From ba9472aebfed07843bc4faa00c7b96bc86194691 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 4 Oct 2006 08:43:01 +0000 Subject: Fix ctan2tds for pgf installation comment powerdot-doc-vn in tpm-ctan-check, it always breaks Update of the following packages: labelcas pstricks-add sectionbox ltxmisc frenchle flowfram verse emulateapj pst-pdf poemscol babelbib dk-bib breakurl screenplay ncctools xkeyval bibleref muthesis pst-labo pgf ncclatex active-conf xcolor commath lineno dottex makeplo git-svn-id: svn://tug.org/texlive/trunk@2240 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/xcolor/svgnam.def | 8 +- Master/texmf-dist/tex/latex/xcolor/x11nam.def | 352 +++++++++++++ Master/texmf-dist/tex/latex/xcolor/xcolor.sty | 731 ++++++++++++++++---------- 3 files changed, 803 insertions(+), 288 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/xcolor/x11nam.def (limited to 'Master/texmf-dist/tex/latex/xcolor') diff --git a/Master/texmf-dist/tex/latex/xcolor/svgnam.def b/Master/texmf-dist/tex/latex/xcolor/svgnam.def index 666d0db4eb2..0d748d91124 100644 --- a/Master/texmf-dist/tex/latex/xcolor/svgnam.def +++ b/Master/texmf-dist/tex/latex/xcolor/svgnam.def @@ -22,7 +22,7 @@ %% in the same archive or directory.) %% \ProvidesFile{svgnam.def} - [2005/10/15 v2.06 Predefined colors according to SVG 1.1 (UK)] + [2005/12/21 v2.09 Predefined colors according to SVG 1.1 (UK)] %% %% ---------------------------------------------------------------- %% Copyright (C) 2003-2005 by Dr. Uwe Kern @@ -84,9 +84,9 @@ GhostWhite,.972,.972,1;% Gold,1,.844,0;% Goldenrod,.855,.648,.125;% Gray,.5,.5,.5;% -Grey,.5,.5,.5;% Green,0,.5,0;% GreenYellow,.68,1,.185;% +Grey,.5,.5,.5;% Honeydew,.94,1,.94;% HotPink,1,.41,.705;% IndianRed,.804,.36,.36;% @@ -100,6 +100,7 @@ LemonChiffon,1,.98,.804;% LightBlue,.68,.848,.9;% LightCoral,.94,.5,.5;% LightCyan,.88,1,1;% +LightGoldenrod,.933,.867,.51;% LightGoldenrodYellow,.98,.98,.824;% LightGray,.828,.828,.828;% LightGreen,.565,.932,.565;% @@ -108,6 +109,7 @@ LightPink,1,.712,.756;% LightSalmon,1,.628,.48;% LightSeaGreen,.125,.698,.668;% LightSkyBlue,.53,.808,.98;% +LightSlateBlue,.518,.44,1;% LightSlateGray,.468,.532,.6;% LightSlateGrey,.468,.532,.6;% LightSteelBlue,.69,.77,.87;% @@ -132,6 +134,7 @@ MistyRose,1,.894,.884;% Moccasin,1,.894,.71;% NavajoWhite,1,.87,.68;% Navy,0,0,.5;% +NavyBlue,0,0,.5;% OldLace,.992,.96,.9;% Olive,.5,.5,0;% OliveDrab,.42,.556,.136;% @@ -172,6 +175,7 @@ Thistle,.848,.75,.848;% Tomato,1,.39,.28;% Turquoise,.25,.88,.815;% Violet,.932,.51,.932;% +VioletRed,.816,.125,.565;% Wheat,.96,.87,.7;% White,1,1,1;% WhiteSmoke,.96,.96,.96;% diff --git a/Master/texmf-dist/tex/latex/xcolor/x11nam.def b/Master/texmf-dist/tex/latex/xcolor/x11nam.def new file mode 100644 index 00000000000..ff738862c86 --- /dev/null +++ b/Master/texmf-dist/tex/latex/xcolor/x11nam.def @@ -0,0 +1,352 @@ +%% +%% This is file `x11nam.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% xcolor.dtx (with options: `x11names') +%% +%% IMPORTANT NOTICE: +%% +%% For the copyright see the source file. +%% +%% Any modified versions of this file must be renamed +%% with new filenames distinct from x11nam.def. +%% +%% For distribution of the original source see the terms +%% for copying and modification in the file xcolor.dtx. +%% +%% This generated file may be distributed as long as the +%% original source files, as listed above, are part of the +%% same distribution. (The sources need not necessarily be +%% in the same archive or directory.) +%% +\ProvidesFile{x11nam.def} + [2005/12/21 v2.09 Predefined colors according to Unix/X11 (UK)] +%% +%% ---------------------------------------------------------------- +%% Copyright (C) 2003-2005 by Dr. Uwe Kern +%% ---------------------------------------------------------------- +%% +\def\colornameprefix{XC@} +\preparecolorset{rgb}{}{}{% +AntiqueWhite1,1,.936,.86;% +AntiqueWhite2,.932,.875,.8;% +AntiqueWhite3,.804,.752,.69;% +AntiqueWhite4,.545,.512,.47;% +Aquamarine1,.498,1,.83;% +Aquamarine2,.464,.932,.776;% +Aquamarine3,.4,.804,.668;% +Aquamarine4,.27,.545,.455;% +Azure1,.94,1,1;% +Azure2,.88,.932,.932;% +Azure3,.756,.804,.804;% +Azure4,.512,.545,.545;% +Bisque1,1,.894,.77;% +Bisque2,.932,.835,.716;% +Bisque3,.804,.716,.62;% +Bisque4,.545,.49,.42;% +Blue1,0,0,1;% +Blue2,0,0,.932;% +Blue3,0,0,.804;% +Blue4,0,0,.545;% +Brown1,1,.25,.25;% +Brown2,.932,.23,.23;% +Brown3,.804,.2,.2;% +Brown4,.545,.136,.136;% +Burlywood1,1,.828,.608;% +Burlywood2,.932,.772,.57;% +Burlywood3,.804,.668,.49;% +Burlywood4,.545,.45,.332;% +CadetBlue1,.596,.96,1;% +CadetBlue2,.556,.898,.932;% +CadetBlue3,.48,.772,.804;% +CadetBlue4,.325,.525,.545;% +Chartreuse1,.498,1,0;% +Chartreuse2,.464,.932,0;% +Chartreuse3,.4,.804,0;% +Chartreuse4,.27,.545,0;% +Chocolate1,1,.498,.14;% +Chocolate2,.932,.464,.13;% +Chocolate3,.804,.4,.112;% +Chocolate4,.545,.27,.075;% +Coral1,1,.448,.336;% +Coral2,.932,.415,.312;% +Coral3,.804,.356,.27;% +Coral4,.545,.244,.185;% +Cornsilk1,1,.972,.864;% +Cornsilk2,.932,.91,.804;% +Cornsilk3,.804,.785,.694;% +Cornsilk4,.545,.532,.47;% +Cyan1,0,1,1;% +Cyan2,0,.932,.932;% +Cyan3,0,.804,.804;% +Cyan4,0,.545,.545;% +DarkGoldenrod1,1,.725,.06;% +DarkGoldenrod2,.932,.68,.055;% +DarkGoldenrod3,.804,.585,.048;% +DarkGoldenrod4,.545,.396,.03;% +DarkOliveGreen1,.792,1,.44;% +DarkOliveGreen2,.736,.932,.408;% +DarkOliveGreen3,.635,.804,.352;% +DarkOliveGreen4,.43,.545,.24;% +DarkOrange1,1,.498,0;% +DarkOrange2,.932,.464,0;% +DarkOrange3,.804,.4,0;% +DarkOrange4,.545,.27,0;% +DarkOrchid1,.75,.244,1;% +DarkOrchid2,.698,.228,.932;% +DarkOrchid3,.604,.196,.804;% +DarkOrchid4,.408,.132,.545;% +DarkSeaGreen1,.756,1,.756;% +DarkSeaGreen2,.705,.932,.705;% +DarkSeaGreen3,.608,.804,.608;% +DarkSeaGreen4,.41,.545,.41;% +DarkSlateGray1,.592,1,1;% +DarkSlateGray2,.552,.932,.932;% +DarkSlateGray3,.475,.804,.804;% +DarkSlateGray4,.32,.545,.545;% +DeepPink1,1,.08,.576;% +DeepPink2,.932,.07,.536;% +DeepPink3,.804,.064,.464;% +DeepPink4,.545,.04,.312;% +DeepSkyBlue1,0,.75,1;% +DeepSkyBlue2,0,.698,.932;% +DeepSkyBlue3,0,.604,.804;% +DeepSkyBlue4,0,.408,.545;% +DodgerBlue1,.116,.565,1;% +DodgerBlue2,.11,.525,.932;% +DodgerBlue3,.094,.455,.804;% +DodgerBlue4,.064,.305,.545;% +Firebrick1,1,.19,.19;% +Firebrick2,.932,.172,.172;% +Firebrick3,.804,.15,.15;% +Firebrick4,.545,.1,.1;% +Gold1,1,.844,0;% +Gold2,.932,.79,0;% +Gold3,.804,.68,0;% +Gold4,.545,.46,0;% +Goldenrod1,1,.756,.145;% +Goldenrod2,.932,.705,.132;% +Goldenrod3,.804,.608,.112;% +Goldenrod4,.545,.41,.08;% +Green1,0,1,0;% +Green2,0,.932,0;% +Green3,0,.804,0;% +Green4,0,.545,0;% +Honeydew1,.94,1,.94;% +Honeydew2,.88,.932,.88;% +Honeydew3,.756,.804,.756;% +Honeydew4,.512,.545,.512;% +HotPink1,1,.43,.705;% +HotPink2,.932,.415,.655;% +HotPink3,.804,.376,.565;% +HotPink4,.545,.228,.385;% +IndianRed1,1,.415,.415;% +IndianRed2,.932,.39,.39;% +IndianRed3,.804,.332,.332;% +IndianRed4,.545,.228,.228;% +Ivory1,1,1,.94;% +Ivory2,.932,.932,.88;% +Ivory3,.804,.804,.756;% +Ivory4,.545,.545,.512;% +Khaki1,1,.965,.56;% +Khaki2,.932,.9,.52;% +Khaki3,.804,.776,.45;% +Khaki4,.545,.525,.305;% +LavenderBlush1,1,.94,.96;% +LavenderBlush2,.932,.88,.898;% +LavenderBlush3,.804,.756,.772;% +LavenderBlush4,.545,.512,.525;% +LemonChiffon1,1,.98,.804;% +LemonChiffon2,.932,.912,.75;% +LemonChiffon3,.804,.79,.648;% +LemonChiffon4,.545,.536,.44;% +LightBlue1,.75,.936,1;% +LightBlue2,.698,.875,.932;% +LightBlue3,.604,.752,.804;% +LightBlue4,.408,.512,.545;% +LightCyan1,.88,1,1;% +LightCyan2,.82,.932,.932;% +LightCyan3,.705,.804,.804;% +LightCyan4,.48,.545,.545;% +LightGoldenrod1,1,.925,.545;% +LightGoldenrod2,.932,.864,.51;% +LightGoldenrod3,.804,.745,.44;% +LightGoldenrod4,.545,.505,.298;% +LightPink1,1,.684,.725;% +LightPink2,.932,.635,.68;% +LightPink3,.804,.55,.585;% +LightPink4,.545,.372,.396;% +LightSalmon1,1,.628,.48;% +LightSalmon2,.932,.585,.448;% +LightSalmon3,.804,.505,.385;% +LightSalmon4,.545,.34,.26;% +LightSkyBlue1,.69,.888,1;% +LightSkyBlue2,.644,.828,.932;% +LightSkyBlue3,.552,.712,.804;% +LightSkyBlue4,.376,.484,.545;% +LightSteelBlue1,.792,.884,1;% +LightSteelBlue2,.736,.824,.932;% +LightSteelBlue3,.635,.71,.804;% +LightSteelBlue4,.43,.484,.545;% +LightYellow1,1,1,.88;% +LightYellow2,.932,.932,.82;% +LightYellow3,.804,.804,.705;% +LightYellow4,.545,.545,.48;% +Magenta1,1,0,1;% +Magenta2,.932,0,.932;% +Magenta3,.804,0,.804;% +Magenta4,.545,0,.545;% +Maroon1,1,.204,.7;% +Maroon2,.932,.19,.655;% +Maroon3,.804,.16,.565;% +Maroon4,.545,.11,.385;% +MediumOrchid1,.88,.4,1;% +MediumOrchid2,.82,.372,.932;% +MediumOrchid3,.705,.32,.804;% +MediumOrchid4,.48,.215,.545;% +MediumPurple1,.67,.51,1;% +MediumPurple2,.624,.475,.932;% +MediumPurple3,.536,.408,.804;% +MediumPurple4,.365,.28,.545;% +MistyRose1,1,.894,.884;% +MistyRose2,.932,.835,.824;% +MistyRose3,.804,.716,.71;% +MistyRose4,.545,.49,.484;% +NavajoWhite1,1,.87,.68;% +NavajoWhite2,.932,.81,.63;% +NavajoWhite3,.804,.7,.545;% +NavajoWhite4,.545,.475,.37;% +OliveDrab1,.752,1,.244;% +OliveDrab2,.7,.932,.228;% +OliveDrab3,.604,.804,.196;% +OliveDrab4,.41,.545,.132;% +Orange1,1,.648,0;% +Orange2,.932,.604,0;% +Orange3,.804,.52,0;% +Orange4,.545,.352,0;% +OrangeRed1,1,.27,0;% +OrangeRed2,.932,.25,0;% +OrangeRed3,.804,.215,0;% +OrangeRed4,.545,.145,0;% +Orchid1,1,.512,.98;% +Orchid2,.932,.48,.912;% +Orchid3,.804,.41,.79;% +Orchid4,.545,.28,.536;% +PaleGreen1,.604,1,.604;% +PaleGreen2,.565,.932,.565;% +PaleGreen3,.488,.804,.488;% +PaleGreen4,.33,.545,.33;% +PaleTurquoise1,.732,1,1;% +PaleTurquoise2,.684,.932,.932;% +PaleTurquoise3,.59,.804,.804;% +PaleTurquoise4,.4,.545,.545;% +PaleVioletRed1,1,.51,.67;% +PaleVioletRed2,.932,.475,.624;% +PaleVioletRed3,.804,.408,.536;% +PaleVioletRed4,.545,.28,.365;% +PeachPuff1,1,.855,.725;% +PeachPuff2,.932,.796,.68;% +PeachPuff3,.804,.688,.585;% +PeachPuff4,.545,.468,.396;% +Pink1,1,.71,.772;% +Pink2,.932,.664,.72;% +Pink3,.804,.57,.62;% +Pink4,.545,.39,.424;% +Plum1,1,.732,1;% +Plum2,.932,.684,.932;% +Plum3,.804,.59,.804;% +Plum4,.545,.4,.545;% +Purple1,.608,.19,1;% +Purple2,.57,.172,.932;% +Purple3,.49,.15,.804;% +Purple4,.332,.1,.545;% +Red1,1,0,0;% +Red2,.932,0,0;% +Red3,.804,0,0;% +Red4,.545,0,0;% +RosyBrown1,1,.756,.756;% +RosyBrown2,.932,.705,.705;% +RosyBrown3,.804,.608,.608;% +RosyBrown4,.545,.41,.41;% +RoyalBlue1,.284,.464,1;% +RoyalBlue2,.264,.43,.932;% +RoyalBlue3,.228,.372,.804;% +RoyalBlue4,.152,.25,.545;% +Salmon1,1,.55,.41;% +Salmon2,.932,.51,.385;% +Salmon3,.804,.44,.33;% +Salmon4,.545,.298,.224;% +SeaGreen1,.33,1,.624;% +SeaGreen2,.305,.932,.58;% +SeaGreen3,.264,.804,.5;% +SeaGreen4,.18,.545,.34;% +Seashell1,1,.96,.932;% +Seashell2,.932,.898,.87;% +Seashell3,.804,.772,.75;% +Seashell4,.545,.525,.51;% +Sienna1,1,.51,.28;% +Sienna2,.932,.475,.26;% +Sienna3,.804,.408,.224;% +Sienna4,.545,.28,.15;% +SkyBlue1,.53,.808,1;% +SkyBlue2,.494,.752,.932;% +SkyBlue3,.424,.65,.804;% +SkyBlue4,.29,.44,.545;% +SlateBlue1,.512,.435,1;% +SlateBlue2,.48,.404,.932;% +SlateBlue3,.41,.35,.804;% +SlateBlue4,.28,.235,.545;% +SlateGray1,.776,.888,1;% +SlateGray2,.725,.828,.932;% +SlateGray3,.624,.712,.804;% +SlateGray4,.424,.484,.545;% +Snow1,1,.98,.98;% +Snow2,.932,.912,.912;% +Snow3,.804,.79,.79;% +Snow4,.545,.536,.536;% +SpringGreen1,0,1,.498;% +SpringGreen2,0,.932,.464;% +SpringGreen3,0,.804,.4;% +SpringGreen4,0,.545,.27;% +SteelBlue1,.39,.72,1;% +SteelBlue2,.36,.675,.932;% +SteelBlue3,.31,.58,.804;% +SteelBlue4,.21,.392,.545;% +Tan1,1,.648,.31;% +Tan2,.932,.604,.288;% +Tan3,.804,.52,.248;% +Tan4,.545,.352,.17;% +Thistle1,1,.884,1;% +Thistle2,.932,.824,.932;% +Thistle3,.804,.71,.804;% +Thistle4,.545,.484,.545;% +Tomato1,1,.39,.28;% +Tomato2,.932,.36,.26;% +Tomato3,.804,.31,.224;% +Tomato4,.545,.21,.15;% +Turquoise1,0,.96,1;% +Turquoise2,0,.898,.932;% +Turquoise3,0,.772,.804;% +Turquoise4,0,.525,.545;% +VioletRed1,1,.244,.59;% +VioletRed2,.932,.228,.55;% +VioletRed3,.804,.196,.47;% +VioletRed4,.545,.132,.32;% +Wheat1,1,.905,.73;% +Wheat2,.932,.848,.684;% +Wheat3,.804,.73,.59;% +Wheat4,.545,.494,.4;% +Yellow1,1,1,0;% +Yellow2,.932,.932,0;% +Yellow3,.804,.804,0;% +Yellow4,.545,.545,0;% +Gray0,.745,.745,.745;% +Green0,0,1,0;% +Grey0,.745,.745,.745;% +Maroon0,.69,.19,.376;% +Purple0,.628,.125,.94} +\endinput +%% +%% End of file `x11nam.def'. diff --git a/Master/texmf-dist/tex/latex/xcolor/xcolor.sty b/Master/texmf-dist/tex/latex/xcolor/xcolor.sty index 46ae9595952..23d6d617cac 100644 --- a/Master/texmf-dist/tex/latex/xcolor/xcolor.sty +++ b/Master/texmf-dist/tex/latex/xcolor/xcolor.sty @@ -22,7 +22,7 @@ %% in the same archive or directory.) %% \ProvidesPackage{xcolor} - [2005/10/15 v2.06 LaTeX color extensions (UK)] + [2005/12/21 v2.09 LaTeX color extensions (UK)] %% %% ---------------------------------------------------------------- %% Copyright (C) 2003-2005 by Dr. Uwe Kern @@ -48,6 +48,7 @@ \catcode`\noexpand\;\the\catcode`\;\relax \catcode`\noexpand\/\the\catcode`\/\relax \catcode`\noexpand\"\the\catcode`\"\relax + \catcode`\noexpand\>\the\catcode`\>\relax \catcode`\noexpand\^^A\the\catcode`\^^A\relax} \catcode`\@=11 \catcode`\!=12 @@ -57,6 +58,7 @@ \catcode`\;=12 \catcode`\/=12 \catcode`\"=12 +\catcode`\>=12 \catcode`\^^A=\catcode`\% \edef\XC@@{\expandafter\noexpand\csname\string\XC@@\endcsname} \newif\ifcolors@ \colors@true @@ -67,7 +69,7 @@ \newif\ifconvertcolorsU \newif\ifblendcolors \newif\ifmaskcolors -\newif\ifXC@@xcp +\newif\ifXC@@fbox \XC@@fboxtrue \newif\ifXC@@tst \def\c@lor@error#1% {\ifcolorerrors@\PackageError{xcolor}{Undefined color #1}\@ehc @@ -75,22 +77,18 @@ \def\XC@append#1#2% {\ifx#1\@undefined\def#1{#2}\else\ifx#1\relax\def#1{#2}\else \toks@\expandafter{#1#2}\edef#1{\the\toks@}\fi\fi} -\def\XC@let@cc#1% - {\expandafter\XC@let@Nc\csname#1\endcsname} -\providecommand*\@namelet[1]% - {\expandafter\XC@let@Nc\csname#1\endcsname} -\def\XC@let@Nc#1#2% - {\expandafter\let\expandafter#1\csname#2\endcsname} -\def\XC@let@cN#1% - {\expandafter\let\csname#1\endcsname} +\def\XC@let@cc#1{\expandafter\XC@let@Nc\csname#1\endcsname} +\providecommand*\@namelet[1]{\expandafter\XC@let@Nc\csname#1\endcsname} +\def\XC@let@Nc#1#2{\expandafter\let\expandafter#1\csname#2\endcsname} +\def\XC@let@cN#1{\expandafter\let\csname#1\endcsname} \def\@namexdef#1{\expandafter\xdef\csname #1\endcsname} \def\aftergroupdef#1#2% {\expandafter\endgroup\expandafter\def\expandafter#1\expandafter{#2}} \def\aftergroupedef#1#2% - {\edef\@@tmp{\noexpand\def\noexpand#1{#2}}\expandafter\endgroup\@@tmp} + {\edef\@@tmp{\def\noexpand#1{#2}}\expandafter\endgroup\@@tmp} \begingroup \catcode`\!=13 \catcode`\:=13 \catcode`\-=13 \catcode`\+=13 -\catcode`\;=13 \catcode`\/=13 \catcode`\"=13 +\catcode`\;=13 \catcode`\/=13 \catcode`\"=13 \catcode`\>=13 \gdef\XC@edef#1#2% {\begingroup \ifnum\catcode`\!=13 \edef!{\string!}\fi @@ -99,13 +97,29 @@ \ifnum\catcode`\+=13 \edef+{\string+}\fi \ifnum\catcode`\;=13 \edef;{\string;}\fi \ifnum\catcode`\"=13 \edef"{\string"}\fi + \ifnum\catcode`\>=13 \edef>{\string>}\fi \edef#1{#2}\@onelevel@sanitize#1\aftergroupdef#1#1} \gdef\XC@mdef#1#2% {\begingroup \ifnum\catcode`\/=13 \edef/{\string/}\fi + \ifnum\catcode`\:=13 \edef:{\string:}\fi \edef#1{#2}\@onelevel@sanitize#1\aftergroupdef#1#1} \endgroup \def\XC@sdef#1#2{\edef#1{#2}\@onelevel@sanitize#1} +\def\@ifxempty#1{\@@ifxempty#1\@@ifxempty\XC@@} +\def\@@ifxempty#1#2\XC@@ + {\ifx#1\@@ifxempty + \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} +\long\def\XC@ifxcase#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@} +\long\def\XC@ifcase#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@} \def\XC@@opt{,} \def\@ifXCopt#1% {\@expandtwoargs\in@{,#1,}{\XC@@opt}% @@ -124,7 +138,7 @@ \else \edef\XC@tgt@mod##1{#1}\convertcolorsDtrue\convertcolorsUtrue \fi\fi}} -\@tfor\@@tmp:={ignore}{named}{ps}{wave}\do +\@tfor\@@tmp:={Hsb}{tHsb}{ignore}{named}{ps}{wave}\do {\expandafter\XC@sdef\csname XC@mod@\@@tmp\endcsname{\@@tmp}} \@tfor\@@tmp:={natural}{rgb}{cmy}{cmyk}{hsb}{gray}{RGB}{HTML}{HSB}{Gray}\do {\expandafter\XC@sdef\csname XC@mod@\@@tmp\endcsname{\@@tmp}% @@ -151,6 +165,7 @@ \let\colornameprefix\XC@@nameprefix}}} \XC@declarenames{dvipsnames}{dvipsnam}{\let\colornameprefix\@empty} \XC@declarenames{svgnames}{svgnam}{} +\XC@declarenames{x11names}{x11nam}{} \XC@declarenames{hksnames}% {hks\ifcase\paperquality k\or n\or k\or z\else n\fi nam}{} \XC@declarenames{pmsnames}{pmsnam}{} @@ -174,17 +189,22 @@ {emtex}{pctex32}{pctexhp}{pctexps}{pctexwin}{pdftex}% {tcidvi}{textures}{truetex}{vtex}{xetex}\do {\edef\@@tmp{\noexpand\DeclareOption{\@@tmp}% - {\noexpand\def\noexpand\Gin@driver{\@@tmp.def}}}% + {\def\noexpand\Gin@driver{\@@tmp.def}}}% \@@tmp} \DeclareOption{dviwindo}{\ExecuteOptions{dvipsone}} \DeclareOption{oztex}{\ExecuteOptions{dvips}} \DeclareOption{xdvi}{\ExecuteOptions{dvips,monochrome}} -\DeclareOption{prologue}{\XC@@xcptrue} +\DeclareOption{xcdraw}{\def\XC@@xcd@{1}} +\DeclareOption{noxcdraw}{\def\XC@@xcd@{-1}} +\DeclareOption{prologue}{\def\XC@@xcp@{1}} +\DeclareOption{kernelfbox}{\XC@@fboxfalse} \DeclareOption{showerrors}{\colorerrors@true} \DeclareOption{hideerrors}{\colorerrors@false} \DeclareOption{debugshow}{\catcode`\^^A=9 \let\GDebug\typeout} \DeclareOption*% {\PackageInfo{xcolor}{Package option `\CurrentOption' ignored}} +\def\XC@@xcd@{-1} +\def\XC@@xcp@{-1} \ExecuteOptions{natural,showerrors} \InputIfFileExists{color.cfg}{}{} \let\@declareoption\XC@declareoption @@ -202,32 +222,36 @@ \def\@@tmp#1.def{\def\XC@@drv{#1}} \expandafter\@@tmp\Gin@driver \fi -\def\XC@@drv@{-1} -\@tfor\@@tmp:={dvips}{pctex32}\do - {\ifx\@@tmp\XC@@drv\def\XC@@drv@{0}\@break@tfor\fi} -\ifXC@@xcp\ifcase\XC@@drv@ - \AtBeginDvi{\special{header=xcolor.pro}\special{header=\jobname.xcp}} - \newwrite\XC@@xcp\immediate\openout\XC@@xcp=\jobname.xcp - \immediate\write\XC@@xcp{\@percentchar!} - \immediate\write\XC@@xcp{TeXDict begin} - \AtEndDocument - {\immediate\write\XC@@xcp{end}\immediate\closeout\XC@@xcp} -\fi\fi +\count@\XC@@xcd@ \advance\count@\XC@@xcp@\relax +\ifnum\count@>-2 + \XC@ifcase\XC@@drv + {{dvips,pctex32}% + {\def\@tempa{0} + \def\XC@special#1{\special{ps:XC!b}\special{"#1}\special{ps:XC!e}}}% + {pdftex}% + {\def\@tempa{1} + \def\XC@special#1{\pdfliteral{ q #1 Q }}}% + {dvipdfm}% + {\def\@tempa{1} + \def\XC@special#1{\special{pdf: content #1}}}% + }{\def\@tempa{-1}} + \ifnum\XC@@xcd@>\m@ne\let\XC@@xcd@\@tempa\fi + \ifnum\XC@@xcp@>\m@ne\let\XC@@xcp@\@tempa\fi + \ifnum\@tempa=0 \AtBeginDvi{\special{header=xcolor.pro}}\fi + \ifcase\XC@@xcp@ + \AtBeginDvi{\special{header=\jobname.xcp}} + \newwrite\XC@@xcp\immediate\openout\XC@@xcp=\jobname.xcp + \immediate\write\XC@@xcp{\@percentchar!} + \immediate\write\XC@@xcp{TeXDict begin} + \AtEndDocument + {\immediate\write\XC@@xcp{end}\immediate\closeout\XC@@xcp} + \fi +\fi \@nameuse{XC@pst} \@namedef{ver@color.sty}{1999/02/16} \XC@@pkg \long\def\@secondoffive#1#2#3#4#5{#2} \long\def\@thirdoffive#1#2#3#4#5{#3} -\def\@ifxempty#1{\@@ifxempty#1\@@ifxempty\XC@@} -\def\@@ifxempty#1#2\XC@@ - {\ifx#1\@@ifxempty - \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} -\long\def\XC@ifxcase#1#2#3% - {\long\def\XC@ifxc@se##1##2% - {\ifx#1##1% - \toks@{##2}\expandafter\remove@to@nnil\else - \expandafter\XC@ifxc@se\fi}% - \XC@ifxc@se#2#1{#3}\@nnil\the\toks@} \def\xglobal{\xglobal@stop\begingroup\futurelet\@@tok\xglobal@test} \def\xglobal@test {\expandafter\@tfor\expandafter\@@tmp @@ -255,6 +279,20 @@ {\ifx,#2% #1\expandafter\remove@to@nnil\else#1 \expandafter\XC@strip@comma\fi #2} +{\catcode`Q=3 + \gdef\XC@replace#1#2#3% + {\begingroup + \def\XC@repl@ce##1#2##2Q##3% + {\@ifxempty{##2}{\XC@r@pl@ce##1Q}{\XC@repl@ce##1##3##2Q{##3}}}% + \def\XC@r@pl@ce##1\@empty Q% + {\expandafter\endgroup\expandafter\def\expandafter#1\expandafter{##1}}% + \expandafter\XC@repl@ce\expandafter\@empty #1\@empty#2Q{#3}} +} +\def\XC@clean#1% + {\edef#1{ #1 }\edef#1{\expandafter\XC@strip@comma#1,,\@nnil}% + \edef#1{\expandafter\XC@cle@n#1\@empty}% + \edef#1{\expandafter\@gobbletwo#1}} +\def\XC@cle@n#1 #2{,#1\ifx#2\@empty\else\expandafter\XC@cle@n\fi#2} \def\rdivide#1#2% {\begingroup\toks@{#1}\edef\@@tmp{\noexpand\@tempdima\the#1}% \@defaultunits\@tempdimb=#2pt\relax\@nnil \@@tmp\relax @@ -350,8 +388,9 @@ \def\XC@calcC#1#2% {\llshiftset\dimen@{-#1}\advance\dimen@100\p@ \rrshift\dimen@ \XC@calcN{\strip@pt\dimen@}#2} -\def\XC@calcD#1#2% - {\dimen@#1\p@ \rdivide\dimen@\@@scl \edef#2{\strip@pt\dimen@}} +\def\XC@calcD{\XC@c@lcD\@@scl{}} +\def\XC@c@lcD#1#2#3#4% + {\dimen@#3\p@ \rdivide\dimen@{#1}\edef#4{\strip@pt\dimen@#2}} \def\XC@calcF#1#2% {\edef#2{#1}\expandafter\XC@c@lcF#2.0.:#2} \def\XC@c@lcF#1.#2.#3:#4% @@ -375,9 +414,13 @@ {\ifnum#10>0 1.00000\else 0.\ifnum#11<0 00000\else \XC@c@@cR#200000:\fi\fi} \def\XC@c@@cR#1#2#3#4#5#6:{#1#2#3#4#5} -\def\XC@calcS#1#2% - {\lshiftset\dimen@{#1}\dimen@\lshiftnum\@@scl\dimen@ \rrshift\dimen@ - \edef#2{\strip@pt\dimen@}} +\def\XC@calcS{\XC@c@lcS\@@scl{}} +\def\XC@c@lcS#1#2#3#4% + {\lshiftset\dimen@{#3}% + \ifdim#1\p@<100\p@ + \dimen@\lshiftnum#1\dimen@ \rrshift\dimen@ \else + \dimen@#1\dimen@ \rshift\dimen@ \fi + \edef#4{\strip@pt\dimen@#2}} \def\XC@calcT#1#2% {\lshiftset\dimen@{#1}\advance\dimen@\lshiftnum\@@arg\p@ \rshift\dimen@ \edef#2% @@ -386,13 +429,15 @@ {\dimen@#1\p@ \ifdim\dimen@=\p@\else \afterassignment\dimen@\count@=\the\dimen@ - \ifnum\count@<\z@ - \lshift\dimen@ \dimen@-\dimen@ \advance\dimen@10\p@ \rshift\dimen@ + \relax\ifdim\dimen@=\z@\else + \ifdim#1\p@<\z@ \dimen@-\dimen@ \advance\dimen@\p@ \fi \fi \fi \edef#2{\strip@pt\dimen@}} \providecommand*\rangeRGB{255} \providecommand*\rangeHSB{240} +\providecommand*\rangeHsb{360} +\providecommand*\rangetHsb{60,30;120,60;180,120;210,180;240,240} \providecommand*\rangeGray{15} \providecommand*\adjustUCRBG{1,1,1,1} \providecommand*\paperquality{1} @@ -413,10 +458,7 @@ {\begingroup \XC@sdef\@@cls{#1}\XC@edef\@@nam{#2}\edef\colornameprefix{#3}% \XC@logdef\@@nam - \ifXC@@getmod\XC@getmod{#4}\XC@@pos\@@mod\fi - \XC@getclr{#5}\XC@@pos\@@clr - \@ifundefined{color@\@@mod}% - {\c@lor@error{model `\@@mod'}\let\@@tmp\relax}% + \XC@getmodclr02{#4}{#5}{\let\@@tmp\relax}% {\ifx\@@mod\XC@mod@named \XC@c@l@rlet\@@nam\@@clr \else @@ -431,11 +473,11 @@ \XC@coremodel\@@mod\@@clr \csname color@\@@mod\expandafter\endcsname \expandafter\@@drv\expandafter{\@@clr}% - \ifXC@@xcp\ifcase\XC@@drv@ + \ifcase\XC@@xcp@ \immediate\write\XC@@xcp{/\colornameprefix\@@nam{\expandafter \XC@strip@comma\@@clr,,\@nnil}XC\@@mod}% \let\@@cls\XC@mod@named - \fi\fi + \fi \ifx\@@cls\@empty\else \let\@@tmp\@@cls \@nameuse{define@color@\@@cls}\@@nam\@@drv @@ -450,27 +492,41 @@ {\noexpand\xcolor@{\@@cls}{\the\toks@}{\@@mod}{\@@clr}}}% \fi}% \expandafter\endgroup\@@tmp\xglobal@stop} -\def\XC@getmod#1#2#3% - {\def\XC@getm@d##1/##2/##3/##4/##5/##6/##7/##8/##9:% - {\XC@g@tm@d0{##1}\XC@g@tm@d1{##2}\XC@g@tm@d2{##3}\XC@g@tm@d3{##4}% - \XC@g@tm@d4{##5}\XC@g@tm@d5{##6}\XC@g@tm@d6{##7}\XC@g@tm@d7{##8}% - \def#2{0}\def#3{##1}\@gobble\@nnil}% - \def\XC@g@tm@d##1##2% - {\edef#2{##2}\XC@sdef#3{\XC@tgt@mod#2}% - \ifx#2#3\def#2{##1}\expandafter\remove@to@nnil\fi}% - \XC@mdef#3{#1}\expandafter\XC@getm@d#3////////:} +\def\XC@getmodclr#1#2#3#4% + {\ifnum\ifcase#1 \ifXC@@getmod1\else0 \fi \or1 \fi>0 + \XC@mdef\@@mod{#3}\expandafter\XC@getmod\@@mod////////\XC@@ + \@ifundefinedmodel\@@Mod{\let\@@Mod\XC@mod@ignore}{}\fi + \@ifundefined{XC@mod@\@@mod}% + {\c@lor@error{model `\@@mod'}\@firstoftwo}% + {\ifcase#2\else + \XC@mdef\@@clr{#4}% + \edef\@@clr{\expandafter\XC@getclr\@@clr////////\XC@@}% + \ifx\@@cls\XC@mod@ps\else\XC@clean\@@clr\fi + \ifx\@@Mod\XC@mod@ignore\else + \convertcolorspec\@@mod\@@clr\@@Mod\@@clr + \ifnum#2>1 \let\@@mod\@@Mod\fi + \fi + \fi \@secondoftwo}} +\def\XC@getmod#1/#2/#3/#4/#5/#6/#7/#8/#9\XC@@ + {\XC@g@tm@d0#1::\XC@@ \XC@getm@d1{#2}\XC@getm@d2{#3}% + \XC@getm@d3{#4}\XC@getm@d4{#5}\XC@getm@d5{#6}\XC@getm@d6{#7}% + \XC@getm@d7{#8}\def\XC@@pos{0}\def\@@mod{#1}\@gobble\@nnil}% +\def\XC@getm@d#1#2% + {\edef\XC@@pos{#2}\XC@sdef\@@mod{\XC@tgt@mod\XC@@pos}% + \ifx\XC@@pos\@@mod\def\XC@@pos{#1}\expandafter\remove@to@nnil\fi}% +\def\XC@g@tm@d#1#2:#3:#4\XC@@ + {\@ifxempty{#3}{\let\@@Mod\XC@mod@ignore\XC@getm@d0{#2}}% + {\def\@@Mod{#2}\XC@getm@d0{#3}}}% +\def\XC@getclr#1/#2/#3/#4/#5/#6/#7/#8/#9\XC@@ + {\ifcase\XC@@pos\space #1\or#2\or#3\or#4\or#5\or#6\or#7\or#8\fi} \newif\ifXC@@getmod \XC@@getmodtrue -\def\XC@getclr#1#2#3% - {\def\XC@getc@r##1/##2/##3/##4/##5/##6/##7/##8/##9:% - {\ifcase#2 ##1\or##2\or##3\or##4\or##5\or##6\or##7\or##8\fi}% - \XC@mdef#3{#1}\edef#3{\expandafter\XC@getc@r#3////////:}} \let\xdefinecolor\definecolor \def\providecolor{\@testopt{\XC@providecolor}{}} \def\XC@providecolor[#1]#2% {\@testopt{\XC@providec@lor[#1]{#2}}\colornameprefix} \def\XC@providec@lor[#1]#2[#3]% {\XC@edef\XC@@tmp{#2}% - \@ifundefined{\string\color@\XC@@tmp}{\XC@definecolor[#1]{#2}[#3]}% + \@ifundefinedcolor\XC@@tmp{\XC@definecolor[#1]{#2}[#3]}% {\ifnum\XC@tracing>0 \PackageInfo{xcolor}{Ignoring color definition `\XC@@tmp'}\fi \@gobbletwo}} @@ -502,7 +558,7 @@ \fi \expandafter\endgroup\@@tmp\xglobal@stop} \def\XC@c@l@rlet#1#2% - {\@ifundefined{\string\color@#2}% + {\@ifundefinedcolor{#2}% {\c@lor@error{`#2'}\let\@@tmp\@empty}% {\edef\@@tmp {\ifglobalcolors\global\else\xglobal@\fi @@ -513,14 +569,11 @@ \def\XC@preparecolor[#1]#2% {\@testopt{\XC@preparec@lor[#1]{#2}}\colornameprefix} \def\XC@preparec@lor[#1]#2[#3]#4#5% - {\XC@edef\@@nam{#2}% - \ifXC@@getmod\XC@getmod{#4}\XC@@pos\@@mod\fi - \XC@getclr{#5}\XC@@pos\@@clr - \@ifundefined{XC@mod@\@@mod}% - {\c@lor@error{model `\@@mod'}}% + {\XC@sdef\@@cls{#1}\XC@edef\@@nam{#2}% + \XC@getmodclr01{#4}{#5}{}% {\xdef\XC@@stack - {\ifx\XC@@stack\@empty\else\XC@@stack,\fi - {#1}{\@@nam}{#3}{\@@mod}{\@@clr}}}} + {\ifx\XC@@stack\@empty\else\XC@@stack,\fi{#1}{\@@nam}{#3}% + {\ifx\@@Mod\XC@mod@ignore\@@mod\else\@@Mod\fi}{\@@clr}}}} \let\XC@@stack\@empty \def\definecolors#1% {\let\XC@@cmd\definecolor\let\XC@@glb\xglobal@ @@ -544,13 +597,13 @@ \def\definecolorset {\let\XC@@cmd\definecolor\@testopt{\XC@definecolorset}{}} \def\XC@definecolorset[#1]#2#3#4#5% - {\XC@getmod{#2}\XC@@pos\@@mod\XC@@getmodfalse\XC@edef\XC@@tmp{#5}% - \let\XC@@glb\xglobal@ - \def\XC@definec@lorset##1,##2;% - {\@ifxempty{##1}{}% - {\let\xglobal@\XC@@glb - \XC@@cmd[#1]{#3##1#4}{\@@mod}{##2}\XC@definec@lorset}}% - \expandafter\XC@definec@lorset\XC@@tmp;,;\XC@@getmodtrue} + {\XC@getmodclr10{#2}{}{}% + {\XC@@getmodfalse\XC@edef\XC@@tmp{#5}\let\XC@@glb\xglobal@ + \def\XC@definec@lorset##1,##2;% + {\@ifxempty{##1}{}% + {\let\xglobal@\XC@@glb + \XC@@cmd[#1]{#3##1#4}{\@@mod}{##2}\XC@definec@lorset}}% + \expandafter\XC@definec@lorset\XC@@tmp;,;\XC@@getmodtrue}} \def\providecolorset {\let\XC@@cmd\providecolor\@testopt{\XC@definecolorset}{}} \def\preparecolorset @@ -605,8 +658,7 @@ {\edef\@@tmp{\@nameuse{\string\colorB@#1}}% \expandafter\XC@st@p\@@tmp{#1}% \edef\@@tmp - {\noexpand\def\noexpand\@@mod{\@@mod}% - \noexpand\def\noexpand\@@clr{\@@tmp}}} + {\def\noexpand\@@mod{\@@mod}\def\noexpand\@@clr{\@@tmp}}} \def\blendcolors{\@ifstar{\XC@blendcolors\colorblend}{\XC@blendcolors{}}} \def\XC@blendcolors#1#2% {\edef\colorblend{#1}\XC@edef\XC@@tmp{#2}% @@ -641,34 +693,35 @@ {\@ifnextchar[\@undeclaredcolor\@declaredcolor} \def\@undeclaredcolor[#1]#2% {\begingroup - \XC@sdef\@@mod{#1}\XC@edef\@@clr{#2}% - \ifblendcolors - \ifx\colorblend\@empty\else - \edef\@@mix{\expandafter\@gobble\colorblend}\@tempswafalse - \XC@coremodel\@@mod\@@clr\@xcolor@{}{}\@@mod\@@clr + \let\@@cls\@empty + \XC@getmodclr12{#1}{#2}{}% + {\ifblendcolors + \ifx\colorblend\@empty\else + \edef\@@mix{\expandafter\@gobble\colorblend}\@tempswafalse + \XC@coremodel\@@mod\@@clr\@xcolor@{}{}\@@mod\@@clr + \fi \fi - \fi - \ifconvertcolorsU - \edef\@@tmp{\XC@tgt@mod{\@@mod}}% - \convertcolorspec\@@mod\@@clr\@@tmp\@@clr \let\@@mod\@@tmp - \fi - \ifmaskcolors - \convertcolorspec\@@mod\@@clr\XC@mmod\@@clr - \let\@@mod\XC@mmod - \XC@inflate\@@mod\XC@mclr\@@clr\@@tmp - \expandafter\XC@mul\@@tmp,\@@clr - \fi - \edef\@@tmp{\noexpand\XC@undeclaredcolor{\@@mod}{\@@clr}}% - \expandafter\endgroup\@@tmp} + \ifconvertcolorsU + \edef\@@tmp{\XC@tgt@mod{\@@mod}}% + \convertcolorspec\@@mod\@@clr\@@tmp\@@clr \let\@@mod\@@tmp + \fi + \ifmaskcolors + \convertcolorspec\@@mod\@@clr\XC@mmod\@@clr + \let\@@mod\XC@mmod + \XC@inflate\@@mod\XC@mclr\@@clr\@@tmp + \expandafter\XC@mul\@@tmp,\@@clr + \fi + \edef\@@tmp{\noexpand\XC@undeclaredcolor{\@@mod}{\@@clr}}% + \expandafter\endgroup\@@tmp}} \def\XC@undeclaredcolor#1#2% - {\@ifundefined{color@#1}% + {\@ifundefinedmodel{#1}% {\c@lor@error{model `#1'}}% {\@nameuse{color@#1}\current@color{#2}% \edef\XC@current@color{\noexpand\xcolor@{}{\current@color}{#1}{#2}}% \XC@display}} \def\@declaredcolor#1% {\XC@edef\XC@@tmp{#1}\XC@@tstfalse - \ifcase\XC@type{\XC@@tmp}\relax \XC@@tsttrue\or \relax\else + \ifcase\XC@type\XC@@tmp\relax \XC@@tsttrue\or \relax\else \ifblendcolors\XC@@tsttrue\fi \ifmaskcolors\XC@@tsttrue\fi \ifconvertcolorsU\XC@@tsttrue\fi \fi @@ -683,6 +736,96 @@ {\XC@let@Nc\XC@current@color{\string\color@\XC@@tmp}% \edef\current@color{\XC@current@color}% \XC@display} +\def\textcolor#1#{\@textcolor{#1}} +\def\@textcolor#1#2#3{\protect\leavevmode{\color#1{#2}#3}} +\def\pagecolor + {\begingroup + \let\ignorespaces\endgroup \let\set@color\set@page@color + \color} +\def\colorbox#1#{\color@box{#1}} +\def\color@box#1#2{\color@b@x\relax{\color#1{#2}}} +\def\fcolorbox#1#{\color@fbox{#1}} +\def\color@fbox#1#2#3#{\color@fb@x{#1}{#2}{#3}} +\def\color@fb@x#1#2#3#4% + {\color@b@x{\fboxsep\z@\color#1{#2}\XC@fbox}% + {\@ifxempty{#3}{\color#1}{\color#3}{#4}}} +\long\def\color@b@x#1#2#3% + {\leavevmode + \setbox\z@\hbox{\kern\fboxsep{\set@color#3}\kern\fboxsep}% + \dimen@\ht\z@\advance\dimen@\fboxsep\ht\z@\dimen@ + \dimen@\dp\z@\advance\dimen@\fboxsep\dp\z@\dimen@ + {#1{#2\color@block{\wd\z@}{\ht\z@}{\dp\z@}\box\z@}}} +\def\XC@frameb@x#1% + {\hbox + {\@tempdima\fboxrule \advance\@tempdima\fboxsep + \advance\@tempdima\dp\@tempboxa + \setbox\@tempboxa\hbox + {\lower\@tempdima\hbox + {\vbox + {\kern\fboxrule + \hbox + {\kern\fboxrule#1% + \vbox{\kern\fboxsep\box\@tempboxa\kern\fboxsep}% + #1\kern\fboxrule}% + \kern\fboxrule}}}% + \@tempdima\wd\@tempboxa + \edef\@tempa{{\the\@tempdima}{\the\ht\@tempboxa}{\the\dp\@tempboxa}}% + \box\@tempboxa\kern-\@tempdima\expandafter\boxframe\@tempa}} +\ifXC@@fbox + \let\@frameb@x\XC@frameb@x \let\XC@fbox\fbox +\else + \def\XC@fbox{\let\@frameb@x\XC@frameb@x\fbox} +\fi + +\ifnum\XC@@xcd@>\m@ne +\def\XC@boxframe#1#2#3#4% + {\hbox{\sbox\z@{\ifdim\fboxrule>\z@ #4\fi}% + \wd\z@#1\relax\ht\z@#2\relax\dp\z@#3\relax\box\z@}} +\fi +\ifcase\XC@@xcd@ +\providecommand*\color@block[3]% + {{\set@color\hbox + {\dimen@#3\edef\@tempa{ \number\dimen@\space}% + \dimen@#2\edef\@tempa{ \number\dimen@\@tempa}% + \dimen@#1\relax + \XC@special{\number\dimen@\@tempa XCcolorblock}}}} +\providecommand*\boxframe[3]% + {\XC@boxframe{#1}{#2}{#3}% + {\dimen@#3\edef\@tempa{ \number\dimen@\space}% + \dimen@#2\edef\@tempa{ \number\dimen@\@tempa}% + \dimen@#1\relax + \XC@special{\number\fboxrule\space\number\dimen@\@tempa XCboxframe}}} +\or +\providecommand*\boxframe[3]% + {\XC@boxframe{#1}{#2}{#3}% + {\dimen@#3\edef\@tempa{ 0 -\strip@pt\dimen@\space}% + \edef\@tempb{\advance\dimen@\the\dimen@}% + \dimen@#2\advance\dimen@-\fboxrule\@tempb + \edef\@tempb{ \strip@pt\dimen@\space re s}% + \dimen@#1\advance\dimen@-\fboxrule + \edef\@tempb{ cm\@tempa\strip@pt\dimen@\@tempb}% + \dimen@.5\fboxrule\edef\@tempa{ \strip@pt\dimen@}% + \XC@special + {0.996264 0 0 0.996264 0 0 cm + \strip@pt\fboxrule\space w [] 0 d 2 J 0 j 4 M + 1 0 0 1\@tempa\@tempa\@tempb}}} +\fi +\providecommand*\color@block[3]% + {{\set@color\rlap{\ifcolors@\vrule\@width#1\@height#2\@depth#3\fi}}} +\providecommand*\boxframe[3]% + {\hbox + {\dimen@#2\advance\dimen@#3\relax + \lower#3\vbox + {\hrule\@height\fboxrule + \@tempdima-0.5\fboxrule \ifodd\fboxrule\advance\@tempdima\m@ne sp\fi + \kern\@tempdima + \hbox + {\advance\dimen@-\fboxrule + \vrule\@width\fboxrule\@height\dimen@\@depth\z@ + \@tempdima#1\advance\@tempdima-\tw@\fboxrule \kern\@tempdima + \vrule\@width\fboxrule\@height\dimen@\@depth\z@}% + \kern-0.5\fboxrule + \hrule\@height\fboxrule}}} \def\@xcolor@#1#2#3#4% {\edef\@@mod{#3}\edef\@@clr{#4}% \ifx\@@mix\@empty\else\expandafter\@xcolor@@\@@mix!!!!\@nil\fi @@ -720,22 +863,24 @@ {\@ifxempty{#4}{}{\@xcolor@@!#4!#5\@nil}}% {\@xcolor@@#3!#4!#5\@nil}} \def\XC@split#1% - {\begingroup\XC@edef\@@tmp{#1}\expandafter\XC@split@i\@@tmp:\@nil} -\def\XC@split@i#1:#2\@nil - {\@ifxempty{#2}{\XC@split@v}{\XC@split@ii#1,,:#2}} -\def\XC@split@ii#1,#2,#3:#4:% + {\begingroup\XC@edef\@@tmp{#1}\expandafter\XC@split@i\@@tmp>>\@nnil} +\def\XC@split@i#1>% + {\def\@@tmp{#1}\XC@split@ii#1:\@nil \XC@func} +\def\XC@split@ii#1:#2\@nil + {\@ifxempty{#2}{\XC@split@vi}{\XC@split@iii#1,,:#2}} +\def\XC@split@iii#1,#2,#3:#4:% {\edef\XC@@mod{#1}\let\@tempa\@empty \ifx,#2,\XC@@tsttrue\@tempdima\z@\else\XC@@tstfalse\@tempdima#2\p@\fi - \XC@split@iii#4;,;} -\def\XC@split@iii#1,#2;% + \XC@split@iv#4;,;} +\def\XC@split@iv#1,#2;% {\@ifxempty{#1}% {\let\XC@@clr\@empty \@tempa \expandafter\XC@calc@\XC@@clr,,,,:U% \let\@@mod\XC@@mod \let\@@clr\@@tmp} - {\XC@append\@tempa{\XC@split@iv{#1}{#2}}% + {\XC@append\@tempa{\XC@split@v{#1}{#2}}% \ifXC@@tst\advance\@tempdima#2\p@\fi - \XC@split@iii}} -\def\XC@split@iv#1#2% - {\def\@@tmp{#1}\XC@split@v + \XC@split@iv}} +\def\XC@split@v#1#2% + {\def\@@tmp{#1}\XC@split@vi \ifx\@@mod\XC@@mod\else \convertcolorspec\@@mod\@@clr\XC@@mod\@@clr \fi @@ -746,14 +891,14 @@ \XC@inflate\XC@@mod\XC@@clr\@@tmp\@@tmp \expandafter\XC@add\@@tmp,\XC@@clr \fi} -\def\XC@split@v{\count@\z@ \expandafter\XC@split@vi\@@tmp!\@nil} -\def\XC@split@vi#1% - {\ifx#1-\advance\count@\@ne\expandafter\XC@split@vi - \else\expandafter\XC@split@vii\expandafter#1\fi} -\def\XC@split@vii#1!#2\@nil +\def\XC@split@vi{\count@\z@ \expandafter\XC@split@vii\@@tmp!\@nil} +\def\XC@split@vii#1% + {\ifx#1-\advance\count@\@ne\expandafter\XC@split@vii + \else\expandafter\XC@split@viii\expandafter#1\fi} +\def\XC@split@viii#1!#2\@nil {\edef\@@nam{#1}\edef\@@mix{#2}% \ifodd\count@\@tempswatrue\else\@tempswafalse\fi - \@ifundefined{\string\color@\@@nam}% + \@ifundefinedcolor\@@nam {\c@lor@error{`\@@nam'}\def\@@nam{black}}{}% \let\xcolor@\@xcolor@\@nameuse{\string\color@\@@nam}} \def\XC@postfix#1#2]#3\relax @@ -767,41 +912,40 @@ \ifnum\@tempcnta=\z@\relax\else\XC@step\@@nam\fi \let\@@tmp\@empty \fi\expandafter\endgroup\@@tmp} +\def\XC@func#1>{\@ifxempty{#1}{\remove@to@nnil}{\XC@fun@#1,>\XC@func}} +\def\XC@fun@#1,#2>{\@nameuse{XC@func@#1}#2,,>} +\def\XC@func@wheel#1,#2,#3>{\XC@func@wh@el{#1}{#2}0} +\def\XC@func@twheel#1,#2,#3>{\XC@func@wh@el{#1}{#2}1} +\def\XC@func@wh@el#1#2#3% + {\convertcolorspec\@@mod\@@clr + {\ifcase#3 \XC@mod@Hsb\or\XC@mod@tHsb\fi}\@@clr + \expandafter\XC@extract@hue\@@clr:\@@hue \dimen@#1\p@ + \@ifxempty{#2}{}% + {\rdivide\dimen@{#2}\lshift\dimen@ + \dimen@\rangeHsb\dimen@\rshift\dimen@}% + \advance\dimen@\@@hue\p@ \rdivide\dimen@\rangeHsb + \edef\@@hue{\strip@pt\dimen@}\XC@calcU\@@hue\@@hue + \ifcase#3 + \expandafter\XC@replace@hue\@@clr:\@@hue,\@@clr + \or + \XC@c@lcS\rangeHsb{}\@@hue\@@hue + \expandafter\XC@replace@hue\@@clr:\@@hue,\@@clr + \convertcolorspec\XC@mod@tHsb\@@clr\XC@mod@hsb\@@clr + \fi + \let\@@mod\XC@mod@hsb} \def\XC@display {\XC@bcolor\XC@let@cN{\string\color@.}\XC@current@color \ifnum\XC@type{.}=1 - \PackageWarning{xcolor}{Incompatible color definition}% - \else - \ifnum\XC@tracing>2 - \begingroup \let\xcolor@\@empty \def\@nil{\string\@nil}% - \PackageInfo{xcolor}{Setting color `\XC@current@color'}% - \endgroup - \fi - \fi + \PackageWarning{xcolor}{Incompatible color definition}\else + \ifnum\XC@tracing>2 + \begingroup \let\xcolor@\@empty \def\@nil{\string\@nil}% + \PackageInfo{xcolor}{Setting color `\XC@current@color'}% + \endgroup + \fi\fi \XC@mcolor\set@color\XC@ecolor\ignorespaces} \let\XC@bcolor\relax \let\XC@mcolor\relax \let\XC@ecolor\relax -\def\textcolor#1#{\@textcolor{#1}} -\def\@textcolor#1#2#3{\protect\leavevmode{\color#1{#2}#3}} -\def\color@block#1#2#3{% - {\set@color\rlap{\ifcolors@\vrule\@width#1\@height#2\@depth#3\fi}}} -\def\colorbox#1#{\color@box{#1}} -\def\color@box#1#2{\color@b@x\relax{\color#1{#2}}} -\def\fcolorbox#1#{\color@fbox{#1}} -\def\color@fbox#1#2#3{% - \color@b@x{\fboxsep\z@\color#1{#2}\fbox}{\color#1{#3}}} -\long\def\color@b@x#1#2#3{% - \leavevmode - \setbox\z@\hbox{\kern\fboxsep{\set@color#3}\kern\fboxsep}% - \dimen@\ht\z@\advance\dimen@\fboxsep\ht\z@\dimen@ - \dimen@\dp\z@\advance\dimen@\fboxsep\dp\z@\dimen@ - {#1{#2\color@block{\wd\z@}{\ht\z@}{\dp\z@}% - \box\z@}}} -\def\pagecolor - {\begingroup - \let\ignorespaces\endgroup \let\set@color\set@page@color - \color} \def\XC@bordercolor#1#2% {\extractcolorspec{#2}\XC@@tmp \expandafter\convertcolorspec\XC@@tmp\XC@mod@rgb\XC@@tmp @@ -846,7 +990,7 @@ \@norowcolor \newif\if@rowcolors \newif\if@rowcmd - \ifx\rownum\@undefined\newcount\rownum\fi + \@ifundefined{rownum}{\newcount\rownum}{} \def\CT@extract#1\columncolor#2#3\@nil {\if!#2% \let\CT@column@color\@empty @@ -868,6 +1012,9 @@ \edef#2{\expandafter\@firstoftwo#3}% \edef#3{\expandafter\@secondoftwo#3}} \def\XC@extract@hue#1,#2:#3{\edef#3{#1}} +\def\XC@replace@hue#1,#2:#3,#4{\edef#4{#3,#2}} +\def\@ifundefinedcolor#1{\@ifundefined{\string\color@#1}} +\def\@ifundefinedmodel#1{\@ifundefined{color@#1}} \def\XC@type#1% {\expandafter\expandafter\expandafter\XC@typ@ \csname\string\color@#1\endcsname\@empty\@empty\@empty\XC@@} @@ -881,16 +1028,17 @@ \fi} \def\XC@info#1#2% {\XC@edef#2{#1}% - \if.#2\def#2{0}\else\expandafter\in@\expandafter:\expandafter{#2}% + \if.#2\def#2{0}\else\expandafter\in@\expandafter>\expandafter{#2}% + \ifin@\def#2{4}\else\expandafter\in@\expandafter:\expandafter{#2}% \ifin@\def#2{3}\else\expandafter\in@\expandafter!\expandafter{#2}% \ifin@\def#2{2}\else\edef#2{\noexpand\in@{/-}{/#2}}#2% - \edef#2{\ifin@2\else1\fi}\fi\fi\fi} + \edef#2{\ifin@2\else1\fi}\fi\fi\fi\fi} \def\tracingcolors{\begingroup\afterassignment\XC@tracingcolors\count@} \def\XC@tracingcolors{\aftergroupdef\XC@tracing{\the\count@}} \tracingcolors=0 \def\XC@logdef#1% {\ifnum\XC@tracing>1 - \@ifundefined{\string\color@#1}% + \@ifundefinedcolor{#1}% {\ifnum\XC@tracing>2 \PackageInfo{xcolor}{Defining color `#1'}% \fi}% @@ -902,12 +1050,20 @@ {\advance\count@\@ne \XC@sdef\@@tmp{\@@tmp}\edef\@@nam{\@@nam{\@@tmp}}}% \edef\@@num{\the\count@}% + \def\XC@@gt{\textgreater}\def\@@tmp{OT1}% + \ifx\f@encoding\@@tmp + \@expandtwoargs\in@{,\f@family,}{,cmtt,pcr,}% + \ifin@\def\XC@@gt{>}\fi + \fi + \def\XC@@xcp@{-1}\ifnum\XC@tracing>1 \def\XC@tracing{1}\fi \def\testcolor{\@testopt{\@testcolor}{}}% \def\@testcolor[##1]##2% - {\@ifxempty{##1}% - {\def\@@arg{##2&}\def\@@clr{##2}}% - {\def\@@arg{[##1]{##2}&}\definecolor{*}{##1}{##2}\def\@@clr{*}}% - \extractcolorspecs\@@clr\@@mod\@@clr + {\XC@mdef\@@mod{##1}\XC@edef\@@clr{##2}% + \ifx\@@mod\@empty + \let\@@arg\@@clr\XC@replace\@@arg>\XC@@gt\else + \edef\@@arg{[\@@mod]{\@@clr}}\XC@definecolor[]{*}\@@mod\@@clr + \def\@@clr{*}\fi + \XC@append\@@arg{&}\extractcolorspecs\@@clr\@@mod\@@clr \@testc@lor}% \def\@testc@lor {\count@\z@ @@ -946,6 +1102,8 @@ {\XC@ifxcase#1% {\XC@mod@RGB {\convertcolorspec#1#2\XC@mod@rgb#2\let#1\XC@mod@rgb}% \XC@mod@HTML{\convertcolorspec#1#2\XC@mod@rgb#2\let#1\XC@mod@rgb}% + \XC@mod@Hsb {\convertcolorspec#1#2\XC@mod@hsb#2\let#1\XC@mod@hsb}% + \XC@mod@tHsb{\convertcolorspec#1#2\XC@mod@hsb#2\let#1\XC@mod@hsb}% \XC@mod@HSB {\convertcolorspec#1#2\XC@mod@hsb#2\let#1\XC@mod@hsb}% \XC@mod@Gray{\convertcolorspec#1#2\XC@mod@gray#2\let#1\XC@mod@gray}% \XC@mod@wave{\convertcolorspec#1#2\XC@mod@hsb#2\let#1\XC@mod@hsb}% @@ -957,17 +1115,15 @@ {\XC@mod@cmy {\XC@calc@#1,#2,#3,,:C}% \XC@mod@cmyk {\XC@calc@#1,#2,#3,,:C\expandafter\XC@cnv@cmy@cmyk\@@tmp,}% - \XC@mod@hsb {\XC@cnv@rgb@hsb#1,#2,#3,}% - \XC@mod@gray{\XC@cnv@rgb@gray#1,#2,#3,}% \XC@mod@RGB {\edef\@@scl{\rangeRGB}\XC@calc@#1,#2,#3,,:M}% \XC@mod@HTML{\edef\@@scl{\@cclv}\XC@calc@#1,#2,#3,,:M% \expandafter\XC@calc@\@@tmp,,:H% \expandafter\XC@cnv@rgb@HTML\@@tmp,}% - \XC@mod@HSB {\XC@cnv@rgb@hsb#1,#2,#3,% - \edef\@@scl{\rangeHSB}\expandafter\XC@calc@\@@tmp,,:M}% - \XC@mod@Gray{\XC@cnv@rgb@gray#1,#2,#3,% - \edef\@@scl{\rangeGray}\XC@calcM\@@tmp\@@tmp}}% - {\XC@calc@#1,#2,#3,,:N}} + \XC@mod@gray{\XC@cnv@rgb@gray#1,#2,#3,}% + \XC@mod@Gray{\XC@cnv@rgb@gray#1,#2,#3,\XC@cnv@gray\@@tmp,}}% + {\XC@cnv@rgb@hsb#1,#2,#3,\XC@cnv@hsb@}} +\def\XC@cnv@rgb@ + {\ifx\tm\XC@mod@rgb\else\expandafter\XC@cnv@rgb\@@tmp,\fi} \def\XC@cnv@rgb@hsb#1,#2,#3,% {\count@\z@ \ifdim#2\p@>#1\p@ \else\advance\count@4 \fi @@ -1001,18 +1157,11 @@ {\edef\@@tmp{#1#2#3}} \def\XC@cnv@cmy#1,#2,#3,% {\XC@ifxcase\tm - {\XC@mod@rgb {\XC@calc@#1,#2,#3,,:C}% - \XC@mod@cmyk{\XC@cnv@cmy@cmyk#1,#2,#3,}% - \XC@mod@hsb {\XC@calc@#1,#2,#3,,:C\expandafter\XC@cnv@rgb@hsb\@@tmp,}% + {\XC@mod@cmyk{\XC@cnv@cmy@cmyk#1,#2,#3,}% \XC@mod@gray{\XC@cnv@rgb@gray#1,#2,#3,\XC@calcC\@@tmp\@@tmp}% - \XC@mod@RGB {\XC@calc@#1,#2,#3,,:C% - \edef\@@scl{\rangeRGB}\expandafter\XC@calc@\@@tmp,,:M}% - \XC@mod@HTML{\XC@calc@#1,#2,#3,,:C\expandafter\XC@cnv@rgb\@@tmp,}% - \XC@mod@HSB {\XC@calc@#1,#2,#3,,:C\expandafter\XC@cnv@rgb@hsb\@@tmp,% - \edef\@@scl{\rangeHSB}\expandafter\XC@calc@\@@tmp,,:M}% \XC@mod@Gray{\XC@cnv@rgb@gray#1,#2,#3,\XC@calcC\@@tmp\@@tmp - \edef\@@scl{\rangeGray}\XC@calcM\@@tmp\@@tmp}}% - {\XC@calc@#1,#2,#3,,:N}} + \XC@cnv@gray\@@tmp,}}% + {\XC@calc@#1,#2,#3,,:C\XC@cnv@rgb@}} \def\XC@cnv@cmy@cmyk#1,#2,#3,% {\edef\@@scl {\ifdim#1\p@<#2\p@ @@ -1025,36 +1174,22 @@ \expandafter\XC@calc@\@@tmp,:N} \def\XC@cnv@cmyk#1,#2,#3,#4,% {\XC@ifxcase\tm - {\XC@mod@rgb - {\XC@cnv@cmyk@cmy#1,#2,#3,#4,\expandafter\XC@calc@\@@tmp,,:C}% - \XC@mod@cmy{\XC@cnv@cmyk@cmy#1,#2,#3,#4,}% - \XC@mod@hsb - {\XC@cnv@cmyk@cmy#1,#2,#3,#4,\expandafter\XC@calc@\@@tmp,,:C% - \expandafter\XC@cnv@rgb@hsb\@@tmp,}% - \XC@mod@gray{\XC@cnv@rgb@gray#1,#2,#3,% - \edef\@@arg{#4}\XC@calcT\@@tmp\@@tmp \XC@calcC\@@tmp\@@tmp}% - \XC@mod@RGB - {\XC@cnv@cmyk@cmy#1,#2,#3,#4,\expandafter\XC@calc@\@@tmp,,:C% - \edef\@@scl{\rangeRGB}\expandafter\XC@calc@\@@tmp,,:M}% - \XC@mod@HTML - {\XC@cnv@cmyk@cmy#1,#2,#3,#4,\expandafter\XC@cnv@cmy\@@tmp,}% - \XC@mod@HSB - {\XC@cnv@cmyk@cmy#1,#2,#3,#4,\expandafter\XC@calc@\@@tmp,,:C% - \expandafter\XC@cnv@rgb@hsb\@@tmp,% - \edef\@@scl{\rangeHSB}\expandafter\XC@calc@\@@tmp,,:M}% - \XC@mod@Gray{\XC@cnv@rgb@gray#1,#2,#3,% - \edef\@@arg{#4}\XC@calcT\@@tmp\@@tmp \XC@calcC\@@tmp\@@tmp - \edef\@@scl{\rangeGray}\XC@calcM\@@tmp\@@tmp}}% - {\XC@calc@#1,#2,#3,#4,:N}} + {\XC@mod@gray{\XC@cnv@rgb@gray#1,#2,#3,\edef\@@arg{#4}% + \XC@calcT\@@tmp\@@tmp \XC@calcC\@@tmp\@@tmp}% + \XC@mod@Gray{\XC@cnv@rgb@gray#1,#2,#3,\edef\@@arg{#4}% + \XC@calcT\@@tmp\@@tmp \XC@calcC\@@tmp\@@tmp \XC@cnv@gray\@@tmp,}}% + {\XC@cnv@cmyk@cmy#1,#2,#3,#4,% + \ifx\tm\XC@mod@cmy\else\expandafter\XC@cnv@cmy\@@tmp,\fi}} \def\XC@cnv@cmyk@cmy#1,#2,#3,#4,% {\edef\@@arg{#4}\XC@calc@#1,#2,#3,,:T} \def\XC@cnv@hsb#1,#2,#3,% - {\ifx\tm\XC@mod@HSB - \edef\@@scl{\rangeHSB}\XC@calc@#1,#2,#3,,:M% - \else - \XC@cnv@hsb@rgb#1,#2,#3,% - \ifx\tm\XC@mod@rgb\else\expandafter\XC@cnv@rgb\@@tmp,\fi - \fi} + {\XC@ifxcase\tm + {\XC@mod@Hsb {\XC@cnv@hsb@Hsb#1,#2,#3,}% + \XC@mod@tHsb{\XC@cnv@hsb@Hsb#1,#2,#3,\expandafter\XC@cnv@Hsb\@@tmp,}% + \XC@mod@HSB {\edef\@@scl{\rangeHSB}\XC@calc@#1,#2,#3,,:M}}% + {\XC@cnv@hsb@rgb#1,#2,#3,\XC@cnv@rgb@}} +\def\XC@cnv@hsb@ + {\ifx\tm\XC@mod@hsb\else\expandafter\XC@cnv@hsb\@@tmp,\fi} \def\XC@cnv@hsb@rgb#1,#2,#3,% {\llshiftset\dimen@{#1}\dimen@6\dimen@ \rrshift\dimen@ \afterassignment\dimen@\count@=\the\dimen@ @@ -1067,12 +1202,13 @@ \expandafter\XC@calc@\@@tmp,,:C% \edef\@@scl{#3}\expandafter\XC@calc@\@@tmp,,:S% \expandafter\XC@calc@\@@tmp,,:N} +\def\XC@cnv@hsb@Hsb#1,#2,#3,% + {\XC@c@lcS\rangeHsb{,#2,#3}{#1}\@@tmp} \def\XC@cnv@gray#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@hsb {\XC@calcN{#1}\@@tmp \edef\@@tmp{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 @@ -1080,62 +1216,85 @@ \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}} + {\XC@calcN{#1}\@@tmp \edef\@@tmp{0,0,\@@tmp}}} \def\XC@cnv@RGB#1,#2,#3,% - {\edef\@@scl{\rangeRGB}\XC@calc@#1,#2,#3,,:D\expandafter\XC@cnv@rgb\@@tmp,} + {\edef\@@scl{\rangeRGB}\XC@calc@#1,#2,#3,,:D\XC@cnv@rgb@} \def\XC@cnv@HTML#1,% {\edef\@@tmp{\expandafter\@hex@Hex#1\relax}\expandafter\XC@cnv@HTML@\@@tmp - \edef\@@scl{\@cclv}\expandafter\XC@calc@\@@tmp,,:D% - \expandafter\XC@cnv@rgb\@@tmp,} + \edef\@@scl{\@cclv}\expandafter\XC@calc@\@@tmp,,:D\XC@cnv@rgb@} \def\XC@cnv@HTML@#1#2#3#4#5#6% {\edef\@@tmp{\number"#1#2,\number"#3#4,\number"#5#6}} +\def\XC@cnv@Hsb#1,#2,#3,% + {\ifx\tm\XC@mod@tHsb\XC@cnv@@Hsb#1,#2,#3,\XC@cnv@Hsb@ + \else\XC@cnv@Hsb@hsb#1,#2,#3,\XC@cnv@hsb@\fi} +\def\XC@cnv@Hsb@hsb#1,#2,#3,% + {\XC@c@lcD\rangeHsb{,#2,#3}{#1}\@@tmp} +\def\XC@cnv@@Hsb#1,#2,#3,#4% + {\dimen@\rangeHsb\p@ \advance\dimen@\p@ \edef\@@tmp{\strip@pt\dimen@}% + \edef\@@tmp{0,0;\rangetHsb;\rangeHsb,\rangeHsb;\@@tmp,\@@tmp;}% + \dimen@#1\p@ \expandafter#4\@@tmp\@nnil + \edef\@@tmp{\strip@pt\dimen@,#2,#3}} +\def\XC@cnv@Hsb@#1,#2;#3,#4;% + {\ifdim\dimen@<#4\p@ + \@tempdima#3\p@ \advance\@tempdima-#1\p@ + \@tempdimb#4\p@ \advance\@tempdimb-#2\p@ + \rdivide\@tempdima\@tempdimb + \advance\dimen@-#2\p@ \rmultiply\dimen@{\strip@pt\@tempdima}% + \advance\dimen@#1\p@ \expandafter\remove@to@nnil + \else + \def\@@tmp{\XC@cnv@Hsb@#3,#4;}\expandafter\@@tmp + \fi} +\def\XC@cnv@tHsb#1,#2,#3,% + {\XC@cnv@@Hsb#1,#2,#3,\XC@cnv@tHsb@ + \ifx\tm\XC@mod@Hsb\else\expandafter\XC@cnv@Hsb\@@tmp,\fi} +\def\XC@cnv@tHsb@#1,#2;#3,#4;% + {\ifdim\dimen@<#3\p@ + \@tempdima#4\p@ \advance\@tempdima-#2\p@ + \@tempdimb#3\p@ \advance\@tempdimb-#1\p@ + \rdivide\@tempdima\@tempdimb + \advance\dimen@-#1\p@ \rmultiply\dimen@{\strip@pt\@tempdima}% + \advance\dimen@#2\p@ \expandafter\remove@to@nnil + \else + \def\@@tmp{\XC@cnv@tHsb@#3,#4;}\expandafter\@@tmp + \fi} \def\XC@cnv@HSB#1,#2,#3,% - {\edef\@@scl{\rangeHSB}\XC@calc@#1,#2,#3,,:D\expandafter\XC@cnv@hsb\@@tmp,} + {\edef\@@scl{\rangeHSB}\XC@calc@#1,#2,#3,,:D\XC@cnv@hsb@} \def\XC@cnv@Gray#1,% - {\edef\@@scl{\rangeGray}\XC@calcD{#1}\@@tmp \XC@cnv@gray\@@tmp,} + {\XC@c@lcD\rangeGray{}{#1}\@@tmp \XC@cnv@gray\@@tmp,} \def\XC@cnv@wave#1,% - {\XC@cnv@wave@hsb#1,% - \ifx\tm\XC@mod@hsb\else\expandafter\XC@cnv@hsb\@@tmp,\fi} + {\XC@cnv@wave@hsb#1,\XC@cnv@hsb@} \def\XC@cnv@wave@hsb#1,% {\@tempdima#1\p@ \ifdim\@tempdima<440\p@ - \XC@c@v@wave@hsb{-.0166667}{7.33333}4{}% - \else\ifdim\@tempdima<490\p@ - \XC@c@v@wave@hsb{.02}{-8.8}4-% - \else\ifdim\@tempdima<510\p@ - \XC@c@v@wave@hsb{-.05}{25.5}2{}% - \else\ifdim\@tempdima<580\p@ - \XC@c@v@wave@hsb{.0142857}{-7.28571}2-% - \else\ifdim\@tempdima<645\p@ - \XC@c@v@wave@hsb{-.0153846}{9.92308}0{}% - \else - \dimen@\z@ - \fi\fi\fi\fi\fi + \XC@c@v@wave@hsb{-.0166667}{7.33333}4{}\else + \ifdim\@tempdima<490\p@ + \XC@c@v@wave@hsb{.02}{-8.8}4-\else + \ifdim\@tempdima<510\p@ + \XC@c@v@wave@hsb{-.05}{25.5}2{}\else + \ifdim\@tempdima<580\p@ + \XC@c@v@wave@hsb{.0142857}{-7.28571}2-\else + \ifdim\@tempdima<645\p@ + \XC@c@v@wave@hsb{-.0153846}{9.92308}0{}\else + \dimen@\z@ \fi\fi\fi\fi\fi \divide\dimen@6\relax \edef\@@tmp{\strip@pt\dimen@,1,}% \ifdim\@tempdima<420\p@ - \XC@c@v@wave@hsb{.0175}{-6.35}0{}% - \else\ifdim\@tempdima>700\p@ - \XC@c@v@wave@hsb{-.00875}{7.125}0{}% - \else - \dimen@\p@ - \fi\fi + \XC@c@v@wave@hsb{.0175}{-6.35}0{}\else + \ifdim\@tempdima>700\p@ + \XC@c@v@wave@hsb{-.00875}{7.125}0{}\else + \dimen@\p@ \fi\fi \edef\@@tmp{\@@tmp\strip@pt\dimen@}} \def\XC@c@v@wave@hsb#1#2#3#4% {\dimen@#1\@tempdima \advance\dimen@#2\p@ - \edef\@tempa{\strip@pt\dimen@}% - \XC@calcR\@tempa\@tempa + \XC@calcR{\strip@pt\dimen@}\@tempa \dimen@#4\@tempa\p@ \advance\dimen@#3\p@} \def\XC@cnv@cmyk@compl#1,#2,#3,#4,% {\XC@cnv@cmyk@cmy#1,#2,#3,#4,% - \expandafter\XC@calc@\@@tmp,,:C% - \expandafter\XC@cnv@cmy@cmyk\@@tmp,} + \expandafter\XC@calc@\@@tmp,,:C\expandafter\XC@cnv@cmy@cmyk\@@tmp,} \def\XC@cnv@hsb@compl#1,#2,#3,% {\lshiftset\dimen@{#1}\advance\dimen@\ifdim\dimen@<5\p@-\fi-5\p@ - \rshift\dimen@ - \edef\@@tmp{\strip@pt\dimen@}% - \lshiftset\dimen@{#3}% - \@tempdima#2\dimen@ + \rshift\dimen@ \edef\@@tmp{\strip@pt\dimen@}% + \lshiftset\dimen@{#3}\@tempdima#2\dimen@ \@tempdimb\@tempdima \advance\@tempdimb10\p@ \advance\@tempdimb-\dimen@ \ifdim\@tempdimb=\z@ \edef\@@tmp{\@@tmp,0,0}% @@ -1144,33 +1303,35 @@ \edef\@@tmp{\@@tmp,\strip@pt\@tempdima,\strip@pt\@tempdimb}% \fi} \def\substitutecolormodel#1#2% - {\edef\XC@@tmp{\expandafter\XC@substitutecolormodel#2/ignore/\@nnil}% - \expandafter\edef\csname color@#1\endcsname##1##2% - {\noexpand\convertcolorspec - \expandafter\noexpand\csname XC@mod@#1\endcsname{##2}% - \expandafter\noexpand\csname XC@mod@\XC@@tmp\endcsname - \noexpand\XC@@tmp\noexpand\expandafter - \expandafter\noexpand\csname color@\XC@@tmp\endcsname - \noexpand\expandafter##1\noexpand\expandafter{\noexpand\XC@@tmp}}% + {\XC@sdef\XC@@tmp{\expandafter\XC@substitutecolormodel#2/ignore/\@nnil}% + \ifx\XC@@tmp\XC@mod@ignore + \XC@let@cN{color@#1}\color@ignore + \else + \expandafter\edef\csname color@#1\endcsname##1##2% + {\noexpand\convertcolorspec + \expandafter\noexpand\csname XC@mod@#1\endcsname{##2}% + \expandafter\noexpand\csname XC@mod@\XC@@tmp\endcsname + \noexpand\XC@@tmp\noexpand\expandafter + \expandafter\noexpand\csname color@\XC@@tmp\endcsname + \noexpand\expandafter##1\noexpand\expandafter{\noexpand\XC@@tmp}}% + \fi \expandafter\xglobalize@\csname color@#1\endcsname \xglobal@stop \PackageInfo{xcolor}{Model `#1' substituted by `\XC@@tmp'}} \def\XC@substitutecolormodel#1/% - {\@ifundefined{color@#1}{\XC@substitutecolormodel}{#1\remove@to@nnil}} + {\@ifundefinedmodel{#1}{\XC@substitutecolormodel}{#1\remove@to@nnil}} \def\color@ignore#1#2{\def#1{}} -\@ifundefined{color@rgb}% - {\substitutecolormodel{rgb}{RGB/HTML/hsb/HSB/cmy/cmyk/gray/Gray}}{} -\@ifundefined{color@cmyk}{\substitutecolormodel{cmyk}{cmy/rgb}}{} -\@ifundefined{color@cmy}% +\@ifundefinedmodel{rgb}% + {\substitutecolormodel{rgb}{RGB/HTML/hsb/Hsb/HSB/cmy/cmyk/gray/Gray}}{} +\@ifundefinedmodel{cmyk}{\substitutecolormodel{cmyk}{cmy/rgb}}{} +\@ifundefinedmodel{cmy}% {\PackageInfo{xcolor}{Model `cmy' substituted by `cmy0'} \def\color@cmy#1#2{\color@cmyk#1{#2,0}}}{} -\@ifundefined{color@hsb}{\@tempswatrue}% - {\@tempswafalse - \@tfor\@@tmp:={dvipdfm}{textures}\do - {\ifx\@@tmp\XC@@drv\@tempswatrue\@break@tfor\fi}} +\@ifundefinedmodel{hsb}{\@tempswatrue}% + {\XC@ifcase\XC@@drv{{dvipdfm,textures}\@tempswatrue}\@tempswafalse} \if@tempswa - \substitutecolormodel{hsb}{HSB/rgb} + \substitutecolormodel{hsb}{Hsb/HSB/rgb} \fi -\@ifundefined{color@RGB}% +\@ifundefinedmodel{RGB}% {\substitutecolormodel{RGB}{HTML/rgb}} {\PackageInfo{xcolor}{Model `RGB' extended} \let\XC@color@RGB\color@RGB @@ -1181,11 +1342,13 @@ \convertcolorspec\XC@mod@RGB{#2}\XC@mod@rgb\XC@@tmp \expandafter\color@rgb\expandafter#1\expandafter{\XC@@tmp}% \fi}} -\@ifundefined{color@gray}{\substitutecolormodel{gray}{Gray/rgb}}{} -\@ifundefined{color@HTML}{\substitutecolormodel{HTML}{rgb}}{} -\@ifundefined{color@HSB}{\substitutecolormodel{HSB}{hsb}}{} -\@ifundefined{color@Gray}{\substitutecolormodel{Gray}{gray}}{} -\@ifundefined{color@wave}{\substitutecolormodel{wave}{hsb}}{} +\@ifundefinedmodel{gray}{\substitutecolormodel{gray}{Gray/rgb}}{} +\@ifundefinedmodel{HTML}{\substitutecolormodel{HTML}{rgb}}{} +\@ifundefinedmodel{Hsb}{\substitutecolormodel{Hsb}{hsb}}{} +\@ifundefinedmodel{tHsb}{\substitutecolormodel{tHsb}{hsb}}{} +\@ifundefinedmodel{HSB}{\substitutecolormodel{HSB}{hsb}}{} +\@ifundefinedmodel{Gray}{\substitutecolormodel{Gray}{gray}}{} +\@ifundefinedmodel{wave}{\substitutecolormodel{wave}{hsb}}{} \@ifundefined{XC@pst}{% \def\XC@getcolor#1#2% {\begingroup\toks@{#1}\XC@getc@lor#1\XC@@\aftergroupdef#2{\@@tmp}} @@ -1207,10 +1370,10 @@ \fi} }{% compatibility code begin \def\XC@getcolor#1#2% - {\@ifundefined{\string\color@#1}% + {\@ifundefinedcolor{#1}% {\begingroup\color{#1}% \edef\@@tmp - {\noexpand\edef\noexpand#2{\noexpand\expandafter\noexpand\c@lor@to@ps + {\edef\noexpand#2{\noexpand\expandafter\noexpand\c@lor@to@ps \current@color\noexpand\@@}}% \expandafter\endgroup\@@tmp}% {\edef#2{\XC@usecolor{#1}}}} @@ -1232,35 +1395,31 @@ \def\c@lor@special#1#2{\edef\@tempa{\write#1{#2}}\@tempa} \def\normalcolor{\let\current@color\default@color\set@color} \AtBeginDocument{\let\default@color\current@color} -\@tfor\@@tmp:={dvipdf}{dvipdfm}{dvipdfmx}{dvips}{pctex32}\do - {\ifx\@@tmp\XC@@drv - \def\c@lor@@named#1,#2,#3\@@#4% - {\edef#4{\expandafter\expandafter\expandafter\@thirdoffive - \csname\string\color@#1\endcsname}} - \def\define@color@named#1#2% - {\@namedef{\string\color@#1}{{}{}{ \colornameprefix#1}{}{}}} - \@break@tfor\fi} -\@tfor\@@tmp:={dvipsone}{pctexps}{pdftex}{tcidvi}{truetex}{vtex}{xetex}\do - {\ifx\@@tmp\XC@@drv - \def\c@lor@@named#1,#2,#3\@@#4% - {\edef#4{\expandafter\expandafter\expandafter\@thirdoffive - \csname\string\color@#1\endcsname}} - \def\define@color@named#1#2% - {\let\@@cls\@empty\@namedef{\string\color@#1}{{}{}{#2}{}{}}} - \@break@tfor\fi} -\@tfor\@@tmp:={textures}\do - {\ifx\@@tmp\XC@@drv - \def\c@lor@@named#1,#2,#3\@@#4% - {\edef\@tempa{\color@P@custom{#1}{\if!#2!1\else#2\fi}}% - \expandafter\def\expandafter#4\@tempa} - \def\define@color@named#1#2% - {\edef\@tempa{{#1}{#2}}\expandafter\AddCustomColor\@tempa} - \def\c@lor@ps@#1 #2\@@ - {\expandafter\expandafter\expandafter\expandafter\expandafter - \expandafter\expandafter\c@lor@to@ps@ - \csname\string\color@#1\expandafter\endcsname\space - #2. \@@{#1}} - \@break@tfor\fi} +\XC@ifcase\XC@@drv + {{dvipdf,dvipdfm,dvipdfmx,dvips,pctex32}% + {\def\c@lor@@named#1,#2,#3\@@#4% + {\edef#4{\expandafter\expandafter\expandafter\@thirdoffive + \csname\string\color@#1\endcsname}} + \def\define@color@named#1#2% + {\@namedef{\string\color@#1}{{}{}{ \colornameprefix#1}{}{}}}}% + {dvipsone,pctexps,pdftex,tcidvi,truetex,vtex,xetex}% + {\def\c@lor@@named#1,#2,#3\@@#4% + {\edef#4{\expandafter\expandafter\expandafter\@thirdoffive + \csname\string\color@#1\endcsname}} + \def\define@color@named#1#2% + {\let\@@cls\@empty\@namedef{\string\color@#1}{{}{}{#2}{}{}}}}% + {textures}% + {\def\c@lor@@named#1,#2,#3\@@#4% + {\edef\@tempa{\color@P@custom{#1}{\if!#2!1\else#2\fi}}% + \expandafter\def\expandafter#4\@tempa} + \def\define@color@named#1#2% + {\edef\@tempa{{#1}{#2}}\expandafter\AddCustomColor\@tempa} + \def\c@lor@ps@#1 #2\@@ + {\expandafter\expandafter\expandafter\expandafter\expandafter + \expandafter\expandafter\c@lor@to@ps@ + \csname\string\color@#1\expandafter\endcsname\space + #2. \@@{#1}}}% + }{} \definecolorset{rgb/hsb/cmyk/gray}{}{}% {red,1,0,0/0,1,1/0,1,1,0/.3;% green,0,1,0/.33333,1,1/1,0,1,0/.59;% -- cgit v1.2.3