From c55f2ef12e38e9282affe822bee7b395651844b7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 15 Apr 2013 22:23:40 +0000 Subject: caption (15apr13) git-svn-id: svn://tug.org/texlive/trunk@29955 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/caption/CHANGELOG | 1 + Master/texmf-dist/doc/latex/caption/README | 2 +- Master/texmf-dist/doc/latex/caption/subcaption.pdf | Bin 133451 -> 133474 bytes .../texmf-dist/source/latex/caption/bicaption.dtx | 37 +-- Master/texmf-dist/source/latex/caption/caption.dtx | 113 +++++++-- Master/texmf-dist/source/latex/caption/caption.ins | 23 +- .../texmf-dist/source/latex/caption/caption3.dtx | 26 +- .../texmf-dist/source/latex/caption/subcaption.dtx | 9 +- .../texmf-dist/source/latex/caption/totalcount.dtx | 275 +++++++++++++++++++++ Master/texmf-dist/tex/latex/caption/bicaption.sty | 46 ++-- Master/texmf-dist/tex/latex/caption/caption.sty | 76 ++++-- Master/texmf-dist/tex/latex/caption/caption3.sty | 27 +- Master/texmf-dist/tex/latex/caption/totalcount.sty | 87 +++++++ 13 files changed, 613 insertions(+), 109 deletions(-) create mode 100644 Master/texmf-dist/source/latex/caption/totalcount.dtx create mode 100644 Master/texmf-dist/tex/latex/caption/totalcount.sty (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/caption/CHANGELOG b/Master/texmf-dist/doc/latex/caption/CHANGELOG index 558591df3dc..1fe8b11e58e 100644 --- a/Master/texmf-dist/doc/latex/caption/CHANGELOG +++ b/Master/texmf-dist/doc/latex/caption/CHANGELOG @@ -102,6 +102,7 @@ v3.3 (2013/01/06) - Adapted to the current version of memhfixc package, provided by the memoir document class - Fixed compatibility problem with breqn and nag packages - Corrects incorrect load order hyperref-float now (needs hyperref v6.82q or newer) +- New switch \ifsinglelinecaption for usage inside own commands added bicaption package diff --git a/Master/texmf-dist/doc/latex/caption/README b/Master/texmf-dist/doc/latex/caption/README index 463f81f287f..3315aec7182 100644 --- a/Master/texmf-dist/doc/latex/caption/README +++ b/Master/texmf-dist/doc/latex/caption/README @@ -1,7 +1,7 @@ ========================================================================== The `caption' package bundle -Copyright (C) 1994-2013 Axel Sommerfeldt +Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) License: LPPL = LaTeX Project Public Licence Maintenance Status: maintained (by Axel Sommerfeldt) diff --git a/Master/texmf-dist/doc/latex/caption/subcaption.pdf b/Master/texmf-dist/doc/latex/caption/subcaption.pdf index d419f3e3616..0ca4931af41 100644 Binary files a/Master/texmf-dist/doc/latex/caption/subcaption.pdf and b/Master/texmf-dist/doc/latex/caption/subcaption.pdf differ diff --git a/Master/texmf-dist/source/latex/caption/bicaption.dtx b/Master/texmf-dist/source/latex/caption/bicaption.dtx index e5fc48b2722..b68cec1aa87 100644 --- a/Master/texmf-dist/source/latex/caption/bicaption.dtx +++ b/Master/texmf-dist/source/latex/caption/bicaption.dtx @@ -2,10 +2,10 @@ % % This is file `bicaption.dtx'. % -% $Id: bicaption.dtx 63 2013-02-03 13:27:05Z sommerfeldt $ +% $Id: bicaption.dtx 68 2013-03-10 09:31:58Z sommerfeldt $ % $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/trunk/source/bicaption.dtx $ % -% Copyright (C) 2010-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +% Copyright (C) 2010-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) % % -------------------------------------------------------------------------- % @@ -28,7 +28,7 @@ % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. % % \fi -% \CheckSum{394} +% \CheckSum{398} % % \iffalse %<*driver> @@ -799,7 +799,7 @@ \NeedsTeXFormat{LaTeX2e}[1994/12/01] \def\caption@tempa$Id: #1 #2 #3-#4-#5 #6${% \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }} -\caption@tempa $Id: bicaption.dtx 63 2013-02-03 13:27:05Z sommerfeldt $ +\caption@tempa $Id: bicaption.dtx 68 2013-03-10 09:31:58Z sommerfeldt $ \ProvidesPackage{bicaption}[\caption@tempa v1.1-\caption@tempb Bilingual Captions (AR)] % \end{macrocode} % \begin{macrocode} @@ -998,11 +998,13 @@ % % \begin{macro}{\bicaption@addcontentsline} % \changes{v1.0}{2011/08/31}{This macro added} +% \changes{v1.1}{2013/03/10}{Bugfix: Delayed usage of \cs{caption@addsubcontentslines} added} % |\bicaption@addcontentsline|\marg{list entry \#2}\marg{type}\marg{list entry \#1}\par % Typeset both captions using the original version of |\caption@add|\-|contents|\-|line|. % \begin{macrocode} \newcommand\bicaption@addcontentsline[3]{% \begingroup + \let\caption@addsubcontentslines\@gobble % \end{macrocode} % Execute the options setup with |\captionsetup[bi]{|\ldots|}|. % \begin{macrocode} @@ -1010,24 +1012,25 @@ % \end{macrocode} % Do the first list entry, if requested. % \begin{macrocode} - \ifnum\bicaption@lang=2\relax \else - \begingroup - \caption@setoptions{bi-first}% - \bicaption@@addcontentsline{#2}{#3}% - \endgroup - \fi + \ifnum\bicaption@lang=2\relax \else + \begingroup + \caption@setoptions{bi-first}% + \bicaption@@addcontentsline{#2}{#3}% + \endgroup + \fi % \end{macrocode} % Do the second list entry, if requested. % \begin{macrocode} - \ifnum\bicaption@lang=1\relax \else - \begingroup - \caption@setoptions{bi-second}% - \bicaption@@addcontentsline{#2}{#1}% - \endgroup - \fi + \ifnum\bicaption@lang=1\relax \else + \begingroup + \caption@setoptions{bi-second}% + \bicaption@@addcontentsline{#2}{#1}% + \endgroup + \fi % \end{macrocode} % \begin{macrocode} - \endgroup} + \endgroup + \caption@addsubcontentslines{#2}} % \end{macrocode} % \begin{macrocode} \newcommand*\bicaption@@addcontentsline[2]{% diff --git a/Master/texmf-dist/source/latex/caption/caption.dtx b/Master/texmf-dist/source/latex/caption/caption.dtx index 1059245b1a2..64991dcd6fa 100644 --- a/Master/texmf-dist/source/latex/caption/caption.dtx +++ b/Master/texmf-dist/source/latex/caption/caption.dtx @@ -2,7 +2,7 @@ % % This is file `caption.dtx'. % -% $Id: caption.dtx 65 2013-02-03 15:09:48Z sommerfeldt $ +% $Id: caption.dtx 73 2013-04-14 19:40:46Z sommerfeldt $ % $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/trunk/source/caption.dtx $ % % Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) @@ -28,7 +28,7 @@ % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. % % \fi -% \CheckSum{3459} +% \CheckSum{3491} % % \iffalse %<*driver> @@ -77,9 +77,9 @@ % % \fi % -% \newcommand*\purerm[1]{{\upshape\mdseries\rmfamily #1}} -% \newcommand*\puresf[1]{{\upshape\mdseries\sffamily #1}} -% \newcommand*\purett[1]{{\upshape\mdseries\ttfamily #1}} +% \newcommand*\purerm[1]{\texorpdfstring{{\upshape\mdseries\rmfamily #1}}{#1}} +% \newcommand*\puresf[1]{\texorpdfstring{{\upshape\mdseries\sffamily #1}}{#1}} +% \newcommand*\purett[1]{\texorpdfstring{{\upshape\mdseries\ttfamily #1}}{#1}} % \let\class\puresf \let\package\puresf % \let\env\purett \let\opt\purett % @@ -223,7 +223,7 @@ \NeedsTeXFormat{LaTeX2e}[1994/12/01] \def\caption@tempa$Id: #1 #2 #3-#4-#5 #6${% \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }} -\caption@tempa $Id: caption.dtx 65 2013-02-03 15:09:48Z sommerfeldt $ +\caption@tempa $Id: caption.dtx 73 2013-04-14 19:40:46Z sommerfeldt $ \ProvidesPackage{caption}[\caption@tempa v3.3-\caption@tempb Customizing captions (AR)] % \end{macrocode} % @@ -641,9 +641,6 @@ \g@addto@macro\@tablecaptionabovetrue{\captionsetup*[table]{position=t}} \g@addto@macro\@tablecaptionabovefalse{\captionsetup*[table]{position=b}} % \end{macrocode} -% \end{macro} -% \end{macro} -% % \begin{macrocode} \if@tablecaptionabove \@tablecaptionabovetrue @@ -651,6 +648,31 @@ \@tablecaptionabovefalse \fi % \end{macrocode} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\@figurecaptionabovetrue} +% \begin{macro}{\@figurecaptionabovefalse} +% \changes{v3.3}{2013/02/15}{Support of \cs{@figurecaptionabovetrue} added} +% \begin{macrocode} + \caption@ifundefined\@figurecaptionabovetrue{}{% +% \end{macrocode} +% \begin{macrocode} + \g@addto@macro\@figurecaptionabovetrue{\captionsetup*[figure]{position=t}} + \g@addto@macro\@figurecaptionabovefalse{\captionsetup*[figure]{position=b}} +% \end{macrocode} +% \begin{macrocode} + \if@figurecaptionabove + \@figurecaptionabovetrue + \else + \@figurecaptionabovefalse + \fi +% \end{macrocode} +% \begin{macrocode} + }% +% \end{macrocode} +% \end{macro} +% \end{macro} % % \begin{macro}{\onelinecaptionstrue} % \begin{macro}{\onelinecaptionsfalse} @@ -659,9 +681,6 @@ \g@addto@macro\onelinecaptionstrue{\let\caption@ifslc\@firstoftwo} \g@addto@macro\onelinecaptionsfalse{\let\caption@ifslc\@secondoftwo} % \end{macrocode} -% \end{macro} -% \end{macro} -% % \begin{macrocode} \ifonelinecaptions \onelinecaptionstrue @@ -669,6 +688,8 @@ \onelinecaptionsfalse \fi % \end{macrocode} +% \end{macro} +% \end{macro} % % \begin{macro}{\@captionabovetrue} % \begin{macro}{\@captionabovefalse} @@ -829,6 +850,34 @@ % \end{macro} % \end{macro} % +% \begin{macro}{\caption@clrflag} +% \changes{v3.3}{2013/04/14}{This macro added} +% \begin{macro}{\caption@setflag} +% \changes{v3.3}{2013/04/14}{This macro added} +% Furthermore we introduce the macros \cs{caption@clrflag} and \cs{caption@setflag} +% for clearing resp.~setting these flags. +% \begin{macrocode} +\newcommand*\caption@clrflag[1]{% + \caption@chgflag{#1}{false}} +\newcommand*\caption@setflag[1]{% + \caption@chgflag{#1}{true}} +\newcommand*\caption@chgflag[2]{% + \global\csname caption@#1#2\endcsname} +% \end{macrocode} +% The \package{floatrow} package uses \cs{FR@loc@} to keep changes +% (flags, counters, \ldots) local. Since it is not aware of our flags above +% we need to extend that macro (if defined). +% \begin{macrocode} +\caption@AtBeginDocument{% + \caption@ifundefined\FR@loc@{}{% + \caption@InfoNoLine{floatrow package is loaded}% + \g@addto@macro\FR@loc@{% + \renewcommand*\caption@chgflag[2]{% + \csname caption@#1#2\endcsname}}}} +% \end{macrocode} +% \end{macro} +% \end{macro} +% % \begin{macro}{\caption@caption} % \changes{v3.0f}{2005/05/22}{Bugfix: \cs{ContinuedFloat} added} % \changes{v3.0f}{2005/06/13}{Support of \cs{caption*[]} removed} @@ -1538,9 +1587,9 @@ % (if |hypcap=|\-|true| and the \package{hypcap} package is not loaded). % \begin{macrocode} \newcommand*\caption@settype{% - \global\caption@captionfalse - \global\caption@subcaptionfalse - \global\caption@ContinuedFloatfalse + \caption@clrflag{caption}% + \caption@clrflag{subcaption}% + \caption@clrflag{ContinuedFloat}% \caption@set@type} % \end{macrocode} % \begin{macrocode} @@ -1847,7 +1896,7 @@ % \end{macrocode} % \begin{macrocode} \newcommand*\caption@@ContinuedFloat[1]{% - \global\caption@ContinuedFloattrue + \caption@setflag{ContinuedFloat}% \stepcounter{ContinuedFloat}% \caption@@@ContinuedFloat{#1}} % \end{macrocode} @@ -1919,12 +1968,12 @@ % therefore ending this part, so we set the flag to |false| in this case.) % \begin{macrocode} \caption@fixposition - \caption@iftop{\global\caption@captiontrue}{\global\caption@captionfalse}% + \caption@iftop\caption@setflag\caption@clrflag{caption}% % \end{macrocode} % This part does not contain content (like sub-figures) yet, % so we set |\if|\-|caption@sub|\-|caption| to |false|. % \begin{macrocode} - \global\caption@subcaptionfalse + \caption@clrflag{subcaption}% % \end{macrocode} % Support of the \textsf{memoir} document class. % \begin{macrocode} @@ -1934,7 +1983,7 @@ \newcommand*\caption@ref@stepcounter{% \ifcaption@ContinuedFloat \let\caption@tempa\caption@@refcounter - \global\caption@ContinuedFloatfalse + \caption@clrflag{ContinuedFloat}% \else \let\caption@tempa\caption@@refstepcounter \ifcaption@caption \else @@ -1970,7 +2019,7 @@ % \end{macrocode} % \begin{macrocode} \newcommand*\caption@prepare@stepcounter[2]{% - \flushsubcaptionlistentries[#2stepcounter]% + \caption@addsubcontentslines{#2stepcounter}% \caption@resetContinuedFloat{#1}} % \end{macrocode} % \begin{macrocode} @@ -2246,14 +2295,15 @@ \ifcaption@caption \else % no \caption in this part of the (floating) environment yet \let\caption@add@contentsline\caption@addsubcontentsline + \let\caption@addsubcontentslines\@gobble \ifcaption@subcaption \else % no \subcaption in this part of the (floating) environment yet \ifcaption@ContinuedFloat - \global\caption@ContinuedFloatfalse + \caption@clrflag{ContinuedFloat}% \else \caption@@stepcounter\@captype \fi - \global\caption@subcaptiontrue + \caption@setflag{subcaption}% \fi \fi % \end{macrocode} @@ -2334,6 +2384,7 @@ % \changes{v3.2}{2011/06/26}{Uses \cs{caption@@addcontentsline} instead of \cs{addcontentsline} now} % \changes{v3.2c}{2011/08/19}{Uses \cs{caption@gobble} instead of \cs{@gobble} now} % \changes{v3.3}{2012/01/15}{Debug message added} +% \changes{v3.3}{2013/03/10}{A single \cs{protect} replaced by \cs{noexpand}} % Add a pending sub-caption list entry. % \begin{macrocode} \newcommand*\caption@addsubcontentsline[4]{% @@ -2348,16 +2399,21 @@ \ifx\@currentHref\@undefined \else \noexpand\def\noexpand\@currentHref{\@currentHref}% \fi - \protect\caption@@@addcontentsline{#1}{#2}{#3}{#4}}}% + \noexpand\caption@@@addcontentsline{#1}{#2}{#3}{#4}}}% \@tempa} % \end{macrocode} % \end{macro} % % \begin{macro}{\flushsubcaptionlistentries} % \changes{v3.3}{2012/01/15}{Renamed from \cs{caption@addsubcontentslines} to \cs{flushsubcaptionlistentries}} +% \changes{v3.3}{2013/03/10}{Bugfix: Missing redefinition of \cs{caption@addsubcontentslines} added} % Writes pending sub-caption list entries. % \begin{macrocode} -\newcommand*\flushsubcaptionlistentries[1][user]{% +\newcommand*\flushsubcaptionlistentries{% + \caption@addsubcontentslines{user}} +% \end{macrocode} +% \begin{macrocode} +\renewcommand*\caption@addsubcontentslines[1]{% \caption@Debug{\string\flushsubcaptionlistentries (#1)}% \begingroup \caption@subcontentslines @@ -2372,19 +2428,19 @@ \AtBeginDocument{\caption@ifundefined\chapter{}{% \let\caption@chapter@ORI\chapter \def\chapter{% - \flushsubcaptionlistentries[chapter]\caption@chapter@ORI}}} + \caption@addsubcontentslines{chapter}\caption@chapter@ORI}}} % \end{macrocode} % Same for \cs{appendix}. % \begin{macrocode} \AtBeginDocument{\caption@ifundefined\appendix{}{% \let\caption@appendix@ORI\appendix \def\appendix{% - \flushsubcaptionlistentries[appendix]\caption@appendix@ORI}}} + \caption@addsubcontentslines{appendix}\caption@appendix@ORI}}} % \end{macrocode} % Flush the list of pending sub-caption list entries at the end of the document. % \begin{macrocode} \AtEndDocument{% - \flushsubcaptionlistentries[AtEndDocument]} + \caption@addsubcontentslines{AtEndDocument}} % \end{macrocode} % \end{macro} % @@ -3826,6 +3882,7 @@ % % \begin{macro}{\caption@wincaption} % \changes{v3.1d}{2007/10/25}{Missing \% added} +% \changes{v3.3}{2013/04/14}{\cs{caption@ContinuedFloattrue} added} % This one finally typesets the caption using |\caption|. % \begin{macrocode} \newcommand\caption@wincaption[1]{% @@ -3837,6 +3894,8 @@ \let\caption@makecurrent\@gobbletwo \let\caption@@start\relax \caption@prepareslc + \else + \caption@ContinuedFloattrue \fi % \end{macrocode} % The argument |#1| could contain simply the caption text diff --git a/Master/texmf-dist/source/latex/caption/caption.ins b/Master/texmf-dist/source/latex/caption/caption.ins index 2933c9d61c1..e431d36f94e 100644 --- a/Master/texmf-dist/source/latex/caption/caption.ins +++ b/Master/texmf-dist/source/latex/caption/caption.ins @@ -6,7 +6,7 @@ \preamble -Copyright (C) 1994-2013 Axel Sommerfeldt +Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) http://sourceforge.net/projects/latex-caption/ @@ -24,11 +24,17 @@ This work has the LPPL maintenance status "maintained". This Current Maintainer of this work is Axel Sommerfeldt. -This work consists of the files caption.ins, caption.dtx, caption2.dtx, -caption3.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx, and newfloat.dtx, -the derived files caption.sty, caption2.sty, caption3.sty, -bicaption.sty, ltcaption.sty, subcaption.sty, and newfloat.sty, -and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. +This work consists of the files + CHANGELOG, README, SUMMARY, caption.ins, + caption.dtx, caption2.dtx, caption3.dtx, + bicaption.dtx, ltcaption.dtx, subcaption.dtx, + newfloat.dtx, and totalcount.dtx +the derived files + caption.sty, caption2.sty, caption3.sty, + bicaption.sty, ltcaption.sty, subcaption.sty, + newfloat.sty, and totalcount.sty +and the user manuals + caption-deu.tex, caption-eng.tex, and caption-rus.tex. \endpreamble @@ -39,13 +45,14 @@ and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. \generate{\file{ltcaption.sty}{\from{ltcaption.dtx}{package}}} \generate{\file{subcaption.sty}{\from{subcaption.dtx}{package}}} \generate{\file{newfloat.sty}{\from{newfloat.dtx}{package}}} +\generate{\file{totalcount.sty}{\from{totalcount.dtx}{package}}} \Msg{***********************************************************} \Msg{*} \Msg{* To finish the installation you have to move the files} \Msg{* `caption.sty', `caption2.sty', 'caption3.sty',} -\Msg{* `bicaption.sty', `ltcaption.sty', `subcaption.sty', and} -\Msg{* `newfloat.sty'} +\Msg{* `bicaption.sty', `ltcaption.sty', `subcaption.sty',} +\Msg{* `newfloat.sty', and `totalcount.sty'} \Msg{* into a directory searched by TeX.} \Msg{*} \Msg{* To produce the documentation run the file} diff --git a/Master/texmf-dist/source/latex/caption/caption3.dtx b/Master/texmf-dist/source/latex/caption/caption3.dtx index 6a2d11419ab..75d79b1a2ca 100644 --- a/Master/texmf-dist/source/latex/caption/caption3.dtx +++ b/Master/texmf-dist/source/latex/caption/caption3.dtx @@ -2,7 +2,7 @@ % % This is file `caption3.dtx'. % -% $Id: caption3.dtx 63 2013-02-03 13:27:05Z sommerfeldt $ +% $Id: caption3.dtx 71 2013-04-14 15:14:26Z sommerfeldt $ % $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/trunk/source/caption3.dtx $ % % Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) @@ -28,7 +28,7 @@ % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. % % \fi -% \CheckSum{3470} +% \CheckSum{3477} % % \iffalse %<*driver> @@ -203,7 +203,7 @@ \NeedsTeXFormat{LaTeX2e}[1994/12/01] \def\caption@tempa$Id: #1 #2 #3-#4-#5 #6${% \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }} -\caption@tempa $Id: caption3.dtx 63 2013-02-03 13:27:05Z sommerfeldt $ +\caption@tempa $Id: caption3.dtx 71 2013-04-14 15:14:26Z sommerfeldt $ \ProvidesPackage{caption3}[\caption@tempa v1.5-\caption@tempb caption3 kernel (AR)] % \end{macrocode} % @@ -3055,7 +3055,8 @@ {\ignorespaces #2}}}} % \end{macrocode} % \begin{macrocode} -\newcommand*\caption@add@contentsline{\caption@@@addcontentsline} +\newcommand*\caption@add@contentsline{% + \caption@@@addcontentsline} % \end{macrocode} % \begin{macrocode} \newcommand*\caption@@@addcontentsline[4]{% @@ -3259,11 +3260,13 @@ % \changes{v1.1d}{2007/10/23}{`SingleLine' renamed to `singleline' for consistency} % \changes{v1.3}{2010/09/04}{Split into \cs{caption@slc} and \cs{caption@@slc}} % \changes{v1.5}{2012/12/26}{Merged into a single macro again} +% \changes{v3.3}{2013/04/14}{Definition and usage of \cs{ifsinglelinecaption} added} % |\caption@slc|\marg{label}\marg{text}\marg{single-line-code}\marg{multi-line-code}\par % This one does the single-line-check. % \begin{macrocode} \newcommand\caption@slc[4]{% \caption@Debug{Begin SLC}% + \singlelinecaptiontrue \begingroup \caption@singleline \let\caption@hj\@empty @@ -3272,6 +3275,7 @@ \sbox\@tempboxa{\caption@@@make{#1}{#2}}% \ifdim\wd\@tempboxa>\captionwidth \endgroup + \singlelinecaptionfalse #4% \else \endgroup @@ -3280,6 +3284,9 @@ \caption@Debug{End SLC}} % \end{macrocode} % \begin{macrocode} +\newif\ifsinglelinecaption +% \end{macrocode} +% \begin{macrocode} \newcommand*\caption@singleline{% \caption@xsetup\caption@opt@singleline \let\caption@fmt\caption@slfmt} @@ -3299,6 +3306,7 @@ % \changes{v1.3}{2011/07/07}{Bugfix 11-07-06: Redefinition of \cs{footnote} and \cs{footnotemark} added, redefinition of \cs{stepcounter} and \cs{refstepcounter} dropped} % \changes{v1.4a}{2011/10/21}{Redefinition of \cs{pagenote} from \textsf{memoir} document class added} % \changes{v1.4a}{2011/10/22}{Redefinition of \cs{footnote} revised} +% \changes{v3.3}{2013/04/13}{Redefinition os \cs{glsunset} added} % Re-define anything which would disturb the single-line-check. % \begin{macrocode} \newcommand*\caption@prepareslc{% @@ -3316,6 +3324,16 @@ % \begin{macrocode} \let\pagenote\caption@gobble % \end{macrocode} +% Adaption to the \package{glossaries} package.\par +% Please note that while this adaption is usually sufficient +% it could give incorrect measuring results if \cs{gls} is both used +% for the very first time and more than once (for a particular acronym). +% The alternative would be using internal macros of the +% \package{glossaries} package which I would like to avoid.\par +% See also \url{http://tex.stackexchange.com/questions/108368} +% \begin{macrocode} + \let\glsunset\@gobble +% \end{macrocode} % \begin{macrocode} } % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/caption/subcaption.dtx b/Master/texmf-dist/source/latex/caption/subcaption.dtx index 60254f632ca..9723413040f 100644 --- a/Master/texmf-dist/source/latex/caption/subcaption.dtx +++ b/Master/texmf-dist/source/latex/caption/subcaption.dtx @@ -2,7 +2,7 @@ % % This is file `subcaption.dtx'. % -% $Id: subcaption.dtx 63 2013-02-03 13:27:05Z sommerfeldt $ +% $Id: subcaption.dtx 68 2013-03-10 09:31:58Z sommerfeldt $ % $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/trunk/source/subcaption.dtx $ % % Copyright (C) 2007-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) @@ -647,12 +647,15 @@ % % \subsection{Referencing sub-figures without sub-captions} % +% \DescribeMacro\phantomsubcaption +% \DescribeMacro\phantomcaption % If you don't want to give a sub-figure a caption, because the picture itself % already contains the caption, or for some other reason, you can use the command % \begin{quote} % |\phantomsubcaption| % \end{quote} -% itstead of |\sub|\-|caption|, or -- when inside a |sub|\-|figure| or |sub|\-|table| environment -- +% instead of |\sub|\-|caption|, or +% -- when inside a |sub|\-|figure| or |sub|\-|table| environment -- % |\phantom|\-|caption| instead of |\caption|. % |\phantom|\-|sub|\-|caption| and |\phantom|\-|caption| do not have any arguments, and % they do not generate any output, but give you an anchor for a |\label| command @@ -899,7 +902,7 @@ \NeedsTeXFormat{LaTeX2e}[1994/12/01] \def\caption@tempa$Id: #1 #2 #3-#4-#5 #6${% \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }} -\caption@tempa $Id: subcaption.dtx 63 2013-02-03 13:27:05Z sommerfeldt $ +\caption@tempa $Id: subcaption.dtx 68 2013-03-10 09:31:58Z sommerfeldt $ \ProvidesPackage{subcaption}[\caption@tempa v1.1-\caption@tempb Sub-captions (AR)] % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/caption/totalcount.dtx b/Master/texmf-dist/source/latex/caption/totalcount.dtx new file mode 100644 index 00000000000..37e97712806 --- /dev/null +++ b/Master/texmf-dist/source/latex/caption/totalcount.dtx @@ -0,0 +1,275 @@ +% \iffalse meta-comment +% +% This is file `totalcount.dtx'. +% +% Copyright (C) 2008 Axel Sommerfeldt +% +% -------------------------------------------------------------------------- +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3 +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of LaTeX +% version 2003/12/01 or later. +% +% This work has the LPPL maintenance status "maintained". +% +% This Current Maintainer of this work is Axel Sommerfeldt. +% +% This work consists of the files totalcount.ins and totalcount.dtx, +% and the derived file totalcount.sty. +% +% \fi +% \CheckSum{107} +% +% \iffalse +%<*driver> +\NeedsTeXFormat{LaTeX2e}[1994/12/01] +\ProvidesFile{totalcount.drv}[2008/02/25 v1.0 Total values of counters] +\hbadness=9999 \newcount\hbadness \hfuzz=74pt % Make TeX shut up. +%\errorcontextlines=3 +% +\documentclass{ltxdoc} +\setlength\parindent{0pt} +\setlength\parskip{\smallskipamount} +% +\usepackage{ifpdf} +\ifpdf + \usepackage{mathptmx,courier} + \usepackage[scaled=0.90]{helvet} +% \addtolength\marginparwidth{15pt} +\fi +% +\usepackage[bottom]{footmisc} +\usepackage{hypdoc} +\ifpdf\usepackage{hypdestopt}\fi +\hypersetup{pdfkeywords={LaTeX, package, totalcount},pdfstartpage={},pdfstartview={}} +% +\usepackage{totalcount}[2008/02/16] +% +\newcommand*\purerm[1]{{\upshape\mdseries\rmfamily #1}} +\newcommand*\puresf[1]{{\upshape\mdseries\sffamily #1}} +\newcommand*\purett[1]{{\upshape\mdseries\ttfamily #1}} +\let\package\puresf +\let\env\purett \let\opt\purett +% +\newcommand*\csmarg[1]{\texttt{\char`\{#1\char`\}}} +\newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}} +\newcommand*\version[2][]{$v#2$} +\newcommand*\x{\discretionary{-}{}{}} +\newcommand*\xx{\discretionary{}{}{}} +% +\usepackage{marvosym} +\newcommand*\MARGINSYM[1]{\hskip 1sp \marginpar{\raggedleft\textcolor{blue}{{#1}}}} +\newenvironment{info}{\par\bigskip\csname info*\endcsname}{\csname endinfo*\endcsname} +\newenvironment{info*}% + {\small + \MARGINSYM{\vbox to \ht\strutbox{\LARGE\Info}}% + \ignorespaces}% + {\par} +% +\begin{document} + \DocInput{totalcount.dtx} +\end{document} +% +% \fi +% +% \def\thispackage{the \package{totalcount} package} +% \def\Thispackage{The \package{totalcount} package} +% +% \GetFileInfo{totalcount.drv} +% \let\docdate\filedate +% \GetFileInfo{totalcount.sty} +% +% \title{\texorpdfstring{\Thispackage\thanks{%^^A +% This package has version number \fileversion, last revised \filedate.}}%^^A +% {The totalcount package}} +% \author{Axel Sommerfeldt\\ +% \url{http://sourceforge.net/projects/latex-caption/}} +% \date{\docdate} +% \maketitle +% +% \begin{abstract} +% TODO\ldots +% \end{abstract} +% +% \subsection*{Introduction} +% Based on the idea here:\\ +% \url{http://texnik.dante.de/cgi-bin/mainFAQ.cgi?file=counter/counter#number} +% +% TODO\ldots +% +% \iffalse +% --------------------------------------------------------------------------- % +% \fi +% +% \StopEventually{}%^^A +% +% \iffalse +% --------------------------------------------------------------------------- % +% \fi +% +% \DoNotIndex{\\,\_,\ ,\@@par} +% \DoNotIndex{\@bsphack} +% \DoNotIndex{\@car,\@cdr,\@classoptionslist,\@cons,\@currext,\@currname} +% \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} +% \DoNotIndex{\@for,\@firstofone,\@firstoftwo} +% \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} +% \DoNotIndex{\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@namedef,\@nameuse} +% \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} +% \DoNotIndex{\@removeelement,\@restorepar,\@secondoftwo,\@setpar} +% \DoNotIndex{\@tempa,\@tempboxa,\@tempdima,\@tempdimb,\@tempdimc,\@tempb,\@tempc} +% \DoNotIndex{\@testopt} +% \DoNotIndex{\@undefined,\@unprocessedoptions,\@unusedoptionlist} +% \DoNotIndex{\p@,\z@} +% \DoNotIndex{\active,\addtocounter,\addtolength,\advance,\aftergroup} +% \DoNotIndex{\baselineskip,\begin,\begingroup,\bfseries,\box} +% \DoNotIndex{\catcode,\centering,\changes,\csname,\def,\divide,\do,\downarrow} +% \DoNotIndex{\edef,\else,\empty,\end,\endcsname,\endgraf,\endgroup,\expandafter} +% \DoNotIndex{\fi,\footnotesize,\global} +% \DoNotIndex{\hangindent,\hbox,\hfil,\hsize,\hskip,\hspace,\hss} +% \DoNotIndex{\ifcase,\ifdim,\ifnum,\ifodd,\ifvoid,\ifvmode} +% \DoNotIndex{\ifx,\ignorespaces,\itshape} +% \DoNotIndex{\Large,\large,\leavevmode,\leftmargini,\leftskip,\let,\linewidth} +% \DoNotIndex{\llap,\long,\m@ne,\margin,\mdseries,\message} +% \DoNotIndex{\newcommand,\newdimen,\newlength,\newline,\newif,\newsavebox} +% \DoNotIndex{\next,\nobreak,\nobreakspace,\noexpand,\noindent,\numberline} +% \DoNotIndex{\normalcolor,\normalfont,\normalsize,\or,\par,\parbox,\parfillskip} +% \DoNotIndex{\parindent,\parskip,\prevdepth,\protect,\protected@edef,\protected@write} +% \DoNotIndex{\providecommand,\quad} +% \DoNotIndex{\raggedleft,\raggedright,\relax,\renewcommand,\RequirePackage} +% \DoNotIndex{\rightskip,\rmfamily} +% \DoNotIndex{\sbox,\scriptsize,\scshape,\setbox,\setlength,\sffamily,\slshape} +% \DoNotIndex{\small,\string,\space,\strut} +% \DoNotIndex{\textheight,\the,\toks@,\typeout,\ttfamily} +% \DoNotIndex{\unvbox,\uparrow,\upshape,\usebox,\usepackage} +% \DoNotIndex{\value,\vbox,\vsize,\vskip,\wd,\width,\z@skip} +% \DoNotIndex{\AtBeginDocument,\AtEndOfPackage,\CurrentOption,\DeclareOption} +% \DoNotIndex{\ExecuteOptions,\GenericWarning,\IfFileExists,\InputIfFileExists} +% \DoNotIndex{\NeedsTeXFormat,\MessageBreak} +% \DoNotIndex{\PackageError,\PackageInfo,\PackageWarning,\PackageWarningNoLine} +% \DoNotIndex{\PassOptionsToPackage,\ProcessOptions,\ProvidesPackage} +% +% \iffalse +% --------------------------------------------------------------------------- % +% \fi +% +% \setlength{\parskip}{0pt plus 1pt} +% \changes{v1.0}{2008/02/16}{First version} +% +% \iffalse +% --------------------------------------------------------------------------- % +% \fi +% +% \clearpage +% \section{The implementation} +% \iffalse +%<*package> +% \fi +% +% \subsection{Identification} +% +% \begin{macrocode} +\NeedsTeXFormat{LaTeX2e}[1994/12/01] +\ProvidesPackage{totalcount}[2008/02/27 v0.7 Total values of counters (AR)] +% \end{macrocode} +% +% \subsection{Initial code} +% +% \begin{macro}{\DeclareTotalCounter} +% |\DeclareTotalCounter|\marg{counter name} +% \begin{macrocode} +\newcommand*\DeclareTotalCounter[1]{% + \@ifundefined{c@#1}% + {\PackageError{totalcount}{Undefined counter `#1'}\@ehc}% + {\newcounter{total@#1}% + \@namedef{total#1s}{\nfss@text{\reset@font\bfseries ??}}% + \@namedef{total#1es}{\nfss@text{\reset@font\bfseries ??}}% +% \PackageWarning{totalcounter}{Total counter `#1' on page \thepage +% \space not\MessageBreak available yet}}% + \@cons\total@counters{{#1}}}} +\@onlypreamble\DeclareTotalCounter +% \end{macrocode} +% \begin{macrocode} +\let\total@counters\@empty +% \end{macrocode} +% \end{macro} +% +% \subsection{Declaration of options} +% +% \begin{macrocode} +\newcommand*\total@xspace{} +\DeclareOption{xspace}{\renewcommand*\total@xspace{\xspace}} +% \end{macrocode} +% \begin{macrocode} +\DeclareOption*{\expandafter\DeclareTotalCounter\expandafter{\CurrentOption}} +% \end{macrocode} +% +% \subsection{Execution of options} +% +% \begin{macrocode} +\ProcessOptions\relax +\ifx\total@xspace\@empty\else + \RequirePackage{xspace} +\fi +% \end{macrocode} +% +% \subsection{Main code} +% +% \begin{macro}{\total@addtocounter} +% |\total@addtocounter|\marg{counter name} +% \begin{macrocode} +\newcommand*\total@addtocounter[1]{% + \@ifundefined{c@total@#1}{}{% + \addtocounter{total@#1}{\value{#1}}}} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\@stpelt} +% |\@stpelt|\marg{counter name} +% \begin{macrocode} +\let\total@stpelt@ORI\@stpelt +\renewcommand*\@stpelt[1]{% + \total@addtocounter{#1}\total@stpelt@ORI{#1}} +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} +\AtBeginDocument{\AtEndDocument{% + \begingroup + \@tempswafalse + \def\@elt#1{% + \total@addtocounter{#1}% + \xdef\total@tempa{\the\value{total@#1}}% + \xdef\total@tempb{\total@tempa\noexpand\total@xspace}% + \expandafter\ifx\csname total#1s\endcsname\total@tempb \else + \@tempswatrue + \fi + \if@filesw + \immediate\write\@mainaux{% + \string\gdef\string\total#1s{\total@tempa\string\total@xspace}% + \string\gdef\string\total#1es{\total@tempa\string\total@xspace}}% + \fi}% + \total@counters + \if@tempswa + \PackageWarningNoLine{totalcount}{% + Total counter(s) have changed.\MessageBreak + Rerun to get them right}% + \fi + \endgroup}}% +% \end{macrocode} +% +% \iffalse +% +% \fi +% +% \iffalse +% --------------------------------------------------------------------------- % +% \fi +% +% \Finale +% +\endinput diff --git a/Master/texmf-dist/tex/latex/caption/bicaption.sty b/Master/texmf-dist/tex/latex/caption/bicaption.sty index f3ca79f4242..d6a126aad03 100644 --- a/Master/texmf-dist/tex/latex/caption/bicaption.sty +++ b/Master/texmf-dist/tex/latex/caption/bicaption.sty @@ -24,16 +24,22 @@ %% %% This Current Maintainer of this work is Axel Sommerfeldt. %% -%% This work consists of the files caption.ins, caption.dtx, caption2.dtx, -%% caption3.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx, and newfloat.dtx, -%% the derived files caption.sty, caption2.sty, caption3.sty, -%% bicaption.sty, ltcaption.sty, subcaption.sty, and newfloat.sty, -%% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. +%% This work consists of the files +%% CHANGELOG, README, SUMMARY, caption.ins, +%% caption.dtx, caption2.dtx, caption3.dtx, +%% bicaption.dtx, ltcaption.dtx, subcaption.dtx, +%% newfloat.dtx, and totalcount.dtx +%% the derived files +%% caption.sty, caption2.sty, caption3.sty, +%% bicaption.sty, ltcaption.sty, subcaption.sty, +%% newfloat.sty, and totalcount.sty +%% and the user manuals +%% caption-deu.tex, caption-eng.tex, and caption-rus.tex. %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] \def\caption@tempa$Id: #1 #2 #3-#4-#5 #6${% \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }} -\caption@tempa $Id: bicaption.sty 62 2013-02-03 10:40:15Z sommerfeldt $ +\caption@tempa $Id: bicaption.sty 68 2013-03-10 09:31:58Z sommerfeldt $ \ProvidesPackage{bicaption}[\caption@tempa v1.1-\caption@tempb Bilingual Captions (AR)] \RequirePackage{caption}[2012/12/26] % needs v3.3 or newer \caption@AtBeginDocument{\caption@ifcompatibility{% @@ -110,20 +116,22 @@ \global\let\bicaption@lentry\@undefined}} \newcommand\bicaption@addcontentsline[3]{% \begingroup + \let\caption@addsubcontentslines\@gobble \caption@setoptions{bi}% - \ifnum\bicaption@lang=2\relax \else - \begingroup - \caption@setoptions{bi-first}% - \bicaption@@addcontentsline{#2}{#3}% - \endgroup - \fi - \ifnum\bicaption@lang=1\relax \else - \begingroup - \caption@setoptions{bi-second}% - \bicaption@@addcontentsline{#2}{#1}% - \endgroup - \fi - \endgroup} + \ifnum\bicaption@lang=2\relax \else + \begingroup + \caption@setoptions{bi-first}% + \bicaption@@addcontentsline{#2}{#3}% + \endgroup + \fi + \ifnum\bicaption@lang=1\relax \else + \begingroup + \caption@setoptions{bi-second}% + \bicaption@@addcontentsline{#2}{#1}% + \endgroup + \fi + \endgroup + \caption@addsubcontentslines{#2}} \newcommand*\bicaption@@addcontentsline[2]{% \caption@ifcontentsline{#2}{% \bicaption@selectlanguage\@secondoftwo diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty index 8e6755e630d..efabb8d19d0 100644 --- a/Master/texmf-dist/tex/latex/caption/caption.sty +++ b/Master/texmf-dist/tex/latex/caption/caption.sty @@ -6,7 +6,7 @@ %% %% caption.dtx (with options: `package') %% -%% Copyright (C) 1994-2013 Axel Sommerfeldt +%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) %% %% http://sourceforge.net/projects/latex-caption/ %% @@ -24,17 +24,23 @@ %% %% This Current Maintainer of this work is Axel Sommerfeldt. %% -%% This work consists of the files caption.ins, caption.dtx, caption2.dtx, -%% caption3.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx, and newfloat.dtx, -%% the derived files caption.sty, caption2.sty, caption3.sty, -%% bicaption.sty, ltcaption.sty, subcaption.sty, and newfloat.sty, -%% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. +%% This work consists of the files +%% CHANGELOG, README, SUMMARY, caption.ins, +%% caption.dtx, caption2.dtx, caption3.dtx, +%% bicaption.dtx, ltcaption.dtx, subcaption.dtx, +%% newfloat.dtx, and totalcount.dtx +%% the derived files +%% caption.sty, caption2.sty, caption3.sty, +%% bicaption.sty, ltcaption.sty, subcaption.sty, +%% newfloat.sty, and totalcount.sty +%% and the user manuals +%% caption-deu.tex, caption-eng.tex, and caption-rus.tex. %% % bicaption.sty, ltcaption.sty, subcaption.sty, and newfloat.sty, \NeedsTeXFormat{LaTeX2e}[1994/12/01] \def\caption@tempa$Id: #1 #2 #3-#4-#5 #6${% \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }} -\caption@tempa $Id: caption.sty 65 2013-02-03 15:09:48Z sommerfeldt $ +\caption@tempa $Id: caption.sty 73 2013-04-14 19:40:46Z sommerfeldt $ \ProvidesPackage{caption}[\caption@tempa v3.3-\caption@tempb Customizing captions (AR)] \RequirePackage{caption3}[2012/12/26] % needs v1.5 or newer \caption@ifbool{documentclass}{}{% @@ -206,6 +212,15 @@ \else \@tablecaptionabovefalse \fi + \caption@ifundefined\@figurecaptionabovetrue{}{% + \g@addto@macro\@figurecaptionabovetrue{\captionsetup*[figure]{position=t}} + \g@addto@macro\@figurecaptionabovefalse{\captionsetup*[figure]{position=b}} + \if@figurecaptionabove + \@figurecaptionabovetrue + \else + \@figurecaptionabovefalse + \fi + }% \g@addto@macro\onelinecaptionstrue{\let\caption@ifslc\@firstoftwo} \g@addto@macro\onelinecaptionsfalse{\let\caption@ifslc\@secondoftwo} \ifonelinecaptions @@ -279,6 +294,18 @@ \newif\ifcaption@caption \newif\ifcaption@subcaption \newif\ifcaption@ContinuedFloat +\newcommand*\caption@clrflag[1]{% + \caption@chgflag{#1}{false}} +\newcommand*\caption@setflag[1]{% + \caption@chgflag{#1}{true}} +\newcommand*\caption@chgflag[2]{% + \global\csname caption@#1#2\endcsname} +\caption@AtBeginDocument{% + \caption@ifundefined\FR@loc@{}{% + \caption@InfoNoLine{floatrow package is loaded}% + \g@addto@macro\FR@loc@{% + \renewcommand*\caption@chgflag[2]{% + \csname caption@#1#2\endcsname}}}} \def\caption@caption{% \caption@iftype {\caption@checkgrouplevel\@empty\caption @@ -700,9 +727,9 @@ {\caption@@settype{sub}*{sub\@captype}}% {\caption@@settype{sub}{sub\@captype}}}% \newcommand*\caption@settype{% - \global\caption@captionfalse - \global\caption@subcaptionfalse - \global\caption@ContinuedFloatfalse + \caption@clrflag{caption}% + \caption@clrflag{subcaption}% + \caption@clrflag{ContinuedFloat}% \caption@set@type} \newcommand*\caption@set@type{% \caption@@settype{}} @@ -839,7 +866,7 @@ \caption@Error{Continued `#1' after `\caption@CFtype'}% \fi} \newcommand*\caption@@ContinuedFloat[1]{% - \global\caption@ContinuedFloattrue + \caption@setflag{ContinuedFloat}% \stepcounter{ContinuedFloat}% \caption@@@ContinuedFloat{#1}} \newcommand*\caption@@@ContinuedFloat[1]{% @@ -865,13 +892,13 @@ {\caption@Error{No float type '#1' defined}}% {\caption@ref@stepcounter{#1}% \caption@fixposition - \caption@iftop{\global\caption@captiontrue}{\global\caption@captionfalse}% - \global\caption@subcaptionfalse + \caption@iftop\caption@setflag\caption@clrflag{caption}% + \caption@clrflag{subcaption}% \@nameuse{donemaincaptiontrue}}} \newcommand*\caption@ref@stepcounter{% \ifcaption@ContinuedFloat \let\caption@tempa\caption@@refcounter - \global\caption@ContinuedFloatfalse + \caption@clrflag{ContinuedFloat}% \else \let\caption@tempa\caption@@refstepcounter \ifcaption@caption \else @@ -898,7 +925,7 @@ \caption@prepare@stepcounter{#1}{}% \caption@@@stepcounter{#1}} \newcommand*\caption@prepare@stepcounter[2]{% - \flushsubcaptionlistentries[#2stepcounter]% + \caption@addsubcontentslines{#2stepcounter}% \caption@resetContinuedFloat{#1}} \newcommand*\caption@@@refstepcounter{\refstepcounter} \newcommand*\caption@@@stepcounter{\stepcounter} @@ -968,13 +995,14 @@ \caption@warmup \ifcaption@caption \else \let\caption@add@contentsline\caption@addsubcontentsline + \let\caption@addsubcontentslines\@gobble \ifcaption@subcaption \else \ifcaption@ContinuedFloat - \global\caption@ContinuedFloatfalse + \caption@clrflag{ContinuedFloat}% \else \caption@@stepcounter\@captype \fi - \global\caption@subcaptiontrue + \caption@setflag{subcaption}% \fi \fi \c@ContinuedFloat=0\relax @@ -1024,9 +1052,11 @@ \ifx\@currentHref\@undefined \else \noexpand\def\noexpand\@currentHref{\@currentHref}% \fi - \protect\caption@@@addcontentsline{#1}{#2}{#3}{#4}}}% + \noexpand\caption@@@addcontentsline{#1}{#2}{#3}{#4}}}% \@tempa} -\newcommand*\flushsubcaptionlistentries[1][user]{% +\newcommand*\flushsubcaptionlistentries{% + \caption@addsubcontentslines{user}} +\renewcommand*\caption@addsubcontentslines[1]{% \caption@Debug{\string\flushsubcaptionlistentries (#1)}% \begingroup \caption@subcontentslines @@ -1035,13 +1065,13 @@ \AtBeginDocument{\caption@ifundefined\chapter{}{% \let\caption@chapter@ORI\chapter \def\chapter{% - \flushsubcaptionlistentries[chapter]\caption@chapter@ORI}}} + \caption@addsubcontentslines{chapter}\caption@chapter@ORI}}} \AtBeginDocument{\caption@ifundefined\appendix{}{% \let\caption@appendix@ORI\appendix \def\appendix{% - \flushsubcaptionlistentries[appendix]\caption@appendix@ORI}}} + \caption@addsubcontentslines{appendix}\caption@appendix@ORI}}} \AtEndDocument{% - \flushsubcaptionlistentries[AtEndDocument]} + \caption@addsubcontentslines{AtEndDocument}} \caption@ifundefined\smf@makecaption{}{\let\smf@makecaption\@makecaption} \@ifclassloaded{beamer}{% \caption@InfoNoLine{beamer document class}% @@ -1510,6 +1540,8 @@ \let\caption@makecurrent\@gobbletwo \let\caption@@start\relax \caption@prepareslc + \else + \caption@ContinuedFloattrue \fi \edef\@tempa{\expandafter\noexpand\@car#1\@nil}% \if\@tempa*% diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty index c524f77aa1c..c6b49254cd9 100644 --- a/Master/texmf-dist/tex/latex/caption/caption3.sty +++ b/Master/texmf-dist/tex/latex/caption/caption3.sty @@ -6,7 +6,7 @@ %% %% caption3.dtx (with options: `package') %% -%% Copyright (C) 1994-2013 Axel Sommerfeldt +%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) %% %% http://sourceforge.net/projects/latex-caption/ %% @@ -24,16 +24,22 @@ %% %% This Current Maintainer of this work is Axel Sommerfeldt. %% -%% This work consists of the files caption.ins, caption.dtx, caption2.dtx, -%% caption3.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx, and newfloat.dtx, -%% the derived files caption.sty, caption2.sty, caption3.sty, -%% bicaption.sty, ltcaption.sty, subcaption.sty, and newfloat.sty, -%% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. +%% This work consists of the files +%% CHANGELOG, README, SUMMARY, caption.ins, +%% caption.dtx, caption2.dtx, caption3.dtx, +%% bicaption.dtx, ltcaption.dtx, subcaption.dtx, +%% newfloat.dtx, and totalcount.dtx +%% the derived files +%% caption.sty, caption2.sty, caption3.sty, +%% bicaption.sty, ltcaption.sty, subcaption.sty, +%% newfloat.sty, and totalcount.sty +%% and the user manuals +%% caption-deu.tex, caption-eng.tex, and caption-rus.tex. %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] \def\caption@tempa$Id: #1 #2 #3-#4-#5 #6${% \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }} -\caption@tempa $Id: caption3.sty 62 2013-02-03 10:40:15Z sommerfeldt $ +\caption@tempa $Id: caption3.sty 71 2013-04-14 15:14:26Z sommerfeldt $ \ProvidesPackage{caption3}[\caption@tempa v1.5-\caption@tempb caption3 kernel (AR)] \providecommand*\@nameundef[1]{% \expandafter\let\csname #1\endcsname\@undefined} @@ -1285,7 +1291,8 @@ {#1}% {\caption@lstfmt{\@nameuse{p@#1}}{\@nameuse{the#1}}}% {\ignorespaces #2}}}} -\newcommand*\caption@add@contentsline{\caption@@@addcontentsline} +\newcommand*\caption@add@contentsline{% + \caption@@@addcontentsline} \newcommand*\caption@@@addcontentsline[4]{% \addcontentsline{#1}{#2}{\protect\numberline{#3}{#4}}} \newcommand\caption@ifcontentsline[1]{% @@ -1364,6 +1371,7 @@ } \newcommand\caption@slc[4]{% \caption@Debug{Begin SLC}% + \singlelinecaptiontrue \begingroup \caption@singleline \let\caption@hj\@empty @@ -1372,12 +1380,14 @@ \sbox\@tempboxa{\caption@@@make{#1}{#2}}% \ifdim\wd\@tempboxa>\captionwidth \endgroup + \singlelinecaptionfalse #4% \else \endgroup #3% \fi \caption@Debug{End SLC}} +\newif\ifsinglelinecaption \newcommand*\caption@singleline{% \caption@xsetup\caption@opt@singleline \let\caption@fmt\caption@slfmt} @@ -1389,6 +1399,7 @@ \let\@footnotetext\caption@gobble \let\@endnotetext\caption@gobble \let\pagenote\caption@gobble + \let\glsunset\@gobble } \newcommand\caption@footnote[2]{% \caption@footnotemark{#1}} diff --git a/Master/texmf-dist/tex/latex/caption/totalcount.sty b/Master/texmf-dist/tex/latex/caption/totalcount.sty new file mode 100644 index 00000000000..350bbb2f815 --- /dev/null +++ b/Master/texmf-dist/tex/latex/caption/totalcount.sty @@ -0,0 +1,87 @@ +%% +%% This is file `totalcount.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% totalcount.dtx (with options: `package') +%% +%% Copyright (C) 1994-2013 Axel Sommerfeldt +%% +%% http://sourceforge.net/projects/latex-caption/ +%% +%% -------------------------------------------------------------------------- +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2003/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% This Current Maintainer of this work is Axel Sommerfeldt. +%% +%% This work consists of the files +%% CHANGELOG, README, SUMMARY, caption.ins, +%% caption.dtx, caption2.dtx, caption3.dtx, +%% bicaption.dtx, ltcaption.dtx, subcaption.dtx, +%% newfloat.dtx, and totalcount.dtx +%% the derived files +%% caption.sty, caption2.sty, caption3.sty, +%% bicaption.sty, ltcaption.sty, subcaption.sty, +%% newfloat.sty, and totalcount.sty +%% and the user manuals +%% caption-deu.tex, caption-eng.tex, and caption-rus.tex. +%% +\NeedsTeXFormat{LaTeX2e}[1994/12/01] +\ProvidesPackage{totalcount}[2008/02/27 v0.7 Total values of counters (AR)] +\newcommand*\DeclareTotalCounter[1]{% + \@ifundefined{c@#1}% + {\PackageError{totalcount}{Undefined counter `#1'}\@ehc}% + {\newcounter{total@#1}% + \@namedef{total#1s}{\nfss@text{\reset@font\bfseries ??}}% + \@namedef{total#1es}{\nfss@text{\reset@font\bfseries ??}}% + \@cons\total@counters{{#1}}}} +\@onlypreamble\DeclareTotalCounter +\let\total@counters\@empty +\newcommand*\total@xspace{} +\DeclareOption{xspace}{\renewcommand*\total@xspace{\xspace}} +\DeclareOption*{\expandafter\DeclareTotalCounter\expandafter{\CurrentOption}} +\ProcessOptions\relax +\ifx\total@xspace\@empty\else + \RequirePackage{xspace} +\fi +\newcommand*\total@addtocounter[1]{% + \@ifundefined{c@total@#1}{}{% + \addtocounter{total@#1}{\value{#1}}}} +\let\total@stpelt@ORI\@stpelt +\renewcommand*\@stpelt[1]{% + \total@addtocounter{#1}\total@stpelt@ORI{#1}} +\AtBeginDocument{\AtEndDocument{% + \begingroup + \@tempswafalse + \def\@elt#1{% + \total@addtocounter{#1}% + \xdef\total@tempa{\the\value{total@#1}}% + \xdef\total@tempb{\total@tempa\noexpand\total@xspace}% + \expandafter\ifx\csname total#1s\endcsname\total@tempb \else + \@tempswatrue + \fi + \if@filesw + \immediate\write\@mainaux{% + \string\gdef\string\total#1s{\total@tempa\string\total@xspace}% + \string\gdef\string\total#1es{\total@tempa\string\total@xspace}}% + \fi}% + \total@counters + \if@tempswa + \PackageWarningNoLine{totalcount}{% + Total counter(s) have changed.\MessageBreak + Rerun to get them right}% + \fi + \endgroup}}% +\endinput +%% +%% End of file `totalcount.sty'. -- cgit v1.2.3