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 --- .../texmf-dist/source/latex/oberdiek/hycolor.dtx | 42 +++++++------- .../texmf-dist/source/latex/oberdiek/oberdiek.ins | 2 +- .../texmf-dist/source/latex/oberdiek/oberdiek.tex | 6 +- .../texmf-dist/source/latex/oberdiek/picture.dtx | 66 ++++++++++++++-------- 4 files changed, 69 insertions(+), 47 deletions(-) (limited to 'Master/texmf-dist/source/latex/oberdiek') diff --git a/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx b/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx index c152f4fd797..8ec8e48629b 100644 --- a/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% 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 @@ -78,7 +78,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: hycolor 2008/09/08 v1.4 Code for color options of hyperref/bookmark (HO)} +\Msg{* Package: hycolor 2009/10/02 v1.5 Code for color options of hyperref/bookmark (HO)} \Msg{************************************************************************} \keepsilent @@ -89,7 +89,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 @@ -157,7 +157,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{hycolor.drv}% - [2008/09/08 v1.4 Code for color options of hyperref/bookmark (HO)]% + [2009/10/02 v1.5 Code for color options of hyperref/bookmark (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \usepackage[ruled]{algorithm2e} @@ -222,7 +222,7 @@ and the derived files % \GetFileInfo{hycolor.drv} % % \title{The \xpackage{hycolor} package} -% \date{2008/09/08 v1.4} +% \date{2009/10/02 v1.5} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -246,9 +246,9 @@ and the derived files % of packages \xpackage{color} and \xpackage{xcolor} are supported % including the optional argument for the color model. % \begin{quote} -% |\hyperref{linkbordercolor=red}%| needs \xpackage{xcolor}\\ -% |\hyperref{linkbordercolor=[named]{red}%| needs \xpackage{xcolor}\\ -% |\hyperref{linkbordercolor=[rgb]{1,0,0}|\\ +% |\hypersetup{linkbordercolor=red}%| needs \xpackage{xcolor}\\ +% |\hypersetup{linkbordercolor=[named]{red}}%| needs \xpackage{xcolor}\\ +% |\hypersetup{linkbordercolor=[rgb]{1,0,0}}|\\ % \end{quote} % % Without package \xpackage{xcolor} some of the options only @@ -324,11 +324,11 @@ and the derived files %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hycolor}% - [2008/09/08 v1.4 Code for color options of hyperref/bookmark (HO)]% + [2009/10/02 v1.5 Code for color options of hyperref/bookmark (HO)]% % \end{macrocode} % % \begin{macrocode} -\RequirePackage{xcolor-patch}[2008/09/08] +\RequirePackage{xcolor-patch}[2009/10/02] % \end{macrocode} % % \subsection{Normalization} @@ -1234,7 +1234,7 @@ and the derived files % \begin{macrocode} %<*xcolor> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{xcolor-patch}[2008/09/08 xcolor patch] +\ProvidesPackage{xcolor-patch}[2009/10/02 xcolor patch] % \end{macrocode} % \begin{macrocode} \@ifpackageloaded{xcolor}{% @@ -1443,19 +1443,19 @@ and the derived files % % \begin{macrocode} %<*test1> -\ProvidesFile{hycolor-test1.tex}[2008/09/08 test file 1] +\ProvidesFile{hycolor-test1.tex}[2009/10/02 test file 1] % % \end{macrocode} % % \begin{macrocode} %<*test2> -\ProvidesFile{hycolor-test2.tex}[2008/09/08 test file 2] +\ProvidesFile{hycolor-test2.tex}[2009/10/02 test file 2] \let\pdfmatch\relax % % \end{macrocode} % % \begin{macrocode} -%\ProvidesFile{hycolor-test3.tex}[2008/09/08 test file 3] +%\ProvidesFile{hycolor-test3.tex}[2009/10/02 test file 3] % \end{macrocode} % % \begin{macrocode} @@ -1501,7 +1501,7 @@ and the derived files \Expect*{\@ResultErrorMessage}*{\@ExpectErrorMessage}% } \usepackage{scrlfile} -\usepackage{hycolor}[2008/09/08] +\usepackage{hycolor}[2009/10/02] % % \end{macrocode} % @@ -1890,15 +1890,15 @@ and the derived files \documentclass{minimal} %<*xcol1> \usepackage{xcolor} -\usepackage{xcolor-patch}[2008/09/08] +\usepackage{xcolor-patch}[2009/10/02] % %<*xcol2> \usepackage{scrlfile} -\usepackage{xcolor-patch}[2008/09/08] +\usepackage{xcolor-patch}[2009/10/02] \usepackage{xcolor} % %<*xcol3> -\usepackage{xcolor-patch}[2008/09/08] +\usepackage{xcolor-patch}[2009/10/02] \usepackage{xcolor} \begin{document} % @@ -1945,7 +1945,7 @@ and the derived files \NeedsTeXFormat{LaTeX2e} \documentclass{article} \usepackage{xcolor} -\usepackage{xcolor-patch}[2008/09/08] +\usepackage{xcolor-patch}[2009/10/02] \makeatletter \protected@edef\x{\fbox{abc}} \let\@tempa\@undefined @@ -2169,6 +2169,10 @@ and the derived files % Fix added to package \xpackage{xcolor-patch}: % Fragile \cs{@frameb@x} (used in \cs{fbox}) is made robust. % \end{Version} +% \begin{Version}{2009/10/02 v1.5} +% \item +% Doku fixes (Herbert Voss). +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins index 389e1e4ad0d..4062ba8a697 100644 --- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins +++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins @@ -1,5 +1,5 @@ % oberdiek.ins -% 2009/09/26 +% 2009/10/11 % % Copyright (C) 1999, 2001, 2006 by % Heiko Oberdiek diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex index d34f7c6408b..b845b29cb38 100644 --- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex +++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex @@ -6,7 +6,7 @@ \newcommand*{\Subject}{CTAN:\CTANdir} \newcommand*{\Author}{Heiko Oberdiek} \newcommand*{\Email}{oberdiek@uni-freiburg.de} -\newcommand*{\Date}{2009/09/26} +\newcommand*{\Date}{2009/10/11} % Copyright (C) 2006 by % Heiko Oberdiek @@ -213,7 +213,7 @@ [\entrysep] \entry{holtxdoc}{2009/08/07}{0.12}{Private additional ltxdoc support}% [\entrysep] -\entry{hycolor}{2008/09/08}{1.4}{Code for color options of hyperref/bookmark}% +\entry{hycolor}{2009/10/02}{1.5}{Code for color options of hyperref/bookmark}% [\entrysep] \entry{hypbmsec}{2007/04/11}{2.4}{Bookmarks in sectioning commands}% [\entrysep] @@ -281,7 +281,7 @@ [\entrysep] \entry{pdftexcmds}{2009/09/23}{0.6}{LuaTeX support for pdfTeX utility functions}% [\entrysep] -\entry{picture}{2008/11/26}{1.2}{Dimens for picture macros}% +\entry{picture}{2009/10/11}{1.3}{Dimens for picture macros}% [\entrysep] \entry{pmboxdraw}{2006/05/03}{1.0}{Poor man's box drawing characters}% [\entrysep] diff --git a/Master/texmf-dist/source/latex/oberdiek/picture.dtx b/Master/texmf-dist/source/latex/oberdiek/picture.dtx index 1ee261fa49f..9bd58d6897b 100644 --- a/Master/texmf-dist/source/latex/oberdiek/picture.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/picture.dtx @@ -1,7 +1,6 @@ % \iffalse meta-comment % -% 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 @@ -69,7 +68,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: picture 2008/11/26 v1.2 Dimens for picture macros (HO)} +\Msg{* Package: picture 2009/10/11 v1.3 Dimens for picture macros (HO)} \Msg{************************************************************************} \keepsilent @@ -80,8 +79,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 @@ -139,7 +137,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{picture.drv}% - [2008/11/26 v1.2 Dimens for picture macros (HO)]% + [2009/10/11 v1.3 Dimens for picture macros (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \begin{document} @@ -148,7 +146,7 @@ and the derived files % % \fi % -% \CheckSum{304} +% \CheckSum{321} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -169,7 +167,7 @@ and the derived files % \GetFileInfo{picture.drv} % % \title{The \xpackage{picture} package} -% \date{2008/11/26 v1.2} +% \date{2009/10/11 v1.3} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -265,7 +263,7 @@ and the derived files %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{picture}% - [2008/11/26 v1.2 Dimens for picture macros (HO)]% + [2009/10/11 v1.3 Dimens for picture macros (HO)]% % \end{macrocode} % % \subsection{Options} @@ -333,26 +331,42 @@ and the derived files \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}% -} % \end{macrocode} % % \subsubsection{Method \xoption{etex}} @@ -755,6 +769,10 @@ and the derived files % \item % Package order of supported packages is checked. % \end{Version} +% \begin{Version}{2009/10/11 v1.3} +% \item +% Fix because of new version v4.3 of package \xpackage{calc}. +% \end{Version} % \end{History} % % \PrintIndex -- cgit v1.2.3