diff --git a/ChangeLog b/ChangeLog index 0d9a718..51512e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,129 @@ +2012-12-17 Karl Berry + + * pretest 4.13.92. + +2012-12-15 Karl Berry + + * doc/texinfo.txi: use "sectioning" as the general term + in a few places. + (Other Customization Variables) : more + on default. + +2012-12-11 Eli Zaretskii + + * configure.ac (TGT_IS_WINDOWS): New conditional. + * util/Makefile.am (bin_SCRIPTS) [TGT_IS_WINDOWS]: add Windows + batch files to bin_SCRIPTS. + +2012-12-14 Ineiev (tiny change) + + * configure.ac (HAVE_TERMLIBS): new conditional. End with + repeated warning about no terminal library for visibility. + * Makefile.am (SUBDIRS) [HAVE_TERMLIBS]: only include info/ if + new conditional is true. + * man/Makefile.am (man_MANS) [HAVE_TERMLIBS]: likewise for making + info.1 and infokey.1. + +2012-12-14 Thien-Thi Nguyen (tiny change) + + * doc/texinfo.txi (Three Arguments): + Add @findex xrefautomaticsectiontitle. + +2012-12-14 Karl Berry + + * doc/texinfo.txi (Other Customization Variables): edit + wording of defaults, etc. + +2012-12-10 Patrice Dumas + + * configure.ac, tp/Makefile.am, tp/texi2any.pl, tp/Texinfo/Common.pm, + tp/Texinfo/Convert/XML.pm, tp/maintain/catalog.xml.in, + tp/t/test_utils.pl, + doc/texinfo.txi (Other Customization Variables): + Add a new configure variable TEXINFO_DTD_VERSION that holds the version + of the dtd. Add the corresponding customization variable in tp/. + +2012-12-08 Patrice Dumas + + * doc/texinfo.txi (Command Contexts): @verb is not accepted in + simple text commands and sectioning commands. + +2012-12-02 Karl Berry + + * configure.ac (TERMLIB_VARIANTS): try tinfo first. + Suggestion from Andreas Schwab, 02 Dec 2012 10:00:44. + +2012-12-02 Colin Watson + + Build gnulib/lib directory in native-tools pass when + cross-compiling (bug #37852). + * Makefile.am (SUBDIRS) [TOOLS_ONLY]: Add gnulib/lib. + +2012-12-02 Karl Berry + + * install-info/tests/defs.in (TMPDIR): define if not defined. + +2012-12-02 Patrice Dumas + + * configure.ac: remove gnulib module regex snippet, it is already in + gnulib/m4/gnulib-comp.m4. + * configure.ac, tp/Texinfo/Convert/Unicode.pm: check that Encode is + available, and use perl >= 5.7.3, required for Encode. Report from + Stefano Lattarini. + +2012-12-01 Sergey Poznyakoff + + Fix bug #37822 (incomplete redraw of screen). + + * info/display.c (display_scroll_display): Fix a "fencepost" + error when scrolling down. + * info/terminal.c: Improve conditional. + +2012-12-01 Sergey Poznyakoff + + Fix cursor positioning after index searches (bug #37823). + + * info/window.h (WINDOW): Use size_t instead of int. + (log_line_no): New member. + (process_node_text): Change signature. + * info/window.c (window_new_screen_size,recalculate_line_starts) + (window_toggle_wrap,window_delete_window): Handle the + log_line_no array. + (calc_closure_expand): New static function. + (_calc_line_starts): Update log_line_no. Use calc_closure_expand + instead of the add_pointer_to_array macro. + (calculate_line_starts): Fill in log_line_no. + (window_log_to_phys_line): New function. + (process_node_text): Keep track of logical line numbers. + * info/display.c (display_node_text): Change signature. + * info/indices.c (info_next_index_match): Convert logical line + number to physical line. + + * info/tag.c (tags_expand): Remove unused variables. + (handle_tag): Fix return type. + * info/tag.h (handle_tag): Fix return type. + +2012-11-30 Patrice Dumas + + * doc/texinfo.txi (Invoking texi2any), tp/texi2any.pl: add -c as an + alias for --set-customization-variable (Karl idea). + * doc/texinfo.txi (Other Customization Variables): explain default + values for customization variables. + +2012-11-30 Karl Berry + + * install-info/tests/defs.in (mktemp): define minimal + replacement if not found in PATH. It is lacking on AIX 6 (Ineiev) + and mingw (Eli). + +2012-11-28 Karl Berry + + * install-info/tests/defs.in (path_spec, EGREP): need these + for findprog. + 2012-11-26 Karl Berry + + * pretest 4.13.91. * configure.ac: invoke gl_REGEX, after gnulib-tool --add-import regex. This will now be used on diff --git a/Makefile.am b/Makefile.am index 3373185..24a265e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.37 2012/06/11 17:54:26 karl Exp $ +# $Id: Makefile.am,v 1.39 2012/12/14 19:36:53 karl Exp $ # Makefile.am for texinfo. # Process this file with automake to produce Makefile.in in all directories. # @@ -26,17 +26,24 @@ # distribution directory. TEXINFO_TEX = doc/texinfo.tex +SUBDIRS = if TOOLS_ONLY # Build native tools only. - SUBDIRS = info install-info tp util + SUBDIRS += gnulib/lib install-info tp util +if HAVE_TERMLIBS + SUBDIRS += info +endif else # All subdirectories. # Do libs first since the C programs depend on it. - # Do doc and man last so makeinfo will be built when we get there. + # Do doc and man last so things will be built when we get there. # Others are alphabetical. - SUBDIRS = $(native_tools) gnulib/lib \ - install-info info po po_document tp Pod-Simple-Texinfo util \ - doc man + SUBDIRS += $(native_tools) gnulib/lib +if HAVE_TERMLIBS + SUBDIRS += info +endif + SUBDIRS += install-info po po_document tp Pod-Simple-Texinfo util \ + doc man endif # One special target for installers to use by hand if desired. diff --git a/Makefile.in b/Makefile.in index 24ee18f..99c45ba 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.5 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am,v 1.37 2012/06/11 17:54:26 karl Exp $ +# $Id: Makefile.am,v 1.39 2012/12/14 19:36:53 karl Exp $ # Makefile.am for texinfo. # Process this file with automake to produce Makefile.in in all directories. # @@ -63,6 +63,13 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@TOOLS_ONLY_TRUE@am__append_1 = gnulib/lib install-info tp util +@HAVE_TERMLIBS_TRUE@@TOOLS_ONLY_TRUE@am__append_2 = info +@TOOLS_ONLY_FALSE@am__append_3 = $(native_tools) gnulib/lib +@HAVE_TERMLIBS_TRUE@@TOOLS_ONLY_FALSE@am__append_4 = info +@TOOLS_ONLY_FALSE@am__append_5 = install-info po po_document tp Pod-Simple-Texinfo util \ +@TOOLS_ONLY_FALSE@ doc man + subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.in \ @@ -99,7 +106,6 @@ $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ $(top_srcdir)/gnulib/m4/iconv.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ - $(top_srcdir)/gnulib/m4/inline.m4 \ $(top_srcdir)/gnulib/m4/intlmacosx.m4 \ $(top_srcdir)/gnulib/m4/iswblank.m4 \ $(top_srcdir)/gnulib/m4/langinfo_h.m4 \ @@ -201,8 +207,8 @@ ETAGS = etags CTAGS = ctags CSCOPE = cscope -DIST_SUBDIRS = @native_tools@ gnulib/lib install-info info po \ - po_document tp Pod-Simple-Texinfo util doc man +DIST_SUBDIRS = gnulib/lib install-info tp util info @native_tools@ po \ + po_document Pod-Simple-Texinfo doc man DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -852,6 +858,7 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ TERMLIBS = @TERMLIBS@ TEX = @TEX@ +TEXINFO_DTD_VERSION = @TEXINFO_DTD_VERSION@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ @@ -940,11 +947,8 @@ # This is to prevent texinfo.tex from being included in the top-level # distribution directory. TEXINFO_TEX = doc/texinfo.tex -@TOOLS_ONLY_FALSE@SUBDIRS = $(native_tools) gnulib/lib \ -@TOOLS_ONLY_FALSE@ install-info info po po_document tp Pod-Simple-Texinfo util \ -@TOOLS_ONLY_FALSE@ doc man - -@TOOLS_ONLY_TRUE@SUBDIRS = info install-info tp util +SUBDIRS = $(am__append_1) $(am__append_2) $(am__append_3) \ + $(am__append_4) $(am__append_5) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -1440,11 +1444,10 @@ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am - @TOOLS_ONLY_TRUE@ # Build native tools only. @TOOLS_ONLY_FALSE@ # All subdirectories. @TOOLS_ONLY_FALSE@ # Do libs first since the C programs depend on it. -@TOOLS_ONLY_FALSE@ # Do doc and man last so makeinfo will be built when we get there. +@TOOLS_ONLY_FALSE@ # Do doc and man last so things will be built when we get there. @TOOLS_ONLY_FALSE@ # Others are alphabetical. # One special target for installers to use by hand if desired. diff --git a/NEWS b/NEWS index ae91cc1..f7ab02e 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -$Id: NEWS,v 1.220 2012/11/20 19:34:13 karl Exp $ +$Id: NEWS,v 1.221 2012/12/15 22:59:41 karl Exp $ This NEWS file records noteworthy changes, very tersely. See the manual for detailed information. @@ -111,7 +111,7 @@ . language support for no removed/renamed to nb, per Norwegian translators. . new translations: id it. . documentation license now GFDLv1.3 or later. - . autoconf 2.69, automake 1.12.4, gettext 0.18.1.1. + . autoconf 2.69, automake 1.12.6, gettext 0.18.1.1. 4.13 (18 September 2008) diff --git a/Pod-Simple-Texinfo/Makefile.in b/Pod-Simple-Texinfo/Makefile.in index b8e4d2b..5f30b44 100644 --- a/Pod-Simple-Texinfo/Makefile.in +++ b/Pod-Simple-Texinfo/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.5 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -87,7 +87,6 @@ $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ $(top_srcdir)/gnulib/m4/iconv.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ - $(top_srcdir)/gnulib/m4/inline.m4 \ $(top_srcdir)/gnulib/m4/intlmacosx.m4 \ $(top_srcdir)/gnulib/m4/iswblank.m4 \ $(top_srcdir)/gnulib/m4/langinfo_h.m4 \ @@ -969,6 +968,7 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ TERMLIBS = @TERMLIBS@ TEX = @TEX@ +TEXINFO_DTD_VERSION = @TEXINFO_DTD_VERSION@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ diff --git a/TODO b/TODO index b3a739f..e6fb1e0 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,4 @@ -$Id: TODO,v 1.68 2012/11/11 19:53:19 pertusus Exp $ +$Id: TODO,v 1.69 2012/12/15 22:59:41 karl Exp $ This is the todo list for GNU Texinfo. If you are interested in working on any of these, email bug-texinfo@gnu.org. @@ -53,6 +53,7 @@ - Allow subitems and `see' and `see also' in indices. - generalize @vtable/@htable to any defined index. - generalize @deffn/etc. with variants that don't make index entries. + - @mergeindex to do @syn*index without changing fonts. - multicolumn * width to take up `the rest'. - Allow @hsep/@vsep at @item, instead of just in template. - another table command to take N succeeding items and split them diff --git a/aclocal.m4 b/aclocal.m4 index fb4f8de..cd93f2d 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.12.5 -*- Autoconf -*- +# generated automatically by aclocal 1.12.6 -*- Autoconf -*- # Copyright (C) 1996-2012 Free Software Foundation, Inc. @@ -34,7 +34,7 @@ [am__api_version='1.12' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.12.5], [], +m4_if([$1], [1.12.6], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,7 +50,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.12.5])dnl +[AM_AUTOMAKE_VERSION([1.12.6])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -1043,7 +1043,6 @@ m4_include([gnulib/m4/gnulib-comp.m4]) m4_include([gnulib/m4/iconv.m4]) m4_include([gnulib/m4/include_next.m4]) -m4_include([gnulib/m4/inline.m4]) m4_include([gnulib/m4/intlmacosx.m4]) m4_include([gnulib/m4/iswblank.m4]) m4_include([gnulib/m4/langinfo_h.m4]) diff --git a/build-aux/config.sub b/build-aux/config.sub index 89b1286..8df5511 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012 Free Software Foundation, Inc. -timestamp='2012-10-10' +timestamp='2012-12-06' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -1026,7 +1026,11 @@ basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; diff --git a/build-aux/depcomp b/build-aux/depcomp index e1f51f4..3f02f5d 100755 --- a/build-aux/depcomp +++ b/build-aux/depcomp @@ -1,7 +1,7 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2012-07-12.20; # UTC +scriptversion=2012-10-18.11; # UTC # Copyright (C) 1999-2012 Free Software Foundation, Inc. @@ -27,9 +27,9 @@ case $1 in '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -56,11 +56,65 @@ ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + # A tabulation character. tab=' ' # A newline character. nl=' ' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 @@ -88,32 +142,32 @@ fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp fi if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 fi if test "$depmode" = xlc; then - # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. - gccflag=-qmakedep=gcc,-MF - depmode=gcc + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -136,8 +190,7 @@ done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -163,15 +216,14 @@ fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" ## This next piece of magic avoids the "deleted header file" problem. @@ -180,15 +232,15 @@ ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' "$nl" < "$tmpdepfile" | ## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as ## well. hp depmode also adds that space, but also prefixes the VPATH ## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -206,8 +258,7 @@ "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -215,7 +266,6 @@ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in @@ -223,19 +273,15 @@ # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr "$nl" ' ' >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; @@ -253,9 +299,8 @@ # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -268,9 +313,7 @@ "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -279,65 +322,37 @@ do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form 'foo.o: dependent.h'. - # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -icc) - # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. - # However on - # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output - # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using '\': - # foo.o: sub/foo.c ... \ - # sub/foo.h ... \ - # ... - # tcc 0.9.26 (FIXME still under development at the moment of writing) - # will emit a similar output, but also prepend the continuation lines - # with horizontal tabulation characters. + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). "$@" -MD -MF "$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" - # Each line is of the form 'foo.o: dependent.h', - # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. - # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ - < "$tmpdepfile" > "$depfile" - sed ' - s/[ '"$tab"'][ '"$tab"']*/ /g - s/^ *// - s/ *\\*$// - s/^[^:]*: *// - /^$/d - /:$/d - s/$/ :/ - ' < "$tmpdepfile" >> "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; @@ -356,34 +371,37 @@ # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= + set_dir_from "$object" # Use the source, not the object, to determine the base name, since # that's sadly what pgcc will do too. - base=`echo "$source" | sed -e 's|^.*/||' -e 's/\.[-_a-zA-Z0-9]*$//'` - tmpdepfile="$base.d" + set_base_from "$source" + tmpdepfile=$base.d # For projects that build the same source file twice into different object # files, the pgcc approach of using the *source* file root name can cause # problems in parallel builds. Use a locking strategy to avoid stomping on # the same $tmpdepfile. - lockdir="$base.d-lock" - trap "echo '$0: caught signal, cleaning up...' >&2; rm -rf $lockdir" 1 2 13 15 + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 numtries=100 i=$numtries - while test $i -gt 0 ; do + while test $i -gt 0; do # mkdir is a portable test-and-set. - if mkdir $lockdir 2>/dev/null; then + if mkdir "$lockdir" 2>/dev/null; then # This process acquired the lock. "$@" -MD stat=$? # Release the lock. - rm -rf $lockdir + rmdir "$lockdir" break else - ## the lock is being held by a different process, - ## wait until the winning process is done or we timeout - while test -d $lockdir && test $i -gt 0; do + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do sleep 1 i=`expr $i - 1` done @@ -409,8 +427,8 @@ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" # Some versions of the HPUX 10.20 sed can't process this invocation # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -421,9 +439,8 @@ # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -434,8 +451,7 @@ "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -445,76 +461,61 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in 'foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; msvc7) if test "$libtool" = yes; then @@ -525,8 +526,7 @@ "$@" $showIncludes > "$tmpdepfile" stat=$? grep -v '^Note: including file: ' "$tmpdepfile" - if test "$stat" = 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -603,13 +603,14 @@ # in the target name. This is to cope with DOS-style filenames: # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' "$nl" < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -662,10 +663,12 @@ # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -701,10 +704,10 @@ esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -736,15 +739,15 @@ shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | diff --git a/build-aux/snippet/warn-on-use.h b/build-aux/snippet/warn-on-use.h index d4cb94f..51e69bb 100644 --- a/build-aux/snippet/warn-on-use.h +++ b/build-aux/snippet/warn-on-use.h @@ -55,7 +55,7 @@ rather than issue the nice warning, but the end result of informing the developer about their portability problem is still achieved): #if HAVE_RAW_DECL_ENVIRON - static inline char ***rpl_environ (void) { return &environ; } + static char ***rpl_environ (void) { return &environ; } _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared"); # undef environ # define environ (*rpl_environ ()) diff --git a/config.in b/config.in index 91bb9a0..b773e70 100644 --- a/config.in +++ b/config.in @@ -268,11 +268,6 @@ /* Define if you have the iconv() function and it works. */ #undef HAVE_ICONV - -/* Define to 1 if the compiler supports one of the keywords 'inline', - '__inline__', '__inline' and effectively inlines functions marked as such. - */ -#undef HAVE_INLINE /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H @@ -1228,13 +1223,19 @@ when FOO is an inline function in the header; see . _GL_INLINE_HEADER_END contains useful stuff to put - in the same include file, after uses of _GL_INLINE. */ -#if (__GNUC__ \ - ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ - : 199901L <= __STDC_VERSION__) + in the same include file, after uses of _GL_INLINE. + + Suppress the use of extern inline on Apple's platforms, + as Libc-825.25 (2012-09-19) is incompatible with it; see + . + Perhaps Apple will fix this some day. */ +#if ((__GNUC__ \ + ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ + : 199901L <= __STDC_VERSION__) \ + && !defined __APPLE__) # define _GL_INLINE inline # define _GL_EXTERN_INLINE extern inline -#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) +#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __APPLE__ # if __GNUC_GNU_INLINE__ /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ # define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) @@ -1243,8 +1244,8 @@ # endif # define _GL_EXTERN_INLINE extern #else -# define _GL_INLINE static inline -# define _GL_EXTERN_INLINE static inline +# define _GL_INLINE static _GL_UNUSED +# define _GL_EXTERN_INLINE static _GL_UNUSED #endif #if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) diff --git a/configure b/configure index 7870706..3d91d0b 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 4.13.91. +# Generated by GNU Autoconf 2.69 for GNU Texinfo 4.13.92. # # Report bugs to . # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='GNU Texinfo' PACKAGE_TARNAME='texinfo' -PACKAGE_VERSION='4.13.91' -PACKAGE_STRING='GNU Texinfo 4.13.91' +PACKAGE_VERSION='4.13.92' +PACKAGE_STRING='GNU Texinfo 4.13.92' PACKAGE_BUGREPORT='bug-texinfo@gnu.org' PACKAGE_URL='http://www.gnu.org/software/texinfo/' @@ -634,6 +634,8 @@ am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS +TGT_IS_WINDOWS_FALSE +TGT_IS_WINDOWS_TRUE POD_SIMPLE_TEXINFO_TESTS_FALSE POD_SIMPLE_TEXINFO_TESTS_TRUE BUILD_PERL_API_TEXI_FALSE @@ -664,14 +666,16 @@ USE_EXTERNAL_EASTASIANWIDTH INSTALL_WARNINGS_FALSE INSTALL_WARNINGS_TRUE +HAVE_TERMLIBS_FALSE +HAVE_TERMLIBS_TRUE TERMLIBS TOOLS_ONLY_FALSE TOOLS_ONLY_TRUE native_tools +LIBOBJS MKINSTALLDIRS LN_S HELP2MAN -LIBOBJS LIBGNU_LTLIBDEPS LIBGNU_LIBDEPS gltests_WITNESS @@ -1274,6 +1278,7 @@ PACKAGE_DATE TEXI2HTML_FALSE TEXI2HTML_TRUE +TEXINFO_DTD_VERSION am__untar am__tar AMTAR @@ -1358,13 +1363,13 @@ ac_precious_vars='build_alias host_alias target_alias +PERL CC CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -PERL' +CPP' # Initialize some variables set by options. @@ -1905,7 +1910,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 4.13.91 to adapt to many kinds of systems. +\`configure' configures GNU Texinfo 4.13.92 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1975,7 +1980,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU Texinfo 4.13.91:";; + short | recursive ) echo "Configuration of GNU Texinfo 4.13.92:";; esac cat <<\_ACEOF @@ -2021,6 +2026,7 @@ use external libintl-perl (default: no) Some influential environment variables: + PERL The path to the 'perl' executable. CC C compiler command CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a @@ -2029,7 +2035,6 @@ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor - PERL The path to the 'perl' executable. Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -2099,7 +2104,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU Texinfo configure 4.13.91 +GNU Texinfo configure 4.13.92 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2808,7 +2813,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 4.13.91, which was +It was created by GNU Texinfo $as_me 4.13.92, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3670,7 +3675,7 @@ # Define the identity of the package. PACKAGE='texinfo' - VERSION='4.13.91' + VERSION='4.13.92' cat >>confdefs.h <<_ACEOF @@ -3805,6 +3810,12 @@ ac_config_headers="$ac_config_headers config.h:config.in" +# version for the dtd. In between releases, PACKAGE_VERSION is not set +# to a value that corresponds to actual files on the internet. +# TEXINFO_DTD_VERSION=$PACKAGE_VERSION +TEXINFO_DTD_VERSION=5.00 + + # Conditional texi2html support. if false; then TEXI2HTML_TRUE= @@ -3820,6 +3831,8 @@ # We need Perl + + # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -3866,7 +3879,20 @@ specify where it is using ./configure PERL=/path/to/perl " "$LINENO" 5 - +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Perl version and Encode module" >&5 +$as_echo_n "checking Perl version and Encode module... " >&6; } +if $PERL -e "use 5.007_003; use Encode;" > /dev/null 2>&1; then + perl_version_requirement='yes' +else + perl_version_requirement='no' +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $perl_version_requirement" >&5 +$as_echo "$perl_version_requirement" >&6; } +if test z"$perl_version_requirement" = 'zno' ; then + as_fn_error $? "perl >= 5.7.3 with Encode required by Texinfo." "$LINENO" 5 fi # Checks for programs. @@ -5988,7 +6014,6 @@ # Code from module gettimeofday: # Code from module havelib: # Code from module include_next: - # Code from module inline: # Code from module intprops: # Code from module iswblank: # Code from module langinfo: @@ -7255,51 +7280,8 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 -$as_echo_n "checking for inline... " >&6; } -if ${ac_cv_c_inline+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_c_inline=no -for ac_kw in inline __inline__ __inline; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef __cplusplus -typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } -#endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_inline=$ac_kw -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - test "$ac_cv_c_inline" != no && break -done - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 -$as_echo "$ac_cv_c_inline" >&6; } - -case $ac_cv_c_inline in - inline | yes) ;; - *) - case $ac_cv_c_inline in - no) ac_val=;; - *) ac_val=$ac_cv_c_inline;; - esac - cat >>confdefs.h <<_ACEOF -#ifndef __cplusplus -#define inline $ac_val -#endif -_ACEOF - ;; -esac - XGETTEXT_EXTRA_OPTIONS= - @@ -8643,8 +8625,6 @@ - - if test $gt_cv_c_wint_t = yes; then HAVE_WINT_T=1 else @@ -10590,6 +10570,48 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 +$as_echo_n "checking for inline... " >&6; } +if ${ac_cv_c_inline+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_c_inline=no +for ac_kw in inline __inline__ __inline; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __cplusplus +typedef int foo_t; +static $ac_kw foo_t static_foo () {return 0; } +$ac_kw foo_t foo () {return 0; } +#endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_inline=$ac_kw +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + test "$ac_cv_c_inline" != no && break +done + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 +$as_echo "$ac_cv_c_inline" >&6; } + +case $ac_cv_c_inline in + inline | yes) ;; + *) + case $ac_cv_c_inline in + no) ac_val=;; + *) ac_val=$ac_cv_c_inline;; + esac + cat >>confdefs.h <<_ACEOF +#ifndef __cplusplus +#define inline $ac_val +#endif +_ACEOF + ;; +esac + @@ -12472,7 +12494,6 @@ - : fi @@ -12910,46 +12931,6 @@ $as_echo "#define GNULIB_TEST_GETTIMEOFDAY 1" >>confdefs.h - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler generally respects inline" >&5 -$as_echo_n "checking whether the compiler generally respects inline... " >&6; } -if ${gl_cv_c_inline_effective+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test $ac_cv_c_inline = no; then - gl_cv_c_inline_effective=no - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -#ifdef __NO_INLINE__ - #error "inline is not effective" - #endif - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_c_inline_effective=yes -else - gl_cv_c_inline_effective=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_inline_effective" >&5 -$as_echo "$gl_cv_c_inline_effective" >&6; } - if test $gl_cv_c_inline_effective = yes; then - -$as_echo "#define HAVE_INLINE 1" >>confdefs.h - - fi @@ -13636,10 +13617,7 @@ gl_LIBOBJS="$gl_LIBOBJS lstat.$ac_objext" - - - : - + : fi @@ -15957,10 +15935,7 @@ gl_LIBOBJS="$gl_LIBOBJS stat.$ac_objext" - - - : - + : fi @@ -16923,8 +16898,6 @@ - - : @@ -17150,7 +17123,6 @@ : - @@ -17871,8 +17843,6 @@ - - if test $gt_cv_c_wint_t = yes; then HAVE_WINT_T=1 else @@ -18374,15 +18344,7 @@ - - - : - - - : - - # End of code from modules @@ -18422,297 +18384,6 @@ LIBGNU_LTLIBDEPS="$gl_ltlibdeps" - -# Regex from Gnulib if needed. - - -# Check whether --with-included-regex was given. -if test "${with_included_regex+set}" = set; then : - withval=$with_included_regex; -fi - - - case $with_included_regex in #( - yes|no) ac_use_included_regex=$with_included_regex - ;; - '') - # If the system regex support is good enough that it passes the - # following run test, then default to *not* using the included regex.c. - # If cross compiling, assume the test would fail and use the included - # regex.c. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working re_compile_pattern" >&5 -$as_echo_n "checking for working re_compile_pattern... " >&6; } -if ${gl_cv_func_re_compile_pattern_working+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - gl_cv_func_re_compile_pattern_working=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default - #include - #include - #include - -int -main () -{ -int result = 0; - static struct re_pattern_buffer regex; - unsigned char folded_chars[UCHAR_MAX + 1]; - int i; - const char *s; - struct re_registers regs; - - /* http://sourceware.org/ml/libc-hacker/2006-09/msg00008.html - This test needs valgrind to catch the bug on Debian - GNU/Linux 3.1 x86, but it might catch the bug better - on other platforms and it shouldn't hurt to try the - test here. */ - if (setlocale (LC_ALL, "en_US.UTF-8")) - { - static char const pat[] = "insert into"; - static char const data[] = - "\xFF\0\x12\xA2\xAA\xC4\xB1,K\x12\xC4\xB1*\xACK"; - re_set_syntax (RE_SYNTAX_GREP | RE_HAT_LISTS_NOT_NEWLINE - | RE_ICASE); - memset (®ex, 0, sizeof regex); - s = re_compile_pattern (pat, sizeof pat - 1, ®ex); - if (s) - result |= 1; - else if (re_search (®ex, data, sizeof data - 1, - 0, sizeof data - 1, ®s) - != -1) - result |= 1; - if (! setlocale (LC_ALL, "C")) - return 1; - } - - /* This test is from glibc bug 3957, reported by Andrew Mackey. */ - re_set_syntax (RE_SYNTAX_EGREP | RE_HAT_LISTS_NOT_NEWLINE); - memset (®ex, 0, sizeof regex); - s = re_compile_pattern ("a[^x]b", 6, ®ex); - if (s) - result |= 2; - /* This should fail, but succeeds for glibc-2.5. */ - else if (re_search (®ex, "a\nb", 3, 0, 3, ®s) != -1) - result |= 2; - - /* This regular expression is from Spencer ere test number 75 - in grep-2.3. */ - re_set_syntax (RE_SYNTAX_POSIX_EGREP); - memset (®ex, 0, sizeof regex); - for (i = 0; i <= UCHAR_MAX; i++) - folded_chars[i] = i; - regex.translate = folded_chars; - s = re_compile_pattern ("a[[:]:]]b\n", 11, ®ex); - /* This should fail with _Invalid character class name_ error. */ - if (!s) - result |= 4; - - /* Ensure that [b-a] is diagnosed as invalid, when - using RE_NO_EMPTY_RANGES. */ - re_set_syntax (RE_SYNTAX_POSIX_EGREP | RE_NO_EMPTY_RANGES); - memset (®ex, 0, sizeof regex); - s = re_compile_pattern ("a[b-a]", 6, ®ex); - if (s == 0) - result |= 8; - - /* This should succeed, but does not for glibc-2.1.3. */ - memset (®ex, 0, sizeof regex); - s = re_compile_pattern ("{1", 2, ®ex); - if (s) - result |= 8; - - /* The following example is derived from a problem report - against gawk from Jorge Stolfi . */ - memset (®ex, 0, sizeof regex); - s = re_compile_pattern ("[an\371]*n", 7, ®ex); - if (s) - result |= 8; - /* This should match, but does not for glibc-2.2.1. */ - else if (re_match (®ex, "an", 2, 0, ®s) != 2) - result |= 8; - - memset (®ex, 0, sizeof regex); - s = re_compile_pattern ("x", 1, ®ex); - if (s) - result |= 8; - /* glibc-2.2.93 does not work with a negative RANGE argument. */ - else if (re_search (®ex, "wxy", 3, 2, -2, ®s) != 1) - result |= 8; - - /* The version of regex.c in older versions of gnulib - ignored RE_ICASE. Detect that problem too. */ - re_set_syntax (RE_SYNTAX_EMACS | RE_ICASE); - memset (®ex, 0, sizeof regex); - s = re_compile_pattern ("x", 1, ®ex); - if (s) - result |= 16; - else if (re_search (®ex, "WXY", 3, 0, 3, ®s) < 0) - result |= 16; - - /* Catch a bug reported by Vin Shelton in - http://lists.gnu.org/archive/html/bug-coreutils/2007-06/msg00089.html - */ - re_set_syntax (RE_SYNTAX_POSIX_BASIC - & ~RE_CONTEXT_INVALID_DUP - & ~RE_NO_EMPTY_RANGES); - memset (®ex, 0, sizeof regex); - s = re_compile_pattern ("[[:alnum:]_-]\\\\+$", 16, ®ex); - if (s) - result |= 32; - - /* REG_STARTEND was added to glibc on 2004-01-15. - Reject older versions. */ - if (! REG_STARTEND) - result |= 64; - -#if 0 - /* It would be nice to reject hosts whose regoff_t values are too - narrow (including glibc on hosts with 64-bit ptrdiff_t and - 32-bit int), but we should wait until glibc implements this - feature. Otherwise, support for equivalence classes and - multibyte collation symbols would always be broken except - when compiling --without-included-regex. */ - if (sizeof (regoff_t) < sizeof (ptrdiff_t) - || sizeof (regoff_t) < sizeof (ssize_t)) - result |= 64; -#endif - - return result; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - gl_cv_func_re_compile_pattern_working=yes -else - gl_cv_func_re_compile_pattern_working=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_re_compile_pattern_working" >&5 -$as_echo "$gl_cv_func_re_compile_pattern_working" >&6; } - case $gl_cv_func_re_compile_pattern_working in #( - yes) ac_use_included_regex=no;; #( - no) ac_use_included_regex=yes;; - esac - ;; - *) as_fn_error $? "Invalid value for --with-included-regex: $with_included_regex" "$LINENO" 5 - ;; - esac - - if test $ac_use_included_regex = yes; then - -$as_echo "#define _REGEX_INCLUDE_LIMITS_H 1" >>confdefs.h - - -$as_echo "#define _REGEX_LARGE_OFFSETS 1" >>confdefs.h - - -$as_echo "#define re_syntax_options rpl_re_syntax_options" >>confdefs.h - - -$as_echo "#define re_set_syntax rpl_re_set_syntax" >>confdefs.h - - -$as_echo "#define re_compile_pattern rpl_re_compile_pattern" >>confdefs.h - - -$as_echo "#define re_compile_fastmap rpl_re_compile_fastmap" >>confdefs.h - - -$as_echo "#define re_search rpl_re_search" >>confdefs.h - - -$as_echo "#define re_search_2 rpl_re_search_2" >>confdefs.h - - -$as_echo "#define re_match rpl_re_match" >>confdefs.h - - -$as_echo "#define re_match_2 rpl_re_match_2" >>confdefs.h - - -$as_echo "#define re_set_registers rpl_re_set_registers" >>confdefs.h - - -$as_echo "#define re_comp rpl_re_comp" >>confdefs.h - - -$as_echo "#define re_exec rpl_re_exec" >>confdefs.h - - -$as_echo "#define regcomp rpl_regcomp" >>confdefs.h - - -$as_echo "#define regexec rpl_regexec" >>confdefs.h - - -$as_echo "#define regerror rpl_regerror" >>confdefs.h - - -$as_echo "#define regfree rpl_regfree" >>confdefs.h - - fi - -if test $ac_use_included_regex = yes; then - case " $LIBOBJS " in - *" regex.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS regex.$ac_objext" - ;; -esac - - - - - - - for ac_header in libintl.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" -if test "x$ac_cv_header_libintl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBINTL_H 1 -_ACEOF - -fi - -done - - - : - - - - - - - - - - - - ac_fn_c_check_decl "$LINENO" "isblank" "ac_cv_have_decl_isblank" "#include -" -if test "x$ac_cv_have_decl_isblank" = xyes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_ISBLANK $ac_have_decl -_ACEOF - - -fi # help2man to generate man pages. @@ -18766,50 +18437,6 @@ MKINSTALLDIRS="\$(top_srcdir)/build-aux/install-sh -d" - - - -# Extract the first word of "perl", so it can be a program name with args. -set dummy perl; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PERL+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PERL in - [\\/]* | ?:[\\/]*) - ac_cv_path_PERL="$PERL" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="/opt/perl5/bin:"$PATH"" -for as_dir in $as_dummy -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="/usr/bin/env perl" - ;; -esac -fi -PERL=$ac_cv_path_PERL -if test -n "$PERL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 -$as_echo "$PERL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - # Needed on sysV68 for sigblock, sigsetmask. But check for it in libc first. @@ -19524,7 +19151,7 @@ # rather ncurses. So we check for it. TERMLIBS= # Check for termlib before termcap because Solaris termcap needs libucb. -TERMLIB_VARIANTS="ncurses curses termlib termcap terminfo" +TERMLIB_VARIANTS="tinfo ncurses curses termlib termcap terminfo" for termlib in ${TERMLIB_VARIANTS}; do as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -l${termlib}" >&5 @@ -19569,11 +19196,13 @@ fi done +have_termlib=yes # don't bother warning on djgpp, it doesn't have a term library, it # ports each termcap-needing program separately according to its needs. if test -z "$TERMLIBS" && echo "$build" | grep -v djgpp >/dev/null; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: probably need a terminal library, one of: ${TERMLIB_VARIANTS}" >&5 -$as_echo "$as_me: WARNING: probably need a terminal library, one of: ${TERMLIB_VARIANTS}" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: info needs a terminal library, one of: ${TERMLIB_VARIANTS}" >&5 +$as_echo "$as_me: WARNING: info needs a terminal library, one of: ${TERMLIB_VARIANTS}" >&2;} + have_termlib=no fi # Checks for variables. @@ -19637,6 +19266,14 @@ TERMLIBS="${TERMLIBS} -l${ac_cv_var_ospeed}" fi # + if test "x$TERMLIBS" != x; then + HAVE_TERMLIBS_TRUE= + HAVE_TERMLIBS_FALSE='#' +else + HAVE_TERMLIBS_TRUE='#' + HAVE_TERMLIBS_FALSE= +fi + # Do not use unless we're linking with ncurses. # Must come after the termlib tests. @@ -21950,7 +21587,7 @@ if test "z$PROVE" = 'z'; then tp_tests='no' - elif $PERL -e "use 5.006; use Encode; use Test::More; use File::Basename; use File::Copy; use Data::Dumper; use Data::Compare; use Test::Deep; use Storable qw(dclone); use Getopt::Long qw(GetOptions);" > /dev/null 2>&1; + elif $PERL -e "use 5.007_003; use Encode; use Test::More; use File::Basename; use File::Copy; use Data::Dumper; use Data::Compare; use Test::Deep; use Storable qw(dclone); use Getopt::Long qw(GetOptions);" > /dev/null 2>&1; then tp_tests='yes' else @@ -21983,7 +21620,7 @@ fi else - if $PERL -e "use 5.006; use Encode; use Pod::Simple::PullParser;" > /dev/null 2>&1; + if $PERL -e "use 5.007_003; use Encode; use Pod::Simple::PullParser;" > /dev/null 2>&1; then build_perl_api_texi='yes' else @@ -22018,7 +21655,7 @@ if test "z$PROVE" = 'z' ; then pod_simple_texinfo_tests='no' - elif $PERL -e "use 5.006; use Encode; use Test::More; use Pod::Simple::PullParser;" > /dev/null 2>&1; + elif $PERL -e "use 5.007_003; use Encode; use Test::More; use Pod::Simple::PullParser;" > /dev/null 2>&1; then pod_simple_texinfo_tests='yes' else @@ -22038,6 +21675,19 @@ else POD_SIMPLE_TEXINFO_TESTS_TRUE='#' POD_SIMPLE_TEXINFO_TESTS_FALSE= +fi + + +tgt_is_windows=no +case "$target" in + *-mingw32 | *-mingw64 | *-msdosdjgpp ) tgt_is_windows=yes ;; +esac + if test "x$tgt_is_windows" = "xyes"; then + TGT_IS_WINDOWS_TRUE= + TGT_IS_WINDOWS_FALSE='#' +else + TGT_IS_WINDOWS_TRUE='#' + TGT_IS_WINDOWS_FALSE= fi @@ -22254,6 +21904,10 @@ as_fn_error $? "conditional \"TOOLS_ONLY\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_TERMLIBS_TRUE}" && test -z "${HAVE_TERMLIBS_FALSE}"; then + as_fn_error $? "conditional \"HAVE_TERMLIBS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${INSTALL_WARNINGS_TRUE}" && test -z "${INSTALL_WARNINGS_FALSE}"; then as_fn_error $? "conditional \"INSTALL_WARNINGS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -22268,6 +21922,10 @@ fi if test -z "${POD_SIMPLE_TEXINFO_TESTS_TRUE}" && test -z "${POD_SIMPLE_TEXINFO_TESTS_FALSE}"; then as_fn_error $? "conditional \"POD_SIMPLE_TEXINFO_TESTS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${TGT_IS_WINDOWS_TRUE}" && test -z "${TGT_IS_WINDOWS_FALSE}"; then + as_fn_error $? "conditional \"TGT_IS_WINDOWS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -22667,7 +22325,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 4.13.91, which was +This file was extended by GNU Texinfo $as_me 4.13.92, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22735,7 +22393,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 4.13.91 +GNU Texinfo config.status 4.13.92 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -23743,3 +23401,11 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi + +# Summarize warnings to make them more visible. +if test $have_termlib = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find a terminal library among ${TERMLIB_VARIANTS}" >&5 +$as_echo "$as_me: WARNING: Could not find a terminal library among ${TERMLIB_VARIANTS}" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The programs from \`info' directory will not be built." >&5 +$as_echo "$as_me: WARNING: The programs from \`info' directory will not be built." >&2;} +fi diff --git a/configure.ac b/configure.ac index 593c449..16499df 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -# $Id: configure.ac,v 1.125 2012/11/26 19:27:08 karl Exp $ +# $Id: configure.ac,v 1.131 2012/12/18 01:36:12 karl Exp $ # # Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # 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], [4.13.91], [bug-texinfo@gnu.org]) +AC_INIT([GNU Texinfo], [4.13.92], [bug-texinfo@gnu.org]) dnl Must come before AM_INIT_AUTOMAKE. AC_CONFIG_AUX_DIR([build-aux]) @@ -27,6 +27,12 @@ AC_CONFIG_HEADERS([config.h:config.in])dnl Keep filename to 8.3 for MS-DOS. AC_CONFIG_SRCDIR([info/info.c]) +# version for the dtd. In between releases, PACKAGE_VERSION is not set +# to a value that corresponds to actual files on the internet. +# TEXINFO_DTD_VERSION=$PACKAGE_VERSION +TEXINFO_DTD_VERSION=5.00 +AC_SUBST([TEXINFO_DTD_VERSION]) + # Conditional texi2html support. AM_CONDITIONAL([TEXI2HTML],[false]) @@ -35,6 +41,9 @@ AC_SUBST([PACKAGE_DATE]) # We need Perl +AC_ARG_VAR([PERL], [The path to the 'perl' executable.]) +dnl AC_PATH_PROG([PERL], [perl], [/usr/bin/env perl], [/opt/perl5/bin:"$PATH"]) + AC_PATH_PROG([PERL], [perl]) if test -z "$PERL"; then AC_MSG_ERROR( @@ -43,7 +52,18 @@ specify where it is using ./configure PERL=/path/to/perl ]) - +fi + + +AC_MSG_CHECKING([Perl version and Encode module]) +if $PERL -e "use 5.007_003; use Encode;" > /dev/null 2>&1; then + perl_version_requirement='yes' +else + perl_version_requirement='no' +fi +AC_MSG_RESULT($perl_version_requirement) +if test z"$perl_version_requirement" = 'zno' ; then + AC_MSG_ERROR([perl >= 5.7.3 with Encode required by Texinfo.]) fi # Checks for programs. @@ -57,13 +77,6 @@ # Rest of Gnulib. gl_INIT -# Regex from Gnulib if needed. -gl_REGEX -if test $ac_use_included_regex = yes; then - AC_LIBOBJ([regex]) - gl_PREREQ_REGEX -fi - # help2man to generate man pages. AM_MISSING_PROG(HELP2MAN, help2man) @@ -76,9 +89,6 @@ dnl gettext Makefiles may need MKINSTALLDIRS MKINSTALLDIRS="\$(top_srcdir)/build-aux/install-sh -d" AC_SUBST([MKINSTALLDIRS]) - -AC_ARG_VAR([PERL], [The path to the 'perl' executable.]) -AC_PATH_PROG([PERL], [perl], [/usr/bin/env perl], [/opt/perl5/bin:"$PATH"]) # Needed on sysV68 for sigblock, sigsetmask. But check for it in libc first. AC_CHECK_FUNC(sigblock, , [AC_CHECK_LIB(bsd, sigblock)]) @@ -164,15 +174,17 @@ # rather ncurses. So we check for it. TERMLIBS= # Check for termlib before termcap because Solaris termcap needs libucb. -TERMLIB_VARIANTS="ncurses curses termlib termcap terminfo" +TERMLIB_VARIANTS="tinfo ncurses curses termlib termcap terminfo" for termlib in ${TERMLIB_VARIANTS}; do AC_CHECK_LIB(${termlib}, tgetent, [TERMLIBS="${TERMLIBS} -l${termlib}"; break]) done +have_termlib=yes # don't bother warning on djgpp, it doesn't have a term library, it # ports each termcap-needing program separately according to its needs. if test -z "$TERMLIBS" && echo "$build" | grep -v djgpp >/dev/null; then - AC_MSG_WARN([probably need a terminal library, one of: ${TERMLIB_VARIANTS}]) + AC_MSG_WARN([info needs a terminal library, one of: ${TERMLIB_VARIANTS}]) + have_termlib=no fi # Checks for variables. @@ -215,6 +227,7 @@ TERMLIBS="${TERMLIBS} -l${ac_cv_var_ospeed}" fi AC_SUBST(TERMLIBS)# +AM_CONDITIONAL(HAVE_TERMLIBS, [[test "x$TERMLIBS" != x]]) # Do not use unless we're linking with ncurses. # Must come after the termlib tests. @@ -307,7 +320,7 @@ [ if test "z$PROVE" = 'z'; then tp_tests='no' - elif $PERL -e "use 5.006; use Encode; use Test::More; use File::Basename; use File::Copy; use Data::Dumper; use Data::Compare; use Test::Deep; use Storable qw(dclone); use Getopt::Long qw(GetOptions);" > /dev/null 2>&1; + elif $PERL -e "use 5.007_003; use Encode; use Test::More; use File::Basename; use File::Copy; use Data::Dumper; use Data::Compare; use Test::Deep; use Storable qw(dclone); use Getopt::Long qw(GetOptions);" > /dev/null 2>&1; then tp_tests='yes' else @@ -329,7 +342,7 @@ build_perl_api_texi='yes' fi], [ - if $PERL -e "use 5.006; use Encode; use Pod::Simple::PullParser;" > /dev/null 2>&1; + if $PERL -e "use 5.007_003; use Encode; use Pod::Simple::PullParser;" > /dev/null 2>&1; then build_perl_api_texi='yes' else @@ -353,7 +366,7 @@ [ if test "z$PROVE" = 'z' ; then pod_simple_texinfo_tests='no' - elif $PERL -e "use 5.006; use Encode; use Test::More; use Pod::Simple::PullParser;" > /dev/null 2>&1; + elif $PERL -e "use 5.007_003; use Encode; use Test::More; use Pod::Simple::PullParser;" > /dev/null 2>&1; then pod_simple_texinfo_tests='yes' else @@ -364,6 +377,12 @@ AC_MSG_CHECKING([Pod::Simple::Texinfo tests requirements]) AC_MSG_RESULT([$pod_simple_texinfo_tests]) AM_CONDITIONAL([POD_SIMPLE_TEXINFO_TESTS], [test "z$pod_simple_texinfo_tests" = 'zyes']) + +tgt_is_windows=no +case "$target" in + *-mingw32 | *-mingw64 | *-msdosdjgpp ) tgt_is_windows=yes ;; +esac +AM_CONDITIONAL([TGT_IS_WINDOWS], [test "x$tgt_is_windows" = "xyes"]) # The config files to generate. AC_CONFIG_FILES([\ @@ -397,3 +416,9 @@ ]) AC_OUTPUT + +# Summarize warnings to make them more visible. +if test $have_termlib = no; then + AC_MSG_WARN([Could not find a terminal library among ${TERMLIB_VARIANTS}]) + AC_MSG_WARN([The programs from \`info' directory will not be built.]) +fi diff --git a/doc/Makefile.in b/doc/Makefile.in index 7084f12..ffb07ca 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.5 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -90,7 +90,6 @@ $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ $(top_srcdir)/gnulib/m4/iconv.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ - $(top_srcdir)/gnulib/m4/inline.m4 \ $(top_srcdir)/gnulib/m4/intlmacosx.m4 \ $(top_srcdir)/gnulib/m4/iswblank.m4 \ $(top_srcdir)/gnulib/m4/langinfo_h.m4 \ @@ -864,6 +863,7 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ TERMLIBS = @TERMLIBS@ TEX = @TEX@ +TEXINFO_DTD_VERSION = @TEXINFO_DTD_VERSION@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ diff --git a/doc/refcard/txicmdcheck b/doc/refcard/txicmdcheck index 65b44d8..266f5e9 100755 --- a/doc/refcard/txicmdcheck +++ b/doc/refcard/txicmdcheck @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# $Id: txicmdcheck,v 1.7 2012/09/21 17:40:45 karl Exp $ +# $Id: txicmdcheck,v 1.8 2012/12/14 18:57:42 karl Exp $ # Copyright 2008, 2011, 2012 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -28,6 +28,7 @@ my @card_cmds = &read_refcard ("txirefcard.tex"); my @man_cmds = &read_refman ("../texinfo.txi"); my @tp_cmds = &read_tp ("../../util/txicmdlist"); + # perhaps we should check against the manual's fnindex too. my (%card_cmds, %man_cmds, %tp_cmds); @card_cmds{@card_cmds} = (); diff --git a/doc/stamp-1 b/doc/stamp-1 index f22a2f9..6999a42 100644 --- a/doc/stamp-1 +++ b/doc/stamp-1 @@ -1,4 +1,4 @@ @set UPDATED 17 April 2012 @set UPDATED-MONTH April 2012 -@set EDITION 4.13.91 -@set VERSION 4.13.91 +@set EDITION 4.13.92 +@set VERSION 4.13.92 diff --git a/doc/stamp-vti b/doc/stamp-vti index 64e400b..28ca753 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 26 November 2012 -@set UPDATED-MONTH November 2012 -@set EDITION 4.13.91 -@set VERSION 4.13.91 +@set UPDATED 17 December 2012 +@set UPDATED-MONTH December 2012 +@set EDITION 4.13.92 +@set VERSION 4.13.92 diff --git a/doc/tp_api/Makefile.in b/doc/tp_api/Makefile.in index ef60643..2f2882b 100644 --- a/doc/tp_api/Makefile.in +++ b/doc/tp_api/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.5 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -86,7 +86,6 @@ $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ $(top_srcdir)/gnulib/m4/iconv.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ - $(top_srcdir)/gnulib/m4/inline.m4 \ $(top_srcdir)/gnulib/m4/intlmacosx.m4 \ $(top_srcdir)/gnulib/m4/iswblank.m4 \ $(top_srcdir)/gnulib/m4/langinfo_h.m4 \ @@ -782,6 +781,7 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ TERMLIBS = @TERMLIBS@ TEX = @TEX@ +TEXINFO_DTD_VERSION = @TEXINFO_DTD_VERSION@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ diff --git a/doc/tp_api/api_includes/Texinfo-Parser.texi b/doc/tp_api/api_includes/Texinfo-Parser.texi index 14bbc52..c2dd367 100644 --- a/doc/tp_api/api_includes/Texinfo-Parser.texi +++ b/doc/tp_api/api_includes/Texinfo-Parser.texi @@ -29,7 +29,7 @@ warn $error_message->{'error_line'}; } - my ($index_names, $merged_indices_hash, $index_entries_arrays) + my ($index_names, $merged_indices_hash) = $parser->indices_information(); my $float_types_arrays = $parser->floats_information(); my $internal_references_array @@ -333,14 +333,110 @@ @anchor{Texinfo::Parser indices_information} @verbatim - ($index_names, $merged_indices_hash, $index_entries_arrays) + ($index_names, $merged_indices_hash) = indices_information($parser); @end verbatim -The index names is a hash reference. The keys are the index names. They -are associated to a hash reference. The keys of these hash references are -the index prefixes associated to the index name, and the value is set if -the index entries should be formatted as code. +The index names is a hash reference. The keys are + +@table @asis +@item in_code +@anchor{Texinfo::Parser in_code} + +1 if the index entries should be formatted as code, 0 in the opposite case. + +@item name +@anchor{Texinfo::Parser name} + +The index name. + +@item prefix +@anchor{Texinfo::Parser prefix} + +An array reference of prefix associated to the index. + +@item merged_in +@anchor{Texinfo::Parser merged_in} + +In case the index is merged to another index, this key holds the name of +the index the index is merged into. It takes into account indirectly +merged indices. + +@item contained_indices +@anchor{Texinfo::Parser contained_indices} + +An hash reference holding names of indices that are merged to the index, +including itself. It also contains indirectly merged indices. This key +is present even if the index is itself later merged to another index. + +@item index_entries +@anchor{Texinfo::Parser index_entries} + +An array reference containing index entry structures for index entries +associated with the index. The index entry could be associated to +@@-commands like @code{@@cindex}, or @code{@@item} in @code{@@vtable}, or definition +commands entries like @code{@@deffn}. + +The keys of the index entry structures are + +@table @asis +@item index_name +@anchor{Texinfo::Parser index_name} + +The index name. + +@item index_prefix +@anchor{Texinfo::Parser index_prefix} + +The associated index prefix. + +@item index_at_command +@anchor{Texinfo::Parser index_at_command} + +The name of the @@-command associated with the index entry. + +@item index_type_command +@anchor{Texinfo::Parser index_type_command} + +The @@-command associated with the index entry allowing to +find the index type. + +@item content +@anchor{Texinfo::Parser content} + +An array reference corresponding to the index entry content. + +@item content_normalized +@anchor{Texinfo::Parser content_normalized} + +An array reference corresponding to the index entry content, independent +of the current language. + +@item command +@anchor{Texinfo::Parser command} + +The element in the parsed tree associated with the @@-command holding the +index entry. + +@item node +@anchor{Texinfo::Parser node} + +The node in the parsed tree containing the index entry. + +@item number +@anchor{Texinfo::Parser number} + +The number of the index entry. + +@item region +@anchor{Texinfo::Parser region} + +The region command (@code{@@copying}, @code{@@titlepage}) containing the index entry, +if it is in such an environement. + +@end table + +@end table The following shows the references corresponding with the default indexes @emph{cp} and @emph{fn}, the @emph{fn} index having its entries formatted as code and @@ -350,78 +446,19 @@ @defindex some @defcodeindex code - $index_names = {'cp' => {'cp' => 0, 'c' => 0}, - 'fn' => {'fn' => 1, 'f' => 1}, - 'some' => {'some' => 0}, - 'code' => {'code' => 1}}; -@end verbatim + $index_names = {'cp' => {'name' => 'cp', 'in_code' => 0, + 'prefix' => ['c', 'cp']}, + 'fn' => {'name' => 'fn', 'in_code' => 1, + 'prefix' => ['f', 'fn']}, + 'some' => {'in_code' => 0}, + 'code' => {'in_code' => 1}}; +@end verbatim + +If @code{name} is not set, it is set to the index name. If @code{prefix} is +not set, it is set to an array containing the index name. @emph{$merged_indices_hash} is a hash reference, the key is an index name merged in the value. - -Last, @emph{$index_entries_arrays} is an hash reference. The keys are -index names, the values are index entry structures that are associated -with the index entries, associated to @@-commands like @code{@@cindex}, -or @code{@@item} in @code{@@vtable}, or definition commands entries like @code{@@deffn}. - -The keys of the index entry structures are - -@table @asis -@item index_name -@anchor{Texinfo::Parser index_name} - -The index name. - -@item index_prefix -@anchor{Texinfo::Parser index_prefix} - -The associated index prefix. - -@item index_at_command -@anchor{Texinfo::Parser index_at_command} - -The name of the @@-command associated with the index entry. - -@item index_type_command -@anchor{Texinfo::Parser index_type_command} - -The @@-command associated with the index entry allowing to -find the index type. - -@item content -@anchor{Texinfo::Parser content} - -An array reference corresponding to the index entry content. - -@item content_normalized -@anchor{Texinfo::Parser content_normalized} - -An array reference corresponding to the index entry content, independent -of the current language. - -@item command -@anchor{Texinfo::Parser command} - -The element in the parsed tree associated with the @@-command holding the -index entry. - -@item node -@anchor{Texinfo::Parser node} - -The node in the parsed tree containing the index entry. - -@item number -@anchor{Texinfo::Parser number} - -The number of the index entry. - -@item region -@anchor{Texinfo::Parser region} - -The region command (@code{@@copying}, @code{@@titlepage}) containing the index entry, -if it is in such an environement. - -@end table @end table @@ -535,7 +572,7 @@ = item merged_indices The associated hash reference holds merged indices information, each key -is merged in the value. Same as setting @code{@@synindex} of @code{syncodeindex}. +is merged in the value. Same as setting @code{@@synindex} or @code{syncodeindex}. @item novalidate @anchor{Texinfo::Parser novalidate} @@ -1138,7 +1175,7 @@ @item index_entry @anchor{Texinfo::Parser index_entry} -The index entry information (described in @ref{Texinfo::Parser indices_information,, indices_information} +The index entry information (described in @ref{Texinfo::Parser index_entries,, index_entries} in details) is associated to @@-commands that have an associated index entry. diff --git a/doc/tp_api/api_includes/Texinfo-Structuring.texi b/doc/tp_api/api_includes/Texinfo-Structuring.texi index c857cc5..c09046d 100644 --- a/doc/tp_api/api_includes/Texinfo-Structuring.texi +++ b/doc/tp_api/api_includes/Texinfo-Structuring.texi @@ -39,10 +39,10 @@ elements_directions($parser, $elements); elements_file_directions($parser, $elements); - my ($index_names, $merged_indices, $index_entries) + my ($index_names, $merged_indices) = $parser->indices_information(); my $merged_index_entries - = merge_indices($index_names, $merged_indices, $index_entries); + = merge_indices($index_names); my $index_entries_sorted; if ($sort_by_letter) { $index_entries_sorted = sort_indices_by_letter($parser, @@ -367,16 +367,17 @@ The API for association of pages/elements to files is not defined yet. -@item $merged_entries = merge_indices($index_names, $merged_indices, $index_entries) -@anchor{Texinfo::Structuring $merged_entries = merge_indices($index_names@comma{} $merged_indices@comma{} $index_entries)} +@item $merged_entries = merge_indices($index_names) +@anchor{Texinfo::Structuring $merged_entries = merge_indices($index_names)} Using informations returned by @ref{Texinfo::Parser indices_information}, -a structure similar with the one returned by -@ref{Texinfo::Parser indices_information}, but with all the entries of -merged indices merged with those of the indice merged into. +a structure holding all the index entries by index name is returned, +with all the entries of merged indices merged with those of the indice +merged into. + The @emph{$merged_entries} returned is a hash reference whose keys are the index names and values arrays of index entry structures -described in details in @ref{Texinfo::Parser indices_information}. +described in details in @ref{Texinfo::Parser index_entries}. @item $index_entries_sorted = sort_indices_by_letter($parser, $merged_index_entries, $index_names) @anchor{Texinfo::Structuring $index_entries_sorted = sort_indices_by_letter($parser@comma{} $merged_index_entries@comma{} $index_names)} diff --git a/doc/version-stnd.texi b/doc/version-stnd.texi index f22a2f9..6999a42 100644 --- a/doc/version-stnd.texi +++ b/doc/version-stnd.texi @@ -1,4 +1,4 @@ @set UPDATED 17 April 2012 @set UPDATED-MONTH April 2012 -@set EDITION 4.13.91 -@set VERSION 4.13.91 +@set EDITION 4.13.92 +@set VERSION 4.13.92 diff --git a/doc/version.texi b/doc/version.texi index 64e400b..28ca753 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 26 November 2012 -@set UPDATED-MONTH November 2012 -@set EDITION 4.13.91 -@set VERSION 4.13.91 +@set UPDATED 17 December 2012 +@set UPDATED-MONTH December 2012 +@set EDITION 4.13.92 +@set VERSION 4.13.92 diff --git a/gnulib/lib/Makefile.am b/gnulib/lib/Makefile.am index 30fcb7a..4fa6dba 100644 --- a/gnulib/lib/Makefile.am +++ b/gnulib/lib/Makefile.am @@ -1317,6 +1317,7 @@ ## begin gnulib module unistd BUILT_SOURCES += unistd.h +libgnu_a_SOURCES += unistd.c # We need the following in order to create an empty placeholder for # when the system doesn't have one. @@ -1646,6 +1647,7 @@ ## begin gnulib module wctype-h BUILT_SOURCES += wctype.h +libgnu_a_SOURCES += wctype-h.c # We need the following in order to create when the system # doesn't have one that works with the given compiler. diff --git a/gnulib/lib/Makefile.in b/gnulib/lib/Makefile.in index fe07920..911aaff 100644 --- a/gnulib/lib/Makefile.in +++ b/gnulib/lib/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.5 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -100,7 +100,6 @@ $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ $(top_srcdir)/gnulib/m4/iconv.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ - $(top_srcdir)/gnulib/m4/inline.m4 \ $(top_srcdir)/gnulib/m4/intlmacosx.m4 \ $(top_srcdir)/gnulib/m4/iswblank.m4 \ $(top_srcdir)/gnulib/m4/langinfo_h.m4 \ @@ -185,7 +184,8 @@ localcharset.c malloca.c mbchar.c mbiter.h mbiter.c \ mbscasecmp.c mbschr.c mbslen.c mbsncasecmp.c mbsstr.c \ mbswidth.h mbswidth.c mbuiter.h mbuiter.c strnlen1.h \ - strnlen1.c tempname.c uniwidth/width.c xmalloc.c xalloc-die.c + strnlen1.c tempname.c unistd.c uniwidth/width.c wctype-h.c \ + xmalloc.c xalloc-die.c am__dirstamp = $(am__leading_dot)dirstamp @LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__objects_1 = uniwidth/width.$(OBJEXT) am_libgnu_a_OBJECTS = exitfail.$(OBJEXT) localcharset.$(OBJEXT) \ @@ -193,7 +193,8 @@ mbscasecmp.$(OBJEXT) mbschr.$(OBJEXT) mbslen.$(OBJEXT) \ mbsncasecmp.$(OBJEXT) mbsstr.$(OBJEXT) mbswidth.$(OBJEXT) \ mbuiter.$(OBJEXT) strnlen1.$(OBJEXT) tempname.$(OBJEXT) \ - $(am__objects_1) xmalloc.$(OBJEXT) xalloc-die.$(OBJEXT) + unistd.$(OBJEXT) $(am__objects_1) wctype-h.$(OBJEXT) \ + xmalloc.$(OBJEXT) xalloc-die.$(OBJEXT) libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS) LTLIBRARIES = $(noinst_LTLIBRARIES) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) @@ -860,6 +861,7 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ TERMLIBS = @TERMLIBS@ TEX = @TEX@ +TEXINFO_DTD_VERSION = @TEXINFO_DTD_VERSION@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ @@ -1009,8 +1011,8 @@ libgnu_a_SOURCES = exitfail.c gettext.h localcharset.h localcharset.c \ malloca.c mbchar.c mbiter.h mbiter.c mbscasecmp.c mbschr.c \ mbslen.c mbsncasecmp.c mbsstr.c mbswidth.h mbswidth.c \ - mbuiter.h mbuiter.c strnlen1.h strnlen1.c tempname.c \ - $(am__append_1) xmalloc.c xalloc-die.c + mbuiter.h mbuiter.c strnlen1.h strnlen1.c tempname.c unistd.c \ + $(am__append_1) wctype-h.c xmalloc.c xalloc-die.c libgnu_a_LIBADD = $(gl_LIBOBJS) libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) EXTRA_libgnu_a_SOURCES = argz.c btowc.c error.c getopt.c getopt1.c \ @@ -1145,7 +1147,9 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strnlen1.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strstr.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tempname.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unistd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcrtomb.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wctype-h.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcwidth.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xalloc-die.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Po@am__quote@ diff --git a/gnulib/lib/error.c b/gnulib/lib/error.c index dc8c65f..7d2bc71 100644 --- a/gnulib/lib/error.c +++ b/gnulib/lib/error.c @@ -121,7 +121,7 @@ #if !_LIBC /* Return non-zero if FD is open. */ -static inline int +static int is_open (int fd) { # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ @@ -139,7 +139,7 @@ } #endif -static inline void +static void flush_stdout (void) { #if !_LIBC diff --git a/gnulib/lib/lstat.c b/gnulib/lib/lstat.c index db119a1..97fe6bb 100644 --- a/gnulib/lib/lstat.c +++ b/gnulib/lib/lstat.c @@ -35,7 +35,7 @@ # include # undef __need_system_sys_stat_h -static inline int +static int orig_lstat (const char *filename, struct stat *buf) { return lstat (filename, buf); diff --git a/gnulib/lib/regex_internal.c b/gnulib/lib/regex_internal.c index 5ecabc0..6fed6da 100644 --- a/gnulib/lib/regex_internal.c +++ b/gnulib/lib/regex_internal.c @@ -1454,7 +1454,7 @@ return dfa->nodes_len++; } -static inline re_hashval_t +static re_hashval_t internal_function calc_state_hash (const re_node_set *nodes, unsigned int context) { diff --git a/gnulib/lib/regex_internal.h b/gnulib/lib/regex_internal.h index 196605d..924b4b3 100644 --- a/gnulib/lib/regex_internal.h +++ b/gnulib/lib/regex_internal.h @@ -83,9 +83,6 @@ # define BE(expr, val) __builtin_expect (expr, val) #else # define BE(expr, val) (expr) -# ifdef _LIBC -# define inline -# endif #endif /* Number of ASCII characters. */ @@ -727,33 +724,33 @@ } bracket_elem_t; -/* Inline functions for bitset_t operation. */ - -static inline void +/* Functions for bitset_t operation. */ + +static void bitset_set (bitset_t set, Idx i) { set[i / BITSET_WORD_BITS] |= (bitset_word_t) 1 << i % BITSET_WORD_BITS; } -static inline void +static void bitset_clear (bitset_t set, Idx i) { set[i / BITSET_WORD_BITS] &= ~ ((bitset_word_t) 1 << i % BITSET_WORD_BITS); } -static inline bool +static bool bitset_contain (const bitset_t set, Idx i) { return (set[i / BITSET_WORD_BITS] >> i % BITSET_WORD_BITS) & 1; } -static inline void +static void bitset_empty (bitset_t set) { memset (set, '\0', sizeof (bitset_t)); } -static inline void +static void bitset_set_all (bitset_t set) { memset (set, -1, sizeof (bitset_word_t) * (SBC_MAX / BITSET_WORD_BITS)); @@ -762,13 +759,13 @@ ((bitset_word_t) 1 << SBC_MAX % BITSET_WORD_BITS) - 1; } -static inline void +static void bitset_copy (bitset_t dest, const bitset_t src) { memcpy (dest, src, sizeof (bitset_t)); } -static inline void +static void bitset_not (bitset_t set) { int bitset_i; @@ -780,7 +777,7 @@ & ~set[BITSET_WORDS - 1]); } -static inline void +static void bitset_merge (bitset_t dest, const bitset_t src) { int bitset_i; @@ -788,7 +785,7 @@ dest[bitset_i] |= src[bitset_i]; } -static inline void +static void bitset_mask (bitset_t dest, const bitset_t src) { int bitset_i; @@ -797,8 +794,8 @@ } #ifdef RE_ENABLE_I18N -/* Inline functions for re_string. */ -static inline int +/* Functions for re_string. */ +static int internal_function __attribute ((pure)) re_string_char_size_at (const re_string_t *pstr, Idx idx) { @@ -811,7 +808,7 @@ return byte_idx; } -static inline wint_t +static wint_t internal_function __attribute ((pure)) re_string_wchar_at (const re_string_t *pstr, Idx idx) { diff --git a/gnulib/lib/stat.c b/gnulib/lib/stat.c index 7599540..c0bcb88 100644 --- a/gnulib/lib/stat.c +++ b/gnulib/lib/stat.c @@ -42,7 +42,7 @@ # endif #endif -static inline int +static int orig_stat (const char *filename, struct stat *buf) { return stat (filename, buf); diff --git a/gnulib/lib/sys_stat.in.h b/gnulib/lib/sys_stat.in.h index 2efc1e9..ac05ddb 100644 --- a/gnulib/lib/sys_stat.in.h +++ b/gnulib/lib/sys_stat.in.h @@ -497,7 +497,7 @@ # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ # if !GNULIB_defined_rpl_mkdir -static inline int +static int rpl_mkdir (char const *name, mode_t mode) { return _mkdir (name); diff --git a/gnulib/lib/unistd.c b/gnulib/lib/unistd.c new file mode 100644 index 0000000..6c6a8e2 --- /dev/null +++ b/gnulib/lib/unistd.c @@ -0,0 +1,3 @@ +#include +#define _GL_UNISTD_INLINE _GL_EXTERN_INLINE +#include "unistd.h" diff --git a/gnulib/lib/unistd.in.h b/gnulib/lib/unistd.in.h index e904e51..6171f77 100644 --- a/gnulib/lib/unistd.in.h +++ b/gnulib/lib/unistd.in.h @@ -125,6 +125,11 @@ But avoid namespace pollution on glibc systems. */ #if @GNULIB_UNISTD_H_GETOPT@ && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT # include +#endif + +_GL_INLINE_HEADER_BEGIN +#ifndef _GL_UNISTD_INLINE +# define _GL_UNISTD_INLINE _GL_INLINE #endif /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ @@ -404,7 +409,7 @@ # endif #elif defined GNULIB_POSIXCHECK # if HAVE_RAW_DECL_ENVIRON -static inline char *** +_GL_UNISTD_INLINE char *** rpl_environ (void) { return &environ; @@ -862,7 +867,7 @@ # define getpagesize() _gl_getpagesize () # else # if !GNULIB_defined_getpagesize_function -static inline int +_GL_UNISTD_INLINE int getpagesize () { return _gl_getpagesize (); @@ -1530,6 +1535,7 @@ _GL_CXXALIASWARN (write); #endif +_GL_INLINE_HEADER_END #endif /* _@GUARD_PREFIX@_UNISTD_H */ #endif /* _@GUARD_PREFIX@_UNISTD_H */ diff --git a/gnulib/lib/wctype-h.c b/gnulib/lib/wctype-h.c new file mode 100644 index 0000000..bb5f847 --- /dev/null +++ b/gnulib/lib/wctype-h.c @@ -0,0 +1,4 @@ +/* Normally this would be wctype.c, but that name's already taken. */ +#include +#define _GL_WCTYPE_INLINE _GL_EXTERN_INLINE +#include "wctype.h" diff --git a/gnulib/lib/wctype.in.h b/gnulib/lib/wctype.in.h index aa018b1..3c98fa3 100644 --- a/gnulib/lib/wctype.in.h +++ b/gnulib/lib/wctype.in.h @@ -53,6 +53,11 @@ #ifndef _@GUARD_PREFIX@_WCTYPE_H #define _@GUARD_PREFIX@_WCTYPE_H + +_GL_INLINE_HEADER_BEGIN +#ifndef _GL_WCTYPE_INLINE +# define _GL_WCTYPE_INLINE _GL_INLINE +#endif /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ @@ -148,7 +153,7 @@ # endif # endif -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswalnum # else @@ -160,7 +165,7 @@ || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z')); } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswalpha # else @@ -171,7 +176,7 @@ return (wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z'; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswblank # else @@ -182,7 +187,7 @@ return wc == ' ' || wc == '\t'; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswcntrl # else @@ -193,7 +198,7 @@ return (wc & ~0x1f) == 0 || wc == 0x7f; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswdigit # else @@ -204,7 +209,7 @@ return wc >= '0' && wc <= '9'; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswgraph # else @@ -215,7 +220,7 @@ return wc >= '!' && wc <= '~'; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswlower # else @@ -226,7 +231,7 @@ return wc >= 'a' && wc <= 'z'; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswprint # else @@ -237,7 +242,7 @@ return wc >= ' ' && wc <= '~'; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswpunct # else @@ -250,7 +255,7 @@ || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z'))); } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswspace # else @@ -262,7 +267,7 @@ || wc == '\n' || wc == '\v' || wc == '\f' || wc == '\r'); } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswupper # else @@ -273,7 +278,7 @@ return wc >= 'A' && wc <= 'Z'; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswxdigit # else @@ -285,7 +290,7 @@ || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'F')); } -static inline wint_t +_GL_WCTYPE_INLINE wint_t # if @REPLACE_TOWLOWER@ rpl_towlower # else @@ -296,7 +301,7 @@ return (wc >= 'A' && wc <= 'Z' ? wc - 'A' + 'a' : wc); } -static inline wint_t +_GL_WCTYPE_INLINE wint_t # if @REPLACE_TOWLOWER@ rpl_towupper # else @@ -336,7 +341,7 @@ result register. We need to fix this by adding a zero-extend from wchar_t to wint_t after the call. */ -static inline wint_t +_GL_WCTYPE_INLINE wint_t rpl_towlower (wint_t wc) { return (wint_t) (wchar_t) towlower (wc); @@ -345,7 +350,7 @@ # define towlower rpl_towlower # endif -static inline wint_t +_GL_WCTYPE_INLINE wint_t rpl_towupper (wint_t wc) { return (wint_t) (wchar_t) towupper (wc); @@ -493,6 +498,7 @@ # endif #endif +_GL_INLINE_HEADER_END #endif /* _@GUARD_PREFIX@_WCTYPE_H */ #endif /* _@GUARD_PREFIX@_WCTYPE_H */ diff --git a/gnulib/lib/xalloc.h b/gnulib/lib/xalloc.h index 6f5b87e..acf30a1 100644 --- a/gnulib/lib/xalloc.h +++ b/gnulib/lib/xalloc.h @@ -16,28 +16,33 @@ along with this program. If not, see . */ #ifndef XALLOC_H_ -# define XALLOC_H_ - -# include - -# include "xalloc-oversized.h" - -# ifdef __cplusplus +#define XALLOC_H_ + +#include + +#include "xalloc-oversized.h" + +_GL_INLINE_HEADER_BEGIN +#ifndef XALLOC_INLINE +# define XALLOC_INLINE _GL_INLINE +#endif + +#ifdef __cplusplus extern "C" { -# endif - - -# if __GNUC__ >= 3 -# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) -# else -# define _GL_ATTRIBUTE_MALLOC -# endif - -# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) -# define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args)) -# else -# define _GL_ATTRIBUTE_ALLOC_SIZE(args) -# endif +#endif + + +#if __GNUC__ >= 3 +# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) +#else +# define _GL_ATTRIBUTE_MALLOC +#endif + +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) +# define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args)) +#else +# define _GL_ATTRIBUTE_ALLOC_SIZE(args) +#endif /* This function is always triggered when memory is exhausted. It must be defined by the application, either explicitly @@ -67,45 +72,31 @@ /* Allocate an object of type T dynamically, with error checking. */ /* extern t *XMALLOC (typename t); */ -# define XMALLOC(t) ((t *) xmalloc (sizeof (t))) +#define XMALLOC(t) ((t *) xmalloc (sizeof (t))) /* Allocate memory for N elements of type T, with error checking. */ /* extern t *XNMALLOC (size_t n, typename t); */ -# define XNMALLOC(n, t) \ - ((t *) (sizeof (t) == 1 ? xmalloc (n) : xnmalloc (n, sizeof (t)))) +#define XNMALLOC(n, t) \ + ((t *) (sizeof (t) == 1 ? xmalloc (n) : xnmalloc (n, sizeof (t)))) /* Allocate an object of type T dynamically, with error checking, and zero it. */ /* extern t *XZALLOC (typename t); */ -# define XZALLOC(t) ((t *) xzalloc (sizeof (t))) +#define XZALLOC(t) ((t *) xzalloc (sizeof (t))) /* Allocate memory for N elements of type T, with error checking, and zero it. */ /* extern t *XCALLOC (size_t n, typename t); */ -# define XCALLOC(n, t) \ - ((t *) (sizeof (t) == 1 ? xzalloc (n) : xcalloc (n, sizeof (t)))) - - -# if HAVE_INLINE -# define static_inline static inline -# else -void *xnmalloc (size_t n, size_t s) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1, 2)); -void *xnrealloc (void *p, size_t n, size_t s) - _GL_ATTRIBUTE_ALLOC_SIZE ((2, 3)); -void *x2nrealloc (void *p, size_t *pn, size_t s); -char *xcharalloc (size_t n) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1)); -# endif - -# ifdef static_inline +#define XCALLOC(n, t) \ + ((t *) (sizeof (t) == 1 ? xzalloc (n) : xcalloc (n, sizeof (t)))) + /* Allocate an array of N objects, each with S bytes of memory, dynamically, with error checking. S must be nonzero. */ -static_inline void *xnmalloc (size_t n, size_t s) +XALLOC_INLINE void *xnmalloc (size_t n, size_t s) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1, 2)); -static_inline void * +XALLOC_INLINE void * xnmalloc (size_t n, size_t s) { if (xalloc_oversized (n, s)) @@ -116,9 +107,9 @@ /* Change the size of an allocated block of memory P to an array of N objects each of S bytes, with error checking. S must be nonzero. */ -static_inline void *xnrealloc (void *p, size_t n, size_t s) +XALLOC_INLINE void *xnrealloc (void *p, size_t n, size_t s) _GL_ATTRIBUTE_ALLOC_SIZE ((2, 3)); -static_inline void * +XALLOC_INLINE void * xnrealloc (void *p, size_t n, size_t s) { if (xalloc_oversized (n, s)) @@ -181,7 +172,7 @@ */ -static_inline void * +XALLOC_INLINE void * x2nrealloc (void *p, size_t *pn, size_t s) { size_t n = *pn; @@ -218,17 +209,15 @@ /* Return a pointer to a new buffer of N bytes. This is like xmalloc, except it returns char *. */ -static_inline char *xcharalloc (size_t n) +XALLOC_INLINE char *xcharalloc (size_t n) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1)); -static_inline char * +XALLOC_INLINE char * xcharalloc (size_t n) { return XNMALLOC (n, char); } -# endif - -# ifdef __cplusplus +#ifdef __cplusplus } /* C++ does not allow conversions from void * to other pointer types @@ -265,7 +254,7 @@ return (T *) xmemdup ((void const *) p, s); } -# endif +#endif #endif /* !XALLOC_H_ */ diff --git a/gnulib/lib/xmalloc.c b/gnulib/lib/xmalloc.c index 3b5f86c..9755985 100644 --- a/gnulib/lib/xmalloc.c +++ b/gnulib/lib/xmalloc.c @@ -17,11 +17,9 @@ #include -#if ! HAVE_INLINE -# define static_inline -#endif +#define XALLOC_INLINE _GL_EXTERN_INLINE + #include "xalloc.h" -#undef static_inline #include #include diff --git a/gnulib/m4/error.m4 b/gnulib/m4/error.m4 index 5d9c70a..1190e32 100644 --- a/gnulib/m4/error.m4 +++ b/gnulib/m4/error.m4 @@ -23,6 +23,5 @@ AC_DEFUN([gl_PREREQ_ERROR], [ AC_REQUIRE([AC_FUNC_STRERROR_R]) - AC_REQUIRE([AC_C_INLINE]) : ]) diff --git a/gnulib/m4/extern-inline.m4 b/gnulib/m4/extern-inline.m4 index 600c8d3..0a9fc9a 100644 --- a/gnulib/m4/extern-inline.m4 +++ b/gnulib/m4/extern-inline.m4 @@ -7,7 +7,6 @@ AC_DEFUN([gl_EXTERN_INLINE], [ - AC_REQUIRE([AC_C_INLINE]) AH_VERBATIM([extern_inline], [/* _GL_INLINE is a portable alternative to ISO C99 plain 'inline'. _GL_EXTERN_INLINE is a portable alternative to 'extern inline'. @@ -17,13 +16,19 @@ when FOO is an inline function in the header; see . _GL_INLINE_HEADER_END contains useful stuff to put - in the same include file, after uses of _GL_INLINE. */ -#if (__GNUC__ \ - ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ - : 199901L <= __STDC_VERSION__) + in the same include file, after uses of _GL_INLINE. + + Suppress the use of extern inline on Apple's platforms, + as Libc-825.25 (2012-09-19) is incompatible with it; see + . + Perhaps Apple will fix this some day. */ +#if ((__GNUC__ \ + ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ + : 199901L <= __STDC_VERSION__) \ + && !defined __APPLE__) # define _GL_INLINE inline # define _GL_EXTERN_INLINE extern inline -#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) +#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __APPLE__ # if __GNUC_GNU_INLINE__ /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ # define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) @@ -32,8 +37,8 @@ # endif # define _GL_EXTERN_INLINE extern #else -# define _GL_INLINE static inline -# define _GL_EXTERN_INLINE static inline +# define _GL_INLINE static _GL_UNUSED +# define _GL_EXTERN_INLINE static _GL_UNUSED #endif #if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) diff --git a/gnulib/m4/gnulib-comp.m4 b/gnulib/m4/gnulib-comp.m4 index 0e1025a..57cd65b 100644 --- a/gnulib/m4/gnulib-comp.m4 +++ b/gnulib/m4/gnulib-comp.m4 @@ -58,7 +58,6 @@ # Code from module gettimeofday: # Code from module havelib: # Code from module include_next: - # Code from module inline: # Code from module intprops: # Code from module iswblank: # Code from module langinfo: @@ -203,7 +202,6 @@ gl_PREREQ_GETTIMEOFDAY fi gl_SYS_TIME_MODULE_INDICATOR([gettimeofday]) - gl_INLINE gl_FUNC_ISWBLANK if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then : @@ -635,6 +633,7 @@ lib/tempname.c lib/tempname.h lib/time.in.h + lib/unistd.c lib/unistd.in.h lib/unitypes.in.h lib/uniwidth.in.h @@ -643,6 +642,7 @@ lib/verify.h lib/wchar.in.h lib/wcrtomb.c + lib/wctype-h.c lib/wctype.in.h lib/wcwidth.c lib/xalloc-die.c @@ -670,7 +670,6 @@ m4/gnulib-common.m4 m4/iconv.m4 m4/include_next.m4 - m4/inline.m4 m4/intdiv0.m4 m4/intl.m4 m4/intldir.m4 diff --git a/gnulib/m4/inline.m4 b/gnulib/m4/inline.m4 deleted file mode 100644 index 6fa9972..0000000 --- a/gnulib/m4/inline.m4 +++ /dev/null @@ -1,40 +0,0 @@ -# inline.m4 serial 4 -dnl Copyright (C) 2006, 2009-2012 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 Test for the 'inline' keyword or equivalent. -dnl Define 'inline' to a supported equivalent, or to nothing if not supported, -dnl like AC_C_INLINE does. Also, define HAVE_INLINE if 'inline' or an -dnl equivalent is effectively supported, i.e. if the compiler is likely to -dnl drop unused 'static inline' functions. -AC_DEFUN([gl_INLINE], -[ - AC_REQUIRE([AC_C_INLINE]) - AC_CACHE_CHECK([whether the compiler generally respects inline], - [gl_cv_c_inline_effective], - [if test $ac_cv_c_inline = no; then - gl_cv_c_inline_effective=no - else - dnl GCC defines __NO_INLINE__ if not optimizing or if -fno-inline is - dnl specified. - dnl Use AC_COMPILE_IFELSE here, not AC_EGREP_CPP, because the result - dnl depends on optimization flags, which can be in CFLAGS. - dnl (AC_EGREP_CPP looks only at the CPPFLAGS.) - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[]], - [[#ifdef __NO_INLINE__ - #error "inline is not effective" - #endif]])], - [gl_cv_c_inline_effective=yes], - [gl_cv_c_inline_effective=no]) - fi - ]) - if test $gl_cv_c_inline_effective = yes; then - AC_DEFINE([HAVE_INLINE], [1], - [Define to 1 if the compiler supports one of the keywords - 'inline', '__inline__', '__inline' and effectively inlines - functions marked as such.]) - fi -]) diff --git a/gnulib/m4/lstat.m4 b/gnulib/m4/lstat.m4 index b7335bd..01b4eb9 100644 --- a/gnulib/m4/lstat.m4 +++ b/gnulib/m4/lstat.m4 @@ -1,4 +1,4 @@ -# serial 25 +# serial 26 # Copyright (C) 1997-2001, 2003-2012 Free Software Foundation, Inc. # @@ -27,11 +27,7 @@ ]) # Prerequisites of lib/lstat.c. -AC_DEFUN([gl_PREREQ_LSTAT], -[ - AC_REQUIRE([AC_C_INLINE]) - : -]) +AC_DEFUN([gl_PREREQ_LSTAT], [:]) AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK], [ diff --git a/gnulib/m4/stat.m4 b/gnulib/m4/stat.m4 index a8b79f5..0fd117e 100644 --- a/gnulib/m4/stat.m4 +++ b/gnulib/m4/stat.m4 @@ -1,4 +1,4 @@ -# serial 10 +# serial 11 # Copyright (C) 2009-2012 Free Software Foundation, Inc. # @@ -68,8 +68,4 @@ ]) # Prerequisites of lib/stat.c. -AC_DEFUN([gl_PREREQ_STAT], -[ - AC_REQUIRE([AC_C_INLINE]) - : -]) +AC_DEFUN([gl_PREREQ_STAT], [:]) diff --git a/gnulib/m4/sys_socket_h.m4 b/gnulib/m4/sys_socket_h.m4 index 8d4e7e1..acfae41 100644 --- a/gnulib/m4/sys_socket_h.m4 +++ b/gnulib/m4/sys_socket_h.m4 @@ -1,4 +1,4 @@ -# sys_socket_h.m4 serial 22 +# sys_socket_h.m4 serial 23 dnl Copyright (C) 2005-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -10,7 +10,6 @@ [ AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AC_C_INLINE]) dnl On OSF/1, the functions recv(), send(), recvfrom(), sendto() have dnl old-style declarations (with return type 'int' instead of 'ssize_t') diff --git a/gnulib/m4/sys_stat_h.m4 b/gnulib/m4/sys_stat_h.m4 index f45dee1..8af3353 100644 --- a/gnulib/m4/sys_stat_h.m4 +++ b/gnulib/m4/sys_stat_h.m4 @@ -1,4 +1,4 @@ -# sys_stat_h.m4 serial 27 -*- Autoconf -*- +# sys_stat_h.m4 serial 28 -*- Autoconf -*- dnl Copyright (C) 2006-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -10,9 +10,6 @@ AC_DEFUN([gl_HEADER_SYS_STAT_H], [ AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) - - dnl For the mkdir substitute. - AC_REQUIRE([AC_C_INLINE]) dnl Check for broken stat macros. AC_REQUIRE([AC_HEADER_STAT]) diff --git a/gnulib/m4/unistd_h.m4 b/gnulib/m4/unistd_h.m4 index 7e7651b..f68fbff 100644 --- a/gnulib/m4/unistd_h.m4 +++ b/gnulib/m4/unistd_h.m4 @@ -1,4 +1,4 @@ -# unistd_h.m4 serial 65 +# unistd_h.m4 serial 66 dnl Copyright (C) 2006-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -11,7 +11,6 @@ dnl Use AC_REQUIRE here, so that the default behavior below is expanded dnl once only, before all statements that occur in other macros. AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) - AC_REQUIRE([AC_C_INLINE]) gl_CHECK_NEXT_HEADERS([unistd.h]) if test $ac_cv_header_unistd_h = yes; then diff --git a/gnulib/m4/wctype_h.m4 b/gnulib/m4/wctype_h.m4 index 4b19f64..885e6fc 100644 --- a/gnulib/m4/wctype_h.m4 +++ b/gnulib/m4/wctype_h.m4 @@ -1,4 +1,4 @@ -# wctype_h.m4 serial 17 +# wctype_h.m4 serial 18 dnl A placeholder for ISO C99 , for platforms that lack it. @@ -21,8 +21,6 @@ HAVE_ISWCNTRL=0 fi AC_SUBST([HAVE_ISWCNTRL]) - - AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([gt_TYPE_WINT_T]) if test $gt_cv_c_wint_t = yes; then diff --git a/gnulib/m4/xalloc.m4 b/gnulib/m4/xalloc.m4 index f47b649..6c2d5d0 100644 --- a/gnulib/m4/xalloc.m4 +++ b/gnulib/m4/xalloc.m4 @@ -1,22 +1,7 @@ -# xalloc.m4 serial 17 +# xalloc.m4 serial 18 dnl Copyright (C) 2002-2006, 2009-2012 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. -AC_DEFUN([gl_XALLOC], -[ - gl_PREREQ_XALLOC - gl_PREREQ_XMALLOC -]) - -# Prerequisites of lib/xalloc.h. -AC_DEFUN([gl_PREREQ_XALLOC], [ - AC_REQUIRE([gl_INLINE]) - : -]) - -# Prerequisites of lib/xmalloc.c. -AC_DEFUN([gl_PREREQ_XMALLOC], [ - : -]) +AC_DEFUN([gl_XALLOC], [:]) diff --git a/info/Makefile.in b/info/Makefile.in index 172f18e..ae59da5 100644 --- a/info/Makefile.in +++ b/info/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.5 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -89,7 +89,6 @@ $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ $(top_srcdir)/gnulib/m4/iconv.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ - $(top_srcdir)/gnulib/m4/inline.m4 \ $(top_srcdir)/gnulib/m4/intlmacosx.m4 \ $(top_srcdir)/gnulib/m4/iswblank.m4 \ $(top_srcdir)/gnulib/m4/langinfo_h.m4 \ @@ -820,6 +819,7 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ TERMLIBS = @TERMLIBS@ TEX = @TEX@ +TEXINFO_DTD_VERSION = @TEXINFO_DTD_VERSION@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ diff --git a/info/display.c b/info/display.c index 1e05bbe..9f5d5e2 100644 --- a/info/display.c +++ b/info/display.c @@ -1,5 +1,5 @@ /* display.c -- How to display Info windows. - $Id: display.c,v 1.18 2012/11/17 17:16:18 gray Exp $ + $Id: display.c,v 1.20 2012/12/01 15:15:44 gray Exp $ Copyright (C) 1993, 1997, 2003, 2004, 2006, 2007, 2008, 2012 Free Software Foundation, Inc. @@ -113,14 +113,14 @@ } int -display_node_text(void *closure, size_t line_index, +display_node_text(void *closure, size_t pline_index, size_t lline_index, const char *src_line, char *printed_line, size_t pl_index, size_t pl_count) { struct display_node_closure *dn = closure; WINDOW *win = dn->win; DISPLAY_LINE **display = dn->display; - DISPLAY_LINE *entry = display[win->first_row + line_index]; + DISPLAY_LINE *entry = display[win->first_row + pline_index]; /* We have the exact line as it should appear on the screen. Check to see if this line matches the one already appearing @@ -139,7 +139,7 @@ /* Need to erase the line if it has escape sequences. */ || (raw_escapes_p && mbschr (entry->text, '\033') != 0)) { - terminal_goto_xy (0, win->first_row + line_index); + terminal_goto_xy (0, win->first_row + pline_index); terminal_clear_to_eol (); entry->inverse = 0; entry->text[0] = '\0'; @@ -154,7 +154,7 @@ if (i != pl_count || pl_count != entry->textlen) { /* Move to the proper point on the terminal. */ - terminal_goto_xy (i, win->first_row + line_index); + terminal_goto_xy (i, win->first_row + pline_index); /* If there is any text to print, print it. */ if (i != pl_count) terminal_put_text (printed_line + i); @@ -196,7 +196,7 @@ return 1; } - if (line_index + 1 == win->height) + if (pline_index + 1 == win->height) return 1; return 0; @@ -324,7 +324,7 @@ last = end + amount; /* Shift the lines to scroll right into place. */ - for (i = 0; i < (end - start); i++) + for (i = 1; i <= (end - start); i++) { temp = the_display[last - i]; the_display[last - i] = the_display[end - i]; @@ -340,8 +340,7 @@ the_display[i]->inverse = 0; } } - - if (amount < 0) + else { last = start + amount; for (i = 0; i < (end - start); i++) diff --git a/info/indices.c b/info/indices.c index 82e5845..32405e5 100644 --- a/info/indices.c +++ b/info/indices.c @@ -1,5 +1,5 @@ /* indices.c -- deal with an Info file index. - $Id: indices.c,v 1.20 2012/04/12 10:38:28 gray Exp $ + $Id: indices.c,v 1.21 2012/11/30 23:58:20 gray Exp $ Copyright (C) 1993, 1997, 1998, 1999, 2002, 2003, 2004, 2007, 2008, 2011 Free Software Foundation, Inc. @@ -502,7 +502,8 @@ { long loc; - long line = index_index[i]->line_number - 1; + long line = window_log_to_phys_line (window, + index_index[i]->line_number - 1); if (line >= 0 && line < window->line_count) { diff --git a/info/tag.c b/info/tag.c index 38198f2..90851aa 100644 --- a/info/tag.c +++ b/info/tag.c @@ -1,5 +1,5 @@ /* tag.c -- Functions to handle Info tags. - $Id: tag.c,v 1.1 2012/11/17 17:16:19 gray Exp $ + $Id: tag.c,v 1.2 2012/11/30 23:58:20 gray Exp $ Copyright (C) 2012 Free Software Foundation, Inc. @@ -186,12 +186,9 @@ while ((p = input + strlen (input)) < endp) { - size_t len = p - input; if (memcmp(p + 1, "\b[", 2) == 0) { char *q; - size_t len; - struct tag_handler *tp; p += 3; q = p + strlen (p); @@ -237,7 +234,7 @@ } } -size_t +void handle_tag (char *tag) { /* Nothing so far */ diff --git a/info/tag.h b/info/tag.h index e0a51f8..5359439 100644 --- a/info/tag.h +++ b/info/tag.h @@ -1,5 +1,5 @@ /* tag.c -- Functions to handle Info tags. - $Id: tag.h,v 1.1 2012/11/17 17:16:19 gray Exp $ + $Id: tag.h,v 1.2 2012/11/30 23:58:21 gray Exp $ Copyright (C) 2012 Free Software Foundation, Inc. @@ -20,6 +20,6 @@ #define TAG_H void tags_expand (char **pbuf, size_t *pbuflen); -size_t handle_tag (char *tag); +void handle_tag (char *tag); #endif diff --git a/info/terminal.c b/info/terminal.c index b97dd04..1d77acc 100644 --- a/info/terminal.c +++ b/info/terminal.c @@ -1,5 +1,5 @@ /* terminal.c -- how to handle the physical terminal for Info. - $Id: terminal.c,v 1.10 2012/11/26 01:32:03 karl Exp $ + $Id: terminal.c,v 1.11 2012/12/01 15:15:44 gray Exp $ Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2001, 2002, 2004, 2007, 2008, 2012 Free Software Foundation, Inc. @@ -412,25 +412,21 @@ if (terminal_scroll_terminal_hook) (*terminal_scroll_terminal_hook) (start, end, amount); - else + else if (amount > 0) { /* If we are scrolling down, delete AMOUNT lines at END. Then insert AMOUNT lines at START. */ - if (amount > 0) - { - terminal_delete_lines (end, amount); - terminal_insert_lines (start, amount); - } - + terminal_delete_lines (end, amount); + terminal_insert_lines (start, amount); + } + else + { /* If we are scrolling up, delete AMOUNT lines before START. This actually does the upwards scroll. Then, insert AMOUNT lines after the already scrolled region (i.e., END - AMOUNT). */ - if (amount < 0) - { - int abs_amount = -amount; - terminal_delete_lines (start - abs_amount, abs_amount); - terminal_insert_lines (end - abs_amount, abs_amount); - } + int abs_amount = -amount; + terminal_delete_lines (start - abs_amount, abs_amount); + terminal_insert_lines (end - abs_amount, abs_amount); } } diff --git a/info/window.c b/info/window.c index 1f7493e..643d80d 100644 --- a/info/window.c +++ b/info/window.c @@ -1,5 +1,5 @@ /* window.c -- windows in Info. - $Id: window.c,v 1.25 2012/07/06 23:55:32 karl Exp $ + $Id: window.c,v 1.26 2012/11/30 23:58:20 gray Exp $ Copyright (C) 1993, 1997, 1998, 2001, 2002, 2003, 2004, 2007, 2008, 2011, 2012 Free Software Foundation, Inc. @@ -25,6 +25,7 @@ #include "display.h" #include "info-utils.h" #include "infomap.h" +#include "tag.h" /* The window which describes the screen. */ WINDOW *the_screen = NULL; @@ -137,6 +138,7 @@ { windows->height = 0; maybe_free (windows->line_starts); + maybe_free (windows->log_line_no); windows->line_starts = NULL; windows->line_count = 0; break; @@ -584,9 +586,11 @@ if (window != the_echo_area) { char **old_starts; + size_t *old_xlat; int old_lines, old_pagetop; old_starts = window->line_starts; + old_xlat = window->log_line_no; old_lines = window->line_count; old_pagetop = window->pagetop; @@ -602,6 +606,7 @@ display_scroll_line_starts (window, old_pagetop, old_starts, old_lines); maybe_free (old_starts); + maybe_free (old_xlat); } window->flags |= W_UpdateWindow; } @@ -645,11 +650,9 @@ else prev->next = next; - if (window->line_starts) - free (window->line_starts); - - if (window->modeline) - free (window->modeline); + free (window->line_starts); + free (window->log_line_no); + free (window->modeline); if (window == active_window) { @@ -800,18 +803,36 @@ struct calc_closure { WINDOW *win; - int line_starts_slots; /* FIXME: size_t */ + size_t line_starts_slots; }; +static void +calc_closure_expand (struct calc_closure *cp) +{ + if (cp->win->line_count == cp->line_starts_slots) + { + if (cp->line_starts_slots == 0) + cp->line_starts_slots = 100; + cp->win->line_starts = x2nrealloc (cp->win->line_starts, + &cp->line_starts_slots, + sizeof (cp->win->line_starts[0])); + cp->win->log_line_no = xrealloc (cp->win->log_line_no, + cp->line_starts_slots * + sizeof (cp->win->log_line_no[0])); + } +} + static int -_calc_line_starts (void *closure, size_t line_index, +_calc_line_starts (void *closure, size_t pline_index, size_t lline_index, const char *src_line, char *printed_line, size_t pl_index, size_t pl_count) { struct calc_closure *cp = closure; - add_pointer_to_array (src_line, - cp->win->line_count, cp->win->line_starts, - cp->line_starts_slots, 100, char *); + + calc_closure_expand (cp); + cp->win->line_starts[cp->win->line_count] = (char*) src_line; + cp->win->log_line_no[cp->win->line_count] = lline_index; + cp->win->line_count++; return 0; } @@ -821,6 +842,7 @@ struct calc_closure closure; window->line_starts = NULL; + window->log_line_no = NULL; window->line_count = 0; if (!window->node) @@ -830,6 +852,9 @@ closure.line_starts_slots = 0; process_node_text (window, window->node->contents, 0, _calc_line_starts, &closure); + calc_closure_expand (&closure); + window->line_starts[window->line_count] = NULL; + window->log_line_no[window->line_count] = 0; } /* Given WINDOW, recalculate the line starts for the node it displays. */ @@ -837,9 +862,28 @@ recalculate_line_starts (WINDOW *window) { maybe_free (window->line_starts); + maybe_free (window->log_line_no); calculate_line_starts (window); } +/* Return the number of first physical line corresponding to the logical + line LN. + + A logical line can occupy one or more physical lines of output. It + occupies more than one physical line if its width is greater than the + window width and the flag W_NoWrap is not set for that window. + */ +size_t +window_log_to_phys_line (WINDOW *window, size_t ln) +{ + size_t i; + + if (ln > window->line_count) + return 0; + for (i = ln; i < window->line_count && window->log_line_no[i] < ln; i++) + ; + return i; +} /* Global variable control redisplay of scrolled windows. If non-zero, it is the desired number of lines to scroll the window in order to @@ -1430,12 +1474,13 @@ FUN is called for every line collected from the node. Its arguments: - int (*fun) (void *closure, size_t line_no, + int (*fun) (void *closure, size_t phys_line_no, size_t log_line_no, const char *src_line, char *prt_line, size_t prt_bytes, size_t prt_chars) closure -- An opaque pointer passed as 5th parameter to process_node_text; - line_no -- Number of processed line (starts from 0); + line_no -- Number of processed physical line (starts from 0); + log_line_no -- Number of processed logical line (starts from 0); src_line -- Pointer to the source line (unmodified); prt_line -- Collected line contents, ready for output; prt_bytes -- Number of bytes in prt_line; @@ -1452,14 +1497,16 @@ size_t process_node_text (WINDOW *win, char *start, int do_tags, - int (*fun) (void *, size_t, const char *, char *, size_t, size_t), + int (*fun) (void *, size_t, size_t, + const char *, char *, size_t, size_t), void *closure) { char *printed_line; /* Buffer for a printed line. */ size_t pl_count = 0; /* Number of *characters* written to PRINTED_LINE */ size_t pl_index = 0; /* Index into PRINTED_LINE. */ size_t in_index = 0; - size_t line_index = 0; /* Number of lines done so far. */ + size_t line_index = 0; /* Number of physical lines done so far. */ + size_t logline_index = 0;/* Number of logical lines */ size_t allocated_win_width; mbi_iterator_t iter; @@ -1493,7 +1540,7 @@ if (*cur_ptr == '\r' || *cur_ptr == '\n') { replen = win->width - pl_count; - delim = 1; + delim = *cur_ptr; } else if (ansi_escape (iter, &cur_len)) { @@ -1508,7 +1555,7 @@ else { if (*cur_ptr == '\t') - delim = 1; + delim = *cur_ptr; cur_ptr = printed_representation (cur_ptr, cur_len, pl_count, &cur_len); replen = cur_len; @@ -1590,10 +1637,13 @@ printed_line[pl_index] = '\0'; } - rc = fun (closure, line_index, mbi_cur_ptr (iter) - in_index, + rc = fun (closure, line_index, logline_index, + mbi_cur_ptr (iter) - in_index, printed_line, pl_index, pl_count); ++line_index; + if (delim == '\r' || delim == '\n') + ++logline_index; /* Reset all data to the start of the line. */ pl_index = 0; @@ -1631,7 +1681,8 @@ } if (pl_count) - fun (closure, line_index, mbi_cur_ptr (iter) - in_index, + fun (closure, line_index, logline_index, + mbi_cur_ptr (iter) - in_index, printed_line, pl_index, pl_count); free (printed_line); diff --git a/info/window.h b/info/window.h index 3d080b7..a09e971 100644 --- a/info/window.h +++ b/info/window.h @@ -1,5 +1,5 @@ /* window.h -- Structure and flags used in manipulating Info windows. - $Id: window.h,v 1.14 2011/10/18 18:47:22 karl Exp $ + $Id: window.h,v 1.15 2012/11/30 23:58:20 gray Exp $ This file is part of GNU Info, a program for reading online documentation stored in Info format. @@ -70,16 +70,18 @@ { struct window_struct *next; /* Next window in this chain. */ struct window_struct *prev; /* Previous window in this chain. */ - int width; /* Width of this window. */ - int height; /* Height of this window. */ - int first_row; /* Offset of the first line in the_screen. */ - int goal_column; /* The column we would like the cursor to appear in. */ + size_t width; /* Width of this window. */ + size_t height; /* Height of this window. */ + size_t first_row; /* Offset of the first line in the_screen. */ + size_t goal_column; /* The column we would like the cursor to appear in. */ Keymap keymap; /* Keymap used to read commands in this window. */ WINDOW_STATE_DECL; /* Node, pagetop and point. */ LINE_MAP line_map; /* Current line map */ char *modeline; /* Calculated text of the modeline for this window. */ char **line_starts; /* Array of printed line starts for this node. */ - int line_count; /* Number of lines appearing in LINE_STARTS. */ + size_t line_count; /* Number of lines appearing in LINE_STARTS. */ + size_t *log_line_no; /* Number of logical line corresponding to each + physical one. */ int flags; /* See below for details. */ } WINDOW; @@ -273,7 +275,8 @@ extern size_t process_node_text (WINDOW *win, char *start, int do_tags, - int (*fun) (void *, size_t, const char *, char *, size_t, size_t), + int (*fun) (void *, size_t, size_t, const char *, char *, + size_t, size_t), void *closure); void clean_manpage (char *manpage); diff --git a/install-info/Makefile.in b/install-info/Makefile.in index c661028..a2dd133 100644 --- a/install-info/Makefile.in +++ b/install-info/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.5 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -87,7 +87,6 @@ $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ $(top_srcdir)/gnulib/m4/iconv.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ - $(top_srcdir)/gnulib/m4/inline.m4 \ $(top_srcdir)/gnulib/m4/intlmacosx.m4 \ $(top_srcdir)/gnulib/m4/iswblank.m4 \ $(top_srcdir)/gnulib/m4/langinfo_h.m4 \ @@ -840,6 +839,7 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ TERMLIBS = @TERMLIBS@ TEX = @TEX@ +TEXINFO_DTD_VERSION = @TEXINFO_DTD_VERSION@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ diff --git a/install-info/tests/Makefile.in b/install-info/tests/Makefile.in index 85c6700..1d81de9 100644 --- a/install-info/tests/Makefile.in +++ b/install-info/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.5 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -87,7 +87,6 @@ $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ $(top_srcdir)/gnulib/m4/iconv.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ - $(top_srcdir)/gnulib/m4/inline.m4 \ $(top_srcdir)/gnulib/m4/intlmacosx.m4 \ $(top_srcdir)/gnulib/m4/iswblank.m4 \ $(top_srcdir)/gnulib/m4/langinfo_h.m4 \ @@ -967,6 +966,7 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ TERMLIBS = @TERMLIBS@ TEX = @TEX@ +TEXINFO_DTD_VERSION = @TEXINFO_DTD_VERSION@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ diff --git a/install-info/tests/defs.in b/install-info/tests/defs.in index fe2c18a..2631996 100644 --- a/install-info/tests/defs.in +++ b/install-info/tests/defs.in @@ -1,5 +1,5 @@ # @configure_input@ -# $Id: defs.in,v 1.3 2012/11/26 18:30:49 karl Exp $ +# $Id: defs.in,v 1.6 2012/12/02 23:12:22 karl Exp $ # # Copyright 2008, 2012 Free Software Foundation, Inc. # @@ -26,7 +26,7 @@ # Ensure we are running from the right directory. if test ! -f ./defs; then - echo "defs: not found in current directory" 1>&2 + echo "$0: defs: not found in current directory." 1>&2 exit 1 fi @@ -36,6 +36,33 @@ # compute $srcdir. srcdir=`echo "$0" | sed -e 's,/[^\\/]*$,,'` test $srcdir = $0 && srcdir=. +fi + +# Two variables we use in the test scripts: +top_builddir=@top_builddir@ +install_info=${top_builddir}/install-info/ginstall-info +export install_info +# +top_srcdir=@top_srcdir@ +testdir=${top_srcdir}/install-info/tests +export testdir + +if test -z "$TMPDIR"; then + TMPDIR=/tmp + export TMPDIR +fi + +# In case someone pedantic insists on using grep -E. +: ${EGREP=egrep} + +# Systems which define $COMSPEC or $ComSpec use semicolons to separate +# directories in TEXINPUTS -- except for Cygwin et al., where COMSPEC +# might be inherited, but : is used. +if test -n "$COMSPEC$ComSpec" \ + && uname | $EGREP -iv 'cygwin|mingw|djgpp' >/dev/null; then + path_sep=";" +else + path_sep=":" fi # Return true if PROG is somewhere in PATH, else false. @@ -62,13 +89,18 @@ return 1 } - -# Two variables we use in the test scripts. - -top_builddir=@top_builddir@ -install_info=${top_builddir}/install-info/ginstall-info -export install_info - -top_srcdir=@top_srcdir@ -testdir=${top_srcdir}/install-info/tests -export testdir +if findprog mktemp; then :; else +# Some deficient proprietary systems lack mktemp; kowtow to them. +# Our mktemp substitute doesn't need all the features of real mktemp; +# our tests here only use it in the most simplistic way, to create a +# temp file. The autoconf manual suggests doing it in a temporary +# directory (mode 700). ($RANDOM may expand to nothing, but that's ok.) +# We do not even bother to expand the X's in the template ... +mktemp () +{ + dir=$TMPDIR/iimktemp$$-$RANDOM + (umask 077 && mkdir "$dir") + touch "$dir/$1" || return 1 + echo "$dir/$1" +} +fi diff --git a/man/Makefile.am b/man/Makefile.am index 0a95b1b..aea1853 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,7 +1,7 @@ -# $Id: Makefile.am,v 1.4 2012/11/23 00:19:00 pertusus Exp $ +# $Id: Makefile.am,v 1.5 2012/12/14 19:36:53 karl Exp $ # Makefile.am for texinfo/man. # -# Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # Free Software Foundation, Inc. # # This file is free software; as a special exception the author gives @@ -13,7 +13,13 @@ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # These are generated using help2man. -man_MANS = info.1 infokey.1 install-info.1 makeinfo.1 texindex.1 texi2dvi.1 +man_MANS = install-info.1 makeinfo.1 texindex.1 texi2dvi.1 + +# These require the build in info/, thus can't do if we failed to find a +# terminal library. +if HAVE_TERMLIBS +man_MANS += info.1 infokey.1 +endif # These are hand-written. man_MANS += info.5 texinfo.5 diff --git a/man/Makefile.in b/man/Makefile.in index d5a72cb..2fc8097 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.5 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -14,10 +14,10 @@ @SET_MAKE@ -# $Id: Makefile.am,v 1.4 2012/11/23 00:19:00 pertusus Exp $ +# $Id: Makefile.am,v 1.5 2012/12/14 19:36:53 karl Exp $ # Makefile.am for texinfo/man. # -# Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # Free Software Foundation, Inc. # # This file is free software; as a special exception the author gives @@ -62,6 +62,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ + +# These require the build in info/, thus can't do if we failed to find a +# terminal library. +@HAVE_TERMLIBS_TRUE@am__append_1 = info.1 infokey.1 subdir = man DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -86,7 +90,6 @@ $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ $(top_srcdir)/gnulib/m4/iconv.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ - $(top_srcdir)/gnulib/m4/inline.m4 \ $(top_srcdir)/gnulib/m4/intlmacosx.m4 \ $(top_srcdir)/gnulib/m4/iswblank.m4 \ $(top_srcdir)/gnulib/m4/langinfo_h.m4 \ @@ -811,6 +814,7 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ TERMLIBS = @TERMLIBS@ TEX = @TEX@ +TEXINFO_DTD_VERSION = @TEXINFO_DTD_VERSION@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ @@ -891,8 +895,8 @@ # These are hand-written. # These are just .so's to the common program. -man_MANS = info.1 infokey.1 install-info.1 makeinfo.1 texindex.1 \ - texi2dvi.1 info.5 texinfo.5 texi2any.1 texi2pdf.1 \ +man_MANS = install-info.1 makeinfo.1 texindex.1 texi2dvi.1 \ + $(am__append_1) info.5 texinfo.5 texi2any.1 texi2pdf.1 \ pdftexi2dvi.1 EXTRA_DIST = $(man_MANS) ginfo.h2m diff --git a/man/info.1 b/man/info.1 index 9a3f090..e27482a 100644 --- a/man/info.1 +++ b/man/info.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.12. -.TH INFO "1" "November 2012" "info 4.13.91" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.13. +.TH INFO "1" "December 2012" "info 4.13.92" "User Commands" .SH NAME info \- read Info documents .SH SYNOPSIS diff --git a/man/infokey.1 b/man/infokey.1 index dfb6c34..5f0795d 100644 --- a/man/infokey.1 +++ b/man/infokey.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.12. -.TH INFOKEY "1" "November 2012" "infokey 4.13.91" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.13. +.TH INFOKEY "1" "December 2012" "infokey 4.13.92" "User Commands" .SH NAME infokey \- compile customizations for Info .SH SYNOPSIS diff --git a/man/install-info.1 b/man/install-info.1 index 42a3542..2c3d12e 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.40.12. -.TH INSTALL-INFO "1" "November 2012" "install-info 4.13.91" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.13. +.TH INSTALL-INFO "1" "December 2012" "install-info 4.13.92" "User Commands" .SH NAME install-info \- update info/dir entries .SH SYNOPSIS diff --git a/man/makeinfo.1 b/man/makeinfo.1 index d80a23c..b742bbf 100644 --- a/man/makeinfo.1 +++ b/man/makeinfo.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.12. -.TH MAKEINFO "1" "November 2012" "makeinfo 4.13.91" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.13. +.TH MAKEINFO "1" "December 2012" "makeinfo 4.13.92" "User Commands" .SH NAME makeinfo \- translate Texinfo documents .SH SYNOPSIS @@ -37,7 +37,7 @@ \fB\-\-init\-file\fR=\fIFILE\fR load FILE to modify the default behavior. .TP -\fB\-\-set\-customization\-variable\fR VAR=VAL +\fB\-c\fR, \fB\-\-set\-customization\-variable\fR VAR=VAL set customization variable VAR to VAL. .TP diff --git a/man/texi2dvi.1 b/man/texi2dvi.1 index 65d8441..52791f6 100644 --- a/man/texi2dvi.1 +++ b/man/texi2dvi.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.12. -.TH TEXI2DVI "1" "November 2012" "texi2dvi 1.173" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.13. +.TH TEXI2DVI "1" "December 2012" "texi2dvi 1.173" "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 e6ad622..3fbb531 100644 --- a/man/texindex.1 +++ b/man/texindex.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.12. -.TH TEXINDEX "1" "November 2012" "texindex 4.13.91" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.13. +.TH TEXINDEX "1" "December 2012" "texindex 4.13.92" "User Commands" .SH NAME texindex \- sort Texinfo index files .SH SYNOPSIS diff --git a/po/cs.gmo b/po/cs.gmo index 4d27a1f..b4de443 100644 Binary files a/po/cs.gmo and b/po/cs.gmo differ diff --git a/po/cs.po b/po/cs.po index 4afd2c6..54f62a5 100644 --- a/po/cs.po +++ b/po/cs.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: texinfo 4.0\n" "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n" -"POT-Creation-Date: 2012-11-26 11:42-0800\n" +"POT-Creation-Date: 2012-12-17 17:27-0800\n" "PO-Revision-Date: 2000-10-31 15:17+01:00\n" "Last-Translator: Vladimir Michl \n" "Language-Team: Czech \n" @@ -300,7 +300,7 @@ msgid "Look up a string in the index for this file" msgstr "Vyhledání øetìzce v rejstøíku tohoto souboru" -#: info/indices.c:203 info/indices.c:892 +#: info/indices.c:203 info/indices.c:893 #, c-format msgid "Finding index entries..." msgstr "Jsou hledány polo¾ky rejstøíku..." @@ -314,7 +314,7 @@ msgid "Index entry: " msgstr "Polo¾ka rejstøíku: " -#: info/indices.c:254 info/indices.c:914 info/session.c:4133 +#: info/indices.c:254 info/indices.c:915 info/session.c:4133 #, c-format msgid "Search string too short" msgstr "" @@ -341,7 +341,7 @@ msgid "No more index entries containing `%s'." msgstr "Ji¾ není %spolo¾ka rejstøíku, která obsahuje \"%s\"." -#: info/indices.c:433 info/indices.c:950 +#: info/indices.c:433 info/indices.c:951 #, fuzzy, c-format msgid "No index entries containing `%s'." msgstr "Ji¾ není %spolo¾ka rejstøíku, která obsahuje \"%s\"." @@ -355,26 +355,26 @@ msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)" msgstr "Nalezeno \"%s\" v %s. (`\\[next-index-match]' - hledání dal¹í.)" -#: info/indices.c:611 +#: info/indices.c:612 #, fuzzy, c-format msgid "Scanning indices of `%s'..." msgstr "Prohledávám tyto rejstøíky \"%s\"..." -#: info/indices.c:665 +#: info/indices.c:666 #, c-format msgid "No available info files have `%s' in their indices." msgstr "" -#: info/indices.c:691 +#: info/indices.c:692 msgid "Grovel all known info file's indices for a string and build a menu" msgstr "" "Vyhledání øetìzce ve v¹ech známých rejstøících info souborù a vytvoøení menu" -#: info/indices.c:695 +#: info/indices.c:696 msgid "Index apropos: " msgstr "Hledat v rejstøíku odkaz na:" -#: info/indices.c:723 +#: info/indices.c:724 #, fuzzy, c-format msgid "" "\n" @@ -383,21 +383,21 @@ "\n" "* Menu: Uzly jejich¾ rejstøíky obsahují \"%s\":\n" -#: info/indices.c:875 +#: info/indices.c:876 msgid "List all matches of a string in the index" msgstr "" -#: info/indices.c:898 +#: info/indices.c:899 #, fuzzy, c-format msgid "No index" msgstr "Nejsou polo¾ky rejstøíku." -#: info/indices.c:902 +#: info/indices.c:903 #, fuzzy msgid "Index topic: " msgstr "Hledat v rejstøíku odkaz na:" -#: info/indices.c:921 +#: info/indices.c:922 #, fuzzy, c-format msgid "Index for `%s'" msgstr " pro %s" @@ -408,7 +408,7 @@ msgstr "Více informací mù¾ete získat pomocí pøepínaèe --help.\n" #: info/info.c:299 info/infokey.c:144 install-info/install-info.c:2133 -#: tp/texi2any.pl:698 util/texindex.c:295 +#: tp/texi2any.pl:735 util/texindex.c:295 #, c-format, perl-format msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -1860,25 +1860,25 @@ msgid "Set %s to value (%s): " msgstr "Nastavení promìnné %s na hodnotu (%s): " -#: info/window.c:1032 +#: info/window.c:1076 msgid "--*** Tags out of Date ***" msgstr "--*** Znaèky jsou zastatalé ***" -#: info/window.c:1043 +#: info/window.c:1087 msgid "-----Info: (), lines ----, " msgstr "-----Info: (), øádkù ----, " -#: info/window.c:1050 +#: info/window.c:1094 #, c-format msgid "-%s---Info: %s, %d lines --%s--" msgstr "-%s---Info: %s, øádkù: %d --%s--" -#: info/window.c:1054 +#: info/window.c:1098 #, c-format msgid "-%s%s-Info: (%s)%s, %d lines --%s--" msgstr "-%s%s-Info: (%s)%s, øádkù: %d --%s--" -#: info/window.c:1061 +#: info/window.c:1105 #, c-format msgid " Subfile: %s" msgstr " Podsoubor: %s" @@ -1970,7 +1970,7 @@ " --version display version information and exit." msgstr "" -#: install-info/install-info.c:589 tp/texi2any.pl:686 +#: install-info/install-info.c:589 tp/texi2any.pl:723 #, fuzzy msgid "" "Email bug reports to bug-texinfo@gnu.org,\n" @@ -2088,106 +2088,101 @@ msgid "no entries found for `%s'; nothing deleted" msgstr "pro `%s' nebyly nalezeny ¾ádné polo¾ky" -#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:789 +#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:794 #: tp/Texinfo/Convert/DocBook.pm:311 tp/Texinfo/Convert/HTML.pm:6518 #: tp/Texinfo/Convert/HTML.pm:6542 tp/Texinfo/Convert/HTML.pm:6918 #: tp/Texinfo/Convert/HTML.pm:6975 tp/Texinfo/Convert/HTML.pm:7052 -#: tp/Texinfo/Convert/HTML.pm:7120 tp/Texinfo/Convert/Info.pm:90 +#: tp/Texinfo/Convert/HTML.pm:7124 tp/Texinfo/Convert/Info.pm:90 #: tp/Texinfo/Convert/Info.pm:178 tp/Texinfo/Convert/Info.pm:201 -#: tp/Texinfo/Convert/Plaintext.pm:462 tp/Texinfo/Convert/XML.pm:275 +#: tp/Texinfo/Convert/Plaintext.pm:462 tp/Texinfo/Convert/XML.pm:281 #, fuzzy, perl-format msgid "Could not open %s for writing: %s" msgstr "Výstup %s pro expanzi makra nelze otevøít" -#: tp/Texinfo/Common.pm:808 +#: tp/Texinfo/Common.pm:824 msgid "recursion is always allowed" msgstr "" -#: tp/Texinfo/Common.pm:809 +#: tp/Texinfo/Common.pm:825 msgid "arguments are quoted by default" msgstr "" -#: tp/Texinfo/Common.pm:1008 +#: tp/Texinfo/Common.pm:1024 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "%s není platný kód jazyka (podle ISO 639)" -#: tp/Texinfo/Common.pm:1013 +#: tp/Texinfo/Common.pm:1029 #, fuzzy, perl-format msgid "%s is not a valid region code" msgstr "%s není platný kód jazyka (podle ISO 639)" -#: tp/Texinfo/Common.pm:1031 +#: tp/Texinfo/Common.pm:1047 #, fuzzy, perl-format msgid "%s is not a valid split possibility" msgstr "%s není platný kód jazyka (podle ISO 639)" -#: tp/Texinfo/Common.pm:1054 tp/Texinfo/Common.pm:1477 +#: tp/Texinfo/Common.pm:1070 tp/Texinfo/Common.pm:1495 #, fuzzy, perl-format msgid "Cannot read %s: %s" msgstr "Výstupní soubor `%s' nelze vytvoøit." -#: tp/Texinfo/Common.pm:1071 +#: tp/Texinfo/Common.pm:1087 #, fuzzy, perl-format msgid "Error on closing @verbatiminclude file %s: %s" msgstr "Výstupní soubor `%s' nelze vytvoøit." -#: tp/Texinfo/Common.pm:1076 tp/Texinfo/Parser.pm:3067 +#: tp/Texinfo/Common.pm:1092 tp/Texinfo/Parser.pm:3084 #, fuzzy, perl-format msgid "@%s: Cannot find %s" msgstr "Nelze najít `%s'." -#: tp/Texinfo/Common.pm:1376 +#: tp/Texinfo/Common.pm:1392 #, fuzzy, perl-format msgid "Cannot open html refs config file %s: %s" msgstr "Výstupní soubor `%s' nelze vytvoøit." -#: tp/Texinfo/Common.pm:1404 +#: tp/Texinfo/Common.pm:1420 msgid "Missing type" msgstr "" -#: tp/Texinfo/Common.pm:1407 +#: tp/Texinfo/Common.pm:1423 #, fuzzy, perl-format msgid "Unrecognized type: %s" msgstr "%s: neznámý pøepínaè `--%s'\n" -#: tp/Texinfo/Common.pm:1423 +#: tp/Texinfo/Common.pm:1439 #, fuzzy, perl-format msgid "Error on closing html refs config file %s: %s" msgstr "Výstupní soubor `%s' nelze vytvoøit." -#: tp/Texinfo/Common.pm:1458 +#: tp/Texinfo/Common.pm:1474 #, perl-format msgid "%s:%d: no node to be renamed\n" msgstr "" -#: tp/Texinfo/Common.pm:1469 +#: tp/Texinfo/Common.pm:1485 #, perl-format msgid "%s:%d: nodes without a new name at the end of file\n" msgstr "" -#: tp/Texinfo/Common.pm:1473 -#, fuzzy, perl-format -msgid "Error on closing renamed nodes file %s: %s" -msgstr "Výstupní soubor `%s' nelze vytvoøit." - -#: tp/Texinfo/Common.pm:1958 +#: tp/Texinfo/Common.pm:1976 #, perl-format msgid "protect_hashchar_at_line_beginning cannot protect in @%s" msgstr "" -#: tp/Texinfo/Convert/Converter.pm:397 tp/Texinfo/Convert/Converter.pm:416 -#: tp/texi2any.pl:349 tp/texi2any.pl:366 +#: tp/Texinfo/Convert/Converter.pm:398 tp/Texinfo/Convert/Converter.pm:417 +#: tp/texi2any.pl:385 tp/texi2any.pl:402 #, fuzzy, perl-format msgid "Obsolete variable %s\n" msgstr "Nastavení promìnné: " -#: tp/Texinfo/Convert/Converter.pm:603 +#: tp/Texinfo/Convert/Converter.pm:608 #, fuzzy, perl-format msgid "Can't create directories `%s' or `%s': %s" msgstr "Výstupní soubor `%s' nelze vytvoøit." -#: tp/Texinfo/Convert/Converter.pm:611 +#: tp/Texinfo/Convert/Converter.pm:616 #, fuzzy, perl-format msgid "Can't create directories `%s': %s" msgstr "Výstupní soubor `%s' nelze vytvoøit." @@ -2195,14 +2190,14 @@ #: tp/Texinfo/Convert/DocBook.pm:347 tp/Texinfo/Convert/HTML.pm:6943 #: tp/Texinfo/Convert/HTML.pm:7001 tp/Texinfo/Convert/Info.pm:145 #: tp/Texinfo/Convert/Info.pm:167 tp/Texinfo/Convert/Info.pm:194 -#: tp/Texinfo/Convert/Info.pm:257 tp/Texinfo/Convert/XML.pm:305 -#: tp/Texinfo/Parser.pm:1855 tp/init/chm.pm:267 tp/init/chm.pm:338 +#: tp/Texinfo/Convert/Info.pm:257 tp/Texinfo/Convert/XML.pm:315 +#: tp/Texinfo/Parser.pm:1871 tp/init/chm.pm:267 tp/init/chm.pm:338 #: tp/init/chm.pm:399 #, fuzzy, perl-format msgid "Error on closing %s: %s" msgstr "Výstupní soubor `%s' nelze vytvoøit." -#: tp/Texinfo/Convert/DocBook.pm:933 +#: tp/Texinfo/Convert/DocBook.pm:919 #, fuzzy, perl-format msgid "@image file `%s' not found, using `%s'" msgstr "soubor `%s' v pøíkazu @image je neèitelný: %s" @@ -2217,32 +2212,32 @@ msgid "Raw format %s is not converted" msgstr "" -#: tp/Texinfo/Convert/HTML.pm:4831 +#: tp/Texinfo/Convert/HTML.pm:4832 #, perl-format msgid "%s:%d: string not closed in css file" msgstr "" -#: tp/Texinfo/Convert/HTML.pm:4833 +#: tp/Texinfo/Convert/HTML.pm:4834 #, perl-format msgid "%s:%d: --css-include ended in comment" msgstr "" -#: tp/Texinfo/Convert/HTML.pm:4835 +#: tp/Texinfo/Convert/HTML.pm:4836 #, perl-format msgid "%s:%d @import not finished in css file" msgstr "" -#: tp/Texinfo/Convert/HTML.pm:4861 +#: tp/Texinfo/Convert/HTML.pm:4862 #, fuzzy, perl-format msgid "css file %s not found" msgstr "%cend makro nebylo nalezeno" -#: tp/Texinfo/Convert/HTML.pm:4867 +#: tp/Texinfo/Convert/HTML.pm:4868 #, fuzzy, perl-format msgid "could not open --include-file %s: %s" msgstr "Výstup %s pro expanzi makra nelze otevøít" -#: tp/Texinfo/Convert/HTML.pm:4877 +#: tp/Texinfo/Convert/HTML.pm:4878 #, fuzzy, perl-format msgid "Error on closing CSS file %s: %s" msgstr "Výstupní soubor `%s' nelze vytvoøit." @@ -2276,32 +2271,32 @@ msgid "Error on closing redirection node file %s: %s" msgstr "" -#: tp/Texinfo/Convert/HTML.pm:7082 -#, fuzzy, perl-format -msgid "Node `%s' that is to be renamed exists" -msgstr "Rejstøík `%s' ji¾ existuje" - -#: tp/Texinfo/Convert/HTML.pm:7086 +#: tp/Texinfo/Convert/HTML.pm:7083 +#, fuzzy, perl-format +msgid "Old name for `%s' is a node of the document" +msgstr "V tomto dokumentu není pro tento uzel pøedchozí nebo vy¹¹í uzel." + +#: tp/Texinfo/Convert/HTML.pm:7087 #, fuzzy, perl-format msgid "File empty for renamed node `%s'" msgstr "uzel `%s' - nesmìøuje na nìj ¾ádný odkaz" -#: tp/Texinfo/Convert/HTML.pm:7098 -#, perl-format -msgid "Node to be renamed as, `%s' not found" -msgstr "" - -#: tp/Texinfo/Convert/HTML.pm:7126 -#, fuzzy, perl-format -msgid "Error on closing renamed node file %s: %s" +#: tp/Texinfo/Convert/HTML.pm:7099 +#, perl-format +msgid "Target node (new name for `%s') not in document: %s" +msgstr "" + +#: tp/Texinfo/Convert/HTML.pm:7131 +#, fuzzy, perl-format +msgid "Error on closing renamed node redirection file %s: %s" msgstr "Výstupní soubor `%s' nelze vytvoøit." -#: tp/Texinfo/Convert/HTML.pm:7164 +#: tp/Texinfo/Convert/HTML.pm:7169 #, fuzzy msgid "Empty node name" msgstr "odpovídající polo¾ky rejstøíku nebyly pro `%s' nalezeny\n" -#: tp/Texinfo/Convert/HTML.pm:7166 tp/Texinfo/Parser.pm:3402 +#: tp/Texinfo/Convert/HTML.pm:7171 tp/Texinfo/Parser.pm:3420 #, perl-format msgid "Syntax for an external node used for `%s'" msgstr "" @@ -2322,7 +2317,7 @@ #: tp/Texinfo/Convert/Info.pm:226 #, perl-format -msgid "@%s `%s' output more than once" +msgid "@%s output more than once: %s" msgstr "" #: tp/Texinfo/Convert/Info.pm:340 @@ -2330,658 +2325,658 @@ msgid "@%s outside of any node" msgstr "(mimo v¹echny uzly)" -#: tp/Texinfo/Convert/Plaintext.pm:1110 tp/Texinfo/Parser.pm:2450 +#: tp/Texinfo/Convert/Plaintext.pm:1109 tp/Texinfo/Parser.pm:2467 #, perl-format msgid "Entry for index `%s' outside of any node" msgstr "Polo¾ka pro rejstøík `%s' je mimo v¹echny uzly" -#: tp/Texinfo/Convert/Plaintext.pm:1218 +#: tp/Texinfo/Convert/Plaintext.pm:1217 #, fuzzy, perl-format msgid "Error on closing image text file %s: %s" msgstr "Výstupní soubor `%s' nelze vytvoøit." -#: tp/Texinfo/Convert/Plaintext.pm:1223 +#: tp/Texinfo/Convert/Plaintext.pm:1222 #, perl-format msgid "@image file `%s' unreadable: %s" msgstr "soubor `%s' v pøíkazu @image je neèitelný: %s" -#: tp/Texinfo/Convert/Plaintext.pm:1251 +#: tp/Texinfo/Convert/Plaintext.pm:1250 #, fuzzy, perl-format msgid "Cannot find @image file `%s.txt' nor alternate text" msgstr "Uzel `%s' nelze nalézt." -#: tp/Texinfo/Convert/Plaintext.pm:1616 +#: tp/Texinfo/Convert/Plaintext.pm:1615 msgid "" "@strong{Note...} produces a spurious cross-reference in Info; reword to " "avoid that" msgstr "" -#: tp/Texinfo/Convert/Plaintext.pm:1846 +#: tp/Texinfo/Convert/Plaintext.pm:1845 #, fuzzy, perl-format msgid "`.' or `,' must follow @xref, not %s" msgstr "`.' nebo `,' musí následovat za køí¾ovým odkazem, ale ne za %c" -#: tp/Texinfo/Convert/Plaintext.pm:1848 +#: tp/Texinfo/Convert/Plaintext.pm:1847 #, fuzzy msgid "`.' or `,' must follow @xref" msgstr "`.' nebo `,' musí následovat za køí¾ovým odkazem, ale ne za %c" -#: tp/Texinfo/Parser.pm:784 +#: tp/Texinfo/Parser.pm:800 #, fuzzy, perl-format msgid "@%s should only appear at beginning or end of document" msgstr "Výstup %s pro expanzi makra nelze otevøít" -#: tp/Texinfo/Parser.pm:800 +#: tp/Texinfo/Parser.pm:816 #, fuzzy, perl-format msgid "Can't read file %s: %s" msgstr "Výstupní soubor `%s' nelze vytvoøit." -#: tp/Texinfo/Parser.pm:1030 tp/Texinfo/Structuring.pm:548 +#: tp/Texinfo/Parser.pm:1046 tp/Texinfo/Structuring.pm:548 #, perl-format msgid "Multiple @%s" msgstr "" -#: tp/Texinfo/Parser.pm:1061 +#: tp/Texinfo/Parser.pm:1077 #, fuzzy, perl-format msgid "Bad syntax for @%s argument: %s" msgstr "©patný argument pro %c%s" -#: tp/Texinfo/Parser.pm:1077 +#: tp/Texinfo/Parser.pm:1093 #, perl-format msgid "Bad or empty @%s formal argument: %s" msgstr "" -#: tp/Texinfo/Parser.pm:1086 tp/Texinfo/Parser.pm:4440 -#: tp/Texinfo/Parser.pm:4463 tp/Texinfo/Parser.pm:5080 -#: tp/Texinfo/Parser.pm:5089 tp/Texinfo/Parser.pm:5099 +#: tp/Texinfo/Parser.pm:1102 tp/Texinfo/Parser.pm:4458 +#: tp/Texinfo/Parser.pm:4481 tp/Texinfo/Parser.pm:5098 +#: tp/Texinfo/Parser.pm:5107 tp/Texinfo/Parser.pm:5117 #, perl-format msgid "%c%s requires a name" msgstr "%c%s po¾aduje jméno" -#: tp/Texinfo/Parser.pm:1196 +#: tp/Texinfo/Parser.pm:1212 #, perl-format msgid "%c%s missing close brace" msgstr "%c%s chybìjící uzavírací závorka" -#: tp/Texinfo/Parser.pm:1199 +#: tp/Texinfo/Parser.pm:1215 #, fuzzy, perl-format msgid "@%s missing closing delimiter sequence: %s}" msgstr "%c%s chybìjící uzavírací závorka" -#: tp/Texinfo/Parser.pm:1311 +#: tp/Texinfo/Parser.pm:1327 #, fuzzy, perl-format msgid "@itemx should not begin @%s" msgstr "Výstup %s pro expanzi makra nelze otevøít" -#: tp/Texinfo/Parser.pm:1379 +#: tp/Texinfo/Parser.pm:1395 msgid "@itemx must follow @item" msgstr "" -#: tp/Texinfo/Parser.pm:1545 +#: tp/Texinfo/Parser.pm:1561 #, perl-format msgid "@%s has text but no @item" msgstr "" -#: tp/Texinfo/Parser.pm:1575 +#: tp/Texinfo/Parser.pm:1591 #, perl-format msgid "`@end' expected `%s', but saw `%s'" msgstr "`@end' vy¾aduje `%s', ale vidí `%s'" -#: tp/Texinfo/Parser.pm:1578 +#: tp/Texinfo/Parser.pm:1594 #, fuzzy, perl-format msgid "@%s seen before @end %s" msgstr "@menu spatøeno pøed prvním @node, vytvoøen uzel `Top'" -#: tp/Texinfo/Parser.pm:1582 +#: tp/Texinfo/Parser.pm:1598 #, perl-format msgid "No matching `%cend %s'" msgstr "Chybí odpovídající `%cend %s'" -#: tp/Texinfo/Parser.pm:1604 tp/Texinfo/Parser.pm:4765 -#: tp/Texinfo/Parser.pm:4975 +#: tp/Texinfo/Parser.pm:1620 tp/Texinfo/Parser.pm:4783 +#: tp/Texinfo/Parser.pm:4993 #, perl-format msgid "Misplaced %c" msgstr "©patnì umístìný znak %c" -#: tp/Texinfo/Parser.pm:1699 tp/Texinfo/Parser.pm:3026 +#: tp/Texinfo/Parser.pm:1715 tp/Texinfo/Parser.pm:3043 #, perl-format msgid "Unmatched `%c%s'" msgstr "Nepárový `%c%s'" -#: tp/Texinfo/Parser.pm:1929 +#: tp/Texinfo/Parser.pm:1945 #, fuzzy, perl-format msgid "Macro `%s' called with too many args" msgstr "Makro `%s' volané na øádku %d s pøíli¹ mnoha argumenty" -#: tp/Texinfo/Parser.pm:1951 +#: tp/Texinfo/Parser.pm:1967 #, fuzzy, perl-format msgid "@%s missing close brace" msgstr "%c%s chybìjící uzavírací závorka" -#: tp/Texinfo/Parser.pm:1958 +#: tp/Texinfo/Parser.pm:1974 #, fuzzy, perl-format msgid "Macro `%s' declared without argument called with an argument" msgstr "Makro `%s' volané na øádku %d s pøíli¹ mnoha argumenty" -#: tp/Texinfo/Parser.pm:1992 +#: tp/Texinfo/Parser.pm:2008 #, fuzzy, perl-format msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\" msgstr "\\ pøi expanzi makra následováno `%s' místo \\ nebo jména parametru" -#: tp/Texinfo/Parser.pm:2383 +#: tp/Texinfo/Parser.pm:2399 #, fuzzy, perl-format msgid "@%s `%s' previously defined" msgstr "makro `%s' ji¾ bylo definováno" -#: tp/Texinfo/Parser.pm:2388 +#: tp/Texinfo/Parser.pm:2404 #, fuzzy, perl-format msgid "here is the previous definition as @%s" msgstr "zde je pøedchozí definice `%s'" -#: tp/Texinfo/Parser.pm:2742 +#: tp/Texinfo/Parser.pm:2759 #, fuzzy, perl-format msgid "Missing name for @%s" msgstr "Chybìjící `}' v argumentu @def" -#: tp/Texinfo/Parser.pm:2747 +#: tp/Texinfo/Parser.pm:2764 #, perl-format msgid "Missing category for @%s" msgstr "" -#: tp/Texinfo/Parser.pm:2799 +#: tp/Texinfo/Parser.pm:2816 #, fuzzy, perl-format msgid "Unexpected argument on @%s line: %s" msgstr "©patný argument pro %c%s" -#: tp/Texinfo/Parser.pm:2815 +#: tp/Texinfo/Parser.pm:2832 #, fuzzy msgid "empty multitable" msgstr "%s: prázdný soubor" -#: tp/Texinfo/Parser.pm:2870 tp/Texinfo/Parser.pm:5167 +#: tp/Texinfo/Parser.pm:2887 tp/Texinfo/Parser.pm:5185 #, fuzzy, perl-format msgid "Superfluous argument to @%s" msgstr "©patný argument pro %c%s" -#: tp/Texinfo/Parser.pm:2876 tp/Texinfo/Parser.pm:5188 -#: tp/Texinfo/Parser.pm:5199 +#: tp/Texinfo/Parser.pm:2893 tp/Texinfo/Parser.pm:5206 +#: tp/Texinfo/Parser.pm:5217 #, fuzzy, perl-format msgid "Bad argument to @%s" msgstr "©patný argument pro %c%s" -#: tp/Texinfo/Parser.pm:2887 +#: tp/Texinfo/Parser.pm:2904 #, perl-format msgid "%s requires an argument: the formatter for %citem" msgstr "%s vy¾aduje argument : formátovaè pro %citem" -#: tp/Texinfo/Parser.pm:2892 +#: tp/Texinfo/Parser.pm:2909 #, perl-format msgid "Command @%s not accepting argument in brace should not be on @%s line" msgstr "" -#: tp/Texinfo/Parser.pm:2927 +#: tp/Texinfo/Parser.pm:2944 #, fuzzy, perl-format msgid "Accent command `@%s' not allowed as @%s argument" msgstr "©patný argument pro %c%s" -#: tp/Texinfo/Parser.pm:3004 tp/Texinfo/Parser.pm:3140 -#: tp/Texinfo/Parser.pm:5160 +#: tp/Texinfo/Parser.pm:3021 tp/Texinfo/Parser.pm:3157 +#: tp/Texinfo/Parser.pm:5178 #, fuzzy, perl-format msgid "@%s missing argument" msgstr "%s: chybí argument jména souboru.\n" -#: tp/Texinfo/Parser.pm:3016 +#: tp/Texinfo/Parser.pm:3033 #, fuzzy, perl-format msgid "Unknown @end %s" msgstr "Neznámý rejstøík `%s'" -#: tp/Texinfo/Parser.pm:3038 tp/Texinfo/Parser.pm:3644 +#: tp/Texinfo/Parser.pm:3055 tp/Texinfo/Parser.pm:3662 #, fuzzy, perl-format msgid "Superfluous argument to @%s %s: %s" msgstr "©patný argument pro %c%s" -#: tp/Texinfo/Parser.pm:3043 tp/Texinfo/Parser.pm:5239 -#: tp/Texinfo/Parser.pm:5272 tp/Texinfo/Parser.pm:5298 -#: tp/Texinfo/Parser.pm:5331 tp/Texinfo/Parser.pm:5392 +#: tp/Texinfo/Parser.pm:3060 tp/Texinfo/Parser.pm:5257 +#: tp/Texinfo/Parser.pm:5303 tp/Texinfo/Parser.pm:5329 +#: tp/Texinfo/Parser.pm:5362 tp/Texinfo/Parser.pm:5423 #, fuzzy, perl-format msgid "Bad argument to @%s: %s" msgstr "©patný argument pro %c%s" -#: tp/Texinfo/Parser.pm:3062 +#: tp/Texinfo/Parser.pm:3079 #, fuzzy, perl-format msgid "@%s: Cannot open %s: %s" msgstr "Nelze najít `%s'." -#: tp/Texinfo/Parser.pm:3074 +#: tp/Texinfo/Parser.pm:3091 #, perl-format msgid "Encoding `%s' is not a canonical texinfo encoding" msgstr "" -#: tp/Texinfo/Parser.pm:3082 +#: tp/Texinfo/Parser.pm:3099 #, fuzzy, perl-format msgid "unrecognized encoding name `%s'" msgstr "%s: neznámý pøepínaè `--%s'\n" -#: tp/Texinfo/Parser.pm:3230 +#: tp/Texinfo/Parser.pm:3247 #, perl-format msgid "@%s after the first element" msgstr "" -#: tp/Texinfo/Parser.pm:3237 +#: tp/Texinfo/Parser.pm:3254 #, fuzzy, perl-format msgid "@%s only meaningful on a @multitable line" msgstr "@%s není myslitelné uvnitø `@%s' bloku" -#: tp/Texinfo/Parser.pm:3274 +#: tp/Texinfo/Parser.pm:3291 #, fuzzy, perl-format msgid "@%s should not be associated with @top" msgstr "Výstup %s pro expanzi makra nelze otevøít" -#: tp/Texinfo/Parser.pm:3285 -#, perl-format -msgid "@node precedes @%s, but part are not associated with nodes" -msgstr "" - -#: tp/Texinfo/Parser.pm:3382 +#: tp/Texinfo/Parser.pm:3303 +#, fuzzy, perl-format +msgid "@node precedes @%s, but parts may not be associated with nodes" +msgstr "Výstup %s pro expanzi makra nelze otevøít" + +#: tp/Texinfo/Parser.pm:3400 #, fuzzy, perl-format msgid "Empty argument in @%s" msgstr "©patný argument pro %c%s" -#: tp/Texinfo/Parser.pm:3386 +#: tp/Texinfo/Parser.pm:3404 #, perl-format msgid "Empty node name after expansion `%s'" msgstr "" -#: tp/Texinfo/Parser.pm:3429 +#: tp/Texinfo/Parser.pm:3447 #, fuzzy, perl-format msgid "Empty menu entry name in `%s'" msgstr "©patný argument pro %c%s" -#: tp/Texinfo/Parser.pm:3437 +#: tp/Texinfo/Parser.pm:3455 #, fuzzy msgid "Empty node in menu entry" msgstr "odpovídající polo¾ky rejstøíku nebyly pro `%s' nalezeny\n" -#: tp/Texinfo/Parser.pm:3507 +#: tp/Texinfo/Parser.pm:3525 #, fuzzy, perl-format msgid "@%s should not appear in @%s" msgstr "Výstup %s pro expanzi makra nelze otevøít" -#: tp/Texinfo/Parser.pm:3638 +#: tp/Texinfo/Parser.pm:3656 #, fuzzy, perl-format msgid "@end %s should only appear at a line beginning" msgstr "Výstup %s pro expanzi makra nelze otevøít" -#: tp/Texinfo/Parser.pm:3660 +#: tp/Texinfo/Parser.pm:3678 #, perl-format msgid "macro `%s' previously defined" msgstr "makro `%s' ji¾ bylo definováno" -#: tp/Texinfo/Parser.pm:3662 +#: tp/Texinfo/Parser.pm:3680 #, perl-format msgid "here is the previous definition of `%s'" msgstr "zde je pøedchozí definice `%s'" -#: tp/Texinfo/Parser.pm:3666 +#: tp/Texinfo/Parser.pm:3684 #, perl-format msgid "Redefining Texinfo language command: @%s" msgstr "" -#: tp/Texinfo/Parser.pm:3715 +#: tp/Texinfo/Parser.pm:3733 #, perl-format msgid "@%s without associated character" msgstr "" -#: tp/Texinfo/Parser.pm:3776 +#: tp/Texinfo/Parser.pm:3794 #, perl-format msgid "" "@%s defined with zero or more than one argument should be invoked with {}" msgstr "" -#: tp/Texinfo/Parser.pm:3799 +#: tp/Texinfo/Parser.pm:3817 #, perl-format msgid "" "Macro call nested too deeply (set MAX_NESTED_MACROS to override; current " "value %d)" msgstr "" -#: tp/Texinfo/Parser.pm:3807 +#: tp/Texinfo/Parser.pm:3825 #, perl-format msgid "Recursive call of macro %s is not allowed; use @rmacro if needed" msgstr "" -#: tp/Texinfo/Parser.pm:3862 +#: tp/Texinfo/Parser.pm:3880 #, perl-format msgid "Accent command `@%s' must not be followed by whitespace" msgstr "" -#: tp/Texinfo/Parser.pm:3868 +#: tp/Texinfo/Parser.pm:3886 #, perl-format msgid "Use braces to give a command as an argument to @%s" msgstr "Pou¾ijte závorky k zadání pøíkazu jako argumentu @%s" -#: tp/Texinfo/Parser.pm:3881 tp/Texinfo/Parser.pm:4879 +#: tp/Texinfo/Parser.pm:3899 tp/Texinfo/Parser.pm:4897 #, fuzzy, perl-format msgid "%c%s expects `i' or `j' as argument, not `%s'" msgstr "%c%s vy¾aduje `i' nebo `j' jako argument, ne `%c'" -#: tp/Texinfo/Parser.pm:3893 +#: tp/Texinfo/Parser.pm:3911 #, perl-format msgid "Accent command `@%s' must not be followed by new line" msgstr "" -#: tp/Texinfo/Parser.pm:3904 +#: tp/Texinfo/Parser.pm:3922 #, fuzzy, perl-format msgid "@%s expected braces" msgstr "%c%s oèekáváno `{...}'" -#: tp/Texinfo/Parser.pm:4063 +#: tp/Texinfo/Parser.pm:4081 #, perl-format msgid "undefined flag: %s" msgstr "" -#: tp/Texinfo/Parser.pm:4066 +#: tp/Texinfo/Parser.pm:4084 msgid "Bad syntax for @value" msgstr "" -#: tp/Texinfo/Parser.pm:4073 +#: tp/Texinfo/Parser.pm:4091 #, fuzzy, perl-format msgid "%c%s is obsolete." msgstr "Pøíkaz %c%s je zastaralý" -#: tp/Texinfo/Parser.pm:4076 +#: tp/Texinfo/Parser.pm:4094 #, fuzzy, perl-format msgid "%c%s is obsolete; %s" msgstr "Pøíkaz %c%s je zastaralý" -#: tp/Texinfo/Parser.pm:4084 +#: tp/Texinfo/Parser.pm:4102 #, fuzzy, perl-format msgid "@%s should only appear at a line beginning" msgstr "Výstup %s pro expanzi makra nelze otevøít" -#: tp/Texinfo/Parser.pm:4174 +#: tp/Texinfo/Parser.pm:4192 #, fuzzy, perl-format msgid "@%s not allowed inside `@%s' block" msgstr "@%s není myslitelné uvnitø `@%s' bloku" -#: tp/Texinfo/Parser.pm:4182 +#: tp/Texinfo/Parser.pm:4200 #, fuzzy, perl-format msgid "@%s should only appear in heading or footing" msgstr "Výstup %s pro expanzi makra nelze otevøít" -#: tp/Texinfo/Parser.pm:4261 tp/Texinfo/Parser.pm:4273 -#: tp/Texinfo/Parser.pm:4317 +#: tp/Texinfo/Parser.pm:4279 tp/Texinfo/Parser.pm:4291 +#: tp/Texinfo/Parser.pm:4335 #, perl-format msgid "@%s not meaningful inside `@%s' block" msgstr "@%s není myslitelné uvnitø `@%s' bloku" -#: tp/Texinfo/Parser.pm:4280 +#: tp/Texinfo/Parser.pm:4298 #, fuzzy, perl-format msgid "@%s in empty multitable" msgstr "%s: prázdný soubor" -#: tp/Texinfo/Parser.pm:4285 +#: tp/Texinfo/Parser.pm:4303 msgid "@tab before @item" msgstr "" -#: tp/Texinfo/Parser.pm:4287 +#: tp/Texinfo/Parser.pm:4305 #, perl-format msgid "Too many columns in multitable item (max %d)" msgstr "Pøíli¹ mnoho sloupcù v multitabulkové polo¾ce (max %d)" -#: tp/Texinfo/Parser.pm:4320 +#: tp/Texinfo/Parser.pm:4338 msgid "ignoring @tab outside of multitable" msgstr "pøíkaz `@tab' ignorován, je mimo multitabulku" -#: tp/Texinfo/Parser.pm:4322 +#: tp/Texinfo/Parser.pm:4340 #, perl-format msgid "@%s outside of table or list" msgstr "" -#: tp/Texinfo/Parser.pm:4355 +#: tp/Texinfo/Parser.pm:4373 #, perl-format msgid "Must be after `@%s' to use `@%s'" msgstr "" -#: tp/Texinfo/Parser.pm:4396 +#: tp/Texinfo/Parser.pm:4414 #, perl-format msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments" msgstr "" -#: tp/Texinfo/Parser.pm:4400 +#: tp/Texinfo/Parser.pm:4418 #, fuzzy msgid "@dircategory after first node" msgstr "@menu spatøeno pøed prvním @node, vytvoøen uzel `Top'" -#: tp/Texinfo/Parser.pm:4551 +#: tp/Texinfo/Parser.pm:4569 #, fuzzy, perl-format msgid "Region %s inside region %s is not allowed" msgstr "Poznámka pod èarou definována bez rodièovského uzlu" -#: tp/Texinfo/Parser.pm:4568 +#: tp/Texinfo/Parser.pm:4586 #, fuzzy msgid "@direntry after first node" msgstr "@menu spatøeno pøed prvním @node, vytvoøen uzel `Top'" -#: tp/Texinfo/Parser.pm:4576 +#: tp/Texinfo/Parser.pm:4594 #, fuzzy, perl-format msgid "@%s seen before first @node" msgstr "@menu spatøeno pøed prvním @node, vytvoøen uzel `Top'" -#: tp/Texinfo/Parser.pm:4578 +#: tp/Texinfo/Parser.pm:4596 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "" "proto¾e vá¹ uzel @top by mìl být uzavøen v @ifnottex spí¹e ne¾ v @ifinfo?" -#: tp/Texinfo/Parser.pm:4639 +#: tp/Texinfo/Parser.pm:4657 #, fuzzy, perl-format msgid "@%s should only appear in math context" msgstr "Výstup %s pro expanzi makra nelze otevøít" -#: tp/Texinfo/Parser.pm:4647 +#: tp/Texinfo/Parser.pm:4665 #, perl-format msgid "Unknown command `%s'" msgstr "Neznámý pøíkaz `%s'" -#: tp/Texinfo/Parser.pm:4657 +#: tp/Texinfo/Parser.pm:4675 #, fuzzy msgid "Unexpected @" msgstr "Oèekáváno `%s'" -#: tp/Texinfo/Parser.pm:4685 +#: tp/Texinfo/Parser.pm:4703 #, fuzzy, perl-format msgid "@%s is not meaningful outside `@float' environment" msgstr "@%s není myslitelné uvnitø `@%s' bloku" -#: tp/Texinfo/Parser.pm:4689 +#: tp/Texinfo/Parser.pm:4707 #, perl-format msgid "@%s should be right below `@float'" msgstr "" -#: tp/Texinfo/Parser.pm:4697 +#: tp/Texinfo/Parser.pm:4715 #, perl-format msgid "Ignoring multiple @%s" msgstr "" -#: tp/Texinfo/Parser.pm:4808 +#: tp/Texinfo/Parser.pm:4826 #, perl-format msgid "Command @%s does not accept arguments" msgstr "" -#: tp/Texinfo/Parser.pm:4831 +#: tp/Texinfo/Parser.pm:4849 #, fuzzy, perl-format msgid "Command @%s missing a node or external manual argument" msgstr "%s: chybí argument jména souboru.\n" -#: tp/Texinfo/Parser.pm:4847 +#: tp/Texinfo/Parser.pm:4865 #, perl-format msgid "In @%s empty cross reference name after expansion `%s'" msgstr "" -#: tp/Texinfo/Parser.pm:4857 +#: tp/Texinfo/Parser.pm:4875 #, perl-format msgid "In @%s empty cross reference title after expansion `%s'" msgstr "" -#: tp/Texinfo/Parser.pm:4870 +#: tp/Texinfo/Parser.pm:4888 msgid "@image missing filename argument" msgstr "pøíkaz @image postrádá jméno souboru" -#: tp/Texinfo/Parser.pm:4899 +#: tp/Texinfo/Parser.pm:4917 #, fuzzy, perl-format msgid "@%s missing first argument" msgstr "%s: chybí argument jména souboru.\n" -#: tp/Texinfo/Parser.pm:5005 +#: tp/Texinfo/Parser.pm:5023 msgid "Superfluous arguments for node" msgstr "" -#: tp/Texinfo/Parser.pm:5044 +#: tp/Texinfo/Parser.pm:5062 #, fuzzy, perl-format msgid "Expected @end %s" msgstr "Oèekáváno `%s'" -#: tp/Texinfo/Parser.pm:5108 +#: tp/Texinfo/Parser.pm:5126 #, fuzzy, perl-format msgid "Remaining argument on @%s line: %s" msgstr "©patný argument pro %c%s" -#: tp/Texinfo/Parser.pm:5110 +#: tp/Texinfo/Parser.pm:5128 #, fuzzy, perl-format msgid "@%s should only accept a @-command as argument, not `%s'" msgstr "Pou¾ijte závorky k zadání pøíkazu jako argumentu @%s" -#: tp/Texinfo/Parser.pm:5183 +#: tp/Texinfo/Parser.pm:5201 #, fuzzy, perl-format msgid "Environment command %s as argument to @%s" msgstr "Pou¾ijte závorky k zadání pøíkazu jako argumentu @%s" -#: tp/Texinfo/Parser.pm:5204 +#: tp/Texinfo/Parser.pm:5222 #, perl-format msgid "Empty @%s" msgstr "" -#: tp/Texinfo/Parser.pm:5212 +#: tp/Texinfo/Parser.pm:5230 #, perl-format msgid "column fraction not a number: %s" msgstr "" -#: tp/Texinfo/Parser.pm:5221 +#: tp/Texinfo/Parser.pm:5239 #, fuzzy, perl-format msgid "@sp arg must be numeric, not `%s'" msgstr "%s: %s argument musí být èíslo ne `%s'.\n" -#: tp/Texinfo/Parser.pm:5229 +#: tp/Texinfo/Parser.pm:5247 #, perl-format msgid "Reserved index name %s" msgstr "" -#: tp/Texinfo/Parser.pm:5246 -#, fuzzy, perl-format -msgid "Unknown from index `%s' in @%s" +#: tp/Texinfo/Parser.pm:5264 +#, fuzzy, perl-format +msgid "Unknown source index in @%s: %s" msgstr "Neznámý rejstøík `%s'" -#: tp/Texinfo/Parser.pm:5248 -#, fuzzy, perl-format -msgid "Unknown to index name `%s' in @%s" +#: tp/Texinfo/Parser.pm:5267 +#, fuzzy, perl-format +msgid "Unknown destination index in @%s: %s" msgstr "Neznámý rejstøík `%s'" -#: tp/Texinfo/Parser.pm:5267 +#: tp/Texinfo/Parser.pm:5298 #, perl-format msgid "@%s leads to a merging of %s in itself, ignoring" msgstr "" -#: tp/Texinfo/Parser.pm:5279 +#: tp/Texinfo/Parser.pm:5310 #, perl-format msgid "Unknown index `%s' in @printindex" msgstr "Neznámý rejstøík `%s' v @printindex" -#: tp/Texinfo/Parser.pm:5284 +#: tp/Texinfo/Parser.pm:5315 #, perl-format msgid "Printing an index `%s' merged in another one `%s'" msgstr "" -#: tp/Texinfo/Parser.pm:5291 +#: tp/Texinfo/Parser.pm:5322 #, perl-format msgid "Printindex before document beginning: @printindex %s" msgstr "" -#: tp/Texinfo/Parser.pm:5306 +#: tp/Texinfo/Parser.pm:5337 #, fuzzy, perl-format msgid "@%s arg must be `top' or `bottom', not `%s'" msgstr "%s: %s argument musí být èíslo ne `%s'.\n" -#: tp/Texinfo/Parser.pm:5312 +#: tp/Texinfo/Parser.pm:5343 #, perl-format msgid "Only @%s 10 or 11 is supported, not `%s'" msgstr "" -#: tp/Texinfo/Parser.pm:5318 +#: tp/Texinfo/Parser.pm:5349 #, fuzzy, perl-format msgid "@%s arg must be `separate' or `end', not `%s'" msgstr "" "%s: argument k --footnote-style musí být `separate'|`end', ale ne `%s'.\n" -#: tp/Texinfo/Parser.pm:5324 +#: tp/Texinfo/Parser.pm:5355 #, fuzzy, perl-format msgid "@%s arg must be `on', `off' or `odd', not `%s'" msgstr "%s: %s argument musí být èíslo ne `%s'.\n" -#: tp/Texinfo/Parser.pm:5339 tp/Texinfo/Parser.pm:5342 +#: tp/Texinfo/Parser.pm:5370 tp/Texinfo/Parser.pm:5373 #, fuzzy, perl-format msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'" msgstr "" "%s: argument pro --paragraph-indent musí být èíslo|`none'|`asis', ale ne `" "%s'.\n" -#: tp/Texinfo/Parser.pm:5348 +#: tp/Texinfo/Parser.pm:5379 #, fuzzy, perl-format msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'" msgstr "" "%s: argument pro --paragraph-indent musí být èíslo|`none'|`asis', ale ne `" "%s'.\n" -#: tp/Texinfo/Parser.pm:5356 +#: tp/Texinfo/Parser.pm:5387 #, fuzzy, perl-format msgid "@exampleindent arg must be numeric/`asis', not `%s'" msgstr "" "%s: argument pro --paragraph-indent musí být èíslo|`none'|`asis', ale ne `" "%s'.\n" -#: tp/Texinfo/Parser.pm:5366 +#: tp/Texinfo/Parser.pm:5397 #, perl-format msgid "Expected @%s on or off, not `%s'" msgstr "" -#: tp/Texinfo/Parser.pm:5373 +#: tp/Texinfo/Parser.pm:5404 #, perl-format msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'" msgstr "" -#: tp/Texinfo/Parser.pm:5379 +#: tp/Texinfo/Parser.pm:5410 #, fuzzy, perl-format msgid "@allowcodebreaks arg must be `true' or `false', not `%s'" msgstr "" "%s: argument k --footnote-style musí být `separate'|`end', ale ne `%s'.\n" -#: tp/Texinfo/Parser.pm:5385 +#: tp/Texinfo/Parser.pm:5416 #, fuzzy, perl-format msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'" msgstr "" "%s: argument k --footnote-style musí být `separate'|`end', ale ne `%s'.\n" -#: tp/Texinfo/Report.pm:93 +#: tp/Texinfo/Report.pm:100 #, fuzzy, perl-format msgid "%s:%d: warning: %s (possibly involving @%s)\n" msgstr "%s:%d: varování: " -#: tp/Texinfo/Report.pm:96 +#: tp/Texinfo/Report.pm:103 #, fuzzy, perl-format msgid "%s:%d: warning: %s\n" msgstr "%s:%d: varování: " -#: tp/Texinfo/Report.pm:139 +#: tp/Texinfo/Report.pm:146 #, fuzzy, perl-format msgid "warning: %s\n" msgstr "%s:%d: varování: " @@ -3068,7 +3063,7 @@ msgid "@%s to `%s', different from %s name `%s'" msgstr "" -#: tp/Texinfo/Structuring.pm:1907 +#: tp/Texinfo/Structuring.pm:1906 #, fuzzy, perl-format msgid "Empty index key in @%s" msgstr "odpovídající polo¾ky rejstøíku nebyly pro `%s' nalezeny\n" @@ -3089,52 +3084,54 @@ msgstr "" #: tp/init/tex4ht.pm:242 -#, perl-format -msgid "tex4ht output %s missing" -msgstr "" - -#: tp/init/tex4ht.pm:294 -#, perl-format -msgid "tex4ht output got %d for %d items entered" -msgstr "" - -#: tp/init/tex4ht.pm:312 -#, perl-format -msgid "tex4ht output no text for @%s %s" -msgstr "" - -#: tp/texi2any.pl:337 +#, fuzzy, perl-format +msgid "tex4ht output file missing: %s" +msgstr "Výstupní soubor `%s' nelze vytvoøit." + +#: tp/init/tex4ht.pm:295 +#, perl-format +msgid "" +"tex4ht processing produced %d items in HTML; expected %d, the number of " +"items found in the document" +msgstr "" + +#: tp/init/tex4ht.pm:313 +#, perl-format +msgid "tex4ht output has no HTML item for @%s %s" +msgstr "" + +#: tp/texi2any.pl:373 #, perl-format msgid "error loading %s: %s\n" msgstr "" -#: tp/texi2any.pl:346 tp/texi2any.pl:363 +#: tp/texi2any.pl:382 tp/texi2any.pl:399 #, fuzzy, perl-format msgid "Unknown variable %s\n" msgstr "Neznámý pøíkaz `%s'" -#: tp/texi2any.pl:430 +#: tp/texi2any.pl:466 #, fuzzy, perl-format msgid "Can't read init file %s" msgstr "Rouru do `%s' nelze otevøít." -#: tp/texi2any.pl:560 +#: tp/texi2any.pl:597 #, fuzzy msgid "Usage: makeinfo [OPTION]... TEXINFO-FILE...\n" msgstr "Pou¾ití: %s [PØEPÍNAÈ]... SOUBOR...\n" -#: tp/texi2any.pl:561 +#: tp/texi2any.pl:598 #, fuzzy msgid " or: texi2any [OPTION]... TEXINFO-FILE...\n" msgstr "Pou¾ití: %s [PØEPÍNAÈ]... SOUBOR...\n" -#: tp/texi2any.pl:563 +#: tp/texi2any.pl:600 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" msgstr "" -#: tp/texi2any.pl:566 +#: tp/texi2any.pl:603 #, perl-format msgid "" "General options:\n" @@ -3147,13 +3144,13 @@ " --no-warn suppress warnings (but not errors).\n" " --conf-dir=DIR search also for initialization files in DIR.\n" " --init-file=FILE load FILE to modify the default behavior.\n" -" --set-customization-variable VAR=VAL set customization variable VAR \n" +" -c, --set-customization-variable VAR=VAL set customization variable VAR \n" " to VAL.\n" " -v, --verbose explain what is being done.\n" " --version display version information and exit.\n" msgstr "" -#: tp/texi2any.pl:581 +#: tp/texi2any.pl:618 msgid "" "Output format selection (default is to produce Info):\n" " --docbook output Docbook XML rather than Info.\n" @@ -3163,7 +3160,7 @@ " --dvi, --dvipdf, --ps, --pdf call texi2dvi to generate given output.\n" msgstr "" -#: tp/texi2any.pl:589 +#: tp/texi2any.pl:626 msgid "" "General output options:\n" " -E, --macro-expand=FILE output macro-expanded source to FILE,\n" @@ -3190,7 +3187,7 @@ " Otherwise, DEST names the output file.\n" msgstr "" -#: tp/texi2any.pl:609 +#: tp/texi2any.pl:646 #, perl-format msgid "" "Options for Info and plain text:\n" @@ -3212,7 +3209,7 @@ " --split-size=NUM split Info files at size NUM (default %d).\n" msgstr "" -#: tp/texi2any.pl:626 +#: tp/texi2any.pl:663 msgid "" "Options for HTML:\n" " --css-include=FILE include FILE in HTML + + + + + + +
+

+ This document was generated on a sunny day using texi2any. +

+ + + + diff --git a/tp/tests/formatting/tests-parser.txt b/tp/tests/formatting/tests-parser.txt index b754c03..99455f7 100644 --- a/tp/tests/formatting/tests-parser.txt +++ b/tp/tests/formatting/tests-parser.txt @@ -14,6 +14,9 @@ cond_info_ifhtml_ifinfo_iftex cond.texi --info --ifhtml --ifinfo --iftex defcondx_Dbar defxcond.texi -D bar defcondx_Ubar defxcond.texi -U bar + +# renamed nodes +unknown_nodes_renamed unknown_nodes_renamed.texi # api texi ignore_and_comments.texi --init ignore_and_comments_output.init diff --git a/tp/tests/formatting/unknown_nodes_renamed-noderename.cnf-ref b/tp/tests/formatting/unknown_nodes_renamed-noderename.cnf-ref new file mode 100644 index 0000000..88c6ef6 --- /dev/null +++ b/tp/tests/formatting/unknown_nodes_renamed-noderename.cnf-ref @@ -0,0 +1,4 @@ +Unknown node 1 +unknown node 2 +@@{} renamed as unknow too + diff --git a/tp/tests/formatting/unknown_nodes_renamed.texi b/tp/tests/formatting/unknown_nodes_renamed.texi new file mode 100644 index 0000000..32b75f1 --- /dev/null +++ b/tp/tests/formatting/unknown_nodes_renamed.texi @@ -0,0 +1 @@ +@node Top diff --git a/tp/tests/htmlxref/Makefile.in b/tp/tests/htmlxref/Makefile.in index e5de0b2..72794a3 100644 --- a/tp/tests/htmlxref/Makefile.in +++ b/tp/tests/htmlxref/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.5 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -72,7 +72,6 @@ $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ $(top_srcdir)/gnulib/m4/iconv.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ - $(top_srcdir)/gnulib/m4/inline.m4 \ $(top_srcdir)/gnulib/m4/intlmacosx.m4 \ $(top_srcdir)/gnulib/m4/iswblank.m4 \ $(top_srcdir)/gnulib/m4/langinfo_h.m4 \ @@ -765,6 +764,7 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ TERMLIBS = @TERMLIBS@ TEX = @TEX@ +TEXINFO_DTD_VERSION = @TEXINFO_DTD_VERSION@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ diff --git a/tp/tests/htmlxref-only_mono/Makefile.in b/tp/tests/htmlxref-only_mono/Makefile.in index 29840cc..1322d88 100644 --- a/tp/tests/htmlxref-only_mono/Makefile.in +++ b/tp/tests/htmlxref-only_mono/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.5 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -72,7 +72,6 @@ $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ $(top_srcdir)/gnulib/m4/iconv.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ - $(top_srcdir)/gnulib/m4/inline.m4 \ $(top_srcdir)/gnulib/m4/intlmacosx.m4 \ $(top_srcdir)/gnulib/m4/iswblank.m4 \ $(top_srcdir)/gnulib/m4/langinfo_h.m4 \ @@ -765,6 +764,7 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ TERMLIBS = @TERMLIBS@ TEX = @TEX@ +TEXINFO_DTD_VERSION = @TEXINFO_DTD_VERSION@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ diff --git a/tp/tests/htmlxref-only_split/Makefile.in b/tp/tests/htmlxref-only_split/Makefile.in index 997722b..0d61d84 100644 --- a/tp/tests/htmlxref-only_split/Makefile.in +++ b/tp/tests/htmlxref-only_split/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.5 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -72,7 +72,6 @@ $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ $(top_srcdir)/gnulib/m4/iconv.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ - $(top_srcdir)/gnulib/m4/inline.m4 \ $(top_srcdir)/gnulib/m4/intlmacosx.m4 \ $(top_srcdir)/gnulib/m4/iswblank.m4 \ $(top_srcdir)/gnulib/m4/langinfo_h.m4 \ @@ -765,6 +764,7 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ TERMLIBS = @TERMLIBS@ TEX = @TEX@ +TEXINFO_DTD_VERSION = @TEXINFO_DTD_VERSION@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ diff --git a/tp/tests/indices/Makefile.in b/tp/tests/indices/Makefile.in index 5c61f42..2858028 100644 --- a/tp/tests/indices/Makefile.in +++ b/tp/tests/indices/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.5 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -72,7 +72,6 @@ $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ $(top_srcdir)/gnulib/m4/iconv.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ - $(top_srcdir)/gnulib/m4/inline.m4 \ $(top_srcdir)/gnulib/m4/intlmacosx.m4 \ $(top_srcdir)/gnulib/m4/iswblank.m4 \ $(top_srcdir)/gnulib/m4/langinfo_h.m4 \ @@ -765,6 +764,7 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ TERMLIBS = @TERMLIBS@ TEX = @TEX@ +TEXINFO_DTD_VERSION = @TEXINFO_DTD_VERSION@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ diff --git a/tp/tests/indices/res_parser_info/index_special_region/index_special_region.2 b/tp/tests/indices/res_parser_info/index_special_region/index_special_region.2 index 7fb8c2a..328daaf 100644 --- a/tp/tests/indices/res_parser_info/index_special_region/index_special_region.2 +++ b/tp/tests/indices/res_parser_info/index_special_region/index_special_region.2 @@ -5,5 +5,5 @@ index_special_region.texi:49: warning: Missing name for @deffnx index_special_region.texi:52: ftable requires an argument: the formatter for @item index_special_region.texi:53: warning: @item missing argument -index_special_region.texi:8: @anchor `Copying information' output more than once -index_special_region.texi:11: @anchor `Public domain reference' output more than once +index_special_region.texi:8: @anchor output more than once: Copying information +index_special_region.texi:11: @anchor output more than once: Public domain reference diff --git a/tp/tests/layout/Makefile.in b/tp/tests/layout/Makefile.in index fb1a7bb..59f7534 100644 --- a/tp/tests/layout/Makefile.in +++ b/tp/tests/layout/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.5 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -72,7 +72,6 @@ $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ $(top_srcdir)/gnulib/m4/iconv.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ - $(top_srcdir)/gnulib/m4/inline.m4 \ $(top_srcdir)/gnulib/m4/intlmacosx.m4 \ $(top_srcdir)/gnulib/m4/iswblank.m4 \ $(top_srcdir)/gnulib/m4/langinfo_h.m4 \ @@ -765,6 +764,7 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ TERMLIBS = @TERMLIBS@ TEX = @TEX@ +TEXINFO_DTD_VERSION = @TEXINFO_DTD_VERSION@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ diff --git a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml index ccee657..f1d288a 100644 --- a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml +++ b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml @@ -2521,11 +2521,7 @@ ``simple-double--three---four----'' -–option -“ -“ -–foption - +–option““–foption @"u ü @"{U} Ü @~n ñ @@ -2750,8 +2746,7 @@ after emph e--mph item -• a--n itemize line index entry within itemize -i--tem 1 +• a--n itemize line index entry within itemizei--tem 1 • a--n itemize line i--tem 2 e--numerate @@ -2760,8 +2755,7 @@ mu--ltitable item multitable tab mu--ltitable item 2 multitable tab 2 -index entry within multitable -lone mu--ltitable item +index entry within multitablelone mu--ltitable item truc bidule @@ -2790,8 +2784,7 @@
def--fn
ifset: i a g -index entry within deffn -truccmde: truc +index entry within deffntruccmde: truc log trapCommand: log trap log trap1Command: log trap1 log trap2Command: log trap2 @@ -2949,8 +2942,7 @@ l--ine aa -index entry between item and itemx -bb +index entry between item and itemxbb l--ine c--artouche diff --git a/tp/tests/layout/res_parser/formatting_xml/formatting.xml b/tp/tests/layout/res_parser/formatting_xml/formatting.xml index 47db74a..d98cd10 100644 --- a/tp/tests/layout/res_parser/formatting_xml/formatting.xml +++ b/tp/tests/layout/res_parser/formatting_xml/formatting.xml @@ -1,5 +1,5 @@ - + \input texinfo @c -*-texinfo-*- diff --git a/tp/tests/many_input_files/Makefile.in b/tp/tests/many_input_files/Makefile.in index 5dcf5c6..40f35d4 100644 --- a/tp/tests/many_input_files/Makefile.in +++ b/tp/tests/many_input_files/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.5 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -73,7 +73,6 @@ $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ $(top_srcdir)/gnulib/m4/iconv.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ - $(top_srcdir)/gnulib/m4/inline.m4 \ $(top_srcdir)/gnulib/m4/intlmacosx.m4 \ $(top_srcdir)/gnulib/m4/iswblank.m4 \ $(top_srcdir)/gnulib/m4/langinfo_h.m4 \ @@ -952,6 +951,7 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ TERMLIBS = @TERMLIBS@ TEX = @TEX@ +TEXINFO_DTD_VERSION = @TEXINFO_DTD_VERSION@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ diff --git a/tp/tests/many_input_files/tex_l2h.sh b/tp/tests/many_input_files/tex_l2h.sh index 505592f..ce12270 100755 --- a/tp/tests/many_input_files/tex_l2h.sh +++ b/tp/tests/many_input_files/tex_l2h.sh @@ -29,9 +29,9 @@ echo "$basename" > $logfile : > $stdout_file -if tmp_dir=`mktemp -d l2h_t2h_XXXXXXXX`; then - : -else +tmp_dir=`mktemp -d l2h_t2h_XXXXXXXX` +if test z"$tmp_dir" = 'z' ; then + echo "mktemp failed" 1>&2 exit 1 fi diff --git a/tp/tests/many_input_files/tex_t4ht.sh b/tp/tests/many_input_files/tex_t4ht.sh index 046527b..ff7ad0b 100755 --- a/tp/tests/many_input_files/tex_t4ht.sh +++ b/tp/tests/many_input_files/tex_t4ht.sh @@ -29,18 +29,12 @@ echo "$basename" > $logfile : > $stdout_file -if tmp_dir=`mktemp -d l2h_t2h_XXXXXXXX`; then - : -else - exit 1 -fi - [ -d $basename ] && rm -rf $basename raw_outdir=$raw_output_dir/$basename [ -d $raw_outdir ] && rm -rf $raw_outdir mkdir $basename -echo "$PERL -I $srcdir/../.. -I $srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I $srcdir/../../maintain/lib/libintl-perl/lib -I $srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl --set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST 1' --set-customization-variable L2H_TMP=$tmp_dir --conf-dir $srcdir/../../init --init-file tex4ht.pm --iftex --out $basename/ $srcdir/../tex_html/tex_complex.texi $srcdir/../tex_html/tex.texi --force >> $stdout_file 2>$basename/${basename}.2" >> $logfile -$PERL -I $srcdir/../.. -I $srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I $srcdir/../../maintain/lib/libintl-perl/lib -I $srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl --set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST 1' --set-customization-variable L2H_TMP=$tmp_dir --conf-dir $srcdir/../../init --init-file tex4ht.pm --iftex --out $basename/ $srcdir/../tex_html/tex_complex.texi $srcdir/../tex_html/tex.texi --force >> $stdout_file 2>$basename/${basename}.2 +echo "$PERL -I $srcdir/../.. -I $srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I $srcdir/../../maintain/lib/libintl-perl/lib -I $srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl --set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST 1' --conf-dir $srcdir/../../init --init-file tex4ht.pm --iftex --out $basename/ $srcdir/../tex_html/tex_complex.texi $srcdir/../tex_html/tex.texi --force >> $stdout_file 2>$basename/${basename}.2" >> $logfile +$PERL -I $srcdir/../.. -I $srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I $srcdir/../../maintain/lib/libintl-perl/lib -I $srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl --set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST 1' --conf-dir $srcdir/../../init --init-file tex4ht.pm --iftex --out $basename/ $srcdir/../tex_html/tex_complex.texi $srcdir/../tex_html/tex.texi --force >> $stdout_file 2>$basename/${basename}.2 return_code=0 ret=$? @@ -74,6 +68,4 @@ fi fi -rm -rf $tmp_dir - exit $return_code diff --git a/tp/tests/nested_formats/Makefile.in b/tp/tests/nested_formats/Makefile.in index 855e1d5..9895b6d 100644 --- a/tp/tests/nested_formats/Makefile.in +++ b/tp/tests/nested_formats/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.5 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -72,7 +72,6 @@ $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ $(top_srcdir)/gnulib/m4/iconv.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ - $(top_srcdir)/gnulib/m4/inline.m4 \ $(top_srcdir)/gnulib/m4/intlmacosx.m4 \ $(top_srcdir)/gnulib/m4/iswblank.m4 \ $(top_srcdir)/gnulib/m4/langinfo_h.m4 \ @@ -765,6 +764,7 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ TERMLIBS = @TERMLIBS@ TEX = @TEX@ +TEXINFO_DTD_VERSION = @TEXINFO_DTD_VERSION@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ diff --git a/tp/tests/run_parser_all.sh b/tp/tests/run_parser_all.sh index 52a0cea..2ce9833 100755 --- a/tp/tests/run_parser_all.sh +++ b/tp/tests/run_parser_all.sh @@ -170,11 +170,6 @@ test -d "${outdir}" || mkdir "${outdir}" done -if tmp_dir=`mktemp -d l2h_t2h_XXXXXXXX`; then - : -else - exit 1 -fi echo "base_result_dir $base_results_dir, driving_file $driving_file" > $logfile @@ -257,6 +252,13 @@ continue 2 fi use_latex2html=yes + if test z"$tmp_dir" = 'z'; then + tmp_dir=`mktemp -d l2h_t2h_XXXXXXXX` + if test z"$tmp_dir" = 'z'; then + echo "mktemp failed" 1>&2 + exit 1 + fi + fi l2h_tmp_dir="--set-customization-variable 'L2H_TMP $tmp_dir'" elif echo "$remaining" | grep -qs -- '-init tex4ht.pm'; then if test "$no_tex4ht" = 'yes' ; then @@ -367,7 +369,9 @@ done done < "$driving_file" -rm -rf $tmp_dir +if test z"$tmp_dir" != 'z' ; then + rm -rf $tmp_dir +fi if test "$one_test" = 'yes' && test "z$one_test_done" != "zyes" ; then echo "$the_test $the_file test not found" diff --git a/tp/tests/sectioning/Makefile.in b/tp/tests/sectioning/Makefile.in index 3513860..7684a0a 100644 --- a/tp/tests/sectioning/Makefile.in +++ b/tp/tests/sectioning/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.5 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -72,7 +72,6 @@ $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ $(top_srcdir)/gnulib/m4/iconv.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ - $(top_srcdir)/gnulib/m4/inline.m4 \ $(top_srcdir)/gnulib/m4/intlmacosx.m4 \ $(top_srcdir)/gnulib/m4/iswblank.m4 \ $(top_srcdir)/gnulib/m4/langinfo_h.m4 \ @@ -765,6 +764,7 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ TERMLIBS = @TERMLIBS@ TEX = @TEX@ +TEXINFO_DTD_VERSION = @TEXINFO_DTD_VERSION@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ diff --git a/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2 b/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2 index 463a5d2..ce857ed 100644 --- a/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2 +++ b/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2 @@ -7,7 +7,7 @@ equivalent_nodes-noderename.cnf:8: no node to be renamed equivalent_nodes-noderename.cnf:10: nodes without a new name at the end of file warning: Must specify a title with a title command or @top -Node `ToP' that is to be renamed exists -Node `Top' that is to be renamed exists +Old name for `ToP' is a node of the document +Old name for `Top' is a node of the document File empty for renamed node `@strong{}' -Node to be renamed as, `non existing file' not found +equivalent_nodes-noderename.cnf: Target node (new name for `old non existing') not in document: non existing file diff --git a/tp/tests/sectioning/res_parser_html/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2 b/tp/tests/sectioning/res_parser_html/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2 index 463a5d2..ce857ed 100644 --- a/tp/tests/sectioning/res_parser_html/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2 +++ b/tp/tests/sectioning/res_parser_html/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2 @@ -7,7 +7,7 @@ equivalent_nodes-noderename.cnf:8: no node to be renamed equivalent_nodes-noderename.cnf:10: nodes without a new name at the end of file warning: Must specify a title with a title command or @top -Node `ToP' that is to be renamed exists -Node `Top' that is to be renamed exists +Old name for `ToP' is a node of the document +Old name for `Top' is a node of the document File empty for renamed node `@strong{}' -Node to be renamed as, `non existing file' not found +equivalent_nodes-noderename.cnf: Target node (new name for `old non existing') not in document: non existing file diff --git a/tp/tests/tex_html/Makefile.in b/tp/tests/tex_html/Makefile.in index 11a1997..d991b3d 100644 --- a/tp/tests/tex_html/Makefile.in +++ b/tp/tests/tex_html/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.5 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -72,7 +72,6 @@ $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ $(top_srcdir)/gnulib/m4/iconv.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ - $(top_srcdir)/gnulib/m4/inline.m4 \ $(top_srcdir)/gnulib/m4/intlmacosx.m4 \ $(top_srcdir)/gnulib/m4/iswblank.m4 \ $(top_srcdir)/gnulib/m4/langinfo_h.m4 \ @@ -765,6 +764,7 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ TERMLIBS = @TERMLIBS@ TEX = @TEX@ +TEXINFO_DTD_VERSION = @TEXINFO_DTD_VERSION@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ diff --git a/tp/tests/tex_html/res_parser/formatting_singular/anchor.html b/tp/tests/tex_html/res_parser/formatting_singular/anchor.html index 041b750..59f354b 100644 --- a/tp/tests/tex_html/res_parser/formatting_singular/anchor.html +++ b/tp/tests/tex_html/res_parser/formatting_singular/anchor.html @@ -531,9 +531,7 @@ @dotless{-a} -a @dotless{a} a -@TeX, but without brace TeX - -@# # +@TeX, but without brace TeX@# # @w{-a} -a diff --git a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html index e5655f2..d45f9c1 100644 --- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html +++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html @@ -531,9 +531,7 @@ @dotless{-a} -a @dotless{a} a -@TeX, but without brace TeX - -@# # +@TeX, but without brace TeX@# # @w{-a} -a diff --git a/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html b/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html index 8af7fff..ffe87fb 100644 --- a/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html +++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html @@ -531,9 +531,7 @@ @dotless{-a} -a @dotless{a} a -@TeX, but without brace TeX - -@# # +@TeX, but without brace TeX@# # @w{-a} -a diff --git a/tp/tests/tex_html/res_parser/formatting_singular/index.htm b/tp/tests/tex_html/res_parser/formatting_singular/index.htm index b4b4bf6..64356a7 100644 --- a/tp/tests/tex_html/res_parser/formatting_singular/index.htm +++ b/tp/tests/tex_html/res_parser/formatting_singular/index.htm @@ -531,9 +531,7 @@ @dotless{-a} -a @dotless{a} a -@TeX, but without brace TeX - -@# # +@TeX, but without brace TeX@# # @w{-a} -a @@ -1360,9 +1358,7 @@ @dotless{--a} –a @dotless{a} a

-

@TeX, but without brace TeX -

-

@# # +

@TeX, but without brace TeX@# #

@w{--a} –a

@@ -2111,9 +2107,7 @@ @dotless{--a} –a @dotless{a} a

-

@TeX, but without brace TeX -

-

@# # +

@TeX, but without brace TeX@# #

@w{--a} –a

@@ -2868,9 +2862,7 @@ @dotless{--a} --a @dotless{a} a -@TeX, but without brace TeX - -@# # +@TeX, but without brace TeX@# # @w{--a} --a diff --git a/tp/tests/tex_html/res_parser/formatting_singular/index.html b/tp/tests/tex_html/res_parser/formatting_singular/index.html index f2e76f1..a756342 100644 --- a/tp/tests/tex_html/res_parser/formatting_singular/index.html +++ b/tp/tests/tex_html/res_parser/formatting_singular/index.html @@ -531,9 +531,7 @@ @dotless{-a} -a @dotless{a} a -@TeX, but without brace TeX - -@# # +@TeX, but without brace TeX@# # @w{-a} -a diff --git a/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html b/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html index 4bbaa49..07db2f8 100644 --- a/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html +++ b/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html @@ -531,9 +531,7 @@ @dotless{-a} -a @dotless{a} a -@TeX, but without brace TeX - -@# # +@TeX, but without brace TeX@# # @w{-a} -a diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm b/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm index ceddc4e..287d4df 100644 --- a/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm +++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm @@ -531,9 +531,7 @@ @dotless{-a} -a @dotless{a} a -@TeX, but without brace TeX - -@# # +@TeX, but without brace TeX@# # @w{-a} -a diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm b/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm index 42c422d..d6a877b 100644 --- a/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm +++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm @@ -531,9 +531,7 @@ @dotless{-a} -a @dotless{a} a -@TeX, but without brace TeX - -@# # +@TeX, but without brace TeX@# # @w{-a} -a diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm b/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm index 645b6f8..acdb6f2 100644 --- a/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm +++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm @@ -531,9 +531,7 @@ @dotless{-a} -a @dotless{a} a -@TeX, but without brace TeX - -@# # +@TeX, but without brace TeX@# # @w{-a} -a diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm b/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm index eb5d439..7dad4d4 100644 --- a/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm +++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm @@ -531,9 +531,7 @@ @dotless{-a} -a @dotless{a} a -@TeX, but without brace TeX - -@# # +@TeX, but without brace TeX@# # @w{-a} -a diff --git a/tp/tests/tex_html/res_parser/formatting_singular/subsection.html b/tp/tests/tex_html/res_parser/formatting_singular/subsection.html index 8d95d80..c64b378 100644 --- a/tp/tests/tex_html/res_parser/formatting_singular/subsection.html +++ b/tp/tests/tex_html/res_parser/formatting_singular/subsection.html @@ -531,9 +531,7 @@ @dotless{-a} -a @dotless{a} a -@TeX, but without brace TeX - -@# # +@TeX, but without brace TeX@# # @w{-a} -a diff --git a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html index b0544e7..c016dd0 100644 --- a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html +++ b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html @@ -531,9 +531,7 @@ @dotless{-a} -a @dotless{a} a -@TeX, but without brace TeX - -@# # +@TeX, but without brace TeX@# # @w{-a} -a diff --git a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html index 7801709..d2a1f35 100644 --- a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html +++ b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html @@ -531,9 +531,7 @@ @dotless{-a} -a @dotless{a} a -@TeX, but without brace TeX - -@# # +@TeX, but without brace TeX@# # @w{-a} -a diff --git a/tp/texi2any.pl b/tp/texi2any.pl index f96a654..a27c4d6 100755 --- a/tp/texi2any.pl +++ b/tp/texi2any.pl @@ -58,7 +58,11 @@ # in-source run if (($command_suffix eq '.pl' and !(defined($ENV{'TEXINFO_DEV_SOURCE'}) and $ENV{'TEXINFO_DEV_SOURCE'} eq 0)) or $ENV{'TEXINFO_DEV_SOURCE'}) { - $texinfolibdir = defined $ENV{'srcdir'} ? $ENV{'srcdir'} : $command_directory; + if (defined($ENV{'top_srcdir'})) { + $texinfolibdir = File::Spec->catdir($ENV{'top_srcdir'}, 'tp'); + } else { + $texinfolibdir = $command_directory; + } $lib_dir = File::Spec->catdir($texinfolibdir, 'maintain'); unshift @INC, $texinfolibdir; } elsif ($datadir ne '@' .'datadir@' and $package ne '@' . 'PACKAGE@' @@ -183,7 +187,12 @@ return Locale::Messages::dpgettext($messages_textdomain, $context, $msgid); } -my $srcdir = defined $ENV{'srcdir'} ? $ENV{'srcdir'} : $command_directory; +my $srcdir; +if (defined($ENV{'top_srcdir'})) { + $srcdir = File::Spec->catdir($ENV{'top_srcdir'}, 'tp'); +} else { + $srcdir = $command_directory; +} my $libsrcdir = File::Spec->catdir($srcdir, 'maintain'); @@ -206,6 +215,9 @@ File::Spec->catdir($updir, $updir, $updir, 'tp', 'LocaleData')) { if (-d $locales_dir) { Locale::Messages::bindtextdomain ($strings_textdomain, $locales_dir); + # the messages in this domain are not regenerated automatically, + # only when calling ./maintain/regenerate_perl_module_files.sh + Locale::Messages::bindtextdomain ($messages_textdomain, $locales_dir); $locales_dir_found = 1; last; } @@ -216,10 +228,12 @@ } else { Locale::Messages::bindtextdomain ($strings_textdomain, File::Spec->catdir($datadir, 'locale')); -} - -Locale::Messages::bindtextdomain ($messages_textdomain, - File::Spec->catdir($datadir, 'locale')); + Locale::Messages::bindtextdomain ($messages_textdomain, + File::Spec->catdir($datadir, 'locale')); +} + +#Locale::Messages::bindtextdomain ($messages_textdomain, +# File::Spec->catdir($datadir, 'locale')); # Version setting is complicated, because we cope with @@ -266,6 +280,27 @@ $configured_url = 'http://www.gnu.org/software/texinfo/' if ($configured_url eq '@' .'PACKAGE_URL@'); +my $texinfo_dtd_version = '@TEXINFO_DTD_VERSION@'; +# $hardcoded_version is undef for a standalone perl module +if ($texinfo_dtd_version eq '@' . 'TEXINFO_DTD_VERSION@') { + $texinfo_dtd_version = undef; + if (defined($hardcoded_version)) { + if (open (CONFIGURE, + "< ".File::Spec->catfile($srcdir, $updir, 'configure.ac'))) { + while () { + if (/^TEXINFO_DTD_VERSION=([0-9]\S*)/) { + $texinfo_dtd_version = "$1"; + last; + } + } + close (CONFIGURE); + } + } +} +# Used in case it is not hardcoded in configure and for standalone perl module +$texinfo_dtd_version = $configured_version + if (!defined($texinfo_dtd_version)); + # defaults for options relevant in the main program, not undef, and also # defaults for all the converters. # Other relevant options (undef) are NO_WARN FORCE OUTFILE @@ -279,6 +314,7 @@ 'PACKAGE_AND_VERSION' => $configured_name_version, 'PACKAGE_URL' => $configured_url, 'PROGRAM' => $real_command_name, + 'TEXINFO_DTD_VERSION' => $texinfo_dtd_version, }; # determine configuration directories. @@ -465,7 +501,8 @@ # options for all the files my $parser_default_options = {'expanded_formats' => [], 'values' => {'txicommandconditionals' => 1}, - 'gettext' => \&__}; + 'gettext' => \&__, + 'pgettext' => \&__p,}; Texinfo::Config::_load_config($converter_default_options, $cmdline_options); @@ -573,7 +610,7 @@ --no-warn suppress warnings (but not errors). --conf-dir=DIR search also for initialization files in DIR. --init-file=FILE load FILE to modify the default behavior. - --set-customization-variable VAR=VAL set customization variable VAR + -c, --set-customization-variable VAR=VAL set customization variable VAR to VAL. -v, --verbose explain what is being done. --version display version information and exit.\n"), get_conf('ERROR_LIMIT')) @@ -766,7 +803,7 @@ 'init-file=s' => sub { locate_and_load_init_file($_[1], [ @conf_dirs, @program_init_dirs ]); }, - 'set-customization-variable=s' => sub { + 'set-customization-variable|c=s' => sub { my $var_val = $_[1]; if ($var_val =~ s/^(\w+)\s*=?\s*//) { my $var = $1; @@ -1121,7 +1158,7 @@ } if ($formats_table{$format}->{'move_index_entries_after_items'} - or $tree_transformations{'simple_menus'}) { + or $tree_transformations{'move_index_entries_after_items'}) { Texinfo::Common::move_index_entries_after_items_in_tree($tree); } diff --git a/util/Makefile.am b/util/Makefile.am index 16f86b4..586601e 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.50 2012/11/21 22:48:47 pertusus Exp $ +# $Id: Makefile.am,v 1.51 2012/12/14 19:49:18 karl Exp $ # Makefile.am for texinfo/util. # Run automake in .. to produce Makefile.in from this. # @@ -15,6 +15,9 @@ bin_PROGRAMS = texindex bin_SCRIPTS = texi2dvi texi2pdf pdftexi2dvi +if TGT_IS_WINDOWS + bin_SCRIPTS += makeinfo.bat pod2texi.bat texi2any.bat +endif nodist_noinst_SCRIPTS = txixml2texi # for auctex. diff --git a/util/Makefile.in b/util/Makefile.in index 78cf479..418aca8 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.5 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am,v 1.50 2012/11/21 22:48:47 pertusus Exp $ +# $Id: Makefile.am,v 1.51 2012/12/14 19:49:18 karl Exp $ # Makefile.am for texinfo/util. # Run automake in .. to produce Makefile.in from this. # @@ -67,6 +67,7 @@ build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = texindex$(EXEEXT) +@TGT_IS_WINDOWS_TRUE@am__append_1 = makeinfo.bat pod2texi.bat texi2any.bat subdir = util DIST_COMMON = README $(dist_pkgdata_DATA) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/defs.in \ @@ -93,7 +94,6 @@ $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ $(top_srcdir)/gnulib/m4/iconv.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ - $(top_srcdir)/gnulib/m4/inline.m4 \ $(top_srcdir)/gnulib/m4/intlmacosx.m4 \ $(top_srcdir)/gnulib/m4/iswblank.m4 \ $(top_srcdir)/gnulib/m4/langinfo_h.m4 \ @@ -834,6 +834,7 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ TERMLIBS = @TERMLIBS@ TEX = @TEX@ +TEXINFO_DTD_VERSION = @TEXINFO_DTD_VERSION@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ @@ -908,7 +909,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -bin_SCRIPTS = texi2dvi texi2pdf pdftexi2dvi +bin_SCRIPTS = texi2dvi texi2pdf pdftexi2dvi $(am__append_1) nodist_noinst_SCRIPTS = txixml2texi AM_CPPFLAGS = \ -I$(top_srcdir) \ diff --git a/util/htmlxref.cnf b/util/htmlxref.cnf index c80afe9..ceb1646 100644 --- a/util/htmlxref.cnf +++ b/util/htmlxref.cnf @@ -1,6 +1,6 @@ # htmlxref.cnf - reference file for free Texinfo manuals on the web. -htmlxrefversion=2012-11-11.14; # UTC +htmlxrefversion=2012-12-11.22; # UTC # Copyright 2010, 2011, 2012 Free Software Foundation, Inc. # @@ -459,6 +459,8 @@ myserver node http://www.myserverproject.net/documentation/ +nano mono http://www.nano-editor.org/dist/latest/nano.html + nettle chapter http://www.lysator.liu.se/~nisse/nettle/nettle.html ocrad mono ${GS}/ocrad/manual/ocrad_manual.html diff --git a/util/texinfo.cat b/util/texinfo.cat index 76de0cc..c817139 100644 --- a/util/texinfo.cat +++ b/util/texinfo.cat @@ -1,3 +1,3 @@ OVERRIDE YES -PUBLIC "-//GNU//DTD TexinfoML V4.13.91//EN" "texinfo.dtd" +PUBLIC "-//GNU//DTD TexinfoML V4.13.92//EN" "texinfo.dtd" diff --git a/util/texinfo.dtd b/util/texinfo.dtd index 25d29a0..d36e0b8 100644 --- a/util/texinfo.dtd +++ b/util/texinfo.dtd @@ -1,4 +1,4 @@ - + index CDATA #IMPLIED + mergedindex CDATA #IMPLIED + incode (%zeroone;) #IMPLIED>