texlive[47551] Master/texmf-dist: caption (15apr18)

commits+karl at tug.org commits+karl at tug.org
Tue May 1 20:03:04 CEST 2018


Revision: 47551
          http://tug.org/svn/texlive?view=revision&revision=47551
Author:   karl
Date:     2018-05-01 20:03:03 +0200 (Tue, 01 May 2018)
Log Message:
-----------
caption (15apr18)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/caption/README
    trunk/Master/texmf-dist/doc/latex/caption/bicaption.pdf
    trunk/Master/texmf-dist/doc/latex/caption/caption-deu.pdf
    trunk/Master/texmf-dist/doc/latex/caption/caption-eng.pdf
    trunk/Master/texmf-dist/doc/latex/caption/caption-rus.pdf
    trunk/Master/texmf-dist/doc/latex/caption/ltcaption.pdf
    trunk/Master/texmf-dist/doc/latex/caption/newfloat.pdf
    trunk/Master/texmf-dist/doc/latex/caption/subcaption.pdf
    trunk/Master/texmf-dist/doc/latex/caption/totalcount.pdf
    trunk/Master/texmf-dist/source/latex/caption/bicaption.dtx
    trunk/Master/texmf-dist/source/latex/caption/caption-deu.tex
    trunk/Master/texmf-dist/source/latex/caption/caption-eng.tex
    trunk/Master/texmf-dist/source/latex/caption/caption-rus.tex
    trunk/Master/texmf-dist/source/latex/caption/caption.dtx
    trunk/Master/texmf-dist/source/latex/caption/caption.ins
    trunk/Master/texmf-dist/source/latex/caption/caption2.dtx
    trunk/Master/texmf-dist/source/latex/caption/caption3.dtx
    trunk/Master/texmf-dist/source/latex/caption/ltcaption.dtx
    trunk/Master/texmf-dist/source/latex/caption/newfloat.dtx
    trunk/Master/texmf-dist/source/latex/caption/subcaption.dtx
    trunk/Master/texmf-dist/source/latex/caption/totalcount.dtx
    trunk/Master/texmf-dist/tex/latex/caption/bicaption.sty
    trunk/Master/texmf-dist/tex/latex/caption/caption.sty
    trunk/Master/texmf-dist/tex/latex/caption/caption2.sty
    trunk/Master/texmf-dist/tex/latex/caption/caption3.sty
    trunk/Master/texmf-dist/tex/latex/caption/ltcaption.sty
    trunk/Master/texmf-dist/tex/latex/caption/newfloat.sty
    trunk/Master/texmf-dist/tex/latex/caption/subcaption.sty
    trunk/Master/texmf-dist/tex/latex/caption/totalcount.sty

Modified: trunk/Master/texmf-dist/doc/latex/caption/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/caption/README	2018-05-01 18:02:49 UTC (rev 47550)
+++ trunk/Master/texmf-dist/doc/latex/caption/README	2018-05-01 18:03:03 UTC (rev 47551)
@@ -1,14 +1,14 @@
 ==========================================================================
 
 The `caption' package bundle
-Release 2016-05-22
-Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+Release 2018-04-15
+Copyright (C) 1994-2018 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
 
 License: LPPL = LaTeX Project Public Licence
 Maintenance Status: maintained (by Axel Sommerfeldt)
 
 Home page:
-  http://sourceforge.net/projects/latex-caption/
+  https://github.com/axelsommerfeldt/latex-caption
 
 If you need help for installation please visit:
   http://www.tex.ac.uk/cgi-bin/texfaq2html?label=inst-miktex*
@@ -23,8 +23,8 @@
 
 If you think you may have found a bug in these packages,
 or want to report a suggestion for improvement, please either visit
-  http://sourceforge.net/p/latex-caption/tickets/
-or send an e-mail to me
+  https://github.com/axelsommerfeldt/latex-caption/issues
+or send an e-mail to
   axel.sommerfeldt at f-m.fm
 
 --------------------------------------------------------------------------

Modified: trunk/Master/texmf-dist/doc/latex/caption/bicaption.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/caption/caption-deu.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/caption/caption-eng.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/caption/caption-rus.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/caption/ltcaption.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/caption/newfloat.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/caption/subcaption.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/caption/totalcount.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/latex/caption/bicaption.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/bicaption.dtx	2018-05-01 18:02:49 UTC (rev 47550)
+++ trunk/Master/texmf-dist/source/latex/caption/bicaption.dtx	2018-05-01 18:03:03 UTC (rev 47551)
@@ -2,9 +2,6 @@
 % 
 % This is file `bicaption.dtx'.
 % 
