annotate lisp/gnus/gnus-html.el @ 110487:d3b676998c45

gnus-html.el: Embiggen pictures slightly.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Thu, 23 Sep 2010 00:58:01 +0000
parents 1ad1adb298a3
children 4d2f8b81bb01
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
110166
514c8efbfdbb gnus-html: Comment fix.; gnus-art.el: Provide an `u' command on urls and the like that copies the string over to the kill ring; Also have the `u' command work for HTML links.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110159
diff changeset
1 ;;; gnus-html.el --- Render HTML in a buffer.
110024
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
2
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
3 ;; Copyright (C) 2010 Free Software Foundation, Inc.
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
4
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
5 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
6 ;; Keywords: html, web
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
7
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
8 ;; This file is part of GNU Emacs.
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
9
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
10 ;; GNU Emacs is free software: you can redistribute it and/or modify
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
11 ;; it under the terms of the GNU General Public License as published by
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
12 ;; the Free Software Foundation, either version 3 of the License, or
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
13 ;; (at your option) any later version.
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
14
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
15 ;; GNU Emacs is distributed in the hope that it will be useful,
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
18 ;; GNU General Public License for more details.
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
19
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
20 ;; You should have received a copy of the GNU General Public License
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
21 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
22
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
23 ;;; Commentary:
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
24
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
25 ;; The idea is to provide a simple, fast and pretty minimal way to
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
26 ;; render HTML (including links and images) in a buffer, based on an
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
27 ;; external HTML renderer (i.e., w3m).
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
28
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
29 ;;; Code:
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
30
110072
1a236d9dcc23 * lisp/gnus/gnus-html.el: Require pkgs that define macros used in this file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110068
diff changeset
31 (eval-when-compile (require 'cl))
1a236d9dcc23 * lisp/gnus/gnus-html.el: Require pkgs that define macros used in this file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110068
diff changeset
32 (eval-when-compile (require 'mm-decode))
110386
93e14258e6bc gnus-html.el: Require gnus-art for `gnus-with-article-buffer'.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110369
diff changeset
33
93e14258e6bc gnus-html.el: Require gnus-art for `gnus-with-article-buffer'.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110369
diff changeset
34 (require 'gnus-art)
110055
140a469a3964 gnus-html.el: require mm-url; by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110054
diff changeset
35 (require 'mm-url)
110422
93e093c035a0 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110387
diff changeset
36 (require 'url)
110461
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
37 (require 'url-cache)
110477
f97b4d2abce9 gnus-html.el (gnus-html-wash-images): Use xml-substitute-special on images alt-text.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110461
diff changeset
38 (require 'xml)
110486
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
39 (require 'browse-url)
110055
140a469a3964 gnus-html.el: require mm-url; by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110054
diff changeset
40
110461
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
41 (defcustom gnus-html-image-cache-ttl (days-to-time 7)
110486
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
42 "Time used to determine if we should use images from the cache."
110084
320a820be8d8 gnus-html.el, message.el: Add custom version to new variables; gnus-sum.el: Bump custom version of gnus-auto-expirable-marks.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110083
diff changeset
43 :version "24.1"
110025
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
44 :group 'gnus-art
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
45 :type 'integer)
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
46
110486
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
47 (defcustom gnus-html-image-automatic-caching t
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
48 "Whether automatically cache retrieve images."
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
49 :version "24.1"
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
50 :group 'gnus-art
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
51 :type 'boolean)
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
52
110025
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
53 (defcustom gnus-html-frame-width 70
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
54 "What width to use when rendering HTML."
110084
320a820be8d8 gnus-html.el, message.el: Add custom version to new variables; gnus-sum.el: Bump custom version of gnus-auto-expirable-marks.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110083
diff changeset
55 :version "24.1"
110025
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
56 :group 'gnus-art
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
57 :type 'integer)
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
58
110075
9ef61fac0063 gnus-html.el: Introduce a new variable, gnus-blocked-images, and use that instead of the w3m variable; by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110073
diff changeset
59 (defcustom gnus-blocked-images "."
9ef61fac0063 gnus-html.el: Introduce a new variable, gnus-blocked-images, and use that instead of the w3m variable; by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110073
diff changeset
60 "Images that have URLs matching this regexp will be blocked."
110084
320a820be8d8 gnus-html.el, message.el: Add custom version to new variables; gnus-sum.el: Bump custom version of gnus-auto-expirable-marks.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110083
diff changeset
61 :version "24.1"
110075
9ef61fac0063 gnus-html.el: Introduce a new variable, gnus-blocked-images, and use that instead of the w3m variable; by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110073
diff changeset
62 :group 'gnus-art
9ef61fac0063 gnus-html.el: Introduce a new variable, gnus-blocked-images, and use that instead of the w3m variable; by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110073
diff changeset
63 :type 'regexp)
9ef61fac0063 gnus-html.el: Introduce a new variable, gnus-blocked-images, and use that instead of the w3m variable; by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110073
diff changeset
64
110487
d3b676998c45 gnus-html.el: Embiggen pictures slightly.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110486
diff changeset
65 (defcustom gnus-max-image-proportion 0.9
110094
b9d6d7f1d89f gnus-html.el: Rescale images in article buffers for Emacs versions that support this. This is currently only Emacs 24 compiled with imagemagick support.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110093
diff changeset
66 "How big pictures displayed are in relation to the window they're in.
b9d6d7f1d89f gnus-html.el: Rescale images in article buffers for Emacs versions that support this. This is currently only Emacs 24 compiled with imagemagick support.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110093
diff changeset
67 A value of 0.7 means that they are allowed to take up 70% of the
b9d6d7f1d89f gnus-html.el: Rescale images in article buffers for Emacs versions that support this. This is currently only Emacs 24 compiled with imagemagick support.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110093
diff changeset
68 width and height of the window. If they are larger than this,
b9d6d7f1d89f gnus-html.el: Rescale images in article buffers for Emacs versions that support this. This is currently only Emacs 24 compiled with imagemagick support.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110093
diff changeset
69 and Emacs supports it, then the images will be rescaled down to
b9d6d7f1d89f gnus-html.el: Rescale images in article buffers for Emacs versions that support this. This is currently only Emacs 24 compiled with imagemagick support.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110093
diff changeset
70 fit these criteria."
b9d6d7f1d89f gnus-html.el: Rescale images in article buffers for Emacs versions that support this. This is currently only Emacs 24 compiled with imagemagick support.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110093
diff changeset
71 :version "24.1"
b9d6d7f1d89f gnus-html.el: Rescale images in article buffers for Emacs versions that support this. This is currently only Emacs 24 compiled with imagemagick support.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110093
diff changeset
72 :group 'gnus-art
b9d6d7f1d89f gnus-html.el: Rescale images in article buffers for Emacs versions that support this. This is currently only Emacs 24 compiled with imagemagick support.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110093
diff changeset
73 :type 'float)
b9d6d7f1d89f gnus-html.el: Rescale images in article buffers for Emacs versions that support this. This is currently only Emacs 24 compiled with imagemagick support.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110093
diff changeset
74
110167
b8559a372ac8 gnus-agent.el: Change the default so that nnimap methods aren't agentized by default. There's apparently many problems related to agent/imap behaviour; gnus-art.el: Don't reuse the 'gnus-data text property, but use a new property. This avoids stomping over other functions that use this for other things; gnus-html.el: Add a new `i' command to insert images.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110166
diff changeset
75 (defvar gnus-html-image-map
b8559a372ac8 gnus-agent.el: Change the default so that nnimap methods aren't agentized by default. There's apparently many problems related to agent/imap behaviour; gnus-art.el: Don't reuse the 'gnus-data text property, but use a new property. This avoids stomping over other functions that use this for other things; gnus-html.el: Add a new `i' command to insert images.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110166
diff changeset
76 (let ((map (make-sparse-keymap)))
b8559a372ac8 gnus-agent.el: Change the default so that nnimap methods aren't agentized by default. There's apparently many problems related to agent/imap behaviour; gnus-art.el: Don't reuse the 'gnus-data text property, but use a new property. This avoids stomping over other functions that use this for other things; gnus-html.el: Add a new `i' command to insert images.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110166
diff changeset
77 (define-key map "u" 'gnus-article-copy-string)
b8559a372ac8 gnus-agent.el: Change the default so that nnimap methods aren't agentized by default. There's apparently many problems related to agent/imap behaviour; gnus-art.el: Don't reuse the 'gnus-data text property, but use a new property. This avoids stomping over other functions that use this for other things; gnus-html.el: Add a new `i' command to insert images.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110166
diff changeset
78 (define-key map "i" 'gnus-html-insert-image)
110461
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
79 (define-key map "v" 'gnus-html-browse-url)
110167
b8559a372ac8 gnus-agent.el: Change the default so that nnimap methods aren't agentized by default. There's apparently many problems related to agent/imap behaviour; gnus-art.el: Don't reuse the 'gnus-data text property, but use a new property. This avoids stomping over other functions that use this for other things; gnus-html.el: Add a new `i' command to insert images.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110166
diff changeset
80 map))
b8559a372ac8 gnus-agent.el: Change the default so that nnimap methods aren't agentized by default. There's apparently many problems related to agent/imap behaviour; gnus-art.el: Don't reuse the 'gnus-data text property, but use a new property. This avoids stomping over other functions that use this for other things; gnus-html.el: Add a new `i' command to insert images.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110166
diff changeset
81
110277
a46aad43ce5a gnus-html.el: Allow showing the ALT text of images and to browse the images themselves.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110276
diff changeset
82 (defvar gnus-html-displayed-image-map
a46aad43ce5a gnus-html.el: Allow showing the ALT text of images and to browse the images themselves.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110276
diff changeset
83 (let ((map (make-sparse-keymap)))
a46aad43ce5a gnus-html.el: Allow showing the ALT text of images and to browse the images themselves.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110276
diff changeset
84 (define-key map "a" 'gnus-html-show-alt-text)
a46aad43ce5a gnus-html.el: Allow showing the ALT text of images and to browse the images themselves.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110276
diff changeset
85 (define-key map "i" 'gnus-html-browse-image)
110278
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
86 (define-key map "\r" 'gnus-html-browse-url)
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
87 (define-key map "u" 'gnus-article-copy-string)
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
88 (define-key map [tab] 'widget-forward)
110277
a46aad43ce5a gnus-html.el: Allow showing the ALT text of images and to browse the images themselves.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110276
diff changeset
89 map))
a46aad43ce5a gnus-html.el: Allow showing the ALT text of images and to browse the images themselves.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110276
diff changeset
90
110486
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
91 (defun gnus-html-encode-url (url)
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
92 "Encode URL."
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
93 (browse-url-url-encode-chars url "[)$ ]"))
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
94
110461
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
95 (defun gnus-html-cache-expired (url ttl)
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
96 "Check if URL is cached for more than TTL."
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
97 (cond (url-standalone-mode
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
98 (not (file-exists-p (url-cache-create-filename url))))
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
99 (t (let ((cache-time (url-is-cached url)))
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
100 (if cache-time
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
101 (time-less-p
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
102 (time-add
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
103 cache-time
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
104 ttl)
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
105 (current-time))
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
106 t)))))
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
107
110024
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
108 ;;;###autoload
110221
f0d95837f863 gnus-html.el (gnus-article-html): Allow calling without specifying the handle. In that case, dissect the buffer first.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110179
diff changeset
109 (defun gnus-article-html (&optional handle)
110024
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
110 (let ((article-buffer (current-buffer)))
110221
f0d95837f863 gnus-html.el (gnus-article-html): Allow calling without specifying the handle. In that case, dissect the buffer first.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110179
diff changeset
111 (unless handle
f0d95837f863 gnus-html.el (gnus-article-html): Allow calling without specifying the handle. In that case, dissect the buffer first.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110179
diff changeset
112 (setq handle (mm-dissect-buffer t)))
110024
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
113 (save-restriction
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
114 (narrow-to-region (point) (point))
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
115 (save-excursion
110025
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
116 (mm-with-part handle
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
117 (let* ((coding-system-for-read 'utf-8)
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
118 (coding-system-for-write 'utf-8)
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
119 (default-process-coding-system
110086
f661002e9a6d gnus-article-html: Decode contents by charset.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110084
diff changeset
120 (cons coding-system-for-read coding-system-for-write))
f661002e9a6d gnus-article-html: Decode contents by charset.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110084
diff changeset
121 (charset (mail-content-type-get (mm-handle-type handle)
f661002e9a6d gnus-article-html: Decode contents by charset.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110084
diff changeset
122 'charset)))
f661002e9a6d gnus-article-html: Decode contents by charset.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110084
diff changeset
123 (when (and charset
f661002e9a6d gnus-article-html: Decode contents by charset.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110084
diff changeset
124 (setq charset (mm-charset-to-coding-system charset))
f661002e9a6d gnus-article-html: Decode contents by charset.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110084
diff changeset
125 (not (eq charset 'ascii)))
110143
19ce95f8bbbb gnus-article-html: Make work buffer multibyte for decoded contents.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110112
diff changeset
126 (insert (prog1
19ce95f8bbbb gnus-article-html: Make work buffer multibyte for decoded contents.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110112
diff changeset
127 (mm-decode-coding-string (buffer-string) charset)
19ce95f8bbbb gnus-article-html: Make work buffer multibyte for decoded contents.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110112
diff changeset
128 (erase-buffer)
19ce95f8bbbb gnus-article-html: Make work buffer multibyte for decoded contents.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110112
diff changeset
129 (mm-enable-multibyte))))
110025
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
130 (call-process-region (point-min) (point-max)
110111
5b9f64b04a04 Delete all trailing white space.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110110
diff changeset
131 "w3m"
110025
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
132 nil article-buffer nil
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
133 "-halfdump"
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
134 "-no-cookie"
110049
00d3a187d587 Tell w3m that the input is UTF-8; This seems to fix problems with some German web feeds; by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110045
diff changeset
135 "-I" "UTF-8"
110025
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
136 "-O" "UTF-8"
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
137 "-o" "ext_halfdump=1"
110433
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
138 "-o" "display_ins_del=2"
110049
00d3a187d587 Tell w3m that the input is UTF-8; This seems to fix problems with some German web feeds; by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110045
diff changeset
139 "-o" "pre_conv=1"
110025
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
140 "-t" (format "%s" tab-width)
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
141 "-cols" (format "%s" gnus-html-frame-width)
110109
8c2040cb14d7 gnus-html.el (gnus-html-wash-tags): Don't show images that are really small. They're probably tracking images; nntp.el (nntp-request-set-mark): Refuse to do marks if nntp-marks-file-name is nil.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110108
diff changeset
142 "-o" "display_image=on"
110025
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
143 "-T" "text/html"))))
110024
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
144 (gnus-html-wash-tags))))
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
145
110072
1a236d9dcc23 * lisp/gnus/gnus-html.el: Require pkgs that define macros used in this file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110068
diff changeset
146 (defvar gnus-article-mouse-face)
1a236d9dcc23 * lisp/gnus/gnus-html.el: Require pkgs that define macros used in this file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110068
diff changeset
147
110278
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
148 (defun gnus-html-pre-wash ()
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
149 (goto-char (point-min))
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
150 (while (re-search-forward " *<pre_int> *</pre_int> *\n" nil t)
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
151 (replace-match "" t t))
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
152 (goto-char (point-min))
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
153 (while (re-search-forward "<a name[^\n>]+>" nil t)
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
154 (replace-match "" t t)))
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
155
110295
f70d39f7b8fd gnus-html.el (gnus-html-wash-tags): Refactor out the image bit, and don't restrict end-tag searches to the end of the line.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110278
diff changeset
156 (defun gnus-html-wash-images ()
110461
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
157 "Run through current buffer and replace img tags by images."
110068
2af503eb57ef Clarify the code a bit by renaming the variable with the url to `url'; Support cid: URLs/images; by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110055
diff changeset
158 (let (tag parameters string start end images url)
110110
91cc7bab2ca4 gnus-html.el (gnus-html-wash-tags): Remove all <pre_int> place holders.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110109
diff changeset
159 (goto-char (point-min))
110278
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
160 ;; Search for all the images first.
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
161 (while (re-search-forward "<img_alt \\([^>]*\\)>" nil t)
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
162 (setq parameters (match-string 1)
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
163 start (match-beginning 0))
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
164 (delete-region start (point))
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
165 (when (search-forward "</img_alt>" (line-end-position) t)
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
166 (delete-region (match-beginning 0) (match-end 0)))
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
167 (setq end (point))
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
168 (when (string-match "src=\"\\([^\"]+\\)" parameters)
110486
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
169 (setq url (gnus-html-encode-url (match-string 1 parameters)))
110278
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
170 (gnus-message 8 "gnus-html-wash-tags: fetching image URL %s" url)
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
171 (if (string-match "^cid:\\(.*\\)" url)
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
172 ;; URLs with cid: have their content stashed in other
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
173 ;; parts of the MIME structure, so just insert them
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
174 ;; immediately.
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
175 (let ((handle (mm-get-content-id
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
176 (setq url (match-string 1 url))))
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
177 image)
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
178 (when handle
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
179 (mm-with-part handle
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
180 (setq image (gnus-create-image (buffer-string)
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
181 nil t))))
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
182 (when image
110461
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
183 (let ((string (buffer-substring start end)))
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
184 (delete-region start end)
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
185 (gnus-put-image image (gnus-string-or string "*") 'cid)
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
186 (gnus-add-image 'cid image))))
110278
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
187 ;; Normal, external URL.
110461
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
188 (let ((alt-text (when (string-match "\\(alt\\|title\\)=\"\\([^\"]+\\)"
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
189 parameters)
110477
f97b4d2abce9 gnus-html.el (gnus-html-wash-images): Use xml-substitute-special on images alt-text.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110461
diff changeset
190 (xml-substitute-special (match-string 2 parameters)))))
110486
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
191 (gnus-put-text-property start end 'gnus-image-url url)
110461
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
192 (if (gnus-html-image-url-blocked-p
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
193 url
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
194 (if (buffer-live-p gnus-summary-buffer)
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
195 (with-current-buffer gnus-summary-buffer
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
196 gnus-blocked-images)
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
197 gnus-blocked-images))
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
198 (progn
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
199 (widget-convert-button
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
200 'link start end
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
201 :action 'gnus-html-insert-image
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
202 :help-echo url
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
203 :keymap gnus-html-image-map
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
204 :button-keymap gnus-html-image-map)
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
205 (let ((overlay (gnus-make-overlay start end))
110486
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
206 (spec (list url alt-text)))
110461
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
207 (gnus-overlay-put overlay 'local-map gnus-html-image-map)
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
208 (gnus-overlay-put overlay 'gnus-image spec)
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
209 (gnus-put-text-property
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
210 start end
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
211 'gnus-image spec)))
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
212 ;; Non-blocked url
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
213 (let ((width
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
214 (when (string-match "width=\"?\\([0-9]+\\)" parameters)
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
215 (string-to-number (match-string 1 parameters))))
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
216 (height
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
217 (when (string-match "height=\"?\\([0-9]+\\)" parameters)
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
218 (string-to-number (match-string 1 parameters)))))
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
219 ;; Don't fetch images that are really small. They're
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
220 ;; probably tracking pictures.
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
221 (when (and (or (null height)
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
222 (> height 4))
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
223 (or (null width)
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
224 (> width 4)))
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
225 (gnus-html-display-image url start end alt-text))))))))))
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
226
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
227 (defun gnus-html-display-image (url start end alt-text)
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
228 "Display image at URL on text from START to END.
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
229 Use ALT-TEXT for the image string."
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
230 (if (gnus-html-cache-expired url gnus-html-image-cache-ttl)
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
231 ;; We don't have it, so schedule it for fetching
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
232 ;; asynchronously.
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
233 (gnus-html-schedule-image-fetching
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
234 (current-buffer)
110486
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
235 (list url alt-text))
110461
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
236 ;; It's already cached, so just insert it.
110486
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
237 (gnus-html-put-image (gnus-html-get-image-data url) url alt-text)))
110295
f70d39f7b8fd gnus-html.el (gnus-html-wash-tags): Refactor out the image bit, and don't restrict end-tag searches to the end of the line.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110278
diff changeset
238
f70d39f7b8fd gnus-html.el (gnus-html-wash-tags): Refactor out the image bit, and don't restrict end-tag searches to the end of the line.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110278
diff changeset
239 (defun gnus-html-wash-tags ()
f70d39f7b8fd gnus-html.el (gnus-html-wash-tags): Refactor out the image bit, and don't restrict end-tag searches to the end of the line.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110278
diff changeset
240 (let (tag parameters string start end images url)
f70d39f7b8fd gnus-html.el (gnus-html-wash-tags): Refactor out the image bit, and don't restrict end-tag searches to the end of the line.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110278
diff changeset
241 (gnus-html-pre-wash)
f70d39f7b8fd gnus-html.el (gnus-html-wash-tags): Refactor out the image bit, and don't restrict end-tag searches to the end of the line.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110278
diff changeset
242 (gnus-html-wash-images)
110278
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
243
110255
91bdd0141c6e gnus-html.el (gnus-html-wash-tags): Remove <a name...> tags, which confuses the rest of the function.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110221
diff changeset
244 (goto-char (point-min))
110278
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
245 ;; Then do the other tags.
110025
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
246 (while (re-search-forward "<\\([^ />]+\\)\\([^>]*\\)>" nil t)
110024
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
247 (setq tag (match-string 1)
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
248 parameters (match-string 2)
110025
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
249 start (match-beginning 0))
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
250 (when (plusp (length parameters))
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
251 (set-text-properties 0 (1- (length parameters)) nil parameters))
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
252 (delete-region start (point))
110295
f70d39f7b8fd gnus-html.el (gnus-html-wash-tags): Refactor out the image bit, and don't restrict end-tag searches to the end of the line.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110278
diff changeset
253 (when (search-forward (concat "</" tag ">") nil t)
110025
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
254 (delete-region (match-beginning 0) (match-end 0)))
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
255 (setq end (point))
110024
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
256 (cond
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
257 ;; Fetch and insert a picture.
110278
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
258 ((equal tag "img_alt"))
110024
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
259 ;; Add a link.
110103
7181bb530921 gnus-html.el (gnus-html-wash-tags): "A" is also used for links, just like "a", it seems like; (gnus-html-image-url-blocked-p): Take a parameter for blocked-images since it needs to be picked from the correct buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110099
diff changeset
260 ((or (equal tag "a")
7181bb530921 gnus-html.el (gnus-html-wash-tags): "A" is also used for links, just like "a", it seems like; (gnus-html-image-url-blocked-p): Take a parameter for blocked-images since it needs to be picked from the correct buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110099
diff changeset
261 (equal tag "A"))
110024
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
262 (when (string-match "href=\"\\([^\"]+\\)" parameters)
110068
2af503eb57ef Clarify the code a bit by renaming the variable with the url to `url'; Support cid: URLs/images; by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110055
diff changeset
263 (setq url (match-string 1 parameters))
110107
ffa0ce354f9d gnus-html.el: prefix log messages with function name
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110106
diff changeset
264 (gnus-message 8 "gnus-html-wash-tags: fetching link URL %s" url)
110024
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
265 (gnus-article-add-button start end
110068
2af503eb57ef Clarify the code a bit by renaming the variable with the url to `url'; Support cid: URLs/images; by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110055
diff changeset
266 'browse-url url
2af503eb57ef Clarify the code a bit by renaming the variable with the url to `url'; Support cid: URLs/images; by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110055
diff changeset
267 url)
110024
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
268 (let ((overlay (gnus-make-overlay start end)))
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
269 (gnus-overlay-put overlay 'evaporate t)
110068
2af503eb57ef Clarify the code a bit by renaming the variable with the url to `url'; Support cid: URLs/images; by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110055
diff changeset
270 (gnus-overlay-put overlay 'gnus-button-url url)
110167
b8559a372ac8 gnus-agent.el: Change the default so that nnimap methods aren't agentized by default. There's apparently many problems related to agent/imap behaviour; gnus-art.el: Don't reuse the 'gnus-data text property, but use a new property. This avoids stomping over other functions that use this for other things; gnus-html.el: Add a new `i' command to insert images.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110166
diff changeset
271 (gnus-put-text-property start end 'gnus-string url)
110024
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
272 (when gnus-article-mouse-face
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
273 (gnus-overlay-put overlay 'mouse-face gnus-article-mouse-face)))))
110092
1e526716f8fc gnus-html.el: Delete the IMG_ALT region.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110086
diff changeset
274 ;; The upper-case IMG_ALT is apparently just an artifact that
1e526716f8fc gnus-html.el: Delete the IMG_ALT region.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110086
diff changeset
275 ;; should be deleted.
1e526716f8fc gnus-html.el: Delete the IMG_ALT region.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110086
diff changeset
276 ((equal tag "IMG_ALT")
1e526716f8fc gnus-html.el: Delete the IMG_ALT region.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110086
diff changeset
277 (delete-region start end))
110433
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
278 ;; w3m does not normalize the case
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
279 ((or (equal tag "b")
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
280 (equal tag "B"))
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
281 (gnus-overlay-put (gnus-make-overlay start end) 'face 'gnus-emphasis-bold))
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
282 ((or (equal tag "u")
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
283 (equal tag "U"))
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
284 (gnus-overlay-put (gnus-make-overlay start end) 'face 'gnus-emphasis-underline))
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
285 ((or (equal tag "i")
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
286 (equal tag "I"))
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
287 (gnus-overlay-put (gnus-make-overlay start end) 'face 'gnus-emphasis-italic))
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
288 ((or (equal tag "s")
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
289 (equal tag "S"))
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
290 (gnus-overlay-put (gnus-make-overlay start end) 'face 'gnus-emphasis-strikethru))
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
291 ((or (equal tag "ins")
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
292 (equal tag "INS"))
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
293 (gnus-overlay-put (gnus-make-overlay start end) 'face 'gnus-emphasis-underline))
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
294 ;; Handle different UL types
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
295 ((equal tag "_SYMBOL")
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
296 (when (string-match "TYPE=\\(.+\\)" parameters)
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
297 (let ((type (string-to-number (match-string 1 parameters))))
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
298 (delete-region start end)
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
299 (cond ((= type 33) (insert " "))
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
300 ((= type 34) (insert " "))
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
301 ((= type 35) (insert " "))
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
302 ((= type 36) (insert " "))
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
303 ((= type 37) (insert " "))
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
304 ((= type 38) (insert " "))
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
305 ((= type 39) (insert " "))
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
306 ((= type 40) (insert " "))
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
307 ((= type 42) (insert " "))
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
308 ((= type 43) (insert " "))
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
309 (t (insert " "))))))
110024
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
310 ;; Whatever. Just ignore the tag.
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
311 (t
110025
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
312 ))
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
313 (goto-char start))
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
314 (goto-char (point-min))
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
315 ;; The output from -halfdump isn't totally regular, so strip
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
316 ;; off any </pre_int>s that were left over.
110259
b350cc580a0f gnus-html.el (gnus-html-wash-tags): Limit end-tag matching to the current line to work around bugs in the output from w3m.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110255
diff changeset
317 (while (re-search-forward "</pre_int>\\|</internal>" nil t)
110025
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
318 (replace-match "" t t))
110172
f400055a098b Fix previous merge from Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110170
diff changeset
319 (mm-url-decode-entities)))
110025
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
320
110167
b8559a372ac8 gnus-agent.el: Change the default so that nnimap methods aren't agentized by default. There's apparently many problems related to agent/imap behaviour; gnus-art.el: Don't reuse the 'gnus-data text property, but use a new property. This avoids stomping over other functions that use this for other things; gnus-html.el: Add a new `i' command to insert images.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110166
diff changeset
321 (defun gnus-html-insert-image ()
b8559a372ac8 gnus-agent.el: Change the default so that nnimap methods aren't agentized by default. There's apparently many problems related to agent/imap behaviour; gnus-art.el: Don't reuse the 'gnus-data text property, but use a new property. This avoids stomping over other functions that use this for other things; gnus-html.el: Add a new `i' command to insert images.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110166
diff changeset
322 "Fetch and insert the image under point."
b8559a372ac8 gnus-agent.el: Change the default so that nnimap methods aren't agentized by default. There's apparently many problems related to agent/imap behaviour; gnus-art.el: Don't reuse the 'gnus-data text property, but use a new property. This avoids stomping over other functions that use this for other things; gnus-html.el: Add a new `i' command to insert images.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110166
diff changeset
323 (interactive)
110461
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
324 (apply 'gnus-html-display-image (get-text-property (point) 'gnus-image)))
110167
b8559a372ac8 gnus-agent.el: Change the default so that nnimap methods aren't agentized by default. There's apparently many problems related to agent/imap behaviour; gnus-art.el: Don't reuse the 'gnus-data text property, but use a new property. This avoids stomping over other functions that use this for other things; gnus-html.el: Add a new `i' command to insert images.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110166
diff changeset
325
110277
a46aad43ce5a gnus-html.el: Allow showing the ALT text of images and to browse the images themselves.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110276
diff changeset
326 (defun gnus-html-show-alt-text ()
a46aad43ce5a gnus-html.el: Allow showing the ALT text of images and to browse the images themselves.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110276
diff changeset
327 "Show the ALT text of the image under point."
a46aad43ce5a gnus-html.el: Allow showing the ALT text of images and to browse the images themselves.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110276
diff changeset
328 (interactive)
a46aad43ce5a gnus-html.el: Allow showing the ALT text of images and to browse the images themselves.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110276
diff changeset
329 (message "%s" (get-text-property (point) 'gnus-alt-text)))
a46aad43ce5a gnus-html.el: Allow showing the ALT text of images and to browse the images themselves.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110276
diff changeset
330
a46aad43ce5a gnus-html.el: Allow showing the ALT text of images and to browse the images themselves.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110276
diff changeset
331 (defun gnus-html-browse-image ()
a46aad43ce5a gnus-html.el: Allow showing the ALT text of images and to browse the images themselves.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110276
diff changeset
332 "Browse the image under point."
a46aad43ce5a gnus-html.el: Allow showing the ALT text of images and to browse the images themselves.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110276
diff changeset
333 (interactive)
110461
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
334 (browse-url (get-text-property (point) 'gnus-image-url)))
110277
a46aad43ce5a gnus-html.el: Allow showing the ALT text of images and to browse the images themselves.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110276
diff changeset
335
110278
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
336 (defun gnus-html-browse-url ()
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
337 "Browse the image under point."
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
338 (interactive)
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
339 (let ((url (get-text-property (point) 'gnus-string)))
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
340 (if (not url)
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
341 (message "No URL at point")
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
342 (browse-url url))))
8c1028027f1b gnus-html (gnus-html-wash-tags): Search for images first, so that <a><img> works better; (gnus-html-displayed-image-map): Bind RET and TAB on images for better UX.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110277
diff changeset
343
110461
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
344 (defun gnus-html-schedule-image-fetching (buffer image)
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
345 "Retrieve IMAGE, and place it into BUFFER on arrival."
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
346 (gnus-message 8 "gnus-html-schedule-image-fetching: buffer %s, image %s"
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
347 buffer image)
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
348 (ignore-errors
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
349 (url-retrieve (car image)
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
350 'gnus-html-image-fetched
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
351 (list buffer image))))
110025
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
352
110422
93e093c035a0 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110387
diff changeset
353 (defun gnus-html-image-fetched (status buffer image)
110486
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
354 "Callback function called when image has been fetched."
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
355 (unless (plist-get status :error)
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
356 (when gnus-html-image-automatic-caching
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
357 (url-store-in-cache (current-buffer)))
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
358 (when (and (or (search-forward "\n\n" nil t)
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
359 (search-forward "\r\n\r\n" nil t))
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
360 (buffer-live-p buffer))
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
361 (let ((data (buffer-substring (point) (point-max))))
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
362 (with-current-buffer buffer
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
363 (let ((inhibit-read-only t))
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
364 (gnus-html-put-image data (car image) (cadr image)))))))
110461
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
365 (kill-buffer (current-buffer)))
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
366
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
367 (defun gnus-html-get-image-data (url)
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
368 "Get image data for URL.
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
369 Return a string with image data."
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
370 (with-temp-buffer
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
371 (mm-disable-multibyte)
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
372 (url-cache-extract (url-cache-create-filename url))
110486
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
373 (when (or (search-forward "\n\n" nil t)
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
374 (search-forward "\r\n\r\n" nil t))
110461
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
375 (buffer-substring (point) (point-max)))))
110025
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
376
110486
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
377 (defun gnus-html-put-image (data url &optional alt-text)
110158
64b3982570b5 Make gnus-html work for XEmacs.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110156
diff changeset
378 (when (gnus-graphic-display-p)
110486
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
379 (let* ((start (text-property-any (point-min) (point-max) 'gnus-image-url url))
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
380 (end (when start
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
381 (next-single-property-change start 'gnus-image-url))))
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
382 ;; Image found?
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
383 (when start
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
384 (let* ((image
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
385 (ignore-errors
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
386 (gnus-create-image data nil t)))
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
387 (size (and image
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
388 (if (featurep 'xemacs)
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
389 (cons (glyph-width image) (glyph-height image))
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
390 (image-size image t)))))
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
391 (save-excursion
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
392 (goto-char start)
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
393 (let ((alt-text (or alt-text (buffer-substring-no-properties start end))))
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
394 (if (and image
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
395 ;; Kludge to avoid displaying 30x30 gif images, which
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
396 ;; seems to be a signal of a broken image.
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
397 (not (and (if (featurep 'xemacs)
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
398 (glyphp image)
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
399 (listp image))
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
400 (eq (if (featurep 'xemacs)
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
401 (let ((d (cdadar (specifier-spec-list
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
402 (glyph-image image)))))
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
403 (and (vectorp d)
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
404 (aref d 0)))
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
405 (plist-get (cdr image) :type))
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
406 'gif)
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
407 (= (car size) 30)
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
408 (= (cdr size) 30))))
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
409 ;; Good image, add it!
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
410 (let ((image (gnus-html-rescale-image image data size)))
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
411 (delete-region start end)
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
412 (gnus-put-image image alt-text 'external)
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
413 (gnus-put-text-property start (point) 'help-echo alt-text)
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
414 (gnus-overlay-put (gnus-make-overlay start (point)) 'local-map
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
415 gnus-html-displayed-image-map)
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
416 (gnus-put-text-property start (point) 'gnus-alt-text alt-text)
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
417 (when url
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
418 (gnus-put-text-property start (point) 'gnus-image-url url))
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
419 (gnus-add-image 'external image)
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
420 t)
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
421 ;; Bad image, try to show something else
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
422 (when (fboundp 'find-image)
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
423 (delete-region start end)
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
424 (setq image (find-image '((:type xpm :file "lock-broken.xpm"))))
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
425 (gnus-put-image image alt-text 'internal)
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
426 (gnus-add-image 'internal image))
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
427 nil))))))))
110025
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
428
110461
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
429 (defun gnus-html-rescale-image (image data size)
110098
3e3e1965a2c2 gnus-html.el: We can't rescale if we don't have the article buffer in a window.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110097
diff changeset
430 (if (or (not (fboundp 'imagemagick-types))
3e3e1965a2c2 gnus-html.el: We can't rescale if we don't have the article buffer in a window.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110097
diff changeset
431 (not (get-buffer-window (current-buffer))))
110094
b9d6d7f1d89f gnus-html.el: Rescale images in article buffers for Emacs versions that support this. This is currently only Emacs 24 compiled with imagemagick support.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110093
diff changeset
432 image
110156
a2439ed30c52 message.el (message-generate-hashcash): Change default to 'opportunistic if hashcash is installed; gnus-html.el (gnus-html-put-image): Only call image-size once, since it's somewhat time-consuming on remote X servers.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110152
diff changeset
433 (let* ((width (car size))
a2439ed30c52 message.el (message-generate-hashcash): Change default to 'opportunistic if hashcash is installed; gnus-html.el (gnus-html-put-image): Only call image-size once, since it's somewhat time-consuming on remote X servers.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110152
diff changeset
434 (height (cdr size))
110486
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
435 (edges (window-inside-pixel-edges (get-buffer-window (current-buffer))))
110094
b9d6d7f1d89f gnus-html.el: Rescale images in article buffers for Emacs versions that support this. This is currently only Emacs 24 compiled with imagemagick support.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110093
diff changeset
436 (window-width (truncate (* gnus-max-image-proportion
b9d6d7f1d89f gnus-html.el: Rescale images in article buffers for Emacs versions that support this. This is currently only Emacs 24 compiled with imagemagick support.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110093
diff changeset
437 (- (nth 2 edges) (nth 0 edges)))))
b9d6d7f1d89f gnus-html.el: Rescale images in article buffers for Emacs versions that support this. This is currently only Emacs 24 compiled with imagemagick support.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110093
diff changeset
438 (window-height (truncate (* gnus-max-image-proportion
b9d6d7f1d89f gnus-html.el: Rescale images in article buffers for Emacs versions that support this. This is currently only Emacs 24 compiled with imagemagick support.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110093
diff changeset
439 (- (nth 3 edges) (nth 1 edges)))))
b9d6d7f1d89f gnus-html.el: Rescale images in article buffers for Emacs versions that support this. This is currently only Emacs 24 compiled with imagemagick support.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110093
diff changeset
440 scaled-image)
110112
8eb5f382b2e6 gnus-html.el (gnus-html-rescale-image): Yet another try at getting the image sizing right.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110111
diff changeset
441 (when (> height window-height)
110461
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
442 (setq image (or (create-image data 'imagemagick t
110112
8eb5f382b2e6 gnus-html.el (gnus-html-rescale-image): Yet another try at getting the image sizing right.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110111
diff changeset
443 :height window-height)
110156
a2439ed30c52 message.el (message-generate-hashcash): Change default to 'opportunistic if hashcash is installed; gnus-html.el (gnus-html-put-image): Only call image-size once, since it's somewhat time-consuming on remote X servers.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110152
diff changeset
444 image))
a2439ed30c52 message.el (message-generate-hashcash): Change default to 'opportunistic if hashcash is installed; gnus-html.el (gnus-html-put-image): Only call image-size once, since it's somewhat time-consuming on remote X servers.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110152
diff changeset
445 (setq size (image-size image t)))
a2439ed30c52 message.el (message-generate-hashcash): Change default to 'opportunistic if hashcash is installed; gnus-html.el (gnus-html-put-image): Only call image-size once, since it's somewhat time-consuming on remote X servers.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110152
diff changeset
446 (when (> (car size) window-width)
110152
3b368edf4df1 gnus-html-rescale-image: Fix up typo in rescaling.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110144
diff changeset
447 (setq image (or
110461
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
448 (create-image data 'imagemagick t
110152
3b368edf4df1 gnus-html-rescale-image: Fix up typo in rescaling.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110144
diff changeset
449 :width window-width)
3b368edf4df1 gnus-html-rescale-image: Fix up typo in rescaling.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110144
diff changeset
450 image)))
110112
8eb5f382b2e6 gnus-html.el (gnus-html-rescale-image): Yet another try at getting the image sizing right.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110111
diff changeset
451 image)))
110094
b9d6d7f1d89f gnus-html.el: Rescale images in article buffers for Emacs versions that support this. This is currently only Emacs 24 compiled with imagemagick support.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110093
diff changeset
452
110103
7181bb530921 gnus-html.el (gnus-html-wash-tags): "A" is also used for links, just like "a", it seems like; (gnus-html-image-url-blocked-p): Take a parameter for blocked-images since it needs to be picked from the correct buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110099
diff changeset
453 (defun gnus-html-image-url-blocked-p (url blocked-images)
110277
a46aad43ce5a gnus-html.el: Allow showing the ALT text of images and to browse the images themselves.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110276
diff changeset
454 "Find out if URL is blocked by BLOCKED-IMAGES."
110103
7181bb530921 gnus-html.el (gnus-html-wash-tags): "A" is also used for links, just like "a", it seems like; (gnus-html-image-url-blocked-p): Take a parameter for blocked-images since it needs to be picked from the correct buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110099
diff changeset
455 (let ((ret (and blocked-images
7181bb530921 gnus-html.el (gnus-html-wash-tags): "A" is also used for links, just like "a", it seems like; (gnus-html-image-url-blocked-p): Take a parameter for blocked-images since it needs to be picked from the correct buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110099
diff changeset
456 (string-match blocked-images url))))
110107
ffa0ce354f9d gnus-html.el: prefix log messages with function name
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110106
diff changeset
457 (if ret
ffa0ce354f9d gnus-html.el: prefix log messages with function name
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110106
diff changeset
458 (gnus-message 8 "gnus-html-image-url-blocked-p: %s blocked by regex %s"
ffa0ce354f9d gnus-html.el: prefix log messages with function name
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110106
diff changeset
459 url blocked-images)
ffa0ce354f9d gnus-html.el: prefix log messages with function name
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110106
diff changeset
460 (gnus-message 9 "gnus-html-image-url-blocked-p: %s passes regex %s"
ffa0ce354f9d gnus-html.el: prefix log messages with function name
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110106
diff changeset
461 url blocked-images))
110099
7a6012e13748 gnus-html.el: add and use gnus-html-image-url-blocked-p
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110098
diff changeset
462 ret))
7a6012e13748 gnus-html.el: add and use gnus-html-image-url-blocked-p
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110098
diff changeset
463
110169
49b2e6d8b396 gnus-html.el: Add the new command gnus-html-show-images.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110168
diff changeset
464 (defun gnus-html-show-images ()
49b2e6d8b396 gnus-html.el: Add the new command gnus-html-show-images.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110168
diff changeset
465 "Show any images that are in the HTML-rendered article buffer.
49b2e6d8b396 gnus-html.el: Add the new command gnus-html-show-images.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110168
diff changeset
466 This only works if the article in question is HTML."
49b2e6d8b396 gnus-html.el: Add the new command gnus-html-show-images.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110168
diff changeset
467 (interactive)
49b2e6d8b396 gnus-html.el: Add the new command gnus-html-show-images.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110168
diff changeset
468 (gnus-with-article-buffer
110461
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
469 (dolist (overlay (overlays-in (point-min) (point-max)))
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
470 (let ((o (overlay-get overlay 'gnus-image)))
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
471 (when o
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
472 (apply 'gnus-html-display-image o))))))
110169
49b2e6d8b396 gnus-html.el: Add the new command gnus-html-show-images.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110168
diff changeset
473
110025
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
474 ;;;###autoload
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
475 (defun gnus-html-prefetch-images (summary)
110433
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
476 (when (buffer-live-p summary)
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
477 (let ((blocked-images (with-current-buffer summary
33cf78a271ef Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110428
diff changeset
478 gnus-blocked-images)))
110025
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
479 (save-match-data
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
480 (while (re-search-forward "<img.*src=[\"']\\([^\"']+\\)" nil t)
110486
1ad1adb298a3 Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110477
diff changeset
481 (let ((url (gnus-html-encode-url (match-string 1))))
110103
7181bb530921 gnus-html.el (gnus-html-wash-tags): "A" is also used for links, just like "a", it seems like; (gnus-html-image-url-blocked-p): Take a parameter for blocked-images since it needs to be picked from the correct buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110099
diff changeset
482 (unless (gnus-html-image-url-blocked-p url blocked-images)
110461
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
483 (when (gnus-html-cache-expired url gnus-html-image-cache-ttl)
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
484 (gnus-html-schedule-image-fetching nil
9992c4871bd4 gnus-html.el: Make gnus-html use url-cache system.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110436
diff changeset
485 (list url))))))))))
110025
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
486
5f352fd4346a Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110024
diff changeset
487 (provide 'gnus-html)
110024
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
488
5428546bbb98 Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
489 ;;; gnus-html.el ends here