95ed2b32d1
The renderer (shared by both engines) is now lossless: synthesized glue carries the original text it replaced (ekp-glue), soft line breaks carry the whitespace swallowed around the break (ekp-soft-break), break hyphens are marked (ekp-soft-hyphen), and paragraph-edge whitespace survives as zero-display ekp-hidden text. Orphaned ekp--combine-glues-and-boxes / ekp--interleave removed. New ekp-region.el: - ekp-justify-region / ekp-unjustify-region: in-place justification with exact structural restore (character- and property-exact), robust to edits made while justified - ekp-auto-justify-mode: keeps the buffer justified at the window width; debounced re-flow on window resize, incremental per-paragraph re-justification after edits (served by the paragraph cache) - fix found in live GUI testing: buffer-local members of window-size-change-functions receive the WINDOW as argument and may run with an unrelated buffer current; the handler now resolves window and buffer explicitly (regression test included) Tests: 47 ERT (36 core + 11 region) passing; 300-case fuzz 0 failures (C/elisp parity unchanged); byte-compile clean with error-on-warn. Verified interactively in GUI Emacs: justified at 1403px maximized, auto-reflowed to 614px on frame resize. docs: interactive-use section in readme.md / readme_zh.md ci: byte-compile list includes ekp-region.el Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
313 lines
13 KiB
EmacsLisp
313 lines
13 KiB
EmacsLisp
;;; ekp-region.el --- Buffer-level justification for ekp -*- lexical-binding: t; -*-
|
|
|
|
;; Author: Kinney Zhang
|
|
;; Keywords: wp, convenience
|
|
|
|
;;; Commentary:
|
|
|
|
;; Interactive layer over the ekp string API.
|
|
;;
|
|
;; - `ekp-justify-region' / `ekp-unjustify-region': justify buffer text
|
|
;; in place. Unjustification is a pure structural transform driven by
|
|
;; the text properties the renderer leaves behind (`ekp-glue',
|
|
;; `ekp-soft-break', `ekp-soft-hyphen', `ekp-soft-trail'), so the
|
|
;; original text — including whitespace runs stripped at line breaks —
|
|
;; is recovered exactly, even after the justified text was edited.
|
|
;;
|
|
;; - `ekp-auto-justify-mode': keeps the whole buffer justified to the
|
|
;; window width. Re-flows (debounced) when the window width changes,
|
|
;; and incrementally re-justifies only the edited paragraphs after
|
|
;; edits, so large buffers stay responsive (unchanged paragraphs hit
|
|
;; the ekp paragraph cache).
|
|
|
|
;;; Code:
|
|
|
|
(require 'ekp)
|
|
(require 'cl-lib)
|
|
|
|
(defvar ekp-auto-justify-mode)
|
|
|
|
(defgroup ekp-region nil
|
|
"Buffer-level justification built on ekp."
|
|
:group 'text
|
|
:prefix "ekp-")
|
|
|
|
(defcustom ekp-region-margin-pixel 2
|
|
"Pixels subtracted from the window body width when justifying.
|
|
A small safety margin that keeps justified lines from being wrapped
|
|
by the display engine due to rounding."
|
|
:type 'natnum)
|
|
|
|
(defcustom ekp-auto-justify-resize-delay 0.15
|
|
"Seconds to debounce window-resize re-flows in `ekp-auto-justify-mode'."
|
|
:type 'number)
|
|
|
|
(defcustom ekp-auto-justify-edit-delay 0.3
|
|
"Idle seconds before edited paragraphs are re-justified."
|
|
:type 'number)
|
|
|
|
(defvar ekp-region--inhibit nil
|
|
"Non-nil while ekp-region is modifying the buffer itself.")
|
|
|
|
(defvar-local ekp-region--auto-width nil
|
|
"Pixel width the buffer is currently auto-justified to.")
|
|
|
|
(defvar-local ekp-region--resize-timer nil)
|
|
(defvar-local ekp-region--edit-timer nil)
|
|
(defvar-local ekp-region--dirty nil
|
|
"Pending edited regions, as a list of (BEG-MARKER . END-MARKER).")
|
|
|
|
;;;; Width
|
|
|
|
(defun ekp-region--window-pixel (&optional window)
|
|
"Usable text width in pixels of WINDOW (default: selected window)."
|
|
(max 1 (- (window-body-width window t) ekp-region-margin-pixel)))
|
|
|
|
;;;; Pure string transforms
|
|
|
|
(defun ekp-region--split-hard (string)
|
|
"Split justified STRING on hard newlines (those without `ekp-soft-break')."
|
|
(let ((parts nil) (start 0) (i 0) (len (length string)))
|
|
(while (< i len)
|
|
(when (and (eq (aref string i) ?\n)
|
|
(not (get-text-property i 'ekp-soft-break string)))
|
|
(push (substring string start i) parts)
|
|
(setq start (1+ i)))
|
|
(setq i (1+ i)))
|
|
(push (substring string start) parts)
|
|
(nreverse parts)))
|
|
|
|
(defun ekp-region--justify-string (text pixel)
|
|
"Return TEXT justified to PIXEL with exact-recovery markers.
|
|
Hard newlines are preserved one-to-one. Whitespace-only paragraphs
|
|
(which the string API would empty out) survive as hidden text."
|
|
(let* ((paras (split-string text "\n"))
|
|
(cores (cl-remove-if #'string-blank-p paras))
|
|
(out (and cores
|
|
(ekp-region--split-hard
|
|
(ekp-pixel-justify (string-join cores "\n") pixel)))))
|
|
(unless (= (length out) (length cores))
|
|
(error "ekp-region: paragraph count mismatch (%d vs %d)"
|
|
(length out) (length cores)))
|
|
(string-join
|
|
(mapcar (lambda (p)
|
|
(if (string-blank-p p)
|
|
(ekp--hide-string p)
|
|
(pop out)))
|
|
paras)
|
|
"\n")))
|
|
|
|
(defun ekp-region--pos-for-offset (string offset)
|
|
"Physical position in justified STRING for logical OFFSET.
|
|
Glue characters count for the length of the original text they
|
|
replaced (their `ekp-glue' value), soft breaks for their payload,
|
|
soft hyphens for nothing; everything else (including hidden text)
|
|
is one logical character."
|
|
(let ((i 0) (len (length string)))
|
|
(while (and (< i len) (> offset 0))
|
|
(let ((glue (get-text-property i 'ekp-glue string)))
|
|
(cond
|
|
(glue
|
|
(setq offset (- offset (length glue))))
|
|
((get-text-property i 'ekp-soft-hyphen string))
|
|
((and (eq (aref string i) ?\n)
|
|
(get-text-property i 'ekp-soft-break string))
|
|
(setq offset (- offset (length (get-text-property
|
|
i 'ekp-soft-break string)))))
|
|
(t (setq offset (1- offset)))))
|
|
(setq i (1+ i)))
|
|
i))
|
|
|
|
;;;; Commands
|
|
|
|
;;;###autoload
|
|
(defun ekp-justify-region (beg end &optional pixel)
|
|
"Justify the text between BEG and END to PIXEL width.
|
|
PIXEL defaults to the window text width (see `ekp-region-margin-pixel');
|
|
interactively, a numeric prefix argument supplies it explicitly.
|
|
Already-justified text is unjustified first, so the command is
|
|
idempotent and can re-flow to a new width."
|
|
(interactive
|
|
(list (region-beginning) (region-end)
|
|
(and current-prefix-arg (prefix-numeric-value current-prefix-arg))))
|
|
(setq pixel (or pixel (ekp-region--window-pixel)))
|
|
(let ((beg (copy-marker (min beg end)))
|
|
(end (copy-marker (max beg end) t))
|
|
(ekp-region--inhibit t)
|
|
(inhibit-read-only t))
|
|
(unwind-protect
|
|
(atomic-change-group
|
|
;; Re-flow support: strip previous justification first.
|
|
(when (text-property-not-all beg end 'ekp-justified nil)
|
|
(ekp-unjustify-region beg end))
|
|
(let* ((text (buffer-substring beg end))
|
|
(justified (ekp-region--justify-string text pixel))
|
|
(point-offset (and (>= (point) beg) (< (point) end)
|
|
(- (point) beg))))
|
|
(unless (equal-including-properties text justified)
|
|
(goto-char beg)
|
|
(delete-region beg end)
|
|
(insert justified)
|
|
(when point-offset
|
|
(goto-char (+ beg (ekp-region--pos-for-offset
|
|
justified point-offset)))))
|
|
(add-text-properties beg end (list 'ekp-justified pixel))))
|
|
(set-marker beg nil)
|
|
(set-marker end nil))))
|
|
|
|
;;;###autoload
|
|
(defun ekp-unjustify-region (beg end)
|
|
"Restore the logical text between BEG and END.
|
|
Removes synthesized glue and soft hyphens, replaces soft line breaks
|
|
with the whitespace they swallowed, and re-exposes hidden paragraph
|
|
tails. Text the user typed into the justified region is preserved."
|
|
(interactive "r")
|
|
(let ((end-m (copy-marker (max beg end) t))
|
|
(ekp-region--inhibit t)
|
|
(inhibit-read-only t))
|
|
(unwind-protect
|
|
(save-excursion
|
|
(goto-char (min beg end))
|
|
(while (< (point) end-m)
|
|
(let* ((pos (point))
|
|
(glue (get-text-property pos 'ekp-glue)))
|
|
(cond
|
|
(glue
|
|
(delete-region pos (1+ pos))
|
|
(when (stringp glue) (insert glue)))
|
|
((get-text-property pos 'ekp-soft-hyphen)
|
|
(delete-region pos (1+ pos)))
|
|
((and (eq (char-after pos) ?\n)
|
|
(get-text-property pos 'ekp-soft-break))
|
|
(let ((payload (get-text-property pos 'ekp-soft-break)))
|
|
(delete-region pos (1+ pos))
|
|
(insert payload)))
|
|
((get-text-property pos 'ekp-hidden)
|
|
(remove-text-properties pos (1+ pos)
|
|
'(ekp-hidden nil display nil))
|
|
(forward-char 1))
|
|
(t (forward-char 1)))))
|
|
(remove-text-properties (min beg end) end-m '(ekp-justified nil)))
|
|
(set-marker end-m nil))))
|
|
|
|
;;;; Auto-justify minor mode
|
|
|
|
(defun ekp-region--para-bounds (marker-pair)
|
|
"Hard-paragraph bounds containing MARKER-PAIR, as (BEG . END)."
|
|
(let ((b (marker-position (car marker-pair)))
|
|
(e (marker-position (cdr marker-pair))))
|
|
(save-excursion
|
|
(goto-char (max (point-min) (min b (point-max))))
|
|
(while (and (> (point) (point-min))
|
|
(let ((prev (1- (point))))
|
|
(not (and (eq (char-after prev) ?\n)
|
|
(not (get-text-property prev 'ekp-soft-break))))))
|
|
(forward-char -1))
|
|
(setq b (point))
|
|
(goto-char (max (point-min) (min e (point-max))))
|
|
(while (and (< (point) (point-max))
|
|
(not (and (eq (char-after) ?\n)
|
|
(not (get-text-property (point) 'ekp-soft-break)))))
|
|
(forward-char 1))
|
|
(cons b (point)))))
|
|
|
|
(defun ekp-region--merge-regions (regions)
|
|
"Merge overlapping or adjacent (BEG . END) REGIONS."
|
|
(let ((sorted (sort regions (lambda (a b) (< (car a) (car b)))))
|
|
merged)
|
|
(dolist (r sorted)
|
|
(if (and merged (<= (car r) (cdr (car merged))))
|
|
(setcdr (car merged) (max (cdr (car merged)) (cdr r)))
|
|
(push (cons (car r) (cdr r)) merged)))
|
|
(nreverse merged)))
|
|
|
|
(defun ekp-region--after-change (beg end _len)
|
|
"Record the edit between BEG and END for incremental re-justification."
|
|
(when (and ekp-auto-justify-mode (not ekp-region--inhibit))
|
|
(push (cons (copy-marker beg) (copy-marker end)) ekp-region--dirty)
|
|
(when (timerp ekp-region--edit-timer)
|
|
(cancel-timer ekp-region--edit-timer))
|
|
(setq ekp-region--edit-timer
|
|
(run-with-idle-timer ekp-auto-justify-edit-delay nil
|
|
#'ekp-region--flush-dirty (current-buffer)))))
|
|
|
|
(defun ekp-region--flush-dirty (buffer)
|
|
"Re-justify the paragraphs of BUFFER touched by recent edits."
|
|
(when (buffer-live-p buffer)
|
|
(with-current-buffer buffer
|
|
(when (and ekp-auto-justify-mode ekp-region--dirty ekp-region--auto-width)
|
|
(let* ((pairs (prog1 ekp-region--dirty (setq ekp-region--dirty nil)))
|
|
;; Convert all bounds to markers before the first
|
|
;; re-justification shifts later positions.
|
|
(regions (mapcar (lambda (r)
|
|
(cons (copy-marker (car r))
|
|
(copy-marker (cdr r) t)))
|
|
(ekp-region--merge-regions
|
|
(mapcar #'ekp-region--para-bounds pairs)))))
|
|
(dolist (r regions)
|
|
(ekp-justify-region (car r) (cdr r) ekp-region--auto-width)
|
|
(set-marker (car r) nil)
|
|
(set-marker (cdr r) nil))
|
|
(dolist (p pairs)
|
|
(set-marker (car p) nil)
|
|
(set-marker (cdr p) nil)))))))
|
|
|
|
(defun ekp-region--on-resize (window-or-frame)
|
|
"Debounced re-flow after WINDOW-OR-FRAME changed size.
|
|
Buffer-local members of `window-size-change-functions' receive the
|
|
window showing the buffer — and are not guaranteed to run with that
|
|
buffer current — so resolve both explicitly."
|
|
(let ((win (cond ((windowp window-or-frame) window-or-frame)
|
|
((framep window-or-frame)
|
|
(get-buffer-window (current-buffer) window-or-frame))
|
|
(t (get-buffer-window (current-buffer))))))
|
|
(when (window-live-p win)
|
|
(with-current-buffer (window-buffer win)
|
|
(when ekp-auto-justify-mode
|
|
(let ((w (ekp-region--window-pixel win)))
|
|
(when (and ekp-region--auto-width (/= w ekp-region--auto-width))
|
|
(when (timerp ekp-region--resize-timer)
|
|
(cancel-timer ekp-region--resize-timer))
|
|
(setq ekp-region--resize-timer
|
|
(run-with-timer ekp-auto-justify-resize-delay nil
|
|
#'ekp-region--reflow
|
|
(current-buffer) w)))))))))
|
|
|
|
(defun ekp-region--reflow (buffer width)
|
|
"Re-justify all of BUFFER to WIDTH."
|
|
(when (buffer-live-p buffer)
|
|
(with-current-buffer buffer
|
|
(when ekp-auto-justify-mode
|
|
(setq ekp-region--auto-width width)
|
|
(ekp-justify-region (point-min) (point-max) width)))))
|
|
|
|
;;;###autoload
|
|
(define-minor-mode ekp-auto-justify-mode
|
|
"Keep the buffer pixel-justified to the window width.
|
|
Re-flows when the window width changes and re-justifies edited
|
|
paragraphs incrementally. Designed for reading and previewing;
|
|
the buffer text is restored exactly when the mode is turned off."
|
|
:lighter " EKP"
|
|
(if ekp-auto-justify-mode
|
|
(progn
|
|
(setq ekp-region--auto-width
|
|
(ekp-region--window-pixel (get-buffer-window)))
|
|
(ekp-justify-region (point-min) (point-max) ekp-region--auto-width)
|
|
(add-hook 'window-size-change-functions #'ekp-region--on-resize nil t)
|
|
(add-hook 'after-change-functions #'ekp-region--after-change nil t))
|
|
(remove-hook 'window-size-change-functions #'ekp-region--on-resize t)
|
|
(remove-hook 'after-change-functions #'ekp-region--after-change t)
|
|
(when (timerp ekp-region--resize-timer)
|
|
(cancel-timer ekp-region--resize-timer))
|
|
(when (timerp ekp-region--edit-timer)
|
|
(cancel-timer ekp-region--edit-timer))
|
|
(setq ekp-region--resize-timer nil
|
|
ekp-region--edit-timer nil
|
|
ekp-region--dirty nil
|
|
ekp-region--auto-width nil)
|
|
(ekp-unjustify-region (point-min) (point-max))))
|
|
|
|
(provide 'ekp-region)
|
|
|
|
;;; ekp-region.el ends here
|