diff options
author | Karl Berry <karl@freefriends.org> | 2007-09-08 15:59:17 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2007-09-08 15:59:17 +0000 |
commit | 788352558edd068d76fe19ad56b81827c0fe7646 (patch) | |
tree | ab733e20eaf33223cbfe9c59c783a30d802ee627 /Master/texmf-dist/source/latex/caption/caption2.dtx | |
parent | ba8058f661bc514c2d960695ddb21d5501abbf97 (diff) |
caption 3.1 (7sep07)
git-svn-id: svn://tug.org/texlive/trunk@4911 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/caption/caption2.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/caption/caption2.dtx | 130 |
1 files changed, 89 insertions, 41 deletions
diff --git a/Master/texmf-dist/source/latex/caption/caption2.dtx b/Master/texmf-dist/source/latex/caption/caption2.dtx index e25b98a6723..f315613407d 100644 --- a/Master/texmf-dist/source/latex/caption/caption2.dtx +++ b/Master/texmf-dist/source/latex/caption/caption2.dtx @@ -18,16 +18,22 @@ % % This Current Maintainer of this work is Axel Sommerfeldt. % -% This work consists of the files caption.ins, caption.dtx, -% caption2.dtx, manual.tex, and anleitung.tex and the derived -% files caption.sty, caption2.sty, and caption3.sty. +% This work consists of the files caption.ins, caption.dtx, caption2.dtx, +% and ltcaption.dtx, the derived files caption.sty, caption2.sty, +% caption3.sty, and ltcaption.sty, and the user manuals caption-deu.tex, +% caption-eng.tex, and caption-rus.tex. % % \fi -% \CheckSum{836} +% \CheckSum{846} % % \iffalse %<*driver> \NeedsTeXFormat{LaTeX2e}[1994/12/01] +\ProvidesFile{caption2.drv}% + [2007/08/12 v2.2 Documentated code of the (obsolete) caption2 package] +\hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up. +%\errorcontextlines=3 +% \documentclass{ltxdoc} \setlength\parindent{0pt} \setlength\parskip{\smallskipamount} @@ -39,7 +45,10 @@ \fi \fi % -\usepackage{caption2}[2007/04/06] +\usepackage{hypdoc} +\hypersetup{pdfkeywords={LaTeX, package, caption2},pdfstartview={}} +% +\usepackage{caption2}[2007/08/12] % %<+driver>\OnlyDescription % @@ -55,11 +64,16 @@ % \let\package\puresf\def\thispackage{\package{caption2}} % \let\env\purett \let\opt\purett % +% \GetFileInfo{caption2.drv} +% \let\docdate\filedate % \GetFileInfo{caption2.sty} -% \title{The \thispackage\ package\thanks{This package has version number -% \fileversion, last revised \filedate.}} -% \author{Axel Sommerfeldt\\\texttt{caption@sommerfee.de}} -% \date{2007/04/06} +% +% \title{The (obsolete) \texorpdfstring{\package{caption2} package\thanks{%^^A +% This package has version number \fileversion, last revised \filedate.}}%^^A +% {caption2 package}} +% \author{Axel Sommerfeldt\\ +% \href{mailto:caption@sommerfee.de}{\texttt{caption@sommerfee.de}}} +% \date{\docdate} % \maketitle % % \changes{v2.0}{1995/10/09}{New experimental version: Many new commands and features} @@ -78,11 +92,11 @@ % % The \package{caption2} package used to be an experimental side-version of % the regular \package{caption} package. It was made public as beta test version -% without documentation in 1995 because of the demand for new features and +% without documentation in 1995 because of the strong demand for new features and % adaptations to other packages like the \package{longtable} and % \package{subfigure} package. % -% Even in the next years I found no time to reintegrate some of the +% But within the next years I found no time to reintegrate some of the % well-tried features into the regular \package{caption} package. So I % decided to release a version $2.1$ of the \package{caption2} package in 2002 % instead, which included some minor bug fixes and adaptations to the new @@ -92,7 +106,7 @@ % % In 2003 I finally found some (more) time, so a new regular release $3.0$ % of the \package{caption} package could be build with massive help from -% Frank Mittelbach\cite{A-W:GMS94} and Steven Cochran\cite{subfigure}. +% Frank Mittelbach and Steven Cochran. % It was released in December 2003 and superseded the neglected % \package{caption2} package. % @@ -127,7 +141,7 @@ % % This means migrating to the actual \package{caption} package should not be % necessary for old documents -- they should still compile fine as they are. -% If they don't please don't hesitate to write me an e-mail asking for +% If not, please don't hesitate to write me an e-mail asking for % maintainance. % % \StopEventually{} @@ -183,24 +197,37 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption2}[2007/04/11 v2.2a Customising captions (AS)] -\PackageWarningNoLine{caption2}{% - *** THIS PACKAGE IS OBSOLETE, PLEASE USE caption ***} +\ProvidesPackage{caption2}[2007/08/12 v2.2b Customising captions (AS)] +% \end{macrocode} +% +% \changes{v2.2b}{2007/06/15}{Made obsolete warning even more annoying} +% \begin{macrocode} +\PackageWarning{caption2}{% + ****************************************************\MessageBreak + THIS PACKAGE IS OBSOLETE:\MessageBreak + This package attempts to provide an caption 2.0/2.1\MessageBreak + author environment so that OLD documents can be\MessageBreak + successfully processed.\MessageBreak + It should NOT be used for NEW documents! New\MessageBreak + documents should use the caption package instead.\MessageBreak + ****************************************************\@gobbletwo}% % \end{macrocode} % % \subsection{Loading the caption3 kernel} % % \begin{macrocode} -\RequirePackage{caption3}[2007/03/04] % needs v3.0m or newer +\RequirePackage{caption3}[2007/08/12] % needs v3.1 or newer % \end{macrocode} % -% \subsection{Check against the regular \package{caption} package} +% \subsection{Check against the regular caption package} % \changes{v2.2}{2007/04/06}{Check against regular \package{caption} package added} % \changes{v2.2a}{2007/04/11}{Bugfix: Usage of \cs{caption@error} replaced by \cs{PackageError}} % % \begin{macrocode} \@ifpackageloaded{caption}{% - \PackageError{caption2}{You can't use both the caption *and* caption2 package}{\caption@eh}% + \PackageError{caption2}{% + You can't use both, the (current) caption *and*\MessageBreak + the (obsolete) caption2 package}\caption@eh \endinput }{} % \end{macrocode} @@ -229,10 +256,16 @@ % \end{macrocode} % \end{macro} % -% \changes{v2.1}{2002/02/20}{New ifs \cs{ifcaptionlabel} and \cs{ifignoreLTcapwidth}} +% \begin{macro}{\captionindent} +% \changes{v2.2b}{2007/08/12}{Re-added since the \package{caption3} kernel uses \cs{caption@indent} now} +% \cs{captionindent} will be used in caption style \texttt{indent} and specifies the indention +% after the first line. % \begin{macrocode} -\newif\ifcaption@temp +\let\captionindent\caption@indent % \end{macrocode} +% \end{macro} +% +% \changes{v2.1}{2002/02/20}{New ifs \cs{ifcaptionlabel} and \cs{ifignoreLTcapwidth}} % % \begin{macro}{\ifcaptionlabel} % If \cs{ifcaptionlabel} is not set the caption label should be suppressed; @@ -241,11 +274,11 @@ % \begin{macrocode} \def\ifcaptionlabel{% \ifcaption@star - \caption@tempfalse + \@tempswafalse \else - \caption@temptrue + \@tempswatrue \fi - \ifcaption@temp} + \if@tempswa} \def\captionlabeltrue{\caption@starfalse} \def\captionlabelfalse{\caption@startrue} % \end{macrocode} @@ -257,8 +290,8 @@ % \changes{v2.2}{2007/04/06}{New definition, based on \cs{caption@ifslc}} % \begin{macrocode} \def\ifonelinecaptions{% - \caption@ifslc{\caption@temptrue}{\caption@tempfalse}% - \ifcaption@temp} + \caption@ifslc{\@tempswatrue}{\@tempswafalse}% + \if@tempswa} \def\onelinecaptionstrue{\caption@setbool{slc}{1}} \def\onelinecaptionsfalse{\caption@setbool{slc}{0}} % \end{macrocode} @@ -839,7 +872,7 @@ % \end{macrocode} % \end{macro} % -% \subsubsection{Support of the \puresf{float} package} +% \subsubsection{Support of the float package} % % \begin{macrocode} \caption@ifpackage{float}{floatc@plain}{}{% @@ -954,7 +987,7 @@ \fi} % \end{macrocode} % -% \subsubsection{Support of the \puresf{longtable} package} +% \subsubsection{Support of the longtable package} % % \begin{macrocode} \caption@ifpackage{longtable}{LT@makecaption}{}{% @@ -1009,7 +1042,7 @@ \fi} % \end{macrocode} % -% \subsubsection{Support of the \puresf{subfigure} package} +% \subsubsection{Support of the subfigure package} % % Some of the following code will not work within \cs{if}, % because of the (yet) undefined \cs{if}\textit{xxx}s. So we simply define @@ -1285,32 +1318,47 @@ %</package> % \fi % +% \clearpage % \begin{thebibliography}{9} -% \bibitem{float} +% \bibitem{float} % Anselm Lingnau: -% \textsl{An Improved Environment for Floats}, +% \href{ftp://ctan.tug.org/tex-archive/macros/latex/contrib/float/float.pdf}% +% {\emph{An Improved Environment for Floats}}, % 2001/11/08 -% \bibitem{longtable} +% +% \bibitem{longtable} % David Carlisle: -% \textsl{The longtable package}, +% \href{ftp://ctan.tug.org/tex-archive/macros/latex/required/tools/longtable.pdf}% +% {\emph{The longtable package}}, % 2000/10/22 -% \bibitem{rotating} +% +% \bibitem{rotating} % Sebastian Rahtz and Leonor Barroca: -% \textsl{A style option for rotated objects in \LaTeX}, +% \iffalse +% \href{ftp://ctan.tug.org/tex-archive/macros/latex/contrib/rotating/rotating.dtx}% +% {\emph{A style option for rotated objects in \LaTeX}}, +% \else +% \emph{A style option for rotated objects in \LaTeX}, +% \fi % 1997/09/26 -% \bibitem{subfigure} -% Steven Douglas Cochran: -% \textsl{The subfigure package}, +% +% \bibitem{subfigure} +% Steven D. Cochran: +% \href{ftp://ctan.tug.org/tex-archive/macros/latex/contrib/subfigure/subfigure.pdf}% +% {\emph{The subfigure package}}, % 2002/02/14 -% \bibitem{A-W:GMS94} +% +% \bibitem{A-W:GMS94} % Michel Goossens, Frank Mittelbach and Alexander Samarin: % \newblock \textsl{The {\LaTeX} Companion}, % \newblock Addison-Wesley, Reading, Massachusetts, 1994. -% \bibitem{Anne} +% +% \bibitem{Anne} % Anne Br\"uggemann-Klein: % \textsl{Einf\"uhrung in die Dokumentverarbeitung}, % B.G. Teubner, Stuttgart, 1989 -% \bibitem{Kopka-E} +% +% \bibitem{Kopka-E} % Helmut Kopka: % \textsl{\LaTeX -- Erweiterungsm\"oglichkeiten}, % 3. \"uberarbeitete Auf\/lage, Addison-Wesley, Bonn, 1991 |