summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def39
1 files changed, 16 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def
index 89dfe25c2ab..0274ecdaea7 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def
@@ -6,7 +6,7 @@
%%
%% l3drivers.dtx (with options: `package,dvisvgm')
%%
-%% Copyright (C) 1990-2017 The LaTeX3 Project
+%% Copyright (C) 1990-2018 The LaTeX3 Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -22,12 +22,12 @@
\ProvidesExplFile
{l3dvisvgm.def}{2017/03/18}{}
{L3 Experimental driver: dvisvgm}
-\cs_new_protected:Npn \__driver_color_pickup:N #1 { }
+\cs_new_protected:Npn \driver_color_pickup:N #1 { }
\AtBeginDocument
{
\@ifpackageloaded { color }
{
- \cs_set_protected:Npn \__driver_color_pickup:N #1
+ \cs_set_protected:Npn \driver_color_pickup:N #1
{
\exp_args:NV \tl_if_head_is_space:nTF \current@color
{
@@ -37,31 +37,24 @@
\exp_after:wN \use:n \current@color \c_space_tl 1
}
}
- { \exp_after:wN \__driver_color_pickup_aux:w \current@color \q_stop #1 }
+ { \exp_after:wN \__driver_color_pickup:w \current@color \q_stop #1 }
}
- \cs_new_protected:Npn \__driver_color_pickup_aux:w #1 ~ #2 \q_stop #3
+ \cs_new_protected:Npn \__driver_color_pickup:w #1 ~ #2 \q_stop #3
{ \tl_set:Nn #3 { #1 ~ #2 } }
}
{ }
}
+\cs_new_protected:Npn \driver_color_cmyk:nnnn #1#2#3#4
+ { \__driver_color_select:n { cmyk~ #1 ~ #2 ~ #3 ~ #4 } }
+\cs_new_protected:Npn \driver_color_gray:n #1
+ { \__driver_color_select:n { gray~ #1 } }
+\cs_new_protected:Npn \driver_color_rgb:nnn #1#2#3
+ { \__driver_color_select:n { rgb~ #1 ~ #2 ~ #3 } }
+\cs_new_protected:Npn \driver_color_spot:nn #1#2
+ { \__driver_color_select:n { color~push~\c_space_tl #1 } }
\cs_new_protected:Npn \__driver_color_select:n #1
- {
- \tex_special:D
- {
- color~push~
- \cs_if_exist_use:cF
- { __driver_color_convert_ \__driver_convert_model:w #1 \q_stop :n }
- { \use:n }
- {#1}
- }
- }
-\cs_generate_variant:Nn \__driver_color_select:n { V }
-\cs_new:Npn \__driver_convert_model:w #1 ~ #2 \q_stop {#1}
-\cs_new:Npn \__driver_color_convert_spot:n #1
- { \__driver_color_convert_spot:w #1 \q_stop }
-\cs_new:Npn \__driver_color_convert_spot:w #1 ~ #2 ~ #3 \q_stop
- { \c_space_tl #2 }
-\cs_new_protected:Npn \__driver_color_reset:
+ { \tex_special:D { color~push~ #1 } }
+\cs_new_protected:Npn \driver_color_reset:
{ \tex_special:D { color~pop } }
\cs_new_protected:Npn \__driver_literal:n #1
{ \tex_special:D { dvisvgm:raw~ #1 { ?nl } } }
@@ -343,7 +336,7 @@
\cs_new_protected:Npn \driver_draw_linewidth:n #1
{ \__driver_draw_scope:x { stroke-width=" \dim_to_decimal:n {#1} " } }
\cs_new_protected:Npn \driver_draw_miterlimit:n #1
- { \__driver_draw_scope:x { stroke-miterlimit=" \fp_eval:n {#1} " } }
+ { \__driver_draw_scope:x { stroke-miterlimit=" #1 " } }
\cs_new_protected:Npn \driver_draw_cap_butt:
{ \__driver_draw_scope:n { stroke-linecap="butt" } }
\cs_new_protected:Npn \driver_draw_cap_round: