Reverting some the index stuff to use tools/newind.py again; this works

better with LaTeX2HTML.

Run pdflatex twice to generate the PDF files, even though LaTeX has already
been run a couple of times.  This ensures that font metrics for the final
run match those for the first run, and seesm to get (somewhat) better
outline results.

diff --git a/Doc/Makefile b/Doc/Makefile
index dabeb11911895defbd48576bb81dbb6ca8af54c1..cfc6ad2f150ff8212c9c873654ffbfd7b812cb36 100644 (file)
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -125,6 +125,7 @@ tut-all:  tut.dvi tut.pdf tut.ps l2htut
 # only free software.
 #
 .dvi.pdf: $*.bkm
+       $(PDFLATEX) $*
        $(PYTHON) tools/toc2bkm.py $*
        $(PDFLATEX) $*
 
@@ -169,7 +170,8 @@ LIBFILES = lib.tex \
 
 # Library document
 lib.dvi: tools/indfix.py $(LIBFILES)
-       rm -f $*.ind mod$*.ind
+       tools/newind.py >$*.ind
+       tools/newind.py modindex >mod$*.ind
        $(LATEX) $*
        $(MAKEINDEX) mod$*.idx
        tools/fix_hack $*.idx
@@ -185,7 +187,7 @@ tut.dvi: tut.tex
 # Extending & Embedding, Python/C API documents.
 # Done this way to avoid repeated command sets.
 .tex.dvi:
-       rm -f $*.ind
+       tools/newind.py >$*.ind
        $(LATEX) $*
        tools/fix_hack $*.idx
        $(MAKEINDEX) $*.idx