[latex3-commits] [git/LaTeX3-latex3-latex3] master: Color should reset automatically (834b821)

Joseph Wright joseph.wright at morningstar2.co.uk
Fri Mar 2 10:43:45 CET 2018


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

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

commit 834b8212ba5b1d8d05b9987a1cd5ee9080007a2b
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Fri Mar 2 09:35:28 2018 +0000

    Color should reset automatically
    
    Even at the driver layer this is more-or-less a given.


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

834b8212ba5b1d8d05b9987a1cd5ee9080007a2b
 l3experimental/l3draw/l3draw-state.dtx  |    9 +----
 l3kernel/l3color-base.dtx               |    5 +--
 l3kernel/l3drivers.dtx                  |   67 +++++--------------------------
 l3kernel/testfiles/m3expl001.luatex.tlg |    4 +-
 l3kernel/testfiles/m3expl001.ptex.tlg   |    4 +-
 l3kernel/testfiles/m3expl001.tlg        |    4 +-
 l3kernel/testfiles/m3expl001.uptex.tlg  |    4 +-
 l3kernel/testfiles/m3expl001.xetex.tlg  |    4 +-
 l3kernel/testfiles/m3expl003.luatex.tlg |    4 +-
 l3kernel/testfiles/m3expl003.ptex.tlg   |    4 +-
 l3kernel/testfiles/m3expl003.tlg        |    4 +-
 l3kernel/testfiles/m3expl003.uptex.tlg  |    4 +-
 l3kernel/testfiles/m3expl003.xetex.tlg  |    4 +-
 13 files changed, 22 insertions(+), 99 deletions(-)

diff --git a/l3experimental/l3draw/l3draw-state.dtx b/l3experimental/l3draw/l3draw-state.dtx
index 380defe..4b3ee29 100644
--- a/l3experimental/l3draw/l3draw-state.dtx
+++ b/l3experimental/l3draw/l3draw-state.dtx
@@ -58,10 +58,6 @@
 %<@@=draw>
 %    \end{macrocode}
 %
-%    \begin{macrocode}
-\cs_generate_variant:Nn \group_insert_after:N { c }
-%    \end{macrocode}
-%
 % \begin{variable}{\g_@@_linewidth_dim, \g_@@_inner_linewidth_dim}
 %   Linewidth for strokes: global as the scope for this relies on the graphics
 %   state. The inner line width is used for places where two lines are used.
@@ -151,10 +147,7 @@
     \@@_color_aux:Vn \l_@@_color_tmp_tl {#1}
   }
 \cs_new_protected:Npn \@@_color_aux:nn #1#2
