From cb4427a16794d98049b4d790b810d62217501f9f Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Mon, 18 Mar 2019 00:04:50 +0000 Subject: [PATCH] ncurses 6.1 - patch 20190317 + regenerate llib-* files. + modify tic to also use new function for user-defined capability info. + modify _nc_parse_entry() to check if a user-defined capability has an unexpected type; ignore it in that case. + fix a special case of link-anchors in generated Ada html files. + use newer rel=author tag in generated html rather than rev=made, which did not become accepted. --- Ada95/gen/Makefile.in | 6 +- Ada95/gen/html.m4 | 6 +- NEWS | 11 +- VERSION | 2 +- dist.mk | 6 +- doc/html/Ada95.html | 6 +- doc/html/ada/funcs/B.htm | 4 +- doc/html/ada/funcs/C.htm | 38 +- doc/html/ada/funcs/D.htm | 24 +- doc/html/ada/funcs/E.htm | 8 +- doc/html/ada/funcs/F.htm | 20 +- doc/html/ada/funcs/G.htm | 30 +- doc/html/ada/funcs/H.htm | 10 +- doc/html/ada/funcs/I.htm | 42 +- doc/html/ada/funcs/K.htm | 8 +- doc/html/ada/funcs/L.htm | 8 +- doc/html/ada/funcs/M.htm | 62 +- doc/html/ada/funcs/N.htm | 30 +- doc/html/ada/funcs/O.htm | 4 +- doc/html/ada/funcs/P.htm | 12 +- doc/html/ada/funcs/Q.htm | 2 +- doc/html/ada/funcs/R.htm | 16 +- doc/html/ada/funcs/S.htm | 100 +- doc/html/ada/funcs/T.htm | 12 +- doc/html/ada/funcs/U.htm | 10 +- doc/html/ada/funcs/W.htm | 92 +- .../terminal_interface-curses-aux__adb.htm | 66 +- .../terminal_interface-curses-aux__ads.htm | 106 +- ...ce-curses-forms-field_types-alpha__adb.htm | 6 +- ...ce-curses-forms-field_types-alpha__ads.htm | 2 +- ...es-forms-field_types-alphanumeric__adb.htm | 6 +- ...es-forms-field_types-alphanumeric__ads.htm | 2 +- ...forms-field_types-enumeration-ada__adb.htm | 12 +- ...ses-forms-field_types-enumeration__adb.htm | 22 +- ...ses-forms-field_types-enumeration__ads.htm | 14 +- ...curses-forms-field_types-intfield__adb.htm | 14 +- ...curses-forms-field_types-intfield__ads.htm | 2 +- ...es-forms-field_types-ipv4_address__adb.htm | 6 +- ...es-forms-field_types-ipv4_address__ads.htm | 2 +- ...-curses-forms-field_types-numeric__adb.htm | 8 +- ...-curses-forms-field_types-numeric__ads.htm | 2 +- ...e-curses-forms-field_types-regexp__adb.htm | 6 +- ...e-curses-forms-field_types-regexp__ads.htm | 2 +- ...ses-forms-field_types-user-choice__adb.htm | 38 +- ...ses-forms-field_types-user-choice__ads.htm | 2 +- ...ace-curses-forms-field_types-user__adb.htm | 54 +- ...ace-curses-forms-field_types-user__ads.htm | 4 +- ...nterface-curses-forms-field_types__adb.htm | 232 +- ...nterface-curses-forms-field_types__ads.htm | 167 +- ...face-curses-forms-field_user_data__adb.htm | 26 +- ...face-curses-forms-field_user_data__ads.htm | 16 +- ...rface-curses-forms-form_user_data__adb.htm | 26 +- ...rface-curses-forms-form_user_data__ads.htm | 16 +- .../terminal_interface-curses-forms__adb.htm | 242 +- .../terminal_interface-curses-forms__ads.htm | 126 +- ...rface-curses-menus-item_user_data__adb.htm | 29 +- ...rface-curses-menus-item_user_data__ads.htm | 18 +- ...rface-curses-menus-menu_user_data__adb.htm | 26 +- ...rface-curses-menus-menu_user_data__ads.htm | 16 +- .../terminal_interface-curses-menus__adb.htm | 767 +++--- .../terminal_interface-curses-menus__ads.htm | 386 +-- .../terminal_interface-curses-mouse__adb.htm | 164 +- .../terminal_interface-curses-mouse__ads.htm | 52 +- ...interface-curses-panels-user_data__adb.htm | 4 +- ...interface-curses-panels-user_data__ads.htm | 6 +- .../terminal_interface-curses-panels__adb.htm | 34 +- .../terminal_interface-curses-panels__ads.htm | 30 +- .../terminal_interface-curses-putwin__adb.htm | 8 +- ...terminal_interface-curses-termcap__adb.htm | 18 +- ...erminal_interface-curses-terminfo__adb.htm | 18 +- .../terminal_interface-curses-trace__ads.htm | 4 +- .../ada/terminal_interface-curses__adb.htm | 2293 ++++++++--------- .../ada/terminal_interface-curses__ads.htm | 1160 ++++----- doc/html/hackguide.html | 6 +- doc/html/index.html | 6 +- doc/html/man/adacurses6-config.1.html | 4 +- doc/html/man/captoinfo.1m.html | 4 +- doc/html/man/clear.1.html | 4 +- doc/html/man/curs_add_wch.3x.html | 2 +- doc/html/man/curs_add_wchstr.3x.html | 2 +- doc/html/man/curs_addch.3x.html | 2 +- doc/html/man/curs_addchstr.3x.html | 2 +- doc/html/man/curs_addstr.3x.html | 2 +- doc/html/man/curs_addwstr.3x.html | 2 +- doc/html/man/curs_attr.3x.html | 2 +- doc/html/man/curs_beep.3x.html | 2 +- doc/html/man/curs_bkgd.3x.html | 2 +- doc/html/man/curs_bkgrnd.3x.html | 2 +- doc/html/man/curs_border.3x.html | 2 +- doc/html/man/curs_border_set.3x.html | 2 +- doc/html/man/curs_clear.3x.html | 2 +- doc/html/man/curs_color.3x.html | 2 +- doc/html/man/curs_delch.3x.html | 2 +- doc/html/man/curs_deleteln.3x.html | 2 +- doc/html/man/curs_extend.3x.html | 2 +- doc/html/man/curs_get_wch.3x.html | 2 +- doc/html/man/curs_get_wstr.3x.html | 2 +- doc/html/man/curs_getcchar.3x.html | 2 +- doc/html/man/curs_getch.3x.html | 2 +- doc/html/man/curs_getstr.3x.html | 2 +- doc/html/man/curs_getyx.3x.html | 2 +- doc/html/man/curs_in_wch.3x.html | 2 +- doc/html/man/curs_in_wchstr.3x.html | 2 +- doc/html/man/curs_inch.3x.html | 2 +- doc/html/man/curs_inchstr.3x.html | 2 +- doc/html/man/curs_initscr.3x.html | 2 +- doc/html/man/curs_inopts.3x.html | 2 +- doc/html/man/curs_ins_wch.3x.html | 2 +- doc/html/man/curs_ins_wstr.3x.html | 2 +- doc/html/man/curs_insch.3x.html | 2 +- doc/html/man/curs_insstr.3x.html | 2 +- doc/html/man/curs_instr.3x.html | 2 +- doc/html/man/curs_inwstr.3x.html | 2 +- doc/html/man/curs_kernel.3x.html | 2 +- doc/html/man/curs_legacy.3x.html | 2 +- doc/html/man/curs_memleaks.3x.html | 2 +- doc/html/man/curs_mouse.3x.html | 2 +- doc/html/man/curs_move.3x.html | 2 +- doc/html/man/curs_opaque.3x.html | 2 +- doc/html/man/curs_outopts.3x.html | 2 +- doc/html/man/curs_overlay.3x.html | 2 +- doc/html/man/curs_pad.3x.html | 2 +- doc/html/man/curs_print.3x.html | 2 +- doc/html/man/curs_printw.3x.html | 2 +- doc/html/man/curs_refresh.3x.html | 2 +- doc/html/man/curs_scanw.3x.html | 2 +- doc/html/man/curs_scr_dump.3x.html | 2 +- doc/html/man/curs_scroll.3x.html | 2 +- doc/html/man/curs_slk.3x.html | 2 +- doc/html/man/curs_sp_funcs.3x.html | 2 +- doc/html/man/curs_termattrs.3x.html | 2 +- doc/html/man/curs_termcap.3x.html | 2 +- doc/html/man/curs_terminfo.3x.html | 2 +- doc/html/man/curs_threads.3x.html | 2 +- doc/html/man/curs_touch.3x.html | 2 +- doc/html/man/curs_trace.3x.html | 2 +- doc/html/man/curs_util.3x.html | 2 +- doc/html/man/curs_variables.3x.html | 2 +- doc/html/man/curs_window.3x.html | 2 +- doc/html/man/default_colors.3x.html | 2 +- doc/html/man/define_key.3x.html | 2 +- doc/html/man/form.3x.html | 4 +- doc/html/man/form_cursor.3x.html | 2 +- doc/html/man/form_data.3x.html | 2 +- doc/html/man/form_driver.3x.html | 2 +- doc/html/man/form_field.3x.html | 2 +- doc/html/man/form_field_attributes.3x.html | 2 +- doc/html/man/form_field_buffer.3x.html | 2 +- doc/html/man/form_field_info.3x.html | 2 +- doc/html/man/form_field_just.3x.html | 2 +- doc/html/man/form_field_new.3x.html | 2 +- doc/html/man/form_field_opts.3x.html | 2 +- doc/html/man/form_field_userptr.3x.html | 2 +- doc/html/man/form_field_validation.3x.html | 2 +- doc/html/man/form_fieldtype.3x.html | 2 +- doc/html/man/form_hook.3x.html | 2 +- doc/html/man/form_new.3x.html | 2 +- doc/html/man/form_new_page.3x.html | 2 +- doc/html/man/form_opts.3x.html | 2 +- doc/html/man/form_page.3x.html | 2 +- doc/html/man/form_post.3x.html | 2 +- doc/html/man/form_requestname.3x.html | 2 +- doc/html/man/form_userptr.3x.html | 2 +- doc/html/man/form_variables.3x.html | 2 +- doc/html/man/form_win.3x.html | 2 +- doc/html/man/index.html | 6 +- doc/html/man/infocmp.1m.html | 4 +- doc/html/man/infotocap.1m.html | 4 +- doc/html/man/key_defined.3x.html | 2 +- doc/html/man/keybound.3x.html | 2 +- doc/html/man/keyok.3x.html | 2 +- doc/html/man/legacy_coding.3x.html | 2 +- doc/html/man/menu.3x.html | 4 +- doc/html/man/menu_attributes.3x.html | 2 +- doc/html/man/menu_cursor.3x.html | 2 +- doc/html/man/menu_driver.3x.html | 2 +- doc/html/man/menu_format.3x.html | 2 +- doc/html/man/menu_hook.3x.html | 2 +- doc/html/man/menu_items.3x.html | 2 +- doc/html/man/menu_mark.3x.html | 2 +- doc/html/man/menu_new.3x.html | 2 +- doc/html/man/menu_opts.3x.html | 2 +- doc/html/man/menu_pattern.3x.html | 2 +- doc/html/man/menu_post.3x.html | 2 +- doc/html/man/menu_requestname.3x.html | 2 +- doc/html/man/menu_spacing.3x.html | 2 +- doc/html/man/menu_userptr.3x.html | 2 +- doc/html/man/menu_win.3x.html | 2 +- doc/html/man/mitem_current.3x.html | 2 +- doc/html/man/mitem_name.3x.html | 2 +- doc/html/man/mitem_new.3x.html | 2 +- doc/html/man/mitem_opts.3x.html | 2 +- doc/html/man/mitem_userptr.3x.html | 2 +- doc/html/man/mitem_value.3x.html | 2 +- doc/html/man/mitem_visible.3x.html | 2 +- doc/html/man/ncurses.3x.html | 4 +- doc/html/man/ncurses6-config.1.html | 4 +- doc/html/man/new_pair.3x.html | 2 +- doc/html/man/panel.3x.html | 4 +- doc/html/man/resizeterm.3x.html | 2 +- doc/html/man/scr_dump.5.html | 2 +- doc/html/man/tabs.1.html | 4 +- doc/html/man/term.5.html | 2 +- doc/html/man/term.7.html | 2 +- doc/html/man/term_variables.3x.html | 2 +- doc/html/man/terminfo.5.html | 6 +- doc/html/man/tic.1m.html | 4 +- doc/html/man/toe.1m.html | 4 +- doc/html/man/tput.1.html | 4 +- doc/html/man/tset.1.html | 4 +- doc/html/man/user_caps.5.html | 2 +- doc/html/man/wresize.3x.html | 2 +- doc/html/ncurses-intro.html | 6 +- include/Caps-ncurses | 12 +- ncurses/llib-lncurses | 57 +- ncurses/llib-lncursest | 56 +- ncurses/llib-lncursestw | 57 +- ncurses/llib-lncursesw | 56 +- ncurses/llib-ltinfo | 24 +- ncurses/llib-ltinfot | 24 +- ncurses/llib-ltinfotw | 24 +- ncurses/llib-ltinfow | 24 +- ncurses/tinfo/MKuserdefs.sh | 4 +- ncurses/tinfo/lib_tputs.c | 5 +- ncurses/tinfo/parse_entry.c | 59 +- 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.map | 3 +- package/ncurses.spec | 2 +- package/ncursest.map | 3 +- package/ncursest.spec | 2 +- package/ncursestw.map | 3 +- package/ncursesw.map | 3 +- progs/tic.c | 66 +- 237 files changed, 3916 insertions(+), 3745 deletions(-) diff --git a/Ada95/gen/Makefile.in b/Ada95/gen/Makefile.in index 327fc488..9f2f3628 100644 --- a/Ada95/gen/Makefile.in +++ b/Ada95/gen/Makefile.in @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 1998-2015,2018 Free Software Foundation, Inc. # +# Copyright (c) 1998-2018,2019 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # @@ -28,7 +28,7 @@ # # Author: Juergen Pfeifer, 1996 # -# $Id: Makefile.in,v 1.87 2018/01/16 00:12:53 tom Exp $ +# $Id: Makefile.in,v 1.88 2019/03/16 21:43:34 tom Exp $ # .SUFFIXES: @@ -329,6 +329,8 @@ adahtml: sed -e 's%GNAT%GNAT%g' |\ sed -e 's%<A HREF%%g' |\ + sed -e 's%#1A\([[:space:]]*NAME="[^"]*"\)#2%%' |\ + sed -e 's%#1/A#2%%' |\ sed -e 's/3X/3x/g' |\ sed -e 's/$$\([ABCDEFGHIJKLMNOPQRSTUVWXZabcdefghijklmnopqrstuvwxz0123456789_]*:.*\)\$$/@\1@/' |\ sed -e 's%</A>%%g' > $$a.tmp ;\ diff --git a/Ada95/gen/html.m4 b/Ada95/gen/html.m4 index 8df2653c..76058505 100644 --- a/Ada95/gen/html.m4 +++ b/Ada95/gen/html.m4 @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright (c) 2000-2006,2007 Free Software Foundation, Inc. * +dnl Copyright (c) 2000-2007,2019 Free Software Foundation, Inc. * dnl * dnl Permission is hereby granted, free of charge, to any person obtaining a * dnl copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ dnl sale, use or other dealings in this Software without prior written * dnl authorization. * dnl*************************************************************************** dnl -dnl $Id: html.m4,v 1.3 2007/09/01 23:59:59 tom Exp $ +dnl $Id: html.m4,v 1.4 2019/03/16 21:49:15 tom Exp $ define(`ANCHORIDX',`0')dnl define(`MANPAGE',`define(`MANPG',$1)dnl |===================================================================== @@ -35,6 +35,6 @@ define(`MANPAGE',`define(`MANPG',$1)dnl define(`ANCHOR',`define(`ANCHORIDX',incr(ANCHORIDX))dnl `#'1A NAME="AFU`_'ANCHORIDX"`#'2dnl define(`CFUNAME',`$1')define(`AFUNAME',`$2')dnl -|')dnl +|#1/A#2')dnl define(`AKA',``AKA': CFUNAME')dnl define(`ALIAS',``AKA': $1')dnl diff --git a/NEWS b/NEWS index 9768cbfb..b96ce872 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.3286 2019/03/09 21:35:49 tom Exp $ +-- $Id: NEWS,v 1.3293 2019/03/17 01:23:23 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,15 @@ 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. +20190317 + + regenerate llib-* files. + + modify tic to also use new function for user-defined capability info. + + modify _nc_parse_entry() to check if a user-defined capability has + an unexpected type; ignore it in that case. + + fix a special case of link-anchors in generated Ada html files. + + use newer rel=author tag in generated html rather than rev=made, + which did not become accepted. + 20190309 + in-progress changes to add parameter-checking for common user-defined capabilities in tic. diff --git a/VERSION b/VERSION index b1c30873..305c6abf 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.1 20190309 +5:0:10 6.1 20190317 diff --git a/dist.mk b/dist.mk index df60f23b..0ec73474 100644 --- a/dist.mk +++ b/dist.mk @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1271 2019/03/09 16:50:35 tom Exp $ +# $Id: dist.mk,v 1.1274 2019/03/17 01:23:23 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -37,7 +37,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 6 NCURSES_MINOR = 1 -NCURSES_PATCH = 20190309 +NCURSES_PATCH = 20190317 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) @@ -118,7 +118,7 @@ manhtml: @echo 's/<\/I>/<\/EM>/g' >> subst.tmp @misc/csort < subst.tmp | uniq > subst.sed @echo '/<\/TITLE>/a\' >> subst.sed - @echo '\' >> subst.sed + @echo '\' >> subst.sed @echo '' >> subst.sed @rm -f subst.tmp @for f in man/*.[0-9]* ; do \ diff --git a/doc/html/Ada95.html b/doc/html/Ada95.html index 77557e77..8d38806b 100644 --- a/doc/html/Ada95.html +++ b/doc/html/Ada95.html @@ -1,7 +1,7 @@