[latex3-commits] [git/LaTeX3-latex3-latex3] main: Fix scoping function for drawing with dvisvgm (7138a157d)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : main
Link       : https://github.com/latex3/latex3/commit/7138a157dc54388bde7b9be18e169dd007bf3f0c

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

commit 7138a157dc54388bde7b9be18e169dd007bf3f0c
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Dec 13 09:52:57 2021 +0000

    Fix scoping function for drawing with dvisvgm


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

7138a157dc54388bde7b9be18e169dd007bf3f0c
 l3backend/CHANGELOG.md       |  3 +++
 l3backend/l3backend-draw.dtx | 28 ++++++++++++++--------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/l3backend/CHANGELOG.md b/l3backend/CHANGELOG.md
index 955522726..388777c5f 100644
--- a/l3backend/CHANGELOG.md
+++ b/l3backend/CHANGELOG.md
@@ -6,6 +6,9 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Fixed
+- Scoping issues for `dvisvgm`
+
 ## [2021-10-17]
 
 ### Changed
diff --git a/l3backend/l3backend-draw.dtx b/l3backend/l3backend-draw.dtx
index d8e8a1922..24bdfd9bc 100644
--- a/l3backend/l3backend-draw.dtx
+++ b/l3backend/l3backend-draw.dtx
@@ -845,9 +845,9 @@
 %   The fill rules here have to be handled as scopes.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_backend_evenodd_rule:
-  { \@@_backend_scope:n { fill-rule="evenodd" } }
+  { \__kernel_backend_scope:n { fill-rule="evenodd" } }
 \cs_new_protected:Npn \@@_backend_nonzero_rule:
-  { \@@_backend_scope:n { fill-rule="nonzero" } }
+  { \__kernel_backend_scope:n { fill-rule="nonzero" } }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -889,7 +889,7 @@
                 #1
             />
           }
-        \@@_backend_scope:x
+        \__kernel_backend_scope:x
           {
             clip-path =
               "url( \c_hash_str l3cp \int_use:N \g_@@_clip_path_int)"
@@ -929,7 +929,7 @@
             <path~d=" \g_@@_draw_path_tl "/> { ?nl }
             < /clipPath >
           }
-        \@@_backend_scope:x
+        \__kernel_backend_scope:x
           {
             clip-path =
               "url( \c_hash_str l3cp \int_use:N \g_@@_clip_path_int)"
@@ -971,7 +971,7 @@
   { , \dim_to_decimal_in_bp:n {#1} }
 \cs_new_protected:Npn \@@_backend_dash_aux:nn #1#2
   {
-    \@@_backend_scope:x
+    \__kernel_backend_scope:x
       {
         stroke-dasharray =
           "
@@ -983,21 +983,21 @@
       }
   }
 \cs_new_protected:Npn \@@_backend_linewidth:n #1
-  { \@@_backend_scope:x { stroke-width=" \dim_to_decimal:n {#1} " } }
+  { \__kernel_backend_scope:x { stroke-width=" \dim_to_decimal:n {#1} " } }
 \cs_new_protected:Npn \@@_backend_miterlimit:n #1
-  { \@@_backend_scope:x { stroke-miterlimit=" #1 " } }
+  { \__kernel_backend_scope:x { stroke-miterlimit=" #1 " } }
 \cs_new_protected:Npn \@@_backend_cap_butt:
-  { \@@_backend_scope:n { stroke-linecap="butt" } }
+  { \__kernel_backend_scope:n { stroke-linecap="butt" } }
 \cs_new_protected:Npn \@@_backend_cap_round:
-  { \@@_backend_scope:n { stroke-linecap="round" } }
+  { \__kernel_backend_scope:n { stroke-linecap="round" } }
 \cs_new_protected:Npn \@@_backend_cap_rectangle:
-  { \@@_backend_scope:n { stroke-linecap="square" } }
+  { \__kernel_backend_scope:n { stroke-linecap="square" } }
 \cs_new_protected:Npn \@@_backend_join_miter:
-  { \@@_backend_scope:n { stroke-linejoin="miter" } }
+  { \__kernel_backend_scope:n { stroke-linejoin="miter" } }
 \cs_new_protected:Npn \@@_backend_join_round:
-  { \@@_backend_scope:n { stroke-linejoin="round" } }
+  { \__kernel_backend_scope:n { stroke-linejoin="round" } }
 \cs_new_protected:Npn \@@_backend_join_bevel:
-  { \@@_backend_scope:n { stroke-linejoin="bevel" } }
+  { \__kernel_backend_scope:n { stroke-linejoin="bevel" } }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -1012,7 +1012,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_backend_cm:nnnn #1#2#3#4
   {
-    \@@_backend_scope:n
+    \__kernel_backend_scope:n
       {
        transform =
          " matrix ( #1 , #2 , #3 , #4 , 0pt , 0pt ) "