From 08a4e770dc29d724e795b8a61f22089c9fe7f69a Mon Sep 17 00:00:00 2001 From: Matthew Butterick Date: Sat, 10 Jan 2015 00:32:02 -0800 Subject: [PATCH] use slicef-after --- quad/main.rkt | 4 ++-- quad/wrap.rkt | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/quad/main.rkt b/quad/main.rkt index 93808769..57b35c80 100644 --- a/quad/main.rkt +++ b/quad/main.rkt @@ -194,7 +194,7 @@ (coerce/input? . -> . doc?) (cond [(input? x) (load-text-cache-file) - (define multipages (time (input->multipages x))) ; 125 = timings for jude0 + (define multipages (input->multipages x)) ; 125 = timings for jude0 (define pages (append-map typeset multipages)) ; 1446 (define doc (typeset pages)) ; 250 (update-text-cache-file) @@ -221,7 +221,7 @@ (require "render.rkt" racket/class profile) (require "samples.rkt") (activate-logger quad-logger) - (parameterize ([world:quality-default world:adaptive-quality] + (parameterize ([world:quality-default world:draft-quality] [world:paper-width-default 600] [world:paper-height-default 700]) (define to (begin (time (typeset (jude0))))) diff --git a/quad/wrap.rkt b/quad/wrap.rkt index af895d27..e2aca179 100644 --- a/quad/wrap.rkt +++ b/quad/wrap.rkt @@ -69,8 +69,7 @@ (quads? . -> . pieces?) (define-values (breakable-items items-to-make-unbreakable) (split-at-right qs (min world:minimum-last-line-chars (length qs)))) (define unbreak-qs (append breakable-items (map make-unbreakable items-to-make-unbreakable))) - (define lists-of-quads (slicef-at unbreak-qs (λ(q) (or (not (possible-word-break-quad? q)) - (quad-attr-ref q world:unbreakable-key #f))))) + (define lists-of-quads (slicef-after unbreak-qs (λ(q) (and (possible-word-break-quad? q) (not (quad-attr-ref q world:unbreakable-key #f)))))) (define-values (first-lists-of-quads last-list-of-quads) (split-last lists-of-quads)) (define (make-first-pieces qs) (let-values ([(first-qs last-q) (split-last qs)])