From 4171608b7d40574e6d634c4b7902f0248e8eaeba Mon Sep 17 00:00:00 2001 From: Matthew Butterick Date: Thu, 15 Nov 2018 18:28:45 -0800 Subject: [PATCH] use fontland --- quad/quad/position.rkt | 2 +- quad/quad/test-glyph-layout.rkt | 2 +- quad/quad/typewriter.rkt | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/quad/quad/position.rkt b/quad/quad/position.rkt index 8ba4a3aa..8e569853 100644 --- a/quad/quad/position.rkt +++ b/quad/quad/position.rkt @@ -184,7 +184,7 @@ (unit '(origin (2 2))) (unit '(origin (3 2))) (unit '(origin (4 2)))))))) -(require racket/runtime-path fontkit/font) +(require racket/runtime-path fontland/font) (define-runtime-path fira "fira.ttf") (define q1 (quad (list 'in 'bi 'out 'bo 'size '(10 10) 'font fira 'fontsize 12))) diff --git a/quad/quad/test-glyph-layout.rkt b/quad/quad/test-glyph-layout.rkt index 226d5b94..2ff72cad 100644 --- a/quad/quad/test-glyph-layout.rkt +++ b/quad/quad/test-glyph-layout.rkt @@ -1,5 +1,5 @@ #lang br -(require fontkit/font) +(require fontland/font) (define f (openSync "fira.ttf")) diff --git a/quad/quad/typewriter.rkt b/quad/quad/typewriter.rkt index 902caaea..2684fe0a 100644 --- a/quad/quad/typewriter.rkt +++ b/quad/quad/typewriter.rkt @@ -45,7 +45,7 @@ [(#\space) (λ (sig) (not (memq sig '(start end))))] [else #t]) 'draw (λ (q doc) - (draw-debug q doc) + #;(draw-debug q doc) (send doc fontSize (string->number (hash-ref (attrs q) 'fontsize "12"))) (let ([str (car (elems q))]) (cond @@ -54,6 +54,7 @@ (λ (url-str) (apply as-link doc str url-str (origin q)))] [else #;(println str) + (void) (send/apply doc text str (origin q))])))) (elems q))) (struct $line $quad () #:transparent) (struct $page $quad () #:transparent)