[latex3-commits] [l3svn] branch master updated: Correct gray -> cmyk conversion

[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.

The following commit(s) were added to refs/heads/master by this push:
       new  4f2dafe   Correct gray -> cmyk conversion
4f2dafe is described below

commit 4f2dafead1844d7dbdc4ad260fa834a1a7d561db
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Wed Oct 11 22:24:05 2017 +0100

    Correct gray -> cmyk conversion
---
 l3trial/l3color-extra/l3color-extra.dtx              |    2 +-
 l3trial/l3color-extra/testfiles/m3color-extra001.lvt |    2 ++
 l3trial/l3color-extra/testfiles/m3color-extra001.tlg |    5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/l3trial/l3color-extra/l3color-extra.dtx b/l3trial/l3color-extra/l3color-extra.dtx
index d636664..326d47d 100644
--- a/l3trial/l3color-extra/l3color-extra.dtx
+++ b/l3trial/l3color-extra/l3color-extra.dtx
@@ -212,7 +212,7 @@
 \cs_new:Npn \@@_convert_gray_rgb:w #1 ~ #2 \q_stop
   { #1 ~ #1 ~ #1 }
 \cs_new:Npn \@@_convert_gray_cmyk:w #1 ~ #2 \q_stop
-  { 0 ~ 0 ~ 0 ~ #1 }
+  { 0 ~ 0 ~ 0 ~ \fp_eval:n { 1 - #1 } }
 %    \end{macrocode}
 %   These rather odd values are based on \textsc{ntsc} television: the set are
 %   used for the |cmyk| conversion.
diff --git a/l3trial/l3color-extra/testfiles/m3color-extra001.lvt b/l3trial/l3color-extra/testfiles/m3color-extra001.lvt
index 1abe74d..7954b85 100644
--- a/l3trial/l3color-extra/testfiles/m3color-extra001.lvt
+++ b/l3trial/l3color-extra/testfiles/m3color-extra001.lvt
@@ -55,6 +55,8 @@
     \color_show:n { foo1 }
     \color_set:nn { foo2 } { cyan!50!red }
     \color_show:n { foo2 }
+    \color_set:nn { foo3 } { cyan!50!red!10!black }
+    \color_show:n { foo3 }
   }
 
 \TEST { Showing~colors }
diff --git a/l3trial/l3color-extra/testfiles/m3color-extra001.tlg b/l3trial/l3color-extra/testfiles/m3color-extra001.tlg
index 2f82778..015c0ce 100644
--- a/l3trial/l3color-extra/testfiles/m3color-extra001.tlg
+++ b/l3trial/l3color-extra/testfiles/m3color-extra001.tlg
@@ -86,6 +86,11 @@ The color foo2 has the properties:
 >  value  =>  0.5, 0.5, 0.5, 0.
 <recently read> }
 l. ...  }
+The color foo3 has the properties:
+>  model  =>  cmyk
+>  value  =>  0.05, 0.05, 0.05, 0.9.
+<recently read> }
+l. ...  }
 ============================================================
 ============================================================
 TEST 5: Showing colors

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