texlive[63563] Master/texmf-dist: xcolor (12jun22)
commits+karl at tug.org
commits+karl at tug.org
Sun Jun 12 22:40:02 CEST 2022
Revision: 63563
http://tug.org/svn/texlive?view=revision&revision=63563
Author: karl
Date: 2022-06-12 22:40:02 +0200 (Sun, 12 Jun 2022)
Log Message:
-----------
xcolor (12jun22)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/xcolor/ChangeLog
trunk/Master/texmf-dist/doc/latex/xcolor/xcolor.lox
trunk/Master/texmf-dist/doc/latex/xcolor/xcolor.pdf
trunk/Master/texmf-dist/doc/latex/xcolor/xcolor1.tex
trunk/Master/texmf-dist/doc/latex/xcolor/xcolor2.pdf
trunk/Master/texmf-dist/doc/latex/xcolor/xcolor2.tex
trunk/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex
trunk/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex
trunk/Master/texmf-dist/dvips/xcolor/xcolor.pro
trunk/Master/texmf-dist/source/latex/xcolor/xcolor.dtx
trunk/Master/texmf-dist/tex/latex/xcolor/svgnam.def
trunk/Master/texmf-dist/tex/latex/xcolor/x11nam.def
trunk/Master/texmf-dist/tex/latex/xcolor/xcolor.sty
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/xcolor/README.md
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/xcolor/README
Modified: trunk/Master/texmf-dist/doc/latex/xcolor/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/doc/latex/xcolor/ChangeLog 2022-06-12 20:39:40 UTC (rev 63562)
+++ trunk/Master/texmf-dist/doc/latex/xcolor/ChangeLog 2022-06-12 20:40:02 UTC (rev 63563)
@@ -3,6 +3,14 @@
History
=======
+2022/06/12 v2.14
+* New features:
+ - Load if it exists the code from LaTeX to define \mathcolor.
+* Bugfixes (LaTeX Team)
+ - Modify \XC at 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 @@
- Declare dvisvgm option to match graphics and color packages.
Make dvipdfm an alias for dvipdfmx
- Modify \XC at info to avoid spurious text from \colorlet{foo}{.!50}
-
+
2016/05/11 v2.12
* New features:
- \nopagecolor command as introduced in `color' v1.1a
Deleted: trunk/Master/texmf-dist/doc/latex/xcolor/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/xcolor/README 2022-06-12 20:39:40 UTC (rev 63562)
+++ trunk/Master/texmf-dist/doc/latex/xcolor/README 2022-06-12 20:40:02 UTC (rev 63563)
@@ -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'.
Added: trunk/Master/texmf-dist/doc/latex/xcolor/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/xcolor/README.md (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/xcolor/README.md 2022-06-12 20:40:02 UTC (rev 63563)
@@ -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`.
Property changes on: trunk/Master/texmf-dist/doc/latex/xcolor/README.md
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/xcolor/xcolor.lox
===================================================================
--- trunk/Master/texmf-dist/doc/latex/xcolor/xcolor.lox 2022-06-12 20:39:40 UTC (rev 63562)
+++ trunk/Master/texmf-dist/doc/latex/xcolor/xcolor.lox 2022-06-12 20:40:02 UTC (rev 63563)
@@ -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
Modified: trunk/Master/texmf-dist/doc/latex/xcolor/xcolor.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/xcolor/xcolor1.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/xcolor/xcolor1.tex 2022-06-12 20:39:40 UTC (rev 63562)
+++ trunk/Master/texmf-dist/doc/latex/xcolor/xcolor1.tex 2022-06-12 20:40:02 UTC (rev 63563)
@@ -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}
Modified: trunk/Master/texmf-dist/doc/latex/xcolor/xcolor2.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/xcolor/xcolor2.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/xcolor/xcolor2.tex 2022-06-12 20:39:40 UTC (rev 63562)
+++ trunk/Master/texmf-dist/doc/latex/xcolor/xcolor2.tex 2022-06-12 20:40:02 UTC (rev 63563)
@@ -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}
Modified: trunk/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex 2022-06-12 20:39:40 UTC (rev 63562)
+++ trunk/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex 2022-06-12 20:40:02 UTC (rev 63563)
@@ -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]
Modified: trunk/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex 2022-06-12 20:39:40 UTC (rev 63562)
+++ trunk/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex 2022-06-12 20:40:02 UTC (rev 63563)
@@ -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}
Modified: trunk/Master/texmf-dist/dvips/xcolor/xcolor.pro
===================================================================
--- trunk/Master/texmf-dist/dvips/xcolor/xcolor.pro 2022-06-12 20:39:40 UTC (rev 63562)
+++ trunk/Master/texmf-dist/dvips/xcolor/xcolor.pro 2022-06-12 20:40:02 UTC (rev 63563)
@@ -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
Modified: trunk/Master/texmf-dist/source/latex/xcolor/xcolor.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/xcolor/xcolor.dtx 2022-06-12 20:39:40 UTC (rev 63562)
+++ trunk/Master/texmf-dist/source/latex/xcolor/xcolor.dtx 2022-06-12 20:40:02 UTC (rev 63563)
@@ -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,7 +1139,13 @@
% 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}
%
% Within a color expression, `.' serves as a placeholder for the current color.
@@ -4850,7 +4858,7 @@
% \end{itemize}
% See table \vref{tab.internal} for some examples.
% \begin{macrocode}
-\def\definecolor{\@testopt{\XC at definecolor}{}}
+\protected\def\definecolor{\@testopt{\XC at definecolor}{}}
\def\XC at definecolor[#1]#2%
{\@testopt{\XC at 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 at color\set at page@color
\color}
@@ -5454,7 +5462,7 @@
% 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 at page@color}%
{\PackageInfo{xcolor}{\@backslashchar nopagecolor\space is not supported}}%
{\no at page@color}}
@@ -5461,7 +5469,12 @@
% \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}
%
% \begin{macro}{\colorbox}
@@ -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 at box{#1}}
+\protected\def\colorbox#1#{\color at box{#1}}
\def\color at box#1#2{\color at 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 at fbox{#1}}
+\protected\def\fcolorbox#1#{\color at fbox{#1}}
\def\color at fbox#1#2#3#{\protect\color at fb@x{#1}{#2}{#3}}
\def\color at fb@x#1#2#3#4%
{\color at b@x{\fboxsep\z@\color#1{#2}\XC at 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 at 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 at color\default at color\set at color}
+\protected\def\normalcolor{\let\current at color\default at color\set at color}
% \end{macrocode}
% \end{macro}
%
Modified: trunk/Master/texmf-dist/tex/latex/xcolor/svgnam.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/xcolor/svgnam.def 2022-06-12 20:39:40 UTC (rev 63562)
+++ trunk/Master/texmf-dist/tex/latex/xcolor/svgnam.def 2022-06-12 20:40:02 UTC (rev 63563)
@@ -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@}
Modified: trunk/Master/texmf-dist/tex/latex/xcolor/x11nam.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/xcolor/x11nam.def 2022-06-12 20:39:40 UTC (rev 63562)
+++ trunk/Master/texmf-dist/tex/latex/xcolor/x11nam.def 2022-06-12 20:40:02 UTC (rev 63563)
@@ -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@}
Modified: trunk/Master/texmf-dist/tex/latex/xcolor/xcolor.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/xcolor/xcolor.sty 2022-06-12 20:39:40 UTC (rev 63562)
+++ trunk/Master/texmf-dist/tex/latex/xcolor/xcolor.sty 2022-06-12 20:40:02 UTC (rev 63563)
@@ -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 at clr@gray at white{1}
\@tfor\@@tmp:={grad}{last}{step}\do
{\XC at let@cN{XC at met@\@@tmp}\@@tmp}
-\def\definecolor{\@testopt{\XC at definecolor}{}}
+\protected\def\definecolor{\@testopt{\XC at definecolor}{}}
\def\XC at definecolor[#1]#2%
{\@testopt{\XC at definec@lor[#1]{#2}}\colornameprefix}
\def\XC at definec@lor[#1]#2[#3]#4#5%
@@ -582,7 +582,7 @@
{\edef\@@tmp
{\ifglobalcolors\global\else\xglobal@\fi
\noexpand\XC at 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 at preparecolor}{}}
\def\XC at preparecolor[#1]#2%
@@ -755,19 +755,20 @@
{\XC at let@Nc\XC at current@color{\@backslashchar color@\XC@@tmp}%
\edef\current at color{\XC at current@color}%
\XC at 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 at color\set at page@color
\color}
-\def\nopagecolor
+\protected\def\nopagecolor
{\@ifundefined{no at page@color}%
{\PackageInfo{xcolor}{\@backslashchar nopagecolor\space is not supported}}%
{\no at page@color}}
-\def\colorbox#1#{\protect\color at box{#1}}
+\InputIfFileExists{mathcolor.ltx}{}{}
+\protected\def\colorbox#1#{\color at box{#1}}
\def\color at box#1#2{\color at b@x\relax{\color#1{#2}}}
-\def\fcolorbox#1#{\color at fbox{#1}}
+\protected\def\fcolorbox#1#{\color at fbox{#1}}
\def\color at fbox#1#2#3#{\protect\color at fb@x{#1}{#2}{#3}}
\def\color at fb@x#1#2#3#4%
{\color at b@x{\fboxsep\z@\color#1{#2}\XC at 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 at 0\else1\fi}\fi\fi\fi\fi}
\def\tracingcolors{\begingroup\afterassignment\XC at tracingcolors\count@}
@@ -1404,7 +1405,7 @@
\let\pst at getcolor\XC at getcolor
\let\pst at usecolor\XC at usecolor
\def\c at lor@special#1#2{\edef\@tempa{\write#1{#2}}\@tempa}
-\def\normalcolor{\let\current at color\default at color\set at color}
+\protected\def\normalcolor{\let\current at color\default at color\set at color}
\AtBeginDocument{\let\default at color\current at color}
\XC at ifcase\XC@@drv
{{dvipdf,dvipdfm,dvipdfmx,dvips,pctex32}%
More information about the tex-live-commits
mailing list.