next: parse path to populate subrs

fontland/fontland/subset.rkt

@@ -99,7 +99,7 @@ https://github.com/mbutterick/fontkit/blob/master/src/subset/CFFSubset.js
     ;; apparently path parsing is not necessary?
     #;(define path (hash-ref glyph 'path)) ;; this causes the glyph to be parsed
 
-       (for ([subr (in-hash-keys (cff-glyph-_usedGsubrs glyph))])
+    (for ([subr (in-hash-keys #R (cff-glyph-_usedGsubrs glyph))])
       (hash-set! gsubrs subr #true)))
 
   (set-cff-subset-gsubrs! this (subsetSubrs
@@ -108,12 +108,12 @@ https://github.com/mbutterick/fontkit/blob/master/src/subset/CFFSubset.js
                                 gsubrs)))
 
 (define (subsetSubrs this subrs used)
+  #RRR 'in-subsetSubrs
   (for/list ([(subr i) (in-indexed subrs)])
     (cond
       [(hash-ref used i #false)
-               (peek-bytes (hash-ref subr 'length)
-                           (hash-ref subr 'offset)
-                           (hash-ref (cff-subset-cff this) 'stream))]
+       (pos (hash-ref (cff-subset-cff this) 'stream) (hash-ref subr 'offset))
+       #RRR (read-bytes (hash-ref subr 'length) (hash-ref (cff-subset-cff this) 'stream))]
       [else (bytes 11)])))
 
 

fontland/fontland/table/cff/cff-dict.rkt

@@ -12,6 +12,9 @@ https://github.com/mbutterick/fontkit/blob/master/src/cff/CFFDict.js
     [(list* 0th 1st _) (bitwise-ior (arithmetic-shift 0th 8) 1st)]
     [val val]))
 
+(define (key->op key)
+  (list (list (bitwise-and (arithmetic-shift key -8) 255) (bitwise-and key 255))))
+
 (define CFFDict%
   (class x:base%
     (super-new)
@@ -27,7 +30,7 @@ https://github.com/mbutterick/fontkit/blob/master/src/cff/CFFDict.js
         [(? list?)
          (for/list ([(op i) (in-indexed operands)])
            (decodeOperands (list-ref type i) stream ret (list op)))]
-        [(? xenomorphic?) (decode type stream #:parent ret operands)]
+        [(? xenomorphic?) (send type decode stream ret operands)]
         [(or 'number 'offset 'sid) (car operands)]
         ['boolean (if (car operands) #t #f)]
         [_  operands]))
@@ -85,7 +88,7 @@ https://github.com/mbutterick/fontkit/blob/master/src/cff/CFFDict.js
 
     (augment [@size size])
     (define (@size dict parent [includePointers #true])
-      #RRR 'in-cff-dict-size
+      #RR 'in-cff-dict-size
       #RR @name
       #RR includePointers
       
@@ -115,8 +118,8 @@ https://github.com/mbutterick/fontkit/blob/master/src/cff/CFFDict.js
                         (list (list-ref field 0))))
         (set! len (+ len #R (length key))))
 
-      #RRR 'intermediate-len
-      #RR len
+      (define intermediate-len len)
+      #RR intermediate-len
       
       (when #RR includePointers
         (set! len (+ len #RR (hash-ref ctx x:pointer-size-key))))

fontland/fontland/table/cff/cff-index.rkt

@@ -1,4 +1,4 @@
-#lang debug racket/base
+#lang debug racket
 (require racket/class racket/match xenomorph sugar/unstable/dict)
 (provide CFFIndex)
 
@@ -28,10 +28,10 @@
                                     [_ (error 'bad-offset-size-in-CFFIndex)]))
                (define startPos (+ (pos stream) (* (add1 count) offSize) -1))
                (for/fold ([vals null]
-                          [start (decode offsetType stream)]
+                          [start (send offsetType decode stream)]
                           #:result (begin0 (reverse vals) (pos stream (+ startPos start))))
                          ([i (in-range count)])
-                 (define end (decode offsetType stream))
+                 (define end (send offsetType decode stream))
                  (define val
                    (cond
                      [@type
@@ -39,7 +39,7 @@
                       (pos stream (+ startPos start))
                       (hash-set! parent 'length (- end start))
                       (begin0
-                        (decode @type stream #:parent parent)
+                        (send @type decode stream parent)
                         (pos stream apos))]
                      [else
                       (hasheq 'offset (+ startPos start)
@@ -48,6 +48,10 @@
 
     (augride [@size size])
     (define (@size arr parent)
+      #RRR 'in-cff-index-size
+      #R (length arr)
+      (when (= 819 (length arr))
+        #R (take arr 3))
       (define size 2)
       (cond
         [(zero? (length arr)) size]
@@ -57,7 +61,9 @@
          ;; find maximum offset to determinine offset type
          (define offset 1)
          (for ([(item i) (in-indexed arr)])
-              (set! offset (+ offset (send type size item parent))))
+              (set! offset (+ offset #R (send #R type size item parent))))
+
+         #RR offset
 
          (define offsetType
            (cond
@@ -70,7 +76,7 @@
          (set! size (+ size 1 (* (send offsetType size) (add1 (length arr)))))
          (set! size (+ size (sub1 offset)))
 
-         size]))
+         #RR size]))
 
     (define/augride (encode arr stream parent)
       (error 'cff-index-encode-not-implemented))))