Revert the index stuff to work better with LaTeX2HTML.

diff --git a/Doc/api.tex b/Doc/api.tex
index 7d998485fbde64a9171062cc1ea7a6ebf27c4f67..fdc19b0bb905bffb893cc2278a7001063da6ca5f 100644 (file)
--- a/Doc/api.tex
+++ b/Doc/api.tex
@@ -2906,6 +2906,6 @@ Py_None, _Py_NoneStruct
 XXX Explain Py_DEBUG, Py_TRACE_REFS, Py_REF_DEBUG.
 
 
-\inputindex{api.ind}                   % Index -- must be last
+\input{api.ind}                        % Index -- must be last
 
 \end{document}

diff --git a/Doc/api/api.tex b/Doc/api/api.tex
index 7d998485fbde64a9171062cc1ea7a6ebf27c4f67..fdc19b0bb905bffb893cc2278a7001063da6ca5f 100644 (file)
--- a/Doc/api/api.tex
+++ b/Doc/api/api.tex
@@ -2906,6 +2906,6 @@ Py_None, _Py_NoneStruct
 XXX Explain Py_DEBUG, Py_TRACE_REFS, Py_REF_DEBUG.
 
 
-\inputindex{api.ind}                   % Index -- must be last
+\input{api.ind}                        % Index -- must be last
 
 \end{document}

diff --git a/Doc/ext.tex b/Doc/ext.tex
index d2d11ad93f9d259bc5fd7bf6cab9c7a4d8043224..0532212e89c3e3bb16f3badecb9fb7e09ae548b3 100644 (file)
--- a/Doc/ext.tex
+++ b/Doc/ext.tex
@@ -1489,6 +1489,6 @@ whitespace-separated absolute pathnames of libraries (\samp{.a}
 files).  No \samp{-l} options can be used.
 
 
-\inputindex{ext.ind}
+\input{ext.ind}
 
 \end{document}

diff --git a/Doc/ext/ext.tex b/Doc/ext/ext.tex
index d2d11ad93f9d259bc5fd7bf6cab9c7a4d8043224..0532212e89c3e3bb16f3badecb9fb7e09ae548b3 100644 (file)
--- a/Doc/ext/ext.tex
+++ b/Doc/ext/ext.tex
@@ -1489,6 +1489,6 @@ whitespace-separated absolute pathnames of libraries (\samp{.a}
 files).  No \samp{-l} options can be used.
 
 
-\inputindex{ext.ind}
+\input{ext.ind}
 
 \end{document}

diff --git a/Doc/lib.tex b/Doc/lib.tex
index ca587ce335512cb77fde90dce1fd3067e62c224c..1ac59927edddf90b57364c60c86d437b028cf28f 100644 (file)
--- a/Doc/lib.tex
+++ b/Doc/lib.tex
@@ -223,12 +223,20 @@ add new extensions to Python and how to embed it in other applications.
 
 \input{libundoc}
 
+%
+%  The ugly "%begin{latexonly}" pseudo-environments are really just to
+%  keep LaTeX2HTML quiet during the \renewcommand{} macros; they're
+%  not really valuable.
+%
+
+%begin{latexonly}
 \renewcommand{\indexname}{Module Index}
-\renewcommand{\indexlabel}{modindex}
-\inputindex{modlib.ind}                % Module Index
+%end{latexonly}
+\input{modlib.ind}             % Module Index
 
+%begin{latexonly}
 \renewcommand{\indexname}{Index}
-\renewcommand{\indexlabel}{genindex}
-\inputindex{lib.ind}                   % Index
+%end{latexonly}
+\input{lib.ind}                        % Index
 
 \end{document}

diff --git a/Doc/lib/lib.tex b/Doc/lib/lib.tex
index ca587ce335512cb77fde90dce1fd3067e62c224c..1ac59927edddf90b57364c60c86d437b028cf28f 100644 (file)
--- a/Doc/lib/lib.tex
+++ b/Doc/lib/lib.tex
@@ -223,12 +223,20 @@ add new extensions to Python and how to embed it in other applications.
 
 \input{libundoc}
 
+%
+%  The ugly "%begin{latexonly}" pseudo-environments are really just to
+%  keep LaTeX2HTML quiet during the \renewcommand{} macros; they're
+%  not really valuable.
+%
+
+%begin{latexonly}
 \renewcommand{\indexname}{Module Index}
-\renewcommand{\indexlabel}{modindex}
-\inputindex{modlib.ind}                % Module Index
+%end{latexonly}
+\input{modlib.ind}             % Module Index
 
+%begin{latexonly}
 \renewcommand{\indexname}{Index}
-\renewcommand{\indexlabel}{genindex}
-\inputindex{lib.ind}                   % Index
+%end{latexonly}
+\input{lib.ind}                        % Index
 
 \end{document}