ctable 1.14 (16sep09)

git-svn-id: svn://tug.org/texlive/trunk@15322 c570f23f-e606-0410-a88d-b1316a301751

91 files changed, 298 insertions, 186 deletions

diff --git a/Master/texmf-dist/doc/latex/ctable/01a b/Master/texmf-dist/doc/latex/ctable/01a
index 8f02115c959..20d45b2af8f 100644
--- a/Master/texmf-dist/doc/latex/ctable/01a
+++ b/Master/texmf-dist/doc/latex/ctable/01a
@@ -1,3 +1,3 @@
 \ctable[caption = a table]{c}{
 }{\FL Table's first row\LL}
-$Id: 01a,v 1.1 2007/07/22 15:30:56 wybo Exp $
+$Id: 01a,v 1.1 2007-07-22 15:30:56 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/01a.pdf b/Master/texmf-dist/doc/latex/ctable/01a.pdf
deleted file mode 100644
index 3a5333ed2ae..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/01a.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/01b b/Master/texmf-dist/doc/latex/ctable/01b
index 6ab8de43d53..c53dd5eb327 100644
--- a/Master/texmf-dist/doc/latex/ctable/01b
+++ b/Master/texmf-dist/doc/latex/ctable/01b
@@ -1,10 +1,10 @@
-\let\H\hsize   
+\newcommand{\F}[1]{\includegraphics[width=\hsize]{#1}}
+\newcolumntype{H}[1]{>{\hsize=#1\hsize}X}
 \ctable[
   caption = a figure,
   figure, botcap,
-  width=.4\H,
-]{@{}>{\H=.4\H}X>{\H=.6\H}X@{}}{}{\FL
-  \includegraphics[width=\H]{penguin}&
-  \includegraphics[width=\H]{lion}\LL
+  width=.4\hsize,
+]{H{.4}H{.6}}{}{\FL
+  \F{penguin}& \F{lion}\LL
 }
-$Id: 01b,v 1.1 2007/07/22 15:30:56 wybo Exp $
+$Id: 01b,v 1.2 2009-09-15 11:19:31 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/02k b/Master/texmf-dist/doc/latex/ctable/02k
index 34c318a6070..9485fed627c 100644
--- a/Master/texmf-dist/doc/latex/ctable/02k
+++ b/Master/texmf-dist/doc/latex/ctable/02k
@@ -1,4 +1,4 @@
 \ctable[
   caption = Centered,
 ]{c}{}{\FL Table's first row\LL}
-$Id: 02k,v 1.1 2007/07/22 15:30:56 wybo Exp $
+$Id: 02k,v 1.1 2007-07-22 15:30:56 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/02k.pdf b/Master/texmf-dist/doc/latex/ctable/02k.pdf
deleted file mode 100644
index 4c5d3cb0cd6..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/02k.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/02l b/Master/texmf-dist/doc/latex/ctable/02l
index 65a877cd9e2..20392e5d819 100644
--- a/Master/texmf-dist/doc/latex/ctable/02l
+++ b/Master/texmf-dist/doc/latex/ctable/02l
@@ -2,4 +2,4 @@
   caption = Left,
      left
 ]{c}{}{\FL Table's first row\LL}
-$Id: 02l,v 1.1 2007/07/22 15:30:56 wybo Exp $
+$Id: 02l,v 1.1 2007-07-22 15:30:56 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/02l.pdf b/Master/texmf-dist/doc/latex/ctable/02l.pdf
deleted file mode 100644
index 9e5c881a9e3..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/02l.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/02m b/Master/texmf-dist/doc/latex/ctable/02m
index 55a1f50d8f8..1d3afbb08d1 100644
--- a/Master/texmf-dist/doc/latex/ctable/02m
+++ b/Master/texmf-dist/doc/latex/ctable/02m
@@ -2,4 +2,4 @@
   caption = Right,
      right
 ]{c}{}{\FL Table's first row\LL}
-$Id: 02m,v 1.1 2007/07/22 15:30:56 wybo Exp $
+$Id: 02m,v 1.1 2007-07-22 15:30:56 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/02m.pdf b/Master/texmf-dist/doc/latex/ctable/02m.pdf
deleted file mode 100644
index 724858d81a6..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/02m.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/03a b/Master/texmf-dist/doc/latex/ctable/03a
index cf4525f44d3..cd9b62bc128 100644
--- a/Master/texmf-dist/doc/latex/ctable/03a
+++ b/Master/texmf-dist/doc/latex/ctable/03a
@@ -1,4 +1,4 @@
 \ctable[
   caption = Caption,
 ]{c}{}{\FL Table's first row\LL}
-$Id: 03a,v 1.1 2007/07/22 15:30:56 wybo Exp $
+$Id: 03a,v 1.1 2007-07-22 15:30:56 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/03a.pdf b/Master/texmf-dist/doc/latex/ctable/03a.pdf
deleted file mode 100644
index 9181028418d..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/03a.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/03b b/Master/texmf-dist/doc/latex/ctable/03b
index cb73246e5e5..a30589c35bb 100644
--- a/Master/texmf-dist/doc/latex/ctable/03b
+++ b/Master/texmf-dist/doc/latex/ctable/03b
@@ -2,4 +2,4 @@
     caption =  Caption,
 captionskip = 1ex,
 ]{c}{}{\FL Table's first row\LL}
-$Id: 03b,v 1.2 2007/08/13 11:02:10 wybo Exp $
+$Id: 03b,v 1.2 2007-08-13 11:02:10 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/03b.pdf b/Master/texmf-dist/doc/latex/ctable/03b.pdf
deleted file mode 100644
index 8c880fb0c9d..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/03b.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/04a b/Master/texmf-dist/doc/latex/ctable/04a
index 17288330e56..ff469bf90a8 100644
--- a/Master/texmf-dist/doc/latex/ctable/04a
+++ b/Master/texmf-dist/doc/latex/ctable/04a
@@ -2,4 +2,4 @@
   caption = Caption,
    botcap
 ]{c}{}{\FL Table's first row\LL}
-$Id: 04a,v 1.1 2007/07/22 15:30:56 wybo Exp $
+$Id: 04a,v 1.1 2007-07-22 15:30:56 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/04a.pdf b/Master/texmf-dist/doc/latex/ctable/04a.pdf
deleted file mode 100644
index bd3cbc6c3ec..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/04a.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/04b b/Master/texmf-dist/doc/latex/ctable/04b
index d6912fc80ef..504df015245 100644
--- a/Master/texmf-dist/doc/latex/ctable/04b
+++ b/Master/texmf-dist/doc/latex/ctable/04b
@@ -3,4 +3,4 @@
 captionskip = -2ex,
      botcap
 ]{c}{}{\FL Table's first row\LL}
-$Id: 04b,v 1.2 2007/08/13 11:02:10 wybo Exp $
+$Id: 04b,v 1.2 2007-08-13 11:02:10 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/04b.pdf b/Master/texmf-dist/doc/latex/ctable/04b.pdf
deleted file mode 100644
index aad8c1c1467..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/04b.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/05a b/Master/texmf-dist/doc/latex/ctable/05a
index bbb91de5b5a..e246b4a53f5 100644
--- a/Master/texmf-dist/doc/latex/ctable/05a
+++ b/Master/texmf-dist/doc/latex/ctable/05a
@@ -1,4 +1,4 @@
 \ctable[
   caption = a lengthy caption
 ]{c}{}{\FL row1\LL}
-$Id: 05a,v 1.2 2007/08/18 12:10:22 wybo Exp $
+$Id: 05a,v 1.2 2007-08-18 12:10:22 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/05a.pdf b/Master/texmf-dist/doc/latex/ctable/05a.pdf
deleted file mode 100644
index 0f7aa515206..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/05a.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/05b b/Master/texmf-dist/doc/latex/ctable/05b
index 1112578ea46..78b8d8d9ae2 100644
--- a/Master/texmf-dist/doc/latex/ctable/05b
+++ b/Master/texmf-dist/doc/latex/ctable/05b
@@ -2,4 +2,4 @@
 mincapwidth = 55mm,
     caption = a lengthy caption
 ]{c}{}{\FL row1\LL}
-$Id: 05b,v 1.2 2007/08/18 12:10:22 wybo Exp $
+$Id: 05b,v 1.2 2007-08-18 12:10:22 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/05b.pdf b/Master/texmf-dist/doc/latex/ctable/05b.pdf
deleted file mode 100644
index 391d284428d..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/05b.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/06a b/Master/texmf-dist/doc/latex/ctable/06a
index 30262c73114..aa8115c6afa 100644
--- a/Master/texmf-dist/doc/latex/ctable/06a
+++ b/Master/texmf-dist/doc/latex/ctable/06a
@@ -3,4 +3,4 @@
   maxwidth=3cm
 ]{lX}{}{\FL 1 & first row\LL}
 
-$Id: 06a,v 1.1 2007/07/22 15:30:56 wybo Exp $
+$Id: 06a,v 1.1 2007-07-22 15:30:56 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/06a.pdf b/Master/texmf-dist/doc/latex/ctable/06a.pdf
deleted file mode 100644
index b442374181f..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/06a.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/06b b/Master/texmf-dist/doc/latex/ctable/06b
index 6cd43e829d9..009ec4da9d2 100644
--- a/Master/texmf-dist/doc/latex/ctable/06b
+++ b/Master/texmf-dist/doc/latex/ctable/06b
@@ -3,4 +3,4 @@
   maxwidth=3cm
 ]{lX}{}{\FL 1 & test\LL}
 
-$Id: 06b,v 1.1 2007/07/22 15:30:56 wybo Exp $
+$Id: 06b,v 1.1 2007-07-22 15:30:56 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/06b.pdf b/Master/texmf-dist/doc/latex/ctable/06b.pdf
deleted file mode 100644
index 2259c1dd218..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/06b.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/07a b/Master/texmf-dist/doc/latex/ctable/07a
index 670e0ab16a9..f67b87975eb 100644
--- a/Master/texmf-dist/doc/latex/ctable/07a
+++ b/Master/texmf-dist/doc/latex/ctable/07a
@@ -3,4 +3,4 @@
   \tnote[b]{Second footnote}
 }{\FL Table's\tmark\ first\tmark[b]\ row\LL}
 
-$Id: 07a,v 1.1 2007/07/22 15:30:56 wybo Exp $
+$Id: 07a,v 1.1 2007-07-22 15:30:56 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/07a.pdf b/Master/texmf-dist/doc/latex/ctable/07a.pdf
deleted file mode 100644
index 468d2f63d11..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/07a.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/07b b/Master/texmf-dist/doc/latex/ctable/07b
index 661e9ed4517..62fea0b8e53 100644
--- a/Master/texmf-dist/doc/latex/ctable/07b
+++ b/Master/texmf-dist/doc/latex/ctable/07b
@@ -3,4 +3,4 @@
   \tnote[b.]{Second footnote}
 }{\FL Table's\tmark\ first\tmark[b]\ row\LL}
 
-$Id: 07b,v 1.1 2007/07/22 15:30:56 wybo Exp $
+$Id: 07b,v 1.1 2007-07-22 15:30:56 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/07b.pdf b/Master/texmf-dist/doc/latex/ctable/07b.pdf
deleted file mode 100644
index b4c8beb7342..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/07b.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/08a b/Master/texmf-dist/doc/latex/ctable/08a
index 248610d01d2..408b966d0c5 100644
--- a/Master/texmf-dist/doc/latex/ctable/08a
+++ b/Master/texmf-dist/doc/latex/ctable/08a
@@ -1,4 +1,4 @@
 \ctable[
   caption = Frame,
 ]{c}{}{\FL Table's first row\LL}
-$Id: 08a,v 1.1 2007/07/22 15:30:56 wybo Exp $
+$Id: 08a,v 1.1 2007-07-22 15:30:56 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/08a.pdf b/Master/texmf-dist/doc/latex/ctable/08a.pdf
deleted file mode 100644
index 17d072e1fad..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/08a.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/08b b/Master/texmf-dist/doc/latex/ctable/08b
index 22120680a8d..4520e1d5d6a 100644
--- a/Master/texmf-dist/doc/latex/ctable/08b
+++ b/Master/texmf-dist/doc/latex/ctable/08b
@@ -3,4 +3,4 @@
   framerule = 2pt,
   framefg = .8 0 0
 ]{c}{}{\FL Table's first row\LL}
-$Id: 08b,v 1.1 2007/07/22 15:30:56 wybo Exp $
+$Id: 08b,v 1.1 2007-07-22 15:30:56 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/08b.pdf b/Master/texmf-dist/doc/latex/ctable/08b.pdf
deleted file mode 100644
index 84912445daf..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/08b.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/09b b/Master/texmf-dist/doc/latex/ctable/09b
index 0ea2cc41f90..0ada9052991 100644
--- a/Master/texmf-dist/doc/latex/ctable/09b
+++ b/Master/texmf-dist/doc/latex/ctable/09b
@@ -5,4 +5,4 @@
   framesep=10pt
 ]{c}{}{\FL Table's first row\LL}
 
-$Id: 09b,v 1.1 2007/07/22 15:30:56 wybo Exp $
+$Id: 09b,v 1.1 2007-07-22 15:30:56 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/09b.pdf b/Master/texmf-dist/doc/latex/ctable/09b.pdf
deleted file mode 100644
index f258f1ce98f..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/09b.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/10a b/Master/texmf-dist/doc/latex/ctable/10a
index e688a1f43fb..81b41c0c7f0 100644
--- a/Master/texmf-dist/doc/latex/ctable/10a
+++ b/Master/texmf-dist/doc/latex/ctable/10a
@@ -3,4 +3,4 @@
   framebg = 1 1 0,
   framesep=10pt
 ]{c}{}{\FL Table's first row\LL}
-$Id: 10a,v 1.1 2007/07/22 15:30:56 wybo Exp $
+$Id: 10a,v 1.1 2007-07-22 15:30:56 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/10a.pdf b/Master/texmf-dist/doc/latex/ctable/10a.pdf
deleted file mode 100644
index ec1ffb2fbf3..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/10a.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/10b b/Master/texmf-dist/doc/latex/ctable/10b
index 0677caf1177..e097ba1bc53 100644
--- a/Master/texmf-dist/doc/latex/ctable/10b
+++ b/Master/texmf-dist/doc/latex/ctable/10b
@@ -6,4 +6,4 @@
   framefg = 1 0 0,
   framesep=10pt
 ]{c}{}{\FL Table's first row\LL}
-$Id: 10b,v 1.1 2007/07/22 15:30:56 wybo Exp $
+$Id: 10b,v 1.1 2007-07-22 15:30:56 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/10b.pdf b/Master/texmf-dist/doc/latex/ctable/10b.pdf
deleted file mode 100644
index 1fe9f704e12..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/10b.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/11k b/Master/texmf-dist/doc/latex/ctable/11k
index f3a46fad745..444efdf1fb4 100644
--- a/Master/texmf-dist/doc/latex/ctable/11k
+++ b/Master/texmf-dist/doc/latex/ctable/11k
@@ -1,3 +1,3 @@
 \ctable[
 ]{c}{}{\FL first row\LL}
-$Id: 11k,v 1.1 2007/07/22 15:30:56 wybo Exp $
+$Id: 11k,v 1.1 2007-07-22 15:30:56 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/11k.pdf b/Master/texmf-dist/doc/latex/ctable/11k.pdf
deleted file mode 100644
index 0f0a096e10e..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/11k.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/11l b/Master/texmf-dist/doc/latex/ctable/11l
index 689c36a1ab4..c3745157526 100644
--- a/Master/texmf-dist/doc/latex/ctable/11l
+++ b/Master/texmf-dist/doc/latex/ctable/11l
@@ -1,4 +1,4 @@
 \ctable[
   sideways
 ]{c}{}{\FL first row\LL}
-$Id: 11l,v 1.1 2007/07/22 15:30:56 wybo Exp $
+$Id: 11l,v 1.1 2007-07-22 15:30:56 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/11l.pdf b/Master/texmf-dist/doc/latex/ctable/11l.pdf
deleted file mode 100644
index 837c16f5f50..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/11l.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/11m b/Master/texmf-dist/doc/latex/ctable/11m
index 82b2900d1eb..3d17876c080 100644
--- a/Master/texmf-dist/doc/latex/ctable/11m
+++ b/Master/texmf-dist/doc/latex/ctable/11m
@@ -2,4 +2,4 @@
 \ctable[
   sideways
 ]{c}{}{\FL first row\LL}
-$Id: 11m,v 1.1 2007/07/22 15:30:56 wybo Exp $
+$Id: 11m,v 1.1 2007-07-22 15:30:56 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/11m.pdf b/Master/texmf-dist/doc/latex/ctable/11m.pdf
deleted file mode 100644
index 378f747ac09..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/11m.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/12a b/Master/texmf-dist/doc/latex/ctable/12a
new file mode 100644
index 00000000000..0e52e8d8707
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/ctable/12a
@@ -0,0 +1,8 @@
+\ctable{c}{
+  \tnote{First note}
+  \tnote[b]{Second note}
+  \tnote[c]{Third note}
+}{\FL Table's\tmark\ first\tmark[b]\ row
+      with footnotes\tmark[c]\LL}
+
+$Id: 12a,v 1.2 2008-04-12 15:33:16 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/12a.pdf b/Master/texmf-dist/doc/latex/ctable/12a.pdf
deleted file mode 100644
index cb08116f246..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/12a.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/12b b/Master/texmf-dist/doc/latex/ctable/12b
new file mode 100644
index 00000000000..68d7dd15664
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/ctable/12b
@@ -0,0 +1,8 @@
+\ctable[notespar]{c}{
+  \tnote[a]{First note.}
+  \tnote[b]{Second note.}
+  \tnote[c]{Third note.}
+}{\FL Table's\tmark\ first\tmark[b]\ row
+      with footnotes\tmark[c]\LL}
+
+$Id: 12b,v 1.2 2008-04-12 15:33:16 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/12b.pdf b/Master/texmf-dist/doc/latex/ctable/12b.pdf
deleted file mode 100644
index 226ca4005c5..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/12b.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/13a b/Master/texmf-dist/doc/latex/ctable/13a
new file mode 100644
index 00000000000..c4cf1ced46d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/ctable/13a
@@ -0,0 +1,5 @@
+\ctable[
+  caption = Caption,
+  mincapwidth = 50mm,
+]{c}{}{\FL Table's first row\LL}
+$Id: 13a,v 1.1 2008-04-30 13:13:16 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/13a.pdf b/Master/texmf-dist/doc/latex/ctable/13a.pdf
deleted file mode 100644
index 8e65d695816..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/13a.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/13b b/Master/texmf-dist/doc/latex/ctable/13b
new file mode 100644
index 00000000000..f216518e0a2
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/ctable/13b
@@ -0,0 +1,7 @@
+\addtocounter{table}{1} % remove for source
+\ctable[
+  caption = Caption,
+  mincapwidth = 50mm,
+  continued
+]{c}{}{\FL Table's first row\LL}
+$Id: 13b,v 1.1 2008-04-30 13:13:16 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/13b.pdf b/Master/texmf-dist/doc/latex/ctable/13b.pdf
deleted file mode 100644
index 4e6a28e5904..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/13b.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/13c b/Master/texmf-dist/doc/latex/ctable/13c
new file mode 100644
index 00000000000..36e65931433
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/ctable/13c
@@ -0,0 +1,7 @@
+\addtocounter{table}{1} %remove for source
+\ctable[
+  caption = Caption,
+  mincapwidth = 50mm,
+  continued = \textit{(contd)}
+]{c}{}{\FL Table's first row\LL}
+$Id: 13c,v 1.1 2008-04-30 13:13:16 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/13c.pdf b/Master/texmf-dist/doc/latex/ctable/13c.pdf
deleted file mode 100644
index e4ab686c769..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/13c.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/README b/Master/texmf-dist/doc/latex/ctable/README
index 18dc8c03124..10981d312db 100644
--- a/Master/texmf-dist/doc/latex/ctable/README
+++ b/Master/texmf-dist/doc/latex/ctable/README
@@ -1,4 +1,4 @@
-This is version 1.13 of the ctable package
+This is version 1.14 of the ctable package
 
 ctable.sty provides commands to easily typeset centered or left or
 right aligned tables and (multiple-)figure floats, with footnotes.
@@ -9,6 +9,14 @@ extensions.
 
 License: LPPL
 
+major changes of v1.14 relative to v1.13):
+- nosuper propagation to later tables prohibited
+- added option doinside
+- use of (obsolete) carom.sty for docs discontinued
+- empty labels not created
+- newcolumntype warnings removed
+- caption package not needed anymore
+
 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 
@@ -30,3 +38,5 @@ major changes of v1.10 relative to v1.9):
    in caption position. As a consequence:
  - *Captionskip option redefined*: 0pt value now corresponds
    to LaTeX defaults
+
+$Id: README,v 1.4 2009-09-15 11:16:49 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/ctable.pdf b/Master/texmf-dist/doc/latex/ctable/ctable.pdf
index 46fbfb36392..974ab446059 100644
--- a/Master/texmf-dist/doc/latex/ctable/ctable.pdf
+++ b/Master/texmf-dist/doc/latex/ctable/ctable.pdf
diff --git a/Master/texmf-dist/doc/latex/ctable/doit b/Master/texmf-dist/doc/latex/ctable/doit
new file mode 100644
index 00000000000..91b71e02b15
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/ctable/doit
@@ -0,0 +1,102 @@
+#!/usr/bin/env ruby
+require 'optparse'
+require 'erb'
+require 'rubygems'
+require 'rio'
+require 'session'
+
+# doit - make all or some example picture sets.
+
+# Usage: doit      # make them all
+#        doit nnx  # make nnx.pdf and snnx.pdf
+#
+# pictures are numbered 01, 02, etc.
+# nn[a-z] has code to typeset a \ctable; for nn[k-z] page layout will be shown
+# for each nn[a-z] two pdfs are generated:
+#      nn[a-z].pdf for the ctable picture
+# and snn[a-z].pdf for the source code verbatim.
+# The number of digits (nn) is set with DIGS
+# The prefix (s) for source verbatims and (empty) for result files is set by PRE
+# Windows users should replace NULL with perhaps "c:/temp/null"
+
+MYNAME = File.basename($0)
+  DIGS = 2
+   ALL = Dir["[0-9]"*DIGS+"[a-z]"].sort
+  NULL = '/dev/null'
+   PRE = ['s','']
+
+# clean up directory
+# all = false: keep pdf's
+# all = true: remove pdf's, too
+def clean(all=false)
+  ALL.map{|x| PRE.map{|y| y+x }}.flatten.each do |f|
+    exts = %w{aux tex log chk fls out}
+    exts << 'pdf' if all
+    exts.each do |e|
+      fe = "#{f}.#{e}"
+      File.delete(fe) if File.exist?(fe)
+    end
+  end
+  exit(0)
+end
+
+# call the system shell with command
+# exit on error
+def sys(command)
+  sh = Session::Bash.new
+  o,e = sh.execute(command)
+  unless sh.exit_status == 0
+    puts "error running: #{command}",
+         "  exit_status: #{sh.exit_status}",
+         "       output: #{o}",
+         "        error: #{e}"
+
+    exit(sh.exit_status)
+  end
+end
+
+@quiet = false
+ARGV.options do |opt|
+  opt.banner = "Create example images\n"
+  opt.banner << "No arguments: create them all\n"
+  opt.banner << "Example: ./#{MYNAME} 03? # creates 03a.pdf, 03b.pdf, s03a.pdf, and s03b.pdf"
+  opt.separator ""
+  opt.on('-h','--help','print this help and exit')       do puts opt.help; exit end
+  opt.on("-c","--clean","Clean up, but keep pdf files")  do clean end
+  opt.on("-C","--Clean","Clean up, including pdf files") do clean(true) end
+  opt.on("-q","--quiet","Be silent")                     do @quiet = true end
+  opt.parse!
+end
+set = ARGV.empty? ? ALL : ARGV
+tex = DATA.readlines("\n\n") # tex[0] -> source verbatim, tex[1] -> result
+sh = Session::Shell.new
+set.each do |j|
+  puts j unless @quiet
+  0.upto(1) do |i|
+    f = "#{PRE[i]}#{j}"
+    r = rio(f+'.tex') < ERB.new(tex[i]).result(binding)
+    sys("pdflatex --interaction=nonstopmode #{r.path}")
+    sys("pdfcrop #{f}.pdf #{f}.pdf")
+  end
+end
+# $Id: doit,v 1.6 2009-09-15 11:28:26 wybo Exp $
+__END__
+\documentclass{article}
+\usepackage[a4paper,margin=20mm,noheadfoot]{geometry}
+\pagestyle{empty}
+\begin{document}\ttfamily
+\fontsize{10}{12 pt}\selectfont
+\begin{verbatim}<%= open(j).readlines.delete_if {|x| x =~ /\$Id|remove for source/ } %>\end{verbatim}
+\end{document}
+
+\documentclass[twoside]{article}
+<% if j =~ /[k-z]$/ %>
+\usepackage[papersize={65mm,40mm},showframe,margin=5mm,noheadfoot]{geometry}
+<% end %>
+\usepackage{ctable}
+\usepackage{txfonts}
+\pagestyle{empty}
+\parindent0pt
+\begin{document}
+<%= open(j).readlines.delete_if {|x| x =~ /\$Id/ } %>
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/ctable/01b.pdf b/Master/texmf-dist/doc/latex/ctable/lion.png
index 97e42853582..00264778966 100644
--- a/Master/texmf-dist/doc/latex/ctable/01b.pdf
+++ b/Master/texmf-dist/doc/latex/ctable/lion.png
diff --git a/Master/texmf-dist/doc/latex/ctable/penguin.jpg b/Master/texmf-dist/doc/latex/ctable/penguin.jpg
new file mode 100644
index 00000000000..342ccda2201
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/ctable/penguin.jpg
diff --git a/Master/texmf-dist/doc/latex/ctable/s01a.pdf b/Master/texmf-dist/doc/latex/ctable/s01a.pdf
deleted file mode 100644
index 8f3b9d04c47..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/s01a.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/s01b.pdf b/Master/texmf-dist/doc/latex/ctable/s01b.pdf
deleted file mode 100644
index 32d2a7de404..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/s01b.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/s02k.pdf b/Master/texmf-dist/doc/latex/ctable/s02k.pdf
deleted file mode 100644
index fca22975464..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/s02k.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/s02l.pdf b/Master/texmf-dist/doc/latex/ctable/s02l.pdf
deleted file mode 100644
index b04b985ddcd..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/s02l.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/s02m.pdf b/Master/texmf-dist/doc/latex/ctable/s02m.pdf
deleted file mode 100644
index 755afdbb10b..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/s02m.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/s03a.pdf b/Master/texmf-dist/doc/latex/ctable/s03a.pdf
deleted file mode 100644
index a91191dd097..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/s03a.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/s03b.pdf b/Master/texmf-dist/doc/latex/ctable/s03b.pdf
deleted file mode 100644
index 9756d737a94..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/s03b.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/s04a.pdf b/Master/texmf-dist/doc/latex/ctable/s04a.pdf
deleted file mode 100644
index f4eaf05feac..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/s04a.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/s04b.pdf b/Master/texmf-dist/doc/latex/ctable/s04b.pdf
deleted file mode 100644
index 5916f1c3e43..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/s04b.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/s05a.pdf b/Master/texmf-dist/doc/latex/ctable/s05a.pdf
deleted file mode 100644
index 08f9e9238f6..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/s05a.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/s05b.pdf b/Master/texmf-dist/doc/latex/ctable/s05b.pdf
deleted file mode 100644
index 961029da727..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/s05b.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/s06a.pdf b/Master/texmf-dist/doc/latex/ctable/s06a.pdf
deleted file mode 100644
index fb717606b87..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/s06a.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/s06b.pdf b/Master/texmf-dist/doc/latex/ctable/s06b.pdf
deleted file mode 100644
index a53d1b39fba..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/s06b.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/s07a.pdf b/Master/texmf-dist/doc/latex/ctable/s07a.pdf
deleted file mode 100644
index d5b3a629ff0..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/s07a.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/s07b.pdf b/Master/texmf-dist/doc/latex/ctable/s07b.pdf
deleted file mode 100644
index abd3167be5a..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/s07b.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/s08a.pdf b/Master/texmf-dist/doc/latex/ctable/s08a.pdf
deleted file mode 100644
index 1a00aacc26f..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/s08a.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/s08b.pdf b/Master/texmf-dist/doc/latex/ctable/s08b.pdf
deleted file mode 100644
index 9457e2c1876..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/s08b.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/s09b.pdf b/Master/texmf-dist/doc/latex/ctable/s09b.pdf
deleted file mode 100644
index ab7b6815d0b..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/s09b.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/s10a.pdf b/Master/texmf-dist/doc/latex/ctable/s10a.pdf
deleted file mode 100644
index 1006be0e07a..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/s10a.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/s10b.pdf b/Master/texmf-dist/doc/latex/ctable/s10b.pdf
deleted file mode 100644
index 8e87bc774a8..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/s10b.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/s11k.pdf b/Master/texmf-dist/doc/latex/ctable/s11k.pdf
deleted file mode 100644
index 290e9ea50a6..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/s11k.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/s11l.pdf b/Master/texmf-dist/doc/latex/ctable/s11l.pdf
deleted file mode 100644
index e8bdd72f72a..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/s11l.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/s11m.pdf b/Master/texmf-dist/doc/latex/ctable/s11m.pdf
deleted file mode 100644
index fd3ad6ff135..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/s11m.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/s12a.pdf b/Master/texmf-dist/doc/latex/ctable/s12a.pdf
deleted file mode 100644
index f9181472f48..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/s12a.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/s12b.pdf b/Master/texmf-dist/doc/latex/ctable/s12b.pdf
deleted file mode 100644
index 4b9b7e6bd23..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/s12b.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/s13a.pdf b/Master/texmf-dist/doc/latex/ctable/s13a.pdf
deleted file mode 100644
index 33f49dffd16..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/s13a.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/s13b.pdf b/Master/texmf-dist/doc/latex/ctable/s13b.pdf
deleted file mode 100644
index 5042d08cbb5..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/s13b.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/ctable/s13c.pdf b/Master/texmf-dist/doc/latex/ctable/s13c.pdf
deleted file mode 100644
index c614f89b6b9..00000000000
--- a/Master/texmf-dist/doc/latex/ctable/s13c.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/source/latex/ctable/ctable.dtx b/Master/texmf-dist/source/latex/ctable/ctable.dtx
index c95d289201d..b5f59163ca7 100644
--- a/Master/texmf-dist/source/latex/ctable/ctable.dtx
+++ b/Master/texmf-dist/source/latex/ctable/ctable.dtx
@@ -19,16 +19,18 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{ctable}
 %<*package>
-    [2008/05/01 v1.13 ctable package]
+    [2009/09/15 v1.14 ctable package]
 %</package>
 %
 %<*driver>
 \documentclass{ltxdoc}
-\usepackage{carom,ctable,txfonts}
+\usepackage{ctable,txfonts}
+\usepackage[l2tabu,orthodox]{nag}
 \usepackage[
    verbose,
    pdftex,
    paper=a4paper,
+   nomarginpar,
    bottom=30mm,
    nohead
 ]{geometry}
@@ -77,7 +79,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{390}
+% \CheckSum{387}
 %
 % \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
@@ -143,6 +145,13 @@
 %                             same number as previous table, ` (continued' added
 %                             to caption.
 %                            }
+% \changes{v1.14}{2008/08/12}{nosuper propagation to later tables prohibited
+%                             added option doinside
+%                             use of (obsolete) carom.sty for docs discontinued
+%                             empty labels not created
+%                             newcolumntype warnings removed
+%                             caption package not needed anymore
+%                            }
 %
 % \GetFileInfo{ctable.dtx}
 %
@@ -244,6 +253,10 @@
 %                  can then be used to give the float a minimum
 %                  width. The tabular will be centered in it.\NN[1ex]
 %
+% |doinside=...| & command to be run inside, just before the tabular
+%                  or tabularx environment. You can use this, for example, 
+%                  for the adjustment of the font size with |\small|.\NN[1ex]
+%
 % |pos=...|      & float position, default: |tbp|.\NN[1ex]
 %
 % |label=...|    & for |\label|\NN[1ex]
@@ -293,12 +306,12 @@
 % |framesep=...| & set the distance between the frame and the table
 %                 to the given dimension. The default is |0pt|.\NN[1ex]
 %
-% |framefg=|\sl r g b & set the foreground color of the frame (the
+% |framefg=|\slshape r g b & set the foreground color of the frame (the
 %                 rule color) to the given triplet of
 %                 \textsl{rgb}-values. The values should be numbers
 %                 between 0 and 1. The default is |0 0 0| (black).\NN[1ex]
 %
-% |framebg=|\sl r g b & set the background color of the frame (the
+% |framebg=|\slshape r g b & set the background color of the frame (the
 %                 color inside the frame) to the given triplet of
 %                 \textsl{rgb}-values. The values should be numbers
 %                 between 0 and 1. The default is |1 1 1| (white).\NN[1ex]
@@ -473,57 +486,11 @@
 % }
 %
 % Figures, even single ones, are always put in tabular cells. This is not
-% particularly handy for single pictures, but it eases the construction
-% of arrays of pictures, including sub-captions, delineation, and spacing.
-% Figure~\ref{fig} shows a figure that has been produced with the |\ctable|
-% command, in combination with
-% |\usepackage|\{%
-% \href{http://tug.ctan.org/obsolete/macros/latex/contrib/xymtex/carom.sty}{\texttt{carom}}\}
-% it has been typeset with:
-% \color{vbgreen}
-% \begin{verbatim}
-% \ctable[
-%    figure,
-%    botcap,
-%    pos       = h,
-%    caption   = The di- and tri-bromobenzenes,
-%    label     = fig,
-%    framebg   = .53 .81 .92,
-%    framerule = 1pt,
-%    framesep  = 4ex,
-% ]{ccc}{}{                     \NN
-%    \bzdrv{1==Br;2==Br}&
-%    \bzdrv{1==Br;3==Br}&
-%    \bzdrv{1==Br;4==Br}        \NN
-%    1,2 & 1,3 & 1,4            \NN[3ex]
-%    \bzdrv{1==Br;2==Br;3==Br}&
-%    \bzdrv{1==Br;2==Br;4==Br}&
-%    \bzdrv{1==Br;3==Br;5==Br}  \NN
-%    1,2,3 & 1,2,4 & 1,3,5
-% }
-% \end{verbatim}
-% \color{black}
-% \ctable[
-%    figure,
-%    botcap,
-%    pos       = h,
-%    caption   = The di- and tri-bromobenzenes,
-%    label     = fig,
-%    framebg   = .53 .81 .92,
-%    framerule = 1pt,
-%    framesep  = 4ex,
-% ]{ccc}{}{                     \NN
-%    \bzdrv{1==Br;2==Br}&
-%    \bzdrv{1==Br;3==Br}&
-%    \bzdrv{1==Br;4==Br}        \NN
-%    1,2 & 1,3 & 1,4            \NN[3ex]
-%    \bzdrv{1==Br;2==Br;3==Br}&
-%    \bzdrv{1==Br;2==Br;4==Br}&
-%    \bzdrv{1==Br;3==Br;5==Br}  \NN
-%    1,2,3 & 1,2,4 & 1,3,5
-% }
-% (The excessive whitespace at the left of the figure is caused by
-% the bounding boxes generated by the |carom| package.)
+% particularly handy for single pictures, but it eases the construction of
+% arrays of pictures, including sub-captions, delineation, and spacing. For a
+% small example, which also shows how you can simplify the construction of
+% figure arrays, see subsection~\ref{figureexample} on
+% page~\pageref{figureexample}.
 %
 % \section{Option examples}
 % In the following, small examples will be shown illustrating the effect of
@@ -562,7 +529,6 @@
 % \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.
 % Sometimes, however, tables are so narrow, that this is not really what you want.
@@ -632,7 +598,7 @@
 % \ROW{Y}{s04a}{04a}
 % \ROW{B}{s04b}{04b}
 % 
-% \subsection{\ttfamily\bfseries figure, botcap}
+% \subsection{\ttfamily\bfseries figure, botcap}\label{figureexample}
 % By default, |ctable| generates a table float, but with the |figure| option, a
 % figure float is generated instead. The caption stays on top, so if you are
 % accustomed to have bottom caption for your figures, you will probably also need
@@ -658,15 +624,15 @@
 %
 % \section{Implementation}
 % \begin{macrocode}
-\RequirePackage{color,xkeyval,array,tabularx,booktabs,rotating,caption}
+\RequirePackage{color,xkeyval,array,tabularx,booktabs,rotating}
 \def\NN{\tabularnewline}
 \def\FL{\toprule}
 \def\ML{\NN\midrule}
 \def\LL{\NN\bottomrule}
 \def\@ctblfgcolor#1 #2 #3={\definecolor{@ctblframefg}{rgb}{#1,#2,#3}}
 \def\@ctblbgcolor#1 #2 #3={\definecolor{@ctblframebg}{rgb}{#1,#2,#3}}
-\let\@cttextsuperscript\@textsuperscript
-\def\@ctcopy#1{\footnotesize #1}
+\def\@ctbltextsuperscript#1{\ifx\@ctblnosuper\empty\@textsuperscript{#1}\else{\footnotesize#1}\fi}
+\def\@ctbldoinside{\relax}
 \newdimen\@ctblframesep
 \newdimen\@ctblframerule
 \newdimen\@ctblwidth
@@ -704,40 +670,39 @@
                               using obsolete option 'rotate', use 'sideways' instead}
                             }
 \define@key{ctbl}{figure}[]{\def\@ctbltaborfig{figure}}
-\define@key{ctbl}{center}[]{\def\@ctblalign{center}}
-\define@key{ctbl}{right}[]{\def\@ctblalign{flushright}}
-\define@key{ctbl}{left}[]{\def\@ctblalign{flushleft}}
+\define@key{ctbl}{center}[]{\let\@ctblalign\centering}
+\define@key{ctbl}{right}[]{\let\@ctblalign\raggedleft}
+\define@key{ctbl}{left}[]{\let\@ctblalign\raggedright}
 \define@key{ctbl}{star}[]{\def\@ctblstarred {*}}
 \define@key{ctbl}{framerule}{\@ctblframerule=#1}
 \define@key{ctbl}{framesep}{\@ctblframesep=#1}
 \define@key{ctbl}{framefg}{\@ctblfgcolor#1=}
 \define@key{ctbl}{framebg}{\@ctblbgcolor#1=}
 \define@key{ctbl}{captionskip}{\@ctblcaptionskip=#1}
-\define@key{ctbl}{nosuper}[]{\let\@cttextsuperscript\@ctcopy}
+\define@key{ctbl}{nosuper}[]{\def\@ctblnosuper{1}}
 \define@key{ctbl}{notespar}[]{\def\@ctblnotespar{1}}
+\define@key{ctbl}{doinside}{\def\@ctbldoinside{#1}}
 %    \end{macrocode}
 % 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\undefined\let\@ctblcap\@ctblcaption\fi
    \ifx\@ctblcaption\empty\else
-      \caption[\@ctblcap]{\label{\@ctbllabel}\@ctblcaption\ \@ctblcontinued}
+      \caption[\@ctblcap]{\ifx\@ctbllabel\empty\else\label{\@ctbllabel}\fi\@ctblcaption\ \@ctblcontinued\strut}
    \fi
 }
+%    \end{macrocode}
+% Need to redefine X columntype, but the array package would generate a warning.
+% So first set the type to be redefined to |\undefined| to suppress the warning.
+% Save the standard X type once in the new type Y
+%    \begin{macrocode}
+\newcolumntype{Y}{X}
+\def\@ctblXcolumntype#1{
+  \let\NC@find@X\undefined
+  \newcolumntype{X}{#1}
+}
 \def\@ctblframe#1#2#3{%
    \@ctbloldsep\fboxsep\fboxsep\@ctblframesep%
    \@ctbloldrule\fboxrule\fboxrule\@ctblframerule%
@@ -745,16 +710,16 @@
 }
 \newcommand{\tnote}[2][a]{%
    \ifx\@ctblnotespar\empty%
-     \hbox{\@cttextsuperscript{\normalfont\textit{#1}}}&#2\NN
+     \hbox{\@ctbltextsuperscript{\normalfont\textit{#1}}}&#2\NN
    \else%
-     \@cttextsuperscript{\normalfont\textit{#1}}\,#2
+     \@ctbltextsuperscript{\normalfont\textit{#1}}\,#2
    \fi
 }
 \newcommand{\tmark}[1][a]{%
    \hbox{\textsuperscript{\normalfont\textit{#1}}}}
 \newcommand{\ctable}[4][]{%
    \def\@ctbltaborfig{table}%
-   \def\@ctblalign   {center}%
+   \let\@ctblalign\centering%
    \def\@ctblsideways{}%
    \def\@ctblcontinued{}%
    \def\@ctblpos     {}%
@@ -766,11 +731,12 @@
    \def\@ctblend     {\end{\@ctblsideways\@ctbltaborfig\@ctblstarred}}%
    \def\@ctblbotcap  {}%
    \def\@ctblstarred {}%
+   \def\@ctblnosuper{}
    \def\@ctblnotespar{}%
    \definecolor{@ctblframefg}{rgb}{0,0,0}%
    \definecolor{@ctblframebg}{rgb}{1,1,1}%
    \@ctblframerule0pt
-   \@ctblcaptionskip0ex
+   \@ctblcaptionskip=0ex
    \@ctblframesep0pt
    \@ctblwidth=0pt
    \@ctblmaxwidth=0pt
@@ -805,14 +771,14 @@
             Such a label can't be referenced}
       \fi
    \fi
-   \newcolumntype{Y}{X}% save the X type
 %    \end{macrocode}
 % save the table contents in a box, so we can determine its width,
 % initially, save the table typeset with the tabular environment:
 %    \begin{macrocode}
    \sbox\ctbl@t{%
-      \newcolumntype{X}{l}% temporarily make  type X = l
+      \@ctblXcolumntype{l}% temporarily make  type X = l
       \@ctblframe{@ctblframefg}{@ctblframebg}{%
+         \@ctbldoinside
          \begin{tabular}{#2}
             #4%
          \end{tabular}%
@@ -837,8 +803,9 @@
 %
    \if@ctblusex
       \sbox\ctbl@t{%
-         \newcolumntype{X}{Y}% restore X
+         \@ctblXcolumntype{Y}% restore X
          \@ctblframe{@ctblframefg}{@ctblframebg}{%
+            \@ctbldoinside
             \begin{tabularx}{\ifdim\@ctblwidth>0pt\@ctblwidth\else\@ctblmaxwidth\fi}{#2}
                #4%
             \end{tabularx}%
@@ -865,31 +832,32 @@
 % |\@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
-            \centering{\usebox\ctbl@t} % insert the tabular
-            \def\@ctblfootnotes{#3}%
-            \ifx#3\empty\else % append footnotes, if any
-               \ifx\@ctblnotespar\empty%
-                  \\
-                  \begin{tabularx}{\hsize}{r@{\,}>{\footnotesize\raggedright}X}
-                     #3%
-                  \end{tabularx}%
-               \else%
-                  \\[.2ex]
-                  \begin{minipage}{\hsize}\footnotesize\raggedright%
-                     #3%
-                  \end{minipage}%
-               \fi
+      \ifx\@ctblcontinued\empty\else\addtocounter{\@ctbltaborfig}{-1}\fi
+      \@ctblalign
+      \begin{minipage}{\@ctblfloatwidth}\parindent0pt
+         \ifx\@ctblbotcap\empty\@ctblCaption\vskip\@ctblcaptionskip\fi
+         \centering{\usebox\ctbl@t} % insert the tabular
+         \def\@ctblfootnotes{#3}%
+         \ifx#3\empty\else{% append footnotes, if any
+            \footnotesize
+            \ifx\@ctblnotespar\empty%
+               \\
+               \begin{tabularx}{\hsize}{r@{\,}>{\raggedright}X}
+                  #3%
+               \end{tabularx}%
+            \else%
+               \\[.2ex]
+               \begin{minipage}{\hsize}\raggedright%
+                  #3%
+               \end{minipage}%
             \fi
-            \ifx\@ctblbotcap\empty\else\vskip\@ctblcaptionskip\@ctblCaption\fi
-         \end{minipage}
-      \end{\@ctblalign}
+         }
+         \fi
+         \ifx\@ctblbotcap\empty\else\vskip\@ctblcaptionskip\@ctblCaption\fi
+      \end{minipage}
    \@ctblend
 }
 %    \end{macrocode}
 % \Finale
 \endinput
-$Id: ctable.dtx,v 1.59 2008/04/30 13:18:59 wybo Exp $
+$Id: ctable.dtx,v 1.64 2009-09-15 11:15:59 wybo Exp $
diff --git a/Master/texmf-dist/source/latex/ctable/ctable.ins b/Master/texmf-dist/source/latex/ctable/ctable.ins
index 7b8e79eaff8..d6868d9ab74 100644
--- a/Master/texmf-dist/source/latex/ctable/ctable.ins
+++ b/Master/texmf-dist/source/latex/ctable/ctable.ins
@@ -61,4 +61,4 @@ and version 1.2 or later is part of all distributions of LaTeX version
 \Msg{**************************************************************}
 
 \endbatchfile
-$Id: ctable.ins,v 1.6 2007/08/18 12:14:49 wybo Exp $
+$Id: ctable.ins,v 1.6 2007-08-18 12:14:49 wybo Exp $
diff --git a/Master/texmf-dist/tex/latex/ctable/ctable.sty b/Master/texmf-dist/tex/latex/ctable/ctable.sty
index 6b799de1e0f..8e4028002b4 100644
--- a/Master/texmf-dist/tex/latex/ctable/ctable.sty
+++ b/Master/texmf-dist/tex/latex/ctable/ctable.sty
@@ -22,16 +22,16 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{ctable}
-    [2008/05/01 v1.13 ctable package]
-\RequirePackage{color,xkeyval,array,tabularx,booktabs,rotating,caption}
+    [2009/09/15 v1.14 ctable package]
+\RequirePackage{color,xkeyval,array,tabularx,booktabs,rotating}
 \def\NN{\tabularnewline}
 \def\FL{\toprule}
 \def\ML{\NN\midrule}
 \def\LL{\NN\bottomrule}
 \def\@ctblfgcolor#1 #2 #3={\definecolor{@ctblframefg}{rgb}{#1,#2,#3}}
 \def\@ctblbgcolor#1 #2 #3={\definecolor{@ctblframebg}{rgb}{#1,#2,#3}}
-\let\@cttextsuperscript\@textsuperscript
-\def\@ctcopy#1{\footnotesize #1}
+\def\@ctbltextsuperscript#1{\ifx\@ctblnosuper\empty\@textsuperscript{#1}\else{\footnotesize#1}\fi}
+\def\@ctbldoinside{\relax}
 \newdimen\@ctblframesep
 \newdimen\@ctblframerule
 \newdimen\@ctblwidth
@@ -58,35 +58,29 @@
                               using obsolete option 'rotate', use 'sideways' instead}
                             }
 \define@key{ctbl}{figure}[]{\def\@ctbltaborfig{figure}}
-\define@key{ctbl}{center}[]{\def\@ctblalign{center}}
-\define@key{ctbl}{right}[]{\def\@ctblalign{flushright}}
-\define@key{ctbl}{left}[]{\def\@ctblalign{flushleft}}
+\define@key{ctbl}{center}[]{\let\@ctblalign\centering}
+\define@key{ctbl}{right}[]{\let\@ctblalign\raggedleft}
+\define@key{ctbl}{left}[]{\let\@ctblalign\raggedright}
 \define@key{ctbl}{star}[]{\def\@ctblstarred {*}}
 \define@key{ctbl}{framerule}{\@ctblframerule=#1}
 \define@key{ctbl}{framesep}{\@ctblframesep=#1}
 \define@key{ctbl}{framefg}{\@ctblfgcolor#1=}
 \define@key{ctbl}{framebg}{\@ctblbgcolor#1=}
 \define@key{ctbl}{captionskip}{\@ctblcaptionskip=#1}
-\define@key{ctbl}{nosuper}[]{\let\@cttextsuperscript\@ctcopy}
+\define@key{ctbl}{nosuper}[]{\def\@ctblnosuper{1}}
 \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}
+\define@key{ctbl}{doinside}{\def\@ctbldoinside{#1}}
 \def\@ctblCaption{
    \ifx\@ctblcap\undefined\let\@ctblcap\@ctblcaption\fi
    \ifx\@ctblcaption\empty\else
-      \caption[\@ctblcap]{\label{\@ctbllabel}\@ctblcaption\ \@ctblcontinued}
+      \caption[\@ctblcap]{\ifx\@ctbllabel\empty\else\label{\@ctbllabel}\fi\@ctblcaption\ \@ctblcontinued\strut}
    \fi
 }
+\newcolumntype{Y}{X}
+\def\@ctblXcolumntype#1{
+  \let\NC@find@X\undefined
+  \newcolumntype{X}{#1}
+}
 \def\@ctblframe#1#2#3{%
    \@ctbloldsep\fboxsep\fboxsep\@ctblframesep%
    \@ctbloldrule\fboxrule\fboxrule\@ctblframerule%
@@ -94,16 +88,16 @@
 }
 \newcommand{\tnote}[2][a]{%
    \ifx\@ctblnotespar\empty%
-     \hbox{\@cttextsuperscript{\normalfont\textit{#1}}}&#2\NN
+     \hbox{\@ctbltextsuperscript{\normalfont\textit{#1}}}&#2\NN
    \else%
-     \@cttextsuperscript{\normalfont\textit{#1}}\,#2
+     \@ctbltextsuperscript{\normalfont\textit{#1}}\,#2
    \fi
 }
 \newcommand{\tmark}[1][a]{%
    \hbox{\textsuperscript{\normalfont\textit{#1}}}}
 \newcommand{\ctable}[4][]{%
    \def\@ctbltaborfig{table}%
-   \def\@ctblalign   {center}%
+   \let\@ctblalign\centering%
    \def\@ctblsideways{}%
    \def\@ctblcontinued{}%
    \def\@ctblpos     {}%
@@ -115,11 +109,12 @@
    \def\@ctblend     {\end{\@ctblsideways\@ctbltaborfig\@ctblstarred}}%
    \def\@ctblbotcap  {}%
    \def\@ctblstarred {}%
+   \def\@ctblnosuper{}
    \def\@ctblnotespar{}%
    \definecolor{@ctblframefg}{rgb}{0,0,0}%
    \definecolor{@ctblframebg}{rgb}{1,1,1}%
    \@ctblframerule0pt
-   \@ctblcaptionskip0ex
+   \@ctblcaptionskip=0ex
    \@ctblframesep0pt
    \@ctblwidth=0pt
    \@ctblmaxwidth=0pt
@@ -146,10 +141,10 @@
             Such a label can't be referenced}
       \fi
    \fi
-   \newcolumntype{Y}{X}% save the X type
    \sbox\ctbl@t{%
-      \newcolumntype{X}{l}% temporarily make  type X = l
+      \@ctblXcolumntype{l}% temporarily make  type X = l
       \@ctblframe{@ctblframefg}{@ctblframebg}{%
+         \@ctbldoinside
          \begin{tabular}{#2}
             #4%
          \end{tabular}%
@@ -168,8 +163,9 @@
    \fi
    \if@ctblusex
       \sbox\ctbl@t{%
-         \newcolumntype{X}{Y}% restore X
+         \@ctblXcolumntype{Y}% restore X
          \@ctblframe{@ctblframefg}{@ctblframebg}{%
+            \@ctbldoinside
             \begin{tabularx}{\ifdim\@ctblwidth>0pt\@ctblwidth\else\@ctblmaxwidth\fi}{#2}
                #4%
             \end{tabularx}%
@@ -183,28 +179,29 @@
       \@ctblw
    \fi
    \@ctblbegin
-      \ifx\@ctblcontinued\empty\else\ContinuedFloat\fi
-      \begin{\@ctblalign}
-         \begin{minipage}{\@ctblfloatwidth}\parindent0pt
-            \ifx\@ctblbotcap\empty\@ctblCaption\vskip\@ctblcaptionskip\fi
-            \centering{\usebox\ctbl@t} % insert the tabular
-            \def\@ctblfootnotes{#3}%
-            \ifx#3\empty\else % append footnotes, if any
-               \ifx\@ctblnotespar\empty%
-                  \\
-                  \begin{tabularx}{\hsize}{r@{\,}>{\footnotesize\raggedright}X}
-                     #3%
-                  \end{tabularx}%
-               \else%
-                  \\[.2ex]
-                  \begin{minipage}{\hsize}\footnotesize\raggedright%
-                     #3%
-                  \end{minipage}%
-               \fi
+      \ifx\@ctblcontinued\empty\else\addtocounter{\@ctbltaborfig}{-1}\fi
+      \@ctblalign
+      \begin{minipage}{\@ctblfloatwidth}\parindent0pt
+         \ifx\@ctblbotcap\empty\@ctblCaption\vskip\@ctblcaptionskip\fi
+         \centering{\usebox\ctbl@t} % insert the tabular
+         \def\@ctblfootnotes{#3}%
+         \ifx#3\empty\else{% append footnotes, if any
+            \footnotesize
+            \ifx\@ctblnotespar\empty%
+               \\
+               \begin{tabularx}{\hsize}{r@{\,}>{\raggedright}X}
+                  #3%
+               \end{tabularx}%
+            \else%
+               \\[.2ex]
+               \begin{minipage}{\hsize}\raggedright%
+                  #3%
+               \end{minipage}%
             \fi
-            \ifx\@ctblbotcap\empty\else\vskip\@ctblcaptionskip\@ctblCaption\fi
-         \end{minipage}
-      \end{\@ctblalign}
+         }
+         \fi
+         \ifx\@ctblbotcap\empty\else\vskip\@ctblcaptionskip\@ctblCaption\fi
+      \end{minipage}
    \@ctblend
 }
 \endinput