From ac704776b98a78d8057dda731ae1f9ff197a39ae Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 22 Dec 2006 23:24:47 +0000 Subject: xcolor 2.10 update git-svn-id: svn://tug.org/texlive/trunk@2852 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/xcolor/ChangeLog | 12 + Master/texmf-dist/doc/latex/xcolor/README | 2 +- Master/texmf-dist/doc/latex/xcolor/xcolor.lox | 6 +- Master/texmf-dist/doc/latex/xcolor/xcolor.pdf | Bin 700615 -> 704477 bytes Master/texmf-dist/doc/latex/xcolor/xcolor1.tex | 8 +- Master/texmf-dist/doc/latex/xcolor/xcolor2.pdf | Bin 95372 -> 95348 bytes Master/texmf-dist/doc/latex/xcolor/xcolor2.tex | 9 +- Master/texmf-dist/doc/latex/xcolor/xcolor3.tex | 8 +- Master/texmf-dist/doc/latex/xcolor/xcolor4.tex | 8 +- Master/texmf-dist/dvips/xcolor/xcolor.pro | 8 +- Master/texmf-dist/source/latex/xcolor/xcolor.dtx | 268 +++++++++++++---------- Master/texmf-dist/tex/latex/xcolor/svgnam.def | 4 +- Master/texmf-dist/tex/latex/xcolor/x11nam.def | 4 +- Master/texmf-dist/tex/latex/xcolor/xcolor.sty | 94 ++++---- Master/texmf-dist/tpm/xcolor.tpm | 8 +- 15 files changed, 243 insertions(+), 196 deletions(-) diff --git a/Master/texmf-dist/doc/latex/xcolor/ChangeLog b/Master/texmf-dist/doc/latex/xcolor/ChangeLog index 1a287bb3259..2ecdabe2156 100644 --- a/Master/texmf-dist/doc/latex/xcolor/ChangeLog +++ b/Master/texmf-dist/doc/latex/xcolor/ChangeLog @@ -4,6 +4,18 @@ Package `xcolor' by Dr. Uwe Kern History ======= +2006/11/28 v2.10 +* New features: + - `fixinclude' option prevents dvips from explicitly resetting + current color to `black' before actually inserting an .eps file + via \color{red}\includegraphics{foo}. +* Changes: + - \colorbox and \fcolorbox made robust; + - obsolete package option `pst' removed; + - several changes to internal macros. +* Bugfixes: + - incorrect processing of cmyk-type current color `.'. + 2005/12/21 v2.09 * New features: - \definecolor and \color now accept space-separated color diff --git a/Master/texmf-dist/doc/latex/xcolor/README b/Master/texmf-dist/doc/latex/xcolor/README index 9996c72a2c4..287bf661342 100644 --- a/Master/texmf-dist/doc/latex/xcolor/README +++ b/Master/texmf-dist/doc/latex/xcolor/README @@ -1,7 +1,7 @@ Package `xcolor' by Dr. Uwe Kern (xcolor at ukern dot de) -v2.09 (2005/12/21) +v2.10 (2006/11/28) `xcolor' provides easy driver-independent access to several kinds of colors, tints, shades, tones, and mixes of arbitrary colors by means of diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor.lox b/Master/texmf-dist/doc/latex/xcolor/xcolor.lox index 03233045853..5cdb60ca392 100644 --- a/Master/texmf-dist/doc/latex/xcolor/xcolor.lox +++ b/Master/texmf-dist/doc/latex/xcolor/xcolor.lox @@ -22,11 +22,11 @@ %% in the same archive or directory.) %% %% ---------------------------------------------------------------- -%% Copyright (C) 2003-2005 by Dr. Uwe Kern +%% Copyright (C) 2003-2006 by Dr. Uwe Kern %% ---------------------------------------------------------------- %% -\def\XCfileversion{v2.09}% -\def\XCfiledate{2005/12/21}% +\def\XCfileversion{v2.10}% +\def\XCfiledate{2006/11/28}% \def\ukfile#1#2#3#4% {\def\ukhead {\ifnum#1>2 \perCent!^^J\fi diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor.pdf b/Master/texmf-dist/doc/latex/xcolor/xcolor.pdf index 433d3cabfce..7b2cef9410f 100644 Binary files a/Master/texmf-dist/doc/latex/xcolor/xcolor.pdf and b/Master/texmf-dist/doc/latex/xcolor/xcolor.pdf differ diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor1.tex b/Master/texmf-dist/doc/latex/xcolor/xcolor1.tex index 5beeb036035..c44f5ad1b33 100644 --- a/Master/texmf-dist/doc/latex/xcolor/xcolor1.tex +++ b/Master/texmf-dist/doc/latex/xcolor/xcolor1.tex @@ -22,14 +22,14 @@ %% in the same archive or directory.) %% \ProvidesFile{xcolor1} - [2005/12/21 v2.09 Color conversion test (UK)] + [2006/11/28 v2.10 Color conversion test (UK)] %% %% ---------------------------------------------------------------- -%% Copyright (C) 2003-2005 by Dr. Uwe Kern +%% Copyright (C) 2003-2006 by Dr. Uwe Kern %% ---------------------------------------------------------------- %% -\def\XCfileversion{v2.09}% -\def\XCfiledate{2005/12/21}% +\def\XCfileversion{v2.10}% +\def\XCfiledate{2006/11/28}% \documentclass[a4paper]{article} \usepackage{array,multicol,multido,textcomp} diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor2.pdf b/Master/texmf-dist/doc/latex/xcolor/xcolor2.pdf index 33c72a09044..2fb5ea75820 100644 Binary files a/Master/texmf-dist/doc/latex/xcolor/xcolor2.pdf and b/Master/texmf-dist/doc/latex/xcolor/xcolor2.pdf differ diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor2.tex b/Master/texmf-dist/doc/latex/xcolor/xcolor2.tex index e369af14e5f..3c668a878dd 100644 --- a/Master/texmf-dist/doc/latex/xcolor/xcolor2.tex +++ b/Master/texmf-dist/doc/latex/xcolor/xcolor2.tex @@ -22,20 +22,19 @@ %% in the same archive or directory.) %% \ProvidesFile{xcolor2} - [2005/12/21 v2.09 Pstricks color test (UK)] + [2006/11/28 v2.10 Pstricks color test (UK)] %% %% ---------------------------------------------------------------- -%% Copyright (C) 2003-2005 by Dr. Uwe Kern +%% Copyright (C) 2003-2006 by Dr. Uwe Kern %% ---------------------------------------------------------------- %% -\def\XCfileversion{v2.09}% -\def\XCfiledate{2005/12/21}% +\def\XCfileversion{v2.10}% +\def\XCfiledate{2006/11/28}% \listfiles \documentclass{article} \usepackage{pstricks,pst-tree,pst-slpe,multido} \makeatletter -\@ifpackagelater{pstricks}{2004/05/12}{}{\usepackage[pst]{xcolor}} \makeatother \usepackage{fvrb-ex} diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex b/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex index 4956e60f3bb..4f4d05ca701 100644 --- a/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex +++ b/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex @@ -22,14 +22,14 @@ %% in the same archive or directory.) %% \ProvidesFile{xcolor3} - [2005/12/21 v2.09 Color logging test (UK)] + [2006/11/28 v2.10 Color logging test (UK)] %% %% ---------------------------------------------------------------- -%% Copyright (C) 2003-2005 by Dr. Uwe Kern +%% Copyright (C) 2003-2006 by Dr. Uwe Kern %% ---------------------------------------------------------------- %% -\def\XCfileversion{v2.09}% -\def\XCfiledate{2005/12/21}% +\def\XCfileversion{v2.10}% +\def\XCfiledate{2006/11/28}% \listfiles \documentclass[a4paper]{article} \usepackage[showerrors,table,dvipsnames*,hyperref]{xcolor}[2005/12/21] diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex b/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex index a922f2bc88c..eb5ddc0f889 100644 --- a/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex +++ b/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex @@ -22,14 +22,14 @@ %% in the same archive or directory.) %% \ProvidesFile{xcolor4} - [2005/12/21 v2.09 Color driver test (UK)] + [2006/11/28 v2.10 Color driver test (UK)] %% %% ---------------------------------------------------------------- -%% Copyright (C) 2003-2005 by Dr. Uwe Kern +%% Copyright (C) 2003-2006 by Dr. Uwe Kern %% ---------------------------------------------------------------- %% -\def\XCfileversion{v2.09}% -\def\XCfiledate{2005/12/21}% +\def\XCfileversion{v2.10}% +\def\XCfiledate{2006/11/28}% \listfiles \documentclass[a4paper]{article} %%\PassOptionsToPackage{dvipdf}{xcolor} diff --git a/Master/texmf-dist/dvips/xcolor/xcolor.pro b/Master/texmf-dist/dvips/xcolor/xcolor.pro index ced9a1e9ca6..b3d530a3669 100644 --- a/Master/texmf-dist/dvips/xcolor/xcolor.pro +++ b/Master/texmf-dist/dvips/xcolor/xcolor.pro @@ -23,10 +23,10 @@ %% in the same archive or directory.) %% %% xcolor.pro (PostScript/dvips header file) -%% [2005/12/21 v2.09 LaTeX color extensions (UK)] +%% [2006/11/28 v2.10 LaTeX color extensions (UK)] %% %% ---------------------------------------------------------------- -%% Copyright (C) 2003-2005 by Dr. Uwe Kern +%% Copyright (C) 2003-2006 by Dr. Uwe Kern %% ---------------------------------------------------------------- %% userdict begin @@ -40,7 +40,9 @@ userdict begin /XCgray{mark exch exec/setgray XCsetcolor}XCbd /XChsb{mark exch exec/sethsbcolor XCsetcolor}XCbd /XCrgb{mark exch exec/setrgbcolor XCsetcolor}XCbd -/XC!b{save/setgray{pop}def}XCbd +/XCfixnormalscale{/normalscale{Resolution 72 div VResolution 72 div neg + scale magscale{DVImag dup scale}if}def}def +/XC!b{save XCfixnormalscale}XCbd /XC!e{restore}XCbd /XCsp2bp{1 65781.76 div dup scale}XCbd /XCsetline diff --git a/Master/texmf-dist/source/latex/xcolor/xcolor.dtx b/Master/texmf-dist/source/latex/xcolor/xcolor.dtx index 92b4ea5e712..4bb61e9b428 100644 --- a/Master/texmf-dist/source/latex/xcolor/xcolor.dtx +++ b/Master/texmf-dist/source/latex/xcolor/xcolor.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment %% %% ---------------------------------------------------------------- -%% Copyright (C) 2003-2005 by Dr. Uwe Kern +%% Copyright (C) 2003-2006 by Dr. Uwe Kern %% ---------------------------------------------------------------- %% %<*package> @@ -17,8 +17,8 @@ %% % %<*extract|driver|test1|test2|test3|test4> -\def\XCfileversion{v2.09}% -\def\XCfiledate{2005/12/21}% +\def\XCfileversion{v2.10}% +\def\XCfiledate{2006/11/28}% % % % This file may be distributed and/or modified under the @@ -33,7 +33,7 @@ % % \fi % -% \CheckSum{4875} +% \CheckSum{4864} % % \DoNotIndex{\def,\gdef,\edef,\xdef,\long,\let} % \DoNotIndex{\ifnum,\ifdim,\iftrue,\iffalse,\ifx,\ifcase,\else,\or,\fi} @@ -186,6 +186,7 @@ % \def\People#1#2{#1 #2\index{people\levelchar#2, #1\string|usage}} % \newcommand*\Color[2][+]{\textsl{#2}\ifx#1+\index{color names\levelchar\textsl{#2}\string|usage}\fi} % \def\Option#1{\texttt{#1}\index{package options\levelchar\texttt{#1}\string|usage}} +% \def\oOption#1{\texttt{#1}\index{package options (obsolete)\levelchar\texttt{#1}\string|usage}} % \def\Key#1{\textit{#1}\index{keys\levelchar\textit{#1}\string|usage}} % \def\File#1{\texttt{#1}\index{files\levelchar\texttt{#1}\string|usage}} % \def\Function#1{\textit{#1}\index{color functions\levelchar\textit{#1}\string|usage}} @@ -378,9 +379,12 @@ % \item options that determine the color driver as explained in \cite{dpc} and \cite{color}, currently: \Option{dvips}, \Option{xdvi}, \Option{dvipdf}, \Option{dvipdfm}, \Option{dvipdfmx}, \Option{pdftex}, \Option{dvipsone}, \Option{dviwindo}, \Option{emtex}, \Option{dviwin}, \Option{oztex}, \Option{textures}, \Option{pctexps}, \Option{pctexwin}, \Option{pctexhp}, \Option{pctex32}, \Option{truetex}, \Option{tcidvi}, \Option{vtex}, \Option{xetex}, % \item options that determine the target color model\footnote{Section \vref{sec.tgt} explains how this setting can be overridden at any point in a document.} (\Option{natural}, \Option{rgb}, \Option{cmy}, \Option{cmyk}, \Option{hsb}, \Option{gray}, \Option{RGB}, \Option{HTML}, \Option{HSB}, \Option{Gray}) or disable colored output (\Option{monochrome}), % \item options that control whether and how certain sets of predefined colors are being loaded: \Option{dvipsnames}, \Option{dvipsnames*}, \Option{svgnames}, \Option{svgnames*}, \Option{x11names}, \Option{x11names*}, -% \item options that determine which other packages are to be loaded (\Option{table}, \Option{fixpdftex}, \Option{pst}\footnote{\label{fnt.pst}This option will soon become obsolete, since recent \File{pstricks.sty} versions do load \XC, whereas \Package{pstcol} is no longer needed.}) or supported (\Option{hyperref}), -% \item options that determine the behaviour of other commands: \Option{prologue}, \Option{kernelfbox}, \Option{xcdraw}, \Option{noxcdraw}, \Option{showerrors}, \Option{hideerrors}, -% \item obsolete options: \Option{override}, \Option{usenames}, \Option{nodvipsnames}. +% \item options that determine which other packages are to be loaded or supported: \Option{table}, \Option{fixpdftex}, +% \Option{hyperref}, +% \item options that influence the behaviour of other commands: \Option{prologue}, \Option{kernelfbox}, \Option{xcdraw}, \Option{noxcdraw}, \Option{fixinclude}, \Option{showerrors}, \Option{hideerrors}, +% \item obsolete options: +% \oOption{pst}, +% \oOption{override}, \oOption{usenames}, \oOption{nodvipsnames}. % \end{itemize} % All available package options (except driver selection and obsolete options) are listed in table \vref{tab.opt}. % \DescribeMacro\GetGinDriver @@ -421,7 +425,6 @@ % \hline % \Option{table}& Load the \Package{colortbl} package, in order to use the tools for coloring rows, columns, and cells within tables.\\ % \Option{fixpdftex}& Load the \Package{pdfcolmk} package, in order to improve |pdftex|'s color behaviour (see section \vref{sec.fixpdftex}).\\ -% \Option{pst}& Load the \Package{pstcol} package, in order to use `normal' color definitions within \Package{pstricks} macros (see footnote \vref{fnt.pst}).\\ % \Option{hyperref}& Support the \Package{hyperref} package in terms of color expressions by defining additional keys (see section \vref{sec.hyperref}).\\ % \hline % \Option{prologue}& Write prologue information to \File{.xcp} file for every color definition (as described in section \vref{sec.prologue}).\\ @@ -429,6 +432,7 @@ % \Option{kernelfbox}& Use \LaTeX{} kernel method to draw \texttt{\string\f(rame)box} frames\footnotemark[2].\\ % \Option{xcdraw}& Use driver-specific commands to draw frames and color boxes.\footnotemark[2]\\ % \Option{noxcdraw}& (Default.) Use generic code to draw frames and color boxes.\footnotemark[2]\\ +% \Option{fixinclude}& Prevent |dvips| color reset before \File{.eps} file inclusion (see section \vref{sec.fixinclude}).\\ % \hline % \Option{showerrors}& (Default.) Display an error message if an undefined color is being used (same behaviour as in the original \LCP).\\ % \Option{hideerrors}& Display only a warning if an undefined color is being used, and replace this color by \Color{black}.\\ @@ -441,25 +445,27 @@ % % % \begin{table}[htbp]\caption{Package loading order}\label{tab.package} -% \centering +% \begin{adjustwidth}{-2.5cm}{} +% \raggedleft % \extrarowheight2pt % \rowcolors{3}{tablerowcolor}{} -% \begin{tabular}{lccccc} +% \begin{tabular}{l*{6}{c}} % \hline % \rowcolor{tableheadcolor} -% \em Action/Package & \LC & \Package{colortbl}& \Package{pdfcolmk}& \Package{pstcol}& \Package{hyperref}\\ -% load before \XC & no & no & no & no & allowed \\ -% load with \XC{} option& --- & \Option{table} & \Option{fixpdftex} & \Option{pst}\footnotemark[1] & ---\\ -% load after \XC & no & no & allowed & no & allowed \\ +% \em Action/Package & \Package{colortbl}& \Package{pdfcolmk}& \Package{hyperref}& \Package{pstricks}& \LC& \Package{pstcol}\\ +% load before \XC & no & no & allowed & allowed\rlap{\footnotemark[1]} & no & no \\ +% load with \XC{} option& \Option{table} & \Option{fixpdftex} & --- & --- & --- & --- \\ +% load after \XC & no & allowed & allowed & allowed & no & no \\ % \hline\hline -% \multicolumn5{c}{\footnotemark[1]\,not recommended, better use recent \File{pstricks.sty}}\\ +% \multicolumn6{c}{\footnotemark[1]\,recent \Package{pstricks} versions do load \XC\ by default}\\ % \hline % \end{tabular} +% \end{adjustwidth} % \end{table} % % % \begin{table}[htbp]\caption{Supported color models}\label{tab.mod} -% \centering +% \raggedleft % \extrarowheight2pt % \rowcolors{3}{tablerowcolor}{} % \begin{tabular}{l>{\em}l>{$}l<{$}rl} @@ -598,7 +604,7 @@ % This applies for selection via a package option as well as via |\selectcolormodel|. % Why don't we simply convert all colors at time of usage? % If many colors are involved, it can save some processing time when all conversions are already done during color definitions. -% Best performance can be achieved by saying |\usepackage[rgb,...]{xcolor}\convertcolorsUfalse|, which is actually the way how \XC{} worked up to version 1.07. +% Best performance can be achieved by |\usepackage[rgb,...]{xcolor}\convertcolorsUfalse|, which is actually the way how \XC{} worked up to version 1.07. % % % \begin{table}[p]\caption{Arguments and terminology}\label{tab.term} @@ -834,7 +840,7 @@ % \end{gather*} % Afterwards the sum of all of these vectors is calculated. % -% Example: mixing 4~parts of \testclr{red} \Color{red}, 2~parts of \testclr{green} \Color{green}, and 1~part of \testclr{yellow} \Color{yellow}, we get \testclr{rgb:red,4;green,2;yellow,1} by saying |\color{rgb:red,4;green,2;yellow,1}|. +% Example: mixing 4~parts of \testclr{red} \Color{red}, 2~parts of \testclr{green} \Color{green}, and 1~part of \testclr{yellow} \Color{yellow}, we get \testclr{rgb:red,4;green,2;yellow,1} via |\color{rgb:red,4;green,2;yellow,1}|. % Trying the same with $-1$ parts of \Color{yellow} instead, we get \testclr{rgb:red,4;green,2;yellow,-1}. % Note that this mechanism can also be used to display an individual color (expression) in a certain color model: |\color{rgb:yellow,1}| results in such a conversion. % The general form @@ -842,7 +848,7 @@ % \Meta{core model}|,|\Meta{div}|:|\Meta[1]{expr}|,|\Meta[1]{dec}|;|\Meta[2]{expr}|,|\Meta[2]{dec}|;...;|\Meta[k]{expr}|,|\Meta[k]{dec} % \end{gather*} % does the same operation with the only difference that the divisor \Meta{div} is being specified instead of calculated. -% In the above example, we get a shaded version \testclr{rgb,9:red,4;green,2;yellow,1} by saying |\color{rgb,9:red,4;green,2;yellow,1}|. +% In the above example, we get a shaded version \testclr{rgb,9:red,4;green,2;yellow,1} via |\color{rgb,9:red,4;green,2;yellow,1}|. % Note that it is not forbidden to specify a \Meta{div} argument which is smaller than the sum of all \Meta[\kappa]{dec}, such that one or more of the final color specification parameters could be outside the interval $[0,1]$. % However, the mapping of equation (\ref{eq.U}) takes care of such cases. % @@ -874,7 +880,7 @@ % % \def\test#1{\testclr{#1}~\Color{#1}} % Within \File{xcolor.sty}, the following color names are defined: -% \test{red}, \test{green}, \test{blue}, \test{cyan}, \test{magenta}, \test{yellow}, \test{orange}, \test{violet}, \test{purple}, \test{brown}, \test{pink}, \test{olive}, \test{black}, \test{darkgray}, \test{gray}, \test{lightgray}, \test{white}. +% \test{red}, \test{green}, \test{blue}, \test{cyan}, \test{magenta}, \test{yellow}, \test{black}, \test{darkgray}, \test{gray}, \test{lightgray}, \test{white}, \test{brown}, \test{olive}, \test{orange}, \test{pink}, \test{purple}, \test{violet}. % % This base set of colors can be used without restrictions in all kinds of color expressions, as explained in section \vref{sec.term}. % @@ -956,7 +962,7 @@ % \item |\definecolor{myblack}{named}{Black}|, % \end{itemize} % where the last command is equivalent to |\colorlet{myblack}{Black}| (see below); the second command defines \Color{red} in the \Model{rgb} or \Model{cmyk} model, depending on the current setting of the \emph{target model}, whereas the third will additionally transform the color to \Model{hsb} prior to saving. -% Note that there is a special \Package{pstricks} version as described in section \vref{sec.pstricks}. +% Note that there is a special \Package{pstricks}-related version as described in section \vref{sec.pstricks}. % % \medskip % @@ -1473,6 +1479,31 @@ % \item It does not support several independent text streams like footnotes. % \end{itemize} % +% \subsubsection{Change color of included \File{.eps} file}\label{sec.fixinclude} +% +% In general, \XC{} cannot change colors of an image that is being included via the |\includegraphics| command from the \Package{graphics} or \Package{graphicx} package. +% There is, however, a limited opportunity to influence the current color of included \Index{PostScript} files. +% Consider the following file |foo.eps| which draws a framed gray box: +% \begin{verbatim} +% %!PS-Adobe-3.0 EPSF-3.0 +% %%BoundingBox: 0 0 60 12 +% 0 0 60 12 rectfill +% 0.75 setgray +% 2 2 56 8 rectfill +% \end{verbatim} +% Now run the following code through \LaTeX{} and \Program{dvips}: +% \begin{verbatim} +% \documentclass{minimal} +% \usepackage[fixinclude]{xcolor} +% \usepackage{graphics} +% \begin{document} +% \includegraphics{foo} \textcolor{red}{\includegraphics{foo}} +% \end{document} +% \end{verbatim} +% The resulting \File{.ps} file will display two gray boxes: the first with a black frame, the second with a red frame. +% If we had omitted the \Option{fixinclude} option, the second box would also display a black frame. +% This is because \Program{dvips} usually resets the current color to black immediately before including an \File{.eps} file. +% % % % @@ -1958,7 +1989,7 @@ % % \section{Colors by Name}\label{sec.names} % -% \begin{multicols}{5}[\subsection{Base Colors}\label{sec.basenam}] +% \begin{multicols}{5}[\subsection{Base colors (always available)}\label{sec.basenam}] % \footnotesize\def\0#1{\Testclr{#1}{#1}} % \0{black} % \0{blue} @@ -1980,7 +2011,7 @@ % \end{multicols} % % -% \begin{multicols}{5}[\subsection{Colors via \Option{dvipsnames}}\label{sec.dvipsnam}] +% \begin{multicols}{5}[\subsection{Colors via \Option{dvipsnames} option}\label{sec.dvipsnam}] % \footnotesize\def\0#1{\Testclr{#1}{#1}} % \0{Apricot} % \0{Aquamarine} @@ -2054,7 +2085,7 @@ % % % \makeatletter -% \def\ColorList#1#2#3#4{\begin{multicols}{#1}[\subsection{Colors via \Option{#2names}}\label{sec.#2nam}] +% \def\ColorList#1#2#3#4{\begin{multicols}{#1}[\subsection{Colors via \Option{#2names} option}\label{sec.#2nam}] % \footnotesize % \def\preparecolorset % {\def\XC@@cmd[####1]####2####3####4{\definecolor[####1]{@test}{####3}{####4}#4{@test}{####2}}\@testopt{\XC@definecolorset}{}} @@ -2123,7 +2154,7 @@ % \Option{pctex32}&1999/02/16 v3.0i&d&n&d&d&d&i&n&n&n\\ % \Option{pctexps}&1999/02/16 v3.0i&d&n&d&d&d&i&n&n&n\\ % \hline -% \Option{pdftex}&2002/06/19 v0.03k&d&n&d&n&d&i&n&n&n\\ +% \Option{pdftex}&2006/03/02 v0.03p&d&n&d&n&d&i&n&n&n\\ % \hline % \Option{dvipdfm}&1998/11/24 vx.x\,\footnotemark[1]&d&n&d&a&d&i&n&n&n\\ % \Option{dvipdfm}&1999/9/6 vx.x\,\footnotemark[2]&d&n&d&a&d&i&n&n&n\\ @@ -2198,7 +2229,7 @@ % \hline % |\col@Plum=macro:| & |\DefineNamedColor{Plum}{rgb}{.5,0,1}|& \LC\\ % |->\@nil .|\X -% |\\color@Plum=macro:| & with option \Option{usenames}\\ +% |\\color@Plum=macro:| & with option \oOption{usenames}\\ % |-> Plum.|\X % \hline % |\\color@Plum=macro:| & |\definecolor[named]{Plum}{rgb}{.5,0,1}|& \XC\\ @@ -2214,7 +2245,7 @@ % \hline % |\col@Plum=macro:| & |\DefineNamedColor{Plum}{rgb}{.5,0,1}|& \LC\\ % |->.5 0 1 rg .5 0 1 RG.|\X -% |\\color@Plum=macro:| & with option \Option{usenames}\\ +% |\\color@Plum=macro:| & with option \oOption{usenames}\\ % |->.5 0 1 rg .5 0 1 RG.|\X % \hline % |\\color@Plum=macro:| & |\definecolor[named]{Plum}{rgb}{.5,0,1}|& \XC\\ @@ -2448,7 +2479,7 @@ % % We collect here the specific conversion formulas between the supported color models. % Table \vref{tab.cnv} gives an overwiew of how each conversion pair is handled. -% In general, PostScript (as described in \cite{plrm}) is used as a basis for most of the calculations, since it supports the color models \Model{rgb}, \Model{cmyk}, \Model{hsb}, and \Model{gray} natively. +% In general, \Index{PostScript} (as described in \cite{plrm}) is used as a basis for most of the calculations, since it supports the color models \Model{rgb}, \Model{cmyk}, \Model{hsb}, and \Model{gray} natively. % Furthermore, \People{Alvy Ray}{Smith}'s paper \cite{smith} is cited in \cite{plrm} as reference for \Model{hsb}-related formulas. % % First, we define a constant which is being used throughout the conversion formulas: @@ -2513,7 +2544,7 @@ % 5-r & \text{if $\emph{blue}=x$ and $\emph{red}>z$} % \end{cases} % \end{gather} -% Note that the singular case $x=z$ is not covered completely in Smith's original algorithm; we stick here to PostScript's behaviour in real life. +% Note that the singular case $x=z$ is not covered completely in Smith's original algorithm; we stick here to \Index{PostScript}'s behaviour in real life. % % Because we need to sort three numbers in order to calculate $x,y,z$, several comparisons are involved in the algorithm. % We present now a second method which is more suited for \TeX. @@ -3019,20 +3050,20 @@ % \URL{http://www.physics.sfasu.edu/astro/color/spectra.html}} % % \bibitem{dpc}% -% {\People{David P.}{Carlisle}: ``Packages in the `graphics' bundle'', 1999. +% {\People{David P.}{Carlisle}: ``Packages in the `graphics' bundle'', 2005. % \CTAN{macros/latex/required/graphics/}{grfguide.*}} % % \bibitem{color}% -% {\People{David P.}{Carlisle}: \LCP, ``1999/02/16 v1.0i Standard \LaTeX{} Color''. -% \CTAN{macros/latex/required/graphics/}{color.*}} +% {\People{David P.}{Carlisle}: \LCP, ``2005/11/14 v1.0j Standard \LaTeX{} Color''. +% \CTAN{macros/latex/required/graphics/}{color.dtx}} % % \bibitem{colortbl}% % {\People{David P.}{Carlisle}: \Package{colortbl} package, ``2001/02/13 v0.1j Color table columns''. -% \CTAN{macros/latex/contrib/carlisle/}{colortbl.*}} +% \CTAN{macros/latex/contrib/colortbl/}{}} % % \bibitem{pstcol}% -% {\People{David P.}{Carlisle}: \Package{pstcol} package, ``2001/06/20 v1.1 PSTricks color compatibility''. -% \CTAN{macros/latex/required/graphics/}{pstcol.*}} +% {\People{David P.}{Carlisle}, \People{Herbert}{Vo\ss}, \People{Rolf}{Niepraschk}: \Package{pstcol} package, ``2005/11/16 v1.2 LaTeX wrapper for `PSTricks'{}''. +% \CTAN{macros/graphics/pstricks/latex/}{pstcol.sty}} % % \bibitem{chroma}% % {\People{Uwe}{Kern}: ``Chroma: a reference book of \LaTeX{} colors''. @@ -3053,11 +3084,11 @@ % \CTAN{macros/latex/contrib/colorinfo/}{}} % % \bibitem{pdfcolmk}% -% {\People{Heiko}{Oberdiek}: \Package{pdfcolmk} package, ``2005/07/09 v0.7''. -% \CTAN{macros/latex/contrib/oberdiek/pdfcolmk.sty}{}} +% {\People{Heiko}{Oberdiek}: \Package{pdfcolmk} package, ``2006/02/20 v0.8 PDFtex COLor MarK''. +% \CTAN{macros/latex/contrib/oberdiek/}{pdfcolmk.*}} % % \bibitem{hyperref}% -% {\People{Sebastian}{Rahtz}: \Package{hyperref} package, ``2003/11/30 v6.74m Hypertext links for \LaTeX''. +% {\People{Sebastian}{Rahtz}, \People{Heiko}{Oberdiek}: \Package{hyperref} package, ``2006/09/06 v6.75e Hypertext links for \LaTeX''. % \CTAN{macros/latex/contrib/hyperref/}{}} % % \bibitem{smith}% @@ -3101,6 +3132,24 @@ % \subsection*{History} % \addcontentsline{toc}{subsection}{History} % +% \subsubsection*{2006/11/28 v2.10} +% \begin{itemize} +% \item New features: +% \begin{itemize} +% \item \Option{fixinclude} option prevents \Program{dvips} from explicitly resetting current color to \Color{black} before actually inserting an \File{.eps} file via |\color{red}\includegraphics{foo}|. +% \end{itemize} +% \item Changes: +% \begin{itemize} +% \item |\colorbox| and |\fcolorbox| made robust; +% \item obsolete package option \oOption{pst} removed; +% \item several changes to internal macros. +% \end{itemize} +% \item Bugfixes: +% \begin{itemize} +% \item incorrect processing of \Model{cmyk}-type current color `.'. +% \end{itemize} +% \end{itemize} +% % \subsubsection*{2005/12/21 v2.09} % \begin{itemize} % \item New features: @@ -3283,7 +3332,7 @@ % \item Changes: % \begin{itemize} % \item \LCP{} now completely integrated within \XC; -% \item \Option{override}, \Option{usenames}, \Option{nodvipsnames} options and |\xdefinecolor| command no longer needed; +% \item \oOption{override}, \oOption{usenames}, \oOption{nodvipsnames} options and |\xdefinecolor| command no longer needed; % \item \Option{dvips} and \Option{dvipsnames} options now independent of each other; % \item |\tracingcolors|'s behaviour changed to make it more versatile and reduce log file size in standard cases; % \item |\rdivide|'s syntax made more flexible (divide by numbers and/or dimensions); @@ -3404,7 +3453,7 @@ % \subsubsection*{2003/11/09 v1.04} % \begin{itemize} % \item New feature: easy access to current color within color expressions. -% \item New option: \Option{override} to replace |\definecolor| by |\xdefinecolor|. +% \item New option: \oOption{override} to replace |\definecolor| by |\xdefinecolor|. % \item New command: |\tracingcolors| for logging color-specific information. % \end{itemize} % @@ -3473,30 +3522,34 @@ % Save catcodes for later restore: % \begin{macrocode} \expandafter\edef\csname XC@catcodes\endcsname - {\catcode`\noexpand\@\the\catcode`\@\relax - \catcode`\noexpand\!\the\catcode`\!\relax - \catcode`\noexpand\:\the\catcode`\:\relax - \catcode`\noexpand\-\the\catcode`\-\relax - \catcode`\noexpand\+\the\catcode`\+\relax - \catcode`\noexpand\;\the\catcode`\;\relax - \catcode`\noexpand\/\the\catcode`\/\relax - \catcode`\noexpand\"\the\catcode`\"\relax - \catcode`\noexpand\>\the\catcode`\>\relax + {\catcode33 \the\catcode33 % ! + \catcode34 \the\catcode34 % " + \catcode39 \the\catcode39 % ' + \catcode42 \the\catcode42 % * + \catcode44 \the\catcode44 % , + \catcode45 \the\catcode45 % - + \catcode46 \the\catcode46 % . + \catcode47 \the\catcode47 % / + \catcode58 \the\catcode58 % : + \catcode59 \the\catcode59 % ; + \catcode60 \the\catcode60 % < + \catcode61 \the\catcode61 % = + \catcode62 \the\catcode62 % > + \catcode63 \the\catcode63 % ? + \catcode64 \the\catcode64 % @ + \catcode94 \the\catcode94 % ^ + \catcode96 \the\catcode96 % ` \catcode`\noexpand\^^A\the\catcode`\^^A\relax} % \end{macrocode} % \end{macro} % % \begin{macrocode} -\catcode`\@=11 -\catcode`\!=12 -\catcode`\:=12 -\catcode`\-=12 -\catcode`\+=12 -\catcode`\;=12 -\catcode`\/=12 -\catcode`\"=12 -\catcode`\>=12 -\catcode`\^^A=\catcode`\% +\catcode64 11 % +\@makeother\! \@makeother\" \@makeother\' \@makeother\* \@makeother\, +\@makeother\- \@makeother\. \@makeother\/ \@makeother\: \@makeother\; +\@makeother\< \@makeother\= \@makeother\> \@makeother\? \@makeother\` +\catcode94 7 % +\catcode`\^^A=14 % % \end{macrocode} % % @@ -3911,12 +3964,6 @@ \DeclareOption{fixpdftex}{\XC@append\XC@@pkg{\RequirePackage{pdfcolmk}}} % \end{macrocode} % -% Use this option to load \People{David P.}{Carlisle}'s \Package{pstcol} package in order to make standard color definitions available within \Package{pstricks}. -% Warning: this option is neither needed nor useful with recent \Package{pstricks} versions. -% \begin{macrocode} -\DeclareOption{pst}{\def\XC@pst{\RequirePackage{pstcol}}} -% \end{macrocode} -% % \begin{macro}{\KV@Hyp@xcitebordercolor} % \begin{macro}{\KV@Hyp@xfilebordercolor} % \begin{macro}{\KV@Hyp@xlinkbordercolor} @@ -3978,6 +4025,7 @@ % \begin{macrocode} \DeclareOption{xcdraw}{\def\XC@@xcd@{1}} \DeclareOption{noxcdraw}{\def\XC@@xcd@{-1}} +\DeclareOption{fixinclude}{\def\XC@@xcf@{1}} \DeclareOption{prologue}{\def\XC@@xcp@{1}} % \end{macrocode} % \end{macro} @@ -4001,7 +4049,7 @@ \DeclareOption{debugshow}{\catcode`\^^A=9 \let\GDebug\typeout} % \end{macrocode} % -% All other options (including \LC's \Option{usenames}, \Option{nodvipsnames}) are being ignored. +% All other options (including \LC's \oOption{usenames}, \oOption{nodvipsnames}) are being ignored. % \begin{macrocode} \DeclareOption*% {\PackageInfo{xcolor}{Package option `\CurrentOption' ignored}} @@ -4010,6 +4058,7 @@ % Choose default options: % \begin{macrocode} \def\XC@@xcd@{-1} +\def\XC@@xcf@{-1} \def\XC@@xcp@{-1} \ExecuteOptions{natural,showerrors} % \end{macrocode} @@ -4050,12 +4099,13 @@ % \end{macro} % % \begin{macro}{\XC@@xcd@} +% \begin{macro}{\XC@@xcf@} % \begin{macro}{\XC@@xcp@} -% These are used firstly by the \Option{xcdraw} and \Option{prologue} options, indicating whether either option is swithed on or off. +% These are used firstly by the \Option{xcdraw} and \Option{prologue} options, indicating whether either option is switched on or off. % Secondly, the macros serve as test variables for |\ifcase| expressions, storing the intended type of output: $-1=\text{dvi}, 0=\text{ps}, 1=\text{pdf}$. % \begin{macrocode} -\count@\XC@@xcd@ \advance\count@\XC@@xcp@\relax -\ifnum\count@>-2 +\count@\XC@@xcd@ \advance\count@\XC@@xcf@ \advance\count@\XC@@xcp@\relax +\ifnum\count@>-3 % \end{macrocode} % % \begin{macro}{\XC@special} @@ -4075,17 +4125,20 @@ \def\XC@special#1{\special{pdf: content #1}}}% }{\def\@tempa{-1}} % \end{macrocode} +% \end{macro} % % Since the options are independent of each other, we have to adjust the affiliated test variables independently as well. % \begin{macrocode} \ifnum\XC@@xcd@>\m@ne\let\XC@@xcd@\@tempa\fi + \ifnum\XC@@xcf@>\m@ne\let\XC@@xcf@\@tempa\fi \ifnum\XC@@xcp@>\m@ne\let\XC@@xcp@\@tempa\fi % \end{macrocode} -% \end{macro} % -% File variable for prologue output. % \begin{macrocode} \ifnum\@tempa=0 \AtBeginDvi{\special{header=xcolor.pro}}\fi + \ifcase\XC@@xcf@ + \AtBeginDvi{\special{! XCfixnormalscale}} + \fi \ifcase\XC@@xcp@ \AtBeginDvi{\special{header=\jobname.xcp}} \newwrite\XC@@xcp\immediate\openout\XC@@xcp=\jobname.xcp @@ -4102,13 +4155,14 @@ % \end{macrocode} % \end{macro} % \end{macro} +% \end{macro} % % % \subsubsection{Required packages} % -% The --- obsolete --- package \Package{pstcol} needs the real \LCP; all other packages receive a pretended \LC. +% All packages within the list |\XC@pkg| +% receive a pretended \LC. % \begin{macrocode} -\@nameuse{XC@pst} \@namedef{ver@color.sty}{1999/02/16} \XC@@pkg % \end{macrocode} @@ -4205,7 +4259,7 @@ % \Meta[1]{string}|,|\Meta[2]{string}|,...,|\Meta[n]{string}|,,\@nnil|\\ % Converts a comma-separated list into a space-separated list. % The evaluation stops at the first empty argument, skipping all remaining tokens until (and including) |\@nnil|. -% Thus, the list to be converted should always contain at least one |,,| sequence. +% Thus, the list to be converted should always contain at least one `|,,|' sequence. % May be used inside |\edef|. % \begin{macrocode} \def\XC@strip@comma#1,#2% @@ -4247,15 +4301,18 @@ % \begin{macro}{\XC@clean} % \marg{cmd}\\ % Makes a proper comma-separated list from \meta{cmd}'s contents and stores it again in \meta{cmd}. -% Firstly, all commas are changed into spaces, secondly, spaces are turned into commas (using a technique similar to \LaTeX's |\zap@space|). -% Thirdly, the two leading commas are gobbled. -% For example, `| 1 2 , 3 |' is mapped to `|1,2,3|'. +% Firstly, all commas are changed into spaces, secondly, `|. |' strings are changed to spaces. +% Thirdly, non-trailing spaces are turned into commas (using a technique similar to \LaTeX's |\zap@space|). +% Finally, the two leading commas are gobbled. +% For example, `| 1 2. , 3 |' is mapped to `|1,2,3|'. % \begin{macrocode} \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{ #1 }% + \XC@cle@n#1,{ }\XC@cle@n#1{. }{ }\XC@cle@n#1{ },% \edef#1{\expandafter\@gobbletwo#1}} -\def\XC@cle@n#1 #2{,#1\ifx#2\@empty\else\expandafter\XC@cle@n\fi#2} +\def\XC@cle@n#1#2#3% + {\def\XC@cl@@n##1#2##2{#3##1\ifx##2\@empty\else\expandafter\XC@cl@@n\fi##2}% + \edef#1{\expandafter\XC@cl@@n#1#2\@empty}}% % \end{macrocode} % \end{macro} % @@ -5344,7 +5401,7 @@ % \oarg{model}\marg{spec}\marg{text}\\ % Takes the same argument forms as |\textcolor|, but the color specifies the \emph{background} color of the box. % \begin{macrocode} -\def\colorbox#1#{\color@box{#1}} +\def\colorbox#1#{\protect\color@box{#1}} \def\color@box#1#2{\color@b@x\relax{\color#1{#2}}} % \end{macrocode} % \end{macro} @@ -5358,7 +5415,7 @@ % If only the first optional argument is given, it specifies the color model for both colors. % \begin{macrocode} \def\fcolorbox#1#{\color@fbox{#1}} -\def\color@fbox#1#2#3#{\color@fb@x{#1}{#2}{#3}} +\def\color@fbox#1#2#3#{\protect\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}}} @@ -5390,10 +5447,9 @@ {\lower\@tempdima\hbox {\vbox {\kern\fboxrule - \hbox - {\kern\fboxrule#1% - \vbox{\kern\fboxsep\box\@tempboxa\kern\fboxsep}% - #1\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}}% @@ -5528,7 +5584,7 @@ % |\@@mix| may contain a mix expression without leading `!'. % \begin{macrocode} \def\@xcolor@#1#2#3#4% - {\edef\@@mod{#3}\edef\@@clr{#4}% + {\XC@sdef\@@mod{#3}\edef\@@clr{#4}% \ifx\@@mix\@empty\else\expandafter\@xcolor@@\@@mix!!!!\@nil\fi \if@tempswa \XC@let@Nc\@@tmp{XC@cnv@\@@mod @compl}% @@ -6069,7 +6125,6 @@ % % Disable prologue and tracing commands for temporary color definitions. % \begin{macrocode} -% \XC@@xcpfalse \ifnum\XC@tracing>1 \def\XC@tracing{1}\fi \def\XC@@xcp@{-1}\ifnum\XC@tracing>1 \def\XC@tracing{1}\fi % \end{macrocode} % @@ -6752,11 +6807,7 @@ % \end{macro} % % -% \subsubsection{PostScript-related stuff} -% -% \begin{macrocode} -\@ifundefined{XC@pst}{% -% \end{macrocode} +% \subsubsection{\Index{PostScript}-related stuff} % % \begin{macro}{\XC@getcolor} % \marg{color}\marg{cmd}\\ @@ -6805,20 +6856,6 @@ % \end{macrocode} % \end{macro} % -% This alternative code is temporarily needed for compatibility reasons if \Package{pstricks} is loaded via the \Option{pst} option: -% \begin{macrocode} -}{% compatibility code begin -\def\XC@getcolor#1#2% - {\@ifundefinedcolor{#1}% - {\begingroup\color{#1}% - \edef\@@tmp - {\edef\noexpand#2{\noexpand\expandafter\noexpand\c@lor@to@ps - \current@color\noexpand\@@}}% - \expandafter\endgroup\@@tmp}% - {\edef#2{\XC@usecolor{#1}}}} -}% compatibility code end -% \end{macrocode} -% % \begin{macro}{\XC@usecolor} % \marg{name}\\ % \marg{color command}\\ @@ -6843,13 +6880,9 @@ % \end{macrocode} % \end{macro} % -% If \Package{pstcol} has been loaded, we have to redefine two macros from this package. -% The conditional code is needed temporarily, until nobody uses old \Package{pstricks} versions anymore. % \begin{macrocode} \let\pst@getcolor\XC@getcolor -\@ifundefined{XC@pst}{% - \let\pst@usecolor\XC@usecolor -}{} +\let\pst@usecolor\XC@usecolor % \end{macrocode} % % @@ -7029,10 +7062,16 @@ userdict begin /XCrgb{mark exch exec/setrgbcolor XCsetcolor}XCbd % \end{macrocode} % +% This is a fix for \File{special.pro}'s behaviour to perform a |0 setgray| during |normalscale|. +% \begin{macrocode} +/XCfixnormalscale{/normalscale{Resolution 72 div VResolution 72 div neg + scale magscale{DVImag dup scale}if}def}def +% \end{macrocode} +% % Grouping operators. -% We have to disable the |setgray| operator which is invoked by |normalscale| as part of |@beginspecial| as defined by \File{special.pro}. +% We have to call |XCfixnormalscale| since |normalscale| is invoked by |@beginspecial| as defined by \File{special.pro}. % \begin{macrocode} -/XC!b{save/setgray{pop}def}XCbd +/XC!b{save XCfixnormalscale}XCbd /XC!e{restore}XCbd % \end{macrocode} % @@ -7720,7 +7759,6 @@ Purple0,.628,.125,.94} \usepackage{pstricks,pst-tree,pst-slpe,multido} \makeatletter -\@ifpackagelater{pstricks}{2004/05/12}{}{\usepackage[pst]{xcolor}} \makeatother \usepackage{fvrb-ex} diff --git a/Master/texmf-dist/tex/latex/xcolor/svgnam.def b/Master/texmf-dist/tex/latex/xcolor/svgnam.def index 0d748d91124..c84ecf30d6d 100644 --- a/Master/texmf-dist/tex/latex/xcolor/svgnam.def +++ b/Master/texmf-dist/tex/latex/xcolor/svgnam.def @@ -22,10 +22,10 @@ %% in the same archive or directory.) %% \ProvidesFile{svgnam.def} - [2005/12/21 v2.09 Predefined colors according to SVG 1.1 (UK)] + [2006/11/28 v2.10 Predefined colors according to SVG 1.1 (UK)] %% %% ---------------------------------------------------------------- -%% Copyright (C) 2003-2005 by Dr. Uwe Kern +%% Copyright (C) 2003-2006 by Dr. Uwe Kern %% ---------------------------------------------------------------- %% \def\colornameprefix{XC@} diff --git a/Master/texmf-dist/tex/latex/xcolor/x11nam.def b/Master/texmf-dist/tex/latex/xcolor/x11nam.def index ff738862c86..020eaff857a 100644 --- a/Master/texmf-dist/tex/latex/xcolor/x11nam.def +++ b/Master/texmf-dist/tex/latex/xcolor/x11nam.def @@ -22,10 +22,10 @@ %% in the same archive or directory.) %% \ProvidesFile{x11nam.def} - [2005/12/21 v2.09 Predefined colors according to Unix/X11 (UK)] + [2006/11/28 v2.10 Predefined colors according to Unix/X11 (UK)] %% %% ---------------------------------------------------------------- -%% Copyright (C) 2003-2005 by Dr. Uwe Kern +%% Copyright (C) 2003-2006 by Dr. Uwe Kern %% ---------------------------------------------------------------- %% \def\colornameprefix{XC@} diff --git a/Master/texmf-dist/tex/latex/xcolor/xcolor.sty b/Master/texmf-dist/tex/latex/xcolor/xcolor.sty index 23d6d617cac..66e9428a416 100644 --- a/Master/texmf-dist/tex/latex/xcolor/xcolor.sty +++ b/Master/texmf-dist/tex/latex/xcolor/xcolor.sty @@ -22,10 +22,10 @@ %% in the same archive or directory.) %% \ProvidesPackage{xcolor} - [2005/12/21 v2.09 LaTeX color extensions (UK)] + [2006/11/28 v2.10 LaTeX color extensions (UK)] %% %% ---------------------------------------------------------------- -%% Copyright (C) 2003-2005 by Dr. Uwe Kern +%% Copyright (C) 2003-2006 by Dr. Uwe Kern %% ---------------------------------------------------------------- %% %% Please send error reports and suggestions for @@ -40,26 +40,30 @@ %% \NeedsTeXFormat{LaTeX2e} \expandafter\edef\csname XC@catcodes\endcsname - {\catcode`\noexpand\@\the\catcode`\@\relax - \catcode`\noexpand\!\the\catcode`\!\relax - \catcode`\noexpand\:\the\catcode`\:\relax - \catcode`\noexpand\-\the\catcode`\-\relax - \catcode`\noexpand\+\the\catcode`\+\relax - \catcode`\noexpand\;\the\catcode`\;\relax - \catcode`\noexpand\/\the\catcode`\/\relax - \catcode`\noexpand\"\the\catcode`\"\relax - \catcode`\noexpand\>\the\catcode`\>\relax + {\catcode33 \the\catcode33 % ! + \catcode34 \the\catcode34 % " + \catcode39 \the\catcode39 % ' + \catcode42 \the\catcode42 % * + \catcode44 \the\catcode44 % , + \catcode45 \the\catcode45 % - + \catcode46 \the\catcode46 % . + \catcode47 \the\catcode47 % / + \catcode58 \the\catcode58 % : + \catcode59 \the\catcode59 % ; + \catcode60 \the\catcode60 % < + \catcode61 \the\catcode61 % = + \catcode62 \the\catcode62 % > + \catcode63 \the\catcode63 % ? + \catcode64 \the\catcode64 % @ + \catcode94 \the\catcode94 % ^ + \catcode96 \the\catcode96 % ` \catcode`\noexpand\^^A\the\catcode`\^^A\relax} -\catcode`\@=11 -\catcode`\!=12 -\catcode`\:=12 -\catcode`\-=12 -\catcode`\+=12 -\catcode`\;=12 -\catcode`\/=12 -\catcode`\"=12 -\catcode`\>=12 -\catcode`\^^A=\catcode`\% +\catcode64 11 % +\@makeother\! \@makeother\" \@makeother\' \@makeother\* \@makeother\, +\@makeother\- \@makeother\. \@makeother\/ \@makeother\: \@makeother\; +\@makeother\< \@makeother\= \@makeother\> \@makeother\? \@makeother\` +\catcode94 7 % +\catcode`\^^A=14 % \edef\XC@@{\expandafter\noexpand\csname\string\XC@@\endcsname} \newif\ifcolors@ \colors@true \newif\ifcolorerrors@ @@ -172,7 +176,6 @@ \XC@declarenames{ralnames}{ralnam}{} \DeclareOption{table}{\XC@append\XC@@pkg{\RequirePackage{colortbl}}} \DeclareOption{fixpdftex}{\XC@append\XC@@pkg{\RequirePackage{pdfcolmk}}} -\DeclareOption{pst}{\def\XC@pst{\RequirePackage{pstcol}}} \DeclareOption{hyperref} {\@tfor\@@tmp:={cite}{file}{link}{menu}{page}{run}{url}\do {\expandafter\edef\csname KV@Hyp@x\@@tmp bordercolor\endcsname #1% @@ -196,6 +199,7 @@ \DeclareOption{xdvi}{\ExecuteOptions{dvips,monochrome}} \DeclareOption{xcdraw}{\def\XC@@xcd@{1}} \DeclareOption{noxcdraw}{\def\XC@@xcd@{-1}} +\DeclareOption{fixinclude}{\def\XC@@xcf@{1}} \DeclareOption{prologue}{\def\XC@@xcp@{1}} \DeclareOption{kernelfbox}{\XC@@fboxfalse} \DeclareOption{showerrors}{\colorerrors@true} @@ -204,6 +208,7 @@ \DeclareOption*% {\PackageInfo{xcolor}{Package option `\CurrentOption' ignored}} \def\XC@@xcd@{-1} +\def\XC@@xcf@{-1} \def\XC@@xcp@{-1} \ExecuteOptions{natural,showerrors} \InputIfFileExists{color.cfg}{}{} @@ -222,8 +227,8 @@ \def\@@tmp#1.def{\def\XC@@drv{#1}} \expandafter\@@tmp\Gin@driver \fi -\count@\XC@@xcd@ \advance\count@\XC@@xcp@\relax -\ifnum\count@>-2 +\count@\XC@@xcd@ \advance\count@\XC@@xcf@ \advance\count@\XC@@xcp@\relax +\ifnum\count@>-3 \XC@ifcase\XC@@drv {{dvips,pctex32}% {\def\@tempa{0} @@ -236,8 +241,12 @@ \def\XC@special#1{\special{pdf: content #1}}}% }{\def\@tempa{-1}} \ifnum\XC@@xcd@>\m@ne\let\XC@@xcd@\@tempa\fi + \ifnum\XC@@xcf@>\m@ne\let\XC@@xcf@\@tempa\fi \ifnum\XC@@xcp@>\m@ne\let\XC@@xcp@\@tempa\fi \ifnum\@tempa=0 \AtBeginDvi{\special{header=xcolor.pro}}\fi + \ifcase\XC@@xcf@ + \AtBeginDvi{\special{! XCfixnormalscale}} + \fi \ifcase\XC@@xcp@ \AtBeginDvi{\special{header=\jobname.xcp}} \newwrite\XC@@xcp\immediate\openout\XC@@xcp=\jobname.xcp @@ -247,7 +256,6 @@ {\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} @@ -289,10 +297,12 @@ \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{ #1 }% + \XC@cle@n#1,{ }\XC@cle@n#1{. }{ }\XC@cle@n#1{ },% \edef#1{\expandafter\@gobbletwo#1}} -\def\XC@cle@n#1 #2{,#1\ifx#2\@empty\else\expandafter\XC@cle@n\fi#2} +\def\XC@cle@n#1#2#3% + {\def\XC@cl@@n##1#2##2{#3##1\ifx##2\@empty\else\expandafter\XC@cl@@n\fi##2}% + \edef#1{\expandafter\XC@cl@@n#1#2\@empty}}% \def\rdivide#1#2% {\begingroup\toks@{#1}\edef\@@tmp{\noexpand\@tempdima\the#1}% \@defaultunits\@tempdimb=#2pt\relax\@nnil \@@tmp\relax @@ -742,10 +752,10 @@ {\begingroup \let\ignorespaces\endgroup \let\set@color\set@page@color \color} -\def\colorbox#1#{\color@box{#1}} +\def\colorbox#1#{\protect\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@fbox#1#2#3#{\protect\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}}} @@ -763,10 +773,9 @@ {\lower\@tempdima\hbox {\vbox {\kern\fboxrule - \hbox - {\kern\fboxrule#1% - \vbox{\kern\fboxsep\box\@tempboxa\kern\fboxsep}% - #1\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}}% @@ -827,7 +836,7 @@ \kern-0.5\fboxrule \hrule\@height\fboxrule}}} \def\@xcolor@#1#2#3#4% - {\edef\@@mod{#3}\edef\@@clr{#4}% + {\XC@sdef\@@mod{#3}\edef\@@clr{#4}% \ifx\@@mix\@empty\else\expandafter\@xcolor@@\@@mix!!!!\@nil\fi \if@tempswa \XC@let@Nc\@@tmp{XC@cnv@\@@mod @compl}% @@ -1349,7 +1358,6 @@ \@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}} \def\XC@getc@lor#1#2\XC@@ @@ -1368,16 +1376,6 @@ \expandafter\@declaredcolor\expandafter{\the\toks@}% \let\@@tmp\XC@current@color \fi} -}{% compatibility code begin -\def\XC@getcolor#1#2% - {\@ifundefinedcolor{#1}% - {\begingroup\color{#1}% - \edef\@@tmp - {\edef\noexpand#2{\noexpand\expandafter\noexpand\c@lor@to@ps - \current@color\noexpand\@@}}% - \expandafter\endgroup\@@tmp}% - {\edef#2{\XC@usecolor{#1}}}} -}% compatibility code end \def\XC@usecolor#1{\expandafter\XC@usec@lor#1\XC@@} \def\XC@usec@lor#1#2\XC@@ {\ifx#1\xcolor@ @@ -1389,9 +1387,7 @@ \space} \let\XC@c@lor@to@ps\XC@usecolor \let\pst@getcolor\XC@getcolor -\@ifundefined{XC@pst}{% - \let\pst@usecolor\XC@usecolor -}{} +\let\pst@usecolor\XC@usecolor \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} diff --git a/Master/texmf-dist/tpm/xcolor.tpm b/Master/texmf-dist/tpm/xcolor.tpm index 36f6c337284..b03c0f83309 100644 --- a/Master/texmf-dist/tpm/xcolor.tpm +++ b/Master/texmf-dist/tpm/xcolor.tpm @@ -3,7 +3,7 @@ xcolor Package - 2006/10/04 08:43:01 + 2006/12/22 23:24:38 2.03 rahtz @@ -23,14 +23,14 @@ Colors can be mixed like \color{red!30!green!40!blue}. 1250395 - + texmf-dist/dvips/xcolor/xcolor.pro texmf-dist/tex/latex/xcolor/svgnam.def texmf-dist/tex/latex/xcolor/x11nam.def texmf-dist/tex/latex/xcolor/xcolor.sty texmf-dist/tpm/xcolor.tpm - + texmf-dist/doc/latex/xcolor/ChangeLog texmf-dist/doc/latex/xcolor/README texmf-dist/doc/latex/xcolor/xcolor.lox @@ -41,7 +41,7 @@ texmf-dist/doc/latex/xcolor/xcolor2.tex texmf-dist/doc/latex/xcolor/xcolor3.tex texmf-dist/doc/latex/xcolor/xcolor4.tex - + texmf-dist/source/latex/xcolor/xcolor.dtx texmf-dist/source/latex/xcolor/xcolor.ins -- cgit v1.2.3