diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/xcolor/ChangeLog | 12 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/xcolor/README | 3 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/xcolor/xcolor.lox | 7 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/xcolor/xcolor.pdf | bin | 706269 -> 858670 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/xcolor/xcolor1.tex | 11 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/xcolor/xcolor2.pdf | bin | 96760 -> 94138 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/xcolor/xcolor2.tex | 13 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/xcolor/xcolor3.tex | 11 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/xcolor/xcolor4.tex | 9 | ||||
| -rw-r--r-- | Master/texmf-dist/dvips/xcolor/xcolor.pro | 5 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/xcolor/xcolor.dtx | 104 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/xcolor/svgnam.def | 5 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/xcolor/x11nam.def | 5 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/xcolor/xcolor.sty | 72 |
14 files changed, 145 insertions, 112 deletions
diff --git a/Master/texmf-dist/doc/latex/xcolor/ChangeLog b/Master/texmf-dist/doc/latex/xcolor/ChangeLog index 630eff06d9b..1e613111c27 100644 --- a/Master/texmf-dist/doc/latex/xcolor/ChangeLog +++ b/Master/texmf-dist/doc/latex/xcolor/ChangeLog @@ -1,9 +1,17 @@ Package `xcolor' by Dr. Uwe Kern -(xcolor at ukern dot de) +https://github.com/latex3/xcolor/issues History ======= - +2021/10/31 v2.13 +* Bugfixes (LaTeX Team) + - use \@backslashchar color rather than \string\color to + generate internal csnames, to avoid relying on the + current setting of \escapechar + - 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 index c81492b5d46..fa4b7dc333b 100644 --- a/Master/texmf-dist/doc/latex/xcolor/README +++ b/Master/texmf-dist/doc/latex/xcolor/README @@ -1,7 +1,6 @@ Package `xcolor' by Dr. Uwe Kern -(xcolor at ukern dot de) +Maintained by the LaTeX Project https://github.com/latex3/xcolor/issues -v2.12 (2016/05/11) `xcolor' provides easy driver-independent access to several kinds of colors, tints, shades, tones, and mixes of arbitrary colors by means of diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor.lox b/Master/texmf-dist/doc/latex/xcolor/xcolor.lox index 7a299077419..fda92a2d61e 100644 --- a/Master/texmf-dist/doc/latex/xcolor/xcolor.lox +++ b/Master/texmf-dist/doc/latex/xcolor/xcolor.lox @@ -22,11 +22,12 @@ %% in the same archive or directory.) %% %% ---------------------------------------------------------------- -%% Copyright (C) 2003-2016 by Dr. Uwe Kern <xcolor at ukern dot de> +%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de> +%% 2021 LaTeX Project https://github.com/latex3/xcolor/issues %% ---------------------------------------------------------------- %% -\def\XCfileversion{v2.12}% -\def\XCfiledate{2016/05/11}% +\def\XCfileversion{v2.13}% +\def\XCfiledate{2021/10/31}% \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 0f5cdff702b..ac7a3d3ef81 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 9190df20491..46f59362816 100644 --- a/Master/texmf-dist/doc/latex/xcolor/xcolor1.tex +++ b/Master/texmf-dist/doc/latex/xcolor/xcolor1.tex @@ -22,14 +22,15 @@ %% in the same archive or directory.) %% \ProvidesFile{xcolor1} - [2016/05/11 v2.12 Color conversion test (UK)] + [2021/10/31 v2.13 Color conversion test (UK)] %% %% ---------------------------------------------------------------- -%% Copyright (C) 2003-2016 by Dr. Uwe Kern <xcolor at ukern dot de> +%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de> +%% 2021 LaTeX Project https://github.com/latex3/xcolor/issues %% ---------------------------------------------------------------- %% -\def\XCfileversion{v2.12}% -\def\XCfiledate{2016/05/11}% +\def\XCfileversion{v2.13}% +\def\XCfiledate{2021/10/31}% \documentclass[a4paper]{article} \usepackage{array,multicol,multido,textcomp} @@ -134,7 +135,7 @@ \begin{document} \title{Color conversion with the \textsf{xcolor} package --- Examples} -\author{Dr. Uwe Kern\thanks{This file is part of the \textsf{xcolor} distribution which can be downloaded from the CTAN mirrors (\texttt{macros/latex/contrib/xcolor/}) or the homepage \texttt{www.ukern.de/tex/xcolor.html}. Please send error reports and suggestions for improvements to \texttt{xcolor@ukern.de}.}} +\author{Dr. Uwe Kern\thanks{This file is part of the \textsf{xcolor} distribution which can be downloaded from the CTAN mirrors (\texttt{macros/latex/contrib/xcolor/}) or the homepage \texttt{www.ukern.de/tex/xcolor.html}. Please send error reports and suggestions for improvements to \texttt{https://github.com/latex3/xcolor/issues}.}} \date{\XCfileversion{} (\XCfiledate)} \maketitle diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor2.pdf b/Master/texmf-dist/doc/latex/xcolor/xcolor2.pdf Binary files differindex d9ed84b6535..2391e374e89 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 b327f0d8724..704e2a14540 100644 --- a/Master/texmf-dist/doc/latex/xcolor/xcolor2.tex +++ b/Master/texmf-dist/doc/latex/xcolor/xcolor2.tex @@ -22,21 +22,22 @@ %% in the same archive or directory.) %% \ProvidesFile{xcolor2} - [2016/05/11 v2.12 Pstricks color test (UK)] + [2021/10/31 v2.13 Pstricks color test (UK)] %% %% ---------------------------------------------------------------- -%% Copyright (C) 2003-2016 by Dr. Uwe Kern <xcolor at ukern dot de> +%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de> +%% 2021 LaTeX Project https://github.com/latex3/xcolor/issues %% ---------------------------------------------------------------- %% -\def\XCfileversion{v2.12}% -\def\XCfiledate{2016/05/11}% +\def\XCfileversion{v2.13}% +\def\XCfiledate{2021/10/31}% \listfiles \documentclass{article} \usepackage{pstricks,pst-tree,pst-slpe,multido} \makeatletter \makeatother -\usepackage{fvrb-ex} +\usepackage{fancyvrb-ex} \def\textfraction{0.01} \def\topfraction{0.99} @@ -48,7 +49,7 @@ \begin{document} \title{Color extensions with the \textsf{xcolor} package --- \textsf{pstricks} examples} -\author{Dr. Uwe Kern\thanks{This file is part of the \textsf{xcolor} distribution which can be downloaded from the CTAN mirrors (\texttt{macros/latex/contrib/xcolor/}) or the homepage \texttt{www.ukern.de/tex/xcolor.html}. Please send error reports and suggestions for improvements to \texttt{xcolor@ukern.de}.}} +\author{Dr. Uwe Kern\thanks{This file is part of the \textsf{xcolor} distribution which can be downloaded from the CTAN mirrors (\texttt{macros/latex/contrib/xcolor/}) or the homepage \texttt{www.ukern.de/tex/xcolor.html}. Please send error reports and suggestions for improvements to \texttt{https://github.com/latex3/xcolor/issues}.}} \date{\XCfileversion{} (\XCfiledate)} \maketitle diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex b/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex index 9a625fc8bc2..36ee8024b55 100644 --- a/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex +++ b/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex @@ -22,14 +22,15 @@ %% in the same archive or directory.) %% \ProvidesFile{xcolor3} - [2016/05/11 v2.12 Color logging test (UK)] + [2021/10/31 v2.13 Color logging test (UK)] %% %% ---------------------------------------------------------------- -%% Copyright (C) 2003-2016 by Dr. Uwe Kern <xcolor at ukern dot de> +%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de> +%% 2021 LaTeX Project https://github.com/latex3/xcolor/issues %% ---------------------------------------------------------------- %% -\def\XCfileversion{v2.12}% -\def\XCfiledate{2016/05/11}% +\def\XCfileversion{v2.13}% +\def\XCfiledate{2021/10/31}% \listfiles \documentclass[a4paper]{article} \usepackage[showerrors,table,dvipsnames*,hyperref]{xcolor}[2005/12/21] @@ -56,7 +57,7 @@ \title{Color extensions with the \textsf{xcolor} package --- various examples} \author{\href{mailto:xcolor@ukern.de}{\fboxrule0pt\fboxsep2pt\fbox{Dr. Uwe Kern}}} \date{\XCfileversion{} (\XCfiledate) -\thanks{This file (\texttt{\jobname.tex}) is part of the \textsf{xcolor} distribution which can be downloaded from the CTAN mirrors \texttt{\href{http://www.ctan.org/tex-archive/macros/latex/contrib/xcolor/}{CTAN/macros/latex/contrib/xcolor/}} or the homepage \texttt{\href{http://www.ukern.de/tex/xcolor.html}{www.ukern.de/tex/xcolor.html}}. Please send error reports and suggestions for improvements to \texttt{\href{mailto:xcolor@ukern.de}{xcolor@ukern.de}}.}} +\thanks{This file (\texttt{\jobname.tex}) is part of the \textsf{xcolor} distribution which can be downloaded from the CTAN mirrors \texttt{\href{http://www.ctan.org/tex-archive/macros/latex/contrib/xcolor/}{CTAN/macros/latex/contrib/xcolor/}} or the homepage \texttt{\href{http://www.ukern.de/tex/xcolor.html}{www.ukern.de/tex/xcolor.html}}. Please send error reports and suggestions for improvements to \url{https://github.com/latex3/xcolor/issues}.}} \maketitle The purpose of this file is to demonstrate a variety of capabilities including the logging facilities of the \textsf{xcolor} package. diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex b/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex index 5533deb7a32..55411d1ec57 100644 --- a/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex +++ b/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex @@ -22,14 +22,15 @@ %% in the same archive or directory.) %% \ProvidesFile{xcolor4} - [2016/05/11 v2.12 Color driver test (UK)] + [2021/10/31 v2.13 Color driver test (UK)] %% %% ---------------------------------------------------------------- -%% Copyright (C) 2003-2016 by Dr. Uwe Kern <xcolor at ukern dot de> +%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de> +%% 2021 LaTeX Project https://github.com/latex3/xcolor/issues %% ---------------------------------------------------------------- %% -\def\XCfileversion{v2.12}% -\def\XCfiledate{2016/05/11}% +\def\XCfileversion{v2.13}% +\def\XCfiledate{2021/10/31}% \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 10536f9df3c..71a992529d0 100644 --- a/Master/texmf-dist/dvips/xcolor/xcolor.pro +++ b/Master/texmf-dist/dvips/xcolor/xcolor.pro @@ -23,10 +23,11 @@ %% in the same archive or directory.) %% %% xcolor.pro (PostScript/dvips header file) -%% [2016/05/11 v2.12 LaTeX color extensions (UK)] +%% [2021/10/31 v2.13 LaTeX color extensions (UK)] %% %% ---------------------------------------------------------------- -%% Copyright (C) 2003-2016 by Dr. Uwe Kern <xcolor at ukern dot de> +%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de> +%% 2021 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 48ab957f481..8162c8f863c 100644 --- a/Master/texmf-dist/source/latex/xcolor/xcolor.dtx +++ b/Master/texmf-dist/source/latex/xcolor/xcolor.dtx @@ -1,12 +1,13 @@ % \iffalse meta-comment %% %% ---------------------------------------------------------------- -%% Copyright (C) 2003-2016 by Dr. Uwe Kern <xcolor at ukern dot de> +%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de> +%% 2021 LaTeX Project https://github.com/latex3/xcolor/issues %% ---------------------------------------------------------------- %% %<*package> %% Please send error reports and suggestions for -%% improvements to the above email address. +%% improvements to https://github.com/latex3/xcolor/issues. %% %% This package contains code copied from %% @@ -17,19 +18,19 @@ %% %</package> %<*extract|driver|test1|test2|test3|test4> -\def\XCfileversion{v2.12}% -\def\XCfiledate{2016/05/11}% +\def\XCfileversion{v2.13}% +\def\XCfiledate{2021/10/31}% %</extract|driver|test1|test2|test3|test4> % % This file may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.2 +% conditions of the LaTeX Project Public License, either version 1.3c % of this license or (at your option) any later version. % The latest version of this license is in: % % http://www.latex-project.org/lppl.txt % -% and version 1.2 or later is part of all distributions of LaTeX -% version 1999/12/01 or later. +% and version 1.3c or later is part of all distributions of LaTeX +% version 2008-05-04 or later. % % \fi % @@ -231,8 +232,8 @@ % \date{\XCfileversion{} (\XCfiledate) % \thanks{This package can be downloaded from \CTAN{macros/latex/contrib/xcolor/}{}. % There is also an \textsf{xcolor} homepage: \XCW. -% Please send error reports and suggestions for improvements to the author: -% \texttt{\href{mailto:xcolor@ukern.de}{xcolor@ukern.de}}.}} +% Please send error reports and suggestions for improvements to: +% \url{https://github.com/latex3/xcolor/issues}.}} % \maketitle % % \begin{abstract} @@ -376,7 +377,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{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 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}, \Option{dvisvgm}, % \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}, @@ -3144,6 +3145,16 @@ % \subsection*{History} % \addcontentsline{toc}{subsection}{History} % +% \subsubsection*{2021/10/31 v2.13} +% \begin{itemize} +% \item Bug Fixes: +% \begin{itemize} +% \item Avoid use of |\string| to generate csnames +% \item Declare |dvisvgm| option and make |dvipdfm| an alias to |dvipdfmx| to match graphics and color packages. +% \item Modify |\XC@info| to avoid spurious text from |\colorlet{foo}{.!50}| +% \end{itemize} +% \end{itemize} +% % \subsubsection*{2016/05/11 v2.12} % \begin{itemize} % \item New features: @@ -3596,7 +3607,7 @@ % \begin{macro}{\XC@@} % Macro consisting of the macro |\\XC@@|, serves as a delimiter. % \begin{macrocode} -\edef\XC@@{\expandafter\noexpand\csname\string\XC@@\endcsname} +\edef\XC@@{\expandafter\noexpand\csname\@backslashchar XC@@\endcsname} % \end{macrocode} % \end{macro} % @@ -4044,9 +4055,9 @@ % % Drivers that come with their individual definition files: % \begin{macrocode} -\@tfor\@@tmp:={dvipdf}{dvipdfm}{dvipdfmx}{dvips}{dvipsone}{dviwin}% +\@tfor\@@tmp:={dvipdf}{dvipdfmx}{dvips}{dvipsone}{dviwin}% {emtex}{luatex}{pctex32}{pctexhp}{pctexps}{pctexwin}{pdftex}% - {tcidvi}{textures}{truetex}{vtex}{xetex}\do + {tcidvi}{textures}{truetex}{vtex}{xetex}{dvisvgm}\do {\edef\@@tmp{\noexpand\DeclareOption{\@@tmp}% {\def\noexpand\Gin@driver{\@@tmp.def}}}% \@@tmp} @@ -4057,6 +4068,7 @@ \DeclareOption{dviwindo}{\ExecuteOptions{dvipsone}} \DeclareOption{oztex}{\ExecuteOptions{dvips}} \DeclareOption{xdvi}{\ExecuteOptions{dvips,monochrome}} +\DeclareOption{dvipdfm}{\ExecuteOptions{dvipdfmx}} % \end{macrocode} % % Options used by (some) drivers. @@ -4890,7 +4902,7 @@ \toks@\expandafter{\@@drv}% \edef\@@tmp {\ifglobalcolors\global\else\xglobal@\fi - \noexpand\@namedef{\string\color@\@@nam}% + \noexpand\@namedef{\@backslashchar color@\@@nam}% {\noexpand\xcolor@{\@@cls}{\the\toks@}{\@@mod}{\@@clr}}}% \fi}% \expandafter\endgroup\@@tmp\xglobal@stop} @@ -5026,7 +5038,7 @@ \else \edef\@@tmp {\expandafter\expandafter\expandafter\@secondoffive - \csname\string\color@\@@clr\endcsname}% + \csname\@backslashchar color@\@@clr\endcsname}% \ifx\@@cls\@@tmp\XC@@tsttrue\fi \fi \fi\fi @@ -5048,7 +5060,7 @@ {\c@lor@error{`#2'}\let\@@tmp\@empty}% {\edef\@@tmp {\ifglobalcolors\global\else\xglobal@\fi - \noexpand\XC@let@cc{\string\color@#1}{\string\color@#2}}}} + \noexpand\XC@let@cc{\@backslashchar color@#1}{\@backslashchar color@#2}}}} % \end{macrocode} % \end{macro} % @@ -5194,7 +5206,7 @@ \XC@sdef\@@mod{#2}% \@ifxempty{#4}{\extractcolorspec{#5}\@@clr}{\edef\@@clr{{#4}{#5}}}% \expandafter\convertcolorspec\@@clr\@@mod\@@clr - \@namexdef{\string\colorB@#1}{{\@@mod}{\@@clr}}% + \@namexdef{\@backslashchar colorB@#1}{{\@@mod}{\@@clr}}% \edef\@@met{#3}% \ifx\@@met\XC@met@last \@ifxempty{#6}{\extractcolorspec{#7}\@@tmp}{\edef\@@tmp{{#6}{#7}}}% @@ -5204,7 +5216,7 @@ \else \edef\@@tmp{#7}% \fi - \@namexdef{\string\colorD@#1}{{\@@met}{\@@tmp}}% + \@namexdef{\@backslashchar colorD@#1}{{\@@met}{\@@tmp}}% \endgroup} % \end{macrocode} % \end{macro} @@ -5216,15 +5228,15 @@ \def\XC@resetcolorseries[#1]#2% {\begingroup \@namexdef - {\string\color@#2}{\noexpand\xcolor@{}{}\@nameuse{\string\colorB@#2}}% - \XC@let@Nc\@@tmp{\string\colorD@#2}% + {\@backslashchar color@#2}{\noexpand\xcolor@{}{}\@nameuse{\@backslashchar colorB@#2}}% + \XC@let@Nc\@@tmp{\@backslashchar colorD@#2}% \edef\@@met{\expandafter\@firstoftwo\@@tmp}% \edef\@@tmp{\expandafter\@secondoftwo\@@tmp}% \ifx\@@met\XC@met@step\else \edef\@@scl{\@ifxempty{#1}\colorseriescycle{#1}}% \expandafter\XC@calc@\@@tmp,,,,:D% \fi - \@namexdef{\string\colorS@#2}{\@@tmp}% + \@namexdef{\@backslashchar colorS@#2}{\@@tmp}% \endgroup} % \end{macrocode} % \end{macro} @@ -5236,14 +5248,14 @@ % In the relative case, the (non-negative) number of single steps is supposed to be stored in |\@tempcnta|. % \begin{macrocode} \def\XC@step#1% - {\let\xcolor@\@gobbletwo\edef\@@tmp{\@nameuse{\string\color@#1}}% + {\let\xcolor@\@gobbletwo\edef\@@tmp{\@nameuse{\@backslashchar color@#1}}% \expandafter\XC@st@p\@@tmp{#1}% - \@namexdef{\string\color@#1}{\noexpand\xcolor@{}{}{\@@mod}{\@@tmp}}} + \@namexdef{\@backslashchar color@#1}{\noexpand\xcolor@{}{}{\@@mod}{\@@tmp}}} % \end{macrocode} % % \begin{macrocode} \def\XC@st@p#1#2#3% - {\def\@@mod{#1}\def\@@tmp{#2}\edef\@@vec{\@nameuse{\string\colorS@#3}}% + {\def\@@mod{#1}\def\@@tmp{#2}\edef\@@vec{\@nameuse{\@backslashchar colorS@#3}}% \@whilenum\@tempcnta>\z@\do {\XC@inflate\@@mod\@@tmp\@@vec\@@tmp \expandafter\XC@add\@@tmp,\@@tmp \expandafter\XC@calc@\@@tmp,,,,:U% @@ -5252,7 +5264,7 @@ % % \begin{macrocode} \def\XC@stepabs#1% - {\edef\@@tmp{\@nameuse{\string\colorB@#1}}% + {\edef\@@tmp{\@nameuse{\@backslashchar colorB@#1}}% \expandafter\XC@st@p\@@tmp{#1}% \edef\@@tmp {\def\noexpand\@@mod{\@@mod}\def\noexpand\@@clr{\@@tmp}}} @@ -5406,7 +5418,7 @@ % % \begin{macrocode} \def\XC@declaredc@lor - {\XC@let@Nc\XC@current@color{\string\color@\XC@@tmp}% + {\XC@let@Nc\XC@current@color{\@backslashchar color@\XC@@tmp}% \edef\current@color{\XC@current@color}% \XC@display} % \end{macrocode} @@ -5444,7 +5456,7 @@ % \begin{macrocode} \def\nopagecolor {\@ifundefined{no@page@color}% - {\PackageInfo{xcolor}{\string\nopagecolor\space is not supported}}% + {\PackageInfo{xcolor}{\@backslashchar nopagecolor\space is not supported}}% {\no@page@color}} % \end{macrocode} % \end{macro} @@ -5778,7 +5790,7 @@ \ifodd\count@\@tempswatrue\else\@tempswafalse\fi \@ifundefinedcolor\@@nam {\c@lor@error{`\@@nam'}\def\@@nam{black}}{}% - \let\xcolor@\@xcolor@\@nameuse{\string\color@\@@nam}} + \let\xcolor@\@xcolor@\@nameuse{\@backslashchar color@\@@nam}} % \end{macrocode} % \end{macro} % \end{macro} @@ -5852,11 +5864,11 @@ % Write information to log file and display the current color. % \begin{macrocode} \def\XC@display - {\XC@bcolor\XC@let@cN{\string\color@.}\XC@current@color + {\XC@bcolor\XC@let@cN{\@backslashchar color@.}\XC@current@color \ifnum\XC@type{.}=1 \PackageWarning{xcolor}{Incompatible color definition}\else \ifnum\XC@tracing>2 - \begingroup \let\xcolor@\@empty \def\@nil{\string\@nil}% + \begingroup \let\xcolor@\@empty \def\@nil{\@backslashchar @nil}% \PackageInfo{xcolor}{Setting color `\XC@current@color'}% \endgroup \fi\fi @@ -6058,7 +6070,7 @@ % \marg{name}\marg{undefined}\marg{defined}\\ % Checks whether \Meta{name} is a defined color name and executes the respective code. % \begin{macrocode} -\def\@ifundefinedcolor#1{\@ifundefined{\string\color@#1}} +\def\@ifundefinedcolor#1{\@ifundefined{\@backslashchar color@#1}} % \end{macrocode} % \end{macro} % @@ -6086,7 +6098,7 @@ % \begin{macrocode} \def\XC@type#1% {\expandafter\expandafter\expandafter\XC@typ@ - \csname\string\color@#1\endcsname\@empty\@empty\@empty\XC@@} + \csname\@backslashchar color@#1\endcsname\@empty\@empty\@empty\XC@@} % \end{macrocode} % % \begin{macrocode} @@ -6117,11 +6129,13 @@ % \begin{macrocode} \def\XC@info#1#2% {\XC@edef#2{#1}% - \if.#2\def#2{0}\else\expandafter\in@\expandafter>\expandafter{#2}% + \expandafter\in@\expandafter>\expandafter{#2}% \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\edef#2{\noexpand\in@{/-}{/#2}}#2% - \edef#2{\ifin@2\else1\fi}\fi\fi\fi\fi} + \ifin@\def#2{2}\else % now there's no >,:,! + \if-\expandafter\@car#2\@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} % \end{macro} % @@ -6925,7 +6939,7 @@ \expandafter\expandafter\expandafter\c@lor@to@ps#1#2\@@ \else \expandafter\expandafter\expandafter\expandafter\expandafter\expandafter - \expandafter\c@lor@to@ps\csname\string\color@#1#2\endcsname\@@ + \expandafter\c@lor@to@ps\csname\@backslashchar color@#1#2\endcsname\@@ \fi \space} % \end{macrocode} @@ -6986,18 +7000,18 @@ {{dvipdf,dvipdfm,dvipdfmx,dvips,pctex32}% {\def\c@lor@@named#1,#2,#3\@@#4% {\edef#4{\expandafter\expandafter\expandafter\@thirdoffive - \csname\string\color@#1\endcsname}} + \csname\@backslashchar color@#1\endcsname}} \def\define@color@named#1#2% - {\@namedef{\string\color@#1}{{}{}{ \colornameprefix#1}{}{}}}}% + {\@namedef{\@backslashchar color@#1}{{}{}{ \colornameprefix#1}{}{}}}}% % \end{macrocode} % % \begin{macrocode} {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}} + \csname\@backslashchar color@#1\endcsname}} \def\define@color@named#1#2% - {\let\@@cls\@empty\@namedef{\string\color@#1}{{}{}{#2}{}{}}}}% + {\let\@@cls\@empty\@namedef{\@backslashchar color@#1}{{}{}{#2}{}{}}}}% % \end{macrocode} % % \begin{macrocode} @@ -7010,7 +7024,7 @@ \def\c@lor@ps@#1 #2\@@ {\expandafter\expandafter\expandafter\expandafter\expandafter \expandafter\expandafter\c@lor@to@ps@ - \csname\string\color@#1\expandafter\endcsname\space + \csname\@backslashchar color@#1\expandafter\endcsname\space #2. \@@{#1}}}% % \end{macrocode} % @@ -7768,7 +7782,7 @@ Purple0,.628,.125,.94} \begin{document} \title{Color conversion with the \textsf{xcolor} package --- Examples} -\author{Dr. Uwe Kern\thanks{This file is part of the \textsf{xcolor} distribution which can be downloaded from the CTAN mirrors (\texttt{macros/latex/contrib/xcolor/}) or the homepage \texttt{www.ukern.de/tex/xcolor.html}. Please send error reports and suggestions for improvements to \texttt{xcolor@ukern.de}.}} +\author{Dr. Uwe Kern\thanks{This file is part of the \textsf{xcolor} distribution which can be downloaded from the CTAN mirrors (\texttt{macros/latex/contrib/xcolor/}) or the homepage \texttt{www.ukern.de/tex/xcolor.html}. Please send error reports and suggestions for improvements to \texttt{https://github.com/latex3/xcolor/issues}.}} \date{\XCfileversion{} (\XCfiledate)} \maketitle @@ -7820,7 +7834,7 @@ Purple0,.628,.125,.94} \usepackage{pstricks,pst-tree,pst-slpe,multido} \makeatletter \makeatother -\usepackage{fvrb-ex} +\usepackage{fancyvrb-ex} \def\textfraction{0.01} \def\topfraction{0.99} @@ -7832,7 +7846,7 @@ Purple0,.628,.125,.94} \begin{document} \title{Color extensions with the \textsf{xcolor} package --- \textsf{pstricks} examples} -\author{Dr. Uwe Kern\thanks{This file is part of the \textsf{xcolor} distribution which can be downloaded from the CTAN mirrors (\texttt{macros/latex/contrib/xcolor/}) or the homepage \texttt{www.ukern.de/tex/xcolor.html}. Please send error reports and suggestions for improvements to \texttt{xcolor@ukern.de}.}} +\author{Dr. Uwe Kern\thanks{This file is part of the \textsf{xcolor} distribution which can be downloaded from the CTAN mirrors (\texttt{macros/latex/contrib/xcolor/}) or the homepage \texttt{www.ukern.de/tex/xcolor.html}. Please send error reports and suggestions for improvements to \texttt{https://github.com/latex3/xcolor/issues}.}} \date{\XCfileversion{} (\XCfiledate)} \maketitle @@ -7964,7 +7978,7 @@ Purple0,.628,.125,.94} \title{Color extensions with the \textsf{xcolor} package --- various examples} \author{\href{mailto:xcolor@ukern.de}{\fboxrule0pt\fboxsep2pt\fbox{Dr. Uwe Kern}}} \date{\XCfileversion{} (\XCfiledate) -\thanks{This file (\texttt{\jobname.tex}) is part of the \textsf{xcolor} distribution which can be downloaded from the CTAN mirrors \texttt{\href{http://www.ctan.org/tex-archive/macros/latex/contrib/xcolor/}{CTAN/macros/latex/contrib/xcolor/}} or the homepage \texttt{\href{http://www.ukern.de/tex/xcolor.html}{www.ukern.de/tex/xcolor.html}}. Please send error reports and suggestions for improvements to \texttt{\href{mailto:xcolor@ukern.de}{xcolor@ukern.de}}.}} +\thanks{This file (\texttt{\jobname.tex}) is part of the \textsf{xcolor} distribution which can be downloaded from the CTAN mirrors \texttt{\href{http://www.ctan.org/tex-archive/macros/latex/contrib/xcolor/}{CTAN/macros/latex/contrib/xcolor/}} or the homepage \texttt{\href{http://www.ukern.de/tex/xcolor.html}{www.ukern.de/tex/xcolor.html}}. Please send error reports and suggestions for improvements to \url{https://github.com/latex3/xcolor/issues}.}} \maketitle The purpose of this file is to demonstrate a variety of capabilities including the logging facilities of the \textsf{xcolor} package. diff --git a/Master/texmf-dist/tex/latex/xcolor/svgnam.def b/Master/texmf-dist/tex/latex/xcolor/svgnam.def index a947636ab3f..902641f6afd 100644 --- a/Master/texmf-dist/tex/latex/xcolor/svgnam.def +++ b/Master/texmf-dist/tex/latex/xcolor/svgnam.def @@ -22,10 +22,11 @@ %% in the same archive or directory.) %% \ProvidesFile{svgnam.def} - [2016/05/11 v2.12 Predefined colors according to SVG 1.1 (UK)] + [2021/10/31 v2.13 Predefined colors according to SVG 1.1 (UK)] %% %% ---------------------------------------------------------------- -%% Copyright (C) 2003-2016 by Dr. Uwe Kern <xcolor at ukern dot de> +%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de> +%% 2021 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 61bcdecb88d..f88c455dded 100644 --- a/Master/texmf-dist/tex/latex/xcolor/x11nam.def +++ b/Master/texmf-dist/tex/latex/xcolor/x11nam.def @@ -22,10 +22,11 @@ %% in the same archive or directory.) %% \ProvidesFile{x11nam.def} - [2016/05/11 v2.12 Predefined colors according to Unix/X11 (UK)] + [2021/10/31 v2.13 Predefined colors according to Unix/X11 (UK)] %% %% ---------------------------------------------------------------- -%% Copyright (C) 2003-2016 by Dr. Uwe Kern <xcolor at ukern dot de> +%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de> +%% 2021 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 7bcf5cc20c2..26a0b9425c3 100644 --- a/Master/texmf-dist/tex/latex/xcolor/xcolor.sty +++ b/Master/texmf-dist/tex/latex/xcolor/xcolor.sty @@ -22,14 +22,15 @@ %% in the same archive or directory.) %% \ProvidesPackage{xcolor} - [2016/05/11 v2.12 LaTeX color extensions (UK)] + [2021/10/31 v2.13 LaTeX color extensions (UK)] %% %% ---------------------------------------------------------------- -%% Copyright (C) 2003-2016 by Dr. Uwe Kern <xcolor at ukern dot de> +%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de> +%% 2021 LaTeX Project https://github.com/latex3/xcolor/issues %% ---------------------------------------------------------------- %% %% Please send error reports and suggestions for -%% improvements to the above email address. +%% improvements to https://github.com/latex3/xcolor/issues. %% %% This package contains code copied from %% @@ -64,7 +65,7 @@ \@makeother\< \@makeother\= \@makeother\> \@makeother\? \@makeother\` \catcode94 7 % \catcode`\^^A=14 % -\edef\XC@@{\expandafter\noexpand\csname\string\XC@@\endcsname} +\edef\XC@@{\expandafter\noexpand\csname\@backslashchar XC@@\endcsname} \newif\ifcolors@ \colors@true \newif\ifcolorerrors@ \newif\ifglobalcolors \globalcolorsfalse @@ -188,15 +189,16 @@ {\edef\@pdfborder{#1}\expandafter\XC@pdfborder\@pdfborder\relax}% \@break@tfor\fi}}} \providecommand*\Gin@driver{} -\@tfor\@@tmp:={dvipdf}{dvipdfm}{dvipdfmx}{dvips}{dvipsone}{dviwin}% +\@tfor\@@tmp:={dvipdf}{dvipdfmx}{dvips}{dvipsone}{dviwin}% {emtex}{luatex}{pctex32}{pctexhp}{pctexps}{pctexwin}{pdftex}% - {tcidvi}{textures}{truetex}{vtex}{xetex}\do + {tcidvi}{textures}{truetex}{vtex}{xetex}{dvisvgm}\do {\edef\@@tmp{\noexpand\DeclareOption{\@@tmp}% {\def\noexpand\Gin@driver{\@@tmp.def}}}% \@@tmp} \DeclareOption{dviwindo}{\ExecuteOptions{dvipsone}} \DeclareOption{oztex}{\ExecuteOptions{dvips}} \DeclareOption{xdvi}{\ExecuteOptions{dvips,monochrome}} +\DeclareOption{dvipdfm}{\ExecuteOptions{dvipdfmx}} \DeclareOption{xcdraw}{\def\XC@@xcd@{1}} \DeclareOption{noxcdraw}{\def\XC@@xcd@{-1}} \DeclareOption{fixinclude}{\def\XC@@xcf@{1}} @@ -505,7 +507,7 @@ \toks@\expandafter{\@@drv}% \edef\@@tmp {\ifglobalcolors\global\else\xglobal@\fi - \noexpand\@namedef{\string\color@\@@nam}% + \noexpand\@namedef{\@backslashchar color@\@@nam}% {\noexpand\xcolor@{\@@cls}{\the\toks@}{\@@mod}{\@@clr}}}% \fi}% \expandafter\endgroup\@@tmp\xglobal@stop} @@ -560,7 +562,7 @@ \else \edef\@@tmp {\expandafter\expandafter\expandafter\@secondoffive - \csname\string\color@\@@clr\endcsname}% + \csname\@backslashchar color@\@@clr\endcsname}% \ifx\@@cls\@@tmp\XC@@tsttrue\fi \fi \fi\fi @@ -579,7 +581,7 @@ {\c@lor@error{`#2'}\let\@@tmp\@empty}% {\edef\@@tmp {\ifglobalcolors\global\else\xglobal@\fi - \noexpand\XC@let@cc{\string\color@#1}{\string\color@#2}}}} + \noexpand\XC@let@cc{\@backslashchar color@#1}{\@backslashchar color@#2}}}} \def\DefineNamedColor#1% {\@nameuse{XC@\ifdefinecolors defin\else prepar\fi ecolor}[#1]} \def\preparecolor{\@testopt{\XC@preparecolor}{}} @@ -635,7 +637,7 @@ \XC@sdef\@@mod{#2}% \@ifxempty{#4}{\extractcolorspec{#5}\@@clr}{\edef\@@clr{{#4}{#5}}}% \expandafter\convertcolorspec\@@clr\@@mod\@@clr - \@namexdef{\string\colorB@#1}{{\@@mod}{\@@clr}}% + \@namexdef{\@backslashchar colorB@#1}{{\@@mod}{\@@clr}}% \edef\@@met{#3}% \ifx\@@met\XC@met@last \@ifxempty{#6}{\extractcolorspec{#7}\@@tmp}{\edef\@@tmp{{#6}{#7}}}% @@ -645,34 +647,34 @@ \else \edef\@@tmp{#7}% \fi - \@namexdef{\string\colorD@#1}{{\@@met}{\@@tmp}}% + \@namexdef{\@backslashchar colorD@#1}{{\@@met}{\@@tmp}}% \endgroup} \def\resetcolorseries{\@testopt{\XC@resetcolorseries}{}} \def\XC@resetcolorseries[#1]#2% {\begingroup \@namexdef - {\string\color@#2}{\noexpand\xcolor@{}{}\@nameuse{\string\colorB@#2}}% - \XC@let@Nc\@@tmp{\string\colorD@#2}% + {\@backslashchar color@#2}{\noexpand\xcolor@{}{}\@nameuse{\@backslashchar colorB@#2}}% + \XC@let@Nc\@@tmp{\@backslashchar colorD@#2}% \edef\@@met{\expandafter\@firstoftwo\@@tmp}% \edef\@@tmp{\expandafter\@secondoftwo\@@tmp}% \ifx\@@met\XC@met@step\else \edef\@@scl{\@ifxempty{#1}\colorseriescycle{#1}}% \expandafter\XC@calc@\@@tmp,,,,:D% \fi - \@namexdef{\string\colorS@#2}{\@@tmp}% + \@namexdef{\@backslashchar colorS@#2}{\@@tmp}% \endgroup} \def\XC@step#1% - {\let\xcolor@\@gobbletwo\edef\@@tmp{\@nameuse{\string\color@#1}}% + {\let\xcolor@\@gobbletwo\edef\@@tmp{\@nameuse{\@backslashchar color@#1}}% \expandafter\XC@st@p\@@tmp{#1}% - \@namexdef{\string\color@#1}{\noexpand\xcolor@{}{}{\@@mod}{\@@tmp}}} + \@namexdef{\@backslashchar color@#1}{\noexpand\xcolor@{}{}{\@@mod}{\@@tmp}}} \def\XC@st@p#1#2#3% - {\def\@@mod{#1}\def\@@tmp{#2}\edef\@@vec{\@nameuse{\string\colorS@#3}}% + {\def\@@mod{#1}\def\@@tmp{#2}\edef\@@vec{\@nameuse{\@backslashchar colorS@#3}}% \@whilenum\@tempcnta>\z@\do {\XC@inflate\@@mod\@@tmp\@@vec\@@tmp \expandafter\XC@add\@@tmp,\@@tmp \expandafter\XC@calc@\@@tmp,,,,:U% \advance\@tempcnta\m@ne}} \def\XC@stepabs#1% - {\edef\@@tmp{\@nameuse{\string\colorB@#1}}% + {\edef\@@tmp{\@nameuse{\@backslashchar colorB@#1}}% \expandafter\XC@st@p\@@tmp{#1}% \edef\@@tmp {\def\noexpand\@@mod{\@@mod}\def\noexpand\@@clr{\@@tmp}}} @@ -750,7 +752,7 @@ \edef\@@tmp{\noexpand\@undeclaredcolor[\@@mod]{\@@clr}}% \expandafter\endgroup\@@tmp} \def\XC@declaredc@lor - {\XC@let@Nc\XC@current@color{\string\color@\XC@@tmp}% + {\XC@let@Nc\XC@current@color{\@backslashchar color@\XC@@tmp}% \edef\current@color{\XC@current@color}% \XC@display} \def\textcolor#1#{\@textcolor{#1}} @@ -761,7 +763,7 @@ \color} \def\nopagecolor {\@ifundefined{no@page@color}% - {\PackageInfo{xcolor}{\string\nopagecolor\space is not supported}}% + {\PackageInfo{xcolor}{\@backslashchar nopagecolor\space is not supported}}% {\no@page@color}} \def\colorbox#1#{\protect\color@box{#1}} \def\color@box#1#2{\color@b@x\relax{\color#1{#2}}} @@ -920,7 +922,7 @@ \ifodd\count@\@tempswatrue\else\@tempswafalse\fi \@ifundefinedcolor\@@nam {\c@lor@error{`\@@nam'}\def\@@nam{black}}{}% - \let\xcolor@\@xcolor@\@nameuse{\string\color@\@@nam}} + \let\xcolor@\@xcolor@\@nameuse{\@backslashchar color@\@@nam}} \def\XC@postfix#1#2]#3\relax {\begingroup \if[#1\@tempcnta#2\relax\XC@stepabs\@@nam @@ -954,11 +956,11 @@ \fi \let\@@mod\XC@mod@hsb} \def\XC@display - {\XC@bcolor\XC@let@cN{\string\color@.}\XC@current@color + {\XC@bcolor\XC@let@cN{\@backslashchar color@.}\XC@current@color \ifnum\XC@type{.}=1 \PackageWarning{xcolor}{Incompatible color definition}\else \ifnum\XC@tracing>2 - \begingroup \let\xcolor@\@empty \def\@nil{\string\@nil}% + \begingroup \let\xcolor@\@empty \def\@nil{\@backslashchar @nil}% \PackageInfo{xcolor}{Setting color `\XC@current@color'}% \endgroup \fi\fi @@ -1033,11 +1035,11 @@ \edef#3{\expandafter\@secondoftwo#3}} \def\XC@extract@hue#1,#2:#3{\edef#3{#1}} \def\XC@replace@hue#1,#2:#3,#4{\edef#4{#3,#2}} -\def\@ifundefinedcolor#1{\@ifundefined{\string\color@#1}} +\def\@ifundefinedcolor#1{\@ifundefined{\@backslashchar color@#1}} \def\@ifundefinedmodel#1{\@ifundefined{color@#1}} \def\XC@type#1% {\expandafter\expandafter\expandafter\XC@typ@ - \csname\string\color@#1\endcsname\@empty\@empty\@empty\XC@@} + \csname\@backslashchar color@#1\endcsname\@empty\@empty\@empty\XC@@} \def\XC@typ@#1#2#3#4\XC@@ {\ifx#1\relax 0\else \ifx#1\xcolor@ @@ -1048,11 +1050,13 @@ \fi} \def\XC@info#1#2% {\XC@edef#2{#1}% - \if.#2\def#2{0}\else\expandafter\in@\expandafter>\expandafter{#2}% + \expandafter\in@\expandafter>\expandafter{#2}% \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\edef#2{\noexpand\in@{/-}{/#2}}#2% - \edef#2{\ifin@2\else1\fi}\fi\fi\fi\fi} + \ifin@\def#2{2}\else % now there's no >,:,! + \if-\expandafter\@car#2\@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@} \def\XC@tracingcolors{\aftergroupdef\XC@tracing{\the\count@}} \tracingcolors=0 @@ -1393,7 +1397,7 @@ \expandafter\expandafter\expandafter\c@lor@to@ps#1#2\@@ \else \expandafter\expandafter\expandafter\expandafter\expandafter\expandafter - \expandafter\c@lor@to@ps\csname\string\color@#1#2\endcsname\@@ + \expandafter\c@lor@to@ps\csname\@backslashchar color@#1#2\endcsname\@@ \fi \space} \let\XC@c@lor@to@ps\XC@usecolor @@ -1406,15 +1410,15 @@ {{dvipdf,dvipdfm,dvipdfmx,dvips,pctex32}% {\def\c@lor@@named#1,#2,#3\@@#4% {\edef#4{\expandafter\expandafter\expandafter\@thirdoffive - \csname\string\color@#1\endcsname}} + \csname\@backslashchar color@#1\endcsname}} \def\define@color@named#1#2% - {\@namedef{\string\color@#1}{{}{}{ \colornameprefix#1}{}{}}}}% + {\@namedef{\@backslashchar color@#1}{{}{}{ \colornameprefix#1}{}{}}}}% {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}} + \csname\@backslashchar color@#1\endcsname}} \def\define@color@named#1#2% - {\let\@@cls\@empty\@namedef{\string\color@#1}{{}{}{#2}{}{}}}}% + {\let\@@cls\@empty\@namedef{\@backslashchar color@#1}{{}{}{#2}{}{}}}}% {textures}% {\def\c@lor@@named#1,#2,#3\@@#4% {\edef\@tempa{\color@P@custom{#1}{\if!#2!1\else#2\fi}}% @@ -1424,7 +1428,7 @@ \def\c@lor@ps@#1 #2\@@ {\expandafter\expandafter\expandafter\expandafter\expandafter \expandafter\expandafter\c@lor@to@ps@ - \csname\string\color@#1\expandafter\endcsname\space + \csname\@backslashchar color@#1\expandafter\endcsname\space #2. \@@{#1}}}% }{} \definecolorset{rgb/hsb/cmyk/gray}{}{}% |