summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-08-01 00:27:39 +0000
committerKarl Berry <karl@freefriends.org>2008-08-01 00:27:39 +0000
commit8a00bd89dba03208646e631956e764f533e00d69 (patch)
treeeeea7569633ab198d18e9ef9b16d82d869a7092c /Master/texmf-dist/tex
parent35912ac29c031e29b7a225f07c48881d428729d2 (diff)
oberdiek attachfile2 v2.4, hycolor v1.2, atbegshi v1.9 update (31jul08)
git-svn-id: svn://tug.org/texlive/trunk@9965 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty6
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/atfidvips.def8
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/atfipdftex.def8
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/attachfile2.sty37
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/hycolor.sty118
5 files changed, 148 insertions, 29 deletions
diff --git a/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty b/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty
index 4a4c9e519d7..0faa867ac99 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty
@@ -25,8 +25,8 @@
%% This work consists of the main source file atbegshi.dtx
%% and the derived files
%% atbegshi.sty, atbegshi.pdf, atbegshi.ins, atbegshi.drv,
-%% atbegshi-example.tex, atbegshi-test1.tex,
-%% atbegshi-test2.tex, atbegshi-test3.tex.
+%% atbegshi-example1.tex, atbegshi-example2.tex,
+%% atbegshi-test1.tex, atbegshi-test2.tex, atbegshi-test3.tex.
%%
\begingroup
\catcode44 12 % ,
@@ -86,7 +86,7 @@
\fi
\expandafter\x\csname ver@atbegshi.sty\endcsname
\ProvidesPackage{atbegshi}%
- [2008/07/19 v1.8 At begin shipout hook (HO)]
+ [2008/07/31 v1.9 At begin shipout hook (HO)]
\begingroup
\catcode123 1 % {
\catcode125 2 % }
diff --git a/Master/texmf-dist/tex/latex/oberdiek/atfidvips.def b/Master/texmf-dist/tex/latex/oberdiek/atfidvips.def
index 8ac4ea594c9..5a69c2b1fe0 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/atfidvips.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/atfidvips.def
@@ -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}
\ProvidesFile{atfipdftex.def}%
- [2007/04/11 v2.3 attachfile2 driver for dvips (HO)]%
+ [2008/07/29 v2.4 attachfile2 driver for dvips (HO)]%
\def\atfi@literal#1{%
\special{ps:atfi_dict begin{#1}atfi_?pdfmark end}%
}
@@ -242,6 +242,8 @@
\def\atfi@SETRGBCOLORFILL{setrgbcolor }
\def\atfi@SETGRAYSTROKE{setgray }
\def\atfi@SETGRAYFILL{setgray }
+\def\atfi@SETCMYKCOLORSTROKE{setcmykcolor }
+\def\atfi@SETCMYKCOLORFILL{setcmykcolor }
\def\atfi@RECTFILL{atfi_rectfill }
\def\atfi@RECTSTROKEFILL#1#2#3{%
#3%
@@ -481,7 +483,7 @@
[%
/Subtype/FileAttachment%
\atfi@icon
- \atfi@color
+ \atfi@color@annot
\atfi@author
\atfi@date
\atfi@annotname
diff --git a/Master/texmf-dist/tex/latex/oberdiek/atfipdftex.def b/Master/texmf-dist/tex/latex/oberdiek/atfipdftex.def
index b0f768d3e92..f57090200ae 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/atfipdftex.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/atfipdftex.def
@@ -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}
\ProvidesFile{atfipdftex.def}%
- [2007/04/11 v2.3 attachfile2 driver for pdfTeX (HO)]%
+ [2008/07/29 v2.4 attachfile2 driver for pdfTeX (HO)]%
\let\atfi@literal\pdfliteral
@@ -45,6 +45,8 @@
\def\atfi@SETRGBCOLORFILL{rg }
\def\atfi@SETGRAYSTROKE{G }
\def\atfi@SETGRAYFILL{g }
+\def\atfi@SETCMYKCOLORSTROKE{K }
+\def\atfi@SETCMYKCOLORFILL{k }
\def\atfi@RECTFILL{re f }
\def\atfi@RECTSTROKEFILL#1#2#3{#1#2#3re B }
\def\atfi@SETMITERLIMIT{M }
@@ -131,7 +133,7 @@
depth \atfi@scale\atfi@appearancedepth {%
/Subtype/FileAttachment%
\atfi@icon
- \atfi@color
+ \atfi@color@annot
\atfi@author
\atfi@date
\atfi@annotname
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
diff --git a/Master/texmf-dist/tex/latex/oberdiek/hycolor.sty b/Master/texmf-dist/tex/latex/oberdiek/hycolor.sty
index e300089260b..6a57ada8ffa 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 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+%% 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
@@ -25,11 +25,11 @@
%% 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-test1.tex, hycolor-test2.tex, hycolor-test3.tex.
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{hycolor}%
- [2007/04/11 v1.1 Code for color options of hyperref/bookmark (HO)]%
+ [2008/07/29 v1.2 Code for color options of hyperref/bookmark (HO)]%
\begingroup
\catcode`\!=13 %
\catcode`\:=13 %
@@ -328,6 +328,7 @@
\fi
\fi
}
+\newif\ifHyColor@result
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname pdfmatch\endcsname\relax
\expandafter\@firstoftwo
@@ -335,7 +336,6 @@
\expandafter\@secondoftwo
\fi
{%
- \newif\ifHyColor@result
\begingroup
\def\x#1{\endgroup
\def\HyColor@IfRGB##1{%
@@ -400,8 +400,10 @@
\expandafter\strip@prefix\pdflastmatch2,%
\expandafter\strip@prefix\pdflastmatch3%
}%
+ \HyColor@resulttrue
\expandafter\@firstoftwo
\else
+ \HyColor@resultfalse
\expandafter\@secondoftwo
\fi
}%
@@ -446,6 +448,114 @@
\fi
}%
}
+\def\HyColor@DetectPdfVersion{%
+ \begingroup\expandafter\expandafter\expandafter\endgroup
+ \expandafter\ifx\csname Hy@pdfversion\endcsname\relax
+ \global\chardef\HyColor@PdfVersion=0 %
+ \else
+ \global\chardef\HyColor@PdfVersion=\Hy@pdfversion\relax
+ \fi
+ \global\let\HyColor@DetectPdfVersion\relax
+}
+\def\HyColor@SpaceToComma#1 #2\@nil{%
+ #1%
+ \ifx\relax#2\relax
+ \expandafter\@gobble
+ \else
+ ,%
+ \expandafter\@firstofone
+ \fi
+ {%
+ \HyColor@SpaceToComma#2\@nil
+ }%
+}%
+\def\HyColor@AttachfileColor#1#2#3#4#5#6{%
+ \def#2{#1}%
+ \ifx#2\@empty
+ \let#3\@gobble
+ \let#4\@empty
+ \else
+ \HyColor@resultfalse
+ \HyColor@XZeroOneThreeFour{#1}#3{#5}{#6}%
+ \ifHyColor@result
+ \edef#2{%
+ [rgb]{\expandafter\HyColor@SpaceToComma#3 \@nil}%
+ }%
+ \fi
+ \ifx\HyColor@model\HyColor@model@rgb
+ \edef#4{/C[#3]}% hash-ok
+ \edef#3##1{%
+ #3 %
+ \noexpand\csname atfi@SETRGBCOLOR##1\noexpand\endcsname
+ }%
+ \else
+ \ifx\HyColor@model\HyColor@model@gray
+ \HyColor@DetectPdfVersion
+ \ifnum\HyColor@PdfVersion<7 %
+ \edef#4{/C[#3 #3 #3]}% hash-ok
+ \else
+ \edef#4{/C[#3]}% hash-ok
+ \fi
+ \edef#3##1{%
+ #3 %
+ \noexpand\csname atfi@SETGRAYCOLOR##1\noexpand\endcsname
+ }%
+ \else
+ \ifx\HyColor@model\HyColor@model@cmyk
+ \HyColor@DetectPdfVersion
+ \ifnum\HyColor@PdfVersion<7 %
+ \HyColor@IfModel{#1}{%
+ \HyColor@IfXcolor{%
+ \convertcolorspec\HyColor@model\HyColor@values
+ \HyColor@model@rgb#4%
+ \expandafter\HyColor@NormalizeCommaRGB#4\@nil#4%
+ \edef#4{/C[#4]}% hash-ok
+ }{%
+ \let#4\@empty
+ \HyColor@ErrorModelNoXcolor{#5}{#6}%
+ }%
+ }{%
+ \HyColor@IfXcolor{%
+ \extractcolorspec{#1}#4%
+ \expandafter\convertcolorspec#4%
+ \HyColor@model@rgb#4%
+ \expandafter\HyColor@NormalizeCommaRGB#4\@nil#4%
+ \edef#4{/C[#4]}% hash-ok
+ }{%
+ \let#4\@empty
+ \HyColor@ErrorSpecNoXcolor{#5}{#6}%
+ }%
+ }%
+ \else
+ \edef#4{/C[#3]}% hash-ok
+ \fi
+ \edef#3##1{%
+ #3 %
+ \noexpand\csname atfi@SETCMYKCOLOR##1\noexpand\endcsname
+ }%
+ \else
+ \ifx\HyColor@model\HyColor@model@empty
+ \PackageError{#5}{%
+ Color model `empty' is not permitted for option `#6'%
+ }\@ehc
+ \let#2\@empty
+ \let#3\@gobble
+ \let#4\@empty
+ \else
+ \ifx\HyColor@model\relax % (missing xcolor)
+ \let#3\@gobble
+ \let#4\@empty
+ \else
+ \PackageError{#5}{%
+ Internal error: unsupported color model%
+ }\@ehc
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+}
\endinput
%%
%% End of file `hycolor.sty'.