--- util/texi2dvi 2008/09/18 18:46:01 1.135
+++ util/texi2dvi 2010/03/30 23:13:37 1.158
@@ -1,9 +1,9 @@
#! /bin/sh
# texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
-# $Id: texi2dvi,v 1.135 2008/09/18 18:46:01 karl Exp $
+# $Id: texi2dvi,v 1.158 2010/03/30 23:13:37 karl Exp $
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
+# 2004, 2005, 2006, 2007, 2008, 2009 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
@@ -18,7 +18,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
#
-# Original author: Noah Friedman.
+# Originally written by Noah Friedman.
#
# Please send bug reports, etc. to bug-texinfo@gnu.org.
# If possible, please send a copy of the output of the script called with
@@ -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.135 $'
+# This string is expanded automatically when this file is checked out.
+rcs_revision='$Revision: 1.158 $'
rcs_version=`set - $rcs_revision; echo $2`
program=`echo $0 | sed -e 's!.*/!!'`
@@ -44,19 +44,21 @@
# Don't use `unset' since old bourne shells don't have this command.
# Instead, assign them an empty value.
action=compile
-batch=false # true for batch mode
+batch=false # interact normally
+catcode_special=maybe
debug=false
escape="\\"
-expand= # t for expansion via makeinfo
+expand=false # true for expansion via makeinfo
includes=
-line_error=true # Pass --file-line-error to TeX.
-no_line_error=false # absolutely do not pass --file-line-error to TeX
+line_error=true # pass --file-line-error to TeX
+max_iters=-1 # keep going forever
oname= # --output
out_lang=dvi
-quiet=false # by default let the tools' message be displayed
+quiet=false # let the tools' message be displayed
recode=false
set_language=
src_specials=
+latex2html=hevea # or set to tex4ht
textra= # Extra TeX commands to insert in the input file.
txiprereq=19990129 # minimum texinfo.tex version with macro expansion
verb=false # true for verbose mode
@@ -160,6 +162,15 @@
}
+# noexit FILE
+# -----------
+# Return FILE with one extension remove. foo.bar.baz -> foo.bar.
+noext ()
+{
+ echo "$1" | sed -e 's/\.[^/.][^/.]*$//'
+}
+
+
# absolute NAME -> ABS-NAME
# -------------------------
# Return an absolute path to NAME.
@@ -175,12 +186,12 @@
local rel
rel=$orig_pwd/`func_dirname "$1"`
if test -d "$rel"; then
- (cd "$rel" 2>/dev/null &&
- local n
- n=`pwd`/`basename "$1"`"$slashes"
- echo "$n")
+ (cd "$rel" 2>/dev/null &&
+ local n
+ n=`pwd`/`basename "$1"`"$slashes"
+ echo "$n")
else
- error 1 "not a directory: $rel"
+ error 1 "not a directory: $rel"
fi
;;
esac
@@ -194,8 +205,12 @@
{
for dir
do
+ # Beware that in parallel builds we may have several concurrent
+ # attempts to create the directory. So fail only if "mkdir"
+ # failed *and* the directory still does not exist.
test -d "$dir" \
|| mkdir "$dir" \
+ || test -d "$dir" \
|| error 1 "cannot create directory: $dir"
done
}
@@ -229,12 +244,12 @@
# We have to try this both for $1 and $1.exe.
#
# Note: On Cygwin and DJGPP, `test -x' also looks for .exe. On Cygwin,
- # also `test -f' has this enhancement, bot not on DJGPP. (Both are
+ # also `test -f' has this enhancement, but not on DJGPP. (Both are
# design decisions, so there is little chance to make them consistent.)
# Thusly, it seems to be difficult to make use of these enhancements.
#
- if { test -f "$dir/$1" && test -x "$dir/$1"; } ||
- { test -f "$dir/$1.exe" && test -x "$dir/$1.exe"; }; then
+ if { test -f "$dir/$1" && test -x "$dir/$1"; } ||
+ { test -f "$dir/$1.exe" && test -x "$dir/$1.exe"; }; then
return 0
fi
done
@@ -280,6 +295,8 @@
# where % denotes the eol character.
cat <,
-general questions and discussion to .
-Texinfo home page: http://www.gnu.org/software/texinfo/
+The values of the BIBTEX, DVIPDF, DVIPS, LATEX, MAKEINDEX, MAKEINFO,
+PDFLATEX, PDFTEX, TEX, 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 bug-texinfo@gnu.org,
+general questions and discussion to help-texinfo@gnu.org.
+GNU Texinfo home page:
+General help using GNU software:
EOF
exit 0
}
@@ -512,6 +537,18 @@
## Language auxiliary functions. ##
## ------------------------------ ##
+
+# out_lang_set LANG
+# -----------------
+out_lang_set ()
+{
+ case $1 in
+ dvi|dvipdf|html|info|pdf|ps|text) out_lang=$1;;
+ *) error 1 "invalid output format: $1";;
+ esac
+}
+
+
# out_lang_tex
# ------------
# Return the tex output language (DVI or PDF) for $OUT_LANG.
@@ -521,7 +558,7 @@
dvi | ps | dvipdf ) echo dvi;;
pdf ) echo $out_lang;;
html | info | text ) echo $out_lang;;
- *) error 1 "$0: invalid out_lang: $1";;
+ *) error 1 "invalid out_lang: $1";;
esac
}
@@ -534,7 +571,7 @@
case $out_lang in
dvipdf ) echo pdf;;
dvi | html | info | pdf | ps | text ) echo $out_lang;;
- *) error 1 "$0: invalid out_lang: $1";;
+ *) error 1 "invalid out_lang: $1";;
esac
}
@@ -576,19 +613,19 @@
do
case $dir in
EMPTY)
- res=$res$path_sep
- ;;
+ res=$res$path_sep
+ ;;
*)
- if test -d "$dir"; then
- res=$res$path_sep`absolute "$dir"`
- else
- # Even if $dir is not a directory, preserve it in the path.
- # It might contain metacharacters that TeX will expand in
- # turn, e.g., /some/path/{a,b,c}. This will not get the
- # implicit absolutification of the path, but we can't help that.
- res=$res$path_sep$dir
- fi
- ;;
+ if test -d "$dir"; then
+ res=$res$path_sep`absolute "$dir"`
+ else
+ # Even if $dir is not a directory, preserve it in the path.
+ # It might contain metacharacters that TeX will expand in
+ # turn, e.g., /some/path/{a,b,c}. This will not get the
+ # implicit absolutification of the path, but we can't help that.
+ res=$res$path_sep$dir
+ fi
+ ;;
esac
done
echo "$res"
@@ -598,20 +635,33 @@
# output_base_name FILE
# ---------------------
# The name of FILE, possibly renamed to satisfy --output.
+# FILE is local, there is no directory part.
output_base_name ()
{
case $oname in
'') echo "$1";;
*) local out_noext
- out_noext=`echo "$oname" | sed 's/\.[^.]*$//'`
- local file_ext
- file_ext=`echo "$1" | sed 's/^.*\.//'`
- echo "$out_noext.$file_ext"
+ out_noext=`noext "$oname"`
+ local file_ext
+ file_ext=`echo "$1" | sed 's/^.*\.//'`
+ echo "$out_noext.$file_ext"
;;
esac
}
+# destdir
+# -------
+# Return the name of the directory where the output is expected.
+destdir ()
+{
+ case $oname in
+ '') echo "$orig_pwd";;
+ *) dirname "$oname";;
+ esac
+}
+
+
# move_to_dest FILE...
# --------------------
# Move FILE to the place where the user expects it. Truly move it, that
@@ -623,7 +673,11 @@
# an auxiliary file with the same base name.
move_to_dest ()
{
- local dest
+ # If we built in place, there is nothing to install, leave.
+ case $tidy:$oname in
+ false:) return;;
+ esac
+
local destfile
local destdir
local destbase
@@ -632,42 +686,32 @@
for file
do
+ test -f "$file" ||
+ error 1 "no such file or directory: $file"
case $tidy:$oname in
- true:) dest=$orig_pwd;;
- false:) dest=;;
- *:*) dest=`output_base_name "$file"`;;
+ true:) destdir=$orig_pwd
+ destfile=$destdir/$file;;
+ *:*) destfile=`output_base_name "$file"`
+ destdir=`dirname "$destfile"`;;
esac
- if test ! -f "$file"; then
- error 1 "no such file or directory: $file"
- fi
- if test -n "$dest"; then
- # We need to know whether $dest is a directory.
- if test -d "$dest"; then
- destdir=$dest
- destfile=$dest/$file
- else
- destdir="`dirname $dest`"
- destfile=$dest
- fi
- # We want to compare the source location and the output location,
- # and if they are different, do the move. But if they are the
- # same, we must preserve the source. Since we can't assume
- # stat(1) or test -ef is available, resort to comparing the
- # directory names, canonicalized with pwd. We can't use cmp -s
- # since the output file might not actually change from run to run;
- # e.g., TeX DVI output is timestamped to only the nearest minute.
- destdir=`cd $destdir && pwd`
- destbase=`basename $destfile`
- #
- sourcedir=`dirname $file`
- sourcedir=`cd $sourcedir && pwd`
- sourcebase=`basename $file`
- #
- if test "$sourcedir/$sourcebase" != "$destdir/$destbase"; then
- verbose "Moving $file to $destfile"
- rm -f "$destfile"
- mv "$file" "$destfile"
- fi
+ # We want to compare the source location and the output location,
+ # and if they are different, do the move. But if they are the
+ # same, we must preserve the source. Since we can't assume
+ # stat(1) or test -ef is available, resort to comparing the
+ # directory names, canonicalized with pwd. We can't use cmp -s
+ # since the output file might not actually change from run to run;
+ # e.g., TeX DVI output is timestamped to only the nearest minute.
+ destdir=`cd "$destdir" && pwd`
+ destbase=`basename "$destfile"`
+
+ sourcedir=`dirname "$file"`
+ sourcedir=`cd "$sourcedir" && pwd`
+ sourcebase=`basename "$file"`
+
+ if test "$sourcedir/$sourcebase" != "$destdir/$destbase"; then
+ verbose "Moving $file to $destfile"
+ rm -f "$destfile"
+ mv "$file" "$destfile"
fi
done
}
@@ -679,7 +723,7 @@
# aux_file_p FILE
# ---------------
-# Return with success with FILE is an aux file.
+# Return with success if FILE is an aux file.
aux_file_p ()
{
test -f "$1" || return 1
@@ -691,7 +735,7 @@
# bibaux_file_p FILE
# ------------------
-# Return with success with FILE is an aux file containing citation
+# Return with success if FILE is an aux file containing citation
# requests.
bibaux_file_p ()
{
@@ -711,13 +755,24 @@
# index_file_p FILE
# -----------------
-# Return with success with FILE is an index file.
-# When index.sty is used, there is a space before the brace.
+# Return with success if FILE is an index file.
index_file_p ()
{
test -f "$1" || return 1
- case `sed '1q' "$1"` in
- "\\entry{"*|"\\indexentry{"*|"\\indexentry {"*) return 0;;
+ case $in_lang:$latex2html:`out_lang_tex`:`sed '1q' "$1"` in
+ # When working with TeX4HT, *.idx are created by LaTeX. They must
+ # be processed to produce *.4ix, *.4dx files. The *.4dx file is
+ # passed to makeindex to produce the *.ind file. This sequence is
+ # handled by run_index, so we are only interested in the *.idx
+ # files, which have each "\indexentry" preceded by a
+ # "\beforeentry".
+ latex:tex4ht:html:"\\beforeentry {"*) return 0;;
+
+ # When index.sty is used, there is a space before the brace.
+ latex:*:*:"\\indexentry{"*|latex:*:*:"\\indexentry {"*) return 0;;
+
+ texinfo:*:*:"\\entry{"*) return 0;;
+
*) return 1;;
esac
}
@@ -735,7 +790,7 @@
case `sed '1q' "$1"` in
"\\input texinfo"*) return 1;;
[\\''@]*) return 0;;
- *) return 1;;
+ *) return 1;;
esac
}
@@ -762,15 +817,15 @@
echo $file
case $in_lang in
texinfo)
- # texindex: texinfo.cp -> texinfo.cps
+ # texindex: texinfo.cp -> texinfo.cps
if index_file_p $file; then
- echo ${file}s
+ echo ${file}s
fi
;;
latex)
- if aux_file_p $file; then
+ if aux_file_p $file; then
# bibtex: *.aux -> *.bbl and *.blg.
- echo $file | sed 's/^\(.*\)\.aux$/\1.bbl/'
+ echo $file | sed 's/^\(.*\)\.aux$/\1.bbl/'
echo $file | sed 's/^\(.*\)\.aux$/\1.blg/'
# -recorder: .fls
echo $file | sed 's/^\(.*\)\.aux$/\1.fls/'
@@ -845,7 +900,7 @@
if cmp -s "$this_file" "$work_bak/$this_file"; then :; else
verbose "xref file `echo $this_file | sed 's|\./||g'` differed ..."
if $debug; then
- diff -u "$work_bak/$this_file" "$this_file"
+ diff -u "$work_bak/$this_file" "$this_file"
fi
return 0
fi
@@ -868,20 +923,30 @@
# Run TeX as "$tex $in_input", taking care of errors and logs.
run_tex ()
{
- case $in_lang:`out_lang_tex` in
- latex:dvi) tex=${LATEX:-latex};;
- latex:pdf) tex=${PDFLATEX:-pdflatex};;
- texinfo:dvi)
- # MetaPost also uses the TEX environment variable. If the user
- # has set TEX=latex for that reason, don't bomb out.
- case $TEX in
- *latex) tex=tex;; # don't bother trying to find etex
- *) tex=$TEX
- esac;;
- texinfo:pdf) tex=$PDFTEX;;
-
- *) error 1 "$0: $out_lang not supported for $in_lang";;
- esac
+ case $in_lang:$latex2html:`out_lang_tex` in
+ latex:*:dvi|latex:tex4ht:html)
+ tex=${LATEX:-latex};;
+ latex:*:pdf)
+ tex=${PDFLATEX:-pdflatex};;
+ texinfo:*:dvi)
+ # MetaPost also uses the TEX environment variable. If the user
+ # has set TEX=latex for that reason, don't bomb out.
+ case $TEX in
+ *latex) tex=tex;; # don't bother trying to find etex
+ *) tex=$TEX
+ esac;;
+ texinfo:*:pdf) tex=$PDFTEX;;
+
+ *) 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.
@@ -891,7 +956,7 @@
sort -u |
while read d
do
- ensure_dir "$work_build/$d"
+ ensure_dir "$work_build/$d"
done
;;
esac
@@ -900,18 +965,18 @@
local cmd="$tex"
# If possible, make TeX report error locations in GNU format.
- if test "${tex_help:+set}" != set; then
- # Go to a temporary directory to try --help, since old versions that
- # don't accept --help will generate a texput.log.
- tex_help_dir=$t2ddir/tex_help
- ensure_dir "$tex_help_dir"
- tex_help=`cd "$tex_help_dir" >&6 && $tex --help &1`
- fi
- if $no_line_error; then :; else
+ if $line_error; then
+ if test "${tex_help:+set}" != set; then
+ # Go to a temporary directory to try --help, since old versions that
+ # don't accept --help will generate a texput.log.
+ tex_help_dir=$t2ddir/tex_help
+ ensure_dir "$tex_help_dir"
+ tex_help=`cd "$tex_help_dir" >&6 && $tex --help &1 || true`
+ fi
# The mk program and perhaps others want to parse TeX's
# original error messages.
- case $line_error:$tex_help in
- true:*file-line-error*) cmd="$cmd --file-line-error";;
+ case $tex_help in
+ *file-line-error*) cmd="$cmd --file-line-error";;
esac
fi
@@ -919,7 +984,7 @@
test -n "$translate_file" && cmd="$cmd --translate-file=$translate_file"
# Tell TeX to make source specials (for backtracking from output to
- # source, given a sufficiently smart editor), if specifed.
+ # source, given a sufficiently smart editor), if specified.
test -n "$src_specials" && cmd="$cmd $src_specials"
# Tell TeX to be batch if requested.
@@ -927,12 +992,27 @@
# \batchmode does not show terminal output at all, so we don't
# want that. And even in batch mode, TeX insists on having input
# from the user. Close its stdin to make it impossible.
- cmd="$cmd &6 2>&1; \
+ && ((grep 'Warning:.*Citation.*undefined' "$in_noext.log" \
+ || grep '.*Undefined citation' "$in_noext.log" \
+ || grep 'No file .*\.bbl\.' "$in_noext.log") \
+ || (grep 'No \.aux file' "$in_noext.log" \
+ && grep '^\\bibdata' "$in_noext.aux")) \
+ >&6 2>&1; \
then
for f in `generated_files_get "$in_noext" bibaux_file_p`
do
@@ -1017,20 +1097,69 @@
# run_index ()
# ------------
-# Run texindex (or makeindex) on current index files. If they already
-# exist, and after running TeX a first time the index files don't
-# change, then there's no reason to run TeX again. But we won't know
-# that if the index files are out of date or nonexistent.
+# Run texindex (or makeindex or texindy) on current index files. If
+# they already exist, and after running TeX a first time the index
+# files don't change, then there's no reason to run TeX again. But we
+# won't know that if the index files are out of date or nonexistent.
run_index ()
{
- case $in_lang in
- latex) texindex=${MAKEINDEX:-makeindex};;
- texinfo) texindex=${TEXINDEX:-texindex};;
+ local index_files=`generated_files_get $in_noext index_file_p`
+ test -n "$index_files" ||
+ return 0
+
+ : ${MAKEINDEX:=makeindex}
+ : ${TEXINDEX:=texindex}
+ : ${TEXINDY:=texindy}
+
+ local index_file
+ local index_noext
+ case $in_lang:$latex2html:`out_lang_tex` in
+ latex:tex4ht:html)
+ for index_file in $index_files
+ do
+ index_noext=`noext "$index_file"`
+ run tex \
+ '\def\filename{{'"$index_noext"'}{idx}{4dx}{ind}}
+ \input idxmake.4ht'
+ run $MAKEINDEX -o $index_noext.ind $index_noext.4dx
+ done
+ ;;
+
+ latex:*)
+ if $TEXINDY --version >&6 2>&1; then
+ run $TEXINDY $index_files
+ else
+ run $MAKEINDEX $index_files
+ fi
+ ;;
+
+ texinfo:*)
+ run $TEXINDEX $index_files
+ ;;
+ esac
+}
+
+
+# run_tex4ht ()
+# -------------
+# Run the last two phases of TeX4HT: tex4ht extracts the HTML from the
+# instrumented DVI file, and t4ht converts the figures and installs
+# the files when given -d.
+#
+# Because knowing exactly which files are created is complex (in
+# addition the names are not simple to compute), which makes it
+# difficult to install the output files in a second step, it is much
+# simpler to install directly the output files.
+run_tex4ht ()
+{
+ case $in_lang:$latex2html:`out_lang_tex` in
+ latex:tex4ht:html)
+ : ${TEX4HT=tex4ht} ${T4HT=t4ht}
+ run "$TEX4HT" "-f/$in_noext"
+ # Do not remove the / after the destdir.
+ run "$T4HT" "-d`destdir`/" "-f/$in_noext"
+ ;;
esac
- index_files=`generated_files_get $in_noext index_file_p`
- if test -n "$texindex" && test -n "$index_files"; then
- run $texindex $index_files
- fi
}
@@ -1049,7 +1178,7 @@
run_tex
else
report "$thumbpdf exited with bad status." \
- "Ignoring its output."
+ "Ignoring its output."
fi
fi
}
@@ -1065,7 +1194,7 @@
for i in "$DVIPDF" dvipdfmx dvipdfm dvipdf dvi2pdf dvitopdf;
do
if findprog $i; then
- dvipdf=$i
+ dvipdf=$i
fi
done
fi
@@ -1074,7 +1203,7 @@
# outputting using the expected file name.
run $dvipdf "$1"
if test ! -f `echo "$1" | sed -e 's/\.dvi$/.pdf/'`; then
- error 1 "$0: cannot find output file"
+ error 1 "cannot find output file"
fi
}
@@ -1093,6 +1222,13 @@
local cycle=0
while :; do
+ # check for probably LaTeX loop (e.g. varioref)
+ if test $cycle -eq "$max_iters"; then
+ error 0 "Maximum of $max_iters cycles exceeded"
+ break
+ fi
+
+ # report progress
cycle=`expr $cycle + 1`
verbose "Cycle $cycle for $command_line_filename"
@@ -1112,15 +1248,19 @@
# and TeX one last time.
run_thumbpdf
+ # If we are using tex4ht, call it.
+ run_tex4ht
+
# Install the result if we didn't already (i.e., if the output is
# dvipdf or ps).
- case $out_lang in
- dvipdf)
+ case $latex2html:$out_lang in
+ *:dvipdf)
run_dvipdf "$in_noext.`out_lang_tex`"
move_to_dest "$in_noext.`out_lang_ext`"
;;
- ps)
- dvips -o "$in_noext.`out_lang_ext`" "$in_noext.`out_lang_tex`"
+ *:ps)
+ : {DVIPS=dvips}
+ $DVIPS -o "$in_noext.`out_lang_ext`" "$in_noext.`out_lang_tex`"
move_to_dest "$in_noext.`out_lang_ext`"
;;
esac
@@ -1135,36 +1275,40 @@
# A sed script that preprocesses Texinfo sources in order to keep the
# iftex sections only. We want to remove non TeX sections, and comment
-# (with `@c texi2dvi') TeX sections so that makeinfo does not try to
+# (with `@c _texi2dvi') TeX sections so that makeinfo does not try to
# parse them. Nevertheless, while commenting TeX sections, don't
# comment @macro/@end macro so that makeinfo does propagate them.
# Unfortunately makeinfo --iftex --no-ifinfo doesn't work well enough
# (yet), makeinfo can't parse the TeX commands, so work around with sed.
#
+# We assume that `@c _texi2dvi' starting a line is not present in the
+# document.
+#
comment_iftex=\
'/^@tex/,/^@end tex/{
- s/^/@c texi2dvi/
+ s/^/@c _texi2dvi/
}
/^@iftex/,/^@end iftex/{
- s/^/@c texi2dvi/
- /^@c texi2dvi@macro/,/^@c texi2dvi@end macro/{
- s/^@c texi2dvi//
+ s/^/@c _texi2dvi/
+ /^@c _texi2dvi@macro/,/^@c _texi2dvi@end macro/{
+ s/^@c _texi2dvi//
}
}
/^@ifnottex/,/^@end ifnottex/{
- s/^/@c (texi2dvi)/
+ s/^/@c (_texi2dvi)/
}
/^@ifinfo/,/^@end ifinfo/{
/^@node/p
/^@menu/,/^@end menu/p
t
- s/^/@c (texi2dvi)/
+ s/^/@c (_texi2dvi)/
}
-s/^@ifnotinfo/@c texi2dvi@ifnotinfo/
-s/^@end ifnotinfo/@c texi2dvi@end ifnotinfo/'
+s/^@ifnotinfo/@c _texi2dvi@ifnotinfo/
+s/^@end ifnotinfo/@c _texi2dvi@end ifnotinfo/'
-# Uncommenting is simple: Remove any leading `@c texi2dvi'.
-uncomment_iftex='s/^@c texi2dvi//'
+# Uncommenting is simpler: remove any leading `@c texi2dvi'; repeated
+# copies can sneak in via macro invocations.
+uncomment_iftex='s/^@c _texi2dvi\(@c _texi2dvi\)*//'
# run_makeinfo ()
@@ -1180,7 +1324,7 @@
# Unless required by the user, makeinfo expansion is wanted only
# if texinfo.tex is too old.
- if test "$expand" = t; then
+ if $expand; then
makeinfo=${MAKEINFO:-makeinfo}
else
# Check if texinfo.tex performs macro expansion by looking for
@@ -1210,9 +1354,9 @@
else
makeinfo=${MAKEINFO:-makeinfo}
fi
- # As long as we had to run TeX, offer the user this convenience:
+ # If TeX is preloaded, offer the user this convenience:
if test "$txiformat" = Texinfo; then
- escape=@
+ escape=@
fi
fi
@@ -1231,7 +1375,7 @@
# happens with gettext 0.14.5, at least.
sed "$comment_iftex" "$command_line_filename" \
| eval $makeinfo --footnote-style=end -I "$in_dir" $miincludes \
- -o /dev/null --macro-expand=- \
+ -o /dev/null --macro-expand=- \
| sed "$uncomment_iftex" >"$in_src"
# Continue only if everything succeeded.
if test $? -ne 0 \
@@ -1248,23 +1392,36 @@
# Used most commonly for @finalout, @smallbook, etc.
insert_commands ()
{
- local textra_cmd
- case $in_lang in
- latex) textra_cmd=1i;;
- texinfo) textra_cmd='/^@setfilename/a';;
- *) error 1 "internal error, unknown language: $in_lang";;
- esac
-
if test -n "$textra"; then
# _xtr. The file with the user's extra commands.
work_xtr=$workdir/xtr
in_xtr=$work_xtr/$in_base
ensure_dir "$work_xtr"
verbose "Inserting extra commands: $textra"
+ local textra_cmd
+ case $in_lang in
+ latex) textra_cmd=1i;;
+ texinfo) textra_cmd='/^@setfilename/a';;
+ *) error 1 "internal error, unknown language: $in_lang";;
+ esac
sed "$textra_cmd\\
$textra" "$in_input" >"$in_xtr"
in_input=$in_xtr
fi
+
+ case $in_lang:$latex2html:`out_lang_tex` in
+ latex:tex4ht:html)
+ # _tex4ht. The file with the added \usepackage{tex4ht}.
+ work_tex4ht=$workdir/tex4ht
+ in_tex4ht=$work_tex4ht/$in_base
+ ensure_dir "$work_tex4ht"
+ verbose "Inserting \\usepackage{tex4ht}"
+ perl -pe 's<\\documentclass(?:\[.*\])?{.*}>
+ <$&\\usepackage[xhtml]{tex4ht}>' \
+ "$in_input" >"$in_tex4ht"
+ in_input=$in_tex4ht
+ ;;
+ esac
}
# run_recode ()
@@ -1278,18 +1435,18 @@
if test $in_lang = texinfo; then
pgm='s/^ *@documentencoding *\([^ ][^ ]*\) *$/\1/
- t found
- d
- :found
- q'
+ t found
+ d
+ :found
+ q'
encoding=`sed -e "$pgm" "$in_input"`
if $recode && test -n "$encoding" && findprog recode; then
if test -n "$recode_from"; then
- from=$recode_from
- to=$encoding
+ from=$recode_from
+ to=$encoding
else
- from=$encoding
- to=$texinfo
+ from=$encoding
+ to=$texinfo
fi
verbose "Recoding from $from to $to."
# _rcd. The Texinfo file recoded in 7bit.
@@ -1297,10 +1454,10 @@
in_rcd=$work_rcd/$in_base
ensure_dir "$work_rcd"
if recode "$encoding..$to" <"$in_input" >"$in_rcd" \
- && test -s "$in_rcd"; then
- in_input=$in_rcd
+ && test -s "$in_rcd"; then
+ in_input=$in_rcd
else
- verbose "Recoding failed, using original input."
+ verbose "Recoding failed, using original input."
fi
fi
fi
@@ -1371,7 +1528,7 @@
case $1 in
html|text) move_to_dest "$out_base";;
info) # There can be foo.info-1, foo.info-2 etc.
- move_to_dest "$out_base"*;;
+ move_to_dest "$out_base"*;;
esac
else
error 1 "$hevea exited with bad status, quitting."
@@ -1384,13 +1541,13 @@
# Run the TeX (or HeVeA).
run_core_conversion ()
{
- case $in_lang:`out_lang_tex` in
- *:dvi|*:pdf)
- run_tex;;
- latex:html|latex:text|latex:info)
- run_hevea $out_lang;;
+ case $in_lang:$latex2html:`out_lang_tex` in
+ *:dvi|*:pdf|latex:tex4ht:html)
+ run_tex;;
+ latex:*:html|latex:*:text|latex:*:info)
+ run_hevea $out_lang;;
*)
- error 1 "invalid input/output combination: $in_lang/$out_lang";;
+ error 1 "invalid input/output combination: $in_lang/$out_lang";;
esac
}
@@ -1407,9 +1564,14 @@
# `.' goes first to ensure that any old .aux, .cps,
# etc. files in ${directory} don't get used in preference to fresher
# files in `.'. Include orig_pwd in case we are in clean build mode, where
- # we've cd'd to a temp directory.
+ # we have cd'd to a temp directory.
+ common="$orig_pwd$path_sep$in_dir$path_sep"
+ #
+ # If we have any includes, put those at the end.
+ # Keep a final path_sep to get the default (system) TeX directories included.
txincludes=`list_infix includes $path_sep`
- common="$orig_pwd$path_sep$in_dir$path_sep$txincludes$path_sep"
+ test -n "$txincludes" && common="$common$txincludes$path_sep"
+ #
for var in $tex_envvars; do
eval val="\$common\$${var}_orig"
# Convert relative paths to absolute paths, so we can run in another
@@ -1505,38 +1667,41 @@
;;
esac
- # This recognizes --quark as --quiet. So what.
+ # This recognizes --quark as --quiet. Oh well.
case "$1" in
-@ ) escape=@;;
+ -~ ) catcode_special=false;;
# Silently and without documentation accept -b and --b[atch] as synonyms.
-b | --batch) batch=true;;
- --build) shift; build_mode=$1;;
- --build-dir) shift; build_dir=$1; build_mode=tidy;;
+ --build) shift; build_mode=$1;;
+ --build-dir) shift; build_dir=$1; build_mode=tidy;;
-c | --clean) build_mode=clean;;
-D | --debug) debug=true;;
- --dvi) out_lang=dvi;;
- --dvipdf) out_lang=dvipdf;;
- -e | -E | --expand) expand=t;;
+ -e | -E | --expand) expand=true;;
-h | --help) usage;;
- --html) out_lang=html;;
-I) shift; list_concat_dirs includes "$1";;
- --info) out_lang=info;;
-l | --lang | --language) shift; set_language=$1;;
--mostly-clean) action=mostly-clean;;
- --no-line-error) no_line_error=true;;
+ --no-line-error) line_error=false;;
+ --max-iterations) shift; max_iters=$1;;
-o | --out | --output)
shift
# Make it absolute, just in case we also have --clean, or whatever.
oname=`absolute "$1"`;;
- -p | --pdf) out_lang=pdf;;
- --ps) out_lang=ps;;
+
+ # Output formats.
+ -O|--output-format) shift; out_lang_set "$1";;
+ --dvi|--dvipdf|--html|--info|--pdf|--ps|--text)
+ out_lang_set `echo "x$1" | sed 's/^x--//'`;;
+
+ -p) out_lang_set pdf;;
-q | -s | --quiet | --silent) quiet=true; batch=true;;
-r | --recode) recode=true;;
--recode-from) shift; recode=true; recode_from="$1";;
--src-specials) src_specials=--src-specials;;
+ --tex4ht) latex2html=tex4ht;;
-t | --texinfo | --command ) shift; textra="$textra\\
"`echo "$1" | sed 's/\\\\/\\\\\\\\/g'`;;
- --text) out_lang=text;;
--translate-file ) shift; translate_file="$1";;
--tidy) build_mode=tidy;;
-v | --vers*) version;;
@@ -1544,13 +1709,13 @@
--) # What remains are not options.
shift
while test x"$1" != x"$arg_sep"; do
- set dummy ${1+"$@"} "$1"; shift
- shift
+ set dummy ${1+"$@"} "$1"; shift
+ shift
done
break;;
-*)
error 1 "Unknown or ambiguous option \`$1'." \
- "Try \`--help' for more information."
+ "Try \`--help' for more information."
;;
*) set dummy ${1+"$@"} "$1"; shift;;
esac
@@ -1677,13 +1842,13 @@
# Let AUC-TeX error parser deal with line numbers.
line_error=false
command_line_filename=`\
- expr X"$command_line_filename" : X'.*input{\([^}]*\)}'`
+ expr X"$command_line_filename" : X'.*input{\([^}]*\)}'`
;;
esac
# If the COMMAND_LINE_FILENAME is not absolute (e.g., --debug.tex),
# prepend `./' in order to avoid that the tools take it as an option.
- echo "$command_line_filename" | $EGREP '^(/|[A-z]:/)' >&6 \
+ echo "$command_line_filename" | $EGREP '^(/|[A-Za-z]:/)' >&6 \
|| command_line_filename="./$command_line_filename"
# See if the file exists. If it doesn't we're in trouble since, even
@@ -1704,7 +1869,7 @@
# Strip directory part but leave extension.
in_base=`basename "$command_line_filename"`
# Strip extension.
- in_noext=`echo "$in_base" | sed 's/\.[^.]*$//'`
+ in_noext=`noext "$in_base"`
# The normalized file name to compile. Must always point to the
# file to actually compile (in case of recoding, macro-expansion etc.).
@@ -1720,7 +1885,7 @@
out_dir=`func_dirname "$out_name"`
out_dir_abs=`absolute "$out_dir"`
out_base=`basename "$out_name"`
- out_noext=`echo "$out_base" | sed 's/\.[^.]*$//'`
+ out_noext=`noext "$out_base"`
}
@@ -1742,11 +1907,13 @@
case $build_dir in
'' | . ) t2ddir=$out_noext.t2d ;;
*) # Avoid collisions between multiple occurrences of the same
- # file. The sed expression is fragile if the cwd has
- # active characters.
- t2ddir=$build_dir/`echo "$out_dir_abs/$out_noext.t2d" |
- sed "s,^$orig_pwd/,," |
- sed 's,/,!,g'`
+ # file, so depend on the output path. Remove leading `./',
+ # at least to avoid creating a file starting with `.!', i.e.,
+ # an invisible file. The sed expression is fragile if the cwd
+ # has active characters. Transform / into ! so that we don't
+ # need `mkdir -p'. It might be something to reconsider.
+ t2ddir=$build_dir/`echo "$out_dir_abs/$out_noext.t2d" |
+ sed "s,^$orig_pwd/,,;s,^\./,,;s,/,!,g"`
esac
# Remove it at exit if clean mode.
trap "cleanup" 0 1 2 15