babel (26sep14)

git-svn-id: svn://tug.org/texlive/trunk@35266 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 44 insertions, 35 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}}
diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty
index b3a70b1474d..bfe4259cda9 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}[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
@@ -48,10 +48,10 @@
 %%                            by Javier Bezos
 %%                            all rights reserved.
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
-\ProvidesPackage{babel}[2014/03/24 3.9k The Babel package]
+\ProvidesPackage{babel}[2014/09/25 3.9l The Babel package]
 \@ifpackagewith{babel}{debug}
  {\input switch.def\relax}
- {\def\bbl@tempa{3.9k}%
+ {\def\bbl@tempa{3.9l}%
 \ifx\bbl@version\bbl@tempa\else
   \input switch.def\relax
 \fi}
@@ -104,9 +104,11 @@
 \DeclareOption{debug}{}
 \DeclareOption{noconfigs}{}
 \DeclareOption{showlanguages}{}
+\DeclareOption{silent}{}
 \DeclareOption{shorthands=off}{\bbl@tempa shorthands=\bbl@tempa}
 \DeclareOption{math=active}{}
 \DeclareOption{math=normal}{\def\bbl@mathnormal{\noexpand\textormath}}
+\DeclareOption{nocase}{}
 \let\bbl@opt@strings\@nnil % accept strings=value
 \DeclareOption{strings}{\def\bbl@opt@strings{\BabelStringsDefault}}
 \DeclareOption{strings=encoded}{\let\bbl@opt@strings\relax}
diff --git a/Master/texmf-dist/tex/generic/babel/blplain.tex b/Master/texmf-dist/tex/generic/babel/blplain.tex
index 10638d754a4..d80d8ee843d 100644
--- a/Master/texmf-dist/tex/generic/babel/blplain.tex
+++ b/Master/texmf-dist/tex/generic/babel/blplain.tex
@@ -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
diff --git a/Master/texmf-dist/tex/generic/babel/bplain.tex b/Master/texmf-dist/tex/generic/babel/bplain.tex
index b53e7d11f77..63f66c12e44 100644
--- a/Master/texmf-dist/tex/generic/babel/bplain.tex
+++ b/Master/texmf-dist/tex/generic/babel/bplain.tex
@@ -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
diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg
index c57cc93c239..3e4021001b1 100644
--- a/Master/texmf-dist/tex/generic/babel/hyphen.cfg
+++ b/Master/texmf-dist/tex/generic/babel/hyphen.cfg
@@ -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
@@ -52,7 +52,7 @@
     \wlog{File: #1 #4 #3 <#2>}%
     \let\ProvidesFile\@undefined}
 \fi
-\ProvidesFile{hyphen.cfg}[2014/03/24 3.9k Babel hyphens]
+\ProvidesFile{hyphen.cfg}[2014/09/25 3.9l Babel hyphens]
 \xdef\bbl@format{\jobname}
 \ifx\AtBeginDocument\@undefined
   \def\@empty{}
@@ -83,7 +83,7 @@
   \countdef\last@language=19
   \def\addlanguage{\alloc@9\language\chardef\@cclvi}
 \fi
-\toks8{Babel <3.9k> and hyphenation patterns for }%
+\toks8{Babel <3.9l> and hyphenation patterns for }%
 \def\process@line#1#2 #3 #4 {%
   \ifx=#1%
     \process@synonym{#2}%
diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf
index b6516c07605..5179b3e8612 100644
--- a/Master/texmf-dist/tex/generic/babel/nil.ldf
+++ b/Master/texmf-dist/tex/generic/babel/nil.ldf
@@ -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
@@ -47,7 +47,7 @@
 %%                            TeXniek
 %%                            by Javier Bezos
 %%                            all rights reserved.
-\ProvidesLanguage{nil}[2014/03/24 3.9k Nil language]
+\ProvidesLanguage{nil}[2014/09/25 3.9l Nil language]
 \LdfInit{nil}{datenil}
 \ifx\l@nohyphenation\@undefined
    \@nopatterns{nil}
diff --git a/Master/texmf-dist/tex/generic/babel/plain.def b/Master/texmf-dist/tex/generic/babel/plain.def
index b2441523935..86615c7fb27 100644
--- a/Master/texmf-dist/tex/generic/babel/plain.def
+++ b/Master/texmf-dist/tex/generic/babel/plain.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
diff --git a/Master/texmf-dist/tex/generic/babel/switch.def b/Master/texmf-dist/tex/generic/babel/switch.def
index 35a19975f96..0e5654ea15a 100644
--- a/Master/texmf-dist/tex/generic/babel/switch.def
+++ b/Master/texmf-dist/tex/generic/babel/switch.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
@@ -52,7 +52,7 @@
     \wlog{File: #1 #4 #3 <#2>}%
     \let\ProvidesFile\@undefined}
 \fi
-\ProvidesFile{switch.def}[2014/03/24 3.9k Babel switching mechanism]
+\ProvidesFile{switch.def}[2014/09/25 3.9l Babel switching mechanism]
 \ifx\AtBeginDocument\@undefined
   \input plain.def\relax
 \fi
@@ -73,8 +73,8 @@
   \countdef\last@language=19
   \def\addlanguage{\alloc@9\language\chardef\@cclvi}
 \fi
-\def\bbl@version{3.9k}
-\def\bbl@date{2014/03/24}
+\def\bbl@version{3.9l}
+\def\bbl@date{2014/09/25}
 \def\adddialect#1#2{%
   \global\chardef#1#2\relax
   \bbl@usehooks{adddialect}{{#1}{#2}}%
@@ -342,6 +342,10 @@
       \PackageInfo{babel}{#1}%
     \endgroup}
 \fi
+\@ifpackagewith{babel}{silent}
+  {\let\bbl@info\@gobble
+   \let\bbl@warning\@gobble}
+  {}
 \def\@nolanerr#1{%
   \bbl@error
     {You haven't defined the language #1\space yet}%