Only insert the images after the top-level table.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 77864fd..82ee6fd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-10-29  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * shr.el (shr-table-depth): New variable.
+       (shr-tag-table-1): Only insert the images after the top-level table.
+
        * nnimap.el (nnimap-split-incoming-mail): Fix typo.
 
        * gnus-util.el (gnus-list-memq-of-list): New function.

diff --git a/lisp/shr.el b/lisp/shr.el
index 8bb532e..324bbee 100644 (file)
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -90,6 +90,7 @@ cid: URL as the argument.")
 (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)))
@@ -630,6 +631,7 @@ Return a string with image data."
   (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))
@@ -651,8 +653,9 @@ Return a string with image data."
   ;; 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)