bug-texinfo
[Top][All Lists]
Advanced

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

FYI: More TeX variables, and //


From: Akim Demaille
Subject: FYI: More TeX variables, and //
Date: Thu, 28 Feb 2008 15:14:07 +0100
User-agent: Gnus/5.110006 (No Gnus v0.6) Emacs/22.0.95 (gnu/linux)

This was needed to be able to use -Ifoo// with foo being a directory
where fonts were installed (deeply).

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        Let texi2dvi keep the trailing //.
        * bin/texi2dvi ($space, $tab): New.
        ($IFS): Use them to be robust to zealous white space cleanups.
        (absolute): Preserve the trailing slashes.
        (tex_envvars): Add MPINPUTS, MFINPUTS, and TFMFONTS.

Index: util/texi2dvi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/util/texi2dvi,v
retrieving revision 1.114
diff -u -u -r1.114 texi2dvi
--- util/texi2dvi 28 Feb 2008 14:01:56 -0000 1.114
+++ util/texi2dvi 28 Feb 2008 14:12:19 -0000
@@ -115,8 +115,8 @@
   -   the current directory is not cluttered with plethora of temporary files.
   -   clutter can be even reduced using --build-dir=dir: all the *.t2d
       directories are stored there.
-  -   clutter can be reduced to zero using,e.g., --build-dir=/tmp/\$USER.t2d or
-      --build-dir=\$HOME/.t2d.
+  -   clutter can be reduced to zero using, e.g., --build-dir=/tmp/\$USER.t2d
+      or --build-dir=\$HOME/.t2d.
   -   the output file is updated after every succesful TeX run, for
       sake of concurrent visualization of the output.  In a \`local' build
       the viewer stops during the whole TeX run.
@@ -170,9 +170,11 @@
 # http://lists.gnu.org/archive/html/automake-patches/2006-05/msg00008.html
 # We need space, tab and new line, in precisely that order.  And don't leave
 # trailing blanks.
+space=' '
+tab='  '
 newline='
 '
-IFS="  $newline"
+IFS="$space$tab$newline"
 
 # In case someone crazy insists on using grep -E.
 : ${EGREP=egrep}
@@ -264,10 +266,13 @@
       # Absolute paths don't need to be expanded.
       echo "$1"
       ;;
-   *) local rel=$orig_pwd/`func_dirname "$1"`
+   *) local slashes
+      slashes=`echo "$1" | sed -n 's,.*[^/]\(/*\)$,\1,p'`
+      rel=$orig_pwd/`func_dirname "$1"`
       if test -d "$rel"; then
        (cd "$rel" 2>/dev/null &&
-        local n=`pwd`/`basename "$1"`
+        local n
+        n=`pwd`/`basename "$1"`"$slashes"
         echo "$n")
       else
        error 1 "not a directory: $rel"
@@ -467,7 +472,8 @@
 
 # Save TEXINPUTS so we can construct a new TEXINPUTS path for each file.
 # Likewise for bibtex and makeindex.
-tex_envvars="BIBINPUTS BSTINPUTS DVIPSHEADERS INDEXSTYLE TEXINPUTS"
+tex_envvars="BIBINPUTS BSTINPUTS DVIPSHEADERS INDEXSTYLE MFINPUTS MPINPUTS \
+TEXINPUTS TFMFONTS"
 for var in $tex_envvars; do
   eval ${var}_orig=\$$var
   export $var
@@ -534,7 +540,7 @@
 # is, it must not remain in its build location unless that is also the
 # output location.  (Otherwise it might appear as an extra file in make
 # distcheck.)
-# 
+#
 # FILE can be the principal output (in which case -o directly applies), or
 # an auxiliary file with the same base name.
 move_to_dest ()




reply via email to

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