From 0cb5b048562b36303214081fb6f9d63958539ba3 Mon Sep 17 00:00:00 2001
From: Matthew Butterick <mb@mbtype.com>
Date: Fri, 21 Dec 2018 23:06:52 -0800
Subject: [PATCH] no init color

---
 pitfall/pitfall/color.rkt    | 47 ++++++++++++++++--------------------
 pitfall/pitfall/document.rkt |  1 -
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/pitfall/pitfall/color.rkt b/pitfall/pitfall/color.rkt
index 45b65148..84228e27 100644
--- a/pitfall/pitfall/color.rkt
+++ b/pitfall/pitfall/color.rkt
@@ -41,35 +41,30 @@
 (define (color-mixin [% mixin-tester%])
   (class %
     (super-new)
-    (field [_opacityRegistry #f]
-           [_opacityCount #f]
-           [_gradCount #f]
+    (field [_opacityRegistry (mhash)]
+           [_opacityCount 0]
+           [_gradCount 0]
            [_fillColor #f])
 
-    (define/public (initColor)
-      (set! _opacityRegistry (mhash))
-      (set! _opacityCount 0)
-      (set! _gradCount 0))
-
-    (define/public (_setColor color stroke)
-      (let ([color (_normalizeColor color)]
-            [op (if stroke "SCN" "scn")])
-        (cond
-          [(not color)]
-          #;[(is-a? color PDFGradient)
-             (_setColorSpace "Pattern" stroke)
-             (send color apply op)
-             #t] ; todo
-          [else
-           (define color-space (case (length color)
-                                 [(4) "DeviceCMYK"]
-                                 [(3) "DeviceRGB"]
-                                 [else (raise-argument-error '_setColor "color of length 3 or 4" color)]))
-           (_setColorSpace color-space stroke)
+    (define/public (_setColor color-in stroke)
+      (define color (_normalizeColor color-in))
+      (define op (if stroke "SCN" "scn"))
+      (cond
+        [(not color)]
+        #;[(is-a? color PDFGradient)
+           (_setColorSpace "Pattern" stroke)
+           (send color apply op)
+           #t] ; todo
+        [else
+         (define color-space (case (length color)
+                               [(4) "DeviceCMYK"]
+                               [(3) "DeviceRGB"]
+                               [else (raise-argument-error '_setColor "color of length 3 or 4" color)]))
+         (_setColorSpace color-space stroke)
        
-           ;; 181126 don't round, to be consistent with pdfkit behavior
-           (send this addContent (format "~a ~a" (string-join (map (λ (num) (number num #:round #false)) color) " ") op))
-           #t])))
+         ;; 181126 don't round, to be consistent with pdfkit behavior
+         (send this addContent (format "~a ~a" (string-join (map (λ (num) (number num #:round #false)) color) " ") op))
+         #t]))
     
     (define/public (_setColorSpace space stroke)
       (define op (if stroke "CS" "cs"))
diff --git a/pitfall/pitfall/document.rkt b/pitfall/pitfall/document.rkt
index 58c8c813..6c96e7ba 100644
--- a/pitfall/pitfall/document.rkt
+++ b/pitfall/pitfall/document.rkt
@@ -37,7 +37,6 @@
                            'CreationDate (seconds->date (if (test-mode) 0 (current-seconds)) #f))])
 
     ;; initialize mixins
-    (send this initColor)
     (send this initVector)
     (inherit-field _ctm)
     (send this initFonts)