[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r102019: shr.el (shr-tag-table): Fix
|
From: |
Katsumi Yamaoka |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r102019: shr.el (shr-tag-table): Fix last change. |
|
Date: |
Wed, 20 Oct 2010 12:24:49 +0000 |
|
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 102019
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Wed 2010-10-20 12:24:49 +0000
message:
shr.el (shr-tag-table): Fix last change.
modified:
lisp/gnus/shr.el
=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el 2010-10-20 07:31:25 +0000
+++ b/lisp/gnus/shr.el 2010-10-20 12:24:49 +0000
@@ -632,44 +632,92 @@
(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)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r102019: shr.el (shr-tag-table): Fix last change.,
Katsumi Yamaoka <=