(defun shr-ensure-paragraph ()
(unless (bobp)
- (if (bolp)
+ (if (<= (current-column) shr-indentation)
(unless (save-excursion
(forward-line -1)
(looking-at " *$"))
(insert "\n\n")))))
(defun shr-indent ()
- (insert (make-string shr-indentation ? )))
+ (when (> shr-indentation 0)
+ (insert (make-string shr-indentation ? ))))
(defun shr-fontize-cont (cont &rest types)
(let (shr-start)
(defun shr-tag-p (cont)
(shr-ensure-paragraph)
+ (shr-indent)
(shr-generic cont)
(shr-ensure-paragraph))
(defun shr-tag-pre (cont)
(let ((shr-folding-mode 'none))
(shr-ensure-newline)
+ (shr-indent)
(shr-generic cont)
(shr-ensure-newline)))
(defun shr-tag-blockquote (cont)
(shr-ensure-paragraph)
+ (shr-indent)
(let ((shr-indentation (+ shr-indentation 4)))
(shr-generic cont))
(shr-ensure-paragraph))
(shr-ensure-paragraph))
(defun shr-tag-li (cont)
- (shr-ensure-newline)
+ (shr-ensure-paragraph)
+ (shr-indent)
(let* ((bullet
(if (numberp shr-list-mode)
(prog1
(defun shr-tag-br (cont)
(unless (bobp)
- (insert "\n"))
+ (insert "\n")
+ (shr-indent))
(shr-generic cont))
(defun shr-tag-h1 (cont)