From: Thomas E. Dickey Date: Mon, 18 Mar 2019 00:04:50 +0000 (+0000) Subject: ncurses 6.1 - patch 20190317 X-Git-Tag: v6.2~47 X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=cb4427a16794d98049b4d790b810d62217501f9f 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. --- 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 @@