caption

git-svn-id: svn://tug.org/texlive/trunk@47917 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 13 insertions, 9 deletions

diff --git a/Master/texmf-dist/source/latex/caption/caption.dtx b/Master/texmf-dist/source/latex/caption/caption.dtx
index 758ca0f7f66..bee2f4150a8 100644
--- a/Master/texmf-dist/source/latex/caption/caption.dtx
+++ b/Master/texmf-dist/source/latex/caption/caption.dtx
@@ -2,7 +2,7 @@
 % 
 % This is file `caption.dtx'.
 % 
-% Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+% Copyright (C) 1994-2018 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 % 
 % --------------------------------------------------------------------------
 % 
@@ -25,7 +25,7 @@
 % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
 % 
 % \fi
-% \CheckSum{3571}
+% \CheckSum{3579}
 %
 % \iffalse
 %<*driver>
@@ -96,7 +96,7 @@
 %          This package has version number \fileversion, last revised \filedate.}}%^^A
 %        {the caption package}}
 % \author{Axel Sommerfeldt\\
-%         \url{https://github.com/axelsommerfeldt/latex-caption}}
+%         \url{https://github.com/axelsommerfeldt/caption}}
 % \date{\docdate}
 % \maketitle
 %
@@ -218,13 +218,13 @@
 %
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2017/03/19 v3.3-145 Customizing captions (AR)]
+\ProvidesPackage{caption}[2018/05/01 v3.3-147 Customizing captions (AR)]
 %    \end{macrocode}
 %
 % \subsection{Loading the kernel}
 %
 %    \begin{macrocode}
-\RequirePackage{caption3}[2016/02/01] % needs v1.7-130 or newer
+\RequirePackage{caption3}[2018/05/01] % needs v1.8 or newer
 %    \end{macrocode}
 %
 % \subsection{Check against incompatible document classes}
@@ -3641,10 +3641,14 @@
 %    \end{macrocode}
 % Workaround for bug in \package{listings} package:
 % If |\hsize| seems not to be set correctly, we set it to |\linewidth|.
+% \changes{v3.3}{2018/04/30}{Bugfix from Ulrike Fischer applied, see also \url{https://github.com/axelsommerfeldt/caption/issues/1}}
 %    \begin{macrocode}
-    \ifdim\hsize>\linewidth
-      \hsize\linewidth
-    \fi
+      \@tempdima\linewidth
+      \advance\@tempdima\lst@xleftmargin
+      \advance\@tempdima\lst@xrightmargin
+      \ifdim\hsize>\@tempdima
+        \hsize\@tempdima
+      \fi
 %    \end{macrocode}
 % First of all, we set |position=#1| and if it was set to `top',
 % we swap the skips so the default behavior of the \package{listings} package
@@ -3658,7 +3662,7 @@
         \belowcaptionskip\abovecaptionskip
         \abovecaptionskip\@tempdima}{}%
 %    \end{macrocode}
-% Workaround for issue with wrong skips (should be examined further)
+% Workaround for issue with wrong skips (FIXME: should be examined further)
 %    \begin{macrocode}
       \caption@setup{rule=0}%
 %    \end{macrocode}