diff options
author | Karl Berry <karl@freefriends.org> | 2022-06-12 20:40:02 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-06-12 20:40:02 +0000 |
commit | 87cabbf4663200d9597c9f0c55838ecf1ebc0a6c (patch) | |
tree | 14c472f2859bc193d68932df2dfeb0b925685b99 /Master | |
parent | 3eca78d12a2bbf27a15e9c706fcf9243b4520441 (diff) |
xcolor (12jun22)
git-svn-id: svn://tug.org/texlive/trunk@63563 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/latex/xcolor/ChangeLog | 10 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/xcolor/README | 56 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/xcolor/README.md | 74 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/xcolor/xcolor.lox | 6 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/xcolor/xcolor.pdf | bin | 858670 -> 864625 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/xcolor/xcolor1.tex | 8 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/xcolor/xcolor2.pdf | bin | 94138 -> 91583 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/xcolor/xcolor2.tex | 8 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/xcolor/xcolor3.tex | 8 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/xcolor/xcolor4.tex | 8 | ||||
-rw-r--r-- | Master/texmf-dist/dvips/xcolor/xcolor.pro | 4 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/xcolor/xcolor.dtx | 51 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/xcolor/svgnam.def | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/xcolor/x11nam.def | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/xcolor/xcolor.sty | 23 |
15 files changed, 152 insertions, 112 deletions
diff --git a/Master/texmf-dist/doc/latex/xcolor/ChangeLog b/Master/texmf-dist/doc/latex/xcolor/ChangeLog index 1e613111c27..48ac99bfbda 100644 --- a/Master/texmf-dist/doc/latex/xcolor/ChangeLog +++ b/Master/texmf-dist/doc/latex/xcolor/ChangeLog @@ -3,6 +3,14 @@ https://github.com/latex3/xcolor/issues History ======= +2022/06/12 v2.14 +* New features: + - Load if it exists the code from LaTeX to define \mathcolor. +* Bugfixes (LaTeX Team) + - Modify \XC@info to avoid spurious error from \colorlet{foo}{} issue #12 + - make \normalcolor, \colorbox, \fcolorbox \textcolor, \pagecolor, + \nopagecolor, \definecolor, \DefineNamedColor protected as in color.sty issue #17 + 2021/10/31 v2.13 * Bugfixes (LaTeX Team) - use \@backslashchar color rather than \string\color to @@ -11,7 +19,7 @@ History - Declare dvisvgm option to match graphics and color packages. Make dvipdfm an alias for dvipdfmx - Modify \XC@info to avoid spurious text from \colorlet{foo}{.!50} - + 2016/05/11 v2.12 * New features: - \nopagecolor command as introduced in `color' v1.1a diff --git a/Master/texmf-dist/doc/latex/xcolor/README b/Master/texmf-dist/doc/latex/xcolor/README deleted file mode 100644 index fa4b7dc333b..00000000000 --- a/Master/texmf-dist/doc/latex/xcolor/README +++ /dev/null @@ -1,56 +0,0 @@ -Package `xcolor' by Dr. Uwe Kern -Maintained by the LaTeX Project https://github.com/latex3/xcolor/issues - - -`xcolor' provides easy driver-independent access to several kinds of -colors, tints, shades, tones, and mixes of arbitrary colors by means of -color expressions like \color{red!50!green!20!blue}. -It allows to select a document-wide target color model and offers tools -for automatic color schemes, conversion between nine color models, -alternating table row colors, color blending and masking, color -separation, and color wheel calculations. - -Installation instructions -========================= - -Extract all package files: - `latex xcolor.ins' - -Put the generated files to their respective locations -within the TeX installation: - *.sty -> /tex/latex/xcolor/ - *.def -> /tex/latex/xcolor/ - *.pro -> /dvips/xcolor/ - -Create the documentation: - `latex xcolor.dtx' - `latex xcolor.dtx' - `makeindex -s gind.ist xcolor.idx' - `latex xcolor.dtx' - `latex xcolor.dtx' - -Run the test files (N=1,2,...): - `latex xcolorN.tex' - `latex xcolorN.tex' - -Notes -===== - -- `xcolor1.tex' should run with both LaTeX and pdfLaTeX, it yields a - 50-page document with several systematic color conversion examples -- `xcolor2.tex' is a 3-page `pstricks' example document that won't run - with pdfLaTeX -- `xcolor3.tex' is a 2-page example for demonstrating several display - and logging facilities -- `xcolor4.tex' is a 1-page driver test file; - uncomment the relevant code line in the header and run it with the - appropriate program, e.g., `latex xcolor4' or any other processor; - apply any desired post-processing like dvips, dvipdfm, etc. -- If the file `xcolor.ins' is missing, run `latex xcolor.dtx' once - and quit the LaTeX compiler as soon as the first error message - appears. - -History -======= - -See file `ChangeLog'. diff --git a/Master/texmf-dist/doc/latex/xcolor/README.md b/Master/texmf-dist/doc/latex/xcolor/README.md new file mode 100644 index 00000000000..dd8e528ccd4 --- /dev/null +++ b/Master/texmf-dist/doc/latex/xcolor/README.md @@ -0,0 +1,74 @@ +## Package `xcolor` by Dr. Uwe Kern + +Version 2022-06-12 v2.14 + +Maintained by the LaTeX Project https://github.com/latex3/xcolor/issues + +`xcolor` provides easy driver-independent access to several kinds of +colors, tints, shades, tones, and mixes of arbitrary colors by means of +color expressions like \color{red!50!green!20!blue}. +It allows to select a document-wide target color model and offers tools +for automatic color schemes, conversion between nine color models, +alternating table row colors, color blending and masking, color +separation, and color wheel calculations. + +## Copyright (C) +- 2003-2021 Dr. Uwe Kern +- 2021-2022 The LaTeX Project + +## License +LaTeX Project Public License, version 1.3c or later. + +## Installation instructions + +* Extract all package files: + + ~~~~ + latex xcolor.ins + ~~~~ + +* Put the generated files to their respective locations +within the TeX installation: + + ~~~~ + *.sty -> /tex/latex/xcolor/ + *.def -> /tex/latex/xcolor/ + *.pro -> /dvips/xcolor/ + ~~~~ + +* Create the documentation: + + ~~~~ + latex xcolor.dtx + latex xcolor.dtx + makeindex -s gind.ist xcolor.idx + latex xcolor.dtx + latex xcolor.dtx + ~~~~ + +* Run the test files (N=1,2,...): + + ~~~~ + latex xcolorN.tex + latex xcolorN.tex + ~~~~ + +## Notes + +- `xcolor1.tex` should run with both LaTeX and pdfLaTeX, it yields a + 50-page document with several systematic color conversion examples +- `xcolor2.tex` is a 3-page `pstricks` example document that won't run + with pdfLaTeX +- `xcolor3.tex` is a 2-page example for demonstrating several display + and logging facilities +- `xcolor4.tex` is a 1-page driver test file; + uncomment the relevant code line in the header and run it with the + appropriate program, e.g., `latex xcolor4` or any other processor; + apply any desired post-processing like dvips, dvipdfm, etc. +- If the file `xcolor.ins` is missing, run `latex xcolor.dtx` once + and quit the LaTeX compiler as soon as the first error message + appears. + +## History + +See file `ChangeLog`. diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor.lox b/Master/texmf-dist/doc/latex/xcolor/xcolor.lox index fda92a2d61e..42f00c9ae9c 100644 --- a/Master/texmf-dist/doc/latex/xcolor/xcolor.lox +++ b/Master/texmf-dist/doc/latex/xcolor/xcolor.lox @@ -23,11 +23,11 @@ %% %% ---------------------------------------------------------------- %% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de> -%% 2021 LaTeX Project https://github.com/latex3/xcolor/issues +%% 2021-2022 LaTeX Project https://github.com/latex3/xcolor/issues %% ---------------------------------------------------------------- %% -\def\XCfileversion{v2.13}% -\def\XCfiledate{2021/10/31}% +\def\XCfileversion{v2.14}% +\def\XCfiledate{2022/06/12}% \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 Binary files differindex ac7a3d3ef81..be04b364513 100644 --- a/Master/texmf-dist/doc/latex/xcolor/xcolor.pdf +++ b/Master/texmf-dist/doc/latex/xcolor/xcolor.pdf diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor1.tex b/Master/texmf-dist/doc/latex/xcolor/xcolor1.tex index 46f59362816..35accd54507 100644 --- a/Master/texmf-dist/doc/latex/xcolor/xcolor1.tex +++ b/Master/texmf-dist/doc/latex/xcolor/xcolor1.tex @@ -22,15 +22,15 @@ %% in the same archive or directory.) %% \ProvidesFile{xcolor1} - [2021/10/31 v2.13 Color conversion test (UK)] + [2022/06/12 v2.14 Color conversion test (UK)] %% %% ---------------------------------------------------------------- %% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de> -%% 2021 LaTeX Project https://github.com/latex3/xcolor/issues +%% 2021-2022 LaTeX Project https://github.com/latex3/xcolor/issues %% ---------------------------------------------------------------- %% -\def\XCfileversion{v2.13}% -\def\XCfiledate{2021/10/31}% +\def\XCfileversion{v2.14}% +\def\XCfiledate{2022/06/12}% \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 Binary files differindex 2391e374e89..35c2946529d 100644 --- a/Master/texmf-dist/doc/latex/xcolor/xcolor2.pdf +++ b/Master/texmf-dist/doc/latex/xcolor/xcolor2.pdf diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor2.tex b/Master/texmf-dist/doc/latex/xcolor/xcolor2.tex index 704e2a14540..a512eda641a 100644 --- a/Master/texmf-dist/doc/latex/xcolor/xcolor2.tex +++ b/Master/texmf-dist/doc/latex/xcolor/xcolor2.tex @@ -22,15 +22,15 @@ %% in the same archive or directory.) %% \ProvidesFile{xcolor2} - [2021/10/31 v2.13 Pstricks color test (UK)] + [2022/06/12 v2.14 Pstricks color test (UK)] %% %% ---------------------------------------------------------------- %% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de> -%% 2021 LaTeX Project https://github.com/latex3/xcolor/issues +%% 2021-2022 LaTeX Project https://github.com/latex3/xcolor/issues %% ---------------------------------------------------------------- %% -\def\XCfileversion{v2.13}% -\def\XCfiledate{2021/10/31}% +\def\XCfileversion{v2.14}% +\def\XCfiledate{2022/06/12}% \listfiles \documentclass{article} diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex b/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex index 36ee8024b55..975d35c604a 100644 --- a/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex +++ b/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex @@ -22,15 +22,15 @@ %% in the same archive or directory.) %% \ProvidesFile{xcolor3} - [2021/10/31 v2.13 Color logging test (UK)] + [2022/06/12 v2.14 Color logging test (UK)] %% %% ---------------------------------------------------------------- %% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de> -%% 2021 LaTeX Project https://github.com/latex3/xcolor/issues +%% 2021-2022 LaTeX Project https://github.com/latex3/xcolor/issues %% ---------------------------------------------------------------- %% -\def\XCfileversion{v2.13}% -\def\XCfiledate{2021/10/31}% +\def\XCfileversion{v2.14}% +\def\XCfiledate{2022/06/12}% \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 55411d1ec57..0ea3a208cbc 100644 --- a/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex +++ b/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex @@ -22,15 +22,15 @@ %% in the same archive or directory.) %% \ProvidesFile{xcolor4} - [2021/10/31 v2.13 Color driver test (UK)] + [2022/06/12 v2.14 Color driver test (UK)] %% %% ---------------------------------------------------------------- %% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de> -%% 2021 LaTeX Project https://github.com/latex3/xcolor/issues +%% 2021-2022 LaTeX Project https://github.com/latex3/xcolor/issues %% ---------------------------------------------------------------- %% -\def\XCfileversion{v2.13}% -\def\XCfiledate{2021/10/31}% +\def\XCfileversion{v2.14}% +\def\XCfiledate{2022/06/12}% \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 71a992529d0..512887812b9 100644 --- a/Master/texmf-dist/dvips/xcolor/xcolor.pro +++ b/Master/texmf-dist/dvips/xcolor/xcolor.pro @@ -23,11 +23,11 @@ %% in the same archive or directory.) %% %% xcolor.pro (PostScript/dvips header file) -%% [2021/10/31 v2.13 LaTeX color extensions (UK)] +%% [2022/06/12 v2.14 LaTeX color extensions (UK)] %% %% ---------------------------------------------------------------- %% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de> -%% 2021 LaTeX Project https://github.com/latex3/xcolor/issues +%% 2021-2022 LaTeX Project https://github.com/latex3/xcolor/issues %% ---------------------------------------------------------------- %% userdict begin diff --git a/Master/texmf-dist/source/latex/xcolor/xcolor.dtx b/Master/texmf-dist/source/latex/xcolor/xcolor.dtx index 8162c8f863c..e6b5129012c 100644 --- a/Master/texmf-dist/source/latex/xcolor/xcolor.dtx +++ b/Master/texmf-dist/source/latex/xcolor/xcolor.dtx @@ -2,7 +2,7 @@ %% %% ---------------------------------------------------------------- %% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de> -%% 2021 LaTeX Project https://github.com/latex3/xcolor/issues +%% 2021-2022 LaTeX Project https://github.com/latex3/xcolor/issues %% ---------------------------------------------------------------- %% %<*package> @@ -18,8 +18,8 @@ %% %</package> %<*extract|driver|test1|test2|test3|test4> -\def\XCfileversion{v2.13}% -\def\XCfiledate{2021/10/31}% +\def\XCfileversion{v2.14}% +\def\XCfiledate{2022/06/12}% %</extract|driver|test1|test2|test3|test4> % % This file may be distributed and/or modified under the @@ -34,7 +34,6 @@ % % \fi % -% \CheckSum{4864} % % \DoNotIndex{\def,\gdef,\edef,\xdef,\long,\let} % \DoNotIndex{\ifnum,\ifdim,\iftrue,\iffalse,\ifx,\ifcase,\else,\or,\fi} @@ -100,15 +99,18 @@ \listfiles \ProvidesFile{xcolor.dtx}[\XCfiledate\space\XCfileversion\space `xcolor' source and documentation (UK)] +\PassOptionsToPackage + { + hyperindex=false,bookmarks,bookmarksopen,bookmarksopenlevel=1,% + pdftitle={xcolor \XCfileversion{} (\XCfiledate)}, + pdfauthor={Dr. Uwe Kern},% + pdfsubject={Color extensions for LaTeX and pdfLaTeX},% + pdfkeywords={xcolor,color,colour,model,tint,tone,shade,harmony,spot,latex,pdftex,dvips,% + conversion,blend,mix,mask,separation,rgb,cmy,cmyk,hsb,gray,html,wave,thsb,wheel} + }{hyperref} \documentclass{ltxdoc} \usepackage[table,showerrors,dvipsnames,hyperref]{xcolor}[2005/06/06] \usepackage{chngpage,varioref,tabularx,amsmath,amsthm} -\usepackage - [\GinDriver,hyperindex=false,bookmarks,bookmarksopen,bookmarksopenlevel=1,% - pdftitle={xcolor \XCfileversion{} (\XCfiledate)},pdfauthor={Dr. Uwe Kern},% - pdfsubject={Color extensions for LaTeX and pdfLaTeX},% - pdfkeywords={xcolor,color,colour,model,tint,tone,shade,harmony,spot,latex,pdftex,dvips,% - conversion,blend,mix,mask,separation,rgb,cmy,cmyk,hsb,gray,html,wave,thsb,wheel}]{hyperref} \OnlyDescription \EnableCrossrefs \CodelineIndex @@ -1137,6 +1139,12 @@ % This is still experimental code that may confuse \File{.dvi} viewers. % The opposite option \Option{noxcdraw} forces usage of the generic (driver-independent) code. % +% \subsubsection{Colors in math} +% +% While it is possible to color parts of a formula using |\color| commands the approach is fairly cumbersome. +% Therefore the command \cs{mathcolor} has been added to the \Package{color} and \Package{xcolor} package, +% which has the same syntax as \cs{textcolor}. The full documentation and examples of its use is in \texttt{mathcolor.pdf} +% in the \LaTeX{} documentation. % % \subsubsection{Using the current color} % @@ -4850,7 +4858,7 @@ % \end{itemize} % See table \vref{tab.internal} for some examples. % \begin{macrocode} -\def\definecolor{\@testopt{\XC@definecolor}{}} +\protected\def\definecolor{\@testopt{\XC@definecolor}{}} \def\XC@definecolor[#1]#2% {\@testopt{\XC@definec@lor[#1]{#2}}\colornameprefix} % \end{macrocode} @@ -5067,7 +5075,7 @@ % \begin{macro}{\DefineNamedColor} % \marg{type}\marg{name}\marg{model-list}\marg{spec-list} % \begin{macrocode} -\def\DefineNamedColor#1% +\protected\def\DefineNamedColor#1% {\@nameuse{XC@\ifdefinecolors defin\else prepar\fi ecolor}[#1]} % \end{macrocode} % \end{macro} @@ -5432,7 +5440,7 @@ % The naming is by analogy with |\textrm| (as opposed to |\rm| and |\rmfamily|) although it is slightly a misnomer as the command also works in math-mode. % Additionally, it calls |\leavevmode| to ensure the start of horizontal mode. % \begin{macrocode} -\def\textcolor#1#{\@textcolor{#1}} +\protected\def\textcolor#1#{\@textcolor{#1}} \def\@textcolor#1#2#3{\protect\leavevmode{\color#1{#2}#3}} % \end{macrocode} % \end{macro} @@ -5443,7 +5451,7 @@ % Specifies the background color for the current, and all following, pages. % It is a global declaration which does not respect \TeX\ groups. % \begin{macrocode} -\def\pagecolor +\protected\def\pagecolor {\begingroup \let\ignorespaces\endgroup \let\set@color\set@page@color \color} @@ -5454,13 +5462,18 @@ % 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 +\protected\def\nopagecolor {\@ifundefined{no@page@color}% {\PackageInfo{xcolor}{\@backslashchar nopagecolor\space is not supported}}% {\no@page@color}} % \end{macrocode} % \end{macro} % +% \subsubsection{mathcolor} +% We load the new mathcolor support from the kernel if it exists. The documentation +% is in \texttt{mathcolor.pdf} +% +\InputIfFileExists{mathcolor.ltx}{}{} % % \subsubsection{Colored boxes} % @@ -5469,7 +5482,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#{\protect\color@box{#1}} +\protected\def\colorbox#1#{\color@box{#1}} \def\color@box#1#2{\color@b@x\relax{\color#1{#2}}} % \end{macrocode} % \end{macro} @@ -5482,7 +5495,7 @@ % Puts a frame of the first color around a box with a background specified by the second color. % If only the first optional argument is given, it specifies the color model for both colors. % \begin{macrocode} -\def\fcolorbox#1#{\color@fbox{#1}} +\protected\def\fcolorbox#1#{\color@fbox{#1}} \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}% @@ -6133,7 +6146,7 @@ \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 % now there's no >,:,! - \if-\expandafter\@car#2\@nil\def#2{2}\else % catches -red + \if-\expandafter\@car#2\relax\@nil\def#2{2}\else % catches -red \edef#2{\noexpand\in@{/./}{/#2/}}#2% \edef#2{\ifin@0\else1\fi}\fi\fi\fi\fi} % \end{macrocode} @@ -6975,7 +6988,7 @@ % |\normalcolor| is defined (to |\relax|) in the \LaTeX\ kernel, so it is safe to use this in macros that may possibly be used in conjunction with color. % It will have no effect until the \XCP{} is also loaded. % \begin{macrocode} -\def\normalcolor{\let\current@color\default@color\set@color} +\protected\def\normalcolor{\let\current@color\default@color\set@color} % \end{macrocode} % \end{macro} % diff --git a/Master/texmf-dist/tex/latex/xcolor/svgnam.def b/Master/texmf-dist/tex/latex/xcolor/svgnam.def index 902641f6afd..0b445d03f13 100644 --- a/Master/texmf-dist/tex/latex/xcolor/svgnam.def +++ b/Master/texmf-dist/tex/latex/xcolor/svgnam.def @@ -22,11 +22,11 @@ %% in the same archive or directory.) %% \ProvidesFile{svgnam.def} - [2021/10/31 v2.13 Predefined colors according to SVG 1.1 (UK)] + [2022/06/12 v2.14 Predefined colors according to SVG 1.1 (UK)] %% %% ---------------------------------------------------------------- %% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de> -%% 2021 LaTeX Project https://github.com/latex3/xcolor/issues +%% 2021-2022 LaTeX Project https://github.com/latex3/xcolor/issues %% ---------------------------------------------------------------- %% \def\colornameprefix{XC@} diff --git a/Master/texmf-dist/tex/latex/xcolor/x11nam.def b/Master/texmf-dist/tex/latex/xcolor/x11nam.def index f88c455dded..82957c001c7 100644 --- a/Master/texmf-dist/tex/latex/xcolor/x11nam.def +++ b/Master/texmf-dist/tex/latex/xcolor/x11nam.def @@ -22,11 +22,11 @@ %% in the same archive or directory.) %% \ProvidesFile{x11nam.def} - [2021/10/31 v2.13 Predefined colors according to Unix/X11 (UK)] + [2022/06/12 v2.14 Predefined colors according to Unix/X11 (UK)] %% %% ---------------------------------------------------------------- %% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de> -%% 2021 LaTeX Project https://github.com/latex3/xcolor/issues +%% 2021-2022 LaTeX Project https://github.com/latex3/xcolor/issues %% ---------------------------------------------------------------- %% \def\colornameprefix{XC@} diff --git a/Master/texmf-dist/tex/latex/xcolor/xcolor.sty b/Master/texmf-dist/tex/latex/xcolor/xcolor.sty index 26a0b9425c3..c08e1c66df3 100644 --- a/Master/texmf-dist/tex/latex/xcolor/xcolor.sty +++ b/Master/texmf-dist/tex/latex/xcolor/xcolor.sty @@ -22,11 +22,11 @@ %% in the same archive or directory.) %% \ProvidesPackage{xcolor} - [2021/10/31 v2.13 LaTeX color extensions (UK)] + [2022/06/12 v2.14 LaTeX color extensions (UK)] %% %% ---------------------------------------------------------------- %% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de> -%% 2021 LaTeX Project https://github.com/latex3/xcolor/issues +%% 2021-2022 LaTeX Project https://github.com/latex3/xcolor/issues %% ---------------------------------------------------------------- %% %% Please send error reports and suggestions for @@ -470,7 +470,7 @@ \def\XC@clr@gray@white{1} \@tfor\@@tmp:={grad}{last}{step}\do {\XC@let@cN{XC@met@\@@tmp}\@@tmp} -\def\definecolor{\@testopt{\XC@definecolor}{}} +\protected\def\definecolor{\@testopt{\XC@definecolor}{}} \def\XC@definecolor[#1]#2% {\@testopt{\XC@definec@lor[#1]{#2}}\colornameprefix} \def\XC@definec@lor[#1]#2[#3]#4#5% @@ -582,7 +582,7 @@ {\edef\@@tmp {\ifglobalcolors\global\else\xglobal@\fi \noexpand\XC@let@cc{\@backslashchar color@#1}{\@backslashchar color@#2}}}} -\def\DefineNamedColor#1% +\protected\def\DefineNamedColor#1% {\@nameuse{XC@\ifdefinecolors defin\else prepar\fi ecolor}[#1]} \def\preparecolor{\@testopt{\XC@preparecolor}{}} \def\XC@preparecolor[#1]#2% @@ -755,19 +755,20 @@ {\XC@let@Nc\XC@current@color{\@backslashchar color@\XC@@tmp}% \edef\current@color{\XC@current@color}% \XC@display} -\def\textcolor#1#{\@textcolor{#1}} +\protected\def\textcolor#1#{\@textcolor{#1}} \def\@textcolor#1#2#3{\protect\leavevmode{\color#1{#2}#3}} -\def\pagecolor +\protected\def\pagecolor {\begingroup \let\ignorespaces\endgroup \let\set@color\set@page@color \color} -\def\nopagecolor +\protected\def\nopagecolor {\@ifundefined{no@page@color}% {\PackageInfo{xcolor}{\@backslashchar nopagecolor\space is not supported}}% {\no@page@color}} -\def\colorbox#1#{\protect\color@box{#1}} +\InputIfFileExists{mathcolor.ltx}{}{} +\protected\def\colorbox#1#{\color@box{#1}} \def\color@box#1#2{\color@b@x\relax{\color#1{#2}}} -\def\fcolorbox#1#{\color@fbox{#1}} +\protected\def\fcolorbox#1#{\color@fbox{#1}} \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}% @@ -1054,7 +1055,7 @@ \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 % now there's no >,:,! - \if-\expandafter\@car#2\@nil\def#2{2}\else % catches -red + \if-\expandafter\@car#2\relax\@nil\def#2{2}\else % catches -red \edef#2{\noexpand\in@{/./}{/#2/}}#2% \edef#2{\ifin@0\else1\fi}\fi\fi\fi\fi} \def\tracingcolors{\begingroup\afterassignment\XC@tracingcolors\count@} @@ -1404,7 +1405,7 @@ \let\pst@getcolor\XC@getcolor \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} +\protected\def\normalcolor{\let\current@color\default@color\set@color} \AtBeginDocument{\let\default@color\current@color} \XC@ifcase\XC@@drv {{dvipdf,dvipdfm,dvipdfmx,dvips,pctex32}% |