From e5d1530ca229aef94a3c84ad33f8ae89f35c4045 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 18 Oct 2020 01:25:54 +0000 Subject: [PATCH] ncurses 6.2 - patch 20201017 + improve manpage typography. + improve discussion in curs_addch.3x of the use of unctrl to display nonprintable characters. + add a note in terminfo.5 explaining that no-parameter strings such as sgr0 or cnorm should not be used with tparm. --- NEWS | 9 ++++- VERSION | 2 +- dist.mk | 4 +-- doc/html/man/adacurses6-config.1.html | 2 +- doc/html/man/captoinfo.1m.html | 2 +- doc/html/man/clear.1.html | 2 +- doc/html/man/curs_add_wch.3x.html | 5 +-- doc/html/man/curs_add_wchstr.3x.html | 3 +- doc/html/man/curs_addch.3x.html | 11 ++++--- doc/html/man/curs_addchstr.3x.html | 19 ++++++----- doc/html/man/curs_addstr.3x.html | 3 +- doc/html/man/curs_addwstr.3x.html | 3 +- doc/html/man/curs_bkgd.3x.html | 4 ++- doc/html/man/curs_bkgrnd.3x.html | 4 ++- doc/html/man/curs_border.3x.html | 34 ++++++++++--------- doc/html/man/curs_deleteln.3x.html | 12 ++++--- doc/html/man/curs_get_wch.3x.html | 3 +- doc/html/man/curs_get_wstr.3x.html | 3 +- doc/html/man/curs_getch.3x.html | 8 +++-- doc/html/man/curs_getstr.3x.html | 19 ++++++----- doc/html/man/curs_in_wch.3x.html | 5 +-- doc/html/man/curs_in_wchstr.3x.html | 3 +- doc/html/man/curs_inch.3x.html | 9 ++--- doc/html/man/curs_inchstr.3x.html | 19 ++++++----- doc/html/man/curs_initscr.3x.html | 4 ++- doc/html/man/curs_ins_wch.3x.html | 9 ++--- doc/html/man/curs_ins_wstr.3x.html | 3 +- doc/html/man/curs_insch.3x.html | 11 ++++--- doc/html/man/curs_insstr.3x.html | 19 ++++++----- doc/html/man/curs_instr.3x.html | 19 ++++++----- doc/html/man/curs_inwstr.3x.html | 3 +- doc/html/man/curs_kernel.3x.html | 6 +++- doc/html/man/curs_legacy.3x.html | 24 ++++++++------ doc/html/man/curs_mouse.3x.html | 13 +++++--- doc/html/man/curs_util.3x.html | 28 +++++++++------- doc/html/man/form.3x.html | 2 +- doc/html/man/form_cursor.3x.html | 5 +-- doc/html/man/form_data.3x.html | 7 ++-- doc/html/man/form_driver.3x.html | 5 +-- doc/html/man/form_field.3x.html | 3 +- doc/html/man/form_field_attributes.3x.html | 17 ++++++---- doc/html/man/form_field_info.3x.html | 32 ++++++++++-------- doc/html/man/form_field_just.3x.html | 7 ++-- doc/html/man/form_field_new.3x.html | 3 +- doc/html/man/form_field_opts.3x.html | 12 ++++--- doc/html/man/form_field_userptr.3x.html | 3 +- doc/html/man/form_field_validation.3x.html | 25 +++++++------- doc/html/man/form_fieldtype.3x.html | 5 ++- doc/html/man/form_hook.3x.html | 22 ++++++++----- doc/html/man/form_new.3x.html | 3 +- doc/html/man/form_new_page.3x.html | 7 ++-- doc/html/man/form_opts.3x.html | 12 ++++--- doc/html/man/form_page.3x.html | 18 ++++++---- doc/html/man/form_post.3x.html | 7 ++-- doc/html/man/form_requestname.3x.html | 3 +- doc/html/man/form_userptr.3x.html | 3 +- doc/html/man/form_win.3x.html | 15 +++++---- doc/html/man/infocmp.1m.html | 2 +- doc/html/man/infotocap.1m.html | 2 +- doc/html/man/key_defined.3x.html | 4 +-- doc/html/man/keybound.3x.html | 4 +-- doc/html/man/keyok.3x.html | 4 +-- doc/html/man/legacy_coding.3x.html | 4 +-- doc/html/man/menu.3x.html | 2 +- doc/html/man/menu_attributes.3x.html | 22 ++++++++----- doc/html/man/menu_cursor.3x.html | 5 +-- doc/html/man/menu_driver.3x.html | 5 +-- doc/html/man/menu_format.3x.html | 7 ++-- doc/html/man/menu_hook.3x.html | 22 ++++++++----- doc/html/man/menu_items.3x.html | 3 +- doc/html/man/menu_mark.3x.html | 3 +- doc/html/man/menu_new.3x.html | 3 +- doc/html/man/menu_opts.3x.html | 12 ++++--- doc/html/man/menu_pattern.3x.html | 7 ++-- doc/html/man/menu_post.3x.html | 7 ++-- doc/html/man/menu_requestname.3x.html | 7 ++-- doc/html/man/menu_spacing.3x.html | 19 ++++++----- doc/html/man/menu_userptr.3x.html | 7 ++-- doc/html/man/menu_win.3x.html | 15 +++++---- doc/html/man/mitem_current.3x.html | 15 +++++---- doc/html/man/mitem_name.3x.html | 7 ++-- doc/html/man/mitem_new.3x.html | 7 ++-- doc/html/man/mitem_opts.3x.html | 12 ++++--- doc/html/man/mitem_userptr.3x.html | 7 ++-- doc/html/man/mitem_value.3x.html | 7 ++-- doc/html/man/mitem_visible.3x.html | 5 +-- doc/html/man/ncurses.3x.html | 2 +- doc/html/man/ncurses6-config.1.html | 2 +- doc/html/man/new_pair.3x.html | 8 ++--- doc/html/man/panel.3x.html | 2 +- doc/html/man/resizeterm.3x.html | 8 ++--- doc/html/man/tabs.1.html | 2 +- doc/html/man/terminfo.5.html | 16 ++++----- 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 +- doc/html/man/wresize.3x.html | 4 +-- include/Caps | 10 ++++-- include/Caps.aix4 | 10 ++++-- include/Caps.hpux11 | 10 ++++-- include/Caps.keys | 10 ++++-- include/Caps.osf1r5 | 10 ++++-- include/Caps.uwin | 10 ++++-- man/curs_add_wch.3x | 4 +-- man/curs_add_wchstr.3x | 4 +-- man/curs_addch.3x | 13 ++++---- man/curs_addchstr.3x | 20 ++++++------ man/curs_addstr.3x | 4 +-- man/curs_addwstr.3x | 4 +-- man/curs_bkgd.3x | 6 ++-- man/curs_bkgrnd.3x | 6 ++-- man/curs_border.3x | 38 +++++++++++----------- man/curs_deleteln.3x | 14 ++++---- man/curs_get_wch.3x | 4 +-- man/curs_get_wstr.3x | 4 +-- man/curs_getch.3x | 8 +++-- man/curs_getstr.3x | 20 ++++++------ man/curs_in_wch.3x | 6 ++-- man/curs_in_wchstr.3x | 4 +-- man/curs_inch.3x | 10 +++--- man/curs_inchstr.3x | 20 ++++++------ man/curs_initscr.3x | 6 ++-- man/curs_ins_wch.3x | 10 +++--- man/curs_ins_wstr.3x | 4 +-- man/curs_insch.3x | 12 +++---- man/curs_insstr.3x | 20 ++++++------ man/curs_instr.3x | 20 ++++++------ man/curs_inwstr.3x | 4 +-- man/curs_kernel.3x | 10 +++--- man/curs_legacy.3x | 28 ++++++++-------- man/curs_mouse.3x | 17 +++++----- man/curs_util.3x | 18 +++++----- man/form_cursor.3x | 6 ++-- man/form_data.3x | 8 ++--- man/form_driver.3x | 4 +-- man/form_field.3x | 4 +-- man/form_field_attributes.3x | 20 ++++++------ man/form_field_info.3x | 18 ++++++---- man/form_field_just.3x | 8 ++--- man/form_field_new.3x | 4 +-- man/form_field_opts.3x | 14 ++++---- man/form_field_userptr.3x | 5 ++- man/form_field_validation.3x | 24 +++++++------- man/form_fieldtype.3x | 9 +++-- man/form_hook.3x | 26 +++++++-------- man/form_new.3x | 4 +-- man/form_new_page.3x | 8 ++--- man/form_opts.3x | 14 ++++---- man/form_page.3x | 22 ++++++------- man/form_post.3x | 8 ++--- man/form_requestname.3x | 4 +-- man/form_userptr.3x | 4 +-- man/form_win.3x | 18 +++++----- man/key_defined.3x | 4 +-- man/keybound.3x | 4 +-- man/keyok.3x | 4 +-- man/legacy_coding.3x | 4 +-- man/manhtml.aliases | 3 +- man/menu_attributes.3x | 26 +++++++-------- man/menu_cursor.3x | 6 ++-- man/menu_driver.3x | 6 ++-- man/menu_format.3x | 8 ++--- man/menu_hook.3x | 26 +++++++-------- man/menu_items.3x | 4 +-- man/menu_mark.3x | 4 +-- man/menu_new.3x | 4 +-- man/menu_opts.3x | 14 ++++---- man/menu_pattern.3x | 8 ++--- man/menu_post.3x | 8 ++--- man/menu_requestname.3x | 8 ++--- man/menu_spacing.3x | 20 ++++++------ man/menu_userptr.3x | 8 ++--- man/menu_win.3x | 18 +++++----- man/mitem_current.3x | 18 +++++----- man/mitem_name.3x | 8 ++--- man/mitem_new.3x | 8 ++--- man/mitem_opts.3x | 14 ++++---- man/mitem_userptr.3x | 8 ++--- man/mitem_value.3x | 8 ++--- man/mitem_visible.3x | 6 ++-- man/new_pair.3x | 8 ++--- man/resizeterm.3x | 8 ++--- man/wresize.3x | 4 +-- misc/terminfo.src | 18 ++++++++-- 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 +- package/ncursest.spec | 2 +- 192 files changed, 971 insertions(+), 797 deletions(-) diff --git a/NEWS b/NEWS index 47a36e02..70c9e04f 100644 --- a/NEWS +++ b/NEWS @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.3575 2020/10/11 00:04:33 tom Exp $ +-- $Id: NEWS,v 1.3578 2020/10/18 00:46:11 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,13 @@ 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. +20201017 + + improve manpage typography. + + improve discussion in curs_addch.3x of the use of unctrl to display + nonprintable characters. + + add a note in terminfo.5 explaining that no-parameter strings such + as sgr0 or cnorm should not be used with tparm. + 20201010 + correct sgr in aaa+rv (report by Florian Weimer) -TD + fix some sgr inconsistencies in d230c, ibm6153, ibm6154, diff --git a/VERSION b/VERSION index b1897d5f..a232778d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.2 20201010 +5:0:10 6.2 20201017 diff --git a/dist.mk b/dist.mk index 65a48510..7fe5a8d7 100644 --- a/dist.mk +++ b/dist.mk @@ -26,7 +26,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1380 2020/10/10 08:40:40 tom Exp $ +# $Id: dist.mk,v 1.1381 2020/10/17 11:56:23 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -38,7 +38,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 6 NCURSES_MINOR = 2 -NCURSES_PATCH = 20201010 +NCURSES_PATCH = 20201017 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/doc/html/man/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html index 7273bdc1..7bc8b43c 100644 --- a/doc/html/man/adacurses6-config.1.html +++ b/doc/html/man/adacurses6-config.1.html @@ -126,7 +126,7 @@

SEE ALSO

        curses(3x)
 
-       This describes ncurses version 6.2 (patch 20201003).
+       This describes ncurses version 6.2 (patch 20201017).
 
 
 
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index 36cb4b38..1e31b8c9 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -199,7 +199,7 @@

SEE ALSO

        infocmp(1m), curses(3x), terminfo(5)
 
-       This describes ncurses version 6.2 (patch 20201003).
+       This describes ncurses version 6.2 (patch 20201017).

AUTHOR

diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 0cb8b7db..31aab1d2 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -149,7 +149,7 @@

SEE ALSO

        tput(1), terminfo(5)
 
-       This describes ncurses version 6.2 (patch 20201003).
+       This describes ncurses version 6.2 (patch 20201017).
 
 
 
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index 52bed5a8..e1cbff48 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wch.3x,v 1.27 2020/03/22 00:25:15 tom Exp @
+  * @Id: curs_add_wch.3x,v 1.28 2020/10/17 23:10:38 tom Exp @
 -->
 
 
@@ -59,6 +59,7 @@
        int wadd_wch( WINDOW *win, const cchar_t *wch );
        int mvadd_wch( int y, int x, const cchar_t *wch );
        int mvwadd_wch( WINDOW *win, int y, int x, const cchar_t *wch );
+
        int echo_wchar( const cchar_t *wch );
        int wecho_wchar( WINDOW *win, const cchar_t *wch );
 
@@ -111,8 +112,8 @@
        WACS_CKBOARD      0x2592     :         a       checker board (stipple)
        WACS_DARROW       0x2193     v         .       arrow pointing down
        WACS_DEGREE       0x00b0     '         f       degree symbol
-       WACS_DIAMOND      0x25c6     +         `       diamond
 
+       WACS_DIAMOND      0x25c6     +         `       diamond
        WACS_GEQUAL       0x2265     >         >       greater-than-or-equal-to
        WACS_HLINE        0x2500     -         q       horizontal line
        WACS_LANTERN      0x2603     #         i       lantern symbol
diff --git a/doc/html/man/curs_add_wchstr.3x.html b/doc/html/man/curs_add_wchstr.3x.html
index 60b5b7c8..b9957121 100644
--- a/doc/html/man/curs_add_wchstr.3x.html
+++ b/doc/html/man/curs_add_wchstr.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wchstr.3x,v 1.13 2020/02/02 23:34:34 tom Exp @
+  * @Id: curs_add_wchstr.3x,v 1.14 2020/10/17 23:11:38 tom Exp @
 -->
 
 
@@ -59,6 +59,7 @@
        int add_wchnstr(const cchar_t *wchstr, int n);
        int wadd_wchstr(WINDOW * win, const cchar_t *wchstr);
        int wadd_wchnstr(WINDOW * win, const cchar_t *wchstr, int n);
+
        int mvadd_wchstr(int y, int x, const cchar_t *wchstr);
        int mvadd_wchnstr(int y, int x, const cchar_t *wchstr, int n);
        int mvwadd_wchstr(WINDOW *win, int y, int x, const cchar_t *wchstr);
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index d84080fb..a7fd7e57 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addch.3x,v 1.52 2020/03/21 23:47:23 tom Exp @
+  * @Id: curs_addch.3x,v 1.54 2020/10/17 23:02:40 tom Exp @
 -->
 
 
@@ -59,6 +59,7 @@
        int waddch(WINDOW *win, const chtype ch);
        int mvaddch(int y, int x, const chtype ch);
        int mvwaddch(WINDOW *win, int y, int x, const chtype ch);
+
        int echochar(const chtype ch);
        int wechochar(WINDOW *win, const chtype ch);
 
@@ -95,10 +96,10 @@
        o   Tabs are considered to be at every eighth column.  The tab interval
            may be altered by setting the TABSIZE variable.
 
-       If  ch  is  any  other  control  character, it is drawn in ^X notation.
-       Calling winch after adding a control  character  does  not  return  the
-       character  itself, but instead returns the ^-representation of the con-
-       trol character.
+       If  ch  is  any  other nonprintable character, it is drawn in printable
+       form, i.e., the ^X notation used by unctrl(3x).   Calling  winch  after
+       adding  a  nonprintable character does not return the character itself,
+       but instead returns the printable representation of the character.
 
        Video attributes can be combined with a character  argument  passed  to
        addch  or  related  functions by logical-ORing them into the character.
diff --git a/doc/html/man/curs_addchstr.3x.html b/doc/html/man/curs_addchstr.3x.html
index 78712927..886e7aa7 100644
--- a/doc/html/man/curs_addchstr.3x.html
+++ b/doc/html/man/curs_addchstr.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addchstr.3x,v 1.19 2020/02/02 23:34:34 tom Exp @
+  * @Id: curs_addchstr.3x,v 1.21 2020/10/18 00:35:20 tom Exp @
 -->
 
 
@@ -55,14 +55,15 @@

SYNOPSIS

        #include <curses.h>
 
-       int addchstr(const chtype *chstr);
-       int addchnstr(const chtype *chstr, int n);
-       int waddchstr(WINDOW *win, const chtype *chstr);
-       int waddchnstr(WINDOW *win, const chtype *chstr, int n);
-       int mvaddchstr(int y, int x, const chtype *chstr);
-       int mvaddchnstr(int y, int x, const chtype *chstr, int n);
-       int mvwaddchstr(WINDOW *win, int y, int x, const chtype *chstr);
-       int mvwaddchnstr(WINDOW *win, int y, int x, const chtype *chstr, int n);
+       int addchstr(const chtype *chstr);
+       int addchnstr(const chtype *chstr, int n);
+       int waddchstr(WINDOW *win, const chtype *chstr);
+       int waddchnstr(WINDOW *win, const chtype *chstr, int n);
+
+       int mvaddchstr(int y, int x, const chtype *chstr);
+       int mvaddchnstr(int y, int x, const chtype *chstr, int n);
+       int mvwaddchstr(WINDOW *win, int y, int x, const chtype *chstr);
+       int mvwaddchnstr(WINDOW *win, int y, int x, const chtype *chstr, int n);

DESCRIPTION

diff --git a/doc/html/man/curs_addstr.3x.html b/doc/html/man/curs_addstr.3x.html
index 4e1ec342..50a8ce5b 100644
--- a/doc/html/man/curs_addstr.3x.html
+++ b/doc/html/man/curs_addstr.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addstr.3x,v 1.22 2020/03/22 00:06:42 tom Exp @
+  * @Id: curs_addstr.3x,v 1.23 2020/10/17 23:11:02 tom Exp @
 -->
 
 
@@ -59,6 +59,7 @@
        int addnstr(const char *str, int n);
        int waddstr(WINDOW *win, const char *str);
        int waddnstr(WINDOW *win, const char *str, int n);
+
        int mvaddstr(int y, int x, const char *str);
        int mvaddnstr(int y, int x, const char *str, int n);
        int mvwaddstr(WINDOW *win, int y, int x, const char *str);
diff --git a/doc/html/man/curs_addwstr.3x.html b/doc/html/man/curs_addwstr.3x.html
index 6fea2aea..f157a296 100644
--- a/doc/html/man/curs_addwstr.3x.html
+++ b/doc/html/man/curs_addwstr.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addwstr.3x,v 1.14 2020/02/02 23:34:34 tom Exp @
+  * @Id: curs_addwstr.3x,v 1.15 2020/10/17 23:12:22 tom Exp @
 -->
 
 
@@ -59,6 +59,7 @@
        int addnwstr(const wchar_t *wstr, int n);
        int waddwstr(WINDOW *win, const wchar_t *wstr);
        int waddnwstr(WINDOW *win, const wchar_t *wstr, int n);
+
        int mvaddwstr(int y, int x, const wchar_t *wstr);
        int mvaddnwstr(int y, int x, const wchar_t *wstr, int n);
        int mvwaddwstr(WINDOW *win, int y, int x, const wchar_t *wstr);
diff --git a/doc/html/man/curs_bkgd.3x.html b/doc/html/man/curs_bkgd.3x.html
index 0e3dca8d..c77f4f99 100644
--- a/doc/html/man/curs_bkgd.3x.html
+++ b/doc/html/man/curs_bkgd.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgd.3x,v 1.30 2020/02/02 23:34:34 tom Exp @
+  * @Id: curs_bkgd.3x,v 1.31 2020/10/17 23:12:52 tom Exp @
 -->
 
 
@@ -56,8 +56,10 @@
 
        void bkgdset(chtype ch);
        void wbkgdset(WINDOW *win, chtype ch);
+
        int bkgd(chtype ch);
        int wbkgd(WINDOW *win, chtype ch);
+
        chtype getbkgd(WINDOW *win);
 
 
diff --git a/doc/html/man/curs_bkgrnd.3x.html b/doc/html/man/curs_bkgrnd.3x.html
index a1ab9247..8ffea8a1 100644
--- a/doc/html/man/curs_bkgrnd.3x.html
+++ b/doc/html/man/curs_bkgrnd.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgrnd.3x,v 1.11 2020/02/02 23:34:34 tom Exp @
+  * @Id: curs_bkgrnd.3x,v 1.12 2020/10/17 23:13:15 tom Exp @
 -->
 
 
@@ -56,8 +56,10 @@
 
        int bkgrnd( const cchar_t *wch);
        int wbkgrnd( WINDOW *win, const cchar_t *wch);
+
        void bkgrndset(const cchar_t *wch );
        void wbkgrndset(WINDOW *win, const cchar_t *wch);
+
        int getbkgrnd(cchar_t *wch);
        int wgetbkgrnd(WINDOW *win, cchar_t *wch);
 
diff --git a/doc/html/man/curs_border.3x.html b/doc/html/man/curs_border.3x.html
index f148f20a..20013f61 100644
--- a/doc/html/man/curs_border.3x.html
+++ b/doc/html/man/curs_border.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_border.3x,v 1.25 2020/02/02 23:34:34 tom Exp @
+  * @Id: curs_border.3x,v 1.27 2020/10/18 00:33:06 tom Exp @
 -->
 
 
@@ -54,20 +54,24 @@

SYNOPSIS

        #include <curses.h>
-       int border(chtype ls, chtype rs, chtype ts, chtype bs,
-          chtype tl, chtype tr, chtype bl, chtype br);
-       int wborder(WINDOW *win, chtype ls, chtype rs,
-          chtype ts, chtype bs, chtype tl, chtype tr,
-          chtype bl, chtype br);
-       int box(WINDOW *win, chtype verch, chtype horch);
-       int hline(chtype ch, int n);
-       int whline(WINDOW *win, chtype ch, int n);
-       int vline(chtype ch, int n);
-       int wvline(WINDOW *win, chtype ch, int n);
-       int mvhline(int y, int x, chtype ch, int n);
-       int mvwhline(WINDOW *, int y, int x, chtype ch, int n);
-       int mvvline(int y, int x, chtype ch, int n);
-       int mvwvline(WINDOW *, int y, int x, chtype ch, int n);
+
+       int border(chtype ls, chtype rs, chtype ts, chtype bs,
+                  chtype tl, chtype tr, chtype bl, chtype br);
+       int wborder(WINDOW *win, chtype ls, chtype rs,
+                   chtype ts, chtype bs, chtype tl, chtype tr,
+                   chtype bl, chtype br);
+
+       int box(WINDOW *win, chtype verch, chtype horch);
+
+       int hline(chtype ch, int n);
+       int whline(WINDOW *win, chtype ch, int n);
+       int vline(chtype ch, int n);
+       int wvline(WINDOW *win, chtype ch, int n);
+
+       int mvhline(int y, int x, chtype ch, int n);
+       int mvwhline(WINDOW *win, int y, int x, chtype ch, int n);
+       int mvvline(int y, int x, chtype ch, int n);
+       int mvwvline(WINDOW *win, int y, int x, chtype ch, int n);

DESCRIPTION

diff --git a/doc/html/man/curs_deleteln.3x.html b/doc/html/man/curs_deleteln.3x.html
index 83add2b0..15a379a9 100644
--- a/doc/html/man/curs_deleteln.3x.html
+++ b/doc/html/man/curs_deleteln.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_deleteln.3x,v 1.15 2020/02/02 23:34:34 tom Exp @
+  * @Id: curs_deleteln.3x,v 1.17 2020/10/18 00:28:51 tom Exp @
 -->
 
 
@@ -55,11 +55,13 @@
        #include <curses.h>
 
        int deleteln(void);
-       int wdeleteln(WINDOW *win);
-       int insdelln(int n);
-       int winsdelln(WINDOW *win, int n);
+       int wdeleteln(WINDOW *win);
+
+       int insdelln(int n);
+       int winsdelln(WINDOW *win, int n);
+
        int insertln(void);
-       int winsertln(WINDOW *win);
+       int winsertln(WINDOW *win);

DESCRIPTION

diff --git a/doc/html/man/curs_get_wch.3x.html b/doc/html/man/curs_get_wch.3x.html
index 66562055..ad6619f2 100644
--- a/doc/html/man/curs_get_wch.3x.html
+++ b/doc/html/man/curs_get_wch.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wch.3x,v 1.13 2020/02/02 23:34:34 tom Exp @
+  * @Id: curs_get_wch.3x,v 1.14 2020/10/17 23:17:05 tom Exp @
 -->
 
 
@@ -58,6 +58,7 @@
        int wget_wch(WINDOW *win, wint_t *wch);
        int mvget_wch(int y, int x, wint_t *wch);
        int mvwget_wch(WINDOW *win, int y, int x, wint_t *wch);
+
        int unget_wch(const wchar_t wch);
 
 
diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html
index 4169df23..0d30c9e5 100644
--- a/doc/html/man/curs_get_wstr.3x.html
+++ b/doc/html/man/curs_get_wstr.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wstr.3x,v 1.20 2020/02/02 23:34:34 tom Exp @
+  * @Id: curs_get_wstr.3x,v 1.21 2020/10/17 23:17:24 tom Exp @
 -->
 
 
