From 20e8d98fb75d2ffc940ee5a53effe336030b6017 Mon Sep 17 00:00:00 2001 From: Manuel Pégourié-Gonnard Date: Thu, 1 May 2008 09:47:00 +0000 Subject: ctable v1.13 git-svn-id: svn://tug.org/texlive/trunk@7766 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/ctable/01a.pdf | Bin 11575 -> 11575 bytes Master/texmf-dist/doc/latex/ctable/01b.pdf | Bin 39361 -> 39361 bytes Master/texmf-dist/doc/latex/ctable/02k.pdf | Bin 12154 -> 12154 bytes Master/texmf-dist/doc/latex/ctable/02l.pdf | Bin 11953 -> 11953 bytes Master/texmf-dist/doc/latex/ctable/02m.pdf | Bin 12469 -> 12469 bytes Master/texmf-dist/doc/latex/ctable/03a.pdf | Bin 12267 -> 12267 bytes Master/texmf-dist/doc/latex/ctable/03b.pdf | Bin 12267 -> 12267 bytes Master/texmf-dist/doc/latex/ctable/04a.pdf | Bin 12265 -> 12265 bytes Master/texmf-dist/doc/latex/ctable/04b.pdf | Bin 12267 -> 12267 bytes Master/texmf-dist/doc/latex/ctable/05a.pdf | Bin 11946 -> 11946 bytes Master/texmf-dist/doc/latex/ctable/05b.pdf | Bin 11856 -> 11856 bytes Master/texmf-dist/doc/latex/ctable/06a.pdf | Bin 10656 -> 10656 bytes Master/texmf-dist/doc/latex/ctable/06b.pdf | Bin 8804 -> 8804 bytes Master/texmf-dist/doc/latex/ctable/07a.pdf | Bin 16861 -> 16861 bytes Master/texmf-dist/doc/latex/ctable/07b.pdf | Bin 17151 -> 17151 bytes Master/texmf-dist/doc/latex/ctable/08a.pdf | Bin 11942 -> 11942 bytes Master/texmf-dist/doc/latex/ctable/08b.pdf | Bin 11990 -> 11990 bytes Master/texmf-dist/doc/latex/ctable/09b.pdf | Bin 12006 -> 12006 bytes Master/texmf-dist/doc/latex/ctable/10a.pdf | Bin 11949 -> 11949 bytes Master/texmf-dist/doc/latex/ctable/10b.pdf | Bin 11997 -> 11997 bytes Master/texmf-dist/doc/latex/ctable/11k.pdf | Bin 10587 -> 10587 bytes Master/texmf-dist/doc/latex/ctable/11l.pdf | Bin 10622 -> 10622 bytes Master/texmf-dist/doc/latex/ctable/11m.pdf | Bin 10622 -> 10622 bytes Master/texmf-dist/doc/latex/ctable/12a.pdf | Bin 17599 -> 17599 bytes Master/texmf-dist/doc/latex/ctable/12b.pdf | Bin 17682 -> 17682 bytes Master/texmf-dist/doc/latex/ctable/13a.pdf | Bin 0 -> 12267 bytes Master/texmf-dist/doc/latex/ctable/13b.pdf | Bin 0 -> 13022 bytes Master/texmf-dist/doc/latex/ctable/13c.pdf | Bin 0 -> 18839 bytes Master/texmf-dist/doc/latex/ctable/README | 49 ++++++++++-------- Master/texmf-dist/doc/latex/ctable/ctable.pdf | Bin 670345 -> 743932 bytes Master/texmf-dist/doc/latex/ctable/s01a.pdf | Bin 8080 -> 8080 bytes Master/texmf-dist/doc/latex/ctable/s01b.pdf | Bin 10379 -> 10379 bytes Master/texmf-dist/doc/latex/ctable/s02k.pdf | Bin 8531 -> 8531 bytes Master/texmf-dist/doc/latex/ctable/s02l.pdf | Bin 8213 -> 8213 bytes Master/texmf-dist/doc/latex/ctable/s02m.pdf | Bin 8912 -> 8912 bytes Master/texmf-dist/doc/latex/ctable/s03a.pdf | Bin 8348 -> 8348 bytes Master/texmf-dist/doc/latex/ctable/s03b.pdf | Bin 8847 -> 8847 bytes Master/texmf-dist/doc/latex/ctable/s04a.pdf | Bin 8364 -> 8364 bytes Master/texmf-dist/doc/latex/ctable/s04b.pdf | Bin 8975 -> 8975 bytes Master/texmf-dist/doc/latex/ctable/s05a.pdf | Bin 8193 -> 8193 bytes Master/texmf-dist/doc/latex/ctable/s05b.pdf | Bin 8928 -> 8928 bytes Master/texmf-dist/doc/latex/ctable/s06a.pdf | Bin 9593 -> 9593 bytes Master/texmf-dist/doc/latex/ctable/s06b.pdf | Bin 9490 -> 9490 bytes Master/texmf-dist/doc/latex/ctable/s07a.pdf | Bin 8631 -> 8631 bytes Master/texmf-dist/doc/latex/ctable/s07b.pdf | Bin 9074 -> 9074 bytes Master/texmf-dist/doc/latex/ctable/s08a.pdf | Bin 8424 -> 8424 bytes Master/texmf-dist/doc/latex/ctable/s08b.pdf | Bin 9480 -> 9480 bytes Master/texmf-dist/doc/latex/ctable/s09b.pdf | Bin 9466 -> 9466 bytes Master/texmf-dist/doc/latex/ctable/s10a.pdf | Bin 8997 -> 8997 bytes Master/texmf-dist/doc/latex/ctable/s10b.pdf | Bin 9553 -> 9553 bytes Master/texmf-dist/doc/latex/ctable/s11k.pdf | Bin 7214 -> 7214 bytes Master/texmf-dist/doc/latex/ctable/s11l.pdf | Bin 7594 -> 7594 bytes Master/texmf-dist/doc/latex/ctable/s11m.pdf | Bin 8675 -> 8675 bytes Master/texmf-dist/doc/latex/ctable/s12a.pdf | Bin 8823 -> 8823 bytes Master/texmf-dist/doc/latex/ctable/s12b.pdf | Bin 9088 -> 9088 bytes Master/texmf-dist/doc/latex/ctable/s13a.pdf | Bin 0 -> 9247 bytes Master/texmf-dist/doc/latex/ctable/s13b.pdf | Bin 0 -> 9435 bytes Master/texmf-dist/doc/latex/ctable/s13c.pdf | Bin 0 -> 9899 bytes Master/texmf-dist/source/latex/ctable/ctable.dtx | 61 +++++++++++++++++++---- Master/texmf-dist/tex/latex/ctable/ctable.sty | 25 ++++++++-- 60 files changed, 99 insertions(+), 36 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/ctable/13a.pdf create mode 100644 Master/texmf-dist/doc/latex/ctable/13b.pdf create mode 100644 Master/texmf-dist/doc/latex/ctable/13c.pdf create mode 100644 Master/texmf-dist/doc/latex/ctable/s13a.pdf create mode 100644 Master/texmf-dist/doc/latex/ctable/s13b.pdf create mode 100644 Master/texmf-dist/doc/latex/ctable/s13c.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/01a.pdf b/Master/texmf-dist/doc/latex/ctable/01a.pdf index fdc4a504bc8..3a5333ed2ae 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/01a.pdf and b/Master/texmf-dist/doc/latex/ctable/01a.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/01b.pdf b/Master/texmf-dist/doc/latex/ctable/01b.pdf index 74c21f3b7a8..97e42853582 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/01b.pdf and b/Master/texmf-dist/doc/latex/ctable/01b.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/02k.pdf b/Master/texmf-dist/doc/latex/ctable/02k.pdf index b02300a499c..4c5d3cb0cd6 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/02k.pdf and b/Master/texmf-dist/doc/latex/ctable/02k.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/02l.pdf b/Master/texmf-dist/doc/latex/ctable/02l.pdf index ee73472c0bf..9e5c881a9e3 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/02l.pdf and b/Master/texmf-dist/doc/latex/ctable/02l.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/02m.pdf b/Master/texmf-dist/doc/latex/ctable/02m.pdf index 0e1080afbba..724858d81a6 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/02m.pdf and b/Master/texmf-dist/doc/latex/ctable/02m.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/03a.pdf b/Master/texmf-dist/doc/latex/ctable/03a.pdf index 01ca42157c6..9181028418d 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/03a.pdf and b/Master/texmf-dist/doc/latex/ctable/03a.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/03b.pdf b/Master/texmf-dist/doc/latex/ctable/03b.pdf index a14ac50bf5f..8c880fb0c9d 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/03b.pdf and b/Master/texmf-dist/doc/latex/ctable/03b.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/04a.pdf b/Master/texmf-dist/doc/latex/ctable/04a.pdf index 7bd1d86c833..bd3cbc6c3ec 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/04a.pdf and b/Master/texmf-dist/doc/latex/ctable/04a.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/04b.pdf b/Master/texmf-dist/doc/latex/ctable/04b.pdf index 48dc4a30dba..aad8c1c1467 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/04b.pdf and b/Master/texmf-dist/doc/latex/ctable/04b.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/05a.pdf b/Master/texmf-dist/doc/latex/ctable/05a.pdf index 5dfb0c8424b..0f7aa515206 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/05a.pdf and b/Master/texmf-dist/doc/latex/ctable/05a.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/05b.pdf b/Master/texmf-dist/doc/latex/ctable/05b.pdf index 1bb8389e2e0..391d284428d 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/05b.pdf and b/Master/texmf-dist/doc/latex/ctable/05b.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/06a.pdf b/Master/texmf-dist/doc/latex/ctable/06a.pdf index b43078a655e..b442374181f 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/06a.pdf and b/Master/texmf-dist/doc/latex/ctable/06a.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/06b.pdf b/Master/texmf-dist/doc/latex/ctable/06b.pdf index f4a93a698c5..2259c1dd218 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/06b.pdf and b/Master/texmf-dist/doc/latex/ctable/06b.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/07a.pdf b/Master/texmf-dist/doc/latex/ctable/07a.pdf index 695ce92ec68..468d2f63d11 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/07a.pdf and b/Master/texmf-dist/doc/latex/ctable/07a.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/07b.pdf b/Master/texmf-dist/doc/latex/ctable/07b.pdf index 5426f00cef8..b4c8beb7342 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/07b.pdf and b/Master/texmf-dist/doc/latex/ctable/07b.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/08a.pdf b/Master/texmf-dist/doc/latex/ctable/08a.pdf index e412535ac51..17d072e1fad 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/08a.pdf and b/Master/texmf-dist/doc/latex/ctable/08a.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/08b.pdf b/Master/texmf-dist/doc/latex/ctable/08b.pdf index 727c3b4416f..84912445daf 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/08b.pdf and b/Master/texmf-dist/doc/latex/ctable/08b.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/09b.pdf b/Master/texmf-dist/doc/latex/ctable/09b.pdf index 5d3ba5671a1..f258f1ce98f 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/09b.pdf and b/Master/texmf-dist/doc/latex/ctable/09b.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/10a.pdf b/Master/texmf-dist/doc/latex/ctable/10a.pdf index d2a1ec5656d..ec1ffb2fbf3 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/10a.pdf and b/Master/texmf-dist/doc/latex/ctable/10a.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/10b.pdf b/Master/texmf-dist/doc/latex/ctable/10b.pdf index 31de80d0a47..1fe9f704e12 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/10b.pdf and b/Master/texmf-dist/doc/latex/ctable/10b.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/11k.pdf b/Master/texmf-dist/doc/latex/ctable/11k.pdf index e7b8fa60d3b..0f0a096e10e 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/11k.pdf and b/Master/texmf-dist/doc/latex/ctable/11k.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/11l.pdf b/Master/texmf-dist/doc/latex/ctable/11l.pdf index 2e15a2e70cb..837c16f5f50 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/11l.pdf and b/Master/texmf-dist/doc/latex/ctable/11l.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/11m.pdf b/Master/texmf-dist/doc/latex/ctable/11m.pdf index a3c85e5b574..378f747ac09 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/11m.pdf and b/Master/texmf-dist/doc/latex/ctable/11m.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/12a.pdf b/Master/texmf-dist/doc/latex/ctable/12a.pdf index 0871ebfc8ef..cb08116f246 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/12a.pdf and b/Master/texmf-dist/doc/latex/ctable/12a.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/12b.pdf b/Master/texmf-dist/doc/latex/ctable/12b.pdf index ccd9f93c681..226ca4005c5 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/12b.pdf and b/Master/texmf-dist/doc/latex/ctable/12b.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/13a.pdf b/Master/texmf-dist/doc/latex/ctable/13a.pdf new file mode 100644 index 00000000000..8e65d695816 Binary files /dev/null and b/Master/texmf-dist/doc/latex/ctable/13a.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/13b.pdf b/Master/texmf-dist/doc/latex/ctable/13b.pdf new file mode 100644 index 00000000000..4e6a28e5904 Binary files /dev/null and b/Master/texmf-dist/doc/latex/ctable/13b.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/13c.pdf b/Master/texmf-dist/doc/latex/ctable/13c.pdf new file mode 100644 index 00000000000..e4ab686c769 Binary files /dev/null and b/Master/texmf-dist/doc/latex/ctable/13c.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/README b/Master/texmf-dist/doc/latex/ctable/README index ba220e8c102..18dc8c03124 100644 --- a/Master/texmf-dist/doc/latex/ctable/README +++ b/Master/texmf-dist/doc/latex/ctable/README @@ -1,25 +1,32 @@ -- ctable.sty provides commands to easily typeset centered or left or - right aligned tables and (multiple-)figure floats, with footnotes. - Instead of an environment, a command with 4 arguments is used; the - first is optional and is used for key,value pairs generating - variations on the defaults and offering a route for future - extensions. +This is version 1.13 of the ctable package -- LPPL +ctable.sty provides commands to easily typeset centered or left or +right aligned tables and (multiple-)figure floats, with footnotes. +Instead of an environment, a command with 4 arguments is used; the +first is optional and is used for key,value pairs generating +variations on the defaults and offering a route for future +extensions. -- major changes of v1.12 relative to v1.11): - - added option notespar, typesetting footnotes in a paragraph, one - after the other. Useful for tables with many short footnotes. +License: LPPL -- major changes of v1.11 relative to v1.10): - - added %'s at eol to prevent whitespace - - removed \xspace usage -caused overfull badness +major changes of v1.13 relative to v1.12): +- cap option with empty argument will prohibit insertion in lot/lof +- added option continued, for continuation tables: same number as + previous table, ` (continued' added to caption. -- major changes of v1.10 relative to v1.9): - - Footnote markers in the text now stay superscript with nosuper. - - Documentation: added many examples for the options. - - Corrected some unwanted white space in captions. - - Caption package included to correct booktabs errors - in caption position. As a consequence: - - *Captionskip option redefined*: 0pt value now corresponds - to LaTeX defaults +major changes of v1.12 relative to v1.11): +- added option notespar, typesetting footnotes in a paragraph, one + after the other. Useful for tables with many short footnotes. + +major changes of v1.11 relative to v1.10): + - added %'s at eol to prevent whitespace + - removed \xspace usage -caused overfull badness + +major changes of v1.10 relative to v1.9): + - Footnote markers in the text now stay superscript with nosuper. + - Documentation: added many examples for the options. + - Corrected some unwanted white space in captions. + - Caption package included to correct booktabs errors + in caption position. As a consequence: + - *Captionskip option redefined*: 0pt value now corresponds + to LaTeX defaults diff --git a/Master/texmf-dist/doc/latex/ctable/ctable.pdf b/Master/texmf-dist/doc/latex/ctable/ctable.pdf index 45e6dd3133c..46fbfb36392 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/ctable.pdf and b/Master/texmf-dist/doc/latex/ctable/ctable.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/s01a.pdf b/Master/texmf-dist/doc/latex/ctable/s01a.pdf index 4bfcd152b29..8f3b9d04c47 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/s01a.pdf and b/Master/texmf-dist/doc/latex/ctable/s01a.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/s01b.pdf b/Master/texmf-dist/doc/latex/ctable/s01b.pdf index e1aa968d923..32d2a7de404 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/s01b.pdf and b/Master/texmf-dist/doc/latex/ctable/s01b.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/s02k.pdf b/Master/texmf-dist/doc/latex/ctable/s02k.pdf index 1287fdcebe5..fca22975464 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/s02k.pdf and b/Master/texmf-dist/doc/latex/ctable/s02k.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/s02l.pdf b/Master/texmf-dist/doc/latex/ctable/s02l.pdf index c6aa225f518..b04b985ddcd 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/s02l.pdf and b/Master/texmf-dist/doc/latex/ctable/s02l.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/s02m.pdf b/Master/texmf-dist/doc/latex/ctable/s02m.pdf index 665dd6e1248..755afdbb10b 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/s02m.pdf and b/Master/texmf-dist/doc/latex/ctable/s02m.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/s03a.pdf b/Master/texmf-dist/doc/latex/ctable/s03a.pdf index da46cb88cf8..a91191dd097 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/s03a.pdf and b/Master/texmf-dist/doc/latex/ctable/s03a.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/s03b.pdf b/Master/texmf-dist/doc/latex/ctable/s03b.pdf index dc085842a84..9756d737a94 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/s03b.pdf and b/Master/texmf-dist/doc/latex/ctable/s03b.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/s04a.pdf b/Master/texmf-dist/doc/latex/ctable/s04a.pdf index 72ef3416d2b..f4eaf05feac 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/s04a.pdf and b/Master/texmf-dist/doc/latex/ctable/s04a.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/s04b.pdf b/Master/texmf-dist/doc/latex/ctable/s04b.pdf index 54f533c7c71..5916f1c3e43 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/s04b.pdf and b/Master/texmf-dist/doc/latex/ctable/s04b.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/s05a.pdf b/Master/texmf-dist/doc/latex/ctable/s05a.pdf index c451e9c9c57..08f9e9238f6 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/s05a.pdf and b/Master/texmf-dist/doc/latex/ctable/s05a.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/s05b.pdf b/Master/texmf-dist/doc/latex/ctable/s05b.pdf index 4e8977ae801..961029da727 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/s05b.pdf and b/Master/texmf-dist/doc/latex/ctable/s05b.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/s06a.pdf b/Master/texmf-dist/doc/latex/ctable/s06a.pdf index aefcdbc2290..fb717606b87 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/s06a.pdf and b/Master/texmf-dist/doc/latex/ctable/s06a.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/s06b.pdf b/Master/texmf-dist/doc/latex/ctable/s06b.pdf index 25122650276..a53d1b39fba 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/s06b.pdf and b/Master/texmf-dist/doc/latex/ctable/s06b.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/s07a.pdf b/Master/texmf-dist/doc/latex/ctable/s07a.pdf index ae4b8a73cc0..d5b3a629ff0 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/s07a.pdf and b/Master/texmf-dist/doc/latex/ctable/s07a.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/s07b.pdf b/Master/texmf-dist/doc/latex/ctable/s07b.pdf index ae463cdc048..abd3167be5a 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/s07b.pdf and b/Master/texmf-dist/doc/latex/ctable/s07b.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/s08a.pdf b/Master/texmf-dist/doc/latex/ctable/s08a.pdf index 79b7dfb08d3..1a00aacc26f 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/s08a.pdf and b/Master/texmf-dist/doc/latex/ctable/s08a.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/s08b.pdf b/Master/texmf-dist/doc/latex/ctable/s08b.pdf index 45fc2edd94a..9457e2c1876 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/s08b.pdf and b/Master/texmf-dist/doc/latex/ctable/s08b.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/s09b.pdf b/Master/texmf-dist/doc/latex/ctable/s09b.pdf index de5740e9990..ab7b6815d0b 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/s09b.pdf and b/Master/texmf-dist/doc/latex/ctable/s09b.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/s10a.pdf b/Master/texmf-dist/doc/latex/ctable/s10a.pdf index fd0eb0c7478..1006be0e07a 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/s10a.pdf and b/Master/texmf-dist/doc/latex/ctable/s10a.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/s10b.pdf b/Master/texmf-dist/doc/latex/ctable/s10b.pdf index 7e8d566adde..8e87bc774a8 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/s10b.pdf and b/Master/texmf-dist/doc/latex/ctable/s10b.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/s11k.pdf b/Master/texmf-dist/doc/latex/ctable/s11k.pdf index b46806746f4..290e9ea50a6 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/s11k.pdf and b/Master/texmf-dist/doc/latex/ctable/s11k.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/s11l.pdf b/Master/texmf-dist/doc/latex/ctable/s11l.pdf index a7ff5b39e21..e8bdd72f72a 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/s11l.pdf and b/Master/texmf-dist/doc/latex/ctable/s11l.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/s11m.pdf b/Master/texmf-dist/doc/latex/ctable/s11m.pdf index 767f878aeb6..fd3ad6ff135 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/s11m.pdf and b/Master/texmf-dist/doc/latex/ctable/s11m.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/s12a.pdf b/Master/texmf-dist/doc/latex/ctable/s12a.pdf index 4c89fa32203..f9181472f48 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/s12a.pdf and b/Master/texmf-dist/doc/latex/ctable/s12a.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/s12b.pdf b/Master/texmf-dist/doc/latex/ctable/s12b.pdf index b6efd4b8a84..4b9b7e6bd23 100644 Binary files a/Master/texmf-dist/doc/latex/ctable/s12b.pdf and b/Master/texmf-dist/doc/latex/ctable/s12b.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/s13a.pdf b/Master/texmf-dist/doc/latex/ctable/s13a.pdf new file mode 100644 index 00000000000..33f49dffd16 Binary files /dev/null and b/Master/texmf-dist/doc/latex/ctable/s13a.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/s13b.pdf b/Master/texmf-dist/doc/latex/ctable/s13b.pdf new file mode 100644 index 00000000000..5042d08cbb5 Binary files /dev/null and b/Master/texmf-dist/doc/latex/ctable/s13b.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctable/s13c.pdf b/Master/texmf-dist/doc/latex/ctable/s13c.pdf new file mode 100644 index 00000000000..c614f89b6b9 Binary files /dev/null and b/Master/texmf-dist/doc/latex/ctable/s13c.pdf differ diff --git a/Master/texmf-dist/source/latex/ctable/ctable.dtx b/Master/texmf-dist/source/latex/ctable/ctable.dtx index b9a26422d28..c95d289201d 100644 --- a/Master/texmf-dist/source/latex/ctable/ctable.dtx +++ b/Master/texmf-dist/source/latex/ctable/ctable.dtx @@ -19,7 +19,7 @@ %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{ctable} %<*package> - [2008/04/13 v1.12 ctable package] + [2008/05/01 v1.13 ctable package] % % %<*driver> @@ -77,7 +77,7 @@ % % \fi % -% \CheckSum{348} +% \CheckSum{390} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -137,6 +137,12 @@ % Removed xspace usage - caused overfull badness % } % \changes{v1.12}{2008/04/12}{Option notespar added} +% \changes{v1.13}{2008/05/01}{cap option with empty argument will not be inserted +% in lot/lof +% Added option continued, for continuation tables: +% same number as previous table, ` (continued' added +% to caption. +% } % % \GetFileInfo{ctable.dtx} % @@ -210,7 +216,17 @@ % |caption={...}|& table caption; the braces are needed only if your % caption contains a comma or an equals sign.\NN[1ex] % -% |cap={...}| & for a short caption to go to the |\listoftables|.\NN[1ex] +% |cap={...}| & for a short caption to go to the |\listoftables|. +% Without the |cap| option, the full caption will go +% into the |\listoftables|. If |cap| is given an empty +% value, no entry in the |\listoftables| will be made. +% This may be useful, for example, with the |continued| +% option.\NN[1ex] +% +% |continued[=...]| & if used, the table will be numbered the same as the +% previous table. If used without an argument, the caption +% will be suffixed with ` (continued)', if used with an +% argument, the suffix will be the argument.\NN[1ex] % % |captionskip=...| & moves the caption relative to the table; % the default is |0ex|, which puts captions at @@ -517,7 +533,6 @@ % background. Where necessary, the example will show boxes to indicate the page % and the text body. % -% \newpage % \subsection{\ttfamily\bfseries center, left, right} % These options align the float in the page; the default is |center|: % \medskip\\ @@ -538,6 +553,15 @@ % \ROW{Y}{s12a}{12a} % \ROW{B}{s12b}{12b} % +% \subsection{\ttfamily\bfseries continued} +% The |continued| option suffixes the caption with ` (continued)', and lowers the table +% number by one, so that it obtains the same number as the previous table. +% This option can be given an argument to replace the default suffix: +% \medskip\\ +% \ROW{Y}{s13a}{13a} +% \ROW{B}{s13b}{13b} +% \ROW{B}{s13c}{13c} +% % \newpage % \subsection{\ttfamily\bfseries mincapwidth} % |ctable| forces caption and footnotes to stay within the width of the table. @@ -668,6 +692,7 @@ \define@key{ctbl}{caption}{\def\@ctblcaption{#1}} \define@key{ctbl}{cap}{\def\@ctblcap{#1}} \define@key{ctbl}{label}{\def\@ctbllabel{#1}} +\define@key{ctbl}{continued}[(continued)]{\def\@ctblcontinued{#1}} \define@key{ctbl}{pos}{\def\@ctblpos{#1}\def\@ctblbegin{\@ctblbeg[#1]}} \define@key{ctbl}{width}{\@ctblwidth=#1} \define@key{ctbl}{maxwidth}{\@ctblmaxwidth=#1} @@ -691,12 +716,26 @@ \define@key{ctbl}{nosuper}[]{\let\@cttextsuperscript\@ctcopy} \define@key{ctbl}{notespar}[]{\def\@ctblnotespar{1}} % \end{macrocode} -% a caption will only be generated if the \textsl{caption} option was used: +% A caption will only be generated if the \textsl{caption} option was used. +% First adapt |\@caption| so that it does not insert empty (short) captions +% in the lot/lof % \begin{macrocode} +\long\def\@caption#1[#2]#3{% + \par + \ifx#2\empty\else\addcontentsline{\csname ext@#1\endcsname}{#1}% + {\protect\numberline{\csname the#1\endcsname}{\ignorespaces #2}}\fi% + \begingroup + \@parboxrestore + \if@minipage + \@setminipage + \fi + \normalsize + \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par + \endgroup} \def\@ctblCaption{ - \ifx\@ctblcap\empty\let\@ctblcap\@ctblcaption\fi + \ifx\@ctblcap\undefined\let\@ctblcap\@ctblcaption\fi \ifx\@ctblcaption\empty\else - \caption[\@ctblcap]{\label{\@ctbllabel}\@ctblcaption} + \caption[\@ctblcap]{\label{\@ctbllabel}\@ctblcaption\ \@ctblcontinued} \fi } \def\@ctblframe#1#2#3{% @@ -716,10 +755,11 @@ \newcommand{\ctable}[4][]{% \def\@ctbltaborfig{table}% \def\@ctblalign {center}% - \def\@ctblsideways {}% + \def\@ctblsideways{}% + \def\@ctblcontinued{}% \def\@ctblpos {}% \def\@ctblcaption {}% - \def\@ctblcap {}% + \let\@ctblcap\undefined% \def\@ctbllabel {}% \def\@ctblbeg {\begin{\@ctblsideways\@ctbltaborfig\@ctblstarred}}% \def\@ctblbegin {\@ctblbeg}% @@ -825,6 +865,7 @@ % |\@ctblbegin| is now defined as something like |\begin{table}[tbp]|. % \begin{macrocode} \@ctblbegin + \ifx\@ctblcontinued\empty\else\ContinuedFloat\fi \begin{\@ctblalign} \begin{minipage}{\@ctblfloatwidth}\parindent0pt \ifx\@ctblbotcap\empty\@ctblCaption\vskip\@ctblcaptionskip\fi @@ -851,4 +892,4 @@ % \end{macrocode} % \Finale \endinput -$Id: ctable.dtx,v 1.58 2008/04/13 15:58:14 wybo Exp $ +$Id: ctable.dtx,v 1.59 2008/04/30 13:18:59 wybo Exp $ diff --git a/Master/texmf-dist/tex/latex/ctable/ctable.sty b/Master/texmf-dist/tex/latex/ctable/ctable.sty index 1d6eb0b4e37..6b799de1e0f 100644 --- a/Master/texmf-dist/tex/latex/ctable/ctable.sty +++ b/Master/texmf-dist/tex/latex/ctable/ctable.sty @@ -22,7 +22,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{ctable} - [2008/04/13 v1.12 ctable package] + [2008/05/01 v1.13 ctable package] \RequirePackage{color,xkeyval,array,tabularx,booktabs,rotating,caption} \def\NN{\tabularnewline} \def\FL{\toprule} @@ -46,6 +46,7 @@ \define@key{ctbl}{caption}{\def\@ctblcaption{#1}} \define@key{ctbl}{cap}{\def\@ctblcap{#1}} \define@key{ctbl}{label}{\def\@ctbllabel{#1}} +\define@key{ctbl}{continued}[(continued)]{\def\@ctblcontinued{#1}} \define@key{ctbl}{pos}{\def\@ctblpos{#1}\def\@ctblbegin{\@ctblbeg[#1]}} \define@key{ctbl}{width}{\@ctblwidth=#1} \define@key{ctbl}{maxwidth}{\@ctblmaxwidth=#1} @@ -68,10 +69,22 @@ \define@key{ctbl}{captionskip}{\@ctblcaptionskip=#1} \define@key{ctbl}{nosuper}[]{\let\@cttextsuperscript\@ctcopy} \define@key{ctbl}{notespar}[]{\def\@ctblnotespar{1}} +\long\def\@caption#1[#2]#3{% + \par + \ifx#2\empty\else\addcontentsline{\csname ext@#1\endcsname}{#1}% + {\protect\numberline{\csname the#1\endcsname}{\ignorespaces #2}}\fi% + \begingroup + \@parboxrestore + \if@minipage + \@setminipage + \fi + \normalsize + \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par + \endgroup} \def\@ctblCaption{ - \ifx\@ctblcap\empty\let\@ctblcap\@ctblcaption\fi + \ifx\@ctblcap\undefined\let\@ctblcap\@ctblcaption\fi \ifx\@ctblcaption\empty\else - \caption[\@ctblcap]{\label{\@ctbllabel}\@ctblcaption} + \caption[\@ctblcap]{\label{\@ctbllabel}\@ctblcaption\ \@ctblcontinued} \fi } \def\@ctblframe#1#2#3{% @@ -91,10 +104,11 @@ \newcommand{\ctable}[4][]{% \def\@ctbltaborfig{table}% \def\@ctblalign {center}% - \def\@ctblsideways {}% + \def\@ctblsideways{}% + \def\@ctblcontinued{}% \def\@ctblpos {}% \def\@ctblcaption {}% - \def\@ctblcap {}% + \let\@ctblcap\undefined% \def\@ctbllabel {}% \def\@ctblbeg {\begin{\@ctblsideways\@ctbltaborfig\@ctblstarred}}% \def\@ctblbegin {\@ctblbeg}% @@ -169,6 +183,7 @@ \@ctblw \fi \@ctblbegin + \ifx\@ctblcontinued\empty\else\ContinuedFloat\fi \begin{\@ctblalign} \begin{minipage}{\@ctblfloatwidth}\parindent0pt \ifx\@ctblbotcap\empty\@ctblCaption\vskip\@ctblcaptionskip\fi -- cgit v1.2.3