From 09963bf5a53cc19b9464cc36175e8ecf1ba65fb8 Mon Sep 17 00:00:00 2001
From: Matthew Butterick <mb@mbtype.com>
Date: Tue, 23 May 2017 21:43:06 -1000
Subject: [PATCH] resume in path:T

---
 pitfall/pitfall/path.rkt            |  42 +++++++++++++++-------------
 pitfall/pitfall/test/test11.rkt     |   4 +--
 pitfall/pitfall/test/test11crkt.pdf | Bin 738 -> 729 bytes
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/pitfall/pitfall/path.rkt b/pitfall/pitfall/path.rkt
index 1c496ceb..7757c741 100644
--- a/pitfall/pitfall/path.rkt
+++ b/pitfall/pitfall/path.rkt
@@ -38,36 +38,40 @@
             ([cmd (in-list commands)])
     (match-define (cons cmd-name cmd-args) cmd)
     (let loop ([cmd-name cmd-name][cmd-args cmd-args])
+      (match-define (list a0 a1 a2 a3 a4 a5)
+        (append cmd-args (make-list (- 6 (length cmd-args)) #f)))
       (case cmd-name
         [(M) (send doc moveTo . cmd-args)
-             (match-define (list a0 a1) cmd-args)
              (values a0 a1 #f #f a0 a1)]
-        [(m) (match-define (list a0 a1) cmd-args)
-             (loop 'M (list (+ cx a0) (+ cy a1)))]
+        [(m) (loop 'M (list (+ cx a0) (+ cy a1)))]
         [(C) (send doc bezierCurveTo . cmd-args)
-             (match-define (list a0 a1 a2 a3 a4 a5) cmd-args)
              (values a4 a5 a2 a3 sx sy)]
-        [(c) (match-define (list a0 a1 a2 a3 a4 a5) cmd-args)
-             (loop 'C (list (+ cx a0) (+ cy a1)
+        [(c) (loop 'C (list (+ cx a0) (+ cy a1)
                             (+ cx a2) (+ cy a3)
                             (+ cx a4) (+ cy a5)))]
+        [(S) (match-let ([(list px py) (if (not px)
+                                           (list cx cy)
+                                           (list px py))])
+               (send doc bezierCurveyTo (- cx (- px cx)) (- cy (- py cy)) a0 a1 a2 a3)
+               (values a2 a3 a0 a1 sx sy))]
+        [(s) (loop 'S (list (+ cx a0) (+ cy a1)
+                            (+ cx a2) (+ cy a3)))]
         [(L) (send doc lineTo . cmd-args)
-             (match-define (list a0 a1) cmd-args)
              (values a0 a1 #f #f sx sy)]
-        [(l) (match-define (list a0 a1) cmd-args)
-             (loop 'L (list (+ cx a0) (+ cy a1)))]
-        [(H) (match-define (list a0) cmd-args)
-             (loop 'L (list a0 cy))]
-        [(h) (match-define (list a0) cmd-args)
-             (loop 'L (list (+ cx a0) cy))]
-        [(V) (match-define (list a0) cmd-args)
-             (loop 'L (list cx a0))]
-        [(v) (match-define (list a0) cmd-args)
-             (loop 'L (list cx (+ cy a0)))]
-             
+        [(l) (loop 'L (list (+ cx a0) (+ cy a1)))]
+        [(H) (loop 'L (list a0 cy))]
+        [(h) (loop 'L (list (+ cx a0) cy))]
+        [(V) (loop 'L (list cx a0))]
+        [(v) (loop 'L (list cx (+ cy a0)))]
         [(Q) (send doc quadraticCurveTo . cmd-args)
-             (match-define (list a0 a1 a2 a3) cmd-args)
              (values a2 a3 a0 a1 sx sy)]
+        [(q) (loop 'Q (list (+ cx a0) (+ cy a1)
+                            (+ cx a2) (+ cy a3)))]
+        [(T) (match-define (list px py)
+               (if (not px)
+                   (list cx py)
+                   (list (- cx (- px cx) (- cy (- py cy))))))
+             (send doc quadraticCurveTo . cmd-args)]
         [(z) (send doc closePath . cmd-args)
              (values sx sy px py sx sy)]
         [else (raise-argument-error 'apply-commands "valid command name" cmd-name)]))))
\ No newline at end of file
diff --git a/pitfall/pitfall/test/test11.rkt b/pitfall/pitfall/test/test11.rkt
index dfcd3104..c3af19f2 100644
--- a/pitfall/pitfall/test/test11.rkt
+++ b/pitfall/pitfall/test/test11.rkt
@@ -2,11 +2,11 @@
 
 (define (proc doc)
   (send doc translate 200 300)
-  (send* doc [path "m 0 0 v 100 h 100 v -100 h -100"]
+  (send* doc [path "M 0 0 v 100 h 100 v -100 h -100"]
     [stroke])
 
   (send doc translate 0 150)
-  (send* doc [path "M 0 0 L 0 100 L 100 0 L 0 -100 L -100 0"]
+  (send* doc [path "M 0 0 l 0 100 l 100 0 l 0 -100 l -100 0"]
     [stroke]))
 
 
diff --git a/pitfall/pitfall/test/test11crkt.pdf b/pitfall/pitfall/test/test11crkt.pdf
index 43436d46bf7f3df10fe3cab18d78599b9983ff0e..51ee86bc1b53ac7af6ccf1ce23749931d5d94393 100644
GIT binary patch
delta 69
zcmaFFdXsg+Ste7<iRXhkJTGxDRQpNHpKQ$dSIpF0!2kpl@)Wqh3<Cob1B=OSOnyv;
UW|OBeIddACaH*=g`nz!f0Pm9$kpKVy

delta 78
zcmcb~`iOPHStc`!iRXg_3o}|YuD5c$IONi_lVQywiJz0T82^fynJE~6fI^-E7nosS
dU}9)K*_O$V$;fnaFOxH;kujI5s;j>n7XWg)7)<~G