texinfo update (Thu Feb 28 09:23:01 EST 2008)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.835
retrieving revision 1.838
diff -u -r1.835 -r1.838
--- ChangeLog   27 Feb 2008 18:19:34 -0000      1.835
+++ ChangeLog   28 Feb 2008 14:14:46 -0000      1.838
@@ -1,10 +1,30 @@
+2008-02-28  Akim Demaille  <address@hidden>
+
+       * util/texi2dvi (absolute): Add a missing "local".
+
+2008-02-28  Akim Demaille  <address@hidden>
+
+       Let texi2dvi keep the trailing //.
+       * bin/texi2dvi ($space, $tab): New.
+       ($IFS): Use them to be robust to zealous white space cleanups.
+       (absolute): Preserve the trailing slashes.
+       (tex_envvars): Add MPINPUTS, MFINPUTS, and TFMFONTS.
+
+2008-02-28  Akim Demaille  <address@hidden>
+
+       * util/texi2dvi: Don't use "local foo=`cmd`", because in that case
+       failures of cmd, including with set -e, will go unnoticed.  So
+       always first declare with local, then run the assignment.
+       (index_file_p): Adjust to be usable with index.sty.
+       * util/local.test: Make the test more robust.
+
 2008-02-27  Karl Berry  <address@hidden>
 
        * info/infomap.c [!INFOKEY]: remove this whole block.  It is too
        confusing having two sets of key bindings.
 
        * info/infodoc.c (info_internal_help_text): more tweaks.
-       Suggestions from Benno Schulenberg, 26 Feb 2008 00:34:22.       
+       Suggestions from Benno Schulenberg, 26 Feb 2008 00:34:22.
 
 2008-02-26  Brendan O'Dea <address@hidden>  (tiny change)
 
@@ -41,7 +61,7 @@
 
        * install-info/install-info.c (munge_old_style_debian_options):
        avoid use of asprintf, just xmalloc ourselves.
-       In report from Juan Manuel Guerrero, 24 Feb 2008 22:06:35.      
+       In report from Juan Manuel Guerrero, 24 Feb 2008 22:06:35.
 
        * install-info/install-info.c (spec_entry) <text_len>: declare
        as size_t instead of int, to avoid warning.
@@ -51,7 +71,7 @@
 
        * pretest 4.11.90.
 
-2008-02-22  Peter Breitenlohner <address@hidden> 
+2008-02-22  Peter Breitenlohner <address@hidden>
 
        * configure.ac (--enable-multiplatform): also set libdir.
        * util/defs.in (PATH): include @address@hidden
@@ -83,7 +103,7 @@
        * util/texi2dvi: path_sep is : on djgpp too.  From Eli Z.
 
        * makeinfo/makeinfo.c: typos in comments.
-       
+
        * makeinfo/cmds.c (cm_direntry): call close_single_paragraph,
        instead of add_char('\n'), or the INFO-DIR-SECTION lines from two
        consecutive @dircategory's are munged together.
@@ -203,7 +223,7 @@
        * doc/texinfo.txi (Invoking makeinfo): --document-language default
        is @documentlanguage, as of 4.11.
 
-       * doc/texinfo.txi (Makeinfo Pointer Creation): mention the 
+       * doc/texinfo.txi (Makeinfo Pointer Creation): mention the
        need for @detailmenu here, too.
 
 2008-01-14  Karl Berry  <address@hidden>
@@ -244,7 +264,7 @@
        * install-info/install-info.c: much work toward Debian compatibility.
        (line_data): new member num_sections to add; change type of
        add_entries_before.
-       (spec_entry): new members missing_name, missing_description, 
+       (spec_entry): new members missing_name, missing_description,
        missing_basename.
        (longopts): new options --name, --menuentry, --description,
        --no-indent, --keep-old, --maxwidth, --max-width,
@@ -331,10 +351,10 @@
 2007-12-09  Fabian Groffen  <address@hidden>  (tiny change)
 
        * info/makedoc.c (main): reorder calls following the Makefile
-       dependencies, for high-precision filesystems.  
+       dependencies, for high-precision filesystems.
        http://bugs.gentoo.org/show_bug.cgi?id=200662
        bug-texinfo mail of 3 Dec 2007 17:59:13 +0100.
