summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/caption/caption.sty
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/caption.sty
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/caption.sty')
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption.sty19
1 files changed, 10 insertions, 9 deletions
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}}}%
}}