summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/caption/caption3.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/caption/caption3.sty')
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption3.sty27
1 files changed, 19 insertions, 8 deletions
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}}