[latex3-commits] [git/LaTeX3-latex3-latex3] color-multi-model: Merge branch 'master' into color-multi-model (75c3fa1a2)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : color-multi-model
Link       : https://github.com/latex3/latex3/commit/75c3fa1a298f726bce0340e0edd8cb407a4f812c

>---------------------------------------------------------------

commit 75c3fa1a298f726bce0340e0edd8cb407a4f812c
Merge: 352f389dd 563e258a4
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sun Jun 14 17:13:16 2020 +0100

    Merge branch 'master' into color-multi-model


>---------------------------------------------------------------

75c3fa1a298f726bce0340e0edd8cb407a4f812c
 l3backend/l3backend-color.dtx      | 31 +++++++++++++++----------------
 l3experimental/l3color/l3color.dtx | 31 ++++++-------------------------
 2 files changed, 21 insertions(+), 41 deletions(-)

diff --cc l3experimental/l3color/l3color.dtx
index c58f09f25,995af0925..2770bb596
--- a/l3experimental/l3color/l3color.dtx
+++ b/l3experimental/l3color/l3color.dtx
@@@ -237,50 -237,6 +237,31 @@@
  %   and similar are not influenced by this setting.
  % \end{variable}
  %
 +% \section{Multiple color models}
 +%
 +% When selecting or setting a color with an explicit model, it is possible
 +% to give values for more than one model at one time. This is particularly
 +% useful where automated conversion between models does not give the desired
 +% outcome. To do this, the list of models and list of values are both subdivided
 +% using |/| characters (as for the similar function in \pkg{xcolor}). For
 +% example, to save a color with explicit |cmyk| and |rgb| values, one could
 +% use
 +% \begin{verbatim}
 +%   \color_set:nnn { foo } { cmyk / rgb }
 +%     { 0.1 , 0.2 , 0.3 , 0.4 / 0.1, 0.2 , 0.3 }
 +% \end{verbatim}
 +% The manually-specified conversion will be used in preference to automated
 +% calculation whenever the model(s) listed are used: both in expressions and
 +% when a fixed model is active.
 +% 
 +% Similarly, the same syntax can be applied to directly selecting a color.
 +% \begin{verbatim}
 +%   \color_select:nn { cmyk / rgb }
 +%     { 0.1 , 0.2 , 0.3 , 0.4 / 0.1, 0.2 , 0.3 }
 +% \end{verbatim}
 +% Again, this list is used when a fixed model is active: the first entry is used
 +% unless there is a fixed model matching one of the other entries.
 +%
- % \section{Core color representation}
- %
- % To allow data to be handled internally, \pkg{l3color} uses a simple
- % representation of color, comprising two \meta{balanced text} entries, the first
- % the \meta{model} and the second the \meta{values} given
- % \emph{separated by spaces}.
- %
- % This core representation is produced when parsing color expressions.
- % 
- % \begin{function}{\color_parse:nN}
- %   \begin{syntax}
- %     \cs{color_parse:nN} \Arg{color expression} \Arg{tl}
- %   \end{syntax}
- %   Parses the \meta{color expression} as described above, and sets the
- %   \meta{tl} to the equivalent \meta{core color representation}
- %   (used at the backend level and based on \texttt{dvips} color
- %   representation).
- % \end{function}
- %
  % \section{Spot colors}
  % \label{l3color:sec:spot}
  %