-% $Id: bicaption.dtx 158 2016-03-27 17:17:41Z sommerfeldt $
-% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/branches/3.3/source/bicaption.dtx $
-%
 % Copyright (C) 2010-2016 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
 % 
 % --------------------------------------------------------------------------
@@ -28,7 +25,7 @@
 % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
 % 
 % \fi
-% \CheckSum{409}
+% \CheckSum{400}
 %
 % \iffalse
 %<*driver>
@@ -127,7 +124,7 @@
 %          This package has version number \fileversion, last revised \filedate.}}%^^A
 %        {The bicaption package}}
 % \author{Axel Sommerfeldt\\
-%         \url{http://sourceforge.net/p/latex-caption/}}
+%         \url{https://github.com/axelsommerfeldt/latex-caption}}
 % \date{\docdate}
 % \maketitle
 % 
@@ -795,10 +792,7 @@
 %
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\def\caption at tempa$Id: #1 #2 #3-#4-#5 #6${%
-  \def\caption at tempa{#3/#4/#5 }\def\caption at tempb{#2 }}
-\caption at tempa $Id: bicaption.dtx 158 2016-03-27 17:17:41Z sommerfeldt $
-\ProvidesPackage{bicaption}[\caption at tempa v1.1-\caption at tempb Bilingual Captions (AR)]
+\ProvidesPackage{bicaption}[2016/03/27 v1.1-158 Bilingual Captions (AR)]
 %    \end{macrocode}
 %    \begin{macrocode}
 \RequirePackage{caption}[2016/02/01] % needs v3.3-134 or newer

Modified: trunk/Master/texmf-dist/source/latex/caption/caption-deu.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption-deu.tex	2018-05-01 18:02:49 UTC (rev 47550)
+++ trunk/Master/texmf-dist/source/latex/caption/caption-deu.tex	2018-05-01 18:03:03 UTC (rev 47551)
@@ -1,8 +1,8 @@
 % 
 % This is file `caption-deu.tex'.
 % 
-% $Id: caption-deu.tex 117 2015-09-20 20:43:35Z sommerfeldt $
-% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/branches/3.3/source/caption-deu.tex $
+% $Id$
+% $HeadURL$
 %
 % Copyright (C) 1994-2012 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
 % 
@@ -202,7 +202,7 @@
 
 \title{Anpassen der Abbildungs- und Tabellenbeschriftungen}
 \author{Axel Sommerfeldt\\
-         \url{http://sourceforge.net/projects/latex-caption/}}
+        \url{https://github.com/axelsommerfeldt/latex-caption}}
 \date{\docdate}
 \maketitle
 

Modified: trunk/Master/texmf-dist/source/latex/caption/caption-eng.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption-eng.tex	2018-05-01 18:02:49 UTC (rev 47550)
+++ trunk/Master/texmf-dist/source/latex/caption/caption-eng.tex	2018-05-01 18:03:03 UTC (rev 47551)
@@ -1,8 +1,8 @@
 % 
 % This is file `caption-eng.tex'.
 % 
-% $Id: caption-eng.tex 117 2015-09-20 20:43:35Z sommerfeldt $
-% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/branches/3.3/source/caption-eng.tex $
+% $Id$
+% $HeadURL$
 %
 % Copyright (C) 1994-2012 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
 % 
@@ -195,7 +195,7 @@
 
 \title{Customizing captions of floating environments}
 \author{Axel Sommerfeldt\\
-         \url{http://sourceforge.net/projects/latex-caption/}}
+        \url{https://github.com/axelsommerfeldt/latex-caption}}
 \date{\docdate}
 \maketitle
 

Modified: trunk/Master/texmf-dist/source/latex/caption/caption-rus.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption-rus.tex	2018-05-01 18:02:49 UTC (rev 47550)
+++ trunk/Master/texmf-dist/source/latex/caption/caption-rus.tex	2018-05-01 18:03:03 UTC (rev 47551)
@@ -2,8 +2,8 @@
 % This is file `caption-rus.tex'.
 % Russian translation of `caption-eng.tex'
 %
-% $Id: caption-rus.tex 140 2016-02-05 10:22:42Z sommerfeldt $
-% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/branches/3.3/source/caption-rus.tex $
+% $Id$
+% $HeadURL$
 %
 % Copyright (C) 1994-2007 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
 %
@@ -248,7 +248,7 @@
        }}{}}
 % \author{Axel Sommerfeldt\\
 \author{\xC0\xEA\xF1\xE5\xEB\xFC \xC7\xEE\xEC\xEC\xE5\xF0\xF4\xE5\xEB\xFC\xE4\xF2 (Axel Sommerfeldt)\\
-         \url{http://sourceforge.net/projects/latex-caption/}}
+        \url{https://github.com/axelsommerfeldt/latex-caption}}
 \date{\docdate}
 \maketitle
 

Modified: trunk/Master/texmf-dist/source/latex/caption/caption.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption.dtx	2018-05-01 18:02:49 UTC (rev 47550)
+++ trunk/Master/texmf-dist/source/latex/caption/caption.dtx	2018-05-01 18:03:03 UTC (rev 47551)
@@ -2,9 +2,6 @@
 % 
 % This is file `caption.dtx'.
 % 
-% $Id: caption.dtx 144 2016-02-21 09:45:24Z sommerfeldt $
-% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/branches/3.3/source/caption.dtx $
-%
 % Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
 % 
 % --------------------------------------------------------------------------
@@ -28,7 +25,7 @@
 % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
 % 
 % \fi
-% \CheckSum{3576}
+% \CheckSum{3571}
 %
 % \iffalse
 %<*driver>
@@ -99,7 +96,7 @@
 %          This package has version number \fileversion, last revised \filedate.}}%^^A
 %        {the caption package}}
 % \author{Axel Sommerfeldt\\
-%         \url{http://sourceforge.net/p/latex-caption/}}
+%         \url{https://github.com/axelsommerfeldt/latex-caption}}
 % \date{\docdate}
 % \maketitle
 %
@@ -221,10 +218,7 @@
 %
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\def\caption at tempa$Id: #1 #2 #3-#4-#5 #6${%
-  \def\caption at tempa{#3/#4/#5 }\def\caption at tempb{#2 }}
-\caption at tempa $Id: caption.dtx 144 2016-02-21 09:45:24Z sommerfeldt $
-\ProvidesPackage{caption}[\caption at tempa v3.3-\caption at tempb Customizing captions (AR)]
+\ProvidesPackage{caption}[2017/03/19 v3.3-145 Customizing captions (AR)]
 %    \end{macrocode}
 %
 % \subsection{Loading the kernel}
@@ -1819,6 +1813,7 @@
 % \changes{v3.2}{2010/12/17}{This macro added}
 % \changes{v3.2a}{2011/08/16}{\cs{captionsetup} replaces with \cs{captionbox at settype} and \cs{caption at setposition}}
 % \changes{v3.3}{2012/04/09}{Adapted to revised version of \cs{caption at withoptargs}}
+% \changes{v3.3}{2017/03/19}{When used with fixed witdh the content will not be hboxed anymore}
 % A |\parbox| with contents and caption, separated by an invisible |\hrule|.
 %    \begin{macrocode}
 \newcommand*\captionbox{%
@@ -1826,7 +1821,9 @@
 %    \end{macrocode}
 %    \begin{macrocode}
 \newcommand\caption at ibox[3]{%
-  \@testopt{\caption at iibox{#1}{#2}{#3}}{\wd\@tempboxa}}
+  \kernel at ifnextchar[%]
+    {\caption at iibox{#1}{#2}{#3}}%
+    {\caption at iibox@{#1}{#2}{#3}}}
 %    \end{macrocode}
 %    \begin{macrocode}
 \long\def\caption at iibox#1#2#3[#4]{%
@@ -1833,8 +1830,12 @@
   \@testopt{\caption at iiibox{#1}{#2}{#3}{#4}}\captionbox at hj@default}
 %    \end{macrocode}
 %    \begin{macrocode}
+\long\def\caption at iibox@#1#2#3#4{%
+  \setbox\@tempboxa\hbox{#4}%
+  \caption at iiibox{#1}{#2}{#3}{\wd\@tempboxa}[\captionbox at hj@default]{\unhbox\@tempboxa}}
+%    \end{macrocode}
+%    \begin{macrocode}
 \long\def\caption at iiibox#1#2#3#4[#5]#6{%
-  \setbox\@tempboxa\hbox{#6}%
   \begingroup
   #1*% set \caption at position
   \caption at iftop{%
@@ -1845,7 +1846,7 @@
       \vbox{\caption#2{#3}}%
       \captionbox at hrule
       \csname caption at hj@#5\endcsname
-      \unhbox\@tempboxa}%
+      #6}%
   }{%
     \endgroup
     \parbox[b]{#4}{%
@@ -1852,7 +1853,7 @@
       #1\relax
       \caption at setposition b%
       \csname caption at hj@#5\endcsname
-      \unhbox\@tempboxa
+      #6%
       \captionbox at hrule
       \vtop{\caption#2{#3}}}%
   }}

Modified: trunk/Master/texmf-dist/source/latex/caption/caption.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption.ins	2018-05-01 18:02:49 UTC (rev 47550)
+++ trunk/Master/texmf-dist/source/latex/caption/caption.ins	2018-05-01 18:03:03 UTC (rev 47551)
@@ -6,9 +6,9 @@
 
 \preamble
 
-Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+Copyright (C) 1994-2018 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
 
-http://sourceforge.net/projects/latex-caption/
+https://github.com/axelsommerfeldt/latex-caption
 
 --------------------------------------------------------------------------
 

Modified: trunk/Master/texmf-dist/source/latex/caption/caption2.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption2.dtx	2018-05-01 18:02:49 UTC (rev 47550)
+++ trunk/Master/texmf-dist/source/latex/caption/caption2.dtx	2018-05-01 18:03:03 UTC (rev 47551)
@@ -2,9 +2,6 @@
 % 
 % This is file `caption2.dtx'.
 % 
-% $Id: caption2.dtx 117 2015-09-20 20:43:35Z sommerfeldt $
-% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/branches/3.3/source/caption2.dtx $
-%
 % Copyright (C) 1994-2011 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
 % 
 % --------------------------------------------------------------------------
@@ -28,7 +25,7 @@
 % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
 % 
 % \fi
-% \CheckSum{862}
+% \CheckSum{853}
 %
 % \iffalse
 %<*driver>
@@ -77,7 +74,7 @@
 %          This package has version number \fileversion, last revised \filedate.}}%^^A
 %        {caption2 package}}
 % \author{Axel Sommerfeldt\\
-%         \url{http://sourceforge.net/projects/latex-caption/}}
+%         \url{https://github.com/axelsommerfeldt/latex-caption}}
 % \date{\docdate}
 % \maketitle
 %
@@ -206,10 +203,7 @@
 %
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\def\caption at tempa$Id: #1 #2 #3-#4-#5 #6${%
-  \def\caption at tempa{#3/#4/#5 }\def\caption at tempb{#2 }}
-\caption at tempa $Id: caption2.dtx 117 2015-09-20 20:43:35Z sommerfeldt $
-\ProvidesPackage{caption2}[\caption at tempa v2.2-\caption at tempb Customising captions (AR)]
+\ProvidesPackage{caption2}[2015/09/15 v2.2-100 Customising captions (AR)]
 %    \end{macrocode}
 %
 % \changes{v2.2b}{2007/06/15}{Made obsolete warning even more annoying}

Modified: trunk/Master/texmf-dist/source/latex/caption/caption3.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption3.dtx	2018-05-01 18:02:49 UTC (rev 47550)
+++ trunk/Master/texmf-dist/source/latex/caption/caption3.dtx	2018-05-01 18:03:03 UTC (rev 47551)
@@ -2,10 +2,7 @@
 % 
 % This is file `caption3.dtx'.
 % 
-% $Id: caption3.dtx 166 2016-05-22 18:50:55Z sommerfeldt $
-% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/branches/3.3/source/caption3.dtx $
-%
-% Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+% Copyright (C) 1994-2018 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
 % 
 % --------------------------------------------------------------------------
 % 
@@ -28,7 +25,7 @@
 % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
 % 
 % \fi
-% \CheckSum{3679}
+% \CheckSum{3671}
 %
 % \iffalse
 %<*driver>
@@ -102,7 +99,7 @@
 %          This package has version number \fileversion, last revised \filedate.}}%^^A
 %        {the caption kernel}}
 % \author{Axel Sommerfeldt\\
-%         \url{http://sourceforge.net/p/latex-caption/}}
+%         \url{https://github.com/axelsommerfeldt/latex-caption}}
 % \date{\docdate}
 % \maketitle
 %
@@ -201,10 +198,7 @@
 %
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\def\caption at tempa$Id: #1 #2 #3-#4-#5 #6${%
-  \def\caption at tempa{#3/#4/#5 }\def\caption at tempb{#2 }}
-\caption at tempa $Id: caption3.dtx 166 2016-05-22 18:50:55Z sommerfeldt $
-\ProvidesPackage{caption3}[\caption at tempa v1.7-\caption at tempb caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2018/04/15 v1.7-167 caption3 kernel (AR)]
 %    \end{macrocode}
 %
 % \subsection{Workaround for bug in package \package{arabtex}}
@@ -2747,6 +2741,7 @@
 % \changes{v1.3}{2011/08/06}{\package{beamer} class support revised}
 % \changes{v1.5}{2013/04/27}{The \package{beamer} template \texttt{caption label separator} will be used now}
 % \changes{v1.7}{2016/05/22}{Re-definition of label format \texttt{simpleMagyar} added to \package{beamer} class support}
+% \changes{v1.7}{2018/04/15}{Re-definition of label format \texttt{simpleMagyar} revised}
 %
 % \begin{macro}{\caption at ifbeamerclass}
 %    \begin{macrocode}
@@ -2800,15 +2795,15 @@
 %    \end{macrocode}
 % The \package{magyar} babel package redefines the current label format to a one called |simple|\-|Magyar|,
 % defined within |\@@magyar at caption|\-|fix| which will be executed |\At|\-|Begin|\-|Document|.
-% But without accounting for the \package{beamer} document class, so we will make up leeway here.
 %    \begin{macrocode}
   \DeclareCaptionLabelFormat{default at magyar}{%
     \caption at ifbeamertemplate{numbered}{%
       \caption at lfmt@simple at magyar{#1}{#2}}{#1}}
   \@ifundefined{@@magyar at captionfix}\AtBeginDocument\@firstofone{%
-    \g at addto@macro\@@magyar at captionfix{%
-      \let\caption at lfmt@simple at magyar\caption at lfmt@simpleMagyar
-      \let\caption at lfmt@simpleMagyar\caption at lfmt@default at magyar}}
+    \@ifundefined{@@magyar at captionfix}{}{%
+      \g at addto@macro\@@magyar at captionfix{%
+        \let\caption at lfmt@simple at magyar\caption at lfmt@simpleMagyar
+        \let\caption at lfmt@simpleMagyar\caption at lfmt@default at magyar}}}
 %    \end{macrocode}
 %    \begin{macrocode}
   \caption at declarelabelseparator

Modified: trunk/Master/texmf-dist/source/latex/caption/ltcaption.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/ltcaption.dtx	2018-05-01 18:02:49 UTC (rev 47550)
+++ trunk/Master/texmf-dist/source/latex/caption/ltcaption.dtx	2018-05-01 18:03:03 UTC (rev 47551)
@@ -2,9 +2,6 @@
 % 
 % This is file `ltcaption.dtx'.
 % 
-% $Id: ltcaption.dtx 117 2015-09-20 20:43:35Z sommerfeldt $
-% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/branches/3.3/source/ltcaption.dtx $
-%
 % Copyright (C) 2007-2013 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
 % 
 % --------------------------------------------------------------------------
@@ -28,7 +25,7 @@
 % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
 % 
 % \fi
-% \CheckSum{386}
+% \CheckSum{377}
 %
 % \iffalse
 %<*driver>
@@ -87,7 +84,7 @@
 %          This package has version number \fileversion.}}%^^A
 %        {The ltcaption package}}
 % \author{Axel Sommerfeldt\\
-%         \url{http://sourceforge.net/projects/latex-caption/}}
+%         \url{https://github.com/axelsommerfeldt/latex-caption}}
 % \date{\docdate}
 % \maketitle
 % 
@@ -463,10 +460,7 @@
 %
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\def\caption at tempa$Id: #1 #2 #3-#4-#5 #6${%
-  \def\caption at tempa{#3/#4/#5 }\def\caption at tempb{#2 }}
-\caption at tempa $Id: ltcaption.dtx 117 2015-09-20 20:43:35Z sommerfeldt $
-\ProvidesPackage{ltcaption}[\caption at tempa v1.4-\caption at tempb longtable captions (AR)]
+\ProvidesPackage{ltcaption}[2013/06/09 v1.4-94 longtable captions (AR)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}

Modified: trunk/Master/texmf-dist/source/latex/caption/newfloat.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/newfloat.dtx	2018-05-01 18:02:49 UTC (rev 47550)
+++ trunk/Master/texmf-dist/source/latex/caption/newfloat.dtx	2018-05-01 18:03:03 UTC (rev 47551)
@@ -2,9 +2,6 @@
 % 
 % This is file `newfloat.dtx'.
 % 
-% $Id: newfloat.dtx 109 2015-09-17 09:29:07Z sommerfeldt $
-% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/branches/3.3/source/newfloat.dtx $
-%
 % Copyright (C) 2011-2015 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
 % 
 % --------------------------------------------------------------------------
@@ -28,7 +25,7 @@
 % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
 % 
 % \fi
-% \CheckSum{1322}
+% \CheckSum{1313}
 %
 % \iffalse
 %<*driver>
@@ -97,7 +94,7 @@
 %          This package has version number \fileversion.}}%^^A
 %        {The newfloat package}}
 % \author{Axel Sommerfeldt\\
-%         \url{http://sourceforge.net/p/latex-caption/}}
+%         \url{https://github.com/axelsommerfeldt/latex-caption}}
 % \date{\docdate}
 % \maketitle
 % 
@@ -534,10 +531,7 @@
 %
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\def\caption at tempa$Id: #1 #2 #3-#4-#5 #6${%
-  \def\caption at tempa{#3/#4/#5 }\def\caption at tempb{#2 }}
-\caption at tempa $Id: newfloat.dtx 109 2015-09-17 09:29:07Z sommerfeldt $
-\ProvidesPackage{newfloat}[\caption at tempa v1.1-\caption at tempb Defining new floating environments (AR)]
+\ProvidesPackage{newfloat}[2015/09/17 v1.1-109 Defining new floating environments (AR)]
 %    \end{macrocode}
 %
 % \begin{macro}{\newfloat at Info}

Modified: trunk/Master/texmf-dist/source/latex/caption/subcaption.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/subcaption.dtx	2018-05-01 18:02:49 UTC (rev 47550)
+++ trunk/Master/texmf-dist/source/latex/caption/subcaption.dtx	2018-05-01 18:03:03 UTC (rev 47551)
@@ -2,9 +2,6 @@
 % 
 % This is file `subcaption.dtx'.
 % 
-% $Id: subcaption.dtx 161 2016-05-22 14:39:14Z sommerfeldt $
-% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/branches/3.3/source/subcaption.dtx $
-%
 % Copyright (C) 2007-2016 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
 % 
 % --------------------------------------------------------------------------
@@ -28,7 +25,7 @@
 % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
 % 
 % \fi
-% \CheckSum{165}
+% \CheckSum{156}
 %
 % \iffalse
 %<*driver>
@@ -118,7 +115,7 @@
 %          This package has version number \fileversion, last revised \filedate.}}%^^A
 %        {The subcaption package}}
 % \author{Axel Sommerfeldt\\
-%         \url{http://sourceforge.net/projects/latex-caption/}}
+%         \url{https://github.com/axelsommerfeldt/latex-caption}}
 % \date{\docdate}
 % \maketitle
 % 
@@ -901,10 +898,7 @@
 %
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\def\caption at tempa$Id: #1 #2 #3-#4-#5 #6${%
-  \def\caption at tempa{#3/#4/#5 }\def\caption at tempb{#2 }}
-\caption at tempa $Id: subcaption.dtx 161 2016-05-22 14:39:14Z sommerfeldt $
-\ProvidesPackage{subcaption}[\caption at tempa v1.1-\caption at tempb Sub-captions (AR)]
+\ProvidesPackage{subcaption}[2016/05/22 v1.1-161 Sub-captions (AR)]
 %    \end{macrocode}
 %
 % \subsection{Initial code}

Modified: trunk/Master/texmf-dist/source/latex/caption/totalcount.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/totalcount.dtx	2018-05-01 18:02:49 UTC (rev 47550)
+++ trunk/Master/texmf-dist/source/latex/caption/totalcount.dtx	2018-05-01 18:03:03 UTC (rev 47551)
@@ -2,9 +2,6 @@
 % 
 % This is file `totalcount.dtx'.
 % 
-% $Id: totalcount.dtx 117 2015-09-20 20:43:35Z sommerfeldt $
-% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/branches/3.3/source/totalcount.dtx $
-%
 % Copyright (C) 2010-2013 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
 % 
 % --------------------------------------------------------------------------
@@ -25,7 +22,7 @@
 % and the derived file totalcount.sty.
 % 
 % \fi
-% \CheckSum{135}
+% \CheckSum{126}
 %
 % \iffalse
 %<*driver>
@@ -85,7 +82,7 @@
 %          This package has version number \fileversion, last revised \filedate.}}%^^A
 %        {The totalcount package}}
 % \author{Axel Sommerfeldt\\
-%         \url{http://sourceforge.net/p/latex-caption/}}
+%         \url{https://github.com/axelsommerfeldt/latex-caption}}
 % \date{\docdate}
 % \maketitle
 % 
@@ -263,10 +260,7 @@
 %
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\def\caption at tempa$Id: #1 #2 #3-#4-#5 #6${%
-  \def\caption at tempa{#3/#4/#5 }\def\caption at tempb{#2 }}
-\caption at tempa $Id: totalcount.dtx 117 2015-09-20 20:43:35Z sommerfeldt $
-\ProvidesPackage{totalcount}[\caption at tempa v1.0-\caption at tempb Total values of counters (AR)]
+\ProvidesPackage{totalcount}[2013/05/12 v1.0-92 Total values of counters (AR)]
 %    \end{macrocode}
 %
 % \subsection{Initial code}

Modified: trunk/Master/texmf-dist/tex/latex/caption/bicaption.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/bicaption.sty	2018-05-01 18:02:49 UTC (rev 47550)
+++ trunk/Master/texmf-dist/tex/latex/caption/bicaption.sty	2018-05-01 18:03:03 UTC (rev 47551)
@@ -8,7 +8,7 @@
 %% 
 %% Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt at 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 at tempa$Id: #1 #2 #3-#4-#5 #6${%
-  \def\caption at tempa{#3/#4/#5 }\def\caption at tempb{#2 }}
-\caption at tempa $Id: bicaption.sty 158 2016-03-27 17:17:41Z sommerfeldt $
-\ProvidesPackage{bicaption}[\caption at tempa v1.1-\caption at 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 at AtBeginDocument{\caption at ifcompatibility{%
   \caption at Error{%

Modified: trunk/Master/texmf-dist/tex/latex/caption/caption.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/caption.sty	2018-05-01 18:02:49 UTC (rev 47550)
+++ trunk/Master/texmf-dist/tex/latex/caption/caption.sty	2018-05-01 18:03:03 UTC (rev 47551)
@@ -8,7 +8,7 @@
 %% 
 %% Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt at 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 at tempa$Id: #1 #2 #3-#4-#5 #6${%
-  \def\caption at tempa{#3/#4/#5 }\def\caption at tempb{#2 }}
-\caption at tempa $Id: caption.sty 144 2016-02-21 09:45:24Z sommerfeldt $
-\ProvidesPackage{caption}[\caption at tempa v3.3-\caption at 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 at ifbool{documentclass}{}{%
   \caption at WarningNoLine{%
@@ -829,11 +826,15 @@
 \newcommand*\captionbox{%
   \caption at withoptargs{\caption at ibox\@gobble}}
 \newcommand\caption at ibox[3]{%
-  \@testopt{\caption at iibox{#1}{#2}{#3}}{\wd\@tempboxa}}
+  \kernel at ifnextchar[%]
+    {\caption at iibox{#1}{#2}{#3}}%
+    {\caption at iibox@{#1}{#2}{#3}}}
 \long\def\caption at iibox#1#2#3[#4]{%
   \@testopt{\caption at iiibox{#1}{#2}{#3}{#4}}\captionbox at hj@default}
+\long\def\caption at iibox@#1#2#3#4{%
+  \setbox\@tempboxa\hbox{#4}%
+  \caption at iiibox{#1}{#2}{#3}{\wd\@tempboxa}[\captionbox at hj@default]{\unhbox\@tempboxa}}
 \long\def\caption at iiibox#1#2#3#4[#5]#6{%
-  \setbox\@tempboxa\hbox{#6}%
   \begingroup
   #1*% set \caption at position
   \caption at iftop{%
@@ -844,7 +845,7 @@
       \vbox{\caption#2{#3}}%
       \captionbox at hrule
       \csname caption at hj@#5\endcsname
-      \unhbox\@tempboxa}%
+      #6}%
   }{%
     \endgroup
     \parbox[b]{#4}{%
@@ -851,7 +852,7 @@
       #1\relax
       \caption at setposition b%
       \csname caption at hj@#5\endcsname
-      \unhbox\@tempboxa
+      #6%
       \captionbox at hrule
       \vtop{\caption#2{#3}}}%
   }}

Modified: trunk/Master/texmf-dist/tex/latex/caption/caption2.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/caption2.sty	2018-05-01 18:02:49 UTC (rev 47550)
+++ trunk/Master/texmf-dist/tex/latex/caption/caption2.sty	2018-05-01 18:03:03 UTC (rev 47551)
@@ -6,9 +6,9 @@
 %%
 %% caption2.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+%% Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt at 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 at tempa$Id: #1 #2 #3-#4-#5 #6${%
-  \def\caption at tempa{#3/#4/#5 }\def\caption at tempb{#2 }}
-\caption at tempa $Id: caption2.sty 100 2015-09-15 17:00:16Z sommerfeldt $
-\ProvidesPackage{caption2}[\caption at tempa v2.2-\caption at tempb Customising captions (AR)]
+\ProvidesPackage{caption2}[2015/09/15 v2.2-100 Customising captions (AR)]
 \PackageWarning{caption2}{%
   ****************************************************\MessageBreak
   THIS PACKAGE IS OBSOLETE:\MessageBreak

Modified: trunk/Master/texmf-dist/tex/latex/caption/caption3.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/caption3.sty	2018-05-01 18:02:49 UTC (rev 47550)
+++ trunk/Master/texmf-dist/tex/latex/caption/caption3.sty	2018-05-01 18:03:03 UTC (rev 47551)
@@ -6,9 +6,9 @@
 %%
 %% caption3.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+%% Copyright (C) 1994-2018 Axel Sommerfeldt (axel.sommerfeldt at 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 at tempa$Id: #1 #2 #3-#4-#5 #6${%
-  \def\caption at tempa{#3/#4/#5 }\def\caption at tempb{#2 }}
-\caption at tempa $Id: caption3.sty 166 2016-05-22 18:50:55Z sommerfeldt $
-\ProvidesPackage{caption3}[\caption at tempa v1.7-\caption at tempb caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2018/04/15 v1.7-167 caption3 kernel (AR)]
 \providecommand\caption at FixArabTeX{%
   \def\caption at tempa##1{}%
   \ifx\caption at tempa\@gobble
@@ -1133,9 +1130,10 @@
     \caption at ifbeamertemplate{numbered}{%
       \caption at lfmt@simple at magyar{#1}{#2}}{#1}}
   \@ifundefined{@@magyar at captionfix}\AtBeginDocument\@firstofone{%
-    \g at addto@macro\@@magyar at captionfix{%
-      \let\caption at lfmt@simple at magyar\caption at lfmt@simpleMagyar
-      \let\caption at lfmt@simpleMagyar\caption at lfmt@default at magyar}}
+    \@ifundefined{@@magyar at captionfix}{}{%
+      \g at addto@macro\@@magyar at captionfix{%
+        \let\caption at lfmt@simple at magyar\caption at lfmt@simpleMagyar
+        \let\caption at lfmt@simpleMagyar\caption at lfmt@default at magyar}}}
   \caption at declarelabelseparator
     {\caption at ifbeamertemplate{caption name own line}\@gobble\@firstofone}
     {default}

Modified: trunk/Master/texmf-dist/tex/latex/caption/ltcaption.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/ltcaption.sty	2018-05-01 18:02:49 UTC (rev 47550)
+++ trunk/Master/texmf-dist/tex/latex/caption/ltcaption.sty	2018-05-01 18:03:03 UTC (rev 47551)
@@ -6,9 +6,9 @@
 %%
 %% ltcaption.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+%% Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt at 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 at tempa$Id: #1 #2 #3-#4-#5 #6${%
-  \def\caption at tempa{#3/#4/#5 }\def\caption at tempb{#2 }}
-\caption at tempa $Id: ltcaption.sty 94 2013-06-09 16:07:04Z sommerfeldt $
-\ProvidesPackage{ltcaption}[\caption at tempa v1.4-\caption at 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}

Modified: trunk/Master/texmf-dist/tex/latex/caption/newfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/newfloat.sty	2018-05-01 18:02:49 UTC (rev 47550)
+++ trunk/Master/texmf-dist/tex/latex/caption/newfloat.sty	2018-05-01 18:03:03 UTC (rev 47551)
@@ -6,9 +6,9 @@
 %%
 %% newfloat.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2015 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+%% Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt at 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 at tempa$Id: #1 #2 #3-#4-#5 #6${%
-  \def\caption at tempa{#3/#4/#5 }\def\caption at tempb{#2 }}
-\caption at tempa $Id: newfloat.sty 109 2015-09-17 09:29:07Z sommerfeldt $
-\ProvidesPackage{newfloat}[\caption at tempa v1.1-\caption at tempb Defining new floating environments (AR)]
+\ProvidesPackage{newfloat}[2015/09/17 v1.1-109 Defining new floating environments (AR)]
 \newcommand*\newfloat at Info[1]{%
   \PackageInfo{newfloat}{#1}}
 \newcommand*\newfloat at InfoNoLine[1]{%

Modified: trunk/Master/texmf-dist/tex/latex/caption/subcaption.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/subcaption.sty	2018-05-01 18:02:49 UTC (rev 47550)
+++ trunk/Master/texmf-dist/tex/latex/caption/subcaption.sty	2018-05-01 18:03:03 UTC (rev 47551)
@@ -8,7 +8,7 @@
 %% 
 %% Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt at 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 at tempa$Id: #1 #2 #3-#4-#5 #6${%
-  \def\caption at tempa{#3/#4/#5 }\def\caption at tempb{#2 }}
-\caption at tempa $Id: subcaption.sty 161 2016-05-22 14:39:14Z sommerfeldt $
-\ProvidesPackage{subcaption}[\caption at tempa v1.1-\caption at 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 at CheckCompatibility{%
   \@ifpackageloaded{subfigure}{%

Modified: trunk/Master/texmf-dist/tex/latex/caption/totalcount.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/totalcount.sty	2018-05-01 18:02:49 UTC (rev 47550)
+++ trunk/Master/texmf-dist/tex/latex/caption/totalcount.sty	2018-05-01 18:03:03 UTC (rev 47551)
@@ -6,9 +6,9 @@
 %%
 %% totalcount.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+%% Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt at 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 at tempa$Id: #1 #2 #3-#4-#5 #6${%
-  \def\caption at tempa{#3/#4/#5 }\def\caption at tempb{#2 }}
-\caption at tempa $Id: totalcount.sty 92 2013-05-12 09:06:59Z sommerfeldt $
-\ProvidesPackage{totalcount}[\caption at tempa v1.0-\caption at 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 at text{\reset at font\bfseries ??}}%



More information about the tex-live-commits mailing list