[latex3-commits] [git/LaTeX3-latex3-latex3] master: Disable Separation/DeviceN with older (x)dvipdfmx (b564b6ffe)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/b564b6ffeaad360b69a45b4cdf4ab83b19170337

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

commit b564b6ffeaad360b69a45b4cdf4ab83b19170337
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue Jan 19 17:20:43 2021 +0000

    Disable Separation/DeviceN with older (x)dvipdfmx


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

b564b6ffeaad360b69a45b4cdf4ab83b19170337
 l3backend/l3backend-color.dtx | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/l3backend/l3backend-color.dtx b/l3backend/l3backend-color.dtx
index 009d8d688..ae291b045 100644
--- a/l3backend/l3backend-color.dtx
+++ b/l3backend/l3backend-color.dtx
@@ -917,6 +917,28 @@
 %</dvipdfmx|luatex|pdftex|xetex>
 %    \end{macrocode}
 %
+%    \begin{macrocode}
+%<*dvipdfmx|xetex>
+%    \end{macrocode}
+%
+% \begin{macro}{\@@_backend_select_separation:nn, \@@_backend_select_devicen:nn}
+%   For older \texttt{(x)dvipdfmx}, we \emph{could} support separations using a
+%   dedicated mechanism, but it was not added that long before the color
+%   stacks. So instead of having two complex paths, just disable here.
+%    \begin{macrocode}
+\int_compare:nNnT \c__kernel_sys_dvipdfmx_version_int < { 20201111 }
+  {
+    \cs_gset_protected:Npn \@@_backend_select_separation:nn #1#2 { }
+    \cs_gset_eq:NN \@@_backend_select_devicen:nn
+      \@@_backend_select_separation:nn
+  }
+%    \end{macrocode}
+% \end{macro}
+%
+%    \begin{macrocode}
+%</dvipdfmx||xetex>
+%    \end{macrocode}
+%
 % \subsection{Fill and stroke color}
 %
 % Here, \texttt{dvipdfmx}/\XeTeX{} follows \LuaTeX{} and \pdfTeX{},
@@ -1023,13 +1045,13 @@
       { \__kernel_backend_literal:n { pdf: ec } }
     \cs_gset_protected:Npn \@@_backend_stroke:n #1
       { \__kernel_backend_literal:n {#1} }
-    \cs_gset_protected:Npn \@@_backend_fill_separation:nn #1#2
-      {
-        \__kernel_backend_literal:n { pdf: bc ~ @#1 [ #2 ] }
-        \group_insert_after:N \@@_backend_reset:
-      }
-    \cs_gset_protected:Npn \@@_backend_stroke_separation:nn #1#2
-      { \__kernel_backend_literal:n { /#1 ~ CS ~ #2 ~ SCN } }
+    \cs_gset_protected:Npn \@@_backend_fill_separation:nn #1#2 { }
+    \cs_gset_eq:NN \@@_backend_fill_devicen:nn 
+      \@@_backend_fill_separation:nn
+    \cs_gset_eq:NN \@@_backend_stroke_separation:nn
+      \@@_backend_fill_separation:nn
+    \cs_gset_eq:NN \@@_backend_stroke_devicen:nn
+      \@@_backend_stroke_separation:nn    
   }
 %    \end{macrocode}
 % \end{macro}