[latex3-commits] [git/LaTeX3-latex3-latex3] master: Revert "Stray mark-up removed" (c061807a8)

[Joseph Wright]

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

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

commit c061807a892988466f5506e7a0c58796eccf2a3c
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Dec 7 22:11:50 2020 +0000

    Revert "Stray mark-up removed"
    
    This reverts commit d6e2dc6acc6b8d538d9fb4439bee25ac226129ba.


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

c061807a892988466f5506e7a0c58796eccf2a3c
 l3backend/l3backend-color.dtx | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/l3backend/l3backend-color.dtx b/l3backend/l3backend-color.dtx
index dcebe8819..baefde5d3 100644
--- a/l3backend/l3backend-color.dtx
+++ b/l3backend/l3backend-color.dtx
@@ -91,6 +91,7 @@
 %     \@@_backend_select_rgb:n
 %   }
 % \begin{macro}{\@@_backend_reset:}
+% \begin{macro}{color.sc, color.fc}
 %    Push the data to the stack.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_backend_select_cmyk:n #1
@@ -105,6 +106,7 @@
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
+% \end{macro}
 %
 %    \begin{macrocode}
 %</dvipdfmx|xetex>
@@ -780,7 +782,7 @@
 % \texttt{dvisvgm} independently, as there we can create SVG directly.
 %
 %    \begin{macrocode}
-%<*luatex|pdftex>
+%<*dvipdfmx|luatex|pdftex|xetex>
 %    \end{macrocode}
 %
 % \begin{macro}
@@ -792,22 +794,24 @@
 %     \@@_backend_stroke_gray:n ,
 %     \@@_backend_stroke_rgb:n
 %   }
-%   Drawing (fill/stroke) color is handled using the same approach as earlier.
+%   Drawing (fill/stroke) color is handled in \texttt{dvipdfmx}/\XeTeX{} in the
+%   same way as \LuaTeX{}/\pdfTeX{}. We use the same approach as earlier, except the
+%   color stack is not involved so the generic direct PDF operation is used.
 %   There is no worry about the nature of strokes: everything is handled
 %   automatically.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_backend_fill_cmyk:n #1
-  { \@@_backend_select:n { #1 ~ k } }
+  { \__kernel_backend_literal_pdf:n { #1 ~ k } }
 \cs_new_protected:Npn \@@_backend_fill_gray:n #1
-  { \@@_backend_select:n { #1 ~ g } }
+  { \__kernel_backend_literal_pdf:n { #1 ~ g } }
 \cs_new_protected:Npn \@@_backend_fill_rgb:n #1
-  { \@@_backend_select:n { #1 ~ rg } }
+  { \__kernel_backend_literal_pdf:n { #1 ~ rg } }
   \cs_new_protected:Npn \@@_backend_stroke_cmyk:n #1
-  { \@@_backend_select:n { #1 ~ K } }
+  { \__kernel_backend_literal_pdf:n { #1 ~ K } }
 \cs_new_protected:Npn \@@_backend_stroke_gray:n #1
-  {\@@_backend_select:n { #1 ~ G } }
+  { \__kernel_backend_literal_pdf:n { #1 ~ G } }
 \cs_new_protected:Npn \@@_backend_stroke_rgb:n #1
-  { \@@_backend_select:n { #1 ~ RG } }
+  { \__kernel_backend_literal_pdf:n { #1 ~ RG } }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -820,16 +824,16 @@
 %   }
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_backend_fill_separation:nn #1#2
-  { \@@_backend_select:n { /#1 ~ cs ~ #2 ~ scn } }
+  { \__kernel_backend_literal_pdf:n { /#1 ~ cs ~ #2 ~ scn } }
 \cs_new_protected:Npn \@@_backend_stroke_separation:nn #1#2
-  { \@@_backend_select:n { /#1 ~ CS ~ #2 ~ SCN } }
+  { \__kernel_backend_literal_pdf:n { /#1 ~ CS ~ #2 ~ SCN } }
 \cs_new_eq:NN \@@_backend_fill_devicen:nn \@@_backend_fill_separation:nn
 \cs_new_eq:NN \@@_backend_stroke_devicen:nn \@@_backend_stroke_separation:nn
 %    \end{macrocode}
 % \end{macro}
 %
 %    \begin{macrocode}
-%</luatex|pdftex>
+%</dvipdfmx|luatex|pdftex|xetex>
 %    \end{macrocode}
 %
 %    \begin{macrocode}