[latex3-commits] [l3svn] 01/02: Most basic colour expression parsing test/fixes

[noreply at latex-project.org]

This is an automated email from the git hooks/post-receive script.

joseph pushed a commit to branch master
in repository l3svn.

commit 07064a672f77567ad0bda3157081c4ff53c39650
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Wed Oct 11 19:35:43 2017 +0100

    Most basic colour expression parsing test/fixes
    
    Currently we don't get any actual mixing!
---
 l3trial/l3color-extra/l3color-extra.dtx              |   13 ++++++-------
 l3trial/l3color-extra/testfiles/m3color-extra001.lvt |    6 ++++++
 l3trial/l3color-extra/testfiles/m3color-extra001.tlg |   11 ++++++++++-
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/l3trial/l3color-extra/l3color-extra.dtx b/l3trial/l3color-extra/l3color-extra.dtx
index 4eb82c5..abdb97f 100644
--- a/l3trial/l3color-extra/l3color-extra.dtx
+++ b/l3trial/l3color-extra/l3color-extra.dtx
@@ -268,7 +268,7 @@
 % \end{variable}
 %
 % \begin{macro}[int]{\@@_parse:nN}
-% \begin{macro}[aux]{\@@_parse_aux:nN, \@@_parse_aux:VN}
+% \begin{macro}[aux]{\@@_parse_aux:nN}
 % \begin{macro}[aux]{\@@_parse:Nw}
 % \begin{macro}[aux]{\@@_parse_loop_init:Nnn}
 % \begin{macro}[aux]{\@@_parse_loop:w}
@@ -297,7 +297,7 @@
         }
       \tl_set:Nx \l_@@_tmp_tl {#1}
     \exp_args:NNV \group_end:
-    \@@_parse_aux:VN \l_@@_tmp_tl #2
+    \@@_parse_aux:nN \l_@@_tmp_tl #2
   }
 %    \end{macrocode}
 %   Before going to all of the effort of parsing an expression, these two
@@ -310,7 +310,6 @@
       { \tl_set_eq:Nc #2 { l_@@_named_ #1 _tl } }
       { \@@_parse:Nw #2#1 ! \q_stop }
   }
-\cs_generate_variant:Nn \@@_parse_aux:nN { V }
 \cs_new_protected:Npn \@@_parse:Nw #1#2 ! #3 \q_stop
   {
     \@@_if_defined:nTF {#2}
@@ -320,7 +319,7 @@
           { \@@_parse_loop_init:Nnn #1 {#2} {#3} }
       }
       {
-        \msg_kernel_error:nnn { color } { unknown-color } {#3}
+        \__msg_kernel_error:nnn { color } { unknown-color } {#3}
         \tl_set_eq:NN \l__color_current_tl \l_@@_named_black_tl
       }
   }
@@ -355,7 +354,7 @@
   {
     \bool_lazy_or:nnF
       { \tl_if_blank_p:n {#1} }
-      { ! \int_compare_p:nNn {#1} = 100 }
+      { ! \int_compare_p:nNn {#1} = { 100 } }
       {
         \int_compare:nNnTF {#1} = { 0 }
           {
@@ -417,7 +416,7 @@
           }
       }
       {
-        \msg_kernel_error:nnn { color } { unknown-color } {#2}
+        \__msg_kernel_error:nnn { color } { unknown-color } {#2}
         \@@_extract:nNN { black } \l_@@_model_tl \l_@@_value_tl
         \@@_parse_break:w
       }
@@ -575,7 +574,7 @@
           { \tl_set_eq:cc { l_@@_named_ #1 _tl } { l_@@_named_ #2 _tl } }
       }
       {
-        \msg_kernel_error:nnn { color } { unknown-color } {#2}
+        \__msg_kernel_error:nnn { color } { unknown-color } {#2}
       }
   }
 %    \end{macrocode}
diff --git a/l3trial/l3color-extra/testfiles/m3color-extra001.lvt b/l3trial/l3color-extra/testfiles/m3color-extra001.lvt
index c2a27f2..1f6fe5d 100644
--- a/l3trial/l3color-extra/testfiles/m3color-extra001.lvt
+++ b/l3trial/l3color-extra/testfiles/m3color-extra001.lvt
@@ -25,6 +25,12 @@
     \color_show:n { foo3 }
   }
 
+\TEST { Naming~colors~by~expression }
+  {
+    \color_set:nn { foo1 } { black }
+    \color_show:n { foo1 }
+  }
+
 \TEST { Showing~colors }
   {
     \color_show:n { unknown }
diff --git a/l3trial/l3color-extra/testfiles/m3color-extra001.tlg b/l3trial/l3color-extra/testfiles/m3color-extra001.tlg
index 36b9438..fc9a01e 100644
--- a/l3trial/l3color-extra/testfiles/m3color-extra001.tlg
+++ b/l3trial/l3color-extra/testfiles/m3color-extra001.tlg
@@ -24,7 +24,16 @@ The color foo3 has the properties:
 l. ...  }
 ============================================================
 ============================================================
-TEST 2: Showing colors
+TEST 2: Naming colors by expression
+============================================================
+The color foo1 has the properties:
+>  model  =>  gray
+>  value  =>  0.
+<recently read> }
+l. ...  }
+============================================================
+============================================================
+TEST 3: Showing colors
 ============================================================
 The color unknown is undefined.
 > .

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.