From c60cde7a1694f7ef61d8176942798f11b5cea563 Mon Sep 17 00:00:00 2001
From: Matthew Butterick <mb@mbtype.com>
Date: Fri, 16 Jun 2017 12:46:23 -0700
Subject: [PATCH] remove padding routine

---
 pitfall/fontkit/directory.rkt            |  24 +++++------------------
 pitfall/pitfall/test/test12.pdf          | Bin 6345 -> 6345 bytes
 pitfall/pitfall/test/test12.rkt          |   2 +-
 pitfall/pitfall/test/test12crkt copy.pdf | Bin 4474 -> 4475 bytes
 pitfall/pitfall/test/test12crkt.pdf      | Bin 4474 -> 4475 bytes
 pitfall/pitfall/test/test12rkt copy.pdf  | Bin 6354 -> 6345 bytes
 pitfall/pitfall/test/test12rkt.pdf       | Bin 6354 -> 6345 bytes
 7 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/pitfall/fontkit/directory.rkt b/pitfall/fontkit/directory.rkt
index e7af5964..ef7f6985 100644
--- a/pitfall/fontkit/directory.rkt
+++ b/pitfall/fontkit/directory.rkt
@@ -14,19 +14,6 @@ https://github.com/mbutterick/fontkit/blob/master/src/tables/directory.js
                              'offset uint32be
                              'length uint32be)))
 
