[latex3-commits] [l3svn] branch master updated: Go with "spot" not "named" for colour model
noreply at latex-project.org
noreply at latex-project.org
Thu Sep 28 18:45:26 CEST 2017
This is an automated email from the git hooks/post-receive script.
joseph pushed a commit to branch master
in repository l3svn.
The following commit(s) were added to refs/heads/master by this push:
new 0431092 Go with "spot" not "named" for colour model
0431092 is described below
commit 04310927baee50c20b651f81549c038e5af4c72e
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Thu Sep 28 17:41:20 2017 +0100
Go with "spot" not "named" for colour model
This will I think be slightly clearer once some mechanism for adding
'colour names' is sorted (cf. \color{blue}, which is a 'name' but not
a spot colour).
---
l3kernel/l3color.dtx | 4 ++--
l3kernel/l3drivers.dtx | 28 ++++++++++++++--------------
l3kernel/testfiles/m3expl001.luatex.tlg | 4 ++--
l3kernel/testfiles/m3expl001.ptex.tlg | 4 ++--
l3kernel/testfiles/m3expl001.tlg | 4 ++--
l3kernel/testfiles/m3expl001.uptex.tlg | 4 ++--
l3kernel/testfiles/m3expl001.xetex.tlg | 4 ++--
l3kernel/testfiles/m3expl003.luatex.tlg | 4 ++--
l3kernel/testfiles/m3expl003.ptex.tlg | 4 ++--
l3kernel/testfiles/m3expl003.tlg | 4 ++--
l3kernel/testfiles/m3expl003.uptex.tlg | 4 ++--
l3kernel/testfiles/m3expl003.xetex.tlg | 4 ++--
12 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/l3kernel/l3color.dtx b/l3kernel/l3color.dtx
index d8e44e3..d99a027 100644
--- a/l3kernel/l3color.dtx
+++ b/l3kernel/l3color.dtx
@@ -96,12 +96,12 @@
% \item \texttt{rgb} RGB color requiring three entries in the
% \meta{settings}, one for each of red, green and blue, each in the
% range~$[0,1]$
-% \item \texttt{named} A pre-defined named (spot) color, with one two
+% \item \texttt{spot} A pre-defined spot color, with one two
% entries in the setting, the name itself and the loading (tint);
% the latter should be in the range~$[0,1]$
% \end{itemize}
%
-% Additional models may be created to allow mixing of named colors. The
+% Additional models may be created to allow mixing of spot colors. The
% number of \meta{settings} these require will depend on the number of
% colors to be mixed.
% \begin{texnote}
diff --git a/l3kernel/l3drivers.dtx b/l3kernel/l3drivers.dtx
index 0d432ee..1c2f3a7 100644
--- a/l3kernel/l3drivers.dtx
+++ b/l3kernel/l3drivers.dtx
@@ -513,7 +513,7 @@
% \begin{macro}[aux]{\@@_color_pickup:}
% Allow for \LaTeXe{} color. Here, the possible input values are limited:
% \texttt{dvips}-style colors can mainly be taken as-is with the exception
-% of named ones (here we need a model and a tint).
+% spot ones (here we need a model and a tint).
% \begin{macrocode}
%<*package>
\AtBeginDocument
@@ -524,7 +524,7 @@
{
\exp_args:NV \tl_if_head_is_space:nTF \current at color
{
- \tl_set:Nn \l__color_current_model_tl { named }
+ \tl_set:Nn \l__color_current_model_tl { spot }
\tl_set:Nx \l__color_current_setting_tl
{ \exp_args:wN \use:n \current at color \c_space_tl 1 }
}
@@ -548,10 +548,10 @@
% \@@_color_convert_gray: ,
% \@@_color_convert_cmyk: ,
% \@@_color_convert_rgb: ,
-% \@@_color_convert_named:
+% \@@_color_convert_spot:
% }
% \begin{macro}[aux]{\@@_color_reset:}
-% Convert the color data to the appropriate form: \texttt{named} colors can't
+% Convert the color data to the appropriate form: \texttt{spot} colors can't
% have a tint level here! The easy route of just picking up \texttt{named}
% won't work as there could be additional models created for mixing named
% colors. (They would not be supported at the moment, but still need to be
@@ -574,12 +574,12 @@
{ cmyk ~ \l__color_current_setting_tl }
\cs_new:Npn \@@_color_convert_rgb:
{ rgb ~ \l__color_current_setting_tl }
-\cs_new:Npn \@@_color_convert_named:
+\cs_new:Npn \@@_color_convert_spot:
{
- \exp_after:wN \@@_color_convert_named:w
+ \exp_after:wN \@@_color_convert_spot:w
\l__color_current_setting_tl
}
-\cs_new:Npn \@@_color_convert_named:w #1 ~ #2
+\cs_new:Npn \@@_color_convert_spot:w #1 ~ #2
{ \c_space_tl #1 }
\cs_new_protected:Npn \@@_color_reset:
{ \tex_special:D { color~pop } }
@@ -642,7 +642,7 @@
{
\str_if_eq:nnTF {#2} { cs }
{
- \tl_set:Nn \l__color_current_model_tl { named }
+ \tl_set:Nn \l__color_current_model_tl { spot }
\tl_set:Nx \l__color_current_setting_tl
{ \use_none:n #1 ~ #5 }
}
@@ -676,13 +676,13 @@
% \@@_color_convert_gray: ,
% \@@_color_convert_cmyk: ,
% \@@_color_convert_rgb: ,
-% \@@_color_convert_named:
+% \@@_color_convert_spot:
% }
-% \begin{macro}[aux, EXP]{\@@_color_convert_named:w}
+% \begin{macro}[aux, EXP]{\@@_color_convert_spot:w}
% \begin{macro}[aux]{\@@_color_reset:}
% There is a dedicated primitive/primitive interface for setting colors.
% As with scoping, this approach is not suitable for cached operations.
-% Most of the conversions are trivial but the need to cover named colors
+% Most of the conversions are trivial but the need to cover spot colors
% makes life slightly more interesting.
% \begin{macrocode}
\cs_new_protected:Npx \@@_color_ensure_current:
@@ -714,12 +714,12 @@
\l__color_current_setting_tl \c_space_tl rg ~
\l__color_current_setting_tl \c_space_tl RG
}
-\cs_new:Npn \@@_color_convert_named:
+\cs_new:Npn \@@_color_convert_spot:
{
- \exp_after:wN \@@_color_convert_named:w
+ \exp_after:wN \@@_color_convert_spot:w
\l__color_current_setting_tl
}
-\cs_new:Npn \@@_color_convert_named:w #1 ~ #2
+\cs_new:Npn \@@_color_convert_spot:w #1 ~ #2
{
/#1 ~ cs ~ /#1 ~ CS ~ #2 ~ sc ~ #2 ~ SC
}
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 50c3406..1a3aa6f 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -5709,8 +5709,8 @@ Defining \__driver_color_ensure_current: on line ...
Defining \__driver_color_convert_gray: on line ...
Defining \__driver_color_convert_cmyk: on line ...
Defining \__driver_color_convert_rgb: on line ...
-Defining \__driver_color_convert_named: on line ...
-Defining \__driver_color_convert_named:w on line ...
+Defining \__driver_color_convert_spot: on line ...
+Defining \__driver_color_convert_spot:w on line ...
Defining \__driver_color_reset: on line ...
Defining \__driver_literal:n on line ...
Defining \__driver_scope_begin: on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 15a6f0b..cc9c398 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -5698,8 +5698,8 @@ Defining \__driver_color_ensure_current: on line ...
Defining \__driver_color_convert_gray: on line ...
Defining \__driver_color_convert_cmyk: on line ...
Defining \__driver_color_convert_rgb: on line ...
-Defining \__driver_color_convert_named: on line ...
-Defining \__driver_color_convert_named:w on line ...
+Defining \__driver_color_convert_spot: on line ...
+Defining \__driver_color_convert_spot:w on line ...
Defining \__driver_color_reset: on line ...
Defining \__driver_literal:n on line ...
Defining \__driver_scope_begin: on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 726c8a8..eb12bf2 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -5901,8 +5901,8 @@ Defining \__driver_color_ensure_current: on line ...
Defining \__driver_color_convert_gray: on line ...
Defining \__driver_color_convert_cmyk: on line ...
Defining \__driver_color_convert_rgb: on line ...
-Defining \__driver_color_convert_named: on line ...
-Defining \__driver_color_convert_named:w on line ...
+Defining \__driver_color_convert_spot: on line ...
+Defining \__driver_color_convert_spot:w on line ...
Defining \__driver_color_reset: on line ...
Defining \__driver_literal:n on line ...
Defining \__driver_scope_begin: on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 5961963..17a56ac 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -5897,8 +5897,8 @@ Defining \__driver_color_ensure_current: on line ...
Defining \__driver_color_convert_gray: on line ...
Defining \__driver_color_convert_cmyk: on line ...
Defining \__driver_color_convert_rgb: on line ...
-Defining \__driver_color_convert_named: on line ...
-Defining \__driver_color_convert_named:w on line ...
+Defining \__driver_color_convert_spot: on line ...
+Defining \__driver_color_convert_spot:w on line ...
Defining \__driver_color_reset: on line ...
Defining \__driver_literal:n on line ...
Defining \__driver_scope_begin: on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 32c2ae3..31f521b 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -5681,8 +5681,8 @@ Defining \__driver_color_ensure_current: on line ...
Defining \__driver_color_convert_gray: on line ...
Defining \__driver_color_convert_cmyk: on line ...
Defining \__driver_color_convert_rgb: on line ...
-Defining \__driver_color_convert_named: on line ...
-Defining \__driver_color_convert_named:w on line ...
+Defining \__driver_color_convert_spot: on line ...
+Defining \__driver_color_convert_spot:w on line ...
Defining \__driver_color_reset: on line ...
Defining \__driver_literal:n on line ...
Defining \__driver_scope_begin: on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 50c3406..1a3aa6f 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -5709,8 +5709,8 @@ Defining \__driver_color_ensure_current: on line ...
Defining \__driver_color_convert_gray: on line ...
Defining \__driver_color_convert_cmyk: on line ...
Defining \__driver_color_convert_rgb: on line ...
-Defining \__driver_color_convert_named: on line ...
-Defining \__driver_color_convert_named:w on line ...
+Defining \__driver_color_convert_spot: on line ...
+Defining \__driver_color_convert_spot:w on line ...
Defining \__driver_color_reset: on line ...
Defining \__driver_literal:n on line ...
Defining \__driver_scope_begin: on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 15a6f0b..cc9c398 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -5698,8 +5698,8 @@ Defining \__driver_color_ensure_current: on line ...
Defining \__driver_color_convert_gray: on line ...
Defining \__driver_color_convert_cmyk: on line ...
Defining \__driver_color_convert_rgb: on line ...
-Defining \__driver_color_convert_named: on line ...
-Defining \__driver_color_convert_named:w on line ...
+Defining \__driver_color_convert_spot: on line ...
+Defining \__driver_color_convert_spot:w on line ...
Defining \__driver_color_reset: on line ...
Defining \__driver_literal:n on line ...
Defining \__driver_scope_begin: on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 726c8a8..eb12bf2 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -5901,8 +5901,8 @@ Defining \__driver_color_ensure_current: on line ...
Defining \__driver_color_convert_gray: on line ...
Defining \__driver_color_convert_cmyk: on line ...
Defining \__driver_color_convert_rgb: on line ...
-Defining \__driver_color_convert_named: on line ...
-Defining \__driver_color_convert_named:w on line ...
+Defining \__driver_color_convert_spot: on line ...
+Defining \__driver_color_convert_spot:w on line ...
Defining \__driver_color_reset: on line ...
Defining \__driver_literal:n on line ...
Defining \__driver_scope_begin: on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 5961963..17a56ac 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -5897,8 +5897,8 @@ Defining \__driver_color_ensure_current: on line ...
Defining \__driver_color_convert_gray: on line ...
Defining \__driver_color_convert_cmyk: on line ...
Defining \__driver_color_convert_rgb: on line ...
-Defining \__driver_color_convert_named: on line ...
-Defining \__driver_color_convert_named:w on line ...
+Defining \__driver_color_convert_spot: on line ...
+Defining \__driver_color_convert_spot:w on line ...
Defining \__driver_color_reset: on line ...
Defining \__driver_literal:n on line ...
Defining \__driver_scope_begin: on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 32c2ae3..31f521b 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -5681,8 +5681,8 @@ Defining \__driver_color_ensure_current: on line ...
Defining \__driver_color_convert_gray: on line ...
Defining \__driver_color_convert_cmyk: on line ...
Defining \__driver_color_convert_rgb: on line ...
-Defining \__driver_color_convert_named: on line ...
-Defining \__driver_color_convert_named:w on line ...
+Defining \__driver_color_convert_spot: on line ...
+Defining \__driver_color_convert_spot:w on line ...
Defining \__driver_color_reset: on line ...
Defining \__driver_literal:n on line ...
Defining \__driver_scope_begin: on line ...
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the latex3-commits
mailing list