From dd668ea645b653e663abe0e53f9364f3b8f28ddf Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 19 Oct 2015 22:35:43 +0000 Subject: ctable (19oct15) git-svn-id: svn://tug.org/texlive/trunk@38672 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/ctable/ctable.sty | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist/tex/latex/ctable') diff --git a/Master/texmf-dist/tex/latex/ctable/ctable.sty b/Master/texmf-dist/tex/latex/ctable/ctable.sty index 75321672f89..a6014337bfa 100644 --- a/Master/texmf-dist/tex/latex/ctable/ctable.sty +++ b/Master/texmf-dist/tex/latex/ctable/ctable.sty @@ -22,8 +22,8 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{ctable} - [2015/08/29 v1.30 ctable package for \ - flexible typesetting of table and figure floats using key/value directives] + [2015/10/17 v1.31 ctable package for flexible typesetting of table and + figure floats using key/value directives] \RequirePackage{ifpdf,etoolbox,xcolor,xkeyval,array,tabularx,booktabs,rotating} \ifpdf \@ifpackageloaded{tikz}{ @@ -40,12 +40,16 @@ } \def\transparent#1{} \fi -\AtEndPreamble{ +\newif\if@CTcaptionloaded +\AtBeginDocument{ + \makeatletter \@ifpackageloaded{tikz}{ \@ifpackageloaded{transparent}{ \PackageError{ctable}{You must load ctable after tikz}{} } - } + }{} + \@ifpackageloaded{caption}{\@CTcaptionloadedtrue}{\@CTcaptionloadedfalse} + \makeatother } \def\NN{\tabularnewline} \def\FL{\toprule} @@ -67,9 +71,7 @@ \def\@CTdoinside{\relax} \newif\if@CTusex \newif\if@CTinmemoir -\newif\if@CThascaption \@ifclassloaded{memoir}{\@CTinmemoirtrue}{\@CTinmemoirfalse} -\@ifpackageloaded{caption}{\@CThascaptiontrue}{\@CThascaptionfalse} \newdimen\@CTframesep \newdimen\@dfltCTframesep \newdimen\@CTframerule \newdimen\@dfltCTframerule \newdimen\@CTwidth \newdimen\@dfltCTwidth @@ -172,17 +174,16 @@ \define@key{CT}{table}[]{\def\@CTtaborfig{table}} \define@key{CT}{topcap}[]{\let\@CTbotcap\@CTfalse} \define@key{CT}{width}{\@CTwidth=#1} -\newcommand{\CT@expandonce}[1]{\unexpanded\expandafter{#1}} \def\@CTCaption{ \ifx\@CTcaption\empty\else \def\@CTcaptionarg{\ifx\@CTlabel\empty\else\label{\@CTlabel}\fi \@CTcaption\ \@CTcontinued\strut} \begingroup \ifx\@CTcap\empty - \edef\x{\endgroup\noexpand\caption[]{\CT@expandonce\@CTcaptionarg}} + \edef\x{\endgroup\noexpand\caption[]{\expandonce\@CTcaptionarg}} \else - \edef\x{\endgroup\noexpand\caption[\CT@expandonce\@CTcap]% - {\CT@expandonce\@CTcaptionarg}} + \edef\x{\endgroup\noexpand\caption[\expandonce\@CTcap]% + {\expandonce\@CTcaptionarg}} \fi \x \fi @@ -238,7 +239,7 @@ \setkeys{CT}{#1}% \ifx\@CTcap\undefined\let\@CTcap\@CTcaption\fi \ifx\@CTcap\empty - \if@CThascaption\else + \if@CTcaptionloaded\else \PackageWarningNoLine{ctable}{\MessageBreak An empty cap= option prevents lot/loc entry only\MessageBreak if the caption package is loaded!} -- cgit v1.2.3