From 2514b6493d7f78e2fb9a7f1107209d3c443018a3 Mon Sep 17 00:00:00 2001
From: Matthew Butterick <mb@mbtype.com>
Date: Mon, 19 Jun 2017 12:03:38 -0700
Subject: [PATCH] subset with composites

---
 pitfall/fontkit/subset.rkt               |  16 ++++---
 pitfall/fontkit/ttfglyph.rkt             |  55 +++++++++++++++++++++--
 pitfall/pitfall/test/out.bin             | Bin 4199 -> 3373 bytes
 pitfall/pitfall/test/test13.coffee       |  23 ++++++++++
 pitfall/pitfall/test/test13.pdf          | Bin 0 -> 5418 bytes
 pitfall/pitfall/test/test13.rkt          |  27 +++++++++++
 pitfall/pitfall/test/test13crkt copy.pdf | Bin 0 -> 4058 bytes
 pitfall/pitfall/test/test13crkt.pdf      | Bin 0 -> 4058 bytes
 pitfall/pitfall/test/test13rkt copy.pdf  | Bin 0 -> 5418 bytes
 pitfall/pitfall/test/test13rkt.pdf       | Bin 0 -> 5418 bytes
 pitfall/restructure/stream.rkt           |   4 +-
 11 files changed, 114 insertions(+), 11 deletions(-)
 create mode 100644 pitfall/pitfall/test/test13.coffee
 create mode 100644 pitfall/pitfall/test/test13.pdf
 create mode 100644 pitfall/pitfall/test/test13.rkt
 create mode 100644 pitfall/pitfall/test/test13crkt copy.pdf
 create mode 100644 pitfall/pitfall/test/test13crkt.pdf
 create mode 100644 pitfall/pitfall/test/test13rkt copy.pdf
 create mode 100644 pitfall/pitfall/test/test13rkt.pdf

diff --git a/pitfall/fontkit/subset.rkt b/pitfall/fontkit/subset.rkt
index a59fa6a0..56540788 100644
--- a/pitfall/fontkit/subset.rkt
+++ b/pitfall/fontkit/subset.rkt
@@ -71,10 +71,12 @@ https://github.com/mbutterick/fontkit/blob/master/src/subset/TTFSubset.js
 
   ;; if it is a compound glyph, include its components
   (when (and glyf (negative? (· glyf numberOfContours)))
-    (set! buffer (+Buffer buffer))
     (for ([component (in-list (· glyf components))])
-      (define gid (includeGlyph (· component glyphID)))
-      (send buffer writUInt16BE gid (send component pos))))
+      (define gid (send this includeGlyph (· component glyphID)))
+      (define es (+EncodeStream))
+      (send uint16be encode es gid)
+      (bytes-copy! buffer (· component pos) (send es dump))))
+  
   ;; skip variation shit
 
   (push-end-field! glyf this buffer)
