texinfo ChangeLog util/texi2dvi

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       09/10/08 21:49:30

Modified files:
        .              : ChangeLog 
        util           : texi2dvi 

Log message:
        make ~ normal only for texinfo, not latex

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1014&r2=1.1015
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/texi2dvi?cvsroot=texinfo&r1=1.152&r2=1.153

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1014
retrieving revision 1.1015
diff -u -b -r1.1014 -r1.1015
--- ChangeLog   9 Sep 2009 22:06:47 -0000       1.1014
+++ ChangeLog   8 Oct 2009 21:49:30 -0000       1.1015
@@ -1,3 +1,9 @@
+2009-10-08  Karl Berry  <address@hidden>
+
+       * util/texi2dvi (catcode_special): default to maybe,
+       and only set to true for processing Texinfo, not LaTeX.
+       Request from Kurt Hornik, also Debian bug #534458.
+
 2009-09-09  Ralf Wildenhues  <address@hidden>
 
         * build-aux/gendocs.sh: Fix copyright header to match GPLv3

Index: util/texi2dvi
===================================================================
RCS file: /sources/texinfo/texinfo/util/texi2dvi,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -b -r1.152 -r1.153
--- util/texi2dvi       20 Apr 2009 21:35:45 -0000      1.152
+++ util/texi2dvi       8 Oct 2009 21:49:30 -0000       1.153
@@ -1,6 +1,6 @@
 #! /bin/sh
 # texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
-# $Id: texi2dvi,v 1.152 2009/04/20 21:35:45 karl Exp $
+# $Id: texi2dvi,v 1.153 2009/10/08 21:49:30 karl Exp $
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
 # 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -33,7 +33,7 @@
 set -e
 
 # This string is expanded automatically when this file is checked out.
-rcs_revision='$Revision: 1.152 $'
+rcs_revision='$Revision: 1.153 $'
 rcs_version=`set - $rcs_revision; echo $2`
 program=`echo $0 | sed -e 's!.*/!!'`
 
@@ -45,7 +45,7 @@
 # Instead, assign them an empty value.
 action=compile
 batch=false     # true for batch mode
-catcode_special=true
+catcode_special=maybe
 debug=false
 escape="\\"
 expand=false    # true for expansion via makeinfo
@@ -938,6 +938,14 @@
     *) error 1 "$out_lang not supported for $in_lang";;
   esac
 
+  # do the special catcode trick for ~ in filenames only for Texinfo,
+  # not LaTeX.
+  if test x"$in_lang" = xtexinfo && test $catcode_special = maybe; then
+    catcode_special=true
+  else
+    catcode_special=false
+  fi
+
   # Beware of aux files in subdirectories that require the
   # subdirectory to exist.
   case $in_lang:$tidy in