texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

texinfo update (Thu Nov 22 17:53:01 EST 2007)


From: Karl Berry
Subject: texinfo update (Thu Nov 22 17:53:01 EST 2007)
Date: Thu, 22 Nov 2007 17:53:03 -0500

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.777
retrieving revision 1.778
diff -u -r1.777 -r1.778
--- ChangeLog   21 Nov 2007 23:02:22 -0000      1.777
+++ ChangeLog   22 Nov 2007 22:52:03 -0000      1.778
@@ -1,3 +1,7 @@
+2007-11-22  Ralf Wildenhues  <address@hidden>
+
+       * util/texi2dvi: Fix quoting for white space in file names.
+
 2007-11-21  Karl Berry  <address@hidden>
 
        * makeinfo/lang.h (hz): #undef, since apparently it is defined on
Index: util/texi2dvi
===================================================================
RCS file: /sources/texinfo/texinfo/util/texi2dvi,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- util/texi2dvi       10 Sep 2007 00:36:30 -0000      1.104
+++ util/texi2dvi       22 Nov 2007 22:52:04 -0000      1.105
@@ -1,6 +1,6 @@
 #! /bin/sh
 # texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
-# $Id: texi2dvi,v 1.104 2007/09/10 00:36:30 karl Exp $
+# $Id: texi2dvi,v 1.105 2007/11/22 22:52:04 karl Exp $
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
 # 2002, 2003, 2004, 2005, 2006, 2007 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.104 $'
+rcs_revision='$Revision: 1.105 $'
 rcs_version=`set - $rcs_revision; echo $2`
 program=`echo $0 | sed -e 's!.*/!!'`
 version="texi2dvi (GNU Texinfo 4.11) $rcs_version
@@ -264,9 +264,11 @@
       # Absolute paths don't need to be expanded.
       echo "$1"
       ;;
-   *) local rel="$orig_pwd/`func_dirname $1`"
+   *) local rel=$orig_pwd/`func_dirname "$1"`
       if test -d "$rel"; then
-       (cd "$rel" 2>/dev/null && echo `pwd`/`basename "$1"`);
+       (cd "$rel" 2>/dev/null &&
+        local n=`pwd`/`basename "$1"`
+        echo "$n")
       else
        error 1 "not a directory: $rel"
       fi
@@ -1061,11 +1063,11 @@
        $TEX txiversion.tex </dev/null >txiversion.out 2>txiversion.err
     )
     if test $? != 0; then
-      cat $version_test_dir/txiversion.out
-      cat $version_test_dir/txiversion.err >&2
+      cat "$version_test_dir/txiversion.out"
+      cat "$version_test_dir/txiversion.err" >&2
       error 1 "texinfo.tex appears to be broken, quitting."
     fi
-    eval `sed -n 's/^.*\[\(.*\)version \(....\)-\(..\)-\(..\).*$/txiformat=\1 
txiversion="\2\3\4"/p' $version_test_dir/txiversion.out`
+    eval `sed -n 's/^.*\[\(.*\)version \(....\)-\(..\)-\(..\).*$/txiformat=\1 
txiversion="\2\3\4"/p' "$version_test_dir/txiversion.out"`
     verbose "texinfo.tex preloaded as \`$txiformat', version is \`$txiversion' 
..."
     if test "$txiprereq" -le "$txiversion" >&6 2>&1; then
       makeinfo=
@@ -1278,8 +1280,8 @@
     # detection).
     val=`absolute_filenames "$val"`
     eval $var="\"$val\""
-    eval export $var
-    eval verbose "$var=\'\$${var}\'"
+    export $var
+    eval verbose \"$var=\'\$${var}\'\"
   done
 
   # --expand
@@ -1311,12 +1313,14 @@
 mostly_clean ()
 {
   cd_orig
-  local to_remove="$t2ddir"
+  set X "$t2ddir"
+  shift
   $tidy || {
     local log="$work_build/$in_noext.log"
-    to_remove=$to_remove" $log "$(generated_files_get "$work_build/$in_noext")
+    set X ${1+"$@"} "$log" $(generated_files_get "$work_build/$in_noext")
+    shift
   }
-  remove $to_remove
+  remove ${1+"$@"}
 }
 
 
@@ -1592,13 +1596,14 @@
 ## TeXify files.  ##
 ## -------------- ##
 
-for command_line_filename in ${1+"$@"}; do
+for command_line_filename
+do
   verbose "Processing $command_line_filename ..."
 
   input_file_name_decode
 
   # `texinfo' or `latex'?
-  in_lang=`compute_language $command_line_filename`
+  in_lang=`compute_language "$command_line_filename"`
 
   # An auxiliary directory used for all the auxiliary tasks involved
   # in compiling this document.
P ChangeLog
P util/texi2dvi




reply via email to

[Prev in Thread] Current Thread [Next in Thread]