[latex3-commits] [l3svn] branch master updated: At least at the moment, keep colour data internal
noreply at latex-project.org
noreply at latex-project.org
Thu Jun 15 21:30:21 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 8e5a4d7 At least at the moment, keep colour data internal
8e5a4d7 is described below
commit 8e5a4d7b7edd05b26a3772d5b310f0514e629a26
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Thu Jun 15 20:30:01 2017 +0100
At least at the moment, keep colour data internal
---
l3kernel/l3color.dtx | 46 ++++++++++++++++---------------
l3kernel/l3drivers.dtx | 10 +++----
l3kernel/testfiles/m3expl001.luatex.tlg | 2 +-
l3kernel/testfiles/m3expl001.ptex.tlg | 2 +-
l3kernel/testfiles/m3expl001.tlg | 2 +-
l3kernel/testfiles/m3expl001.uptex.tlg | 2 +-
l3kernel/testfiles/m3expl001.xetex.tlg | 2 +-
l3kernel/testfiles/m3expl003.luatex.tlg | 2 +-
l3kernel/testfiles/m3expl003.ptex.tlg | 2 +-
l3kernel/testfiles/m3expl003.tlg | 2 +-
l3kernel/testfiles/m3expl003.uptex.tlg | 2 +-
l3kernel/testfiles/m3expl003.xetex.tlg | 2 +-
12 files changed, 39 insertions(+), 37 deletions(-)
diff --git a/l3kernel/l3color.dtx b/l3kernel/l3color.dtx
index 15daa96..8d25d76 100644
--- a/l3kernel/l3color.dtx
+++ b/l3kernel/l3color.dtx
@@ -51,25 +51,6 @@
% material here is mainly intended to support a small number of low-level
% requirements in other \pkg{l3kernel} modules.
%
-% \begin{variable}[added = 2017-06-15]{\l_color_current_tl}
-% The color currently active for foreground (text, \emph{etc.}) material.
-% This is stored in the form of a color model followed by one or more
-% values in the range $[0,1]$: these determine the color. The model and
-% applicable data format must be one of the following:
-% \begin{itemize}
-% \item \texttt{gray \meta{gray}} Grayscale color with the \meta{gray}
-% value running from $0$ (fully black) to $1$ (fully white)
-% \item \texttt{cmyk \meta{cyan} \meta{magenta} \meta{yellow} \meta{black}}
-% \item \texttt{rgb \meta{red} \meta{green} \meta{blue}}
-% \end{itemize}
-% Notice that the value are separated by spaces.
-% \begin{texnote}
-% This format is the native one for \texttt{dvips} color specials:
-% other drivers are expected to convert to their own format when
-% writing color data to output.
-% \end{texnote}
-% \end{function}
-%
% \section{Color in boxes}
%
% Controlling the color of text in boxes requires a small number of control
@@ -95,6 +76,27 @@
% \cs{color_group_begin:} \ldots \cs{color_group_end:} group.
% \end{function}
%
+% \subsection{Internal functions}
+%
+% \begin{variable}[added = 2017-06-15]{\l__color_current_tl}
+% The color currently active for foreground (text, \emph{etc.}) material.
+% This is stored in the form of a color model followed by one or more
+% values in the range $[0,1]$: these determine the color. The model and
+% applicable data format must be one of the following:
+% \begin{itemize}
+% \item \texttt{gray \meta{gray}} Grayscale color with the \meta{gray}
+% value running from $0$ (fully black) to $1$ (fully white)
+% \item \texttt{cmyk \meta{cyan} \meta{magenta} \meta{yellow} \meta{black}}
+% \item \texttt{rgb \meta{red} \meta{green} \meta{blue}}
+% \end{itemize}
+% Notice that the value are separated by spaces.
+% \begin{texnote}
+% This format is the native one for \texttt{dvips} color specials:
+% other drivers are expected to convert to their own format when
+% writing color data to output.
+% \end{texnote}
+% \end{function}
+%
% \end{documentation}
%
% \begin{implementation}
@@ -131,12 +133,12 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{variable}{\l_color_current_tl}
+% \begin{variable}{\l__color_current_tl}
% The current color: the format here is taken from \texttt{dvips} but it
% is easy enough to convert to \texttt{pdfmode} as required.
% \begin{macrocode}
-\tl_new:N \l_color_current_tl
-\tl_set:Nn \l_color_current_tl { gray~0 }
+\tl_new:N \l__color_current_tl
+\tl_set:Nn \l__color_current_tl { gray~0 }
% \end{macrocode}
% \end{variable}
%
diff --git a/l3kernel/l3drivers.dtx b/l3kernel/l3drivers.dtx
index f5a78a7..0e00c63 100644
--- a/l3kernel/l3drivers.dtx
+++ b/l3kernel/l3drivers.dtx
@@ -519,7 +519,7 @@
\@ifpackageloaded { color }
{
\cs_new_protected:Npn \@@_color_pickup:
- { \tl_set_eq:NN \l_color_current_tl \current at color }
+ { \tl_set_eq:NN \l__color_current_tl \current at color }
}
{ \cs_new_protected:Npn \@@_color_pickup: { } }
}
@@ -536,7 +536,7 @@
%<*package>
\@@_color_pickup:
%</package>
- \tex_special:D { color~push~\l_color_current_tl }
+ \tex_special:D { color~push~\l__color_current_tl }
}
\cs_new_protected:Npn \@@_color_reset:
{ \tex_special:D { color~pop } }
@@ -567,10 +567,10 @@
{
\cs_new_protected:Npn \@@_color_pickup:
{
- \tl_set:Nx \l_color_current_tl
+ \tl_set:Nx \l__color_current_tl
{
\exp_after:wN \@@_color_pickup_aux:w
- \l_color_current_tl ~ 0 ~ 0 ~ 0 \q_stop
+ \l__color_current_tl ~ 0 ~ 0 ~ 0 \q_stop
}
}
\cs_new:Npn \@@_color_pickup_aux:w #1 ~ #2 ~ #3 ~ #4 ~ #5 ~ #6 \q_stop
@@ -627,7 +627,7 @@
{
\exp_not:N \exp_after:wN
\exp_not:N \@@_color_convert:w
- \exp_not:N \l_color_current_tl
+ \exp_not:N \l__color_current_tl
\c_space_tl 0 ~ 0 ~ 0
\exp_not:N \q_stop
}
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 730b63e..daae3a2 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -5294,7 +5294,7 @@ Defining message LaTeX/kernel/show-coffin on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
-Defining \l_color_current_tl on line ...
+Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
Defining \c_sys_hour_int on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 427ba49..23a5592 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -5284,7 +5284,7 @@ Defining message LaTeX/kernel/show-coffin on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
-Defining \l_color_current_tl on line ...
+Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
Defining \c_sys_hour_int on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 6486a60..148c6df 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -5284,7 +5284,7 @@ Defining message LaTeX/kernel/show-coffin on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
-Defining \l_color_current_tl on line ...
+Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
Defining \c_sys_hour_int on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 8632ddb..681cde1 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -5282,7 +5282,7 @@ Defining message LaTeX/kernel/show-coffin on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
-Defining \l_color_current_tl on line ...
+Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
Defining \c_sys_hour_int on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index fe2c035..59fefdf 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -5272,7 +5272,7 @@ Defining message LaTeX/kernel/show-coffin on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
-Defining \l_color_current_tl on line ...
+Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
Defining \c_sys_hour_int on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index f2c56f7..de37ee5 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -5295,7 +5295,7 @@ Defining message LaTeX/kernel/show-coffin on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
-Defining \l_color_current_tl on line ...
+Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
Defining \c_sys_hour_int on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 77762c0..595e527 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -5285,7 +5285,7 @@ Defining message LaTeX/kernel/show-coffin on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
-Defining \l_color_current_tl on line ...
+Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
Defining \c_sys_hour_int on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index a273b8b..3af0465 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -5285,7 +5285,7 @@ Defining message LaTeX/kernel/show-coffin on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
-Defining \l_color_current_tl on line ...
+Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
Defining \c_sys_hour_int on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index d49cc73..05c164a 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -5283,7 +5283,7 @@ Defining message LaTeX/kernel/show-coffin on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
-Defining \l_color_current_tl on line ...
+Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
Defining \c_sys_hour_int on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 2b02731..1b5ab82 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -5273,7 +5273,7 @@ Defining message LaTeX/kernel/show-coffin on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
-Defining \l_color_current_tl on line ...
+Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
Defining \c_sys_hour_int 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