texinfo update (Tue Jun 27 13:22:01 EDT 2006)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.618
retrieving revision 1.619
diff -u -r1.618 -r1.619
--- ChangeLog   27 Jun 2006 16:23:18 -0000      1.618
+++ ChangeLog   27 Jun 2006 17:01:26 -0000      1.619
@@ -1,5 +1,13 @@
 2006-06-27  Akim Demaille  <address@hidden>
 
+       * util/defs.in ($latex_paragraph): New.
+       * util/latex2html.test (input.tex): Make it big enough to trigger
+       the info file splitting.
+       * util/texi2dvi (move_to_dest): Accept several arguments.
+       (run_hevea): Use it to move the whole family.
+
+2006-06-27  Akim Demaille  <address@hidden>
+
        Fix the clean invocations to hevea.
        Note that this breaks document using images (to be fixed).
        * util/latex2html.test (run_hevea_check): Extend to support
Index: doc/texi2dvi.1
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texi2dvi.1,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- doc/texi2dvi.1      27 Jun 2006 16:23:19 -0000      1.56
+++ doc/texi2dvi.1      27 Jun 2006 17:01:26 -0000      1.57
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH TEXI2DVI "1" "June 2006" "texi2dvi 1.86" "User Commands"
+.TH TEXI2DVI "1" "June 2006" "texi2dvi 1.88" "User Commands"
 .SH NAME
 texi2dvi \- convert Texinfo documents to DVI
 .SH SYNOPSIS
Index: util/defs.in
===================================================================
RCS file: /sources/texinfo/texinfo/util/defs.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- util/defs.in        27 Jun 2006 16:23:19 -0000      1.6
+++ util/defs.in        27 Jun 2006 17:01:26 -0000      1.7
@@ -303,6 +303,54 @@
   )
 }
 
+# $latex_paragraph
+# ----------------
+# Some lengthy LaTeX.
+# grep -E '^[a-zA-Z]+$' /usr/share/dict/words | sed 200q | pr --page-width=76 
--column=5 --omit-header
+latex_paragraph='
+A              Acrux        Aegean           Ahmad          Albany
+AOL            Actaeon        Aelfric        Ahmadabad      Albee
+Aachen         Acton        Aeneas           Ahmed          Alberio
+Aaliyah        Acts         Aeneid           Ahriman        Albert
+Aaron          Acuff        Aeolus           Aida           Alberta
+Abbas          Ada          Aeroflot         Aiken          Alberto
+Abbasid        Adam         Aeschylus        Aileen         Albigensian
+Abbott         Adams        Aesculapius    Aimee     Albion
+Abby           Adan         Aesop            Ainu           Albireo
+Abdul          Adana        Afghan           Airedale       Albuquerque
+Abe            Adar         Afghanistan    Airedales        Alcatraz
+Abel           Addams       Afghans          Aisha          Alcestis
+Abelard        Adderley       Africa         Ajax           Alcibiades
+Abelson        Addie        African          Akbar          Alcmena
+Aberdeen       Addison        Africans       Akhmatova      Alcoa
+Abernathy      Adela        Afrikaans        Akihito        Alcott
+Abidjan        Adelaide       Afrikaner      Akita          Alcuin
+Abigail        Adele        Afrikaners     Akkad     Alcyone
+Abilene        Adeline        Afro           Akron          Aldan
+Abner          Aden         Afrocentrism   Al        Aldebaran
+Abraham        Adenauer       Afros          Ala     Alden
+Abram          Adhara       Ag       Alabama        Alderamin
+Abrams         Adidas       Agamemnon        Alabaman       Aldo
+Absalom        Adirondack     Agassi         Alabamans      Aldrin
+Abuja          Adirondacks    Agassiz        Alabamian      Alec
+Abyssinia      Adkins       Agatha           Alabamians     Aleichem
+Abyssinian     Adler        Aggie            Aladdin        Alejandra
+Ac             Adolf        Aglaia           Alamo          Alejandro
+Acadia         Adolfo       Agnes            Alamogordo     Alembert
+Acapulco       Adolph       Agnew            Alan           Aleppo
+Accra          Adonis       Agni             Alana          Aleut
+Acevedo        Adonises       Agra           Alar           Aleutian
+Achaean        Adrian       Agricola         Alaric         Alex
+Achebe         Adriana        Agrippa        Alaska         Alexander
+Achernar       Adriatic       Agrippina      Alaskan        Alexandra
+Acheson        Adrienne       Aguilar        Alaskans       Alexandria
+Achilles       Advent       Aguinaldo        Alba           Alexei
+Aconcagua      Adventist      Aguirre        Albania        Alexis
+Acosta         Advents        Agustin        Albanian       Alfonso
+Acropolis      Advil        Ahab             Albanians      Alfonzo
+'
+
+
 # Turn on shell traces when VERBOSE is set.
 if test -n "$VERBOSE"; then
   set -x
