annotate lisp/gnus/shr.el @ 111096:d7e691f6ffc0

Merge changes made in Gnus trunk. gnus.texi (Subscription Commands): Mention that you can also subscribe to new groups via the Server buffer, which is probably more convenient when subscribing to many groups. gnus-group.el (gnus-group-mark-group): Use gnus-group-position-point instead of the summary one. shr.el (shr-tag-img): Don't bug out on images that don't have a SRC.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sat, 23 Oct 2010 00:01:49 +0000
parents 647c0a15da32
children 2d713b285a70
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
110698
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
1 ;;; shr.el --- Simple HTML Renderer
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
2
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
3 ;; Copyright (C) 2010 Free Software Foundation, Inc.
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
4
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
5 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
6 ;; Keywords: html
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
7
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
8 ;; This file is part of GNU Emacs.
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
9
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
10 ;; GNU Emacs is free software: you can redistribute it and/or modify
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
11 ;; it under the terms of the GNU General Public License as published by
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
12 ;; the Free Software Foundation, either version 3 of the License, or
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
13 ;; (at your option) any later version.
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
14
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
15 ;; GNU Emacs is distributed in the hope that it will be useful,
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
18 ;; GNU General Public License for more details.
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
19
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
20 ;; You should have received a copy of the GNU General Public License
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
21 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
22
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
23 ;;; Commentary:
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
24
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
25 ;; This package takes a HTML parse tree (as provided by
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
26 ;; libxml-parse-html-region) and renders it in the current buffer. It
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
27 ;; does not do CSS, JavaScript or anything advanced: It's geared
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
28 ;; towards rendering typical short snippets of HTML, like what you'd
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
29 ;; find in HTML email and the like.
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
30
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
31 ;;; Code:
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
32
110810
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
33 (eval-when-compile (require 'cl))
110763
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
34 (require 'browse-url)
111033
8ad626575f8a shr.el: Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111032
diff changeset
35 (unless (aref (char-category-set (make-char 'japanese-jisx0208 33 35)) ?>)
8ad626575f8a shr.el: Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111032
diff changeset
36 (load "kinsoku" nil t))
110763
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
37
110708
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
38 (defgroup shr nil
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
39 "Simple HTML Renderer"
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
40 :group 'mail)
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
41
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
42 (defcustom shr-max-image-proportion 0.9
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
43 "How big pictures displayed are in relation to the window they're in.
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
44 A value of 0.7 means that they are allowed to take up 70% of the
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
45 width and height of the window. If they are larger than this,
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
46 and Emacs supports it, then the images will be rescaled down to
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
47 fit these criteria."
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
48 :version "24.1"
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
49 :group 'shr
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
50 :type 'float)
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
51
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
52 (defcustom shr-blocked-images nil
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
53 "Images that have URLs matching this regexp will be blocked."
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
54 :version "24.1"
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
55 :group 'shr
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
56 :type 'regexp)
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
57
110873
d98a67277730 shr,el: Allow shr table char to be customized.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110859
diff changeset
58 (defcustom shr-table-line ?-
d98a67277730 shr,el: Allow shr table char to be customized.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110859
diff changeset
59 "Character used to draw table line."
d98a67277730 shr,el: Allow shr table char to be customized.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110859
diff changeset
60 :group 'shr
110999
9330a5183ae6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110996
diff changeset
61 :type 'character)
110873
d98a67277730 shr,el: Allow shr table char to be customized.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110859
diff changeset
62
d98a67277730 shr,el: Allow shr table char to be customized.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110859
diff changeset
63 (defcustom shr-table-corner ?+
110917
3243e7055d49 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110898
diff changeset
64 "Character used to draw table corner."
3243e7055d49 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110898
diff changeset
65 :group 'shr
110999
9330a5183ae6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110996
diff changeset
66 :type 'character)
110917
3243e7055d49 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110898
diff changeset
67
3243e7055d49 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110898
diff changeset
68 (defcustom shr-hr-line ?-
3243e7055d49 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110898
diff changeset
69 "Character used to draw hr line."
110873
d98a67277730 shr,el: Allow shr table char to be customized.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110859
diff changeset
70 :group 'shr
110999
9330a5183ae6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110996
diff changeset
71 :type 'character)
110873
d98a67277730 shr,el: Allow shr table char to be customized.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110859
diff changeset
72
110966
0272ba632fc2 shr: make shr-width a defcustom, use it in shr-tag-img.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110957
diff changeset
73 (defcustom shr-width fill-column
0272ba632fc2 shr: make shr-width a defcustom, use it in shr-tag-img.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110957
diff changeset
74 "Frame width to use for rendering."
0272ba632fc2 shr: make shr-width a defcustom, use it in shr-tag-img.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110957
diff changeset
75 :type 'integer
0272ba632fc2 shr: make shr-width a defcustom, use it in shr-tag-img.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110957
diff changeset
76 :group 'shr)
0272ba632fc2 shr: make shr-width a defcustom, use it in shr-tag-img.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110957
diff changeset
77
110777
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
78 (defvar shr-content-function nil
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
79 "If bound, this should be a function that will return the content.
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
80 This is used for cid: URLs, and the function is called with the
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
81 cid: URL as the argument.")
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
82
110790
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
83 ;;; Internal variables.
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
84
110708
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
85 (defvar shr-folding-mode nil)
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
86 (defvar shr-state nil)
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
87 (defvar shr-start nil)
110747
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
88 (defvar shr-indentation 0)
110777
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
89 (defvar shr-inhibit-images nil)
110790
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
90 (defvar shr-list-mode nil)
110810
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
91 (defvar shr-content-cache nil)
111032
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
92 (defvar shr-kinsoku-shorten nil)
110708
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
93
110763
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
94 (defvar shr-map
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
95 (let ((map (make-sparse-keymap)))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
96 (define-key map "a" 'shr-show-alt-text)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
97 (define-key map "i" 'shr-browse-image)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
98 (define-key map "I" 'shr-insert-image)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
99 (define-key map "u" 'shr-copy-url)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
100 (define-key map "v" 'shr-browse-url)
111058
ea17726e9043 shr.el (shr-save-contents): New command and keystroke.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111057
diff changeset
101 (define-key map "o" 'shr-save-contents)
110763
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
102 (define-key map "\r" 'shr-browse-url)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
103 map))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
104
110790
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
105 ;; Public functions and commands.
110708
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
106
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
107 ;;;###autoload
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
108 (defun shr-insert-document (dom)
110810
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
109 (setq shr-content-cache nil)
110708
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
110 (let ((shr-state nil)
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
111 (shr-start nil))
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
112 (shr-descend (shr-transform-dom dom))))
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
113
110763
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
114 (defun shr-copy-url ()
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
115 "Copy the URL under point to the kill ring.
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
116 If called twice, then try to fetch the URL and see whether it
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
117 redirects somewhere else."
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
118 (interactive)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
119 (let ((url (get-text-property (point) 'shr-url)))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
120 (cond
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
121 ((not url)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
122 (message "No URL under point"))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
123 ;; Resolve redirected URLs.
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
124 ((equal url (car kill-ring))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
125 (url-retrieve
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
126 url
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
127 (lambda (a)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
128 (when (and (consp a)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
129 (eq (car a) :redirect))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
130 (with-temp-buffer
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
131 (insert (cadr a))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
132 (goto-char (point-min))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
133 ;; Remove common tracking junk from the URL.
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
134 (when (re-search-forward ".utm_.*" nil t)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
135 (replace-match "" t t))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
136 (message "Copied %s" (buffer-string))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
137 (copy-region-as-kill (point-min) (point-max)))))))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
138 ;; Copy the URL to the kill ring.
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
139 (t
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
140 (with-temp-buffer
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
141 (insert url)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
142 (copy-region-as-kill (point-min) (point-max))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
143 (message "Copied %s" url))))))
110708
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
144
110763
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
145 (defun shr-show-alt-text ()
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
146 "Show the ALT text of the image under point."
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
147 (interactive)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
148 (let ((text (get-text-property (point) 'shr-alt)))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
149 (if (not text)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
150 (message "No image under point")
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
151 (message "%s" text))))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
152
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
153 (defun shr-browse-image ()
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
154 "Browse the image under point."
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
155 (interactive)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
156 (let ((url (get-text-property (point) 'shr-image)))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
157 (if (not url)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
158 (message "No image under point")
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
159 (message "Browsing %s..." url)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
160 (browse-url url))))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
161
110810
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
162 (defun shr-insert-image ()
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
163 "Insert the image under point into the buffer."
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
164 (interactive)
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
165 (let ((url (get-text-property (point) 'shr-image)))
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
166 (if (not url)
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
167 (message "No image under point")
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
168 (message "Inserting %s..." url)
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
169 (url-retrieve url 'shr-image-fetched
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
170 (list (current-buffer) (1- (point)) (point-marker))
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
171 t))))
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
172
110790
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
173 ;;; Utility functions.
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
174
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
175 (defun shr-transform-dom (dom)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
176 (let ((result (list (pop dom))))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
177 (dolist (arg (pop dom))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
178 (push (cons (intern (concat ":" (symbol-name (car arg))) obarray)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
179 (cdr arg))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
180 result))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
181 (dolist (sub dom)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
182 (if (stringp sub)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
183 (push (cons :text sub) result)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
184 (push (shr-transform-dom sub) result)))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
185 (nreverse result)))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
186
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
187 (defun shr-descend (dom)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
188 (let ((function (intern (concat "shr-tag-" (symbol-name (car dom))) obarray)))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
189 (if (fboundp function)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
190 (funcall function (cdr dom))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
191 (shr-generic (cdr dom)))))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
192
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
193 (defun shr-generic (cont)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
194 (dolist (sub cont)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
195 (cond
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
196 ((eq (car sub) :text)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
197 (shr-insert (cdr sub)))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
198 ((listp (cdr sub))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
199 (shr-descend sub)))))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
200
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
201 (defun shr-insert (text)
110917
3243e7055d49 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110898
diff changeset
202 (when (and (eq shr-state 'image)
3243e7055d49 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110898
diff changeset
203 (not (string-match "\\`[ \t\n]+\\'" text)))
110790
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
204 (insert "\n")
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
205 (setq shr-state nil))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
206 (cond
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
207 ((eq shr-folding-mode 'none)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
208 (insert text))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
209 (t
111021
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
210 (when (and (string-match "\\`[ \t\n]" text)
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
211 (not (bolp))
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
212 (not (eq (char-after (1- (point))) ? )))
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
213 (insert " "))
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
214 (dolist (elem (split-string text))
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
215 (when (and (bolp)
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
216 (> shr-indentation 0))
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
217 (shr-indent))
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
218 ;; The shr-start is a special variable that is used to pass
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
219 ;; upwards the first point in the buffer where the text really
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
220 ;; starts.
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
221 (unless shr-start
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
222 (setq shr-start (point)))
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
223 ;; No space is needed behind a wide character categorized as
111022
d263303441df shr.el (shr-insert): Comment fix.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111021
diff changeset
224 ;; kinsoku-bol, between characters both categorized as nospace,
d263303441df shr.el (shr-insert): Comment fix.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111021
diff changeset
225 ;; or at the beginning of a line.
111021
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
226 (let (prev)
111002
62243368de05 shr.el (shr-insert): Remove space inserted before or after a breakable character or at the beginning or the end of a line.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110999
diff changeset
227 (when (and (eq (preceding-char) ? )
62243368de05 shr.el (shr-insert): Remove space inserted before or after a breakable character or at the beginning or the end of a line.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110999
diff changeset
228 (or (= (line-beginning-position) (1- (point)))
111021
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
229 (and (aref fill-find-break-point-function-table
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
230 (setq prev (char-after (- (point) 2))))
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
231 (aref (char-category-set prev) ?>))
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
232 (and (aref fill-nospace-between-words-table prev)
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
233 (aref fill-nospace-between-words-table
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
234 (aref elem 0)))))
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
235 (delete-char -1)))
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
236 (insert elem)
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
237 (while (> (current-column) shr-width)
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
238 (unless (prog1
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
239 (shr-find-fill-point)
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
240 (when (eq (preceding-char) ? )
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
241 (delete-char -1))
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
242 (insert "\n"))
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
243 (put-text-property (1- (point)) (point) 'shr-break t)
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
244 ;; No space is needed at the beginning of a line.
111057
097fe1170a9a shr.el (shr-find-fill-point): Don't leave blanks at the start of some lines.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111054
diff changeset
245 (when (eq (following-char) ? )
097fe1170a9a shr.el (shr-find-fill-point): Don't leave blanks at the start of some lines.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111054
diff changeset
246 (delete-char 1)))
111021
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
247 (when (> shr-indentation 0)
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
248 (shr-indent))
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
249 (end-of-line))
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
250 (insert " "))
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
251 (unless (string-match "[ \t\n]\\'" text)
7aa9d9b402c8 shr.el (shr-insert): Don't insert space behind a wide character categorized as kinsoku-bol, or between characters both categorized as nospace.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111019
diff changeset
252 (delete-char -1)))))
110790
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
253
110917
3243e7055d49 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110898
diff changeset
254 (defun shr-find-fill-point ()
111032
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
255 (when (> (move-to-column shr-width) shr-width)
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
256 (backward-char 1))
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
257 (let (failed)
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
258 (while (not
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
259 (or (setq failed (= (current-column) shr-indentation))
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
260 (eq (preceding-char) ? )
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
261 (eq (following-char) ? )
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
262 (aref fill-find-break-point-function-table (preceding-char))))
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
263 (backward-char 1))
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
264 (if failed
111002
62243368de05 shr.el (shr-insert): Remove space inserted before or after a breakable character or at the beginning or the end of a line.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110999
diff changeset
265 ;; There's no breakable point, so we give it up.
111032
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
266 (progn
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
267 (end-of-line)
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
268 (while (aref fill-find-break-point-function-table (preceding-char))
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
269 (backward-char 1))
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
270 nil)
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
271 (or (eolp)
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
272 ;; Don't put kinsoku-bol characters at the beginning of a line,
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
273 ;; or kinsoku-eol characters at the end of a line,
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
274 (let ((count 4))
111059
938faaa83cf1 shr.el (shr-find-fill-point): Shorten line if the preceding char is kinsoku-eol regardless of shr-kinsoku-shorten.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111058
diff changeset
275 (if (or shr-kinsoku-shorten
938faaa83cf1 shr.el (shr-find-fill-point): Shorten line if the preceding char is kinsoku-eol regardless of shr-kinsoku-shorten.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111058
diff changeset
276 (and (aref (char-category-set (preceding-char)) ?<)
938faaa83cf1 shr.el (shr-find-fill-point): Shorten line if the preceding char is kinsoku-eol regardless of shr-kinsoku-shorten.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111058
diff changeset
277 (progn
938faaa83cf1 shr.el (shr-find-fill-point): Shorten line if the preceding char is kinsoku-eol regardless of shr-kinsoku-shorten.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111058
diff changeset
278 (setq count (1- count))
938faaa83cf1 shr.el (shr-find-fill-point): Shorten line if the preceding char is kinsoku-eol regardless of shr-kinsoku-shorten.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111058
diff changeset
279 (backward-char 1)
938faaa83cf1 shr.el (shr-find-fill-point): Shorten line if the preceding char is kinsoku-eol regardless of shr-kinsoku-shorten.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111058
diff changeset
280 t)))
111032
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
281 (while (and
111059
938faaa83cf1 shr.el (shr-find-fill-point): Shorten line if the preceding char is kinsoku-eol regardless of shr-kinsoku-shorten.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111058
diff changeset
282 (>= (setq count (1- count)) 0)
938faaa83cf1 shr.el (shr-find-fill-point): Shorten line if the preceding char is kinsoku-eol regardless of shr-kinsoku-shorten.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111058
diff changeset
283 (not (memq (preceding-char) (list ?\C-@ ?\n ? )))
111032
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
284 (or (aref (char-category-set (preceding-char)) ?<)
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
285 (aref (char-category-set (following-char)) ?>)))
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
286 (backward-char 1))
111059
938faaa83cf1 shr.el (shr-find-fill-point): Shorten line if the preceding char is kinsoku-eol regardless of shr-kinsoku-shorten.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111058
diff changeset
287 (while (and (>= (setq count (1- count)) 0)
111032
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
288 (aref (char-category-set (following-char)) ?>))
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
289 (forward-char 1)))
111057
097fe1170a9a shr.el (shr-find-fill-point): Don't leave blanks at the start of some lines.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111054
diff changeset
290 (when (eq (following-char) ? )
097fe1170a9a shr.el (shr-find-fill-point): Don't leave blanks at the start of some lines.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111054
diff changeset
291 (forward-char 1))
111032
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
292 t)))))
110917
3243e7055d49 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110898
diff changeset
293
110790
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
294 (defun shr-ensure-newline ()
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
295 (unless (zerop (current-column))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
296 (insert "\n")))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
297
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
298 (defun shr-ensure-paragraph ()
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
299 (unless (bobp)
110898
069deed4cdec Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110873
diff changeset
300 (if (<= (current-column) shr-indentation)
110790
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
301 (unless (save-excursion
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
302 (forward-line -1)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
303 (looking-at " *$"))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
304 (insert "\n"))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
305 (if (save-excursion
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
306 (beginning-of-line)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
307 (looking-at " *$"))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
308 (insert "\n")
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
309 (insert "\n\n")))))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
310
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
311 (defun shr-indent ()
110898
069deed4cdec Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110873
diff changeset
312 (when (> shr-indentation 0)
069deed4cdec Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110873
diff changeset
313 (insert (make-string shr-indentation ? ))))
110790
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
314
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
315 (defun shr-fontize-cont (cont &rest types)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
316 (let (shr-start)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
317 (shr-generic cont)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
318 (dolist (type types)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
319 (shr-add-font (or shr-start (point)) (point) type))))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
320
111072
a7fee19797df message.el (message-fix-before-sending): Change options when sending non-printable characters.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111067
diff changeset
321 ;; Add an overlay in the region, but avoid putting the font properties
a7fee19797df message.el (message-fix-before-sending): Change options when sending non-printable characters.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111067
diff changeset
322 ;; on blank text at the start of the line, and the newline at the end,
a7fee19797df message.el (message-fix-before-sending): Change options when sending non-printable characters.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111067
diff changeset
323 ;; to avoid ugliness.
110790
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
324 (defun shr-add-font (start end type)
111072
a7fee19797df message.el (message-fix-before-sending): Change options when sending non-printable characters.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111067
diff changeset
325 (save-excursion
a7fee19797df message.el (message-fix-before-sending): Change options when sending non-printable characters.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111067
diff changeset
326 (goto-char start)
a7fee19797df message.el (message-fix-before-sending): Change options when sending non-printable characters.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111067
diff changeset
327 (while (< (point) end)
a7fee19797df message.el (message-fix-before-sending): Change options when sending non-printable characters.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111067
diff changeset
328 (when (bolp)
a7fee19797df message.el (message-fix-before-sending): Change options when sending non-printable characters.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111067
diff changeset
329 (skip-chars-forward " "))
a7fee19797df message.el (message-fix-before-sending): Change options when sending non-printable characters.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111067
diff changeset
330 (let ((overlay (make-overlay (point) (min (line-end-position) end))))
a7fee19797df message.el (message-fix-before-sending): Change options when sending non-printable characters.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111067
diff changeset
331 (overlay-put overlay 'face type))
a7fee19797df message.el (message-fix-before-sending): Change options when sending non-printable characters.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111067
diff changeset
332 (if (< (line-end-position) end)
a7fee19797df message.el (message-fix-before-sending): Change options when sending non-printable characters.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111067
diff changeset
333 (forward-line 1)
a7fee19797df message.el (message-fix-before-sending): Change options when sending non-printable characters.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111067
diff changeset
334 (goto-char end)))))
110790
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
335
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
336 (defun shr-browse-url ()
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
337 "Browse the URL under point."
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
338 (interactive)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
339 (let ((url (get-text-property (point) 'shr-url)))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
340 (if (not url)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
341 (message "No link under point")
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
342 (browse-url url))))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
343
111058
ea17726e9043 shr.el (shr-save-contents): New command and keystroke.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111057
diff changeset
344 (defun shr-save-contents (directory)
ea17726e9043 shr.el (shr-save-contents): New command and keystroke.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111057
diff changeset
345 "Save the contents from URL in a file."
ea17726e9043 shr.el (shr-save-contents): New command and keystroke.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111057
diff changeset
346 (interactive "DSave contents of URL to directory: ")
ea17726e9043 shr.el (shr-save-contents): New command and keystroke.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111057
diff changeset
347 (let ((url (get-text-property (point) 'shr-url)))
ea17726e9043 shr.el (shr-save-contents): New command and keystroke.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111057
diff changeset
348 (if (not url)
ea17726e9043 shr.el (shr-save-contents): New command and keystroke.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111057
diff changeset
349 (message "No link under point")
ea17726e9043 shr.el (shr-save-contents): New command and keystroke.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111057
diff changeset
350 (url-retrieve (shr-encode-url url)
ea17726e9043 shr.el (shr-save-contents): New command and keystroke.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111057
diff changeset
351 'shr-store-contents (list url directory)))))
ea17726e9043 shr.el (shr-save-contents): New command and keystroke.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111057
diff changeset
352
ea17726e9043 shr.el (shr-save-contents): New command and keystroke.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111057
diff changeset
353 (defun shr-store-contents (status url directory)
ea17726e9043 shr.el (shr-save-contents): New command and keystroke.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111057
diff changeset
354 (unless (plist-get status :error)
ea17726e9043 shr.el (shr-save-contents): New command and keystroke.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111057
diff changeset
355 (when (or (search-forward "\n\n" nil t)
ea17726e9043 shr.el (shr-save-contents): New command and keystroke.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111057
diff changeset
356 (search-forward "\r\n\r\n" nil t))
ea17726e9043 shr.el (shr-save-contents): New command and keystroke.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111057
diff changeset
357 (write-region (point) (point-max)
ea17726e9043 shr.el (shr-save-contents): New command and keystroke.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111057
diff changeset
358 (expand-file-name (file-name-nondirectory url)
ea17726e9043 shr.el (shr-save-contents): New command and keystroke.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111057
diff changeset
359 directory)))))
ea17726e9043 shr.el (shr-save-contents): New command and keystroke.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111057
diff changeset
360
110708
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
361 (defun shr-image-fetched (status buffer start end)
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
362 (when (and (buffer-name buffer)
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
363 (not (plist-get status :error)))
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
364 (url-store-in-cache (current-buffer))
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
365 (when (or (search-forward "\n\n" nil t)
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
366 (search-forward "\r\n\r\n" nil t))
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
367 (let ((data (buffer-substring (point) (point-max))))
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
368 (with-current-buffer buffer
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
369 (let ((alt (buffer-substring start end))
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
370 (inhibit-read-only t))
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
371 (delete-region start end)
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
372 (shr-put-image data start alt))))))
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
373 (kill-buffer (current-buffer)))
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
374
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
375 (defun shr-put-image (data point alt)
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
376 (if (not (display-graphic-p))
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
377 (insert alt)
110747
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
378 (let ((image (ignore-errors
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
379 (shr-rescale-image data))))
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
380 (when image
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
381 (put-image image point alt)))))
110708
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
382
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
383 (defun shr-rescale-image (data)
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
384 (if (or (not (fboundp 'imagemagick-types))
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
385 (not (get-buffer-window (current-buffer))))
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
386 (create-image data nil t)
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
387 (let* ((image (create-image data nil t))
110747
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
388 (size (image-size image t))
110708
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
389 (width (car size))
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
390 (height (cdr size))
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
391 (edges (window-inside-pixel-edges
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
392 (get-buffer-window (current-buffer))))
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
393 (window-width (truncate (* shr-max-image-proportion
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
394 (- (nth 2 edges) (nth 0 edges)))))
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
395 (window-height (truncate (* shr-max-image-proportion
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
396 (- (nth 3 edges) (nth 1 edges)))))
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
397 scaled-image)
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
398 (when (> height window-height)
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
399 (setq image (or (create-image data 'imagemagick t
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
400 :height window-height)
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
401 image))
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
402 (setq size (image-size image t)))
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
403 (when (> (car size) window-width)
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
404 (setq image (or
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
405 (create-image data 'imagemagick t
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
406 :width window-width)
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
407 image)))
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
408 image)))
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
409
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
410 (defun shr-get-image-data (url)
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
411 "Get image data for URL.
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
412 Return a string with image data."
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
413 (with-temp-buffer
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
414 (mm-disable-multibyte)
110763
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
415 (when (ignore-errors
110957
627742e646c4 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110917
diff changeset
416 (url-cache-extract (url-cache-create-filename (shr-encode-url url)))
110763
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
417 t)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
418 (when (or (search-forward "\n\n" nil t)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
419 (search-forward "\r\n\r\n" nil t))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
420 (buffer-substring (point) (point-max))))))
110708
4c31586ca1ca Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110704
diff changeset
421
110790
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
422 (defun shr-heading (cont &rest types)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
423 (shr-ensure-paragraph)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
424 (apply #'shr-fontize-cont cont types)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
425 (shr-ensure-paragraph))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
426
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
427 ;;; Tag-specific rendering rules.
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
428
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
429 (defun shr-tag-p (cont)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
430 (shr-ensure-paragraph)
110898
069deed4cdec Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110873
diff changeset
431 (shr-indent)
110790
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
432 (shr-generic cont)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
433 (shr-ensure-paragraph))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
434
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
435 (defun shr-tag-b (cont)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
436 (shr-fontize-cont cont 'bold))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
437
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
438 (defun shr-tag-i (cont)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
439 (shr-fontize-cont cont 'italic))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
440
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
441 (defun shr-tag-em (cont)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
442 (shr-fontize-cont cont 'bold))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
443
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
444 (defun shr-tag-u (cont)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
445 (shr-fontize-cont cont 'underline))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
446
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
447 (defun shr-tag-s (cont)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
448 (shr-fontize-cont cont 'strike-through))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
449
111054
779cd575396a Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111033
diff changeset
450 (defun shr-tag-span (cont)
779cd575396a Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111033
diff changeset
451 (let ((start (point))
779cd575396a Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111033
diff changeset
452 (color (cdr (assq 'color (shr-parse-style (cdr (assq :style cont)))))))
779cd575396a Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111033
diff changeset
453 (shr-generic cont)
779cd575396a Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111033
diff changeset
454 (when color
779cd575396a Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111033
diff changeset
455 (let ((overlay (make-overlay start (point))))
779cd575396a Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111033
diff changeset
456 (overlay-put overlay 'face (cons 'foreground-color color))))))
779cd575396a Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111033
diff changeset
457
779cd575396a Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111033
diff changeset
458 (defun shr-parse-style (style)
779cd575396a Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111033
diff changeset
459 (when style
779cd575396a Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111033
diff changeset
460 (let ((plist nil))
779cd575396a Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111033
diff changeset
461 (dolist (elem (split-string style ";"))
779cd575396a Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111033
diff changeset
462 (when elem
779cd575396a Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111033
diff changeset
463 (setq elem (split-string elem ":"))
779cd575396a Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111033
diff changeset
464 (when (and (car elem)
779cd575396a Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111033
diff changeset
465 (cadr elem))
779cd575396a Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111033
diff changeset
466 (let ((name (replace-regexp-in-string "^ +\\| +$" "" (car elem)))
779cd575396a Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111033
diff changeset
467 (value (replace-regexp-in-string "^ +\\| +$" "" (cadr elem))))
779cd575396a Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111033
diff changeset
468 (push (cons (intern name obarray)
779cd575396a Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111033
diff changeset
469 value)
779cd575396a Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111033
diff changeset
470 plist)))))
779cd575396a Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111033
diff changeset
471 plist)))
779cd575396a Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111033
diff changeset
472
110790
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
473 (defun shr-tag-a (cont)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
474 (let ((url (cdr (assq :href cont)))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
475 (start (point))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
476 shr-start)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
477 (shr-generic cont)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
478 (widget-convert-button
110996
e65b79c36e50 shr.el (shr-tag-a): Use url-link as widget type.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110968
diff changeset
479 'url-link (or shr-start start) (point)
e65b79c36e50 shr.el (shr-tag-a): Use url-link as widget type.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110968
diff changeset
480 :help-echo url
e65b79c36e50 shr.el (shr-tag-a): Use url-link as widget type.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110968
diff changeset
481 :keymap shr-map
e65b79c36e50 shr.el (shr-tag-a): Use url-link as widget type.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110968
diff changeset
482 url)
110790
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
483 (put-text-property (or shr-start start) (point) 'shr-url url)))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
484
110957
627742e646c4 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110917
diff changeset
485 (defun shr-encode-url (url)
627742e646c4 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110917
diff changeset
486 "Encode URL."
627742e646c4 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110917
diff changeset
487 (browse-url-url-encode-chars url "[)$ ]"))
627742e646c4 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110917
diff changeset
488
110790
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
489 (defun shr-tag-img (cont)
111096
d7e691f6ffc0 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111078
diff changeset
490 (when (and cont
d7e691f6ffc0 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111078
diff changeset
491 (cdr (assq :src cont)))
111005
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
492 (when (and (> (current-column) 0)
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
493 (not (eq shr-state 'image)))
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
494 (insert "\n"))
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
495 (let ((alt (cdr (assq :alt cont)))
111019
615617bd614d shr.el (shr-tag-img): Don't align images -- since we're not rescaling, this often leads to ugly displays.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111005
diff changeset
496 (url (cdr (assq :src cont))))
111005
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
497 (let ((start (point-marker)))
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
498 (when (zerop (length alt))
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
499 (setq alt "[img]"))
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
500 (cond
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
501 ((and (not shr-inhibit-images)
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
502 (string-match "\\`cid:" url))
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
503 (let ((url (substring url (match-end 0)))
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
504 image)
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
505 (if (or (not shr-content-function)
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
506 (not (setq image (funcall shr-content-function url))))
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
507 (insert alt)
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
508 (shr-put-image image (point) alt))))
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
509 ((or shr-inhibit-images
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
510 (and shr-blocked-images
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
511 (string-match shr-blocked-images url)))
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
512 (setq shr-start (point))
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
513 (let ((shr-state 'space))
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
514 (if (> (length alt) 8)
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
515 (shr-insert (substring alt 0 8))
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
516 (shr-insert alt))))
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
517 ((url-is-cached (shr-encode-url url))
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
518 (shr-put-image (shr-get-image-data url) (point) alt))
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
519 (t
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
520 (insert alt)
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
521 (ignore-errors
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
522 (url-retrieve (shr-encode-url url) 'shr-image-fetched
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
523 (list (current-buffer) start (point-marker))
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
524 t))))
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
525 (insert " ")
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
526 (put-text-property start (point) 'keymap shr-map)
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
527 (put-text-property start (point) 'shr-alt alt)
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
528 (put-text-property start (point) 'shr-image url)
e172bc1db402 shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111002
diff changeset
529 (setq shr-state 'image)))))
110790
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
530
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
531 (defun shr-tag-pre (cont)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
532 (let ((shr-folding-mode 'none))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
533 (shr-ensure-newline)
110898
069deed4cdec Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110873
diff changeset
534 (shr-indent)
110790
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
535 (shr-generic cont)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
536 (shr-ensure-newline)))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
537
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
538 (defun shr-tag-blockquote (cont)
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
539 (shr-ensure-paragraph)
110898
069deed4cdec Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110873
diff changeset
540 (shr-indent)
110790
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
541 (let ((shr-indentation (+ shr-indentation 4)))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
542 (shr-generic cont))
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
543 (shr-ensure-paragraph))
110747
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
544
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
545 (defun shr-tag-ul (cont)
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
546 (shr-ensure-paragraph)
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
547 (let ((shr-list-mode 'ul))
110810
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
548 (shr-generic cont))
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
549 (shr-ensure-paragraph))
110747
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
550
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
551 (defun shr-tag-ol (cont)
110810
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
552 (shr-ensure-paragraph)
110747
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
553 (let ((shr-list-mode 1))
110810
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
554 (shr-generic cont))
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
555 (shr-ensure-paragraph))
110747
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
556
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
557 (defun shr-tag-li (cont)
110898
069deed4cdec Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110873
diff changeset
558 (shr-ensure-paragraph)
069deed4cdec Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110873
diff changeset
559 (shr-indent)
110757
d3001fd75795 shr.el (shr-tag-li): Get <li> indentation right.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110756
diff changeset
560 (let* ((bullet
d3001fd75795 shr.el (shr-tag-li): Get <li> indentation right.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110756
diff changeset
561 (if (numberp shr-list-mode)
d3001fd75795 shr.el (shr-tag-li): Get <li> indentation right.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110756
diff changeset
562 (prog1
d3001fd75795 shr.el (shr-tag-li): Get <li> indentation right.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110756
diff changeset
563 (format "%d " shr-list-mode)
d3001fd75795 shr.el (shr-tag-li): Get <li> indentation right.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110756
diff changeset
564 (setq shr-list-mode (1+ shr-list-mode)))
d3001fd75795 shr.el (shr-tag-li): Get <li> indentation right.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110756
diff changeset
565 "* "))
d3001fd75795 shr.el (shr-tag-li): Get <li> indentation right.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110756
diff changeset
566 (shr-indentation (+ shr-indentation (length bullet))))
d3001fd75795 shr.el (shr-tag-li): Get <li> indentation right.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110756
diff changeset
567 (insert bullet)
d3001fd75795 shr.el (shr-tag-li): Get <li> indentation right.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110756
diff changeset
568 (shr-generic cont)))
110747
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
569
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
570 (defun shr-tag-br (cont)
110756
9070b77b4a28 shr.el (shr-insert): Tweak line breaking.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110755
diff changeset
571 (unless (bobp)
110898
069deed4cdec Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110873
diff changeset
572 (insert "\n")
069deed4cdec Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110873
diff changeset
573 (shr-indent))
110747
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
574 (shr-generic cont))
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
575
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
576 (defun shr-tag-h1 (cont)
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
577 (shr-heading cont 'bold 'underline))
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
578
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
579 (defun shr-tag-h2 (cont)
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
580 (shr-heading cont 'bold))
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
581
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
582 (defun shr-tag-h3 (cont)
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
583 (shr-heading cont 'italic))
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
584
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
585 (defun shr-tag-h4 (cont)
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
586 (shr-heading cont))
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
587
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
588 (defun shr-tag-h5 (cont)
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
589 (shr-heading cont))
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
590
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
591 (defun shr-tag-h6 (cont)
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
592 (shr-heading cont))
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
593
110810
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
594 (defun shr-tag-hr (cont)
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
595 (shr-ensure-newline)
110917
3243e7055d49 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110898
diff changeset
596 (insert (make-string shr-width shr-hr-line) "\n"))
110810
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
597
110790
1f25b03df4ad Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110778
diff changeset
598 ;;; Table rendering algorithm.
110747
0defef1647a5 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110740
diff changeset
599
110778
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
600 ;; Table rendering is the only complicated thing here. We do this by
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
601 ;; first counting how many TDs there are in each TR, and registering
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
602 ;; how wide they think they should be ("width=45%", etc). Then we
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
603 ;; render each TD separately (this is done in temporary buffers, so
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
604 ;; that we can use all the rendering machinery as if we were in the
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
605 ;; main buffer). Now we know how much space each TD really takes, so
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
606 ;; we then render everything again with the new widths, and finally
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
607 ;; insert all these boxes into the main buffer.
111063
4430b518c7c5 shr.el: (shr-tag-table): Support caption, thead, and tfoot.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111059
diff changeset
608 (defun shr-tag-table-1 (cont)
110763
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
609 (setq cont (or (cdr (assq 'tbody cont))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
610 cont))
110777
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
611 (let* ((shr-inhibit-images t)
111032
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
612 (shr-kinsoku-shorten t)
110778
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
613 ;; Find all suggested widths.
110777
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
614 (columns (shr-column-specs cont))
110778
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
615 ;; Compute how many characters wide each TD should be.
110763
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
616 (suggested-widths (shr-pro-rate-columns columns))
110778
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
617 ;; Do a "test rendering" to see how big each TD is (this can
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
618 ;; be smaller (if there's little text) or bigger (if there's
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
619 ;; unbreakable text).
110763
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
620 (sketch (shr-make-table cont suggested-widths))
110804
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
621 (sketch-widths (shr-table-widths sketch suggested-widths)))
110999
9330a5183ae6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110996
diff changeset
622 ;; This probably won't work very well.
111032
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
623 (when (> (+ (loop for width across sketch-widths
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
624 summing (1+ width))
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
625 shr-indentation 1)
110999
9330a5183ae6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110996
diff changeset
626 (frame-width))
9330a5183ae6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110996
diff changeset
627 (setq truncate-lines t))
110778
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
628 ;; Then render the table again with these new "hard" widths.
110777
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
629 (shr-insert-table (shr-make-table cont sketch-widths t) sketch-widths))
110778
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
630 ;; Finally, insert all the images after the table. The Emacs buffer
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
631 ;; model isn't strong enough to allow us to put the images actually
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
632 ;; into the tables.
110777
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
633 (dolist (elem (shr-find-elements cont 'img))
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
634 (shr-tag-img (cdr elem))))
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
635
111063
4430b518c7c5 shr.el: (shr-tag-table): Support caption, thead, and tfoot.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111059
diff changeset
636 (defun shr-tag-table (cont)
4430b518c7c5 shr.el: (shr-tag-table): Support caption, thead, and tfoot.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111059
diff changeset
637 (shr-ensure-paragraph)
4430b518c7c5 shr.el: (shr-tag-table): Support caption, thead, and tfoot.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111059
diff changeset
638 (let* ((caption (cdr (assq 'caption cont)))
4430b518c7c5 shr.el: (shr-tag-table): Support caption, thead, and tfoot.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111059
diff changeset
639 (header (cdr (assq 'thead cont)))
4430b518c7c5 shr.el: (shr-tag-table): Support caption, thead, and tfoot.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111059
diff changeset
640 (body (or (cdr (assq 'tbody cont)) cont))
4430b518c7c5 shr.el: (shr-tag-table): Support caption, thead, and tfoot.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111059
diff changeset
641 (footer (cdr (assq 'tfoot cont)))
4430b518c7c5 shr.el: (shr-tag-table): Support caption, thead, and tfoot.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111059
diff changeset
642 (nheader (if header (shr-max-columns header)))
4430b518c7c5 shr.el: (shr-tag-table): Support caption, thead, and tfoot.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111059
diff changeset
643 (nbody (if body (shr-max-columns body)))
4430b518c7c5 shr.el: (shr-tag-table): Support caption, thead, and tfoot.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111059
diff changeset
644 (nfooter (if footer (shr-max-columns footer))))
4430b518c7c5 shr.el: (shr-tag-table): Support caption, thead, and tfoot.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111059
diff changeset
645 (shr-tag-table-1
111078
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
646 (nconc
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
647 (if caption `((tr (td ,@caption))))
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
648 (if header
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
649 (if footer
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
650 ;; hader + body + footer
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
651 (if (= nheader nbody)
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
652 (if (= nbody nfooter)
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
653 `((tr (td (table (tbody ,@header ,@body ,@footer)))))
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
654 (nconc `((tr (td (table (tbody ,@header ,@body)))))
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
655 (if (= nfooter 1)
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
656 footer
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
657 `((tr (td (table (tbody ,@footer))))))))
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
658 (nconc `((tr (td (table (tbody ,@header)))))
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
659 (if (= nbody nfooter)
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
660 `((tr (td (table (tbody ,@body ,@footer)))))
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
661 (nconc `((tr (td (table (tbody ,@body)))))
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
662 (if (= nfooter 1)
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
663 footer
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
664 `((tr (td (table (tbody ,@footer))))))))))
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
665 ;; header + body
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
666 (if (= nheader nbody)
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
667 `((tr (td (table (tbody ,@header ,@body)))))
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
668 (if (= nheader 1)
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
669 `(,@header (tr (td (table (tbody ,@body)))))
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
670 `((tr (td (table (tbody ,@header))))
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
671 (tr (td (table (tbody ,@body))))))))
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
672 (if footer
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
673 ;; body + footer
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
674 (if (= nbody nfooter)
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
675 `((tr (td (table (tbody ,@body ,@footer)))))
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
676 (nconc `((tr (td (table (tbody ,@body)))))
111067
e36c65ac23bf Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111066
diff changeset
677 (if (= nfooter 1)
111078
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
678 footer
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
679 `((tr (td (table (tbody ,@footer))))))))
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
680 (if caption
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
681 `((tr (td (table (tbody ,@body)))))
647c0a15da32 shr.el (shr-tag-table): Simplify.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111072
diff changeset
682 body)))))))
111063
4430b518c7c5 shr.el: (shr-tag-table): Support caption, thead, and tfoot.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111059
diff changeset
683
110777
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
684 (defun shr-find-elements (cont type)
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
685 (let (result)
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
686 (dolist (elem cont)
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
687 (cond ((eq (car elem) type)
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
688 (push elem result))
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
689 ((consp (cdr elem))
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
690 (setq result (nconc (shr-find-elements (cdr elem) type) result)))))
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
691 (nreverse result)))
110763
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
692
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
693 (defun shr-insert-table (table widths)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
694 (shr-insert-table-ruler widths)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
695 (dolist (row table)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
696 (let ((start (point))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
697 (height (let ((max 0))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
698 (dolist (column row)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
699 (setq max (max max (cadr column))))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
700 max)))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
701 (dotimes (i height)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
702 (shr-indent)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
703 (insert "|\n"))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
704 (dolist (column row)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
705 (goto-char start)
110804
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
706 (let ((lines (nth 2 column))
110777
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
707 (overlay-lines (nth 3 column))
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
708 overlay overlay-line)
110763
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
709 (dolist (line lines)
110777
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
710 (setq overlay-line (pop overlay-lines))
110810
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
711 (end-of-line)
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
712 (insert line "|")
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
713 (dolist (overlay overlay-line)
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
714 (let ((o (make-overlay (- (point) (nth 0 overlay) 1)
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
715 (- (point) (nth 1 overlay) 1)))
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
716 (properties (nth 2 overlay)))
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
717 (while properties
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
718 (overlay-put o (pop properties) (pop properties)))))
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
719 (forward-line 1))
110763
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
720 ;; Add blank lines at padding at the bottom of the TD,
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
721 ;; possibly.
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
722 (dotimes (i (- height (length lines)))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
723 (end-of-line)
111032
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
724 (insert (make-string (string-width (car lines)) ? ) "|")
110763
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
725 (forward-line 1)))))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
726 (shr-insert-table-ruler widths)))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
727
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
728 (defun shr-insert-table-ruler (widths)
111032
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
729 (when (and (bolp)
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
730 (> shr-indentation 0))
1ed05f12a0bc shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111022
diff changeset
731 (shr-indent))
110873
d98a67277730 shr,el: Allow shr table char to be customized.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110859
diff changeset
732 (insert shr-table-corner)
110763
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
733 (dotimes (i (length widths))
110873
d98a67277730 shr,el: Allow shr table char to be customized.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110859
diff changeset
734 (insert (make-string (aref widths i) shr-table-line) shr-table-corner))
110763
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
735 (insert "\n"))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
736
110804
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
737 (defun shr-table-widths (table suggested-widths)
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
738 (let* ((length (length suggested-widths))
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
739 (widths (make-vector length 0))
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
740 (natural-widths (make-vector length 0)))
110763
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
741 (dolist (row table)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
742 (let ((i 0))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
743 (dolist (column row)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
744 (aset widths i (max (aref widths i)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
745 (car column)))
110804
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
746 (aset natural-widths i (max (aref natural-widths i)
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
747 (cadr column)))
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
748 (setq i (1+ i)))))
110812
3d3d15223058 shr.el (shr-table-widths): Don't use cl function `reduce'.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110810
diff changeset
749 (let ((extra (- (apply '+ (append suggested-widths nil))
3d3d15223058 shr.el (shr-table-widths): Don't use cl function `reduce'.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110810
diff changeset
750 (apply '+ (append widths nil))))
110804
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
751 (expanded-columns 0))
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
752 (when (> extra 0)
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
753 (dotimes (i length)
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
754 ;; If the natural width is wider than the rendered width, we
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
755 ;; want to allow the column to expand.
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
756 (when (> (aref natural-widths i) (aref widths i))
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
757 (setq expanded-columns (1+ expanded-columns))))
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
758 (dotimes (i length)
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
759 (when (> (aref natural-widths i) (aref widths i))
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
760 (aset widths i (min
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
761 (1+ (aref natural-widths i))
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
762 (+ (/ extra expanded-columns)
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
763 (aref widths i))))))))
110763
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
764 widths))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
765
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
766 (defun shr-make-table (cont widths &optional fill)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
767 (let ((trs nil))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
768 (dolist (row cont)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
769 (when (eq (car row) 'tr)
110778
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
770 (let ((tds nil)
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
771 (columns (cdr row))
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
772 (i 0)
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
773 column)
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
774 (while (< i (length widths))
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
775 (setq column (pop columns))
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
776 (when (or (memq (car column) '(td th))
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
777 (null column))
110763
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
778 (push (shr-render-td (cdr column) (aref widths i) fill)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
779 tds)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
780 (setq i (1+ i))))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
781 (push (nreverse tds) trs))))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
782 (nreverse trs)))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
783
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
784 (defun shr-render-td (cont width fill)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
785 (with-temp-buffer
110810
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
786 (let ((cache (cdr (assoc (cons width cont) shr-content-cache))))
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
787 (if cache
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
788 (insert cache)
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
789 (let ((shr-width width)
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
790 (shr-indentation 0))
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
791 (shr-generic cont))
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
792 (delete-region
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
793 (point)
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
794 (+ (point)
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
795 (skip-chars-backward " \t\n")))
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
796 (push (cons (cons width cont) (buffer-string))
07053df95af6 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110804
diff changeset
797 shr-content-cache)))
110763
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
798 (goto-char (point-min))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
799 (let ((max 0))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
800 (while (not (eobp))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
801 (end-of-line)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
802 (setq max (max max (current-column)))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
803 (forward-line 1))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
804 (when fill
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
805 (goto-char (point-min))
110778
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
806 ;; If the buffer is totally empty, then put a single blank
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
807 ;; line here.
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
808 (if (zerop (buffer-size))
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
809 (insert (make-string width ? ))
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
810 ;; Otherwise, fill the buffer.
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
811 (while (not (eobp))
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
812 (end-of-line)
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
813 (when (> (- width (current-column)) 0)
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
814 (insert (make-string (- width (current-column)) ? )))
5a595f515d1c shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110777
diff changeset
815 (forward-line 1))))
110804
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
816 (if fill
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
817 (list max
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
818 (count-lines (point-min) (point-max))
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
819 (split-string (buffer-string) "\n")
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
820 (shr-collect-overlays))
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
821 (list max
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
822 (shr-natural-width))))))
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
823
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
824 (defun shr-natural-width ()
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
825 (goto-char (point-min))
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
826 (let ((current 0)
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
827 (max 0))
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
828 (while (not (eobp))
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
829 (end-of-line)
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
830 (setq current (+ current (current-column)))
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
831 (unless (get-text-property (point) 'shr-break)
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
832 (setq max (max max current)
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
833 current 0))
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
834 (forward-line 1))
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
835 max))
110777
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
836
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
837 (defun shr-collect-overlays ()
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
838 (save-excursion
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
839 (goto-char (point-min))
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
840 (let ((overlays nil))
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
841 (while (not (eobp))
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
842 (push (shr-overlays-in-region (point) (line-end-position))
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
843 overlays)
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
844 (forward-line 1))
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
845 (nreverse overlays))))
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
846
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
847 (defun shr-overlays-in-region (start end)
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
848 (let (result)
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
849 (dolist (overlay (overlays-in start end))
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
850 (push (list (if (> start (overlay-start overlay))
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
851 (- end start)
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
852 (- end (overlay-start overlay)))
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
853 (if (< end (overlay-end overlay))
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
854 0
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
855 (- end (overlay-end overlay)))
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
856 (overlay-properties overlay))
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
857 result))
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
858 (nreverse result)))
110763
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
859
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
860 (defun shr-pro-rate-columns (columns)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
861 (let ((total-percentage 0)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
862 (widths (make-vector (length columns) 0)))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
863 (dotimes (i (length columns))
110804
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
864 (setq total-percentage (+ total-percentage (aref columns i))))
110763
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
865 (setq total-percentage (/ 1.0 total-percentage))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
866 (dotimes (i (length columns))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
867 (aset widths i (max (truncate (* (aref columns i)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
868 total-percentage
110804
30fed27e97bc Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110792
diff changeset
869 (- shr-width (1+ (length columns)))))
110763
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
870 10)))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
871 widths))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
872
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
873 ;; Return a summary of the number and shape of the TDs in the table.
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
874 (defun shr-column-specs (cont)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
875 (let ((columns (make-vector (shr-max-columns cont) 1)))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
876 (dolist (row cont)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
877 (when (eq (car row) 'tr)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
878 (let ((i 0))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
879 (dolist (column (cdr row))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
880 (when (memq (car column) '(td th))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
881 (let ((width (cdr (assq :width (cdr column)))))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
882 (when (and width
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
883 (string-match "\\([0-9]+\\)%" width))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
884 (aset columns i
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
885 (/ (string-to-number (match-string 1 width))
110777
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
886 100.0))))
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
887 (setq i (1+ i)))))))
110763
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
888 columns))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
889
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
890 (defun shr-count (cont elem)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
891 (let ((i 0))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
892 (dolist (sub cont)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
893 (when (eq (car sub) elem)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
894 (setq i (1+ i))))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
895 i))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
896
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
897 (defun shr-max-columns (cont)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
898 (let ((max 0))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
899 (dolist (row cont)
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
900 (when (eq (car row) 'tr)
110777
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
901 (setq max (max max (+ (shr-count (cdr row) 'td)
895607aec71e Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110774
diff changeset
902 (shr-count (cdr row) 'th))))))
110763
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
903 max))
0fe64d68a522 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110757
diff changeset
904
110704
016990bf37ad lisp/gnus/shr.el (shr): Fix typo in provide call.
Juanma Barranquero <lekktu@gmail.com>
parents: 110698
diff changeset
905 (provide 'shr)
110698
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
906
74bad2d7bddd Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
907 ;;; shr.el ends here