geekinney/ekp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: DP line metrics now excludes leading/trailing space box widths to match rendering

Browse Source 
Co-authored-by: Kinneyzhang <38454496+Kinneyzhang@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2026-01-25 12:55:58 +00:00
parent c60ddb3903
commit 8e39dc2b83
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ekp.el
View File

@ -612,23 +612,25 @@ Returns 0 if box at K-1 is not a space box."
(defun ekp--dp-line-metrics (para i k glues-types ideal-prefixs min-prefixs max-prefixs) (defun ekp--dp-line-metrics (para i k glues-types ideal-prefixs min-prefixs max-prefixs)
"Compute line metrics for boxes I to K using PARA's stored glue params. "Compute line metrics for boxes I to K using PARA's stored glue params.
Returns (ideal-pixel min-pixel max-pixel) excluding leading glue and leading/trailing space boxes." Returns (ideal-pixel min-pixel max-pixel) excluding leading glue and
leading/trailing space boxes (which are stripped during rendering)."
(let* ((leading-glue-type (aref glues-types i)) (let* ((leading-glue-type (aref glues-types i))
(boxes-types (ekp-para-boxes-types para)) (boxes-types (ekp-para-boxes-types para))
(boxes-widths (ekp-para-boxes-widths para)) (boxes-widths (ekp-para-boxes-widths para))
;; Compute width of leading/trailing space boxes (these will be stripped during rendering) ;; Compute width of leading/trailing space boxes
(leading-space-width (ekp--leading-space-width i boxes-types boxes-widths)) ;; These are stripped during rendering, so exclude from line metrics
(trailing-space-width (ekp--trailing-space-width k boxes-types boxes-widths)) (leading-space-w (ekp--leading-space-width i boxes-types boxes-widths))
(space-width (+ leading-space-width trailing-space-width))) (trailing-space-w (ekp--trailing-space-width k boxes-types boxes-widths))
(space-w (+ leading-space-w trailing-space-w)))
(list (- (aref ideal-prefixs k) (aref ideal-prefixs i) (list (- (aref ideal-prefixs k) (aref ideal-prefixs i)
(ekp--para-glue-ideal para leading-glue-type) (ekp--para-glue-ideal para leading-glue-type)
space-width) space-w)
(- (aref min-prefixs k) (aref min-prefixs i) (- (aref min-prefixs k) (aref min-prefixs i)
(ekp--para-glue-min para leading-glue-type) (ekp--para-glue-min para leading-glue-type)
space-width) space-w)
(- (aref max-prefixs k) (aref max-prefixs i) (- (aref max-prefixs k) (aref max-prefixs i)
(ekp--para-glue-max para leading-glue-type) (ekp--para-glue-max para leading-glue-type)
space-width)))) space-w))))
(defun ekp--dp-force-break (para i k arrays glues-types hyphen-positions ideal-prefixs hyphen-pixel line-pixel) (defun ekp--dp-force-break (para i k arrays glues-types hyphen-positions ideal-prefixs hyphen-pixel line-pixel)
"Force a break at K-1 when no valid break found. Update ARRAYS. "Force a break at K-1 when no valid break found. Update ARRAYS.
@ -643,15 +645,14 @@ Uses PARA's stored glue params for consistency."
(hyphenate-p (ekp--hyphenate-p hyphen-positions break-pos)) (hyphenate-p (ekp--hyphenate-p hyphen-positions break-pos))
(boxes-types (ekp-para-boxes-types para)) (boxes-types (ekp-para-boxes-types para))
(boxes-widths (ekp-para-boxes-widths para)) (boxes-widths (ekp-para-boxes-widths para))
;; Exclude leading/trailing space boxes (will be stripped during rendering) ;; Exclude leading/trailing space widths (stripped during rendering)
;; Use k as the exclusive end for trailing space calculation (leading-space-w (ekp--leading-space-width i boxes-types boxes-widths))
(leading-space-width (ekp--leading-space-width i boxes-types boxes-widths)) (trailing-space-w (ekp--trailing-space-width k boxes-types boxes-widths))
(trailing-space-width (ekp--trailing-space-width k boxes-types boxes-widths)) (space-w (+ leading-space-w trailing-space-w))
(space-width (+ leading-space-width trailing-space-width))
(ideal-pixel (- (aref ideal-prefixs break-pos) (ideal-pixel (- (aref ideal-prefixs break-pos)
(aref ideal-prefixs i) (aref ideal-prefixs i)
(ekp--para-glue-ideal para (aref glues-types i)) (ekp--para-glue-ideal para (aref glues-types i))
space-width)) space-w))
(rest-pixel (- line-pixel ideal-pixel))) (rest-pixel (- line-pixel ideal-pixel)))
(when hyphenate-p (cl-incf ideal-pixel hyphen-pixel)) (when hyphenate-p (cl-incf ideal-pixel hyphen-pixel))
;; Force break with high demerits ;; Force break with high demerits