texlive[72407] Master/texmf-dist: xcolor (29sep24)
commits+karl at tug.org
commits+karl at tug.org
Sun Sep 29 22:40:00 CEST 2024
Revision: 72407
https://tug.org/svn/texlive?view=revision&revision=72407
Author: karl
Date: 2024-09-29 22:39:59 +0200 (Sun, 29 Sep 2024)
Log Message:
-----------
xcolor (29sep24)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/xcolor/ChangeLog
trunk/Master/texmf-dist/doc/latex/xcolor/README.md
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
Modified: trunk/Master/texmf-dist/doc/latex/xcolor/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/doc/latex/xcolor/ChangeLog 2024-09-29 20:39:49 UTC (rev 72406)
+++ trunk/Master/texmf-dist/doc/latex/xcolor/ChangeLog 2024-09-29 20:39:59 UTC (rev 72407)
@@ -3,6 +3,15 @@
History
=======
+2024/09/29 v3.02
+* remove definitions of color groups as they are already in the kernel.
+
+2024/09/17
+* unknown model error handled (issue #1)
+
+2024/03/13
+* Add \relax after \ProcessKeyOptions to improve error context lines
+
2023/11/15 v3.01
* only warn and not error if obsolete option usenames is used, issue #31
Modified: trunk/Master/texmf-dist/doc/latex/xcolor/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/xcolor/README.md 2024-09-29 20:39:49 UTC (rev 72406)
+++ trunk/Master/texmf-dist/doc/latex/xcolor/README.md 2024-09-29 20:39:59 UTC (rev 72407)
@@ -1,6 +1,6 @@
## Package `xcolor` by Dr. Uwe Kern
-Version 2023-11-15 v3.01
+Version 2024-09-29 v3.02
Maintained by the LaTeX Project https://github.com/latex3/xcolor/issues
@@ -14,7 +14,7 @@
## Copyright (C)
- 2003-2021 Dr. Uwe Kern
-- 2021-2023 The LaTeX Project
+- 2021-2024 The LaTeX Project
## License
LaTeX Project Public License, version 1.3c or later.
Modified: trunk/Master/texmf-dist/doc/latex/xcolor/xcolor.lox
===================================================================
--- trunk/Master/texmf-dist/doc/latex/xcolor/xcolor.lox 2024-09-29 20:39:49 UTC (rev 72406)
+++ trunk/Master/texmf-dist/doc/latex/xcolor/xcolor.lox 2024-09-29 20:39:59 UTC (rev 72407)
@@ -23,11 +23,11 @@
%%
%% ----------------------------------------------------------------
%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>
-%% 2021-2023 LaTeX Project https://github.com/latex3/xcolor/issues
+%% 2021-2024 LaTeX Project https://github.com/latex3/xcolor/issues
%% ----------------------------------------------------------------
%%
-\def\XCfileversion{v3.01}%
-\def\XCfiledate{2023/11/15}%
+\def\XCfileversion{v3.02}%
+\def\XCfiledate{2024/09/29}%
\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 2024-09-29 20:39:49 UTC (rev 72406)
+++ trunk/Master/texmf-dist/doc/latex/xcolor/xcolor1.tex 2024-09-29 20:39:59 UTC (rev 72407)
@@ -22,15 +22,15 @@
%% in the same archive or directory.)
%%
\ProvidesFile{xcolor1}
- [2023/11/15 v3.01 Color conversion test (UK)]
+ [2024/09/29 v3.02 Color conversion test (UK)]
%%
%% ----------------------------------------------------------------
%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>
-%% 2021-2023 LaTeX Project https://github.com/latex3/xcolor/issues
+%% 2021-2024 LaTeX Project https://github.com/latex3/xcolor/issues
%% ----------------------------------------------------------------
%%
-\def\XCfileversion{v3.01}%
-\def\XCfiledate{2023/11/15}%
+\def\XCfileversion{v3.02}%
+\def\XCfiledate{2024/09/29}%
\documentclass[a4paper]{article}
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 2024-09-29 20:39:49 UTC (rev 72406)
+++ trunk/Master/texmf-dist/doc/latex/xcolor/xcolor2.tex 2024-09-29 20:39:59 UTC (rev 72407)
@@ -22,15 +22,15 @@
%% in the same archive or directory.)
%%
\ProvidesFile{xcolor2}
- [2023/11/15 v3.01 Pstricks color test (UK)]
+ [2024/09/29 v3.02 Pstricks color test (UK)]
%%
%% ----------------------------------------------------------------
%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>
-%% 2021-2023 LaTeX Project https://github.com/latex3/xcolor/issues
+%% 2021-2024 LaTeX Project https://github.com/latex3/xcolor/issues
%% ----------------------------------------------------------------
%%
-\def\XCfileversion{v3.01}%
-\def\XCfiledate{2023/11/15}%
+\def\XCfileversion{v3.02}%
+\def\XCfiledate{2024/09/29}%
\listfiles
\documentclass{article}
Modified: trunk/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex 2024-09-29 20:39:49 UTC (rev 72406)
+++ trunk/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex 2024-09-29 20:39:59 UTC (rev 72407)
@@ -22,15 +22,15 @@
%% in the same archive or directory.)
%%
\ProvidesFile{xcolor3}
- [2023/11/15 v3.01 Color logging test (UK)]
+ [2024/09/29 v3.02 Color logging test (UK)]
%%
%% ----------------------------------------------------------------
%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>
-%% 2021-2023 LaTeX Project https://github.com/latex3/xcolor/issues
+%% 2021-2024 LaTeX Project https://github.com/latex3/xcolor/issues
%% ----------------------------------------------------------------
%%
-\def\XCfileversion{v3.01}%
-\def\XCfiledate{2023/11/15}%
+\def\XCfileversion{v3.02}%
+\def\XCfiledate{2024/09/29}%
\listfiles
\documentclass[a4paper]{article}
Modified: trunk/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex 2024-09-29 20:39:49 UTC (rev 72406)
+++ trunk/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex 2024-09-29 20:39:59 UTC (rev 72407)
@@ -22,15 +22,15 @@
%% in the same archive or directory.)
%%
\ProvidesFile{xcolor4}
- [2023/11/15 v3.01 Color driver test (UK)]
+ [2024/09/29 v3.02 Color driver test (UK)]
%%
%% ----------------------------------------------------------------
%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>
-%% 2021-2023 LaTeX Project https://github.com/latex3/xcolor/issues
+%% 2021-2024 LaTeX Project https://github.com/latex3/xcolor/issues
%% ----------------------------------------------------------------
%%
-\def\XCfileversion{v3.01}%
-\def\XCfiledate{2023/11/15}%
+\def\XCfileversion{v3.02}%
+\def\XCfiledate{2024/09/29}%
\listfiles
\documentclass[a4paper]{article}
Modified: trunk/Master/texmf-dist/dvips/xcolor/xcolor.pro
===================================================================
--- trunk/Master/texmf-dist/dvips/xcolor/xcolor.pro 2024-09-29 20:39:49 UTC (rev 72406)
+++ trunk/Master/texmf-dist/dvips/xcolor/xcolor.pro 2024-09-29 20:39:59 UTC (rev 72407)
@@ -23,11 +23,11 @@
%% in the same archive or directory.)
%%
%% xcolor.pro (PostScript/dvips header file)
-%% [2023/11/15 v3.01 LaTeX color extensions (UK)]
+%% [2024/09/29 v3.02 LaTeX color extensions (UK)]
%%
%% ----------------------------------------------------------------
%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>
-%% 2021-2023 LaTeX Project https://github.com/latex3/xcolor/issues
+%% 2021-2024 LaTeX Project https://github.com/latex3/xcolor/issues
%% ----------------------------------------------------------------
%%
Modified: trunk/Master/texmf-dist/source/latex/xcolor/xcolor.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/xcolor/xcolor.dtx 2024-09-29 20:39:49 UTC (rev 72406)
+++ trunk/Master/texmf-dist/source/latex/xcolor/xcolor.dtx 2024-09-29 20:39:59 UTC (rev 72407)
@@ -2,7 +2,7 @@
%%
%% ----------------------------------------------------------------
%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>
-%% 2021-2023 LaTeX Project https://github.com/latex3/xcolor/issues
+%% 2021-2024 LaTeX Project https://github.com/latex3/xcolor/issues
%% ----------------------------------------------------------------
%%
%<*package>
@@ -18,8 +18,8 @@
%%
%</package>
%<*extract|driver|test1|test2|test3|test4>
-\def\XCfileversion{v3.01}%
-\def\XCfiledate{2023/11/15}%
+\def\XCfileversion{v3.02}%
+\def\XCfiledate{2024/09/29}%
%</extract|driver|test1|test2|test3|test4>
%
% This file may be distributed and/or modified under the
@@ -320,7 +320,7 @@
% There are proprietary models (like \Index{Pantone} or \Index{HKS}) that provide finite sets of colors (often called \emph{\Index{spot color}s}), where the user has to choose from without caring about parametrisations; on the other hand, there are parameter-driven models like \Model{gray}, \Model{rgb}, and \Model{cmyk}, that aim to represent large finite or even (theoretically) infinite sets of colors, built on very small subsets of base colors and rules, how to construct other colors from these base colors.
% For example, a large range of colors can be constructed by linear combinations of the base colors \Color{red}, \Color{green}, and \Color{blue}.
% On the other hand, usually \Index{spot color}s can only be \emph{approximated} by parameter values in models like \Model{cmyk} or \Model{rgb}; the original colors are being physically mixed even dependent on the targeted kind of paper.
-% Finally, there are certain colors like \Color{gold} and \Color{silver} that are hardly reproducable by any parameter-driven color model on standard ink or laser printers.
+% Finally, there are certain colors like \Color{gold} and \Color{silver} that are hardly reproducible by any parameter-driven color model on standard ink or laser printers.
%
%
%
@@ -501,7 +501,7 @@
%
% Example: assuming that |a.tex| is a complete \LaTeX{} document, a command like
% `|latex \def\xcolorcmd{\colorlet{black}{red}}\input{a}|'
-% at the console generates a file |a.dvi| with all occurences of \Color{black} being replaced by \Color{red}, without the necessity to change the source file itself.
+% at the console generates a file |a.dvi| with all occurrences of \Color{black} being replaced by \Color{red}, without the necessity to change the source file itself.
% (The exact spelling of the console command might vary across operating systems and \TeX{} distributions.)
%
%
@@ -2486,7 +2486,7 @@
% \subsection{Color conversion and complements}\label{sec.cnv}
%
% 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.
+% Table \vref{tab.cnv} gives an overview of how each conversion pair is handled.
% 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.
%
@@ -4119,7 +4119,7 @@
{
,usenames .code =
{\PackageWarning{xcolor}{Package option `usenames' is obsolete and ignored}}
- ,usename .usage = preamble
+ ,usenames .usage = preamble
,hyperref .code =
{\PackageWarning{xcolor}{Package option `hyperref' is obsolete and ignored}}
,hyperref .usage = preamble
@@ -4153,9 +4153,14 @@
% \end{macrocode}
%
% After the options are processed, load the appropriate driver file.
-% If a site wants a default driver (e.g., \Option{dvips}) it just needs to put |\ExecuteOptions{dvips}| in a \File{color.cfg} file.
+% If a site wants a default driver (e.g., \Option{dvips}) it just needs
+% to put |\ExecuteOptions{dvips}| in a \File{color.cfg} file.
+%
+% Note |\relax| added here to ensure that |\ProcessKeyOptions| not the following
+% |\edef| shows in error context lines for unknown options.
+% \changes{3.02}{2024-03-13}{Added \cs{relax}}
% \begin{macrocode}
-\ProcessKeyOptions
+\ProcessKeyOptions\relax
% \end{macrocode}
%
% \begin{macro}{\XC@@drv}
@@ -4269,7 +4274,7 @@
%
% \begin{macro}{\xglobal}
% \begin{macro}{\xglobal at test}
-% If |\foo| occurs in the token list |\xglobal@@|, then the command |\xglobal\foo| will set the switch |\xglobal at true| which can be used inside |\foo| to determine whether certain definitions are to be made explicitely global.
+% If |\foo| occurs in the token list |\xglobal@@|, then the command |\xglobal\foo| will set the switch |\xglobal at true| which can be used inside |\foo| to determine whether certain definitions are to be made explicitly global.
% |\foo| is responsible for resetting |\xglobal at false| in order to avoid side effects.
% To include |\foo| in the magic list, simply say |\XC at append\xglobal at list{\foo}|.
% If |\foo| is not in the list, |\xglobal\foo| will behave like |\global\foo|, thus |\xglobal\let| will be like |\global\let| etc.
@@ -4356,7 +4361,7 @@
%
% \begin{macro}{\XC at replace}
% \marg{cmd}\marg{search}\marg{replace}\\
-% Replace all occurences of \meta{search} within the first-level expansion of \meta{cmd} by \meta{replace} and save the result in \meta{cmd}.
+% Replace all occurrences of \meta{search} within the first-level expansion of \meta{cmd} by \meta{replace} and save the result in \meta{cmd}.
% The replacement is recursive, so don't put the search pattern into the replacement text!
% Note that this macro is incapable of seeing `into' braces.
% The code and its explanation is taken from \People{Donald}{Arseneau}'s \Package{url} package \cite{url}, with only minor changes and renamings applied.
@@ -4976,9 +4981,10 @@
% Retrieve model position |\XC@@pos|, model |\@@mod|, and target model |\@@Mod| from multiple definitions (up to~8), separated by `|/|'.
% \begin{macrocode}
\def\XC at getmod#1/#2/#3/#4/#5/#6/#7/#8/#9\XC@@
- {\XC at g@tm at d0#1::\XC@@ \XC at getm@d1{#2}\XC at getm@d2{#3}%
+ {\def\XC at dflt@@mod{#1}%
+ \XC at g@tm at d0#1::\XC@@ \XC at getm@d1{#2}\XC at getm@d2{#3}%
\XC at getm@d3{#4}\XC at getm@d4{#5}\XC at getm@d5{#6}\XC at getm@d6{#7}%
- \XC at getm@d7{#8}\def\XC@@pos{0}\def\@@mod{#1}\@gobble\@nnil}%
+ \XC at getm@d7{#8}\def\XC@@pos{0}\let\@@mod\XC at dflt@@mod\@gobble\@nnil}%
% \end{macrocode}
%
% \begin{macrocode}
@@ -4990,7 +4996,10 @@
% \begin{macrocode}
\def\XC at g@tm at d#1#2:#3:#4\XC@@
{\@ifxempty{#3}{\let\@@Mod\XC at mod@ignore\XC at getm@d0{#2}}%
- {\def\@@Mod{#2}\XC at getm@d0{#3}}}%
+ {\def\@@Mod{#2}%
+ \def\XC at tgt@mod##1{#2}%
+ \def\XC at dflt@@mod{#3}%
+ \XC at getm@d0{#3}}}%
% \end{macrocode}
% \end{macro}
%
@@ -6182,11 +6191,13 @@
%
%
% \subsubsection{Extra groups}
-% Turning on extra groups in the standard \LaTeX\ commands, so that color commands are scoped corectly.
%
-% Like |\normalcolor|, the following five commands are defined in the kernel, with empty definitions (|\relax|).
+% Like |\normalcolor|, the following five commands are defined in the kernel.
% This means that they can be used to make macros in packages `color safe'.
-% The commands will not have any effect unless a user also uses a color package, when the `active definitions' here will take effect and keep color commands correctly scoped.
+% The extra groups have been made permanent in the \LaTeX{} kernel 2021 so
+% they are no longer redefined here.
+% The |\color at setgroup| will not have any effect unless a user also uses
+% a color package, when the `active definition' here will take effect.
%
% \begin{macro}{\color at setgroup}
% This is to be used in contexts (e.g., `lrbox') where text is to be saved and used after some other, unknown, text that may contain color commands.
@@ -6200,38 +6211,23 @@
% This is to be used at the start of contexts that may contain color commands, but where it is not necessary to save the current color.
% Examples of this are in the box commands of \File{ltboxes.dtx} where user-supplied text is saved internally in a box between |\color at begingroup|, |\color at endgroup|, but the box is used before any other color commands could intervene.
% A matching |\color at endgroup| should be used at the end of the text.
-% \begin{macrocode}
-\let\color at begingroup\begingroup
-% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\color at endgroup}
% To be used to close the `group' started by one of the above two commands.
% The |\endgraf| in its definition is required in the case of groups of text in vertical `par' mode, but doesn't do any harm in horizontal `LR' contexts.
-% \begin{macrocode}
-\def\color at endgroup{\endgraf\endgroup}
-% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\color at hbox}
% To be used to open a `colored hbox'
-% \begin{macrocode}
-\def\color at hbox{\hbox\bgroup\color at begingroup}
-% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\color at vbox}
% To be used to open a `colored hbox'
-% \begin{macrocode}
-\def\color at vbox{\vbox\bgroup\color at begingroup}
-% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\color at endbox}
% To be used to close a `colored (h/v)box'
-% \begin{macrocode}
-\def\color at endbox{\color at endgroup\egroup}
-% \end{macrocode}
% \end{macro}
%
%
@@ -6458,7 +6454,7 @@
%
% \begin{macro}{\XC at cnv@gray}
% \Meta{gray}|,|
-% \changes{3.0}{2022-08-10}{moved the patch from hycolor to correct Gray model, issue \#23}
+% \changes{3.0}{2022-08-10}{moved the patch from hycolor to correct Gray model, issue \#23}w
% \begin{macrocode}
\def\XC at cnv@gray#1,%
{\XC at ifxcase\tm
Modified: trunk/Master/texmf-dist/tex/latex/xcolor/svgnam.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/xcolor/svgnam.def 2024-09-29 20:39:49 UTC (rev 72406)
+++ trunk/Master/texmf-dist/tex/latex/xcolor/svgnam.def 2024-09-29 20:39:59 UTC (rev 72407)
@@ -22,11 +22,11 @@
%% in the same archive or directory.)
%%
\ProvidesFile{svgnam.def}
- [2023/11/15 v3.01 Predefined colors according to SVG 1.1 (UK)]
+ [2024/09/29 v3.02 Predefined colors according to SVG 1.1 (UK)]
%%
%% ----------------------------------------------------------------
%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>
-%% 2021-2023 LaTeX Project https://github.com/latex3/xcolor/issues
+%% 2021-2024 LaTeX Project https://github.com/latex3/xcolor/issues
%% ----------------------------------------------------------------
%%
Modified: trunk/Master/texmf-dist/tex/latex/xcolor/x11nam.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/xcolor/x11nam.def 2024-09-29 20:39:49 UTC (rev 72406)
+++ trunk/Master/texmf-dist/tex/latex/xcolor/x11nam.def 2024-09-29 20:39:59 UTC (rev 72407)
@@ -22,11 +22,11 @@
%% in the same archive or directory.)
%%
\ProvidesFile{x11nam.def}
- [2023/11/15 v3.01 Predefined colors according to Unix/X11 (UK)]
+ [2024/09/29 v3.02 Predefined colors according to Unix/X11 (UK)]
%%
%% ----------------------------------------------------------------
%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>
-%% 2021-2023 LaTeX Project https://github.com/latex3/xcolor/issues
+%% 2021-2024 LaTeX Project https://github.com/latex3/xcolor/issues
%% ----------------------------------------------------------------
%%
Modified: trunk/Master/texmf-dist/tex/latex/xcolor/xcolor.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/xcolor/xcolor.sty 2024-09-29 20:39:49 UTC (rev 72406)
+++ trunk/Master/texmf-dist/tex/latex/xcolor/xcolor.sty 2024-09-29 20:39:59 UTC (rev 72407)
@@ -22,11 +22,11 @@
%% in the same archive or directory.)
%%
\ProvidesPackage{xcolor}
- [2023/11/15 v3.01 LaTeX color extensions (UK)]
+ [2024/09/29 v3.02 LaTeX color extensions (UK)]
%%
%% ----------------------------------------------------------------
%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>
-%% 2021-2023 LaTeX Project https://github.com/latex3/xcolor/issues
+%% 2021-2024 LaTeX Project https://github.com/latex3/xcolor/issues
%% ----------------------------------------------------------------
%%
%% Please send error reports and suggestions for
@@ -244,7 +244,7 @@
{
,usenames .code =
{\PackageWarning{xcolor}{Package option `usenames' is obsolete and ignored}}
- ,usename .usage = preamble
+ ,usenames .usage = preamble
,hyperref .code =
{\PackageWarning{xcolor}{Package option `hyperref' is obsolete and ignored}}
,hyperref .usage = preamble
@@ -262,7 +262,7 @@
\ExplSyntaxOff
\InputIfFileExists{color.cfg}{}{}
\let\ExecuteOptions\XC at ExecuteOptions
-\ProcessKeyOptions
+\ProcessKeyOptions\relax
\edef\Gin at driver{\Gin at driver}
\if!\Gin at driver!
\PackageError{xcolor}
@@ -574,15 +574,19 @@
\fi
\fi \@secondoftwo}}
\def\XC at getmod#1/#2/#3/#4/#5/#6/#7/#8/#9\XC@@
- {\XC at g@tm at d0#1::\XC@@ \XC at getm@d1{#2}\XC at getm@d2{#3}%
+ {\def\XC at dflt@@mod{#1}%
+ \XC at g@tm at d0#1::\XC@@ \XC at getm@d1{#2}\XC at getm@d2{#3}%
\XC at getm@d3{#4}\XC at getm@d4{#5}\XC at getm@d5{#6}\XC at getm@d6{#7}%
- \XC at getm@d7{#8}\def\XC@@pos{0}\def\@@mod{#1}\@gobble\@nnil}%
+ \XC at getm@d7{#8}\def\XC@@pos{0}\let\@@mod\XC at dflt@@mod\@gobble\@nnil}%
\def\XC at getm@d#1#2%
{\edef\XC@@pos{#2}\XC at sdef\@@mod{\XC at tgt@mod\XC@@pos}%
\ifx\XC@@pos\@@mod\def\XC@@pos{#1}\expandafter\remove at to@nnil\fi}%
\def\XC at g@tm at d#1#2:#3:#4\XC@@
{\@ifxempty{#3}{\let\@@Mod\XC at mod@ignore\XC at getm@d0{#2}}%
- {\def\@@Mod{#2}\XC at getm@d0{#3}}}%
+ {\def\@@Mod{#2}%
+ \def\XC at tgt@mod##1{#2}%
+ \def\XC at dflt@@mod{#3}%
+ \XC at getm@d0{#3}}}%
\def\XC at getclr#1/#2/#3/#4/#5/#6/#7/#8/#9\XC@@
{\ifcase\XC@@pos\space #1\or#2\or#3\or#4\or#5\or#6\or#7\or#8\fi}
\newif\ifXC@@getmod \XC@@getmodtrue
@@ -1108,11 +1112,6 @@
\def\@@arg{\textbf{color}& }\let\@@clr\@empty\@testc at lor}%
{\endtabular\ignorespacesafterend}
\def\color at setgroup{\begingroup\set at color}
-\let\color at begingroup\begingroup
-\def\color at endgroup{\endgraf\endgroup}
-\def\color at hbox{\hbox\bgroup\color at begingroup}
-\def\color at vbox{\vbox\bgroup\color at begingroup}
-\def\color at endbox{\color at endgroup\egroup}
\def\convertcolorspec#1#2#3#4%
{\begingroup
\XC at sdef\sm{#1}\XC at sdef\tm{#3}\edef\@@tmp{#2}%
More information about the tex-live-commits
mailing list.