oberdiek update (7aug08)

git-svn-id: svn://tug.org/texlive/trunk@10157 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 199 insertions, 2 deletions

diff --git a/Master/texmf-dist/tex/latex/oberdiek/hycolor.sty b/Master/texmf-dist/tex/latex/oberdiek/hycolor.sty
index 6a57ada8ffa..3d3392c93ce 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/hycolor.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/hycolor.sty
@@ -25,11 +25,14 @@
 %% 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.
 %% 
 \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)]%
+\RequirePackage{xcolor-patch}[2008/08/01]
 \begingroup
   \catcode`\!=13 %
   \catcode`\:=13 %
diff --git a/Master/texmf-dist/tex/latex/oberdiek/xcolor-patch.sty b/Master/texmf-dist/tex/latex/oberdiek/xcolor-patch.sty
new file mode 100644
index 00000000000..be19b84bc73
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/oberdiek/xcolor-patch.sty
@@ -0,0 +1,194 @@
+%%
+%% This is file `xcolor-patch.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% hycolor.dtx  (with options: `xcolor')
+%% 
+%% This is a generated file.
+%% 
+%% Copyright (C) 2007, 2008 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3 of this license or (at your option) any later
+%% version. The latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%% 
+%% This work has the LPPL maintenance status "maintained".
+%% 
+%% 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,
+%%    xcolor-patch.sty, hycolor-test1.tex, hycolor-test2.tex,
+%%    hycolor-test3.tex, hycolor-test-xcol1.tex,
+%%    hycolor-test-xcol2.tex, hycolor-test-xcol3.tex.
+%% 
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{xcolor-patch}[2008/08/01 xcolor patch]
+\@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@
+  }%
+}%
+{%
+  \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
+  \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
+  \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
+}
+\endinput
+%%
+%% End of file `xcolor-patch.sty'.