(defvar shr-list-mode nil)
(defvar shr-content-cache nil)
(defvar shr-kinsoku-shorten nil)
+(defvar shr-table-depth 0)
(defvar shr-map
(let ((map (make-sparse-keymap)))
(dolist (type types)
(shr-add-font (or shr-start (point)) (point) type))))
+;; Add an overlay in the region, but avoid putting the font properties
+;; on blank text at the start of the line, and the newline at the end,
+;; to avoid ugliness.
(defun shr-add-font (start end type)
- (let ((overlay (make-overlay start end)))
- (overlay-put overlay 'face type)))
+ (save-excursion
+ (goto-char start)
+ (while (< (point) end)
+ (when (bolp)
+ (skip-chars-forward " "))
+ (let ((overlay (make-overlay (point) (min (line-end-position) end))))
+ (overlay-put overlay 'face type))
+ (if (< (line-end-position) end)
+ (forward-line 1)
+ (goto-char end)))))
(defun shr-browse-url ()
"Browse the URL under point."
(let ((alt (buffer-substring start end))
(inhibit-read-only t))
(delete-region start end)
- (shr-put-image data start alt))))))
+ (goto-char start)
+ (shr-put-image data alt))))))
(kill-buffer (current-buffer)))
-(defun shr-put-image (data point alt)
- (if (not (display-graphic-p))
- (insert alt)
- (let ((image (ignore-errors
- (shr-rescale-image data))))
- (when image
- (put-image image point alt)))))
+(defun shr-put-image (data alt)
+ (if (display-graphic-p)
+ (let ((image (ignore-errors
+ (shr-rescale-image data))))
+ (when image
+ (insert-image image (or alt "*"))))
+ (insert alt)))
(defun shr-rescale-image (data)
(if (or (not (fboundp 'imagemagick-types))
(apply #'shr-fontize-cont cont types)
(shr-ensure-paragraph))
+(defun shr-urlify (start url)
+ (widget-convert-button
+ 'url-link start (point)
+ :help-echo url
+ :keymap shr-map
+ url)
+ (put-text-property start (point) 'shr-url url))
+
+(defun shr-encode-url (url)
+ "Encode URL."
+ (browse-url-url-encode-chars url "[)$ ]"))
+
;;; Tag-specific rendering rules.
(defun shr-tag-p (cont)
(shr-generic cont)
(shr-ensure-paragraph))
+(defun shr-tag-div (cont)
+ (shr-ensure-newline)
+ (shr-indent)
+ (shr-generic cont)
+ (shr-ensure-newline))
+
(defun shr-tag-b (cont)
(shr-fontize-cont cont 'bold))
(defun shr-tag-em (cont)
(shr-fontize-cont cont 'bold))
+(defun shr-tag-strong (cont)
+ (shr-fontize-cont cont 'bold))
+
(defun shr-tag-u (cont)
(shr-fontize-cont cont 'underline))
(defun shr-tag-s (cont)
(shr-fontize-cont cont 'strike-through))
-(defun shr-tag-span (cont)
- (let ((start (point))
- (color (cdr (assq 'color (shr-parse-style (cdr (assq :style cont)))))))
- (shr-generic cont)
- (when color
- (let ((overlay (make-overlay start (point))))
- (overlay-put overlay 'face (cons 'foreground-color color))))))
-
(defun shr-parse-style (style)
(when style
(let ((plist nil))
(start (point))
shr-start)
(shr-generic cont)
- (widget-convert-button
- 'url-link (or shr-start start) (point)
- :help-echo url
- :keymap shr-map
- url)
- (put-text-property (or shr-start start) (point) 'shr-url url)))
+ (shr-urlify (or shr-start start) url)))
-(defun shr-encode-url (url)
- "Encode URL."
- (browse-url-url-encode-chars url "[)$ ]"))
+(defun shr-tag-object (cont)
+ (let ((url (cdr (assq :src (cdr (assq 'embed cont)))))
+ (start (point)))
+ (when url
+ (shr-insert " [multimedia] ")
+ (shr-urlify start url))))
(defun shr-tag-img (cont)
- (when cont
+ (when (and cont
+ (cdr (assq :src cont)))
(when (and (> (current-column) 0)
(not (eq shr-state 'image)))
(insert "\n"))
(when (zerop (length alt))
(setq alt "[img]"))
(cond
+ ((or (member (cdr (assq :height cont)) '("0" "1"))
+ (member (cdr (assq :width cont)) '("0" "1")))
+ ;; Ignore zero-sized or single-pixel images.
+ )
((and (not shr-inhibit-images)
(string-match "\\`cid:" url))
(let ((url (substring url (match-end 0)))
(if (or (not shr-content-function)
(not (setq image (funcall shr-content-function url))))
(insert alt)
- (shr-put-image image (point) alt))))
+ (shr-put-image image alt))))
((or shr-inhibit-images
(and shr-blocked-images
(string-match shr-blocked-images url)))
(shr-insert (substring alt 0 8))
(shr-insert alt))))
((url-is-cached (shr-encode-url url))
- (shr-put-image (shr-get-image-data url) (point) alt))
+ (shr-put-image (shr-get-image-data url) alt))
(t
(insert alt)
(ignore-errors
(url-retrieve (shr-encode-url url) 'shr-image-fetched
(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)
+ (put-text-property start (point) 'help-echo alt)
(setq shr-state 'image)))))
(defun shr-tag-pre (cont)
(setq cont (or (cdr (assq 'tbody cont))
cont))
(let* ((shr-inhibit-images t)
+ (shr-table-depth (1+ shr-table-depth))
(shr-kinsoku-shorten t)
;; Find all suggested widths.
(columns (shr-column-specs cont))
;; Finally, insert all the images after the table. The Emacs buffer
;; model isn't strong enough to allow us to put the images actually
;; into the tables.
- (dolist (elem (shr-find-elements cont 'img))
- (shr-tag-img (cdr elem))))
+ (when (zerop shr-table-depth)
+ (dolist (elem (shr-find-elements cont 'img))
+ (shr-tag-img (cdr elem)))))
(defun shr-tag-table (cont)
(shr-ensure-paragraph)
(nbody (if body (shr-max-columns body)))
(nfooter (if footer (shr-max-columns footer))))
(shr-tag-table-1
- (if caption
- (if header
- (if footer
- ;; caption + hader + body + footer
- (if (= nheader nbody)
- (if (= nbody nfooter)
- `((tr (td ,@caption))
- (tr (td (table (tbody ,@header ,@body ,@footer)))))
- (if (= nfooter 1)
- `((tr (td ,@caption))
- (tr (td (table (tbody ,@header ,@body))))
- ,@footer)
- `((tr (td ,@caption))
- (tr (td (table (tbody ,@header ,@body))))
- (tr (td (table (tbody ,@footer)))))))
- (if (= nbody nfooter)
- `((tr (td ,@caption))
- (tr (td (table (tbody ,@header))))
- (tr (td (table (tbody ,@body ,@footer)))))
- (if (= nfooter 1)
- `((tr (td ,@caption))
- (tr (td (table (tbody ,@header))))
- (tr (td (table (tbody ,@body))))
- ,@footer)
- `((tr (td ,@caption))
- (tr (td (table (tbody ,@header))))
- (tr (td (table (tbody ,@body))))
- (tr (td (table (tbody ,@footer))))))))
- ;; caption + header + body
- (if (= nheader nbody)
- `((tr (td ,@caption))
- (tr (td (table (tbody ,@header ,@body)))))
- (if (= nheader 1)
- `((tr (td ,@caption))
- ,@header (tr (td (table (tbody ,@body)))))
- `((tr (td ,@caption))
- (tr (td (table (tbody ,@header))))
- (tr (td (table (tbody ,@body))))))))
- (if footer
- ;; caption + body + footer
- (if (= nbody nfooter)
- `((tr (td (table (tbody ,@body ,@footer)))))
- (if (= nfooter 1)
- `((tr (td (table (tbody ,@body)))) ,@footer)
- `((tr (td (table (tbody ,@body))))
- (tr (td (table (tbody ,@footer)))))))
- ;; caption + body
- `((tr (td ,@caption))
- (tr (td (table (tbody ,@body)))))))
- (if header
- (if footer
- ;; header + body + footer
- (if (= nheader nbody)
- (if (= nbody nfooter)
- `((tr (td (table (tbody ,@header ,@body ,@footer)))))
+ (nconc
+ (if caption `((tr (td ,@caption))))
+ (if header
+ (if footer
+ ;; hader + body + footer
+ (if (= nheader nbody)
+ (if (= nbody nfooter)
+ `((tr (td (table (tbody ,@header ,@body ,@footer)))))
+ (nconc `((tr (td (table (tbody ,@header ,@body)))))
+ (if (= nfooter 1)
+ footer
+ `((tr (td (table (tbody ,@footer))))))))
+ (nconc `((tr (td (table (tbody ,@header)))))
+ (if (= nbody nfooter)
+ `((tr (td (table (tbody ,@body ,@footer)))))
+ (nconc `((tr (td (table (tbody ,@body)))))
+ (if (= nfooter 1)
+ footer
+ `((tr (td (table (tbody ,@footer))))))))))
+ ;; header + body
+ (if (= nheader nbody)
+ `((tr (td (table (tbody ,@header ,@body)))))
+ (if (= nheader 1)
+ `(,@header (tr (td (table (tbody ,@body)))))
+ `((tr (td (table (tbody ,@header))))
+ (tr (td (table (tbody ,@body))))))))
+ (if footer
+ ;; body + footer
+ (if (= nbody nfooter)
+ `((tr (td (table (tbody ,@body ,@footer)))))
+ (nconc `((tr (td (table (tbody ,@body)))))
(if (= nfooter 1)
- `((tr (td (table (tbody ,@header ,@body))))
- ,@footer)
- `((tr (td (table (tbody ,@header ,@body))))
- (tr (td (table (tbody ,@footer)))))))
- (if (= nbody nfooter)
- `((tr (td (table (tbody ,@header))))
- (tr (td (table (tbody ,@body ,@footer)))))
- (if (= nfooter 1)
- `((tr (td (table (tbody ,@header))))
- (tr (td (table (tbody ,@body))))
- ,@footer)
- `((tr (td (table (tbody ,@header))))
- (tr (td (table (tbody ,@body))))
- (tr (td (table (tbody ,@footer))))))))
- ;; header + body
- (if (= nheader nbody)
- `((tr (td (table (tbody ,@header ,@body)))))
- (if (= nheader 1)
- `(,@header (tr (td (table (tbody ,@body)))))
- `((tr (td (table (tbody ,@header))))
- (tr (td (table (tbody ,@body))))))))
- (if footer
- ;; body + footer
- (if (= nbody nfooter)
- `((tr (td (table (tbody ,@body ,@footer)))))
- (if (= nfooter 1)
- `((tr (td (table (tbody ,@body)))) ,@footer)
- `((tr (td (table (tbody ,@body))))
- (tr (td (table (tbody ,@footer)))))))
- body))))))
+ footer
+ `((tr (td (table (tbody ,@footer))))))))
+ (if caption
+ `((tr (td (table (tbody ,@body)))))
+ body)))))))
(defun shr-find-elements (cont type)
(let (result)
projects / gnus / blobdiff