From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Noam Postavsky Newsgroups: gmane.emacs.bugs Subject: bug#32281: shr.el align support patch Date: Sun, 05 Aug 2018 22:52:35 -0400 Message-ID: <87wot4xl3g.fsf@gmail.com> References: <6177421532613989@iva7-bd007c44f58e.qloud-c.yandex.net> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1533523888 21493 195.159.176.226 (6 Aug 2018 02:51:28 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 6 Aug 2018 02:51:28 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) Cc: 32281@debbugs.gnu.org To: Bad Blue Bull Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Aug 06 04:51:24 2018 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fmVcA-0005SD-7b for geb-bug-gnu-emacs@m.gmane.org; Mon, 06 Aug 2018 04:51:22 +0200 Original-Received: from localhost ([::1]:60443 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fmVeG-0004cp-VQ for geb-bug-gnu-emacs@m.gmane.org; Sun, 05 Aug 2018 22:53:32 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47984) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fmVdp-0004Qz-TE for bug-gnu-emacs@gnu.org; Sun, 05 Aug 2018 22:53:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fmVdm-0000HH-RC for bug-gnu-emacs@gnu.org; Sun, 05 Aug 2018 22:53:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:37151) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fmVdm-0000HD-LP for bug-gnu-emacs@gnu.org; Sun, 05 Aug 2018 22:53:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fmVdm-0007Pw-BH for bug-gnu-emacs@gnu.org; Sun, 05 Aug 2018 22:53:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Noam Postavsky Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 06 Aug 2018 02:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 32281 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 32281-submit@debbugs.gnu.org id=B32281.153352396528487 (code B ref 32281); Mon, 06 Aug 2018 02:53:02 +0000 Original-Received: (at 32281) by debbugs.gnu.org; 6 Aug 2018 02:52:45 +0000 Original-Received: from localhost ([127.0.0.1]:42169 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fmVdV-0007PK-DX for submit@debbugs.gnu.org; Sun, 05 Aug 2018 22:52:45 -0400 Original-Received: from mail-it0-f44.google.com ([209.85.214.44]:50657) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fmVdT-0007P0-0t; Sun, 05 Aug 2018 22:52:43 -0400 Original-Received: by mail-it0-f44.google.com with SMTP id j81-v6so13746296ite.0; Sun, 05 Aug 2018 19:52:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=zT7WneBRmXHjxzjLEewKqT4SrSSQUkeqrPW7oqtg3D0=; b=GGH8ZOJHvsoK4+TIfCg0zEQF4S19Es9eL5I1gNaaI8TEuhs3Xr2avfGHg51Yu/lFQp RkYr7+77bhx3Mjc3pnykfYkpYO5wePQWP6S1Dxewt6gDD/yewicBipT56DUVbaUNm6tS 835872ccF1k0p0mRmP9emlY3DFEWYPA8qEKB1klSDqNYJTl9dWttEbbqH/CA450bk2oZ P79Qebz7zLePUMxGFrpvbGVjloBupYAF+iUjvT+y/r3hIO8fEOPPGxaPXIZwK9oMGqaI fJ5FFrCWepl8DEhnkb6cK61Xl0XmRZ7P7ZMOsWS7UCU0dxtFYTNdF4wW0pM+GP736QHe Ipbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=zT7WneBRmXHjxzjLEewKqT4SrSSQUkeqrPW7oqtg3D0=; b=HYYRkiLKCcXrdUG2sA+0y/P8/sguyQ5e3TYY8ri3CxKlEF0yk566eCNd9ig2mYx2XT BDlIn+r0rs6OpY2e9hmkEpQkWh957cGai+6UFJWoktt3AF0TH4iF86u2w/se9wdesh4X hvDRA7l3oRh/4en+0caXI8Xo8JD/lRUlKVc8hFqYJxSAMSGfgNpwO6twpT1EltU/bjoN ES4AGjSz1+mfxVctLZL4f7h5Minyhrv3e1m6rb87zLbMdqzBBgFhjhp2DsI2BPHew9F7 fqQpRxIR2h9mISERLgHt5bCEskUvB98zFaXC/5cfm3doZW8CepRkGYwvoXRF7bkM4f1U LQXQ== X-Gm-Message-State: AOUpUlFKZtYqaSf5W5a/KLicg2u+si5WI1kRrNyB1s0moV1PCgAoUD5V w95XQ88P0t6SQKJcQgTZvDc6vXKz X-Google-Smtp-Source: AAOMgpdv3o+ac6OGoeaqOOcbmlKKFGXlvkQ6I+gzm0F1gwOyfLxN3ZnCsJdnrsuz+2+dGYcSkSl5lg== X-Received: by 2002:a24:f5c2:: with SMTP id k185-v6mr14327636ith.106.1533523957251; Sun, 05 Aug 2018 19:52:37 -0700 (PDT) Original-Received: from zebian (cbl-45-2-119-34.yyz.frontiernetworks.ca. [45.2.119.34]) by smtp.googlemail.com with ESMTPSA id t187-v6sm3328833ita.28.2018.08.05.19.52.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 05 Aug 2018 19:52:36 -0700 (PDT) In-Reply-To: <6177421532613989@iva7-bd007c44f58e.qloud-c.yandex.net> (Bad Blue Bull's message of "Thu, 26 Jul 2018 17:06:29 +0300") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:149276 Archived-At: severity 32281 wishlist tags 32281 + patch quit Bad Blue Bull writes: > Here's a patch for shr.el that makes it handle "align" attribute for > headers, paragraphs and lists, works only when monospace font is used > (becoz of lame implementation of fill-paragraph). Also default value > of shr-use-fonts set to nil so monospace fonts are used by default. Seems reasonable overall, but I'm not sure if changing the default is justified. > -(defcustom shr-use-fonts t > +(defcustom shr-use-fonts nil ; set default value to nil because monospace fonts are better for Emacs Although I do somewhat agree with the "monospace fonts are better for Emacs" sentiment. > +(defun shr-fill-paragraph-with-breaks (&optional justify bre-del bre-regexp) > + "Fill paragraph at or after point, breaking lines at positions matching regexp argument BRE-REGEXP. > +If JUSTIFY is non-nil justify as well. > +Delete matched text if BRE-DEL is non nil > +BRE-REGEXP must be a regexp that determines positions where to break lines, default value is \\x2028." > + (unless bre-regexp (setq bre-regexp "\x2028")) > + (setq bre-regexp (concat bre-regexp "\\|\x2029")) > + (save-excursion > + (let ((line-begin) (paragraph-end)) > + (forward-paragraph) > + (insert "\x2029") ; use \x2029 (unicode paragraph separator) to mark end of a paragraph > + (backward-paragraph) > + (setq line-begin (point)) > + (while (not paragraph-end) > + (re-search-forward bre-regexp) > + (if (equal (match-string 0) "\x2029") (setq paragraph-end t)) ; end of paragraph reached > + (if (or bre-del paragraph-end) (replace-match "")) > + (unless (equal (char-after) ?\n) (insert "\n")) ; I don't know why but two adjacent \n leave an empty line after fill > + (fill-region-as-paragraph line-begin (- (point) 1) justify) > + (setq line-begin (point))) > + (delete-char -1) > + ))) > +(defun shr-fill-paragraph (dom) > + "Fill paragraph" > + (when (not shr-use-fonts) ;fill-paragraph is useful only with monospace fonts > + (shr-fill-paragraph-with-breaks > + ((lambda (x) > + (cond > + ((equal x "right") 'right) > + ((equal x "center") 'center) > + ((equal x "left") 'left) > + )) > + (cdr (assq 'align (dom-attributes dom)))) ; justify parameter > + t) ; bre-del t > + ) > + ) > + > (defun shr-tag-li (dom) > @@ -1770,6 +1813,7 @@ > (put-text-property start (1+ start) 'shr-prefix-length (length bullet)) > (shr-generic dom)))) > (unless (bolp) > + (unless shr-use-fonts (insert "\x2028")) ; insert a line separator > (insert "\n"))) > > (defun shr-mark-fill (start) > @@ -1785,7 +1829,8 @@ > (or (not (bolp)) > (and (> (- (point) 2) (point-min)) > (not (= (char-after (- (point) 2)) ?\n))))) > - (insert "\n")) > + (unless shr-use-fonts (insert "\x2028")) ; insert a line separator > + (insert "\n")) > (shr-generic dom)) The indentation in your patch looks kind of off, are you not using Emacs' builtin auto-indentation? (also, don't leave hanging parens.)