summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-08-07 22:50:54 +0000
committerKarl Berry <karl@freefriends.org>2011-08-07 22:50:54 +0000
commitbcdd4b5d66feaf11bd0ef448645957cb6f14f372 (patch)
tree01a3afd2afd814fb65b3955f6f4f8c46d9de40b6 /Master/texmf-dist
parent5c643469f1d42bcc79dc4d4856860d28553f062d (diff)
ccaption 3.2c (7aug11)
git-svn-id: svn://tug.org/texlive/trunk@23443 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/ccaption/README42
-rw-r--r--Master/texmf-dist/doc/latex/ccaption/ccaption.pdfbin378739 -> 469733 bytes
-rw-r--r--Master/texmf-dist/source/latex/ccaption/ccaption.dtx79
-rw-r--r--Master/texmf-dist/tex/latex/ccaption/ccaption.sty13
4 files changed, 61 insertions, 73 deletions
diff --git a/Master/texmf-dist/doc/latex/ccaption/README b/Master/texmf-dist/doc/latex/ccaption/README
index 689b0832fd2..7759d6a1ba7 100644
--- a/Master/texmf-dist/doc/latex/ccaption/README
+++ b/Master/texmf-dist/doc/latex/ccaption/README
@@ -14,78 +14,82 @@ subfigure, sidecap, endfloat, longtable, xtab, tocloft and hyperref packages.
Change History
______________
-Changes in version 3.2b (2009/09/02)
+Version 3.2c (2011/08/07)
+- Fix a bug in longtable compatibility; font changing now works correctly
+
+Version 3.2b (2009/09/02)
- New maintainer (Will Robertson)
-Changes in version 3.2a (2005/03/29)
+Version 3.2a (2005/03/29)
- Fixed a labelling problem with bilingual captions
-Changes in version 3.2 (2005/03/21)
+Version 3.2 (2005/03/21)
- New commands for bilingual captions in longtables
-Changes in version 3.1c (2003/11/14)
+Version 3.1c (2003/11/14)
- \label now picks up the correct number after \contcaption
-Changes in version 3.1b (2002/10/18)
+Version 3.1b (2002/10/18)
- Minor bug fix related to brackets in captions with the subfigure option
- Stopped double labelling within a caption
-Changes in version 3.1a (2002/04/01)
+Version 3.1a (2002/04/01)
- subfigure option code changed to match released version 2.1.2 of
the subfigure package.
-Changes in version 3.1 (2002/02/20)
+Version 3.1 (2002/02/20)
- subfigure option code changed to match released version 2.1 of
the subfigure package.
-Changes in version 3.0a (2001/08/03)
+Version 3.0a (2001/08/03)
- Catered for old versions of amsmath package doing odd things with
\@tempa, \@tempb, and \@tempc.
-Changes in version 3.0 (2001/03/03)
+Version 3.0 (2001/03/03)
- Provides same tools for typesetting new List of... as the tocloft package
-Changes in version 2.7 (2001/02/24)
+Version 2.7 (2001/02/24)
- Tools provided for styling captions.
- The \formatlegend command has been replaced by the general styling
mechanism, so in this slight respect version 7.0 is not upwards
compatible with earlier versions.
- Added extensive discussion on float placement.
-Changes in version 2.6e (2001/01/12)
+Version 2.6e (2001/01/12)
- Fixed problem with hyperref package and new (sub) floats.
-Changes in version 2.6d (2001/01/02)
+Version 2.6d (2001/01/02)
- Fixed problem with fragile commands in subfigure 2.0 package option
continued subfloat captions.
- Fixed problem with new subfloats and the subfigure 2.1 package option.
- Added discussion on use with the endfloat package.
-Changes in version 2.6a (2000/02/29)
+Version 2.6a (2000/02/29)
- With subfigures, main captions can be at the top or bottom of the
float, and subcaptions can be at the top or bottom of the `subfloat'
-Changes in version 2.6 (2000/02/26)
+Version 2.6 (2000/02/26)
- Added support for bilingual captions
-Changes in version 2.5 (2000/02/20)
+Version 2.5 (2000/02/20)
- Added support for the subfigure version 2.1 package
- Fixed an infelicity with \centering
-Changes in version 2.4 (1999/09/20)
+Version 2.4 (1999/09/20)
- Added support for the subfigure (version 2.0) package
-Changes in version 2.3 (1999/01/24)
+Version 2.3 (1999/01/24)
- Added unnumbered captions
- Much improved documentation.
-Changes in version 2.1 (1998/10/04)
+Version 2.1 (1998/10/04)
- More efficient coding.
-----------------------------------------------------------------
Author: Peter Wilson (Herries Press)
Maintainer: Will Robertson (will dot robertson at latex-project dot org)
- Copyright 1998 -- 2005 Peter R. Wilson
+ Copyright 1998-2005 Peter R. Wilson
+ Copyright 2011 Will Robertson
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
diff --git a/Master/texmf-dist/doc/latex/ccaption/ccaption.pdf b/Master/texmf-dist/doc/latex/ccaption/ccaption.pdf
index df958f2332f..8905e2290d8 100644
--- a/Master/texmf-dist/doc/latex/ccaption/ccaption.pdf
+++ b/Master/texmf-dist/doc/latex/ccaption/ccaption.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/ccaption/ccaption.dtx b/Master/texmf-dist/source/latex/ccaption/ccaption.dtx
index 063abae1fc1..fcd5bb67846 100644
--- a/Master/texmf-dist/source/latex/ccaption/ccaption.dtx
+++ b/Master/texmf-dist/source/latex/ccaption/ccaption.dtx
@@ -3,11 +3,12 @@
% ccaption.dtx
% Author: Peter Wilson (Herries Press)
% Maintainer: Will Robertson (will dot robertson at latex-project dot org)
-% Copyright 1998 -- 2005 Peter R. Wilson
+% Copyright 1998-2005 Peter R. Wilson
+% Copyright 2011 Will Robertson
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
-% version 1.3c of this license or (at your option) any
+% version 1.3c of this license or (at your option) any
% later version: <http://www.latex-project.org/lppl.txt>
%
% This work has the LPPL maintenance status "maintained".
@@ -15,7 +16,15 @@
%
% This work consists of the files listed in the README file.
%
-%
+%
+%<*driver>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesFile{ccaption.dtx}
+%</driver>
+%<usc>\ProvidesPackage{ccaption}
+%<*usc>
+ [2011/08/07 v3.2c Extended captioning and new floats]
+%</usc>
%<*driver>
\documentclass[twoside]{ltxdoc}
\usepackage{url}
@@ -23,7 +32,8 @@
plainpages=false,
pdfpagelabels,
bookmarksnumbered,
- hyperindex=false
+ hyperindex=false,
+ linktocpage=true,
]{hyperref}
\providecommand{\phantomsection}{}
\makeatletter
@@ -45,6 +55,7 @@
%%\usepackage{subfigure}
\EnableCrossrefs
\CodelineIndex
+\RecordChanges
\renewcommand{\MakeUppercase}[1]{#1}
\pagestyle{headings}
\setcounter{StandardModuleDepth}{1}
@@ -57,7 +68,7 @@
%
% \fi
%
-% \CheckSum{1461}
+% \CheckSum{1457}
%
% \DoNotIndex{\',\.,\@M,\@@input,\@addtoreset,\@arabic,\@badmath}
% \DoNotIndex{\@centercr,\@cite}
@@ -128,19 +139,7 @@
% \changes{v3.2b}{2009/09/02}{New maintainer (Will Robertson)}
%
% \def\dtxfile{ccaption.dtx}
-% \def\fileversion{v2.6c} \def\filedate{2000/03/15}
-% \def\fileversion{v2.6d} \def\filedate{2001/01/02}
-% \def\fileversion{v2.6e} \def\filedate{2001/01/12}
-% \def\fileversion{v2.7} \def\filedate{2001/02/24}
-% \def\fileversion{v3.0} \def\filedate{2001/03/15}
-% \def\fileversion{v3.0a} \def\filedate{2001/08/15}
-% \def\fileversion{v3.1} \def\filedate{2002/02/20}
-% \def\fileversion{v3.1a} \def\filedate{2002/04/01}
-% \def\fileversion{v3.1b} \def\filedate{2002/10/18}
-% \def\fileversion{v3.1c} \def\filedate{2003/11/14}
-% \def\fileversion{v3.2} \def\filedate{2005/03/21}
-% \def\fileversion{v3.2a} \def\filedate{2005/03/29}
-% \def\fileversion{v3.2b} \def\filedate{2009/09/02}
+% \GetFileInfo{\dtxfile}
% \newcommand*{\Lpack}[1]{\textsf {#1}} ^^A typeset a package
% \newcommand*{\Lopt}[1]{\textsf {#1}} ^^A typeset an option
% \newcommand*{\file}[1]{\texttt {#1}} ^^A typeset a file
@@ -149,16 +148,13 @@
% \newcommand*{\Lenv}[1]{\texttt {#1}} ^^A typeset an environment
% \newcommand*{\pname}{ccaption} ^^A name of the package
%
-% \title{The \Lpack{\pname} package\thanks{This
-% file (\texttt{\dtxfile}) has version number \fileversion, last revised
-% \filedate.}}
-%
+% \title{The \Lpack{\pname} package}
% \author{%
% Author: Peter Wilson, Herries Press\\
% Maintainer: Will Robertson\\
% \texttt{will dot robertson at latex-project dot org}
% }
-% \date{\filedate}
+% \date{\fileversion\qquad\filedate}
% \maketitle
% \begin{abstract}
% The \Lpack{\pname} package enables restyling of captions and
@@ -166,15 +162,13 @@
% unnumbered captions, bilingual captions, and
% an `anonymous' caption (a legend) that can be used in any
% environment. It also provides commands to define captions
-% that can be used outside float environments as well as
+% that can be used outside float environments as well as
% a mechanism for creating new types of float environments and subfloats.
%
-% The package has been tested in conjunction with the
-% \Lpack{tocloft}
-% \Lpack{rotating},
+% The package has been tested in conjunction with the
+% \Lpack{tocloft}, \Lpack{rotating},
% \Lpack{caption2}, \Lpack{sidecap}, \Lpack{subfigure}, \Lpack{endfloat},
-% \Lpack{longtable}, \Lpack{xtab}
-% and \Lpack{hyperref}
+% \Lpack{longtable}, \Lpack{xtab} and \Lpack{hyperref}
% packages.
% \end{abstract}
% \tableofcontents
@@ -183,8 +177,6 @@
%
% \StopEventually{}
%
-%
-%
% \section{Introduction}
%
% Some publishers require and some authors prefer captioning styles
@@ -194,8 +186,7 @@
% Some publishers require that documents that include multi-part
% tables use a \textit{continuation caption} on all but the first
% part of the multi-part table. For the times where such a table
-% is specified by the author as a set of tables, the
-% \Lpack{\pname} package
+% is specified by the author as a set of tables, the \Lpack{\pname} package
% provides a simple `continuation' caption command to meet this
% requirement. It also provides
% a facility for an `anonymous' caption which can be used in any
@@ -1890,13 +1881,8 @@
%
% \section{The package code} \label{sec:code}
%
-% Announce the name and version of the package, which requires
-% LaTeX2e.
% \begin{macrocode}
%<*usc>
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ccaption}[2009/09/02 v3.2b Extended captioning and new floats]
-
% \end{macrocode}
% In an attempt to avoid name clashes with other packages, all internal
% commands include the string |@cont|.
@@ -2579,25 +2565,26 @@
% \subsection{The code for the \Lpack{longtable} package}
%
% \begin{macro}{\LT@makecaption}
-% This is defined in the \Lpack{longtable} package and sets a caption
+% This is defined in the \Lpack{longtable} package and sets a caption
% essentially as a centered multicolumn entry in the table. To utilize
% \Lpack{ccaption}'s font settings it has to be modified.
+% N.B. that |#1| is either |\@firstofone| or |\@gobble| so we need double
+% braces to protect the font change.
% \changes{v3.2}{2005/03/21}{Added \cs{LT@makecaption}}
+% \changes{v3.2c}{2011/08/07}{Fix bug in longtable compatibility.}
% \begin{macrocode}
-\providecommand*{\LT@makecaption}[3]{}
-\renewcommand*{\LT@makecaption}[3]{%
+\def\LT@makecaption#1#2#3{%
\LT@mcol\LT@cols c{\hb@xt@ \z@{\hss\parbox[t]\LTcapwidth{%
- \sbox\@tempboxa{#1{\@contnfont #2\@contdelim}\@conttfont #3}%
+ \sbox\@tempboxa{#1{{\@contnfont #2\@contdelim}}\@conttfont #3}%
\ifdim\wd\@tempboxa>\hsize
- #1{\@contnfont #2\@contdelim}\@conttfont #3%
+ #1{{\@contnfont #2\@contdelim}}\@conttfont #3%
\else
\hb@xt@ \hsize{\hfil\box\@tempboxa\hfil}%
\fi
\endgraf\vskip\belowcaptionskip}%
\hss}}}
-
% \end{macrocode}
-% \end{macro}
+% \end{macro}
%
% \begin{macro}{\longbitwonumcaption}
% A version of \cs{bitwonumcaption} for use in a |longtable|.
@@ -3886,9 +3873,9 @@
%
% \end{thebibliography}
%
-%
% \Finale
% \PrintIndex
+% \PrintChanges
%
\endinput
diff --git a/Master/texmf-dist/tex/latex/ccaption/ccaption.sty b/Master/texmf-dist/tex/latex/ccaption/ccaption.sty
index f1eb14a619a..218ef150023 100644
--- a/Master/texmf-dist/tex/latex/ccaption/ccaption.sty
+++ b/Master/texmf-dist/tex/latex/ccaption/ccaption.sty
@@ -20,9 +20,8 @@
%%
%% This work consists of the files listed in the README file.
%%
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ccaption}[2009/09/02 v3.2b Extended captioning and new floats]
-
+\ProvidesPackage{ccaption}
+ [2011/08/07 v3.2c Extended captioning and new floats]
\newif\if@contsubfigxx
\@contsubfigxxfalse
\newif\if@contsubfigxxi
@@ -261,18 +260,16 @@
\contcaption{#3}
\endgroup}
-\providecommand*{\LT@makecaption}[3]{}
-\renewcommand*{\LT@makecaption}[3]{%
+\def\LT@makecaption#1#2#3{%
\LT@mcol\LT@cols c{\hb@xt@ \z@{\hss\parbox[t]\LTcapwidth{%
- \sbox\@tempboxa{#1{\@contnfont #2\@contdelim}\@conttfont #3}%
+ \sbox\@tempboxa{#1{{\@contnfont #2\@contdelim}}\@conttfont #3}%
\ifdim\wd\@tempboxa>\hsize
- #1{\@contnfont #2\@contdelim}\@conttfont #3%
+ #1{{\@contnfont #2\@contdelim}}\@conttfont #3%
\else
\hb@xt@ \hsize{\hfil\box\@tempboxa\hfil}%
\fi
\endgraf\vskip\belowcaptionskip}%
\hss}}}
-
\newcommand*{\longbitwonumcaption}[5]{%
\@if@contemptyarg{#1}{\caption{#2}}{\caption[#1]{#2}}%
\global\let\@cont@oldtablename\tablename