From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Mon, 4 Mar 2019 13:29:48 +0000 (+0000)
Subject: wip new org
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=60f6620b4692ba729ae98b30dc9a1bd283130d4a;p=pandemic-rising-tide.git

wip new org
---

diff --git a/cmyk.ps b/cmyk.ps
index 63efc75..922ce85 100644
--- a/cmyk.ps
+++ b/cmyk.ps
@@ -1,33 +1,52 @@
 %!
 
-/n 16 def
+/m 16 def
 
 /knx 2 def
 /kny 4 def
 
-/szfx 11.4 def
-/szfy 10.0 def
-/marg1x 3 def
-/marg1y 3 def
-/margfx 5 def
-/margfy 5 def
+% o = outer, i = inner, f = final
 
-/sz1x szfx knx mul marg1x add def
-/sz1y szfy kny mul marg1x add def
+/szox 595 def
+/szoy 842 def
 
-0 1 n {			/yellow  exch def
-    0 1 n {		/magenta exch def
-    0 1 n {		/cyan    exch def
+/margox 5 def
+/margoy 5 def
+
+/margix 2 def
+/margiy 2 def
+
+% strid = stride
+
+/n      m     1 add   def
+/kmx    knx   1 sub   def
+/kmy    kny   1 sub   def
+
+/stridox  szox  n  div  def
+/stridoy  szoy  n  div  def
+
+/szix  stridox  margox sub  def
+/sziy  stridoy  margoy sub  def
+
+/stridix  szix  knx  div def
+/stridiy  sziy  kny  div def
+
+/szfx  stridix  margix sub  def
+/szfy  stridiy  margiy sub  def
+
+0 1 m {			/yellow  exch def
+    0 1 m {		/magenta exch def
+    0 1 m {		/cyan    exch def
 
     gsave
 
-        magenta			sz1x mul
-        cyan    neg n add	sz1y mul  translate
+        magenta			stridox mul
+        cyan    neg m add	stridoy mul  translate
 
         szfy setlinewidth
 
-        0 1 knx 1 sub {	/blackx exch def
-        0 1 kny 1 sub {	/blacky exch def
+        0 1 kmx {	/blackx exch def
+        0 1 kmy {	/blacky exch def
 
         	cyan		n div
                  magenta	n div
@@ -37,8 +56,8 @@
 
                  setcmykcolor
 
-                blackx			knx div	 sz1x mul  margfx add
-                 blacky neg kny add	kny div	 sz1y mul  margfy add
+                blackx				stridix mul
+                 blacky  neg kmy add		stridiy mul
                  szfy -0.5 mul add
                  moveto