[latex3-commits] [git/LaTeX3-latex3-latex3] master: Update l3draw for new internal color model (180c5d66d)
Joseph Wright
joseph.wright at morningstar2.co.uk
Wed Jun 10 18:06:25 CEST 2020
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/180c5d66df1bf061b2a82a026760e8fb9038cf92
>---------------------------------------------------------------
commit 180c5d66df1bf061b2a82a026760e8fb9038cf92
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Wed Jun 10 16:39:30 2020 +0100
Update l3draw for new internal color model
>---------------------------------------------------------------
180c5d66df1bf061b2a82a026760e8fb9038cf92
l3backend/l3backend-draw.dtx | 149 +++++++--------------
l3experimental/l3draw/l3draw-state.dtx | 28 +---
.../l3draw/testfiles/m3draw004.luatex.tlg | 20 +--
l3experimental/l3draw/testfiles/m3draw004.ptex.tlg | 20 +--
l3experimental/l3draw/testfiles/m3draw004.tlg | 20 +--
.../l3draw/testfiles/m3draw004.uptex.tlg | 20 +--
.../l3draw/testfiles/m3draw004.xetex.tlg | 20 +--
l3experimental/l3draw/testfiles/m3draw007.ptex.tlg | 10 +-
l3experimental/l3draw/testfiles/m3draw007.tlg | 10 +-
.../l3draw/testfiles/m3draw007.uptex.tlg | 10 +-
.../l3draw/testfiles/m3draw007.xetex.tlg | 10 +-
11 files changed, 124 insertions(+), 193 deletions(-)
diff --git a/l3backend/l3backend-draw.dtx b/l3backend/l3backend-draw.dtx
index 6b235e4fa..8c48b6e2e 100644
--- a/l3backend/l3backend-draw.dtx
+++ b/l3backend/l3backend-draw.dtx
@@ -335,8 +335,8 @@
%
% \begin{macro}
% {
-% \@@_backend_color_fill_cmyk:nnnn ,
-% \@@_backend_color_stroke_cmyk:nnnn
+% \@@_backend_color_fill_cmyk:n ,
+% \@@_backend_color_stroke_cmyk:n
% }
% \begin{macro}
% {
@@ -345,63 +345,37 @@
% }
% \begin{macro}
% {
-% \@@_backend_color_fill_rgb:nnn ,
-% \@@_backend_color_stroke_rgb:nnn
-% }
-% \begin{macro}
-% {
-% \@@_backend_color_fill:n, \@@_backend_color_fill:x,
-% \@@_backend_color_stroke:n, \@@_backend_color_stroke:x
+% \@@_backend_color_fill_rgb:n ,
+% \@@_backend_color_stroke_rgb:n
% }
+% \begin{macro}{\@@_backend_color_fill:n, \@@_backend_color_stroke:n}
% For \texttt{dvips}, we can use the standard color stack to deal with
% stroke color, but for fills have to switch to raw PostScript. This is
% thus not handled by the stack, but the context is very restricted. See
% also how fills are implemented.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_backend_color_fill_cmyk:nnnn #1#2#3#4
- {
- \@@_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 \@@_backend_color_stroke_cmyk:nnnn #1#2#3#4
- {
- \@@_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 \@@_backend_color_fill_gray:n #1
- { \@@_backend_color_fill:x { \fp_eval:n {#1} ~ setgray } }
+\cs_new_protected:Npn \@@_backend_color_fill_cmyk:n #1
+ { \@@_backend_color_fill:n { #1 ~ setcmykcolor } }
+\cs_new_protected:Npn \@@_backend_color_stroke_cmyk:n #1
+ { \@@_backend_color_stroke:n { cmyk ~ #1 } }
\cs_new_protected:Npn \@@_backend_color_stroke_gray:n #1
- { \@@_backend_color_stroke:x { gray ~ \fp_eval:n {#1} } }
-\cs_new_protected:Npn \@@_backend_color_fill_rgb:nnn #1#2#3
- {
- \@@_backend_color_fill:x
- { \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} ~ setrgbcolor }
- }
-\cs_new_protected:Npn \@@_backend_color_stroke_rgb:nnn #1#2#3
- {
- \@@_backend_color_stroke:x
- { rgb ~ \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} }
- }
+ { \@@_backend_color_fill:n { #1 ~ setgray } }
+\cs_new_protected:Npn \@@_backend_color_fill_gray:n #1
+ { \@@_backend_color_stroke:n { gray ~ #1 } }
+\cs_new_protected:Npn \@@_backend_color_fill_rgb:n #1
+ { \@@_backend_color_fill:n { #1 ~ setrgbcolor } }
+\cs_new_protected:Npn \@@_backend_color_stroke_rgb:n #1
+ { \@@_backend_color_stroke:n { rgb ~ #1 } }
\cs_new_protected:Npn \@@_backend_color_fill:n #1
{
\__kernel_backend_postscript:n
{ /color.fc ~ { #1 } ~ def }
}
-\cs_generate_variant:Nn \@@_backend_color_fill:n { x }
\cs_new_protected:Npn \@@_backend_color_stroke:n #1
{
\__kernel_backend_literal:n { color~push~#1 }
\group_insert_after:N \@@_color_reset:
}
-\cs_generate_variant:Nn \@@_backend_color_stroke:n { x }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -655,8 +629,8 @@
%
% \begin{macro}
% {
-% \@@_backend_color_fill_cmyk:nnnn ,
-% \@@_backend_color_stroke_cmyk:nnnn
+% \@@_backend_color_fill_cmyk:n ,
+% \@@_backend_color_stroke_cmyk:n
% }
% \begin{macro}
% {
@@ -665,46 +639,26 @@
% }
% \begin{macro}
% {
-% \@@_backend_color_fill_rgb:nnn ,
-% \@@_backend_color_stroke_rgb:nnn
+% \@@_backend_color_fill_rgb:n ,
+% \@@_backend_color_stroke_rgb:n
% }
% \begin{macro}{\@@_backend_color_select:n, \@@_backend_color_select:x}
% \begin{macro}{\@@_backend_color_reset:}
% Color has to be split between \texttt{(x)dvipdfmx} and the PDF engines
% as there is no color stack for fill/stroke separation in the former.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_backend_color_fill_cmyk:nnnn #1#2#3#4
- {
- \@@_backend_color_select:x
- {
- \fp_eval:n {#1} ~ \fp_eval:n {#2} ~
- \fp_eval:n {#3} ~ \fp_eval:n {#4} ~
- k
- }
- }
-\cs_new_protected:Npn \@@_backend_color_stroke_cmyk:nnnn #1#2#3#4
- {
- \@@_backend_color_select:x
- {
- \fp_eval:n {#1} ~ \fp_eval:n {#2} ~
- \fp_eval:n {#3} ~ \fp_eval:n {#4} ~
- k
- }
- }
+\cs_new_protected:Npn \@@_backend_color_fill_cmyk:n #1
+ { \@@_backend_color_select:n { #1 ~ k } }
+\cs_new_protected:Npn \@@_backend_color_stroke_cmyk:n #1
+ { \@@_backend_color_select:n { #1 ~ K } }
\cs_new_protected:Npn \@@_backend_color_fill_gray:n #1
- { \@@_backend_color_select:x { \fp_eval:n {#1} ~ g } }
+ { \@@_backend_color_select:n { #1 ~ g } }
\cs_new_protected:Npn \@@_backend_color_stroke_gray:n #1
- { \@@_backend_color_select:x { \fp_eval:n {#1} ~ G } }
-\cs_new_protected:Npn \@@_backend_color_fill_rgb:nnn #1#2#3
- {
- \@@_backend_color_select:x
- { \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} ~ rg }
- }
-\cs_new_protected:Npn \@@_backend_color_stroke_rgb:nnn #1#2#3
- {
- \@@_backend_color_select:x
- { \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} ~ RG }
- }
+ { \@@_backend_color_select:n { #1 ~ G } }
+\cs_new_protected:Npn \@@_backend_color_fill_rgb:n #1
+ { \@@_backend_color_select:n { #1 ~ rg } }
+\cs_new_protected:Npn \@@_backend_color_stroke_rgb:n #1
+ { \@@_backend_color_select:n { #1 ~ RG } }
%<*pdfmode>
\cs_new_protected:Npx \@@_backend_color_select:n #1
{
@@ -1222,43 +1176,41 @@
%
% \begin{macro}
% {
-% \@@_backend_color_fill_cmyk:nnnn ,
-% \@@_backend_color_stroke_cmyk:nnnn
+% \@@_backend_color_fill_cmyk:n ,
+% \@@_backend_color_stroke_cmyk:n
% }
+% \begin{macro}{\@@_backend_color_fill_cmyk:w}
% \begin{macro}
% {
% \@@_backend_color_fill_gray:n ,
% \@@_backend_color_stroke_gray:n
% }
+% \begin{macro}{\@@_backend_color_gray_aux:n}
% \begin{macro}
% {
-% \@@_backend_color_fill_rgb:nnn ,
-% \@@_backend_color_stroke_rgb:nnn
+% \@@_backend_color_fill_rgb:n ,
+% \@@_backend_color_stroke_rgb:n
% }
% \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
% conversion to do.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_backend_color_fill_cmyk:nnnn #1#2#3#4
+\cs_new_protected:Npn \@@_backend_color_fill_cmyk:n #1
+ { \@@_backend_color_fill_cmyk:w #1 \s_@@_stop }
+\cs_new_protected:Npn \@@_backend_color_fill_cmyk:w
+ #1 ~ #2 ~ #3 ~ #4 \s_@@_stop
{
\use:x
{
\@@_backend_color_fill:nnn
- { \fp_eval:n { -100 * ( (#1) * ( 1 - (#4) ) - 1 ) } }
- { \fp_eval:n { -100 * ( (#2) * ( 1 - (#4) ) + #4 - 1 ) } }
- { \fp_eval:n { -100 * ( (#3) * ( 1 - (#4) ) + #4 - 1 ) } }
- }
- }
-\cs_new_protected:Npn \@@_backend_color_stroke_cmyk:nnnn #1#2#3#4
- {
- \@@_backend_select:x
- {
- cmyk~
- \fp_eval:n {#1} ~ \fp_eval:n {#2} ~
- \fp_eval:n {#3} ~ \fp_eval:n {#4}
+ { \fp_eval:n { -100 * ( 1 - min ( 1 , #1 + #4 ) ) } }
+ { \fp_eval:n { -100 * ( 1 - min ( 1 , #2 + #4 ) ) } }
+ { \fp_eval:n { -100 * ( 1 - min ( 1 , #3 + #4 ) ) } }
}
}
+\cs_new_protected:Npn \@@_backend_color_stroke_cmyk:n #1
+ { \@@_backend_select:n { cmyk ~ #1 } }
\cs_new_protected:Npn \@@_backend_color_fill_gray:n #1
{
\use:x
@@ -1271,7 +1223,7 @@
{ \@@_backend_color_fill:nnn {#1} {#1} {#1} }
\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:nnn #1#2#3
+\cs_new_protected:Npn \@@_backend_color_fill_rgb:n #1
{
\use:x
{
@@ -1296,16 +1248,15 @@
"
}
}
-\cs_new_protected:Npn \@@_backend_color_stroke_rgb:nnn #1#2#3
- {
- \@@_backend_select:x
- { rgb~ \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} }
- }
+\cs_new_protected:Npn \@@_backend_color_stroke_rgb:n #1
+ { \@@_backend_select:n { rgb ~ #1 } }
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
+% \end{macro}
%
% \begin{macro}{\@@_backend_cm:nnnn}
% The four arguments here are floats (the affine matrix), the last
diff --git a/l3experimental/l3draw/l3draw-state.dtx b/l3experimental/l3draw/l3draw-state.dtx
index 42adda47c..63f41ad57 100644
--- a/l3experimental/l3draw/l3draw-state.dtx
+++ b/l3experimental/l3draw/l3draw-state.dtx
@@ -156,13 +156,7 @@
%
% \begin{macro}{\draw_color:n, \draw_color_fill:n, \draw_color_stroke:n}
% \begin{macro}{\@@_color:nn}
-% \begin{macro}{\@@_color_aux:nn, \@@_color_aux:Vn}
-% \begin{macro}{\@@_color:nw}
-% \begin{macro}
-% {
-% \@@_select_cmyk:nw, \@@_select_gray:nw,
-% \@@_select_rgb:nw, \@@_split_select:nw
-% }
+% \begin{macro}{\@@_color:nnn}
% Much the same as for core color support but calling the relevant
% driver-level function.
% \begin{macrocode}
@@ -174,24 +168,10 @@
\cs_new_protected:Npn \@@_color:nn #1#2
{
\color_parse:nN {#2} \l_@@_color_tmp_tl
- \@@_color_aux:Vn \l_@@_color_tmp_tl {#1}
+ \exp_after:wN \@@_color:nnn \l_@@_color_tmp_tl {#1}
}
-\cs_new_protected:Npn \@@_color_aux:nn #1#2
- { \@@_color:nw {#2} #1 \s_@@_stop }
-\cs_generate_variant:Nn \@@_color_aux:nn { V }
-\cs_new_protected:Npn \@@_color:nw #1#2 ~ #3 \s_@@_stop
- { \use:c { @@_color_ #2 :nw } {#1} #3 \s_@@_stop }
-\cs_new_protected:Npn \@@_color_cmyk:nw #1#2 ~ #3 ~ #4 ~ #5 \s_@@_stop
- { \use:c { @@_backend_color_ #1 _cmyk:nnnn } {#2} {#3} {#4} {#5} }
-\cs_new_protected:Npn \@@_color_gray:nw #1#2 \s_@@_stop
- { \use:c { @@_backend_color_ #1 _gray:n } {#2} }
-\cs_new_protected:Npn \@@_color_rgb:nw #1#2 ~ #3 ~ #4 \s_@@_stop
- { \use:c { @@_backend_color_ #1 _rgb:nnn } {#2} {#3} {#4} }
-\cs_new_protected:Npn \@@_color_spot:nw #1#2 ~ #3 \s_@@_stop
- { \use:c { @@_backend_color_ #1 _spot:nn } {#2} {#3} }
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
+\cs_new_protected:Npn \@@_color:nnn #1#2#3
+ { \use:c { @@_backend_color_ #3 _ #1 :n } {#2} }
% \end{macro}
% \end{macro}
% \end{macro}
diff --git a/l3experimental/l3draw/testfiles/m3draw004.luatex.tlg b/l3experimental/l3draw/testfiles/m3draw004.luatex.tlg
index 46bdee91e..adffc92f7 100644
--- a/l3experimental/l3draw/testfiles/m3draw004.luatex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw004.luatex.tlg
@@ -383,7 +383,7 @@ TEST 7: \draw_color:n
...\pdfliteral origin{10 M}
...\pdfliteral origin{[] 0 d}
...\hbox(0.0+0.0)x0.0, direction TLT
-....\pdfcolorstack 0 push {1 0 0 rg 1 0 0 RG}
+....\pdfcolorstack 0 push {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
....\pdfliteral origin{0 0 m}
....\pdfliteral origin{28.34647 283.46457 l}
....\pdfliteral origin{56.69292 0 l}
@@ -407,13 +407,13 @@ l. ... }
...\pdfliteral origin{10 M}
...\pdfliteral origin{[] 0 d}
...\hbox(0.0+0.0)x0.0, direction TLT
-....\pdfcolorstack 0 push {1 0 0 rg 1 0 0 RG}
+....\pdfcolorstack 0 push {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
....\pdfliteral origin{0 0 28.34647 28.34647 re}
....\pdfliteral origin{f}
-....\pdfcolorstack 0 push {1 0 0 rg 1 0 0 RG}
+....\pdfcolorstack 0 push {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
....\pdfliteral origin{0 0 28.34647 28.34647 re}
....\pdfliteral origin{B}
-....\pdfcolorstack 0 push {1 0 0 rg 1 0 0 RG}
+....\pdfcolorstack 0 push {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
....\pdfliteral origin{0 0 m}
....\pdfliteral origin{28.34647 283.46457 l}
....\pdfliteral origin{56.69292 0 l}
@@ -443,13 +443,13 @@ TEST 8: \draw_color_fill:n
...\pdfliteral origin{10 M}
...\pdfliteral origin{[] 0 d}
...\hbox(0.0+0.0)x0.0, direction TLT
-....\pdfcolorstack 0 push {1 0 0 rg}
+....\pdfcolorstack 0 push {1.0 0.0 0.0 rg}
....\pdfliteral origin{0 0 28.34647 28.34647 re}
....\pdfliteral origin{f}
-....\pdfcolorstack 0 push {1 0 0 rg}
+....\pdfcolorstack 0 push {1.0 0.0 0.0 rg}
....\pdfliteral origin{0 0 28.34647 28.34647 re}
....\pdfliteral origin{B}
-....\pdfcolorstack 0 push {1 0 0 rg}
+....\pdfcolorstack 0 push {1.0 0.0 0.0 rg}
....\pdfliteral origin{0 0 m}
....\pdfliteral origin{28.34647 283.46457 l}
....\pdfliteral origin{56.69292 0 l}
@@ -479,13 +479,13 @@ TEST 9: \draw_color_stroke:n
...\pdfliteral origin{10 M}
...\pdfliteral origin{[] 0 d}
...\hbox(0.0+0.0)x0.0, direction TLT
-....\pdfcolorstack 0 push {1 0 0 RG}
+....\pdfcolorstack 0 push {1.0 0.0 0.0 RG}
....\pdfliteral origin{0 0 28.34647 28.34647 re}
....\pdfliteral origin{f}
-....\pdfcolorstack 0 push {1 0 0 RG}
+....\pdfcolorstack 0 push {1.0 0.0 0.0 RG}
....\pdfliteral origin{0 0 28.34647 28.34647 re}
....\pdfliteral origin{B}
-....\pdfcolorstack 0 push {1 0 0 RG}
+....\pdfcolorstack 0 push {1.0 0.0 0.0 RG}
....\pdfliteral origin{0 0 m}
....\pdfliteral origin{28.34647 283.46457 l}
....\pdfliteral origin{56.69292 0 l}
diff --git a/l3experimental/l3draw/testfiles/m3draw004.ptex.tlg b/l3experimental/l3draw/testfiles/m3draw004.ptex.tlg
index 35b7f0ef9..2bacc5a1d 100644
--- a/l3experimental/l3draw/testfiles/m3draw004.ptex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw004.ptex.tlg
@@ -461,7 +461,7 @@ TEST 7: \draw_color:n
...\special{ps::10 setmiterlimit}
...\special{ps::[] 0 setdash}
...\hbox(0.0+0.0)x0.0
-....\special{color push rgb 1 0 0}
+....\special{color push rgb 1.0 0.0 0.0}
....\special{ps:SDict begin /color.fc {} def end}
....\special{ps::0 0 moveto}
....\special{ps::28.34647 283.46457 lineto}
@@ -491,7 +491,7 @@ l. ... }
...\special{ps::10 setmiterlimit}
...\special{ps::[] 0 setdash}
...\hbox(0.0+0.0)x0.0
-....\special{color push rgb 1 0 0}
+....\special{color push rgb 1.0 0.0 0.0}
....\special{ps:SDict begin /color.fc {} def end}
....\special{ps::28.34647 28.34647 0 0 moveto dup 0 rlineto exch 0 exch rlineto ne\ETC.}
....\special{ps::gsave}
@@ -499,7 +499,7 @@ l. ... }
....\special{ps::fill}
....\special{ps::grestore}
....\special{ps::newpath}
-....\special{color push rgb 1 0 0}
+....\special{color push rgb 1.0 0.0 0.0}
....\special{ps:SDict begin /color.fc {} def end}
....\special{ps::28.34647 28.34647 0 0 moveto dup 0 rlineto exch 0 exch rlineto ne\ETC.}
....\special{ps::gsave}
@@ -508,7 +508,7 @@ l. ... }
....\special{ps::grestore}
....\special{ps::stroke}
....\special{ps::newpath}
-....\special{color push rgb 1 0 0}
+....\special{color push rgb 1.0 0.0 0.0}
....\special{ps:SDict begin /color.fc {} def end}
....\special{ps::0 0 moveto}
....\special{ps::28.34647 283.46457 lineto}
@@ -544,14 +544,14 @@ TEST 8: \draw_color_fill:n
...\special{ps::10 setmiterlimit}
...\special{ps::[] 0 setdash}
...\hbox(0.0+0.0)x0.0
-....\special{ps:SDict begin /color.fc {1 0 0 setrgbcolor} def end}
+....\special{ps:SDict begin /color.fc {1.0 0.0 0.0 setrgbcolor} def end}
....\special{ps::28.34647 28.34647 0 0 moveto dup 0 rlineto exch 0 exch rlineto ne\ETC.}
....\special{ps::gsave}
....\special{ps::color.fc}
....\special{ps::fill}
....\special{ps::grestore}
....\special{ps::newpath}
-....\special{ps:SDict begin /color.fc {1 0 0 setrgbcolor} def end}
+....\special{ps:SDict begin /color.fc {1.0 0.0 0.0 setrgbcolor} def end}
....\special{ps::28.34647 28.34647 0 0 moveto dup 0 rlineto exch 0 exch rlineto ne\ETC.}
....\special{ps::gsave}
....\special{ps::color.fc}
@@ -559,7 +559,7 @@ TEST 8: \draw_color_fill:n
....\special{ps::grestore}
....\special{ps::stroke}
....\special{ps::newpath}
-....\special{ps:SDict begin /color.fc {1 0 0 setrgbcolor} def end}
+....\special{ps:SDict begin /color.fc {1.0 0.0 0.0 setrgbcolor} def end}
....\special{ps::0 0 moveto}
....\special{ps::28.34647 283.46457 lineto}
....\special{ps::56.69292 0 lineto}
@@ -617,14 +617,14 @@ and I'll forget about whatever was undefined.
...\special{ps::10 setmiterlimit}
...\special{ps::[] 0 setdash}
...\hbox(0.0+0.0)x0.0
-....\special{color push rgb 1 0 0}
+....\special{color push rgb 1.0 0.0 0.0}
....\special{ps::28.34647 28.34647 0 0 moveto dup 0 rlineto exch 0 exch rlineto ne\ETC.}
....\special{ps::gsave}
....\special{ps::color.fc}
....\special{ps::fill}
....\special{ps::grestore}
....\special{ps::newpath}
-....\special{color push rgb 1 0 0}
+....\special{color push rgb 1.0 0.0 0.0}
....\special{ps::28.34647 28.34647 0 0 moveto dup 0 rlineto exch 0 exch rlineto ne\ETC.}
....\special{ps::gsave}
....\special{ps::color.fc}
@@ -632,7 +632,7 @@ and I'll forget about whatever was undefined.
....\special{ps::grestore}
....\special{ps::stroke}
....\special{ps::newpath}
-....\special{color push rgb 1 0 0}
+....\special{color push rgb 1.0 0.0 0.0}
....\special{ps::0 0 moveto}
....\special{ps::28.34647 283.46457 lineto}
....\special{ps::56.69292 0 lineto}
diff --git a/l3experimental/l3draw/testfiles/m3draw004.tlg b/l3experimental/l3draw/testfiles/m3draw004.tlg
index 022c9d0ac..1b622a218 100644
--- a/l3experimental/l3draw/testfiles/m3draw004.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw004.tlg
@@ -383,7 +383,7 @@ TEST 7: \draw_color:n
...\pdfliteral{10 M}
...\pdfliteral{[] 0 d}
...\hbox(0.0+0.0)x0.0
-....\pdfcolorstack 0 push {1 0 0 rg 1 0 0 RG}
+....\pdfcolorstack 0 push {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
....\pdfliteral{0 0 m}
....\pdfliteral{28.34647 283.46457 l}
....\pdfliteral{56.69292 0 l}
@@ -407,13 +407,13 @@ l. ... }
...\pdfliteral{10 M}
...\pdfliteral{[] 0 d}
...\hbox(0.0+0.0)x0.0
-....\pdfcolorstack 0 push {1 0 0 rg 1 0 0 RG}
+....\pdfcolorstack 0 push {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
....\pdfliteral{0 0 28.34647 28.34647 re}
....\pdfliteral{f}
-....\pdfcolorstack 0 push {1 0 0 rg 1 0 0 RG}
+....\pdfcolorstack 0 push {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
....\pdfliteral{0 0 28.34647 28.34647 re}
....\pdfliteral{B}
-....\pdfcolorstack 0 push {1 0 0 rg 1 0 0 RG}
+....\pdfcolorstack 0 push {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
....\pdfliteral{0 0 m}
....\pdfliteral{28.34647 283.46457 l}
....\pdfliteral{56.69292 0 l}
@@ -443,13 +443,13 @@ TEST 8: \draw_color_fill:n
...\pdfliteral{10 M}
...\pdfliteral{[] 0 d}
...\hbox(0.0+0.0)x0.0
-....\pdfcolorstack 0 push {1 0 0 rg}
+....\pdfcolorstack 0 push {1.0 0.0 0.0 rg}
....\pdfliteral{0 0 28.34647 28.34647 re}
....\pdfliteral{f}
-....\pdfcolorstack 0 push {1 0 0 rg}
+....\pdfcolorstack 0 push {1.0 0.0 0.0 rg}
....\pdfliteral{0 0 28.34647 28.34647 re}
....\pdfliteral{B}
-....\pdfcolorstack 0 push {1 0 0 rg}
+....\pdfcolorstack 0 push {1.0 0.0 0.0 rg}
....\pdfliteral{0 0 m}
....\pdfliteral{28.34647 283.46457 l}
....\pdfliteral{56.69292 0 l}
@@ -479,13 +479,13 @@ TEST 9: \draw_color_stroke:n
...\pdfliteral{10 M}
...\pdfliteral{[] 0 d}
...\hbox(0.0+0.0)x0.0
-....\pdfcolorstack 0 push {1 0 0 RG}
+....\pdfcolorstack 0 push {1.0 0.0 0.0 RG}
....\pdfliteral{0 0 28.34647 28.34647 re}
....\pdfliteral{f}
-....\pdfcolorstack 0 push {1 0 0 RG}
+....\pdfcolorstack 0 push {1.0 0.0 0.0 RG}
....\pdfliteral{0 0 28.34647 28.34647 re}
....\pdfliteral{B}
-....\pdfcolorstack 0 push {1 0 0 RG}
+....\pdfcolorstack 0 push {1.0 0.0 0.0 RG}
....\pdfliteral{0 0 m}
....\pdfliteral{28.34647 283.46457 l}
....\pdfliteral{56.69292 0 l}
diff --git a/l3experimental/l3draw/testfiles/m3draw004.uptex.tlg b/l3experimental/l3draw/testfiles/m3draw004.uptex.tlg
index 35b7f0ef9..2bacc5a1d 100644
--- a/l3experimental/l3draw/testfiles/m3draw004.uptex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw004.uptex.tlg
@@ -461,7 +461,7 @@ TEST 7: \draw_color:n
...\special{ps::10 setmiterlimit}
...\special{ps::[] 0 setdash}
...\hbox(0.0+0.0)x0.0
-....\special{color push rgb 1 0 0}
+....\special{color push rgb 1.0 0.0 0.0}
....\special{ps:SDict begin /color.fc {} def end}
....\special{ps::0 0 moveto}
....\special{ps::28.34647 283.46457 lineto}
@@ -491,7 +491,7 @@ l. ... }
...\special{ps::10 setmiterlimit}
...\special{ps::[] 0 setdash}
...\hbox(0.0+0.0)x0.0
-....\special{color push rgb 1 0 0}
+....\special{color push rgb 1.0 0.0 0.0}
....\special{ps:SDict begin /color.fc {} def end}
....\special{ps::28.34647 28.34647 0 0 moveto dup 0 rlineto exch 0 exch rlineto ne\ETC.}
....\special{ps::gsave}
@@ -499,7 +499,7 @@ l. ... }
....\special{ps::fill}
....\special{ps::grestore}
....\special{ps::newpath}
-....\special{color push rgb 1 0 0}
+....\special{color push rgb 1.0 0.0 0.0}
....\special{ps:SDict begin /color.fc {} def end}
....\special{ps::28.34647 28.34647 0 0 moveto dup 0 rlineto exch 0 exch rlineto ne\ETC.}
....\special{ps::gsave}
@@ -508,7 +508,7 @@ l. ... }
....\special{ps::grestore}
....\special{ps::stroke}
....\special{ps::newpath}
-....\special{color push rgb 1 0 0}
+....\special{color push rgb 1.0 0.0 0.0}
....\special{ps:SDict begin /color.fc {} def end}
....\special{ps::0 0 moveto}
....\special{ps::28.34647 283.46457 lineto}
@@ -544,14 +544,14 @@ TEST 8: \draw_color_fill:n
...\special{ps::10 setmiterlimit}
...\special{ps::[] 0 setdash}
...\hbox(0.0+0.0)x0.0
-....\special{ps:SDict begin /color.fc {1 0 0 setrgbcolor} def end}
+....\special{ps:SDict begin /color.fc {1.0 0.0 0.0 setrgbcolor} def end}
....\special{ps::28.34647 28.34647 0 0 moveto dup 0 rlineto exch 0 exch rlineto ne\ETC.}
....\special{ps::gsave}
....\special{ps::color.fc}
....\special{ps::fill}
....\special{ps::grestore}
....\special{ps::newpath}
-....\special{ps:SDict begin /color.fc {1 0 0 setrgbcolor} def end}
+....\special{ps:SDict begin /color.fc {1.0 0.0 0.0 setrgbcolor} def end}
....\special{ps::28.34647 28.34647 0 0 moveto dup 0 rlineto exch 0 exch rlineto ne\ETC.}
....\special{ps::gsave}
....\special{ps::color.fc}
@@ -559,7 +559,7 @@ TEST 8: \draw_color_fill:n
....\special{ps::grestore}
....\special{ps::stroke}
....\special{ps::newpath}
-....\special{ps:SDict begin /color.fc {1 0 0 setrgbcolor} def end}
+....\special{ps:SDict begin /color.fc {1.0 0.0 0.0 setrgbcolor} def end}
....\special{ps::0 0 moveto}
....\special{ps::28.34647 283.46457 lineto}
....\special{ps::56.69292 0 lineto}
@@ -617,14 +617,14 @@ and I'll forget about whatever was undefined.
...\special{ps::10 setmiterlimit}
...\special{ps::[] 0 setdash}
...\hbox(0.0+0.0)x0.0
-....\special{color push rgb 1 0 0}
+....\special{color push rgb 1.0 0.0 0.0}
....\special{ps::28.34647 28.34647 0 0 moveto dup 0 rlineto exch 0 exch rlineto ne\ETC.}
....\special{ps::gsave}
....\special{ps::color.fc}
....\special{ps::fill}
....\special{ps::grestore}
....\special{ps::newpath}
-....\special{color push rgb 1 0 0}
+....\special{color push rgb 1.0 0.0 0.0}
....\special{ps::28.34647 28.34647 0 0 moveto dup 0 rlineto exch 0 exch rlineto ne\ETC.}
....\special{ps::gsave}
....\special{ps::color.fc}
@@ -632,7 +632,7 @@ and I'll forget about whatever was undefined.
....\special{ps::grestore}
....\special{ps::stroke}
....\special{ps::newpath}
-....\special{color push rgb 1 0 0}
+....\special{color push rgb 1.0 0.0 0.0}
....\special{ps::0 0 moveto}
....\special{ps::28.34647 283.46457 lineto}
....\special{ps::56.69292 0 lineto}
diff --git a/l3experimental/l3draw/testfiles/m3draw004.xetex.tlg b/l3experimental/l3draw/testfiles/m3draw004.xetex.tlg
index d310d9855..681c30743 100644
--- a/l3experimental/l3draw/testfiles/m3draw004.xetex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw004.xetex.tlg
@@ -383,7 +383,7 @@ TEST 7: \draw_color:n
...\special{pdf:literal 10 M}
...\special{pdf:literal [] 0 d}
...\hbox(0.0+0.0)x0.0
-....\special{color push rgb 1 0 0}
+....\special{color push rgb 1.0 0.0 0.0}
....\special{pdf:literal 0 0 m}
....\special{pdf:literal 28.34647 283.46457 l}
....\special{pdf:literal 56.69292 0 l}
@@ -407,13 +407,13 @@ l. ... }
...\special{pdf:literal 10 M}
...\special{pdf:literal [] 0 d}
...\hbox(0.0+0.0)x0.0
-....\special{color push rgb 1 0 0}
+....\special{color push rgb 1.0 0.0 0.0}
....\special{pdf:literal 0 0 28.34647 28.34647 re}
....\special{pdf:literal f}
-....\special{color push rgb 1 0 0}
+....\special{color push rgb 1.0 0.0 0.0}
....\special{pdf:literal 0 0 28.34647 28.34647 re}
....\special{pdf:literal B}
-....\special{color push rgb 1 0 0}
+....\special{color push rgb 1.0 0.0 0.0}
....\special{pdf:literal 0 0 m}
....\special{pdf:literal 28.34647 283.46457 l}
....\special{pdf:literal 56.69292 0 l}
@@ -443,13 +443,13 @@ TEST 8: \draw_color_fill:n
...\special{pdf:literal 10 M}
...\special{pdf:literal [] 0 d}
...\hbox(0.0+0.0)x0.0
-....\special{pdf:literal 1 0 0 rg}
+....\special{pdf:literal 1.0 0.0 0.0 rg}
....\special{pdf:literal 0 0 28.34647 28.34647 re}
....\special{pdf:literal f}
-....\special{pdf:literal 1 0 0 rg}
+....\special{pdf:literal 1.0 0.0 0.0 rg}
....\special{pdf:literal 0 0 28.34647 28.34647 re}
....\special{pdf:literal B}
-....\special{pdf:literal 1 0 0 rg}
+....\special{pdf:literal 1.0 0.0 0.0 rg}
....\special{pdf:literal 0 0 m}
....\special{pdf:literal 28.34647 283.46457 l}
....\special{pdf:literal 56.69292 0 l}
@@ -476,13 +476,13 @@ TEST 9: \draw_color_stroke:n
...\special{pdf:literal 10 M}
...\special{pdf:literal [] 0 d}
...\hbox(0.0+0.0)x0.0
-....\special{pdf:literal 1 0 0 RG}
+....\special{pdf:literal 1.0 0.0 0.0 RG}
....\special{pdf:literal 0 0 28.34647 28.34647 re}
....\special{pdf:literal f}
-....\special{pdf:literal 1 0 0 RG}
+....\special{pdf:literal 1.0 0.0 0.0 RG}
....\special{pdf:literal 0 0 28.34647 28.34647 re}
....\special{pdf:literal B}
-....\special{pdf:literal 1 0 0 RG}
+....\special{pdf:literal 1.0 0.0 0.0 RG}
....\special{pdf:literal 0 0 m}
....\special{pdf:literal 28.34647 283.46457 l}
....\special{pdf:literal 56.69292 0 l}
diff --git a/l3experimental/l3draw/testfiles/m3draw007.ptex.tlg b/l3experimental/l3draw/testfiles/m3draw007.ptex.tlg
index 4499962a5..eaddf5a96 100644
--- a/l3experimental/l3draw/testfiles/m3draw007.ptex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw007.ptex.tlg
@@ -19,7 +19,7 @@ TEST 1: stroke
...\special{ps::10 setmiterlimit}
...\special{ps::[] 0 setdash}
...\hbox(0.0+0.0)x0.0
-....\special{ps:SDict begin /color.fc {1 0 0 setrgbcolor} def end}
+....\special{ps:SDict begin /color.fc {1.0 0.0 0.0 setrgbcolor} def end}
....\special{ps::0 0 moveto}
....\special{ps::0 113.38582 lineto}
....\special{ps::113.38582 113.38582 lineto}
@@ -53,7 +53,7 @@ TEST 2: fill
...\special{ps::10 setmiterlimit}
...\special{ps::[] 0 setdash}
...\hbox(0.0+0.0)x0.0
-....\special{ps:SDict begin /color.fc {1 0 0 setrgbcolor} def end}
+....\special{ps:SDict begin /color.fc {1.0 0.0 0.0 setrgbcolor} def end}
....\special{ps::0 0 moveto}
....\special{ps::0 113.38582 lineto}
....\special{ps::113.38582 113.38582 lineto}
@@ -90,7 +90,7 @@ TEST 3: draw
...\special{ps::10 setmiterlimit}
...\special{ps::[] 0 setdash}
...\hbox(0.0+0.0)x0.0
-....\special{ps:SDict begin /color.fc {1 0 0 setrgbcolor} def end}
+....\special{ps:SDict begin /color.fc {1.0 0.0 0.0 setrgbcolor} def end}
....\special{ps::0 0 moveto}
....\special{ps::0 113.38582 lineto}
....\special{ps::113.38582 113.38582 lineto}
@@ -124,7 +124,7 @@ TEST 4: fill,stroke
...\special{ps::10 setmiterlimit}
...\special{ps::[] 0 setdash}
...\hbox(0.0+0.0)x0.0
-....\special{ps:SDict begin /color.fc {1 0 0 setrgbcolor} def end}
+....\special{ps:SDict begin /color.fc {1.0 0.0 0.0 setrgbcolor} def end}
....\special{ps::0 0 moveto}
....\special{ps::0 113.38582 lineto}
....\special{ps::113.38582 113.38582 lineto}
@@ -168,7 +168,7 @@ TEST 5: clip;fill
....\special{ps::closepath}
....\special{ps::clip}
....\special{ps::newpath}
-....\special{ps:SDict begin /color.fc {1 0 0 setrgbcolor} def end}
+....\special{ps:SDict begin /color.fc {1.0 0.0 0.0 setrgbcolor} def end}
....\special{ps::0 0 moveto}
....\special{ps::0 113.38582 lineto}
....\special{ps::113.38582 113.38582 lineto}
diff --git a/l3experimental/l3draw/testfiles/m3draw007.tlg b/l3experimental/l3draw/testfiles/m3draw007.tlg
index 95742faf0..9543aebc5 100644
--- a/l3experimental/l3draw/testfiles/m3draw007.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw007.tlg
@@ -16,7 +16,7 @@ TEST 1: stroke
...\pdfliteral{10 M}
...\pdfliteral{[] 0 d}
...\hbox(0.0+0.0)x0.0
-....\pdfcolorstack 0 push {1 0 0 rg}
+....\pdfcolorstack 0 push {1.0 0.0 0.0 rg}
....\pdfliteral{0 0 m}
....\pdfliteral{0 113.38582 l}
....\pdfliteral{113.38582 113.38582 l}
@@ -46,7 +46,7 @@ TEST 2: fill
...\pdfliteral{10 M}
...\pdfliteral{[] 0 d}
...\hbox(0.0+0.0)x0.0
-....\pdfcolorstack 0 push {1 0 0 rg}
+....\pdfcolorstack 0 push {1.0 0.0 0.0 rg}
....\pdfliteral{0 0 m}
....\pdfliteral{0 113.38582 l}
....\pdfliteral{113.38582 113.38582 l}
@@ -76,7 +76,7 @@ TEST 3: draw
...\pdfliteral{10 M}
...\pdfliteral{[] 0 d}
...\hbox(0.0+0.0)x0.0
-....\pdfcolorstack 0 push {1 0 0 rg}
+....\pdfcolorstack 0 push {1.0 0.0 0.0 rg}
....\pdfliteral{0 0 m}
....\pdfliteral{0 113.38582 l}
....\pdfliteral{113.38582 113.38582 l}
@@ -106,7 +106,7 @@ TEST 4: fill,stroke
...\pdfliteral{10 M}
...\pdfliteral{[] 0 d}
...\hbox(0.0+0.0)x0.0
-....\pdfcolorstack 0 push {1 0 0 rg}
+....\pdfcolorstack 0 push {1.0 0.0 0.0 rg}
....\pdfliteral{0 0 m}
....\pdfliteral{0 113.38582 l}
....\pdfliteral{113.38582 113.38582 l}
@@ -142,7 +142,7 @@ TEST 5: clip;fill
....\pdfliteral{h}
....\pdfliteral{W}
....\pdfliteral{n}
-....\pdfcolorstack 0 push {1 0 0 rg}
+....\pdfcolorstack 0 push {1.0 0.0 0.0 rg}
....\pdfliteral{0 0 m}
....\pdfliteral{0 113.38582 l}
....\pdfliteral{113.38582 113.38582 l}
diff --git a/l3experimental/l3draw/testfiles/m3draw007.uptex.tlg b/l3experimental/l3draw/testfiles/m3draw007.uptex.tlg
index 4499962a5..eaddf5a96 100644
--- a/l3experimental/l3draw/testfiles/m3draw007.uptex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw007.uptex.tlg
@@ -19,7 +19,7 @@ TEST 1: stroke
...\special{ps::10 setmiterlimit}
...\special{ps::[] 0 setdash}
...\hbox(0.0+0.0)x0.0
-....\special{ps:SDict begin /color.fc {1 0 0 setrgbcolor} def end}
+....\special{ps:SDict begin /color.fc {1.0 0.0 0.0 setrgbcolor} def end}
....\special{ps::0 0 moveto}
....\special{ps::0 113.38582 lineto}
....\special{ps::113.38582 113.38582 lineto}
@@ -53,7 +53,7 @@ TEST 2: fill
...\special{ps::10 setmiterlimit}
...\special{ps::[] 0 setdash}
...\hbox(0.0+0.0)x0.0
-....\special{ps:SDict begin /color.fc {1 0 0 setrgbcolor} def end}
+....\special{ps:SDict begin /color.fc {1.0 0.0 0.0 setrgbcolor} def end}
....\special{ps::0 0 moveto}
....\special{ps::0 113.38582 lineto}
....\special{ps::113.38582 113.38582 lineto}
@@ -90,7 +90,7 @@ TEST 3: draw
...\special{ps::10 setmiterlimit}
...\special{ps::[] 0 setdash}
...\hbox(0.0+0.0)x0.0
-....\special{ps:SDict begin /color.fc {1 0 0 setrgbcolor} def end}
+....\special{ps:SDict begin /color.fc {1.0 0.0 0.0 setrgbcolor} def end}
....\special{ps::0 0 moveto}
....\special{ps::0 113.38582 lineto}
....\special{ps::113.38582 113.38582 lineto}
@@ -124,7 +124,7 @@ TEST 4: fill,stroke
...\special{ps::10 setmiterlimit}
...\special{ps::[] 0 setdash}
...\hbox(0.0+0.0)x0.0
-....\special{ps:SDict begin /color.fc {1 0 0 setrgbcolor} def end}
+....\special{ps:SDict begin /color.fc {1.0 0.0 0.0 setrgbcolor} def end}
....\special{ps::0 0 moveto}
....\special{ps::0 113.38582 lineto}
....\special{ps::113.38582 113.38582 lineto}
@@ -168,7 +168,7 @@ TEST 5: clip;fill
....\special{ps::closepath}
....\special{ps::clip}
....\special{ps::newpath}
-....\special{ps:SDict begin /color.fc {1 0 0 setrgbcolor} def end}
+....\special{ps:SDict begin /color.fc {1.0 0.0 0.0 setrgbcolor} def end}
....\special{ps::0 0 moveto}
....\special{ps::0 113.38582 lineto}
....\special{ps::113.38582 113.38582 lineto}
diff --git a/l3experimental/l3draw/testfiles/m3draw007.xetex.tlg b/l3experimental/l3draw/testfiles/m3draw007.xetex.tlg
index 558bc8a6e..5146d839f 100644
--- a/l3experimental/l3draw/testfiles/m3draw007.xetex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw007.xetex.tlg
@@ -16,7 +16,7 @@ TEST 1: stroke
...\special{pdf:literal 10 M}
...\special{pdf:literal [] 0 d}
...\hbox(0.0+0.0)x0.0
-....\special{pdf:literal 1 0 0 rg}
+....\special{pdf:literal 1.0 0.0 0.0 rg}
....\special{pdf:literal 0 0 m}
....\special{pdf:literal 0 113.38582 l}
....\special{pdf:literal 113.38582 113.38582 l}
@@ -45,7 +45,7 @@ TEST 2: fill
...\special{pdf:literal 10 M}
...\special{pdf:literal [] 0 d}
...\hbox(0.0+0.0)x0.0
-....\special{pdf:literal 1 0 0 rg}
+....\special{pdf:literal 1.0 0.0 0.0 rg}
....\special{pdf:literal 0 0 m}
....\special{pdf:literal 0 113.38582 l}
....\special{pdf:literal 113.38582 113.38582 l}
@@ -74,7 +74,7 @@ TEST 3: draw
...\special{pdf:literal 10 M}
...\special{pdf:literal [] 0 d}
...\hbox(0.0+0.0)x0.0
-....\special{pdf:literal 1 0 0 rg}
+....\special{pdf:literal 1.0 0.0 0.0 rg}
....\special{pdf:literal 0 0 m}
....\special{pdf:literal 0 113.38582 l}
....\special{pdf:literal 113.38582 113.38582 l}
@@ -103,7 +103,7 @@ TEST 4: fill,stroke
...\special{pdf:literal 10 M}
...\special{pdf:literal [] 0 d}
...\hbox(0.0+0.0)x0.0
-....\special{pdf:literal 1 0 0 rg}
+....\special{pdf:literal 1.0 0.0 0.0 rg}
....\special{pdf:literal 0 0 m}
....\special{pdf:literal 0 113.38582 l}
....\special{pdf:literal 113.38582 113.38582 l}
@@ -138,7 +138,7 @@ TEST 5: clip;fill
....\special{pdf:literal h}
....\special{pdf:literal W}
....\special{pdf:literal n}
-....\special{pdf:literal 1 0 0 rg}
+....\special{pdf:literal 1.0 0.0 0.0 rg}
....\special{pdf:literal 0 0 m}
....\special{pdf:literal 0 113.38582 l}
....\special{pdf:literal 113.38582 113.38582 l}
More information about the latex3-commits
mailing list.