summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/caption
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-05-01 18:03:03 +0000
committerKarl Berry <karl@freefriends.org>2018-05-01 18:03:03 +0000
commit5fe7446034e35f94836e48943a6417e3843d2003 (patch)
tree13bcb33a135cce246abd1c8309b5bf425b033eef /Master/texmf-dist/tex/latex/caption
parent1a0e99416060de1e124428f5589e959dbc2febbb (diff)
caption (15apr18)
git-svn-id: svn://tug.org/texlive/trunk@47551 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/caption')
-rw-r--r--Master/texmf-dist/tex/latex/caption/bicaption.sty7
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption.sty19
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption2.sty9
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption3.sty16
-rw-r--r--Master/texmf-dist/tex/latex/caption/ltcaption.sty9
-rw-r--r--Master/texmf-dist/tex/latex/caption/newfloat.sty9
-rw-r--r--Master/texmf-dist/tex/latex/caption/subcaption.sty7
-rw-r--r--Master/texmf-dist/tex/latex/caption/totalcount.sty9
8 files changed, 33 insertions, 52 deletions
diff --git a/Master/texmf-dist/tex/latex/caption/bicaption.sty b/Master/texmf-dist/tex/latex/caption/bicaption.sty
index 06d119c3abf..c7df5e861d7 100644
--- a/Master/texmf-dist/tex/latex/caption/bicaption.sty
+++ b/Master/texmf-dist/tex/latex/caption/bicaption.sty
@@ -8,7 +8,7 @@
%%
%% Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
%%
-%% http://sourceforge.net/projects/latex-caption/
+%% https://github.com/axelsommerfeldt/latex-caption
%%
%% --------------------------------------------------------------------------
%%
@@ -37,10 +37,7 @@
%% 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 158 2016-03-27 17:17:41Z sommerfeldt $
-\ProvidesPackage{bicaption}[\caption@tempa v1.1-\caption@tempb Bilingual Captions (AR)]
+\ProvidesPackage{bicaption}[2016/03/27 v1.1-158 Bilingual Captions (AR)]
\RequirePackage{caption}[2016/02/01] % needs v3.3-134 or newer
\caption@AtBeginDocument{\caption@ifcompatibility{%
\caption@Error{%
diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty
index 3cc549ed940..139599456ae 100644
--- a/Master/texmf-dist/tex/latex/caption/caption.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption.sty
@@ -8,7 +8,7 @@
%%
%% Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
%%
-%% http://sourceforge.net/projects/latex-caption/
+%% https://github.com/axelsommerfeldt/latex-caption
%%
%% --------------------------------------------------------------------------
%%
@@ -37,10 +37,7 @@
%% 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: caption.sty 144 2016-02-21 09:45:24Z sommerfeldt $
-\ProvidesPackage{caption}[\caption@tempa v3.3-\caption@tempb Customizing captions (AR)]
+\ProvidesPackage{caption}[2017/03/19 v3.3-145 Customizing captions (AR)]
\RequirePackage{caption3}[2016/02/01] % needs v1.7-130 or newer
\caption@ifbool{documentclass}{}{%
\caption@WarningNoLine{%
@@ -829,11 +826,15 @@
\newcommand*\captionbox{%
\caption@withoptargs{\caption@ibox\@gobble}}
\newcommand\caption@ibox[3]{%
- \@testopt{\caption@iibox{#1}{#2}{#3}}{\wd\@tempboxa}}
+ \kernel@ifnextchar[%]
+ {\caption@iibox{#1}{#2}{#3}}%
+ {\caption@iibox@{#1}{#2}{#3}}}
\long\def\caption@iibox#1#2#3[#4]{%
\@testopt{\caption@iiibox{#1}{#2}{#3}{#4}}\captionbox@hj@default}
+\long\def\caption@iibox@#1#2#3#4{%
+ \setbox\@tempboxa\hbox{#4}%
+ \caption@iiibox{#1}{#2}{#3}{\wd\@tempboxa}[\captionbox@hj@default]{\unhbox\@tempboxa}}
\long\def\caption@iiibox#1#2#3#4[#5]#6{%
- \setbox\@tempboxa\hbox{#6}%
\begingroup
#1*% set \caption@position
\caption@iftop{%
@@ -844,14 +845,14 @@
\vbox{\caption#2{#3}}%
\captionbox@hrule
\csname caption@hj@#5\endcsname
- \unhbox\@tempboxa}%
+ #6}%
}{%
\endgroup
\parbox[b]{#4}{%
#1\relax
\caption@setposition b%
\csname caption@hj@#5\endcsname
- \unhbox\@tempboxa
+ #6%
\captionbox@hrule
\vtop{\caption#2{#3}}}%
}}
diff --git a/Master/texmf-dist/tex/latex/caption/caption2.sty b/Master/texmf-dist/tex/latex/caption/caption2.sty
index 487aac682ce..37e7fbc6300 100644
--- a/Master/texmf-dist/tex/latex/caption/caption2.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption2.sty
@@ -6,9 +6,9 @@
%%
%% caption2.dtx (with options: `package')
%%
-%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
%%
-%% http://sourceforge.net/projects/latex-caption/
+%% https://github.com/axelsommerfeldt/latex-caption
%%
%% --------------------------------------------------------------------------
%%
@@ -37,10 +37,7 @@
%% 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: caption2.sty 100 2015-09-15 17:00:16Z sommerfeldt $
-\ProvidesPackage{caption2}[\caption@tempa v2.2-\caption@tempb Customising captions (AR)]
+\ProvidesPackage{caption2}[2015/09/15 v2.2-100 Customising captions (AR)]
\PackageWarning{caption2}{%
****************************************************\MessageBreak
THIS PACKAGE IS OBSOLETE:\MessageBreak
diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty
index 7aa3b591244..a36da9db442 100644
--- a/Master/texmf-dist/tex/latex/caption/caption3.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption3.sty
@@ -6,9 +6,9 @@
%%
%% caption3.dtx (with options: `package')
%%
-%% Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2018 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
%%
-%% http://sourceforge.net/projects/latex-caption/
+%% https://github.com/axelsommerfeldt/latex-caption
%%
%% --------------------------------------------------------------------------
%%
@@ -37,10 +37,7 @@
%% 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 166 2016-05-22 18:50:55Z sommerfeldt $
-\ProvidesPackage{caption3}[\caption@tempa v1.7-\caption@tempb caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2018/04/15 v1.7-167 caption3 kernel (AR)]
\providecommand\caption@FixArabTeX{%
\def\caption@tempa##1{}%
\ifx\caption@tempa\@gobble
@@ -1133,9 +1130,10 @@
\caption@ifbeamertemplate{numbered}{%
\caption@lfmt@simple@magyar{#1}{#2}}{#1}}
\@ifundefined{@@magyar@captionfix}\AtBeginDocument\@firstofone{%
- \g@addto@macro\@@magyar@captionfix{%
- \let\caption@lfmt@simple@magyar\caption@lfmt@simpleMagyar
- \let\caption@lfmt@simpleMagyar\caption@lfmt@default@magyar}}
+ \@ifundefined{@@magyar@captionfix}{}{%
+ \g@addto@macro\@@magyar@captionfix{%
+ \let\caption@lfmt@simple@magyar\caption@lfmt@simpleMagyar
+ \let\caption@lfmt@simpleMagyar\caption@lfmt@default@magyar}}}
\caption@declarelabelseparator
{\caption@ifbeamertemplate{caption name own line}\@gobble\@firstofone}
{default}
diff --git a/Master/texmf-dist/tex/latex/caption/ltcaption.sty b/Master/texmf-dist/tex/latex/caption/ltcaption.sty
index 74f6a26dde7..089ae61246f 100644
--- a/Master/texmf-dist/tex/latex/caption/ltcaption.sty
+++ b/Master/texmf-dist/tex/latex/caption/ltcaption.sty
@@ -6,9 +6,9 @@
%%
%% ltcaption.dtx (with options: `package')
%%
-%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
%%
-%% http://sourceforge.net/projects/latex-caption/
+%% https://github.com/axelsommerfeldt/latex-caption
%%
%% --------------------------------------------------------------------------
%%
@@ -37,10 +37,7 @@
%% 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: ltcaption.sty 94 2013-06-09 16:07:04Z sommerfeldt $
-\ProvidesPackage{ltcaption}[\caption@tempa v1.4-\caption@tempb longtable captions (AR)]
+\ProvidesPackage{ltcaption}[2013/06/09 v1.4-94 longtable captions (AR)]
\@ifpackageloaded{longtable}{}{%
\PackageError{ltcaption}{longtable package not loaded, aborting}{RTFM}}
\providecommand*\LTcaptype{table}
diff --git a/Master/texmf-dist/tex/latex/caption/newfloat.sty b/Master/texmf-dist/tex/latex/caption/newfloat.sty
index de68c5d1610..5bbbabb73c0 100644
--- a/Master/texmf-dist/tex/latex/caption/newfloat.sty
+++ b/Master/texmf-dist/tex/latex/caption/newfloat.sty
@@ -6,9 +6,9 @@
%%
%% newfloat.dtx (with options: `package')
%%
-%% Copyright (C) 1994-2015 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
%%
-%% http://sourceforge.net/projects/latex-caption/
+%% https://github.com/axelsommerfeldt/latex-caption
%%
%% --------------------------------------------------------------------------
%%
@@ -37,10 +37,7 @@
%% 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: newfloat.sty 109 2015-09-17 09:29:07Z sommerfeldt $
-\ProvidesPackage{newfloat}[\caption@tempa v1.1-\caption@tempb Defining new floating environments (AR)]
+\ProvidesPackage{newfloat}[2015/09/17 v1.1-109 Defining new floating environments (AR)]
\newcommand*\newfloat@Info[1]{%
\PackageInfo{newfloat}{#1}}
\newcommand*\newfloat@InfoNoLine[1]{%
diff --git a/Master/texmf-dist/tex/latex/caption/subcaption.sty b/Master/texmf-dist/tex/latex/caption/subcaption.sty
index 932900ca917..37674ef5063 100644
--- a/Master/texmf-dist/tex/latex/caption/subcaption.sty
+++ b/Master/texmf-dist/tex/latex/caption/subcaption.sty
@@ -8,7 +8,7 @@
%%
%% Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
%%
-%% http://sourceforge.net/projects/latex-caption/
+%% https://github.com/axelsommerfeldt/latex-caption
%%
%% --------------------------------------------------------------------------
%%
@@ -37,10 +37,7 @@
%% 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: subcaption.sty 161 2016-05-22 14:39:14Z sommerfeldt $
-\ProvidesPackage{subcaption}[\caption@tempa v1.1-\caption@tempb Sub-captions (AR)]
+\ProvidesPackage{subcaption}[2016/05/22 v1.1-161 Sub-captions (AR)]
\RequirePackage{caption}[2012/03/25] % needs v3.3 or newer
\newcommand\subcaption@CheckCompatibility{%
\@ifpackageloaded{subfigure}{%
diff --git a/Master/texmf-dist/tex/latex/caption/totalcount.sty b/Master/texmf-dist/tex/latex/caption/totalcount.sty
index c8e6476021d..5a429eabc0d 100644
--- a/Master/texmf-dist/tex/latex/caption/totalcount.sty
+++ b/Master/texmf-dist/tex/latex/caption/totalcount.sty
@@ -6,9 +6,9 @@
%%
%% totalcount.dtx (with options: `package')
%%
-%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
%%
-%% http://sourceforge.net/projects/latex-caption/
+%% https://github.com/axelsommerfeldt/latex-caption
%%
%% --------------------------------------------------------------------------
%%
@@ -37,10 +37,7 @@
%% 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: totalcount.sty 92 2013-05-12 09:06:59Z sommerfeldt $
-\ProvidesPackage{totalcount}[\caption@tempa v1.0-\caption@tempb Total values of counters (AR)]
+\ProvidesPackage{totalcount}[2013/05/12 v1.0-92 Total values of counters (AR)]
\newcommand*\DeclareTotalCounter[1]{%
\newcounter{totalcount@#1}%
\@namedef{total#1s}{\nfss@text{\reset@font\bfseries ??}}%