texinfo ChangeLog util/texi2dvi util/texi2pdf u...

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       09/04/13 00:29:38

Modified files:
        .              : ChangeLog 
        util           : texi2dvi texi2pdf pdftexi2dvi 

Log message:
        handle --version in texi2pdf, mention PDF output in texi2dvi --help

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.993&r2=1.994
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/texi2dvi?cvsroot=texinfo&r1=1.138&r2=1.139
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/texi2pdf?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/pdftexi2dvi?cvsroot=texinfo&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.993
retrieving revision 1.994
diff -u -b -r1.993 -r1.994
--- ChangeLog   29 Mar 2009 16:29:57 -0000      1.993
+++ ChangeLog   13 Apr 2009 00:29:37 -0000      1.994
@@ -1,3 +1,9 @@
+2009-04-12  Karl Berry  <address@hidden>
+
+       * util/texi2pdf,
+       * util/pdftexi2dvi: handle --version to hardwire the program name.
+       * util/texi2dvi (usage): mention PDF output.
+
 2009-03-29  Karl Berry  <address@hidden>
 
        * doc/texinfo.tex (Local Variables): nuke-trailing-whitespace, to

Index: util/texi2dvi
===================================================================
RCS file: /sources/texinfo/texinfo/util/texi2dvi,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -b -r1.138 -r1.139
--- util/texi2dvi       15 Mar 2009 19:00:24 -0000      1.138
+++ util/texi2dvi       13 Apr 2009 00:29:37 -0000      1.139
@@ -1,6 +1,6 @@
 #! /bin/sh
 # texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
-# $Id: texi2dvi,v 1.138 2009/03/15 19:00:24 karl Exp $
+# $Id: texi2dvi,v 1.139 2009/04/13 00:29:37 karl Exp $
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
 # 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -32,8 +32,8 @@
 # No failure shall remain unpunished.
 set -e
 
-# This string is expanded by rcs automatically when this file is checked out.
-rcs_revision='$Revision: 1.138 $'
+# This string is expanded automatically when this file is checked out.
+rcs_revision='$Revision: 1.139 $'
 rcs_version=`set - $rcs_revision; echo $2`
 program=`echo $0 | sed -e 's!.*/!!'`
 
@@ -281,6 +281,8 @@
   # where % denotes the eol character.
   cat <<EOF
 Usage: $program [OPTION]... FILE...
+       texi2pdf [OPTION]... FILE...
+       pdftexi2dvi [OPTION]... FILE...
 
 Run each Texinfo or (La)TeX FILE through TeX in turn until all
 cross-references are resolved, building all indices.  The directory
@@ -293,8 +295,8 @@
   \`\\input{FILE}'     the actual file to compile
   \`\\nonstopmode'     same as --batch
 
-Makeinfo is used to perform Texinfo macro expansion before running TeX
-when needed.
+When invoked as \`texi2pdf' or \`pdftexi2dvi', or given the option --pdf
+or --dvipdf, generate PDF output.  Otherwise, generate DVI.
 
 General options:
   -b, --batch         no interaction
@@ -364,9 +366,9 @@
 using \\graphicspath): in that case use -I to specify the additional
 directories to consider.
 
-The values of the BIBTEX, LATEX (or PDFLATEX), MAKEINDEX, MAKEINFO,
-TEX (or PDFTEX), TEXINDEX, and THUMBPDF environment variables are used
-to run those commands, if they are set.  Any CMD strings are added
+The values of the BIBTEX, LATEX (or PDFLATEX), MAKEINDEX, MAKEINFO, TEX
+(or PDFTEX or DVIPDF), TEXINDEX, and THUMBPDF environment variables are
+used to run those commands, if they are set.  Any CMD strings are added
 after @setfilename for Texinfo input, in the first line for LaTeX input.
 
 Report bugs to address@hidden,

Index: util/texi2pdf
===================================================================
RCS file: /sources/texinfo/texinfo/util/texi2pdf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- util/texi2pdf       28 Jan 2005 01:52:04 -0000      1.2
+++ util/texi2pdf       13 Apr 2009 00:29:38 -0000      1.3
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: texi2pdf,v 1.2 2005/01/28 01:52:04 karl Exp $
+# $Id: texi2pdf,v 1.3 2009/04/13 00:29:38 karl Exp $
 # Written by Thomas Esser.  Public domain.
 # Execute texi2dvi --pdf.
 
@@ -16,4 +16,23 @@
 # hack around a bug in zsh:
 test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
+rcs_revision='$Revision: 1.3 $'
+rcs_version=`set - $rcs_revision; echo $2`
+
+# special-case --version following GNU standards for identifying the
+# program name.  If --version is specified as other than the first
+# argument, we don't output the standard name, but then, we're not
+# obliged to.
+if test "x$1" = x--version; then
+  cat <<EOF
+texi2pdf (GNU Texinfo 4.13) $rcs_version
+
+Copyright (C) 2009 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+EOF
+  exit 0
+fi
+
 texi2dvi --pdf ${1+"$@"}

Index: util/pdftexi2dvi
===================================================================
RCS file: /sources/texinfo/texinfo/util/pdftexi2dvi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- util/pdftexi2dvi    5 Jul 2007 15:22:26 -0000       1.3
+++ util/pdftexi2dvi    13 Apr 2009 00:29:38 -0000      1.4
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: pdftexi2dvi,v 1.3 2007/07/05 15:22:26 karl Exp $
+# $Id: pdftexi2dvi,v 1.4 2009/04/13 00:29:38 karl Exp $
 # Written by Thomas Esser.  Public domain.
 # Execute texi2dvi --pdf.
 
@@ -16,4 +16,23 @@
 # hack around a bug in zsh:
 test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
+rcs_revision='$Revision: 1.4 $'
+rcs_version=`set - $rcs_revision; echo $2`
+
+# special-case --version following GNU standards for identifying the
+# program name.  If --version is specified as other than the first
+# argument, we don't output the standard name, but then, we're not
+# obliged to.
+if test "x$1" = x--version; then
+  cat <<EOF
+pdftexi2dvi (GNU Texinfo 4.13) $rcs_version
+
+Copyright (C) 2009 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+EOF
+  exit 0
+fi
+
 texi2dvi --pdf ${1+"$@"}