From e460fda8c7865ee778d7b51d756a06129ac0431c Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 5 Mar 2019 14:14:53 +0000
Subject: [PATCH] wip

---
 cmyk.ps | 47 +++++++++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/cmyk.ps b/cmyk.ps
index dd6d66d..68b028e 100644
--- a/cmyk.ps
+++ b/cmyk.ps
@@ -63,15 +63,19 @@
 } def
 /kentry_x {
     textx
-    magenta stridox mul  add
-    blackx  stridix mul  add
+    magentax stridox mul  add
+    blackx   stridix mul  add
     
 } def
 /kentry_y {
     blacky  neg kmy add  stridiy mul
-    cyan    neg gm add   stridoy mul  add
+    cyany   neg  gm add  stridoy mul  add
 } def 
 
+/cm_xy2val {
+    maxval gm div mul round cvi
+} def
+
 /someyellow {
     
     /gn     gm    1 add   def
@@ -90,19 +94,19 @@
     /szfx  stridix  margix sub  def
     /szfy  stridiy  margiy sub  def
 
-    0 1 gm {		/cyan    exch def
-    0 1 kmy {	        /blacky exch def
+    0 1 gm {		/cyany    exch def
+    0 1 kmy {	        /blacky   exch def
 
-    0 1 gm {		/magenta exch def
-    0 1 kmx {	        /blackx  exch def
+    0 1 gm {		/magentax exch def
+    0 1 kmx {	        /blackx   exch def
 
     gsave
         szfy setlinewidth
         kentry_x kentry_y translate
 
-        	cyan		gn div
-                 magenta	gn div
-                 yellow		gn div
+        	cyany		gn div
+                 magentax	gn div
+                 yellowval	gn div
  	         klist_get maxval div
 
                  setcmykcolor
@@ -110,8 +114,9 @@
                 0  szfy +0.5 mul  moveto
                 szfx 0 rlineto stroke
 
-      cyan 0 le  blacky 0 le and {  % top row
-          0  texty neg  translate
+      cyany 0 le  blacky 0 le  and {  % top row
+          0  setgray
+          0  stridiy margoy add  translate
 	  0 0 moveto
 	  text_u
       } if
@@ -151,8 +156,6 @@ start_page
 
 /maxval 8 def
 
-
-
 /gm 8 def
 
 /knx 1 def
@@ -166,20 +169,20 @@ start_page
 
 /text_ul {
     (Y) show
-    yellow (_) cvs show
+    yellowval (_) cvs show
 } def
 
 /text_cyan {
     (C) show
-    cyan (_) cvs show
+    cyany cm_xy2val (_) cvs show
 } def
 /text_magenta {
-    (C) show
-    magenta (_) cvs show
+    (M) show
+    magentax cm_xy2val (_) cvs show
 } def
 
 /text_l {
-    cyan 0 le {
+    cyany 0 le {
       gsave
 	0 texty rmoveto
  (K) show
@@ -192,10 +195,14 @@ start_page
 } def
 /text_u {
     text_magenta
+    magentax gm ge {
+	(/) show
+	gm (_) cvs show
+    } if
 } def
 
 /ranges {
-    0 1 gm {			/yellow  exch def
+    0 1 maxval {		/yellowval  exch def
 
         /ytext { digits yellow get } def
 
-- 
2.30.2