diff options
| author | Karl Berry <karl@freefriends.org> | 2018-05-01 18:03:03 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2018-05-01 18:03:03 +0000 |
| commit | 5fe7446034e35f94836e48943a6417e3843d2003 (patch) | |
| tree | 13bcb33a135cce246abd1c8309b5bf425b033eef /Master | |
| parent | 1a0e99416060de1e124428f5589e959dbc2febbb (diff) | |
caption (15apr18)
git-svn-id: svn://tug.org/texlive/trunk@47551 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
29 files changed, 90 insertions, 149 deletions
diff --git a/Master/texmf-dist/doc/latex/caption/README b/Master/texmf-dist/doc/latex/caption/README index ea49e525a44..1a02cc11757 100644 --- a/Master/texmf-dist/doc/latex/caption/README +++ b/Master/texmf-dist/doc/latex/caption/README @@ -1,14 +1,14 @@ ========================================================================== The `caption' package bundle -Release 2016-05-22 -Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +Release 2018-04-15 +Copyright (C) 1994-2018 Axel Sommerfeldt (axel.sommerfeldt@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 need help using these packages please visit: 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@f-m.fm -------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/caption/bicaption.pdf b/Master/texmf-dist/doc/latex/caption/bicaption.pdf Binary files differindex 64396a78862..a0cc964d398 100644 --- a/Master/texmf-dist/doc/latex/caption/bicaption.pdf +++ b/Master/texmf-dist/doc/latex/caption/bicaption.pdf diff --git a/Master/texmf-dist/doc/latex/caption/caption-deu.pdf b/Master/texmf-dist/doc/latex/caption/caption-deu.pdf Binary files differindex dd9ed5f3a6e..b047f9b6235 100644 --- a/Master/texmf-dist/doc/latex/caption/caption-deu.pdf +++ b/Master/texmf-dist/doc/latex/caption/caption-deu.pdf diff --git a/Master/texmf-dist/doc/latex/caption/caption-eng.pdf b/Master/texmf-dist/doc/latex/caption/caption-eng.pdf Binary files differindex 8473c951591..b547c50ce7d 100644 --- a/Master/texmf-dist/doc/latex/caption/caption-eng.pdf +++ b/Master/texmf-dist/doc/latex/caption/caption-eng.pdf diff --git a/Master/texmf-dist/doc/latex/caption/caption-rus.pdf b/Master/texmf-dist/doc/latex/caption/caption-rus.pdf Binary files differindex c8ac73f2950..e0a093adfb1 100644 --- a/Master/texmf-dist/doc/latex/caption/caption-rus.pdf +++ b/Master/texmf-dist/doc/latex/caption/caption-rus.pdf diff --git a/Master/texmf-dist/doc/latex/caption/ltcaption.pdf b/Master/texmf-dist/doc/latex/caption/ltcaption.pdf Binary files differindex 85b7a52483c..d0cb408a3d4 100644 --- a/Master/texmf-dist/doc/latex/caption/ltcaption.pdf +++ b/Master/texmf-dist/doc/latex/caption/ltcaption.pdf diff --git a/Master/texmf-dist/doc/latex/caption/newfloat.pdf b/Master/texmf-dist/doc/latex/caption/newfloat.pdf Binary files differindex 3b72f7fe3b6..b3e61dd8c0f 100644 --- a/Master/texmf-dist/doc/latex/caption/newfloat.pdf +++ b/Master/texmf-dist/doc/latex/caption/newfloat.pdf diff --git a/Master/texmf-dist/doc/latex/caption/subcaption.pdf b/Master/texmf-dist/doc/latex/caption/subcaption.pdf Binary files differindex 432e4e28314..6fbfdfe0a80 100644 --- a/Master/texmf-dist/doc/latex/caption/subcaption.pdf +++ b/Master/texmf-dist/doc/latex/caption/subcaption.pdf diff --git a/Master/texmf-dist/doc/latex/caption/totalcount.pdf b/Master/texmf-dist/doc/latex/caption/totalcount.pdf Binary files differindex 9e63fbf0da8..cbcdc392d3c 100644 --- a/Master/texmf-dist/doc/latex/caption/totalcount.pdf +++ b/Master/texmf-dist/doc/latex/caption/totalcount.pdf diff --git a/Master/texmf-dist/source/latex/caption/bicaption.dtx b/Master/texmf-dist/source/latex/caption/bicaption.dtx index 149a58acfcc..e94f60f664e 100644 --- a/Master/texmf-dist/source/latex/caption/bicaption.dtx +++ b/Master/texmf-dist/source/latex/caption/bicaption.dtx @@ -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@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@tempa$Id: #1 #2 #3-#4-#5 #6${% - \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }} -\caption@tempa $Id: bicaption.dtx 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)] % \end{macrocode} % \begin{macrocode} \RequirePackage{caption}[2016/02/01] % needs v3.3-134 or newer diff --git a/Master/texmf-dist/source/latex/caption/caption-deu.tex b/Master/texmf-dist/source/latex/caption/caption-deu.tex index b52ef4e4164..83694e5bd2d 100644 --- a/Master/texmf-dist/source/latex/caption/caption-deu.tex +++ b/Master/texmf-dist/source/latex/caption/caption-deu.tex @@ -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@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 diff --git a/Master/texmf-dist/source/latex/caption/caption-eng.tex b/Master/texmf-dist/source/latex/caption/caption-eng.tex index 27ef802baa7..d0e76a49c60 100644 --- a/Master/texmf-dist/source/latex/caption/caption-eng.tex +++ b/Master/texmf-dist/source/latex/caption/caption-eng.tex @@ -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@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 diff --git a/Master/texmf-dist/source/latex/caption/caption-rus.tex b/Master/texmf-dist/source/latex/caption/caption-rus.tex index 224539c7bce..2b3fc2f928e 100644 --- a/Master/texmf-dist/source/latex/caption/caption-rus.tex +++ b/Master/texmf-dist/source/latex/caption/caption-rus.tex @@ -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@f-m.fm) % @@ -248,7 +248,7 @@ }}{}} % \author{Axel Sommerfeldt\\ \author{ΐκρελό Ηξμμεπτελόδς (Axel Sommerfeldt)\\ - \url{http://sourceforge.net/projects/latex-caption/}} + \url{https://github.com/axelsommerfeldt/latex-caption}} \date{\docdate} \maketitle diff --git a/Master/texmf-dist/source/latex/caption/caption.dtx b/Master/texmf-dist/source/latex/caption/caption.dtx index c51e803d1ea..758ca0f7f66 100644 --- a/Master/texmf-dist/source/latex/caption/caption.dtx +++ b/Master/texmf-dist/source/latex/caption/caption.dtx @@ -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@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@tempa$Id: #1 #2 #3-#4-#5 #6${% - \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }} -\caption@tempa $Id: caption.dtx 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)] % \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@settype} and \cs{caption@setposition}} % \changes{v3.3}{2012/04/09}{Adapted to revised version of \cs{caption@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,15 +1821,21 @@ % \end{macrocode} % \begin{macrocode} \newcommand\caption@ibox[3]{% - \@testopt{\caption@iibox{#1}{#2}{#3}}{\wd\@tempboxa}} + \kernel@ifnextchar[%] + {\caption@iibox{#1}{#2}{#3}}% + {\caption@iibox@{#1}{#2}{#3}}} % \end{macrocode} % \begin{macrocode} \long\def\caption@iibox#1#2#3[#4]{% \@testopt{\caption@iiibox{#1}{#2}{#3}{#4}}\captionbox@hj@default} % \end{macrocode} % \begin{macrocode} +\long\def\caption@iibox@#1#2#3#4{% + \setbox\@tempboxa\hbox{#4}% + \caption@iiibox{#1}{#2}{#3}{\wd\@tempboxa}[\captionbox@hj@default]{\unhbox\@tempboxa}} +% \end{macrocode} +% \begin{macrocode} \long\def\caption@iiibox#1#2#3#4[#5]#6{% - \setbox\@tempboxa\hbox{#6}% \begingroup #1*% set \caption@position \caption@iftop{% @@ -1845,14 +1846,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/source/latex/caption/caption.ins b/Master/texmf-dist/source/latex/caption/caption.ins index dc2eace4295..81de7ee1ebd 100644 --- a/Master/texmf-dist/source/latex/caption/caption.ins +++ b/Master/texmf-dist/source/latex/caption/caption.ins @@ -6,9 +6,9 @@ \preamble -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 -------------------------------------------------------------------------- diff --git a/Master/texmf-dist/source/latex/caption/caption2.dtx b/Master/texmf-dist/source/latex/caption/caption2.dtx index eb4883c0595..1fc50eba858 100644 --- a/Master/texmf-dist/source/latex/caption/caption2.dtx +++ b/Master/texmf-dist/source/latex/caption/caption2.dtx @@ -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@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@tempa$Id: #1 #2 #3-#4-#5 #6${% - \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }} -\caption@tempa $Id: caption2.dtx 117 2015-09-20 20:43:35Z sommerfeldt $ -\ProvidesPackage{caption2}[\caption@tempa v2.2-\caption@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} diff --git a/Master/texmf-dist/source/latex/caption/caption3.dtx b/Master/texmf-dist/source/latex/caption/caption3.dtx index f1bf4b7088d..d6f89bd77d7 100644 --- a/Master/texmf-dist/source/latex/caption/caption3.dtx +++ b/Master/texmf-dist/source/latex/caption/caption3.dtx @@ -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@f-m.fm) +% Copyright (C) 1994-2018 Axel Sommerfeldt (axel.sommerfeldt@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@tempa$Id: #1 #2 #3-#4-#5 #6${% - \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }} -\caption@tempa $Id: caption3.dtx 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)] % \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@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@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@magyar}{% \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}}} % \end{macrocode} % \begin{macrocode} \caption@declarelabelseparator diff --git a/Master/texmf-dist/source/latex/caption/ltcaption.dtx b/Master/texmf-dist/source/latex/caption/ltcaption.dtx index dabba0de5a2..f7565a92db9 100644 --- a/Master/texmf-dist/source/latex/caption/ltcaption.dtx +++ b/Master/texmf-dist/source/latex/caption/ltcaption.dtx @@ -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@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@tempa$Id: #1 #2 #3-#4-#5 #6${% - \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }} -\caption@tempa $Id: ltcaption.dtx 117 2015-09-20 20:43:35Z sommerfeldt $ -\ProvidesPackage{ltcaption}[\caption@tempa v1.4-\caption@tempb longtable captions (AR)] +\ProvidesPackage{ltcaption}[2013/06/09 v1.4-94 longtable captions (AR)] % \end{macrocode} % % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/caption/newfloat.dtx b/Master/texmf-dist/source/latex/caption/newfloat.dtx index f80eed4c129..c95fbddb4c1 100644 --- a/Master/texmf-dist/source/latex/caption/newfloat.dtx +++ b/Master/texmf-dist/source/latex/caption/newfloat.dtx @@ -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@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@tempa$Id: #1 #2 #3-#4-#5 #6${% - \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }} -\caption@tempa $Id: newfloat.dtx 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)] % \end{macrocode} % % \begin{macro}{\newfloat@Info} diff --git a/Master/texmf-dist/source/latex/caption/subcaption.dtx b/Master/texmf-dist/source/latex/caption/subcaption.dtx index 5ca25e16531..bedb96109a5 100644 --- a/Master/texmf-dist/source/latex/caption/subcaption.dtx +++ b/Master/texmf-dist/source/latex/caption/subcaption.dtx @@ -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@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@tempa$Id: #1 #2 #3-#4-#5 #6${% - \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }} -\caption@tempa $Id: subcaption.dtx 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)] % \end{macrocode} % % \subsection{Initial code} diff --git a/Master/texmf-dist/source/latex/caption/totalcount.dtx b/Master/texmf-dist/source/latex/caption/totalcount.dtx index 2ac45c50134..d2fc4fb8b1a 100644 --- a/Master/texmf-dist/source/latex/caption/totalcount.dtx +++ b/Master/texmf-dist/source/latex/caption/totalcount.dtx @@ -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@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@tempa$Id: #1 #2 #3-#4-#5 #6${% - \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }} -\caption@tempa $Id: totalcount.dtx 117 2015-09-20 20:43:35Z 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)] % \end{macrocode} % % \subsection{Initial code} 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 ??}}% |