ctable update 1.16

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

9 files changed, 171 insertions, 111 deletions

diff --git a/Master/texmf-dist/doc/latex/ctable/01b b/Master/texmf-dist/doc/latex/ctable/01b
index c53dd5eb327..3ae87b4c718 100644
--- a/Master/texmf-dist/doc/latex/ctable/01b
+++ b/Master/texmf-dist/doc/latex/ctable/01b
@@ -1,4 +1,6 @@
-\newcommand{\F}[1]{\includegraphics[width=\hsize]{#1}}
+\newcommand{\F}[1]{
+  \includegraphics[width=\hsize]{#1}
+}
 \newcolumntype{H}[1]{>{\hsize=#1\hsize}X}
 \ctable[
   caption = a figure,
@@ -7,4 +9,4 @@
 ]{H{.4}H{.6}}{}{\FL
   \F{penguin}& \F{lion}\LL
 }
-$Id: 01b,v 1.2 2009-09-15 11:19:31 wybo Exp $
+$Id: 01b,v 1.3 2009-12-18 16:49:34 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/05b b/Master/texmf-dist/doc/latex/ctable/05b
index 78b8d8d9ae2..48277ef8397 100644
--- a/Master/texmf-dist/doc/latex/ctable/05b
+++ b/Master/texmf-dist/doc/latex/ctable/05b
@@ -1,5 +1,5 @@
 \ctable[
 mincapwidth = 55mm,
-    caption = a lengthy caption
-]{c}{}{\FL row1\LL}
-$Id: 05b,v 1.2 2007-08-18 12:10:22 wybo Exp $
+    caption = a more or less lengthy caption
+]{c}{\tnote[x]{a more or less lengthy note}}{\FL row1\tmark[x]\LL}
+$Id: 05b,v 1.3 2010-03-04 10:19:25 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/12b b/Master/texmf-dist/doc/latex/ctable/12b
index 68d7dd15664..5c18fa1d18d 100644
--- a/Master/texmf-dist/doc/latex/ctable/12b
+++ b/Master/texmf-dist/doc/latex/ctable/12b
@@ -1,8 +1,12 @@
 \ctable[notespar]{c}{
   \tnote[a]{First note.}
   \tnote[b]{Second note.}
-  \tnote[c]{Third note.}
+  \tnote[c]{Third note, this one is a
+            little longer and forces a
+            new line at the end.\\}
+  \tnote[d]{And here is e very long note:
+            \input{thuan}}
 }{\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 $
+$Id: 12b,v 1.3 2010-06-26 21:09:14 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/README b/Master/texmf-dist/doc/latex/ctable/README
index 7fdd5d8bf9c..c5975b1e1c9 100644
--- a/Master/texmf-dist/doc/latex/ctable/README
+++ b/Master/texmf-dist/doc/latex/ctable/README
@@ -1,4 +1,5 @@
-This is version 1.15 of the ctable package
+This is version 1.16 of the ctable package
+License: LPPL
 
 ctable.sty provides commands to easily typeset centered or left or
 right aligned tables and (multiple-)figure floats, with footnotes.
@@ -7,40 +8,12 @@ first is optional and is used for key,value pairs generating
 variations on the defaults and offering a route for future
 extensions.
 
-License: LPPL
+major changes of v1.16 relative to v1.15):
+- option cap={} did not suppress lot/lof entry
+- notespar option now generates fully justified notes 
 
 major changes of v1.15 relative to v1.14):
 - removed whitespace before tables,
 - corrected marginpars in the documentation
 
-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 
-  previous table, ` (continued' added to caption.
-
-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
-
-$Id: README,v 1.5 2009-09-16 23:10:43 wybo Exp $
+$Id: README,v 1.6 2010-06-26 21:05:33 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/ctable.pdf b/Master/texmf-dist/doc/latex/ctable/ctable.pdf
index 1e15120e650..a1895d40074 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
index 91b71e02b15..b2da791d8a9 100644
--- a/Master/texmf-dist/doc/latex/ctable/doit
+++ b/Master/texmf-dist/doc/latex/ctable/doit
@@ -1,9 +1,6 @@
-#!/usr/bin/env ruby
-require 'optparse'
+#!/usr/bin/ruby
 require 'erb'
-require 'rubygems'
-require 'rio'
-require 'session'
+require 'scriptingutils'
 
 # doit - make all or some example picture sets.
 
@@ -19,10 +16,8 @@ require 'session'
 # 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
@@ -40,53 +35,40 @@ def clean(all=false)
   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!
+def handle_options
+  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
 end
+init(nil,:handle_options)
 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}")
+    open(f+'.tex','w') do |o| o.print ERB.new(tex[i]).result(binding) end
+    sys("pdflatex --interaction=nonstopmode #{f}")
     sys("pdfcrop #{f}.pdf #{f}.pdf")
   end
 end
-# $Id: doit,v 1.6 2009-09-15 11:28:26 wybo Exp $
+# $Id: doit,v 1.8 2010-06-26 21:09:37 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}
+\begin{verbatim}<%= open(j).readlines.delete_if {|x| x =~ /\$Id|remove for source/ }.join %>\end{verbatim}
 \end{document}
 
 \documentclass[twoside]{article}
@@ -98,5 +80,5 @@ __END__
 \pagestyle{empty}
 \parindent0pt
 \begin{document}
-<%= open(j).readlines.delete_if {|x| x =~ /\$Id/ } %>
+<%= open(j).readlines.delete_if {|x| x =~ /\$Id/ }.join %>
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/ctable/inst b/Master/texmf-dist/doc/latex/ctable/inst
new file mode 100755
index 00000000000..be3981d5a02
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/ctable/inst
@@ -0,0 +1,78 @@
+#!/bin/bash
+
+# this script generates ctable's documentation into ctable.pdf
+# and then installs (unless the environment variable NOINSTALL is not empty)
+# ctable in TEXMFLOCAL
+# This is not a make-like process. If you changed any files, then first run
+# inst with the --Clean option, then run inst without options.
+
+function die {
+  echo -e "$1"
+  exit 1
+}
+
+NAME=ctable
+LOCAL=`kpsewhich --expand-var '$TEXMFLOCAL'`/tex/latex/ctable
+CLEAN={aux,idx,ilg,chk,fls,ind,log,glo,gls,out,tex}
+ALLCLEAN={aux,idx,ilg,chk,fls,ind,log,glo,gls,out,tex,sty,cls,pdf}
+
+function clean {
+  eval "rm -f $NAME.$CLEAN doc/*.$CLEAN"
+}
+function Clean {
+  eval "rm -f $NAME.$ALLCLEAN doc/*.$ALLCLEAN"
+}
+
+case "$1"
+in
+-c|--clean) clean; exit;;
+-C|--Clean) Clean; exit;;
+-h|--help)  echo 'Usage: ./inst [-c|C|h]'; exit;;
+?*)         echo 'Illegal argument(s)'; exit;;
+esac
+
+echo y |tex $NAME.ins >/dev/null
+(
+  # recompile example graphics if any is missing:
+  cd doc
+  ln -sf ../ctable.sty || exit 1 # use the ctable.sty version to be installed
+  for i in [0-9][0-9]?; do 
+    if [ ! -f $i.pdf -o ! -f s$i.pdf ]; then
+      echo Creating example graphics
+      ./doit || exit 1
+      ./doit -c
+      break
+    fi
+  done
+  rm ctable.sty
+  cd ..
+  
+  echo Creating documentation
+  pdflatex --recorder --interaction=batchmode $NAME.dtx  || die "`texlog_extract $NAME.log`"
+  if [ -f $NAME.glo ]; then
+    makeindex -q -s gglo.ist -o $NAME.gls $NAME.glo || echo makeindex-error
+  fi
+  if [ -f $NAME.idx ]; then
+    makeindex -q -s gind.ist -o $NAME.ind $NAME.idx || exit 1
+  fi
+  pdflatex --recorder --interaction=nonstopmode $NAME.dtx > /dev/null || exit 1
+  
+  # set environment variable NOINSTALL to skip installation in your textree
+  if [ "$NOINSTALL" = "" ]; then
+    echo Installing $NAME.{dtx,sty,pdf}
+    rm -rf $LOCAL
+    mkdir -p $LOCAL
+    cp $NAME.{dtx,sty,pdf} $LOCAL || exit 1
+  fi
+  sudo `which mktexlsr` || exit 1
+  exit 0
+)
+if [ $? != 0 ]; then 
+  echo errors detected, see ctable.log
+else
+  echo ctable successfully installed
+fi
+texlog_extract ctable
+
+# $Id: inst,v 1.24 2010-06-26 21:44:29 wybo Exp $
+
diff --git a/Master/texmf-dist/source/latex/ctable/ctable.dtx b/Master/texmf-dist/source/latex/ctable/ctable.dtx
index f32bb859426..e165b8d8a2a 100644
--- a/Master/texmf-dist/source/latex/ctable/ctable.dtx
+++ b/Master/texmf-dist/source/latex/ctable/ctable.dtx
@@ -19,7 +19,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{ctable}
 %<*package>
-    [2009/09/17 v1.15 ctable package]
+    [2010/06/26 v1.16 ctable package]
 %</package>
 %
 %<*driver>
@@ -30,7 +30,9 @@
    verbose,
    pdftex,
    paper=a4paper,
+   margin=20mm,
    bottom=30mm,
+   left=50mm,
    nohead
 ]{geometry}
 \usepackage{hyperref}
@@ -41,16 +43,15 @@
 \def\URL#1{http://www.ctan.org/tex-archive/help/Catalogue/entries/#1.html}
 \def\REF#1{\href{\URL{#1}}{\texttt{#1}}}
 \parindent0pt\parskip1ex
-\newcommand{\ROW}[3]{\noindent\parskip0pt%
-  %\fboxsep0pt
+\newcommand{\ROW}[3]{\parskip0pt%
   \colorbox{#1}{%
     \parbox{.98\hsize}{%
-      \rule{0pt}{1.5ex}\\
-      \parbox{.5\hsize}{\includegraphics{#2}}
-      \parbox{.5\hsize}{\centering{\includegraphics{#3}}}
-      \\\rule{0pt}{1.5ex}
-    }
-  }\par
+      \rule{0pt}{1.5ex}\\%%
+      \parbox{.5\hsize}{\includegraphics{#2}}%%
+      \parbox{.5\hsize}{\centering{\includegraphics{#3}}}%%
+      \\\rule{0pt}{1.5ex}%%
+    }%%
+  }\par%%
 }
 \AtBeginDocument{\RecordChanges}
 \AtEndDocument{\PrintChanges}
@@ -78,7 +79,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{387}
+% \CheckSum{396}
 %
 % \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
@@ -154,6 +155,9 @@
 % \changes{v1.15}{2009/09/17}{removed whitespace before tables,
 %                             corrected marginpars in the documentation
 %                            }
+% \changes{v1.16}{2009/11/02}{option cap={} did not suppress lot/lof entry
+%                             notespar option now generates fully justified notes
+%                            }
 %
 % \GetFileInfo{ctable.dtx}
 %
@@ -194,11 +198,11 @@
 % to typeset it, and one or more |X| column specifiers should be specified.
 % Otherwise tabular will be used.
 %
-% This package defines the commands |\ctable|,
-% |\tnote| and |\tmark|, as well as four |\tabularnewline| generating
+% This package defines the commands |\ctable|, |\tnote| and
+% |\tmark|, and four |\tabularnewline| generating
 % commands. The latter generate reasonable amounts of whitespace
-% around horizontal rules and are also useful for tabulars outside
-% this package.
+% around horizontal rules and are also useful for tabulars
+% outside this package.
 %
 % Since the |ctable| package imports the \REF{array} and \REF{booktabs}
 % packages, all commands from those packages are available as well.
@@ -450,7 +454,7 @@
 %    caption = Example with a specified width of 100mm,
 %    label   = width,
 %    width   = 100mm,
-%    pos     = h,
+%    pos     = ht,
 %    left
 % ]{c>{\raggedright}Xc>{\raggedright}X}{
 %    \tnote{footnotes are placed under the table}
@@ -471,7 +475,7 @@
 %    caption = Example with a specified width of 100mm,
 %    label   = width,
 %    width   = 100mm,
-%    pos     = h,
+%    pos     = ht,
 %    left
 % ]{c>{\raggedright}Xc>{\raggedright}X}{
 %    \tnote{footnotes are placed under the table}
@@ -631,9 +635,13 @@
 \def\FL{\toprule}
 \def\ML{\NN\midrule}
 \def\LL{\NN\bottomrule}
+\definecolor{@ctblframefg}{rgb}{0,0,0}%
+\definecolor{@ctblframebg}{rgb}{1,1,1}%
 \def\@ctblfgcolor#1 #2 #3={\definecolor{@ctblframefg}{rgb}{#1,#2,#3}}
 \def\@ctblbgcolor#1 #2 #3={\definecolor{@ctblframebg}{rgb}{#1,#2,#3}}
-\def\@ctbltextsuperscript#1{\ifx\@ctblnosuper\empty\@textsuperscript{#1}\else{\footnotesize#1}\fi}
+\def\@ctbltextsuperscript#1{%
+  \ifx\@ctblnosuper\empty\@textsuperscript{#1}\else{\footnotesize#1}\fi
+}
 \def\@ctbldoinside{\relax}
 \newdimen\@ctblframesep
 \newdimen\@ctblframerule
@@ -685,14 +693,21 @@
 \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
+% A caption will only be generated if the \textsl{caption} option was used, with a
+% non-empty value. If so, it goes in the lot/lof, unless the \textsl{cap} option 
+% specified a different (probably shorter) value for it. A \textsl{cap} option with
+% an empty value inhibits a tof/lof entry.
 %    \begin{macrocode}
 \def\@ctblCaption{
    \ifx\@ctblcap\undefined\let\@ctblcap\@ctblcaption\fi
    \ifx\@ctblcaption\empty\else
-      \caption[\@ctblcap]{\ifx\@ctbllabel\empty\else\label{\@ctbllabel}\fi\@ctblcaption\ \@ctblcontinued\strut}
+      \def\@ctblcaptionarg{\ifx\@ctbllabel\empty\else\label{\@ctbllabel}\fi
+         \@ctblcaption\ \@ctblcontinued\strut}
+      \ifx\@ctblcap\empty
+         \caption[]{\@ctblcaptionarg}
+      \else
+         \caption[\@ctblcap]{\@ctblcaptionarg}
+      \fi
    \fi
 }
 %    \end{macrocode}
@@ -733,10 +748,8 @@
    \def\@ctblend     {\end{\@ctblsideways\@ctbltaborfig\@ctblstarred}}%
    \def\@ctblbotcap  {}%
    \def\@ctblstarred {}%
-   \def\@ctblnosuper{}
+   \def\@ctblnosuper {}%
    \def\@ctblnotespar{}%
-   \definecolor{@ctblframefg}{rgb}{0,0,0}%
-   \definecolor{@ctblframebg}{rgb}{1,1,1}%
    \@ctblframerule0pt
    \@ctblcaptionskip=0ex
    \@ctblframesep0pt
@@ -849,7 +862,7 @@
                \end{tabularx}%
             \else%
                \\[.2ex]
-               \begin{minipage}{\hsize}\raggedright%
+               \begin{minipage}{\hsize}%
                   #3%
                \end{minipage}%
             \fi
@@ -862,4 +875,4 @@
 %    \end{macrocode}
 % \Finale
 \endinput
-$Id: ctable.dtx,v 1.65 2009-09-16 23:09:29 wybo Exp $
+$Id: ctable.dtx,v 1.68 2010-06-26 21:04:57 wybo Exp $
diff --git a/Master/texmf-dist/tex/latex/ctable/ctable.sty b/Master/texmf-dist/tex/latex/ctable/ctable.sty
index 0ab3d273311..e2dbbb409e9 100644
--- a/Master/texmf-dist/tex/latex/ctable/ctable.sty
+++ b/Master/texmf-dist/tex/latex/ctable/ctable.sty
@@ -22,15 +22,19 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{ctable}
-    [2009/09/17 v1.15 ctable package]
+    [2010/06/26 v1.16 ctable package]
 \RequirePackage{color,xkeyval,array,tabularx,booktabs,rotating}
 \def\NN{\tabularnewline}
 \def\FL{\toprule}
 \def\ML{\NN\midrule}
 \def\LL{\NN\bottomrule}
+\definecolor{@ctblframefg}{rgb}{0,0,0}%
+\definecolor{@ctblframebg}{rgb}{1,1,1}%
 \def\@ctblfgcolor#1 #2 #3={\definecolor{@ctblframefg}{rgb}{#1,#2,#3}}
 \def\@ctblbgcolor#1 #2 #3={\definecolor{@ctblframebg}{rgb}{#1,#2,#3}}
-\def\@ctbltextsuperscript#1{\ifx\@ctblnosuper\empty\@textsuperscript{#1}\else{\footnotesize#1}\fi}
+\def\@ctbltextsuperscript#1{%
+  \ifx\@ctblnosuper\empty\@textsuperscript{#1}\else{\footnotesize#1}\fi
+}
 \def\@ctbldoinside{\relax}
 \newdimen\@ctblframesep
 \newdimen\@ctblframerule
@@ -73,7 +77,13 @@
 \def\@ctblCaption{
    \ifx\@ctblcap\undefined\let\@ctblcap\@ctblcaption\fi
    \ifx\@ctblcaption\empty\else
-      \caption[\@ctblcap]{\ifx\@ctbllabel\empty\else\label{\@ctbllabel}\fi\@ctblcaption\ \@ctblcontinued\strut}
+      \def\@ctblcaptionarg{\ifx\@ctbllabel\empty\else\label{\@ctbllabel}\fi
+         \@ctblcaption\ \@ctblcontinued\strut}
+      \ifx\@ctblcap\empty
+         \caption[]{\@ctblcaptionarg}
+      \else
+         \caption[\@ctblcap]{\@ctblcaptionarg}
+      \fi
    \fi
 }
 \newcolumntype{Y}{X}
@@ -109,10 +119,8 @@
    \def\@ctblend     {\end{\@ctblsideways\@ctbltaborfig\@ctblstarred}}%
    \def\@ctblbotcap  {}%
    \def\@ctblstarred {}%
-   \def\@ctblnosuper{}
+   \def\@ctblnosuper {}%
    \def\@ctblnotespar{}%
-   \definecolor{@ctblframefg}{rgb}{0,0,0}%
-   \definecolor{@ctblframebg}{rgb}{1,1,1}%
    \@ctblframerule0pt
    \@ctblcaptionskip=0ex
    \@ctblframesep0pt
@@ -194,7 +202,7 @@
                \end{tabularx}%
             \else%
                \\[.2ex]
-               \begin{minipage}{\hsize}\raggedright%
+               \begin{minipage}{\hsize}%
                   #3%
                \end{minipage}%
             \fi