From 4bfb8dec36751543c5ba254d8a69685d39295615 Mon Sep 17 00:00:00 2001
From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Wed, 20 Oct 2010 12:24:49 +0000
Subject: [PATCH] shr.el (shr-tag-table): Fix last change.

---
 lisp/gnus/shr.el | 114 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 81 insertions(+), 33 deletions(-)

diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index 9183e985fe6..e632b689a3f 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -632,44 +632,92 @@ Return a string with image data."
 	 (nfooter (if footer (shr-max-columns footer))))
     (shr-tag-table-1
      (nconc
-      (if caption `((tr (td ,@caption))))
-      (if header
-	  (if footer
-	      ;; header + body + footer
-	      (if (= nheader nbody)
+      (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)))))
+		      (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 ,@body ,@footer)))))
+		      `((tr (td (table (tbody ,@header))))
+			(tr (td (table (tbody ,@body ,@footer)))))
 		    (if (= nfooter 1)
-			`((tr (td (table (tbody ,@header ,@body))))
+			`((tr (td (table (tbody ,@header))))
+			  (tr (td (table (tbody ,@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))))))
+			(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)))))))
 
 (defun shr-find-elements (cont type)
   (let (result)
-- 
2.39.5