From 9920753f2adb7821a18ae7805d0daddffd101eab Mon Sep 17 00:00:00 2001 From: Matthew Butterick Date: Tue, 19 Mar 2019 20:03:46 -0700 Subject: [PATCH] nit --- quad/qtest/markdown.rkt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/quad/qtest/markdown.rkt b/quad/qtest/markdown.rkt index 8ab9dc66..00d56784 100644 --- a/quad/qtest/markdown.rkt +++ b/quad/qtest/markdown.rkt @@ -141,7 +141,7 @@ [elems (quad-elems q)] [size (delay (font-size doc (quad-ref q 'font-size)) - (font doc (path->string (quad-ref q font-path-key))) + (font doc (path->string (quad-ref q font-path-key default-font-face))) (define str (if (pair? (quad-elems q)) (unsafe-car (quad-elems q)) "")) (define line-height (cond [(and (pair? (quad-elems q)) (quad-ref q 'line-height))] @@ -230,7 +230,7 @@ dest-hash) (define (line-wrap xs wrap-size) - (wrap-best xs (λ (q idx) (- wrap-size + (wrap xs (λ (q idx) (- wrap-size (quad-ref q 'inset-left 0) (quad-ref q 'inset-right 0))) #:hard-break line-break? @@ -486,7 +486,8 @@ naive approach works but: (for* ([font-family-subdir (in-directory fonts-dir)] #:when (directory-exists? font-family-subdir) [font-path (in-directory font-family-subdir)] - #:when (path-has-extension? font-path #"ttf")) + #:when (or (path-has-extension? font-path #"otf") + (path-has-extension? font-path #"ttf"))) (match-define (list font-path-string family-name) (map (λ (x) (path->string (find-relative-path fonts-dir x))) (list font-path font-family-subdir))) (define key