texinfo update (Fri Mar 14 14:53:01 EDT 2008)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.855
retrieving revision 1.856
diff -u -r1.855 -r1.856
--- ChangeLog   12 Mar 2008 22:50:01 -0000      1.855
+++ ChangeLog   14 Mar 2008 18:38:36 -0000      1.856
@@ -1,3 +1,15 @@
+2008-03-14  Karl Berry  <address@hidden>
+
+       * install-info/install-info.c: portability fixes.
+       (): use \f not \x1f.
+       (parse_dir_file): declare void, since it is.
+       (split_entry): Remove unused variable ostream.
+       (add_missing_basenames, add_missing_descriptions): Avoid
+               declarations after statements.
+       (main): Do not use // comments.
+       * util/texi2dvi: use `...` instead of $(...).  Avoid
+       (...) as case labels.
+
 2008-03-12  Karl Berry  <address@hidden>
 
        * doc/texinfo.txi (exdent): typo in example.
Index: install-info/install-info.c
===================================================================
RCS file: /sources/texinfo/texinfo/install-info/install-info.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- install-info/install-info.c 26 Feb 2008 16:58:17 -0000      1.6
+++ install-info/install-info.c 14 Mar 2008 18:38:36 -0000      1.7
@@ -1,5 +1,5 @@
 /* install-info -- create Info directory entry(ies) for an Info file.
-   $Id: install-info.c,v 1.6 2008/02/26 16:58:17 karl Exp $
+   $Id: install-info.c,v 1.7 2008/03/14 18:38:36 karl Exp $
 
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
    2005, 2007, 2008 Free Software Foundation, Inc.
@@ -1081,7 +1081,7 @@
 
 /* Parse the dir file whose basename is BASE_NAME.  Find all the
    nodes, and their menus, and the sections of their menus.  */
-int
+static void
 parse_dir_file (struct line_data *lines, int nlines, struct node **nodes)
 {
   int node_header_flag = 0;
@@ -1421,7 +1421,6 @@
 static void
 split_entry (char *entry, char **name, size_t *name_len, char **description, 
size_t *description_len)
 {
-  FILE *ostream;
   char *endptr;
 
   /* on the first line, the description starts after the first period. */
@@ -1571,7 +1570,7 @@
       if (entry->missing_basename)
         {
           /* Insert NAME into the right place in ENTRY->TEXT. */
-          char *info, *rest;
+          char *info, *rest, *text;
           size_t name_len = strlen (name);
           char *ptr = strstr (entry->text, ": ().");
           if (!ptr)
@@ -1581,7 +1580,7 @@
 
           info = xmalloc (name_len +  6);
           snprintf (info, name_len + 6, ": (%s).", name);
-          char *text = concat (entry->text, info, rest);
+          text = concat (entry->text, info, rest);
           free (info);
           if (entry->text)
             free (entry->text);
@@ -1645,12 +1644,13 @@
     {
       if (entry->missing_description)
         {
+          char *text;
           int add_nl = 1;
           if (entry->text)
             if (entry->text[entry->text_len - 1] == '\n')
               add_nl = 0;
           /* Append DESC onto ENTRY->TEXT. */
-          char *text = concat (entry->text == NULL ? "" : entry->text, desc,
+          text = concat (entry->text == NULL ? "" : entry->text, desc,
                                add_nl ? "\n" : "");
           if (entry->text)
             free (entry->text);
@@ -2189,7 +2189,7 @@
                  missing names with the info file's basename.  We're out
                  of luck for any missing descriptions. */
               add_missing_names (entries_to_add, infile_sans_info);
-              //add_missing_descriptions (entries_to_add, "\n");
+              /* add_missing_descriptions (entries_to_add, "\n"); */
             }
           else
             {
@@ -2359,7 +2359,6 @@
                 break;
             if (spec)
               {
-                int entries_added = 0;
                 int add_at_line = section->end_line;
                 struct spec_entry *entry;
                 /* Say we have found at least one section with this name,
Index: util/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/util/Makefile.am,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- util/Makefile.am    2 Jan 2008 17:46:55 -0000       1.32
+++ util/Makefile.am    14 Mar 2008 18:38:37 -0000      1.33
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.32 2008/01/02 17:46:55 karl Exp $
+# $Id: Makefile.am,v 1.33 2008/03/14 18:38:37 karl Exp $
 # Makefile.am for texinfo/util.
 # Run automake in .. to produce Makefile.in from this.
 #
@@ -10,7 +10,6 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-#SUBDIRS = tests
 bin_PROGRAMS = texindex
 bin_SCRIPTS = texi2dvi texi2pdf pdftexi2dvi
 
@@ -35,7 +34,7 @@
        sed 's/__VERSION__/@VERSION@/g' $(srcdir)/texinfo-cat.in >$@
 
 # Most of these are for fun.  The only official/installed ones are the
-# texi2* scripts.
+# *texi2* scripts.
 #
 EXTRA_DIST = README deref.c dir-example fix-info-dir fixfonts \
   fixref.gawk gdoc gen-dir-node gendocs.sh gendocs_template infosrch \
@@ -44,19 +43,15 @@
   $(dist_pkgdata_DATA) texinfo-cat.in
 CLEANFILES = $(pkgdata_DATA)
 
-XFAIL_TESTS =
-TESTS =        \
-bibtex.test \
-latex2html.test \
-texi2dvi.test
-
-# Let's not stress people's TeX installations.
+# Let's not stress people's TeX installations, etc.
+#XFAIL_TESTS =
+#TESTS =       \
+#bibtex.test \
 #dvipdf.test
-
-EXTRA_DIST += $(TESTS)
-
-# Each test case depends on defs.
-check_SCRIPTS = defs
-
-distclean-local:
-       -rm -rf testSubDir
+#latex2html.test \
+#texi2dvi.test
+#EXTRA_DIST += $(TESTS)
+## Each test case depends on defs.
+#check_SCRIPTS = defs
+#distclean-local:
+#      -rm -rf testSubDir
Index: util/texi2dvi
===================================================================
RCS file: /sources/texinfo/texinfo/util/texi2dvi,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- util/texi2dvi       28 Feb 2008 14:14:47 -0000      1.116
+++ util/texi2dvi       14 Mar 2008 18:38:37 -0000      1.117
@@ -1,6 +1,6 @@
 #! /bin/sh
 # texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
-# $Id: texi2dvi,v 1.116 2008/02/28 14:14:47 akim Exp $
+# $Id: texi2dvi,v 1.117 2008/03/14 18:38:37 karl 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.116 $'
+rcs_revision='$Revision: 1.117 $'
 rcs_version=`set - $rcs_revision; echo $2`
 program=`echo $0 | sed -e 's!.*/!!'`
 version="texi2dvi (GNU Texinfo 4.11) $rcs_version
@@ -558,7 +558,7 @@
     case $tidy:$oname in
       true:)  dest=$orig_pwd;;
       false:) dest=;;
-      *:*)    dest=$(output_base_name "$file");;
+      *:*)    dest=`output_base_name "$file"`;;
     esac
     if test ! -f "$file"; then
       error 1 "no such file or directory: $file"
@@ -684,13 +684,13 @@
   while read file; do
     echo $file
     case $in_lang in
-      (texinfo)
+      texinfo)
        # texindex: texinfo.cp -> texinfo.cps
        if index_file_p $file; then
         echo ${file}s
        fi
        ;;
-      (latex)
+      latex)
        # bibtex: *.aux -> *.bbl and *.blg.
        if aux_file_p $file; then
          echo $file | sed 's/^\(.*\)\.aux$/\1.bbl/'
@@ -781,7 +781,7 @@
 # Run TeX as "$tex $in_input", taking care of errors and logs.
 run_tex ()
 {
-  case $in_lang:$(out_lang_tex) in
+  case $in_lang:`out_lang_tex` in
     latex:dvi)   tex=${LATEX:-latex};;
     latex:pdf)   tex=${PDFLATEX:-pdflatex};;
     texinfo:dvi)
