From e099cca5254b2407d84ef68db58c436e4975ea12 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 11 Oct 2009 23:19:36 +0000 Subject: oberdiek update (11oct09) git-svn-id: svn://tug.org/texlive/trunk@15785 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/oberdiek/hycolor.sty | 6 +-- Master/texmf-dist/tex/latex/oberdiek/picture.sty | 51 ++++++++++++++-------- .../texmf-dist/tex/latex/oberdiek/xcolor-patch.sty | 4 +- 3 files changed, 38 insertions(+), 23 deletions(-) (limited to 'Master/texmf-dist/tex/latex/oberdiek') diff --git a/Master/texmf-dist/tex/latex/oberdiek/hycolor.sty b/Master/texmf-dist/tex/latex/oberdiek/hycolor.sty index 7b6c1fbd0e5..8237f877704 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/hycolor.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/hycolor.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007, 2008 by Heiko Oberdiek +%% Copyright (C) 2007-2009 by Heiko Oberdiek %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -32,8 +32,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hycolor}% - [2008/09/08 v1.4 Code for color options of hyperref/bookmark (HO)]% -\RequirePackage{xcolor-patch}[2008/09/08] + [2009/10/02 v1.5 Code for color options of hyperref/bookmark (HO)]% +\RequirePackage{xcolor-patch}[2009/10/02] \begingroup \catcode`\!=13 % \catcode`\:=13 % diff --git a/Master/texmf-dist/tex/latex/oberdiek/picture.sty b/Master/texmf-dist/tex/latex/oberdiek/picture.sty index 849b94fc9db..9c043e3f2f2 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/picture.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/picture.sty @@ -8,8 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006, 2007, 2008 by -%% Heiko Oberdiek +%% Copyright (C) 2006-2009 by Heiko Oberdiek %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -30,7 +29,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{picture}% - [2008/11/26 v1.2 Dimens for picture macros (HO)]% + [2009/10/11 v1.3 Dimens for picture macros (HO)]% \def\Pc@calcname{calc} \def\Pc@etexname{etex} \def\Pc@plainname{plain} @@ -75,26 +74,42 @@ \setlength\dimen@{#1\unitlength}\Pc@next\Pc@nil{#1}% }% \let\PcOrg@calc@error\calc@error - \def\Pc@calc@error#1{% - \expandafter\ifx\expandafter\unitlength\noexpand#1\relax - \def\calc@next##1!{% - \endgroup - \aftergroup\afterassignment - \aftergroup\Pc@next + \@ifpackagelater{calc}{2007/08/22}{% v4.3 + \def\Pc@calc@error#1{% + \expandafter\ifx\expandafter\unitlength\noexpand#1\relax + \def\calc@next##1!{% + \endgroup + \aftergroup\afterassignment + \aftergroup\Pc@next + }% + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi + {% + \calc@next{#1}% + }{% + \PcOrg@calc@error{#1}% }% - \else - \@ReturnAfterFi{% + }% + }{% + \def\Pc@calc@error#1{% + \expandafter\ifx\expandafter\unitlength\noexpand#1\relax + \def\calc@next##1!{% + \endgroup + \aftergroup\afterassignment + \aftergroup\Pc@next + }% + \expandafter\@gobble + \else + \expandafter\@firstofone + \fi + {% \PcOrg@calc@error{#1}% }% - \fi + }% }% - \expandafter\@firstofone -\else - \expandafter\@gobble \fi -{% - \long\def\@ReturnAfterFi#1\fi{\fi#1}% -} \ifx\Pc@method\Pc@etexname \def\Pc@tokslength#1{% \begingroup diff --git a/Master/texmf-dist/tex/latex/oberdiek/xcolor-patch.sty b/Master/texmf-dist/tex/latex/oberdiek/xcolor-patch.sty index 1f753e7f015..483754c8aa8 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/xcolor-patch.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/xcolor-patch.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007, 2008 by Heiko Oberdiek +%% Copyright (C) 2007-2009 by Heiko Oberdiek %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -31,7 +31,7 @@ %% hycolor-test-xcol4.tex. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{xcolor-patch}[2008/09/08 xcolor patch] +\ProvidesPackage{xcolor-patch}[2009/10/02 xcolor patch] \@ifpackageloaded{xcolor}{% \@firstofone }{% -- cgit v1.2.3