From 7cf631ce211034fe381c5f491e813af3543b3fa7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 23 May 2012 23:30:26 +0000 Subject: computational-complexity 2.23 (23may12) git-svn-id: svn://tug.org/texlive/trunk@26607 c570f23f-e606-0410-a88d-b1316a301751 --- .../computational-complexity/cc-cls-inline.tex | 60 +++++++++--------- .../doc/latex/computational-complexity/cc.pdf | Bin 790287 -> 789692 bytes .../source/latex/computational-complexity/cc.dtx | 68 ++++++++++++--------- .../tex/latex/computational-complexity/cc.cls | 2 +- .../latex/computational-complexity/cclayout.sty | 1 + .../tex/latex/computational-complexity/ccthm.sty | 57 +++++++++-------- 6 files changed, 104 insertions(+), 84 deletions(-) (limited to 'Master') 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 2a0f0d4ff12..d465949e58c 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.22 +2012/05/07 v2.23 computational complexity \ifclass document class\else package\fi] \RequirePackage{ccaux} @@ -2430,6 +2430,7 @@ computational complexity linkcolor=\ifKV@ccsps@xlink blue\else black\fi, unicode]{hyperref}[2011/04/17 v6.82g]% \AtBeginDocument{\init@bare} + \RequirePackage{breakcites}% \RequirePackage{breakurl}[2009/01/24 v1.30]% \def\l@title##1{\@dottedtocline{-1}{0pt}{0pt}{{\large\textbf{##1}}}}% \let\l@title\l@part @@ -3689,38 +3690,41 @@ computational complexity \theoremstyle{cc} \newtheorem{namedth@@r@m}{\the\theoremtitle} \if@ccnosepeqncnt -\let\c@namedth@@r@m\c@equation -\def\thenamedth@@r@m{\theequation} +%%% \let\c@namedth@@r@m\c@equation +%%% \def\thenamedth@@r@m{\theequation} +\def\cc@thmcnter{equation} +\else +\def\cc@thmcnter{namedth@@r@m} \fi \newenvironment{namedtheorem}[1] {\theoremtitle{#1}\namedth@@r@m} {\endnamedth@@r@m} \if@standardtheorems -\newtheorem{answer}[namedth@@r@m]{\Answer} -\newtheorem{assumption}[namedth@@r@m]{\Assumption} -\newtheorem{claim}[namedth@@r@m]{\Claim} -\newtheorem{conjecture}[namedth@@r@m]{\Conjecture} -\newtheorem{convention}[namedth@@r@m]{\Convention} -\newtheorem{corollary}[namedth@@r@m]{\Corollary} -\newtheorem{counterexample}[namedth@@r@m]{\Counterexample} -\newtheorem{definition}[namedth@@r@m]{\Definition} -\newtheorem{exercise}[namedth@@r@m]{\Exercise} -\newtheorem{fact}[namedth@@r@m]{\Fact} -\newtheorem{hypothesis}[namedth@@r@m]{\Hypothesis} -\newtheorem{lemma}[namedth@@r@m]{\Lemma} -\newtheorem{notation}[namedth@@r@m]{\Notation} -\newtheorem{note}[namedth@@r@m]{\Note} -\newtheorem{observation}[namedth@@r@m]{\Observation} -\newtheorem{open}[namedth@@r@m]{\OpenQuestion} -\newtheorem{openquestion}[namedth@@r@m]{\OpenQuestion} -\newtheorem{problem}[namedth@@r@m]{\Problem} -\newtheorem{proposition}[namedth@@r@m]{\Proposition} -\newtheorem{question}[namedth@@r@m]{\Question} -\newtheorem{remark}[namedth@@r@m]{\Remark} -\newtheorem{result}[namedth@@r@m]{\Result} -\newtheorem{theorem}[namedth@@r@m]{\Theorem} -\newtheorem{thesis}[namedth@@r@m]{\Thesis} -\newtheorem{warning}[namedth@@r@m]{\Warning} +\newtheorem{answer}[\cc@thmcnter]{\Answer} +\newtheorem{assumption}[\cc@thmcnter]{\Assumption} +\newtheorem{claim}[\cc@thmcnter]{\Claim} +\newtheorem{conjecture}[\cc@thmcnter]{\Conjecture} +\newtheorem{convention}[\cc@thmcnter]{\Convention} +\newtheorem{corollary}[\cc@thmcnter]{\Corollary} +\newtheorem{counterexample}[\cc@thmcnter]{\Counterexample} +\newtheorem{definition}[\cc@thmcnter]{\Definition} +\newtheorem{exercise}[\cc@thmcnter]{\Exercise} +\newtheorem{fact}[\cc@thmcnter]{\Fact} +\newtheorem{hypothesis}[\cc@thmcnter]{\Hypothesis} +\newtheorem{lemma}[\cc@thmcnter]{\Lemma} +\newtheorem{notation}[\cc@thmcnter]{\Notation} +\newtheorem{note}[\cc@thmcnter]{\Note} +\newtheorem{observation}[\cc@thmcnter]{\Observation} +\newtheorem{open}[\cc@thmcnter]{\OpenQuestion} +\newtheorem{openquestion}[\cc@thmcnter]{\OpenQuestion} +\newtheorem{problem}[\cc@thmcnter]{\Problem} +\newtheorem{proposition}[\cc@thmcnter]{\Proposition} +\newtheorem{question}[\cc@thmcnter]{\Question} +\newtheorem{remark}[\cc@thmcnter]{\Remark} +\newtheorem{result}[\cc@thmcnter]{\Result} +\newtheorem{theorem}[\cc@thmcnter]{\Theorem} +\newtheorem{thesis}[\cc@thmcnter]{\Thesis} +\newtheorem{warning}[\cc@thmcnter]{\Warning} \newenvironment{example}[1][]{% \cc@ifempty{#1} {\namedtheorem{\Example}}% diff --git a/Master/texmf-dist/doc/latex/computational-complexity/cc.pdf b/Master/texmf-dist/doc/latex/computational-complexity/cc.pdf index 1f24b417b5d..f20fd75156a 100644 Binary files a/Master/texmf-dist/doc/latex/computational-complexity/cc.pdf and b/Master/texmf-dist/doc/latex/computational-complexity/cc.pdf differ diff --git a/Master/texmf-dist/source/latex/computational-complexity/cc.dtx b/Master/texmf-dist/source/latex/computational-complexity/cc.dtx index 65df35577cd..84f2eb8840b 100644 --- a/Master/texmf-dist/source/latex/computational-complexity/cc.dtx +++ b/Master/texmf-dist/source/latex/computational-complexity/cc.dtx @@ -2831,6 +2831,8 @@ multilingual,english]{cc} % soon. Michael N{\"{u}}sken, Bonn} % \changes{v2.22}{2012/05/07}{Added version in draft output. It is % planned to advance to 3.0 soon. Michael N{\"{u}}sken, Bonn} +% \changes{v2.23}{2012/05/22}{Increased compatibility with hyperref. +% Michael N{\"{u}}sken, Bonn} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \providecommand\ignorespacesafterend{\@ignoretrue} @@ -2839,7 +2841,7 @@ multilingual,english]{cc} \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.22 +2012/05/07 v2.23 computational complexity \ifclass document class\else package\fi] % \end{macrocode} @@ -4325,6 +4327,7 @@ computational complexity \else Springer Basel AG\fi} \define@key{ccsps}{doisuffix}[????-?]{% % Is the doi always 10.1007/s00037-threedigityear-suffix? +% Yes! (Answer from Springer...) \cc@fixelendef50\@doiinfo{\@journalnumber}% \xdef\@doiinfo{% 10.1007/s\@doiinfo-% @@ -4419,6 +4422,7 @@ computational complexity unicode]{hyperref}[2011/04/17 v6.82g]% % Make sure \cs{init@bare} is executed/repeated after hyperref's commands. \AtBeginDocument{\init@bare} + \RequirePackage{breakcites}% \RequirePackage{breakurl}[2009/01/24 v1.30]% \def\l@title##1{\@dottedtocline{-1}{0pt}{0pt}{{\large\textbf{##1}}}}% \let\l@title\l@part @@ -6148,41 +6152,49 @@ computational complexity % Michael N{\"{u}}sken, Paderborn.} % \changes{v2.01}{2001/03/12}{Added handling optional arguments for % \lenv{example} and \lenv{example*}. Michael N{\"{u}}sken, Paderborn.} +% \changes{v2.23}{2012/05/22}{For compatibility with +% \lpackage{hyperref.sty}: Changed handling of using equation counter +% for theorems (\lclo{separateequationcounting}, +% \lclo{noseparateequationcounting}). +% Michael N{\"{u}}sken, Bonn.} % \begin{macrocode} \newtheorem{namedth@@r@m}{\the\theoremtitle} \if@ccnosepeqncnt -\let\c@namedth@@r@m\c@equation -\def\thenamedth@@r@m{\theequation} +%%% \let\c@namedth@@r@m\c@equation +%%% \def\thenamedth@@r@m{\theequation} +\def\cc@thmcnter{equation} +\else +\def\cc@thmcnter{namedth@@r@m} \fi \newenvironment{namedtheorem}[1] {\theoremtitle{#1}\namedth@@r@m} {\endnamedth@@r@m} \if@standardtheorems -\newtheorem{answer}[namedth@@r@m]{\Answer} -\newtheorem{assumption}[namedth@@r@m]{\Assumption} -\newtheorem{claim}[namedth@@r@m]{\Claim} -\newtheorem{conjecture}[namedth@@r@m]{\Conjecture} -\newtheorem{convention}[namedth@@r@m]{\Convention} -\newtheorem{corollary}[namedth@@r@m]{\Corollary} -\newtheorem{counterexample}[namedth@@r@m]{\Counterexample} -\newtheorem{definition}[namedth@@r@m]{\Definition} -\newtheorem{exercise}[namedth@@r@m]{\Exercise} -\newtheorem{fact}[namedth@@r@m]{\Fact} -\newtheorem{hypothesis}[namedth@@r@m]{\Hypothesis} -\newtheorem{lemma}[namedth@@r@m]{\Lemma} -\newtheorem{notation}[namedth@@r@m]{\Notation} -\newtheorem{note}[namedth@@r@m]{\Note} -\newtheorem{observation}[namedth@@r@m]{\Observation} -\newtheorem{open}[namedth@@r@m]{\OpenQuestion} -\newtheorem{openquestion}[namedth@@r@m]{\OpenQuestion} -\newtheorem{problem}[namedth@@r@m]{\Problem} -\newtheorem{proposition}[namedth@@r@m]{\Proposition} -\newtheorem{question}[namedth@@r@m]{\Question} -\newtheorem{remark}[namedth@@r@m]{\Remark} -\newtheorem{result}[namedth@@r@m]{\Result} -\newtheorem{theorem}[namedth@@r@m]{\Theorem} -\newtheorem{thesis}[namedth@@r@m]{\Thesis} -\newtheorem{warning}[namedth@@r@m]{\Warning} +\newtheorem{answer}[\cc@thmcnter]{\Answer} +\newtheorem{assumption}[\cc@thmcnter]{\Assumption} +\newtheorem{claim}[\cc@thmcnter]{\Claim} +\newtheorem{conjecture}[\cc@thmcnter]{\Conjecture} +\newtheorem{convention}[\cc@thmcnter]{\Convention} +\newtheorem{corollary}[\cc@thmcnter]{\Corollary} +\newtheorem{counterexample}[\cc@thmcnter]{\Counterexample} +\newtheorem{definition}[\cc@thmcnter]{\Definition} +\newtheorem{exercise}[\cc@thmcnter]{\Exercise} +\newtheorem{fact}[\cc@thmcnter]{\Fact} +\newtheorem{hypothesis}[\cc@thmcnter]{\Hypothesis} +\newtheorem{lemma}[\cc@thmcnter]{\Lemma} +\newtheorem{notation}[\cc@thmcnter]{\Notation} +\newtheorem{note}[\cc@thmcnter]{\Note} +\newtheorem{observation}[\cc@thmcnter]{\Observation} +\newtheorem{open}[\cc@thmcnter]{\OpenQuestion} +\newtheorem{openquestion}[\cc@thmcnter]{\OpenQuestion} +\newtheorem{problem}[\cc@thmcnter]{\Problem} +\newtheorem{proposition}[\cc@thmcnter]{\Proposition} +\newtheorem{question}[\cc@thmcnter]{\Question} +\newtheorem{remark}[\cc@thmcnter]{\Remark} +\newtheorem{result}[\cc@thmcnter]{\Result} +\newtheorem{theorem}[\cc@thmcnter]{\Theorem} +\newtheorem{thesis}[\cc@thmcnter]{\Thesis} +\newtheorem{warning}[\cc@thmcnter]{\Warning} \newenvironment{example}[1][]{% \cc@ifempty{#1} {\namedtheorem{\Example}}% diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc.cls b/Master/texmf-dist/tex/latex/computational-complexity/cc.cls index d43248aeb54..869f236810a 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.22 +2012/05/07 v2.23 computational complexity \ifclass document class\else package\fi] \RequirePackage{ccaux} diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cclayout.sty b/Master/texmf-dist/tex/latex/computational-complexity/cclayout.sty index d4441cd253f..a446e676aab 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cclayout.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cclayout.sty @@ -305,6 +305,7 @@ linkcolor=\ifKV@ccsps@xlink blue\else black\fi, unicode]{hyperref}[2011/04/17 v6.82g]% \AtBeginDocument{\init@bare} + \RequirePackage{breakcites}% \RequirePackage{breakurl}[2009/01/24 v1.30]% \def\l@title##1{\@dottedtocline{-1}{0pt}{0pt}{{\large\textbf{##1}}}}% \let\l@title\l@part diff --git a/Master/texmf-dist/tex/latex/computational-complexity/ccthm.sty b/Master/texmf-dist/tex/latex/computational-complexity/ccthm.sty index 565db792caa..927aaf1fe99 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/ccthm.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/ccthm.sty @@ -177,38 +177,41 @@ \theoremstyle{cc} \newtheorem{namedth@@r@m}{\the\theoremtitle} \if@ccnosepeqncnt -\let\c@namedth@@r@m\c@equation -\def\thenamedth@@r@m{\theequation} +%%% \let\c@namedth@@r@m\c@equation +%%% \def\thenamedth@@r@m{\theequation} +\def\cc@thmcnter{equation} +\else +\def\cc@thmcnter{namedth@@r@m} \fi \newenvironment{namedtheorem}[1] {\theoremtitle{#1}\namedth@@r@m} {\endnamedth@@r@m} \if@standardtheorems -\newtheorem{answer}[namedth@@r@m]{\Answer} -\newtheorem{assumption}[namedth@@r@m]{\Assumption} -\newtheorem{claim}[namedth@@r@m]{\Claim} -\newtheorem{conjecture}[namedth@@r@m]{\Conjecture} -\newtheorem{convention}[namedth@@r@m]{\Convention} -\newtheorem{corollary}[namedth@@r@m]{\Corollary} -\newtheorem{counterexample}[namedth@@r@m]{\Counterexample} -\newtheorem{definition}[namedth@@r@m]{\Definition} -\newtheorem{exercise}[namedth@@r@m]{\Exercise} -\newtheorem{fact}[namedth@@r@m]{\Fact} -\newtheorem{hypothesis}[namedth@@r@m]{\Hypothesis} -\newtheorem{lemma}[namedth@@r@m]{\Lemma} -\newtheorem{notation}[namedth@@r@m]{\Notation} -\newtheorem{note}[namedth@@r@m]{\Note} -\newtheorem{observation}[namedth@@r@m]{\Observation} -\newtheorem{open}[namedth@@r@m]{\OpenQuestion} -\newtheorem{openquestion}[namedth@@r@m]{\OpenQuestion} -\newtheorem{problem}[namedth@@r@m]{\Problem} -\newtheorem{proposition}[namedth@@r@m]{\Proposition} -\newtheorem{question}[namedth@@r@m]{\Question} -\newtheorem{remark}[namedth@@r@m]{\Remark} -\newtheorem{result}[namedth@@r@m]{\Result} -\newtheorem{theorem}[namedth@@r@m]{\Theorem} -\newtheorem{thesis}[namedth@@r@m]{\Thesis} -\newtheorem{warning}[namedth@@r@m]{\Warning} +\newtheorem{answer}[\cc@thmcnter]{\Answer} +\newtheorem{assumption}[\cc@thmcnter]{\Assumption} +\newtheorem{claim}[\cc@thmcnter]{\Claim} +\newtheorem{conjecture}[\cc@thmcnter]{\Conjecture} +\newtheorem{convention}[\cc@thmcnter]{\Convention} +\newtheorem{corollary}[\cc@thmcnter]{\Corollary} +\newtheorem{counterexample}[\cc@thmcnter]{\Counterexample} +\newtheorem{definition}[\cc@thmcnter]{\Definition} +\newtheorem{exercise}[\cc@thmcnter]{\Exercise} +\newtheorem{fact}[\cc@thmcnter]{\Fact} +\newtheorem{hypothesis}[\cc@thmcnter]{\Hypothesis} +\newtheorem{lemma}[\cc@thmcnter]{\Lemma} +\newtheorem{notation}[\cc@thmcnter]{\Notation} +\newtheorem{note}[\cc@thmcnter]{\Note} +\newtheorem{observation}[\cc@thmcnter]{\Observation} +\newtheorem{open}[\cc@thmcnter]{\OpenQuestion} +\newtheorem{openquestion}[\cc@thmcnter]{\OpenQuestion} +\newtheorem{problem}[\cc@thmcnter]{\Problem} +\newtheorem{proposition}[\cc@thmcnter]{\Proposition} +\newtheorem{question}[\cc@thmcnter]{\Question} +\newtheorem{remark}[\cc@thmcnter]{\Remark} +\newtheorem{result}[\cc@thmcnter]{\Result} +\newtheorem{theorem}[\cc@thmcnter]{\Theorem} +\newtheorem{thesis}[\cc@thmcnter]{\Thesis} +\newtheorem{warning}[\cc@thmcnter]{\Warning} \newenvironment{example}[1][]{% \cc@ifempty{#1} {\namedtheorem{\Example}}% -- cgit v1.2.3