[latex3-commits] [git/LaTeX3-latex3-latex3] main: Move some color reset from backend to l3color (595bca81c)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : main
Link       : https://github.com/latex3/latex3/commit/595bca81cd6fa243b6ccb33cc0b1f46ac20c17f8

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

commit 595bca81cd6fa243b6ccb33cc0b1f46ac20c17f8
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Thu Jan 6 23:12:47 2022 +0000

    Move some color reset from backend to l3color


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

595bca81cd6fa243b6ccb33cc0b1f46ac20c17f8
 l3backend/CHANGELOG.md        | 3 +++
 l3backend/l3backend-color.dtx | 7 +------
 l3kernel/CHANGELOG.md         | 3 +++
 l3kernel/l3color.dtx          | 5 ++++-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/l3backend/CHANGELOG.md b/l3backend/CHANGELOG.md
index 15826624b..e5c78e850 100644
--- a/l3backend/CHANGELOG.md
+++ b/l3backend/CHANGELOG.md
@@ -6,6 +6,9 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Changed
+- Move some functions to `l3color`
+
 ## [2021-12-14]
 
 ### Fixed
diff --git a/l3backend/l3backend-color.dtx b/l3backend/l3backend-color.dtx
index 36817333a..498fdb352 100644
--- a/l3backend/l3backend-color.dtx
+++ b/l3backend/l3backend-color.dtx
@@ -377,7 +377,6 @@
 %<*dvips>
     \__kernel_backend_postscript:n { /color.sc ~ { } ~ def }
 %</dvips>
-    \group_insert_after:N \@@_backend_reset:
   }
 \cs_new_protected:Npn \@@_backend_reset:
   { \__kernel_backend_literal:n { color~pop } }
@@ -424,7 +423,6 @@
     \tl_set:Nn \l_@@_backend_fill_tl {#1}
     \tl_set:Nn \l_@@_backend_stroke_tl {#2}
     \__kernel_color_backend_stack_push:nn \l_@@_backend_stack_int { #1 ~ #2 }
-    \group_insert_after:N \@@_backend_reset:
   }
 \cs_new_protected:Npn \@@_backend_reset:
   { \__kernel_color_backend_stack_pop:n \l_@@_backend_stack_int }
@@ -463,10 +461,7 @@
 \int_compare:nNnT \c__kernel_sys_dvipdfmx_version_int < { 20201111 }
   {
     \cs_gset_protected:Npn \@@_backend_select_cmyk:n #1
-      {
-        \__kernel_backend_literal:n { pdf: bc ~ [#1] }
-        \group_insert_after:N \@@_backend_reset:
-      }
+      { \__kernel_backend_literal:n { pdf: bc ~ [#1] } }
     \cs_gset_eq:NN \@@_backend_select_gray:n \@@_backend_select_cmyk:n
     \cs_gset_eq:NN \@@_backend_select_rgb:n \@@_backend_select_cmyk:n
     \cs_gset_protected:Npn \@@_backend_reset:
diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index 8c2f8f2aa..872578c35 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -7,6 +7,9 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Changed
+- Move some color functions from `l3backend`
+
 ### Removed
 - Lua functions in `l3kernel` table
 
diff --git a/l3kernel/l3color.dtx b/l3kernel/l3color.dtx
index e51a20c33..99d62953d 100644
--- a/l3kernel/l3color.dtx
+++ b/l3kernel/l3color.dtx
@@ -543,7 +543,10 @@
 \cs_new_protected:Npn \@@_select:N #1
   { \exp_after:wN \@@_select:nn #1 }
 \cs_new_protected:Npn \@@_select:nn #1#2
-  { \use:c { @@_backend_select_ #1 :n } {#2} }
+  {
+    \use:c { @@_backend_select_ #1 :n } {#2}
+    \group_insert_after:N \@@_backend_reset:
+  }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}