[latex3-commits] [git/LaTeX3-latex3-latex3] master: Revert "Move \color_parse:nN to \___color_parse:nN" (311080927)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/31108092707eef59ef86beb1e5c90a2732a815d1

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

commit 31108092707eef59ef86beb1e5c90a2732a815d1
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sun Jun 14 17:07:30 2020 +0100

    Revert "Move \color_parse:nN to \___color_parse:nN"
    
    This reverts commit 563e258a4b79a3936d863626a9935d6b237f3c87.


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

31108092707eef59ef86beb1e5c90a2732a815d1
 l3experimental/l3color/l3color.dtx | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/l3experimental/l3color/l3color.dtx b/l3experimental/l3color/l3color.dtx
index 995af0925..8c45bb95c 100644
--- a/l3experimental/l3color/l3color.dtx
+++ b/l3experimental/l3color/l3color.dtx
@@ -237,6 +237,25 @@
 %   and similar are not influenced by this setting.
 % \end{variable}
 %
+% \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}
 %
@@ -423,8 +442,8 @@
 %    \end{macrocode}
 % \end{variable}
 %
+% \begin{macro}{\color_parse:nN}
 % \begin{macro}{\@@_parse:nN}
-% \begin{macro}{\@@_parse_aux:nN}
 % \begin{macro}{\@@_parse:Nw}
 % \begin{macro}{\@@_parse_loop_init:Nnn}
 % \begin{macro}{\@@_parse_loop:w}
@@ -443,20 +462,20 @@
 %   otherwise expands, then starts working through the expression itself.
 %   At the end, we apply the payload.
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_parse:nN #1#2
+\cs_new_protected:Npn \color_parse:nN #1#2
   {
 %<*package>
     \@@_backend_pickup:N \l_@@_current_tl
     \tl_set_eq:cN { l_@@_named_ . _tl } \l_@@_current_tl
 %</package>
-    \exp_args:Ne \@@_parse_aux:nN { \tl_to_str:n {#1} } #2
+    \exp_args:Ne \@@_parse:nN { \tl_to_str:n {#1} } #2
   }
 %    \end{macrocode}
 %   Before going to all of the effort of parsing an expression, these two
 %   precursor functions look for a pre-defined name, either on its own or
 %   with a trailing |!| (which is the same thing).
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_parse_aux:nN #1#2
+\cs_new_protected:Npn \@@_parse:nN #1#2
   {
     \tl_if_exist:cTF { l_@@_named_ #1 _tl }
       { \tl_set_eq:Nc #2 { l_@@_named_ #1 _tl } }
@@ -810,7 +829,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \color_select:n #1
   {
-    \@@_parse:nN {#1} \l_@@_current_tl
+    \color_parse:nN {#1} \l_@@_current_tl
     \@@_select:
   }
 \cs_new_protected:Npn \color_select:nn #1#2
@@ -873,7 +892,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \color_set:nn #1#2
   {
-    \@@_parse:nN {#2} \l_@@_named_tl
+    \color_parse:nN {#2} \l_@@_named_tl
     \@@_store:Nn \l_@@_named_tl {#1}
   }
 \cs_new_protected:Npn \color_set:nnn #1#2#3