diff options
author | Karl Berry <karl@freefriends.org> | 2012-07-14 16:22:32 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-07-14 16:22:32 +0000 |
commit | 8ff57bdca1f2f31861913ebc22961fdb89240cbd (patch) | |
tree | 16bce8182f2d5b16a36d589de033fd2ea5f7e8e2 /Master/texmf-dist/tex | |
parent | 7580e0584873d1ed5ed97c98b87e3aa32753ea46 (diff) |
computational-complexity 2.24 (18jun12)
git-svn-id: svn://tug.org/texlive/trunk@27047 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
4 files changed, 25 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc.cls b/Master/texmf-dist/tex/latex/computational-complexity/cc.cls index 869f236810a..32627eb8c7c 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc.cls +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc.cls @@ -38,7 +38,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} diff --git a/Master/texmf-dist/tex/latex/computational-complexity/ccalgo.sty b/Master/texmf-dist/tex/latex/computational-complexity/ccalgo.sty index caf4578dad1..17d739808eb 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/ccalgo.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/ccalgo.sty @@ -427,12 +427,13 @@ \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? @@ -440,11 +441,13 @@ \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} @@ -472,6 +475,7 @@ \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} % diff --git a/Master/texmf-dist/tex/latex/computational-complexity/ccthm.sty b/Master/texmf-dist/tex/latex/computational-complexity/ccthm.sty index 927aaf1fe99..3138eb30e1a 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/ccthm.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/ccthm.sty @@ -92,8 +92,15 @@ \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 @@ -169,18 +176,21 @@ {\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] diff --git a/Master/texmf-dist/tex/latex/computational-complexity/thcc.sty b/Master/texmf-dist/tex/latex/computational-complexity/thcc.sty index d8d68d502ef..7b18b8a21e2 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/thcc.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/thcc.sty @@ -65,16 +65,16 @@ \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 |