[latex3-commits] [git/LaTeX3-latex3-graphics-def] main: Allow for main color stack be set up elsewhere in (x)dvipdfmx (130215e)

[Joseph Wright]

Repository : https://github.com/latex3/graphics-def
On branch  : main
Link       : https://github.com/latex3/graphics-def/commit/130215e5aed14cac7f6d5b0c1c0ea59be58ef9aa

>---------------------------------------------------------------

commit 130215e5aed14cac7f6d5b0c1c0ea59be58ef9aa
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue Mar 2 09:33:00 2021 +0000

    Allow for main color stack be set up elsewhere in (x)dvipdfmx


>---------------------------------------------------------------

130215e5aed14cac7f6d5b0c1c0ea59be58ef9aa
 dvipdfmx.def | 8 +++++---
 xetex.def    | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dvipdfmx.def b/dvipdfmx.def
index 99ba13e..5cc9cf1 100644
--- a/dvipdfmx.def
+++ b/dvipdfmx.def
@@ -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@
@@ -387,7 +387,9 @@
 % 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 %
+\ifdefined\main at pdfcolorstack\else
+  \chardef\main at pdfcolorstack=1 %
+\fi
 \ifx\AtBeginDvi\undefined
   \long\def\@firstofone#1{#1}%
   \expandafter\@firstofone
diff --git a/xetex.def b/xetex.def
index 439b5cc..4c7f31a 100644
--- a/xetex.def
+++ b/xetex.def
@@ -486,7 +486,9 @@
 % 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 %
+\ifdefined\main at pdfcolorstack\else
+  \chardef\main at pdfcolorstack=1 %
+\fi
 \ifx\AtBeginDvi\undefined
   \long\def\@firstofone#1{#1}%
   \expandafter\@firstofone