texlive[58059] Master/texmf-dist/tex/latex/graphics-def: graphics-def

[commits+karl at tug.org]

Revision: 58059
          http://tug.org/svn/texlive?view=revision&revision=58059
Author:   karl
Date:     2021-03-02 22:55:01 +0100 (Tue, 02 Mar 2021)
Log Message:
-----------
graphics-def (2mar21)

Modified Paths:
--------------
    trunk/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def
    trunk/Master/texmf-dist/tex/latex/graphics-def/xetex.def

Modified: trunk/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def	2021-03-02 21:54:44 UTC (rev 58058)
+++ trunk/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def	2021-03-02 21:55:01 UTC (rev 58059)
@@ -1,5 +1,5 @@
 %% dvipdfmx.def
-%% Copyright (C) 2005-2020 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata
+%% Copyright (C) 2005-2021 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata
 %%                         (with contributions from many others)
 %%
 %% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
 %% https://github.com/latex3/graphics-def/issues
 %%
 \ProvidesFile{dvipdfmx.def}
-  [2020/08/26 v5.0h Graphics/color driver for dvipdfmx]
+  [2021/03/02 v5.0i Graphics/color driver for dvipdfmx]
 \def\GPT at space{ }
 \def\c at lor@arg#1{%
   \dimen@#1\p@
@@ -384,15 +384,23 @@
 \def\convert at color@cmyk#1{#1 k #1 K}
 \def\convert at color@gray#1{#1 g #1 G}
 \def\convert at color@rgb#1{#1 rg #1 RG}
+\def\convert at color@#1{%
+  \expandafter\expandafter\expandafter\convert@@color
+    \expandafter\expandafter\expandafter{\csname col@#1\endcsname}%
+}
+% Deal with named colors
+\def\define at color@named#1#2{\expandafter\edef\csname col@#1\endcsname{#2}}
 % Change the specials to use the stack
-\chardef\main at pdfcolorstack=1 %
-\ifx\AtBeginDvi\undefined
-  \long\def\@firstofone#1{#1}%
-  \expandafter\@firstofone
-\else
-  \expandafter\AtBeginDvi
+\ifdefined\main at pdfcolorstack\else
+  \chardef\main at pdfcolorstack=1 %
+  \ifx\AtBeginDvi\undefined
+    \long\def\@firstofone#1{#1}%
+    \expandafter\@firstofone
+  \else
+    \expandafter\AtBeginDvi
+  \fi
+    {\special{pdfcolorstackinit \the\main at pdfcolorstack\space page direct (0 g 0 G)}}
 \fi
-  {\special{pdfcolorstackinit \the\main at pdfcolorstack\space page direct (0 g 0 G)}}
 \def\@pdfcolorstack{\the\main at pdfcolorstack\space}
 \def\set at color{%
   \special{pdfcolorstack \@pdfcolorstack push (\convert at color\current at color)}%

Modified: trunk/Master/texmf-dist/tex/latex/graphics-def/xetex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/graphics-def/xetex.def	2021-03-02 21:54:44 UTC (rev 58058)
+++ trunk/Master/texmf-dist/tex/latex/graphics-def/xetex.def	2021-03-02 21:55:01 UTC (rev 58059)
@@ -1,5 +1,5 @@
 %% xetex.def
-%% Copyright (C) 2005-2020 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata
+%% Copyright (C) 2005-2021 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata
 %%                         (with contributions from many others)
 %%
 %% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
 %% https://github.com/latex3/graphics-def/issues
 %%
 \ProvidesFile{xetex.def}
-  [2020/08/26 v5.0i Graphics/color driver for xetex]
+  [2021/03/02 v5.0j Graphics/color driver for xetex]
 \def\GPT at space{ }
 \def\c at lor@arg#1{%
   \dimen@#1\p@
@@ -483,15 +483,23 @@
 \def\convert at color@cmyk#1{#1 k #1 K}
 \def\convert at color@gray#1{#1 g #1 G}
 \def\convert at color@rgb#1{#1 rg #1 RG}
+\def\convert at color@#1{%
+  \expandafter\expandafter\expandafter\convert@@color
+    \expandafter\expandafter\expandafter{\csname col@#1\endcsname}%
+}
+% Deal with named colors
+\def\define at color@named#1#2{\expandafter\edef\csname col@#1\endcsname{#2}}
 % Change the specials to use the stack
-\chardef\main at pdfcolorstack=1 %
-\ifx\AtBeginDvi\undefined
-  \long\def\@firstofone#1{#1}%
-  \expandafter\@firstofone
-\else
-  \expandafter\AtBeginDvi
+\ifdefined\main at pdfcolorstack\else
+  \chardef\main at pdfcolorstack=1 %
+  \ifx\AtBeginDvi\undefined
+    \long\def\@firstofone#1{#1}%
+    \expandafter\@firstofone
+  \else
+    \expandafter\AtBeginDvi
+  \fi
+    {\special{pdfcolorstackinit \the\main at pdfcolorstack\space page direct (0 g 0 G)}}
 \fi
-  {\special{pdfcolorstackinit \the\main at pdfcolorstack\space page direct (0 g 0 G)}}
 \def\@pdfcolorstack{\the\main at pdfcolorstack\space}
 \def\set at color{%
   \special{pdfcolorstack \@pdfcolorstack push (\convert at color\current at color)}%