:group 'shr
:type 'regexp)
+(defvar shr-content-function nil
+ "If bound, this should be a function that will return the content.
+This is used for cid: URLs, and the function is called with the
+cid: URL as the argument.")
+
(defvar shr-folding-mode nil)
(defvar shr-state nil)
(defvar shr-start nil)
(defvar shr-indentation 0)
+(defvar shr-inhibit-images nil)
(defvar shr-width 70)
+(defvar shr-map
+ (let ((map (make-sparse-keymap)))
+ (define-key map "a" 'shr-show-alt-text)
+ (define-key map "i" 'shr-browse-image)
+ (define-key map "I" 'shr-insert-image)
+ (define-key map "u" 'shr-copy-url)
+ (define-key map "v" 'shr-browse-url)
+ (define-key map "\r" 'shr-browse-url)
+ map))
+
(defun shr-transform-dom (dom)
(let ((result (list (pop dom))))
(dolist (arg (pop dom))
(defun shr-ensure-paragraph ()
(unless (bobp)
(if (bolp)
- (unless (eql (char-after (- (point) 2)) ?\n)
+ (unless (save-excursion
+ (forward-line -1)
+ (looking-at " *$"))
(insert "\n"))
(if (save-excursion
(beginning-of-line)
(defun shr-tag-i (cont)
(shr-fontize-cont cont 'italic))
+(defun shr-tag-em (cont)
+ (shr-fontize-cont cont 'bold))
+
(defun shr-tag-u (cont)
(shr-fontize-cont cont 'underline))
(defun shr-tag-a (cont)
(let ((url (cdr (assq :href cont)))
+ (start (point))
shr-start)
(shr-generic cont)
(widget-convert-button
- 'link shr-start (point)
- :action 'shr-browse-url
- :url url
- :keymap widget-keymap
- :help-echo url)))
-
-(defun shr-browse-url (widget &rest stuff)
- (browse-url (widget-get widget :url)))
+ 'link (or shr-start start) (point)
+ :help-echo url)
+ (put-text-property (or shr-start start) (point) 'keymap shr-map)
+ (put-text-property (or shr-start start) (point) 'shr-url url)))
+
+(defun shr-browse-url ()
+ "Browse the URL under point."
+ (interactive)
+ (let ((url (get-text-property (point) 'shr-url)))
+ (if (not url)
+ (message "No link under point")
+ (browse-url url))))
+
+(defun shr-copy-url ()
+ "Copy the URL under point to the kill ring.
+If called twice, then try to fetch the URL and see whether it
+redirects somewhere else."
+ (interactive)
+ (let ((url (get-text-property (point) 'shr-url)))
+ (cond
+ ((not url)
+ (message "No URL under point"))
+ ;; Resolve redirected URLs.
+ ((equal url (car kill-ring))
+ (url-retrieve
+ url
+ (lambda (a)
+ (when (and (consp a)
+ (eq (car a) :redirect))
+ (with-temp-buffer
+ (insert (cadr a))
+ (goto-char (point-min))
+ ;; Remove common tracking junk from the URL.
+ (when (re-search-forward ".utm_.*" nil t)
+ (replace-match "" t t))
+ (message "Copied %s" (buffer-string))
+ (copy-region-as-kill (point-min) (point-max)))))))
+ ;; Copy the URL to the kill ring.
+ (t
+ (with-temp-buffer
+ (insert url)
+ (copy-region-as-kill (point-min) (point-max))
+ (message "Copied %s" url))))))
(defun shr-tag-img (cont)
(when (and (> (current-column) 0)
(when (zerop (length alt))
(setq alt "[img]"))
(cond
- ((and shr-blocked-images
- (string-match shr-blocked-images url))
+ ((and (not shr-inhibit-images)
+ (string-match "\\`cid:" url))
+ (let ((url (substring url (match-end 0)))
+ image)
+ (if (or (not shr-content-function)
+ (not (setq image (funcall shr-content-function url))))
+ (insert alt)
+ (shr-put-image image (point) alt))))
+ ((or shr-inhibit-images
+ (and shr-blocked-images
+ (string-match shr-blocked-images url)))
+ (setq shr-start (point))
(insert alt))
((url-is-cached (browse-url-url-encode-chars url "[&)$ ]"))
(shr-put-image (shr-get-image-data url) (point) alt))
(list (current-buffer) start (point-marker))
t)))
(insert " ")
+ (put-text-property start (point) 'keymap shr-map)
+ (put-text-property start (point) 'shr-alt alt)
+ (put-text-property start (point) 'shr-image url)
(setq shr-state 'image))))
+(defun shr-show-alt-text ()
+ "Show the ALT text of the image under point."
+ (interactive)
+ (let ((text (get-text-property (point) 'shr-alt)))
+ (if (not text)
+ (message "No image under point")
+ (message "%s" text))))
+
+(defun shr-browse-image ()
+ "Browse the image under point."
+ (interactive)
+ (let ((url (get-text-property (point) 'shr-image)))
+ (if (not url)
+ (message "No image under point")
+ (message "Browsing %s..." url)
+ (browse-url url))))
+
(defun shr-image-fetched (status buffer start end)
(when (and (buffer-name buffer)
(not (plist-get status :error)))
(defun shr-tag-blockquote (cont)
(shr-ensure-paragraph)
(let ((shr-indentation (+ shr-indentation 4)))
- (shr-generic cont)))
+ (shr-generic cont))
+ (shr-ensure-paragraph))
(defun shr-ensure-newline ()
(unless (zerop (current-column))
Return a string with image data."
(with-temp-buffer
(mm-disable-multibyte)
- (url-cache-extract (url-cache-create-filename url))
- (when (or (search-forward "\n\n" nil t)
- (search-forward "\r\n\r\n" nil t))
- (buffer-substring (point) (point-max)))))
+ (when (ignore-errors
+ (url-cache-extract (url-cache-create-filename url))
+ t)
+ (when (or (search-forward "\n\n" nil t)
+ (search-forward "\r\n\r\n" nil t))
+ (buffer-substring (point) (point-max))))))
(defvar shr-list-mode nil)
(shr-ensure-paragraph)
(setq cont (or (cdr (assq 'tbody cont))
cont))
- (let* ((columns (shr-column-specs cont))
+ (let* ((shr-inhibit-images t)
+ (columns (shr-column-specs cont))
(suggested-widths (shr-pro-rate-columns columns))
(sketch (shr-make-table cont suggested-widths))
(sketch-widths (shr-table-widths sketch (length suggested-widths))))
- (shr-insert-table (shr-make-table cont sketch-widths t) sketch-widths)))
+ (shr-insert-table (shr-make-table cont sketch-widths t) sketch-widths))
+ (dolist (elem (shr-find-elements cont 'img))
+ (shr-tag-img (cdr elem))))
+
+(defun shr-find-elements (cont type)
+ (let (result)
+ (dolist (elem cont)
+ (cond ((eq (car elem) type)
+ (push elem result))
+ ((consp (cdr elem))
+ (setq result (nconc (shr-find-elements (cdr elem) type) result)))))
+ (nreverse result)))
(defun shr-insert-table (table widths)
(shr-insert-table-ruler widths)
(insert "|\n"))
(dolist (column row)
(goto-char start)
- (let ((lines (split-string (nth 2 column) "\n")))
+ (let ((lines (split-string (nth 2 column) "\n"))
+ (overlay-lines (nth 3 column))
+ overlay overlay-line)
(dolist (line lines)
+ (setq overlay-line (pop overlay-lines))
(when (> (length line) 0)
(end-of-line)
(insert line "|")
+ (dolist (overlay overlay-line)
+ (let ((o (make-overlay (- (point) (nth 0 overlay) 1)
+ (- (point) (nth 1 overlay) 1)))
+ (properties (nth 2 overlay)))
+ (while properties
+ (overlay-put o (pop properties) (pop properties)))))
(forward-line 1)))
;; Add blank lines at padding at the bottom of the TD,
;; possibly.
(defun shr-render-td (cont width fill)
(with-temp-buffer
- (let ((shr-width width))
+ (let ((shr-width width)
+ (shr-indentation 0))
(shr-generic cont))
(while (re-search-backward "\n *$" nil t)
(delete-region (match-beginning 0) (match-end 0)))
(goto-char (point-min))
(while (not (eobp))
(end-of-line)
- (insert (make-string (- width (current-column)) ? ))
+ (when (> (- width (current-column)) 0)
+ (insert (make-string (- width (current-column)) ? )))
(forward-line 1)))
- (list max (count-lines (point-min) (point-max)) (buffer-string)))))
+ (list max
+ (count-lines (point-min) (point-max))
+ (buffer-string)
+ (and fill
+ (shr-collect-overlays))))))
+
+(defun shr-collect-overlays ()
+ (save-excursion
+ (goto-char (point-min))
+ (let ((overlays nil))
+ (while (not (eobp))
+ (push (shr-overlays-in-region (point) (line-end-position))
+ overlays)
+ (forward-line 1))
+ (nreverse overlays))))
+
+(defun shr-overlays-in-region (start end)
+ (let (result)
+ (dolist (overlay (overlays-in start end))
+ (push (list (max start (- end (overlay-start overlay)))
+ (min end (- end (overlay-end overlay) start))
+ (overlay-properties overlay))
+ result))
+ (nreverse result)))
(defun shr-pro-rate-columns (columns)
(let ((total-percentage 0)
(string-match "\\([0-9]+\\)%" width))
(aset columns i
(/ (string-to-number (match-string 1 width))
- 100.0)))))
- (setq i (1+ i))))))
+ 100.0))))
+ (setq i (1+ i)))))))
columns))
(defun shr-count (cont elem)
(let ((max 0))
(dolist (row cont)
(when (eq (car row) 'tr)
- (setq max (max max (shr-count (cdr row) 'td)))))
+ (setq max (max max (+ (shr-count (cdr row) 'td)
+ (shr-count (cdr row) 'th))))))
max))
(provide 'shr)
projects / gnus / blobdiff