X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fshr.el;h=e5bd5b0aeb7bbc1244380f4696397e81531bb916;hb=c8b66408c77cef31df1a874a2751d0a025d1c327;hp=2ad49dd75492301f67a28af7a003a88193149c05;hpb=357954767131102c97574658345a0746daac23a3;p=gnus

diff --git a/lisp/shr.el b/lisp/shr.el
index 2ad49dd75..e5bd5b0ae 100644
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -56,26 +56,28 @@ fit these criteria."
 (defcustom shr-table-line ?-
   "Character used to draw table line."
   :group 'shr
-  :type 'char)
+  :type 'character)
 
 (defcustom shr-table-corner ?+
   "Character used to draw table corner."
   :group 'shr
-  :type 'char)
+  :type 'character)
 
 (defcustom shr-hr-line ?-
   "Character used to draw hr line."
   :group 'shr
-  :type 'char)
+  :type 'character)
+
+(defcustom shr-width fill-column
+  "Frame width to use for rendering."
+  :type 'integer
+  :group 'shr)
 
 (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-width 70
-  "Frame width to use for rendering.")
-
 ;;; Internal variables.
 
 (defvar shr-folding-mode nil)
@@ -194,7 +196,7 @@ redirects somewhere else."
 
 (defun shr-insert (text)
   (when (and (eq shr-state 'image)
-             (not (string-match "^\\s-*$" text)))
+	     (not (string-match "\\`[ \t\n]+\\'" text)))
     (insert "\n")
     (setq shr-state nil))
   (cond
@@ -217,8 +219,8 @@ redirects somewhere else."
 	(unless shr-start
 	  (setq shr-start (point)))
 	(insert elem)
-	(when (> (current-column) shr-width)
-	  (if (not (search-backward " " (line-beginning-position) t))
+	(while (> (current-column) shr-width)
+	  (if (not (shr-find-fill-point))
 	      (insert "\n")
 	    (delete-char 1)
 	    (insert "\n")
@@ -230,6 +232,19 @@ redirects somewhere else."
       (unless (string-match "[ \t\n]\\'" text)
 	(delete-char -1))))))
 
+(defun shr-find-fill-point ()
+  (let ((found nil))
+    (while (and (not found)
+		(> (current-column) shr-indentation))
+      (when (and (or (eq (preceding-char) ? )
+		     (aref fill-find-break-point-function-table
+			   (preceding-char)))
+		 (<= (current-column) shr-width))
+	(setq found (point)))
+      (backward-char 1))
+    (or found
+	(end-of-line))))
+
 (defun shr-ensure-newline ()
   (unless (zerop (current-column))
     (insert "\n")))
@@ -324,7 +339,7 @@ Return a string with image data."
   (with-temp-buffer
     (mm-disable-multibyte)
     (when (ignore-errors
-	    (url-cache-extract (url-cache-create-filename url))
+	    (url-cache-extract (url-cache-create-filename (shr-encode-url url)))
 	    t)
       (when (or (search-forward "\n\n" nil t)
 		(search-forward "\r\n\r\n" nil t))
@@ -364,24 +379,49 @@ Return a string with image data."
 	shr-start)
     (shr-generic cont)
     (widget-convert-button
-     'link (or shr-start start) (point)
-     :help-echo url)
-    (put-text-property (or shr-start start) (point) 'keymap shr-map)
+     '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)))
 
+(defun shr-encode-url (url)
+  "Encode URL."
+  (browse-url-url-encode-chars url "[)$ ]"))
+
 (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))))
+  (let ((alt (cdr (assq :alt cont)))
+        (url (cdr (assq :src cont)))
+        (width (cdr (assq :width cont))))
+    ;; Only respect align if width specified.
+    (when width
+      ;; Check that width is not larger than max width, otherwise ignore
+      ;; align
+      (let ((max-width (* shr-width (frame-char-width)))
+            (width (string-to-number width)))
+        (when (< width max-width)
+          (let ((align (cdr (assq :align cont))))
+            (cond
+	     ((string= align "right")
+	      (insert (propertize
+		       " " 'display
+		       `(space . (:align-to
+				  ,(list (- max-width width)))))))
+	     ((string= align "center")
+	      (insert (propertize
+		       " " 'display
+		       `(space . (:balign-to
+				  ,(list (- (/ max-width 2) width))))))))))))
+    (let ((start (point-marker)))
       (when (zerop (length alt))
-	(setq alt "[img]"))
+        (setq alt "[img]"))
       (cond
        ((and (not shr-inhibit-images)
-	     (string-match "\\`cid:" url))
-	(let ((url (substring url (match-end 0)))
+             (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))))
@@ -395,12 +435,12 @@ Return a string with image data."
 	  (if (> (length alt) 8)
 	      (shr-insert (substring alt 0 8))
 	    (shr-insert alt))))
-       ((url-is-cached (browse-url-url-encode-chars url "[&)$ ]"))
+       ((url-is-cached (shr-encode-url url))
 	(shr-put-image (shr-get-image-data url) (point) alt))
        (t
 	(insert alt)
 	(ignore-errors
-	  (url-retrieve url 'shr-image-fetched
+	  (url-retrieve (shr-encode-url url) 'shr-image-fetched
 			(list (current-buffer) start (point-marker))
 			t))))
       (insert " ")