@@ -59,6 +59,7 @@
        int getn_wstr(wint_t *wstr, int n);
        int wget_wstr(WINDOW *win, wint_t *wstr);
        int wgetn_wstr(WINDOW *win, wint_t *wstr, int n);
+
        int mvget_wstr(int y, int x, wint_t *wstr);
        int mvgetn_wstr(int y, int x, wint_t *wstr, int n);
        int mvwget_wstr(WINDOW *win, int y, int x, wint_t *wstr);
diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index 63817d52..3515adbf 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getch.3x,v 1.55 2020/02/02 23:34:34 tom Exp @
+  * @Id: curs_getch.3x,v 1.56 2020/10/17 23:18:32 tom Exp @
 -->
 
 
@@ -57,9 +57,13 @@
 
        int getch(void);
        int wgetch(WINDOW *win);
+
        int mvgetch(int y, int x);
        int mvwgetch(WINDOW *win, int y, int x);
+
        int ungetch(int ch);
+
+       /* extension */
        int has_key(int ch);
 
 
@@ -176,11 +180,11 @@
                   KEY_ENTER       Enter or send
                   KEY_SRESET      Soft (partial) reset
                   KEY_RESET       Reset or hard reset
+
                   KEY_PRINT       Print or copy
                   KEY_LL          Home down or bottom (lower left)
                   KEY_A1          Upper left of keypad
                   KEY_A3          Upper right of keypad
-
                   KEY_B2          Center of keypad
                   KEY_C1          Lower left of keypad
                   KEY_C3          Lower right of keypad
diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html
index ca39dbf3..5d8a2c0e 100644
--- a/doc/html/man/curs_getstr.3x.html
+++ b/doc/html/man/curs_getstr.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getstr.3x,v 1.29 2020/02/02 23:34:34 tom Exp @
+  * @Id: curs_getstr.3x,v 1.31 2020/10/18 00:27:44 tom Exp @
   * X/Open says also until EOf
   * X/Open says then an EOS is added to the result
   * X/Open doesn't mention n<0
@@ -57,14 +57,15 @@

SYNOPSIS

        #include <curses.h>
 
-       int getstr(char *str);
-       int getnstr(char *str, int n);
-       int wgetstr(WINDOW *win, char *str);
-       int wgetnstr(WINDOW *win, char *str, int n);
-       int mvgetstr(int y, int x, char *str);
-       int mvwgetstr(WINDOW *win, int y, int x, char *str);
-       int mvgetnstr(int y, int x, char *str, int n);
-       int mvwgetnstr(WINDOW *, int y, int x, char *str, int n);
+       int getstr(char *str);
+       int getnstr(char *str, int n);
+       int wgetstr(WINDOW *win, char *str);
+       int wgetnstr(WINDOW *win, char *str, int n);
+
+       int mvgetstr(int y, int x, char *str);
+       int mvwgetstr(WINDOW *win, int y, int x, char *str);
+       int mvgetnstr(int y, int x, char *str, int n);
+       int mvwgetnstr(WINDOW *win, int y, int x, char *str, int n);

DESCRIPTION

diff --git a/doc/html/man/curs_in_wch.3x.html b/doc/html/man/curs_in_wch.3x.html
index ed9dd6a6..353bf908 100644
--- a/doc/html/man/curs_in_wch.3x.html
+++ b/doc/html/man/curs_in_wch.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_in_wch.3x,v 1.9 2020/02/02 23:34:34 tom Exp @
+  * @Id: curs_in_wch.3x,v 1.10 2020/10/17 23:19:29 tom Exp @
 -->
 
 
@@ -55,9 +55,10 @@
        #include <curses.h>
 
        int in_wch(cchar_t *wcval);
+       int win_wch(WINDOW *win, cchar_t *wcval);
+
        int mvin_wch(int y, int x, cchar_t *wcval);
        int mvwin_wch(WINDOW *win, int y, int x, cchar_t *wcval);
-       int win_wch(WINDOW *win, cchar_t *wcval);

DESCRIPTION

diff --git a/doc/html/man/curs_in_wchstr.3x.html b/doc/html/man/curs_in_wchstr.3x.html
index 089801bb..f1b048f5 100644
--- a/doc/html/man/curs_in_wchstr.3x.html
+++ b/doc/html/man/curs_in_wchstr.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_in_wchstr.3x,v 1.13 2020/02/02 23:34:34 tom Exp @
+  * @Id: curs_in_wchstr.3x,v 1.14 2020/10/17 23:19:44 tom Exp @
 -->
 
 
@@ -59,6 +59,7 @@
        int in_wchnstr(cchar_t *wchstr, int n);
        int win_wchstr(WINDOW *win, cchar_t *wchstr);
        int win_wchnstr(WINDOW *win, cchar_t *wchstr, int n);
+
        int mvin_wchstr(int y, int x, cchar_t *wchstr);
        int mvin_wchnstr(int y, int x, cchar_t *wchstr, int n);
        int mvwin_wchstr(WINDOW *win, int y, int x, cchar_t *wchstr);
diff --git a/doc/html/man/curs_inch.3x.html b/doc/html/man/curs_inch.3x.html
index 8de0774a..6b37318c 100644
--- a/doc/html/man/curs_inch.3x.html
+++ b/doc/html/man/curs_inch.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inch.3x,v 1.23 2020/02/02 23:34:34 tom Exp @
+  * @Id: curs_inch.3x,v 1.25 2020/10/18 00:25:23 tom Exp @
 -->
 
 
@@ -56,9 +56,10 @@
        #include <curses.h>
 
        chtype inch(void);
-       chtype winch(WINDOW *win);
-       chtype mvinch(int y, int x);
-       chtype mvwinch(WINDOW *win, int y, int x);
+       chtype winch(WINDOW *win);
+
+       chtype mvinch(int y, int x);
+       chtype mvwinch(WINDOW *win, int y, int x);

DESCRIPTION

diff --git a/doc/html/man/curs_inchstr.3x.html b/doc/html/man/curs_inchstr.3x.html
index f0f9a707..a94a7fcf 100644
--- a/doc/html/man/curs_inchstr.3x.html
+++ b/doc/html/man/curs_inchstr.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inchstr.3x,v 1.19 2020/02/02 23:34:34 tom Exp @
+  * @Id: curs_inchstr.3x,v 1.21 2020/10/18 00:24:36 tom Exp @
 -->
 
 
@@ -55,14 +55,15 @@

SYNOPSIS

        #include <curses.h>
 
-       int inchstr(chtype *chstr);
-       int inchnstr(chtype *chstr, int n);
-       int winchstr(WINDOW *win, chtype *chstr);
-       int winchnstr(WINDOW *win, chtype *chstr, int n);
-       int mvinchstr(int y, int x, chtype *chstr);
-       int mvinchnstr(int y, int x, chtype *chstr, int n);
-       int mvwinchstr(WINDOW *win, int y, int x, chtype *chstr);
-       int mvwinchnstr(WINDOW *win, int y, int x, chtype *chstr, int n);
+       int inchstr(chtype *chstr);
+       int inchnstr(chtype *chstr, int n);
+       int winchstr(WINDOW *win, chtype *chstr);
+       int winchnstr(WINDOW *win, chtype *chstr, int n);
+
+       int mvinchstr(int y, int x, chtype *chstr);
+       int mvinchnstr(int y, int x, chtype *chstr, int n);
+       int mvwinchstr(WINDOW *win, int y, int x, chtype *chstr);
+       int mvwinchnstr(WINDOW *win, int y, int x, chtype *chstr, int n);

DESCRIPTION

diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html
index 395a7864..ff3e6c26 100644
--- a/doc/html/man/curs_initscr.3x.html
+++ b/doc/html/man/curs_initscr.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_initscr.3x,v 1.32 2020/02/02 23:34:34 tom Exp @
+  * @Id: curs_initscr.3x,v 1.33 2020/10/17 23:20:48 tom Exp @
 -->
 
 
@@ -56,7 +56,9 @@
 
        WINDOW *initscr(void);
        int endwin(void);
+
        bool isendwin(void);
+
        SCREEN *newterm(const char *type, FILE *outfd, FILE *infd);
        SCREEN *set_term(SCREEN *new);
        void delscreen(SCREEN* sp);
diff --git a/doc/html/man/curs_ins_wch.3x.html b/doc/html/man/curs_ins_wch.3x.html
index 2a373484..5ab6a011 100644
--- a/doc/html/man/curs_ins_wch.3x.html
+++ b/doc/html/man/curs_ins_wch.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wch.3x,v 1.8 2020/02/02 23:34:34 tom Exp @
+  * @Id: curs_ins_wch.3x,v 1.10 2020/10/18 00:22:21 tom Exp @
 -->
 
 
@@ -55,9 +55,10 @@
        #include <curses.h>
 
        int ins_wch(const cchar_t *wch);
-       int wins_wch(WINDOW *win, const cchar_t *wch);
-       int mvins_wch(int y, int x, const cchar_t *wch);
-       int mvwins_wch(WINDOW *win, int y, int x, const cchar_t *wch);
+       int wins_wch(WINDOW *win, const cchar_t *wch);
+
+       int mvins_wch(int y, int x, const cchar_t *wch);
+       int mvwins_wch(WINDOW *win, int y, int x, const cchar_t *wch);

DESCRIPTION

diff --git a/doc/html/man/curs_ins_wstr.3x.html b/doc/html/man/curs_ins_wstr.3x.html
index d30ad4fd..fdb40881 100644
--- a/doc/html/man/curs_ins_wstr.3x.html
+++ b/doc/html/man/curs_ins_wstr.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wstr.3x,v 1.10 2020/02/02 23:34:34 tom Exp @
+  * @Id: curs_ins_wstr.3x,v 1.11 2020/10/17 23:21:25 tom Exp @
 -->
 
 
@@ -59,6 +59,7 @@
        int ins_nwstr(const wchar_t *wstr, int n);
        int wins_wstr(WINDOW *win, const wchar_t *wstr);
        int wins_nwstr(WINDOW *win, const wchar_t *wstr, int n);
+
        int mvins_wstr(int y, int x, const wchar_t *wstr);
        int mvins_nwstr(int y, int x, const wchar_t *wstr, int n);
        int mvwins_wstr(WINDOW *win, int y, int x, const wchar_t *wstr);
diff --git a/doc/html/man/curs_insch.3x.html b/doc/html/man/curs_insch.3x.html
index 1bda98e4..238b418b 100644
--- a/doc/html/man/curs_insch.3x.html
+++ b/doc/html/man/curs_insch.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insch.3x,v 1.17 2020/02/02 23:34:34 tom Exp @
+  * @Id: curs_insch.3x,v 1.19 2020/10/18 00:21:39 tom Exp @
 -->
 
 
@@ -54,10 +54,11 @@

SYNOPSIS

        #include <curses.h>
 
-       int insch(chtype ch);
-       int winsch(WINDOW *win, chtype ch);
-       int mvinsch(int y, int x, chtype ch);
-       int mvwinsch(WINDOW *win, int y, int x, chtype ch);
+       int insch(chtype ch);
+       int winsch(WINDOW *win, chtype ch);
+
+       int mvinsch(int y, int x, chtype ch);
+       int mvwinsch(WINDOW *win, int y, int x, chtype ch);

DESCRIPTION

diff --git a/doc/html/man/curs_insstr.3x.html b/doc/html/man/curs_insstr.3x.html
index 7c9efa72..285bfa4b 100644
--- a/doc/html/man/curs_insstr.3x.html
+++ b/doc/html/man/curs_insstr.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insstr.3x,v 1.24 2020/02/02 23:34:34 tom Exp @
+  * @Id: curs_insstr.3x,v 1.26 2020/10/18 00:20:36 tom Exp @
 -->
 
 
@@ -53,14 +53,15 @@

SYNOPSIS

        #include <curses.h>
-       int insstr(const char *str);
-       int insnstr(const char *str, int n);
-       int winsstr(WINDOW *win, const char *str);
-       int winsnstr(WINDOW *win, const char *str, int n);
-       int mvinsstr(int y, int x, const char *str);
-       int mvinsnstr(int y, int x, const char *str, int n);
-       int mvwinsstr(WINDOW *win, int y, int x, const char *str);
-       int mvwinsnstr(WINDOW *win, int y, int x, const char *str, int n);
+       int insstr(const char *str);
+       int insnstr(const char *str, int n);
+       int winsstr(WINDOW *win, const char *str);
+       int winsnstr(WINDOW *win, const char *str, int n);
+
+       int mvinsstr(int y, int x, const char *str);
+       int mvinsnstr(int y, int x, const char *str, int n);
+       int mvwinsstr(WINDOW *win, int y, int x, const char *str);
+       int mvwinsnstr(WINDOW *win, int y, int x, const char *str, int n);

DESCRIPTION

diff --git a/doc/html/man/curs_instr.3x.html b/doc/html/man/curs_instr.3x.html
index f5aecfcb..f223394a 100644
--- a/doc/html/man/curs_instr.3x.html
+++ b/doc/html/man/curs_instr.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_instr.3x,v 1.20 2020/02/02 23:34:34 tom Exp @
+  * @Id: curs_instr.3x,v 1.22 2020/10/18 00:18:27 tom Exp @
 -->
 
 
@@ -54,14 +54,15 @@

SYNOPSIS

        #include <curses.h>
 
-       int instr(char *str);
-       int innstr(char *str, int n);
-       int winstr(WINDOW *win, char *str);
-       int winnstr(WINDOW *win, char *str, int n);
-       int mvinstr(int y, int x, char *str);
-       int mvinnstr(int y, int x, char *str, int n);
-       int mvwinstr(WINDOW *win, int y, int x, char *str);
-       int mvwinnstr(WINDOW *win, int y, int x, char *str, int n);
+       int instr(char *str);
+       int innstr(char *str, int n);
+       int winstr(WINDOW *win, char *str);
+       int winnstr(WINDOW *win, char *str, int n);
+
+       int mvinstr(int y, int x, char *str);
+       int mvinnstr(int y, int x, char *str, int n);
+       int mvwinstr(WINDOW *win, int y, int x, char *str);
+       int mvwinnstr(WINDOW *win, int y, int x, char *str, int n);

DESCRIPTION

diff --git a/doc/html/man/curs_inwstr.3x.html b/doc/html/man/curs_inwstr.3x.html
index f70cc787..3560c6bc 100644
--- a/doc/html/man/curs_inwstr.3x.html
+++ b/doc/html/man/curs_inwstr.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inwstr.3x,v 1.13 2020/02/02 23:34:34 tom Exp @
+  * @Id: curs_inwstr.3x,v 1.14 2020/10/17 23:22:11 tom Exp @
 -->
 
 
@@ -58,6 +58,7 @@
        int innwstr(wchar_t *wstr, int n);
        int winwstr(WINDOW *win, wchar_t *wstr);
        int winnwstr(WINDOW *win, wchar_t *wstr, int n);
+
        int mvinwstr(int y, int x, wchar_t *wstr);
        int mvinnwstr(int y, int x, wchar_t *wstr, int n);
        int mvwinwstr(WINDOW *win, int y, int x, wchar_t *wstr);
diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html
index f90c1a66..d8932e32 100644
--- a/doc/html/man/curs_kernel.3x.html
+++ b/doc/html/man/curs_kernel.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_kernel.3x,v 1.28 2020/02/02 23:34:34 tom Exp @
+  * @Id: curs_kernel.3x,v 1.29 2020/10/17 23:22:35 tom Exp @
 -->
 
 
@@ -57,12 +57,16 @@
 
        int def_prog_mode(void);
        int def_shell_mode(void);
+
        int reset_prog_mode(void);
        int reset_shell_mode(void);
+
        int resetty(void);
        int savetty(void);
+
        void getsyx(int y, int x);
        void setsyx(int y, int x);
+
        int ripoffline(int line, int (*init)(WINDOW *, int));
        int curs_set(int visibility);
        int napms(int ms);
diff --git a/doc/html/man/curs_legacy.3x.html b/doc/html/man/curs_legacy.3x.html
index 24071db7..d3fadc3a 100644
--- a/doc/html/man/curs_legacy.3x.html
+++ b/doc/html/man/curs_legacy.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_legacy.3x,v 1.10 2020/02/02 23:34:34 tom Exp @
+  * @Id: curs_legacy.3x,v 1.12 2020/10/18 00:16:04 tom Exp @
 -->
 
 
@@ -53,15 +53,19 @@

SYNOPSIS

        #include <curses.h>
 
-       int getattrs(const WINDOW *win);
-       int getbegx(const WINDOW *win);
-       int getbegy(const WINDOW *win);
-       int getcurx(const WINDOW *win);
-       int getcury(const WINDOW *win);
-       int getmaxx(const WINDOW *win);
-       int getmaxy(const WINDOW *win);
-       int getparx(const WINDOW *win);
-       int getpary(const WINDOW *win);
+       int getattrs(const WINDOW *win);
+
+       int getbegx(const WINDOW *win);
+       int getbegy(const WINDOW *win);
+
+       int getcurx(const WINDOW *win);
+       int getcury(const WINDOW *win);
+
+       int getmaxx(const WINDOW *win);
+       int getmaxy(const WINDOW *win);
+
+       int getparx(const WINDOW *win);
+       int getpary(const WINDOW *win);

DESCRIPTION

diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html
index 81fe57a2..b62defdf 100644
--- a/doc/html/man/curs_mouse.3x.html
+++ b/doc/html/man/curs_mouse.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_mouse.3x,v 1.52 2020/02/02 23:34:34 tom Exp @
+  * @Id: curs_mouse.3x,v 1.53 2020/10/17 23:25:08 tom Exp @
 -->
 
 
@@ -64,13 +64,18 @@
        } MEVENT;
 
        bool has_mouse(void);
+
        int getmouse(MEVENT *event);
        int ungetmouse(MEVENT *event);
+
        mmask_t mousemask(mmask_t newmask, mmask_t *oldmask);
+
        bool wenclose(const WINDOW *win, int y, int x);
+
        bool mouse_trafo(int* pY, int* pX, bool to_screen);
-       bool wmouse_trafo(const WINDOW* win, int* pY, int* pX,
-            bool to_screen);
+       bool wmouse_trafo(const WINDOW* win,
+                         int* pY, int* pX, bool to_screen);
+
        int mouseinterval(int erval);
 
 
@@ -107,12 +112,12 @@
        BUTTON2_PRESSED          mouse button 2 down
        BUTTON2_RELEASED         mouse button 2 up
        BUTTON2_CLICKED          mouse button 2 clicked
+
        BUTTON2_DOUBLE_CLICKED   mouse button 2 double clicked
        BUTTON2_TRIPLE_CLICKED   mouse button 2 triple clicked
        ---------------------------------------------------------------------
        BUTTON3_PRESSED          mouse button 3 down
        BUTTON3_RELEASED         mouse button 3 up
-
        BUTTON3_CLICKED          mouse button 3 clicked
        BUTTON3_DOUBLE_CLICKED   mouse button 3 double clicked
        BUTTON3_TRIPLE_CLICKED   mouse button 3 triple clicked
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index b8e05be6..3589d2a7 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.57 2020/02/02 23:34:34 tom Exp @
+  * @Id: curs_util.3x,v 1.58 2020/10/17 22:54:59 tom Exp @
 -->
 
 
@@ -58,14 +58,19 @@
 
        const char *unctrl(chtype c);
        wchar_t *wunctrl(cchar_t *c);
+
        const char *keyname(int c);
        const char *key_name(wchar_t w);
+
        void filter(void);
        void nofilter(void);
+
        void use_env(bool f);
        void use_tioctl(bool f);
+
        int putwin(WINDOW *win, FILE *filep);
        WINDOW *getwin(FILE *filep);
+
        int delay_output(int ms);
        int flushinp(void);
 
@@ -176,6 +181,7 @@
                                   uses operating system calls unless over-
                                   ridden by $LINES or $COLUMNS environment
                                   variables.
+
            TRUE      TRUE         ncurses   updates  $LINES  and  $COLUMNS
                                   based on operating system calls.
            FALSE     TRUE         ncurses ignores $LINES and $COLUMNS, us-
@@ -302,9 +308,9 @@
            X/Open Curses documented.
 
        o   the parameter is in the range 128-159, i.e., a C1 control code.  If
-           use_legacy_coding  has  been  called with a 2 parameter, unctrl re-
-           turns the parameter, i.e., a one-character string with the  parame-
-           ter  as  the  first  character.   Otherwise, it returns "~@", "~A",
+           use_legacy_coding(3x)  has  been  called with a 2 parameter, unctrl
+           returns the parameter, i.e., a one-character string with the param-
+           eter  as  the  first  character.  Otherwise, it returns "~@", "~A",
            etc., analogous to "^@", "^A", C0 controls.
 
            X/Open Curses does not document whether unctrl can be called before
@@ -321,16 +327,16 @@
        "^", and strip the parameter to 7 bits.  Or they may ignore C1 controls
        and treat all of the upper-128 codes as printable.  This implementation
        uses  8  bits  but  does  not modify the string to reflect locale.  The
-       use_legacy_coding function allows the caller to change  the  output  of
-       unctrl.
+       use_legacy_coding(3x) function allows the caller to change  the  output
+       of unctrl.
 
        Likewise,  the meta(3x) function allows the caller to change the output
        of keyname, i.e., it determines whether to  use  the  "M-"  prefix  for
-       "meta"  keys  (codes  in the range 128 to 255).  Both use_legacy_coding
-       and meta succeed only after curses is initialized.  X/Open Curses  does
-       not  document the treatment of codes 128 to 159.  When treating them as
-       "meta" keys (or if keyname is called before initializing curses),  this
-       implementation returns strings "M-^@", "M-^A", etc.
+       "meta"  keys  (codes  in  the  range 128 to 255).  Both use_legacy_cod-
+       ing(3x) and meta(3x) succeed only after curses is initialized.   X/Open
+       Curses  does  not  document  the  treatment  of codes 128 to 159.  When
+       treating them as "meta" keys (or if keyname is called before initializ-
+       ing curses), this implementation returns strings "M-^@", "M-^A", etc.
 
        X/Open Curses documents unctrl as declared in <unctrl.h>, which ncurses
        does.  However, ncurses' <curses.h> includes <unctrl.h>,  matching  the
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index edb8d24c..0f0d1f27 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -247,7 +247,7 @@
        curses(3x)  and  related  pages  whose names begin "form_" for detailed
        descriptions of the entry points.
 
-       This describes ncurses version 6.2 (patch 20201003).
+       This describes ncurses version 6.2 (patch 20201017).
 
 
 
diff --git a/doc/html/man/form_cursor.3x.html b/doc/html/man/form_cursor.3x.html
index 5430124b..d5e13cf6 100644
--- a/doc/html/man/form_cursor.3x.html
+++ b/doc/html/man/form_cursor.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_cursor.3x,v 1.12 2020/02/02 23:34:34 tom Exp @
+  * @Id: form_cursor.3x,v 1.14 2020/10/18 00:15:29 tom Exp @
 -->
 
 
@@ -53,7 +53,8 @@

SYNOPSIS

        #include <form.h>
-       int pos_form_cursor(FORM *form);
+
+       int pos_form_cursor(FORM *form);

DESCRIPTION

diff --git a/doc/html/man/form_data.3x.html b/doc/html/man/form_data.3x.html
index d3d94d48..72157880 100644
--- a/doc/html/man/form_data.3x.html
+++ b/doc/html/man/form_data.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_data.3x,v 1.13 2020/02/02 23:34:34 tom Exp @
+  * @Id: form_data.3x,v 1.15 2020/10/18 00:15:00 tom Exp @
 -->
 
 
@@ -53,8 +53,9 @@

SYNOPSIS

        #include <form.h>
-       bool data_ahead(const FORM *form);
-       bool data_behind(const FORM *form);
+
+       bool data_ahead(const FORM *form);
+       bool data_behind(const FORM *form);

DESCRIPTION

diff --git a/doc/html/man/form_driver.3x.html b/doc/html/man/form_driver.3x.html
index b5bebe1e..c2c1aa3f 100644
--- a/doc/html/man/form_driver.3x.html
+++ b/doc/html/man/form_driver.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_driver.3x,v 1.33 2020/02/02 23:34:34 tom Exp @
+  * @Id: form_driver.3x,v 1.34 2020/10/17 23:28:04 tom Exp @
 -->
 
 
@@ -52,6 +52,7 @@

SYNOPSIS

        #include <form.h>
+
        int form_driver(FORM *form, int c);
        int form_driver_w(FORM *form, int c, wchar_t wch);
 
@@ -111,8 +112,8 @@
        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.
 
+       REQ_NEXT_CHOICE    Display next field choice.
        REQ_NEXT_FIELD     Move to the next field.
        REQ_NEXT_LINE      Move to the next line.
        REQ_NEXT_PAGE      Move to the next page.
diff --git a/doc/html/man/form_field.3x.html b/doc/html/man/form_field.3x.html
index b8d8bc64..22aa78e7 100644
--- a/doc/html/man/form_field.3x.html
+++ b/doc/html/man/form_field.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field.3x,v 1.15 2020/03/28 19:06:28 tom Exp @
+  * @Id: form_field.3x,v 1.16 2020/10/17 23:06:12 tom Exp @
 -->
 
 
@@ -53,6 +53,7 @@

SYNOPSIS

        #include <form.h>
+
        int set_form_fields(FORM *form, FIELD **fields);
        FIELD **form_fields(const FORM *form);
        int field_count(const FORM *form);
