summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/caption/caption.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-06-03 21:23:43 +0000
committerKarl Berry <karl@freefriends.org>2018-06-03 21:23:43 +0000
commite9a9d7ef171d4f2a125839da7a046f40f200fc0e (patch)
treeca04847bb81bcd14cb30ab976116c1a90c9c342d /Master/texmf-dist/tex/latex/caption/caption.sty
parent4405aa93f214194296defce3607ceb101f56e1b0 (diff)
caption
git-svn-id: svn://tug.org/texlive/trunk@47917 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.sty17
1 files changed, 10 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty
index 139599456ae..5c4f64dc22a 100644
--- a/Master/texmf-dist/tex/latex/caption/caption.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption.sty
@@ -6,9 +6,9 @@
%%
%% caption.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)
%%
-%% https://github.com/axelsommerfeldt/latex-caption
+%% https://github.com/axelsommerfeldt/caption
%%
%% --------------------------------------------------------------------------
%%
@@ -37,8 +37,8 @@
%% caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2017/03/19 v3.3-145 Customizing captions (AR)]
-\RequirePackage{caption3}[2016/02/01] % needs v1.7-130 or newer
+\ProvidesPackage{caption}[2018/05/01 v3.3-147 Customizing captions (AR)]
+\RequirePackage{caption3}[2018/05/01] % needs v1.8 or newer
\caption@ifbool{documentclass}{}{%
\caption@WarningNoLine{%
Unsupported document class (or package) detected,\MessageBreak
@@ -1484,9 +1484,12 @@
\let\caption@ORI@lst@MakeCaption\lst@MakeCaption
\def\lst@MakeCaption#1{% #1 is `t' or `b'
\begingroup
- \ifdim\hsize>\linewidth
- \hsize\linewidth
- \fi
+ \@tempdima\linewidth
+ \advance\@tempdima\lst@xleftmargin
+ \advance\@tempdima\lst@xrightmargin
+ \ifdim\hsize>\@tempdima
+ \hsize\@tempdima
+ \fi
\caption@setposition{#1}%
\caption@iftop{%
\@tempdima\belowcaptionskip