@@ -83,7 +85,7 @@ https://github.com/mbutterick/fontkit/blob/master/src/subset/TTFSubset.js
 
   (hash-update! (get-field hmtx this) 'metrics (λ (ms) (append ms
                                                                (list (mhash 'advance (· glyph advanceWidth)
-                                                                      'bearing (· (send glyph _getMetrics) leftBearing))))))
+                                                                            'bearing (· (send glyph _getMetrics) leftBearing))))))
 
   (increment-field! offset this (bytes-length buffer))
   (sub1 (length (· this glyf))))
@@ -101,7 +103,11 @@ https://github.com/mbutterick/fontkit/blob/master/src/subset/TTFSubset.js
   (set-field! hmtx this (mhash 'metrics empty 'bearings empty))
 
   ;; include all the glyphs used in the document
-  (for ([gid (in-list (· this glyphs))])
+  ;; not using `in-list` because we need to support adding more
+  ;; glyphs to the array as component glyphs are discovered & enqueued
+  (for ([idx (in-naturals)]
+        #:break (= idx (length (· this glyphs))))
+    (define gid (list-ref (· this glyphs) idx))
     (send this _addGlyph gid))
 
   (define maxp (cloneDeep (send (· this font) _getTable 'maxp)))
diff --git a/pitfall/fontkit/ttfglyph.rkt b/pitfall/fontkit/ttfglyph.rkt
index 6bb98e91..63d49f9a 100644
--- a/pitfall/fontkit/ttfglyph.rkt
+++ b/pitfall/fontkit/ttfglyph.rkt
@@ -28,7 +28,8 @@ https://github.com/mbutterick/fontkit/blob/master/src/glyph/TTFGlyph.js
 (match-define (list ARG_1_AND_2_ARE_WORDS    
                     ARGS_ARE_XY_VALUES       
                     ROUND_XY_TO_GRID         
-                    WE_HAVE_A_SCALE          
+                    WE_HAVE_A_SCALE
+                    ___NO-FLAG___
                     MORE_COMPONENTS          
                     WE_HAVE_AN_X_AND_Y_SCALE 
                     WE_HAVE_A_TWO_BY_TWO     
@@ -37,7 +38,7 @@ https://github.com/mbutterick/fontkit/blob/master/src/glyph/TTFGlyph.js
                     OVERLAP_COMPOUND         
                     SCALED_COMPONENT_OFFSET  
                     UNSCALED_COMPONENT_OFFSET)
-  (map (curry expt 2) (range 12)))
+  (map (curry expt 2) (range 13)))
 
 ;; Represents a point in a simple glyph
 (define-subclass object% (Point onCurve endContour [x 0] [y 0])
@@ -149,6 +150,52 @@ https://github.com/mbutterick/fontkit/blob/master/src/glyph/TTFGlyph.js
     )
 
   (define/public (_decodeComposite glyph stream [offset 0])
-    (unfinished)))
+    ;; this is a composite glyph
+    (hash-set! glyph 'components empty)
+    (define haveInstructions #f)
+    (define flags MORE_COMPONENTS)
+
+    (hash-set! glyph 'components
+               (for/list ([i (in-naturals)]
+                          #:break (zero? (bitwise-and flags MORE_COMPONENTS)))
+                 (set! flags (send uint16be decode stream))
+                 (define gPos (- (send stream pos) offset))
+                 (define glyphID (send uint16be decode stream))
+                 (unless haveInstructions
+                   (set! haveInstructions (not (zero? (bitwise-and flags WE_HAVE_INSTRUCTIONS)))))
+
+                 (match-define
+                   (list dx dy)
+                   (let ([decoder (if (not (zero? (bitwise-and flags ARG_1_AND_2_ARE_WORDS))) int16be int8)])
+                     (list (send decoder decode stream) (send decoder decode stream))))
+
+                 (define component (+Component glyphID dx dy))
+                 (set-field! pos component gPos)
+
+                 (cond
+                   [(not (zero? (bitwise-and flags WE_HAVE_A_SCALE)))
+                    (define scale (read-fixed14 stream))
+                    (set-field! scaleX component scale)
+                    (set-field! scaleY component scale)]
+                   [(not (zero? (bitwise-and flags WE_HAVE_AN_X_AND_Y_SCALE)))
+                    (set-field! scaleX component (read-fixed14 stream))
+                    (set-field! scaleY component (read-fixed14 stream))]
+                   [(not (zero? (bitwise-and flags WE_HAVE_A_TWO_BY_TWO)))
+                    (set-field! scaleX component (read-fixed14 stream))
+                    (set-field! scale01 component (read-fixed14 stream))
+                    (set-field! scale10 component (read-fixed14 stream))
+                    (set-field! scaleY component (read-fixed14 stream))])
+                 
+                 component))
+
+    haveInstructions
+    ))
         
-    
+
+(define (bytes->fixed14 b1 b2)
+  (/ (+ (* b1 (expt 2 8)) b2) (expt 2 14) 1.0))
+  
+(define (read-fixed14 stream)
+  (define b1 (send uint8 decode stream))
+  (define b2 (send uint8 decode stream))
+  (bytes->fixed14 b1 b2))
\ No newline at end of file
diff --git a/pitfall/pitfall/test/out.bin b/pitfall/pitfall/test/out.bin
index f22176fe1693c4cccef0a05a9fc7347302d9613b..0be093371961d49cf800dcf09b0da8fb2770e605 100644
GIT binary patch
delta 1827
zcmY*ZU5pb|6h8NM+U{<<yX~~oX}fefbo#f`W&5}7u7ZU{-Cd2Y1_YJ>8c<n-3lczs
zFVx_RnqZLSfd_pvCOr7GJapT*kf4dt2ls(T9`Gk<#6(Os0spAqolZB{$@H9i?!9yG
z_nq&YpY_k9=Qkh79zA&aI9WfY!RRl)bxOC#HQ4C!6R&pX=P;g~UwHelJ^vX|@7J##
zJ$1S>_8fzK=J4_PqxQJ@(WL|VfHnA({$egBvy1E|-;L)Gzvh^5JmEOw_*g1P??_jq
zpNL^)U{Pc5)}{7+BL0EnIt3_BMH-{aO&X*;IdV-(kQ25=G2*0>lxvXF*P!Go-h6`w
z;g7%{$v3Hl9SOhuNR!Iz-Wc}85TgdslXDF+@<YpHkfXNO4s6N~)t70Lh_rAaMnRm>
zqA0vR%PYgnTIU+RW!#3XH7F%c#G79&6j@2*N^pQ1iBVn|t8q2qQi7p!sahFJs{vIp
zDqC5`aK{<E@qnZ3V5LY-mt{Q{iR9w49M9FGS}v!>hljm)xBOUh&-^ysH~HnGzwZ2I
z-f>;lO)RsQo4UNojBBQ;#m(RU{m?r+>>Rjyb-;<8{KSK^Ou<!C?LXONc87F&R-oYI
z#@)N<y#l?L-0SGM2-JCp4=?bk7CsIy2Cs>9aPoq`LNVp)A}p6eN)V$=C2iPX#}#(@
zh3CpUH|s`iPi1CSi>e_tGPz^_?6$3DF*&(!Vq*XHWOXDQ8{9Fl@X~>KbBx+;Ty`Ta
zo4Lc&IEKhY{r|vN6ZhCPehYDr6(4ZJEUoo9+2U8u3w5)7kIe(5NpH3QkW<P^)gZhW
zye4>v(IBqfAeLXoRt_jCR=KU1idYD-E-hKXLiQnAWD$@%tYpE3WU(T{gD%zz^&&Ge
zHg;8GYKM+=rczcri67;eQC1nNmP;y|EB0iJY%XU;$0O-Od(+#a1+SSKDfLIwk!_Rv
zc0XQXuS_fHgq{iZM}peK)bpOcv%A8hMqooI=-IHjwEgLj#fgc`{=%2QNqx{F#V5f4
zD(aY>1{*^(-vUaGN0f<*(r~YKF?s|f&qElaA`tE9-ifaW-8U!-jQAWh?t$m9G|+=(
z9*a1_CnKwcnc`ONhnmYujg41JK&cp@!|fL$*DCV#sdThD<mz{6njVbjYyPP}l1?8x
z5>LK3R0#3@-QlMm{NQsYY4L`1x8BANM-Ex(_FKs0#SXG7(8n8a!!+E<vutNqMN6O-
zdPKKMks%8~p}0{IH|i?1lMl$$U12_VpTo%3CiIjR(~XkT<9v*z6EkM9FWI98Q;fYX
zpwkVWV3+tUfY+M{pg7j+hXiLt9#KE+CTibpjI&D@N(cF^m6fG$drgK~I>Kk!`+Nyx
ztF)^@VRR`4Zy4P5qG$9%d=7{YQ7{b2uFKH=dhdF5+U42_V7u#PgJiUvfDJEgNz7Is
z{7;lvJ*Fs{_MH;5EMJO+gd2)=tpI4?Phz*x2&yd%IrV_mu1+KYQR>LTgIUo88zk9c
zz#YW-R-)0@gb2RySHG|Lr%tll4|e*T^`xC?anJ&od=E^zXp1OG(Z`#>4z)o|-2?y6
zshG!BOKlR^a*7VC8W}-!^jLLn&-gKLeeT=}F;oSwx9_tRN?Gq6O7V#*X>67v>^zxb
j0s9;F3}TpM;dYy?(G|QmtoRxoVPP^bURYWiILZD4weE5#

literal 4199
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

diff --git a/pitfall/pitfall/test/test13.coffee b/pitfall/pitfall/test/test13.coffee
new file mode 100644
index 00000000..79baadf8
--- /dev/null
+++ b/pitfall/pitfall/test/test13.coffee
@@ -0,0 +1,23 @@
+PDFDocument = require 'pdfkit'
+fs = require 'fs'
+
+make = (doc) -> 
+
+  # Register a font name for use later
+  doc.registerFont('Charter', 'assets/charter.ttf')
+
+  # Set the font, draw some text
+  doc.font('Charter')
+     .fontSize(25)
+     .text('Åcçénts äre în', 100, 100, {width: false})
+                 
+  doc.end()
+
+
+doc = new PDFDocument({compress: no})
+doc.pipe(fs.createWriteStream('test13.pdf'))
+make doc
+
+#doc = new PDFDocument({compress: yes})
+#doc.pipe(fs.createWriteStream('test12c.pdf'))
+#make doc
diff --git a/pitfall/pitfall/test/test13.pdf b/pitfall/pitfall/test/test13.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..1c452ac22c9d8dcdfedde2c03ee748e68c8c513c
GIT binary patch
literal 5418
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
T&P(-H6mR&<KHu2Iar6HH!%*uZ

literal 0
HcmV?d00001

diff --git a/pitfall/pitfall/test/test13.rkt b/pitfall/pitfall/test/test13.rkt
new file mode 100644
index 00000000..75e99472
--- /dev/null
+++ b/pitfall/pitfall/test/test13.rkt
@@ -0,0 +1,27 @@
+#lang pitfall/pdftest
+
+(define-runtime-path charter-path "assets/charter.ttf")
+
+(define (proc doc)
+  ;; Register a font name for use later
+  (send doc registerFont "Charter" (path->string charter-path))
+
+  ;; Set the font, draw some text
+  (send* doc
+    [font "Charter"]
+    [fontSize 25]
+    [text "Åcçénts äre în" 100 100 (hash 'width #f)]))
+
+;; test against non-subsetted font version
+(define-runtime-path this "test13rkt.pdf")
+(make-doc this #f proc)
+
+(define-runtime-path that "test13crkt.pdf")
+(make-doc that #t proc #:pdfkit #f)
+
+#;(module+ test
+  (define doc (make-object PDFDocument))
+  (send doc registerFont "Charter" (path->string charter-path))
+  (send* doc [font "Charter"])
+  (send doc pipe (open-output-string))
+  (send doc end))
diff --git a/pitfall/pitfall/test/test13crkt copy.pdf b/pitfall/pitfall/test/test13crkt copy.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..ffcb9401f116092b5a6d97a415b00c3483e54110
GIT binary patch
literal 4058
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
a8o<E$;&7o?-fFh61RM$>FK=|1jQBrJM5(j@

literal 0
HcmV?d00001

diff --git a/pitfall/pitfall/test/test13crkt.pdf b/pitfall/pitfall/test/test13crkt.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..ffcb9401f116092b5a6d97a415b00c3483e54110
GIT binary patch
literal 4058
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
a8o<E$;&7o?-fFh61RM$>FK=|1jQBrJM5(j@

literal 0
HcmV?d00001

diff --git a/pitfall/pitfall/test/test13rkt copy.pdf b/pitfall/pitfall/test/test13rkt copy.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..e8fc9343d3c2aed03de29989b394ee535e583611
GIT binary patch
literal 5418
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

literal 0
HcmV?d00001

diff --git a/pitfall/pitfall/test/test13rkt.pdf b/pitfall/pitfall/test/test13rkt.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..e8fc9343d3c2aed03de29989b394ee535e583611
GIT binary patch
literal 5418
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

literal 0
HcmV?d00001

diff --git a/pitfall/restructure/stream.rkt b/pitfall/restructure/stream.rkt
index f012b23b..f98e99b5 100644
--- a/pitfall/restructure/stream.rkt
+++ b/pitfall/restructure/stream.rkt
@@ -80,8 +80,8 @@ https://github.com/mbutterick/restructure/blob/master/src/DecodeStream.coffee
     (set-port-position! _port current-position)
     bs)
 
-  (define/public-final (readUInt8)
-    (read 1))
+  (define/public-final (readUInt8) (read 1))
+  (define/public-final (readInt8) (read 1))
 
   (define/public-final (read count)
     (unless (index? count)