diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic/babel/babel.def')
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/babel.def | 87 |
1 files changed, 41 insertions, 46 deletions
diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def index a58501aec4a..23c13db2653 100644 --- a/Master/texmf-dist/tex/generic/babel/babel.def +++ b/Master/texmf-dist/tex/generic/babel/babel.def @@ -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}[2013/10/10 v3.9g The Babel package] +%%\ProvidesFile{babel.dtx}[2013/12/03 v3.9h The Babel package] %% Babel package for LaTeX2e. %% Copyright (C) 1989 -- 2008 by Johannes Braams, %% TeXniek @@ -56,11 +56,11 @@ \wlog{File: #1 #4 #3 <#2>}% \let\ProvidesFile\@undefined} \fi -\ProvidesFile{babel.def}[2013/10/10 3.9g Babel common definitions] +\ProvidesFile{babel.def}[2013/12/03 3.9h Babel common definitions] \ifx\AtBeginDocument\@undefined \input plain.def\relax \fi -\def\bbl@tempa{3.9g}% +\def\bbl@tempa{3.9h}% \ifx\bbl@version\bbl@tempa\else \input switch.def\relax \fi @@ -420,7 +420,8 @@ The character `\string #1' should be made a shorthand character;\\% add the command \string\useshorthands\string{#1\string} to the preamble.\\% - I will ignore your instruction}{}} + I will ignore your instruction}% + {You may proceed, but expect unexpected results}} \newcommand*\shorthandon[1]{\bbl@switch@sh\@ne#1\@nnil} \DeclareRobustCommand*\shorthandoff{% \@ifstar{\bbl@shorthandoff\tw@}{\bbl@shorthandoff\z@}} @@ -869,26 +870,24 @@ \def\StartBabelCommands{% \begingroup \bbl@recatcode{11}% - \def\SetStringLoop{\afterassignment\bbl@sclp\def\bbl@templ####1}% - \def\bbl@sclp##1{% - \def\bbl@tempk{\@ne}% - \@for\bbl@tempm:=##1\do{% - \count@\bbl@tempk\relax % Because of stringprocess event - \toks@\expandafter{\bbl@tempm}% - \edef\bbl@tempn{% - \expandafter\noexpand - \csname\bbl@templ{\romannumeral\count@}\endcsname{\the\toks@}}% - \advance\count@\@ne - \edef\bbl@tempk{\the\count@}% - \expandafter\SetString\bbl@tempn}}% + \def\SetStringLoop##1##2{% + \def\bbl@templ####1{\expandafter\noexpand\csname##1\endcsname}% + \count@\z@ + \@for\bbl@tempa:=\@empty##2\do{% \@empty "undoes" \expandafter + \advance\count@\@ne + \toks@\expandafter{\bbl@tempa}% + \edef\bbl@tempb{% + \bbl@templ{\romannumeral\count@}{\the\toks@}% + \count@=\the\count@\relax}% + \expandafter\SetString\bbl@tempb}}% \newcommand\SetCase[3][]{% \bbl@patchuclc \bbl@forlang\bbl@tempa{% - \expandafter\bbl@stringdef + \expandafter\bbl@encstring \csname\bbl@tempa @bbl@uclc\endcsname{\reserved@a##1}% - \expandafter\bbl@stringdef + \expandafter\bbl@encstring \csname\bbl@tempa @bbl@uc\endcsname{##2}% - \expandafter\bbl@stringdef + \expandafter\bbl@encstring \csname\bbl@tempa @bbl@lc\endcsname{##3}}}% \def\bbl@provstring##1##2{% \providecommand##1{##2}% @@ -952,20 +951,25 @@ \@expandtwoargs \in@{,\bbl@opt@strings,}{,\bbl@sc@label,\bbl@sc@fontenc,}}% \fi - \bbl@scswitch{% - \ifx\bbl@opt@strings\@nnil % ie, no strings - \let\bbl@stringdef\bbl@encstring % for \SetCase - \else\ifx\bbl@opt@strings\relax % ie, strings with no value - \let\AfterBabelCommands\bbl@aftercmds - \let\SetString\bbl@setstring - \let\bbl@stringdef\bbl@encstring - \else % ie, strings=value - \bbl@sctest - \ifin@ - \let\AfterBabelCommands\bbl@aftercmds - \let\SetString\bbl@setstring - \let\bbl@stringdef\bbl@provstring - \fi\fi\fi}% + \ifx\bbl@opt@strings\@nnil % ie, no strings -> defaults + \else\ifx\bbl@opt@strings\relax % ie, strings with no value + \let\AfterBabelCommands\bbl@aftercmds + \let\SetString\bbl@setstring + \let\bbl@stringdef\bbl@encstring + \else % ie, strings=value + \bbl@sctest + \ifin@ + \let\AfterBabelCommands\bbl@aftercmds + \let\SetString\bbl@setstring + \let\bbl@stringdef\bbl@provstring + \fi\fi\fi + \bbl@scswitch + \ifx\bbl@G\@empty + \def\SetString##1##2{% + \bbl@error{Missing group for string \string##1}% + {You must assign strings to some category, typically\\% + captions or extras, but you set none}}% + \fi \ifx\@empty#1% \@expandtwoargs \bbl@usehooks{defaultcommands}{}% @@ -976,10 +980,8 @@ \def\bbl@forlang#1#2{% \bbl@for#1\bbl@L{% \@expandtwoargs\in@{,#1,}{,\BabelLanguages,}% - \ifin@#2\fi}} -\def\bbl@scswitch#1{% - #1\relax - \bbl@scswitch@i + \ifin@#2\relax\fi}} +\def\bbl@scswitch{% \bbl@forlang\bbl@tempa{% \ifx\bbl@G\@empty\else \ifx\SetString\@gobbletwo\else @@ -991,16 +993,9 @@ \fi \fi \fi}} -\def\bbl@scswitch@i{% - \ifx\bbl@G\@empty - \def\SetString##1##2{% - \bbl@error{Missing group for string \string##1}% - {You must assign strings to some category, typically\\% - captions or extras, but you set none}}% - \fi} \AtEndOfPackage{% - \def\bbl@scswitch#1{#1\relax\bbl@scswitch@i}% - \def\bbl@forlang#1#2{\bbl@for#1\bbl@L{\@ifundefined{date#1}{}{#2}}}} + \def\bbl@forlang#1#2{\bbl@for#1\bbl@L{\@ifundefined{date#1}{}{#2}}}% + \let\bbl@scswitch\relax} \@onlypreamble\EndBabelCommands \def\EndBabelCommands{% \bbl@usehooks{stopcommands}{}% |