-(define (pad-to-32bit bstr)
-  (define op (open-output-bytes))
-  (write-bytes bstr op)
-  (file-position op (* (ceiling (/ (file-position op) 4)) 4))
-  (get-output-bytes op))
-
-(test-module
- (check-equal? (pad-to-32bit #"") #"")
- (check-equal? (pad-to-32bit #"1") #"1\0\0\0")
- (check-equal? (pad-to-32bit #"12") #"12\0\0")
- (check-equal? (pad-to-32bit #"123") #"123\0")
- (check-equal? (pad-to-32bit #"1234") #"1234"))
-
 ;; for stupid tags like 'cvt '
 (define (symbol-replace sym this that)
   (string->symbol (string-replace (if (string? sym) sym (symbol->string sym)) this that)))
@@ -45,8 +32,8 @@ https://github.com/mbutterick/fontkit/blob/master/src/tables/directory.js
     (define table-header-size (+ preamble-length
                                  (* (length (hash-keys (· this-val tables))) (send TableEntry size))))
 
-    (define-values (table-headers table-datas)
-      (for/lists (ths tds)
+    (define-values (table-headers table-datas _)
+      (for/lists (ths tds lens)
                  ([(tag table) (in-hash (· this-val tables))])
 
                  (define table-data
@@ -57,11 +44,10 @@ https://github.com/mbutterick/fontkit/blob/master/src/tables/directory.js
                  (define table-header (mhash
                                        'tag (unescape-tag tag)
                                        'checkSum 0
-                                       'offset (apply + (cons table-header-size (map bytes-length tds)))
+                                       'offset (apply + (cons table-header-size lens))
                                        'length (bytes-length table-data)))
-
-                 (define table-data-padded (pad-to-32bit table-data))
-                 (values table-header table-data-padded)))
+        
+                 (values table-header table-data (bytes-length table-data))))
 
 
     (define numTables (length table-headers))
diff --git a/pitfall/pitfall/test/test12.pdf b/pitfall/pitfall/test/test12.pdf
index d84fe023a6077fb78cf4440b1784fae2d53a942c..b9eace51b13f21889ddd19b9ca3664f73d9ce829 100644
GIT binary patch
delta 53
xcmX?Uc+zl#921+Fp{0p|$z&BKE4JVe7awo`$tg@%pv=v7%x{@sY(usgLI9{B55E8a

delta 53
xcmX?Uc+zl#921*~fq{vM@njVyD>fHj59bKy$tg@%pv=v7%x{@sY(usgLI9u<4`=`Y

diff --git a/pitfall/pitfall/test/test12.rkt b/pitfall/pitfall/test/test12.rkt
index f3b98066..ebb2adb2 100644
--- a/pitfall/pitfall/test/test12.rkt
+++ b/pitfall/pitfall/test/test12.rkt
@@ -15,7 +15,7 @@
 
 ;; test against non-subsetted font version
 (define-runtime-path this "test12rkt.pdf")
-(make-doc this #f proc #:pdfkit #f)
+(make-doc this #f proc)
 
 (define-runtime-path that "test12crkt.pdf")
 (make-doc that #t proc #:pdfkit #f)
diff --git a/pitfall/pitfall/test/test12crkt copy.pdf b/pitfall/pitfall/test/test12crkt copy.pdf
index 22392aabdbea267a5c06e190499e999ef5e18d02..7855b83718c2109a44c8c2083070ec28f267a722 100644
GIT binary patch
delta 2676
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

delta 2675
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

diff --git a/pitfall/pitfall/test/test12crkt.pdf b/pitfall/pitfall/test/test12crkt.pdf
index 22392aabdbea267a5c06e190499e999ef5e18d02..7855b83718c2109a44c8c2083070ec28f267a722 100644
GIT binary patch
delta 2676
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

delta 2675
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

diff --git a/pitfall/pitfall/test/test12rkt copy.pdf b/pitfall/pitfall/test/test12rkt copy.pdf
index ffbe68b844cb8cb8780fac8d754308e0aebed258..8641980ec7363ae367aef1f12f1a1dee026427fb 100644
GIT binary patch
delta 281
zcmca)c+zl#8xymkrR8K#CZqa&3=F&?xrr483}C=}2}mhq<d#%G`JaHaLq<kwB81Op
z1f*4f+!QE33`m=$6{P1v`8^B_jK#@iB?=He|9>DYRZx@)HD5py$oB)wwJ|(noHh9u
zljLSm=Ciz;p9qvNN{TROGXw)=1^%l6&3VYc%`~4ui0J_X$K(<rzs*O4zO#rLC>Vf%
zLY@K_m|<XQX=FJ0g1A4U!DIyqD=kA~3<U;;<``l|W|os%BwRU-%(+xmUH#p-0RFN$
AK>z>%

delta 289
zcmX?Uc*$^s8xymUfyHD`CZqZT3=F&?xrr483}C=}1xP7m<d#%G`CovvLq<kwB81Op
z0;E-d+!QE30!W*s6{P1v`4boz7>kq3N)#Y`0Tv)FRZx@)HD3TE?gy4@V|d0mYw|B9
zNk)dvLd@rQH{TN|W0YYKVbEp>1}YHvuLd;gAp<wld<G$=2Minx43l$({FoRRHt!bt
z&LV25U;qLNc?w)$hJmT2vBBiy;{J@5lf@;hw2X`}6c`wpVTc)-TTHH&aOE^M<5E?1
I^>^a}09-scIsgCw

diff --git a/pitfall/pitfall/test/test12rkt.pdf b/pitfall/pitfall/test/test12rkt.pdf
index ffbe68b844cb8cb8780fac8d754308e0aebed258..8641980ec7363ae367aef1f12f1a1dee026427fb 100644
GIT binary patch
delta 281
zcmca)c+zl#8xymkrR8K#CZqa&3=F&?xrr483}C=}2}mhq<d#%G`JaHaLq<kwB81Op
z1f*4f+!QE33`m=$6{P1v`8^B_jK#@iB?=He|9>DYRZx@)HD5py$oB)wwJ|(noHh9u
zljLSm=Ciz;p9qvNN{TROGXw)=1^%l6&3VYc%`~4ui0J_X$K(<rzs*O4zO#rLC>Vf%
zLY@K_m|<XQX=FJ0g1A4U!DIyqD=kA~3<U;;<``l|W|os%BwRU-%(+xmUH#p-0RFN$
AK>z>%

delta 289
zcmX?Uc*$^s8xymUfyHD`CZqZT3=F&?xrr483}C=}1xP7m<d#%G`CovvLq<kwB81Op
z0;E-d+!QE30!W*s6{P1v`4boz7>kq3N)#Y`0Tv)FRZx@)HD3TE?gy4@V|d0mYw|B9
zNk)dvLd@rQH{TN|W0YYKVbEp>1}YHvuLd;gAp<wld<G$=2Minx43l$({FoRRHt!bt
z&LV25U;qLNc?w)$hJmT2vBBiy;{J@5lf@;hw2X`}6c`wpVTc)-TTHH&aOE^M<5E?1
I^>^a}09-scIsgCw