summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/caption
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-04-15 22:23:40 +0000
committerKarl Berry <karl@freefriends.org>2013-04-15 22:23:40 +0000
commitc55f2ef12e38e9282affe822bee7b395651844b7 (patch)
treebc0e3a9621623275ab3a0336937e0afffb018a19 /Master/texmf-dist/tex/latex/caption
parent0639a522410335d1b0ada2c404a8e8b7b6b408c6 (diff)
caption (15apr13)
git-svn-id: svn://tug.org/texlive/trunk@29955 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/caption')
-rw-r--r--Master/texmf-dist/tex/latex/caption/bicaption.sty46
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption.sty76
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption3.sty27
-rw-r--r--Master/texmf-dist/tex/latex/caption/totalcount.sty87
4 files changed, 187 insertions, 49 deletions
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'.