From 70ad28046c3443b3ec8b79256c30c575689752f0 Mon Sep 17 00:00:00 2001
From: Matthew Butterick <mb@mbtype.com>
Date: Thu, 27 Dec 2018 12:47:45 -0800
Subject: [PATCH] even cachier

---
 pitfall/pitfall/embedded-font.rkt | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/pitfall/pitfall/embedded-font.rkt b/pitfall/pitfall/embedded-font.rkt
index 5e282b1f..3726630d 100644
--- a/pitfall/pitfall/embedded-font.rkt
+++ b/pitfall/pitfall/embedded-font.rkt
@@ -58,22 +58,15 @@ https://github.com/mbutterick/pdfkit/blob/master/lib/font/embedded.coffee
 
     (define/override (string-width str size [features null])
       ; #f disables features ; null enables default features ; list adds features
-      (hash-ref! width-cache
-                 (list str size (and features (sort features symbol<?)))
-                 (λ ()
-                   (define run (layout font str features))
-                   (define width (glyphrun-advance-width run))
-                   (define scale (/ size (+ (font-units-per-em font) 0.0)))
-                   (* width scale))))
-
-    ;; called from text.rkt
+      (match-define (list _ posns) (encode str features))
+      (define scale (/ size (+ (font-units-per-em font) 0.0)))
+      (define width (for/sum ([p (in-vector posns)]) (glyph-position-x-advance p)))
+      (* width scale))
+
     (define layout-cache (make-hash))
-    
-    (define/override (encode str [features null])
-      (define layout-subcache
-        (hash-ref! layout-cache features make-hash))
-      
-      (hash-ref! layout-subcache str
+    ;; called from text.rkt    
+    (define/override (encode str [features null])      
+      (hash-ref! (hash-ref! layout-cache features make-hash) str
                  (λ () 
                    (define glyph-run (layout font str features))
                    (define glyphs (glyphrun-glyphs glyph-run))