projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gnus-art.el (gnus-mime-buttonize-attachments-in-header): Improve criterion that finds...
[gnus]
/
lisp
/
html2text.el
diff --git
a/lisp/html2text.el
b/lisp/html2text.el
index
7a58e38
..
78cecd9
100644
(file)
--- a/
lisp/html2text.el
+++ b/
lisp/html2text.el
@@
-1,24
+1,23
@@
-;;; html2text.el --- a simple html to plain text converter
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;; html2text.el --- a simple html to plain text converter -*- coding: utf-8 -*-
+
+;; Copyright (C) 2002-2014 Free Software Foundation, Inc.
;; Author: Joakim Hove <hove@phys.ntnu.no>
;; This file is part of GNU Emacs.
;; Author: Joakim Hove <hove@phys.ntnu.no>
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software
;
you can redistribute it and/or modify
+;; GNU Emacs is free software
:
you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation
, either version 3 of the License, or
+;;
(at your option)
any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Commentary:
@@
-42,8
+41,42
@@
(defvar html2text-format-single-element-list '(("hr" . html2text-clean-hr)))
(defvar html2text-replace-list
(defvar html2text-format-single-element-list '(("hr" . html2text-clean-hr)))
(defvar html2text-replace-list
- '((" " . " ") (">" . ">") ("<" . "<") (""" . "\"")
- ("&" . "&") ("'" . "'"))
+ '(("´" . "`")
+ ("&" . "&")
+ ("'" . "'")
+ ("¦" . "|")
+ ("¢" . "c")
+ ("ˆ" . "^")
+ ("©" . "(C)")
+ ("¤" . "(#)")
+ ("°" . "degree")
+ ("÷" . "/")
+ ("€" . "e")
+ ("½" . "1/2")
+ (">" . ">")
+ ("¿" . "?")
+ ("«" . "<<")
+ ("&ldquo" . "\"")
+ ("‹" . "(")
+ ("‘" . "`")
+ ("<" . "<")
+ ("—" . "--")
+ (" " . " ")
+ ("–" . "-")
+ ("‰" . "%%")
+ ("±" . "+-")
+ ("£" . "£")
+ (""" . "\"")
+ ("»" . ">>")
+ ("&rdquo" . "\"")
+ ("®" . "(R)")
+ ("›" . ")")
+ ("’" . "'")
+ ("§" . "§")
+ ("¹" . "^1")
+ ("²" . "^2")
+ ("³" . "^3")
+ ("˜" . "~"))
"The map of entity to text.
This is an alist were each element is a dotted pair consisting of an
"The map of entity to text.
This is an alist were each element is a dotted pair consisting of an
@@
-58,7
+91,7
@@
completely verbatim - without any use of REGEXP.")
This is a list of tags which should be removed, without any
formatting. Note that tags in the list are presented *without*
This is a list of tags which should be removed, without any
formatting. Note that tags in the list are presented *without*
-any \"<\" or \">\". All occurences of a tag appearing in this
+any \"<\" or \">\". All occur
r
ences of a tag appearing in this
list are removed, irrespective of whether it is a closing or
opening tag, or if the tag has additional attributes. The
deletion is done by the function `html2text-remove-tags'.
list are removed, irrespective of whether it is a closing or
opening tag, or if the tag has additional attributes. The
deletion is done by the function `html2text-remove-tags'.
@@
-90,7
+123,7
@@
If this list contains the element \"font\".")
This is an alist where each dotted pair consists of a tag, and then
the name of a function to be called when this tag is found. The
function is called with the arguments p1, p2, p3 and p4. These are
This is an alist where each dotted pair consists of a tag, and then
the name of a function to be called when this tag is found. The
function is called with the arguments p1, p2, p3 and p4. These are
-demontrated below:
+demon
s
trated below:
\"<b> This is bold text </b>\"
^ ^ ^ ^
\"<b> This is bold text </b>\"
^ ^ ^ ^
@@
-160,7
+193,7
@@
formatting, and then moved afterward.")
;; size=3
((string-match "[^ ]=[^ ]" prev)
(let ((attr (nth 0 (split-string prev "=")))
;; size=3
((string-match "[^ ]=[^ ]" prev)
(let ((attr (nth 0 (split-string prev "=")))
- (value (
nth 1 (split-string prev "="
))))
+ (value (
substring prev (1+ (string-match "=" prev)
))))
(setq attr-list (cons (list attr value) attr-list))))
;; size= 3
((string-match "[^ ]=\\'" prev)
(setq attr-list (cons (list attr value) attr-list))))
;; size= 3
((string-match "[^ ]=\\'" prev)
@@
-171,7
+204,7
@@
formatting, and then moved afterward.")
;; size=3
((string-match "[^ ]=[^ ]" this)
(let ((attr (nth 0 (split-string this "=")))
;; size=3
((string-match "[^ ]=[^ ]" this)
(let ((attr (nth 0 (split-string this "=")))
- (value (
nth 1 (split-string this "="
))))
+ (value (
substring this (1+ (string-match "=" this)
))))
(setq attr-list (cons (list attr value) attr-list))))
;; size =3
((string-match "\\`=[^ ]" this)
(setq attr-list (cons (list attr value) attr-list))))
;; size =3
((string-match "\\`=[^ ]" this)
@@
-325,7
+358,8
@@
formatting, and then moved afterward.")
(delete-region p1 p4)
(when href
(goto-char p1)
(delete-region p1 p4)
(when href
(goto-char p1)
- (insert (substring href 1 -1 ))
+ (insert (if (string-match "\\`['\"].*['\"]\\'" href)
+ (substring href 1 -1) href))
(put-text-property p1 (point) 'face 'bold))))
;;
(put-text-property p1 (point) 'face 'bold))))
;;
@@
-350,10
+384,10
@@
formatting, and then moved afterward.")
(setq refill-start (point))
(goto-char p2)
(re-search-backward ".+[^<][^b][^r][^>]$" refill-start t)
(setq refill-start (point))
(goto-char p2)
(re-search-backward ".+[^<][^b][^r][^>]$" refill-start t)
- (
next
-line 1)
+ (
forward
-line 1)
(end-of-line)
;; refill-stop should ideally be adjusted to
(end-of-line)
;; refill-stop should ideally be adjusted to
- ;; accomodate the "<br>" strings which are removed
+ ;; accom
m
odate the "<br>" strings which are removed
;; between refill-start and refill-stop. Can simply
;; be returned from my-replace-string
(setq refill-stop (+ (point)
;; between refill-start and refill-stop. Can simply
;; be returned from my-replace-string
(setq refill-stop (+ (point)
@@
-376,7
+410,7
@@
fashion, quite close to pure guess-work. It does work in some cases though."
(while (re-search-forward "^<br>$" nil t)
(delete-region (match-beginning 0) (match-end 0)))
;; Removing lonely <br> on a single line, if they are left intact we
(while (re-search-forward "^<br>$" nil t)
(delete-region (match-beginning 0) (match-end 0)))
;; Removing lonely <br> on a single line, if they are left intact we
- ;; dont have any paragraphs at all.
+ ;; don
'
t have any paragraphs at all.
(goto-char (point-min))
(while (not (eobp))
(let ((p1 (point)))
(goto-char (point-min))
(while (not (eobp))
(let ((p1 (point)))
@@
-421,7
+455,9
@@
See the documentation for that variable."
(p3) (p4))
(search-backward "<" (point-min) t)
(setq p1 (point))
(p3) (p4))
(search-backward "<" (point-min) t)
(setq p1 (point))
- (search-forward (format "</%s>" tag) (point-max) t)
+ (unless (search-forward (format "</%s>" tag) (point-max) t)
+ (goto-char p2)
+ (insert (format "</%s>" tag)))
(setq p4 (point))
(search-backward "</" (point-min) t)
(setq p3 (point))
(setq p4 (point))
(search-backward "</" (point-min) t)
(setq p3 (point))
@@
-473,5
+509,5
@@
See the documentation for that variable."
;; </Interactive functions>
;;
(provide 'html2text)
;; </Interactive functions>
;;
(provide 'html2text)
-;;; arch-tag: e9e57b79-35d4-4de1-a647-e7e01fe56d1e
+
;;; html2text.el ends here
;;; html2text.el ends here
projects / gnus / blobdiff