diff options
author | Karl Berry <karl@freefriends.org> | 2008-08-08 00:12:57 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2008-08-08 00:12:57 +0000 |
commit | e5f07d95b842dc87e161ab78bc2d2fdc85030ed7 (patch) | |
tree | 31b98a91381a6774e35a9f2fcd05e1b9ab1593de /Master/texmf-dist/source | |
parent | 635e9afff29b63ade3594e3cf8eb94ce6c965b9a (diff) |
oberdiek update (7aug08)
git-svn-id: svn://tug.org/texlive/trunk@10157 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r-- | Master/texmf-dist/source/latex/oberdiek/hycolor.dtx | 306 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/oberdiek/oberdiek.ins | 2 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/oberdiek/oberdiek.tex | 4 |
3 files changed, 295 insertions, 17 deletions
diff --git a/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx b/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx index 0881c019ecd..affb830603a 100644 --- a/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx @@ -17,7 +17,9 @@ % This work consists of the main source file hycolor.dtx % and the derived files % hycolor.sty, hycolor.pdf, hycolor.ins, hycolor.drv, -% hycolor-test1.tex, hycolor-test2.tex, hycolor-test3.tex. +% xcolor-patch.sty, hycolor-test1.tex, hycolor-test2.tex, +% hycolor-test3.tex, hycolor-test-xcol1.tex, +% hycolor-test-xcol2.tex, hycolor-test-xcol3.tex. % % Distribution: % CTAN:macros/latex/contrib/oberdiek/hycolor.dtx @@ -51,10 +53,14 @@ % % Installation: % TDS:tex/latex/oberdiek/hycolor.sty +% TDS:tex/latex/oberdiek/xcolor-patch.sty % TDS:doc/latex/oberdiek/hycolor.pdf % TDS:doc/latex/oberdiek/test/hycolor-test1.tex % TDS:doc/latex/oberdiek/test/hycolor-test2.tex % TDS:doc/latex/oberdiek/test/hycolor-test3.tex +% TDS:doc/latex/oberdiek/test/hycolor-test-xcol1.tex +% TDS:doc/latex/oberdiek/test/hycolor-test-xcol2.tex +% TDS:doc/latex/oberdiek/test/hycolor-test-xcol3.tex % TDS:source/latex/oberdiek/hycolor.dtx % %<*ignore> @@ -70,7 +76,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: hycolor 2008/07/29 v1.2 Code for color options of hyperref/bookmark (HO)} +\Msg{* Package: hycolor 2008/08/01 v1.3 Code for color options of hyperref/bookmark (HO)} \Msg{************************************************************************} \keepsilent @@ -98,7 +104,9 @@ This Current Maintainer of this work is Heiko Oberdiek. This work consists of the main source file hycolor.dtx and the derived files hycolor.sty, hycolor.pdf, hycolor.ins, hycolor.drv, - hycolor-test1.tex, hycolor-test2.tex, hycolor-test3.tex. + xcolor-patch.sty, hycolor-test1.tex, hycolor-test2.tex, + hycolor-test3.tex, hycolor-test-xcol1.tex, + hycolor-test-xcol2.tex, hycolor-test-xcol3.tex. \endpreamble \let\MetaPrefix\DoubleperCent @@ -108,19 +116,23 @@ and the derived files \file{hycolor.drv}{\from{hycolor.dtx}{driver}}% \usedir{tex/latex/oberdiek}% \file{hycolor.sty}{\from{hycolor.dtx}{package}}% + \file{xcolor-patch.sty}{\from{hycolor.dtx}{xcolor}}% \usedir{doc/latex/oberdiek/test}% \file{hycolor-test1.tex}{\from{hycolor.dtx}{test,test1}}% \file{hycolor-test2.tex}{\from{hycolor.dtx}{test,test2}}% \file{hycolor-test3.tex}{\from{hycolor.dtx}{test,test3}}% + \file{hycolor-test-xcol1.tex}{\from{hycolor.dtx}{test-xcolor,xcol1}}% + \file{hycolor-test-xcol2.tex}{\from{hycolor.dtx}{test-xcolor,xcol2}}% + \file{hycolor-test-xcol3.tex}{\from{hycolor.dtx}{test-xcolor,xcol3}}% } \obeyspaces \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} -\Msg{* file into a directory searched by TeX:} +\Msg{* files into a directory searched by TeX:} \Msg{*} -\Msg{* hycolor.sty} +\Msg{* hycolor.sty, xcolor-patch.sty} \Msg{*} \Msg{* And install the following script file:} \Msg{*} @@ -141,7 +153,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{hycolor.drv}% - [2008/07/29 v1.2 Code for color options of hyperref/bookmark (HO)]% + [2008/08/01 v1.3 Code for color options of hyperref/bookmark (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2007/11/11] \usepackage[ruled]{algorithm2e} @@ -185,7 +197,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{1389} +% \CheckSum{1702} % % \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 @@ -206,7 +218,7 @@ and the derived files % \GetFileInfo{hycolor.drv} % % \title{The \xpackage{hycolor} package} -% \date{2008/07/29 v1.2} +% \date{2008/08/01 v1.3} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -308,7 +320,11 @@ and the derived files %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hycolor}% - [2008/07/29 v1.2 Code for color options of hyperref/bookmark (HO)]% + [2008/08/01 v1.3 Code for color options of hyperref/bookmark (HO)]% +% \end{macrocode} +% +% \begin{macrocode} +\RequirePackage{xcolor-patch}[2008/08/01] % \end{macrocode} % % \subsection{Normalization} @@ -1196,23 +1212,219 @@ and the derived files %</package> % \end{macrocode} % +% \subsection{Patch for package \xpackage{xcolor}} +% +% Because the test files triggered a bug in package \xpackage{xcolor} +% of version 2007/01/21 v2.11. +% I contacted the author of \xpackage{xcolor} Uwe Kern. He responded +% with a test version 2007/03/27 v2.12a00 that fixes the problem. +% However, apparently he did not found the time for an official +% release yet. Thus I have reluctantly written the following +% patch package using the fixes of v2.12a00. +% +% The patch is immediately applied if package \xpackage{xcolor} +% is already loaded. +% Otherwise the patch is delayed using \cs{AfterPackage} if +% package \xpackage{scrlfile} is loaded. As last resort +% \cs{AtBeginDocument} is used. +% \begin{macrocode} +%<*xcolor> +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{xcolor-patch}[2008/08/01 xcolor patch] +% \end{macrocode} +% \begin{macrocode} +\@ifpackageloaded{xcolor}{% + \@firstofone +}{% + \@ifpackageloaded{scrlfile}{% + \AfterPackage{xcolor}% + }{% + \def\reserved@a{% + \edef\x{% + \endgroup + \noexpand\AtBeginDocument{% + \noexpand\@ifpackageloaded{xcolor}{\the\toks@}{}% + }% + }% + \x + }% + \begingroup + \afterassignment\reserved@a + \toks@ + }% +}% +{% +% \end{macrocode} +% \begin{macro}{\XC@ifxcase} +% \begin{macrocode} + \long\def\reserved@a#1#2#3{% + \long\def\@@tmp##1##2{% + \ifx#1##1% + \toks@{##2}% + \expandafter\remove@to@nnil + \else + \expandafter\@@tmp + \fi + }% + \@@tmp#2#1{#3}\@nnil\the\toks@ + }% + \ifx\XC@ifxcase\reserved@a + \long\def\XC@ifxcase#1#2#3{% + \long\def\XC@if@##1##2{% + \ifx#1##1% + \toks@{##2}% + \expandafter\remove@to@nnil + \else + \expandafter\XC@if@ + \fi + }% + \XC@if@#2#1{#3}\@nnil + \the\toks@ + }% + \fi +% \end{macrocode} +% \end{macro} +% \begin{macro}{\XC@ifcase} +% \begin{macrocode} + \long\def\reserved@a#1#2#3{% + \long\def\@@tmp##1##2{% + \@expandtwoargs\in@{,#1,}{,##1,}% + \ifin@ + \toks@{##2}% + \expandafter\remove@to@nnil + \else + \expandafter\@@tmp + \fi + }% + \@@tmp#2{#1}{#3}\@nnil + \the\toks@ + }% + \ifx\XC@ifcase\reserved@a + \long\def\XC@ifcase#1#2#3{% + \long\def\XC@if@##1##2{% + \@expandtwoargs\in@{,#1,}{,##1,}% + \ifin@ + \toks@{##2}% + \expandafter\remove@to@nnil + \else + \expandafter\XC@if@ + \fi + }% + \XC@if@#2{#1}{#3}\@nnil + \the\toks@ + }% + \fi +% \end{macrocode} +% \end{macro} +% \begin{macro}{\XC@cnv@gray} +% \begin{macrocode} + \def\reserved@a#1,{% + \XC@ifxcase\tm{% + \XC@mod@rgb{% + \XC@calcN{#1}\@@tmp + \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}% + }% + \XC@mod@cmy{% + \XC@calcC{#1}\@@tmp + \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}% + }% + \XC@mod@cmyk{% + \XC@calcC{#1}\@@tmp + \edef\@@tmp{0,0,0,\@@tmp}% + }% + \XC@mod@RGB{% + \edef\@@scl{\rangeRGB}% + \XC@calcM{#1}\@@tmp + \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}% + }% + \XC@mod@HTML{% + \edef\@@scl{\@cclv}% + \XC@calcM{#1}\@@tmp + \XC@calcH\@@tmp\@@tmp + \edef\@@tmp{\@@tmp\@@tmp\@@tmp}% + }% + \XC@mod@HSB{% + \edef\@@scl{\rangeHSB}% + \XC@calcM{#1}\@@tmp + \edef\@@tmp{0,0,\@@tmp}% + }% + \XC@mod@Gray{% + \edef\@@scl{\rangeGray}% + \XC@calcM{#1}\@@tmp + }% + }% + {% + \XC@calcN{#1}\@@tmp + \edef\@@tmp{0,0,\@@tmp}% + }% + }% + \ifx\XC@cnv@gray\reserved@a + \def\XC@cnv@gray#1,{% + \XC@ifxcase\tm{% + \XC@mod@rgb{% + \XC@calcN{#1}\@@tmp + \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}% + }% + \XC@mod@gray{}% + \XC@mod@cmy{% + \XC@calcC{#1}\@@tmp + \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}% + }% + \XC@mod@cmyk{% + \XC@calcC{#1}\@@tmp + \edef\@@tmp{0,0,0,\@@tmp}% + }% + \XC@mod@RGB{% + \edef\@@scl{\rangeRGB}% + \XC@calcM{#1}\@@tmp + \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}% + }% + \XC@mod@HTML{% + \edef\@@scl{\@cclv}% + \XC@calcM{#1}\@@tmp + \XC@calcH\@@tmp\@@tmp + \edef\@@tmp{\@@tmp\@@tmp\@@tmp}% + }% + \XC@mod@HSB{% + \edef\@@scl{\rangeHSB}% + \XC@calcM{#1}\@@tmp + \edef\@@tmp{0,0,\@@tmp}% + }% + \XC@mod@Gray{% + \edef\@@scl{\rangeGray}% + \XC@calcM{#1}\@@tmp + }% + }% + {% + \XC@calcN{#1}\@@tmp + \edef\@@tmp{0,0,\@@tmp}% + }% + }% + \fi +} +% \end{macrocode} +% \end{macro} +% \begin{macrocode} +%</xcolor> +% \end{macrocode} +% % \section{Test} % % \begin{macrocode} %<*test1> -\ProvidesFile{hycolor-test1.tex}[2008/07/29 test file 1] +\ProvidesFile{hycolor-test1.tex}[2008/08/01 test file 1] %</test1> % \end{macrocode} % % \begin{macrocode} %<*test2> -\ProvidesFile{hycolor-test2.tex}[2008/07/29 test file 2] +\ProvidesFile{hycolor-test2.tex}[2008/08/01 test file 2] \let\pdfmatch\relax %</test2> % \end{macrocode} % % \begin{macrocode} -%<test3>\ProvidesFile{hycolor-test3.tex}[2008/07/29 test file 3] +%<test3>\ProvidesFile{hycolor-test3.tex}[2008/08/01 test file 3] % \end{macrocode} % % \begin{macrocode} @@ -1257,8 +1469,8 @@ and the derived files \endgroup \Expect*{\@ResultErrorMessage}*{\@ExpectErrorMessage}% } - -\usepackage{hycolor}[2008/07/29] +\usepackage{scrlfile} +\usepackage{hycolor}[2008/08/01] %</test> % \end{macrocode} % @@ -1638,6 +1850,63 @@ and the derived files %</test> % \end{macrocode} % +% \subsection{Test for package \xpackage{xcolor}} +% +% \begin{macrocode} +%<*test-xcolor> +\NeedsTeXFormat{LaTeX2e} +\nofiles +\documentclass{minimal} +%<*xcol1> +\usepackage{xcolor} +\usepackage{xcolor-patch}[2008/08/01] +%</xcol1> +%<*xcol2> +\usepackage{scrlfile} +\usepackage{xcolor-patch}[2008/08/01] +\usepackage{xcolor} +%</xcol2> +%<*xcol3> +\usepackage{xcolor-patch}[2008/08/01] +\usepackage{xcolor} +\begin{document} +%</xcol3> +\makeatletter +\newcommand*{\ColModList}{% + rgb,% + cmy,% + cmyk,% + hsb,% + Hsb,% + tHsb,% + gray,% + RGB,% + HTML,% + HSB,% + Gray,% + % wave, +} +\newcommand*{\StartModel}{rgb} +\newcommand*{\StartValues}{.1,.2,.3} +\@for\x:=\ColModList\do{% + \ifx\x\@empty + \else + \convertcolorspec\StartModel\StartValues\x\y + \typeout{* [\StartModel]{\StartValues} ==> [\x]{\y}}% + \@for\xx:=\ColModList\do{% + \ifx\xx\@empty + \else + \convertcolorspec\x\y\xx\yy + \typeout{* [\x]{\y} ==> [\xx]{\yy}}% + \fi + }% + \fi +} +%<xcol3>\end{document} +%<xcol1|xcol2>\@@end +%</test-xcolor> +% \end{macrocode} +% % \section{Installation} % % \subsection{Download} @@ -1698,10 +1967,14 @@ and the derived files % \def\t{^^A % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}} % hycolor.sty & tex/latex/oberdiek/hycolor.sty\\ +% xcolor-patch.sty & tex/latex/oberdiek/xcolor-patch.sty\\ % hycolor.pdf & doc/latex/oberdiek/hycolor.pdf\\ % test/hycolor-test1.tex & doc/latex/oberdiek/test/hycolor-test1.tex\\ % test/hycolor-test2.tex & doc/latex/oberdiek/test/hycolor-test2.tex\\ % test/hycolor-test3.tex & doc/latex/oberdiek/test/hycolor-test3.tex\\ +% test/hycolor-test-xcol1.tex & doc/latex/oberdiek/test/hycolor-test-xcol1.tex\\ +% test/hycolor-test-xcol2.tex & doc/latex/oberdiek/test/hycolor-test-xcol2.tex\\ +% test/hycolor-test-xcol3.tex & doc/latex/oberdiek/test/hycolor-test-xcol3.tex\\ % hycolor.dtx & source/latex/oberdiek/hycolor.dtx\\ % \end{tabular}^^A % }^^A @@ -1835,6 +2108,11 @@ and the derived files % \item % Support for package \xpackage{attachfile2} added. % \end{Version} +% \begin{Version}{2008/08/01 v1.3} +% \item +% Patch package \xpackage{xcolor-patch} added that fixes bugs in +% package \xpackage{xcolor} to get the test files running. +% \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 77c9da39c58..77207dab6cf 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 -% 2008/07/31 +% 2008/08/05 % % Copyright (C) 1999, 2001, 2006 by % Heiko Oberdiek <oberdiek@uni-freiburg.de> diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex index 9b5f8c557f9..a721095efcd 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}{2008/07/31} +\newcommand*{\Date}{2008/08/05} % Copyright (C) 2006 by % Heiko Oberdiek <oberdiek@uni-freiburg.de> @@ -212,7 +212,7 @@ [\entrysep] \entry{holtxdoc}{2007/12/12}{0.10}{Private additional ltxdoc support}% [\entrysep] -\entry{hycolor}{2008/07/29}{1.2}{Code for color options of hyperref/bookmark}% +\entry{hycolor}{2008/08/01}{1.3}{Code for color options of hyperref/bookmark}% [\entrysep] \entry{hypbmsec}{2007/04/11}{2.4}{Bookmarks in sectioning commands}% [\entrysep] |