diff --git a/fontland/fontland/directory.rkt b/fontland/fontland/directory.rkt index b56b6dc9..7bd934d6 100644 --- a/fontland/fontland/directory.rkt +++ b/fontland/fontland/directory.rkt @@ -14,8 +14,8 @@ https://github.com/mbutterick/fontkit/blob/master/src/tables/directory.js (define table-entry (x:struct 'tag (x:symbol #:length 4) 'checkSum uint32be - 'offset (x:pointer #:offset-type uint32be - #:type 'void + 'offset (x:pointer #:type uint32be + #:dest-type 'void #:relative-to 'global) 'length uint32be)) diff --git a/fontland/fontland/table/cff/cff-pointer.rkt b/fontland/fontland/table/cff/cff-pointer.rkt index 22362513..524e8546 100644 --- a/fontland/fontland/table/cff/cff-pointer.rkt +++ b/fontland/fontland/table/cff/cff-pointer.rkt @@ -11,7 +11,7 @@ https://github.com/mbutterick/fontkit/blob/master/src/cff/CFFPointer.js (define (CFFPointer type #:relative-to [relative-to 'global] #:lazy [lazy #false]) - (x:pointer #:type type + (x:pointer #:dest-type type #:base-class CFFPointer% #:relative-to relative-to #:lazy lazy)) @@ -20,10 +20,10 @@ https://github.com/mbutterick/fontkit/blob/master/src/cff/CFFPointer.js (class x:pointer% (super-new) - (inherit-field type offset-type) + (inherit-field ptr-type) (define/override (x:decode stream parent operands) - (set! offset-type (make-object + (set! ptr-type (make-object (class x:base% (super-new) (define/augment (x:decode . args) (first operands))))) @@ -33,7 +33,7 @@ https://github.com/mbutterick/fontkit/blob/master/src/cff/CFFPointer.js (cond [(not stream) ;; compute the size (so ctx.pointerSize is correct) - (set! offset-type (make-object + (set! ptr-type (make-object (class x:base% (super-new) (define/augment (x:size . args) 0)))) @@ -41,7 +41,7 @@ https://github.com/mbutterick/fontkit/blob/master/src/cff/CFFPointer.js (list (Ptr 0))] [else (define ptr #false) - (set! offset-type (make-object + (set! ptr-type (make-object (class x:base% (super-new) (define/augment (x:encode val stream . _) (set! ptr val)))))