FYI: Both: texi2dvi

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * contrib/texi2dvi4a2ps: Update form Texinfo 4.1c.

Index: contrib/texi2dvi4a2ps
===================================================================
RCS file: /cvsroot/a2ps/a2ps/contrib/texi2dvi4a2ps,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 texi2dvi4a2ps
--- contrib/texi2dvi4a2ps 4 Mar 2002 18:46:23 -0000 1.1.1.1
+++ contrib/texi2dvi4a2ps 25 Mar 2002 16:28:22 -0000
@@ -1,8 +1,9 @@
 #! /bin/sh
 # texi2dvi --- produce DVI (or PDF) files from Texinfo (or LaTeX) sources.
-# $Id: texi2dvi4a2ps,v 1.1.1.1 2002/03/04 18:46:23 akim Exp $
+# $Id: texi2dvi,v 0.50 2002/03/13 13:42:23 karl Exp $
 #
-# Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
+# Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2001, 02
+# Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,18 +27,17 @@
 # the `--debug' option when making a bug report.
 
 # This string is expanded by rcs automatically when this file is checked out.
-rcs_revision='$Revision: 1.1.1.1 $'
+rcs_revision='$Revision: 0.50 $'
 rcs_version=`set - $rcs_revision; echo $2`
 program=`echo $0 | sed -e 's!.*/!!'`
-version="texi2dvi (GNU Texinfo 4.0) $rcs_version
+version="texi2dvi (GNU Texinfo 4.1) $rcs_version
 
-Copyright (C) 1999 Free Software Foundation, Inc.
+Copyright (C) 2002 Free Software Foundation, Inc.
 There is NO warranty.  You may redistribute this software
 under the terms of the GNU General Public License.
 For more information about these matters, see the files named COPYING."
 
-usage="\
-Usage: $program [OPTION]... FILE...
+usage="Usage: $program [OPTION]... FILE...
 
 Run each Texinfo or LaTeX FILE through TeX in turn until all
 cross-references are resolved, building all indices.  The directory
@@ -48,18 +48,16 @@
 when needed.
 
 Operation modes:
+  -b, --batch         no interaction
+  -c, --clean         remove all auxiliary files
+  -D, --debug         turn on shell debugging (set -x)
   -h, --help          display this help and exit successfully
-  -v, --version       display version information and exit successfully
-  -V, --verbose       report on what is done
+  -o, --output=OFILE  leave output in OFILE (implies --clean);
+                      Only one input FILE may be specified in this case
   -q, --quiet         no output unless errors (implies --batch)
   -s, --silent        same as --quiet
-  -D, --debug         turn on shell debugging (set -x)
-  -b, --batch         no interaction
-  -c, --clean         remove all auxiliary files
-  -o, --output=FILE   leave output in FILE (implies --clean)
-
-Only one FILE may be specified if \`--output' is used.
-
+  -v, --version       display version information and exit successfully
+  -V, --verbose       report on what is done
 
 TeX tuning:
   -@                   use @input instead of \input; for preloaded Texinfo
@@ -75,7 +73,8 @@
 those commands, if they are set.
 
 Email bug reports to <address@hidden>,
-general questions and discussion to <address@hidden>."
+general questions and discussion to <address@hidden>.
+Texinfo home page: http://www.gnu.org/software/texinfo/";
 
 # Initialize variables for option overriding and otherwise.
 # Don't use `unset' since old bourne shells don't have this command.
@@ -229,14 +228,23 @@
     s/address@hidden texi2dvi//
   }
 }
-/address@hidden/,/address@hidden html/d
-/address@hidden/,/address@hidden ifhtml/d
-/address@hidden/,/address@hidden ifnottex/d
+/address@hidden/,/address@hidden html/{
+  s/^/@c (texi2dvi)/
+}
+/address@hidden/,/address@hidden ifhtml/{
+  s/^/@c (texi2dvi)/
+}
+/address@hidden/,/address@hidden ifnottex/{
+  s/^/@c (texi2dvi)/
+}
 /address@hidden/,/address@hidden ifinfo/{
   /address@hidden/p
   /address@hidden/,/address@hidden menu/p
-  d
+  t
+  s/^/@c (texi2dvi)/
 }
+s/address@hidden/@c address@hidden/
+s/address@hidden ifnotinfo/@c address@hidden ifnotinfo/
 EOF
 # Uncommenting is simple: Remove any leading address@hidden texi2dvi'.
 uncomment_iftex_sed=$utildir/uncomment.sed
@@ -513,8 +521,8 @@
     # Prevent $ESCAPE from being interpreted by the shell if it happens
     # to be `/'.
     $batch tex_args="\\${escape}nonstopmode\ \\${escape}input"
-    $verbose "Running $cmd ..."
     cmd="$tex $tex_args $filename_input"
+    $verbose "Running $cmd ..."
     if $cmd >&5; then :; else
       echo "$0: $tex exited with bad status, quitting." >&2
       echo "$0: see $filename_noext.log for errors." >&2
@@ -577,7 +585,7 @@
     if test -n "$oname"; then
        dest=$oname
     else
-       dest=$orgi_pwd
+       dest=$orig_pwd
     fi
     $verbose "Copying $oformat file from `pwd` to $dest"
     cp -p "./$filename_noext.$oformat" "$dest"