summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>1998-03-17 06:23:13 (GMT)
committerFred Drake <fdrake@acm.org>1998-03-17 06:23:13 (GMT)
commitf3aa0e0627bbabeb028044de6efffb614bbf4c06 (patch)
tree21bf1904c838439918d616e1b6b3db228a264739
parent396a7cfb9404e4d38fe285b5f2c7432e6ec6f47b (diff)
downloadcpython-f3aa0e0627bbabeb028044de6efffb614bbf4c06.zip
cpython-f3aa0e0627bbabeb028044de6efffb614bbf4c06.tar.gz
cpython-f3aa0e0627bbabeb028044de6efffb614bbf4c06.tar.bz2
Revert the index stuff to work better with LaTeX2HTML.
-rw-r--r--Doc/api.tex2
-rw-r--r--Doc/api/api.tex2
-rw-r--r--Doc/ext.tex2
-rw-r--r--Doc/ext/ext.tex2
-rw-r--r--Doc/lib.tex16
-rw-r--r--Doc/lib/lib.tex16
6 files changed, 28 insertions, 12 deletions
diff --git a/Doc/api.tex b/Doc/api.tex
index 7d99848..fdc19b0 100644
--- 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 7d99848..fdc19b0 100644
--- 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 d2d11ad..0532212 100644
--- 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 d2d11ad..0532212 100644
--- 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 ca587ce..1ac5992 100644
--- 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 ca587ce..1ac5992 100644
--- 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}