diff --git a/doc/html/man/form_field_attributes.3x.html b/doc/html/man/form_field_attributes.3x.html
index e1b4b97d..589c965d 100644
--- a/doc/html/man/form_field_attributes.3x.html
+++ b/doc/html/man/form_field_attributes.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_attributes.3x,v 1.16 2020/02/02 23:34:34 tom Exp @
+  * @Id: form_field_attributes.3x,v 1.18 2020/10/18 00:14:20 tom Exp @
 -->
 
 
@@ -53,12 +53,15 @@

SYNOPSIS

        #include <form.h>
-       int set_field_fore(FIELD *field, chtype attr);
-       chtype field_fore(const FIELD *field);
-       int set_field_back(FIELD *field, chtype attr);
-       chtype field_back(const FIELD *field);
-       int set_field_pad(FIELD *field, int pad);
-       int field_pad(const FIELD *field);
+
+       int set_field_fore(FIELD *field, chtype attr);
+       chtype field_fore(const FIELD *field);
+
+       int set_field_back(FIELD *field, chtype attr);
+       chtype field_back(const FIELD *field);
+
+       int set_field_pad(FIELD *field, int pad);
+       int field_pad(const FIELD *field);

DESCRIPTION

diff --git a/doc/html/man/form_field_info.3x.html b/doc/html/man/form_field_info.3x.html
index 38c2bec1..41cabe8c 100644
--- a/doc/html/man/form_field_info.3x.html
+++ b/doc/html/man/form_field_info.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_info.3x,v 1.17 2020/02/02 23:34:34 tom Exp @
+  * @Id: form_field_info.3x,v 1.18 2020/10/17 23:35:05 tom Exp @
 -->
 
 
@@ -53,20 +53,24 @@

SYNOPSIS

        #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 *cols, int
-       *max);
+
+       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 *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 corner, column of  upper-left  corner,  number
+       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 corner, 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
+       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 argument will be set to 0.  A field can
        be made dynamic by turning off the O_STATIC option with field_opts_off.
 
@@ -84,7 +88,7 @@

SEE ALSO

-       curses(3x) and related pages whose names  begin  "form_"  for  detailed
+       curses(3x)  and  related  pages  whose names begin "form_" for detailed
        descriptions of the entry points.
 
 
@@ -94,11 +98,11 @@

PORTABILITY

-       These routines emulate the System V forms library.  They were not  sup-
+       These  routines emulate the System V forms library.  They were not sup-
        ported 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 allow this,  e.g.,  Solaris
+       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.
 
 
diff --git a/doc/html/man/form_field_just.3x.html b/doc/html/man/form_field_just.3x.html
index 2b501e54..ffd27b11 100644
--- a/doc/html/man/form_field_just.3x.html
+++ b/doc/html/man/form_field_just.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_just.3x,v 1.16 2020/02/02 23:34:34 tom Exp @
+  * @Id: form_field_just.3x,v 1.18 2020/10/18 00:12:55 tom Exp @
 -->
 
 
@@ -53,8 +53,9 @@

SYNOPSIS

        #include <form.h>
-       int set_field_just(FIELD *field, int justification);
-       int field_just(const FIELD *field);
+
+       int set_field_just(FIELD *field, int justification);
+       int field_just(const FIELD *field);

DESCRIPTION

diff --git a/doc/html/man/form_field_new.3x.html b/doc/html/man/form_field_new.3x.html
index ac197ecc..b17d67c3 100644
--- a/doc/html/man/form_field_new.3x.html
+++ b/doc/html/man/form_field_new.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_new.3x,v 1.22 2020/03/28 19:06:28 tom Exp @
+  * @Id: form_field_new.3x,v 1.23 2020/10/17 23:06:36 tom Exp @
 -->
 
 
@@ -54,6 +54,7 @@

SYNOPSIS

        #include <form.h>
+
        FIELD *new_field(int height, int width,
                         int toprow, int leftcol,
                         int offscreen, int nbuffers);
diff --git a/doc/html/man/form_field_opts.3x.html b/doc/html/man/form_field_opts.3x.html
index d370db13..1f4882db 100644
--- a/doc/html/man/form_field_opts.3x.html
+++ b/doc/html/man/form_field_opts.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_opts.3x,v 1.25 2020/02/02 23:34:34 tom Exp @
+  * @Id: form_field_opts.3x,v 1.27 2020/10/18 00:11:45 tom Exp @
 -->
 
 
@@ -54,10 +54,12 @@

SYNOPSIS

        #include <form.h>
-       int set_field_opts(FIELD *field, Field_Options opts);
-       int field_opts_on(FIELD *field, Field_Options opts);
-       int field_opts_off(FIELD *field, Field_Options opts);
-       Field_Options field_opts(const FIELD *field);
+
+       int set_field_opts(FIELD *field, Field_Options opts);
+       Field_Options field_opts(const FIELD *field);
+
+       int field_opts_on(FIELD *field, Field_Options opts);
+       int field_opts_off(FIELD *field, Field_Options opts);

DESCRIPTION

diff --git a/doc/html/man/form_field_userptr.3x.html b/doc/html/man/form_field_userptr.3x.html
index 62d7fbbb..b5c626aa 100644
--- a/doc/html/man/form_field_userptr.3x.html
+++ b/doc/html/man/form_field_userptr.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_userptr.3x,v 1.14 2020/03/28 19:06:28 tom Exp @
+  * @Id: form_field_userptr.3x,v 1.15 2020/10/17 23:07:03 tom Exp @
 -->
 
 
@@ -54,6 +54,7 @@

SYNOPSIS

        #include <form.h>
+
        int set_field_userptr(FIELD *field, void*userptr);
        void *field_userptr(const FIELD *field);
 
diff --git a/doc/html/man/form_field_validation.3x.html b/doc/html/man/form_field_validation.3x.html
index 49753023..8150c2c1 100644
--- a/doc/html/man/form_field_validation.3x.html
+++ b/doc/html/man/form_field_validation.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_validation.3x,v 1.25 2020/02/02 23:34:34 tom Exp @
+  * @Id: form_field_validation.3x,v 1.27 2020/10/18 00:07:45 tom Exp @
 -->
 
 
@@ -52,17 +52,18 @@

SYNOPSIS

        #include <form.h>
-       int set_field_type(FIELD *field, FIELDTYPE *type, ...);
-       FIELDTYPE *field_type(const FIELD *field);
-       void *field_arg(const FIELD *field);
-
-       FIELDTYPE *TYPE_ALNUM;
-       FIELDTYPE *TYPE_ALPHA;
-       FIELDTYPE *TYPE_ENUM;
-       FIELDTYPE *TYPE_INTEGER;
-       FIELDTYPE *TYPE_NUMERIC;
-       FIELDTYPE *TYPE_REGEXP;
-       FIELDTYPE *TYPE_IPV4;
+
+       int set_field_type(FIELD *field, FIELDTYPE *type, ...);
+       FIELDTYPE *field_type(const FIELD *field);
+       void *field_arg(const FIELD *field);
+
+       FIELDTYPE *TYPE_ALNUM;
+       FIELDTYPE *TYPE_ALPHA;
+       FIELDTYPE *TYPE_ENUM;
+       FIELDTYPE *TYPE_INTEGER;
+       FIELDTYPE *TYPE_NUMERIC;
+       FIELDTYPE *TYPE_REGEXP;
+       FIELDTYPE *TYPE_IPV4;

DESCRIPTION

diff --git a/doc/html/man/form_fieldtype.3x.html b/doc/html/man/form_fieldtype.3x.html
index 56d682d4..2c8cc6ba 100644
--- a/doc/html/man/form_fieldtype.3x.html
+++ b/doc/html/man/form_fieldtype.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_fieldtype.3x,v 1.21 2020/03/28 19:06:28 tom Exp @
+  * @Id: form_fieldtype.3x,v 1.22 2020/10/17 23:07:47 tom Exp @
 -->
 
 
@@ -53,10 +53,12 @@

SYNOPSIS

        #include <form.h>
+
        FIELDTYPE *new_fieldtype(
            bool (* const field_check)(FIELD *, const void *),
            bool (* const char_check)(int, const void *));
        int free_fieldtype(FIELDTYPE *fieldtype);
+
        int set_fieldtype_arg(
            FIELDTYPE *fieldtype,
            void *(* const make_arg)(va_list *),
@@ -66,6 +68,7 @@
            FIELDTYPE *fieldtype,
            bool (* const next_choice)(FIELD *, const void *),
            bool (* const prev_choice)(FIELD *, const void *));
+
        FIELDTYPE *link_fieldtype(FIELDTYPE *type1,
                                  FIELDTYPE *type2);
 
diff --git a/doc/html/man/form_hook.3x.html b/doc/html/man/form_hook.3x.html
index bac8d438..ba593cb0 100644
--- a/doc/html/man/form_hook.3x.html
+++ b/doc/html/man/form_hook.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_hook.3x,v 1.14 2020/02/02 23:34:34 tom Exp @
+  * @Id: form_hook.3x,v 1.16 2020/10/18 00:06:29 tom Exp @
 -->
 
 
@@ -53,14 +53,18 @@

SYNOPSIS

        #include <form.h>
-       int set_field_init(FORM *form, Form_Hook func);
-       Form_Hook field_init(const FORM *form);
-       int set_field_term(FORM *form, Form_Hook func);
-       Form_Hook field_term(const FORM *form);
-       int set_form_init(FORM *form, Form_Hook func);
-       Form_Hook form_init(const FORM *form);
-       int set_form_term(FORM *form, Form_Hook func);
-       Form_Hook form_term(const FORM *form);
+
+       int set_field_init(FORM *form, Form_Hook func);
+       Form_Hook field_init(const FORM *form);
+
+       int set_field_term(FORM *form, Form_Hook func);
+       Form_Hook field_term(const FORM *form);
+
+       int set_form_init(FORM *form, Form_Hook func);
+       Form_Hook form_init(const FORM *form);
+
+       int set_form_term(FORM *form, Form_Hook func);
+       Form_Hook form_term(const FORM *form);

DESCRIPTION

diff --git a/doc/html/man/form_new.3x.html b/doc/html/man/form_new.3x.html
index ed4c893e..90358a3e 100644
--- a/doc/html/man/form_new.3x.html
+++ b/doc/html/man/form_new.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_new.3x,v 1.13 2020/03/28 19:06:28 tom Exp @
+  * @Id: form_new.3x,v 1.14 2020/10/17 23:08:09 tom Exp @
 -->
 
 
@@ -53,6 +53,7 @@

SYNOPSIS

        #include <form.h>
+
        FORM *new_form(FIELD **fields);
        int free_form(FORM *form);
 
diff --git a/doc/html/man/form_new_page.3x.html b/doc/html/man/form_new_page.3x.html
index c14bb9da..16b1b3e2 100644
--- a/doc/html/man/form_new_page.3x.html
+++ b/doc/html/man/form_new_page.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_new_page.3x,v 1.15 2020/02/02 23:34:34 tom Exp @
+  * @Id: form_new_page.3x,v 1.17 2020/10/18 00:04:36 tom Exp @
 -->
 
 
@@ -53,8 +53,9 @@

SYNOPSIS

        #include <form.h>
-       int set_new_page(FIELD *field, bool new_page_flag);
-       bool new_page(const FIELD *field);
+
+       int set_new_page(FIELD *field, bool new_page_flag);
+       bool new_page(const FIELD *field);

DESCRIPTION

diff --git a/doc/html/man/form_opts.3x.html b/doc/html/man/form_opts.3x.html
index cf680aff..8789e882 100644
--- a/doc/html/man/form_opts.3x.html
+++ b/doc/html/man/form_opts.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_opts.3x,v 1.15 2020/02/02 23:34:34 tom Exp @
+  * @Id: form_opts.3x,v 1.17 2020/10/18 00:03:49 tom Exp @
 -->
 
 
@@ -54,10 +54,12 @@

SYNOPSIS

        #include <form.h>
-       int set_form_opts(FORM *form, Field_Options opts);
-       int form_opts_on(FORM *form, Field_Options opts);
-       int form_opts_off(FORM *form, Field_Options opts);
-       Field_Options form_opts(const FORM *form);
+
+       int set_form_opts(FORM *form, Field_Options opts);
+       Field_Options form_opts(const FORM *form);
+
+       int form_opts_on(FORM *form, Field_Options opts);
+       int form_opts_off(FORM *form, Field_Options opts);

DESCRIPTION

diff --git a/doc/html/man/form_page.3x.html b/doc/html/man/form_page.3x.html
index e06fffde..f38aa72d 100644
--- a/doc/html/man/form_page.3x.html
+++ b/doc/html/man/form_page.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_page.3x,v 1.17 2020/02/02 23:34:34 tom Exp @
+  * @Id: form_page.3x,v 1.19 2020/10/18 00:02:44 tom Exp @
 -->
 
 
@@ -53,12 +53,16 @@

SYNOPSIS

        #include <form.h>
-       int set_current_field(FORM *form, FIELD *field);
-       FIELD *current_field(const FORM *);
-       int unfocus_current_field(FORM *form);
-       int set_form_page(FORM *form, int n);
-       int form_page(const FORM *form);
-       int field_index(const FIELD *field);
+
+       int set_current_field(FORM *form, FIELD *field);
+       FIELD *current_field(const FORM *form);
+
+       int unfocus_current_field(FORM *form);
+
+       int set_form_page(FORM *form, int n);
+       int form_page(const FORM *form);
+
+       int field_index(const FIELD *field);

DESCRIPTION

diff --git a/doc/html/man/form_post.3x.html b/doc/html/man/form_post.3x.html
index 9a18331d..9709d408 100644
--- a/doc/html/man/form_post.3x.html
+++ b/doc/html/man/form_post.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_post.3x,v 1.14 2020/02/02 23:34:34 tom Exp @
+  * @Id: form_post.3x,v 1.16 2020/10/18 00:01:05 tom Exp @
 -->
 
 
@@ -54,8 +54,9 @@

SYNOPSIS

        #include <form.h>
-       int post_form(FORM *form);
-       int unpost_form(FORM *form);
+
+       int post_form(FORM *form);
+       int unpost_form(FORM *form);

DESCRIPTION

diff --git a/doc/html/man/form_requestname.3x.html b/doc/html/man/form_requestname.3x.html
index 77b03fa8..fbe3279f 100644
--- a/doc/html/man/form_requestname.3x.html
+++ b/doc/html/man/form_requestname.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_requestname.3x,v 1.13 2020/03/28 19:06:28 tom Exp @
+  * @Id: form_requestname.3x,v 1.14 2020/10/17 23:08:23 tom Exp @
 -->
 
 
@@ -54,6 +54,7 @@

SYNOPSIS

        #include <form.h>
+
        const char *form_request_name(int request);
        int form_request_by_name(const char *name);
 
diff --git a/doc/html/man/form_userptr.3x.html b/doc/html/man/form_userptr.3x.html
index 37186136..c60e7146 100644
--- a/doc/html/man/form_userptr.3x.html
+++ b/doc/html/man/form_userptr.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_userptr.3x,v 1.17 2020/03/28 19:06:28 tom Exp @
+  * @Id: form_userptr.3x,v 1.18 2020/10/17 23:08:37 tom Exp @
 -->
 
 
@@ -54,6 +54,7 @@

SYNOPSIS

        #include <form.h>
+
        int set_form_userptr(FORM *form, void *userptr);
        void* form_userptr(const FORM *form);
 
diff --git a/doc/html/man/form_win.3x.html b/doc/html/man/form_win.3x.html
index 5295fca2..0adea8e7 100644
--- a/doc/html/man/form_win.3x.html
+++ b/doc/html/man/form_win.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_win.3x,v 1.16 2020/02/02 23:34:34 tom Exp @
+  * @Id: form_win.3x,v 1.18 2020/10/18 00:00:32 tom Exp @
 -->
 
 
@@ -53,11 +53,14 @@

SYNOPSIS

        #include <form.h>
-       int set_form_win(FORM *form, WINDOW *win);
-       WINDOW *form_win(const FORM *form);
-       int set_form_sub(FORM *form, WINDOW *sub);
-       WINDOW *form_sub(const FORM *form);
-       int scale_form(const FORM *form, int *rows, int *columns);
+
+       int set_form_win(FORM *form, WINDOW *win);
+       WINDOW *form_win(const FORM *form);
+
+       int set_form_sub(FORM *form, WINDOW *sub);
+       WINDOW *form_sub(const FORM *form);
+
+       int scale_form(const FORM *form, int *rows, int *columns);

DESCRIPTION

diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index eece92be..128447b8 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -512,7 +512,7 @@
 
        https://invisible-island.net/ncurses/tctest.html
 
-       This describes ncurses version 6.2 (patch 20201003).
+       This describes ncurses version 6.2 (patch 20201017).

AUTHOR

diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 85d358a5..d5e8454d 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -91,7 +91,7 @@

SEE ALSO

        curses(3x), tic(1m), infocmp(1m), terminfo(5)
 
-       This describes ncurses version 6.2 (patch 20201003).
+       This describes ncurses version 6.2 (patch 20201017).

AUTHOR

diff --git a/doc/html/man/key_defined.3x.html b/doc/html/man/key_defined.3x.html
index 073b7817..87278cac 100644
--- a/doc/html/man/key_defined.3x.html
+++ b/doc/html/man/key_defined.3x.html
@@ -28,7 +28,7 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 2003
-  * @Id: key_defined.3x,v 1.9 2020/02/02 23:34:34 tom Exp @
+  * @Id: key_defined.3x,v 1.10 2020/10/17 23:39:03 tom Exp @
 -->
 
 
@@ -54,7 +54,7 @@

SYNOPSIS

        #include <curses.h>
 
-       int key_defined(const char *definition);
+       int key_defined(const char *definition);

DESCRIPTION

diff --git a/doc/html/man/keybound.3x.html b/doc/html/man/keybound.3x.html
index 605fd432..942e3a7b 100644
--- a/doc/html/man/keybound.3x.html
+++ b/doc/html/man/keybound.3x.html
@@ -28,7 +28,7 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1999
-  * @Id: keybound.3x,v 1.10 2020/02/02 23:34:34 tom Exp @
+  * @Id: keybound.3x,v 1.11 2020/10/17 23:39:30 tom Exp @
 -->
 
 
@@ -54,7 +54,7 @@

SYNOPSIS

        #include <curses.h>
 
-       char * keybound(int keycode, int count);
+       char * keybound(int keycode, int count);

DESCRIPTION

diff --git a/doc/html/man/keyok.3x.html b/doc/html/man/keyok.3x.html
index 40281f94..3d255b47 100644
--- a/doc/html/man/keyok.3x.html
+++ b/doc/html/man/keyok.3x.html
@@ -28,7 +28,7 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997
-  * @Id: keyok.3x,v 1.14 2020/02/02 23:34:34 tom Exp @
+  * @Id: keyok.3x,v 1.15 2020/10/17 23:39:59 tom Exp @
 -->
 
 
@@ -54,7 +54,7 @@

SYNOPSIS

        #include <curses.h>
 
-       int keyok(int keycode, bool enable);
+       int keyok(int keycode, bool enable);

DESCRIPTION

diff --git a/doc/html/man/legacy_coding.3x.html b/doc/html/man/legacy_coding.3x.html
index c5745fde..d3469715 100644
--- a/doc/html/man/legacy_coding.3x.html
+++ b/doc/html/man/legacy_coding.3x.html
@@ -28,7 +28,7 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey
-  * @Id: legacy_coding.3x,v 1.7 2020/02/02 23:34:34 tom Exp @
+  * @Id: legacy_coding.3x,v 1.8 2020/10/17 23:40:23 tom Exp @
 -->
 
 
@@ -54,7 +54,7 @@

SYNOPSIS

        #include <curses.h>
 
-       int use_legacy_coding(int level);
+       int use_legacy_coding(int level);

DESCRIPTION

diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index 6306fdf2..c7eb5933 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -222,7 +222,7 @@
        curses(3x)  and  related  pages  whose names begin "menu_" for detailed
        descriptions of the entry points.
 
-       This describes ncurses version 6.2 (patch 20201003).
+       This describes ncurses version 6.2 (patch 20201017).
 
 
 
diff --git a/doc/html/man/menu_attributes.3x.html b/doc/html/man/menu_attributes.3x.html
index 0d1f8761..42589c50 100644
--- a/doc/html/man/menu_attributes.3x.html
+++ b/doc/html/man/menu_attributes.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_attributes.3x,v 1.17 2020/02/02 23:34:34 tom Exp @
+  * @Id: menu_attributes.3x,v 1.19 2020/10/17 23:58:58 tom Exp @
 -->
 
 
@@ -55,14 +55,18 @@

SYNOPSIS

        #include <menu.h>
-       int set_menu_fore(MENU *menu, chtype attr);
-       chtype menu_fore(const MENU *menu);
-       int set_menu_back(MENU *menu, chtype attr);
-       chtype menu_back(const MENU *menu);
-       int set_menu_grey(MENU *menu, chtype attr);
-       chtype menu_grey(const MENU *menu);
-       int set_menu_pad(MENU *menu, int pad);
-       int menu_pad(const MENU *menu);
+
+       int set_menu_fore(MENU *menu, chtype attr);
+       chtype menu_fore(const MENU *menu);
+
+       int set_menu_back(MENU *menu, chtype attr);
+       chtype menu_back(const MENU *menu);
+
+       int set_menu_grey(MENU *menu, chtype attr);
+       chtype menu_grey(const MENU *menu);
+
+       int set_menu_pad(MENU *menu, int pad);
+       int menu_pad(const MENU *menu);

DESCRIPTION

diff --git a/doc/html/man/menu_cursor.3x.html b/doc/html/man/menu_cursor.3x.html
index 86aff55f..d181aed8 100644
--- a/doc/html/man/menu_cursor.3x.html
+++ b/doc/html/man/menu_cursor.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_cursor.3x,v 1.12 2020/02/02 23:34:34 tom Exp @
+  * @Id: menu_cursor.3x,v 1.13 2020/10/17 23:41:31 tom Exp @
 -->
 
 
@@ -53,7 +53,8 @@

SYNOPSIS

        #include <menu.h>
-       int pos_menu_cursor(const MENU *menu);
+
+       int pos_menu_cursor(const MENU *menu);

DESCRIPTION

diff --git a/doc/html/man/menu_driver.3x.html b/doc/html/man/menu_driver.3x.html
index bf5da3e8..84813650 100644
--- a/doc/html/man/menu_driver.3x.html
+++ b/doc/html/man/menu_driver.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_driver.3x,v 1.26 2020/02/02 23:34:34 tom Exp @
+  * @Id: menu_driver.3x,v 1.27 2020/10/17 23:42:13 tom Exp @
 -->
 
 
@@ -52,7 +52,8 @@

SYNOPSIS

        #include <menu.h>
-       int menu_driver(MENU *menu, int c);
+
+       int menu_driver(MENU *menu, int c);

DESCRIPTION

diff --git a/doc/html/man/menu_format.3x.html b/doc/html/man/menu_format.3x.html
index 44e2125d..184d0860 100644
--- a/doc/html/man/menu_format.3x.html
+++ b/doc/html/man/menu_format.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_format.3x,v 1.17 2020/02/02 23:34:34 tom Exp @
+  * @Id: menu_format.3x,v 1.18 2020/10/17 23:43:11 tom Exp @
 -->
 
 
@@ -53,8 +53,9 @@

SYNOPSIS

        #include <menu.h>
-       int set_menu_format(MENU *menu, int rows, int cols);
-       void menu_format(const MENU *menu, int *rows, int *cols);
+
+       int set_menu_format(MENU *menu, int rows, int cols);
+       void menu_format(const MENU *menu, int *rows, int *cols);

DESCRIPTION

diff --git a/doc/html/man/menu_hook.3x.html b/doc/html/man/menu_hook.3x.html
index 17b298f6..a894320b 100644
--- a/doc/html/man/menu_hook.3x.html
+++ b/doc/html/man/menu_hook.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_hook.3x,v 1.14 2020/02/02 23:34:34 tom Exp @
+  * @Id: menu_hook.3x,v 1.15 2020/10/17 23:44:57 tom Exp @
 -->
 
 
@@ -53,14 +53,18 @@

SYNOPSIS

        #include <menu.h>
-       int set_item_init(MENU *menu, Menu_Hook func);
-       Menu_Hook item_init(const MENU *menu);
-       int set_item_term(MENU *menu, Menu_Hook func);
-       Menu_Hook item_term(const MENU *menu);
-       int set_menu_init(MENU *menu, Menu_Hook func);
-       Menu_Hook menu_init(const MENU *menu);
-       int set_menu_term(MENU *menu, Menu_Hook func);
-       Menu_Hook menu_term(const MENU *menu);
+
+       int set_item_init(MENU *menu, Menu_Hook func);
+       Menu_Hook item_init(const MENU *menu);
+
+       int set_item_term(MENU *menu, Menu_Hook func);
+       Menu_Hook item_term(const MENU *menu);
+
+       int set_menu_init(MENU *menu, Menu_Hook func);
+       Menu_Hook menu_init(const MENU *menu);
+
+       int set_menu_term(MENU *menu, Menu_Hook func);
+       Menu_Hook menu_term(const MENU *menu);

DESCRIPTION

diff --git a/doc/html/man/menu_items.3x.html b/doc/html/man/menu_items.3x.html
index dda9991d..34b75ae5 100644
--- a/doc/html/man/menu_items.3x.html
+++ b/doc/html/man/menu_items.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_items.3x,v 1.15 2020/03/28 19:06:28 tom Exp @
+  * @Id: menu_items.3x,v 1.16 2020/10/17 23:08:48 tom Exp @
 -->
 
 
@@ -54,6 +54,7 @@

SYNOPSIS

        #include <menu.h>
