diff options
author | Karl Berry <karl@freefriends.org> | 2021-06-28 20:38:19 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-06-28 20:38:19 +0000 |
commit | a977864eac6d306a206d3c4535fe0e397a10ab4a (patch) | |
tree | eef32e46d36c0092e1062db037e8000e4862fc26 /Master/texmf-dist/tex/generic/babel/babel.sty | |
parent | 472bc9cb1b41fa04197e7684ac38bb1ea6550ee0 (diff) |
babel (28jun21)
git-svn-id: svn://tug.org/texlive/trunk@59740 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/babel/babel.sty')
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/babel.sty | 42 |
1 files changed, 25 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty index 360f73acce6..bdf21cb3358 100644 --- a/Master/texmf-dist/tex/generic/babel/babel.sty +++ b/Master/texmf-dist/tex/generic/babel/babel.sty @@ -12,6 +12,7 @@ %% any individual authors listed elsewhere in this file. %% All rights reserved. %% +%% %% This file is part of the Babel system. %% -------------------------------------- %% @@ -26,7 +27,6 @@ %% This work has the LPPL maintenance status "maintained". %% %% The Current Maintainer of this work is Javier Bezos. - %% %% The list of derived (unpacked) files belonging to the distribution %% and covered by LPPL is defined by the unpacking scripts (with @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2005/12/01] -\ProvidesPackage{babel}[2021/06/02 3.60 The Babel package] +\ProvidesPackage{babel}[2021/06/28 3.61 The Babel package] \@ifpackagewith{babel}{debug} {\providecommand\bbl@trace[1]{\message{^^J[ #1 ]}}% \let\bbl@debug\@firstofone @@ -217,6 +217,16 @@ \else \expandafter\@firstofone \fi} +\def\bbl@extras@wrap#1#2#3{% 1:in-test, 2:before, 3:after + \toks@\expandafter\expandafter\expandafter{% + \csname extras\languagename\endcsname}% + \bbl@exp{\\\in@{#1}{\the\toks@}}% + \ifin@\else + \@temptokena{#2}% + \edef\bbl@tempc{\the\@temptokena\the\toks@}% + \toks@\expandafter{\bbl@tempc#3}% + \expandafter\edef\csname extras\languagename\endcsname{\the\toks@}% + \fi} % Temporarily repeat here the code for errors. TODO. \def\bbl@error#1#2{% \begingroup @@ -326,7 +336,7 @@ \ifx\@empty#2% \edef\bbl@tempc{\ifx\bbl@tempc\@empty\else\bbl@tempc,\fi#1}% \else - \in@{,provide,}{,#1,}% + \in@{,provide=}{,#1}% \ifin@ \edef\bbl@tempc{% \ifx\bbl@tempc\@empty\else\bbl@tempc,\fi#1.\bbl@tempb#2}% @@ -350,7 +360,6 @@ \DeclareOption{noconfigs}{} \DeclareOption{showlanguages}{} \DeclareOption{silent}{} -\DeclareOption{mono}{} \DeclareOption{shorthands=off}{\bbl@tempa shorthands=\bbl@tempa} \chardef\bbl@iniflag\z@ \DeclareOption{provide=*}{\chardef\bbl@iniflag\@ne} % main -> +1 @@ -387,6 +396,7 @@ \let\bbl@opt@main\@nnil \let\bbl@opt@headfoot\@nnil \let\bbl@opt@layout\@nnil +\let\bbl@opt@provide\@nnil \def\bbl@tempa#1=#2\bbl@tempa{% \bbl@csarg\ifx{opt@#1}\@nnil \bbl@csarg\edef{opt@#1}{#2}% @@ -407,6 +417,12 @@ \bbl@add@list\bbl@language@opts{\CurrentOption}% \fi} \ProcessOptions* +\ifx\bbl@opt@provide\@nnil\else % Tests. Ignore. + \chardef\bbl@iniflag\@ne + \bbl@replace\bbl@opt@provide{;}{,} + \bbl@add\bbl@opt@provide{,import} + \show\bbl@opt@provide +\fi \bbl@trace{Conditional loading of shorthands} \def\bbl@sh@string#1{% \ifx#1\@empty\else @@ -995,18 +1011,6 @@ *}}% \@empty}} \fi -\ifx\@unexpandable@protect\@undefined - \def\@unexpandable@protect{\noexpand\protect\noexpand} - \long\def\protected@write#1#2#3{% - \begingroup - \let\thepage\relax - #2% - \let\protect\@unexpandable@protect - \edef\reserved@a{\write#1{#3}}% - \reserved@a - \endgroup - \if@nobreak\ifvmode\nobreak\fi\fi} -\fi \bbl@trace{Language options} \let\bbl@afterlang\relax \let\BabelModifiers\relax @@ -1153,7 +1157,11 @@ \ifodd\bbl@iniflag % case 1,3 \bbl@ldfinit \let\CurrentOption\bbl@opt@main - \bbl@exp{\\\babelprovide[import,main]{\bbl@opt@main}} + \ifx\bbl@opt@provide\@nnil + \bbl@exp{\\\babelprovide[import,main]{\bbl@opt@main}} + \else + \bbl@exp{\\\babelprovide[\bbl@opt@provide,main]{\bbl@opt@main}}% + \fi \bbl@afterldf{}% \else % case 0,2 \chardef\bbl@iniflag\z@ % Force ldf |