-  {
-    \@@_color:nw {#2} #1 \q_stop
-    \group_insert_after:c { driver_draw_color_ #2 _reset: }
-  }
+  { \@@_color:nw {#2} #1 \q_stop }
 \cs_generate_variant:Nn \@@_color_aux:nn { V }
 \cs_new_protected:Npn \@@_color:nw #1#2 ~ #3 \q_stop
   { \use:c { @@_color_ #2 :nw } {#1} #3 \q_stop }
diff --git a/l3kernel/l3color-base.dtx b/l3kernel/l3color-base.dtx
index 5edf058..dbcea90 100644
--- a/l3kernel/l3color-base.dtx
+++ b/l3kernel/l3color-base.dtx
@@ -160,10 +160,7 @@
 %    higher-level experimental material.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_select:n #1
-  {
-    \@@_select:w #1 \q_stop
-    \group_insert_after:N \driver_color_reset:
-  }
+  { \@@_select:w #1 \q_stop }
 \cs_generate_variant:Nn \@@_select:n { V }
 \cs_new_protected:Npn \@@_select:w #1 ~ #2 \q_stop
   { \use:c { @@_select_ #1 :w } #2 \q_stop }
diff --git a/l3kernel/l3drivers.dtx b/l3kernel/l3drivers.dtx
index b510159..6596888 100644
--- a/l3kernel/l3drivers.dtx
+++ b/l3kernel/l3drivers.dtx
@@ -150,19 +150,6 @@
 %   \cs{driver_draw_stroke_rgb:nnn}, \emph{etc.}
 % \end{function}
 %
-% \begin{function}[added = 2018-02-20]{\driver_color_reset:}
-%   \begin{syntax}
-%     \cs{driver_color_reset:}
-%   \end{syntax}
-%   Resets the active color to that before a call to
-%   \cs{driver_color_\meta{model}:n(nnn)}. This function should be inserted
-%   after the \TeX{} group setting a color, \emph{i.e.}~normally
-%   \begin{verbatim}
-%     % Use of \driver_color_rgb:nnn, etc.
-%     \group_insert_after:N \driver_color_reset:
-%   \end{verbatim}
-% \end{function}
-%
 % \begin{function}[added = 2018-02-20]{\driver_color_pickup:N}
 %   \begin{syntax}
 %     \cs{driver_color_pickup:N} \meta{tl}
@@ -439,20 +426,6 @@
 %   fp denotations in the range $0$ and $1$.
 % \end{function}
 %
-% \begin{function}
-%   {\driver_draw_color_fill_reset:, \driver_draw_color_stroke_reset:}
-%   \begin{syntax}
-%     \cs{driver_draw_color_fill_reset:}
-%   \end{syntax}
-%   Resets the active color to that before a call to
-%   \cs{driver_draw_color_fill_\meta{model}:n(nnn)}. This function should be
-%   inserted after the \TeX{} group setting a color, \emph{i.e.}~normally
-%   \begin{verbatim}
-%     % Use of \driver_driver_color_fill_rgb:nnn, etc.
-%     \group_insert_after:N \driver_draw_color_fill_reset:
-%   \end{verbatim}
-% \end{function}
-%
 % \subsection{Inserting \TeX{} material}
 %
 % \begin{function}{\driver_draw_hbox:Nnnnnnn}
@@ -592,7 +565,7 @@
 % \begin{macro}{\driver_color_rgb:nnn}
 % \begin{macro}{\driver_color_spot:nn}
 % \begin{macro}{\@@_color_select:n}
-% \begin{macro}{\driver_color_reset:}
+% \begin{macro}{\@@_color_reset:}
 %    Push the data to the stack. In the case of \texttt{dvips} also reset the
 %    drawing fill color in raw PostScript.
 %    \begin{macrocode}
@@ -610,8 +583,9 @@
 %<*dvips>
     \tex_special:D { ps::/l3fc~{ }~def }
 %</dvips>
+    \group_insert_after:N \@@_color_reset:
   }
-\cs_new_protected:Npn \driver_color_reset:
+\cs_new_protected:Npn \@@_color_reset:
   { \tex_special:D { color~pop } }
 %    \end{macrocode}
 % \end{macro}
@@ -695,7 +669,7 @@
 % \begin{macro}{\driver_color_rgb:nnn}
 % \begin{macro}{\driver_color_spot:nn}
 % \begin{macro}{\@@_color_select:n}
-% \begin{macro}{\driver_color_reset:}
+% \begin{macro}{\@@_color_reset:}
 %   Simply dump the data, but allowing for \LuaTeX{}.
 %    \begin{macrocode}
 \cs_new_protected:Npn \driver_color_cmyk:nnnn #1#2#3#4
@@ -712,8 +686,9 @@
       { \luatex_pdfextension:D colorstack }
       { \pdftex_pdfcolorstack:D }
         \exp_not:N \l_@@_color_stack_int push {#1}
+      \group_insert_after:N \exp_not:N \@@_color_reset:
   }
-\cs_new_protected:Npx \driver_color_reset:
+\cs_new_protected:Npx \@@_color_reset:
   {
     \cs_if_exist:NTF \luatex_pdfextension:D
       { \luatex_pdfextension:D colorstack }
@@ -1157,7 +1132,6 @@
 %     \driver_draw_color_stroke_rgb:nnn
 %   }
 % \begin{macro}{\@@_draw_color_fill:n, \@@_draw_color_stroke:n}
-% \begin{macro}{\driver_draw_color_fill_reset:, \driver_draw_color_stroke_reset:}
 %   For \texttt{dvips}, we can use the standard color stack to deal with
 %   stroke color, but for fills have to switch to raw PostScript. This is
 %   thus not handled by the stack, but the context is very restricted. See
@@ -1178,15 +1152,15 @@
 \cs_new_protected:Npn \@@_draw_color_fill:n #1
   { \@@_draw_literal:n { /l3fc ~ { #1 } ~ def } }
 \cs_new_protected:Npn \@@_draw_color_stroke:n #1
-  { \tex_special:D { color~push~#1 } }
-\cs_new_protected:Npn \driver_draw_color_fill_reset: { }
-\cs_new_eq:NN \driver_draw_color_stroke_reset: \driver_color_reset:
+  {
+    \tex_special:D { color~push~#1 } 
+    \group_insert_after:N \@@_color_reset:
+  }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
 % \end{macro}
 % \end{macro}
-% \end{macro}
 %
 % \begin{macro}{\driver_draw_transformcm:nnnnnn}
 %   The first four arguments here are floats (the affine matrix), the last
@@ -2049,11 +2023,6 @@
 %     \driver_draw_color_fill_rgb:nnn   ,
 %     \driver_draw_color_stroke_rgb:nnn
 %   }
-% \begin{macro}
-%   {
-%     \driver_draw_color_fill_reset:   ,
-%     \driver_draw_color_stroke_reset:
-%   }
 %    For the stroke color, all engines here can use the color stack to handle
 %    the setting. However, that is not the case for fill color: the stack in
 %    \texttt{(x)dvipdfmx} only covers one type of color. So we have to use
@@ -2072,13 +2041,6 @@
 \cs_new_protected:Npn \driver_draw_color_stroke_rgb:nnn #1#2#3
   { \@@_color_select:n { #1 ~ #2 ~ #3 ~ RG } }
 %<*pdfmode>
-\cs_new_eq:NN \driver_draw_color_fill_reset: \driver_color_reset:
-%</pdfmode>
-%<*dvipdfmx|xdvipdfmx>
-\cs_new_protected:Npn \driver_draw_color_fill_reset: { }
-%</dvipdfmx|xdvipdfmx>
-\cs_new_eq:NN \driver_draw_color_stroke_reset: \driver_color_reset:
-%<*pdfmode>
 \cs_new_eq:NN \@@_color_fill_select:n \@@_color_select:n
 %</pdfmode>
 %<*dvipdfmx|xdvipdfmx>
@@ -2088,7 +2050,6 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
-% \end{macro}
 %
 % \begin{macro}{\driver_draw_transformcm:nnnnnn}
 %   The first four arguments here are floats (the affine matrix), the last
@@ -2650,11 +2611,6 @@
 %     \driver_draw_color_stroke_rgb:nnn
 %   }
 % \begin{macro}{\@@_draw_color_fill:nnn}
-% \begin{macro}
-%   {
-%     \driver_draw_color_fill_reset:   ,
-%     \driver_draw_color_stroke_reset:
-%   }
 %  SVG fill color has to be covered outside of the stack, as for
 %  \texttt{dvips}. Here, we are only allowed RGB colors so there is some
 %  conversion to do.
@@ -2707,14 +2663,11 @@
       }
   }
 \cs_new_eq:NN \driver_draw_color_stroke_rgb:nnn \driver_color_rgb:nnn
-\cs_new_protected:Npn \driver_draw_color_fill_reset: { }
-\cs_new_eq:NN \driver_draw_color_stroke_reset: \driver_color_reset:
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
 % \end{macro}
 % \end{macro}
-% \end{macro}
 %
 % \begin{macro}{\driver_draw_transformcm:nnnnnn}
 %   The first four arguments here are floats (the affine matrix), the last
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index fa2bd69..bab02ec 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -5919,7 +5919,7 @@ Defining \driver_color_gray:n on line ...
 Defining \driver_color_rgb:nnn on line ...
 Defining \driver_color_spot:nn on line ...
 Defining \__driver_color_select:n on line ...
-Defining \driver_color_reset: on line ...
+Defining \__driver_color_reset: on line ...
 Defining \__driver_literal:n on line ...
 Defining \__driver_scope_begin: on line ...
 Defining \__driver_scope_end: on line ...
@@ -5974,8 +5974,6 @@ Defining \driver_draw_color_fill_gray:n on line ...
 Defining \driver_draw_color_stroke_gray:n on line ...
 Defining \driver_draw_color_fill_rgb:nnn on line ...
 Defining \driver_draw_color_stroke_rgb:nnn on line ...
-Defining \driver_draw_color_fill_reset: on line ...
-Defining \driver_draw_color_stroke_reset: on line ...
 Defining \__driver_color_fill_select:n on line ...
 Defining \driver_draw_transformcm:nnnnnn on line ...
 Defining \driver_draw_hbox:Nnnnnnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index e148105..b380f78 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -5908,7 +5908,7 @@ Defining \driver_color_gray:n on line ...
 Defining \driver_color_rgb:nnn on line ...
 Defining \driver_color_spot:nn on line ...
 Defining \__driver_color_select:n on line ...
-Defining \driver_color_reset: on line ...
+Defining \__driver_color_reset: on line ...
 Defining \__driver_literal:n on line ...
 Defining \__driver_scope_begin: on line ...
 Defining \__driver_scope_end: on line ...
@@ -5965,8 +5965,6 @@ Defining \driver_draw_color_fill_gray:n on line ...
 Defining \driver_draw_color_stroke_gray:n on line ...
 Defining \driver_draw_color_fill_rgb:nnn on line ...
 Defining \driver_draw_color_stroke_rgb:nnn on line ...
-Defining \driver_draw_color_fill_reset: on line ...
-Defining \driver_draw_color_stroke_reset: on line ...
 Defining \__driver_color_fill_select:n on line ...
 Defining \driver_draw_transformcm:nnnnnn on line ...
 Defining \driver_draw_hbox:Nnnnnnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 1886f8a..ee626e3 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -6111,7 +6111,7 @@ Defining \driver_color_gray:n on line ...
 Defining \driver_color_rgb:nnn on line ...
 Defining \driver_color_spot:nn on line ...
 Defining \__driver_color_select:n on line ...
-Defining \driver_color_reset: on line ...
+Defining \__driver_color_reset: on line ...
 Defining \__driver_literal:n on line ...
 Defining \__driver_scope_begin: on line ...
 Defining \__driver_scope_end: on line ...
@@ -6166,8 +6166,6 @@ Defining \driver_draw_color_fill_gray:n on line ...
 Defining \driver_draw_color_stroke_gray:n on line ...
 Defining \driver_draw_color_fill_rgb:nnn on line ...
 Defining \driver_draw_color_stroke_rgb:nnn on line ...
-Defining \driver_draw_color_fill_reset: on line ...
-Defining \driver_draw_color_stroke_reset: on line ...
 Defining \__driver_color_fill_select:n on line ...
 Defining \driver_draw_transformcm:nnnnnn on line ...
 Defining \driver_draw_hbox:Nnnnnnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index ea87590..bf2ea52 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -6107,7 +6107,7 @@ Defining \driver_color_gray:n on line ...
 Defining \driver_color_rgb:nnn on line ...
 Defining \driver_color_spot:nn on line ...
 Defining \__driver_color_select:n on line ...
-Defining \driver_color_reset: on line ...
+Defining \__driver_color_reset: on line ...
 Defining \__driver_literal:n on line ...
 Defining \__driver_scope_begin: on line ...
 Defining \__driver_scope_end: on line ...
@@ -6164,8 +6164,6 @@ Defining \driver_draw_color_fill_gray:n on line ...
 Defining \driver_draw_color_stroke_gray:n on line ...
 Defining \driver_draw_color_fill_rgb:nnn on line ...
 Defining \driver_draw_color_stroke_rgb:nnn on line ...
-Defining \driver_draw_color_fill_reset: on line ...
-Defining \driver_draw_color_stroke_reset: on line ...
 Defining \__driver_color_fill_select:n on line ...
 Defining \driver_draw_transformcm:nnnnnn on line ...
 Defining \driver_draw_hbox:Nnnnnnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 155b3aa..8ed818c 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -5890,7 +5890,7 @@ Defining \driver_color_gray:n on line ...
 Defining \driver_color_rgb:nnn on line ...
 Defining \driver_color_spot:nn on line ...
 Defining \__driver_color_select:n on line ...
-Defining \driver_color_reset: on line ...
+Defining \__driver_color_reset: on line ...
 Defining \__driver_literal:n on line ...
 Defining \__driver_scope_begin: on line ...
 Defining \__driver_scope_end: on line ...
@@ -5956,8 +5956,6 @@ Defining \driver_draw_color_fill_gray:n on line ...
 Defining \driver_draw_color_stroke_gray:n on line ...
 Defining \driver_draw_color_fill_rgb:nnn on line ...
 Defining \driver_draw_color_stroke_rgb:nnn on line ...
-Defining \driver_draw_color_fill_reset: on line ...
-Defining \driver_draw_color_stroke_reset: on line ...
 Defining \__driver_color_fill_select:n on line ...
 Defining \driver_draw_transformcm:nnnnnn on line ...
 Defining \driver_draw_hbox:Nnnnnnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index fa2bd69..bab02ec 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -5919,7 +5919,7 @@ Defining \driver_color_gray:n on line ...
 Defining \driver_color_rgb:nnn on line ...
 Defining \driver_color_spot:nn on line ...
 Defining \__driver_color_select:n on line ...
-Defining \driver_color_reset: on line ...
+Defining \__driver_color_reset: on line ...
 Defining \__driver_literal:n on line ...
 Defining \__driver_scope_begin: on line ...
 Defining \__driver_scope_end: on line ...
@@ -5974,8 +5974,6 @@ Defining \driver_draw_color_fill_gray:n on line ...
 Defining \driver_draw_color_stroke_gray:n on line ...
 Defining \driver_draw_color_fill_rgb:nnn on line ...
 Defining \driver_draw_color_stroke_rgb:nnn on line ...
-Defining \driver_draw_color_fill_reset: on line ...
-Defining \driver_draw_color_stroke_reset: on line ...
 Defining \__driver_color_fill_select:n on line ...
 Defining \driver_draw_transformcm:nnnnnn on line ...
 Defining \driver_draw_hbox:Nnnnnnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index e148105..b380f78 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -5908,7 +5908,7 @@ Defining \driver_color_gray:n on line ...
 Defining \driver_color_rgb:nnn on line ...
 Defining \driver_color_spot:nn on line ...
 Defining \__driver_color_select:n on line ...
-Defining \driver_color_reset: on line ...
+Defining \__driver_color_reset: on line ...
 Defining \__driver_literal:n on line ...
 Defining \__driver_scope_begin: on line ...
 Defining \__driver_scope_end: on line ...
@@ -5965,8 +5965,6 @@ Defining \driver_draw_color_fill_gray:n on line ...
 Defining \driver_draw_color_stroke_gray:n on line ...
 Defining \driver_draw_color_fill_rgb:nnn on line ...
 Defining \driver_draw_color_stroke_rgb:nnn on line ...
-Defining \driver_draw_color_fill_reset: on line ...
-Defining \driver_draw_color_stroke_reset: on line ...
 Defining \__driver_color_fill_select:n on line ...
 Defining \driver_draw_transformcm:nnnnnn on line ...
 Defining \driver_draw_hbox:Nnnnnnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 1886f8a..ee626e3 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -6111,7 +6111,7 @@ Defining \driver_color_gray:n on line ...
 Defining \driver_color_rgb:nnn on line ...
 Defining \driver_color_spot:nn on line ...
 Defining \__driver_color_select:n on line ...
-Defining \driver_color_reset: on line ...
+Defining \__driver_color_reset: on line ...
 Defining \__driver_literal:n on line ...
 Defining \__driver_scope_begin: on line ...
 Defining \__driver_scope_end: on line ...
@@ -6166,8 +6166,6 @@ Defining \driver_draw_color_fill_gray:n on line ...
 Defining \driver_draw_color_stroke_gray:n on line ...
 Defining \driver_draw_color_fill_rgb:nnn on line ...
 Defining \driver_draw_color_stroke_rgb:nnn on line ...
-Defining \driver_draw_color_fill_reset: on line ...
-Defining \driver_draw_color_stroke_reset: on line ...
 Defining \__driver_color_fill_select:n on line ...
 Defining \driver_draw_transformcm:nnnnnn on line ...
 Defining \driver_draw_hbox:Nnnnnnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index ea87590..bf2ea52 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -6107,7 +6107,7 @@ Defining \driver_color_gray:n on line ...
 Defining \driver_color_rgb:nnn on line ...
 Defining \driver_color_spot:nn on line ...
 Defining \__driver_color_select:n on line ...
-Defining \driver_color_reset: on line ...
+Defining \__driver_color_reset: on line ...
 Defining \__driver_literal:n on line ...
 Defining \__driver_scope_begin: on line ...
 Defining \__driver_scope_end: on line ...
@@ -6164,8 +6164,6 @@ Defining \driver_draw_color_fill_gray:n on line ...
 Defining \driver_draw_color_stroke_gray:n on line ...
 Defining \driver_draw_color_fill_rgb:nnn on line ...
 Defining \driver_draw_color_stroke_rgb:nnn on line ...
-Defining \driver_draw_color_fill_reset: on line ...
-Defining \driver_draw_color_stroke_reset: on line ...
 Defining \__driver_color_fill_select:n on line ...
 Defining \driver_draw_transformcm:nnnnnn on line ...
 Defining \driver_draw_hbox:Nnnnnnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 155b3aa..8ed818c 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -5890,7 +5890,7 @@ Defining \driver_color_gray:n on line ...
 Defining \driver_color_rgb:nnn on line ...
 Defining \driver_color_spot:nn on line ...
 Defining \__driver_color_select:n on line ...
-Defining \driver_color_reset: on line ...
+Defining \__driver_color_reset: on line ...
 Defining \__driver_literal:n on line ...
 Defining \__driver_scope_begin: on line ...
 Defining \__driver_scope_end: on line ...
@@ -5956,8 +5956,6 @@ Defining \driver_draw_color_fill_gray:n on line ...
 Defining \driver_draw_color_stroke_gray:n on line ...
 Defining \driver_draw_color_fill_rgb:nnn on line ...
 Defining \driver_draw_color_stroke_rgb:nnn on line ...
-Defining \driver_draw_color_fill_reset: on line ...
-Defining \driver_draw_color_stroke_reset: on line ...
 Defining \__driver_color_fill_select:n on line ...
 Defining \driver_draw_transformcm:nnnnnn on line ...
 Defining \driver_draw_hbox:Nnnnnnn on line ...





More information about the latex3-commits mailing list