summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-06-18 21:08:59 +0000
committerKarl Berry <karl@freefriends.org>2020-06-18 21:08:59 +0000
commit700211024849d94938004ff91e0a3928b1578e98 (patch)
treea577e99bdf389f5e3a443561cb0162e4a13cd8ad /Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def
parent0e574a322aeab7e91f801eec35e961965f597e7a (diff)
l3 (18jun20)
git-svn-id: svn://tug.org/texlive/trunk@55586 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def')
-rw-r--r--Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def90
1 files changed, 25 insertions, 65 deletions
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def
index 4c768d9628a..bf161ed1b35 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def
@@ -25,7 +25,7 @@
%%
%% File: l3backend-basics.dtx
\ProvidesExplFile
- {l3backend-dvips.def}{2020-06-03}{}
+ {l3backend-dvips.def}{2020-06-18}{}
{L3 backend support: dvips}
\cs_new_eq:NN \__kernel_backend_literal:e \tex_special:D
\cs_new_protected:Npn \__kernel_backend_literal:n #1
@@ -73,8 +73,8 @@
{
\tl_set:Nx #1
{
- spot ~
- \exp_after:wN \use:n \current@color \c_space_tl 1
+ { spot }
+ { \exp_after:wN \use:n \current@color \c_space_tl 1 }
}
}
{
@@ -83,34 +83,23 @@
}
}
\cs_new_protected:Npn \__color_backend_pickup:w #1 ~ #2 \s__color_stop #3
- { \tl_set:Nn #3 { #1 ~ #2 } }
+ { \tl_set:Nn #3 { {#1} {#2} } }
}
}
-\cs_new_protected:Npn \__color_backend_cmyk:w #1 ~ #2 ~ #3 ~ #4 \s__color_stop
- {
- \__color_backend_select:x
- {
- cmyk~
- \fp_eval:n {#1} ~ \fp_eval:n {#2} ~
- \fp_eval:n {#3} ~ \fp_eval:n {#4}
- }
- }
-\cs_new_protected:Npn \__color_backend_gray:w #1 \s__color_stop
- { \__color_backend_select:x { gray~ \fp_eval:n {#1} } }
-\cs_new_protected:Npn \__color_backend_rgb:w #1 ~ #2 ~ #3 \s__color_stop
- {
- \__color_backend_select:x
- { rgb~ \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} }
- }
-\cs_new_protected:Npn \__color_backend_spot:w #1 ~ #2 \s__color_stop
- { \__color_backend_select:n { #1 } }
+\cs_new_protected:Npn \__color_backend_cmyk:n #1
+ { \__color_backend_select:n { cmyk ~ #1 } }
+\cs_new_protected:Npn \__color_backend_gray:n #1
+ { \__color_backend_select:n { gray ~ #1 } }
+\cs_new_protected:Npn \__color_backend_rgb:n #1
+ { \__color_backend_select:n { rgb ~ #1 } }
+\cs_new_protected:Npn \__color_backend_spot:n #1
+ { \__color_backend_select:n {#1} }
\cs_new_protected:Npn \__color_backend_select:n #1
{
\__kernel_backend_literal:n { color~push~ #1 }
\__kernel_backend_postscript:n { /color.fc~{ }~def }
\group_insert_after:N \__color_backend_reset:
}
-\cs_generate_variant:Nn \__color_backend_select:n { x }
\cs_new_protected:Npn \__color_backend_reset:
{ \__kernel_backend_literal:n { color~pop } }
%% File: l3backend-box.dtx
@@ -324,7 +313,7 @@
{ \dim_to_decimal_in_bp:n {#1} ~ setlinewidth }
}
\cs_new_protected:Npn \__draw_backend_miterlimit:n #1
- { \__draw_backend_literal:x { \fp_eval:n {#1} ~ setmiterlimit } }
+ { \__draw_backend_literal:n { #1 ~ setmiterlimit } }
\cs_new_protected:Npn \__draw_backend_cap_butt:
{ \__draw_backend_literal:n { 0 ~ setlinecap } }
\cs_new_protected:Npn \__draw_backend_cap_round:
@@ -337,61 +326,32 @@
{ \__draw_backend_literal:n { 1 ~ setlinejoin } }
\cs_new_protected:Npn \__draw_backend_join_bevel:
{ \__draw_backend_literal:n { 2 ~ setlinejoin } }
-\cs_new_protected:Npn \__draw_backend_color_fill_cmyk:nnnn #1#2#3#4
- {
- \__draw_backend_color_fill:x
- {
- \fp_eval:n {#1} ~ \fp_eval:n {#2} ~
- \fp_eval:n {#3} ~ \fp_eval:n {#4} ~
- setcmykcolor
- }
- }
-\cs_new_protected:Npn \__draw_backend_color_stroke_cmyk:nnnn #1#2#3#4
- {
- \__draw_backend_color_stroke:x
- {
- cmyk ~
- \fp_eval:n {#1} ~ \fp_eval:n {#2} ~
- \fp_eval:n {#3} ~ \fp_eval:n {#4}
- }
- }
-\cs_new_protected:Npn \__draw_backend_color_fill_gray:n #1
- { \__draw_backend_color_fill:x { \fp_eval:n {#1} ~ setgray } }
+\cs_new_protected:Npn \__draw_backend_color_fill_cmyk:n #1
+ { \__draw_backend_color_fill:n { #1 ~ setcmykcolor } }
+\cs_new_protected:Npn \__draw_backend_color_stroke_cmyk:n #1
+ { \__draw_backend_color_stroke:n { cmyk ~ #1 } }
\cs_new_protected:Npn \__draw_backend_color_stroke_gray:n #1
- { \__draw_backend_color_stroke:x { gray ~ \fp_eval:n {#1} } }
-\cs_new_protected:Npn \__draw_backend_color_fill_rgb:nnn #1#2#3
- {
- \__draw_backend_color_fill:x
- { \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} ~ setrgbcolor }
- }
-\cs_new_protected:Npn \__draw_backend_color_stroke_rgb:nnn #1#2#3
- {
- \__draw_backend_color_stroke:x
- { rgb ~ \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} }
- }
+ { \__draw_backend_color_fill:n { #1 ~ setgray } }
+\cs_new_protected:Npn \__draw_backend_color_fill_gray:n #1
+ { \__draw_backend_color_stroke:n { gray ~ #1 } }
+\cs_new_protected:Npn \__draw_backend_color_fill_rgb:n #1
+ { \__draw_backend_color_fill:n { #1 ~ setrgbcolor } }
+\cs_new_protected:Npn \__draw_backend_color_stroke_rgb:n #1
+ { \__draw_backend_color_stroke:n { rgb ~ #1 } }
\cs_new_protected:Npn \__draw_backend_color_fill:n #1
{
\__kernel_backend_postscript:n
{ /color.fc ~ { #1 } ~ def }
}
-\cs_generate_variant:Nn \__draw_backend_color_fill:n { x }
\cs_new_protected:Npn \__draw_backend_color_stroke:n #1
{
\__kernel_backend_literal:n { color~push~#1 }
\group_insert_after:N \__draw_color_reset:
}
-\cs_generate_variant:Nn \__draw_backend_color_stroke:n { x }
\cs_new_protected:Npn \__draw_backend_cm:nnnn #1#2#3#4
{
\__draw_backend_literal:n
- {
- [
- \fp_eval:n {#1} ~ \fp_eval:n {#2} ~
- \fp_eval:n {#3} ~ \fp_eval:n {#4} ~
- 0 ~ 0
- ] ~
- concat
- }
+ { [ #1 ~ #2 ~ #3 ~ #4 ~ 0 ~ 0 ] ~ concat }
}
\cs_new_protected:Npn \__draw_backend_box_use:Nnnnn #1#2#3#4#5
{