* build-aux/tex.mk (TEXI2HTML): Add --tex4ht. * bootstrap (tempdir): Check for TeX4HT, dvipng and convert (from ImageMagick). --- ChangeLog | 8 ++++++++ bootstrap | 22 ++++++++++++++++++++-- build-aux/tex.mk | 2 +- 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 36bc676..567cd69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2010-03-15 Roland Levillain <roland@lrde.epita.fr> + Have texi2dvi use TeX4ht instead of HeVeA to produce HTML outputs. + + * build-aux/tex.mk (TEXI2HTML): Add --tex4ht. + * bootstrap (tempdir): Check for TeX4ht, dvipng and convert (from + ImageMagick). + +2010-03-15 Roland Levillain <roland@lrde.epita.fr> + Support HTML outputs in tex.mk. * build-aux/tex.mk (SUFFIXES): Add .html. diff --git a/bootstrap b/bootstrap index 2bdd761..18a65b1 100755 --- a/bootstrap +++ b/bootstrap @@ -129,8 +129,26 @@ export LIBTOOLIZE=$libtoolize require $libtoolize 1.5.22 require doxygen 1.5.6 -# FIXME: These should no longer be required when TeX4HT is used. -require hevea 1.10 -version +require convert 6.3.7 + +# Check for TeX4ht. htlatex and friends do not have options like +# `--version', `-version', `-v', etc. Hence this ad hoc procedure. +tempdir=`mktemp -d` +cleanup() { rm -rf "$tempdir"; exit; } +trap cleanup 0 1 2 3 6 15 +( + cd "$tempdir" + cat >test.tex <<EOF + \documentclass{article} + \begin{document} + Test + \end{document} +EOF + htlatex >/dev/null 2>&1 test.tex || fatal "TeX4ht is required" +) +rm -rf "$tempdir" +# dvipnh is required by TeX4ht. +require dvipng 1.11 # Tell what's going on. set -x diff --git a/build-aux/tex.mk b/build-aux/tex.mk index 493a687..79b4644 100644 --- a/build-aux/tex.mk +++ b/build-aux/tex.mk @@ -27,7 +27,7 @@ TEXI2DVI_FLAGS = --tidy --build-dir=tmp.t2d --batch TEXI2PDF = $(TEXI2DVI) --pdf TEXI2PDF_FLAGS = $(TEXI2DVI_FLAGS) -TEXI2HTML = $(TEXI2DVI) --html +TEXI2HTML = $(TEXI2DVI) --html --tex4ht TEXI2HTML_FLAGS = $(TEXI2DVI_FLAGS) SUFFIXES = .tex .pdf .html -- 1.5.6.5