diff options
author | Karl Berry <karl@freefriends.org> | 2018-10-03 22:44:10 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-10-03 22:44:10 +0000 |
commit | bc810e6340a36baa5a2918ed256a605f54f04811 (patch) | |
tree | c8f9199f1458a3ad9551163a014175ba07478e41 /Master/texmf-dist/tex/latex/caption/caption3.sty | |
parent | 55845302274b6cfc093524d6b32db3b1747626c5 (diff) |
caption (3oct18)
git-svn-id: svn://tug.org/texlive/trunk@48824 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/caption/caption3.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/caption/caption3.sty | 71 |
1 files changed, 58 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty index cee7781981d..8639d49fc8a 100644 --- a/Master/texmf-dist/tex/latex/caption/caption3.sty +++ b/Master/texmf-dist/tex/latex/caption/caption3.sty @@ -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@FixArabTeX{% \def\caption@tempa##1{}% \ifx\caption@tempa\@gobble @@ -1302,6 +1302,36 @@ \DeclareCaptionDefaultFont{labelfont}{\cph@font} \DeclareCaptionDefaultFont{textfont}{\cpb@font} } +\caption@ifundefined\ArabiCoreLoaded{% + \let\caption@rl\@firstofone +}{% + \newcommand\caption@rl[1]{\if@rl\textRL{#1}\else\textLR{#1}\fi} + \def\fnum@figure{\figurename\nobreakspace\thefigure}% + \def\fnum@table{\tablename\nobreakspace\thetable}% + \DeclareCaptionLabelSeparator{arabi}{ : } + \DeclareCaptionLabelSeparator{default}{% + \if@rl\caption@lsep@arabi\else\caption@lsep@colon\fi} + \caption@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@rl{ + \ifdim \wd\@Arabitempboxa >\hsize + \textRL{#2} : #1\par + \else + \global \@minipagefalse + \hb@xt@\hsize{\hfil\box\@Arabitempboxa\hfil}% + \fi}\else{ + \ifdim \wd\@tempboxa >\hsize + #1: #2\par + \else + \global \@minipagefalse + \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}% + \fi}\fi + \vskip\belowcaptionskip}} +} \caption@ifundefined\FB@makecaption{}{% \caption@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@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@ifundefined\hunnewlabel{}{% \caption@CheckCommand\@makecaption{% @@ -1375,16 +1413,18 @@ \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}% \fi \vskip\belowcaptionskip}}} -\def\caption@tempa#1{\@ifundefined{extras#1}{}{% - \expandafter\addto\csname extras#1\endcsname{% - % change default labelsep and listformat - \caption@setdefaultlabelsep{period}% - \caption@setdefaultlistformat{subperiod}}% - \expandafter\addto\csname noextras#1\endcsname{% - % change default labelsep and listformat - \caption@setdefaultlabelsep{colon}% - \caption@setdefaultlistformat{subsimple}}% -}} +\def\caption@tempa#1{% + \@ifpackagewith{babel}{#1}{% + \caption@InfoNoLine{#1 babel option is loaded}% + \expandafter\addto\csname extras#1\endcsname{% + % change default labelsep and listformat + \caption@setdefaultlabelsep{period}% + \caption@setdefaultlistformat{subperiod}}% + \expandafter\addto\csname noextras#1\endcsname{% + % change default labelsep and listformat + \caption@setdefaultlabelsep{colon}% + \caption@setdefaultlistformat{subsimple}}% + }{}} \caption@tempa{hungarian} \caption@tempa{magyar} \caption@IfCheckCommand{% @@ -1425,11 +1465,13 @@ {\csname ext@#1\endcsname}% {#1}% {\caption@lstfmt{\@nameuse{p@#1}}{\@nameuse{the#1}}}% - {\ignorespaces #2}}}} + {\ignorespaces #2}% + \caption@chkfloat{#1}{#2}}}} \newcommand*\caption@add@contentsline{% \caption@@@addcontentsline} \newcommand*\caption@@@addcontentsline[4]{% \addcontentsline{#1}{#2}{\protect\numberline{#3}{#4}}} +\let\caption@chkfloat\@gobbletwo \newcommand\caption@ifcontentsline[1]{% \caption@iflist {\def\@tempa{#1}}% @@ -1591,6 +1633,7 @@ \endgroup \fi}% {{\captiontextfont + \captiontextstart \caption@ifstrut {\vrule\@height\ht\strutbox\@width\z@}% {}% @@ -1599,7 +1642,9 @@ \caption@ifstrut {\ifhmode\@finalstrut\strutbox\fi}% {}% - \par}}} + \captiontextend}}} +\newcommand*\captiontextstart{} +\newcommand*\captiontextend{\par} \newcommand\caption@ifempty[1]{% \caption@if@empty{#1}% \caption@ifempty\@unused} |