summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/caption
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-02-21 22:43:25 +0000
committerKarl Berry <karl@freefriends.org>2016-02-21 22:43:25 +0000
commit74c4ff7c3b76564c948c023b0f3f83b4a170f2f2 (patch)
tree29b29e5e14008c3b55be8eafa414f15e2045cc65 /Master/texmf-dist/source/latex/caption
parente1b29ebf71d4e7966a871e8d1112125ddb532170 (diff)
caption (21feb16)
git-svn-id: svn://tug.org/texlive/trunk@39809 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/caption')
-rw-r--r--Master/texmf-dist/source/latex/caption/caption-rus.tex80
-rw-r--r--Master/texmf-dist/source/latex/caption/caption.dtx9
-rw-r--r--Master/texmf-dist/source/latex/caption/caption3.dtx28
-rw-r--r--Master/texmf-dist/source/latex/caption/subcaption.dtx7
4 files changed, 63 insertions, 61 deletions
diff --git a/Master/texmf-dist/source/latex/caption/caption-rus.tex b/Master/texmf-dist/source/latex/caption/caption-rus.tex
index 582c0b07665..224539c7bce 100644
--- a/Master/texmf-dist/source/latex/caption/caption-rus.tex
+++ b/Master/texmf-dist/source/latex/caption/caption-rus.tex
@@ -2,7 +2,7 @@
% This is file `caption-rus.tex'.
% Russian translation of `caption-eng.tex'
%
-% $Id: caption-rus.tex 63 2013-02-03 13:27:05Z sommerfeldt $
+% $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 $
%
% Copyright (C) 1994-2007 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
@@ -4678,7 +4678,7 @@ extension} для Списка, «|tbp|» как опция размещения \meta{placement}
\textsf{epslatex} (Keith Reckdahl) содержит множество подсказок
как разместить иллюстрационный материал в~документации созданной в~\LaTeXe.
Вы найдете этот файл в~директории
- \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}
% --------------------------------------------------------------------------- %
@@ -6071,6 +6071,7 @@ and \class{book}.
\begin{thebibliography}{99}
\fontencoding{T1}%\fontfamily{ptm}
\selectfont
+
\bibitem{TLC2}
Frank Mittelbach and Michel Goossens:\\
\newblock {\em The {\LaTeX} Companion (2nd.~Ed.)},\\
@@ -6078,170 +6079,147 @@ and \class{book}.
\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}},\\
2008/03/28
\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 f16cfd85c81..c51e803d1ea 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 136 2016-02-02 09:41:30Z sommerfeldt $
+% $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 +28,7 @@
% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%
% \fi
-% \CheckSum{3578}
+% \CheckSum{3576}
%
% \iffalse
%<*driver>
@@ -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 136 2016-02-02 09:41:30Z sommerfeldt $
+\caption@tempa $Id: caption.dtx 144 2016-02-21 09:45:24Z sommerfeldt $
\ProvidesPackage{caption}[\caption@tempa v3.3-\caption@tempb Customizing captions (AR)]
% \end{macrocode}
%
@@ -1719,6 +1719,7 @@
% \changes{v3.1i}{2008/04/13}{Contents changed to \cs{caption@xref}(\ldots)}
% \changes{v3.1k}{2009/03/30}{Bugfix 08-12-08: \cs{caption@xref} is robust now}
% \changes{v3.2c}{2011/09/13}{Text changed from `before' to `without proper'}
+% \changes{v3.3}{2016/02/21}{Text changed from `without proper \cs{caption}' to `without proper reference'}
% This label will be used for |\currentlabel| inside (floating) environments
% as default. (see above)
% \iffalse\Note{All commands used have to be robust here.}\fi
@@ -1728,7 +1729,7 @@
% \end{macrocode}
% \begin{macrocode}
\DeclareRobustCommand*\caption@xref[2]{%
- \caption@WarningNoLine{\noexpand\label without proper \string\caption#2}%
+ \caption@WarningNoLine{\noexpand\label without proper reference#2}%
\@setref\relax\@undefined{#1}}
% \end{macrocode}
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/caption/caption3.dtx b/Master/texmf-dist/source/latex/caption/caption3.dtx
index 6ae6658e7cf..50fc631aba2 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 136 2016-02-02 09:41:30Z sommerfeldt $
+% $Id: caption3.dtx 139 2016-02-04 10:26:00Z 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)
@@ -28,7 +28,7 @@
% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%
% \fi
-% \CheckSum{3646}
+% \CheckSum{3664}
%
% \iffalse
%<*driver>
@@ -203,10 +203,32 @@
\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 136 2016-02-02 09:41:30Z sommerfeldt $
+\caption@tempa $Id: caption3.dtx 139 2016-02-04 10:26:00Z sommerfeldt $
\ProvidesPackage{caption3}[\caption@tempa v1.7-\caption@tempb caption3 kernel (AR)]
% \end{macrocode}
%
+% \subsection{Workaround for bug in package \package{arabtex}}
+% \package{arabtex} re-defines \cs{@gobble} as not-long so the packages of the
+% \package{caption} package bundle are doomed to fail.
+% Since this fatal bug won't be fixed in \package{arabtex} but we are dependent on a
+% proper definition of \cs{@gobble}, \cs{@firstofone}, \cs{@firstoftwo}, \cs{@secondoftwo}
+% and so on we fix this here. (Sigh!)
+% \begin{macrocode}
+\providecommand\caption@FixArabTeX{%
+ \def\caption@tempa##1{}%
+ \ifx\caption@tempa\@gobble
+ \PackageInfo{caption3}{Fixing ArabTeX}%
+ \long\def\@gobble##1{}%
+ \fi}
+% \end{macrocode}
+% Do the fix now and at |\begin{document}|, in case \package{arabtex} will be loaded after \package{caption}.
+% \begin{macrocode}
+\caption@FixArabTeX
+\AtBeginDocument{%
+ \caption@FixArabTeX
+ \let\caption@FixArabTeX\@undefined}
+% \end{macrocode}
+%
% \subsection{Generic helpers}
%
% \begin{macro}{\@nameundef}
diff --git a/Master/texmf-dist/source/latex/caption/subcaption.dtx b/Master/texmf-dist/source/latex/caption/subcaption.dtx
index 112e1900999..74ba9ac7b13 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 136 2016-02-02 09:41:30Z sommerfeldt $
+% $Id: subcaption.dtx 142 2016-02-20 19:59:43Z 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)
@@ -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 136 2016-02-02 09:41:30Z sommerfeldt $
+\caption@tempa $Id: subcaption.dtx 142 2016-02-20 19:59:43Z sommerfeldt $
\ProvidesPackage{subcaption}[\caption@tempa v1.1-\caption@tempb Sub-captions (AR)]
% \end{macrocode}
%
@@ -1074,11 +1074,12 @@
% \begin{macro}{\subcaption@label}
% \changes{v1.1}{2011/09/12}{Redefinition of \cs{SK@} added}
% \changes{v1.1}{2011/09/12}{Uses \cs{caption@withoptargs} now}
+% \changes{v1.1}{2016/02/20}{Unwanted space removed}
% When a label will be placed for a sub-caption, we automatically place
% a second one for |\subref|, too. This second label will contain
% the sub-type counter only.
% \begin{macrocode}
-\newcommand*\subcaption@label{
+\newcommand*\subcaption@label{%
\caption@withoptargs\subcaption@@label}
% \end{macrocode}
% \begin{macrocode}