From c1044bdb50e496455faff9eb534259b4a9571ed8 Mon Sep 17 00:00:00 2001 From: Matthew Butterick Date: Mon, 17 Dec 2018 16:59:13 -0800 Subject: [PATCH] change version-key name --- fontland/fontland/subset.rkt | 2 +- fontland/fontland/table/loca.rkt | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/fontland/fontland/subset.rkt b/fontland/fontland/subset.rkt index d9025b04..c2a13a30 100644 --- a/fontland/fontland/subset.rkt +++ b/fontland/fontland/subset.rkt @@ -130,7 +130,7 @@ https://github.com/mbutterick/fontkit/blob/master/src/subset/TTFSubset.js (loca-pre-encode (ttf-subset-loca ss)) (define new-head-table (clone-deep (get-head-table (subset-font ss)))) - (dict-set! new-head-table 'indexToLocFormat (dict-ref (ttf-subset-loca ss) 'version)) + (dict-set! new-head-table 'indexToLocFormat (dict-ref (ttf-subset-loca ss) x:version-key)) (define new-hhea-table (clone-deep (get-hhea-table (subset-font ss)))) (dict-set! new-hhea-table 'numberOfMetrics (length (dict-ref (ttf-subset-hmtx ss) 'metrics))) diff --git a/fontland/fontland/table/loca.rkt b/fontland/fontland/table/loca.rkt index 03463e1a..789ccefb 100644 --- a/fontland/fontland/table/loca.rkt +++ b/fontland/fontland/table/loca.rkt @@ -1,4 +1,4 @@ -#lang racket/base +#lang debug racket/base (require xenomorph sugar/unstable/class sugar/unstable/js @@ -20,17 +20,18 @@ approximates https://github.com/mbutterick/fontkit/blob/master/src/tables/loca.js |# + (define (loca-pre-encode val) - (unless (dict-has-key? val 'version) - (dict-set! val 'version (if (> (last (· val offsets)) max-32-bit-value) + (unless (dict-has-key? val x:version-key) + (dict-set! val x:version-key (if (> (last (· val offsets)) max-32-bit-value) 32bit-style 16bit-style)) - (when (= 16bit-style (· val version)) + (when (= 16bit-style (dict-ref val x:version-key)) (dict-update! val 'offsets (λ (offsets) (map (λ (x) (/ x 2)) offsets))))) val) (define (loca-post-decode val) - (when (= 16bit-style (· val version)) + (when (= 16bit-style (dict-ref val x:version-key)) ;; in a 16bits-style loca table, actual 32bit offset values are divided by 2 (to fit into 16 bits) ;; so we re-inflate them. (dict-update! val 'offsets (λ (offsets) (map (λ (x) (* 2 x)) offsets)))) @@ -56,9 +57,9 @@ https://github.com/mbutterick/fontkit/blob/master/src/tables/loca.js (module+ test (require rackunit racket/serialize) (check-equal? - (encode loca (mhash 'version 0 'offsets '(0 76 156)) #f) #"\0\0\0L\0\234") + (encode loca (mhasheq x:version-key 0 'offsets '(0 76 156)) #f) #"\0\0\0L\0\234") (check-equal? - (encode loca '#hash((version . 1) (offsets . (0 76 156))) #f) #"\0\0\0\0\0\0\0L\0\0\0\234") + (encode loca (mhasheq x:version-key 1 'offsets '(0 76 156)) #f) #"\0\0\0\0\0\0\0L\0\0\0\234") (define ip (open-input-file charter-path)) (define dir (deserialize (read (open-input-file charter-directory-path)))) (define offset (dict-ref (dict-ref (dict-ref dir 'tables) 'loca) 'offset))