From 1bacfc6b28763adb12f6a9aadc573c6012a5c14c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 20 Dec 2013 22:01:53 +0000 Subject: ctable (20dec13) git-svn-id: svn://tug.org/texlive/trunk@32456 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/ctable/ctable.dtx | 61 ++++++++++++++---------- Master/texmf-dist/source/latex/ctable/ctable.ins | 1 - 2 files changed, 35 insertions(+), 27 deletions(-) (limited to 'Master/texmf-dist/source') diff --git a/Master/texmf-dist/source/latex/ctable/ctable.dtx b/Master/texmf-dist/source/latex/ctable/ctable.dtx index b3bd0aaceac..b41c091120c 100644 --- a/Master/texmf-dist/source/latex/ctable/ctable.dtx +++ b/Master/texmf-dist/source/latex/ctable/ctable.dtx @@ -31,7 +31,7 @@ Execute the inst script with the --help option for more information. %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{ctable} %<*package> - [2013/06/15 v1.26 ctable package for \ + [2013/12/19 v1.27 ctable package for \ flexible typesetting of table and figure floats using key/value directives] % % @@ -39,16 +39,12 @@ Execute the inst script with the --help option for more information. \documentclass{ltxdoc} \usepackage{ctable,txfonts,paralist,desclist} \usepackage[l2tabu,orthodox]{nag} -\usepackage[ - verbose, - pdftex, - paper=a4paper, - margin=20mm, - bottom=30mm, - left=50mm, - nohead -]{geometry} -\usepackage{hyperref} +\usepackage[a4paper,margin=20mm,left=50mm,nohead]{geometry} +\usepackage[colorlinks]{hyperref} +\usepackage{tocloft} +\setlength\cftparskip{.5ex} +\setlength\cftbeforesecskip{.5ex} +\setlength\cftaftertoctitleskip{1ex} \graphicspath{{./doc/}} \definecolor{vbgreen}{rgb}{0,.6,0} \definecolor{B}{rgb}{0.77, 0.90, 0.96} @@ -58,18 +54,17 @@ Execute the inst script with the --help option for more information. \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} -\EnableCrossrefs +\CodelineIndex\EnableCrossrefs \hypersetup{ - colorlinks = true, pdftitle = The ctable package, pdfauthor = Wybo Dekker, pdfsubject = {Typesetting centered, right, and left aligned table and figure @@ -86,7 +81,9 @@ Execute the inst script with the --help option for more information. bookmarksopen } \begin{document} -\DocInput{ctable.dtx} + \DocInput{ctable.dtx} + \PrintChanges + \PrintIndex \end{document} % % \fi @@ -230,6 +227,10 @@ Execute the inst script with the --help option for more information. % \changes{v1.26}{2013/06/15}{ % footerwidth option was inactive when notespar option was active % } +% \changes{v1.27}{2013/12/19}{ +% label option did not work with side caption\\ +% disable transparency with warning if tikz package loaded +% } % % \GetFileInfo{ctable.dtx} % @@ -261,6 +262,8 @@ Execute the inst script with the --help option for more information. % better vertical spacing around horizontal rules and it provides % facilities for making table footnotes. % \end{abstract} +% \tableofcontents +% \section{Introduction} % % \section{Purpose} The |ctable| package lets you easily typeset % captioned table and figure floats with optional @@ -824,18 +827,25 @@ Execute the inst script with the --help option for more information. % example, for the adjustment of the font size with |\small|: % \medskip\\ % \ROW{Y}{s14a}{14a} -% % \StopEventually{} % % \section{Implementation} % \begin{macrocode} \RequirePackage{ifpdf,xcolor,xkeyval,array,tabularx,booktabs,rotating} % \end{macrocode} -% The transparency package works only in pdf mode, otherwise define -% a dummy |\transparent| and issue a warning. +% The transparency package works only in pdf mode, and if the tikz package is not loaded; +% otherwise define a dummy |\transparent| and issue a warning. % \begin{macrocode} \ifpdf \RequirePackage{transparent} + \AtBeginDocument{ + \@ifpackageloaded{tikz}{ + \PackageWarning{ctable}{ + Transparency disabled: incompatible with tikz package + } + \def\transparent#1{} + }{} + } \else \PackageWarningNoLine{ctable}{\MessageBreak Transparency disabled: pdfTeX is not running in PDF mode @@ -1190,8 +1200,8 @@ Execute the inst script with the --help option for more information. \@ctblalign \begin{minipage}{\@ctblfloatwidth}\parindent0pt \ifx\@ctblbotcap\@ctblfalse\@ctblCaption\vskip\@ctblcaptionskip\fi - \ifx\@ctblbotcap\undefined\begin{sidecaption}[\@ctblcap]{\@ctblcaption}[ label ]\fi - \centering{\usebox\ctbl@t} % insert the tabular + \ifx\@ctblbotcap\undefined\begin{sidecaption}[\@ctblcap]{\@ctblcaption}[\@ctbllabel]\fi + \centering{\usebox\ctbl@t}% insert the tabular \def\@ctblfootnotes{#3}% \ifx#3\empty\else{% append footnotes, if any % \end{macrocode} @@ -1226,4 +1236,3 @@ Execute the inst script with the --help option for more information. % \end{macrocode} % \Finale \endinput -$Id: ctable.dtx,v 1.86 2013/06/14 21:06:55 wybo Exp $ diff --git a/Master/texmf-dist/source/latex/ctable/ctable.ins b/Master/texmf-dist/source/latex/ctable/ctable.ins index 6a1b19247bd..141cb1a6f51 100644 --- a/Master/texmf-dist/source/latex/ctable/ctable.ins +++ b/Master/texmf-dist/source/latex/ctable/ctable.ins @@ -61,4 +61,3 @@ and version 1.2 or later is part of all distributions of LaTeX version \Msg{**************************************************************} \endbatchfile -$Id: ctable.ins,v 1.8 2011-03-16 15:56:11 wybo Exp $ -- cgit v1.2.3