Index: util/latex2html.test
===================================================================
RCS file: /sources/texinfo/texinfo/util/latex2html.test,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- util/latex2html.test        27 Jun 2006 16:23:19 -0000      1.2
+++ util/latex2html.test        27 Jun 2006 17:01:26 -0000      1.3
@@ -24,12 +24,22 @@
 
 set -e
 
-# For the creation of auxiliary files.
-create_input_tex <<EOF
-\tableofcontents
-\section{First}
-\section{Second}
-EOF
+# Force the creation of auxiliary files.
+# Force it to be big enough to trigger the info file splitting.
+{
+  echo "\tableofcontents"
+  for section in 1 2 3 4 5 6
+  do
+    echo "\section{$i}"
+    for subsection in 1 2 3 4 5 6
+    do
+      echo "\subsection{$i}"
+      echo "$latex_paragraph"
+    done
+  done
+} |
+create_input_tex
+
 
 # run_hevea_check FORMAT OPTIONS
 # ------------------------------
@@ -43,6 +53,13 @@
   # Testing the local build mode.
   TEXI2DVI_pass --batch --$format "$@" input.tex
 
+  # Compute the expected output.
+  outfiles=input.$out
+  case $format in
+     info) outfiles="$outfiles input.info-1 input.info-2";;
+  esac
+
+  # Compute the aux files.
   case $format:$@ in
     *clean* ) auxfiles='';;
      *tidy* ) auxfiles='input.t2d';;
@@ -51,8 +68,8 @@
           * ) auxfiles='';;
   esac
   # There should only be the expected output and the source file.
-  assert_files $auxfiles input.$out input.tex
-  rm -fr $auxfiles input.$out
+  assert_files input.tex $outfiles $auxfiles
+  rm -fr $outfiles $auxfiles
 }
 
 for opt in "" "--clean" "--tidy"
Index: util/texi2dvi
===================================================================
RCS file: /sources/texinfo/texinfo/util/texi2dvi,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- util/texi2dvi       27 Jun 2006 16:29:54 -0000      1.88
+++ util/texi2dvi       27 Jun 2006 17:01:26 -0000      1.89
@@ -1,6 +1,6 @@
 #! /bin/sh
 # texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
-# $Id: texi2dvi,v 1.88 2006/06/27 16:29:54 akim Exp $
+# $Id: texi2dvi,v 1.89 2006/06/27 17:01:26 akim Exp $
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -35,7 +35,7 @@
 set -e
 
 # This string is expanded by rcs automatically when this file is checked out.
-rcs_revision='$Revision: 1.88 $'
+rcs_revision='$Revision: 1.89 $'
 rcs_version=`set - $rcs_revision; echo $2`
 program=`echo $0 | sed -e 's!.*/!!'`
 version="texi2dvi (GNU Texinfo 4.8) $rcs_version
@@ -505,8 +505,9 @@
   esac
 }
 
-# move_to_dest FILE
-# -----------------
+
+# move_to_dest FILE...
+# --------------------
 # Move the FILE to the place where the user expects it.  FILE can be
 # the principal output (in which case -o directly apply), or an auxiliary
 # file with the same base name.
@@ -514,18 +515,21 @@
 {
   local dest
 
-  case $tidy:$oname in
-    true:)  dest=$orig_pwd;;
-    false:) dest=;;
-    *:*)    dest=$(output_base_name "$1");;
-  esac
-  if test ! -f "$1"; then
-    error 1 "no such file or directory: $1"
-  fi
-  if test -n "$dest"; then
-    verbose "Copying $1 to $dest"
-    cp -p "$1" "$dest"
-  fi
+  for file
+  do
+    case $tidy:$oname in
+      true:)  dest=$orig_pwd;;
+      false:) dest=;;
+      *:*)    dest=$(output_base_name "$file");;
+    esac
+    if test ! -f "$file"; then
+      error 1 "no such file or directory: $file"
+    fi
+    if test -n "$dest"; then
+      verbose "Copying $file to $dest"
+      cp -p "$file" "$dest"
+    fi
+  done
 }
 
 
@@ -1178,7 +1182,11 @@
 
   verbose "running $run_hevea"
   if eval "$run_hevea" >&5; then
-    move_to_dest "$out_base"
+    case $1 in
+    html|text) move_to_dest "$out_base";;
+    info) # There can be foo.info-1, foo.info-2 etc.
+               move_to_dest "$out_base"*;;
+    esac
   else
     error 1 "$hevea exited with bad status, quitting."
   fi
P ChangeLog
P doc/texi2dvi.1
P util/defs.in
P util/latex2html.test
P util/texi2dvi