From 82e7602ebaa01a1c3e7233c8c4142ddfb867fb21 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Tue, 14 Dec 2021 21:24:04 +0000
Subject: l3backend (14dec21)

git-svn-id: svn://tug.org/texlive/trunk@61303 c570f23f-e606-0410-a88d-b1316a301751
---
 .../tex/latex/l3backend/l3backend-dvisvgm.def      | 80 +++++++++++-----------
 1 file changed, 41 insertions(+), 39 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def')

diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def
index 9f7839f5dd3..27cadb9aae0 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def
@@ -26,7 +26,7 @@
 %% 
 %% File: l3backend-basics.dtx
 \ProvidesExplFile
-  {l3backend-dvisvgm.def}{2021-10-18}{}
+  {l3backend-dvisvgm.def}{2021-12-14}{}
   {L3 backend support: dvisvgm}
 \cs_if_exist:NTF \__kernel_dependency_version_check:nn
   {
@@ -220,9 +220,9 @@
 %% File: l3backend-box.dtx
 \cs_new_protected:Npn \__box_backend_clip:N #1
   {
-    \int_gincr:N \g__box_clip_path_int
+    \int_gincr:N \g__kernel_clip_path_int
     \__kernel_backend_literal_svg:x
-      { < clipPath~id = " l3cp \int_use:N \g__box_clip_path_int " > }
+      { < clipPath~id = " l3cp \int_use:N \g__kernel_clip_path_int " > }
     \__kernel_backend_literal_svg:x
       {
         <
@@ -253,7 +253,7 @@
     \__kernel_backend_scope:x
       {
         clip-path =
-          "url ( \c_hash_str l3cp \int_use:N \g__box_clip_path_int ) "
+          "url ( \c_hash_str l3cp \int_use:N \g__kernel_clip_path_int ) "
       }
     \__kernel_backend_scope:n
       {
@@ -267,7 +267,7 @@
     \box_use:N #1
     \__kernel_backend_scope_end:
   }
-\int_new:N \g__box_clip_path_int
+\int_new:N \g__kernel_clip_path_int
 \cs_new_protected:Npn \__box_backend_rotate:Nn #1#2
   {
     \__kernel_backend_scope_begin:x
@@ -303,6 +303,8 @@
 %% File: l3backend-draw.dtx
 \cs_new_eq:NN \__draw_backend_literal:n \__kernel_backend_literal_svg:n
 \cs_generate_variant:Nn \__draw_backend_literal:n { x }
+\cs_new_eq:NN \__draw_backend_scope_begin: \__kernel_backend_scope_begin:
+\cs_new_eq:NN \__draw_backend_scope_end: \__kernel_backend_scope_end:
 \cs_new_protected:Npn \__draw_backend_begin:
   {
     \__kernel_backend_scope_begin:
@@ -342,51 +344,51 @@
   }
 \cs_new_protected:Npn \__draw_backend_add_to_path:n #1
   {
-    \tl_gset:Nx \g__draw_draw_path_tl
+    \tl_gset:Nx \g__draw_backend_path_tl
       {
-        \g__draw_draw_path_tl
-        \tl_if_empty:NF \g__draw_draw_path_tl { \c_space_tl }
+        \g__draw_backend_path_tl
+        \tl_if_empty:NF \g__draw_backend_path_tl { \c_space_tl }
         #1
       }
   }
-\tl_new:N \g__draw_draw_path_tl
+\tl_new:N \g__draw_backend_path_tl
 \cs_new_protected:Npn \__draw_backend_evenodd_rule:
-  { \__draw_backend_scope:n { fill-rule="evenodd" } }
+  { \__kernel_backend_scope:n { fill-rule="evenodd" } }
 \cs_new_protected:Npn \__draw_backend_nonzero_rule:
-  { \__draw_backend_scope:n { fill-rule="nonzero" } }
+  { \__kernel_backend_scope:n { fill-rule="nonzero" } }
 \cs_new_protected:Npn \__draw_backend_closepath:
   { \__draw_backend_add_to_path:n { Z } }
 \cs_new_protected:Npn \__draw_backend_path:n #1
   {
     \bool_if:NTF \g__draw_draw_clip_bool
       {
-        \int_gincr:N \g__draw_clip_path_int
+        \int_gincr:N \g__kernel_clip_path_int
         \__draw_backend_literal:x
           {
-            < clipPath~id = " l3cp \int_use:N \g__draw_clip_path_int " >
+            < clipPath~id = " l3cp \int_use:N \g__kernel_clip_path_int " >
               { ?nl }
-            <path~d=" \g__draw_draw_path_tl "/> { ?nl }
+            <path~d=" \g__draw_backend_path_tl "/> { ?nl }
             < /clipPath > { ? nl }
             <
               use~xlink:href =
-                "\c_hash_str l3path \int_use:N \g__draw_path_int " ~
+                "\c_hash_str l3path \int_use:N \g__draw_backend_path_int " ~
                 #1
             />
           }
-        \__draw_backend_scope:x
+        \__kernel_backend_scope:x
           {
             clip-path =
-              "url( \c_hash_str l3cp \int_use:N \g__draw_clip_path_int)"
+              "url( \c_hash_str l3cp \int_use:N \g__kernel_clip_path_int)"
           }
       }
       {
         \__draw_backend_literal:x
-          { <path ~ d=" \g__draw_draw_path_tl " ~ #1 /> }
+          { <path ~ d=" \g__draw_backend_path_tl " ~ #1 /> }
       }
-    \tl_gclear:N \g__draw_draw_path_tl
+    \tl_gclear:N \g__draw_backend_path_tl
     \bool_gset_false:N \g__draw_draw_clip_bool
   }
-\int_new:N \g__draw_path_int
+\int_new:N \g__draw_backend_path_int
 \cs_new_protected:Npn \__draw_backend_stroke:
   { \__draw_backend_path:n { style="fill:none" } }
 \cs_new_protected:Npn \__draw_backend_closestroke:
@@ -405,21 +407,21 @@
   {
     \bool_if:NT \g__draw_draw_clip_bool
       {
-        \int_gincr:N \g__draw_clip_path_int
+        \int_gincr:N \g__kernel_clip_path_int
         \__draw_backend_literal:x
           {
-            < clipPath~id = " l3cp \int_use:N \g__draw_clip_path_int " >
+            < clipPath~id = " l3cp \int_use:N \g__kernel_clip_path_int " >
               { ?nl }
-            <path~d=" \g__draw_draw_path_tl "/> { ?nl }
+            <path~d=" \g__draw_backend_path_tl "/> { ?nl }
             < /clipPath >
           }
-        \__draw_backend_scope:x
+        \__kernel_backend_scope:x
           {
             clip-path =
-              "url( \c_hash_str l3cp \int_use:N \g__draw_clip_path_int)"
+              "url( \c_hash_str l3cp \int_use:N \g__kernel_clip_path_int)"
           }
       }
-    \tl_gclear:N \g__draw_draw_path_tl
+    \tl_gclear:N \g__draw_path_tl
     \bool_gset_false:N \g__draw_draw_clip_bool
   }
 \cs_new_protected:Npn \__draw_backend_dash_pattern:nn #1#2
@@ -427,7 +429,7 @@
     \use:x
       {
         \__draw_backend_dash_aux:nn
-          { \clist_map_function:nn {#1} \__draw_backend_dash:n }
+          { \clist_map_function:nN {#1} \__draw_backend_dash:n }
           { \dim_to_decimal:n {#2} }
       }
   }
@@ -435,11 +437,11 @@
   { , \dim_to_decimal_in_bp:n {#1} }
 \cs_new_protected:Npn \__draw_backend_dash_aux:nn #1#2
   {
-    \__draw_backend_scope:x
+    \__kernel_backend_scope:x
       {
         stroke-dasharray =
           "
-            \tl_if_empty:oTF { \use_none:n #1 }
+            \tl_if_empty:nTF {#1}
               { none }
               { \use_none:n #1 }
           " ~
@@ -447,30 +449,30 @@
       }
   }
 \cs_new_protected:Npn \__draw_backend_linewidth:n #1
-  { \__draw_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 \__draw_backend_miterlimit:n #1
-  { \__draw_backend_scope:x { stroke-miterlimit=" #1 " } }
+  { \__kernel_backend_scope:x { stroke-miterlimit=" #1 " } }
 \cs_new_protected:Npn \__draw_backend_cap_butt:
-  { \__draw_backend_scope:n { stroke-linecap="butt" } }
+  { \__kernel_backend_scope:n { stroke-linecap="butt" } }
 \cs_new_protected:Npn \__draw_backend_cap_round:
-  { \__draw_backend_scope:n { stroke-linecap="round" } }
+  { \__kernel_backend_scope:n { stroke-linecap="round" } }
 \cs_new_protected:Npn \__draw_backend_cap_rectangle:
-  { \__draw_backend_scope:n { stroke-linecap="square" } }
+  { \__kernel_backend_scope:n { stroke-linecap="square" } }
 \cs_new_protected:Npn \__draw_backend_join_miter:
-  { \__draw_backend_scope:n { stroke-linejoin="miter" } }
+  { \__kernel_backend_scope:n { stroke-linejoin="miter" } }
 \cs_new_protected:Npn \__draw_backend_join_round:
-  { \__draw_backend_scope:n { stroke-linejoin="round" } }
+  { \__kernel_backend_scope:n { stroke-linejoin="round" } }
 \cs_new_protected:Npn \__draw_backend_join_bevel:
-  { \__draw_backend_scope:n { stroke-linejoin="bevel" } }
+  { \__kernel_backend_scope:n { stroke-linejoin="bevel" } }
 \cs_new_protected:Npn \__draw_backend_cm:nnnn #1#2#3#4
   {
-    \__draw_backend_scope:n
+    \__kernel_backend_scope:n
       {
        transform =
          " matrix ( #1 , #2 , #3 , #4 , 0pt , 0pt ) "
       }
   }
-\cs_new_protected:Npn \__draw_backend_box_use:Nnnnn #1#2#3#4#5#6#7
+\cs_new_protected:Npn \__draw_backend_box_use:Nnnnn #1#2#3#4#5
   {
     \__kernel_backend_scope_begin:
     \__draw_backend_cm:nnnn {#2} {#3} {#4} {#5}
-- 
cgit v1.2.3

