texlive[48824] Master/texmf-dist: caption (3oct18)
commits+karl at tug.org
commits+karl at tug.org
Thu Oct 4 00:44:10 CEST 2018
Revision: 48824
http://tug.org/svn/texlive?view=revision&revision=48824
Author: karl
Date: 2018-10-04 00:44:10 +0200 (Thu, 04 Oct 2018)
Log Message:
-----------
caption (3oct18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/caption/README
trunk/Master/texmf-dist/source/latex/caption/bicaption.dtx
trunk/Master/texmf-dist/source/latex/caption/caption.dtx
trunk/Master/texmf-dist/source/latex/caption/caption3.dtx
trunk/Master/texmf-dist/source/latex/caption/ltcaption.dtx
trunk/Master/texmf-dist/tex/latex/caption/bicaption.sty
trunk/Master/texmf-dist/tex/latex/caption/caption.sty
trunk/Master/texmf-dist/tex/latex/caption/caption3.sty
trunk/Master/texmf-dist/tex/latex/caption/ltcaption.sty
Modified: trunk/Master/texmf-dist/doc/latex/caption/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/caption/README 2018-10-03 22:43:40 UTC (rev 48823)
+++ trunk/Master/texmf-dist/doc/latex/caption/README 2018-10-03 22:44:10 UTC (rev 48824)
@@ -1,7 +1,7 @@
==========================================================================
The `caption' package bundle
-Release 2018-06-09
+Release 2018-09-12
Copyright (C) 1994-2018 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
License: LPPL = LaTeX Project Public Licence
Modified: trunk/Master/texmf-dist/source/latex/caption/bicaption.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/bicaption.dtx 2018-10-03 22:43:40 UTC (rev 48823)
+++ trunk/Master/texmf-dist/source/latex/caption/bicaption.dtx 2018-10-03 22:44:10 UTC (rev 48824)
@@ -25,7 +25,7 @@
% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%
% \fi
-% \CheckSum{400}
+% \CheckSum{402}
%
% \iffalse
%<*driver>
@@ -792,7 +792,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{bicaption}[2016/03/27 v1.1-158 Bilingual Captions (AR)]
+\ProvidesPackage{bicaption}[2018/08/26 v1.1-159 Bilingual Captions (AR)]
% \end{macrocode}
% \begin{macrocode}
\RequirePackage{caption}[2016/02/01] % needs v3.3-134 or newer
@@ -1018,9 +1018,8 @@
\renewcommand*\caption at addcontentsline[2]{%
% \end{macrocode}
% \begin{macrocode}
- \caption at ifundefined\bicaption at LT@setup{}{%
- \bicaption at LT@setup
- \global\let\bicaption at LT@setup\@undefined}%
+ \bicaption at LT@setup
+ \global\let\bicaption at LT@setup\relax
% \end{macrocode}
% \begin{macrocode}
\caption at ifundefined\bicaption at lentry
@@ -1241,6 +1240,10 @@
{\egroup\bicaption at cmd[{#3}]{#4}}%
{\egroup\bicaption at cmd[{#1}]{#2}}}
% \end{macrocode}
+% \begin{macrocode}
+\let\bicaption at LTsetup\relax
+\let\bicaption at LT@setup\relax
+% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\caption at LT@setup}
@@ -1249,9 +1252,8 @@
% of the \package{longtable} bilingual caption.
% \begin{macrocode}
\g at addto@macro\caption at LT@setup{%
- \caption at ifundefined\bicaption at LTsetup{}{%
- \bicaption at LTsetup
- \global\let\bicaption at LTsetup\@undefined}}
+ \bicaption at LTsetup
+ \global\let\bicaption at LTsetup\relax}
% \end{macrocode}
% \end{macro}
%
Modified: trunk/Master/texmf-dist/source/latex/caption/caption.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption.dtx 2018-10-03 22:43:40 UTC (rev 48823)
+++ trunk/Master/texmf-dist/source/latex/caption/caption.dtx 2018-10-03 22:44:10 UTC (rev 48824)
@@ -25,7 +25,7 @@
% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%
% \fi
-% \CheckSum{3579}
+% \CheckSum{3693}
%
% \iffalse
%<*driver>
@@ -218,13 +218,13 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2018/05/01 v3.3-147 Customizing captions (AR)]
+\ProvidesPackage{caption}[2018/09/12 v3.3-152 Customizing captions (AR)]
% \end{macrocode}
%
% \subsection{Loading the kernel}
%
% \begin{macrocode}
-\RequirePackage{caption3}[2018/05/01] % needs v1.8 or newer
+\RequirePackage{caption3}[2018/09/12] % needs v1.8c or newer
% \end{macrocode}
%
% \subsection{Check against incompatible document classes}
@@ -818,59 +818,65 @@
%
% \subsection{\cs{caption}, \cs{@caption}, and \cs{@makecaption}}
%
-% \begin{macro}{\ifcaption at caption}
+% \begin{macro}{\caption at ifflag}
% \changes{v3.3}{2011/12/28}{This switch added}
-% \begin{macro}{\ifcaption at subcaption}
-% \changes{v3.3}{2011/12/28}{This switch added}
-% \begin{macro}{\ifcaption at ContinuedFloat}
-% \changes{v3.3}{2011/12/28}{This switch added}
+% \changes{v3.3}{2018/08/08}{Rewritten (and renamed) so a counter is used instead of a switch}
% Since we support continued floats and sub-figures it's not an easy task
% to manage the figure (and table) counter. (Especially since previous versions
% of the caption package has proven that correcting a counter locally is not a good idea.)
%
% These three switches hold the
-% current status: |\if|\-|caption at caption| is set if the caption was already
+% current status: |\caption at if|\-|flag{2}| is set if the caption was already
% typeset (so the counter doesn't need to be incremented for sub-figures),
-% |\if|\-|caption at sub|\-|caption| is set if there is already content which have
+% |\caption at if|\-|flag{4}| is set if there is already content which have
% incremented the counter (so the counter doesn't need to be incremented
% for the main caption, further sub-figures, and other stuff), and
-% |\if|\-|caption at Continued|\-|Float| is set if |\Continued|\-|Float| was given.
+% |\caption at if|\-|flag{1}| is set if |\Continued|\-|Float| was given.
+%
+% In the past three boolean switches were used to store the flags, but since some
+% packages (like the \package{floatrow} and \package{tabu} package) try hard to keep
+% counter changes locally under certain circumstances, it seems a good idea to make
+% these flags a counter value, too.
% \begin{macrocode}
-\newif\ifcaption at caption
-\newif\ifcaption at subcaption
-\newif\ifcaption at ContinuedFloat
+\newcounter{caption at flags}
% \end{macrocode}
+% \begin{macrocode}
+\newcommand*\caption at ifflag[1]{%
+ \@tempcnta\c at caption@flags
+ \divide\@tempcnta #1\relax
+ \ifodd\@tempcnta
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi}
+% \end{macrocode}
% \end{macro}
-% \end{macro}
-% \end{macro}
%
+% \begin{macro}{\caption at clrflags}
+% \changes{v3.3}{2018/08/08}{This macro added}
% \begin{macro}{\caption at clrflag}
% \changes{v3.3}{2013/04/14}{This macro added}
+% \changes{v3.3}{2018/08/08}{Rewritten so a counter is used instead of a switch}
% \begin{macro}{\caption at setflag}
% \changes{v3.3}{2013/04/14}{This macro added}
+% \changes{v3.3}{2018/08/08}{Rewritten so a counter is used instead of a switch}
% Furthermore we introduce the macros \cs{caption at clrflag} and \cs{caption at setflag}
% for clearing resp.~setting these flags.
% \begin{macrocode}
+\newcommand*\caption at clrflags{%
+ \setcounter{caption at flags}\z@}
+% \end{macrocode}
+% \begin{macrocode}
\newcommand*\caption at clrflag[1]{%
- \caption at chgflag{#1}{false}}
+ \caption at ifflag{#1}{\caption at addtoflags{-#1}}{}}
\newcommand*\caption at setflag[1]{%
- \caption at chgflag{#1}{true}}
-\newcommand*\caption at chgflag[2]{%
- \global\csname caption@#1#2\endcsname}
+ \caption at ifflag{#1}{}{\caption at addtoflags{#1}}}
+\newcommand*\caption at addtoflags{%
+ \addtocounter{caption at flags}}
% \end{macrocode}
-% The \package{floatrow} package uses \cs{FR at loc@} to keep changes
-% (flags, counters, \ldots) local. Since it is not aware of our flags above
-% we need to extend that macro (if defined).
-% \begin{macrocode}
-\caption at AtBeginDocument{%
- \caption at ifundefined\FR at loc@{}{%
- \caption at InfoNoLine{floatrow package is loaded}%
- \g at addto@macro\FR at loc@{%
- \renewcommand*\caption at chgflag[2]{%
- \csname caption@#1#2\endcsname}}}}
-% \end{macrocode}
% \end{macro}
% \end{macro}
+% \end{macro}
%
% \begin{macro}{\caption at caption}
% \changes{v3.0f}{2005/05/22}{Bugfix: \cs{ContinuedFloat} added}
@@ -1165,6 +1171,50 @@
%
% \begin{macrocode}
\caption at CheckCommand\@caption{%
+ % arabicore.sty [2006/01/01 v1.0 Arabi Core switching commands (may still change)]
+ \long\def\@caption#1[#2]#3{%
+ \par
+ \addtocontents{\csname ext@#1\endcsname}{\xstring\select at language{\main at Arabi@language}}%
+ \addcontentsline{\csname ext@#1\endcsname}{#1}%
+ {\protect\numberline{\csname the#1\endcsname}{\ignorespaces \if at rl{\textRL{#2}}\else\textLR{#2}\fi}}%
+ \begingroup
+ \@parboxrestore
+ \if at minipage
+ \@setminipage
+ \fi
+ \normalsize
+ \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces \if at rl{\textRL{#3}}\else\textLR{#3}\fi}\par
+ \endgroup}}%
+% \end{macrocode}
+%
+% \begin{macrocode}
+ \caption at CheckCommand\@caption{%
+ % rlbabel.def [2005/03/30 v2.3h Right-to-Left support from the babel system Hebrew language support from the babel system]
+ \long\def\@caption#1[#2]#3{%
+ \par
+ \addcontentsline{\csname ext@#1\endcsname}{#1}%
+ {\protect\numberline{\csname the#1\endcsname}%
+ {\ignorespaces #2}}%
+ \def\@fignm{figure}
+ \ifx#1\@fignm\addcontentsline{fol}{#1}%
+ {\protect\numberline{\csname the#1\endcsname}%
+ {\ignorespaces #2}}\fi%
+ \def\@tblnm{table}
+ \ifx#1\@tblnm\addcontentsline{tol}{#1}%
+ {\protect\numberline{\csname the#1\endcsname}%
+ {\ignorespaces #2}}\fi%
+ \begingroup
+ \@parboxrestore
+ \if at minipage
+ \@setminipage
+ \fi
+ \normalsize
+ \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par
+ \endgroup}}%
+% \end{macrocode}
+%
+% \begin{macrocode}
+ \caption at CheckCommand\@caption{%
% magyar.ldf [2005/03/30 v1.4j Magyar support from the babel system]
\long\def\@caption#1[#2]#3{%
\csname par\endcsname
@@ -1402,6 +1452,21 @@
% \end{macrocode}
%
% \begin{macrocode}
+ \caption at CheckCommand\@caption{%
+ % chkfloat.sty [2012/08/19 v0.1 chkfloat: check for moved floats]
+ \def\@caption#1[#2]#3{\chkfloat at caption{#1}[#2]{#3}%
+ \addtocontents{fof}{\protect\chkfloat@{\thepage}{\chkfloat at page}{\csname fnum@#1\endcsname: #2}}%
+ }}%
+% \end{macrocode}
+% \begin{macrocode}
+ \caption at CheckCommand\@caption{%
+ % chkfloat.sty [20??/??/?? v0.? chkfloat: check for moved floats]
+ \def\@caption#1[#2]#3{\chkfloat at caption{#1}[#2]{#3}%
+ \chkfloat at addcontentsline{#1}{#2}%
+ }}%
+% \end{macrocode}
+%
+% \begin{macrocode}
\caption at IfCheckCommand{}{%
\caption at InfoNoLine{%
Incompatible package detected (regarding \string\@caption).\MessageBreak
@@ -1608,9 +1673,7 @@
% (if |hypcap=|\-|true| and the \package{hypcap} package is not loaded).
% \begin{macrocode}
\newcommand*\caption at settype{%
- \caption at clrflag{caption}%
- \caption at clrflag{subcaption}%
- \caption at clrflag{ContinuedFloat}%
+ \caption at clrflags
\caption at set@type}
% \end{macrocode}
% \begin{macrocode}
@@ -1925,7 +1988,7 @@
% \end{macrocode}
% \begin{macrocode}
\newcommand*\caption@@ContinuedFloat{%
- \caption at setflag{ContinuedFloat}%
+ \caption at setflag1% ContinuedFloat
\caption@@@ContinuedFloat}
\newcommand*\caption@@@ContinuedFloat{%
\stepcounter{ContinuedFloat}%
@@ -2011,12 +2074,12 @@
% therefore ending this part, so we set the flag to |false| in this case.)
% \begin{macrocode}
\caption at fixposition
- \caption at iftop\caption at setflag\caption at clrflag{caption}%
+ \caption at iftop\caption at setflag\caption at clrflag2% caption
% \end{macrocode}
% This part does not contain content (like sub-figures) yet,
% so we set |\if|\-|caption at sub|\-|caption| to |false|.
% \begin{macrocode}
- \caption at clrflag{subcaption}%
+ \caption at clrflag4% subcaption
% \end{macrocode}
% Support of the \textsf{memoir} document class.
% \begin{macrocode}
@@ -2024,18 +2087,18 @@
% \end{macrocode}
% \begin{macrocode}
\newcommand*\caption at ref@stepcounter{%
- \ifcaption at ContinuedFloat
+ \caption at ifflag1{% ContinuedFloat
\let\caption at tempa\caption@@refcounter
- \caption at clrflag{ContinuedFloat}%
- \else
+ \caption at clrflag1% ContinuedFloat
+ }{%
\let\caption at tempa\caption@@refstepcounter
- \ifcaption at caption \else
- \ifcaption at subcaption
+ \caption at ifflag2{}{% caption
+ \caption at ifflag4{% subcaption
% Counter was already incremented by content, so we suppress \stepcounter{#1} here
\let\caption at tempa\caption@@refcounter
- \fi
- \fi
- \fi
+ }{}%
+ }%
+ }%
\caption at tempa}
% \end{macrocode}
% \begin{macrocode}
@@ -2328,6 +2391,7 @@
% \changes{v3.3}{2012/03/15}{Usage of \cs{caption at setbox} added}
% \changes{v3.3}{2013/05/01}{Redefinition of \cs{caption at settype} added}
% \changes{v3.3}{2013/06/17}{Missing redefinition of \cs{captionlistentry} added}
+% \changes{v3.3}{2018/09/06}{Adapted to the \package{chkfloat} package}
% Hook, will be used inside \cs{caption at setsubtype}.\par
% (Note: If we are inside an |sub|\-|float|\-|row| environment we have to keep
% the |\@make|\-|caption| code of the \package{floatrow} package intact.)
@@ -2337,24 +2401,25 @@
\caption at warmup
% \end{macrocode}
% \begin{macrocode}
- \ifcaption at caption \else
+ \caption at ifflag2{}{% caption
% no \caption in this part of the (floating) environment yet
\let\caption at add@contentsline\caption at addsubcontentsline
\let\caption at addsubcontentslines\@gobble
- \ifcaption at subcaption \else
+ \caption at ifflag4{}{% subcaption
% no \subcaption in this part of the (floating) environment yet
- \ifcaption at ContinuedFloat
- \caption at clrflag{ContinuedFloat}%
- \else
+ \caption at ifflag1{% ContinuedFloat
+ \caption at clrflag1%
+ }{%
\caption@@stepcounter\@captype
- \fi
- \caption at setflag{subcaption}%
- \fi
- \fi
+ }%
+ \caption at setflag4% subcaption
+ }%
+ }%
% \end{macrocode}
% \begin{macrocode}
\c at ContinuedFloat=0\relax
\let\caption at setfloatcapt\@firstofone
+ \let\caption at chkfloat\@gobbletwo
% \end{macrocode}
% \begin{macrocode}
\caption at setbox{none}%
@@ -2668,19 +2733,21 @@
%
% \subsubsection{The hungarian and magyar Babel option}
% \changes{v3.2}{2009/03/29}{\package{magyar} package support added}
+% \changes{v3.3}{2018/08/26}{\package{magyar} package support revised}
%
% \begin{macrocode}
\def\caption at tempa#1{%
- \@ifundefined{extras#1}\caption at AtBeginDocument\@firstofone{%
- \@ifundefined{extras#1}{}{%
- \caption at InfoNoLine{#1 babel option is loaded}%
- \expandafter\addto\csname extras#1\endcsname{%
- % reverse changes made by magyar.ldf
- \let\@makecaption\caption at makecaption
- \babel at save\@makecaption
- \caption at redefine
- \babel at save\@caption}%
- }}}
+ \@ifpackagewith{babel}{#1}{%
+ \caption at InfoNoLine{#1 babel option is loaded}%
+ \expandafter\addto\csname extras#1\endcsname{%
+ % reverse changes made by magyar.ldf
+ \let\@makecaption\caption at makecaption
+ \babel at save\@makecaption
+ \caption at redefine
+ \babel at save\@caption}%
+ }{}}
+% \end{macrocode}
+% \begin{macrocode}
\caption at tempa{hungarian}%
\caption at tempa{magyar}%
% \end{macrocode}
@@ -2868,6 +2935,30 @@
% \end{macrocode}
% \end{macro}
%
+% \subsubsection{The chkfloat package}
+% \changes{v3.3}{2018/09/06}{Support of the \package{chkfloat} package added}
+%
+% \begin{macrocode}
+\caption at IfPackageLoaded{chkfloat}[2012/08/19 v0.1]{%
+% \end{macrocode}
+%
+% \begin{macro}{\caption at chkfloat}
+% \changes{v3.3}{2018/09/06}{This macro added}
+% \begin{macrocode}
+ \caption at ifundefined\chkfloat at addcontentsline{%
+ \renewcommand\caption at chkfloat[2]{%
+ \caption at ifundefined\chkfloat at page{}{%
+ \addtocontents{fof}{\protect\chkfloat@{\thepage}{\chkfloat at page}{\csname fnum@#1\endcsname: #2}}}}%
+ }{%
+ \renewcommand\caption at chkfloat{\chkfloat at addcontentsline}%
+ }%
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+ }{}%
+% \end{macrocode}
+%
% \subsubsection{The float package}
% \changes{v3.0f}{2005/05/31}{\package{float} package support rewritten and improved}
% \iffalse
@@ -3726,7 +3817,7 @@
\caption at IfPackageLoaded{longtable}[1995/05/24 v3.14]{%
% \end{macrocode}
% \begin{macrocode}
- \RequirePackage{ltcaption}[2007/09/01]%
+ \RequirePackage{ltcaption}[2018/08/26]%
\let\LT@@makecaption\@undefined
% \end{macrocode}
%
@@ -3767,10 +3858,8 @@
% \begin{macrocode}
\def\captionlistentry{%
\noalign\bgroup
- \@ifstar{\egroup\LT at captionlistentry}% gobble *
- {\egroup\LT at captionlistentry}}%
- \def\LT at captionlistentry##1{%
- \caption at listentry\@firstoftwo[\LTcaptype]{##1}}%
+ \@ifstar{\egroup\LT at listentry}% gobble *
+ {\egroup\LT at listentry}}%
% \end{macrocode}
% |\ContinuedFloat| for longtable:\\
% {\small(Commented out, since it's not deeply tested and quite useless anyway)}
@@ -3833,26 +3922,6 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\LT at c@ption}
-% \changes{v3.1g}{2008/01/22}{Made it \cs{long}}
-% The original implementation:
-% \begin{verbatim}
-% \def\LT at c@ption#1[#2]#3{%
-% \LT at makecaption#1\fnum at table{#3}%
-% \def\@tempa{#2}%
-% \ifx\@tempa\@empty\else
-% {\let\\\space
-% \addcontentsline{lot}{table}{\protect\numberline{\thetable}{#2}}}%
-% \fi}
-% \end{verbatim}%^^A
-% Our implementation uses |\LTcaptype| instead of |{table}|:
-% \begin{macrocode}
- \long\def\LT at c@ption#1[#2]#3{%
- \LT at makecaption#1{\csname fnum@\LTcaptype\endcsname}{#3}%
- \LT at captionlistentry{#2}}%
-% \end{macrocode}
-% \end{macro}
-%
% \begin{macro}{\LT at makecaption}
% \changes{v3.0d}{2004/08/10}{%
% Bugfix 04-08-04: \cs{abovecaptionskip} \& \cs{belowcaptionskip} will be used now}
@@ -3881,21 +3950,9 @@
% \begin{macrocode}
\renewcommand\LT at makecaption[3]{%
\caption at LT@make{%
+ \caption at LT@settype\LTcaptype
% \end{macrocode}
%
-% If |\LTcapwidth| is not set to its default value |4in| we assume
-% that it shall overwrite our own setting.
-% (But |\captionsetup[longtable]{width=|\ldots|}| will overwrite |\LTcapwidth|.)
-% \begin{macrocode}
- \caption at settype*\LTcaptype
- \ifdim\LTcapwidth=4in \else
- \setcaptionwidth\LTcapwidth
- \fi
- \caption at setoptions{longtable}%
-% \caption at setContinuedFloat
- \caption at setoptions{@longtable}%
-% \end{macrocode}
-%
% |\caption at LT@setup| is re-defined inside the \package{bicaption} package
% and contains the preparation of typesetting of the bilingual caption.
% \begin{macrocode}
@@ -3954,7 +4011,42 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\LT at listentry}
+% \changes{v3.3}{2018/08/26}{This macro added}
% \begin{macrocode}
+ \renewcommand*\LT at listentry[2]{%
+ \begingroup
+ \caption at LT@settype{#1}%
+ \caption at listentry\@firstoftwo[#1]{#2}%
+ \endgroup}%
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\caption at LT@settype}
+% \changes{v3.3}{2018/08/26}{This macro added}
+% \begin{macrocode}
+ \newcommand*\caption at LT@settype[1]{%
+ \caption at settype*\LTcaptype
+% \end{macrocode}
+% If |\LTcapwidth| is not set to its default value |4in| we assume
+% that it shall overwrite our own setting.
+% (But |\captionsetup[longtable]{width=|\ldots|}| will overwrite |\LTcapwidth|.)
+% \begin{macrocode}
+ \ifdim\LTcapwidth=4in \else
+ \setcaptionwidth\LTcapwidth
+ \fi
+% \end{macrocode}
+% \begin{macrocode}
+ \caption at setoptions{longtable}%
+% \caption at setContinuedFloat
+% \end{macrocode}
+% Finally set options applied by |\captionsetup| inside the longtable.
+% \begin{macrocode}
+ \caption at setoptions{@longtable}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
}{}
% \end{macrocode}
%
Modified: trunk/Master/texmf-dist/source/latex/caption/caption3.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption3.dtx 2018-10-03 22:43:40 UTC (rev 48823)
+++ trunk/Master/texmf-dist/source/latex/caption/caption3.dtx 2018-10-03 22:44:10 UTC (rev 48824)
@@ -25,7 +25,7 @@
% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%
% \fi
-% \CheckSum{3848}
+% \CheckSum{3954}
%
% \iffalse
%<*driver>
@@ -198,7 +198,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption3}[2018/05/27 v1.8a caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2018/09/12 v1.8c caption3 kernel (AR)]
% \end{macrocode}
%
% \subsection{Workaround for bug in package \package{arabtex}}
@@ -3054,8 +3054,57 @@
}
% \end{macrocode}
%
+% \subsubsection{The arabic Babel option}
+% \changes{v1.8}{2018/05/20}{\package{arabic} babel package support added}
+%
+% \begin{macrocode}
+\caption at ifundefined\ArabiCoreLoaded{%
+% \end{macrocode}
+% \begin{macro}{\caption at rl}
+% \changes{v1.8}{2018/05/20}{This macro added}
+% \begin{macrocode}
+ \let\caption at rl\@firstofone
+}{%
+ \newcommand\caption at rl[1]{\if at rl\textRL{#1}\else\textLR{#1}\fi}
+% \end{macrocode}
+% \end{macro}
+% \begin{macrocode}
+ \def\fnum at figure{\figurename\nobreakspace\thefigure}%
+ \def\fnum at table{\tablename\nobreakspace\thetable}%
+% \end{macrocode}
+% \begin{macrocode}
+ \DeclareCaptionLabelSeparator{arabi}{ : }
+ \DeclareCaptionLabelSeparator{default}{%
+ \if at rl\caption at lsep@arabi\else\caption at lsep@colon\fi}
+% \end{macrocode}
+% \begin{macrocode}
+ \caption at CheckCommand\@makecaption{%
+ % arabicore.sty [2006/01/01 v1.0 Arabi Core switching commands (may still change)]
+ \long\def\@makecaption#1#2{%
+ \vskip\abovecaptionskip
+ \sbox\@tempboxa{#1: #2}%
+ \sbox\@Arabitempboxa{\textRL{#2} : #1}%
+ \if at rl{
+ \ifdim \wd\@Arabitempboxa >\hsize
+ \textRL{#2} : #1\par
+ \else
+ \global \@minipagefalse
+ \hb at xt@\hsize{\hfil\box\@Arabitempboxa\hfil}%
+ \fi}\else{
+ \ifdim \wd\@tempboxa >\hsize
+ #1: #2\par
+ \else
+ \global \@minipagefalse
+ \hb at xt@\hsize{\hfil\box\@tempboxa\hfil}%
+ \fi}\fi
+ \vskip\belowcaptionskip}}
+% \end{macrocode}
+% \begin{macrocode}
+}
+% \end{macrocode}
+%
% \subsubsection{The frenchb Babel option}
-% \changes{v1.1}{2006/05/14}{\package{frenchb} package support added}
+% \changes{v1.1}{2006/05/14}{\package{frenchb} babel package support added}
%
% \begin{macrocode}
\caption at ifundefined\FB at makecaption{}{%
@@ -3139,9 +3188,24 @@
}
% \end{macrocode}
%
+% \subsubsection{The hebrew Babel option}
+% \changes{v1.8}{2018/08/26}{\package{hebrew} package support added}
+%
+% \begin{macrocode}
+ \caption at CheckCommand\@makecaption{%
+ % rlbabel.def [2005/03/30 v2.3h Right-to-Left support from the babel system Hebrew language support from the babel system]
+ \long\def\@makecaption#1#2{%
+ \vskip\abovecaptionskip%
+ \begin{center}%
+ #1: #2%
+ \end{center} \par%
+ \vskip\belowcaptionskip}}%
+% \end{macrocode}
+%
% \subsubsection{The hungarian and magyar Babel option}
% \changes{v1.3}{2009/03/29}{\package{magyar} package support added}
% \changes{v1.3a}{2011/08/12}{\package{magyar} package support revised}
+% \changes{v1.8b}{2018/08/26}{\package{magyar} package support revised}
%
% \begin{macrocode}
\DeclareCaptionListFormat{subperiod}{#2.}
@@ -3164,24 +3228,26 @@
% \end{macrocode}
%
% \begin{macrocode}
-\def\caption at tempa#1{\@ifundefined{extras#1}{}{%
- \expandafter\addto\csname extras#1\endcsname{%
- % change default labelsep and listformat
- \caption at setdefaultlabelsep{period}%
- \caption at setdefaultlistformat{subperiod}}%
- \expandafter\addto\csname noextras#1\endcsname{%
- % change default labelsep and listformat
- \caption at setdefaultlabelsep{colon}%
- \caption at setdefaultlistformat{subsimple}}%
+\def\caption at tempa#1{%
+ \@ifpackagewith{babel}{#1}{%
+ \caption at InfoNoLine{#1 babel option is loaded}%
+ \expandafter\addto\csname extras#1\endcsname{%
+ % change default labelsep and listformat
+ \caption at setdefaultlabelsep{period}%
+ \caption at setdefaultlistformat{subperiod}}%
+ \expandafter\addto\csname noextras#1\endcsname{%
+ % change default labelsep and listformat
+ \caption at setdefaultlabelsep{colon}%
+ \caption at setdefaultlistformat{subsimple}}%
+ }{}}
% \end{macrocode}
% \begin{macrocode}
-}}
-% \end{macrocode}
-% \begin{macrocode}
\caption at tempa{hungarian}
\caption at tempa{magyar}
% \end{macrocode}
%
+% TODO: babel-latvian/latvian.ldf
+%
% \subsubsection{Unknown document class (or package)}
% \changes{v1.1}{2007/04/10}{Check of document class added}
%
@@ -3218,6 +3284,7 @@
% \changes{v1.5}{2012/01/15}{Usage of \cs{caption at addsubcontentslines} added}
% \changes{v1.7}{2015/09/15}{Argument \#3 which holds the environment name added to \cs{caption at lstfmt}}
% \changes{v1.7}{2015/09/20}{Unfortunately \package{subfig} defines and uses \cs{caption at lstfmt} as well, so I replaced the third argument with \cs{captionlisttype}}
+% \changes{v1.8}{2018/09/06}{Adapted to the \package{chkfloat} package}
% |\caption at 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
@@ -3252,7 +3319,8 @@
{\csname ext@#1\endcsname}%
{#1}%
{\caption at lstfmt{\@nameuse{p@#1}}{\@nameuse{the#1}}}%
- {\ignorespaces #2}}}}
+ {\ignorespaces #2}%
+ \caption at chkfloat{#1}{#2}}}}
% \end{macrocode}
% \begin{macrocode}
\newcommand*\caption at add@contentsline{%
@@ -3260,9 +3328,14 @@
% \end{macrocode}
% \begin{macrocode}
\newcommand*\caption@@@addcontentsline[4]{%
+% \caption at ifundefined\main at Arabi@language{}%
+% {\addtocontents{#1}{\xstring\select at language{\main at Arabi@language}}}%
\addcontentsline{#1}{#2}{\protect\numberline{#3}{#4}}}
% \end{macrocode}
% \begin{macrocode}
+\let\caption at chkfloat\@gobbletwo
+% \end{macrocode}
+% \begin{macrocode}
\newcommand\caption at ifcontentsline[1]{%
\caption at iflist
{\def\@tempa{#1}}%
@@ -3620,6 +3693,7 @@
% \changes{v1.3}{2010/11/01}{Bugfix: If the caption text is empty, the text format will be set to \opt{simple} now}
% \changes{v1.7}{2016/02/01}{Bugfix: \cs{relax} added before \cs{caption at lsep} so the label separator
% will not be gobbled if the label font command ignores spaces, e.g. by usage of \cs{color}}
+% \changes{v1.8}{2018/09/12}{\cs{par} replaced by \cs{captiontextend}}
% |\caption@@@make|\marg{caption label}\marg{caption text}\par
% This one finally typesets the caption paragraph, without margin and indention.
% \begin{macrocode}
@@ -3669,6 +3743,7 @@
\endgroup
\fi}%
{{\captiontextfont
+ \captiontextstart
\caption at ifstrut
{\vrule\@height\ht\strutbox\@width\z@}%
{}%
@@ -3678,8 +3753,12 @@
\caption at ifstrut
{\ifhmode\@finalstrut\strutbox\fi}%
{}%
- \par}}}
+ \captiontextend}}}
% \end{macrocode}
+% \begin{macrocode}
+\newcommand*\captiontextstart{}
+\newcommand*\captiontextend{\par}
+% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\caption at ifempty}
Modified: trunk/Master/texmf-dist/source/latex/caption/ltcaption.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/ltcaption.dtx 2018-10-03 22:43:40 UTC (rev 48823)
+++ trunk/Master/texmf-dist/source/latex/caption/ltcaption.dtx 2018-10-03 22:44:10 UTC (rev 48824)
@@ -25,7 +25,7 @@
% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%
% \fi
-% \CheckSum{377}
+% \CheckSum{378}
%
% \iffalse
%<*driver>
@@ -460,7 +460,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{ltcaption}[2013/06/09 v1.4-94 longtable captions (AR)]
+\ProvidesPackage{ltcaption}[2018/08/26 v1.4-95 longtable captions (AR)]
% \end{macrocode}
%
% \begin{macrocode}
@@ -616,13 +616,7 @@
% \begin{macrocode}
\long\def\LT at c@ption#1[#2]#3{%
\LT at makecaption#1{\csname fnum@\LTcaptype\endcsname}{#3}%
- \def\@tempa{#2}%
- \ifx\@tempa\@empty\else
- {\let\\\space
- \addcontentsline{\csname ext@\LTcaptype\endcsname}{\LTcaptype}%
- {\protect\numberline{\csname the\LTcaptype\endcsname}{#2}}}%
- \fi
- \ignorespaces}
+ \LT at listentry\LTcaptype{#2}}
% \end{macrocode}
% \end{macro}
%
@@ -784,6 +778,20 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\LT at listentry}
+% \changes{v1.4}{2018/08/26}{This macro added}
+% \begin{macrocode}
+\newcommand*\LT at listentry[2]{%
+ \def\@tempa{#2}%
+ \ifx\@tempa\@empty\else
+ {\let\\\space
+ \addcontentsline{\csname ext@#1\endcsname}{#1}%
+ {\protect\numberline{\csname the#1\endcsname}{#2}}}%
+ \fi
+ \ignorespaces}
+% \end{macrocode}
+% \end{macro}
+%
% \subsection{The \texttt{longtable*} environment}
% \changes{v1.1}{2007/09/01}{Environment \env{longtable*} added}
%
Modified: trunk/Master/texmf-dist/tex/latex/caption/bicaption.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/bicaption.sty 2018-10-03 22:43:40 UTC (rev 48823)
+++ trunk/Master/texmf-dist/tex/latex/caption/bicaption.sty 2018-10-03 22:44:10 UTC (rev 48824)
@@ -37,7 +37,7 @@
%% caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{bicaption}[2016/03/27 v1.1-158 Bilingual Captions (AR)]
+\ProvidesPackage{bicaption}[2018/08/26 v1.1-159 Bilingual Captions (AR)]
\RequirePackage{caption}[2016/02/01] % needs v3.3-134 or newer
\caption at AtBeginDocument{\caption at ifcompatibility{%
\caption at Error{%
@@ -116,9 +116,8 @@
\caption at ProcessOptions*{bicaption}
\let\bicaption at addcontentsline@ORI\caption at addcontentsline
\renewcommand*\caption at addcontentsline[2]{%
- \caption at ifundefined\bicaption at LT@setup{}{%
- \bicaption at LT@setup
- \global\let\bicaption at LT@setup\@undefined}%
+ \bicaption at LT@setup
+ \global\let\bicaption at LT@setup\relax
\caption at ifundefined\bicaption at lentry
{\bicaption at addcontentsline@ORI{#1}{#2}}%
{\expandafter\bicaption at addcontentsline\expandafter
@@ -226,10 +225,11 @@
\bicaption at ifswap
{\egroup\bicaption at cmd[{#3}]{#4}}%
{\egroup\bicaption at cmd[{#1}]{#2}}}
+\let\bicaption at LTsetup\relax
+\let\bicaption at LT@setup\relax
\g at addto@macro\caption at LT@setup{%
- \caption at ifundefined\bicaption at LTsetup{}{%
- \bicaption at LTsetup
- \global\let\bicaption at LTsetup\@undefined}}
+ \bicaption at LTsetup
+ \global\let\bicaption at LTsetup\relax}
\newcommand\bicaption at setup[2]{%
\def\bicaption at lentry{#1}%
\def\bicaption at text{\ignorespaces#2}}
Modified: trunk/Master/texmf-dist/tex/latex/caption/caption.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/caption.sty 2018-10-03 22:43:40 UTC (rev 48823)
+++ trunk/Master/texmf-dist/tex/latex/caption/caption.sty 2018-10-03 22:44:10 UTC (rev 48824)
@@ -37,8 +37,8 @@
%% caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2018/05/01 v3.3-147 Customizing captions (AR)]
-\RequirePackage{caption3}[2018/05/01] % needs v1.8 or newer
+\ProvidesPackage{caption}[2018/09/12 v3.3-152 Customizing captions (AR)]
+\RequirePackage{caption3}[2018/09/12] % needs v1.8c or newer
\caption at ifbool{documentclass}{}{%
\caption at WarningNoLine{%
Unsupported document class (or package) detected,\MessageBreak
@@ -287,21 +287,23 @@
}
\caption at SetupOptions{caption}{\caption at setkeys{#1}{#2}}
\caption at ProcessOptions*{caption}
-\newif\ifcaption at caption
-\newif\ifcaption at subcaption
-\newif\ifcaption at ContinuedFloat
+\newcounter{caption at flags}
+\newcommand*\caption at ifflag[1]{%
+ \@tempcnta\c at caption@flags
+ \divide\@tempcnta #1\relax
+ \ifodd\@tempcnta
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi}
+\newcommand*\caption at clrflags{%
+ \setcounter{caption at flags}\z@}
\newcommand*\caption at clrflag[1]{%
- \caption at chgflag{#1}{false}}
+ \caption at ifflag{#1}{\caption at addtoflags{-#1}}{}}
\newcommand*\caption at setflag[1]{%
- \caption at chgflag{#1}{true}}
-\newcommand*\caption at chgflag[2]{%
- \global\csname caption@#1#2\endcsname}
-\caption at AtBeginDocument{%
- \caption at ifundefined\FR at loc@{}{%
- \caption at InfoNoLine{floatrow package is loaded}%
- \g at addto@macro\FR at loc@{%
- \renewcommand*\caption at chgflag[2]{%
- \csname caption@#1#2\endcsname}}}}
+ \caption at ifflag{#1}{}{\caption at addtoflags{#1}}}
+\newcommand*\caption at addtoflags{%
+ \addtocounter{caption at flags}}
\def\caption at caption{%
\caption at iftype
{\caption at checkgrouplevel\@empty\caption
@@ -481,6 +483,44 @@
\M at gettitle{#2}%
}}%
\caption at CheckCommand\@caption{%
+ % arabicore.sty [2006/01/01 v1.0 Arabi Core switching commands (may still change)]
+ \long\def\@caption#1[#2]#3{%
+ \par
+ \addtocontents{\csname ext@#1\endcsname}{\xstring\select at language{\main at Arabi@language}}%
+ \addcontentsline{\csname ext@#1\endcsname}{#1}%
+ {\protect\numberline{\csname the#1\endcsname}{\ignorespaces \if at rl{\textRL{#2}}\else\textLR{#2}\fi}}%
+ \begingroup
+ \@parboxrestore
+ \if at minipage
+ \@setminipage
+ \fi
+ \normalsize
+ \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces \if at rl{\textRL{#3}}\else\textLR{#3}\fi}\par
+ \endgroup}}%
+ \caption at CheckCommand\@caption{%
+ % rlbabel.def [2005/03/30 v2.3h Right-to-Left support from the babel system Hebrew language support from the babel system]
+ \long\def\@caption#1[#2]#3{%
+ \par
+ \addcontentsline{\csname ext@#1\endcsname}{#1}%
+ {\protect\numberline{\csname the#1\endcsname}%
+ {\ignorespaces #2}}%
+ \def\@fignm{figure}
+ \ifx#1\@fignm\addcontentsline{fol}{#1}%
+ {\protect\numberline{\csname the#1\endcsname}%
+ {\ignorespaces #2}}\fi%
+ \def\@tblnm{table}
+ \ifx#1\@tblnm\addcontentsline{tol}{#1}%
+ {\protect\numberline{\csname the#1\endcsname}%
+ {\ignorespaces #2}}\fi%
+ \begingroup
+ \@parboxrestore
+ \if at minipage
+ \@setminipage
+ \fi
+ \normalsize
+ \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par
+ \endgroup}}%
+ \caption at CheckCommand\@caption{%
% magyar.ldf [2005/03/30 v1.4j Magyar support from the babel system]
\long\def\@caption#1[#2]#3{%
\csname par\endcsname
@@ -671,6 +711,16 @@
% subfig.sty [2005/06/28 ver: 1.3 subfig package]
\def\@caption{\caption@}%
}%
+ \caption at CheckCommand\@caption{%
+ % chkfloat.sty [2012/08/19 v0.1 chkfloat: check for moved floats]
+ \def\@caption#1[#2]#3{\chkfloat at caption{#1}[#2]{#3}%
+ \addtocontents{fof}{\protect\chkfloat@{\thepage}{\chkfloat at page}{\csname fnum@#1\endcsname: #2}}%
+ }}%
+ \caption at CheckCommand\@caption{%
+ % chkfloat.sty [20??/??/?? v0.? chkfloat: check for moved floats]
+ \def\@caption#1[#2]#3{\chkfloat at caption{#1}[#2]{#3}%
+ \chkfloat at addcontentsline{#1}{#2}%
+ }}%
\caption at IfCheckCommand{}{%
\caption at InfoNoLine{%
Incompatible package detected (regarding \string\@caption).\MessageBreak
@@ -739,9 +789,7 @@
{\caption@@settype{sub}*{sub\@captype}}%
{\caption@@settype{sub}{sub\@captype}}}%
\newcommand*\caption at settype{%
- \caption at clrflag{caption}%
- \caption at clrflag{subcaption}%
- \caption at clrflag{ContinuedFloat}%
+ \caption at clrflags
\caption at set@type}
\newcommand*\caption at set@type{%
\caption@@settype{}}
@@ -880,7 +928,7 @@
\caption at Error{Continued `#1' after `\caption at CFtype'}%
\fi}
\newcommand*\caption@@ContinuedFloat{%
- \caption at setflag{ContinuedFloat}%
+ \caption at setflag1% ContinuedFloat
\caption@@@ContinuedFloat}
\newcommand*\caption@@@ContinuedFloat{%
\stepcounter{ContinuedFloat}%
@@ -909,21 +957,21 @@
{\caption at Error{No float type '#1' defined}}%
{\caption at ref@stepcounter{#1}%
\caption at fixposition
- \caption at iftop\caption at setflag\caption at clrflag{caption}%
- \caption at clrflag{subcaption}%
+ \caption at iftop\caption at setflag\caption at clrflag2% caption
+ \caption at clrflag4% subcaption
\@nameuse{donemaincaptiontrue}}}
\newcommand*\caption at ref@stepcounter{%
- \ifcaption at ContinuedFloat
+ \caption at ifflag1{% ContinuedFloat
\let\caption at tempa\caption@@refcounter
- \caption at clrflag{ContinuedFloat}%
- \else
+ \caption at clrflag1% ContinuedFloat
+ }{%
\let\caption at tempa\caption@@refstepcounter
- \ifcaption at caption \else
- \ifcaption at subcaption
+ \caption at ifflag2{}{% caption
+ \caption at ifflag4{% subcaption
\let\caption at tempa\caption@@refcounter
- \fi
- \fi
- \fi
+ }{}%
+ }%
+ }%
\caption at tempa}
\newcommand*\caption@@refcounter[1]{%
\let\caption at stepcounter@ORI\stepcounter
@@ -1010,20 +1058,21 @@
\newcommand*\caption at subtypehook{%
\ifx\caption\caption at subcaption \else
\caption at warmup
- \ifcaption at caption \else
+ \caption at ifflag2{}{% caption
\let\caption at add@contentsline\caption at addsubcontentsline
\let\caption at addsubcontentslines\@gobble
- \ifcaption at subcaption \else
- \ifcaption at ContinuedFloat
- \caption at clrflag{ContinuedFloat}%
- \else
+ \caption at ifflag4{}{% subcaption
+ \caption at ifflag1{% ContinuedFloat
+ \caption at clrflag1%
+ }{%
\caption@@stepcounter\@captype
- \fi
- \caption at setflag{subcaption}%
- \fi
- \fi
+ }%
+ \caption at setflag4% subcaption
+ }%
+ }%
\c at ContinuedFloat=0\relax
\let\caption at setfloatcapt\@firstofone
+ \let\caption at chkfloat\@gobbletwo
\caption at setbox{none}%
\caption at clearmargin
\caption at iflist{}{\let\caption at setlist\@gobble}%
@@ -1153,16 +1202,15 @@
}%
}}
\def\caption at tempa#1{%
- \@ifundefined{extras#1}\caption at AtBeginDocument\@firstofone{%
- \@ifundefined{extras#1}{}{%
- \caption at InfoNoLine{#1 babel option is loaded}%
- \expandafter\addto\csname extras#1\endcsname{%
- % reverse changes made by magyar.ldf
- \let\@makecaption\caption at makecaption
- \babel at save\@makecaption
- \caption at redefine
- \babel at save\@caption}%
- }}}
+ \@ifpackagewith{babel}{#1}{%
+ \caption at InfoNoLine{#1 babel option is loaded}%
+ \expandafter\addto\csname extras#1\endcsname{%
+ % reverse changes made by magyar.ldf
+ \let\@makecaption\caption at makecaption
+ \babel at save\@makecaption
+ \caption at redefine
+ \babel at save\@caption}%
+ }{}}
\caption at tempa{hungarian}%
\caption at tempa{magyar}%
\newcommand\caption at IfPackageLoaded[1]{%
@@ -1253,6 +1301,15 @@
}{}%
\caption at undefbool{needfreeze}}
\let\caption at warmup\relax
+\caption at IfPackageLoaded{chkfloat}[2012/08/19 v0.1]{%
+ \caption at ifundefined\chkfloat at addcontentsline{%
+ \renewcommand\caption at chkfloat[2]{%
+ \caption at ifundefined\chkfloat at page{}{%
+ \addtocontents{fof}{\protect\chkfloat@{\thepage}{\chkfloat at page}{\csname fnum@#1\endcsname: #2}}}}%
+ }{%
+ \renewcommand\caption at chkfloat{\chkfloat at addcontentsline}%
+ }%
+ }{}%
\caption at IfPackageLoaded{float}[2001/11/08 v1.3d]{%
\@ifpackageloaded{floatrow}{%
\caption at If@Package at Loaded{floatrow}[2007/08/24 v0.2a]{}{}%
@@ -1508,7 +1565,7 @@
}{}
\providecommand*\LTcaptype{table}
\caption at IfPackageLoaded{longtable}[1995/05/24 v3.14]{%
- \RequirePackage{ltcaption}[2007/09/01]%
+ \RequirePackage{ltcaption}[2018/08/26]%
\let\LT@@makecaption\@undefined
\caption at AtBeginDocument{%
\let\caption at ORI@LT at array\LT at array
@@ -1525,10 +1582,8 @@
\def\@captionabovefalse{\LT at captionsetup{position=b}}%
\def\captionlistentry{%
\noalign\bgroup
- \@ifstar{\egroup\LT at captionlistentry}% gobble *
- {\egroup\LT at captionlistentry}}%
- \def\LT at captionlistentry##1{%
- \caption at listentry\@firstoftwo[\LTcaptype]{##1}}%
+ \@ifstar{\egroup\LT at listentry}% gobble *
+ {\egroup\LT at listentry}}%
%% \let\Hy at LT@currentHlabel\@currentHlabel
%% \let\@currentHlabel\Hy at LT@currentHlabel
\def\ContinuedFloat{\noalign{%
@@ -1539,17 +1594,9 @@
\@ifstar
{\egroup\LT at c@ption\@gobble[]}%
{\egroup\caption at xdblarg{\LT at c@ption\@firstofone}}}
- \long\def\LT at c@ption#1[#2]#3{%
- \LT at makecaption#1{\csname fnum@\LTcaptype\endcsname}{#3}%
- \LT at captionlistentry{#2}}%
\renewcommand\LT at makecaption[3]{%
\caption at LT@make{%
- \caption at settype*\LTcaptype
- \ifdim\LTcapwidth=4in \else
- \setcaptionwidth\LTcapwidth
- \fi
- \caption at setoptions{longtable}%
- \caption at setoptions{@longtable}%
+ \caption at LT@settype\LTcaptype
\caption at LT@setup
\caption at setautoposition{\ifcase\LT at rows t\else b\fi}%
\caption at startrue#1\caption at starfalse
@@ -1561,6 +1608,18 @@
\caption@@make{#2}{#3}\endgraf
\caption at iftop{\vskip\abovecaptionskip}{\vskip\belowcaptionskip}%
\caption at end}}%
+ \renewcommand*\LT at listentry[2]{%
+ \begingroup
+ \caption at LT@settype{#1}%
+ \caption at listentry\@firstoftwo[#1]{#2}%
+ \endgroup}%
+ \newcommand*\caption at LT@settype[1]{%
+ \caption at settype*\LTcaptype
+ \ifdim\LTcapwidth=4in \else
+ \setcaptionwidth\LTcapwidth
+ \fi
+ \caption at setoptions{longtable}%
+ \caption at setoptions{@longtable}}
}{}
\providecommand*\caption at LT@setup{}
\caption at IfPackageLoaded{picinpar}{%
Modified: trunk/Master/texmf-dist/tex/latex/caption/caption3.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/caption3.sty 2018-10-03 22:43:40 UTC (rev 48823)
+++ trunk/Master/texmf-dist/tex/latex/caption/caption3.sty 2018-10-03 22:44:10 UTC (rev 48824)
@@ -37,7 +37,7 @@
%% caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption3}[2018/05/27 v1.8a caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2018/09/12 v1.8c caption3 kernel (AR)]
\providecommand\caption at FixArabTeX{%
\def\caption at tempa##1{}%
\ifx\caption at tempa\@gobble
@@ -1302,6 +1302,36 @@
\DeclareCaptionDefaultFont{labelfont}{\cph at font}
\DeclareCaptionDefaultFont{textfont}{\cpb at font}
}
+\caption at ifundefined\ArabiCoreLoaded{%
+ \let\caption at rl\@firstofone
+}{%
+ \newcommand\caption at rl[1]{\if at rl\textRL{#1}\else\textLR{#1}\fi}
+ \def\fnum at figure{\figurename\nobreakspace\thefigure}%
+ \def\fnum at table{\tablename\nobreakspace\thetable}%
+ \DeclareCaptionLabelSeparator{arabi}{ : }
+ \DeclareCaptionLabelSeparator{default}{%
+ \if at rl\caption at lsep@arabi\else\caption at lsep@colon\fi}
+ \caption at CheckCommand\@makecaption{%
+ % arabicore.sty [2006/01/01 v1.0 Arabi Core switching commands (may still change)]
+ \long\def\@makecaption#1#2{%
+ \vskip\abovecaptionskip
+ \sbox\@tempboxa{#1: #2}%
+ \sbox\@Arabitempboxa{\textRL{#2} : #1}%
+ \if at rl{
+ \ifdim \wd\@Arabitempboxa >\hsize
+ \textRL{#2} : #1\par
+ \else
+ \global \@minipagefalse
+ \hb at xt@\hsize{\hfil\box\@Arabitempboxa\hfil}%
+ \fi}\else{
+ \ifdim \wd\@tempboxa >\hsize
+ #1: #2\par
+ \else
+ \global \@minipagefalse
+ \hb at xt@\hsize{\hfil\box\@tempboxa\hfil}%
+ \fi}\fi
+ \vskip\belowcaptionskip}}
+}
\caption at ifundefined\FB at makecaption{}{%
\caption at CheckCommand\@makecaption{%
% frenchb.ldf [2005/02/06 v1.6g French support from the babel system]
@@ -1361,6 +1391,14 @@
\DeclareCaptionDefaultFont{textfont}{\itshape}%
\DeclareCaptionLabelSeparator{default}{\captionseparator\space}%
}
+ \caption at CheckCommand\@makecaption{%
+ % rlbabel.def [2005/03/30 v2.3h Right-to-Left support from the babel system Hebrew language support from the babel system]
+ \long\def\@makecaption#1#2{%
+ \vskip\abovecaptionskip%
+ \begin{center}%
+ #1: #2%
+ \end{center} \par%
+ \vskip\belowcaptionskip}}%
\DeclareCaptionListFormat{subperiod}{#2.}
\caption at ifundefined\hunnewlabel{}{%
\caption at CheckCommand\@makecaption{%
@@ -1375,16 +1413,18 @@
\hb at xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}}}
-\def\caption at tempa#1{\@ifundefined{extras#1}{}{%
- \expandafter\addto\csname extras#1\endcsname{%
- % change default labelsep and listformat
- \caption at setdefaultlabelsep{period}%
- \caption at setdefaultlistformat{subperiod}}%
- \expandafter\addto\csname noextras#1\endcsname{%
- % change default labelsep and listformat
- \caption at setdefaultlabelsep{colon}%
- \caption at setdefaultlistformat{subsimple}}%
-}}
+\def\caption at tempa#1{%
+ \@ifpackagewith{babel}{#1}{%
+ \caption at InfoNoLine{#1 babel option is loaded}%
+ \expandafter\addto\csname extras#1\endcsname{%
+ % change default labelsep and listformat
+ \caption at setdefaultlabelsep{period}%
+ \caption at setdefaultlistformat{subperiod}}%
+ \expandafter\addto\csname noextras#1\endcsname{%
+ % change default labelsep and listformat
+ \caption at setdefaultlabelsep{colon}%
+ \caption at setdefaultlistformat{subsimple}}%
+ }{}}
\caption at tempa{hungarian}
\caption at tempa{magyar}
\caption at IfCheckCommand{%
@@ -1425,11 +1465,13 @@
{\csname ext@#1\endcsname}%
{#1}%
{\caption at lstfmt{\@nameuse{p@#1}}{\@nameuse{the#1}}}%
- {\ignorespaces #2}}}}
+ {\ignorespaces #2}%
+ \caption at chkfloat{#1}{#2}}}}
\newcommand*\caption at add@contentsline{%
\caption@@@addcontentsline}
\newcommand*\caption@@@addcontentsline[4]{%
\addcontentsline{#1}{#2}{\protect\numberline{#3}{#4}}}
+\let\caption at chkfloat\@gobbletwo
\newcommand\caption at ifcontentsline[1]{%
\caption at iflist
{\def\@tempa{#1}}%
@@ -1591,6 +1633,7 @@
\endgroup
\fi}%
{{\captiontextfont
+ \captiontextstart
\caption at ifstrut
{\vrule\@height\ht\strutbox\@width\z@}%
{}%
@@ -1599,7 +1642,9 @@
\caption at ifstrut
{\ifhmode\@finalstrut\strutbox\fi}%
{}%
- \par}}}
+ \captiontextend}}}
+\newcommand*\captiontextstart{}
+\newcommand*\captiontextend{\par}
\newcommand\caption at ifempty[1]{%
\caption at if@empty{#1}%
\caption at ifempty\@unused}
Modified: trunk/Master/texmf-dist/tex/latex/caption/ltcaption.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/ltcaption.sty 2018-10-03 22:43:40 UTC (rev 48823)
+++ trunk/Master/texmf-dist/tex/latex/caption/ltcaption.sty 2018-10-03 22:44:10 UTC (rev 48824)
@@ -37,7 +37,7 @@
%% caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{ltcaption}[2013/06/09 v1.4-94 longtable captions (AR)]
+\ProvidesPackage{ltcaption}[2018/08/26 v1.4-95 longtable captions (AR)]
\@ifpackageloaded{longtable}{}{%
\PackageError{ltcaption}{longtable package not loaded, aborting}{RTFM}}
\providecommand*\LTcaptype{table}
@@ -80,13 +80,7 @@
\newcommand*\caption at LT@table{table}%
\long\def\LT at c@ption#1[#2]#3{%
\LT at makecaption#1{\csname fnum@\LTcaptype\endcsname}{#3}%
- \def\@tempa{#2}%
- \ifx\@tempa\@empty\else
- {\let\\\space
- \addcontentsline{\csname ext@\LTcaptype\endcsname}{\LTcaptype}%
- {\protect\numberline{\csname the\LTcaptype\endcsname}{#2}}}%
- \fi
- \ignorespaces}
+ \LT at listentry\LTcaptype{#2}}
\renewcommand\LT at makecaption[3]{%
\LT@@makecaption{%
\sbox\@tempboxa{%
@@ -157,6 +151,14 @@
\def\next{\caption at LT@parse@ @}%
\fi\fi\fi
\next}
+\newcommand*\LT at listentry[2]{%
+ \def\@tempa{#2}%
+ \ifx\@tempa\@empty\else
+ {\let\\\space
+ \addcontentsline{\csname ext@#1\endcsname}{#1}%
+ {\protect\numberline{\csname the#1\endcsname}{#2}}}%
+ \fi
+ \ignorespaces}
\newenvironment{longtable*}{%
\let\caption at LT@type\@gobble
\let\caption at LT@raisedlink\Hy at raisedlink
More information about the tex-live-commits
mailing list