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

better behavior for justified tracked

Browse Source
main
Matthew Butterick 5 years ago
parent 476fb53006
commit 2f2c7d3104
3 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File

BIN
quad/qtest/test-font-tracking-tester.pdf
View File

Binary file not shown.

21
quad/qtest/test-font-tracking.rkt
Unescape Escape View File

@ -1,7 +1,22 @@
#lang quadwriter
'(q ((font-size "20")(font-tracking "5")) "we have the same tracking")
'(q "Left aligned")
'(q ((break "para")))
'(q ((font-size "20")(font-tracking "25%")) "we have the same tracking")
'(q ((font-size "20")(font-tracking "5")) "we have the same tracking you see")
'(q ((break "para")))
'(q ((font-size "20")(font-tracking "25%")) "we have the same tracking you see")
'(q ((break "para")))
'(q ((font-size "20")(font-tracking "0.25em")) "we have the same tracking you see")
'(q ((break "para")))
'(q "Justified")
'(q ((break "para")))
'(q ((font-size "20")(font-tracking "5")(line-align "justify")) "we have the same tracking you see")
'(q ((break "para")))
'(q ((font-size "20")(font-tracking "25%")(line-align "justify")) "we have the same tracking you see")
'(q ((break "para")))
'(q ((font-size "20")(font-tracking "0.25em")) "we have the same tracking")
'(q ((font-size "20")(font-tracking "0.25em")(line-align "justify")) "we have the same tracking you see")

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

@ -376,18 +376,30 @@
(quad-ref q-first :inset-left 0)
nonspace-total-width
(quad-ref q-first :inset-right 0)))
(define (make-left-edge-filler [width 0])
(make-quad #:type filler-quad
#:id 'line-filler
#:from-parent (quad-from-parent q-first)
#:from 'bo
#:to 'bi
#:shift (pt (- left-tracking-adjustment) 0)
#:size (pt width 0)
#:attrs (quad-attrs q-first)))
(cond
[(or (equal? align-value "justify")
(let ([line-overfull? (negative? (- empty-hspace space-total-width))])
;; force justification upon overfull lines
;; force justification upon overfull lines,
;; which amounts to shrinking the word spaces till the line fits
(and line-overfull? (> nonspacess-count 1))))
(define justified-space-width (/ empty-hspace (sub1 nonspacess-count)))
(apply append (add-between hung-nonspacess (list (make-quad
#:from 'bo
#:to 'bi
#:draw-end q:string-draw-end
#:size (pt justified-space-width line-prototype-height)))))]
(cons (make-left-edge-filler)
(apply append (add-between hung-nonspacess (list (make-quad
#:from 'bo
#:to 'bi
#:draw-end q:string-draw-end
#:size (pt justified-space-width line-prototype-height))))))]
[else
(define space-multiplier (match align-value
["left" 0]
@ -400,15 +412,7 @@
(define end-hspace (- empty-hspace space-total-width))
;; make filler a leading quad, not a parent / grouping quad,
;; so that elements can still be reached by consolidate-runs
(define fq (make-quad #:type filler-quad
#:id 'line-filler
#:from-parent (quad-from-parent q-first)
#:from 'bo
#:to 'bi
#:shift (pt (- left-tracking-adjustment) 0)
#:size (pt (* end-hspace space-multiplier) 0)
#:attrs (quad-attrs q-first)))
(list* fq
(list* (make-left-edge-filler (* end-hspace space-multiplier))
(quad-update! q-first [from-parent #f])
other-qs)])]))

Write Preview
Loading…
Cancel
Save