From: Ivan Shmakov <ivan@siamics.net>
To: 19462@debbugs.gnu.org
Cc: emacs-devel@gnu.org
Subject: bug#19462: shr: use wrap-prefix when possible, instead of filling the text
Date: Mon, 29 Dec 2014 09:55:15 +0000 [thread overview]
Message-ID: <8761cubx18.fsf__29650.3523168669$1419846982$gmane$org@violet.siamics.net> (raw)
In-Reply-To: <87egric2ki.fsf_-_@violet.siamics.net> (Ivan Shmakov's message of "Mon, 29 Dec 2014 07:55:41 +0000")
[-- Attachment #1: Type: text/plain, Size: 1364 bytes --]
As it seems, the initial version of the patch didn’t play well
with other essential shr.el features (as in: hyperlinks.)
Please thus consider the revised patch MIMEd.
* lisp/net/shr.el (shr-force-fill): New variable to disable this
feature if needed.
(shr-internal-width): Defer initialization until...
(shr-insert-document): ... here; set to nil if neither
shr-force-fill nor shr-width are non-nil.
(shr-fold-text, shr-tag-table-1): Likewise.
(shr-insert): Do not fill if shr-internal-width is nil.
(shr-setup-wrap-1, shr-setup-wrap): New function.
(shr-tag-blockquote, shr-tag-dd, shr-tag-li):
Call shr-setup-wrap.
(shr-tag-hr): Use a constant if shr-internal-width is nil.
The other so far unresolved issue with this approach is that the
tables and <pre /> elements may actually require truncate-lines.
Unfortunately, I know of no way to allow for word-wrapped and
truncated lines to exist in the same buffer; I guess we may need
either a truncate-lines or word-wrap property (or both) to
override the buffer-local variables in this case.
Similarly to wrap-prefix, we may also use line-prefix in place
of shr-indent. But that may not be a good idea if quoting
text/html messages in text/plain replies, for instance.
--
FSF associate member #7257 http://boycottsystemd.org/ … 3013 B6A0 230E 334A
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/diff, Size: 4441 bytes --]
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -128,13 +128,16 @@
(defvar shr-inhibit-images nil
"If non-nil, inhibit loading images.")
+(defvar shr-force-fill nil
+ "If non-nil, fill text even in the cases Emacs can wrap it by itself.")
+
;;; Internal variables.
(defvar shr-folding-mode nil)
(defvar shr-state nil)
(defvar shr-start nil)
(defvar shr-indentation 0)
-(defvar shr-internal-width (or shr-width (1- (window-width))))
+(defvar shr-internal-width nil) ; set in shr-insert-document
(defvar shr-list-mode nil)
(defvar shr-content-cache nil)
(defvar shr-kinsoku-shorten nil)
@@ -206,7 +209,8 @@ defun shr-insert-document (dom)
(shr-base nil)
(shr-depth 0)
(shr-warning nil)
- (shr-internal-width (or shr-width (1- (window-width)))))
+ (shr-internal-width
+ (or shr-width (and shr-force-fill (1- (window-width))))))
(shr-descend dom)
(shr-remove-trailing-whitespace start (point))
(when shr-warning
@@ -420,7 +424,8 @@ defun shr-fold-text (text)
(let ((shr-indentation 0)
(shr-state nil)
(shr-start nil)
- (shr-internal-width (window-width)))
+ (shr-internal-width (and shr-force-fill
+ (1- (window-width)))))
(shr-insert text)
(buffer-string)))))
@@ -485,7 +490,8 @@ defun shr-insert (text)
(insert elem)
(setq shr-state nil)
(let (found)
- (while (and (> (current-column) shr-internal-width)
+ (while (and shr-internal-width ; Use Emacs native wrapping if nil.
+ (> (current-column) shr-internal-width)
(> shr-internal-width 0)
(progn
(setq found (shr-find-fill-point))
@@ -500,7 +506,8 @@ defun shr-insert (text)
(when (> shr-indentation 0)
(shr-indent))
(end-of-line))
- (if (<= (current-column) shr-internal-width)
+ (if (or (not shr-internal-width)
+ (<= (current-column) shr-internal-width))
(insert " ")
;; In case we couldn't get a valid break point (because of a
;; word that's longer than `shr-internal-width'), just break anyway.
@@ -665,6 +672,23 @@
(when (> shr-indentation 0)
(insert (make-string shr-indentation ? ))))
+(defun shr-setup-wrap-1 (from to pval)
+ (put-text-property from to 'wrap-prefix pval))
+
+(defun shr-setup-wrap (from to)
+ (let ((prev from)
+ (pos (next-property-change from nil to))
+ (pval (and (> shr-indentation 0)
+ `(space :align-to ,shr-indentation))))
+ (while (and pos (> pos prev))
+ (unless (get-text-property prev 'wrap-prefix)
+ (shr-setup-wrap-1 prev pos pval))
+ (setq prev pos
+ pos (next-property-change pos nil to)))
+ (unless (or (<= to prev)
+ (get-text-property prev 'wrap-prefix))
+ (shr-setup-wrap-1 prev to pval))))
+
(defun shr-fontize-dom (dom &rest types)
(let (shr-start)
(shr-generic dom)
@@ -1308,8 +1338,10 @@
(defun shr-tag-blockquote (dom)
(shr-ensure-paragraph)
(shr-indent)
- (let ((shr-indentation (+ shr-indentation 4)))
- (shr-generic dom))
+ (let ((from (point))
+ (shr-indentation (+ shr-indentation 4)))
+ (shr-generic dom)
+ (shr-setup-wrap from (point)))
(shr-ensure-paragraph))
(defun shr-tag-dl (dom)
@@ -1324,8 +1356,10 @@
(defun shr-tag-dd (dom)
(shr-ensure-newline)
- (let ((shr-indentation (+ shr-indentation 4)))
- (shr-generic dom)))
+ (let ((from (point))
+ (shr-indentation (+ shr-indentation 4)))
+ (shr-generic dom)
+ (shr-setup-wrap from (point))))
(defun shr-tag-ul (dom)
(shr-ensure-paragraph)
@@ -1348,9 +1382,11 @@ defun shr-tag-li (dom)
(format "%d " shr-list-mode)
(setq shr-list-mode (1+ shr-list-mode)))
shr-bullet))
+ (from (point))
(shr-indentation (+ shr-indentation (length bullet))))
(insert bullet)
- (shr-generic dom)))
+ (shr-generic dom)
+ (shr-setup-wrap from (point))))
(defun shr-tag-br (dom)
(when (and (not (bobp))
@@ -1386,7 +1422,8 @@
(defun shr-tag-hr (_dom)
(shr-ensure-newline)
- (insert (make-string shr-internal-width shr-hr-line) "\n"))
+ (insert (make-string (or shr-internal-width 31) ; FIXME: magic
+ shr-hr-line) "\n"))
(defun shr-tag-title (dom)
(shr-heading dom 'bold 'underline))
@@ -1414,6 +1451,7 @@
(defun shr-tag-table-1 (dom)
(setq dom (or (dom-child-by-tag dom 'tbody) dom))
(let* ((shr-inhibit-images t)
+ (shr-internal-width (or shr-internal-width (1- (window-width))))
(shr-table-depth (1+ shr-table-depth))
(shr-kinsoku-shorten t)
;; Find all suggested widths.
next prev parent reply other threads:[~2014-12-29 9:55 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAP1yDHYm2uJ1fnObdN3F4X44w+9nVxHCaFULH9bM-M8Dz207Mw@mail.gmail.com>
[not found] ` <87ioh4nf8k.fsf@ferrier.me.uk>
[not found] ` <83y4pzptpx.fsf@gnu.org>
[not found] ` <871tnr1gqo.fsf@ferrier.me.uk>
[not found] ` <83bnmvowdb.fsf@gnu.org>
[not found] ` <jwvppbab8xb.fsf-monnier+emacs@gnu.org>
[not found] ` <83ppbanqhe.fsf@gnu.org>
[not found] ` <87vbl2xigp.fsf@ferrier.me.uk>
[not found] ` <83ioh2nlow.fsf@gnu.org>
[not found] ` <87sig6xech.fsf@ferrier.me.uk>
[not found] ` <83fvc5ni0u.fsf@gnu.org>
[not found] ` <E1Y4AVO-00035n-PI@fencepost.gnu.org>
[not found] ` <87k31fwwyv.fsf@ferrier.me.uk>
[not found] ` <E1Y4Snj-0004wy-PF@fencepost.gnu.org>
[not found] ` <87bnmq9ibf.fsf@ferrier.me.uk>
[not found] ` <E1Y50Fd-0003BE-GC@fencepost.gnu.org>
[not found] ` <jwv3880fumd.fsf-monnier+emacs@gnu.org>
[not found] ` <87lhlrx5fc.fsf@building.gnus.org>
[not found] ` <jwvfvbzh54s.fsf-monnier+emacs@gnu.org>
[not found] ` <878uhrcr5l.fsf@building.gnus.org>
[not found] ` <83sifzjflk.fsf@gnu.org>
2014-12-29 7:55 ` bug#19462: shr: use wrap-prefix when possible, instead of filling the text Ivan Shmakov
[not found] ` <87egric2ki.fsf_-_@violet.siamics.net>
2014-12-29 9:55 ` Ivan Shmakov [this message]
[not found] ` <jwvtx0eee66.fsf-monnier+emacs@gnu.org>
[not found] ` <877fxaa49w.fsf@violet.siamics.net>
[not found] ` <831tnicji7.fsf@gnu.org>
[not found] ` <jwviogtdei4.fsf-monnier+emacs@gnu.org>
[not found] ` <83y4pp9dku.fsf@gnu.org>
[not found] ` <87387w8r2j.fsf@violet.siamics.net>
2015-01-23 13:17 ` bug#19661: wrapping before window-width (new wrap-column text property?) Ivan Shmakov
2015-01-23 16:11 ` Eli Zaretskii
2015-01-23 16:55 ` martin rudalics
2015-01-23 19:11 ` Ivan Shmakov
2015-01-24 9:08 ` martin rudalics
2015-01-23 20:22 ` Eli Zaretskii
2015-01-24 9:08 ` martin rudalics
2015-01-24 9:47 ` Eli Zaretskii
2015-01-25 10:38 ` martin rudalics
2015-01-25 15:50 ` Eli Zaretskii
2015-01-25 17:46 ` martin rudalics
2015-01-25 18:00 ` Eli Zaretskii
2015-01-23 19:45 ` Ivan Shmakov
2015-01-23 21:17 ` Eli Zaretskii
2015-01-27 22:47 ` Ivan Shmakov
2015-12-25 17:34 ` bug#19462: shr: use wrap-prefix when possible, instead of filling the text Lars Ingebrigtsen
2015-12-26 9:13 ` Ivan Shmakov
[not found] ` <87bn9ezb2h.fsf@gnus.org>
[not found] ` <567D8E43.8030408@gmail.com>
[not found] ` <87y4ciwe6g.fsf@gnus.org>
[not found] ` <567DC781.8040306@gmail.com>
2015-12-25 22:51 ` Lars Ingebrigtsen
2015-12-26 16:53 ` Clément Pit--Claudel
2015-12-27 3:36 ` Clément Pit--Claudel
2015-12-27 4:19 ` Clément Pit--Claudel
2015-12-27 6:22 ` Lars Ingebrigtsen
2015-12-27 11:16 ` Clément Pit--Claudel
2015-12-27 6:19 ` Lars Ingebrigtsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='8761cubx18.fsf__29650.3523168669$1419846982$gmane$org@violet.siamics.net' \
--to=ivan@siamics.net \
--cc=19462@debbugs.gnu.org \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).