further fixes to sphinx.sty per progress on the sphinx trunk

diff --git a/doc/build/texinputs/sphinx.sty b/doc/build/texinputs/sphinx.sty
index 219a4003408f970e0771acdd92c1854eda028328..e44bf714a575a7cb3b67ea166aced26572a2ebcb 100644 (file)
--- a/doc/build/texinputs/sphinx.sty
+++ b/doc/build/texinputs/sphinx.sty
@@ -441,13 +441,7 @@
 % class method ----------------------------------------------------------
 % \begin{classmethoddesc}[classname]{methodname}{args}
 \newcommand{\classmethodline}[3][\@undefined]{
-  \classmethodlineni{#2}{#3}
-  \ifx\@undefined#1\relax
-    \index{#2@{\py@idxcode{#2()}} (\py@thisclass\ class method)}
-  \else
-    \index{#2@{\py@idxcode{#2()}} (#1 class method)}
-  \fi
-}
+\py@sigline{class \bfcode{#2}}{#3}}
 \newenvironment{classmethoddesc}[3][\@undefined]{
   \begin{fulllineitems}
     \ifx\@undefined#1\relax
@@ -458,15 +452,6 @@
     \fi
 }{\end{fulllineitems}}
 
-% similar to {classmethoddesc}, but doesn't add to the index
-% (never actually uses the optional argument)
-\newcommand{\classmethodlineni}[3][\py@classbadkey]{%
-  \py@sigline{class \bfcode{#2}}{#3}}
-\newenvironment{classmethoddescni}[3][\py@classbadkey]{
-  \begin{fulllineitems}
-    \classmethodlineni{#2}{#3}
-}{\end{fulllineitems}}
-
 
 % object data attribute --------------------------------------------------
 % \begin{memberdesc}[classname]{membername}