+
        int set_menu_items(MENU *menu, ITEM **items);
        ITEM **menu_items(const MENU *menu);
        int item_count(const MENU *menu);
diff --git a/doc/html/man/menu_mark.3x.html b/doc/html/man/menu_mark.3x.html
index 22c80480..742ca608 100644
--- a/doc/html/man/menu_mark.3x.html
+++ b/doc/html/man/menu_mark.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_mark.3x,v 1.16 2020/03/28 19:06:28 tom Exp @
+  * @Id: menu_mark.3x,v 1.17 2020/10/17 23:09:02 tom Exp @
 -->
 
 
@@ -53,6 +53,7 @@

SYNOPSIS

        #include <menu.h>
+
        int set_menu_mark(MENU *menu, const char *mark);
        const char *menu_mark(const MENU *menu);
 
diff --git a/doc/html/man/menu_new.3x.html b/doc/html/man/menu_new.3x.html
index e436240f..3a6d9934 100644
--- a/doc/html/man/menu_new.3x.html
+++ b/doc/html/man/menu_new.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_new.3x,v 1.16 2020/03/28 19:06:28 tom Exp @
+  * @Id: menu_new.3x,v 1.17 2020/10/17 23:09:13 tom Exp @
 -->
 
 
@@ -53,6 +53,7 @@

SYNOPSIS

        #include <menu.h>
+
        MENU *new_menu(ITEM **items);
        int free_menu(MENU *menu);
 
diff --git a/doc/html/man/menu_opts.3x.html b/doc/html/man/menu_opts.3x.html
index 5b9ee06a..4dd172a6 100644
--- a/doc/html/man/menu_opts.3x.html
+++ b/doc/html/man/menu_opts.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_opts.3x,v 1.17 2020/02/02 23:34:34 tom Exp @
+  * @Id: menu_opts.3x,v 1.18 2020/10/17 23:46:35 tom Exp @
 -->
 
 
@@ -54,10 +54,12 @@

SYNOPSIS

        #include <menu.h>
-       int set_menu_opts(MENU *menu, Menu_Options opts);
-       int menu_opts_on(MENU *menu, Menu_Options opts);
-       int menu_opts_off(MENU *menu, Menu_Options opts);
-       Menu_Options menu_opts(const MENU *menu);
+
+       int set_menu_opts(MENU *menu, Menu_Options opts);
+       Menu_Options menu_opts(const MENU *menu);
+
+       int menu_opts_on(MENU *menu, Menu_Options opts);
+       int menu_opts_off(MENU *menu, Menu_Options opts);

DESCRIPTION

diff --git a/doc/html/man/menu_pattern.3x.html b/doc/html/man/menu_pattern.3x.html
index 01212b4b..fd67efa9 100644
--- a/doc/html/man/menu_pattern.3x.html
+++ b/doc/html/man/menu_pattern.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_pattern.3x,v 1.19 2020/03/28 19:06:28 tom Exp @
+  * @Id: menu_pattern.3x,v 1.21 2020/10/18 00:41:14 tom Exp @
 -->
 
 
@@ -52,8 +52,9 @@

SYNOPSIS

        #include <menu.h>
-       int set_menu_pattern(MENU *menu, const char *pattern);
-       char *menu_pattern(const MENU *menu);
+
+       int set_menu_pattern(MENU *menu, const char *pattern);
+       char *menu_pattern(const MENU *menu);

DESCRIPTION

diff --git a/doc/html/man/menu_post.3x.html b/doc/html/man/menu_post.3x.html
index a2fc2bc5..4321967b 100644
--- a/doc/html/man/menu_post.3x.html
+++ b/doc/html/man/menu_post.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_post.3x,v 1.18 2020/02/02 23:34:34 tom Exp @
+  * @Id: menu_post.3x,v 1.19 2020/10/17 23:47:21 tom Exp @
 -->
 
 
@@ -54,8 +54,9 @@

SYNOPSIS

        #include <menu.h>
-       int post_menu(MENU *menu);
-       int unpost_menu(MENU *menu);
+
+       int post_menu(MENU *menu);
+       int unpost_menu(MENU *menu);

DESCRIPTION

diff --git a/doc/html/man/menu_requestname.3x.html b/doc/html/man/menu_requestname.3x.html
index e0d2c5ad..f6e35be9 100644
--- a/doc/html/man/menu_requestname.3x.html
+++ b/doc/html/man/menu_requestname.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_requestname.3x,v 1.13 2020/03/28 19:06:28 tom Exp @
+  * @Id: menu_requestname.3x,v 1.15 2020/10/18 00:40:34 tom Exp @
 -->
 
 
@@ -54,8 +54,9 @@

SYNOPSIS

        #include <menu.h>
-       const char *menu_request_name(int request);
-       int menu_request_by_name(const char *name);
+
+       const char *menu_request_name(int request);
+       int menu_request_by_name(const char *name);

DESCRIPTION

diff --git a/doc/html/man/menu_spacing.3x.html b/doc/html/man/menu_spacing.3x.html
index f7a812ea..df9c562b 100644
--- a/doc/html/man/menu_spacing.3x.html
+++ b/doc/html/man/menu_spacing.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_spacing.3x,v 1.16 2020/02/02 23:34:34 tom Exp @
+  * @Id: menu_spacing.3x,v 1.17 2020/10/17 23:48:53 tom Exp @
 -->
 
 
@@ -54,14 +54,15 @@

SYNOPSIS

        #include <menu.h>
-       int set_menu_spacing(MENU *menu,
-                            int spc_description,
-                            int spc_rows,
-                            int spc_columns);
-       int menu_spacing(const MENU *menu,
-                        int* spc_description,
-                        int* spc_rows,
-                        int* spc_columns);
+
+       int set_menu_spacing(MENU *menu,
+                            int spc_description,
+                            int spc_rows,
+                            int spc_columns);
+       int menu_spacing(const MENU *menu,
+                        int* spc_description,
+                        int* spc_rows,
+                        int* spc_columns);

DESCRIPTION

diff --git a/doc/html/man/menu_userptr.3x.html b/doc/html/man/menu_userptr.3x.html
index aac3a056..1de814c5 100644
--- a/doc/html/man/menu_userptr.3x.html
+++ b/doc/html/man/menu_userptr.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_userptr.3x,v 1.14 2020/03/28 19:06:28 tom Exp @
+  * @Id: menu_userptr.3x,v 1.16 2020/10/18 00:39:49 tom Exp @
 -->
 
 
@@ -54,8 +54,9 @@

SYNOPSIS

        #include <menu.h>
-       int set_menu_userptr(MENU *menu, void *userptr);
-       void *menu_userptr(const MENU *menu);
+
+       int set_menu_userptr(MENU *menu, void *userptr);
+       void *menu_userptr(const MENU *menu);

DESCRIPTION

diff --git a/doc/html/man/menu_win.3x.html b/doc/html/man/menu_win.3x.html
index 020064a1..b76b41d5 100644
--- a/doc/html/man/menu_win.3x.html
+++ b/doc/html/man/menu_win.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_win.3x,v 1.14 2020/02/02 23:34:34 tom Exp @
+  * @Id: menu_win.3x,v 1.15 2020/10/17 23:50:51 tom Exp @
 -->
 
 
@@ -53,11 +53,14 @@

SYNOPSIS

        #include <menu.h>
-       int set_menu_win(MENU *menu, WINDOW *win);
-       WINDOW *menu_win(const MENU *menu);
-       int set_menu_sub(MENU *menu, WINDOW *sub);
-       WINDOW *menu_sub(const MENU *menu);
-       int scale_menu(const MENU *menu, int *rows, int *columns);
+
+       int set_menu_win(MENU *menu, WINDOW *win);
+       WINDOW *menu_win(const MENU *menu);
+
+       int set_menu_sub(MENU *menu, WINDOW *sub);
+       WINDOW *menu_sub(const MENU *menu);
+
+       int scale_menu(const MENU *menu, int *rows, int *columns);

DESCRIPTION

diff --git a/doc/html/man/mitem_current.3x.html b/doc/html/man/mitem_current.3x.html
index a6663c01..1fc955f2 100644
--- a/doc/html/man/mitem_current.3x.html
+++ b/doc/html/man/mitem_current.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_current.3x,v 1.18 2020/03/28 19:06:28 tom Exp @
+  * @Id: mitem_current.3x,v 1.20 2020/10/18 00:39:06 tom Exp @
 -->
 
 
@@ -53,11 +53,14 @@

SYNOPSIS

        #include <menu.h>
-       int set_current_item(MENU *menu, ITEM *item);
-       ITEM *current_item(const MENU *menu);
-       int set_top_row(MENU *menu, int row);
-       int top_row(const MENU *menu);
-       int item_index(const ITEM *item);
+
+       int set_current_item(MENU *menu, ITEM *item);
+       ITEM *current_item(const MENU *menu);
+
+       int set_top_row(MENU *menu, int row);
+       int top_row(const MENU *menu);
+
+       int item_index(const ITEM *item);

DESCRIPTION

diff --git a/doc/html/man/mitem_name.3x.html b/doc/html/man/mitem_name.3x.html
index aee591bd..a745b078 100644
--- a/doc/html/man/mitem_name.3x.html
+++ b/doc/html/man/mitem_name.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_name.3x,v 1.12 2020/03/28 19:06:28 tom Exp @
+  * @Id: mitem_name.3x,v 1.14 2020/10/18 00:37:48 tom Exp @
 -->
 
 
@@ -53,8 +53,9 @@

SYNOPSIS

        #include <menu.h>
-       const char *item_name(const ITEM *item);
-       const char *item_description(const ITEM *item);
+
+       const char *item_name(const ITEM *item);
+       const char *item_description(const ITEM *item);

DESCRIPTION

diff --git a/doc/html/man/mitem_new.3x.html b/doc/html/man/mitem_new.3x.html
index 6fb45e58..be9151ba 100644
--- a/doc/html/man/mitem_new.3x.html
+++ b/doc/html/man/mitem_new.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_new.3x,v 1.17 2020/03/28 19:06:28 tom Exp @
+  * @Id: mitem_new.3x,v 1.19 2020/10/18 00:37:03 tom Exp @
 -->
 
 
@@ -53,8 +53,9 @@

SYNOPSIS

        #include <menu.h>
-       ITEM *new_item(const char *name, const char *description);
-       int free_item(ITEM *item);
+
+       ITEM *new_item(const char *name, const char *description);
+       int free_item(ITEM *item);

DESCRIPTION

diff --git a/doc/html/man/mitem_opts.3x.html b/doc/html/man/mitem_opts.3x.html
index 3665188f..bb19f69f 100644
--- a/doc/html/man/mitem_opts.3x.html
+++ b/doc/html/man/mitem_opts.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_opts.3x,v 1.15 2020/02/02 23:34:34 tom Exp @
+  * @Id: mitem_opts.3x,v 1.16 2020/10/17 23:52:26 tom Exp @
 -->
 
 
@@ -54,10 +54,12 @@

SYNOPSIS

        #include <menu.h>
-       int set_item_opts(ITEM *item, Item_Options opts);
-       int item_opts_on(ITEM *item, Item_Options opts);
-       int item_opts_off(ITEM *item, Item_Options opts);
-       Item_Options item_opts(const ITEM *item);
+
+       int set_item_opts(ITEM *item, Item_Options opts);
+       Item_Options item_opts(const ITEM *item);
+
+       int item_opts_on(ITEM *item, Item_Options opts);
+       int item_opts_off(ITEM *item, Item_Options opts);

DESCRIPTION

diff --git a/doc/html/man/mitem_userptr.3x.html b/doc/html/man/mitem_userptr.3x.html
index d2c6090e..e3cd0a5a 100644
--- a/doc/html/man/mitem_userptr.3x.html
+++ b/doc/html/man/mitem_userptr.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_userptr.3x,v 1.15 2020/03/28 19:06:28 tom Exp @
+  * @Id: mitem_userptr.3x,v 1.17 2020/10/18 00:36:16 tom Exp @
 -->
 
 
@@ -54,8 +54,9 @@

SYNOPSIS

        #include <menu.h>
-       int set_item_userptr(ITEM *item, void *userptr);
-       void *item_userptr(const ITEM *item);
+
+       int set_item_userptr(ITEM *item, void *userptr);
+       void *item_userptr(const ITEM *item);

DESCRIPTION

diff --git a/doc/html/man/mitem_value.3x.html b/doc/html/man/mitem_value.3x.html
index 2b55d6e8..e58f8742 100644
--- a/doc/html/man/mitem_value.3x.html
+++ b/doc/html/man/mitem_value.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_value.3x,v 1.14 2020/02/02 23:34:34 tom Exp @
+  * @Id: mitem_value.3x,v 1.15 2020/10/17 23:53:24 tom Exp @
 -->
 
 
@@ -52,8 +52,9 @@

SYNOPSIS

        #include <menu.h>
-       int set_item_value(ITEM *item, bool value);
-       bool item_value(const ITEM *item);
+
+       int set_item_value(ITEM *item, bool value);
+       bool item_value(const ITEM *item);

DESCRIPTION

diff --git a/doc/html/man/mitem_visible.3x.html b/doc/html/man/mitem_visible.3x.html
index 98e0a755..e5e2b451 100644
--- a/doc/html/man/mitem_visible.3x.html
+++ b/doc/html/man/mitem_visible.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_visible.3x,v 1.9 2020/02/02 23:34:34 tom Exp @
+  * @Id: mitem_visible.3x,v 1.10 2020/10/17 23:53:55 tom Exp @
 -->
 
 
@@ -53,7 +53,8 @@

SYNOPSIS

        #include <menu.h>
-       bool item_visible(const ITEM *item);
+
+       bool item_visible(const ITEM *item);

DESCRIPTION

diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 1fc62427..3ee341c3 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -60,7 +60,7 @@
        method of updating  character  screens  with  reasonable  optimization.
        This  implementation  is  "new  curses"  (ncurses)  and is the approved
        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
-       This describes ncurses version 6.2 (patch 20201003).
+       This describes ncurses version 6.2 (patch 20201017).
 
        The  ncurses  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
index 5b5a90bb..a68eec6b 100644
--- a/doc/html/man/ncurses6-config.1.html
+++ b/doc/html/man/ncurses6-config.1.html
@@ -113,7 +113,7 @@

SEE ALSO

        curses(3x)
 
-       This describes ncurses version 6.2 (patch 20201003).
+       This describes ncurses version 6.2 (patch 20201017).
 
 
 
diff --git a/doc/html/man/new_pair.3x.html b/doc/html/man/new_pair.3x.html
index dec3de15..515f982d 100644
--- a/doc/html/man/new_pair.3x.html
+++ b/doc/html/man/new_pair.3x.html
@@ -28,7 +28,7 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey
-  * @Id: new_pair.3x,v 1.14 2020/02/02 23:34:34 tom Exp @
+  * @Id: new_pair.3x,v 1.15 2020/10/17 23:54:50 tom Exp @
 -->
 
 
@@ -54,9 +54,9 @@

SYNOPSIS

        #include <curses.h>
 
-       int alloc_pair(int fg, int bg);
-       int find_pair(int fg, int bg);
-       int free_pair(int pair);
+       int alloc_pair(int fg, int bg);
+       int find_pair(int fg, int bg);
+       int free_pair(int pair);

DESCRIPTION

diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index 550ab4d2..5ebbd778 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -281,7 +281,7 @@

SEE ALSO

        curses(3x), curs_variables(3x),
 
-       This describes ncurses version 6.2 (patch 20201003).
+       This describes ncurses version 6.2 (patch 20201017).

AUTHOR

diff --git a/doc/html/man/resizeterm.3x.html b/doc/html/man/resizeterm.3x.html
index b19559d9..244bfd70 100644
--- a/doc/html/man/resizeterm.3x.html
+++ b/doc/html/man/resizeterm.3x.html
@@ -28,7 +28,7 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1996-on
-  * @Id: resizeterm.3x,v 1.27 2020/02/02 23:34:34 tom Exp @
+  * @Id: resizeterm.3x,v 1.28 2020/10/17 23:55:41 tom Exp @
 -->
 
 
@@ -55,9 +55,9 @@

SYNOPSIS

        #include <curses.h>
 
-       bool is_term_resized(int lines, int columns);
-       int resize_term(int lines, int columns);
-       int resizeterm(int lines, int columns);
+       bool is_term_resized(int lines, int columns);
+       int resize_term(int lines, int columns);
+       int resizeterm(int lines, int columns);

DESCRIPTION

diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 8b24360f..72122785 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -206,7 +206,7 @@

SEE ALSO

        tset(1), infocmp(1m), curses(3x), terminfo(5).
 
-       This describes ncurses version 6.2 (patch 20201003).
+       This describes ncurses version 6.2 (patch 20201017).
 
 
 
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index da1018ec..d124aa25 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -105,7 +105,7 @@
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes ncurses version 6.2 (patch 20201003).
+       This manual describes ncurses version 6.2 (patch 20201017).

Terminfo Entry Syntax

@@ -264,7 +264,11 @@
        (P)    indicates that padding may be specified
 
        #[1-9] in the description field indicates that  the  string  is  passed
