From 6bbf49a14eb2e647daa4d9b28916df74cbc1eb2b Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 6 Mar 2019 15:02:16 +0000 Subject: [PATCH] fixes to cmyk --- generate-board | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/generate-board b/generate-board index f7e3cdb..8de6473 100755 --- a/generate-board +++ b/generate-board @@ -410,17 +410,18 @@ sub pscolour ($$$$) { $rw = 'setrgbcolor'; } elsif ($spec =~ m/[CMYK]/) { my @specs = split /\//, $spec; - if ($cmykix==0 && @specs==1) { + if ($cmykix==1 && @specs==1) { $spec = $specs[0]; } else { $spec = $specs[$cmykix]; - confess unless defined; + confess unless defined $spec; } my %cmyk; foreach (split /(?=[A-Z])/, $spec) { - m/^([CMYK])(?:[0-7]\.\d*|8)_?$/ or confess $_.' ?'; + m/^([CMYK])([0-7]\.\d*|8)_?$/ or confess $_.' ?'; confess if defined $cmyk{$1}; $cmyk{$1} = $2 / 8.; + print STDERR " CMYK $1 $2\n"; } @r = map { $cmyk{$_} // 0 } qw(C M Y K); $rw = 'setcmykcolor'; -- 2.30.2