@@ -908,7 +908,7 @@
              && grep '^\\bibdata' "$in_noext.aux") \
        >&6 2>&1; \
   then
-    for f in $(generated_files_get "$in_noext" bibaux_file_p)
+    for f in `generated_files_get "$in_noext" bibaux_file_p`
     do
       run $bibtex "$f"
     done
@@ -938,7 +938,7 @@
 # ---------------
 run_thumbpdf ()
 {
-  if test $(out_lang_tex) = pdf \
+  if test `out_lang_tex` = pdf \
      && test -r "$in_noext.log" \
      && grep 'thumbpdf\.sty'  "$in_noext.log" >&6 2>&1; \
   then
@@ -972,7 +972,7 @@
   # 'input -o output'.  They all seem to accept 'input' only,
   # outputting using the expected file name.
   run $dvipdf "$1"
-  if test ! -f $(echo "$1" | sed -e 's/\.dvi$/.pdf/'); then
+  if test ! -f `echo "$1" | sed -e 's/\.dvi$/.pdf/'`; then
     error 1 "$0: cannot find output file"
   fi
 }
@@ -1015,12 +1015,12 @@
   # dvipdf or ps).
   case $out_lang in
     dvipdf)
-      run_dvipdf "$in_noext.$(out_lang_tex)"
-      move_to_dest "$in_noext.$(out_lang_ext)"
+      run_dvipdf "$in_noext.`out_lang_tex`"
+      move_to_dest "$in_noext.`out_lang_ext`"
       ;;
     ps)
-      dvips -o "$in_noext.$(out_lang_ext)" "$in_noext.$(out_lang_tex)"
-      move_to_dest "$in_noext.$(out_lang_ext)"
+      dvips -o "$in_noext.`out_lang_ext`" "$in_noext.`out_lang_tex`"
+      move_to_dest "$in_noext.`out_lang_ext`"
       ;;
   esac
 
@@ -1283,7 +1283,7 @@
 # Run the TeX (or HeVeA).
 run_core_conversion ()
 {
-  case $in_lang:$(out_lang_tex) in
+  case $in_lang:`out_lang_tex` in
     *:dvi|*:pdf)
        run_tex;;
     latex:html|latex:text|latex:info)
@@ -1353,7 +1353,7 @@
   shift
   $tidy || {
     local log="$work_build/$in_noext.log"
-    set X ${1+"$@"} "$log" $(generated_files_get "$work_build/$in_noext")
+    set X ${1+"$@"} "$log" `generated_files_get "$work_build/$in_noext"`
     shift
   }
   remove ${1+"$@"}
@@ -1619,7 +1619,7 @@
   if test x"$oname" != x; then
     out_name=$oname
   else
-    out_name=$in_noext.$(out_lang_ext)
+    out_name=$in_noext.`out_lang_ext`
   fi
   out_dir=`func_dirname "$out_name"`
   out_dir_abs=`absolute "$out_dir"`
@@ -1662,7 +1662,7 @@
   # Sometimes there are incompatibilities between auxiliary files for
   # DVI and PDF.  The contents can also change whether we work on PDF
   # and/or DVI.  So keep separate spaces for each.
-  workdir=$t2ddir/$(out_lang_tex)
+  workdir=$t2ddir/`out_lang_tex`
   ensure_dir "$workdir"
 
   # _build.  In a tidy build, where the auxiliary files are output.
P ChangeLog
P install-info/install-info.c
P util/Makefile.am
P util/texi2dvi