From f17434595759bd2eb2cf02b2f042956adb23eb04 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 19 Apr 2012 16:53:20 +0000 Subject: computational-complexity (18apr12) git-svn-id: svn://tug.org/texlive/trunk@26045 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/computational-complexity/cc-cls.sty | 2 +- Master/texmf-dist/tex/latex/computational-complexity/cc.cls | 6 +++--- .../tex/latex/computational-complexity/cc2cite.sty | 2 +- .../tex/latex/computational-complexity/cc4amsart.sty | 2 +- .../tex/latex/computational-complexity/cc4apjrnl.sty | 2 +- .../tex/latex/computational-complexity/cc4elsart.sty | 2 +- .../texmf-dist/tex/latex/computational-complexity/cc4jT.sty | 2 +- .../tex/latex/computational-complexity/cc4llncs.sty | 2 +- .../tex/latex/computational-complexity/cc4siamltex.sty | 2 +- .../tex/latex/computational-complexity/cc4svjour.sty | 2 +- .../texmf-dist/tex/latex/computational-complexity/ccalgo.sty | 3 ++- .../texmf-dist/tex/latex/computational-complexity/ccaux.sty | 11 +++++++---- .../texmf-dist/tex/latex/computational-complexity/cccite.sty | 2 +- .../texmf-dist/tex/latex/computational-complexity/ccdbs.sty | 2 +- .../tex/latex/computational-complexity/cclayout.sty | 5 +++-- .../tex/latex/computational-complexity/ccproof.sty | 2 +- .../texmf-dist/tex/latex/computational-complexity/ccqed.sty | 2 +- .../texmf-dist/tex/latex/computational-complexity/ccref.sty | 2 +- .../tex/latex/computational-complexity/ccreltx.sty | 2 +- .../texmf-dist/tex/latex/computational-complexity/ccthm.sty | 2 +- .../tex/latex/computational-complexity/relabel.sty | 12 +++++++----- .../texmf-dist/tex/latex/computational-complexity/thcc.sty | 2 +- 22 files changed, 39 insertions(+), 32 deletions(-) (limited to 'Master/texmf-dist/tex/latex/computational-complexity') diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc-cls.sty b/Master/texmf-dist/tex/latex/computational-complexity/cc-cls.sty index fc30ad1eba2..495737e651c 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc-cls.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc-cls.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `ccsty,chartab') %% -%% Copyright 2000-2011 +%% Copyright 2000-2012 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc.cls b/Master/texmf-dist/tex/latex/computational-complexity/cc.cls index 86de8ee3527..21c46b84ed8 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc.cls +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc.cls @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `cccls,chartab') %% -%% Copyright 2000-2011 +%% Copyright 2000-2012 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: @@ -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 -2011/07/28 v2.20 +2012/04/17 v2.21 computational complexity \ifclass document class\else package\fi] \RequirePackage{ccaux} @@ -145,7 +145,7 @@ computational complexity \DeclareOption*{\OptionNotUsed \PassOptionsToClass{\CurrentOption}{article}} \ifclass -\ExecuteOptions{a4paper,12pt,cctextarea,balancedmargins,twoside,% +\ExecuteOptions{a4paper,12pt,cctextarea,twoside,% OT1,nolatin1,nobabel,% localnumbering,bare,% leqno,ams,ccpublish,cclayout,autotitle,ccsectioning,% diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc2cite.sty b/Master/texmf-dist/tex/latex/computational-complexity/cc2cite.sty index 7e13bd5bf34..3073f8e2c80 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc2cite.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc2cite.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `cc2cite,chartab') %% -%% Copyright 2000-2011 +%% Copyright 2000-2012 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc4amsart.sty b/Master/texmf-dist/tex/latex/computational-complexity/cc4amsart.sty index f188e54f3a3..a3044da3aa1 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc4amsart.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc4amsart.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `cc4amsart,chartab') %% -%% Copyright 2000-2011 +%% Copyright 2000-2012 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc4apjrnl.sty b/Master/texmf-dist/tex/latex/computational-complexity/cc4apjrnl.sty index 54e83805cab..17e2ed8431a 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc4apjrnl.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc4apjrnl.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `cc4apjrnl,chartab') %% -%% Copyright 2000-2011 +%% Copyright 2000-2012 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc4elsart.sty b/Master/texmf-dist/tex/latex/computational-complexity/cc4elsart.sty index 6818939fc7a..61ea650a9b4 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc4elsart.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc4elsart.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `cc4elsart,chartab') %% -%% Copyright 2000-2011 +%% Copyright 2000-2012 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc4jT.sty b/Master/texmf-dist/tex/latex/computational-complexity/cc4jT.sty index fb0f24c8dc5..382c9761bea 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc4jT.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc4jT.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `cc4jT,chartab') %% -%% Copyright 2000-2011 +%% Copyright 2000-2012 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc4llncs.sty b/Master/texmf-dist/tex/latex/computational-complexity/cc4llncs.sty index 4c9d4fbcc79..d72538a378e 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc4llncs.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc4llncs.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `cc4llncs,chartab') %% -%% Copyright 2000-2011 +%% Copyright 2000-2012 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc4siamltex.sty b/Master/texmf-dist/tex/latex/computational-complexity/cc4siamltex.sty index c276629becf..757d013ed7f 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc4siamltex.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc4siamltex.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `cc4siamltex,chartab') %% -%% Copyright 2000-2011 +%% Copyright 2000-2012 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cc4svjour.sty b/Master/texmf-dist/tex/latex/computational-complexity/cc4svjour.sty index 6f22e844822..4d585c263f4 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cc4svjour.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cc4svjour.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `cc4svjour,chartab') %% -%% Copyright 2000-2011 +%% Copyright 2000-2012 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: diff --git a/Master/texmf-dist/tex/latex/computational-complexity/ccalgo.sty b/Master/texmf-dist/tex/latex/computational-complexity/ccalgo.sty index ce81a0da1ce..caf4578dad1 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/ccalgo.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/ccalgo.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `ccalgo,chartab') %% -%% Copyright 2000-2011 +%% Copyright 2000-2012 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: @@ -320,6 +320,7 @@ \newif\if@trivialrange \newcommand{\refsetrange}[2]{% {\shortlabeltrue + \let\index\relax \let\@tempa\relax \protected@edef\@tempa{% \csname r@\the\algorithmmasterkey-#1\endcsname}% diff --git a/Master/texmf-dist/tex/latex/computational-complexity/ccaux.sty b/Master/texmf-dist/tex/latex/computational-complexity/ccaux.sty index 994a55cb022..dba85f432d6 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/ccaux.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/ccaux.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `ccaux,chartab') %% -%% Copyright 2000-2011 +%% Copyright 2000-2012 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: @@ -59,7 +59,7 @@ \def\@cctextareafalse{\@textareaversion\z@} \def\@cctextareatrue{\@textareaversion\tw@} \@cctextareatrue -\newcount\@marginmode \@marginmode\tw@ +\newcount\@marginmode \@marginmode\m@ne \def\numberallwithin#1{\gdef\cc@numberingtoplevel{#1}} \def\@adjustnumbering{% \if@longarticle @@ -122,6 +122,9 @@ \advance\count@\@ne \expandafter\xdef\csname cc@warncount@#1\endcsname{\the\count@}% } +\newcommand{\cc@addto}[2]{% + \expandafter\ccaddto\expandafter{\csname + cc@\string#1\endcsname}{#2}{#1}} \providecommand{\addto}[2]{% \expandafter\ccaddto\expandafter{\csname cc@\string#1\endcsname}{#2}{#1}} @@ -172,12 +175,12 @@ \@ifnextchar[{\n@wbabel{#1}{#2}}{\n@wbabel{#1}{#2}[]}} \def\n@wbabel#1#2[#3]{% \def#1{#2}% - \cc@ifnotempty{#2}{\addto\captionsenglish{\def#1{#2}}}% + \cc@ifnotempty{#2}{\cc@addto\captionsenglish{\def#1{#2}}}% \babeladdtranslations#1{#3}% } \def\b@beladdlang#1=#2=#3\@@@#4{% \cc@ifnotempty{#2}{% - \expandafter\addto\csname captions#1\endcsname{\def#4{#2}}% + \expandafter\cc@addto\csname captions#1\endcsname{\def#4{#2}}% }% } \def\babeladdtranslations#1#2{% diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cccite.sty b/Master/texmf-dist/tex/latex/computational-complexity/cccite.sty index 05daac82c20..cb95e0442a7 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cccite.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cccite.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `cccite,chartab') %% -%% Copyright 2000-2011 +%% Copyright 2000-2012 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: diff --git a/Master/texmf-dist/tex/latex/computational-complexity/ccdbs.sty b/Master/texmf-dist/tex/latex/computational-complexity/ccdbs.sty index 6e1c48b4dad..fe4453794b5 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/ccdbs.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/ccdbs.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `ccdbs,chartab') %% -%% Copyright 2000-2011 +%% Copyright 2000-2012 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: diff --git a/Master/texmf-dist/tex/latex/computational-complexity/cclayout.sty b/Master/texmf-dist/tex/latex/computational-complexity/cclayout.sty index c1f0d17b0e0..26f353467c8 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/cclayout.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/cclayout.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `cclayout,chartab') %% -%% Copyright 2000-2011 +%% Copyright 2000-2012 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: @@ -304,6 +304,7 @@ colorlinks=\ifKV@ccsps@xlink true\else false\fi, linkcolor=\ifKV@ccsps@xlink blue\else black\fi, unicode]{hyperref}[2011/04/17 v6.82g]% + \AtBeginDocument{\init@bare} \RequirePackage{breakurl}[2009/01/24 v1.30]% \def\l@title##1{\@dottedtocline{-1}{0pt}{0pt}{{\large\textbf{##1}}}}% \let\l@title\l@part @@ -569,7 +570,7 @@ \fi \fi}% } -\typeout{Now adjusting margins.} +\typeout{Now adjusting margins (\the\@marginmode).} \ifcase\@marginmode \AtEndOfClass{% \oddsidemargin\paperwidth diff --git a/Master/texmf-dist/tex/latex/computational-complexity/ccproof.sty b/Master/texmf-dist/tex/latex/computational-complexity/ccproof.sty index 27bc74a01d6..3ec3401b46b 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/ccproof.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/ccproof.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `ccproof,chartab') %% -%% Copyright 2000-2011 +%% Copyright 2000-2012 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: diff --git a/Master/texmf-dist/tex/latex/computational-complexity/ccqed.sty b/Master/texmf-dist/tex/latex/computational-complexity/ccqed.sty index a86a0cefdbd..024b260466e 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/ccqed.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/ccqed.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `ccqed,chartab') %% -%% Copyright 2000-2011 +%% Copyright 2000-2012 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: diff --git a/Master/texmf-dist/tex/latex/computational-complexity/ccref.sty b/Master/texmf-dist/tex/latex/computational-complexity/ccref.sty index 086d5fc48b4..f5b00de2a49 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/ccref.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/ccref.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `ccref,chartab') %% -%% Copyright 2000-2011 +%% Copyright 2000-2012 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: diff --git a/Master/texmf-dist/tex/latex/computational-complexity/ccreltx.sty b/Master/texmf-dist/tex/latex/computational-complexity/ccreltx.sty index 5f0ac869108..7d8f8eaa8b6 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/ccreltx.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/ccreltx.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `ccreltx,chartab') %% -%% Copyright 2000-2011 +%% Copyright 2000-2012 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: diff --git a/Master/texmf-dist/tex/latex/computational-complexity/ccthm.sty b/Master/texmf-dist/tex/latex/computational-complexity/ccthm.sty index b370259845c..565db792caa 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/ccthm.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/ccthm.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `ccthm,chartab') %% -%% Copyright 2000-2011 +%% Copyright 2000-2012 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: diff --git a/Master/texmf-dist/tex/latex/computational-complexity/relabel.sty b/Master/texmf-dist/tex/latex/computational-complexity/relabel.sty index 8bf37755e2c..72b52591b97 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/relabel.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/relabel.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `relabel,chartab') %% -%% Copyright 2000-2011 +%% Copyright 2000-2012 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: @@ -103,14 +103,16 @@ {\csname the#1\endcsname}% } \if@bare -\let\relabel@label\label -\def\label#1{\ifx\@currentlabel\@bare@currentlabel\else - {\let\@currentlabel\@bare@currentlabel\relabel@label{bare@#1}}% - \fi\relabel@label{#1}} +\def\relabel@label#1{\ifx\@currentlabel\@bare@currentlabel\else + {\let\@currentlabel\@bare@currentlabel\relabel@olabel{bare@#1}}% + \fi\relabel@olabel{#1}} +\def\init@bare{\if@bare\let\relabel@olabel\label\let\label\relabel@label\fi} +\AtBeginDocument{\init@bare}% \def\bare\ref#1{\@ifundefined{r@bare@#1}{\ref{#1}}{\ref{bare@#1}}} \else \def\bare{\PackageWarning{relabel}{\string\bare\space disabled! (Use option bare to enable it.)}} +\def\init@bare{} \fi \let\@bare@currentlabel\@currentlabel \endinput diff --git a/Master/texmf-dist/tex/latex/computational-complexity/thcc.sty b/Master/texmf-dist/tex/latex/computational-complexity/thcc.sty index b0fe7be23a4..d8d68d502ef 100644 --- a/Master/texmf-dist/tex/latex/computational-complexity/thcc.sty +++ b/Master/texmf-dist/tex/latex/computational-complexity/thcc.sty @@ -6,7 +6,7 @@ %% %% cc.dtx (with options: `thcc,chartab') %% -%% Copyright 2000-2011 +%% Copyright 2000-2012 %% Michael N"usken, Joachim von zur Gathen, computational complexity %% %% IMPORTANT NOTICE: -- cgit v1.2.3