:type 'regexp)
(defvar shr-folding-mode nil)
+(defvar shr-state nil)
+(defvar shr-start nil)
+(defvar shr-indentation 0)
(defvar shr-width 70)
;;;###autoload
(defun shr-insert-document (dom)
- (shr-descend (shr-transform-dom dom)))
+ (let ((shr-state nil)
+ (shr-start nil))
+ (shr-descend (shr-transform-dom dom))))
(defun shr-descend (dom)
- (let ((function (intern (concat "shr-" (symbol-name (car dom))) obarray)))
+ (let ((function (intern (concat "shr-tag-" (symbol-name (car dom))) obarray)))
(if (fboundp function)
(funcall function (cdr dom))
(shr-generic (cdr dom)))))
(cond
((eq (car sub) :text)
(shr-insert (cdr sub)))
- ((consp (cdr sub))
+ ((listp (cdr sub))
(shr-descend sub)))))
-(defun shr-p (cont)
- (shr-ensure-newline)
- (insert "\n")
+(defun shr-tag-p (cont)
+ (shr-ensure-paragraph)
(shr-generic cont)
- (insert "\n"))
-
-(defun shr-b (cont)
+ (shr-ensure-paragraph))
+
+(defun shr-ensure-paragraph ()
+ (unless (bobp)
+ (if (bolp)
+ (unless (eql (char-after (- (point) 2)) ?\n)
+ (insert "\n"))
+ (if (save-excursion
+ (beginning-of-line)
+ (looking-at " *$"))
+ (insert "\n")
+ (insert "\n\n")))))
+
+(defun shr-tag-b (cont)
(shr-fontize-cont cont 'bold))
-(defun shr-i (cont)
+(defun shr-tag-i (cont)
(shr-fontize-cont cont 'italic))
-(defun shr-u (cont)
+(defun shr-tag-u (cont)
(shr-fontize-cont cont 'underline))
-(defun shr-s (cont)
- (shr-fontize-cont cont 'strikethru))
+(defun shr-tag-s (cont)
+ (shr-fontize-cont cont 'strike-through))
-(defun shr-fontize-cont (cont type)
- (let ((start (point)))
+(defun shr-fontize-cont (cont &rest types)
+ (let (shr-start)
(shr-generic cont)
- (shr-add-font start (point) type)))
+ (dolist (type types)
+ (shr-add-font (or shr-start (point)) (point) type))))
(defun shr-add-font (start end type)
- (put-text-property start end 'face type))
+ (let ((overlay (make-overlay start end)))
+ (overlay-put overlay 'face type)))
-(defun shr-a (cont)
- (let ((start (point))
- (url (cdr (assq :href cont))))
+(defun shr-tag-a (cont)
+ (let ((url (cdr (assq :href cont)))
+ shr-start)
(shr-generic cont)
(widget-convert-button
- 'link start (point)
+ 'link shr-start (point)
:action 'shr-browse-url
:url url
:keymap widget-keymap
(defun shr-browse-url (widget &rest stuff)
(browse-url (widget-get widget :url)))
-(defun shr-img (cont)
+(defun shr-tag-img (cont)
+ (when (and (> (current-column) 0)
+ (not (eq shr-state 'image)))
+ (insert "\n"))
(let ((start (point-marker)))
(let ((alt (cdr (assq :alt cont)))
(url (cdr (assq :src cont))))
((and shr-blocked-images
(string-match shr-blocked-images url))
(insert alt))
- ((url-is-cached url)
+ ((url-is-cached (browse-url-url-encode-chars url "[&)$ ]"))
(shr-put-image (shr-get-image-data url) (point) alt))
(t
(insert alt)
(url-retrieve url 'shr-image-fetched
(list (current-buffer) start (point-marker))
t)))
- (insert " "))))
+ (insert " ")
+ (setq shr-state 'image))))
(defun shr-image-fetched (status buffer start end)
(when (and (buffer-name buffer)
(defun shr-put-image (data point alt)
(if (not (display-graphic-p))
(insert alt)
- (let ((image (shr-rescale-image data)))
- (put-image image point alt))))
+ (let ((image (ignore-errors
+ (shr-rescale-image data))))
+ (when image
+ (put-image image point alt)))))
(defun shr-rescale-image (data)
(if (or (not (fboundp 'imagemagick-types))
(not (get-buffer-window (current-buffer))))
(create-image data nil t)
(let* ((image (create-image data nil t))
- (size (image-size image))
+ (size (image-size image t))
(width (car size))
(height (cdr size))
(edges (window-inside-pixel-edges
image)))
image)))
-(defun shr-pre (cont)
- (let ((shr-folding-mode nil))
+(defun shr-tag-pre (cont)
+ (let ((shr-folding-mode 'none))
(shr-ensure-newline)
(shr-generic cont)
(shr-ensure-newline)))
-(defun shr-blockquote (cont)
- (shr-pre cont))
+(defun shr-tag-blockquote (cont)
+ (shr-ensure-paragraph)
+ (let ((shr-indentation (+ shr-indentation 4)))
+ (shr-generic cont)))
(defun shr-ensure-newline ()
(unless (zerop (current-column))
(insert "\n")))
(defun shr-insert (text)
+ (when (eq shr-state 'image)
+ (insert "\n")
+ (setq shr-state nil))
(cond
((eq shr-folding-mode 'none)
- (insert t))
+ (insert text))
(t
- (let (column)
+ (let ((first t)
+ column)
+ (when (and (string-match "\\`[ \t\n]" text)
+ (not (bolp)))
+ (insert " "))
(dolist (elem (split-string text))
(setq column (current-column))
- (if (zerop column)
- (insert elem)
- (if (> (+ column (length elem) 1) shr-width)
- (insert "\n" elem)
- (insert " " elem))))))))
+ (when (> column 0)
+ (cond
+ ((and (or (not first)
+ (eq shr-state 'space))
+ (> (+ column (length elem) 1) shr-width))
+ (insert "\n"))
+ ((not first)
+ (insert " "))))
+ (setq first nil)
+ (when (and (bolp)
+ (> shr-indentation 0))
+ (shr-indent))
+ ;; The shr-start is a special variable that is used to pass
+ ;; upwards the first point in the buffer where the text really
+ ;; starts.
+ (unless shr-start
+ (setq shr-start (point)))
+ (insert elem))
+ (setq shr-state nil)
+ (when (and (string-match "[ \t\n]\\'" text)
+ (not (bolp)))
+ (insert " ")
+ (setq shr-state 'space))))))
+
+(defun shr-indent ()
+ (insert (make-string shr-indentation ? )))
(defun shr-get-image-data (url)
"Get image data for URL.
(search-forward "\r\n\r\n" nil t))
(buffer-substring (point) (point-max)))))
+(defvar shr-list-mode nil)
+
+(defun shr-tag-ul (cont)
+ (shr-ensure-paragraph)
+ (let ((shr-list-mode 'ul))
+ (shr-generic cont)))
+
+(defun shr-tag-ol (cont)
+ (let ((shr-list-mode 1))
+ (shr-generic cont)))
+
+(defun shr-tag-li (cont)
+ (shr-ensure-newline)
+ (let* ((bullet
+ (if (numberp shr-list-mode)
+ (prog1
+ (format "%d " shr-list-mode)
+ (setq shr-list-mode (1+ shr-list-mode)))
+ "* "))
+ (shr-indentation (+ shr-indentation (length bullet))))
+ (insert bullet)
+ (shr-generic cont)))
+
+(defun shr-tag-br (cont)
+ (unless (bobp)
+ (insert "\n"))
+ (shr-generic cont))
+
+(defun shr-tag-h1 (cont)
+ (shr-heading cont 'bold 'underline))
+
+(defun shr-tag-h2 (cont)
+ (shr-heading cont 'bold))
+
+(defun shr-tag-h3 (cont)
+ (shr-heading cont 'italic))
+
+(defun shr-tag-h4 (cont)
+ (shr-heading cont))
+
+(defun shr-tag-h5 (cont)
+ (shr-heading cont))
+
+(defun shr-tag-h6 (cont)
+ (shr-heading cont))
+
+(defun shr-heading (cont &rest types)
+ (shr-ensure-paragraph)
+ (apply #'shr-fontize-cont cont types)
+ (shr-ensure-paragraph))
+
+(defun shr-tag-table (cont)
+ (shr-ensure-paragraph)
+ (setq cont (or (cdr (assq 'tbody cont))
+ cont))
+ (let* ((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)))
+
+(defun shr-insert-table (table widths)
+ (shr-insert-table-ruler widths)
+ (dolist (row table)
+ (let ((start (point))
+ (height (let ((max 0))
+ (dolist (column row)
+ (setq max (max max (cadr column))))
+ max)))
+ (dotimes (i height)
+ (shr-indent)
+ (insert "|\n"))
+ (dolist (column row)
+ (goto-char start)
+ (let ((lines (split-string (nth 2 column) "\n")))
+ (dolist (line lines)
+ (when (> (length line) 0)
+ (end-of-line)
+ (insert line "|")
+ (forward-line 1)))
+ ;; Add blank lines at padding at the bottom of the TD,
+ ;; possibly.
+ (dotimes (i (- height (length lines)))
+ (end-of-line)
+ (insert (make-string (length (car lines)) ? ) "|")
+ (forward-line 1)))))
+ (shr-insert-table-ruler widths)))
+
+(defun shr-insert-table-ruler (widths)
+ (shr-indent)
+ (insert "+")
+ (dotimes (i (length widths))
+ (insert (make-string (aref widths i) ?-) ?+))
+ (insert "\n"))
+
+(defun shr-table-widths (table length)
+ (let ((widths (make-vector length 0)))
+ (dolist (row table)
+ (let ((i 0))
+ (dolist (column row)
+ (aset widths i (max (aref widths i)
+ (car column)))
+ (incf i))))
+ widths))
+
+(defun shr-make-table (cons widths &optional fill)
+ (let ((trs nil))
+ (dolist (row cont)
+ (when (eq (car row) 'tr)
+ (let ((i 0)
+ (tds nil))
+ (dolist (column (cdr row))
+ (when (memq (car column) '(td th))
+ (push (shr-render-td (cdr column) (aref widths i) fill)
+ tds)
+ (setq i (1+ i))))
+ (push (nreverse tds) trs))))
+ (nreverse trs)))
+
+(defun shr-render-td (cont width fill)
+ (with-temp-buffer
+ (let ((shr-width width))
+ (shr-generic cont))
+ (while (re-search-backward "\n *$" nil t)
+ (delete-region (match-beginning 0) (match-end 0)))
+ (goto-char (point-min))
+ (let ((max 0))
+ (while (not (eobp))
+ (end-of-line)
+ (setq max (max max (current-column)))
+ (forward-line 1))
+ (when fill
+ (goto-char (point-min))
+ (while (not (eobp))
+ (end-of-line)
+ (insert (make-string (- width (current-column)) ? ))
+ (forward-line 1)))
+ (list max (count-lines (point-min) (point-max)) (buffer-string)))))
+
+(defun shr-pro-rate-columns (columns)
+ (let ((total-percentage 0)
+ (widths (make-vector (length columns) 0)))
+ (dotimes (i (length columns))
+ (incf total-percentage (aref columns i)))
+ (setq total-percentage (/ 1.0 total-percentage))
+ (dotimes (i (length columns))
+ (aset widths i (max (truncate (* (aref columns i)
+ total-percentage
+ shr-width))
+ 10)))
+ widths))
+
+;; Return a summary of the number and shape of the TDs in the table.
+(defun shr-column-specs (cont)
+ (let ((columns (make-vector (shr-max-columns cont) 1)))
+ (dolist (row cont)
+ (when (eq (car row) 'tr)
+ (let ((i 0))
+ (dolist (column (cdr row))
+ (when (memq (car column) '(td th))
+ (let ((width (cdr (assq :width (cdr column)))))
+ (when (and width
+ (string-match "\\([0-9]+\\)%" width))
+ (aset columns i
+ (/ (string-to-number (match-string 1 width))
+ 100.0)))))
+ (setq i (1+ i))))))
+ columns))
+
+(defun shr-count (cont elem)
+ (let ((i 0))
+ (dolist (sub cont)
+ (when (eq (car sub) elem)
+ (setq i (1+ i))))
+ i))
+
+(defun shr-max-columns (cont)
+ (let ((max 0))
+ (dolist (row cont)
+ (when (eq (car row) 'tr)
+ (setq max (max max (shr-count (cdr row) 'td)))))
+ max))
+
(provide 'shr)
;;; shr.el ends here
projects / gnus / blobdiff