procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/net/shr.el (shr-dom-max-natural-width): Rewrite muddled code.

Browse source
This commit is contained in:
Mattias Engdegård 2023-05-30 22:58:26 +02:00
parent 288c48bcd9
commit 2df7b98de3
1 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lisp/net/shr.el
View file

@ -2530,7 +2530,7 @@ flags that control whether to collect or render objects."
(setq natural-width
(or (dom-attr dom 'shr-td-cache-natural)
(let ((natural (max (shr-pixel-buffer-width)
(shr-dom-max-natural-width dom 0))))
(shr-dom-max-natural-width dom))))
(dom-set-attribute dom 'shr-td-cache-natural natural)
natural))))
(if (and natural-width
@ -2559,22 +2559,18 @@ flags that control whether to collect or render objects."
(cdr (assq 'color shr-stylesheet))
(cdr (assq 'background-color shr-stylesheet))))))
(defun shr-dom-max-natural-width (dom max)
(if (eq (dom-tag dom) 'table)
(max max (or
(cl-loop
for line in (dom-attr dom 'shr-suggested-widths)
maximize (+
shr-table-separator-length
(cl-loop for elem in line
summing
(+ (cdr elem)
(* 2 shr-table-separator-length)))))
0))
(dolist (child (dom-children dom))
(unless (stringp child)
(setq max (max (shr-dom-max-natural-width child max)))))
max))
(defun shr-dom-max-natural-width (dom)
(or (if (eq (dom-tag dom) 'table)
(cl-loop for line in (dom-attr dom 'shr-suggested-widths)
maximize (+ shr-table-separator-length
(cl-loop for elem in line
summing
(+ (cdr elem)
(* 2 shr-table-separator-length)))))
(cl-loop for child in (dom-children dom)
unless (stringp child)
maximize (shr-dom-max-natural-width child)))
0))
(defun shr-buffer-width ()
(goto-char (point-min))