summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/xcolor
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-06-13 03:03:42 +0000
committerNorbert Preining <norbert@preining.info>2022-06-13 03:03:42 +0000
commitef6d63ded56fb892decaa8ab41d7deebbe670473 (patch)
tree9c8eccf2e633fcfe0ad512e5428222ce0707971e /macros/latex/contrib/xcolor
parent86d0c4c6729cfb43e13fb29790810c3cc2521806 (diff)
CTAN sync 202206130303
Diffstat (limited to 'macros/latex/contrib/xcolor')
-rw-r--r--macros/latex/contrib/xcolor/ChangeLog10
-rw-r--r--macros/latex/contrib/xcolor/README56
-rw-r--r--macros/latex/contrib/xcolor/README.md74
-rw-r--r--macros/latex/contrib/xcolor/xcolor.dtx51
-rw-r--r--macros/latex/contrib/xcolor/xcolor.pdfbin858670 -> 864625 bytes
-rw-r--r--macros/latex/contrib/xcolor/xcolor2.pdfbin94138 -> 91583 bytes
6 files changed, 115 insertions, 76 deletions
diff --git a/macros/latex/contrib/xcolor/ChangeLog b/macros/latex/contrib/xcolor/ChangeLog
index 1e613111c2..48ac99bfbd 100644
--- a/macros/latex/contrib/xcolor/ChangeLog
+++ b/macros/latex/contrib/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/macros/latex/contrib/xcolor/README b/macros/latex/contrib/xcolor/README
deleted file mode 100644
index fa4b7dc333..0000000000
--- a/macros/latex/contrib/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/macros/latex/contrib/xcolor/README.md b/macros/latex/contrib/xcolor/README.md
new file mode 100644
index 0000000000..dd8e528ccd
--- /dev/null
+++ b/macros/latex/contrib/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/macros/latex/contrib/xcolor/xcolor.dtx b/macros/latex/contrib/xcolor/xcolor.dtx
index 8162c8f863..e6b5129012 100644
--- a/macros/latex/contrib/xcolor/xcolor.dtx
+++ b/macros/latex/contrib/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/macros/latex/contrib/xcolor/xcolor.pdf b/macros/latex/contrib/xcolor/xcolor.pdf
index ac7a3d3ef8..be04b36451 100644
--- a/macros/latex/contrib/xcolor/xcolor.pdf
+++ b/macros/latex/contrib/xcolor/xcolor.pdf
Binary files differ
diff --git a/macros/latex/contrib/xcolor/xcolor2.pdf b/macros/latex/contrib/xcolor/xcolor2.pdf
index 2391e374e8..35c2946529 100644
--- a/macros/latex/contrib/xcolor/xcolor2.pdf
+++ b/macros/latex/contrib/xcolor/xcolor2.pdf
Binary files differ