diff options
author | Karl Berry <karl@freefriends.org> | 2016-06-12 16:12:11 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-06-12 16:12:11 +0000 |
commit | 01c5b7b8dfc848413685e16692be37a4cad2a14a (patch) | |
tree | b0c3b60b2864a8b2d094bdef920cb993da777a94 /Master/texmf-dist/tex/latex/caption/bicaption.sty | |
parent | 1da26fe4bf4ac2b50bbce09e9874582c8593a2d3 (diff) |
caption (24may16)
git-svn-id: svn://tug.org/texlive/trunk@41409 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/caption/bicaption.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/caption/bicaption.sty | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/latex/caption/bicaption.sty b/Master/texmf-dist/tex/latex/caption/bicaption.sty index f018a58e35f..06d119c3abf 100644 --- a/Master/texmf-dist/tex/latex/caption/bicaption.sty +++ b/Master/texmf-dist/tex/latex/caption/bicaption.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: bicaption.sty 136 2016-02-02 09:41:30Z sommerfeldt $ +\caption@tempa $Id: bicaption.sty 158 2016-03-27 17:17:41Z sommerfeldt $ \ProvidesPackage{bicaption}[\caption@tempa v1.1-\caption@tempb Bilingual Captions (AR)] \RequirePackage{caption}[2016/02/01] % needs v3.3-134 or newer \caption@AtBeginDocument{\caption@ifcompatibility{% @@ -78,15 +78,25 @@ \caption@set@bool\bicaption@ifslc{#1}} \DeclareCaptionOption{bi-swap}[1]{% \caption@set@bool\bicaption@ifswap{#1}} -\DeclareCaptionOption{lang}{\def\bicaption@language{#1}} +\DeclareCaptionOption{lang}{% + \caption@ifundefined\bicaption@language + {\let\KV@bicaption@name\KV@caption@name + \def\KV@caption@name{\bicaption@KV{name}}}% + {}% + \def\bicaption@language{#1}% + \let\bicaption@language@options\@empty} \let\KV@caption@language\KV@caption@lang +\newcommand\bicaption@KV[2]{% + \@bicaption@KV{#1}{#2}% + \l@addto@macro\bicaption@language@options{\@bicaption@KV{#1}{#2}}} +\newcommand\@bicaption@KV[1]{% + \@nameuse{KV@bicaption@#1}} \newcommand*\bicaption@selectlanguage[1]{% \caption@ifundefined\bicaption@language{}{% - \expandafter\selectcaptionlanguage\expandafter#1\expandafter{\bicaption@language}}} -\g@addto@macro\caption@applyfont{% + \expandafter\selectcaptionlanguage\expandafter#1\expandafter{\bicaption@language}% + \bicaption@language@options}} +\g@addto@macro\caption@beginhook{% \bicaption@selectlanguage\@firstoftwo} -\g@addto@macro\caption@prepareslc{% - \let\bicaption@language\@undefined} \providecommand*\selectcaptionlanguage[1]{% #1\select@language\selectlanguage} \caption@ExecuteOptions{caption}{bi-lang=0,bi-slc=1,bi-swap=0} |