diff --git a/quad/main-typed.rkt b/quad/main-typed.rkt index df54c634..fc180998 100644 --- a/quad/main-typed.rkt +++ b/quad/main-typed.rkt @@ -117,9 +117,9 @@ (define/typed (columns-mapper page-in) (PageQuad . -> . PageQuad) (apply page (quad-attrs page-in) - (for/list : (Listof Quad) ([col (in-list (quad-list page-in))]) + (map add-vert-positions (for/list : (Listof ColumnQuad) ([col (in-list (quad-list page-in))]) (assert col ColumnQuad?) - (apply column (quad-attrs col) (map (λ([ln : Quad]) (assert ln LineQuad?) (compute-line-height (add-horiz-positions (fill ln)))) (quad-list col)))))) + (apply column (quad-attrs col) (map (λ([ln : Quad]) (assert ln LineQuad?) (compute-line-height (add-horiz-positions (fill ln)))) (quad-list col))))))) (define mapped-pages (map columns-mapper (number-pages ps))) (define doc (quads->doc mapped-pages)) doc) diff --git a/quad/main.rkt b/quad/main.rkt index 9e9d41b7..9b150032 100644 --- a/quad/main.rkt +++ b/quad/main.rkt @@ -199,12 +199,12 @@ (module+ main - (require "render.rkt" racket/class profile) + (require "render.rkt" racket/class profile sugar/debug) (require "samples.rkt") (activate-logger quad-logger) (parameterize ([world:quality-default world:draft-quality] [world:paper-width-default 600] [world:paper-height-default 700]) - (define sample (ti3)) + (define sample (ti5)) (define to (begin (time (typeset sample)))) (time (send (new pdf-renderer%) render-to-file to "foo.pdf")))) diff --git a/quad/utils-typed.rkt b/quad/utils-typed.rkt index 0502c78c..6fcddc71 100644 --- a/quad/utils-typed.rkt +++ b/quad/utils-typed.rkt @@ -248,7 +248,6 @@ (define/typed+provide (quad-height q) (Quad -> Float) - (display 'foom) (assert (quad-attr-ref q world:height-key 0.0) flonum?)) ;; use heights to compute vertical positions