-       
+
 2007-12-02  Karl Berry  <address@hidden>
 
        * info/info.c (main): undo change of 2006-08-13 in this file,
@@ -352,7 +372,7 @@
 
        * doc/Makeinfo.am: Rename txi-no.tex to txi-nb.tex (see
        2007-10-31).
-       
+
 2007-11-27  Karl Berry  <address@hidden>
 
        * doc/texinfo.txi (headings on off): clarify the meaning of
@@ -388,7 +408,7 @@
 
        * doc/txi-no.tex: rename to txi-nb.tex.
        * po/no.po: remove.
-       * po/LINGUAS: remove no.        
+       * po/LINGUAS: remove no.
 
 2007-10-24  Karl Berry  <address@hidden>
 
@@ -398,7 +418,7 @@
        xml_begin_document in docbook case too, else some frontmatter
        can be lost.
        Bug report from Sam Varshavchik, 14 Oct 2007 12:10:04, for binutils.
-       
+
        * makeinfo/insertion.c: formatting.
 
        * makeinfo/xml.c (xml_begin_document): arg can be const;
@@ -463,7 +483,7 @@
        reported by Werner Lemberg, 16 Sep 2007 16:48:47.
 
        * makeinfo/cmds.c,
-       * makeinfo/xref.c: #include "index.h", instead of explicit      
+       * makeinfo/xref.c: #include "index.h", instead of explicit
        extern printing_index.
        * makeinfo/index.c (the_indices, index_element_compare): can be static.
        * makeinfo/index.h: make order of decls match index.c.
@@ -599,7 +619,7 @@
 
        * pretest 4.9.91.
        * doc/texinfo.txi (Inserting Quotes): wording.
-       
+
        * util/Makefile.am (TESTS): remove local.test.  It fails and I
        would prefer not to replace local with a shell function anyway.
 
Index: util/local.test
===================================================================
RCS file: /sources/texinfo/texinfo/util/local.test,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- util/local.test     25 Jul 2007 12:18:41 -0000      1.10
+++ util/local.test     28 Feb 2008 14:01:56 -0000      1.11
@@ -25,7 +25,11 @@
 
 # Make sure quotes are used to protect the value.  See the comment in
 # texi2dvi itself about local.
-if $EGREP "^ *local [a-zA-Z_0-9]*=[^\"']" $TEXI2DVI; then
+if sed -e 's/^[         ]*#.*//' $TEXI2DVI |
+    $EGREP "\blocal [a-zA-Z_0-9]*=[^\"']" |
+    $EGREP -v "\blocal [a-zA-Z_0-9]*=[a-zA-Z0-9]*$" |
+    grep .
+then
   false
 else
   true
Index: util/texi2dvi
===================================================================
RCS file: /sources/texinfo/texinfo/util/texi2dvi,v
retrieving revision 1.113
retrieving revision 1.116
diff -u -r1.113 -r1.116
--- util/texi2dvi       26 Feb 2008 17:09:39 -0000      1.113
+++ util/texi2dvi       28 Feb 2008 14:14:47 -0000      1.116
@@ -1,6 +1,6 @@
 #! /bin/sh
 # texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
-# $Id: texi2dvi,v 1.113 2008/02/26 17:09:39 karl Exp $
+# $Id: texi2dvi,v 1.116 2008/02/28 14:14:47 akim Exp $
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -33,7 +33,7 @@
 set -e
 
 # This string is expanded by rcs automatically when this file is checked out.
-rcs_revision='$Revision: 1.113 $'
+rcs_revision='$Revision: 1.116 $'
 rcs_version=`set - $rcs_revision; echo $2`
 program=`echo $0 | sed -e 's!.*/!!'`
 version="texi2dvi (GNU Texinfo 4.11) $rcs_version
@@ -115,8 +115,8 @@
   -   the current directory is not cluttered with plethora of temporary files.
   -   clutter can be even reduced using --build-dir=dir: all the *.t2d
       directories are stored there.
