From fb5b5c7d10b1189305c0d66695b63b084b475819 Mon Sep 17 00:00:00 2001
From: Matthew Butterick <mb@mbtype.com>
Date: Tue, 12 Mar 2019 15:47:38 -0700
Subject: [PATCH] testier

---
 pitfall/pitfall/check-pdf.rkt | 59 ++++++++++++++++++++++++++---------
 pitfall/pitfall/pdftest.rkt   |  2 +-
 pitfall/ptest/alltest.rkt     |  2 +-
 pitfall/ptest/test20.rkt      |  3 ++
 pitfall/ptest/test21.rkt      | 10 +++---
 5 files changed, 56 insertions(+), 20 deletions(-)

diff --git a/pitfall/pitfall/check-pdf.rkt b/pitfall/pitfall/check-pdf.rkt
index 4439058b..04537c96 100644
--- a/pitfall/pitfall/check-pdf.rkt
+++ b/pitfall/pitfall/check-pdf.rkt
@@ -1,5 +1,5 @@
 #lang debug racket
-(require rackunit (prefix-in zlib: pitfall/zlib))
+(require rackunit (prefix-in zlib: pitfall/zlib) fontland/table/cff/cff-top)
 (provide (all-defined-out))
 
 (define (xref-offset bs)
@@ -63,7 +63,7 @@
         (for/list ([kv (in-slice 2 items)]
                    ;; suppress these keys so we can compare pdfkit & pitfall output
                    #:unless (member (car kv) (list #"/Producer" #"/Creator" #"/CreationDate")))
-          (apply cons kv))
+                  (apply cons kv))
         bytes<?
         #:key car))
      (cond ;; might have a stream
@@ -96,7 +96,7 @@
 
 (define (parse-pdf-bytes bs)
   (for/list ([tok (in-port parse-1 (open-input-bytes bs))])
-    tok))
+            tok))
 
 (define (pdf->dict pdf)
   (define pdf-bs (file->bytes pdf))
@@ -108,14 +108,14 @@
      (sort ; sort by byte offset
       (cdr ; drop zeroth record: there is no zeroth object
        (for/list ([i (in-range ref-count)])
-         (cons i (read (open-input-bytes (car (regexp-match #px"\\d{10}" xref-ip)))))))
+                 (cons i (read (open-input-bytes (car (regexp-match #px"\\d{10}" xref-ip)))))))
       < #:key cdr)
      (list (cons #f xoff))))
   (sort ; sort by index
    (parameterize ([current-input-port (open-input-bytes pdf-bs)])
      (for/list ([(idx start) (in-dict obj-locations)]
                 [(_ end) (in-dict (cdr obj-locations))])
-       (cons idx (car (parse-pdf-bytes (peek-bytes (- end start) start))))))
+               (cons idx (car (parse-pdf-bytes (peek-bytes (- end start) start))))))
    < #:key car))
 
 (define (dict-compare arg1 arg2)
@@ -125,13 +125,13 @@
        (= (length d1) (length d2))
        (for/and ([(k1 v1) (in-dict d1)]
                  [(k2 v2) (in-dict d2)])
-         (unless (equal? k1 k2)
-           (error (format "keys unequal in ~a and ~a: ~a ≠ ~a" arg1 arg2 k1 k2)))
-         (unless (equal? v1 v2)
-           (error (format "values unequal in ~a and ~a: ~e ≠ ~e" arg1 arg2 v1 v2)))
-         (when (dict? v1)
-           (dict-compare v1 v2))
-         #true)))
+                (unless (equal? k1 k2)
+                  (error (format "keys unequal in ~a and ~a: ~a ≠ ~a" arg1 arg2 k1 k2)))
+                (unless (equal? v1 v2)
+                  (error (format "values unequal in ~a and ~a: ~e ≠ ~e" arg1 arg2 v1 v2)))
+                (when (dict? v1)
+                  (dict-compare v1 v2))
+                #true)))
 
 (define-simple-check (check-headers-equal? ps1 ps2)
   (equal? (peek-bytes 14 0 (open-input-file ps1))
@@ -140,8 +140,39 @@
 (define-simple-check (check-pdfs-equal? ps1 ps2)
   (dict-compare ps1 ps2))
 
+(define-simple-check (check-font-subsets-equal? f1 f2)
+  (define misses null)
+
+  (define (dump val)
+    (cond
+      [(promise? val) 'promise-omitted]
+      [(dict? val)
+       (for/list ([(k v) (in-dict (sort (dict->list val) #:key car symbol<?))])
+                 (list k (dump v)))]
+      [(list? val) (map dump val)]
+      [else val]))
+
+  (define (cmp v1 v2)
+    (cond
+      [(and (list? v1) (list? v2))
+       (and
+        (= (length v1) (length v2))
+        (for/and ([x1 (in-list v1)]
+                  [x2 (in-list v2)])
+                 (unless (cmp x1 x2)
+                   (set! misses (cons (list v1 x1 v2 x2) misses)))))]
+      [else (equal? v1 v2)]))
+
+  (define ibs1 (dict-ref (dict-ref (pdf->dict f1) 8) 'stream))
+  (define cfftop1 (dump (send CFFTop decode (open-input-bytes ibs1))))
+  (define ibs2 (dict-ref (dict-ref (pdf->dict f2) 8) 'stream))
+  (define cfftop2 (dump (send CFFTop decode (open-input-bytes ibs2))))
+
+  (cmp cfftop1 cfftop2)
+  (check-true (null? misses)))
+
 #;(module+ main
     (for ([p (in-directory)]
           #:when (path-has-extension? p #"pdf"))
-      (with-handlers ([exn:fail? (λ (exn) (println (format "~a failed" p)))])
-        (pdf->dict p))))
+         (with-handlers ([exn:fail? (λ (exn) (println (format "~a failed" p)))])
+           (pdf->dict p))))
diff --git a/pitfall/pitfall/pdftest.rkt b/pitfall/pitfall/pdftest.rkt
index 1b11e690..4c2f805b 100644
--- a/pitfall/pitfall/pdftest.rkt
+++ b/pitfall/pitfall/pdftest.rkt
@@ -7,7 +7,7 @@
   br/define
   "check-pdf.rkt")
 
-(provide check-copy-equal? check-pdfkit? make-doc)
+(provide check-copy-equal? check-pdfkit? make-doc check-font-subsets-equal?)
 
 (test-mode #t)
 
diff --git a/pitfall/ptest/alltest.rkt b/pitfall/ptest/alltest.rkt
index 3f736dd4..0bbf4074 100644
--- a/pitfall/ptest/alltest.rkt
+++ b/pitfall/ptest/alltest.rkt
@@ -1,5 +1,5 @@
 #lang racket
-(for ([i (in-range 20)])
+(for ([i (in-range 22)])
   (define which (string->symbol (format "ptest/test~a" i)))
   (println which)
   (dynamic-require which #f))
diff --git a/pitfall/ptest/test20.rkt b/pitfall/ptest/test20.rkt
index 0f037c5c..a765a1b7 100644
--- a/pitfall/ptest/test20.rkt
+++ b/pitfall/ptest/test20.rkt
@@ -23,3 +23,6 @@
 
 (define-runtime-path that "test20crkt.pdf")
 (make-doc that #t proc)
+
+(check-font-subsets-equal? "test20rkt.pdf" "test20.pdf")
+
diff --git a/pitfall/ptest/test21.rkt b/pitfall/ptest/test21.rkt
index 0f037c5c..3ec76d9d 100644
--- a/pitfall/ptest/test21.rkt
+++ b/pitfall/ptest/test21.rkt
@@ -13,13 +13,15 @@
   (register-font doc "charter" (path->string charter))
 
   ;; Set the font, draw some text
-  [font doc "fira"]
+  [font doc "charter"]
   [font-size doc 40]
-  [text doc "Fira OTF rifle fire" 100 100])
+  [text doc "Charter OTF rifle fire" 100 100])
 
 ;; test against non-subsetted font version
-(define-runtime-path this "test20rkt.pdf")
+(define-runtime-path this "test21rkt.pdf")
 (make-doc this #f proc)
 
-(define-runtime-path that "test20crkt.pdf")
+(define-runtime-path that "test21crkt.pdf")
 (make-doc that #t proc)
+
+(check-font-subsets-equal? "test21rkt.pdf" "test21.pdf")