[latex3-commits] [git/LaTeX3-latex3-latex3] master: Use an auxiliary for color model creation (d9547f9f5)
Joseph Wright
joseph.wright at morningstar2.co.uk
Mon Feb 22 20:19:05 CET 2021
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/d9547f9f53cd27067330db9d5e861b4e657d73df
>---------------------------------------------------------------
commit d9547f9f53cd27067330db9d5e861b4e657d73df
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Mon Feb 22 19:19:05 2021 +0000
Use an auxiliary for color model creation
>---------------------------------------------------------------
d9547f9f53cd27067330db9d5e861b4e657d73df
l3kernel/l3color.dtx | 67 +++++++++++++++-----------------
l3kernel/testfiles/m3color003.luatex.tlg | 32 +++++++--------
l3kernel/testfiles/m3color003.ptex.tlg | 32 +++++++--------
l3kernel/testfiles/m3color003.tlg | 32 +++++++--------
l3kernel/testfiles/m3color003.uptex.tlg | 32 +++++++--------
l3kernel/testfiles/m3color003.xetex.tlg | 32 +++++++--------
6 files changed, 111 insertions(+), 116 deletions(-)
diff --git a/l3kernel/l3color.dtx b/l3kernel/l3color.dtx
index b3fd3cfa7..991941593 100644
--- a/l3kernel/l3color.dtx
+++ b/l3kernel/l3color.dtx
@@ -1750,6 +1750,35 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\@@_model_init:nn}
+% A shared auxiliary to do the basics of setting up a new model: reserve a
+% number, create a fallback and white-equivalent, set up links to the backend.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_model_init:nnn #1#2#3
+ {
+ \int_gincr:N \g_@@_model_int
+ \tl_const:cx { c_@@_fallback_ #1 _tl }
+ { 1 \prg_replicate:nn { #2 - 1 } { ~ 1 } }
+ \clist_map_inline:nn { fill , stroke , select }
+ {
+ \cs_new_protected:cpx { @@_backend_ ##1 _ #1 :n } ####1
+ {
+ \exp_not:c { @@_backend_ ##1 _ #3 :nn }
+ { color \int_use:N \g_@@_model_int } {####1}
+ }
+ }
+ \cs_new_protected:cpx { @@_model_ #1 _white: }
+ {
+ \prop_put:Nnn \exp_not:N \l_@@_named_white_prop {#1}
+ { 0 \prg_replicate:nn { #2 - 1 } { ~ 0 } }
+ \exp_not:N \int_compare:nNnF { \tex_currentgrouplevel:D } = 0
+ { \group_insert_after:N \exp_not:c { @@_model_ #1 _ white: } }
+ }
+ \use:c { @@_model_ #1 _white: }
+ }
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\@@_model_separation:n}
% \begin{macro}{\@@_model_separation:nn}
% \begin{macro}{\@@_model_separation:nnn}
@@ -1829,31 +1858,15 @@
\cs_new_protected:Npn \@@_model_separation:w
#1 , #2 , #3 , #4 , #5 \s_@@_stop #6#7#8
{
- \int_gincr:N \g_@@_model_int
- \tl_const:cn { c_@@_fallback_ #6 _tl } { 1 }
+ \@@_model_init:nnn {#6} { 1 } { separation }
\cs_new_eq:cN { @@_parse_mix_ #6 :nw } \@@_parse_mix_gray:nw
\cs_new:cpn { @@_parse_model_ #6 :w } ##1 , ##2 \s_@@_stop
{ {#6} { \@@_parse_number:n {##1} } }
- \clist_map_inline:nn { fill , stroke , select }
- {
- \cs_new_protected:cpx { @@_backend_ ##1 _ #6 :n } ####1
- {
- \exp_not:c { @@_backend_ ##1 _ separation:nn }
- { color \int_use:N \g_@@_model_int } {####1}
- }
- }
\use:c { @@_model_separation_ #8 :nnnnnn }
{#6} {#7} {#1} {#2} {#3} {#4}
\prop_gput:Nnn \g_@@_alternative_model_prop {#6} {#8}
\prop_gput:Nnx \g_@@_colorants_prop {#6}
{ \str_convert_pdfname:n {#7} }
- \cs_new_protected:cpx { @@_model_ #6 _white: }
- {
- \prop_put:Nnn \exp_not:N \l_@@_named_white_prop {#6} { 0 }
- \exp_not:N \int_compare:nNnF { \tex_currentgrouplevel:D } = 0
- { \group_insert_after:N \exp_not:c { @@_model_ #6 _ white: } }
- }
- \use:c { @@_model_ #6 _white: }
}
\cs_new_protected:Npn \@@_model_separation_cmyk:nnnnnn #1#2#3#4#5#6
{
@@ -2086,28 +2099,10 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_model_devicen:nnnn #1#2#3#4
{
- \int_gincr:N \g_@@_model_int
- \tl_const:cx { c_@@_fallback_ #4 _tl }
- { \prg_replicate:nn {#1} { 1 ~ } }
+ \@@_model_init:nnn {#4} {#1} { devicen }
\cs_if_exist_use:cF { @@_model_devicen_parse_ #1 :nn }
{ \@@_model_devicen_parse_generic:nn }
{#4} {#1}
- \clist_map_inline:nn { fill , stroke , select }
- {
- \cs_new_protected:cpx { @@_backend_ ##1 _ #4 :n } ####1
- {
- \exp_not:c { @@_backend_ ##1 _ devicen:nn }
- { color \int_use:N \g_@@_model_int } {####1}
- }
- }
- \cs_new_protected:cpx { @@_model_ #4 _white: }
- {
- \prop_put:Nnn \exp_not:N \l_@@_named_white_prop {#4}
- { \prg_replicate:nn {#1} { 0 ~ } }
- \exp_not:N \int_compare:nNnF { \tex_currentgrouplevel:D } = 0
- { \group_insert_after:N \exp_not:c { @@_model_ #4 _ white: } }
- }
- \use:c { @@_model_ #4 _white: }
\@@_model_devicen_init:nnn {#1} {#2} {#3}
\@@_model_devicen_convert:nnn {#4} {#2} {#3}
}
diff --git a/l3kernel/testfiles/m3color003.luatex.tlg b/l3kernel/testfiles/m3color003.luatex.tlg
index fca22955d..dc11d4caa 100644
--- a/l3kernel/testfiles/m3color003.luatex.tlg
+++ b/l3kernel/testfiles/m3color003.luatex.tlg
@@ -196,15 +196,15 @@ l. ... }
TEST 8: Creating new models
============================================================
Defining \c__color_fallback_BarToneCMYK_tl on line ...
-Defining \__color_parse_mix_BarToneCMYK:nw on line ...
-Defining \__color_parse_model_BarToneCMYK:w on line ...
Defining \__color_backend_fill_BarToneCMYK:n on line ...
Defining \__color_backend_stroke_BarToneCMYK:n on line ...
Defining \__color_backend_select_BarToneCMYK:n on line ...
+Defining \__color_model_BarToneCMYK_white: on line ...
+Defining \__color_parse_mix_BarToneCMYK:nw on line ...
+Defining \__color_parse_model_BarToneCMYK:w on line ...
Defining \__color_convert_BarToneCMYK_cmyk:w on line ...
Defining \__color_convert_BarToneCMYK_rgb:w on line ...
Defining \__color_convert_BarToneCMYK_gray:w on line ...
-Defining \__color_model_BarToneCMYK_white: on line ...
Defining \l__color_named_fooCMYK_tl on line ...
Defining \l__color_named_fooCMYK_prop on line ...
The color fooCMYK has the properties:
@@ -213,15 +213,15 @@ The color fooCMYK has the properties:
<recently read> }
l. ... }
Defining \c__color_fallback_BarToneRGB_tl on line ...
-Defining \__color_parse_mix_BarToneRGB:nw on line ...
-Defining \__color_parse_model_BarToneRGB:w on line ...
Defining \__color_backend_fill_BarToneRGB:n on line ...
Defining \__color_backend_stroke_BarToneRGB:n on line ...
Defining \__color_backend_select_BarToneRGB:n on line ...
+Defining \__color_model_BarToneRGB_white: on line ...
+Defining \__color_parse_mix_BarToneRGB:nw on line ...
+Defining \__color_parse_model_BarToneRGB:w on line ...
Defining \__color_convert_BarToneRGB_rgb:w on line ...
Defining \__color_convert_BarToneRGB_cmyk:w on line ...
Defining \__color_convert_BarToneRGB_gray:w on line ...
-Defining \__color_model_BarToneRGB_white: on line ...
Defining \l__color_named_fooRGB_tl on line ...
Defining \l__color_named_fooRGB_prop on line ...
The color fooRGB has the properties:
@@ -230,15 +230,15 @@ The color fooRGB has the properties:
<recently read> }
l. ... }
Defining \c__color_fallback_BarToneGray_tl on line ...
-Defining \__color_parse_mix_BarToneGray:nw on line ...
-Defining \__color_parse_model_BarToneGray:w on line ...
Defining \__color_backend_fill_BarToneGray:n on line ...
Defining \__color_backend_stroke_BarToneGray:n on line ...
Defining \__color_backend_select_BarToneGray:n on line ...
+Defining \__color_model_BarToneGray_white: on line ...
+Defining \__color_parse_mix_BarToneGray:nw on line ...
+Defining \__color_parse_model_BarToneGray:w on line ...
Defining \__color_convert_BarToneGray_cmyk:w on line ...
Defining \__color_convert_BarToneGray_gray:w on line ...
Defining \__color_convert_BarToneGray_rgb:w on line ...
-Defining \__color_model_BarToneGray_white: on line ...
Defining \l__color_named_fooGray_tl on line ...
Defining \l__color_named_fooGray_prop on line ...
The color fooGray has the properties:
@@ -247,16 +247,16 @@ The color fooGray has the properties:
<recently read> }
l. ... }
Defining \c__color_fallback_BarToneCIELAB_tl on line ...
-Defining \__color_parse_mix_BarToneCIELAB:nw on line ...
-Defining \__color_parse_model_BarToneCIELAB:w on line ...
Defining \__color_backend_fill_BarToneCIELAB:n on line ...
Defining \__color_backend_stroke_BarToneCIELAB:n on line ...
Defining \__color_backend_select_BarToneCIELAB:n on line ...
+Defining \__color_model_BarToneCIELAB_white: on line ...
+Defining \__color_parse_mix_BarToneCIELAB:nw on line ...
+Defining \__color_parse_model_BarToneCIELAB:w on line ...
Defining \c__pdf_backend_object___color_illuminant_CIELAB_d65_int on line ..
Defining \__color_convert_BarToneCIELAB_cmyk:w on line ...
Defining \__color_convert_BarToneCIELAB_rgb:w on line ...
Defining \__color_convert_BarToneCIELAB_gray:w on line ...
-Defining \__color_model_BarToneCIELAB_white: on line ...
The color BarToneCIELAB is undefined.
> .
<recently read> }
@@ -408,12 +408,12 @@ l. ... }
TEST 13: DeviceN spaces
============================================================
Defining \c__color_fallback_TwoUp_tl on line ...
-Defining \__color_parse_model_TwoUp:w on line ...
-Defining \__color_parse_mix_TwoUp:nw on line ...
Defining \__color_backend_fill_TwoUp:n on line ...
Defining \__color_backend_stroke_TwoUp:n on line ...
Defining \__color_backend_select_TwoUp:n on line ...
Defining \__color_model_TwoUp_white: on line ...
+Defining \__color_parse_model_TwoUp:w on line ...
+Defining \__color_parse_mix_TwoUp:nw on line ...
Defining \__color_convert_TwoUp_gray:w on line ...
Defining \__color_convert_TwoUp_rgb:w on line ...
Defining \__color_convert_TwoUp_cmyk:w on line ...
@@ -430,12 +430,12 @@ The color foo has the properties:
<recently read> }
l. ... }
Defining \c__color_fallback_AllIn_tl on line ...
-Defining \__color_parse_model_AllIn:w on line ...
-Defining \__color_parse_mix_AllIn:nw on line ...
Defining \__color_backend_fill_AllIn:n on line ...
Defining \__color_backend_stroke_AllIn:n on line ...
Defining \__color_backend_select_AllIn:n on line ...
Defining \__color_model_AllIn_white: on line ...
+Defining \__color_parse_model_AllIn:w on line ...
+Defining \__color_parse_mix_AllIn:nw on line ...
Defining \__color_convert_AllIn_gray:w on line ...
Defining \__color_convert_AllIn_rgb:w on line ...
Defining \__color_convert_AllIn_cmyk:w on line ...
diff --git a/l3kernel/testfiles/m3color003.ptex.tlg b/l3kernel/testfiles/m3color003.ptex.tlg
index c6b433e6d..34e10a549 100644
--- a/l3kernel/testfiles/m3color003.ptex.tlg
+++ b/l3kernel/testfiles/m3color003.ptex.tlg
@@ -201,15 +201,15 @@ l. ... }
TEST 8: Creating new models
============================================================
Defining \c__color_fallback_BarToneCMYK_tl on line ...
-Defining \__color_parse_mix_BarToneCMYK:nw on line ...
-Defining \__color_parse_model_BarToneCMYK:w on line ...
Defining \__color_backend_fill_BarToneCMYK:n on line ...
Defining \__color_backend_stroke_BarToneCMYK:n on line ...
Defining \__color_backend_select_BarToneCMYK:n on line ...
+Defining \__color_model_BarToneCMYK_white: on line ...
+Defining \__color_parse_mix_BarToneCMYK:nw on line ...
+Defining \__color_parse_model_BarToneCMYK:w on line ...
Defining \__color_convert_BarToneCMYK_cmyk:w on line ...
Defining \__color_convert_BarToneCMYK_rgb:w on line ...
Defining \__color_convert_BarToneCMYK_gray:w on line ...
-Defining \__color_model_BarToneCMYK_white: on line ...
Defining \l__color_named_fooCMYK_tl on line ...
Defining \l__color_named_fooCMYK_prop on line ...
The color fooCMYK has the properties:
@@ -218,15 +218,15 @@ The color fooCMYK has the properties:
<recently read> }
l. ... }
Defining \c__color_fallback_BarToneRGB_tl on line ...
-Defining \__color_parse_mix_BarToneRGB:nw on line ...
-Defining \__color_parse_model_BarToneRGB:w on line ...
Defining \__color_backend_fill_BarToneRGB:n on line ...
Defining \__color_backend_stroke_BarToneRGB:n on line ...
Defining \__color_backend_select_BarToneRGB:n on line ...
+Defining \__color_model_BarToneRGB_white: on line ...
+Defining \__color_parse_mix_BarToneRGB:nw on line ...
+Defining \__color_parse_model_BarToneRGB:w on line ...
Defining \__color_convert_BarToneRGB_rgb:w on line ...
Defining \__color_convert_BarToneRGB_cmyk:w on line ...
Defining \__color_convert_BarToneRGB_gray:w on line ...
-Defining \__color_model_BarToneRGB_white: on line ...
Defining \l__color_named_fooRGB_tl on line ...
Defining \l__color_named_fooRGB_prop on line ...
The color fooRGB has the properties:
@@ -235,15 +235,15 @@ The color fooRGB has the properties:
<recently read> }
l. ... }
Defining \c__color_fallback_BarToneGray_tl on line ...
-Defining \__color_parse_mix_BarToneGray:nw on line ...
-Defining \__color_parse_model_BarToneGray:w on line ...
Defining \__color_backend_fill_BarToneGray:n on line ...
Defining \__color_backend_stroke_BarToneGray:n on line ...
Defining \__color_backend_select_BarToneGray:n on line ...
+Defining \__color_model_BarToneGray_white: on line ...
+Defining \__color_parse_mix_BarToneGray:nw on line ...
+Defining \__color_parse_model_BarToneGray:w on line ...
Defining \__color_convert_BarToneGray_cmyk:w on line ...
Defining \__color_convert_BarToneGray_gray:w on line ...
Defining \__color_convert_BarToneGray_rgb:w on line ...
-Defining \__color_model_BarToneGray_white: on line ...
Defining \l__color_named_fooGray_tl on line ...
Defining \l__color_named_fooGray_prop on line ...
The color fooGray has the properties:
@@ -252,15 +252,15 @@ The color fooGray has the properties:
<recently read> }
l. ... }
Defining \c__color_fallback_BarToneCIELAB_tl on line ...
-Defining \__color_parse_mix_BarToneCIELAB:nw on line ...
-Defining \__color_parse_model_BarToneCIELAB:w on line ...
Defining \__color_backend_fill_BarToneCIELAB:n on line ...
Defining \__color_backend_stroke_BarToneCIELAB:n on line ...
Defining \__color_backend_select_BarToneCIELAB:n on line ...
+Defining \__color_model_BarToneCIELAB_white: on line ...
+Defining \__color_parse_mix_BarToneCIELAB:nw on line ...
+Defining \__color_parse_model_BarToneCIELAB:w on line ...
Defining \__color_convert_BarToneCIELAB_cmyk:w on line ...
Defining \__color_convert_BarToneCIELAB_rgb:w on line ...
Defining \__color_convert_BarToneCIELAB_gray:w on line ...
-Defining \__color_model_BarToneCIELAB_white: on line ...
The color BarToneCIELAB is undefined.
> .
<recently read> }
@@ -412,12 +412,12 @@ l. ... }
TEST 13: DeviceN spaces
============================================================
Defining \c__color_fallback_TwoUp_tl on line ...
-Defining \__color_parse_model_TwoUp:w on line ...
-Defining \__color_parse_mix_TwoUp:nw on line ...
Defining \__color_backend_fill_TwoUp:n on line ...
Defining \__color_backend_stroke_TwoUp:n on line ...
Defining \__color_backend_select_TwoUp:n on line ...
Defining \__color_model_TwoUp_white: on line ...
+Defining \__color_parse_model_TwoUp:w on line ...
+Defining \__color_parse_mix_TwoUp:nw on line ...
Defining \__color_convert_TwoUp_gray:w on line ...
Defining \__color_convert_TwoUp_rgb:w on line ...
Defining \__color_convert_TwoUp_cmyk:w on line ...
@@ -434,12 +434,12 @@ The color foo has the properties:
<recently read> }
l. ... }
Defining \c__color_fallback_AllIn_tl on line ...
-Defining \__color_parse_model_AllIn:w on line ...
-Defining \__color_parse_mix_AllIn:nw on line ...
Defining \__color_backend_fill_AllIn:n on line ...
Defining \__color_backend_stroke_AllIn:n on line ...
Defining \__color_backend_select_AllIn:n on line ...
Defining \__color_model_AllIn_white: on line ...
+Defining \__color_parse_model_AllIn:w on line ...
+Defining \__color_parse_mix_AllIn:nw on line ...
Defining \__color_convert_AllIn_gray:w on line ...
Defining \__color_convert_AllIn_rgb:w on line ...
Defining \__color_convert_AllIn_cmyk:w on line ...
diff --git a/l3kernel/testfiles/m3color003.tlg b/l3kernel/testfiles/m3color003.tlg
index b4f315a37..e04b15c35 100644
--- a/l3kernel/testfiles/m3color003.tlg
+++ b/l3kernel/testfiles/m3color003.tlg
@@ -196,15 +196,15 @@ l. ... }
TEST 8: Creating new models
============================================================
Defining \c__color_fallback_BarToneCMYK_tl on line ...
-Defining \__color_parse_mix_BarToneCMYK:nw on line ...
-Defining \__color_parse_model_BarToneCMYK:w on line ...
Defining \__color_backend_fill_BarToneCMYK:n on line ...
Defining \__color_backend_stroke_BarToneCMYK:n on line ...
Defining \__color_backend_select_BarToneCMYK:n on line ...
+Defining \__color_model_BarToneCMYK_white: on line ...
+Defining \__color_parse_mix_BarToneCMYK:nw on line ...
+Defining \__color_parse_model_BarToneCMYK:w on line ...
Defining \__color_convert_BarToneCMYK_cmyk:w on line ...
Defining \__color_convert_BarToneCMYK_rgb:w on line ...
Defining \__color_convert_BarToneCMYK_gray:w on line ...
-Defining \__color_model_BarToneCMYK_white: on line ...
Defining \l__color_named_fooCMYK_tl on line ...
Defining \l__color_named_fooCMYK_prop on line ...
The color fooCMYK has the properties:
@@ -213,15 +213,15 @@ The color fooCMYK has the properties:
<recently read> }
l. ... }
Defining \c__color_fallback_BarToneRGB_tl on line ...
-Defining \__color_parse_mix_BarToneRGB:nw on line ...
-Defining \__color_parse_model_BarToneRGB:w on line ...
Defining \__color_backend_fill_BarToneRGB:n on line ...
Defining \__color_backend_stroke_BarToneRGB:n on line ...
Defining \__color_backend_select_BarToneRGB:n on line ...
+Defining \__color_model_BarToneRGB_white: on line ...
+Defining \__color_parse_mix_BarToneRGB:nw on line ...
+Defining \__color_parse_model_BarToneRGB:w on line ...
Defining \__color_convert_BarToneRGB_rgb:w on line ...
Defining \__color_convert_BarToneRGB_cmyk:w on line ...
Defining \__color_convert_BarToneRGB_gray:w on line ...
-Defining \__color_model_BarToneRGB_white: on line ...
Defining \l__color_named_fooRGB_tl on line ...
Defining \l__color_named_fooRGB_prop on line ...
The color fooRGB has the properties:
@@ -230,15 +230,15 @@ The color fooRGB has the properties:
<recently read> }
l. ... }
Defining \c__color_fallback_BarToneGray_tl on line ...
-Defining \__color_parse_mix_BarToneGray:nw on line ...
-Defining \__color_parse_model_BarToneGray:w on line ...
Defining \__color_backend_fill_BarToneGray:n on line ...
Defining \__color_backend_stroke_BarToneGray:n on line ...
Defining \__color_backend_select_BarToneGray:n on line ...
+Defining \__color_model_BarToneGray_white: on line ...
+Defining \__color_parse_mix_BarToneGray:nw on line ...
+Defining \__color_parse_model_BarToneGray:w on line ...
Defining \__color_convert_BarToneGray_cmyk:w on line ...
Defining \__color_convert_BarToneGray_gray:w on line ...
Defining \__color_convert_BarToneGray_rgb:w on line ...
-Defining \__color_model_BarToneGray_white: on line ...
Defining \l__color_named_fooGray_tl on line ...
Defining \l__color_named_fooGray_prop on line ...
The color fooGray has the properties:
@@ -247,16 +247,16 @@ The color fooGray has the properties:
<recently read> }
l. ... }
Defining \c__color_fallback_BarToneCIELAB_tl on line ...
-Defining \__color_parse_mix_BarToneCIELAB:nw on line ...
-Defining \__color_parse_model_BarToneCIELAB:w on line ...
Defining \__color_backend_fill_BarToneCIELAB:n on line ...
Defining \__color_backend_stroke_BarToneCIELAB:n on line ...
Defining \__color_backend_select_BarToneCIELAB:n on line ...
+Defining \__color_model_BarToneCIELAB_white: on line ...
+Defining \__color_parse_mix_BarToneCIELAB:nw on line ...
+Defining \__color_parse_model_BarToneCIELAB:w on line ...
Defining \c__pdf_backend_object___color_illuminant_CIELAB_d65_int on line ..
Defining \__color_convert_BarToneCIELAB_cmyk:w on line ...
Defining \__color_convert_BarToneCIELAB_rgb:w on line ...
Defining \__color_convert_BarToneCIELAB_gray:w on line ...
-Defining \__color_model_BarToneCIELAB_white: on line ...
The color BarToneCIELAB is undefined.
> .
<recently read> }
@@ -408,12 +408,12 @@ l. ... }
TEST 13: DeviceN spaces
============================================================
Defining \c__color_fallback_TwoUp_tl on line ...
-Defining \__color_parse_model_TwoUp:w on line ...
-Defining \__color_parse_mix_TwoUp:nw on line ...
Defining \__color_backend_fill_TwoUp:n on line ...
Defining \__color_backend_stroke_TwoUp:n on line ...
Defining \__color_backend_select_TwoUp:n on line ...
Defining \__color_model_TwoUp_white: on line ...
+Defining \__color_parse_model_TwoUp:w on line ...
+Defining \__color_parse_mix_TwoUp:nw on line ...
Defining \__color_convert_TwoUp_gray:w on line ...
Defining \__color_convert_TwoUp_rgb:w on line ...
Defining \__color_convert_TwoUp_cmyk:w on line ...
@@ -430,12 +430,12 @@ The color foo has the properties:
<recently read> }
l. ... }
Defining \c__color_fallback_AllIn_tl on line ...
-Defining \__color_parse_model_AllIn:w on line ...
-Defining \__color_parse_mix_AllIn:nw on line ...
Defining \__color_backend_fill_AllIn:n on line ...
Defining \__color_backend_stroke_AllIn:n on line ...
Defining \__color_backend_select_AllIn:n on line ...
Defining \__color_model_AllIn_white: on line ...
+Defining \__color_parse_model_AllIn:w on line ...
+Defining \__color_parse_mix_AllIn:nw on line ...
Defining \__color_convert_AllIn_gray:w on line ...
Defining \__color_convert_AllIn_rgb:w on line ...
Defining \__color_convert_AllIn_cmyk:w on line ...
diff --git a/l3kernel/testfiles/m3color003.uptex.tlg b/l3kernel/testfiles/m3color003.uptex.tlg
index c6b433e6d..34e10a549 100644
--- a/l3kernel/testfiles/m3color003.uptex.tlg
+++ b/l3kernel/testfiles/m3color003.uptex.tlg
@@ -201,15 +201,15 @@ l. ... }
TEST 8: Creating new models
============================================================
Defining \c__color_fallback_BarToneCMYK_tl on line ...
-Defining \__color_parse_mix_BarToneCMYK:nw on line ...
-Defining \__color_parse_model_BarToneCMYK:w on line ...
Defining \__color_backend_fill_BarToneCMYK:n on line ...
Defining \__color_backend_stroke_BarToneCMYK:n on line ...
Defining \__color_backend_select_BarToneCMYK:n on line ...
+Defining \__color_model_BarToneCMYK_white: on line ...
+Defining \__color_parse_mix_BarToneCMYK:nw on line ...
+Defining \__color_parse_model_BarToneCMYK:w on line ...
Defining \__color_convert_BarToneCMYK_cmyk:w on line ...
Defining \__color_convert_BarToneCMYK_rgb:w on line ...
Defining \__color_convert_BarToneCMYK_gray:w on line ...
-Defining \__color_model_BarToneCMYK_white: on line ...
Defining \l__color_named_fooCMYK_tl on line ...
Defining \l__color_named_fooCMYK_prop on line ...
The color fooCMYK has the properties:
@@ -218,15 +218,15 @@ The color fooCMYK has the properties:
<recently read> }
l. ... }
Defining \c__color_fallback_BarToneRGB_tl on line ...
-Defining \__color_parse_mix_BarToneRGB:nw on line ...
-Defining \__color_parse_model_BarToneRGB:w on line ...
Defining \__color_backend_fill_BarToneRGB:n on line ...
Defining \__color_backend_stroke_BarToneRGB:n on line ...
Defining \__color_backend_select_BarToneRGB:n on line ...
+Defining \__color_model_BarToneRGB_white: on line ...
+Defining \__color_parse_mix_BarToneRGB:nw on line ...
+Defining \__color_parse_model_BarToneRGB:w on line ...
Defining \__color_convert_BarToneRGB_rgb:w on line ...
Defining \__color_convert_BarToneRGB_cmyk:w on line ...
Defining \__color_convert_BarToneRGB_gray:w on line ...
-Defining \__color_model_BarToneRGB_white: on line ...
Defining \l__color_named_fooRGB_tl on line ...
Defining \l__color_named_fooRGB_prop on line ...
The color fooRGB has the properties:
@@ -235,15 +235,15 @@ The color fooRGB has the properties:
<recently read> }
l. ... }
Defining \c__color_fallback_BarToneGray_tl on line ...
-Defining \__color_parse_mix_BarToneGray:nw on line ...
-Defining \__color_parse_model_BarToneGray:w on line ...
Defining \__color_backend_fill_BarToneGray:n on line ...
Defining \__color_backend_stroke_BarToneGray:n on line ...
Defining \__color_backend_select_BarToneGray:n on line ...
+Defining \__color_model_BarToneGray_white: on line ...
+Defining \__color_parse_mix_BarToneGray:nw on line ...
+Defining \__color_parse_model_BarToneGray:w on line ...
Defining \__color_convert_BarToneGray_cmyk:w on line ...
Defining \__color_convert_BarToneGray_gray:w on line ...
Defining \__color_convert_BarToneGray_rgb:w on line ...
-Defining \__color_model_BarToneGray_white: on line ...
Defining \l__color_named_fooGray_tl on line ...
Defining \l__color_named_fooGray_prop on line ...
The color fooGray has the properties:
@@ -252,15 +252,15 @@ The color fooGray has the properties:
<recently read> }
l. ... }
Defining \c__color_fallback_BarToneCIELAB_tl on line ...
-Defining \__color_parse_mix_BarToneCIELAB:nw on line ...
-Defining \__color_parse_model_BarToneCIELAB:w on line ...
Defining \__color_backend_fill_BarToneCIELAB:n on line ...
Defining \__color_backend_stroke_BarToneCIELAB:n on line ...
Defining \__color_backend_select_BarToneCIELAB:n on line ...
+Defining \__color_model_BarToneCIELAB_white: on line ...
+Defining \__color_parse_mix_BarToneCIELAB:nw on line ...
+Defining \__color_parse_model_BarToneCIELAB:w on line ...
Defining \__color_convert_BarToneCIELAB_cmyk:w on line ...
Defining \__color_convert_BarToneCIELAB_rgb:w on line ...
Defining \__color_convert_BarToneCIELAB_gray:w on line ...
-Defining \__color_model_BarToneCIELAB_white: on line ...
The color BarToneCIELAB is undefined.
> .
<recently read> }
@@ -412,12 +412,12 @@ l. ... }
TEST 13: DeviceN spaces
============================================================
Defining \c__color_fallback_TwoUp_tl on line ...
-Defining \__color_parse_model_TwoUp:w on line ...
-Defining \__color_parse_mix_TwoUp:nw on line ...
Defining \__color_backend_fill_TwoUp:n on line ...
Defining \__color_backend_stroke_TwoUp:n on line ...
Defining \__color_backend_select_TwoUp:n on line ...
Defining \__color_model_TwoUp_white: on line ...
+Defining \__color_parse_model_TwoUp:w on line ...
+Defining \__color_parse_mix_TwoUp:nw on line ...
Defining \__color_convert_TwoUp_gray:w on line ...
Defining \__color_convert_TwoUp_rgb:w on line ...
Defining \__color_convert_TwoUp_cmyk:w on line ...
@@ -434,12 +434,12 @@ The color foo has the properties:
<recently read> }
l. ... }
Defining \c__color_fallback_AllIn_tl on line ...
-Defining \__color_parse_model_AllIn:w on line ...
-Defining \__color_parse_mix_AllIn:nw on line ...
Defining \__color_backend_fill_AllIn:n on line ...
Defining \__color_backend_stroke_AllIn:n on line ...
Defining \__color_backend_select_AllIn:n on line ...
Defining \__color_model_AllIn_white: on line ...
+Defining \__color_parse_model_AllIn:w on line ...
+Defining \__color_parse_mix_AllIn:nw on line ...
Defining \__color_convert_AllIn_gray:w on line ...
Defining \__color_convert_AllIn_rgb:w on line ...
Defining \__color_convert_AllIn_cmyk:w on line ...
diff --git a/l3kernel/testfiles/m3color003.xetex.tlg b/l3kernel/testfiles/m3color003.xetex.tlg
index 49013bcae..0febffaed 100644
--- a/l3kernel/testfiles/m3color003.xetex.tlg
+++ b/l3kernel/testfiles/m3color003.xetex.tlg
@@ -196,15 +196,15 @@ l. ... }
TEST 8: Creating new models
============================================================
Defining \c__color_fallback_BarToneCMYK_tl on line ...
-Defining \__color_parse_mix_BarToneCMYK:nw on line ...
-Defining \__color_parse_model_BarToneCMYK:w on line ...
Defining \__color_backend_fill_BarToneCMYK:n on line ...
Defining \__color_backend_stroke_BarToneCMYK:n on line ...
Defining \__color_backend_select_BarToneCMYK:n on line ...
+Defining \__color_model_BarToneCMYK_white: on line ...
+Defining \__color_parse_mix_BarToneCMYK:nw on line ...
+Defining \__color_parse_model_BarToneCMYK:w on line ...
Defining \__color_convert_BarToneCMYK_cmyk:w on line ...
Defining \__color_convert_BarToneCMYK_rgb:w on line ...
Defining \__color_convert_BarToneCMYK_gray:w on line ...
-Defining \__color_model_BarToneCMYK_white: on line ...
Defining \l__color_named_fooCMYK_tl on line ...
Defining \l__color_named_fooCMYK_prop on line ...
The color fooCMYK has the properties:
@@ -213,15 +213,15 @@ The color fooCMYK has the properties:
<recently read> }
l. ... }
Defining \c__color_fallback_BarToneRGB_tl on line ...
-Defining \__color_parse_mix_BarToneRGB:nw on line ...
-Defining \__color_parse_model_BarToneRGB:w on line ...
Defining \__color_backend_fill_BarToneRGB:n on line ...
Defining \__color_backend_stroke_BarToneRGB:n on line ...
Defining \__color_backend_select_BarToneRGB:n on line ...
+Defining \__color_model_BarToneRGB_white: on line ...
+Defining \__color_parse_mix_BarToneRGB:nw on line ...
+Defining \__color_parse_model_BarToneRGB:w on line ...
Defining \__color_convert_BarToneRGB_rgb:w on line ...
Defining \__color_convert_BarToneRGB_cmyk:w on line ...
Defining \__color_convert_BarToneRGB_gray:w on line ...
-Defining \__color_model_BarToneRGB_white: on line ...
Defining \l__color_named_fooRGB_tl on line ...
Defining \l__color_named_fooRGB_prop on line ...
The color fooRGB has the properties:
@@ -230,15 +230,15 @@ The color fooRGB has the properties:
<recently read> }
l. ... }
Defining \c__color_fallback_BarToneGray_tl on line ...
-Defining \__color_parse_mix_BarToneGray:nw on line ...
-Defining \__color_parse_model_BarToneGray:w on line ...
Defining \__color_backend_fill_BarToneGray:n on line ...
Defining \__color_backend_stroke_BarToneGray:n on line ...
Defining \__color_backend_select_BarToneGray:n on line ...
+Defining \__color_model_BarToneGray_white: on line ...
+Defining \__color_parse_mix_BarToneGray:nw on line ...
+Defining \__color_parse_model_BarToneGray:w on line ...
Defining \__color_convert_BarToneGray_cmyk:w on line ...
Defining \__color_convert_BarToneGray_gray:w on line ...
Defining \__color_convert_BarToneGray_rgb:w on line ...
-Defining \__color_model_BarToneGray_white: on line ...
Defining \l__color_named_fooGray_tl on line ...
Defining \l__color_named_fooGray_prop on line ...
The color fooGray has the properties:
@@ -247,16 +247,16 @@ The color fooGray has the properties:
<recently read> }
l. ... }
Defining \c__color_fallback_BarToneCIELAB_tl on line ...
-Defining \__color_parse_mix_BarToneCIELAB:nw on line ...
-Defining \__color_parse_model_BarToneCIELAB:w on line ...
Defining \__color_backend_fill_BarToneCIELAB:n on line ...
Defining \__color_backend_stroke_BarToneCIELAB:n on line ...
Defining \__color_backend_select_BarToneCIELAB:n on line ...
+Defining \__color_model_BarToneCIELAB_white: on line ...
+Defining \__color_parse_mix_BarToneCIELAB:nw on line ...
+Defining \__color_parse_model_BarToneCIELAB:w on line ...
Defining \c__pdf_backend_object___color_illuminant_CIELAB_d65_int on line ..
Defining \__color_convert_BarToneCIELAB_cmyk:w on line ...
Defining \__color_convert_BarToneCIELAB_rgb:w on line ...
Defining \__color_convert_BarToneCIELAB_gray:w on line ...
-Defining \__color_model_BarToneCIELAB_white: on line ...
The color BarToneCIELAB is undefined.
> .
<recently read> }
@@ -408,12 +408,12 @@ l. ... }
TEST 13: DeviceN spaces
============================================================
Defining \c__color_fallback_TwoUp_tl on line ...
-Defining \__color_parse_model_TwoUp:w on line ...
-Defining \__color_parse_mix_TwoUp:nw on line ...
Defining \__color_backend_fill_TwoUp:n on line ...
Defining \__color_backend_stroke_TwoUp:n on line ...
Defining \__color_backend_select_TwoUp:n on line ...
Defining \__color_model_TwoUp_white: on line ...
+Defining \__color_parse_model_TwoUp:w on line ...
+Defining \__color_parse_mix_TwoUp:nw on line ...
Defining \__color_convert_TwoUp_gray:w on line ...
Defining \__color_convert_TwoUp_rgb:w on line ...
Defining \__color_convert_TwoUp_cmyk:w on line ...
@@ -430,12 +430,12 @@ The color foo has the properties:
<recently read> }
l. ... }
Defining \c__color_fallback_AllIn_tl on line ...
-Defining \__color_parse_model_AllIn:w on line ...
-Defining \__color_parse_mix_AllIn:nw on line ...
Defining \__color_backend_fill_AllIn:n on line ...
Defining \__color_backend_stroke_AllIn:n on line ...
Defining \__color_backend_select_AllIn:n on line ...
Defining \__color_model_AllIn_white: on line ...
+Defining \__color_parse_model_AllIn:w on line ...
+Defining \__color_parse_mix_AllIn:nw on line ...
Defining \__color_convert_AllIn_gray:w on line ...
Defining \__color_convert_AllIn_rgb:w on line ...
Defining \__color_convert_AllIn_cmyk:w on line ...
More information about the latex3-commits
mailing list.