From 7c462278a2429faf985004a87d2e3332aee13ea3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 11 May 2016 21:29:20 +0000 Subject: xcolor (11may16) git-svn-id: svn://tug.org/texlive/trunk@41044 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/xcolor/xcolor.dtx | 114 +++++++++++++++-------- 1 file changed, 77 insertions(+), 37 deletions(-) (limited to 'Master/texmf-dist/source/latex/xcolor') diff --git a/Master/texmf-dist/source/latex/xcolor/xcolor.dtx b/Master/texmf-dist/source/latex/xcolor/xcolor.dtx index 8e51c6e85f8..48ab957f481 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-2007 by Dr. Uwe Kern +%% Copyright (C) 2003-2016 by Dr. Uwe Kern %% ---------------------------------------------------------------- %% %<*package> @@ -17,8 +17,8 @@ %% % %<*extract|driver|test1|test2|test3|test4> -\def\XCfileversion{v2.11}% -\def\XCfiledate{2007/01/21}% +\def\XCfileversion{v2.12}% +\def\XCfiledate{2016/05/11}% % % % This file may be distributed and/or modified under the @@ -376,7 +376,7 @@ % % In general, there are several types of options: % \begin{itemize} -% \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 color driver as explained in \cite{dpc} and \cite{color}, currently: \Option{dvips}, \Option{xdvi}, \Option{dvipdf}, \Option{dvipdfm}, \Option{dvipdfmx}, \Option{luatex}, \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 or supported: \Option{table}, \Option{fixpdftex}, @@ -897,7 +897,7 @@ % \item \Option{x11names}/\Option{x11names*} loads a set of 317 \Model{rgb} color names\footnote{These names represent 315 different colors.} that are basically variations of a subset of the \Index{SVG} set mentioned before, according to the file \File{rgb.txt} which is part of \Index{Unix}/\Index{X11} distributions\footnote{Again, the original definitions are given in \Model{RGB} parameters, converted to \Model{rgb} by the author.}. % We describe now how to access all 752 color names of \File{rgb.txt} without much effort: % \begin{itemize} -% \item Load \Option{x11namees} as well as \Option{svgnames}. +% \item Load \Option{x11names} as well as \Option{svgnames}. % \item Capitalise initials and skip blanks: \Color[-]{DarkSlateGray} instead of \Color[-]{dark slate gray}. % \item \Index{X11} names without numbers are identical to the corresponding \Index{SVG} colors, except in 5~cases: % use \Color{Gray0}, \Color{Grey0}, \Color{Green0}, \Color{Maroon0}, \Color{Purple0} instead of \Color[-]{Gray}, \Color[-]{Grey}, \Color[-]{Green}, \Color[-]{Maroon}, \Color[-]{Purple} to obtain the original \Index{X11} colors. @@ -1095,6 +1095,10 @@ % Note that color-specific commands from other packages may give unexpected results if directly confronted with color expressions (e.g., \Package{soul}'s |\sethlcolor| and friends). % However, one can turn the expression into a name via |\colorlet| and try to use that name instead. % +% \DescribeMacro\nopagecolor +% Removes any currently specified page color returning to the default transparent background. +% It is not yet supported by all driver options and so generates a warning if there is no definition in the driver file. +% % % \subsubsection{Colored boxes}\label{sec.fbox} % @@ -2154,37 +2158,35 @@ % \rowcolor{tableheadcolor} % \hline % \em Driver&\em Version&\Model{rgb}&\Model{cmy}&\Model{cmyk}&\Model{hsb}&\Model{gray}&\Model{RGB}&\Model{HTML}&\Model{HSB}&\Model{Gray}\\ -% \Option{dvipdf}&1999/02/16 v3.0i&d&n&d&n&d&i&n&n&n\\ -% \Option{dvips}&1999/02/16 v3.0i&d&n&d&d&d&i&n&n&n\\ -% \Option{dvipsone}&1999/02/16 v3.0i&d&n&d&d&d&i&n&n&n\\ -% \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}&2006/03/02 v0.03p&d&n&d&n&d&i&n&n&n\\ +% \Option{dvipdf}&2015/12/30 v3.0k&d&n&d&n&d&i&n&n&n\\ +% \Option{dvips}&2015/12/30 v3.0k&d&n&d&d&d&i&n&n&n\\ +% \Option{dvipsone}&2015/12/30 v3.0k&d&n&d&d&d&i&n&n&n\\ +% \Option{pctex32}&2015/12/30 v3.0k&d&n&d&d&d&i&n&n&n\\ +% \Option{pctexps}&2015/12/30 v3.0k&d&n&d&d&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\\ +% \Option{pdftex}&2011/05/27 v0.06d&d&n&d&n&d&i&n&n&n\\ +% \Option{luatex}&2016/01/23 v0.01b&d&n&d&n&d&i&n&n&n\\ % \hline -% \Option{dvipdfmx}&?&d&n&d&f&d&i&n&n&n\\ +% \Option{dvipdfm}&1999/9/6 vx.x&d&n&d&n&d&i&n&n&n\\ +% \Option{dvipdfmx}&2016/04/06 v4.08&d&n&d&?&d&i&n&n&n\\ % \hline -% \Option{textures}&1997/5/28 v0.3&d&n&d&a&i&n&n&n&n\\ +% \Option{textures}&1997/5/28 v0.3&d&n&d&?&i&n&n&n&n\\ % \hline % \Option{vtex}&1999/01/14 v6.3&d&n&d&n&i&i&n&n&n\\ % \hline -% \Option{xetex}&2004/05/09 v0.7&i&n&i&i&i&i&d&n&n\\ +% \Option{xetex}&2016/04/06 v4.08&d&n&d&d&d&i&n&n&n\\ % \hline -% \Option{tcidvi}&1999/02/16 v3.0i&i&n&i&n&i&d&n&n&n\\ -% \Option{truetex}&1999/02/16 v3.0i&i&n&i&n&i&d&n&n&n\\ +% \Option{tcidvi}&2015/12/30 v3.0k&i&n&i&n&i&d&n&n&n\\ +% \Option{truetex}&2015/12/30 v3.0k&i&n&i&n&i&d&n&n&n\\ % \hline -% \Option{dviwin}&1999/02/16 v3.0i&n&n&n&n&n&n&n&n&n\\ -% \Option{emtex}&1999/02/16 v3.0i&n&n&n&n&n&n&n&n&n\\ -% \Option{pctexhp}&1999/02/16 v3.0i&n&n&n&n&n&n&n&n&n\\ -% \Option{pctexwin}&1999/02/16 v3.0i&n&n&n&n&n&n&n&n&n\\ +% \Option{dviwin}&2015/12/30 v3.0k&n&n&n&n&n&n&n&n&n\\ +% \Option{emtex}&2015/12/30 v3.0k&n&n&n&n&n&n&n&n&n\\ +% \Option{pctexhp}&2015/12/30 v3.0k&n&n&n&n&n&n&n&n&n\\ +% \Option{pctexwin}&2015/12/30 v3.0k&n&n&n&n&n&n&n&n&n\\ % \hline\hline % \multicolumn{11}c{\Option{dviwindo} = \Option{dvipsone}; \Option{oztex} = \Option{dvips}; \Option{xdvi} = \Option{dvips} + \Option{monochrome}}\\ -% \multicolumn{11}c{\footnotemark[1]\,part of \Package{graphics} package\quad \footnotemark[2]\,additionally distributed with MiK\TeX}\\ % \hline -% \multicolumn{11}c{Driver's color model support: d\,=\,direct, i\,=\,indirect, a\,=\,alleged, n\,=\,none, f\,=\,faulty}\\ +% \multicolumn{11}c{Driver's color model support: d\,=\,direct, i\,=\,indirect, n\,=\,none}\\ % \hline % \end{tabular} % \end{table} @@ -3056,11 +3058,11 @@ % \URL{http://www.physics.sfasu.edu/astro/color/spectra.html}} % % \bibitem{dpc}% -% {\People{David P.}{Carlisle}: ``Packages in the `graphics' bundle'', 2005. +% {\People{David P.}{Carlisle}: ``Packages in the `graphics' bundle'', 2014. % \CTAN{macros/latex/required/graphics/}{grfguide.*}} % % \bibitem{color}% -% {\People{David P.}{Carlisle}: \LCP, ``2005/11/14 v1.0j Standard \LaTeX{} Color''. +% {\People{David P.}{Carlisle}: \LCP, ``2016/01/03 v1.1b Standard LaTeX Color (DPC)''. % \CTAN{macros/latex/required/graphics/}{color.dtx}} % % \bibitem{colortbl}% @@ -3142,6 +3144,20 @@ % \subsection*{History} % \addcontentsline{toc}{subsection}{History} % +% \subsubsection*{2016/05/11 v2.12} +% \begin{itemize} +% \item New features: +% \begin{itemize} +% \item |\nopagecolor| command as introduced in \LC{} v1.1a (example added to \File{xcolor3.tex}); +% \item \Option{luatex} driver option (code provided by DPC) to fix incompatibilities due to changes in new Lua\TeX\ version. +% \end{itemize} +% \item Bugfixes: +% \begin{itemize} +% \item possible name conflict by |\XC@ifxcase| call; +% \item incorrect internal |\@hex@@Hex| macro. +% \end{itemize} +% \end{itemize} +% % \subsubsection*{2007/01/21 v2.11} % \begin{itemize} % \item New features: @@ -3789,10 +3805,10 @@ % If all tests are `false', then \Meta{default code} is executed. % \begin{macrocode} \long\def\XC@ifxcase#1#2#3% - {\long\def\@@tmp##1##2% + {\long\def\XC@if@##1##2% {\ifx#1##1% - \toks@{##2}\expandafter\remove@to@nnil\else\expandafter\@@tmp\fi}% - \@@tmp#2#1{#3}\@nnil\the\toks@} + \toks@{##2}\expandafter\remove@to@nnil\else\expandafter\XC@if@\fi}% + \XC@if@#2#1{#3}\@nnil\the\toks@} % \end{macrocode} % \end{macro} % @@ -3804,10 +3820,10 @@ % If all tests are `false', then \Meta{default code} is executed. % \begin{macrocode} \long\def\XC@ifcase#1#2#3% - {\long\def\@@tmp##1##2% + {\long\def\XC@if@##1##2% {\@expandtwoargs\in@{,#1,}{,##1,}\ifin@ - \toks@{##2}\expandafter\remove@to@nnil\else\expandafter\@@tmp\fi}% - \@@tmp#2{#1}{#3}\@nnil\the\toks@} + \toks@{##2}\expandafter\remove@to@nnil\else\expandafter\XC@if@\fi}% + \XC@if@#2{#1}{#3}\@nnil\the\toks@} % \end{macrocode} % \end{macro} % @@ -4029,7 +4045,7 @@ % Drivers that come with their individual definition files: % \begin{macrocode} \@tfor\@@tmp:={dvipdf}{dvipdfm}{dvipdfmx}{dvips}{dvipsone}{dviwin}% - {emtex}{pctex32}{pctexhp}{pctexps}{pctexwin}{pdftex}% + {emtex}{luatex}{pctex32}{pctexhp}{pctexps}{pctexwin}{pdftex}% {tcidvi}{textures}{truetex}{vtex}{xetex}\do {\edef\@@tmp{\noexpand\DeclareOption{\@@tmp}% {\def\noexpand\Gin@driver{\@@tmp.def}}}% @@ -4142,6 +4158,13 @@ {pdftex}% {\def\@tempa{1} \def\XC@special#1{\pdfliteral{ q #1 Q }}}% + {luatex}% + {\def\@tempa{1} + \ifnum\luatexversion<87% + \def\XC@special#1{\pdfliteral{ q #1 Q }}% + \else% + \def\XC@special#1{\pdfextension literal{ q #1 Q }}% + \fi}% {dvipdfm}% {\def\@tempa{1} \def\XC@special#1{\special{pdf: content #1}}}% @@ -4255,7 +4278,7 @@ % \begin{macrocode} \def\GetGinDriver {\@tempswafalse - \@tfor\@@tmp:={dvips}{pdftex}{dvipdf}{dvipdfm}{dvipsone}{vtex}{textures}% + \@tfor\@@tmp:={dvips}{luatex}{pdftex}{dvipdf}{dvipdfm}{dvipsone}{vtex}{textures}% \do{\ifx\XC@@drv\@@tmp\@tempswatrue\@break@tfor\fi}% \edef\GinDriver{\if@tempswa\XC@@drv\else hypertex\fi}} % \end{macrocode} @@ -4273,7 +4296,7 @@ \def\@hex@Hex#1{\ifx#1\relax\else\expandafter\@hex@@Hex\expandafter#1\fi} \def\@hex@@Hex#1% {\if a#1A\else \if b#1B\else \if c#1C\else \if d#1D\else - \if e#1E\else \if f#1f\else #1\fi\fi\fi\fi\fi\fi \@hex@Hex} + \if e#1E\else \if f#1F\else #1\fi\fi\fi\fi\fi\fi \@hex@Hex} % \end{macrocode} % \end{macro} % @@ -5415,6 +5438,17 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\nopagecolor} +% Removes any currently specified page color returning to the default transparent background. +% It is not yet supported by all driver options and so generates a warning if there is no definition in the driver file. +% \begin{macrocode} +\def\nopagecolor + {\@ifundefined{no@page@color}% + {\PackageInfo{xcolor}{\string\nopagecolor\space is not supported}}% + {\no@page@color}} +% \end{macrocode} +% \end{macro} +% % % \subsubsection{Colored boxes} % @@ -6958,7 +6992,7 @@ % \end{macrocode} % % \begin{macrocode} - {dvipsone,pctexps,pdftex,tcidvi,truetex,vtex,xetex}% + {dvipsone,luatex,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}} @@ -7988,6 +8022,11 @@ By playing around with different values of \texttt{\string\tracingcolors}, one c \vfill +\clearpage +\nopagecolor +Switch off \texttt{\string\pagecolor} by \texttt{\string\nopagecolor}. +The driver may or may not obey this command \dots + \clearpage \pagecolor{white} @@ -8124,6 +8163,7 @@ Type test: %%\PassOptionsToPackage{dviwindo}{xcolor} %%\PassOptionsToPackage{emtex}{xcolor} %%\PassOptionsToPackage{oztex}{xcolor} +%%\PassOptionsToPackage{luatex}{xcolor} %%\PassOptionsToPackage{pctex32}{xcolor} %%\PassOptionsToPackage{pctexhp}{xcolor} %%\PassOptionsToPackage{pctexps}{xcolor} -- cgit v1.2.3