-  -   clutter can be reduced to zero using,e.g., --build-dir=/tmp/\$USER.t2d or
-      --build-dir=\$HOME/.t2d.
+  -   clutter can be reduced to zero using, e.g., --build-dir=/tmp/\$USER.t2d
+      or --build-dir=\$HOME/.t2d.
   -   the output file is updated after every succesful TeX run, for
       sake of concurrent visualization of the output.  In a \`local' build
       the viewer stops during the whole TeX run.
@@ -170,9 +170,11 @@
 # http://lists.gnu.org/archive/html/automake-patches/2006-05/msg00008.html
 # We need space, tab and new line, in precisely that order.  And don't leave
 # trailing blanks.
+space=' '
+tab='  '
 newline='
 '
-IFS="  $newline"
+IFS="$space$tab$newline"
 
 # In case someone crazy insists on using grep -E.
 : ${EGREP=egrep}
@@ -264,10 +266,14 @@
       # Absolute paths don't need to be expanded.
       echo "$1"
       ;;
-   *) local rel=$orig_pwd/`func_dirname "$1"`
+   *) local slashes
+      slashes=`echo "$1" | sed -n 's,.*[^/]\(/*\)$,\1,p'`
+      local rel
+      rel=$orig_pwd/`func_dirname "$1"`
       if test -d "$rel"; then
        (cd "$rel" 2>/dev/null &&
-        local n=`pwd`/`basename "$1"`
+        local n
+        n=`pwd`/`basename "$1"`"$slashes"
         echo "$n")
       else
        error 1 "not a directory: $rel"
@@ -467,7 +473,8 @@
 
 # Save TEXINPUTS so we can construct a new TEXINPUTS path for each file.
 # Likewise for bibtex and makeindex.
-tex_envvars="BIBINPUTS BSTINPUTS DVIPSHEADERS INDEXSTYLE TEXINPUTS"
+tex_envvars="BIBINPUTS BSTINPUTS DVIPSHEADERS INDEXSTYLE MFINPUTS MPINPUTS \
+TEXINPUTS TFMFONTS"
 for var in $tex_envvars; do
   eval ${var}_orig=\$$var
   export $var
@@ -488,7 +495,8 @@
   local replace_empty="-e 's/^$path_sep/EMPTY$path_sep/g' \
                       -e 's/$path_sep\$/${path_sep}EMPTY/g' \
                       -e 's/$path_sep$path_sep/${path_sep}EMPTY:/g'"
-  local res=`echo "$1" | eval sed $replace_empty`
+  local res
+  res=`echo "$1" | eval sed $replace_empty`
   save_IFS=$IFS
   IFS=$path_sep
   set x $res; shift
@@ -517,8 +525,10 @@
 {
   case $oname in
     '') echo "$1";;
-     *) local out_noext=`echo "$oname" | sed 's/\.[^.]*$//'`
-       local file_ext=`echo "$1" | sed 's/^.*\.//'`
+     *) local out_noext
+       out_noext=`echo "$oname" | sed 's/\.[^.]*$//'`
+       local file_ext
+       file_ext=`echo "$1" | sed 's/^.*\.//'`
        echo "$out_noext.$file_ext"
       ;;
   esac
@@ -531,7 +541,7 @@
 # is, it must not remain in its build location unless that is also the
 # output location.  (Otherwise it might appear as an extra file in make
 # distcheck.)
-# 
+#
 # FILE can be the principal output (in which case -o directly applies), or
 # an auxiliary file with the same base name.
 move_to_dest ()
@@ -625,11 +635,12 @@
 # index_file_p FILE
 # -----------------
 # Return with success with FILE is an index file.
+# When index.sty is used, there is a space before the brace.
 index_file_p ()
 {
   test -f "$1" || return 1
   case `sed '1q' $1` in
-    "\\entry{"*|"\\indexentry{"*) return 0;;
+    "\\entry{"*|"\\indexentry{"*|"\\indexentry {"*) return 0;;
     *) return 1;;
   esac
 }
@@ -1110,7 +1121,8 @@
     work_src=$workdir/src
     ensure_dir "$work_src"
     in_src=$work_src/$in_base
-    local miincludes=`list_prefix includes -I`
+    local miincludes
+    miincludes=`list_prefix includes -I`
     verbose "Macro-expanding $command_line_filename to $in_src ..."
     # eval $makeinfo because it might be defined as something complex
     # (running missing) and then we end up with things like '"-I"',
P ChangeLog
P util/local.test
P util/texi2dvi