Mercurial > emacs
annotate lisp/gnus/shr.el @ 111066:ea124ffc596b
shr.el (shr-tag-table): Fix last change.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Wed, 20 Oct 2010 12:24:49 +0000 |
parents | 4430b518c7c5 |
children | e36c65ac23bf |
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 |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
321 (defun shr-add-font (start end type) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
322 (let ((overlay (make-overlay start end))) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
323 (overlay-put overlay 'face type))) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
324 |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
325 (defun shr-browse-url () |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
326 "Browse the URL under point." |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
327 (interactive) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
328 (let ((url (get-text-property (point) 'shr-url))) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
329 (if (not url) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
330 (message "No link under point") |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
331 (browse-url url)))) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
332 |
111058
ea17726e9043
shr.el (shr-save-contents): New command and keystroke.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111057
diff
changeset
|
333 (defun shr-save-contents (directory) |
ea17726e9043
shr.el (shr-save-contents): New command and keystroke.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111057
diff
changeset
|
334 "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
|
335 (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
|
336 (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
|
337 (if (not url) |
ea17726e9043
shr.el (shr-save-contents): New command and keystroke.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111057
diff
changeset
|
338 (message "No link under point") |
ea17726e9043
shr.el (shr-save-contents): New command and keystroke.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111057
diff
changeset
|
339 (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
|
340 '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
|
341 |
ea17726e9043
shr.el (shr-save-contents): New command and keystroke.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111057
diff
changeset
|
342 (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
|
343 (unless (plist-get status :error) |
ea17726e9043
shr.el (shr-save-contents): New command and keystroke.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111057
diff
changeset
|
344 (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
|
345 (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
|
346 (write-region (point) (point-max) |
ea17726e9043
shr.el (shr-save-contents): New command and keystroke.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111057
diff
changeset
|
347 (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
|
348 directory))))) |
ea17726e9043
shr.el (shr-save-contents): New command and keystroke.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111057
diff
changeset
|
349 |
110708
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
350 (defun shr-image-fetched (status buffer start end) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
351 (when (and (buffer-name buffer) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
352 (not (plist-get status :error))) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
353 (url-store-in-cache (current-buffer)) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
354 (when (or (search-forward "\n\n" nil t) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
355 (search-forward "\r\n\r\n" nil t)) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
356 (let ((data (buffer-substring (point) (point-max)))) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
357 (with-current-buffer buffer |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
358 (let ((alt (buffer-substring start end)) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
359 (inhibit-read-only t)) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
360 (delete-region start end) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
361 (shr-put-image data start alt)))))) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
362 (kill-buffer (current-buffer))) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
363 |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
364 (defun shr-put-image (data point alt) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
365 (if (not (display-graphic-p)) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
366 (insert alt) |
110747
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
367 (let ((image (ignore-errors |
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
368 (shr-rescale-image data)))) |
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
369 (when image |
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
370 (put-image image point alt))))) |
110708
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
371 |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
372 (defun shr-rescale-image (data) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
373 (if (or (not (fboundp 'imagemagick-types)) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
374 (not (get-buffer-window (current-buffer)))) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
375 (create-image data nil t) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
376 (let* ((image (create-image data nil t)) |
110747
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
377 (size (image-size image t)) |
110708
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
378 (width (car size)) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
379 (height (cdr size)) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
380 (edges (window-inside-pixel-edges |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
381 (get-buffer-window (current-buffer)))) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
382 (window-width (truncate (* shr-max-image-proportion |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
383 (- (nth 2 edges) (nth 0 edges))))) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
384 (window-height (truncate (* shr-max-image-proportion |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
385 (- (nth 3 edges) (nth 1 edges))))) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
386 scaled-image) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
387 (when (> height window-height) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
388 (setq image (or (create-image data 'imagemagick t |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
389 :height window-height) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
390 image)) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
391 (setq size (image-size image t))) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
392 (when (> (car size) window-width) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
393 (setq image (or |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
394 (create-image data 'imagemagick t |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
395 :width window-width) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
396 image))) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
397 image))) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
398 |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
399 (defun shr-get-image-data (url) |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
400 "Get image data for URL. |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
401 Return a string with image data." |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
402 (with-temp-buffer |
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
403 (mm-disable-multibyte) |
110763
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
404 (when (ignore-errors |
110957
627742e646c4
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110917
diff
changeset
|
405 (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
|
406 t) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
407 (when (or (search-forward "\n\n" nil t) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
408 (search-forward "\r\n\r\n" nil t)) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
409 (buffer-substring (point) (point-max)))))) |
110708
4c31586ca1ca
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110704
diff
changeset
|
410 |
110790
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
411 (defun shr-heading (cont &rest types) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
412 (shr-ensure-paragraph) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
413 (apply #'shr-fontize-cont cont types) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
414 (shr-ensure-paragraph)) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
415 |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
416 ;;; Tag-specific rendering rules. |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
417 |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
418 (defun shr-tag-p (cont) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
419 (shr-ensure-paragraph) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110873
diff
changeset
|
420 (shr-indent) |
110790
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
421 (shr-generic cont) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
422 (shr-ensure-paragraph)) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
423 |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
424 (defun shr-tag-b (cont) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
425 (shr-fontize-cont cont 'bold)) |
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 (defun shr-tag-i (cont) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
428 (shr-fontize-cont cont 'italic)) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
429 |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
430 (defun shr-tag-em (cont) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
431 (shr-fontize-cont cont 'bold)) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
432 |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
433 (defun shr-tag-u (cont) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
434 (shr-fontize-cont cont 'underline)) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
435 |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
436 (defun shr-tag-s (cont) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
437 (shr-fontize-cont cont 'strike-through)) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
438 |
111054
779cd575396a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111033
diff
changeset
|
439 (defun shr-tag-span (cont) |
779cd575396a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111033
diff
changeset
|
440 (let ((start (point)) |
779cd575396a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111033
diff
changeset
|
441 (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
|
442 (shr-generic cont) |
779cd575396a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111033
diff
changeset
|
443 (when color |
779cd575396a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111033
diff
changeset
|
444 (let ((overlay (make-overlay start (point)))) |
779cd575396a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111033
diff
changeset
|
445 (overlay-put overlay 'face (cons 'foreground-color color)))))) |
779cd575396a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111033
diff
changeset
|
446 |
779cd575396a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111033
diff
changeset
|
447 (defun shr-parse-style (style) |
779cd575396a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111033
diff
changeset
|
448 (when style |
779cd575396a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111033
diff
changeset
|
449 (let ((plist nil)) |
779cd575396a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111033
diff
changeset
|
450 (dolist (elem (split-string style ";")) |
779cd575396a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111033
diff
changeset
|
451 (when elem |
779cd575396a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111033
diff
changeset
|
452 (setq elem (split-string elem ":")) |
779cd575396a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111033
diff
changeset
|
453 (when (and (car elem) |
779cd575396a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111033
diff
changeset
|
454 (cadr elem)) |
779cd575396a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111033
diff
changeset
|
455 (let ((name (replace-regexp-in-string "^ +\\| +$" "" (car elem))) |
779cd575396a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111033
diff
changeset
|
456 (value (replace-regexp-in-string "^ +\\| +$" "" (cadr elem)))) |
779cd575396a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111033
diff
changeset
|
457 (push (cons (intern name obarray) |
779cd575396a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111033
diff
changeset
|
458 value) |
779cd575396a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111033
diff
changeset
|
459 plist))))) |
779cd575396a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111033
diff
changeset
|
460 plist))) |
779cd575396a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111033
diff
changeset
|
461 |
110790
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
462 (defun shr-tag-a (cont) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
463 (let ((url (cdr (assq :href cont))) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
464 (start (point)) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
465 shr-start) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
466 (shr-generic cont) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
467 (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
|
468 '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
|
469 :help-echo url |
e65b79c36e50
shr.el (shr-tag-a): Use url-link as widget type.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110968
diff
changeset
|
470 :keymap shr-map |
e65b79c36e50
shr.el (shr-tag-a): Use url-link as widget type.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110968
diff
changeset
|
471 url) |
110790
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
472 (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
|
473 |
110957
627742e646c4
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110917
diff
changeset
|
474 (defun shr-encode-url (url) |
627742e646c4
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110917
diff
changeset
|
475 "Encode URL." |
627742e646c4
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110917
diff
changeset
|
476 (browse-url-url-encode-chars url "[)$ ]")) |
627742e646c4
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110917
diff
changeset
|
477 |
110790
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
478 (defun shr-tag-img (cont) |
111005
e172bc1db402
shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111002
diff
changeset
|
479 (when cont |
e172bc1db402
shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111002
diff
changeset
|
480 (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
|
481 (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
|
482 (insert "\n")) |
e172bc1db402
shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111002
diff
changeset
|
483 (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
|
484 (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
|
485 (let ((start (point-marker))) |
e172bc1db402
shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111002
diff
changeset
|
486 (when (zerop (length alt)) |
e172bc1db402
shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111002
diff
changeset
|
487 (setq alt "[img]")) |
e172bc1db402
shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111002
diff
changeset
|
488 (cond |
e172bc1db402
shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111002
diff
changeset
|
489 ((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
|
490 (string-match "\\`cid:" url)) |
e172bc1db402
shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111002
diff
changeset
|
491 (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
|
492 image) |
e172bc1db402
shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111002
diff
changeset
|
493 (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
|
494 (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
|
495 (insert alt) |
e172bc1db402
shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111002
diff
changeset
|
496 (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
|
497 ((or shr-inhibit-images |
e172bc1db402
shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111002
diff
changeset
|
498 (and shr-blocked-images |
e172bc1db402
shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111002
diff
changeset
|
499 (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
|
500 (setq shr-start (point)) |
e172bc1db402
shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111002
diff
changeset
|
501 (let ((shr-state 'space)) |
e172bc1db402
shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111002
diff
changeset
|
502 (if (> (length alt) 8) |
e172bc1db402
shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111002
diff
changeset
|
503 (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
|
504 (shr-insert alt)))) |
e172bc1db402
shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111002
diff
changeset
|
505 ((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
|
506 (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
|
507 (t |
e172bc1db402
shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111002
diff
changeset
|
508 (insert alt) |
e172bc1db402
shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111002
diff
changeset
|
509 (ignore-errors |
e172bc1db402
shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111002
diff
changeset
|
510 (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
|
511 (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
|
512 t)))) |
e172bc1db402
shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111002
diff
changeset
|
513 (insert " ") |
e172bc1db402
shr.el (shr-tag-img): Ignore images with no data.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111002
diff
changeset
|
514 (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
|
515 (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
|
516 (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
|
517 (setq shr-state 'image))))) |
110790
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
518 |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
519 (defun shr-tag-pre (cont) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
520 (let ((shr-folding-mode 'none)) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
521 (shr-ensure-newline) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110873
diff
changeset
|
522 (shr-indent) |
110790
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
523 (shr-generic cont) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
524 (shr-ensure-newline))) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
525 |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
526 (defun shr-tag-blockquote (cont) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
527 (shr-ensure-paragraph) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110873
diff
changeset
|
528 (shr-indent) |
110790
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
529 (let ((shr-indentation (+ shr-indentation 4))) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
530 (shr-generic cont)) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
531 (shr-ensure-paragraph)) |
110747
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
532 |
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
533 (defun shr-tag-ul (cont) |
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
534 (shr-ensure-paragraph) |
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
535 (let ((shr-list-mode 'ul)) |
110810
07053df95af6
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110804
diff
changeset
|
536 (shr-generic cont)) |
07053df95af6
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110804
diff
changeset
|
537 (shr-ensure-paragraph)) |
110747
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
538 |
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
539 (defun shr-tag-ol (cont) |
110810
07053df95af6
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110804
diff
changeset
|
540 (shr-ensure-paragraph) |
110747
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
541 (let ((shr-list-mode 1)) |
110810
07053df95af6
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110804
diff
changeset
|
542 (shr-generic cont)) |
07053df95af6
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110804
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-li (cont) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110873
diff
changeset
|
546 (shr-ensure-paragraph) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110873
diff
changeset
|
547 (shr-indent) |
110757
d3001fd75795
shr.el (shr-tag-li): Get <li> indentation right.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110756
diff
changeset
|
548 (let* ((bullet |
d3001fd75795
shr.el (shr-tag-li): Get <li> indentation right.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110756
diff
changeset
|
549 (if (numberp shr-list-mode) |
d3001fd75795
shr.el (shr-tag-li): Get <li> indentation right.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110756
diff
changeset
|
550 (prog1 |
d3001fd75795
shr.el (shr-tag-li): Get <li> indentation right.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110756
diff
changeset
|
551 (format "%d " shr-list-mode) |
d3001fd75795
shr.el (shr-tag-li): Get <li> indentation right.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110756
diff
changeset
|
552 (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
|
553 "* ")) |
d3001fd75795
shr.el (shr-tag-li): Get <li> indentation right.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110756
diff
changeset
|
554 (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
|
555 (insert bullet) |
d3001fd75795
shr.el (shr-tag-li): Get <li> indentation right.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110756
diff
changeset
|
556 (shr-generic cont))) |
110747
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
557 |
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
558 (defun shr-tag-br (cont) |
110756
9070b77b4a28
shr.el (shr-insert): Tweak line breaking.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110755
diff
changeset
|
559 (unless (bobp) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110873
diff
changeset
|
560 (insert "\n") |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110873
diff
changeset
|
561 (shr-indent)) |
110747
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
562 (shr-generic cont)) |
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
563 |
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
564 (defun shr-tag-h1 (cont) |
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
565 (shr-heading cont 'bold 'underline)) |
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
566 |
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
567 (defun shr-tag-h2 (cont) |
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
568 (shr-heading cont 'bold)) |
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-h3 (cont) |
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
571 (shr-heading cont 'italic)) |
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
572 |
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
573 (defun shr-tag-h4 (cont) |
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
574 (shr-heading 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-h5 (cont) |
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
577 (shr-heading cont)) |
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-h6 (cont) |
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
580 (shr-heading cont)) |
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
581 |
110810
07053df95af6
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110804
diff
changeset
|
582 (defun shr-tag-hr (cont) |
07053df95af6
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110804
diff
changeset
|
583 (shr-ensure-newline) |
110917
3243e7055d49
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
584 (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
|
585 |
110790
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110778
diff
changeset
|
586 ;;; Table rendering algorithm. |
110747
0defef1647a5
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110740
diff
changeset
|
587 |
110778
5a595f515d1c
shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110777
diff
changeset
|
588 ;; 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
|
589 ;; 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
|
590 ;; 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
|
591 ;; 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
|
592 ;; 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
|
593 ;; 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
|
594 ;; 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
|
595 ;; 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
|
596 (defun shr-tag-table-1 (cont) |
110763
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
597 (setq cont (or (cdr (assq 'tbody cont)) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
598 cont)) |
110777
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
599 (let* ((shr-inhibit-images t) |
111032
1ed05f12a0bc
shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111022
diff
changeset
|
600 (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
|
601 ;; Find all suggested widths. |
110777
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
602 (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
|
603 ;; 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
|
604 (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
|
605 ;; 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
|
606 ;; 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
|
607 ;; unbreakable text). |
110763
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
608 (sketch (shr-make-table cont suggested-widths)) |
110804
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
609 (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
|
610 ;; 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
|
611 (when (> (+ (loop for width across sketch-widths |
1ed05f12a0bc
shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111022
diff
changeset
|
612 summing (1+ width)) |
1ed05f12a0bc
shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111022
diff
changeset
|
613 shr-indentation 1) |
110999
9330a5183ae6
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110996
diff
changeset
|
614 (frame-width)) |
9330a5183ae6
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110996
diff
changeset
|
615 (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
|
616 ;; 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
|
617 (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
|
618 ;; 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
|
619 ;; 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
|
620 ;; into the tables. |
110777
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
621 (dolist (elem (shr-find-elements cont 'img)) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
622 (shr-tag-img (cdr elem)))) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
623 |
111063
4430b518c7c5
shr.el: (shr-tag-table): Support caption, thead, and tfoot.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111059
diff
changeset
|
624 (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
|
625 (shr-ensure-paragraph) |
4430b518c7c5
shr.el: (shr-tag-table): Support caption, thead, and tfoot.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111059
diff
changeset
|
626 (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
|
627 (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
|
628 (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
|
629 (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
|
630 (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
|
631 (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
|
632 (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
|
633 (shr-tag-table-1 |
4430b518c7c5
shr.el: (shr-tag-table): Support caption, thead, and tfoot.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111059
diff
changeset
|
634 (nconc |
111066
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
635 (if caption |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
636 (if header |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
637 (if footer |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
638 ;; caption + hader + body + footer |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
639 (if (= nheader nbody) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
640 (if (= nbody nfooter) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
641 `((tr (td ,@caption)) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
642 (tr (td (table (tbody ,@header ,@body ,@footer))))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
643 (if (= nfooter 1) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
644 `((tr (td ,@caption)) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
645 (tr (td (table (tbody ,@header ,@body)))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
646 ,@footer) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
647 `((tr (td ,@caption)) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
648 (tr (td (table (tbody ,@header ,@body)))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
649 (tr (td (table (tbody ,@footer))))))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
650 (if (= nbody nfooter) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
651 `((tr (td ,@caption)) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
652 (tr (td (table (tbody ,@header)))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
653 (tr (td (table (tbody ,@body ,@footer))))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
654 (if (= nfooter 1) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
655 `((tr (td ,@caption)) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
656 (tr (td (table (tbody ,@header)))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
657 (tr (td (table (tbody ,@body)))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
658 ,@footer) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
659 `((tr (td ,@caption)) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
660 (tr (td (table (tbody ,@header)))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
661 (tr (td (table (tbody ,@body)))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
662 (tr (td (table (tbody ,@footer)))))))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
663 ;; caption + header + body |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
664 (if (= nheader nbody) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
665 `((tr (td ,@caption)) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
666 (tr (td (table (tbody ,@header ,@body))))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
667 (if (= nheader 1) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
668 `((tr (td ,@caption)) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
669 ,@header (tr (td (table (tbody ,@body))))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
670 `((tr (td ,@caption)) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
671 (tr (td (table (tbody ,@header)))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
672 (tr (td (table (tbody ,@body)))))))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
673 (if footer |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
674 ;; caption + body + footer |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
675 (if (= nbody nfooter) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
676 `((tr (td (table (tbody ,@body ,@footer))))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
677 (if (= nfooter 1) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
678 `((tr (td (table (tbody ,@body)))) ,@footer) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
679 `((tr (td (table (tbody ,@body)))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
680 (tr (td (table (tbody ,@footer))))))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
681 ;; caption + body |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
682 `((tr (td ,@caption)) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
683 (tr (td (table (tbody ,@body))))))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
684 (if header |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
685 (if footer |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
686 ;; header + body + footer |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
687 (if (= nheader nbody) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
688 (if (= nbody nfooter) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
689 `((tr (td (table (tbody ,@header ,@body ,@footer))))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
690 (if (= nfooter 1) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
691 `((tr (td (table (tbody ,@header ,@body)))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
692 ,@footer) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
693 `((tr (td (table (tbody ,@header ,@body)))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
694 (tr (td (table (tbody ,@footer))))))) |
111063
4430b518c7c5
shr.el: (shr-tag-table): Support caption, thead, and tfoot.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111059
diff
changeset
|
695 (if (= nbody nfooter) |
111066
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
696 `((tr (td (table (tbody ,@header)))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
697 (tr (td (table (tbody ,@body ,@footer))))) |
111063
4430b518c7c5
shr.el: (shr-tag-table): Support caption, thead, and tfoot.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111059
diff
changeset
|
698 (if (= nfooter 1) |
111066
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
699 `((tr (td (table (tbody ,@header)))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
700 (tr (td (table (tbody ,@body)))) |
111063
4430b518c7c5
shr.el: (shr-tag-table): Support caption, thead, and tfoot.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111059
diff
changeset
|
701 ,@footer) |
4430b518c7c5
shr.el: (shr-tag-table): Support caption, thead, and tfoot.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111059
diff
changeset
|
702 `((tr (td (table (tbody ,@header)))) |
4430b518c7c5
shr.el: (shr-tag-table): Support caption, thead, and tfoot.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111059
diff
changeset
|
703 (tr (td (table (tbody ,@body)))) |
111066
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
704 (tr (td (table (tbody ,@footer)))))))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
705 ;; header + body |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
706 (if (= nheader nbody) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
707 `((tr (td (table (tbody ,@header ,@body))))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
708 (if (= nheader 1) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
709 `(,@header (tr (td (table (tbody ,@body))))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
710 `((tr (td (table (tbody ,@header)))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
711 (tr (td (table (tbody ,@body)))))))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
712 (if footer |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
713 ;; body + footer |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
714 (if (= nbody nfooter) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
715 `((tr (td (table (tbody ,@body ,@footer))))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
716 (if (= nfooter 1) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
717 `((tr (td (table (tbody ,@body)))) ,@footer) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
718 `((tr (td (table (tbody ,@body)))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
719 (tr (td (table (tbody ,@footer))))))) |
ea124ffc596b
shr.el (shr-tag-table): Fix last change.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111063
diff
changeset
|
720 body))))))) |
111063
4430b518c7c5
shr.el: (shr-tag-table): Support caption, thead, and tfoot.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111059
diff
changeset
|
721 |
110777
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
722 (defun shr-find-elements (cont type) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
723 (let (result) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
724 (dolist (elem cont) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
725 (cond ((eq (car elem) type) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
726 (push elem result)) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
727 ((consp (cdr elem)) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
728 (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
|
729 (nreverse result))) |
110763
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
730 |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
731 (defun shr-insert-table (table widths) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
732 (shr-insert-table-ruler widths) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
733 (dolist (row table) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
734 (let ((start (point)) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
735 (height (let ((max 0)) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
736 (dolist (column row) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
737 (setq max (max max (cadr column)))) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
738 max))) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
739 (dotimes (i height) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
740 (shr-indent) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
741 (insert "|\n")) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
742 (dolist (column row) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
743 (goto-char start) |
110804
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
744 (let ((lines (nth 2 column)) |
110777
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
745 (overlay-lines (nth 3 column)) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
746 overlay overlay-line) |
110763
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
747 (dolist (line lines) |
110777
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
748 (setq overlay-line (pop overlay-lines)) |
110810
07053df95af6
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110804
diff
changeset
|
749 (end-of-line) |
07053df95af6
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110804
diff
changeset
|
750 (insert line "|") |
07053df95af6
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110804
diff
changeset
|
751 (dolist (overlay overlay-line) |
07053df95af6
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110804
diff
changeset
|
752 (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
|
753 (- (point) (nth 1 overlay) 1))) |
07053df95af6
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110804
diff
changeset
|
754 (properties (nth 2 overlay))) |
07053df95af6
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110804
diff
changeset
|
755 (while properties |
07053df95af6
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110804
diff
changeset
|
756 (overlay-put o (pop properties) (pop properties))))) |
07053df95af6
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110804
diff
changeset
|
757 (forward-line 1)) |
110763
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
758 ;; 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
|
759 ;; possibly. |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
760 (dotimes (i (- height (length lines))) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
761 (end-of-line) |
111032
1ed05f12a0bc
shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111022
diff
changeset
|
762 (insert (make-string (string-width (car lines)) ? ) "|") |
110763
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
763 (forward-line 1))))) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
764 (shr-insert-table-ruler 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-insert-table-ruler (widths) |
111032
1ed05f12a0bc
shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111022
diff
changeset
|
767 (when (and (bolp) |
1ed05f12a0bc
shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111022
diff
changeset
|
768 (> shr-indentation 0)) |
1ed05f12a0bc
shr.el: Improve kinsoku and table rendering.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111022
diff
changeset
|
769 (shr-indent)) |
110873
d98a67277730
shr,el: Allow shr table char to be customized.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110859
diff
changeset
|
770 (insert shr-table-corner) |
110763
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
771 (dotimes (i (length widths)) |
110873
d98a67277730
shr,el: Allow shr table char to be customized.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110859
diff
changeset
|
772 (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
|
773 (insert "\n")) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
774 |
110804
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
775 (defun shr-table-widths (table suggested-widths) |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
776 (let* ((length (length suggested-widths)) |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
777 (widths (make-vector length 0)) |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
778 (natural-widths (make-vector length 0))) |
110763
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
779 (dolist (row table) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
780 (let ((i 0)) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
781 (dolist (column row) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
782 (aset widths i (max (aref widths i) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
783 (car column))) |
110804
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
784 (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
|
785 (cadr column))) |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
786 (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
|
787 (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
|
788 (apply '+ (append widths nil)))) |
110804
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
789 (expanded-columns 0)) |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
790 (when (> extra 0) |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
791 (dotimes (i length) |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
792 ;; 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
|
793 ;; want to allow the column to expand. |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
794 (when (> (aref natural-widths i) (aref widths i)) |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
795 (setq expanded-columns (1+ expanded-columns)))) |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
796 (dotimes (i length) |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
797 (when (> (aref natural-widths i) (aref widths i)) |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
798 (aset widths i (min |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
799 (1+ (aref natural-widths i)) |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
800 (+ (/ extra expanded-columns) |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
801 (aref widths i)))))))) |
110763
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
802 widths)) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
803 |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
804 (defun shr-make-table (cont widths &optional fill) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
805 (let ((trs nil)) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
806 (dolist (row cont) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
807 (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
|
808 (let ((tds nil) |
5a595f515d1c
shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110777
diff
changeset
|
809 (columns (cdr row)) |
5a595f515d1c
shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110777
diff
changeset
|
810 (i 0) |
5a595f515d1c
shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110777
diff
changeset
|
811 column) |
5a595f515d1c
shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110777
diff
changeset
|
812 (while (< i (length widths)) |
5a595f515d1c
shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110777
diff
changeset
|
813 (setq column (pop columns)) |
5a595f515d1c
shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110777
diff
changeset
|
814 (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
|
815 (null column)) |
110763
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
816 (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
|
817 tds) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
818 (setq i (1+ i)))) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
819 (push (nreverse tds) trs)))) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
820 (nreverse trs))) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
821 |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
822 (defun shr-render-td (cont width fill) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
823 (with-temp-buffer |
110810
07053df95af6
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110804
diff
changeset
|
824 (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
|
825 (if cache |
07053df95af6
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110804
diff
changeset
|
826 (insert cache) |
07053df95af6
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110804
diff
changeset
|
827 (let ((shr-width width) |
07053df95af6
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110804
diff
changeset
|
828 (shr-indentation 0)) |
07053df95af6
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110804
diff
changeset
|
829 (shr-generic cont)) |
07053df95af6
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110804
diff
changeset
|
830 (delete-region |
07053df95af6
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110804
diff
changeset
|
831 (point) |
07053df95af6
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110804
diff
changeset
|
832 (+ (point) |
07053df95af6
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110804
diff
changeset
|
833 (skip-chars-backward " \t\n"))) |
07053df95af6
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110804
diff
changeset
|
834 (push (cons (cons width cont) (buffer-string)) |
07053df95af6
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110804
diff
changeset
|
835 shr-content-cache))) |
110763
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
836 (goto-char (point-min)) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
837 (let ((max 0)) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
838 (while (not (eobp)) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
839 (end-of-line) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
840 (setq max (max max (current-column))) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
841 (forward-line 1)) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
842 (when fill |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
843 (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
|
844 ;; 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
|
845 ;; line here. |
5a595f515d1c
shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110777
diff
changeset
|
846 (if (zerop (buffer-size)) |
5a595f515d1c
shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110777
diff
changeset
|
847 (insert (make-string width ? )) |
5a595f515d1c
shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110777
diff
changeset
|
848 ;; Otherwise, fill the buffer. |
5a595f515d1c
shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110777
diff
changeset
|
849 (while (not (eobp)) |
5a595f515d1c
shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110777
diff
changeset
|
850 (end-of-line) |
5a595f515d1c
shr.el (shr-render-td): Allow blank/missing <TD>s.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110777
diff
changeset
|
851 (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
|
852 (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
|
853 (forward-line 1)))) |
110804
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
854 (if fill |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
855 (list max |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
856 (count-lines (point-min) (point-max)) |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
857 (split-string (buffer-string) "\n") |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
858 (shr-collect-overlays)) |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
859 (list max |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
860 (shr-natural-width)))))) |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
861 |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
862 (defun shr-natural-width () |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
863 (goto-char (point-min)) |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
864 (let ((current 0) |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
865 (max 0)) |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
866 (while (not (eobp)) |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
867 (end-of-line) |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
868 (setq current (+ current (current-column))) |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
869 (unless (get-text-property (point) 'shr-break) |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
870 (setq max (max max current) |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
871 current 0)) |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
872 (forward-line 1)) |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
873 max)) |
110777
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
874 |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
875 (defun shr-collect-overlays () |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
876 (save-excursion |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
877 (goto-char (point-min)) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
878 (let ((overlays nil)) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
879 (while (not (eobp)) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
880 (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
|
881 overlays) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
882 (forward-line 1)) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
883 (nreverse overlays)))) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
884 |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
885 (defun shr-overlays-in-region (start end) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
886 (let (result) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
887 (dolist (overlay (overlays-in start end)) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
888 (push (list (if (> start (overlay-start overlay)) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
889 (- end start) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
890 (- end (overlay-start overlay))) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
891 (if (< end (overlay-end overlay)) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
892 0 |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
893 (- end (overlay-end overlay))) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
894 (overlay-properties overlay)) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
895 result)) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
896 (nreverse result))) |
110763
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
897 |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
898 (defun shr-pro-rate-columns (columns) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
899 (let ((total-percentage 0) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
900 (widths (make-vector (length columns) 0))) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
901 (dotimes (i (length columns)) |
110804
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
902 (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
|
903 (setq total-percentage (/ 1.0 total-percentage)) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
904 (dotimes (i (length columns)) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
905 (aset widths i (max (truncate (* (aref columns i) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
906 total-percentage |
110804
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110792
diff
changeset
|
907 (- shr-width (1+ (length columns))))) |
110763
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
908 10))) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
909 widths)) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
910 |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
911 ;; 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
|
912 (defun shr-column-specs (cont) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
913 (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
|
914 (dolist (row cont) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
915 (when (eq (car row) 'tr) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
916 (let ((i 0)) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
917 (dolist (column (cdr row)) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
918 (when (memq (car column) '(td th)) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
919 (let ((width (cdr (assq :width (cdr column))))) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
920 (when (and width |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
921 (string-match "\\([0-9]+\\)%" width)) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
922 (aset columns i |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
923 (/ (string-to-number (match-string 1 width)) |
110777
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
924 100.0)))) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
925 (setq i (1+ i))))))) |
110763
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
926 columns)) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
927 |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
928 (defun shr-count (cont elem) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
929 (let ((i 0)) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
930 (dolist (sub cont) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
931 (when (eq (car sub) elem) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
932 (setq i (1+ i)))) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
933 i)) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
934 |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
935 (defun shr-max-columns (cont) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
936 (let ((max 0)) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
937 (dolist (row cont) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
938 (when (eq (car row) 'tr) |
110777
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110774
diff
changeset
|
939 (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
|
940 (shr-count (cdr row) 'th)))))) |
110763
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
941 max)) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110757
diff
changeset
|
942 |
110704
016990bf37ad
lisp/gnus/shr.el (shr): Fix typo in provide call.
Juanma Barranquero <lekktu@gmail.com>
parents:
110698
diff
changeset
|
943 (provide 'shr) |
110698
74bad2d7bddd
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff
changeset
|
944 |
74bad2d7bddd
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff
changeset
|
945 ;;; shr.el ends here |