diff options
| author | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-10-20 12:24:49 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-10-20 12:24:49 +0000 |
| commit | 4bfb8dec36751543c5ba254d8a69685d39295615 (patch) | |
| tree | 58b1c62b9c92fd2c8068bd84056da7d6b5c87e68 /lisp/gnus/shr.el | |
| parent | 9d1bf25d2db54a4ce44e4e0c896e0c02c358b960 (diff) | |
| download | emacs-4bfb8dec36751543c5ba254d8a69685d39295615.tar.gz emacs-4bfb8dec36751543c5ba254d8a69685d39295615.tar.bz2 emacs-4bfb8dec36751543c5ba254d8a69685d39295615.zip | |
shr.el (shr-tag-table): Fix last change.
Diffstat (limited to 'lisp/gnus/shr.el')
| -rw-r--r-- | lisp/gnus/shr.el | 114 |
1 files 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) |