1 files changed, 21 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/oberdiek/attachfile2.sty b/Master/texmf-dist/tex/latex/oberdiek/attachfile2.sty
index 3d06c5afb5e..ea4124bfbd4 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/attachfile2.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/attachfile2.sty
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2005, 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+%% Copyright (C) 2005-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
@@ -29,7 +29,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{attachfile2}%
-  [2007/04/11 v2.3 attach files into PDF (HO)]%
+  [2008/07/29 v2.4 attach files into PDF (HO)]%
 \RequirePackage{ifpdf}
 \RequirePackage{keyval}
 \RequirePackage{color}
@@ -37,6 +37,7 @@
 
 
 \RequirePackage{hyperref}
+\RequirePackage{hycolor}[2008/07/29]
 
 \def\atfi@pdfstringdef#1#2{%
   \pdfstringdef\atfi@temp@string{#2}%
@@ -155,8 +156,9 @@
 \setkeys{AtFi}{icon=PushPin}
 
 \define@key{AtFi}{color}{%
-  \def\atfi@color{/C[#1]}% hash-ok
-  \def\atfi@color@rgb{#1}%
+  \HyColor@AttachfileColor{#1}%
+          \atfi@color@tex\atfi@color@inline\atfi@color@annot
+          {attachfile2}{color}%
 }
 \setkeys{AtFi}{color=1 0.9255 0.7765}
 
@@ -281,10 +283,11 @@
   \begingroup
     \setkeys{AtFi}{#1}%
     \ifatfi@print
-      \def\atfi@textcolor(##1 ##2 ##3)##4{%
-        \textcolor[rgb]{##1,##2,##3}{##4}}%
-      \expandafter\atfi@textcolor\expandafter
-        (\atfi@color@rgb){#2\strut}%
+      \leavevmode
+      \begingroup
+        \HyColor@UseColor\atfi@color@tex
+        #2\strut
+      \endgroup
     \else
       \setbox0=\hbox{#2\strut}%
       \makebox[\wd0]{}%
@@ -330,7 +333,7 @@
   2.7319 4.1367 3.9571 13.8867 \atfi@RECTFILL
   8.7031 4.1367 3.9571 9.8867 \atfi@RECTFILL
   14.7471 4.1367 3.9571 11.8867 \atfi@RECTFILL
-  \atfi@color@rgb\space \atfi@SETRGBCOLORFILL
+  \atfi@color@inline{FILL}%
   1.689 3.0938 3.9571 13.8867 \atfi@RECTFILL
   7.6602 3.0938 3.9571 9.8867 \atfi@RECTFILL
   13.7041 3.0938 3.9571 11.8867 \atfi@RECTFILL
@@ -379,7 +382,7 @@
   6.9692 6.3301 6.9692 7.1572 \atfi@CURVETOV
   6.9692 7.9863 6.9692 12.21 \atfi@CURVETOY
   \atfi@STROKE
-  \atfi@color@rgb\space \atfi@SETRGBCOLORSTROKE
+  \atfi@color@inline{STROKE}%
   1 \atfi@SETLINEWIDTH
   1.2495 12.4404 \atfi@MOVETO
   1.2495 3.9883 1.2495 3.1895 \atfi@CURVETOV
@@ -422,7 +425,7 @@
   11 1  \atfi@LINETO
   11 6  \atfi@LINETO
   \atfi@FILLSTROKE{%
-    \atfi@color@rgb\space\atfi@SETRGBCOLORFILL
+    \atfi@color@inline{FILL}%
   }{%
     0 \atfi@SETGRAYSTROKE
   }%
@@ -484,7 +487,7 @@
   9.4463 10.1035 8.7344 10.9199 7.856 10.9199 \atfi@CURVETO
   \atfi@CLOSEPATH
   \atfi@FILLSTROKE{%
-    \atfi@color@rgb\space\atfi@SETRGBCOLORFILL
+    \atfi@color@inline{FILL}%
   }{%
     0 \atfi@SETGRAYSTROKE
   }%
@@ -694,11 +697,13 @@
 \def\atfi@textattachfile@i#1#2#3{%
     \setkeys{AtFi}{#1}%
     \atfi@embedfile{#2}%
-    \def\atfi@textcolor(##1 ##2 ##3)##4{%
-      \textcolor[rgb]{##1,##2,##3}{##4}}%
     \atfi@set@appearance{%
-      \expandafter\atfi@textcolor\expandafter
-      (\atfi@color@rgb){#3\strut}}%
+      \leavevmode
+      \begingroup
+        \HyColor@UseColor\atfi@color@tex
+        #3\strut
+      \endgroup
+    }%
     \atfi@flags@to@int
     \atfi@insert@file@annot{#2}%
   \endgroup