From 231b3e33972bc418dc51de55e2dbd853adb90224 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 21 Sep 2015 21:58:06 +0000 Subject: caption (21sep15) git-svn-id: svn://tug.org/texlive/trunk@38425 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/caption/README | 3 +- Master/texmf-dist/doc/latex/caption/bicaption.pdf | Bin 101595 -> 101463 bytes .../texmf-dist/doc/latex/caption/caption-deu.pdf | Bin 319070 -> 319080 bytes .../texmf-dist/doc/latex/caption/caption-eng.pdf | Bin 307767 -> 307875 bytes Master/texmf-dist/doc/latex/caption/ltcaption.pdf | Bin 81048 -> 81013 bytes Master/texmf-dist/doc/latex/caption/newfloat.pdf | Bin 99991 -> 99869 bytes Master/texmf-dist/doc/latex/caption/subcaption.pdf | Bin 133516 -> 133478 bytes Master/texmf-dist/doc/latex/caption/totalcount.pdf | Bin 73857 -> 73833 bytes .../source/latex/caption/caption-deu.tex | 81 ++++++++------------- .../source/latex/caption/caption-eng.tex | 75 +++++++------------ Master/texmf-dist/source/latex/caption/caption.dtx | 52 ++++++------- .../texmf-dist/source/latex/caption/caption2.dtx | 12 +-- .../texmf-dist/source/latex/caption/caption3.dtx | 27 +++---- .../texmf-dist/source/latex/caption/ltcaption.dtx | 14 ++-- .../texmf-dist/source/latex/caption/subcaption.dtx | 12 +-- .../texmf-dist/source/latex/caption/totalcount.dtx | 8 +- Master/texmf-dist/tex/latex/caption/caption3.sty | 15 ++-- 17 files changed, 128 insertions(+), 171 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/caption/README b/Master/texmf-dist/doc/latex/caption/README index 331f5e00c69..fd90321262e 100644 --- a/Master/texmf-dist/doc/latex/caption/README +++ b/Master/texmf-dist/doc/latex/caption/README @@ -1,6 +1,7 @@ ========================================================================== The `caption' package bundle +Release 2015-09-20 Copyright (C) 1994-2015 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) License: LPPL = LaTeX Project Public Licence @@ -17,8 +18,8 @@ If you need help for installation please visit: 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) + http://www.texwelt.de/ (German) If you think you may have found a bug in these packages, or want to report a suggestion for improvement, please either visit diff --git a/Master/texmf-dist/doc/latex/caption/bicaption.pdf b/Master/texmf-dist/doc/latex/caption/bicaption.pdf index 08784a0d0c0..64396a78862 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 230f4e72dbc..dd9ed5f3a6e 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 03eae1aff96..8473c951591 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/ltcaption.pdf b/Master/texmf-dist/doc/latex/caption/ltcaption.pdf index 088b64eb521..85b7a52483c 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 3e8503b2ff4..3b72f7fe3b6 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 a19ad789d60..432e4e28314 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/doc/latex/caption/totalcount.pdf b/Master/texmf-dist/doc/latex/caption/totalcount.pdf index afe5b317c4f..9e63fbf0da8 100644 Binary files a/Master/texmf-dist/doc/latex/caption/totalcount.pdf and b/Master/texmf-dist/doc/latex/caption/totalcount.pdf differ diff --git a/Master/texmf-dist/source/latex/caption/caption-deu.tex b/Master/texmf-dist/source/latex/caption/caption-deu.tex index d83d1c1062c..b52ef4e4164 100644 --- a/Master/texmf-dist/source/latex/caption/caption-deu.tex +++ b/Master/texmf-dist/source/latex/caption/caption-deu.tex @@ -1,7 +1,7 @@ % % This is file `caption-deu.tex'. % -% $Id: caption-deu.tex 64 2013-02-03 13:41:27Z sommerfeldt $ +% $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 $ % % Copyright (C) 1994-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) @@ -1353,7 +1353,7 @@ Betroffenen |\caption| Befehl auszuschalten. Mehr Informationen über \emph{wanderende} Argumente und \emph{zerbrechliche} \& \emph{robuste} Befehle finden sich in der gängigen \LaTeX"=Literatur, aber auch hier: -\url{http://www.ctan.org/tex-archive/info/lshort/german/} +\url{http://mirror.ctan.org/info/lshort/german/} und (in englischer Sprache) hier: \url{http://www-h.eng.cam.ac.uk/help/tpl/textprocessing/teTeX/latex/latex2e-html/fragile.html} \end{Expert} @@ -3264,7 +3264,7 @@ jedem ans Herz legen: beinhaltet die häufigsten Fragen und Antworten, die im Zusammenhang mit \LaTeX\ und Abbildungen auftreten: \begin{quote} - \url{http://dante.ctan.org/info/l2picfaq/german/l2picfaq.pdf} + \url{http://mirror.ctan.org/info/l2picfaq/german/l2picfaq.pdf} \end{quote} \item @@ -3272,14 +3272,14 @@ jedem ans Herz legen: erl"autert den Umgang mit gleitenden Umgebungen und ist hier im Netz zu finden: \begin{quote} - \url{ftp://dante.ctan.org/pub/tex/info/german/gleitobjekte/} + \url{http://mirror.ctan.org/info/german/gleitobjekte/} \end{quote} \item \textsf{epslatex} von Keith Reckdahl enth"alt viele n"utzliche Tips im Zusammenhang mit der Einbindung von Graphiken in \LaTeXe. Das Dokument ist in Englisch und unter - \begin{quote}\url{ftp://dante.ctan.org/pub/tex/info/epslatex/}\end{quote} + \begin{quote}\url{http://mirror.ctan.org/info/epslatex/}\end{quote} zu finden. \end{itemize} @@ -4429,170 +4429,147 @@ und laden Sie nicht mehr \thispackage. \bibitem{beamer} Till Tantau:\\ - \href{http://dante.ctan.org/tex-archive/macros/latex/contrib/beamer/}% -% \href{ftp://dante.ctan.org/tex-archive/macros/latex/contrib/beamer/doc/beameruserguide.pdf}% + \href{http://www.ctan.org/pkg/beamer}% {\emph{User Guide to the Beamer Class, Version 3.07}},\\ March 11, 2007 \bibitem{KOMAScript} Markus Kohm \& Jens-Uwe-Morawski:\\ - \href{http://dante.ctan.org/tex-archive/macros/latex/contrib/koma-script/}% -% \href{ftp://dante.ctan.org/tex-archive/macros/latex/contrib/koma-script/scrguide.pdf}% + \href{http://www.ctan.org/pkg/koma-script}% {\emph{KOMA-Script -- ein wandelbares \LaTeXe-Paket}},\\ 2007-03-02 \bibitem{NTG} Victor Eijkhout:\\ - \href{http://dante.ctan.org/tex-archive/macros/latex/contrib/ntgclass/}% -% \href{ftp://dante.ctan.org/tex-archive/macros/latex/contrib/ntgclass/classdoc.pdf}% + \href{http://www.ctan.org/pkg/ntgclass}% {\emph{An introduction to the Dutch \LaTeX\ document classes}},\\ 3 September 1989 \bibitem{algorithms} Rog\'erio Brito:\\ - \href{http://dante.ctan.org/tex-archive/macros/latex/contrib/algorithms/}% -% \href{ftp://dante.ctan.org/tex-archive/macros/latex/contrib/algorithms/algorithms.pdf}% + \href{http://www.ctan.org/pkg/algorithms}% {\emph{Algorithms}},\\ June 2, 2006 \iffalse \bibitem{algorithm2e} Christophe Fiorio:\\ - \href{http://dante.ctan.org/tex-archive/macros/latex/contrib/algorithm2e/}% -% \href{ftp://dante.ctan.org/tex-archive/macros/latex/contrib/algorithm2e/algorithm2e.pdf}% + \href{http://www.ctan.org/pkg/algorithm2e}% {\emph{algorithm2e.sty -- package for algorithms}},\\ March 11, 2007 \fi \bibitem{float} Anselm Lingnau:\\ - \href{http://dante.ctan.org/tex-archive/macros/latex/contrib/float/}% -% \href{ftp://dante.ctan.org/tex-archive/macros/latex/contrib/float/float.pdf}% + \href{http://www.ctan.org/pkg/float}% {\emph{An Improved Environment for Floats}},\\ 2001/11/08 \bibitem{floatflt} Mats Dahlgren:\\ - \href{http://dante.ctan.org/tex-archive/macros/latex/contrib/floatflt/}% -% \href{ftp://dante.ctan.org/tex-archive/macros/latex/contrib/floatflt/floatflt.pdf}% + \href{http://www.ctan.org/pkg/floatflt}% {\emph{Welcome to the floatflt package}},\\ 1998/06/05 \bibitem{floatrow} Olga Lapko:\\ - \href{http://dante.ctan.org/tex-archive/macros/latex/contrib/floatrow/}% -% \href{ftp://dante.ctan.org/tex-archive/macros/latex/contrib/floatrow/floatrow.pdf}% + \href{http://www.ctan.org/pkg/floatrow}% {\emph{The floatrow package documentation}},\\ 2007/12/24 \bibitem{fltpage} Sebastian Gross:\\ - \href{http://dante.ctan.org/tex-archive/macros/latex/contrib/fltpage/}% -% \href{ftp://dante.ctan.org/tex-archive/macros/latex/contrib/fltpage/fltpage.pdf}% + \href{http://www.ctan.org/pkg/fltpage}% {\emph{Welcome to the beta test of fltpage package!}},\\ 1998/11/13 \bibitem{hyperref} Sebastian Rahtz \& Heiko Oberdiek:\\ - \href{http://dante.ctan.org/tex-archive/macros/latex/contrib/hyperref/}% -% \href{ftp://dante.ctan.org/tex-archive/macros/latex/contrib/hyperref/hyperref.pdf}% + \href{http://www.ctan.org/pkg/hyperref}% {\emph{Hypertext marks in \LaTeX}},\\ November 12, 2007 \bibitem{hypcap} Heiko Oberdiek:\\ - \href{http://dante.ctan.org/tex-archive/macros/latex/contrib/oberdiek/}% -% \href{ftp://dante.ctan.org/tex-archive/macros/latex/contrib/oberdiek/hypcap.pdf}% + \href{http://www.ctan.org/pkg/hypcap}% {\emph{The hypcap package -- Adjusting anchors of captions}},\\ 2007/04/09 \bibitem{listings} Carsten Heinz \& Brooks Moses:\\ - \href{http://dante.ctan.org/tex-archive/macros/latex/contrib/listings/}% -% \href{ftp://dante.ctan.org/tex-archive/macros/latex/contrib/listings/listings.pdf}% + \href{http://www.ctan.org/pkg/listings}% {\emph{The Listings Package}},\\ 2007/02/22 \bibitem{longtable} David Carlisle:\\ - \href{http://dante.ctan.org/tex-archive/macros/latex/required/tools/}% -% \href{ftp://dante.ctan.org/tex-archive/macros/latex/required/tools/longtable.pdf}% + \href{http://www.ctan.org/pkg/longtable}% {\emph{The longtable package}},\\ 2004/02/01 \bibitem{picinpar} Friedhelm Sowa:\\ - \href{http://dante.ctan.org/tex-archive/macros/latex209/contrib/picinpar/}% -% \href{ftp://dante.ctan.org/tex-archive/macros/latex209/contrib/picinpar/}% + \href{http://www.ctan.org/pkg/picinpar}% {\emph{Pictures in Paragraphs}},\\ July 13, 1993 \bibitem{picins} Joachim Bleser und Edmund Lang:\\ - \href{http://dante.ctan.org/tex-archive/macros/latex209/contrib/picins/}% -% \href{ftp://dante.ctan.org/tex-archive/macros/latex209/contrib/picins/mpic.dvi}% + \href{http://www.ctan.org/pkg/picins}% {\emph{PicIns-Benutzerhandbuch Version 3.0}},\\ September~1992 \bibitem{rotating} Sebastian Rahtz und Leonor Barroca:\\ - \href{http://dante.ctan.org/tex-archive/macros/latex/contrib/rotating/}% -% \href{ftp://dante.ctan.org/tex-archive/macros/latex/contrib/rotating/}% + \href{http://www.ctan.org/pkg/rotating}% {\emph{A style option for rotated objects in \LaTeX}},\\ 1997/09/26 \bibitem{setspace} Erica M. S. Harris \& Geoffrey Tobin:\\ - \href{http://dante.ctan.org/tex-archive/macros/latex/contrib/setspace/}% -% \href{ftp://dante.ctan.org/tex-archive/macros/latex/contrib/setspace/}% + \href{http://www.ctan.org/pkg/setspace}% {\emph{LaTeX Document Package ``setspace''}},\\ 1 December 2000 \bibitem{sidecap} Rolf Niepraschk \& Hubert G\"a\ss lein:\\ - \href{http://dante.ctan.org/tex-archive/macros/latex/contrib/sidecap/}% -% \href{ftp://dante.ctan.org/tex-archive/macros/latex/contrib/sidecap/sidecap.pdf}% + \href{http://www.ctan.org/pkg/sidecap}% {\emph{The sidecap package}},\\ 2003/06/06 \bibitem{subfigure} Steven D. Cochran:\\ - \href{http://dante.ctan.org/tex-archive/macros/latex/contrib/subfigure/}% -% \href{ftp://dante.ctan.org/tex-archive/macros/latex/contrib/subfigure/subfigure.pdf}% + \href{http://www.ctan.org/pkg/subfigure}% {\emph{The subfigure package}},\\ 2002/07/02 \bibitem{subfig} Steven D. Cochran:\\ - \href{http://dante.ctan.org/tex-archive/macros/latex/contrib/subfig/}% -% \href{ftp://dante.ctan.org/tex-archive/macros/latex/contrib/subfig/subfig.pdf}% + \href{http://www.ctan.org/pkg/subfig}% {\emph{The subfig package}},\\ 2005/07/05 \bibitem{supertabular} Johannes Braams und Theo Jurriens:\\ - \href{http://dante.ctan.org/tex-archive/macros/latex/contrib/supertabular/}% -% \href{ftp://dante.ctan.org/tex-archive/macros/latex/contrib/supertabular/supertabular.pdf}% + \href{http://www.ctan.org/pkg/supertabular}% {\emph{The supertabular environment}},\\ 2002/07/19 \bibitem{threeparttable} Donald Arseneau:\\ - \href{http://dante.ctan.org/tex-archive/macros/latex/contrib/misc/}% -% \href{ftp://dante.ctan.org/tex-archive/macros/latex/contrib/misc/threeparttable.sty}% + \href{http://www.ctan.org/pkg/threeparttable}% {\emph{Three part tables: title, tabular environment, notes}},\\ 2003/06/13 \bibitem{wrapfig} Donald Arseneau:\\ - \href{http://dante.ctan.org/tex-archive/macros/latex/contrib/wrapfig/}% -% \href{ftp://dante.ctan.org/tex-archive/macros/latex/contrib/wrapfig/wrapfig.sty}% + \href{http://www.ctan.org/pkg/wrapfig}% {\emph{WRAPFIG.STY ver 3.6}},\\ 2003/01/31 \bibitem{xtab} Peter Wilson:\\ - \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/xtab/}% + \href{http://www.ctan.org/pkg/xtab}% {\emph{The xtab package}},\\ 2004/05/24 diff --git a/Master/texmf-dist/source/latex/caption/caption-eng.tex b/Master/texmf-dist/source/latex/caption/caption-eng.tex index a6eb72e4434..27ef802baa7 100644 --- a/Master/texmf-dist/source/latex/caption/caption-eng.tex +++ b/Master/texmf-dist/source/latex/caption/caption-eng.tex @@ -1,7 +1,7 @@ % % This is file `caption-eng.tex'. % -% $Id: caption-eng.tex 64 2013-02-03 13:41:27Z sommerfeldt $ +% $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 $ % % Copyright (C) 1994-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) @@ -3148,7 +3148,7 @@ I recommend the following documents for further reading: \textsf{epslatex} from Keith Reckdahl contains many tips around including graphics in \LaTeXe\ documents. You will find this document in the directory - \begin{quote}\url{ftp://tug.ctan.org/pub/tex/info/epslatex/}\end{quote} + \begin{quote}\url{http://mirror.ctan.org/info/epslatex/}\end{quote} \end{itemize} % --------------------------------------------------------------------------- % @@ -4085,170 +4085,147 @@ to the \package{subfig} package instead and do not load \thispackage\ anymore. \bibitem{beamer} Till Tantau:\\ - \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/beamer/}% -% \href{ftp://tug.ctan.org/tex-archive/macros/latex/contrib/beamer/doc/beameruserguide.pdf}% + \href{http://www.ctan.org/pkg/beamer}% {\emph{User Guide to the Beamer Class, Version 3.07}},\\ March 11, 2007 \bibitem{KOMAScript} Markus Kohm \& Jens-Uwe-Morawski:\\ - \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/koma-script/}% -% \href{ftp://tug.ctan.org/tex-archive/macros/latex/contrib/koma-script/scrguien.pdf}% + \href{http://www.ctan.org/pkg/koma-script}% {\emph{KOMA-Script -- a versatile \LaTeXe\ bundle}},\\ 2007-01-09 \bibitem{NTG} Victor Eijkhout:\\ - \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/ntgclass/}% -% \href{ftp://tug.ctan.org/tex-archive/macros/latex/contrib/ntgclass/classdoc.pdf}% + \href{http://www.ctan.org/pkg/ntgclass}% {\emph{An introduction to the Dutch \LaTeX\ document classes}},\\ 3 September 1989 \bibitem{algorithms} Rog\'erio Brito:\\ - \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/algorithms/}% -% \href{ftp://tug.ctan.org/tex-archive/macros/latex/contrib/algorithms/algorithms.pdf}% + \href{http://www.ctan.org/pkg/algorithms}% {\emph{Algorithms}},\\ June 2, 2006 \iffalse \bibitem{algorithm2e} Christophe Fiorio:\\ - \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/algorithm2e/}% -% \href{ftp://tug.ctan.org/tex-archive/macros/latex/contrib/algorithm2e/algorithm2e.pdf}% + \href{http://www.ctan.org/pkg/algorithm2e}% {\emph{algorithm2e.sty -- package for algorithms}},\\ March 11, 2007 \fi \bibitem{float} Anselm Lingnau:\\ - \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/float/}% -% \href{ftp://tug.ctan.org/tex-archive/macros/latex/contrib/float/float.pdf}% + \href{http://www.ctan.org/pkg/float}% {\emph{An Improved Environment for Floats}},\\ 2001/11/08 \bibitem{floatflt} Mats Dahlgren:\\ - \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/floatflt/}% -% \href{ftp://tug.ctan.org/tex-archive/macros/latex/contrib/floatflt/floatflt.pdf}% + \href{http://www.ctan.org/pkg/floatflt}% {\emph{Welcome to the floatflt package}},\\ 1998/06/05 \bibitem{floatrow} Olga Lapko:\\ - \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/floatrow/}% -% \href{ftp://tug.ctan.org/tex-archive/macros/latex/contrib/floatrow/floatrow.pdf}% + \href{http://www.ctan.org/pkg/floatrow}% {\emph{The floatrow package documentation}},\\ 2007/12/24 \bibitem{fltpage} Sebastian Gross:\\ - \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/fltpage/}% -% \href{ftp://tug.ctan.org/tex-archive/macros/latex/contrib/fltpage/fltpage.pdf}% + \href{http://www.ctan.org/pkg/fltpage}% {\emph{Welcome to the beta test of fltpage package!}},\\ 1998/11/13 \bibitem{hyperref} Sebastian Rahtz \& Heiko Oberdiek:\\ - \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/hyperref/}% -% \href{ftp://tug.ctan.org/tex-archive/macros/latex/contrib/hyperref/hyperref.pdf}% + \href{http://www.ctan.org/pkg/hyperref}% {\emph{Hypertext marks in \LaTeX}},\\ November 12, 2007 \bibitem{hypcap} Heiko Oberdiek:\\ - \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/oberdiek/}% -% \href{ftp://tug.ctan.org/tex-archive/macros/latex/contrib/oberdiek/hypcap.pdf}% + \href{http://www.ctan.org/pkg/hypcap}% {\emph{The hypcap package -- Adjusting anchors of captions}},\\ 2007/04/09 \bibitem{listings} Carsten Heinz \& Brooks Moses:\\ - \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/listings/}% -% \href{ftp://tug.ctan.org/tex-archive/macros/latex/contrib/listings/listings.pdf}% + \href{http://www.ctan.org/pkg/listings}% {\emph{The Listings Package}},\\ 2007/02/22 \bibitem{longtable} David Carlisle:\\ - \href{http://tug.ctan.org/tex-archive/macros/latex/required/tools/}% -% \href{ftp://tug.ctan.org/tex-archive/macros/latex/required/tools/longtable.pdf}% + \href{http://www.ctan.org/pkg/longtable}% {\emph{The longtable package}},\\ 2004/02/01 \bibitem{picinpar} Friedhelm Sowa:\\ - \href{http://tug.ctan.org/tex-archive/macros/latex209/contrib/picinpar/}% -% \href{ftp://tug.ctan.org/tex-archive/macros/latex209/contrib/picinpar/}% + \href{http://www.ctan.org/pkg/picinpar}% {\emph{Pictures in Paragraphs}},\\ July 13, 1993 \bibitem{picins} Joachim Bleser and Edmund Lang:\\ - \href{http://tug.ctan.org/tex-archive/macros/latex209/contrib/picins/}% -% \href{ftp://tug.ctan.org/tex-archive/macros/latex209/contrib/picins/mpic.dvi}% + \href{http://www.ctan.org/pkg/picins}% {\emph{PicIns-Benutzerhandbuch Version 3.0}},\\ September~1992 \bibitem{rotating} Sebastian Rahtz and Leonor Barroca:\\ - \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/rotating/}% -% \href{ftp://tug.ctan.org/tex-archive/macros/latex/contrib/rotating/}% + \href{http://www.ctan.org/pkg/rotating}% {\emph{A style option for rotated objects in \LaTeX}},\\ 1997/09/26 \bibitem{setspace} Erica M. S. Harris \& Geoffrey Tobin:\\ - \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/setspace/}% -% \href{ftp://tug.ctan.org/tex-archive/macros/latex/contrib/setspace/}% + \href{http://www.ctan.org/pkg/setspace}% {\emph{LaTeX Document Package ``setspace''}},\\ 1 December 2000 \bibitem{sidecap} Rolf Niepraschk \& Hubert G\"a\ss lein:\\ - \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/sidecap/}% -% \href{ftp://tug.ctan.org/tex-archive/macros/latex/contrib/sidecap/sidecap.pdf}% + \href{http://www.ctan.org/pkg/sidecap}% {\emph{The sidecap package}},\\ 2003/06/06 \bibitem{subfigure} Steven D. Cochran:\\ - \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/subfigure/}% -% \href{ftp://tug.ctan.org/tex-archive/macros/latex/contrib/subfigure/subfigure.pdf}% + \href{http://www.ctan.org/pkg/subfigure}% {\emph{The subfigure package}},\\ 2002/07/02 \bibitem{subfig} Steven D. Cochran:\\ - \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/subfig/}% -% \href{ftp://tug.ctan.org/tex-archive/macros/latex/contrib/subfig/subfig.pdf}% + \href{http://www.ctan.org/pkg/subfig}% {\emph{The subfig package}},\\ 2005/07/05 \bibitem{supertabular} Johannes Braams and Theo Jurriens:\\ - \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/supertabular/}% -% \href{ftp://tug.ctan.org/tex-archive/macros/latex/contrib/supertabular/supertabular.pdf}% + \href{http://www.ctan.org/pkg/supertabular}% {\emph{The supertabular environment}},\\ 2002/07/19 \bibitem{threeparttable} Donald Arseneau:\\ - \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/misc/}% -% \href{ftp://tug.ctan.org/tex-archive/macros/latex/contrib/misc/threeparttable.sty}% + \href{http://www.ctan.org/pkg/threeparttable}% {\emph{Three part tables: title, tabular environment, notes}},\\ 2003/06/13 \bibitem{wrapfig} Donald Arseneau:\\ - \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/wrapfig/}% -% \href{ftp://tug.ctan.org/tex-archive/macros/latex/contrib/wrapfig/wrapfig.sty}% + \href{http://www.ctan.org/pkg/wrapfig}% {\emph{WRAPFIG.STY ver 3.6}},\\ 2003/01/31 \bibitem{xtab} Peter Wilson:\\ - \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/xtab/}% + \href{http://www.ctan.org/pkg/xtab}% {\emph{The xtab package}},\\ 2004/05/24 diff --git a/Master/texmf-dist/source/latex/caption/caption.dtx b/Master/texmf-dist/source/latex/caption/caption.dtx index 0cdb873108c..a519cdd1ef2 100644 --- a/Master/texmf-dist/source/latex/caption/caption.dtx +++ b/Master/texmf-dist/source/latex/caption/caption.dtx @@ -2,7 +2,7 @@ % % This is file `caption.dtx'. % -% $Id: caption.dtx 111 2015-09-17 09:48:20Z sommerfeldt $ +% $Id: caption.dtx 118 2015-09-20 20:51:09Z sommerfeldt $ % $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/branches/3.3/source/caption.dtx $ % % Copyright (C) 1994-2015 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) @@ -127,11 +127,11 @@ % documentation can be found in % \nopagebreak\begin{quote} % \begin{tabular}{ll} -% \href{ftp://ctan.tug.org/tex-archive/macros/latex/contrib/caption/caption-eng.pdf}% +% \href{http://mirror.ctan.org/macros/latex/contrib/caption/caption-eng.pdf}% % {\texttt{caption-eng.pdf}} & The English documentation \\ -% \href{ftp://ctan.tug.org/tex-archive/macros/latex/contrib/caption/caption-rus.pdf}% +% \href{http://mirror.ctan.org/macros/latex/contrib/caption/caption-rus.pdf}% % {\texttt{caption-rus.pdf}} & The Russian documentation\footnotemark \\ -% \href{ftp://dante.ctan.org/tex-archive/macros/latex/contrib/caption/caption-deu.pdf}% +% \href{http://mirror.ctan.org/macros/latex/contrib/caption/caption-deu.pdf}% % {\texttt{caption-deu.pdf}} & The German documentation \\ % \end{tabular} % \footnotetext{Thanks a lot to Olga Lapko for this translation} @@ -223,7 +223,7 @@ \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 111 2015-09-17 09:48:20Z sommerfeldt $ +\caption@tempa $Id: caption.dtx 118 2015-09-20 20:51:09Z sommerfeldt $ \ProvidesPackage{caption}[\caption@tempa v3.3-\caption@tempb Customizing captions (AR)] % \end{macrocode} % @@ -4635,127 +4635,127 @@ % \begin{thebibliography}{99} % \bibitem{beamer} % Till Tantau:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/beamer/}% +% \href{http://www.ctan.org/pkg/beamer}% % {\emph{The beamer class, User Guide for version 3.25}},\\ % December 26, 2012 % % \bibitem{KOMAScript} % Markus Kohm \& Jens-Uwe-Morawski:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/koma-script/}% +% \href{http://www.ctan.org/pkg/koma-script}% % {\emph{KOMA-Script -- a versatile \LaTeXe\ bundle}},\\ % 2012-07-22 % % \bibitem{NTG} % Victor Eijkhout:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/ntgclass/}% +% \href{http://www.ctan.org/pkg/ntgclass}% % {\emph{An introduction to the Dutch \LaTeX\ document classes}},\\ % 3 September 1989 % % \bibitem{float} % Anselm Lingnau:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/float/}% +% \href{http://www.ctan.org/pkg/float}% % {\emph{An Improved Environment for Floats}},\\ % 2001/11/08 % % \bibitem{floatflt} % Mats Dahlgren:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/floatflt/}% +% \href{http://www.ctan.org/pkg/floatflt}% % {\emph{Welcome to the floatflt package}},\\ % 1998/06/05 % % \bibitem{floatrow} % Olga Lapko:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/floatrow/}% +% \href{http://www.ctan.org/pkg/floatrow}% % {\emph{The floatrow package documentation}},\\ % 2009/08/02 % % \bibitem{fltpage} % Sebastian Gross:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/fltpage/}% +% \href{http://www.ctan.org/pkg/fltpage}% % {\emph{Welcome to the beta test of fltpage package!}},\\ % 1998/11/13 % % \bibitem{hyperref} % Sebastian Rahtz \& Heiko Oberdiek:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/hyperref/}% +% \href{http://www.ctan.org/pkg/hyperref}% % {\emph{Hypertext marks in \LaTeX: a manual for hyperref}},\\ % November 2012 % % \bibitem{hypcap} % Heiko Oberdiek:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/oberdiek/}% +% \href{http://www.ctan.org/pkg/oberdiek}% % {\emph{The hypcap package -- Adjusting anchors of captions}},\\ % 2011/02/16 % % \bibitem{listings} % Carsten Heinz \& Brooks Moses:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/listings/}% +% \href{http://www.ctan.org/pkg/listings}% % {\emph{The Listings Package}},\\ % 2007/02/22 % % \bibitem{longtable} % David Carlisle:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/required/tools/}% +% \href{http://www.ctan.org/pkg/longtable}% % {\emph{The longtable package}},\\ % 2004/02/01 % % \bibitem{picinpar} % Friedhelm Sowa:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex209/contrib/picinpar/}% +% \href{http://www.ctan.org/pkg/picinpar}% % {\emph{Pictures in Paragraphs}},\\ % July 13, 1993 % % \bibitem{picins} % Joachim Bleser and Edmund Lang:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex209/contrib/picins/}% +% \href{http://www.ctan.org/pkg/picins}% % {\emph{PicIns-Benutzerhandbuch Version 3.0}},\\ % September~1992 % % \bibitem{rotating} % Sebastian Rahtz and Leonor Barroca:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/rotating/}% +% \href{http://www.ctan.org/pkg/rotating}% % {\emph{A style option for rotated objects in \LaTeX}},\\ % 1997/09/26 % % \bibitem{sidecap} % Rolf Niepraschk \& Hubert G\"a\ss lein:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/sidecap/}% +% \href{http://www.ctan.org/pkg/sidecap}% % {\emph{The sidecap package}},\\ % 2003/06/06 % % \bibitem{subfigure} % Steven D. Cochran:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/subfigure/}% +% \href{http://www.ctan.org/pkg/subfigure}% % {\emph{The subfigure package}},\\ % 2005/03/15 % % \bibitem{subfig} % Steven D. Cochran:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/subfig/}% +% \href{http://www.ctan.org/pkg/subfig}% % {\emph{The subfig package}},\\ % 2005/07/05 % % \bibitem{supertabular} % Johannes Braams and Theo Jurriens:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/supertabular/}% +% \href{http://www.ctan.org/pkg/supertabular}% % {\emph{The supertabular environment}},\\ % 2004/02/20 % % \bibitem{threeparttable} % Donald Arseneau:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/misc/}% +% \href{http://www.ctan.org/pkg/threeparttable}% % {\emph{Three part tables: title, tabular environment, notes}},\\ % March 5, 2010 % % \bibitem{wrapfig} % Donald Arseneau:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/wrapfig/}% +% \href{http://www.ctan.org/pkg/wrapfig}% % {\emph{WRAPFIG.STY ver 3.6}},\\ % Jan 31, 2003 % % \bibitem{xtab} % Peter Wilson:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/xtab/}% +% \href{http://www.ctan.org/pkg/xtab}% % {\emph{The xtab package}},\\ % 2011/07/31 % \end{thebibliography} diff --git a/Master/texmf-dist/source/latex/caption/caption2.dtx b/Master/texmf-dist/source/latex/caption/caption2.dtx index 1cf2e1468ec..eb4883c0595 100644 --- a/Master/texmf-dist/source/latex/caption/caption2.dtx +++ b/Master/texmf-dist/source/latex/caption/caption2.dtx @@ -2,7 +2,7 @@ % % This is file `caption2.dtx'. % -% $Id: caption2.dtx 63 2013-02-03 13:27:05Z sommerfeldt $ +% $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) @@ -208,7 +208,7 @@ \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 63 2013-02-03 13:27:05Z sommerfeldt $ +\caption@tempa $Id: caption2.dtx 117 2015-09-20 20:43:35Z sommerfeldt $ \ProvidesPackage{caption2}[\caption@tempa v2.2-\caption@tempb Customising captions (AR)] % \end{macrocode} % @@ -1346,25 +1346,25 @@ % \begin{thebibliography}{9} % \bibitem{float} % Anselm Lingnau: -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/float/}% +% \href{http://www.ctan.org/pkg/float}% % {\emph{An Improved Environment for Floats}}, % 2001/11/08 % % \bibitem{longtable} % David Carlisle: -% \href{http://tug.ctan.org/tex-archive/macros/latex/required/tools/}% +% \href{http://www.ctan.org/pkg/longtable}% % {\emph{The longtable package}}, % 2000/10/22 % % \bibitem{rotating} % Sebastian Rahtz and Leonor Barroca: -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/rotating/}% +% \href{http://www.ctan.org/pkg/rotating}% % {\emph{A style option for rotated objects in \LaTeX}},\\ % 1997/09/26 % % \bibitem{subfigure} % Steven D. Cochran: -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/subfigure/}% +% \href{http://www.ctan.org/pkg/subfigure}% % {\emph{The subfigure package}}, % 2002/02/14 % diff --git a/Master/texmf-dist/source/latex/caption/caption3.dtx b/Master/texmf-dist/source/latex/caption/caption3.dtx index edf1839953d..ffb0fd2172a 100644 --- a/Master/texmf-dist/source/latex/caption/caption3.dtx +++ b/Master/texmf-dist/source/latex/caption/caption3.dtx @@ -2,7 +2,7 @@ % % This is file `caption3.dtx'. % -% $Id: caption3.dtx 111 2015-09-17 09:48:20Z sommerfeldt $ +% $Id: caption3.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/caption3.dtx $ % % Copyright (C) 1994-2015 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) @@ -28,7 +28,7 @@ % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. % % \fi -% \CheckSum{3633} +% \CheckSum{3635} % % \iffalse %<*driver> @@ -203,7 +203,7 @@ \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 111 2015-09-17 09:48:20Z sommerfeldt $ +\caption@tempa $Id: caption3.dtx 117 2015-09-20 20:43:35Z sommerfeldt $ \ProvidesPackage{caption3}[\caption@tempa v1.7-\caption@tempb caption3 kernel (AR)] % \end{macrocode} % @@ -2492,11 +2492,10 @@ % \begin{macro}{\DeclareCaptionListFormat} % \changes{v1.1}{2004/07/15}{This macro added} % \changes{v1.2}{2007/11/17}{Renamed from \cs{DeclareCaptionListOfFormat} to \cs{DeclareCaptionListFormat}} -% \changes{v1.7}{2015/09/15}{Argument \#3 added which holds the environment name} % |\DeclareCaptionListFormat|\marg{name}\marg{code with \#1 and \#2} % \begin{macrocode} \newcommand*\DeclareCaptionListFormat[2]{% - \global\@namedef{caption@lstfmt@#1}##1##2##3{#2}} + \global\@namedef{caption@lstfmt@#1}##1##2{#2}} \@onlypreamble\DeclareCaptionListFormat % \end{macrocode} % \end{macro} @@ -3104,6 +3103,7 @@ % \changes{v1.4}{2011/08/30}{Support for option \opt{listtype=} added} % \changes{v1.5}{2012/01/15}{Usage of \cs{caption@addsubcontentslines} added} % \changes{v1.7}{2015/09/15}{Argument \#3 which holds the environment name added to \cs{caption@lstfmt}} +% \changes{v1.7}{2015/09/20}{Unfortunately \package{subfig} defines and uses \cs{caption@lstfmt} as well, so I replaced the third argument with \cs{captionlisttype}} % |\caption@addcontentsline|\marg{type}\marg{list entry}\par % Makes an entry in the list-of-whatever, if requested, % i.e.~the argument \meta{list entry} is not empty and @@ -3133,11 +3133,12 @@ {\let\\\space \@ifundefined{ext@#1}% {\caption@Error{No float type '#1' defined}}% - {\caption@add@contentsline - {\csname ext@#1\endcsname}% - {#1}% - {\caption@lstfmt{\@nameuse{p@#1}}{\@nameuse{the#1}}{#1}}% - {\ignorespaces #2}}}} + {\def\captionlisttype{#1}% + \caption@add@contentsline + {\csname ext@#1\endcsname}% + {#1}% + {\caption@lstfmt{\@nameuse{p@#1}}{\@nameuse{the#1}}}% + {\ignorespaces #2}}}} % \end{macrocode} % \begin{macrocode} \newcommand*\caption@add@contentsline{% @@ -3905,19 +3906,19 @@ % % \bibitem{hyperref} % Sebastian Rahtz \& Heiko Oberdiek:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/hyperref/}% +% \href{http://www.ctan.org/pkg/hyperref}% % {\emph{Hypertext marks in \LaTeX}},\\ % November 12, 2007 % % \bibitem{refcount} % Heiko Oberdiek:\\ -% \href{ftp://ctan.tug.org/tex-archive/macros/latex/contrib/oberdiek/refcount.pdf}% +% \href{http://www.ctan.org/pkg/refcount}% % {\emph{The refcount package}},\\ % 2006/02/20 % % \bibitem{threeparttable} % Donald Arseneau:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/misc/}% +% \href{http://www.ctan.org/pkg/threeparttable}% % {\emph{Three part tables: title, tabular environment, notes}},\\ % 2003/06/13 % \end{thebibliography} diff --git a/Master/texmf-dist/source/latex/caption/ltcaption.dtx b/Master/texmf-dist/source/latex/caption/ltcaption.dtx index e3b2d4e23a4..dabba0de5a2 100644 --- a/Master/texmf-dist/source/latex/caption/ltcaption.dtx +++ b/Master/texmf-dist/source/latex/caption/ltcaption.dtx @@ -2,7 +2,7 @@ % % This is file `ltcaption.dtx'. % -% $Id: ltcaption.dtx 94 2013-06-09 16:07:04Z sommerfeldt $ +% $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) @@ -365,31 +365,31 @@ % \begin{thebibliography}{9} % \bibitem{longtable} % David Carlisle: -% \href{http://tug.ctan.org/tex-archive/macros/latex/required/tools/}% +% \href{http://www.ctan.org/pkg/longtable}% % {\emph{The longtable package}}, % 2004/02/01 % % \bibitem{NTGclasses} % Victor Eijkhout: -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/ntgclass/}% +% \href{http://www.ctan.org/pkg/ntgclass}% % {\emph{An introduction to the Dutch \LaTeX\ document classes}}, % \mbox{3~September~1989} % % \bibitem{KOMAScript} % Markus Kohm \& Jens-Uwe-Morawski: -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/koma-script/}% +% \href{http://www.ctan.org/pkg/koma-script}% % {\emph{KOMA-Script -- a versatile \LaTeXe\ bundle}}, % 2012-07-22 % % \bibitem{memoir} % Peter Wilson, maintained by Lars Madsen: -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/koma-script/}% +% \href{http://www.ctan.org/pkg/koma-script}% % {\emph{The Memoir Class for Configurable Typesetting}}, % 2013-05-30 % % \bibitem{floatrow} % Olga Lapko: -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/floatrow/}% +% \href{http://www.ctan.org/pkg/floatrow}% % {\emph{The floatrow package documentation}}, % 2007/08/24 % \end{thebibliography} @@ -465,7 +465,7 @@ \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 94 2013-06-09 16:07:04Z sommerfeldt $ +\caption@tempa $Id: ltcaption.dtx 117 2015-09-20 20:43:35Z sommerfeldt $ \ProvidesPackage{ltcaption}[\caption@tempa v1.4-\caption@tempb longtable captions (AR)] % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/caption/subcaption.dtx b/Master/texmf-dist/source/latex/caption/subcaption.dtx index 484dd6b1f5e..b1a8becb95e 100644 --- a/Master/texmf-dist/source/latex/caption/subcaption.dtx +++ b/Master/texmf-dist/source/latex/caption/subcaption.dtx @@ -2,7 +2,7 @@ % % This is file `subcaption.dtx'. % -% $Id: subcaption.dtx 75 2013-04-16 17:57:13Z sommerfeldt $ +% $Id: subcaption.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/subcaption.dtx $ % % Copyright (C) 2007-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) @@ -804,23 +804,23 @@ % \newblock Addison-Wesley, 2004. % \bibitem{floatrow} % Olga Lapko:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/floatrow/}% +% \href{http://www.ctan.org/pkg/floatrow}% % {\emph{The floatrow package documentation}}, % 2007/12/24 % \bibitem{hyperref} % Sebastian Rahtz \& Heiko Oberdiek:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/hyperref/}% +% \href{http://www.ctan.org/pkg/hyperref}% % {\emph{Hypertext marks in \LaTeX}}, % November 12, 2007 % \bibitem{hypcap} % Heiko Oberdiek:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/oberdiek/}% +% \href{http://www.ctan.org/pkg/hypcap}% % {\emph{The hypcap package -- Adjusting anchors of captions}}, % 2007/04/09 % \iffalse % \bibitem{subfig} % Steven D. Cochran:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/subfig/}% +% \href{http://www.ctan.org/pkg/subfig}% % {\emph{The subfig package}}, % 2005/07/05 % \fi @@ -903,7 +903,7 @@ \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 75 2013-04-16 17:57:13Z sommerfeldt $ +\caption@tempa $Id: subcaption.dtx 117 2015-09-20 20:43:35Z sommerfeldt $ \ProvidesPackage{subcaption}[\caption@tempa v1.1-\caption@tempb Sub-captions (AR)] % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/caption/totalcount.dtx b/Master/texmf-dist/source/latex/caption/totalcount.dtx index 19eb4b20bc3..2ac45c50134 100644 --- a/Master/texmf-dist/source/latex/caption/totalcount.dtx +++ b/Master/texmf-dist/source/latex/caption/totalcount.dtx @@ -2,7 +2,7 @@ % % This is file `totalcount.dtx'. % -% $Id: totalcount.dtx 93 2013-05-12 10:17:54Z sommerfeldt $ +% $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) @@ -185,12 +185,12 @@ % \begin{thebibliography}{9} % \bibitem{listings} % Carsten Heinz \& Brooks Moses:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/listings/}% +% \href{http://www.ctan.org/pkg/listings}% % {\emph{The Listings Package}},\\ % 2007/02/22 % \bibitem{xspace} % David Carlisle and Morten H\o gholm:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/xspace/}% +% \href{http://www.ctan.org/pkg/xspace}% % {\emph{The xspace package}}, % 2009/10/20 % \end{thebibliography} @@ -265,7 +265,7 @@ \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 93 2013-05-12 10:17:54Z sommerfeldt $ +\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)] % \end{macrocode} % diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty index 43fa98f09f7..27fcf88e2c9 100644 --- a/Master/texmf-dist/tex/latex/caption/caption3.sty +++ b/Master/texmf-dist/tex/latex/caption/caption3.sty @@ -39,7 +39,7 @@ \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 111 2015-09-17 09:48:20Z sommerfeldt $ +\caption@tempa $Id: caption3.sty 115 2015-09-20 15:20:31Z sommerfeldt $ \ProvidesPackage{caption3}[\caption@tempa v1.7-\caption@tempb caption3 kernel (AR)] \providecommand*\@nameundef[1]{% \expandafter\let\csname #1\endcsname\@undefined} @@ -950,7 +950,7 @@ \newcommand*\caption@setlisttype@ext{% \caption@@setlisttype\caption@listtype@ext} \newcommand*\DeclareCaptionListFormat[2]{% - \global\@namedef{caption@lstfmt@#1}##1##2##3{#2}} + \global\@namedef{caption@lstfmt@#1}##1##2{#2}} \@onlypreamble\DeclareCaptionListFormat \DeclareCaptionOption{listformat}{\caption@setlistformat{#1}} \newcommand*\caption@setlistformat[1]{% @@ -1339,11 +1339,12 @@ {\let\\\space \@ifundefined{ext@#1}% {\caption@Error{No float type '#1' defined}}% - {\caption@add@contentsline - {\csname ext@#1\endcsname}% - {#1}% - {\caption@lstfmt{\@nameuse{p@#1}}{\@nameuse{the#1}}{#1}}% - {\ignorespaces #2}}}} + {\def\captionlisttype{#1}% + \caption@add@contentsline + {\csname ext@#1\endcsname}% + {#1}% + {\caption@lstfmt{\@nameuse{p@#1}}{\@nameuse{the#1}}}% + {\ignorespaces #2}}}} \newcommand*\caption@add@contentsline{% \caption@@@addcontentsline} \newcommand*\caption@@@addcontentsline[4]{% -- cgit v1.2.3