diff options
author | Karl Berry <karl@freefriends.org> | 2014-09-26 20:27:50 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-09-26 20:27:50 +0000 |
commit | bf07457f5a27ec860ad159058da5a67e3033062d (patch) | |
tree | f0a296920f6f7e83a7d61ab76b07fae1e743433d /Master/texmf-dist/tex/generic/babel/babel.def | |
parent | f0f6bb195e19199b566cdbd1e8352dbae05e777c (diff) |
babel (26sep14)
git-svn-id: svn://tug.org/texlive/trunk@35266 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/babel/babel.def')
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/babel.def | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def index 67ded378850..ed3232d161b 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}[2014/03/24 v3.9k The Babel package] +%%\ProvidesFile{babel.dtx}[2014/09/25 v3.9l 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}[2014/03/24 3.9k Babel common definitions] +\ProvidesFile{babel.def}[2014/09/25 3.9l Babel common definitions] \ifx\AtBeginDocument\@undefined \input plain.def\relax \fi -\def\bbl@tempa{3.9k}% +\def\bbl@tempa{3.9l}% \ifx\bbl@version\bbl@tempa\else \input switch.def\relax \fi @@ -783,18 +783,20 @@ \expandafter\bbl@tempa \fi}% \bbl@tempa} -\def\bbl@patchuclc{% - \let\bbl@patchuclc\relax - \@ifundefined{bbl@tolower}{% - \g@addto@macro\@uclclist{% - \reserved@b{\reserved@b\@gobble}% stops processing the list +\@ifpackagewith{babel}{nocase}% + {\let\bbl@patchuclc\relax}% + {\def\bbl@patchuclc{% + \global\let\bbl@patchuclc\relax + \g@addto@macro\@uclclist{\reserved@b{\reserved@b\bbl@uclc}}% + \gdef\bbl@uclc##1{% \let\bbl@encoded\bbl@encoded@uclc \@ifundefined{\languagename @bbl@uclc}% and resumes it - {\reserved@a}% - {\csname\languagename @bbl@uclc\endcsname}% + {##1}% + {\let\bbl@tempa##1\relax % Used by LANG@bbl@uclc + \csname\languagename @bbl@uclc\endcsname}% {\bbl@tolower\@empty}{\bbl@toupper\@empty}}% \gdef\bbl@tolower{\csname\languagename @bbl@lc\endcsname}% - \gdef\bbl@toupper{\csname\languagename @bbl@uc\endcsname}}{}}% + \gdef\bbl@toupper{\csname\languagename @bbl@uc\endcsname}}} \@onlypreamble\StartBabelCommands \def\StartBabelCommands{% \begingroup @@ -813,7 +815,7 @@ \bbl@patchuclc \bbl@forlang\bbl@tempa{% \expandafter\bbl@encstring - \csname\bbl@tempa @bbl@uclc\endcsname{\reserved@a##1}% + \csname\bbl@tempa @bbl@uclc\endcsname{\bbl@tempa##1}% \expandafter\bbl@encstring \csname\bbl@tempa @bbl@uc\endcsname{##2}% \expandafter\bbl@encstring @@ -1233,7 +1235,7 @@ \def\@citex[#1][#2]#3{% \@safe@activestrue\edef\@tempa{#3}\@safe@activesfalse \org@@citex[#1][#2]{\@tempa}}% - }{}} + }{}} \AtBeginDocument{% \@ifpackageloaded{cite}{% \def\@citex[#1]#2{% @@ -1412,13 +1414,14 @@ \fi} \AtEndOfPackage{\edef\latinencoding{\cf@encoding}} \AtBeginDocument{% - \gdef\latinencoding{OT1}% - \ifx\cf@encoding\bbl@t@one - \xdef\latinencoding{\bbl@t@one}% - \else - \@ifl@aded{def}{t1enc}{\xdef\latinencoding{\bbl@t@one}}{}% - \fi - } + \@ifpackageloaded{fontspec}% + {\xdef\latinencoding{EU\ifcase\bbl@engine\or2\or1\fi}}% + {\gdef\latinencoding{OT1}% + \ifx\cf@encoding\bbl@t@one + \xdef\latinencoding{\bbl@t@one}% + \else + \@ifl@aded{def}{t1enc}{\xdef\latinencoding{\bbl@t@one}}{}% + \fi}} \DeclareRobustCommand{\latintext}{% \fontencoding{\latinencoding}\selectfont \def\encodingdefault{\latinencoding}} |