diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic/babel/babel.sty')
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/babel.sty | 71 |
1 files changed, 50 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty index 2021e85f21a..f183ce68e6b 100644 --- a/Master/texmf-dist/tex/generic/babel/babel.sty +++ b/Master/texmf-dist/tex/generic/babel/babel.sty @@ -38,7 +38,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. %% File 'babel.dtx' -%%\ProvidesFile{babel.dtx}[2017/04/28 v3.9t The Babel package] +%%\ProvidesFile{babel.dtx}[2017/05/19 v3.10 The Babel package] %% Babel package for LaTeX2e. %% Copyright (C) 1989-2008 by Johannes Braams, %% TeXniek @@ -48,10 +48,12 @@ %% by Javier Bezos %% all rights reserved. \NeedsTeXFormat{LaTeX2e}[2005/12/01] -\ProvidesPackage{babel}[2017/04/28 3.9t The Babel package] +\ProvidesPackage{babel}[2017/05/19 3.10 The Babel package] \@ifpackagewith{babel}{debug} - {\input switch.def\relax} - {\def\bbl@tempa{3.9t}% + {\let\bbl@debug\@firstofone + \input switch.def\relax} + {\let\bbl@debug\@gobble + \def\bbl@tempa{3.10}% \ifx\bbl@version\bbl@tempa\else \input switch.def\relax \fi} @@ -115,6 +117,38 @@ \def\bbl@ifblank#1{% \bbl@ifblank@i#1\@nil\@nil\@secondoftwo\@firstoftwo\@nil} \long\def\bbl@ifblank@i#1#2\@nil#3#4#5\@nil{#4} +\def\bbl@forkv#1#2{% + \def\bbl@kvcmd##1##2##3{#2}% + \bbl@kvnext#1,\@nil,} +\def\bbl@kvnext#1,{% + \ifx\@nil#1\relax\else + \bbl@ifblank{#1}{}{\bbl@forkv@eq#1=\@empty=\@nil{#1}}% + \expandafter\bbl@kvnext + \fi} +\def\bbl@forkv@eq#1=#2=#3\@nil#4{% + \bbl@trim@def\bbl@forkv@a{#1}% + \bbl@trim{\expandafter\bbl@kvcmd\expandafter{\bbl@forkv@a}}{#2}{#4}} +\def\bbl@vforeach#1#2{% + \def\bbl@forcmd##1{#2}% + \bbl@fornext#1,\@nil,} +\def\bbl@fornext#1,{% + \ifx\@nil#1\relax\else + \bbl@ifblank{#1}{}{\bbl@trim\bbl@forcmd{#1}}% + \expandafter\bbl@fornext + \fi} +\def\bbl@foreach#1{\expandafter\bbl@vforeach\expandafter{#1}} +\def\bbl@replace#1#2#3{% in #1 -> repl #2 by #3 + \toks@{}% + \def\bbl@replace@aux##1#2##2#2{% + \ifx\bbl@nil##2% + \toks@\expandafter{\the\toks@##1}% + \else + \toks@\expandafter{\the\toks@##1#3}% + \bbl@afterfi + \bbl@replace@aux##2#2% + \fi}% + \expandafter\bbl@replace@aux#1#2\bbl@nil#2% + \edef#1{\the\toks@}} \def\bbl@exp#1{% \begingroup \let\\\noexpand @@ -192,8 +226,7 @@ \fi \fi} \let\bbl@tempc\@empty -\bbl@for\bbl@tempa\bbl@tempa{% - \expandafter\bbl@tempd\bbl@tempa.\@empty\@nnil} +\bbl@foreach\bbl@tempa{\bbl@tempd#1.\@empty\@nnil} \expandafter\let\csname opt@babel.sty\endcsname\bbl@tempc \DeclareOption{KeepShorthandsActive}{} \DeclareOption{activeacute}{} @@ -210,11 +243,11 @@ \DeclareOption{strings}{\def\bbl@opt@strings{\BabelStringsDefault}} \DeclareOption{strings=encoded}{\let\bbl@opt@strings\relax} \def\BabelStringsDefault{generic} -\DeclareOption{hyphenmap=off}{\chardef\bbl@hymapopt\z@} -\DeclareOption{hyphenmap=first}{\chardef\bbl@hymapopt\@ne} -\DeclareOption{hyphenmap=select}{\chardef\bbl@hymapopt\tw@} -\DeclareOption{hyphenmap=other}{\chardef\bbl@hymapopt\thr@@} -\DeclareOption{hyphenmap=other*}{\chardef\bbl@hymapopt4\relax} +\DeclareOption{hyphenmap=off}{\chardef\bbl@opt@hyphenmap\z@} +\DeclareOption{hyphenmap=first}{\chardef\bbl@opt@hyphenmap\@ne} +\DeclareOption{hyphenmap=select}{\chardef\bbl@opt@hyphenmap\tw@} +\DeclareOption{hyphenmap=other}{\chardef\bbl@opt@hyphenmap\thr@@} +\DeclareOption{hyphenmap=other*}{\chardef\bbl@opt@hyphenmap4\relax} \DeclareOption{safe=none}{\let\bbl@opt@safe\@empty} \DeclareOption{safe=bib}{\def\bbl@opt@safe{B}} \DeclareOption{safe=ref}{\def\bbl@opt@safe{R}} @@ -343,16 +376,12 @@ {\noexpand\bbl@load@language{\bbl@tempa}}}% \bbl@tempb}% \@empty} -\bbl@for\bbl@tempa\@classoptionslist{% - \bbl@ifunset{ds@\bbl@tempa}% - {\IfFileExists{\bbl@tempa.ldf}% - {\edef\bbl@tempb{% - \noexpand\DeclareOption - {\bbl@tempa}% - {\noexpand\bbl@load@language{\bbl@tempa}}}% - \bbl@tempb}% - \@empty}% - \@empty} +\bbl@foreach\@classoptionslist{% + \bbl@ifunset{ds@#1}% + {\IfFileExists{#1.ldf}% + {\DeclareOption{#1}{\bbl@load@language{#1}}}% + {}}% + {}} \ifx\bbl@opt@main\@nnil\else \expandafter \let\expandafter\bbl@loadmain\csname ds@\bbl@opt@main\endcsname |