diff options
| author | Katsumi Yamaoka | 2010-10-20 12:24:49 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka | 2010-10-20 12:24:49 +0000 |
| commit | 4bfb8dec36751543c5ba254d8a69685d39295615 (patch) | |
| tree | 58b1c62b9c92fd2c8068bd84056da7d6b5c87e68 | |
| parent | 9d1bf25d2db54a4ce44e4e0c896e0c02c358b960 (diff) | |
| download | emacs-4bfb8dec36751543c5ba254d8a69685d39295615.tar.gz emacs-4bfb8dec36751543c5ba254d8a69685d39295615.zip | |
shr.el (shr-tag-table): Fix last change.
| -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." | |||
| 632 | (nfooter (if footer (shr-max-columns footer)))) | 632 | (nfooter (if footer (shr-max-columns footer)))) |
| 633 | (shr-tag-table-1 | 633 | (shr-tag-table-1 |
| 634 | (nconc | 634 | (nconc |
| 635 | (if caption `((tr (td ,@caption)))) | 635 | (if caption |
| 636 | (if header | 636 | (if header |
| 637 | (if footer | 637 | (if footer |
| 638 | ;; header + body + footer | 638 | ;; caption + hader + body + footer |
| 639 | (if (= nheader nbody) | 639 | (if (= nheader nbody) |
| 640 | (if (= nbody nfooter) | ||
| 641 | `((tr (td ,@caption)) | ||
| 642 | (tr (td (table (tbody ,@header ,@body ,@footer))))) | ||
| 643 | (if (= nfooter 1) | ||
| 644 | `((tr (td ,@caption)) | ||
| 645 | (tr (td (table (tbody ,@header ,@body)))) | ||
| 646 | ,@footer) | ||
| 647 | `((tr (td ,@caption)) | ||
| 648 | (tr (td (table (tbody ,@header ,@body)))) | ||
| 649 | (tr (td (table (tbody ,@footer))))))) | ||
| 650 | (if (= nbody nfooter) | ||
| 651 | `((tr (td ,@caption)) | ||
| 652 | (tr (td (table (tbody ,@header)))) | ||
| 653 | (tr (td (table (tbody ,@body ,@footer))))) | ||
| 654 | (if (= nfooter 1) | ||
| 655 | `((tr (td ,@caption)) | ||
| 656 | (tr (td (table (tbody ,@header)))) | ||
| 657 | (tr (td (table (tbody ,@body)))) | ||
| 658 | ,@footer) | ||
| 659 | `((tr (td ,@caption)) | ||
| 660 | (tr (td (table (tbody ,@header)))) | ||
| 661 | (tr (td (table (tbody ,@body)))) | ||
| 662 | (tr (td (table (tbody ,@footer)))))))) | ||
| 663 | ;; caption + header + body | ||
| 664 | (if (= nheader nbody) | ||
| 665 | `((tr (td ,@caption)) | ||
| 666 | (tr (td (table (tbody ,@header ,@body))))) | ||
| 667 | (if (= nheader 1) | ||
| 668 | `((tr (td ,@caption)) | ||
| 669 | ,@header (tr (td (table (tbody ,@body))))) | ||
| 670 | `((tr (td ,@caption)) | ||
| 671 | (tr (td (table (tbody ,@header)))) | ||
| 672 | (tr (td (table (tbody ,@body)))))))) | ||
| 673 | (if footer | ||
| 674 | ;; caption + body + footer | ||
| 675 | (if (= nbody nfooter) | ||
| 676 | `((tr (td (table (tbody ,@body ,@footer))))) | ||
| 677 | (if (= nfooter 1) | ||
| 678 | `((tr (td (table (tbody ,@body)))) ,@footer) | ||
| 679 | `((tr (td (table (tbody ,@body)))) | ||
| 680 | (tr (td (table (tbody ,@footer))))))) | ||
| 681 | ;; caption + body | ||
| 682 | `((tr (td ,@caption)) | ||
| 683 | (tr (td (table (tbody ,@body))))))) | ||
| 684 | (if header | ||
| 685 | (if footer | ||
| 686 | ;; header + body + footer | ||
| 687 | (if (= nheader nbody) | ||
| 688 | (if (= nbody nfooter) | ||
| 689 | `((tr (td (table (tbody ,@header ,@body ,@footer))))) | ||
| 690 | (if (= nfooter 1) | ||
| 691 | `((tr (td (table (tbody ,@header ,@body)))) | ||
| 692 | ,@footer) | ||
| 693 | `((tr (td (table (tbody ,@header ,@body)))) | ||
| 694 | (tr (td (table (tbody ,@footer))))))) | ||
| 640 | (if (= nbody nfooter) | 695 | (if (= nbody nfooter) |
| 641 | `((tr (td (table (tbody ,@header ,@body ,@footer))))) | 696 | `((tr (td (table (tbody ,@header)))) |
| 697 | (tr (td (table (tbody ,@body ,@footer))))) | ||
| 642 | (if (= nfooter 1) | 698 | (if (= nfooter 1) |
| 643 | `((tr (td (table (tbody ,@header ,@body)))) | 699 | `((tr (td (table (tbody ,@header)))) |
| 700 | (tr (td (table (tbody ,@body)))) | ||
| 644 | ,@footer) | 701 | ,@footer) |
| 645 | `((tr (td (table (tbody ,@header ,@body)))) | ||
| 646 | (tr (td (table (tbody ,@footer))))))) | ||
| 647 | (if (= nbody nfooter) | ||
| 648 | `((tr (td (table (tbody ,@header)))) | ||
| 649 | (tr (td (table (tbody ,@body ,@footer))))) | ||
| 650 | (if (= nfooter 1) | ||
| 651 | `((tr (td (table (tbody ,@header)))) | 702 | `((tr (td (table (tbody ,@header)))) |
| 652 | (tr (td (table (tbody ,@body)))) | 703 | (tr (td (table (tbody ,@body)))) |
| 653 | ,@footer) | 704 | (tr (td (table (tbody ,@footer)))))))) |
| 654 | `((tr (td (table (tbody ,@header)))) | 705 | ;; header + body |
| 655 | (tr (td (table (tbody ,@body)))) | 706 | (if (= nheader nbody) |
| 656 | (tr (td (table (tbody ,@footer)))))))) | 707 | `((tr (td (table (tbody ,@header ,@body))))) |
| 657 | ;; header + body | 708 | (if (= nheader 1) |
| 658 | (if (= nheader nbody) | 709 | `(,@header (tr (td (table (tbody ,@body))))) |
| 659 | `((tr (td (table (tbody ,@header ,@body))))) | 710 | `((tr (td (table (tbody ,@header)))) |
| 660 | (if (= nheader 1) | 711 | (tr (td (table (tbody ,@body)))))))) |
| 661 | `(,@header (tr (td (table (tbody ,@body))))) | 712 | (if footer |
| 662 | `((tr (td (table (tbody ,@header)))) | 713 | ;; body + footer |
| 663 | (tr (td (table (tbody ,@body)))))))) | 714 | (if (= nbody nfooter) |
| 664 | (if footer | 715 | `((tr (td (table (tbody ,@body ,@footer))))) |
| 665 | ;; body + footer | 716 | (if (= nfooter 1) |
| 666 | (if (= nbody nfooter) | 717 | `((tr (td (table (tbody ,@body)))) ,@footer) |
| 667 | `((tr (td (table (tbody ,@body ,@footer))))) | 718 | `((tr (td (table (tbody ,@body)))) |
| 668 | (if (= nfooter 1) | 719 | (tr (td (table (tbody ,@footer))))))) |
| 669 | `((tr (td (table (tbody ,@body)))) ,@footer) | 720 | body))))))) |
| 670 | `((tr (td (table (tbody ,@body)))) | ||
| 671 | (tr (td (table (tbody ,@footer))))))) | ||
| 672 | body)))))) | ||
| 673 | 721 | ||
| 674 | (defun shr-find-elements (cont type) | 722 | (defun shr-find-elements (cont type) |
| 675 | (let (result) | 723 | (let (result) |