mbutterick
/
typesetting
2
1
Fork 0
Code Issues 13 Pull Requests Projects Releases Wiki Activity

nits

Browse Source
main
Matthew Butterick 5 years ago
parent 2c482d888b
commit 1aa7dc038d
2 changed files with 39 additions and 42 deletions
Show Stats Download Patch File Download Diff File

23
quad/quadwriter/layout.rkt
Unescape Escape View File

@ -700,15 +700,14 @@
(define qs (match qs-in (define qs (match qs-in
[(cons (? para-break-quad?) _) qs-in] [(cons (? para-break-quad?) _) qs-in]
[_ (cons q:page-break qs-in)])) [_ (cons q:page-break qs-in)]))
(for/fold ([qs-out null] (apply append
#:result (reverse qs-out)) (for/list ([q (in-list qs)]
([q (in-list qs)] [next-q (in-list (cdr qs))])
[next-q (in-list (cdr qs))]) (match (and (para-break-quad? q) (quad-ref next-q :first-line-indent 0))
(match (and (para-break-quad? q) (quad-ref next-q :first-line-indent 0)) [(or #false 0) (list next-q)]
[(or #false 0) (cons next-q qs-out)] [indent-val (list (make-quad #:from 'bo
[indent-val (list* next-q (make-quad #:from 'bo #:to 'bi
#:to 'bi #:draw-end q:string-draw-end
#:draw-end q:string-draw-end #:type first-line-indent-quad
#:type first-line-indent-quad #:attrs (quad-attrs next-q)
#:attrs (quad-attrs next-q) #:size (pt indent-val 10)) next-q)]))))
#:size (pt indent-val 10)) qs-out)])))

58
quad/quadwriter/render.rkt
Unescape Escape View File

@ -54,17 +54,16 @@
;; do this before ->string-quad so that it can handle the sizing promises ;; do this before ->string-quad so that it can handle the sizing promises
(apply append (apply append
(for/list ([q (in-list qs)]) (for/list ([q (in-list qs)])
(match (quad-ref q :hyphenate) (cond
[#true #:when (and (pair? (quad-elems q)) [(and (quad-ref q :hyphenate) (pair? (quad-elems q)) (andmap string? (quad-elems q)))
(andmap string? (quad-elems q))) (for*/list ([str (in-list (quad-elems q))]
(for*/list ([str (in-list (quad-elems q))] [hyphen-char (in-value #\u00AD)]
[hyphen-char (in-value #\u00AD)] [hstr (in-value (hyphenate str hyphen-char
[hstr (in-value (hyphenate str hyphen-char #:min-left-length 3
#:min-left-length 3 #:min-right-length 3))]
#:min-right-length 3))] [substr (in-list (regexp-match* (regexp (string hyphen-char)) hstr #:gap-select? #t))])
[substr (in-list (regexp-match* (regexp (string hyphen-char)) hstr #:gap-select? #t))]) (quad-copy q [elems (list substr)]))]
(quad-copy q [elems (list substr)]))] [else (list q)]))))
[_ (list q)]))))
(define (string->feature-list str) (define (string->feature-list str)
@ -72,20 +71,18 @@
(cons (string->bytes/utf-8 (first kv)) (string->number (second kv))))) (cons (string->bytes/utf-8 (first kv)) (string->number (second kv)))))
(define (parse-font-features! attrs) (define (parse-font-features! attrs)
(cond (match (hash-ref attrs :font-features-adjust #f)
[(match (hash-ref attrs :font-features-adjust #f) [(? string? str)
[(? string? str) ;; override any existing features
;; override any existing features (define parsed-features (string->feature-list str))
(define parsed-features (string->feature-list str)) (hash-update! attrs :font-features (λ (fs) (remove-duplicates (append parsed-features fs) equal? #:key car)))
(hash-update! attrs :font-features (λ (fs) (remove-duplicates (append parsed-features fs) equal? #:key car))) ;; adjustment is incorporated, so delete it
;; adjustment is incorporated, so delete it (hash-set! attrs :font-features-adjust #false)]
(hash-set! attrs :font-features-adjust #false)] [_ (match (hash-ref attrs :font-features #f)
[_ #false])] [(? string? str)
[else (match (hash-ref attrs :font-features #f) (define parsed-features (string->feature-list str))
[(? string? str) (hash-set! attrs :font-features parsed-features)]
(define parsed-features (string->feature-list str)) [_ (void)])]))
(hash-set! attrs :font-features parsed-features)]
[_ #false])]))
(define (parse-dimension-strings! attrs) (define (parse-dimension-strings! attrs)
@ -102,11 +99,12 @@
attrs) attrs)
(define (handle-cascading-attrs attrs) (define (handle-cascading-attrs attrs)
(parse-dimension-strings! attrs) (for ([proc (in-list (list parse-dimension-strings!
(complete-every-path! attrs) complete-every-path!
(resolve-font-path! attrs) resolve-font-path!
(resolve-font-size! attrs) resolve-font-size!
(parse-font-features! attrs)) parse-font-features!))])
(proc attrs)))
(define default-line-height-multiplier 1.42) (define default-line-height-multiplier 1.42)
(define (setup-qs qx-arg pdf-path) (define (setup-qs qx-arg pdf-path)

Write Preview
Loading…
Cancel
Save