1 files changed, 30 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def
index 2841b87e0aa..9af228d1ae3 100644
--- a/Master/texmf-dist/tex/generic/babel/babel.def
+++ b/Master/texmf-dist/tex/generic/babel/babel.def
@@ -38,12 +38,12 @@
 %% 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}[2016/01/08 v3.9n The Babel package]
+%%\ProvidesFile{babel.dtx}[2016/02/24 v3.9q The Babel package]
 %% Babel package for LaTeX2e.
 %% Copyright (C) 1989-2008 by Johannes Braams,
 %%                            TeXniek
 %%                            all rights reserved.
-%% Copyright (C) 2013-2014 by Johannes Braams
+%% Copyright (C) 2013-2016 by Johannes Braams
 %%                            TeXniek
 %%                            by Javier Bezos
 %%                            all rights reserved.
@@ -56,7 +56,7 @@
     \wlog{File: #1 #4 #3 <#2>}%
     \let\ProvidesFile\@undefined}
 \fi
-\ProvidesFile{babel.def}[2016/01/08 3.9n Babel common definitions]
+\ProvidesFile{babel.def}[2016/02/24 3.9q Babel common definitions]
 \ifx\AtBeginDocument\@undefined
   \input plain.def\relax
 \fi
@@ -67,29 +67,36 @@
   \let\bbl@afterlang\relax
   \let\bbl@language@opts\@empty
 \fi
-\def\bbl@tempa{3.9n}%
+\def\bbl@tempa{3.9q}%
 \ifx\bbl@version\bbl@tempa\else
   \input switch.def\relax
 \fi
 \ifx\bbl@languages\@undefined
-  \openin1 = language.def
-  \ifeof1
-    \closein1
-    \message{I couldn't find the file language.def}
-  \else
-    \closein1
-    \begingroup
-      \def\addlanguage#1#2#3#4#5{%
-        \expandafter\ifx\csname lang@#1\endcsname\relax\else
-          \global\expandafter\let\csname l@#1\expandafter\endcsname
-            \csname lang@#1\endcsname
-        \fi}%
-      \def\uselanguage#1{}%
-      \input language.def
-    \endgroup
+  \ifx\directlua\@undefined
+    \openin1 = language.def
+    \ifeof1
+      \closein1
+      \message{I couldn't find the file language.def}
+    \else
+      \closein1
+      \begingroup
+\def\addlanguage#1#2#3#4#5{%
+  \expandafter\ifx\csname lang@#1\endcsname\relax\else
+    \global\expandafter\let\csname l@#1\expandafter\endcsname
+      \csname lang@#1\endcsname
+  \fi}%
+\def\uselanguage#1{}%
+\input language.def
+      \endgroup
+    \fi
   \fi
   \chardef\l@english\z@
 \fi
+\ifx\directlua\@undefined\else
+  \ifx\bbl@luapatterns\@undefined
+    \input luababel.def
+  \fi
+\fi
 \def\bbl@add#1#2{%
   \@ifundefined{\expandafter\@gobble\string#1}%
     {\def#1{#2}}%
@@ -1422,7 +1429,10 @@
 \AtEndOfPackage{\edef\latinencoding{\cf@encoding}}
 \AtBeginDocument{%
   \@ifpackageloaded{fontspec}%
-    {\xdef\latinencoding{EU\ifcase\bbl@engine\or2\or1\fi}}%
+    {\xdef\latinencoding{%
+       \@ifundefined{UTFencname}%
+         {EU\ifcase\bbl@engine\or2\or1\fi}%
+         {\UTFencname}}}%
     {\gdef\latinencoding{OT1}%
      \ifx\cf@encoding\bbl@t@one
        \xdef\latinencoding{\bbl@t@one}%