[latex3-commits] [git/LaTeX3-latex3-latex3] master: Correct l3draw backend color defs for dvisvgm (c76326cce)

[Joseph Wright]

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

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

commit c76326cce55dc83d9669bb04255df877891b9bc9
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue Jun 23 07:44:24 2020 +0100

    Correct l3draw backend color defs for dvisvgm


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

c76326cce55dc83d9669bb04255df877891b9bc9
 l3backend/CHANGELOG.md       | 3 +++
 l3backend/l3backend-draw.dtx | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/l3backend/CHANGELOG.md b/l3backend/CHANGELOG.md
index cbd624e02..2f5ec3936 100644
--- a/l3backend/CHANGELOG.md
+++ b/l3backend/CHANGELOG.md
@@ -6,6 +6,9 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Fixed
+- Loading with `dvisvgm`
+
 ## [2020-06-18]
 
 ### Changed
diff --git a/l3backend/l3backend-draw.dtx b/l3backend/l3backend-draw.dtx
index 6c82820a9..4a56cb9f3 100644
--- a/l3backend/l3backend-draw.dtx
+++ b/l3backend/l3backend-draw.dtx
@@ -1175,6 +1175,7 @@
 %     \@@_backend_color_fill_rgb:n   ,
 %     \@@_backend_color_stroke_rgb:n
 %   }
+% \begin{macro}{\@@_backend_color_fill_rgb:w}
 % \begin{macro}{\@@_backend_color_fill:nnn}
 %  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
@@ -1208,6 +1209,11 @@
 \cs_new_protected:Npn \@@_backend_color_stroke_gray:n #1
   { \@@_backend_select:x { gray~ \fp_eval:n {#1} } }
 \cs_new_protected:Npn \@@_backend_color_fill_rgb:n #1
+  { \@@_backend_color_fill_rgb:w #1 \s_@@_stop }
+\cs_new_protected:Npn \@@_backend_color_stroke_rgb:n #1
+  { \@@_backend_select:n { rgb ~ #1 } }
+\cs_new_protected:Npn \@@_backend_color_fill_rgb:w
+  #1 ~ #2 ~ #3 \s_@@_stop
   {
     \use:x
       {
@@ -1241,6 +1247,7 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
+% \end{macro}
 %
 % \begin{macro}{\@@_backend_cm:nnnn}
 %   The four arguments here are floats (the affine matrix), the last