-              through tparm with parms as given (#i).
+              through tparm(3x) with parameters as given (#i).
+
+              If  no  parameters  are  listed  in the description, passing the
+              string through tparm(3x) may give unexpected results,  e.g.,  if
+              it contains percent (%%) signs.
 
        (P*)   indicates  that  padding may vary in proportion to the number of
               lines affected
@@ -281,11 +285,9 @@
                                                        umn 0 to last column
           auto_right_margin           am        am     terminal has auto-
                                                        matic margins
+
           back_color_erase            bce       ut     screen erased with
                                                        background color
-
-
-
           can_change                  ccc       cc     terminal can re-
                                                        define existing col-
                                                        ors
@@ -349,9 +351,9 @@
                                                        strike
           prtr_silent                 mc5i      5i     printer will not
                                                        echo on screen
+
           row_addr_glitch             xvpa      YD     only positive motion
                                                        for vpa/mvpa caps
-
           semi_auto_right_margin      sam       YE     printing in last
                                                        column causes cr
           status_line_esc_ok          eslok     es     escape can be used
@@ -416,8 +418,6 @@
           bit_image_type              bitype    Yp     type of bit-image
                                                        device
 
-
-
           buffer_capacity             bufsz     Ya     numbers of bytes
                                                        buffered before
                                                        printing
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 83400358..d70e3088 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -461,7 +461,7 @@
        infocmp(1m),   captoinfo(1m),   infotocap(1m),   toe(1m),   curses(3x),
        term(5).  terminfo(5).  user_caps(5).
 
-       This describes ncurses version 6.2 (patch 20201003).
+       This describes ncurses version 6.2 (patch 20201017).

AUTHOR

diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 397ed527..5a10f2ae 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -171,7 +171,7 @@
        tic(1m), infocmp(1m), captoinfo(1m),  infotocap(1m),  curses(3x),  ter-
        minfo(5).
 
-       This describes ncurses version 6.2 (patch 20201003).
+       This describes ncurses version 6.2 (patch 20201017).
 
 
 
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 94486cdd..8595dd62 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -523,7 +523,7 @@

SEE ALSO

        clear(1), stty(1), tabs(1), tset(1), terminfo(5), curs_termcap(3x).
 
-       This describes ncurses version 6.2 (patch 20201003).
+       This describes ncurses version 6.2 (patch 20201017).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index be73ea67..d7987fc4 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -390,7 +390,7 @@
        csh(1),  sh(1),  stty(1),   curs_terminfo(3x),   tty(4),   terminfo(5),
        ttys(5), environ(7)
 
-       This describes ncurses version 6.2 (patch 20201003).
+       This describes ncurses version 6.2 (patch 20201017).
 
 
 
diff --git a/doc/html/man/wresize.3x.html b/doc/html/man/wresize.3x.html
index 01b9d77b..8ddc39bb 100644
--- a/doc/html/man/wresize.3x.html
+++ b/doc/html/man/wresize.3x.html
@@ -28,7 +28,7 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1996
-  * @Id: wresize.3x,v 1.16 2020/02/02 23:34:34 tom Exp @
+  * @Id: wresize.3x,v 1.17 2020/10/17 23:56:38 tom Exp @
 -->
 
 
@@ -54,7 +54,7 @@

SYNOPSIS

        #include <curses.h>
 
-       int wresize(WINDOW *win, int lines, int columns);
+       int wresize(WINDOW *win, int lines, int columns);

DESCRIPTION

diff --git a/include/Caps b/include/Caps
index af0ec451..4528cffb 100644
--- a/include/Caps
+++ b/include/Caps
@@ -30,7 +30,7 @@
 # Author: Zeyd M. Ben-Halim  1992,1995
 #    and: Eric S. Raymond 
 #
-# $Id: Caps,v 1.45 2020/02/02 23:34:34 tom Exp $
+# $Id: Caps,v 1.46 2020/10/17 21:30:19 tom Exp $
 #
 # This is the master termcap/terminfo capability table.
 #
@@ -189,8 +189,12 @@
 #%indicates that padding may be specified
 #%.TP
 #%#[1-9]
-#%in the description field indicates that the string is passed through tparm with
-#%parms as given (#\fIi\fP).
+#%in the description field indicates that the string is passed
+#%through \fBtparm\fP(3X) with parameters as given (#\fIi\fP).
+#%.IP
+#%If no parameters are listed in the description,
+#%passing the string through \fBtparm\fP(3X) may give unexpected results,
+#%e.g., if it contains percent (%%) signs.
 #%.TP
 #%(P*)
 #%indicates that padding may vary in proportion to the number of
diff --git a/include/Caps.aix4 b/include/Caps.aix4
index 100489c5..a27f2699 100644
--- a/include/Caps.aix4
+++ b/include/Caps.aix4
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.aix4,v 1.17 2020/02/02 23:34:34 tom Exp $
+# $Id: Caps.aix4,v 1.18 2020/10/17 21:30:19 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with AIX 4.x's terminfo.
@@ -189,8 +189,12 @@
 #%indicates that padding may be specified
 #%.TP
 #%#[1-9]
-#%in the description field indicates that the string is passed through tparm with
-#%parms as given (#\fIi\fP).
+#%in the description field indicates that the string is passed
+#%through \fBtparm\fP(3X) with parameters as given (#\fIi\fP).
+#%.IP
+#%If no parameters are listed in the description,
+#%passing the string through \fBtparm\fP(3X) may give unexpected results,
+#%e.g., if it contains percent (%%) signs.
 #%.TP
 #%(P*)
 #%indicates that padding may vary in proportion to the number of
diff --git a/include/Caps.hpux11 b/include/Caps.hpux11
index e028224c..712a7429 100644
--- a/include/Caps.hpux11
+++ b/include/Caps.hpux11
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.hpux11,v 1.15 2020/02/02 23:34:34 tom Exp $
+# $Id: Caps.hpux11,v 1.16 2020/10/17 21:30:19 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with HPUX 11.x's terminfo.
@@ -189,8 +189,12 @@
 #%indicates that padding may be specified
 #%.TP
 #%#[1-9]
-#%in the description field indicates that the string is passed through tparm with
-#%parms as given (#\fIi\fP).
+#%in the description field indicates that the string is passed
+#%through \fBtparm\fP(3X) with parameters as given (#\fIi\fP).
+#%.IP
+#%If no parameters are listed in the description,
+#%passing the string through \fBtparm\fP(3X) may give unexpected results,
+#%e.g., if it contains percent (%%) signs.
 #%.TP
 #%(P*)
 #%indicates that padding may vary in proportion to the number of
diff --git a/include/Caps.keys b/include/Caps.keys
index 6b03964f..018f6847 100644
--- a/include/Caps.keys
+++ b/include/Caps.keys
@@ -30,7 +30,7 @@
 # Author: Thomas Dickey
 #    and: Ilya Zakharevich
 #
-# $Id: Caps.keys,v 1.14 2020/02/02 23:34:34 tom Exp $
+# $Id: Caps.keys,v 1.15 2020/10/17 21:30:19 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is illustrates an experimental extension to describe alt-, shift- and
@@ -191,8 +191,12 @@
 #%indicates that padding may be specified
 #%.TP
 #%#[1-9]
-#%in the description field indicates that the string is passed through tparm with
-#%parms as given (#\fIi\fP).
+#%in the description field indicates that the string is passed
+#%through \fBtparm\fP(3X) with parameters as given (#\fIi\fP).
+#%.IP
+#%If no parameters are listed in the description,
+#%passing the string through \fBtparm\fP(3X) may give unexpected results,
+#%e.g., if it contains percent (%%) signs.
 #%.TP
 #%(P*)
 #%indicates that padding may vary in proportion to the number of
diff --git a/include/Caps.osf1r5 b/include/Caps.osf1r5
index 94991837..8a295548 100644
--- a/include/Caps.osf1r5
+++ b/include/Caps.osf1r5
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.osf1r5,v 1.13 2020/02/02 23:34:34 tom Exp $
+# $Id: Caps.osf1r5,v 1.14 2020/10/17 21:30:19 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with OSF/1 version 5 (Tru64) terminfo.
@@ -189,8 +189,12 @@
 #%indicates that padding may be specified
 #%.TP
 #%#[1-9]
-#%in the description field indicates that the string is passed through tparm with
-#%parms as given (#\fIi\fP).
+#%in the description field indicates that the string is passed
+#%through \fBtparm\fP(3X) with parameters as given (#\fIi\fP).
+#%.IP
+#%If no parameters are listed in the description,
+#%passing the string through \fBtparm\fP(3X) may give unexpected results,
+#%e.g., if it contains percent (%%) signs.
 #%.TP
 #%(P*)
 #%indicates that padding may vary in proportion to the number of
diff --git a/include/Caps.uwin b/include/Caps.uwin
index 7628bd47..de0d5b77 100644
--- a/include/Caps.uwin
+++ b/include/Caps.uwin
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.uwin,v 1.12 2020/02/02 23:34:34 tom Exp $
+# $Id: Caps.uwin,v 1.13 2020/10/17 21:30:19 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with U/Win's terminfo.
@@ -189,8 +189,12 @@
 #%indicates that padding may be specified
 #%.TP
 #%#[1-9]
-#%in the description field indicates that the string is passed through tparm with
-#%parms as given (#\fIi\fP).
+#%in the description field indicates that the string is passed
+#%through \fBtparm\fP(3X) with parameters as given (#\fIi\fP).
+#%.IP
+#%If no parameters are listed in the description,
+#%passing the string through \fBtparm\fP(3X) may give unexpected results,
+#%e.g., if it contains percent (%%) signs.
 #%.TP
 #%(P*)
 #%indicates that padding may vary in proportion to the number of
diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index 5447057e..44602083 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wch.3x,v 1.27 2020/03/22 00:25:15 tom Exp $
+.\" $Id: curs_add_wch.3x,v 1.28 2020/10/17 23:10:38 tom Exp $
 .TH curs_add_wch 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -55,7 +55,7 @@
 .B "int mvadd_wch( int \fIy\fP, int \fIx\fP, const cchar_t *\fIwch\fB );"
 .br
 .B "int mvwadd_wch( WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t *\fIwch\fB );"
-.br
+.sp
 .B "int echo_wchar( const cchar_t *\fIwch\fB );"
 .br
 .B "int wecho_wchar( WINDOW *\fIwin\fP, const cchar_t *\fIwch\fB );"
diff --git a/man/curs_add_wchstr.3x b/man/curs_add_wchstr.3x
index 5ce6d04c..494ce51e 100644
--- a/man/curs_add_wchstr.3x
+++ b/man/curs_add_wchstr.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wchstr.3x,v 1.13 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_add_wchstr.3x,v 1.14 2020/10/17 23:11:38 tom Exp $
 .TH curs_add_wchstr 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -61,7 +61,7 @@
 \fBint wadd_wchstr(WINDOW *\fR \fIwin\fR\fB, const cchar_t *\fR\fIwchstr\fR\fB);\fR
 .br
 \fBint wadd_wchnstr(WINDOW *\fR \fIwin\fR\fB, const cchar_t *\fR\fIwchstr\fR\fB, int \fR\fIn\fR\fB);\fR
-.br
+.sp
 \fBint mvadd_wchstr(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, const cchar_t *\fR\fIwchstr\fR\fB);\fR
 .br
 \fBint mvadd_wchnstr(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, const cchar_t *\fR\fIwchstr\fR\fB, int \fR\fIn\fR\fB);\fR
diff --git a/man/curs_addch.3x b/man/curs_addch.3x
index ccf8da21..68667d9f 100644
--- a/man/curs_addch.3x
+++ b/man/curs_addch.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addch.3x,v 1.52 2020/03/21 23:47:23 tom Exp $
+.\" $Id: curs_addch.3x,v 1.54 2020/10/17 23:02:40 tom Exp $
 .TH curs_addch 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -55,7 +55,7 @@
 \fBint mvaddch(int y, int x, const chtype ch);\fR
 .br
 \fBint mvwaddch(WINDOW *win, int y, int x, const chtype ch);\fR
-.br
+.sp
 \fBint echochar(const chtype ch);\fR
 .br
 \fBint wechochar(WINDOW *win, const chtype ch);\fR
@@ -94,11 +94,12 @@ scrolling the window if on the last line.
 Tabs are considered to be at every eighth column.
 The tab interval may be altered by setting the \fBTABSIZE\fR variable.
 .PP
-If \fIch\fR is any other control character, it
-is drawn in \fB^\fR\fIX\fR notation.
+If \fIch\fR is any other nonprintable character,
+it is drawn in printable form,
+i.e., the \fB^\fR\fIX\fR notation used by \fBunctrl\fR(3X).
 Calling \fBwinch\fR after adding a
-control character does not return the character itself, but instead returns
-the ^-representation of the control character.
+nonprintable character does not return the character itself,
+but instead returns the printable representation of the character.
 .PP
 Video attributes can be combined with a character argument passed to
 \fBaddch\fR or related functions by logical-ORing them into the character.
diff --git a/man/curs_addchstr.3x b/man/curs_addchstr.3x
index 37e6aeec..03f6debf 100644
--- a/man/curs_addchstr.3x
+++ b/man/curs_addchstr.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addchstr.3x,v 1.19 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_addchstr.3x,v 1.21 2020/10/18 00:35:20 tom Exp $
 .TH curs_addchstr 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -54,21 +54,21 @@
 .nf
 \fB#include \fR
 .PP
-\fBint addchstr(const chtype *chstr);\fR
+\fBint addchstr(const chtype *\fP\fIchstr\fP\fB);\fR
 .br
-\fBint addchnstr(const chtype *chstr, int n);\fR
+\fBint addchnstr(const chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fR
 .br
-\fBint waddchstr(WINDOW *win, const chtype *chstr);\fR
+\fBint waddchstr(WINDOW *\fP\fIwin\fP\fB, const chtype *\fP\fIchstr\fP\fB);\fR
 .br
-\fBint waddchnstr(WINDOW *win, const chtype *chstr, int n);\fR
+\fBint waddchnstr(WINDOW *\fP\fIwin\fP\fB, const chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fR
+.sp
+\fBint mvaddchstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const chtype *\fP\fIchstr\fP\fB);\fR
 .br
-\fBint mvaddchstr(int y, int x, const chtype *chstr);\fR
+\fBint mvaddchnstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fR
 .br
-\fBint mvaddchnstr(int y, int x, const chtype *chstr, int n);\fR
+\fBint mvwaddchstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const chtype *\fP\fIchstr\fP\fB);\fR
 .br
-\fBint mvwaddchstr(WINDOW *win, int y, int x, const chtype *chstr);\fR
-.br
-\fBint mvwaddchnstr(WINDOW *win, int y, int x, const chtype *chstr, int n);\fR
+\fBint mvwaddchnstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fR
 .fi
 .SH DESCRIPTION
 These functions copy the (null-terminated)
diff --git a/man/curs_addstr.3x b/man/curs_addstr.3x
index 88163422..6f280e64 100644
--- a/man/curs_addstr.3x
+++ b/man/curs_addstr.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addstr.3x,v 1.22 2020/03/22 00:06:42 tom Exp $
+.\" $Id: curs_addstr.3x,v 1.23 2020/10/17 23:11:02 tom Exp $
 .TH curs_addstr 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -61,7 +61,7 @@
 \fBint waddstr(WINDOW *\fR\fIwin\fR\fB, const char *\fR\fIstr\fR\fB);\fR
 .br
 \fBint waddnstr(WINDOW *\fR\fIwin\fR\fB, const char *\fR\fIstr\fR\fB, int \fR\fIn\fR\fB);\fR
-.br
+.sp
 \fBint mvaddstr(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, const char *\fR\fIstr\fR\fB);\fR
 .br
 \fBint mvaddnstr(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, const char *\fR\fIstr\fR\fB, int \fR\fIn\fR\fB);\fR
diff --git a/man/curs_addwstr.3x b/man/curs_addwstr.3x
index f1d738f1..6f7c3dbe 100644
--- a/man/curs_addwstr.3x
+++ b/man/curs_addwstr.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addwstr.3x,v 1.14 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_addwstr.3x,v 1.15 2020/10/17 23:12:22 tom Exp $
 .TH curs_addwstr 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -61,7 +61,7 @@
 \fBint waddwstr(WINDOW *\fR\fIwin\fR\fB, const wchar_t *\fR\fIwstr\fR\fB);\fR
 .br
 \fBint waddnwstr(WINDOW *\fR\fIwin\fR\fB, const wchar_t *\fR\fIwstr\fR\fB, int \fR\fIn\fR\fB);\fR
-.br
+.sp
 \fBint mvaddwstr(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, const wchar_t *\fR\fIwstr\fR\fB);\fR
 .br
 \fBint mvaddnwstr(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, const wchar_t *\fR\fIwstr\fR\fB, int \fR\fIn\fR\fB);\fR
diff --git a/man/curs_bkgd.3x b/man/curs_bkgd.3x
index 6b663882..051d5fda 100644
--- a/man/curs_bkgd.3x
+++ b/man/curs_bkgd.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgd.3x,v 1.30 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_bkgd.3x,v 1.31 2020/10/17 23:12:52 tom Exp $
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -43,11 +43,11 @@
 \fBvoid bkgdset(chtype \fP\fIch\fP\fB);\fR
 .br
 \fBvoid wbkgdset(WINDOW *\fP\fIwin, chtype \fP\fIch\fP\fB);\fR
-.br
+.sp
 \fBint bkgd(chtype \fP\fIch\fP\fB);\fR
 .br
 \fBint wbkgd(WINDOW *\fP\fIwin\fP\fB, chtype \fP\fIch\fP\fB);\fR
-.br
+.sp
 \fBchtype getbkgd(WINDOW *\fP\fIwin\fP\fB);\fR
 .br
 .SH DESCRIPTION
diff --git a/man/curs_bkgrnd.3x b/man/curs_bkgrnd.3x
index 8e3e8368..84a2984b 100644
--- a/man/curs_bkgrnd.3x
+++ b/man/curs_bkgrnd.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgrnd.3x,v 1.11 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_bkgrnd.3x,v 1.12 2020/10/17 23:13:15 tom Exp $
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -47,11 +47,11 @@
 \fBint bkgrnd(\fR\fB const cchar_t *\fR\fIwch\fR\fB);\fR
 .br
 \fBint wbkgrnd(\fR\fB WINDOW *\fR\fIwin\fR\fB, const cchar_t *\fR\fIwch\fR\fB);\fR
-.br
+.sp
 \fBvoid bkgrndset(const cchar_t *\fR\fIwch\fR \fB);\fR
 .br
 \fBvoid wbkgrndset(WINDOW *\fR\fIwin\fR\fB, const cchar_t *\fR\fIwch\fR\fB);\fR
-.br
+.sp
 \fBint getbkgrnd(cchar_t *\fR\fIwch\fR\fB);\fR
 .br
 \fBint wgetbkgrnd(WINDOW *\fR\fIwin\fR\fB, cchar_t *\fR\fIwch\fR\fB);\fR
diff --git a/man/curs_border.3x b/man/curs_border.3x
index eaf69548..7b41da53 100644
--- a/man/curs_border.3x
+++ b/man/curs_border.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_border.3x,v 1.25 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_border.3x,v 1.27 2020/10/18 00:33:06 tom Exp $
 .TH curs_border 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -51,31 +51,31 @@
 .hy
 .SH SYNOPSIS
 \fB#include \fR
+.sp
+\fBint border(chtype \fP\fIls\fP\fB, chtype \fP\fIrs\fP\fB, chtype \fP\fIts\fP\fB, chtype \fP\fIbs\fP\fB,\fR
+           \fBchtype \fP\fItl\fP\fB, chtype \fP\fItr\fP\fB, chtype \fP\fIbl\fP\fB, chtype \fP\fIbr\fP\fB);\fR
 .br
-\fBint border(chtype ls, chtype rs, chtype ts, chtype bs,\fR
-   \fBchtype tl, chtype tr, chtype bl, chtype br);\fR
-.br
-\fBint wborder(WINDOW *win, chtype ls, chtype rs,\fR
-   \fBchtype ts, chtype bs, chtype tl, chtype tr,\fR
-   \fBchtype bl, chtype br);\fR
-.br
-\fBint box(WINDOW *win, chtype verch, chtype horch);\fR
-.br
-\fBint hline(chtype ch, int n);\fR
-.br
-\fBint whline(WINDOW *win, chtype ch, int n);\fR
+\fBint wborder(WINDOW *\fP\fIwin\fP\fB, chtype \fP\fIls\fP\fB, chtype \fP\fIrs\fP\fB,\fR
+            \fBchtype \fP\fIts\fP\fB, chtype \fP\fIbs\fP\fB, chtype \fP\fItl\fP\fB, chtype \fP\fItr\fP\fB,\fR
+            \fBchtype \fP\fIbl\fP\fB, chtype \fP\fIbr\fP\fB);\fR
+.sp
+\fBint box(WINDOW *\fP\fIwin\fP\fB, chtype \fP\fIverch\fP\fB, chtype \fP\fIhorch\fP\fB);\fR
+.sp
+\fBint hline(chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fR
 .br
-\fBint vline(chtype ch, int n);\fR
+\fBint whline(WINDOW *\fP\fIwin\fP\fB, chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fR
 .br
-\fBint wvline(WINDOW *win, chtype ch, int n);\fR
+\fBint vline(chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fR
 .br
-\fBint mvhline(int y, int x, chtype ch, int n);\fR
+\fBint wvline(WINDOW *\fP\fIwin\fP\fB, chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fR
+.sp
+\fBint mvhline(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fR
 .br
-\fBint mvwhline(WINDOW *, int y, int x, chtype ch, int n);\fR
+\fBint mvwhline(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fR
 .br
-\fBint mvvline(int y, int x, chtype ch, int n);\fR
+\fBint mvvline(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fR
 .br
-\fBint mvwvline(WINDOW *, int y, int x, chtype ch, int n);\fR
+\fBint mvwvline(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fR
 .br
 .SH DESCRIPTION
 The \fBborder\fR, \fBwborder\fR and \fBbox\fR routines
diff --git a/man/curs_deleteln.3x b/man/curs_deleteln.3x
index 2e667c81..391c8009 100644
--- a/man/curs_deleteln.3x
+++ b/man/curs_deleteln.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_deleteln.3x,v 1.15 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_deleteln.3x,v 1.17 2020/10/18 00:28:51 tom Exp $
 .TH curs_deleteln 3X ""
 .SH NAME
 \fBdeleteln\fR,
@@ -41,15 +41,15 @@
 .sp
 \fBint deleteln(void);\fR
 .br
-\fBint wdeleteln(WINDOW *win);\fR
-.br
-\fBint insdelln(int n);\fR
-.br
-\fBint winsdelln(WINDOW *win, int n);\fR
+\fBint wdeleteln(WINDOW *\fP\fIwin\fP\fB);\fR
+.sp
+\fBint insdelln(int \fP\fIn\fP\fB);\fR
 .br
+\fBint winsdelln(WINDOW *\fP\fIwin\fP\fB, int \fP\fIn\fP\fB);\fR
+.sp
 \fBint insertln(void);\fR
 .br
-\fBint winsertln(WINDOW *win);\fR
+\fBint winsertln(WINDOW *\fP\fIwin\fP\fB);\fR
 .br
 .SH DESCRIPTION
 The \fBdeleteln\fR and \fBwdeleteln\fR routines delete the line under the
diff --git a/man/curs_get_wch.3x b/man/curs_get_wch.3x
index 4a30cf16..dfa5c7e9 100644
--- a/man/curs_get_wch.3x
+++ b/man/curs_get_wch.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wch.3x,v 1.13 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_get_wch.3x,v 1.14 2020/10/17 23:17:05 tom Exp $
 .TH curs_get_wch 3X ""
 .na
 .hy 0
@@ -57,7 +57,7 @@
 \fBint mvget_wch(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, wint_t *\fR\fIwch\fR\fB);\fR
 .br
 \fBint mvwget_wch(WINDOW *\fR\fIwin\fR\fB, int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, wint_t *\fR\fIwch\fR\fB);\fR
-.br
+.sp
 \fBint unget_wch(const wchar_t \fR\fIwch\fR\fB);\fR
 .SH DESCRIPTION
 The
diff --git a/man/curs_get_wstr.3x b/man/curs_get_wstr.3x
index ce8572e6..112208ae 100644
--- a/man/curs_get_wstr.3x
+++ b/man/curs_get_wstr.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wstr.3x,v 1.20 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_get_wstr.3x,v 1.21 2020/10/17 23:17:24 tom Exp $
 .TH curs_get_wstr 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -61,7 +61,7 @@
 \fBint wget_wstr(WINDOW *\fR\fIwin\fR\fB, wint_t *\fR\fIwstr\fR\fB);\fR
 .br
 \fBint wgetn_wstr(WINDOW *\fR\fIwin\fR\fB, wint_t *\fR\fIwstr\fR\fB, int \fR\fIn\fR\fB);\fR
-.br
+.sp
 \fBint mvget_wstr(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, wint_t *\fR\fIwstr\fR\fB);\fR
 .br
 \fBint mvgetn_wstr(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, wint_t *\fR\fIwstr\fR\fB, int \fR\fIn\fR\fB);\fR
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index c171f1d5..1cf9d18b 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getch.3x,v 1.55 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_getch.3x,v 1.56 2020/10/17 23:18:32 tom Exp $
 .TH curs_getch 3X ""
 .na
 .hy 0
@@ -55,12 +55,14 @@
 \fBint getch(void);\fR
 .br
 \fBint wgetch(WINDOW *\fP\fIwin);\fR
-.br
+.sp
 \fBint mvgetch(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fR
 .br
 \fBint mvwgetch(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fR
-.br
+.sp
 \fBint ungetch(int \fP\fIch\fP\fB);\fR
+.sp
+/* extension */
 .br
 \fBint has_key(int \fP\fIch\fP\fB);\fR
 .br
diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x
index d9bed595..baf56967 100644
--- a/man/curs_getstr.3x
+++ b/man/curs_getstr.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getstr.3x,v 1.29 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_getstr.3x,v 1.31 2020/10/18 00:27:44 tom Exp $
 .TH curs_getstr 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -53,21 +53,21 @@
 .SH SYNOPSIS
 \fB#include \fR
 .sp
-\fBint getstr(char *str);\fR
+\fBint getstr(char *\fP\fIstr\fP\fB);\fR
 .br
-\fBint getnstr(char *str, int n);\fR
+\fBint getnstr(char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fR
 .br
-\fBint wgetstr(WINDOW *win, char *str);\fR
+\fBint wgetstr(WINDOW *\fP\fIwin\fP\fB, char *\fP\fIstr\fP\fB);\fR
 .br
-\fBint wgetnstr(WINDOW *win, char *str, int n);\fR
-.br
-\fBint mvgetstr(int y, int x, char *str);\fR
+\fBint wgetnstr(WINDOW *\fP\fIwin\fP\fB, char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fR
+.sp
+\fBint mvgetstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB);\fR
 .br
-\fBint mvwgetstr(WINDOW *win, int y, int x, char *str);\fR
+\fBint mvwgetstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB);\fR
 .br
-\fBint mvgetnstr(int y, int x, char *str, int n);\fR
+\fBint mvgetnstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fR
 .br
-\fBint mvwgetnstr(WINDOW *, int y, int x, char *str, int n);\fR
+\fBint mvwgetnstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fR
 .br
 .SH DESCRIPTION
 The function \fBgetstr\fR is equivalent to a series of calls to \fBgetch\fR,
diff --git a/man/curs_in_wch.3x b/man/curs_in_wch.3x
index a17135ec..e2678997 100644
--- a/man/curs_in_wch.3x
+++ b/man/curs_in_wch.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_in_wch.3x,v 1.9 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_in_wch.3x,v 1.10 2020/10/17 23:19:29 tom Exp $
 .TH curs_in_wch 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -43,11 +43,11 @@
 .sp
 \fBint in_wch(cchar_t *\fR\fIwcval\fR\fB);\fR
 .br
+\fBint win_wch(WINDOW *\fR\fIwin\fR\fB, cchar_t *\fR\fIwcval\fR\fB);\fR
+.sp
 \fBint mvin_wch(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, cchar_t *\fR\fIwcval\fR\fB);\fR
 .br
 \fBint mvwin_wch(WINDOW *\fR\fIwin\fR\fB, int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, cchar_t *\fR\fIwcval\fR\fB);\fR
-.br
-\fBint win_wch(WINDOW *\fR\fIwin\fR\fB, cchar_t *\fR\fIwcval\fR\fB);\fR
 .SH DESCRIPTION
 These functions extract the complex character and rendition from
 the current position in the named window into the \fBcchar_t\fR object
diff --git a/man/curs_in_wchstr.3x b/man/curs_in_wchstr.3x
index 53491a8f..4feae480 100644
--- a/man/curs_in_wchstr.3x
+++ b/man/curs_in_wchstr.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_in_wchstr.3x,v 1.13 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_in_wchstr.3x,v 1.14 2020/10/17 23:19:44 tom Exp $
 .TH curs_in_wchstr 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -57,7 +57,7 @@
 \fBint win_wchstr(WINDOW *\fR\fIwin\fR\fB, cchar_t *\fR\fIwchstr\fR\fB);\fR
 .br
 \fBint win_wchnstr(WINDOW *\fR\fIwin\fR\fB, cchar_t *\fR\fIwchstr\fR\fB, int \fR\fIn\fR\fB);\fR
-.br
+.sp
 \fBint mvin_wchstr(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, cchar_t *\fR\fIwchstr\fR\fB);\fR
 .br
 \fBint mvin_wchnstr(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, cchar_t *\fR\fIwchstr\fR\fB, int \fR\fIn\fR\fB);\fR
diff --git a/man/curs_inch.3x b/man/curs_inch.3x
index a91d9638..ab38cbb9 100644
--- a/man/curs_inch.3x
+++ b/man/curs_inch.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inch.3x,v 1.23 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_inch.3x,v 1.25 2020/10/18 00:25:23 tom Exp $
 .TH curs_inch 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -48,11 +48,11 @@
 .sp
 \fBchtype inch(void);\fR
 .br
-\fBchtype winch(WINDOW *win);\fR
-.br
-\fBchtype mvinch(int y, int x);\fR
+\fBchtype winch(WINDOW *\fP\fIwin\fP\fB);\fR
+.sp
+\fBchtype mvinch(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fR
 .br
-\fBchtype mvwinch(WINDOW *win, int y, int x);\fR
+\fBchtype mvwinch(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fR
 .br
 .SH DESCRIPTION
 These routines return the character, of type \fBchtype\fR, at the current
diff --git a/man/curs_inchstr.3x b/man/curs_inchstr.3x
index d352c385..332604e7 100644
--- a/man/curs_inchstr.3x
+++ b/man/curs_inchstr.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inchstr.3x,v 1.19 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_inchstr.3x,v 1.21 2020/10/18 00:24:36 tom Exp $
 .TH curs_inchstr 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -53,21 +53,21 @@
 .SH SYNOPSIS
 \fB#include \fR
 .sp
-\fBint inchstr(chtype *chstr);\fR
+\fBint inchstr(chtype *\fP\fIchstr\fP\fB);\fR
 .br
-\fBint inchnstr(chtype *chstr, int n);\fR
+\fBint inchnstr(chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fR
 .br
-\fBint winchstr(WINDOW *win, chtype *chstr);\fR
+\fBint winchstr(WINDOW *\fP\fIwin\fP\fB, chtype *\fP\fIchstr\fP\fB);\fR
 .br
-\fBint winchnstr(WINDOW *win, chtype *chstr, int n);\fR
-.br
-\fBint mvinchstr(int y, int x, chtype *chstr);\fR
+\fBint winchnstr(WINDOW *\fP\fIwin\fP\fB, chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fR
+.sp
+\fBint mvinchstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype *\fP\fIchstr\fP\fB);\fR
 .br
-\fBint mvinchnstr(int y, int x, chtype *chstr, int n);\fR
+\fBint mvinchnstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fR
 .br
-\fBint mvwinchstr(WINDOW *win, int y, int x, chtype *chstr);\fR
+\fBint mvwinchstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype *\fP\fIchstr\fP\fB);\fR
 .br
-\fBint mvwinchnstr(WINDOW *win, int y, int x, chtype *chstr, int n);\fR
+\fBint mvwinchnstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fR
 .br
 .SH DESCRIPTION
 These routines return a NULL-terminated array of \fBchtype\fR quantities,
diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
index e0e8ba2c..235a5aa7 100644
--- a/man/curs_initscr.3x
+++ b/man/curs_initscr.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_initscr.3x,v 1.32 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_initscr.3x,v 1.33 2020/10/17 23:20:48 tom Exp $
 .TH curs_initscr 3X ""
 .de bP
 .ie n  .IP \(bu 4
@@ -54,9 +54,9 @@
 \fBWINDOW *initscr(void);\fR
 .br
 \fBint endwin(void);\fR
-.br
+.sp
 \fBbool isendwin(void);\fR
-.br
+.sp
 \fBSCREEN *newterm(const char *\fP\fItype\fP\fB, FILE *\fP\fIoutfd\fP\fB, FILE *\fP\fIinfd\fP\fB);\fR
 .br
 \fBSCREEN *set_term(SCREEN *\fP\fInew\fP\fB);\fR
diff --git a/man/curs_ins_wch.3x b/man/curs_ins_wch.3x
index 69731f6a..9b19a282 100644
--- a/man/curs_ins_wch.3x
+++ b/man/curs_ins_wch.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wch.3x,v 1.8 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_ins_wch.3x,v 1.10 2020/10/18 00:22:21 tom Exp $
 .TH curs_ins_wch 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -43,11 +43,11 @@
 .sp
 \fBint ins_wch(const cchar_t *\fR\fIwch\fR\fB);\fR
 .br
-\fBint wins_wch(WINDOW *\fR\fIwin, const cchar_t *\fR\fIwch\fR\fB);\fR
-.br
-\fBint mvins_wch(int \fR\fIy, int \fR\fIx, const cchar_t *\fR\fIwch\fR\fB);\fR
+\fBint wins_wch(WINDOW *\fR\fIwin\fP\fB, const cchar_t *\fR\fIwch\fR\fB);\fR
+.sp
+\fBint mvins_wch(int \fR\fIy\fP\fB, int \fR\fIx\fP\fB, const cchar_t *\fR\fIwch\fR\fB);\fR
 .br
-\fBint mvwins_wch(WINDOW *\fR\fIwin, int \fR\fIy, int \fR\fIx, const cchar_t *\fR\fIwch\fR\fB);\fR
+\fBint mvwins_wch(WINDOW *\fR\fIwin\fP\fB, int \fR\fIy\fP\fB, int \fR\fIx\fP\fB, const cchar_t *\fR\fIwch\fR\fB);\fR
 .SH DESCRIPTION
 These routines, insert the complex character \fIwch\fR with rendition
 before the character under the cursor.
diff --git a/man/curs_ins_wstr.3x b/man/curs_ins_wstr.3x
index 2a89ff1f..76c44fb6 100644
--- a/man/curs_ins_wstr.3x
+++ b/man/curs_ins_wstr.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wstr.3x,v 1.10 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_ins_wstr.3x,v 1.11 2020/10/17 23:21:25 tom Exp $
 .TH curs_ins_wstr 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -57,7 +57,7 @@
 \fBint wins_wstr(WINDOW *\fR\fIwin\fR\fB, const wchar_t *\fR\fIwstr\fR\fB);\fR
 .br
 \fBint wins_nwstr(WINDOW *\fR\fIwin\fR\fB, const wchar_t *\fR\fIwstr\fR\fB, int \fR\fIn\fR\fB);\fR
-.br
+.sp
 \fBint mvins_wstr(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, const wchar_t *\fR\fIwstr\fR\fB);\fR
 .br
 \fBint mvins_nwstr(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, const wchar_t *\fR\fIwstr\fR\fB, int \fR\fIn\fR\fB);\fR
diff --git a/man/curs_insch.3x b/man/curs_insch.3x
index 4642caa4..1b4e3ee4 100644
--- a/man/curs_insch.3x
+++ b/man/curs_insch.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insch.3x,v 1.17 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_insch.3x,v 1.19 2020/10/18 00:21:39 tom Exp $
 .TH curs_insch 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -41,13 +41,13 @@
 .SH SYNOPSIS
 \fB#include \fR
 .sp
-\fBint insch(chtype ch);\fR
+\fBint insch(chtype \fP\fIch\fP\fB);\fR
 .br
-\fBint winsch(WINDOW *win, chtype ch);\fR
-.br
-\fBint mvinsch(int y, int x, chtype ch);\fR
+\fBint winsch(WINDOW *\fP\fIwin\fP\fB, chtype \fP\fIch\fP\fB);\fR
+.sp
+\fBint mvinsch(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype \fP\fIch\fP\fB);\fR
 .br
-\fBint mvwinsch(WINDOW *win, int y, int x, chtype ch);\fR
+\fBint mvwinsch(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype \fP\fIch\fP\fB);\fR
 .br
 .SH DESCRIPTION
 These routines insert the character \fIch\fR before the character under the
diff --git a/man/curs_insstr.3x b/man/curs_insstr.3x
index b3147ed6..4d5f123e 100644
--- a/man/curs_insstr.3x
+++ b/man/curs_insstr.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insstr.3x,v 1.24 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_insstr.3x,v 1.26 2020/10/18 00:20:36 tom Exp $
 .TH curs_insstr 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -45,21 +45,21 @@
 .SH SYNOPSIS
 \fB#include \fR
 .br
-\fBint insstr(const char *str);\fR
+\fBint insstr(const char *\fP\fIstr\fP\fB);\fR
 .br
-\fBint insnstr(const char *str, int n);\fR
+\fBint insnstr(const char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fR
 .br
-\fBint winsstr(WINDOW *win, const char *str);\fR
+\fBint winsstr(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIstr\fP\fB);\fR
 .br
-\fBint winsnstr(WINDOW *win, const char *str, int n);\fR
+\fBint winsnstr(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fR
+.sp
+\fBint mvinsstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIstr\fP\fB);\fR
 .br
-\fBint mvinsstr(int y, int x, const char *str);\fR
+\fBint mvinsnstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fR
 .br
-\fBint mvinsnstr(int y, int x, const char *str, int n);\fR
+\fBint mvwinsstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIstr\fP\fB);\fR
 .br
-\fBint mvwinsstr(WINDOW *win, int y, int x, const char *str);\fR
-.br
-\fBint mvwinsnstr(WINDOW *win, int y, int x, const char *str, int n);\fR
+\fBint mvwinsnstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fR
 .br
 .SH DESCRIPTION
 These routines insert a character string
diff --git a/man/curs_instr.3x b/man/curs_instr.3x
index 44231060..7cc4b4bc 100644
--- a/man/curs_instr.3x
+++ b/man/curs_instr.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_instr.3x,v 1.20 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_instr.3x,v 1.22 2020/10/18 00:18:27 tom Exp $
 .TH curs_instr 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -49,21 +49,21 @@
 .SH SYNOPSIS
 \fB#include \fR
 .sp
-\fBint instr(char *str);\fR
+\fBint instr(char *\fP\fIstr\fP\fB);\fR
 .br
-\fBint innstr(char *str, int n);\fR
+\fBint innstr(char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fR
 .br
-\fBint winstr(WINDOW *win, char *str);\fR
+\fBint winstr(WINDOW *\fP\fIwin\fP\fB, char *\fP\fIstr\fP\fB);\fR
 .br
-\fBint winnstr(WINDOW *win, char *str, int n);\fR
-.br
-\fBint mvinstr(int y, int x, char *str);\fR
+\fBint winnstr(WINDOW *\fP\fIwin\fP\fB, char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fR
+.sp
+\fBint mvinstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB);\fR
 .br
-\fBint mvinnstr(int y, int x, char *str, int n);\fR
+\fBint mvinnstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fR
 .br
-\fBint mvwinstr(WINDOW *win, int y, int x, char *str);\fR
+\fBint mvwinstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB);\fR
 .br
-\fBint mvwinnstr(WINDOW *win, int y, int x, char *str, int n);\fR
+\fBint mvwinnstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fR
 .br
 .SH DESCRIPTION
 These routines return a string of characters in \fIstr\fR, extracted starting
diff --git a/man/curs_inwstr.3x b/man/curs_inwstr.3x
index 1b44a645..b3899c4b 100644
--- a/man/curs_inwstr.3x
+++ b/man/curs_inwstr.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inwstr.3x,v 1.13 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_inwstr.3x,v 1.14 2020/10/17 23:22:11 tom Exp $
 .TH curs_inwstr 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -53,7 +53,7 @@
 \fBint winwstr(\fR\fBWINDOW *\fR\fIwin\fR\fB, wchar_t *\fR\fIwstr\fR\fB);\fR
 .br
 \fBint winnwstr(\fR\fBWINDOW *\fR\fIwin\fR\fB, wchar_t *\fR\fIwstr\fR\fB, int \fR\fIn\fR\fB);\fR
-.br
+.sp
 \fBint mvinwstr(\fR\fBint \fR\fIy\fR\fB, int \fR\fIx\fR\fB, wchar_t *\fR\fIwstr\fR\fB);\fR
 .br
 \fBint mvinnwstr(\fR\fBint \fR\fIy\fR\fB, int \fR\fIx\fR\fB, wchar_t *\fR\fIwstr\fR\fB, int \fR\fIn\fR\fB);\fR
diff --git a/man/curs_kernel.3x b/man/curs_kernel.3x
index 2d89d1ac..a4e6c808 100644
--- a/man/curs_kernel.3x
+++ b/man/curs_kernel.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_kernel.3x,v 1.28 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_kernel.3x,v 1.29 2020/10/17 23:22:35 tom Exp $
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -59,19 +59,19 @@
 \fBint def_prog_mode(void);\fR
 .br
 \fBint def_shell_mode(void);\fR
-.br
+.sp
 \fBint reset_prog_mode(void);\fR
 .br
 \fBint reset_shell_mode(void);\fR
-.br
+.sp
 \fBint resetty(void);\fR
 .br
 \fBint savetty(void);\fR
-.br
+.sp
 \fBvoid getsyx(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fR
 .br
 \fBvoid setsyx(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fR
-.br
+.sp
 \fBint ripoffline(int \fP\fIline\fP\fB, int (*\fP\fIinit\fP\fB)(WINDOW *, int));\fR
 .br
 \fBint curs_set(int \fP\fIvisibility\fP\fB);\fR
diff --git a/man/curs_legacy.3x b/man/curs_legacy.3x
index b73a6be1..c2eb86b8 100644
--- a/man/curs_legacy.3x
+++ b/man/curs_legacy.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_legacy.3x,v 1.10 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_legacy.3x,v 1.12 2020/10/18 00:16:04 tom Exp $
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -38,23 +38,23 @@ curs_legacy \- get \fBcurses\fP cursor and window coordinates, attributes
 .SH SYNOPSIS
 \fB#include \fP
 .sp
-\fBint getattrs(const WINDOW *win);\fP
-.br
-\fBint getbegx(const WINDOW *win);\fP
-.br
-\fBint getbegy(const WINDOW *win);\fP
-.br
-\fBint getcurx(const WINDOW *win);\fP
-.br
-\fBint getcury(const WINDOW *win);\fP
+\fBint getattrs(const WINDOW *\fP\fIwin\fP\fB);\fP
+.sp
+\fBint getbegx(const WINDOW *\fP\fIwin\fP\fB);\fP
 .br
-\fBint getmaxx(const WINDOW *win);\fP
+\fBint getbegy(const WINDOW *\fP\fIwin\fP\fB);\fP
+.sp
+\fBint getcurx(const WINDOW *\fP\fIwin\fP\fB);\fP
 .br
-\fBint getmaxy(const WINDOW *win);\fP
+\fBint getcury(const WINDOW *\fP\fIwin\fP\fB);\fP
+.sp
+\fBint getmaxx(const WINDOW *\fP\fIwin\fP\fB);\fP
 .br
-\fBint getparx(const WINDOW *win);\fP
+\fBint getmaxy(const WINDOW *\fP\fIwin\fP\fB);\fP
+.sp
+\fBint getparx(const WINDOW *\fP\fIwin\fP\fB);\fP
 .br
-\fBint getpary(const WINDOW *win);\fP
+\fBint getpary(const WINDOW *\fP\fIwin\fP\fB);\fP
 .br
 .SH DESCRIPTION
 These legacy functions are simpler to use than the X/Open Curses functions:
diff --git a/man/curs_mouse.3x b/man/curs_mouse.3x
index 775bc33f..c18be3fa 100644
--- a/man/curs_mouse.3x
+++ b/man/curs_mouse.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_mouse.3x,v 1.52 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_mouse.3x,v 1.53 2020/10/17 23:25:08 tom Exp $
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -76,21 +76,20 @@
 .fi
 .PP
 \fBbool has_mouse(void);\fR
-.br
+.sp
 \fBint getmouse(MEVENT *\fP\fIevent\fP\fB);\fR
 .br
 \fBint ungetmouse(MEVENT *\fP\fIevent\fP\fB);\fR
-.br
+.sp
 \fBmmask_t mousemask(mmask_t \fP\fInewmask\fP\fB, mmask_t *\fP\fIoldmask\fP\fB);\fR
-.br
+.sp
 \fBbool wenclose(const WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fR
-.br
+.sp
 \fBbool mouse_trafo(int* \fP\fIpY\fP\fB, int* \fP\fIpX\fP\fB, bool \fP\fIto_screen\fP\fB);\fR
 .br
-\fBbool wmouse_trafo(const WINDOW* \fP\fIwin\fP\fB, int* \fP\fIpY\fP\fB, int* \fP\fIpX\fP\fB,\fR
-.br
-	\fBbool \fP\fIto_screen\fP\fB);\fR
-.br
+\fBbool wmouse_trafo(const WINDOW* \fP\fIwin\fP\fB,\fR
+                  \fBint* \fP\fIpY\fP\fB, int* \fP\fIpX\fP\fB, bool \fP\fIto_screen\fP\fB);\fR
+.sp
 \fBint mouseinterval(int \fP\fIerval\fP\fB);\fR
 .br
 .SH DESCRIPTION
diff --git a/man/curs_util.3x b/man/curs_util.3x
index 7cee63fe..a71015b3 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.57 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_util.3x,v 1.58 2020/10/17 22:54:59 tom Exp $
 .TH curs_util 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -61,23 +61,23 @@
 \fBconst char *unctrl(chtype c);\fR
 .br
 \fBwchar_t *wunctrl(cchar_t *c);\fR
-.br
+.sp
 \fBconst char *keyname(int c);\fR
 .br
 \fBconst char *key_name(wchar_t w);\fR
-.br
+.sp
 \fBvoid filter(void);\fR
 .br
 \fBvoid nofilter(void);\fR
-.br
+.sp
 \fBvoid use_env(bool f);\fR
 .br
 \fBvoid use_tioctl(bool f);\fR
-.br
+.sp
 \fBint putwin(WINDOW *win, FILE *filep);\fR
 .br
 \fBWINDOW *getwin(FILE *filep);\fR
-.br
+.sp
 \fBint delay_output(int ms);\fR
 .br
 \fBint flushinp(void);\fR
@@ -344,7 +344,7 @@ the parameter is a 7-bit US\-ASCII code.
 This is the case that X/Open Curses documented.
 .bP
 the parameter is in the range 128\-159, i.e., a C1 control code.
-If \fBuse_legacy_coding\fP has been called with a \fB2\fP parameter,
+If \fBuse_legacy_coding\fP(3X) has been called with a \fB2\fP parameter,
 \fBunctrl\fP returns the parameter, i.e., a one-character string with
 the parameter as the first character.
 Otherwise, it returns \*(``~@\*('', \*(``~A\*('', etc.,
@@ -369,14 +369,14 @@ Or they may ignore C1 controls and treat all of the upper-128 codes as
 printable.
 This implementation uses 8 bits but does not modify the string to reflect
 locale.
-The \fBuse_legacy_coding\fP function allows the caller to
+The \fBuse_legacy_coding\fP(3X) function allows the caller to
 change the output of \fBunctrl\fP.
 .PP
 Likewise, the \fBmeta\fP(3X) function allows the caller to change the
 output of \fBkeyname\fP, i.e.,
 it determines whether to use the \*(``M\-\*('' prefix
 for \*(``meta\*('' keys (codes in the range 128 to 255).
-Both \fBuse_legacy_coding\fP and \fBmeta\fP succeed only after
+Both \fBuse_legacy_coding\fP(3X) and \fBmeta\fP(3X) succeed only after
 curses is initialized.
 X/Open Curses does not document the treatment of codes 128 to 159.
 When treating them as \*(``meta\*('' keys
diff --git a/man/form_cursor.3x b/man/form_cursor.3x
index 7fde03c5..cb9d1cd1 100644
--- a/man/form_cursor.3x
+++ b/man/form_cursor.3x
@@ -28,14 +28,14 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_cursor.3x,v 1.12 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_cursor.3x,v 1.14 2020/10/18 00:15:29 tom Exp $
 .TH form_cursor 3X ""
 .SH NAME
 \fBpos_form_cursor\fR \- position a form window cursor
 .SH SYNOPSIS
 \fB#include \fR
-.br
-int pos_form_cursor(FORM *form);
+.sp
+\fBint pos_form_cursor(FORM *\fP\fIform\fP\fB);\fP
 .br
 .SH DESCRIPTION
 The function \fBpos_form_cursor\fR restores the cursor to the position required
diff --git a/man/form_data.3x b/man/form_data.3x
index 1d14343d..8a566920 100644
--- a/man/form_data.3x
+++ b/man/form_data.3x
@@ -28,17 +28,17 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_data.3x,v 1.13 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_data.3x,v 1.15 2020/10/18 00:15:00 tom Exp $
 .TH form_data 3X ""
 .SH NAME
 \fBdata_ahead\fP,
 \fBdata_behind\fR \- test for off-screen data in given forms
 .SH SYNOPSIS
 \fB#include \fR
+.sp
+\fBbool data_ahead(const FORM *\fP\fIform\fP\fB);\fP
 .br
-bool data_ahead(const FORM *form);
-.br
-bool data_behind(const FORM *form);
+\fBbool data_behind(const FORM *\fP\fIform\fP\fB);\fP
 .br
 .SH DESCRIPTION
 The function \fBdata_ahead\fR tests whether there is off-screen data
diff --git a/man/form_driver.3x b/man/form_driver.3x
index 64a1e487..9b564f94 100644
--- a/man/form_driver.3x
+++ b/man/form_driver.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_driver.3x,v 1.33 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_driver.3x,v 1.34 2020/10/17 23:28:04 tom Exp $
 .TH form_driver 3X ""
 .de bP
 .ie n  .IP \(bu 4
@@ -38,7 +38,7 @@
 \fBform_driver_w\fR \- command-processing loop of the form system
 .SH SYNOPSIS
 \fB#include \fR
-.br
+.sp
 \fBint form_driver(FORM *\fP\fIform\fP\fB, int \fP\fIc\fP\fB);\fP
 .br
 \fBint form_driver_w(FORM *\fP\fIform\fP\fB, int \fP\fIc\fP\fB, wchar_t \fP\fIwch\fP\fB);\fP
diff --git a/man/form_field.3x b/man/form_field.3x
index b10e5af0..757c486f 100644
--- a/man/form_field.3x
+++ b/man/form_field.3x
@@ -28,13 +28,13 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field.3x,v 1.15 2020/03/28 19:06:28 tom Exp $
+.\" $Id: form_field.3x,v 1.16 2020/10/17 23:06:12 tom Exp $
 .TH form_field 3X ""
 .SH NAME
 \fBform_field\fR \- make and break connections between fields and forms
 .SH SYNOPSIS
 \fB#include \fR
-.br
+.sp
 int set_form_fields(FORM *form, FIELD **fields);
 .br
 FIELD **form_fields(const FORM *form);
diff --git a/man/form_field_attributes.3x b/man/form_field_attributes.3x
index caeffa39..88778b1b 100644
--- a/man/form_field_attributes.3x
+++ b/man/form_field_attributes.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_attributes.3x,v 1.16 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_field_attributes.3x,v 1.18 2020/10/18 00:14:20 tom Exp $
 .TH form_field_attributes 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -38,18 +38,18 @@
 \fBform_field_attributes\fR \- color and attribute control for form fields
 .SH SYNOPSIS
 \fB#include \fR
+.sp
+\fBint set_field_fore(FIELD *\fP\fIfield\fP\fB, chtype \fP\fIattr\fP\fB);\fP
 .br
-int set_field_fore(FIELD *field, chtype attr);
+\fBchtype field_fore(const FIELD *\fP\fIfield\fP\fB);\fP
+.sp
+\fBint set_field_back(FIELD *\fP\fIfield\fP\fB, chtype \fP\fIattr\fP\fB);\fP
 .br
-chtype field_fore(const FIELD *field);
+\fBchtype field_back(const FIELD *\fP\fIfield\fP\fB);\fP
+.sp
+\fBint set_field_pad(FIELD *\fP\fIfield\fP\fB, int \fP\fIpad\fP\fB);\fP
 .br
-int set_field_back(FIELD *field, chtype attr);
-.br
-chtype field_back(const FIELD *field);
-.br
-int set_field_pad(FIELD *field, int pad);
-.br
-int field_pad(const FIELD *field);
+\fBint field_pad(const FIELD *\fP\fIfield\fP\fB);\fP
 .br
 .SH DESCRIPTION
 The function \fBset_field_fore\fR sets the foreground attribute of
diff --git a/man/form_field_info.3x b/man/form_field_info.3x
index ba4c82a4..556c45ba 100644
--- a/man/form_field_info.3x
+++ b/man/form_field_info.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_info.3x,v 1.17 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_field_info.3x,v 1.18 2020/10/17 23:35:05 tom Exp $
 .TH form_field_info 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -38,13 +38,17 @@
 \fBdynamic_field_info\fP,
 \fBfield_info\fR \- retrieve field characteristics
 .SH SYNOPSIS
+.nf
 \fB#include \fR
-.br
-int field_info(const FIELD *field, int *rows, int *cols,
-              int *frow, int *fcol, int *nrow, int *nbuf);
-.br
-int dynamic_field_info(const FIELD *field, int *rows, int *cols, int *max);
-.br
+.sp
+\fBint field_info(const FIELD *\fP\fIfield\fP\fB,\fP
+               \fBint *\fP\fIrows\fP\fB, int *\fP\fIcols\fP\fB,\fP
+               \fBint *\fP\fIfrow\fP\fB, int *\fP\fIfcol\fP\fB,\fP
+               \fBint *\fP\fInrow\fP\fB, int *\fP\fInbuf\fB);\fP
+.sp
+\fBint dynamic_field_info(const FIELD *\fP\fIfield\fP\fB,\fP
+                       \fBint *\fP\fIrows\fP\fB, int *\fP\fIcols\fP\fB, int *\fImax\fB);\fP
+.fi
 .SH DESCRIPTION
 The function \fBfield_info\fR returns the sizes and other attributes passed in
 to the field at its creation time.
diff --git a/man/form_field_just.3x b/man/form_field_just.3x
index bd3753d1..d8fef765 100644
--- a/man/form_field_just.3x
+++ b/man/form_field_just.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_just.3x,v 1.16 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_field_just.3x,v 1.18 2020/10/18 00:12:55 tom Exp $
 .TH form_field_just 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -39,10 +39,10 @@
 \fBfield_just\fP \- retrieve field characteristics
 .SH SYNOPSIS
 \fB#include \fR
+.sp
+\fBint set_field_just(FIELD *\fP\fIfield\fP\fB, int \fP\fIjustification\fP\fB);\fP
 .br
-int set_field_just(FIELD *field, int justification);
-.br
-int field_just(const FIELD *field);
+\fBint field_just(const FIELD *\fP\fIfield\fP\fB);\fP
 .br
 .SH DESCRIPTION
 The function \fBset_field_just\fR sets the justification attribute of
diff --git a/man/form_field_new.3x b/man/form_field_new.3x
index 4b32c55d..9a18da18 100644
--- a/man/form_field_new.3x
+++ b/man/form_field_new.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_new.3x,v 1.22 2020/03/28 19:06:28 tom Exp $
+.\" $Id: form_field_new.3x,v 1.23 2020/10/17 23:06:36 tom Exp $
 .TH form_field_new 3X ""
 .SH NAME
 \fBnew_field\fR,
@@ -37,7 +37,7 @@
 \fBfree_field\fR \- create and destroy form fields
 .SH SYNOPSIS
 \fB#include \fR
-.br
+.sp
 FIELD *new_field(int height, int width,
                  int toprow, int leftcol,
                  int offscreen, int nbuffers);
diff --git a/man/form_field_opts.3x b/man/form_field_opts.3x
index 14f9a20d..96338e29 100644
--- a/man/form_field_opts.3x
+++ b/man/form_field_opts.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_opts.3x,v 1.25 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_field_opts.3x,v 1.27 2020/10/18 00:11:45 tom Exp $
 .TH form_field_opts 3X ""
 .SH NAME
 \fBset_field_opts\fP,
@@ -37,14 +37,14 @@
 \fBfield_opts\fP \- set and get field options
 .SH SYNOPSIS
 \fB#include \fR
+.sp
+\fBint set_field_opts(FIELD *\fP\fIfield\fP\fB, Field_Options \fP\fIopts\fP\fB);\fP
 .br
-int set_field_opts(FIELD *field, Field_Options opts);
+\fBField_Options field_opts(const FIELD *\fP\fIfield\fP\fB);\fP
+.sp
+\fBint field_opts_on(FIELD *\fP\fIfield\fP\fB, Field_Options \fP\fIopts\fP\fB);\fP
 .br
-int field_opts_on(FIELD *field, Field_Options opts);
-.br
-int field_opts_off(FIELD *field, Field_Options opts);
-.br
-Field_Options field_opts(const FIELD *field);
+\fBint field_opts_off(FIELD *\fP\fIfield\fP\fB, Field_Options \fP\fIopts\fP\fB);\fP
 .br
 .SH DESCRIPTION
 The function \fBset_field_opts\fR sets all the given field's option bits (field
diff --git a/man/form_field_userptr.3x b/man/form_field_userptr.3x
index 8a8427c5..862943a5 100644
--- a/man/form_field_userptr.3x
+++ b/man/form_field_userptr.3x
@@ -28,18 +28,17 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_userptr.3x,v 1.14 2020/03/28 19:06:28 tom Exp $
+.\" $Id: form_field_userptr.3x,v 1.15 2020/10/17 23:07:03 tom Exp $
 .TH form_field_userptr 3X ""
 .SH NAME
 \fBset_field_userptr\fR,
 \fBfield_userptr\fR \- associate application data with a form field
 .SH SYNOPSIS
 \fB#include \fR
-.br
+.sp
 int set_field_userptr(FIELD *field, void*userptr);
 .br
 void *field_userptr(const FIELD *field);
-.br
 .SH DESCRIPTION
 Every form field has a field that can be used to hold application-specific data
 (that is, the form-driver code leaves it alone).
diff --git a/man/form_field_validation.3x b/man/form_field_validation.3x
index 58359230..6da08ab9 100644
--- a/man/form_field_validation.3x
+++ b/man/form_field_validation.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_validation.3x,v 1.25 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_field_validation.3x,v 1.27 2020/10/18 00:07:45 tom Exp $
 .TH form_field_validation 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -41,26 +41,26 @@
 \fBform_field_validation\fR \- data type validation for fields
 .SH SYNOPSIS
 \fB#include \fR
+.sp
+\fBint set_field_type(FIELD *\fP\fIfield\fP\fB, FIELDTYPE *\fP\fItype\fP\fB, ...);\fP
 .br
-int set_field_type(FIELD *field, FIELDTYPE *type, ...);
-.br
-FIELDTYPE *field_type(const FIELD *field);
+\fBFIELDTYPE *field_type(const FIELD *\fP\fIfield\fP\fB);\fP
 .br
-void *field_arg(const FIELD *field);
+\fBvoid *field_arg(const FIELD *\fP\fIfield\fP\fB);\fP
 .sp
-FIELDTYPE *TYPE_ALNUM;
+\fBFIELDTYPE *TYPE_ALNUM;\fP
 .br
-FIELDTYPE *TYPE_ALPHA;
+\fBFIELDTYPE *TYPE_ALPHA;\fP
 .br
-FIELDTYPE *TYPE_ENUM;
+\fBFIELDTYPE *TYPE_ENUM;\fP
 .br
-FIELDTYPE *TYPE_INTEGER;
+\fBFIELDTYPE *TYPE_INTEGER;\fP
 .br
-FIELDTYPE *TYPE_NUMERIC;
+\fBFIELDTYPE *TYPE_NUMERIC;\fP
 .br
-FIELDTYPE *TYPE_REGEXP;
+\fBFIELDTYPE *TYPE_REGEXP;\fP
 .br
-FIELDTYPE *TYPE_IPV4;
+\fBFIELDTYPE *TYPE_IPV4;\fP
 .br
 .SH DESCRIPTION
 The function \fBset_field_type\fR declares a data type for a given form field.
diff --git a/man/form_fieldtype.3x b/man/form_fieldtype.3x
index b4918420..775d1f26 100644
--- a/man/form_fieldtype.3x
+++ b/man/form_fieldtype.3x
@@ -28,19 +28,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_fieldtype.3x,v 1.21 2020/03/28 19:06:28 tom Exp $
+.\" $Id: form_fieldtype.3x,v 1.22 2020/10/17 23:07:47 tom Exp $
 .TH form_fieldtype 3X ""
 .SH NAME
 \fBform_fieldtype\fR \- define validation-field types
 .SH SYNOPSIS
 \fB#include \fR
-.br
+.sp
 FIELDTYPE *new_fieldtype(
     bool (* const field_check)(FIELD *, const void *),
     bool (* const char_check)(int, const void *));
 .br
 int free_fieldtype(FIELDTYPE *fieldtype);
-.br
+.sp
 int set_fieldtype_arg(
     FIELDTYPE *fieldtype,
     void *(* const make_arg)(va_list *),
@@ -51,10 +51,9 @@ int set_fieldtype_choice(
     FIELDTYPE *fieldtype,
     bool (* const next_choice)(FIELD *, const void *),
     bool (* const prev_choice)(FIELD *, const void *));
-.br
+.sp
 FIELDTYPE *link_fieldtype(FIELDTYPE *type1,
                           FIELDTYPE *type2);
-.br
 .SH DESCRIPTION
 The function \fBnew_fieldtype\fR creates a new field type usable for data
 validation.
diff --git a/man/form_hook.3x b/man/form_hook.3x
index 5ddeb9fe..e84aa972 100644
--- a/man/form_hook.3x
+++ b/man/form_hook.3x
@@ -28,28 +28,28 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_hook.3x,v 1.14 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_hook.3x,v 1.16 2020/10/18 00:06:29 tom Exp $
 .TH form_hook 3X ""
 .SH NAME
 \fBform_hook\fR \- set hooks for automatic invocation by applications
 .SH SYNOPSIS
 \fB#include \fR
+.sp
+\fBint set_field_init(FORM *\fP\fIform\fP\fB, Form_Hook \fP\fIfunc\fP\fB);\fP
 .br
-int set_field_init(FORM *form, Form_Hook func);
+\fBForm_Hook field_init(const FORM *\fP\fIform\fP\fB);\fP
+.sp
+\fBint set_field_term(FORM *\fP\fIform\fP\fB, Form_Hook \fP\fIfunc\fP\fB);\fP
 .br
-Form_Hook field_init(const FORM *form);
+\fBForm_Hook field_term(const FORM *\fP\fIform\fP\fB);\fP
+.sp
+\fBint set_form_init(FORM *\fP\fIform\fP\fB, Form_Hook \fP\fIfunc\fP\fB);\fP
 .br
-int set_field_term(FORM *form, Form_Hook func);
+\fBForm_Hook form_init(const FORM *\fP\fIform\fP\fB);\fP
+.sp
+\fBint set_form_term(FORM *\fP\fIform\fP\fB, Form_Hook \fP\fIfunc\fP\fB);\fP
 .br
-Form_Hook field_term(const FORM *form);
-.br
-int set_form_init(FORM *form, Form_Hook func);
-.br
-Form_Hook form_init(const FORM *form);
-.br
-int set_form_term(FORM *form, Form_Hook func);
-.br
-Form_Hook form_term(const FORM *form);
+\fBForm_Hook form_term(const FORM *\fP\fIform\fP\fB);\fP
 .br
 .SH DESCRIPTION
 These functions make it possible to set hook functions to be called at various
diff --git a/man/form_new.3x b/man/form_new.3x
index dd2eefb6..e606853f 100644
--- a/man/form_new.3x
+++ b/man/form_new.3x
@@ -28,14 +28,14 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_new.3x,v 1.13 2020/03/28 19:06:28 tom Exp $
+.\" $Id: form_new.3x,v 1.14 2020/10/17 23:08:09 tom Exp $
 .TH form_new 3X ""
 .SH NAME
 \fBnew_form\fR,
 \fBfree_form\fP \- create and destroy forms
 .SH SYNOPSIS
 \fB#include \fR
-.br
+.sp
 FORM *new_form(FIELD **fields);
 .br
 int free_form(FORM *form);
diff --git a/man/form_new_page.3x b/man/form_new_page.3x
index 68dce029..478688fa 100644
--- a/man/form_new_page.3x
+++ b/man/form_new_page.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_new_page.3x,v 1.15 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_new_page.3x,v 1.17 2020/10/18 00:04:36 tom Exp $
 .TH form_new_page 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -39,10 +39,10 @@
 \fBnew_page\fR \- form pagination functions
 .SH SYNOPSIS
 \fB#include \fR
+.sp
+\fBint set_new_page(FIELD *\fP\fIfield\fP\fB, bool \fP\fInew_page_flag\fP\fB);\fP
 .br
-int set_new_page(FIELD *field, bool new_page_flag);
-.br
-bool new_page(const FIELD *field);
+\fBbool new_page(const FIELD *\fP\fIfield\fP\fB);\fP
 .br
 .SH DESCRIPTION
 The function \fBset_new_page\fR sets or resets a flag marking the given field
diff --git a/man/form_opts.3x b/man/form_opts.3x
index 18474fa0..db6c491e 100644
--- a/man/form_opts.3x
+++ b/man/form_opts.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_opts.3x,v 1.15 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_opts.3x,v 1.17 2020/10/18 00:03:49 tom Exp $
 .TH form_opts 3X ""
 .SH NAME
 \fBset_form_opts\fP,
@@ -37,14 +37,14 @@
 \fBform_opts\fR \- set and get form options
 .SH SYNOPSIS
 \fB#include \fR
+.sp
+\fBint set_form_opts(FORM *\fP\fIform\fP\fB, Field_Options \fP\fIopts\fP\fB);\fP
 .br
-int set_form_opts(FORM *form, Field_Options opts);
+\fBField_Options form_opts(const FORM *\fP\fIform\fP\fB);\fP
+.sp
+\fBint form_opts_on(FORM *\fP\fIform\fP\fB, Field_Options \fP\fIopts\fP\fB);\fP
 .br
-int form_opts_on(FORM *form, Field_Options opts);
-.br
-int form_opts_off(FORM *form, Field_Options opts);
-.br
-Field_Options form_opts(const FORM *form);
+\fBint form_opts_off(FORM *\fP\fIform\fP\fB, Field_Options \fP\fIopts\fP\fB);\fP
 .br
 .SH DESCRIPTION
 The function \fBset_form_opts\fR sets all the given form's option bits (form
diff --git a/man/form_page.3x b/man/form_page.3x
index 4b0e8191..da1c7254 100644
--- a/man/form_page.3x
+++ b/man/form_page.3x
@@ -28,24 +28,24 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_page.3x,v 1.17 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_page.3x,v 1.19 2020/10/18 00:02:44 tom Exp $
 .TH form_page 3X ""
 .SH NAME
 \fBform_page\fR \- set and get form page number
 .SH SYNOPSIS
 \fB#include \fR
+.sp
+\fBint set_current_field(FORM *\fP\fIform\fP\fB, FIELD *\fP\fIfield\fP\fB);\fP
 .br
-int set_current_field(FORM *form, FIELD *field);
+\fBFIELD *current_field(const FORM *\fP\fIform\fP\fB);\fP
+.sp
+\fBint unfocus_current_field(FORM *\fP\fIform\fP\fB);\fP
+.sp
+\fBint set_form_page(FORM *\fP\fIform\fP\fB, int \fP\fIn\fP\fB);\fP
 .br
-FIELD *current_field(const FORM *);
-.br
-int unfocus_current_field(FORM *form);
-.br
-int set_form_page(FORM *form, int n);
-.br
-int form_page(const FORM *form);
-.br
-int field_index(const FIELD *field);
+\fBint form_page(const FORM *\fP\fIform\fP\fB);\fP
+.sp
+\fBint field_index(const FIELD *\fP\fIfield\fP\fB);\fP
 .br
 .SH DESCRIPTION
 The function \fBset_current_field\fR sets the current field of the given
diff --git a/man/form_post.3x b/man/form_post.3x
index 5aa08c71..c0e5baa5 100644
--- a/man/form_post.3x
+++ b/man/form_post.3x
@@ -28,17 +28,17 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_post.3x,v 1.14 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_post.3x,v 1.16 2020/10/18 00:01:05 tom Exp $
 .TH form_post 3X ""
 .SH NAME
 \fBpost_form\fR,
 \fBunpost_form\fR \- write or erase forms from associated subwindows
 .SH SYNOPSIS
 \fB#include \fR
+.sp
+\fBint post_form(FORM *\fP\fIform\fP\fB);\fP
 .br
-int post_form(FORM *form);
-.br
-int unpost_form(FORM *form);
+\fBint unpost_form(FORM *\fP\fIform\fP\fB);\fP
 .br
 .SH DESCRIPTION
 The function \fBpost_form\fR displays a form to its associated subwindow.
diff --git a/man/form_requestname.3x b/man/form_requestname.3x
index 0cad1ad0..1cb35d67 100644
--- a/man/form_requestname.3x
+++ b/man/form_requestname.3x
@@ -28,14 +28,14 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_requestname.3x,v 1.13 2020/03/28 19:06:28 tom Exp $
+.\" $Id: form_requestname.3x,v 1.14 2020/10/17 23:08:23 tom Exp $
 .TH form_requestname 3X ""
 .SH NAME
 \fBform_request_by_name\fP,
 \fBform_request_name\fR \- handle printable form request names
 .SH SYNOPSIS
 \fB#include \fR
-.br
+.sp
 const char *form_request_name(int request);
 .br
 int form_request_by_name(const char *name);
diff --git a/man/form_userptr.3x b/man/form_userptr.3x
index 266b13ef..b1fdaac3 100644
--- a/man/form_userptr.3x
+++ b/man/form_userptr.3x
@@ -28,14 +28,14 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_userptr.3x,v 1.17 2020/03/28 19:06:28 tom Exp $
+.\" $Id: form_userptr.3x,v 1.18 2020/10/17 23:08:37 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
-.br
+.sp
 int set_form_userptr(FORM *form, void *userptr);
 .br
 void* form_userptr(const FORM *form);
diff --git a/man/form_win.3x b/man/form_win.3x
index b1dc9dff..8d4a46da 100644
--- a/man/form_win.3x
+++ b/man/form_win.3x
@@ -28,22 +28,22 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_win.3x,v 1.16 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_win.3x,v 1.18 2020/10/18 00:00:32 tom Exp $
 .TH form_win 3X ""
 .SH NAME
 \fBform_win\fR \- make and break form window and subwindow associations
 .SH SYNOPSIS
 \fB#include \fR
+.sp
+\fBint set_form_win(FORM *\fP\fIform\fP\fB, WINDOW *\fP\fIwin\fP\fB);\fP
 .br
-int set_form_win(FORM *form, WINDOW *win);
+\fBWINDOW *form_win(const FORM *\fP\fIform\fP\fB);\fP
+.sp
+\fBint set_form_sub(FORM *\fP\fIform\fP\fB, WINDOW *\fP\fIsub\fP\fB);\fP
 .br
-WINDOW *form_win(const FORM *form);
-.br
-int set_form_sub(FORM *form, WINDOW *sub);
-.br
-WINDOW *form_sub(const FORM *form);
-.br
-int scale_form(const FORM *form, int *rows, int *columns);
+\fBWINDOW *form_sub(const FORM *\fP\fIform\fP\fB);\fP
+.sp
+\fBint scale_form(const FORM *\fP\fIform\fP\fB, int *\fP\fIrows\fP\fB, int *\fP\fIcolumns\fP\fB);\fP
 .br
 .SH DESCRIPTION
 Every form has an associated pair of \fBcurses\fR windows.
diff --git a/man/key_defined.3x b/man/key_defined.3x
index 9ff86a7f..c66c54c2 100644
--- a/man/key_defined.3x
+++ b/man/key_defined.3x
@@ -29,14 +29,14 @@
 .\"
 .\" Author: Thomas E. Dickey 2003
 .\"
-.\" $Id: key_defined.3x,v 1.9 2020/02/02 23:34:34 tom Exp $
+.\" $Id: key_defined.3x,v 1.10 2020/10/17 23:39:03 tom Exp $
 .TH key_defined 3X ""
 .SH NAME
 \fBkey_defined\fP \- check if a keycode is defined
 .SH SYNOPSIS
 \fB#include \fP
 .sp
-\fBint key_defined(const char *definition);\fP
+\fBint key_defined(const char *\fP\fIdefinition\fP\fB);\fP
 .SH DESCRIPTION
 This is an extension to the curses library.
 It permits an application to determine if a string is currently bound
diff --git a/man/keybound.3x b/man/keybound.3x
index 6a4642b2..d9a069e8 100644
--- a/man/keybound.3x
+++ b/man/keybound.3x
@@ -29,14 +29,14 @@
 .\"
 .\" Author: Thomas E. Dickey 1999
 .\"
-.\" $Id: keybound.3x,v 1.10 2020/02/02 23:34:34 tom Exp $
+.\" $Id: keybound.3x,v 1.11 2020/10/17 23:39:30 tom Exp $
 .TH keybound 3X ""
 .SH NAME
 \fBkeybound\fP \- return definition of keycode
 .SH SYNOPSIS
 \fB#include \fP
 .sp
-\fBchar * keybound(int keycode, int count);\fP
+\fBchar * keybound(int \fP\fIkeycode\fP\fB, int \fP\fIcount);\fP
 .SH DESCRIPTION
 This is an extension to the curses library.
 It permits an application to determine the string which is defined
diff --git a/man/keyok.3x b/man/keyok.3x
index d3c1c847..937450e5 100644
--- a/man/keyok.3x
+++ b/man/keyok.3x
@@ -29,14 +29,14 @@
 .\"
 .\" Author: Thomas E. Dickey 1997
 .\"
-.\" $Id: keyok.3x,v 1.14 2020/02/02 23:34:34 tom Exp $
+.\" $Id: keyok.3x,v 1.15 2020/10/17 23:39:59 tom Exp $
 .TH keyok 3X ""
 .SH NAME
 \fBkeyok\fP \- enable or disable a keycode
 .SH SYNOPSIS
 \fB#include \fP
 .sp
-\fBint keyok(int keycode, bool enable);\fP
+\fBint keyok(int \fP\fIkeycode\fP\fB, bool \fP\fIenable\fP\fB);\fP
 .SH DESCRIPTION
 This is an extension to the curses library.
 It permits an application to disable specific keycodes, rather than
diff --git a/man/legacy_coding.3x b/man/legacy_coding.3x
index ff951d67..fa3181a8 100644
--- a/man/legacy_coding.3x
+++ b/man/legacy_coding.3x
@@ -29,14 +29,14 @@
 .\"
 .\" Author: Thomas E. Dickey
 .\"
-.\" $Id: legacy_coding.3x,v 1.7 2020/02/02 23:34:34 tom Exp $
+.\" $Id: legacy_coding.3x,v 1.8 2020/10/17 23:40:23 tom Exp $
 .TH legacy_coding 3X ""
 .SH NAME
 \fBuse_legacy_coding\fR \- override locale-encoding checks
 .SH SYNOPSIS
 \fB#include \fP
 .sp
-\fBint use_legacy_coding(int level);\fP
+\fBint use_legacy_coding(int \fP\fIlevel\fP\fB);\fP
 .SH DESCRIPTION
 The \fBuse_legacy_coding\fP function is an extension to the curses library.
 It allows the caller to change the result of \fBunctrl\fP,
diff --git a/man/manhtml.aliases b/man/manhtml.aliases
index 68357971..3b3252bd 100644
--- a/man/manhtml.aliases
+++ b/man/manhtml.aliases
@@ -1,4 +1,4 @@
-# $Id: manhtml.aliases,v 1.17 2020/04/18 14:30:44 tom Exp $
+# $Id: manhtml.aliases,v 1.18 2020/10/17 22:56:04 tom Exp $
 #***************************************************************************
 # Copyright 2019,2020 Thomas E. Dickey                                     *
 # Copyright 2013,2017 Free Software Foundation, Inc.                       *
@@ -63,6 +63,7 @@ tputs(3X)		curs_terminfo(3X)
 use_default_colors(3X)	default_colors(3X)
 use_env(3X)		curs_util(3X)
 use_extended_names(3X)	curs_extend(3X)
+use_legacy_coding(3X)	legacy_coding(3X)
 vidputs(3X)		curs_terminfo(3X)
 wgetch(3X)		curs_getch(3X)
 wnoutrefresh(3X)	curs_refresh(3X)
diff --git a/man/menu_attributes.3x b/man/menu_attributes.3x
index 0dcea245..903e303c 100644
--- a/man/menu_attributes.3x
+++ b/man/menu_attributes.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_attributes.3x,v 1.17 2020/02/02 23:34:34 tom Exp $
+.\" $Id: menu_attributes.3x,v 1.19 2020/10/17 23:58:58 tom Exp $
 .TH menu_attributes 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -45,22 +45,22 @@
 \fBset_menu_pad\fR \- color and attribute control for menus
 .SH SYNOPSIS
 \fB#include \fR
+.sp
+\fBint set_menu_fore(MENU *\fP\fImenu\fP\fB, chtype \fP\fIattr\fP\fB);\fP
 .br
-int set_menu_fore(MENU *menu, chtype attr);
+\fBchtype menu_fore(const MENU *\fP\fImenu\fP\fB);\fP
+.sp
+\fBint set_menu_back(MENU *\fP\fImenu\fP\fB, chtype \fP\fIattr\fP\fB);\fP
 .br
-chtype menu_fore(const MENU *menu);
+\fBchtype menu_back(const MENU *\fP\fImenu\fP\fB);\fP
+.sp
+\fBint set_menu_grey(MENU *\fP\fImenu\fP\fB, chtype \fP\fIattr\fP\fB);\fP
 .br
-int set_menu_back(MENU *menu, chtype attr);
+\fBchtype menu_grey(const MENU *\fP\fImenu\fP\fB);\fP
+.sp
+\fBint set_menu_pad(MENU *\fP\fImenu\fP\fB, int \fP\fIpad\fP\fB);\fP
 .br
-chtype menu_back(const MENU *menu);
-.br
-int set_menu_grey(MENU *menu, chtype attr);
-.br
-chtype menu_grey(const MENU *menu);
-.br
-int set_menu_pad(MENU *menu, int pad);
-.br
-int menu_pad(const MENU *menu);
+\fBint menu_pad(const MENU *\fP\fImenu\fP\fB);\fP
 .br
 .SH DESCRIPTION
 The function \fBset_menu_fore\fR sets the foreground attribute of
diff --git a/man/menu_cursor.3x b/man/menu_cursor.3x
index 2ea893d5..7a364eb5 100644
--- a/man/menu_cursor.3x
+++ b/man/menu_cursor.3x
@@ -28,14 +28,14 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_cursor.3x,v 1.12 2020/02/02 23:34:34 tom Exp $
+.\" $Id: menu_cursor.3x,v 1.13 2020/10/17 23:41:31 tom Exp $
 .TH menu_cursor 3X ""
 .SH NAME
 \fBpos_menu_cursor\fR \- position a menu's cursor
 .SH SYNOPSIS
 \fB#include \fR
-.br
-int pos_menu_cursor(const MENU *menu);
+.sp
+\fBint pos_menu_cursor(const MENU *\fP\fImenu\fP\fB);\fP
 .br
 .SH DESCRIPTION
 The function \fBpos_menu_cursor\fR restores the cursor to the current position
diff --git a/man/menu_driver.3x b/man/menu_driver.3x
index 27dccbb8..a5c5c83d 100644
--- a/man/menu_driver.3x
+++ b/man/menu_driver.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_driver.3x,v 1.26 2020/02/02 23:34:34 tom Exp $
+.\" $Id: menu_driver.3x,v 1.27 2020/10/17 23:42:13 tom Exp $
 .TH menu_driver 3X ""
 .de bP
 .ie n  .IP \(bu 4
@@ -37,8 +37,8 @@
 \fBmenu_driver\fR \- command-processing loop of the menu system
 .SH SYNOPSIS
 \fB#include \fR
-.br
-int menu_driver(MENU *menu, int c);
+.sp
+\fBint menu_driver(MENU *\fP\fImenu\fP\fB, int \fP\fIc\fP\fB);\fP
 .br
 .SH DESCRIPTION
 Once a menu has been posted (displayed), you should funnel input events to it
diff --git a/man/menu_format.3x b/man/menu_format.3x
index ca2e8ef5..d01f27ea 100644
--- a/man/menu_format.3x
+++ b/man/menu_format.3x
@@ -28,17 +28,17 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_format.3x,v 1.17 2020/02/02 23:34:34 tom Exp $
+.\" $Id: menu_format.3x,v 1.18 2020/10/17 23:43:11 tom Exp $
 .TH menu_format 3X ""
 .SH NAME
 \fBset_menu_format\fP,
 \fBmenu_format\fP \- set and get menu sizes
 .SH SYNOPSIS
 \fB#include \fR
+.sp
+\fBint set_menu_format(MENU *\fP\fImenu\fP\fB, int \fP\fIrows\fP\fB, int \fP\fIcols\fP\fB);\fP
 .br
-int set_menu_format(MENU *menu, int rows, int cols);
-.br
-void menu_format(const MENU *menu, int *rows, int *cols);
+\fBvoid menu_format(const MENU *\fP\fImenu\fP\fB, int *\fP\fIrows\fP\fB, int *\fP\fIcols\fP\fB);\fP
 .br
 .SH DESCRIPTION
 The function \fBset_menu_format\fR sets the maximum display size of the given
diff --git a/man/menu_hook.3x b/man/menu_hook.3x
index adf0cb41..17a1036f 100644
--- a/man/menu_hook.3x
+++ b/man/menu_hook.3x
@@ -28,28 +28,28 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_hook.3x,v 1.14 2020/02/02 23:34:34 tom Exp $
+.\" $Id: menu_hook.3x,v 1.15 2020/10/17 23:44:57 tom Exp $
 .TH menu_hook 3X ""
 .SH NAME
 \fBmenu_hook\fR \- set hooks for automatic invocation by applications
 .SH SYNOPSIS
 \fB#include \fR
+.sp
+\fBint set_item_init(MENU *\fP\fImenu\fP\fB, Menu_Hook \fP\fIfunc);\fP
 .br
-int set_item_init(MENU *menu, Menu_Hook func);
+\fBMenu_Hook item_init(const MENU *\fP\fImenu);\fP
+.sp
+\fBint set_item_term(MENU *\fP\fImenu\fP\fB, Menu_Hook \fP\fIfunc);\fP
 .br
-Menu_Hook item_init(const MENU *menu);
+\fBMenu_Hook item_term(const MENU *\fP\fImenu);\fP
+.sp
+\fBint set_menu_init(MENU *\fP\fImenu\fP\fB, Menu_Hook \fP\fIfunc);\fP
 .br
-int set_item_term(MENU *menu, Menu_Hook func);
+\fBMenu_Hook menu_init(const MENU *\fP\fImenu);\fP
+.sp
+\fBint set_menu_term(MENU *\fP\fImenu\fP\fB, Menu_Hook \fP\fIfunc);\fP
 .br
-Menu_Hook item_term(const MENU *menu);
-.br
-int set_menu_init(MENU *menu, Menu_Hook func);
-.br
-Menu_Hook menu_init(const MENU *menu);
-.br
-int set_menu_term(MENU *menu, Menu_Hook func);
-.br
-Menu_Hook menu_term(const MENU *menu);
+\fBMenu_Hook menu_term(const MENU *\fP\fImenu);\fP
 .br
 .SH DESCRIPTION
 These functions make it possible to set hook functions to be called at various
diff --git a/man/menu_items.3x b/man/menu_items.3x
index 939e034d..a9ed4010 100644
--- a/man/menu_items.3x
+++ b/man/menu_items.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_items.3x,v 1.15 2020/03/28 19:06:28 tom Exp $
+.\" $Id: menu_items.3x,v 1.16 2020/10/17 23:08:48 tom Exp $
 .TH menu_items 3X ""
 .SH NAME
 \fBset_menu_items\fR,
@@ -36,7 +36,7 @@
 \fBitem_count\fP \- make and break connections between items and menus
 .SH SYNOPSIS
 \fB#include \fR
-.br
+.sp
 int set_menu_items(MENU *menu, ITEM **items);
 .br
 ITEM **menu_items(const MENU *menu);
diff --git a/man/menu_mark.3x b/man/menu_mark.3x
index 0de4a27e..88498d9a 100644
--- a/man/menu_mark.3x
+++ b/man/menu_mark.3x
@@ -28,14 +28,14 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_mark.3x,v 1.16 2020/03/28 19:06:28 tom Exp $
+.\" $Id: menu_mark.3x,v 1.17 2020/10/17 23:09:02 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
-.br
+.sp
 int set_menu_mark(MENU *menu, const char *mark);
 .br
 const char *menu_mark(const MENU *menu);
diff --git a/man/menu_new.3x b/man/menu_new.3x
index 7854376e..6deb97d9 100644
--- a/man/menu_new.3x
+++ b/man/menu_new.3x
@@ -28,14 +28,14 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_new.3x,v 1.16 2020/03/28 19:06:28 tom Exp $
+.\" $Id: menu_new.3x,v 1.17 2020/10/17 23:09:13 tom Exp $
 .TH menu_new 3X ""
 .SH NAME
 \fBnew_menu\fP,
 \fBfree_menu\fR \- create and destroy menus
 .SH SYNOPSIS
 \fB#include \fR
-.br
+.sp
 MENU *new_menu(ITEM **items);
 .br
 int free_menu(MENU *menu);
diff --git a/man/menu_opts.3x b/man/menu_opts.3x
index 4a0d435d..99e950e5 100644
--- a/man/menu_opts.3x
+++ b/man/menu_opts.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_opts.3x,v 1.17 2020/02/02 23:34:34 tom Exp $
+.\" $Id: menu_opts.3x,v 1.18 2020/10/17 23:46:35 tom Exp $
 .TH menu_opts 3X ""
 .SH NAME
 \fBset_menu_opts\fP,
@@ -37,14 +37,14 @@
 \fBmenu_opts\fR \- set and get menu options
 .SH SYNOPSIS
 \fB#include \fR
+.sp
+\fBint set_menu_opts(MENU *\fP\fImenu\fP\fB, Menu_Options \fP\fIopts\fP\fB);\fP
 .br
-int set_menu_opts(MENU *menu, Menu_Options opts);
+\fBMenu_Options menu_opts(const MENU *\fP\fImenu\fP\fB);\fP
+.sp
+\fBint menu_opts_on(MENU *\fP\fImenu\fP\fB, Menu_Options \fP\fIopts\fP\fB);\fP
 .br
-int menu_opts_on(MENU *menu, Menu_Options opts);
-.br
-int menu_opts_off(MENU *menu, Menu_Options opts);
-.br
-Menu_Options menu_opts(const MENU *menu);
+\fBint menu_opts_off(MENU *\fP\fImenu\fP\fB, Menu_Options \fP\fIopts\fP\fB);\fP
 .br
 .SH DESCRIPTION
 The function \fBset_menu_opts\fR sets all the given menu's option bits (menu
diff --git a/man/menu_pattern.3x b/man/menu_pattern.3x
index f7b34425..a24ffa08 100644
--- a/man/menu_pattern.3x
+++ b/man/menu_pattern.3x
@@ -27,17 +27,17 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_pattern.3x,v 1.19 2020/03/28 19:06:28 tom Exp $
+.\" $Id: menu_pattern.3x,v 1.21 2020/10/18 00:41:14 tom Exp $
 .TH menu_pattern 3X ""
 .SH NAME
 \fBset_menu_pattern\fP,
 \fBmenu_pattern\fR \- set and get a menu's pattern buffer
 .SH SYNOPSIS
 \fB#include \fR
+.sp
+\fBint set_menu_pattern(MENU *\fP\fImenu\fP\fB, const char *\fP\fIpattern\fP\fB);\fP
 .br
-int set_menu_pattern(MENU *menu, const char *pattern);
-.br
-char *menu_pattern(const MENU *menu);
+\fBchar *menu_pattern(const MENU *\fP\fImenu\fP\fB);\fP
 .br
 .SH DESCRIPTION
 Every menu has an associated pattern match buffer.
diff --git a/man/menu_post.3x b/man/menu_post.3x
index 71f31a70..6f14a45a 100644
--- a/man/menu_post.3x
+++ b/man/menu_post.3x
@@ -28,17 +28,17 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_post.3x,v 1.18 2020/02/02 23:34:34 tom Exp $
+.\" $Id: menu_post.3x,v 1.19 2020/10/17 23:47:21 tom Exp $
 .TH menu_post 3X ""
 .SH NAME
 \fBpost_menu\fR,
 \fBunpost_menu\fR \- write or erase menus from associated subwindows
 .SH SYNOPSIS
 \fB#include \fR
+.sp
+\fBint post_menu(MENU *\fP\fImenu\fP\fB);\fP
 .br
-int post_menu(MENU *menu);
-.br
-int unpost_menu(MENU *menu);
+\fBint unpost_menu(MENU *\fP\fImenu\fP\fB);\fP
 .br
 .SH DESCRIPTION
 The function \fBpost_menu\fR displays a menu to its associated subwindow.
diff --git a/man/menu_requestname.3x b/man/menu_requestname.3x
index 30992c07..d10874cc 100644
--- a/man/menu_requestname.3x
+++ b/man/menu_requestname.3x
@@ -28,17 +28,17 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_requestname.3x,v 1.13 2020/03/28 19:06:28 tom Exp $
+.\" $Id: menu_requestname.3x,v 1.15 2020/10/18 00:40:34 tom Exp $
 .TH menu_requestname 3X ""
 .SH NAME
 \fBmenu_request_by_name\fP,
 \fBmenu_request_name\fR \- handle printable menu request names
 .SH SYNOPSIS
 \fB#include \fR
+.sp
+\fBconst char *menu_request_name(int \fP\fIrequest\fP\fB);\fP
 .br
-const char *menu_request_name(int request);
-.br
-int menu_request_by_name(const char *name);
+\fBint menu_request_by_name(const char *\fP\fIname\fP\fB);\fP
 .br
 .SH DESCRIPTION
 The function \fBmenu_request_name\fR returns the printable name of a menu
diff --git a/man/menu_spacing.3x b/man/menu_spacing.3x
index 04ccb573..7d67f0b6 100644
--- a/man/menu_spacing.3x
+++ b/man/menu_spacing.3x
@@ -28,23 +28,23 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_spacing.3x,v 1.16 2020/02/02 23:34:34 tom Exp $
+.\" $Id: menu_spacing.3x,v 1.17 2020/10/17 23:48:53 tom Exp $
 .TH menu_spacing 3X ""
 .SH NAME
 \fBset_menu_spacing\fP,
 \fBmenu_spacing\fR \- set and get spacing between menu items.
 .SH SYNOPSIS
 \fB#include \fR
+.sp
+\fBint set_menu_spacing(MENU *\fP\fImenu\fP\fB,\fP
+                     \fBint \fP\fIspc_description\fP\fB,\fP
+                     \fBint \fP\fIspc_rows\fP\fB,\fP
+                     \fBint \fP\fIspc_columns\fP\fB);\fP
 .br
-int set_menu_spacing(MENU *menu,
-                     int spc_description,
-                     int spc_rows,
-                     int spc_columns);
-.br
-int menu_spacing(const MENU *menu,
-                 int* spc_description,
-                 int* spc_rows,
-                 int* spc_columns);
+\fBint menu_spacing(const MENU *\fP\fImenu\fP\fB,\fP
+                 \fBint* \fP\fIspc_description\fP\fB,\fP
+                 \fBint* \fP\fIspc_rows\fP\fB,\fP
+                 \fBint* \fP\fIspc_columns\fP\fB);\fP
 .br
 .SH DESCRIPTION
 The function \fBset_menu_spacing\fR sets the spacing information for the menu.
diff --git a/man/menu_userptr.3x b/man/menu_userptr.3x
index 3ed7abbf..afc393e0 100644
--- a/man/menu_userptr.3x
+++ b/man/menu_userptr.3x
@@ -28,17 +28,17 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_userptr.3x,v 1.14 2020/03/28 19:06:28 tom Exp $
+.\" $Id: menu_userptr.3x,v 1.16 2020/10/18 00:39:49 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
+.sp
+\fBint set_menu_userptr(MENU *\fP\fImenu\fP\fB, void *\fP\fIuserptr\fP\fB);\fP
 .br
-int set_menu_userptr(MENU *menu, void *userptr);
-.br
-void *menu_userptr(const MENU *menu);
+\fBvoid *menu_userptr(const MENU *\fP\fImenu\fP\fB);\fP
 .br
 .SH DESCRIPTION
 Every menu and every menu item has a field that can be used to hold
diff --git a/man/menu_win.3x b/man/menu_win.3x
index 99ba5463..ae764ec9 100644
--- a/man/menu_win.3x
+++ b/man/menu_win.3x
@@ -28,22 +28,22 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_win.3x,v 1.14 2020/02/02 23:34:34 tom Exp $
+.\" $Id: menu_win.3x,v 1.15 2020/10/17 23:50:51 tom Exp $
 .TH menu_win 3X ""
 .SH NAME
 \fBmenu_win\fR \- make and break menu window and subwindow associations
 .SH SYNOPSIS
 \fB#include \fR
+.sp
+\fBint set_menu_win(MENU *\fP\fImenu\fP\fB, WINDOW *\fP\fIwin\fP\fB);\fP
 .br
-int set_menu_win(MENU *menu, WINDOW *win);
+\fBWINDOW *menu_win(const MENU *\fP\fImenu\fP\fB);\fP
+.sp
+\fBint set_menu_sub(MENU *\fP\fImenu\fP\fB, WINDOW *\fP\fIsub\fP\fB);\fP
 .br
-WINDOW *menu_win(const MENU *menu);
-.br
-int set_menu_sub(MENU *menu, WINDOW *sub);
-.br
-WINDOW *menu_sub(const MENU *menu);
-.br
-int scale_menu(const MENU *menu, int *rows, int *columns);
+\fBWINDOW *menu_sub(const MENU *\fP\fImenu\fP\fB);\fP
+.sp
+\fBint scale_menu(const MENU *\fP\fImenu, int *\fP\fIrows\fP\fB, int *\fP\fIcolumns);\fP
 .br
 .SH DESCRIPTION
 Every menu has an associated pair of \fBcurses\fR windows.
diff --git a/man/mitem_current.3x b/man/mitem_current.3x
index 360f7997..4cd37b60 100644
--- a/man/mitem_current.3x
+++ b/man/mitem_current.3x
@@ -28,22 +28,22 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_current.3x,v 1.18 2020/03/28 19:06:28 tom Exp $
+.\" $Id: mitem_current.3x,v 1.20 2020/10/18 00:39:06 tom Exp $
 .TH mitem_current 3X ""
 .SH NAME
 \fBmitem_current\fR \- set and get current_menu_item
 .SH SYNOPSIS
 \fB#include \fR
+.sp
+\fBint set_current_item(MENU *\fP\fImenu\fP\fB, ITEM *\fP\fIitem\fP\fB);\fP
 .br
-int set_current_item(MENU *menu, ITEM *item);
+\fBITEM *current_item(const MENU *\fP\fImenu\fP\fB);\fP
+.sp
+\fBint set_top_row(MENU *\fP\fImenu\fP\fB, int \fP\fIrow\fP\fB);\fP
 .br
-ITEM *current_item(const MENU *menu);
-.br
-int set_top_row(MENU *menu, int row);
-.br
-int top_row(const MENU *menu);
-.br
-int item_index(const ITEM *item);
+\fBint top_row(const MENU *\fP\fImenu\fP\fB);\fP
+.sp
+\fBint item_index(const ITEM *\fP\fIitem\fP\fB);\fP
 .br
 .SH DESCRIPTION
 The function \fBset_current_item\fR sets the current item (the item on which
diff --git a/man/mitem_name.3x b/man/mitem_name.3x
index 90ab3f74..bf50cfd8 100644
--- a/man/mitem_name.3x
+++ b/man/mitem_name.3x
@@ -28,17 +28,17 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_name.3x,v 1.12 2020/03/28 19:06:28 tom Exp $
+.\" $Id: mitem_name.3x,v 1.14 2020/10/18 00:37:48 tom Exp $
 .TH mitem_name 3X ""
 .SH NAME
 \fBitem_name\fR,
 \fBitem_description\fR \- get menu item name and description fields
 .SH SYNOPSIS
 \fB#include \fR
+.sp
+\fBconst char *item_name(const ITEM *\fP\fIitem\fP\fB);\fP
 .br
-const char *item_name(const ITEM *item);
-.br
-const char *item_description(const ITEM *item);
+\fBconst char *item_description(const ITEM *\fP\fIitem\fP\fB);\fP
 .br
 .SH DESCRIPTION
 The function \fBitem_name\fR returns the name part of the given item.
diff --git a/man/mitem_new.3x b/man/mitem_new.3x
index bc160f8c..ce52044f 100644
--- a/man/mitem_new.3x
+++ b/man/mitem_new.3x
@@ -28,17 +28,17 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_new.3x,v 1.17 2020/03/28 19:06:28 tom Exp $
+.\" $Id: mitem_new.3x,v 1.19 2020/10/18 00:37:03 tom Exp $
 .TH mitem_new 3X ""
 .SH NAME
 \fBnew_item\fP,
 \fBfree_item\fR \- create and destroy menu items
 .SH SYNOPSIS
 \fB#include \fR
+.sp
+\fBITEM *new_item(const char *\fP\fIname\fP\fB, const char *\fP\fIdescription\fP\fB);\fP
 .br
-ITEM *new_item(const char *name, const char *description);
-.br
-int free_item(ITEM *item);
+\fBint free_item(ITEM *\fP\fIitem\fP\fB);\fP
 .br
 .SH DESCRIPTION
 The function \fBnew_item\fR allocates a new item and initializes it from the
diff --git a/man/mitem_opts.3x b/man/mitem_opts.3x
index 27459433..105f9de9 100644
--- a/man/mitem_opts.3x
+++ b/man/mitem_opts.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_opts.3x,v 1.15 2020/02/02 23:34:34 tom Exp $
+.\" $Id: mitem_opts.3x,v 1.16 2020/10/17 23:52:26 tom Exp $
 .TH mitem_opts 3X ""
 .SH NAME
 \fBset_item_opts\fP,
@@ -37,14 +37,14 @@
 \fBitem_opts\fR \- set and get menu item options
 .SH SYNOPSIS
 \fB#include \fR
+.sp
+\fBint set_item_opts(ITEM *\fP\fIitem\fP\fB, Item_Options \fP\fIopts\fP\fB);\fP
 .br
-int set_item_opts(ITEM *item, Item_Options opts);
+\fBItem_Options item_opts(const ITEM *\fP\fIitem\fP\fB);\fP
+.sp
+\fBint item_opts_on(ITEM *\fP\fIitem\fP\fB, Item_Options \fP\fIopts\fP\fB);\fP
 .br
-int item_opts_on(ITEM *item, Item_Options opts);
-.br
-int item_opts_off(ITEM *item, Item_Options opts);
-.br
-Item_Options item_opts(const ITEM *item);
+\fBint item_opts_off(ITEM *\fP\fIitem\fP\fB, Item_Options \fP\fIopts\fP\fB);\fP
 .br
 .SH DESCRIPTION
 The function \fBset_item_opts\fR sets all the given item's option bits (menu
diff --git a/man/mitem_userptr.3x b/man/mitem_userptr.3x
index e17dbc8d..3c3feb26 100644
--- a/man/mitem_userptr.3x
+++ b/man/mitem_userptr.3x
@@ -28,17 +28,17 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_userptr.3x,v 1.15 2020/03/28 19:06:28 tom Exp $
+.\" $Id: mitem_userptr.3x,v 1.17 2020/10/18 00:36:16 tom Exp $
 .TH mitem_userptr 3X ""
 .SH NAME
 \fBset_item_userptr\fP,
 \fBitem_userptr\fR \- associate application data with a menu item
 .SH SYNOPSIS
 \fB#include \fR
+.sp
+\fBint set_item_userptr(ITEM *\fP\fIitem\fP\fB, void *\fP\fIuserptr\fP\fB);\fP
 .br
-int set_item_userptr(ITEM *item, void *userptr);
-.br
-void *item_userptr(const ITEM *item);
+\fBvoid *item_userptr(const ITEM *\fP\fIitem\fP\fB);\fP
 .br
 .SH DESCRIPTION
 Every menu item has a field that can be used to hold application-specific data
diff --git a/man/mitem_value.3x b/man/mitem_value.3x
index ddbc0f5d..3dc20f1a 100644
--- a/man/mitem_value.3x
+++ b/man/mitem_value.3x
@@ -27,17 +27,17 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_value.3x,v 1.14 2020/02/02 23:34:34 tom Exp $
+.\" $Id: mitem_value.3x,v 1.15 2020/10/17 23:53:24 tom Exp $
 .TH mitem_value 3X ""
 .SH NAME
 \fBset_item_value\fP,
 \fBitem_value\fP \- set and get menu item values
 .SH SYNOPSIS
 \fB#include \fR
+.sp
+\fBint set_item_value(ITEM *\fP\fIitem\fP\fB, bool \fP\fIvalue\fP\fB);\fP
 .br
-int set_item_value(ITEM *item, bool value);
-.br
-bool item_value(const ITEM *item);
+\fBbool item_value(const ITEM *\fP\fIitem\fP\fB);\fP
 .br
 .SH DESCRIPTION
 If you turn off the menu option \fBO_ONEVALUE\fR (e.g., with
diff --git a/man/mitem_visible.3x b/man/mitem_visible.3x
index 37f569c5..5e6d1682 100644
--- a/man/mitem_visible.3x
+++ b/man/mitem_visible.3x
@@ -28,14 +28,14 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_visible.3x,v 1.9 2020/02/02 23:34:34 tom Exp $
+.\" $Id: mitem_visible.3x,v 1.10 2020/10/17 23:53:55 tom Exp $
 .TH mitem_visible 3X ""
 .SH NAME
 \fBmitem_visible\fR \- check visibility of a menu item
 .SH SYNOPSIS
 \fB#include \fR
-.br
-bool item_visible(const ITEM *item);
+.sp
+\fBbool item_visible(const ITEM *\fP\fIitem\fP\fB);\fP
 .br
 .SH DESCRIPTION
 A menu item is visible when it is in the portion of a posted menu that
diff --git a/man/new_pair.3x b/man/new_pair.3x
index 3f1e3ac6..c2252388 100644
--- a/man/new_pair.3x
+++ b/man/new_pair.3x
@@ -29,7 +29,7 @@
 .\"
 .\" Author: Thomas E. Dickey
 .\"
-.\" $Id: new_pair.3x,v 1.14 2020/02/02 23:34:34 tom Exp $
+.\" $Id: new_pair.3x,v 1.15 2020/10/17 23:54:50 tom Exp $
 .TH new_pair 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -60,11 +60,11 @@
 .SH SYNOPSIS
 \fB#include \fP
 .sp
-\fBint alloc_pair(int fg, int bg);\fP
+\fBint alloc_pair(int \fP\fIfg\fP\fB, int \fP\fIbg\fP\fB);\fP
 .br
-\fBint find_pair(int fg, int bg);\fP
+\fBint find_pair(int \fP\fIfg\fP\fB, int \fP\fIbg\fP\fB);\fP
 .br
-\fBint free_pair(int pair);\fP
+\fBint free_pair(int \fP\fIpair\fP\fB);\fP
 .SH DESCRIPTION
 These functions are an extension to the curses library.
 They permit an application to dynamically allocate a color pair using
diff --git a/man/resizeterm.3x b/man/resizeterm.3x
index 5f2bc935..ae5106e1 100644
--- a/man/resizeterm.3x
+++ b/man/resizeterm.3x
@@ -29,7 +29,7 @@
 .\"
 .\" Author: Thomas E. Dickey 1996-on
 .\"
-.\" $Id: resizeterm.3x,v 1.27 2020/02/02 23:34:34 tom Exp $
+.\" $Id: resizeterm.3x,v 1.28 2020/10/17 23:55:41 tom Exp $
 .TH resizeterm 3X ""
 .de bP
 .ie n  .IP \(bu 4
@@ -42,11 +42,11 @@
 .SH SYNOPSIS
 \fB#include \fR
 .sp
-\fBbool is_term_resized(int lines, int columns);\fR
+\fBbool is_term_resized(int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fR
 .br
-\fBint resize_term(int lines, int columns);\fR
+\fBint resize_term(int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fR
 .br
-\fBint resizeterm(int lines, int columns);\fR
+\fBint resizeterm(int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fR
 .SH DESCRIPTION
 .PP
 This is an extension to the curses library.
diff --git a/man/wresize.3x b/man/wresize.3x
index 8afaddaa..54c1fc6b 100644
--- a/man/wresize.3x
+++ b/man/wresize.3x
@@ -29,14 +29,14 @@
 .\"
 .\" Author: Thomas E. Dickey 1996
 .\"
-.\" $Id: wresize.3x,v 1.16 2020/02/02 23:34:34 tom Exp $
+.\" $Id: wresize.3x,v 1.17 2020/10/17 23:56:38 tom Exp $
 .TH wresize 3X ""
 .SH NAME
 \fBwresize\fR \- resize a curses window
 .SH SYNOPSIS
 \fB#include \fR
 .sp
-\fBint wresize(WINDOW *win, int lines, int columns);\fR
+\fBint wresize(WINDOW *\fP\fIwin\fP\fB, int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fR
 .SH DESCRIPTION
 This is an extension to the curses library.
 It reallocates storage for an \fBncurses\fR
diff --git a/misc/terminfo.src b/misc/terminfo.src
index db0c8348..cda81102 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.825 $
-#	$Date: 2020/10/11 00:01:33 $
+#	$Revision: 1.826 $
+#	$Date: 2020/10/17 22:41:29 $
 #
 # The original header is preserved below for reference.  It is noted that there
 # is a "newer" version which differs in some cosmetic details (but actually
@@ -19599,6 +19599,13 @@ tek4106brl|tek4107brl|tek4109brl|Tektronix 4106 4107 or 4109,
 	smkx=\E[?1h\E=, smso=\E[7;42m, smul=\E[4m, tbc=\E[3g,
 	use=ecma+index,
 
+# Refer to:
+# TEK Programmer's Reference
+# Part No. 070-4893-00
+# Product Group 18
+# 4107/4109 Computer Display Terminal
+# November 1983
+#
 # Tektronix 4107/4109 interpret 4 modes using "\E%!" followed by a code:
 # 0 selects Tek mode, i.e., \E%!0
 # 1 selects ANSI mode
@@ -19607,7 +19614,9 @@ tek4106brl|tek4107brl|tek4109brl|Tektronix 4106 4107 or 4109,
 #
 # One odd thing about the description (which has been unchanged since the 90s)
 # is that the cursor addressing is using VT52 mode, and a few others use the
-# VT52's non-CSI versions of ANSI, e.g., \EJ.
+# VT52's non-CSI versions of ANSI, e.g., \EJ.  A possible explanation is that
+# the developer used Emacs, which misuses cvvis (this description sets VT52
+# mode in that capability).
 tek4107|tek4109|tektronix terminals 4107 4109,
 	OTbs, am, mir, msgr, ul, xenl, xt,
 	cols#79, it#8, lines#29,
@@ -26685,4 +26694,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	+ fix some sgr inconsistencies in d230c, ibm6153, ibm6154,
 #	  ncrvt100an -TD
 #
+# 2020-10-17
+#	+ expanded notes about tek4107 -TD
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 851d6cc7..09429725 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20201010) unstable; urgency=low
+ncurses6 (6.2+20201017) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 10 Oct 2020 04:40:40 -0400
+ -- Thomas E. Dickey   Sat, 17 Oct 2020 07:56:23 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 851d6cc7..09429725 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20201010) unstable; urgency=low
+ncurses6 (6.2+20201017) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 10 Oct 2020 04:40:40 -0400
+ -- Thomas E. Dickey   Sat, 17 Oct 2020 07:56:23 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index da656771..49e19fc6 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20201010) unstable; urgency=low
+ncurses6 (6.2+20201017) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 10 Oct 2020 04:40:40 -0400
+ -- Thomas E. Dickey   Sat, 17 Oct 2020 07:56:23 -0400
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 1de5eb04..fdc5f6ae 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.424 2020/10/10 08:40:40 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.425 2020/10/17 11:56:23 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "2"
 !define VERSION_YYYY  "2020"
-!define VERSION_MMDD  "1010"
+!define VERSION_MMDD  "1017"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index a4ad4be8..017dd649 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.2
-Release: 20201010
+Release: 20201017
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncurses.spec b/package/ncurses.spec
index e604bc49..eea06fcb 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.2
-Release: 20201010
+Release: 20201017
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 4514c618..56aad1bc 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.2
-Release: 20201010
+Release: 20201017
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
-- 
2.44.0