diff --git a/ChangeLog b/ChangeLog index 705e99a..c4cef99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,142 @@ +2017-09-12 Gavin Smith + + 6.5 release. + * configure.ac, NEWS, util/texi2dvi, util/texi2pdf, + doc/refcard/txirefcard.tex: Version number. + +2017-09-04 Gavin Smith + + * pretest 6.4.92 + * configure.ac: Update version. + +2017-09-04 Gavin Smith + + * tp/Makefile.am (AM_T_LOG_FLAGS): Add "-I .". + * tp/tests/run_parser_all.sh: Add "-I ." to perl invocations. + Attempt at getting tests to work if . is not in @INC. Report + from Patrice Dumas. + +2017-09-02 Gavin Smith + + * info/infokey.c (compile): Support "1 menu-digit" in .infokey + file in case this default binding is disabled for some reason. + Clark Wang reported that "1 menu-digit" didn't work. + +2017-08-29 Patrice Dumas + + * autogen.sh: update regeneration of tests makefile fragment to + match the change in tp/Makefile.am associated with the removal + of "long tests" in 2016-10-23. + +2017-08-28 Gavin Smith + + * info/pseudotty.c: Open slave end of pseudoterminal outside of + a conditional block so that it will be open even if that block + is not executed. Otherwise we could fail to turn off the + special interpretation of some characters (C-u, C-s) to the + terminal in time, leading some tests to fail. Assaf Gordon + reported test failures for several platforms. + +2017-08-27 Gavin Smith + + * pretest 6.4.91 + * configure.ac: Update version. + +2017-08-27 Gavin Smith + + * NEWS: Add a couple of news items. + +2017-08-25 Mathieu Lirzin + + * tp/Texinfo/Convert/HTML.pm (_default_node_redirection_page) + (_default_begin_file): Move '$encoding' to the top of the '' + element. This removes a warning in recent browsers that check if + the encoding declaration is present in the first 1024 bytes of the + file. See + https://www.w3.org/TR/html5/document-metadata.html#character-encoding-declaration + +2017-08-23 Gavin Smith + + * doc/texinfo.tex (\entry): When splitting the text across + multiple lines, do not simply set \leftskip and \parindent to + values, alter the existing values instead. Otherwise, long + entries in a table of contents would not be indented properly, + because \leftskip had been set to a positive value. Arnold + Robbins reported that this happened for the gawk manual. Add or + change some comments. + +2017-08-20 Gavin Smith + + * doc/texinfo.tex (\partentry): Add stretch and a bonus for + breaking the page before the part heading in the table of + contents. Arnold Robbins reported that the page could be broken + immediately after the part heading, which separated it from the + entry for the first chapter in that part, which didn't look + good. + +2017-08-18 Gavin Smith + + * po_document: Run fix-translations.sh. + * tp/t: Update test results. + +2017-08-18 Gavin Smith + + * po_document/fix-translations.sh: Add file. + +2017-08-18 Gavin Smith + + * tp/maintain/change_perl_modules.sh: Get version number from + configure.ac instead of from Makefile, as then Makefile doesn't + have to be regenerated before it runs. (Otherwise, there could + be a failure in 'make distcheck' due to a version number + mismatch.) + +2017-08-18 Gavin Smith + + * tp/Texinfo/Convert/Text.pm (@ISA). Add Texinfo::Convert::Converter. + Report from Randall Sawyer 2017-07-31. + +2017-07-31 Gavin Smith + + * tp/texi2any.pl : Check if tree is defined, as + happened before. + +2017-07-31 Randall Sawyer (tiny change) + + * tp/texi2any.pl: Exchange two conditional blocks, so that we + check if 'DUMP_TREE' was given as an option before 'parse' being + the output format, so that + + makeinfo -c DUMP_TREE=1 -c TEXINFO_OUTPUT_FORMAT=parse document.texi + + works to dump the parse tree, as mentioned in the comments at + the end of Parser.pm. + +2017-07-31 Randall Sawyer (tiny change) + + * tp/texi2any.pl (%formats_table) + : Change to use 'module' + value instead of a 'converter' value so that these values for + TEXINFO_OUTPUT_FORMAT work again. + * tp/Texinfo/Convert/Text.pm: Add missing 'use File::Basename' line. + +2017-07-31 Gavin Smith + + * tp/texi2any.pl (%formats_table): Remove 'debugcount' section + as the corresponding module doesn't exist any more. + +2017-07-23 Alexis Bienvene (tiny change) + + * tp/Texinfo/Common.pm (expand_today): + Honour the SOURCE_DATE_EPOCH environment variable to get a + reproducible @today value for info output when it is set. + See https://reproducible-builds.org/specs/source-date-epoch/. + +2017-07-16 Gavin Smith + + * gnulib/m4/intlmacos.m4: Add this file, as gettextize doesn't + copy it. + 2017-07-10 Gavin Smith * pretest 6.4.90 @@ -65,6 +204,11 @@ * info/nodes.c (info_find_file): Do not convert the filename to lowercase and check for it again if a file was not found. + + Note added 2017-08-30: This change was made for code + simplification, and not to fix anything. The thinking behind + the original code was to support a case-insensitive filesystem + that was mounted in a way that was not case-insensitive. 2017-07-06 Gavin Smith diff --git a/Makefile.in b/Makefile.in index 86743b9..ef9d132 100644 --- a/Makefile.in +++ b/Makefile.in @@ -141,6 +141,7 @@ $(top_srcdir)/gnulib/m4/hard-locale.m4 \ $(top_srcdir)/gnulib/m4/iconv.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ + $(top_srcdir)/gnulib/m4/intlmacosx.m4 \ $(top_srcdir)/gnulib/m4/intmax_t.m4 \ $(top_srcdir)/gnulib/m4/inttypes_h.m4 \ $(top_srcdir)/gnulib/m4/iswblank.m4 \ @@ -296,8 +297,8 @@ $(top_srcdir)/build-aux/missing \ $(top_srcdir)/build-aux/tap-driver.sh \ $(top_srcdir)/tp/Texinfo/ModulePath.pm.in ABOUT-NLS AUTHORS \ - COPYING ChangeLog INSTALL NEWS README README-alpha TODO \ - build-aux/ar-lib build-aux/compile build-aux/config.guess \ + COPYING ChangeLog INSTALL NEWS README TODO build-aux/ar-lib \ + build-aux/compile build-aux/config.guess \ build-aux/config.rpath build-aux/config.sub build-aux/depcomp \ build-aux/install-sh build-aux/mdate-sh build-aux/missing \ build-aux/texinfo.tex @@ -816,6 +817,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@ LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@ diff --git a/NEWS b/NEWS index aeb3c34..865a64b 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -$Id: NEWS 7916 2017-07-10 17:52:54Z gavin $ +$Id: NEWS 7939 2017-08-27 09:53:33Z gavin $ This NEWS file records noteworthy changes, very tersely. See the manual for detailed information. @@ -12,6 +12,7 @@ ------------------------------------------------------------------------------ +6.5 (12 September 2017) * info: . some bugs fixed: . a bug where a segfault could happen in the regex search, for @@ -28,12 +29,16 @@ * texinfo.tex . some faulty definitions for Unicode characters have been changed or removed + . fix indentation in table of contents for entries that are split + across multiple lines * texi2dvi . a bug that broke the processing of LaTeX files that did not use BibTeX has been fixed * texi2any + . output the encoding declaration of a HTML file earlier so it + will always occur within first 1024 bytes of file . `INLINE_INSERTCOPYING' removed as a customization variable diff --git a/Pod-Simple-Texinfo/Makefile.in b/Pod-Simple-Texinfo/Makefile.in index 845d277..15a8277 100644 --- a/Pod-Simple-Texinfo/Makefile.in +++ b/Pod-Simple-Texinfo/Makefile.in @@ -129,6 +129,7 @@ $(top_srcdir)/gnulib/m4/hard-locale.m4 \ $(top_srcdir)/gnulib/m4/iconv.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ + $(top_srcdir)/gnulib/m4/intlmacosx.m4 \ $(top_srcdir)/gnulib/m4/intmax_t.m4 \ $(top_srcdir)/gnulib/m4/inttypes_h.m4 \ $(top_srcdir)/gnulib/m4/iswblank.m4 \ @@ -918,6 +919,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@ LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@ diff --git a/README-alpha b/README-alpha deleted file mode 100644 index 02f491e..0000000 --- a/README-alpha +++ /dev/null @@ -1,27 +0,0 @@ -$Id: README-alpha 6124 2015-02-13 20:22:54Z gavin $ -This is the README-alpha file for GNU Texinfo. - - Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005, 2011, 2012, 2014, 2015 - Free Software Foundation, Inc. - - Copying and distribution of this file, with or without modification, - are permitted in any medium without royalty provided the copyright - notice and this notice are preserved. - -This is a test release! - -The latest test release (if any) is available at -ftp://alpha.gnu.org/gnu/texinfo/ - -Please email comments and problem reports to bug-texinfo@gnu.org. You -are welcome to join that mailing list; to do so, please visit -http://lists.gnu.org/mailman/listinfo/bug-texinfo. (There is no -dedicated mailing list for pretests any more.) - -If you see a problem in this release that you've already reported, feel -free to re-report it -- it's good to get a reminder. If you sent a -patch for a previous release, and you haven't received any feedback -about it, please do re-send it, it likely got lost. - -For development environment information, see README-hacking. diff --git a/aclocal.m4 b/aclocal.m4 index 6ca2ad8..9cddcfb 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1177,6 +1177,7 @@ m4_include([gnulib/m4/hard-locale.m4]) m4_include([gnulib/m4/iconv.m4]) m4_include([gnulib/m4/include_next.m4]) +m4_include([gnulib/m4/intlmacosx.m4]) m4_include([gnulib/m4/intmax_t.m4]) m4_include([gnulib/m4/inttypes_h.m4]) m4_include([gnulib/m4/iswblank.m4]) diff --git a/config.in b/config.in index 7a67d40..99e6bb5 100644 --- a/config.in +++ b/config.in @@ -167,6 +167,14 @@ /* Define to 1 if you have the `bzero' function. */ #undef HAVE_BZERO + +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +#undef HAVE_CFLOCALECOPYCURRENT + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +#undef HAVE_CFPREFERENCESCOPYAPPVALUE /* Define to 1 if you have the header file. */ #undef HAVE_CRTDEFS_H diff --git a/configure b/configure index a7a534a..0d67a38 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GNU Texinfo 6.4.90. +# Generated by GNU Autoconf 2.69 for GNU Texinfo 6.5. # # Report bugs to . # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='GNU Texinfo' PACKAGE_TARNAME='texinfo' -PACKAGE_VERSION='6.4.90' -PACKAGE_STRING='GNU Texinfo 6.4.90' +PACKAGE_VERSION='6.5' +PACKAGE_STRING='GNU Texinfo 6.5' PACKAGE_BUGREPORT='bug-texinfo@gnu.org' PACKAGE_URL='http://www.gnu.org/software/texinfo/' @@ -651,6 +651,7 @@ USE_EXTERNAL_LIBINTL POSUB INTLLIBS +INTL_MACOSX_LIBS XGETTEXT_EXTRA_OPTIONS MSGMERGE XGETTEXT_015 @@ -2065,7 +2066,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GNU Texinfo 6.4.90 to adapt to many kinds of systems. +\`configure' configures GNU Texinfo 6.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2135,7 +2136,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU Texinfo 6.4.90:";; + short | recursive ) echo "Configuration of GNU Texinfo 6.5:";; esac cat <<\_ACEOF @@ -2273,7 +2274,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU Texinfo configure 6.4.90 +GNU Texinfo configure 6.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2982,7 +2983,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNU Texinfo $as_me 6.4.90, which was +It was created by GNU Texinfo $as_me 6.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3884,7 +3885,7 @@ # Define the identity of the package. PACKAGE='texinfo' - VERSION='6.4.90' + VERSION='6.5' cat >>confdefs.h <<_ACEOF @@ -23899,7 +23900,81 @@ - gt_INTL_MACOSX + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 +$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } +if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then : + $as_echo_n "(cached) " >&6 +else + gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +CFPreferencesCopyAppValue(NULL, NULL) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_CFPreferencesCopyAppValue=yes +else + gt_cv_func_CFPreferencesCopyAppValue=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gt_save_LIBS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 +$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then + +$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5 +$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; } +if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then : + $as_echo_n "(cached) " >&6 +else + gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +CFLocaleCopyCurrent(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_CFLocaleCopyCurrent=yes +else + gt_cv_func_CFLocaleCopyCurrent=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gt_save_LIBS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5 +$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; } + if test $gt_cv_func_CFLocaleCopyCurrent = yes; then + +$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h + + fi + INTL_MACOSX_LIBS= + if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" + fi + + @@ -26057,7 +26132,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNU Texinfo $as_me 6.4.90, which was +This file was extended by GNU Texinfo $as_me 6.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26125,7 +26200,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GNU Texinfo config.status 6.4.90 +GNU Texinfo config.status 6.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index d1e76c9..e9d7b5b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -# $Id: configure.ac 7845 2017-06-24 19:17:18Z gavin $ +# $Id: configure.ac 7942 2017-08-28 20:42:04Z gavin $ # # Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, # 2012, 2013, 2014, 2015, 2016, 2017 Free Software Foundation, Inc. @@ -12,7 +12,7 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # -AC_INIT([GNU Texinfo], [6.4.90], [bug-texinfo@gnu.org]) +AC_INIT([GNU Texinfo], [6.5], [bug-texinfo@gnu.org]) dnl Must come before AM_INIT_AUTOMAKE. AC_CONFIG_AUX_DIR([build-aux]) diff --git a/doc/Makefile.in b/doc/Makefile.in index 4c9a4d6..70fa672 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -129,6 +129,7 @@ $(top_srcdir)/gnulib/m4/hard-locale.m4 \ $(top_srcdir)/gnulib/m4/iconv.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ + $(top_srcdir)/gnulib/m4/intlmacosx.m4 \ $(top_srcdir)/gnulib/m4/intmax_t.m4 \ $(top_srcdir)/gnulib/m4/inttypes_h.m4 \ $(top_srcdir)/gnulib/m4/iswblank.m4 \ @@ -842,6 +843,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@ LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@ diff --git a/doc/refcard/txirefcard.tex b/doc/refcard/txirefcard.tex index 9b0ce36..2e51ffd 100644 --- a/doc/refcard/txirefcard.tex +++ b/doc/refcard/txirefcard.tex @@ -14,7 +14,7 @@ \newcount\letterpaper \ifx\undefined\afour\letterpaper=1 \else\letterpaper=0 \fi -% Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 +% Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 % Free Software Foundation, Inc. % % This file is part of GNU Texinfo. @@ -50,7 +50,7 @@ % Summary node in the Texinfo manual, originally written by Bob Chassell. \def\versionyear{2017} % year manual was updated -\def\versionTexinfo{6.4} % version of Texinfo this manual is for +\def\versionTexinfo{6.5} % version of Texinfo this manual is for \def\copyrightnotice{% \vskip 1ex plus 1filll\begingroup\small diff --git a/doc/stamp-1 b/doc/stamp-1 index 487620b..fb4b4c6 100644 --- a/doc/stamp-1 +++ b/doc/stamp-1 @@ -1,4 +1,4 @@ @set UPDATED 21 May 2017 @set UPDATED-MONTH May 2017 -@set EDITION 6.4.90 -@set VERSION 6.4.90 +@set EDITION 6.5 +@set VERSION 6.5 diff --git a/doc/stamp-vti b/doc/stamp-vti index 11d3612..e74ab0a 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 28 June 2017 -@set UPDATED-MONTH June 2017 -@set EDITION 6.4.90 -@set VERSION 6.4.90 +@set UPDATED 25 August 2017 +@set UPDATED-MONTH August 2017 +@set EDITION 6.5 +@set VERSION 6.5 diff --git a/doc/texinfo.tex b/doc/texinfo.tex index 3844333..a774790 100644 --- a/doc/texinfo.tex +++ b/doc/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2017-07-04.16} +\def\texinfoversion{2017-08-23.19} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -5696,10 +5696,13 @@ \advance\dimen@ii by 1\dimen@i \ifdim\wd\boxA > \dimen@ii % If the entry doesn't fit in one line \ifdim\dimen@ > 0.8\dimen@ii % due to long index text - \dimen@ = 0.7\dimen@ % Try to split the text roughly evenly + % Try to split the text roughly evenly. \dimen@ will be the length of + % the first line. + \dimen@ = 0.7\dimen@ \dimen@ii = \hsize \ifnum\dimen@>\dimen@ii - % If the entry is too long, use the whole line + % If the entry is too long (for example, if it needs more than + % two lines), use all the space in the first line. \dimen@ = \dimen@ii \fi \advance\leftskip by 0pt plus 1fill % ragged right @@ -5709,8 +5712,9 @@ % instead of using \parshape with explicit line lengths, but TeX % doesn't seem to provide a way to do such a thing. % - \leftskip = 1em - \parindent = -1em + % Indent all lines but the first one. + \advance\leftskip by 1em + \advance\parindent by -1em \fi\fi \indent % start paragraph \unhbox\boxA @@ -6943,7 +6947,15 @@ % exist, with an empty box. Let's hope all the numbers have the same width. % Also ignore the page number, which is conventionally not printed. \def\numeralbox{\setbox0=\hbox{8}\hbox to \wd0{\hfil}} -\def\partentry#1#2#3#4{\dochapentry{\numeralbox\labelspace#1}{}} +\def\partentry#1#2#3#4{% + % Add stretch and a bonus for breaking the page before the part heading. + % This reduces the chance of the page being broken immediately after the + % part heading, before a following chapter heading. + \vskip 0pt plus 5\baselineskip + \penalty-300 + \vskip 0pt plus -5\baselineskip + \dochapentry{\numeralbox\labelspace#1}{}% +} % % Parts, in the short toc. \def\shortpartentry#1#2#3#4{% diff --git a/doc/tp_api/Makefile.in b/doc/tp_api/Makefile.in index 991c54c..2210862 100644 --- a/doc/tp_api/Makefile.in +++ b/doc/tp_api/Makefile.in @@ -129,6 +129,7 @@ $(top_srcdir)/gnulib/m4/hard-locale.m4 \ $(top_srcdir)/gnulib/m4/iconv.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ + $(top_srcdir)/gnulib/m4/intlmacosx.m4 \ $(top_srcdir)/gnulib/m4/intmax_t.m4 \ $(top_srcdir)/gnulib/m4/inttypes_h.m4 \ $(top_srcdir)/gnulib/m4/iswblank.m4 \ @@ -709,6 +710,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@ LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@ diff --git a/doc/version-stnd.texi b/doc/version-stnd.texi index 487620b..fb4b4c6 100644 --- a/doc/version-stnd.texi +++ b/doc/version-stnd.texi @@ -1,4 +1,4 @@ @set UPDATED 21 May 2017 @set UPDATED-MONTH May 2017 -@set EDITION 6.4.90 -@set VERSION 6.4.90 +@set EDITION 6.5 +@set VERSION 6.5 diff --git a/doc/version.texi b/doc/version.texi index 11d3612..e74ab0a 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 28 June 2017 -@set UPDATED-MONTH June 2017 -@set EDITION 6.4.90 -@set VERSION 6.4.90 +@set UPDATED 25 August 2017 +@set UPDATED-MONTH August 2017 +@set EDITION 6.5 +@set VERSION 6.5 diff --git a/gnulib/lib/Makefile.in b/gnulib/lib/Makefile.in index 2b09479..63fb4de 100644 --- a/gnulib/lib/Makefile.in +++ b/gnulib/lib/Makefile.in @@ -156,6 +156,7 @@ $(top_srcdir)/gnulib/m4/hard-locale.m4 \ $(top_srcdir)/gnulib/m4/iconv.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ + $(top_srcdir)/gnulib/m4/intlmacosx.m4 \ $(top_srcdir)/gnulib/m4/intmax_t.m4 \ $(top_srcdir)/gnulib/m4/inttypes_h.m4 \ $(top_srcdir)/gnulib/m4/iswblank.m4 \ @@ -852,6 +853,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@ LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@ @@ -1607,8 +1609,8 @@ @echo "it deletes files that may require special tools to rebuild." -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +@gl_GNULIB_ENABLED_localcharset_FALSE@install-exec-local: @gl_GNULIB_ENABLED_localcharset_FALSE@uninstall-local: -@gl_GNULIB_ENABLED_localcharset_FALSE@install-exec-local: clean: clean-recursive clean-am: clean-generic clean-noinstLIBRARIES clean-noinstLTLIBRARIES \ diff --git a/gnulib/lib/config.charset b/gnulib/lib/config.charset old file mode 100644 new file mode 100755 index 8bedbf3..8bedbf3 100755 diff --git a/gnulib/m4/intlmacosx.m4 b/gnulib/m4/intlmacosx.m4 new file mode 100644 index 0000000..aca924c --- /dev/null +++ b/gnulib/m4/intlmacosx.m4 @@ -0,0 +1,56 @@ +# intlmacosx.m4 serial 5 (gettext-0.18.2) +dnl Copyright (C) 2004-2014, 2016 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Checks for special options needed on Mac OS X. +dnl Defines INTL_MACOSX_LIBS. +AC_DEFUN([gt_INTL_MACOSX], +[ + dnl Check for API introduced in Mac OS X 10.2. + AC_CACHE_CHECK([for CFPreferencesCopyAppValue], + [gt_cv_func_CFPreferencesCopyAppValue], + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[CFPreferencesCopyAppValue(NULL, NULL)]])], + [gt_cv_func_CFPreferencesCopyAppValue=yes], + [gt_cv_func_CFPreferencesCopyAppValue=no]) + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then + AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], + [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) + fi + dnl Check for API introduced in Mac OS X 10.3. + AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[CFLocaleCopyCurrent();]])], + [gt_cv_func_CFLocaleCopyCurrent=yes], + [gt_cv_func_CFLocaleCopyCurrent=no]) + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFLocaleCopyCurrent = yes; then + AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], + [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) + fi + INTL_MACOSX_LIBS= + if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" + fi + AC_SUBST([INTL_MACOSX_LIBS]) +]) diff --git a/info/Makefile.am b/info/Makefile.am index 621fb36..771b5bd 100644 --- a/info/Makefile.am +++ b/info/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am 7911 2017-07-09 15:12:16Z gavin $ +# $Id: Makefile.am 7921 2017-07-16 18:52:25Z gavin $ # Makefile.am for texinfo/info. # # Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, diff --git a/info/Makefile.in b/info/Makefile.in index 58ca7b1..8eace1a 100644 --- a/info/Makefile.in +++ b/info/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 7911 2017-07-09 15:12:16Z gavin $ +# $Id: Makefile.am 7921 2017-07-16 18:52:25Z gavin $ # Makefile.am for texinfo/info. # # Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, @@ -132,6 +132,7 @@ $(top_srcdir)/gnulib/m4/hard-locale.m4 \ $(top_srcdir)/gnulib/m4/iconv.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ + $(top_srcdir)/gnulib/m4/intlmacosx.m4 \ $(top_srcdir)/gnulib/m4/intmax_t.m4 \ $(top_srcdir)/gnulib/m4/inttypes_h.m4 \ $(top_srcdir)/gnulib/m4/iswblank.m4 \ @@ -986,6 +987,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@ LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@ diff --git a/info/infokey.c b/info/infokey.c index 98e38ac..71e4206 100644 --- a/info/infokey.c +++ b/info/infokey.c @@ -1,5 +1,5 @@ /* infokey.c -- compile ~/.infokey to ~/.info. - $Id: infokey.c 7040 2016-03-04 19:33:07Z gavin $ + $Id: infokey.c 7947 2017-09-02 13:07:20Z gavin $ Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc. @@ -440,14 +440,36 @@ } else { + int keymap_bind_keyseq (Keymap, int *, KEYMAP_ENTRY *); + act[alen] = '\0'; a = lookup_action (act); if (a == A_info_menu_digit) { - /* It does not make sense for menu-digit to be anything - other than '0' .. '9'. */ - syntax_error (filename, lnum, - _("cannot bind key sequence to menu-digit")); + /* Only allow "1 menu-digit". (This is useful if + this default binding is disabled with "#stop".) + E.g. do not allow "b menu-digit". */ + if (seq[0] != '1' || seq[1] != '\0' + || section != info) + { + syntax_error (filename, lnum, + _("cannot bind key sequence to menu-digit")); + } + else + { + /* Bind each key from '1' to '9' to 'menu-digit'. */ + KEYMAP_ENTRY ke; + int i; + + ke.type = ISFUNC; + ke.value.function = &function_doc_array[a]; + + for (i = '1'; i <= '9'; i++) + { + seq[0] = i; + keymap_bind_keyseq (info_keymap, seq, &ke); + } + } } else if (a == -1) { @@ -460,8 +482,6 @@ } else { - int keymap_bind_keyseq (Keymap, int *, KEYMAP_ENTRY *); - KEYMAP_ENTRY ke; static InfoCommand invalid_function = { 0 }; diff --git a/info/pseudotty.c b/info/pseudotty.c index c73e521..601c56b 100644 --- a/info/pseudotty.c +++ b/info/pseudotty.c @@ -2,7 +2,7 @@ standard output. Read and ignore any data sent to terminal. This is so we can run tests interactively without messing up the screen. - Copyright 2014, 2015, 2016 Free Software Foundation, Inc. + Copyright 2014, 2015, 2016, 2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -64,11 +64,12 @@ exit (1); error (0, 0, "%s", name); -#ifdef HAVE_STROPTS_H error (0, 0, "opening slave device"); slave = open (name, O_RDWR); if (slave == -1) exit (1); + +#ifdef HAVE_STROPTS_H if (!isatty (slave)) { error (0, 0, "performing STREAMS ioctl's on slave"); diff --git a/install-info/Makefile.in b/install-info/Makefile.in index f1b4f9f..29ab994 100644 --- a/install-info/Makefile.in +++ b/install-info/Makefile.in @@ -131,6 +131,7 @@ $(top_srcdir)/gnulib/m4/hard-locale.m4 \ $(top_srcdir)/gnulib/m4/iconv.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ + $(top_srcdir)/gnulib/m4/intlmacosx.m4 \ $(top_srcdir)/gnulib/m4/intmax_t.m4 \ $(top_srcdir)/gnulib/m4/inttypes_h.m4 \ $(top_srcdir)/gnulib/m4/iswblank.m4 \ @@ -830,6 +831,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@ LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@ diff --git a/install-info/tests/Makefile.in b/install-info/tests/Makefile.in index 9627dba..ac7866e 100644 --- a/install-info/tests/Makefile.in +++ b/install-info/tests/Makefile.in @@ -129,6 +129,7 @@ $(top_srcdir)/gnulib/m4/hard-locale.m4 \ $(top_srcdir)/gnulib/m4/iconv.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ + $(top_srcdir)/gnulib/m4/intlmacosx.m4 \ $(top_srcdir)/gnulib/m4/intmax_t.m4 \ $(top_srcdir)/gnulib/m4/inttypes_h.m4 \ $(top_srcdir)/gnulib/m4/iswblank.m4 \ @@ -915,6 +916,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@ LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@ diff --git a/man/Makefile.in b/man/Makefile.in index 803b896..afd0bd5 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -133,6 +133,7 @@ $(top_srcdir)/gnulib/m4/hard-locale.m4 \ $(top_srcdir)/gnulib/m4/iconv.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ + $(top_srcdir)/gnulib/m4/intlmacosx.m4 \ $(top_srcdir)/gnulib/m4/intmax_t.m4 \ $(top_srcdir)/gnulib/m4/inttypes_h.m4 \ $(top_srcdir)/gnulib/m4/iswblank.m4 \ @@ -745,6 +746,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@ LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@ diff --git a/man/info.1 b/man/info.1 index 4d0da76..f1b1382 100644 --- a/man/info.1 +++ b/man/info.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4. -.TH INFO "1" "July 2017" "info 6.4.90" "User Commands" +.TH INFO "1" "September 2017" "info 6.5" "User Commands" .SH NAME info \- read Info documents .SH SYNOPSIS diff --git a/man/install-info.1 b/man/install-info.1 index a57214f..080fcd3 100644 --- a/man/install-info.1 +++ b/man/install-info.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4. -.TH INSTALL-INFO "1" "July 2017" "install-info 6.4.90" "User Commands" +.TH INSTALL-INFO "1" "September 2017" "install-info 6.5" "User Commands" .SH NAME install-info \- update info/dir entries .SH SYNOPSIS diff --git a/man/makeinfo.1 b/man/makeinfo.1 index 8327150..a97b370 100644 --- a/man/makeinfo.1 +++ b/man/makeinfo.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4. -.TH TEXI2ANY "1" "July 2017" "texi2any 6.4.90" "User Commands" +.TH TEXI2ANY "1" "September 2017" "texi2any 6.5" "User Commands" .SH NAME texi2any \- translate Texinfo documents .SH SYNOPSIS diff --git a/man/texi2dvi.1 b/man/texi2dvi.1 index 4c360a9..807dbed 100644 --- a/man/texi2dvi.1 +++ b/man/texi2dvi.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4. -.TH TEXI2DVI "1" "July 2017" "texi2dvi 7906" "User Commands" +.TH TEXI2DVI "1" "September 2017" "texi2dvi 7906" "User Commands" .SH NAME texi2dvi \- convert Texinfo documents to DVI or PDF .SH SYNOPSIS diff --git a/man/texindex.1 b/man/texindex.1 index 807e656..7e912f0 100644 --- a/man/texindex.1 +++ b/man/texindex.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4. -.TH TEXINDEX "1" "July 2017" "texindex 6.4.90" "User Commands" +.TH TEXINDEX "1" "September 2017" "texindex 6.5" "User Commands" .SH NAME texindex \- sort Texinfo index files .SH SYNOPSIS diff --git a/po/ca.gmo b/po/ca.gmo index dfec2af..46668a0 100644 Binary files a/po/ca.gmo and b/po/ca.gmo differ diff --git a/po/ca.po b/po/ca.po index 3cd3b03..c812d37 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: texinfo 6.1.92\n" "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n" -"POT-Creation-Date: 2017-07-10 19:41+0100\n" +"POT-Creation-Date: 2017-08-19 19:55+0100\n" "PO-Revision-Date: 2016-12-30 07:10+0100\n" "Last-Translator: Walter Garcia-Fontes \n" "Language-Team: Catalan \n" @@ -424,7 +424,7 @@ msgid "Try --help for more information.\n" msgstr "Proveu --help per a més informació.\n" -#: info/info.c:861 install-info/install-info.c:2239 tp/texi2any.pl:888 +#: info/info.c:861 install-info/install-info.c:2239 tp/texi2any.pl:883 #, c-format, perl-format msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -581,7 +581,7 @@ "sencer a sortida.txt\n" " info -f ./bla.info mostra el fitxer ./bla.info, sense buscar a dir" -#: info/info.c:1149 install-info/install-info.c:616 tp/texi2any.pl:876 +#: info/info.c:1149 install-info/install-info.c:616 tp/texi2any.pl:871 msgid "" "Email bug reports to bug-texinfo@gnu.org,\n" "general questions and discussion to help-texinfo@gnu.org.\n" @@ -2150,20 +2150,20 @@ msgid "@%s: could not find %s" msgstr "@%s: no s'ha pogut trobar %s" -#: tp/Texinfo/Common.pm:1628 +#: tp/Texinfo/Common.pm:1633 msgid "no node to be renamed" msgstr "no hi ha un node a reanomenar" -#: tp/Texinfo/Common.pm:1639 +#: tp/Texinfo/Common.pm:1644 msgid "nodes without a new name at the end of file" msgstr "hi ha nodes sense un nom nou al final del fitxer" -#: tp/Texinfo/Common.pm:1649 tp/Texinfo/Parser.pm:859 +#: tp/Texinfo/Common.pm:1654 tp/Texinfo/Parser.pm:859 #, perl-format msgid "could not open %s: %s" msgstr "no s'ha pogut obrir %s: %s" -#: tp/Texinfo/Common.pm:2169 +#: tp/Texinfo/Common.pm:2174 #, perl-format msgid "could not protect hash character in @%s" msgstr "no s'ha pogut protegir el caràcter coixinet a @%s" @@ -3300,17 +3300,17 @@ msgid "could not read init file %s" msgstr "no s'ha pogut llegir el fitxer d'inicialització %s" -#: tp/texi2any.pl:662 +#: tp/texi2any.pl:657 #, perl-format msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n" msgstr "s'ignorarà l'ordre no reconeguda TEXINFO_OUTPUT_FORMAT valor `%s'\n" -#: tp/texi2any.pl:745 +#: tp/texi2any.pl:740 #, perl-format msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" msgstr "Ús: %s [OPCIÓ]... FITXER-TEXINFO...\n" -#: tp/texi2any.pl:748 +#: tp/texi2any.pl:743 msgid "" "Translate Texinfo source documentation to various other formats, by default\n" "Info files suitable for reading online with Emacs or standalone GNU Info.\n" @@ -3326,7 +3326,7 @@ "el comportament és idèntic, i no depèn del nom instal·lat.\n" "\n" -#: tp/texi2any.pl:754 +#: tp/texi2any.pl:749 #, perl-format msgid "" "General options:\n" @@ -3366,7 +3366,7 @@ " -v, --verbose explica el que es fa.\n" " --version mostra la informació de versió i surt.\n" -#: tp/texi2any.pl:770 +#: tp/texi2any.pl:765 msgid "" "Output format selection (default is to produce Info):\n" " --docbook output Docbook XML rather than Info.\n" @@ -3386,7 +3386,7 @@ " després de verificar la validesa de FITXER-" "TEXINFO.\n" -#: tp/texi2any.pl:778 +#: tp/texi2any.pl:773 msgid "" "General output options:\n" " -E, --macro-expand=FILE output macro-expanded source to FILE,\n" @@ -3438,7 +3438,7 @@ " En cas contrari, DEST anomena el fitxer de " "sortida.\n" -#: tp/texi2any.pl:798 +#: tp/texi2any.pl:793 #, perl-format msgid "" "Options for Info and plain text:\n" @@ -3480,7 +3480,7 @@ " --split-size=NUM divideix els fitxers Info a la mida NUM " "(predeterminat %d).\n" -#: tp/texi2any.pl:815 +#: tp/texi2any.pl:810 msgid "" "Options for HTML:\n" " --css-include=FILE include FILE in HTML