From ce680c5880f743ecea22f9ebfde192a05186c257 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 4 Feb 2013 23:09:35 +0000 Subject: caption (4feb13) git-svn-id: svn://tug.org/texlive/trunk@29026 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/caption/CHANGELOG | 5 +- Master/texmf-dist/doc/latex/caption/README | 15 ++++- Master/texmf-dist/doc/latex/caption/SUMMARY | 1 + Master/texmf-dist/doc/latex/caption/bicaption.pdf | Bin 101444 -> 101619 bytes .../texmf-dist/doc/latex/caption/caption-deu.pdf | Bin 319767 -> 319070 bytes .../texmf-dist/doc/latex/caption/caption-eng.pdf | Bin 308303 -> 307767 bytes .../texmf-dist/doc/latex/caption/caption-rus.pdf | Bin 719015 -> 720696 bytes Master/texmf-dist/doc/latex/caption/caption.pdf | Bin 53240 -> 0 bytes Master/texmf-dist/doc/latex/caption/caption2.pdf | Bin 65041 -> 0 bytes Master/texmf-dist/doc/latex/caption/caption3.pdf | Bin 48342 -> 0 bytes Master/texmf-dist/doc/latex/caption/ltcaption.pdf | Bin 79903 -> 79935 bytes Master/texmf-dist/doc/latex/caption/newfloat.pdf | Bin 93983 -> 94110 bytes Master/texmf-dist/doc/latex/caption/subcaption.pdf | Bin 133292 -> 133451 bytes .../texmf-dist/source/latex/caption/bicaption.dtx | 14 +++-- .../source/latex/caption/caption-deu.tex | 11 ++-- .../source/latex/caption/caption-eng.tex | 11 ++-- .../source/latex/caption/caption-rus.tex | 6 +- Master/texmf-dist/source/latex/caption/caption.dtx | 68 ++++++++++----------- Master/texmf-dist/source/latex/caption/caption.ins | 4 +- .../texmf-dist/source/latex/caption/caption2.dtx | 12 +++- .../texmf-dist/source/latex/caption/caption3.dtx | 21 ++++--- .../texmf-dist/source/latex/caption/ltcaption.dtx | 12 +++- .../texmf-dist/source/latex/caption/newfloat.dtx | 12 +++- .../texmf-dist/source/latex/caption/subcaption.dtx | 14 +++-- Master/texmf-dist/tex/latex/caption/bicaption.sty | 9 ++- Master/texmf-dist/tex/latex/caption/caption.sty | 36 +++++------ Master/texmf-dist/tex/latex/caption/caption2.sty | 9 ++- Master/texmf-dist/tex/latex/caption/caption3.sty | 11 +++- Master/texmf-dist/tex/latex/caption/ltcaption.sty | 9 ++- Master/texmf-dist/tex/latex/caption/newfloat.sty | 9 ++- Master/texmf-dist/tex/latex/caption/subcaption.sty | 9 ++- Master/tlpkg/bin/tlpkg-ctan-check | 8 ++- 32 files changed, 190 insertions(+), 116 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/caption/SUMMARY delete mode 100644 Master/texmf-dist/doc/latex/caption/caption.pdf delete mode 100644 Master/texmf-dist/doc/latex/caption/caption2.pdf delete mode 100644 Master/texmf-dist/doc/latex/caption/caption3.pdf (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/caption/CHANGELOG b/Master/texmf-dist/doc/latex/caption/CHANGELOG index d023f660e45..558591df3dc 100644 --- a/Master/texmf-dist/doc/latex/caption/CHANGELOG +++ b/Master/texmf-dist/doc/latex/caption/CHANGELOG @@ -97,10 +97,11 @@ v3.3 (2013/01/06) - Revised handling of continued floats and sub-captions - New option box= and appropriate command \DeclareCaptionBox - New option list-entry= (see also endfloat package documentation) -- Support of multiple optional arguments added to \captionsetup +- Support of multiple optional arguments added to \captionsetup (see bicaption package documentation) - Adapted to the elsarticle document class - Adapted to the current version of memhfixc package, provided by the memoir document class - Fixed compatibility problem with breqn and nag packages +- Corrects incorrect load order hyperref-float now (needs hyperref v6.82q or newer) bicaption package @@ -112,7 +113,7 @@ v0.9 (2010/09/19) v1.0 (2011/09/03) - Support for list entries added -v1.1 (2012/04/08) +v1.1 (2012/12/26) - \captionmainlanguage and \selectcaptionlanguage added diff --git a/Master/texmf-dist/doc/latex/caption/README b/Master/texmf-dist/doc/latex/caption/README index 72e5896e04c..463f81f287f 100644 --- a/Master/texmf-dist/doc/latex/caption/README +++ b/Master/texmf-dist/doc/latex/caption/README @@ -1,16 +1,29 @@ ========================================================================== The `caption' package bundle -Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +Copyright (C) 1994-2013 Axel Sommerfeldt License: LPPL = LaTeX Project Public Licence Maintenance Status: maintained (by Axel Sommerfeldt) +Home page: +http://sourceforge.net/projects/latex-caption/ + If you need help for installation please visit: http://www.tex.ac.uk/cgi-bin/texfaq2html?label=inst-miktex* http://www.tex.ac.uk/cgi-bin/texfaq2html?label=installthings http://www.tex.ac.uk/cgi-bin/texfaq2html?label=privinst +If you need help using these packages please visit: +http://www.latex-community.org/ +http://tex.stackexchange.com/ +http://www.mrunix.de/ (German) +http://www.golatex.de/ (German) + +If you think you may have found a bug in these packages, +or want to report a suggestion for improvement, please visit: +http://sourceforge.net/p/latex-caption/tickets/ + -------------------------------------------------------------------------- The `caption' package v3.3 offers customization of captions of floating diff --git a/Master/texmf-dist/doc/latex/caption/SUMMARY b/Master/texmf-dist/doc/latex/caption/SUMMARY new file mode 100644 index 00000000000..3c3dbafcbdc --- /dev/null +++ b/Master/texmf-dist/doc/latex/caption/SUMMARY @@ -0,0 +1 @@ +This LaTeX package provides many ways to customise the captions in floating environments like figure and table. diff --git a/Master/texmf-dist/doc/latex/caption/bicaption.pdf b/Master/texmf-dist/doc/latex/caption/bicaption.pdf index 05163c02d43..e99edc20e6e 100644 Binary files a/Master/texmf-dist/doc/latex/caption/bicaption.pdf and b/Master/texmf-dist/doc/latex/caption/bicaption.pdf differ diff --git a/Master/texmf-dist/doc/latex/caption/caption-deu.pdf b/Master/texmf-dist/doc/latex/caption/caption-deu.pdf index 60162c204ac..230f4e72dbc 100644 Binary files a/Master/texmf-dist/doc/latex/caption/caption-deu.pdf and b/Master/texmf-dist/doc/latex/caption/caption-deu.pdf differ diff --git a/Master/texmf-dist/doc/latex/caption/caption-eng.pdf b/Master/texmf-dist/doc/latex/caption/caption-eng.pdf index 2f93fbd0e51..03eae1aff96 100644 Binary files a/Master/texmf-dist/doc/latex/caption/caption-eng.pdf and b/Master/texmf-dist/doc/latex/caption/caption-eng.pdf differ diff --git a/Master/texmf-dist/doc/latex/caption/caption-rus.pdf b/Master/texmf-dist/doc/latex/caption/caption-rus.pdf index d4f5ef1f03a..ff161228b8b 100644 Binary files a/Master/texmf-dist/doc/latex/caption/caption-rus.pdf and b/Master/texmf-dist/doc/latex/caption/caption-rus.pdf differ diff --git a/Master/texmf-dist/doc/latex/caption/caption.pdf b/Master/texmf-dist/doc/latex/caption/caption.pdf deleted file mode 100644 index bdbcc87b94e..00000000000 Binary files a/Master/texmf-dist/doc/latex/caption/caption.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/caption/caption2.pdf b/Master/texmf-dist/doc/latex/caption/caption2.pdf deleted file mode 100644 index 5128cc499bd..00000000000 Binary files a/Master/texmf-dist/doc/latex/caption/caption2.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/caption/caption3.pdf b/Master/texmf-dist/doc/latex/caption/caption3.pdf deleted file mode 100644 index add870fa9cb..00000000000 Binary files a/Master/texmf-dist/doc/latex/caption/caption3.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/caption/ltcaption.pdf b/Master/texmf-dist/doc/latex/caption/ltcaption.pdf index 78aa26bf735..d035a4ad4ca 100644 Binary files a/Master/texmf-dist/doc/latex/caption/ltcaption.pdf and b/Master/texmf-dist/doc/latex/caption/ltcaption.pdf differ diff --git a/Master/texmf-dist/doc/latex/caption/newfloat.pdf b/Master/texmf-dist/doc/latex/caption/newfloat.pdf index b7c303c371e..555b03fe8c0 100644 Binary files a/Master/texmf-dist/doc/latex/caption/newfloat.pdf and b/Master/texmf-dist/doc/latex/caption/newfloat.pdf differ diff --git a/Master/texmf-dist/doc/latex/caption/subcaption.pdf b/Master/texmf-dist/doc/latex/caption/subcaption.pdf index ca25bcbd691..d419f3e3616 100644 Binary files a/Master/texmf-dist/doc/latex/caption/subcaption.pdf and b/Master/texmf-dist/doc/latex/caption/subcaption.pdf differ diff --git a/Master/texmf-dist/source/latex/caption/bicaption.dtx b/Master/texmf-dist/source/latex/caption/bicaption.dtx index fdfe5a62602..e5fc48b2722 100644 --- a/Master/texmf-dist/source/latex/caption/bicaption.dtx +++ b/Master/texmf-dist/source/latex/caption/bicaption.dtx @@ -2,6 +2,9 @@ % % This is file `bicaption.dtx'. % +% $Id: bicaption.dtx 63 2013-02-03 13:27:05Z sommerfeldt $ +% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/trunk/source/bicaption.dtx $ +% % Copyright (C) 2010-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) % % -------------------------------------------------------------------------- @@ -25,12 +28,12 @@ % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. % % \fi -% \CheckSum{385} +% \CheckSum{394} % % \iffalse %<*driver> \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesFile{bicaption.drv}[2012/12/26 v1.1 Adds a bilingual caption feature to the caption package] +\ProvidesFile{bicaption.drv}[2012/04/10 v1.1 Adds a bilingual caption feature to the caption package] \hbadness=9999 \newcount\hbadness \hfuzz=74pt % Make TeX shut up. %\errorcontextlines=3 % @@ -124,7 +127,7 @@ % This package has version number \fileversion, last revised \filedate.}}%^^A % {The bicaption package}} % \author{Axel Sommerfeldt\\ -% \href{mailto:axel.sommerfeldt@f-m.fm}{\texttt{axel.sommerfeldt@f-m.fm}}} +% \url{http://sourceforge.net/projects/latex-caption/}} % \date{\docdate} % \maketitle % @@ -794,7 +797,10 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{bicaption}[2012/12/26 v1.1 Bilingual Captions (AR)] +\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 63 2013-02-03 13:27:05Z sommerfeldt $ +\ProvidesPackage{bicaption}[\caption@tempa v1.1-\caption@tempb Bilingual Captions (AR)] % \end{macrocode} % \begin{macrocode} \RequirePackage{caption}[2012/12/26] % needs v3.3 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 f3e88f0dc9a..55b639c408a 100644 --- a/Master/texmf-dist/source/latex/caption/caption-deu.tex +++ b/Master/texmf-dist/source/latex/caption/caption-deu.tex @@ -1,6 +1,9 @@ % % This is file `caption-deu.tex'. % +% $Id: caption-deu.tex 64 2013-02-03 13:41:27Z sommerfeldt $ +% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/trunk/source/caption-deu.tex $ +% % Copyright (C) 1994-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) % % -------------------------------------------------------------------------- @@ -57,7 +60,6 @@ \usepackage[bottom]{footmisc} \usepackage{graphicx,longtable,setspace} -\IfFileExists{test/tlc2/cat.eps}{\graphicspath{{test/tlc2/}}}{}% \usepackage{hypdoc} \ifpdf\usepackage{hypdestopt}\fi @@ -198,12 +200,9 @@ \let\docdate\filedate \GetFileInfo{caption.sty} -\title{Anpassen der Abbildungs- und Tabellenbeschriftungen - mit Hilfe des caption-Paketes\texorpdfstring{\thanks{% - Dieses Paket hat die Versionsnummer \fileversion, - zuletzt ge"andert am \filedate.}}{}} +\title{Anpassen der Abbildungs- und Tabellenbeschriftungen} \author{Axel Sommerfeldt\\ - \href{mailto:axel.sommerfeldt@f-m.fm}{\texttt{axel.sommerfeldt@f-m.fm}}} + \url{http://sourceforge.net/projects/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 381d745be3e..6c3782bb306 100644 --- a/Master/texmf-dist/source/latex/caption/caption-eng.tex +++ b/Master/texmf-dist/source/latex/caption/caption-eng.tex @@ -1,6 +1,9 @@ % % This is file `caption-eng.tex'. % +% $Id: caption-eng.tex 64 2013-02-03 13:41:27Z sommerfeldt $ +% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/trunk/source/caption-eng.tex $ +% % Copyright (C) 1994-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) % % -------------------------------------------------------------------------- @@ -50,7 +53,6 @@ \usepackage[bottom]{footmisc} \usepackage{graphicx,longtable,setspace} -\IfFileExists{test/tlc2/cat.eps}{\graphicspath{{test/tlc2/}}}{}% \usepackage{hypdoc} \ifpdf\usepackage{hypdestopt}\fi @@ -191,12 +193,9 @@ \let\docdate\filedate \GetFileInfo{caption.sty} -\title{Customizing captions of floating environments - using the caption package\texorpdfstring{\thanks{% - This package has version number \fileversion, - last revised \filedate.}}{}} +\title{Customizing captions of floating environments} \author{Axel Sommerfeldt\\ - \href{mailto:axel.sommerfeldt@f-m.fm}{\texttt{axel.sommerfeldt@f-m.fm}}} + \url{http://sourceforge.net/projects/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 8bf60c425c4..458259adcaa 100644 --- a/Master/texmf-dist/source/latex/caption/caption-rus.tex +++ b/Master/texmf-dist/source/latex/caption/caption-rus.tex @@ -2,6 +2,9 @@ % This is file `caption-rus.tex'. % Russian translation of `caption-eng.tex' % +% $Id: caption-rus.tex 63 2013-02-03 13:27:05Z sommerfeldt $ +% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/trunk/source/caption-rus.tex $ +% % Copyright (C) 1994-2007 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) % % -------------------------------------------------------------------------- @@ -66,7 +69,6 @@ \usepackage[bottom]{footmisc} \usepackage{graphicx,longtable,setspace} -\IfFileExists{test/tlc2/cat.eps}{\graphicspath{{test/tlc2/}}}{}% \usepackage{hypdoc} \hypersetup{unicode} @@ -246,7 +248,7 @@ }}{}} % \author{Axel Sommerfeldt\\ \author{ΐκρελό Ηξμμεπτελόδς (Axel Sommerfeldt)\\ - \href{mailto:axel.sommerfeldt@f-m.fm}{\texttt{axel.sommerfeldt@f-m.fm}}} + \url{http://sourceforge.net/projects/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 84af747aa8d..1059245b1a2 100644 --- a/Master/texmf-dist/source/latex/caption/caption.dtx +++ b/Master/texmf-dist/source/latex/caption/caption.dtx @@ -2,6 +2,9 @@ % % This is file `caption.dtx'. % +% $Id: caption.dtx 65 2013-02-03 15:09:48Z sommerfeldt $ +% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/trunk/source/caption.dtx $ +% % Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) % % -------------------------------------------------------------------------- @@ -25,12 +28,12 @@ % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. % % \fi -% \CheckSum{3475} +% \CheckSum{3459} % % \iffalse %<*driver> \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesFile{caption.drv}[2012/12/26 v3.3 Implementation of the caption package] +\ProvidesFile{caption.drv}[2011/08/06 v3.3 Implementation of the caption package] \hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up. %\errorcontextlines=3 % @@ -96,7 +99,7 @@ % This package has version number \fileversion, last revised \filedate.}}%^^A % {the caption package}} % \author{Axel Sommerfeldt\\ -% \href{mailto:axel.sommerfeldt@f-m.fm}{\texttt{axel.sommerfeldt@f-m.fm}}} +% \url{http://sourceforge.net/projects/latex-caption/}} % \date{\docdate} % \maketitle % @@ -218,8 +221,10 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption}[2013/01/06 v3.3 Customizing captions (AR)] -%\@ifundefined{PackageRedefines}{}{\PackageRedefines{caption}{caption}} +\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 65 2013-02-03 15:09:48Z sommerfeldt $ +\ProvidesPackage{caption}[\caption@tempa v3.3-\caption@tempb Customizing captions (AR)] % \end{macrocode} % % \subsection{Loading the kernel} @@ -1383,10 +1388,6 @@ \caption@Debug{% Restore hypcap definition of \string\capstart\@gobble}% \let\capstart\caption@ORI@capstart}% - \caption@ifundefined\caption@ORI@float@makebox{}{% - \caption@Debug{% - Restore hyperref redefinition of \string\float@makebox\@gobble}% - \let\float@makebox\caption@ORI@float@makebox}% }% % \end{macrocode} % @@ -1426,8 +1427,7 @@ % \end{macrocode} % \begin{macrocode} \caption@AtBeginDocument*{% - \let\caption@ORI@capstart\@undefined - \let\caption@ORI@float@makebox\@undefined}% + \let\caption@ORI@capstart\@undefined}% % \end{macrocode} % % \begin{macro}{\@xfloat} @@ -2816,6 +2816,27 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\float@makebox} +% \changes{v3.3}{2013/01/06}{Corrects wrong load order hyperref-float now} +% \changes{v3.3}{2013/02/03}{Correction of wrong load order hyperref-float revised} +% Redefine |\float@makebox| (only if we are not operating in compatibility mode). +% \begin{macrocode} + \caption@AtBeginDocument{\caption@ifcompatibility{}{% +% \end{macrocode} +% If it was redefined by the \package{hyperref} package, +% we need to build on the original definition (and not on the redefined one). +% \begin{macrocode} + \caption@ifundefined\HyOrg@float@makebox + {\let\caption@ORI@float@makebox\float@makebox}% + {\let\caption@ORI@float@makebox\HyOrg@float@makebox}% + \renewcommand\float@makebox[1]{% + \caption@ORI@float@makebox{#1\relax \caption@defrostHref}}% +% \end{macrocode} +% \begin{macrocode} + }}% +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\caption@typehook} % \changes{v3.1}{2007/07/08}{float package hook added} % \LaTeX\ and almost every other packages use @@ -3408,31 +3429,6 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\float@makebox} -% \changes{v3.3}{2013/01/06}{Corrects wrong load order hyperref-float now} -% Do our own redefinition of |\float@makebox|, if it was redefined by -% the \package{hyperref} package. -% (But first of all we correct a wrong load order \package{hyperref}-\package{float}, -% if possible.) -% \begin{macrocode} - \caption@ifundefined\HyNew@float@makebox{}{% - \caption@ifundefined\HyOrg@float@makebox{% - \caption@Debug{% - Correcting wrong load order hyperref-float\@gobble}% - \let\HyOrg@float@makebox\float@makebox - \let\float@makebox\HyNew@float@makebox}{}}% -% \end{macrocode} -% \begin{macrocode} - \caption@ifundefined\HyOrg@float@makebox{}{% - \caption@Debug{% - Redefining \noexpand\float@makebox (again)\@gobble}% - \let\caption@ORI@float@makebox\float@makebox % save for compatibility mode - \renewcommand\float@makebox[1]{% - \HyOrg@float@makebox{#1\relax \caption@defrostHref}}% - }% -% \end{macrocode} -% \end{macro} -% % \begin{macrocode} }}{} % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/caption/caption.ins b/Master/texmf-dist/source/latex/caption/caption.ins index 763f86f2156..2933c9d61c1 100644 --- a/Master/texmf-dist/source/latex/caption/caption.ins +++ b/Master/texmf-dist/source/latex/caption/caption.ins @@ -6,7 +6,9 @@ \preamble -Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +Copyright (C) 1994-2013 Axel Sommerfeldt + +http://sourceforge.net/projects/latex-caption/ -------------------------------------------------------------------------- diff --git a/Master/texmf-dist/source/latex/caption/caption2.dtx b/Master/texmf-dist/source/latex/caption/caption2.dtx index f5195233adf..0b0369f091c 100644 --- a/Master/texmf-dist/source/latex/caption/caption2.dtx +++ b/Master/texmf-dist/source/latex/caption/caption2.dtx @@ -2,6 +2,9 @@ % % This is file `caption2.dtx'. % +% $Id: caption2.dtx 63 2013-02-03 13:27:05Z sommerfeldt $ +% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/trunk/source/caption2.dtx $ +% % Copyright (C) 1994-2011 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) % % -------------------------------------------------------------------------- @@ -25,7 +28,7 @@ % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. % % \fi -% \CheckSum{853} +% \CheckSum{862} % % \iffalse %<*driver> @@ -74,7 +77,7 @@ % This package has version number \fileversion, last revised \filedate.}}%^^A % {caption2 package}} % \author{Axel Sommerfeldt\\ -% \href{mailto:axel.sommerfeldt@f-m.fm}{\texttt{axel.sommerfeldt@f-m.fm}}} +% \url{http://sourceforge.net/projects/latex-caption/}} % \date{\docdate} % \maketitle % @@ -203,7 +206,10 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption2}[2011/08/12 v2.2d Customising captions (AR)] +\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 63 2013-02-03 13:27:05Z sommerfeldt $ +\ProvidesPackage{caption2}[\caption@tempa v2.2-\caption@tempb 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 d80fb43d646..6a2d11419ab 100644 --- a/Master/texmf-dist/source/latex/caption/caption3.dtx +++ b/Master/texmf-dist/source/latex/caption/caption3.dtx @@ -2,6 +2,9 @@ % % This is file `caption3.dtx'. % +% $Id: caption3.dtx 63 2013-02-03 13:27:05Z sommerfeldt $ +% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/trunk/source/caption3.dtx $ +% % Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) % % -------------------------------------------------------------------------- @@ -25,12 +28,12 @@ % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. % % \fi -% \CheckSum{3461} +% \CheckSum{3470} % % \iffalse %<*driver> \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesFile{caption3.drv}[2013/01/06 v1.5 Implementation of the caption kernel] +\ProvidesFile{caption3.drv}[2011/10/09 v1.5 Implementation of the caption kernel] \hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up. %\errorcontextlines=3 % @@ -99,7 +102,7 @@ % This package has version number \fileversion, last revised \filedate.}}%^^A % {the caption kernel}} % \author{Axel Sommerfeldt\\ -% \href{mailto:axel.sommerfeldt@f-m.fm}{\texttt{axel.sommerfeldt@f-m.fm}}} +% \url{http://sourceforge.net/projects/latex-caption/}} % \date{\docdate} % \maketitle % @@ -198,7 +201,10 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption3}[2013/01/06 v1.5 caption3 kernel (AR)] +\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 63 2013-02-03 13:27:05Z sommerfeldt $ +\ProvidesPackage{caption3}[\caption@tempa v1.5-\caption@tempb caption3 kernel (AR)] % \end{macrocode} % % \subsection{Generic helpers} @@ -3537,6 +3543,7 @@ % \changes{v1.3}{2011/01/01}{\cs{@dottedlofline} will be defined \& used now} % \changes{v1.4}{2011/10/09}{Support of the titletoc package added} % \changes{v1.5}{2011/12/29}{Usage of \cs{caption@addtoreset} replaced by \cs{@addtoreset}} +% \changes{v1.5}{2013/01/10}{Bugfix: Definition of autoref string corrected} % |\DeclareCaptionSubType|\oarg{numbering scheme}\marg{type}\\ % |\DeclareCaptionSubType*|\oarg{numbering scheme}\marg{type}\par % The starred variant provides the numbering format @@ -3574,7 +3581,7 @@ % \end{macrocode} % \begin{macrocode} \@namedef{sub#3name}{}% - \@namedef{sub#3autorefname}{\csname #3name\endcsname}% + \@namedef{sub#3autorefname}{\csname #3autorefname\endcsname}% #1% is \@firstoftwo in star form, and \@secondoftwo otherwise {\@namedef{p@sub#3}{}% \@namedef{thesub#3}{\csname the#3\endcsname.\@nameuse{#2}{sub#3}}}% @@ -3670,15 +3677,13 @@ % \end{macro} % % \subsection{subfig package adaptions} -% \changes{v1.0i}{2007/01/07}{Very small bugfix of \package{subfig} package added} -% \changes{v1.0j}{2007/01/31}{Bugfix of \package{subfig} package moved from package to kernel} % \changes{v1.1}{2007/07/07}{Several adaptions to the \package{subfig} package added} % \changes{v1.4a}{2011/11/01}{Bugfix 11-11-01: Test for the \package{subfig} package revised} % % Since the \package{subfig} package is not maintained anymore, % we have to make several adaptions to \thispackage~\version{1.1} here. % Please note that we only support the version $1.3$ of the \package{subfig} package here. -% So older versions do not work with this version of \thispackage, and never +% So older versions do not work with this version of \thispackage, and newer % versions are expected to be adapted. % \begin{macrocode} \caption@AtBeginDocument{% diff --git a/Master/texmf-dist/source/latex/caption/ltcaption.dtx b/Master/texmf-dist/source/latex/caption/ltcaption.dtx index d38526a7adc..e2e93706dd3 100644 --- a/Master/texmf-dist/source/latex/caption/ltcaption.dtx +++ b/Master/texmf-dist/source/latex/caption/ltcaption.dtx @@ -2,6 +2,9 @@ % % This is file `ltcaption.dtx'. % +% $Id: ltcaption.dtx 63 2013-02-03 13:27:05Z sommerfeldt $ +% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/trunk/source/ltcaption.dtx $ +% % Copyright (C) 2007-2011 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) % % -------------------------------------------------------------------------- @@ -25,7 +28,7 @@ % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. % % \fi -% \CheckSum{347} +% \CheckSum{356} % % \iffalse %<*driver> @@ -84,7 +87,7 @@ % This package has version number \fileversion, last revised \filedate.}}%^^A % {The ltcaption package}} % \author{Axel Sommerfeldt\\ -% \href{mailto:axel.sommerfeldt@f-m.fm}{\texttt{axel.sommerfeldt@f-m.fm}}} +% \url{http://sourceforge.net/projects/latex-caption/}} % \date{\docdate} % \maketitle % @@ -451,7 +454,10 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{ltcaption}[2011/09/12 v1.3 longtable captions (AR)] +\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 63 2013-02-03 13:27:05Z sommerfeldt $ +\ProvidesPackage{ltcaption}[\caption@tempa v1.3-\caption@tempb 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 05198f0d5f4..3522c9bfea1 100644 --- a/Master/texmf-dist/source/latex/caption/newfloat.dtx +++ b/Master/texmf-dist/source/latex/caption/newfloat.dtx @@ -2,6 +2,9 @@ % % This is file `newfloat.dtx'. % +% $Id: newfloat.dtx 63 2013-02-03 13:27:05Z sommerfeldt $ +% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/trunk/source/newfloat.dtx $ +% % Copyright (C) 2011-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) % % -------------------------------------------------------------------------- @@ -25,7 +28,7 @@ % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. % % \fi -% \CheckSum{1291} +% \CheckSum{1300} % % \iffalse %<*driver> @@ -94,7 +97,7 @@ % This package has version number \fileversion, last revised \filedate.}}%^^A % {The newfloat package}} % \author{Axel Sommerfeldt\\ -% \href{mailto:axel.sommerfeldt@f-m.fm}{\texttt{axel.sommerfeldt@f-m.fm}}} +% \url{http://sourceforge.net/projects/latex-caption/}} % \date{\docdate} % \maketitle % @@ -452,7 +455,10 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{newfloat}[2012/05/19 v1.0b Defining new floating environments (AR)] +\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 63 2013-02-03 13:27:05Z sommerfeldt $ +\ProvidesPackage{newfloat}[\caption@tempa v1.0-\caption@tempb 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 13d365884a8..60254f632ca 100644 --- a/Master/texmf-dist/source/latex/caption/subcaption.dtx +++ b/Master/texmf-dist/source/latex/caption/subcaption.dtx @@ -2,6 +2,9 @@ % % This is file `subcaption.dtx'. % +% $Id: subcaption.dtx 63 2013-02-03 13:27:05Z sommerfeldt $ +% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/trunk/source/subcaption.dtx $ +% % Copyright (C) 2007-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) % % -------------------------------------------------------------------------- @@ -25,7 +28,7 @@ % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. % % \fi -% \CheckSum{133} +% \CheckSum{142} % % \iffalse %<*driver> @@ -53,7 +56,6 @@ % \usepackage[bottom]{footmisc} \usepackage{array,graphicx,overpic,pict2e,diagbox} -\IfFileExists{test/tlc2/cat.eps}{\graphicspath{{test/tlc2/}}}{}% % \PassOptionsToPackage{breaklinks=true}{hyperref} \usepackage{hypdoc} @@ -116,7 +118,7 @@ % This package has version number \fileversion, last revised \filedate.}}%^^A % {The subcaption package}} % \author{Axel Sommerfeldt\\ -% \href{mailto:axel.sommerfeldt@f-m.fm}{\texttt{axel.sommerfeldt@f-m.fm}}} +% \url{http://sourceforge.net/projects/latex-caption/}} % \date{\docdate} % \maketitle % @@ -892,9 +894,13 @@ % \fi % % \subsection{Identification} +% % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{subcaption}[2012/04/09 v1.1f Sub-captions (AR)] +\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 63 2013-02-03 13:27:05Z sommerfeldt $ +\ProvidesPackage{subcaption}[\caption@tempa v1.1-\caption@tempb Sub-captions (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 94b6fecdb8a..f3ca79f4242 100644 --- a/Master/texmf-dist/tex/latex/caption/bicaption.sty +++ b/Master/texmf-dist/tex/latex/caption/bicaption.sty @@ -6,7 +6,9 @@ %% %% bicaption.dtx (with options: `package') %% -%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +%% Copyright (C) 1994-2013 Axel Sommerfeldt +%% +%% http://sourceforge.net/projects/latex-caption/ %% %% -------------------------------------------------------------------------- %% @@ -29,7 +31,10 @@ %% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{bicaption}[2012/12/26 v1.1 Bilingual Captions (AR)] +\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 62 2013-02-03 10:40:15Z sommerfeldt $ +\ProvidesPackage{bicaption}[\caption@tempa v1.1-\caption@tempb Bilingual Captions (AR)] \RequirePackage{caption}[2012/12/26] % needs v3.3 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 bf396d89096..8e6755e630d 100644 --- a/Master/texmf-dist/tex/latex/caption/caption.sty +++ b/Master/texmf-dist/tex/latex/caption/caption.sty @@ -6,7 +6,9 @@ %% %% caption.dtx (with options: `package') %% -%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +%% Copyright (C) 1994-2013 Axel Sommerfeldt +%% +%% http://sourceforge.net/projects/latex-caption/ %% %% -------------------------------------------------------------------------- %% @@ -30,7 +32,10 @@ %% % bicaption.sty, ltcaption.sty, subcaption.sty, and newfloat.sty, \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption}[2013/01/06 v3.3 Customizing captions (AR)] +\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 65 2013-02-03 15:09:48Z sommerfeldt $ +\ProvidesPackage{caption}[\caption@tempa v3.3-\caption@tempb Customizing captions (AR)] \RequirePackage{caption3}[2012/12/26] % needs v1.5 or newer \caption@ifbool{documentclass}{}{% \caption@WarningNoLine{% @@ -654,10 +659,6 @@ \caption@Debug{% Restore hypcap definition of \string\capstart\@gobble}% \let\capstart\caption@ORI@capstart}% - \caption@ifundefined\caption@ORI@float@makebox{}{% - \caption@Debug{% - Restore hyperref redefinition of \string\float@makebox\@gobble}% - \let\float@makebox\caption@ORI@float@makebox}% }% \renewcommand*\caption@star[2]{#1#2}% }{% @@ -673,8 +674,7 @@ \caption@redefine }% \caption@AtBeginDocument*{% - \let\caption@ORI@capstart\@undefined - \let\caption@ORI@float@makebox\@undefined}% + \let\caption@ORI@capstart\@undefined}% \let\caption@ORI@xfloat\@xfloat \def\@xfloat#1[#2]{% \caption@ORI@xfloat{#1}[#2]% @@ -1208,6 +1208,13 @@ }{}% \caption@freezeHref % will be defrosted in \float@makebox \caption@ORI@float@setevery{#1}}% + \caption@AtBeginDocument{\caption@ifcompatibility{}{% + \caption@ifundefined\HyOrg@float@makebox + {\let\caption@ORI@float@makebox\float@makebox}% + {\let\caption@ORI@float@makebox\HyOrg@float@makebox}% + \renewcommand\float@makebox[1]{% + \caption@ORI@float@makebox{#1\relax \caption@defrostHref}}% + }}% \g@addto@macro\caption@typehook{% \expandafter\ifx\csname #1name\endcsname\relax \expandafter\let\csname #1name\expandafter\endcsname @@ -1398,19 +1405,6 @@ \caption@startanchor\caption@currentHref \global\let\caption@currentHref\@undefined \fi}% - \caption@ifundefined\HyNew@float@makebox{}{% - \caption@ifundefined\HyOrg@float@makebox{% - \caption@Debug{% - Correcting wrong load order hyperref-float\@gobble}% - \let\HyOrg@float@makebox\float@makebox - \let\float@makebox\HyNew@float@makebox}{}}% - \caption@ifundefined\HyOrg@float@makebox{}{% - \caption@Debug{% - Redefining \noexpand\float@makebox (again)\@gobble}% - \let\caption@ORI@float@makebox\float@makebox % save for compatibility mode - \renewcommand\float@makebox[1]{% - \HyOrg@float@makebox{#1\relax \caption@defrostHref}}% - }% }}{} \caption@IfPackageLoaded{hypcap}{% v1.0 \ifx\caption@start\relax \else % hyperref hasn't stopped early diff --git a/Master/texmf-dist/tex/latex/caption/caption2.sty b/Master/texmf-dist/tex/latex/caption/caption2.sty index 415b7241b01..a4a37457c66 100644 --- a/Master/texmf-dist/tex/latex/caption/caption2.sty +++ b/Master/texmf-dist/tex/latex/caption/caption2.sty @@ -6,7 +6,9 @@ %% %% caption2.dtx (with options: `package') %% -%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +%% Copyright (C) 1994-2013 Axel Sommerfeldt +%% +%% http://sourceforge.net/projects/latex-caption/ %% %% -------------------------------------------------------------------------- %% @@ -29,7 +31,10 @@ %% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption2}[2011/08/12 v2.2d Customising captions (AR)] +\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 62 2013-02-03 10:40:15Z sommerfeldt $ +\ProvidesPackage{caption2}[\caption@tempa v2.2-\caption@tempb 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 17eb5c5743c..c524f77aa1c 100644 --- a/Master/texmf-dist/tex/latex/caption/caption3.sty +++ b/Master/texmf-dist/tex/latex/caption/caption3.sty @@ -6,7 +6,9 @@ %% %% caption3.dtx (with options: `package') %% -%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +%% Copyright (C) 1994-2013 Axel Sommerfeldt +%% +%% http://sourceforge.net/projects/latex-caption/ %% %% -------------------------------------------------------------------------- %% @@ -29,7 +31,10 @@ %% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption3}[2013/01/06 v1.5 caption3 kernel (AR)] +\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 62 2013-02-03 10:40:15Z sommerfeldt $ +\ProvidesPackage{caption3}[\caption@tempa v1.5-\caption@tempb caption3 kernel (AR)] \providecommand*\@nameundef[1]{% \expandafter\let\csname #1\endcsname\@undefined} \providecommand\l@addto@macro[2]{% @@ -1494,7 +1499,7 @@ \caption@ifundefined\contentsuse{}{% \contentsuse{sub#3}{\csname ext@sub#3\endcsname}}% \@namedef{sub#3name}{}% - \@namedef{sub#3autorefname}{\csname #3name\endcsname}% + \@namedef{sub#3autorefname}{\csname #3autorefname\endcsname}% #1% is \@firstoftwo in star form, and \@secondoftwo otherwise {\@namedef{p@sub#3}{}% \@namedef{thesub#3}{\csname the#3\endcsname.\@nameuse{#2}{sub#3}}}% diff --git a/Master/texmf-dist/tex/latex/caption/ltcaption.sty b/Master/texmf-dist/tex/latex/caption/ltcaption.sty index 58bf6ddc01d..153f4c875f0 100644 --- a/Master/texmf-dist/tex/latex/caption/ltcaption.sty +++ b/Master/texmf-dist/tex/latex/caption/ltcaption.sty @@ -6,7 +6,9 @@ %% %% ltcaption.dtx (with options: `package') %% -%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +%% Copyright (C) 1994-2013 Axel Sommerfeldt +%% +%% http://sourceforge.net/projects/latex-caption/ %% %% -------------------------------------------------------------------------- %% @@ -29,7 +31,10 @@ %% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{ltcaption}[2011/09/12 v1.3 longtable captions (AR)] +\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 62 2013-02-03 10:40:15Z sommerfeldt $ +\ProvidesPackage{ltcaption}[\caption@tempa v1.3-\caption@tempb 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 507be3322d4..b945f492bbb 100644 --- a/Master/texmf-dist/tex/latex/caption/newfloat.sty +++ b/Master/texmf-dist/tex/latex/caption/newfloat.sty @@ -6,7 +6,9 @@ %% %% newfloat.dtx (with options: `package') %% -%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +%% Copyright (C) 1994-2013 Axel Sommerfeldt +%% +%% http://sourceforge.net/projects/latex-caption/ %% %% -------------------------------------------------------------------------- %% @@ -29,7 +31,10 @@ %% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{newfloat}[2012/05/19 v1.0b Defining new floating environments (AR)] +\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 62 2013-02-03 10:40:15Z sommerfeldt $ +\ProvidesPackage{newfloat}[\caption@tempa v1.0-\caption@tempb 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 56ba02f214a..759a19ab24d 100644 --- a/Master/texmf-dist/tex/latex/caption/subcaption.sty +++ b/Master/texmf-dist/tex/latex/caption/subcaption.sty @@ -6,7 +6,9 @@ %% %% subcaption.dtx (with options: `package') %% -%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +%% Copyright (C) 1994-2013 Axel Sommerfeldt +%% +%% http://sourceforge.net/projects/latex-caption/ %% %% -------------------------------------------------------------------------- %% @@ -29,7 +31,10 @@ %% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{subcaption}[2012/04/09 v1.1f Sub-captions (AR)] +\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 62 2013-02-03 10:40:15Z sommerfeldt $ +\ProvidesPackage{subcaption}[\caption@tempa v1.1-\caption@tempb Sub-captions (AR)] \RequirePackage{caption}[2012/03/25] % needs v3.3 or newer \caption@AtBeginDocument{\caption@ifcompatibility{% \caption@Error{% diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index 2b668b294bd..c1093e78e12 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -486,6 +486,7 @@ my @TLP_no_check = ( "c90", # part of cjk "chktex", # binary "cjkutils", # binary + "cns", # part of cjk "context", # binary+taco "cs", # distributed as .tar.gz, too painful to unpack "cslatex", # distributed as .tar.gz @@ -510,7 +511,7 @@ my @TLP_no_check = ( "dvisvgm", # binary "enctex", # binary "etex", # binary - "finbib", # missing on CTAN + "finbib", # not on CTAN "fontname", # tl-update-auto "fontware", # binary "garuda-c90", # part of cjk @@ -518,6 +519,7 @@ my @TLP_no_check = ( "gnu-freefont", # no files to compare, distributed as tarballs "groff", # binary "gsftopk", # binary + "gustlib", # not on CTAN, requested from GUST "guide-to-latex", # not on CTAN, book examples, ok "hyperref-docsrc", # not on CTAN, awaiting hyperref doc volunteer "ifluatex", # part of oberdiek @@ -547,13 +549,13 @@ my @TLP_no_check = ( "pstools", # binary "psutils", # binary "ptex", # binary - "roex", # GUST + "roex", # GUST, requested 2012 "seetexk", # binary "synctex", # binary "t1utils", # binary "tetex", # our sources "tex", # binary - "tex-virtual-academy-pl",# GUST + "tex-virtual-academy-pl",# GUST, requested 2012 "tex4ht", # binary "texconfig", # our sources "texdoc", # binary -- cgit v1.2.3