computational-complexity 2.24 (18jun12)

git-svn-id: svn://tug.org/texlive/trunk@27047 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 25 insertions, 11 deletions

diff --git a/Master/texmf-dist/doc/latex/computational-complexity/cc-cls-inline.tex b/Master/texmf-dist/doc/latex/computational-complexity/cc-cls-inline.tex
index d465949e58c..18527d03224 100644
--- a/Master/texmf-dist/doc/latex/computational-complexity/cc-cls-inline.tex
+++ b/Master/texmf-dist/doc/latex/computational-complexity/cc-cls-inline.tex
@@ -39,7 +39,7 @@
 \ifclass\expandafter\ProvidesClass\else\expandafter\ProvidesPackage\fi
 {\ifclass cc\else cc-cls\fi}
 [% CC MAIN DATE AND VERSION ON NEXT LINE
-2012/05/07 v2.23
+2012/06/21 v2.25
 computational complexity
 \ifclass document class\else package\fi]
 \RequirePackage{ccaux}
@@ -1505,12 +1505,13 @@ computational complexity
 \newtheorem{named@lg@r@thm*}{\the\algotitle}
 \defprefix{named@lg@r@thm*}#1{\the\algotitle}
 \theoremstyle{ccalgo}
-\newtheorem{named@lg@r@thm}{\the\algotitle}
+\providecommand{\cc@thmcnter}{equation}
+\newtheorem{named@lg@r@thm}[\cc@thmcnter]{\the\algotitle}
 \defprefix{named@lg@r@thm}#1{\the\algotitle~#1}
-\ifx\c@namedth@@r@m\@undefined\else
-\let\c@named@lg@r@thm\c@namedth@@r@m
-\let\thenamed@lg@r@thm\thenamedth@@r@m
-\fi
+%%% \ifx\c@namedth@@r@m\@undefined\else
+%%% \let\c@named@lg@r@thm\c@namedth@@r@m
+%%% \let\thenamed@lg@r@thm\thenamedth@@r@m
+%%% \fi
 \babel\def\babelInput{Input}[german=Eingabe,french=Entr\'ee]
 \babel\def\babelOutput{Output}[german=Ausgabe,french=Sortie]
 \babel\def\babelstep{step}[german=Schritt,french=pas]%% ??? pas?
@@ -1518,11 +1519,13 @@ computational complexity
 \newtoks\algorithmmasterkey
 \newenvironment{namedalgorithm}[1]{%
   \pagebreak[3]%
+  \defprefix{\cc@thmcnter}##1{\the\algotitle~##1}%
   \def\algo@theorem{named@lg@r@thm}%
   \algotitle{#1}%
   \n@medalgorithm}
 {\endalgonumerate\csname end\algo@theorem\endcsname}
 \newenvironment{namedalgorithm*}[1]{%
+  \defprefix{\cc@thmcnter}##1{\the\algotitle}%
   \def\algo@theorem{named@lg@r@thm*}%
   \algotitle{#1}%
   \n@medalgorithm}
@@ -1550,6 +1553,7 @@ computational complexity
   \ifx\@tempa\@empty\csname\algo@theorem\endcsname
   \else\csname\algo@theorem\endcsname[#1]\fi%
   \label{\the\algorithmmasterkey}%
+  \defprefix{equation}##1{(##1)}% reset equation prefix
   \algo@keywords
   \defprefix{algonumerate}{%
     \Iflabelchanged{\algo@theorem}{\uselabel{\algo@theorem} %
@@ -3605,8 +3609,15 @@ computational complexity
   \defprefix{enumiv}##1{(\theenumi.\theenumii.\theenumiii##1)}
   }
 \fi
+\def\reset@prefixrefstepcounter#1{%
+  \let\refstepcounter\cc@normal@refstepcounter% Put refstepcounter back to normal
+  \refstepcounter{#1}% do normal operation
+  \defprefix{equation}##1{(##1)}% reset equation prefix
+}
 \def\theorempreamblenn\@thm#1#2{%
   \defprefix{#1}##1{#2}%
+  \let\cc@normal@refstepcounter\refstepcounter
+  \let\refstepcounter\reset@prefixrefstepcounter
   \EnumerationInTheorems{#1}%
   \pagebreak[3]\relax
   \the\everytheorem
@@ -3682,18 +3693,21 @@ computational complexity
 {\qed\csname endnamedtheorem*\endcsname}
 \def\theorempreamble\@thm#1#2{%
   \defprefix{#1}##1{#2~##1}%
+  \let\cc@normal@refstepcounter\refstepcounter
+  \let\refstepcounter\reset@prefixrefstepcounter
   \EnumerationInTheorems{#1}%
   \pagebreak[3]\relax
   \the\everytheorem
   \@thm{#1}{#2}}
 \theorem@bodyfont{\theorempreamble}
 \theoremstyle{cc}
-\newtheorem{namedth@@r@m}{\the\theoremtitle}
 \if@ccnosepeqncnt
 %%% \let\c@namedth@@r@m\c@equation
 %%% \def\thenamedth@@r@m{\theequation}
 \def\cc@thmcnter{equation}
+\newtheorem{namedth@@r@m}[\cc@thmcnter]{\the\theoremtitle}
 \else
+\newtheorem{namedth@@r@m}{\the\theoremtitle}
 \def\cc@thmcnter{namedth@@r@m}
 \fi
 \newenvironment{namedtheorem}[1]
@@ -4653,16 +4667,16 @@ Submit
   \def\@begintheorem##1##2{\item
     [\hskip\labelsep \theorem@headerfont ##1\ ##2.]}%
   \def\@opargbegintheorem##1##2##3{\item
-    [\hskip\labelsep \theorem@headerfont ##1\ ##2\ %
-    \normalfont({\activate@shortcite{}##3}).]}%
+    [\hskip\labelsep \theorem@headerfont ##1\ ##2]%
+    {\normalfont({\activate@shortcite{}##3}).}}%
   }
 \def\th@ccnn{%
   \normalfont\slshape
   \def\@begintheorem##1##2{\item
     [\hskip\labelsep \theorem@headerfont ##1.]}%
   \def\@opargbegintheorem##1##2##3{\item
-    [\hskip\labelsep \theorem@headerfont ##1\ %
-    \normalfont({\activate@shortcite{}##3}).]}%
+    [\hskip\labelsep \theorem@headerfont ##1]%
+    {\normalfont({\activate@shortcite{}##3}).}}%
   }
 \def\th@ccproof{%
   \normalfont\upshape
diff --git a/Master/texmf-dist/doc/latex/computational-complexity/cc.pdf b/Master/texmf-dist/doc/latex/computational-complexity/cc.pdf
index f20fd75156a..a27144f7188 100644
--- a/Master/texmf-dist/doc/latex/computational-complexity/cc.pdf
+++ b/Master/texmf-dist/doc/latex/computational-complexity/cc.pdf