3 files changed, 40 insertions, 32 deletions
diff --git a/Master/texmf-dist/source/latex/babel/babel.dtx b/Master/texmf-dist/source/latex/babel/babel.dtx
index 612d5a9c08e..59d49aed4d0 100644
--- a/Master/texmf-dist/source/latex/babel/babel.dtx
+++ b/Master/texmf-dist/source/latex/babel/babel.dtx
@@ -36,7 +36,7 @@
 %\iffalse
 %% File 'babel.dtx'
 %\fi
-%%\ProvidesFile{babel.dtx}[2016/02/24 v3.9q The Babel package]
+%%\ProvidesFile{babel.dtx}[2016/04/23 v3.9r The Babel package]
 %\iffalse
 %
 % Babel DOCUMENT-STYLE option for LaTeX version 2.09 or plain TeX;
@@ -196,8 +196,8 @@
 \vspace{2cm}\hspace{1.5cm}
 \begin{minipage}{5cm}
 \Large
-Version 3.9q\newline
-2016/02/24
+Version 3.9r\newline
+2016/04/23
 
 \vspace{1cm}
 \textit{Original author}\newline
@@ -1650,7 +1650,7 @@ explained in in sec. \ref{s:strings} (\babel{} 3.9 and later).
 
 \begin{verbatim}
 \ProvidesLanguage{<language>}
-     [2016/02/24 v0.0 <Language> support from the babel system]
+     [2016/04/23 v0.0 <Language> support from the babel system]
 \LdfInit{<language>}{captions<language>}
 
 \ifx\undefined\l@<language>
@@ -2433,8 +2433,8 @@ help from Bernd Raichle, for which I am grateful.
 %    little bit of literate programming.
 %
 %    \begin{macrocode}
-%<<version=3.9q>>
-%<<date=2016/02/24>>
+%<<version=3.9r>>
+%<<date=2016/04/23>>
 %    \end{macrocode}
 %
 %    We define some basic macros which just make the code cleaner.
diff --git a/Master/texmf-dist/source/latex/babel/bbcompat.dtx b/Master/texmf-dist/source/latex/babel/bbcompat.dtx
index 342e394e91e..bd2392526fc 100644
--- a/Master/texmf-dist/source/latex/babel/bbcompat.dtx
+++ b/Master/texmf-dist/source/latex/babel/bbcompat.dtx
@@ -30,7 +30,7 @@
 %
 % \iffalse
 %<*dtx>
-\ProvidesFile{bbcompat.dtx}[2013/07/28 v1.2l]
+\ProvidesFile{bbcompat.dtx}[2016/04/23 v3.9r]
 %</dtx>
 %
 %% File 'bbcompat.dtx'
diff --git a/Master/texmf-dist/source/latex/babel/bbunicode.dtx b/Master/texmf-dist/source/latex/babel/bbunicode.dtx
index f41054716d4..edc6b714c46 100644
--- a/Master/texmf-dist/source/latex/babel/bbunicode.dtx
+++ b/Master/texmf-dist/source/latex/babel/bbunicode.dtx
@@ -31,7 +31,7 @@
 % \iffalse
 %<*dtx>
 \ProvidesFile{bbunicode.dtx}
-       [2016/02/24 v1.1c Babel hooks for Unicode engines]
+       [2016/04/23 v3.9r Babel hooks for Unicode engines]
 %</dtx>
 %
 %% File `bbunicode.dtx'
@@ -246,6 +246,9 @@
 % \changes{bbunicode~1.1c}{2016/02/08}{Some hacks for polyglossia. To
 %   be improved.}
 % \changes{bbunicode~1.1c}{2016/02/23}{Thoroughly revised.}
+% \changes{bbunicode~1.1d}{2016/4/22}{Lua: Fixed a line break at
+%   \cs{foreignlanguage} with unloaded patterns. Added
+%   \cs{babelcatcodetablenum}, just in case.}
 %
 %    \begin{macrocode}
 %<*luatex>
@@ -309,7 +312,7 @@
       \ifnum#2>\z@\else
         \noexpand\bbl@elt{#1}{#2}{#3}{#4}%
       \fi}%
-    \xdef\bbl@languages{\bbl@languages}% 
+    \xdef\bbl@languages{\bbl@languages}%
   \fi
   \def\bbl@elt#1#2#3#4{\@namedef{zth@#1}{}} % Define flags
   \bbl@languages
@@ -331,30 +334,35 @@
   \fi
 \endgroup
 \def\bbl@get@enc#1:#2:#3\@@@{\def\bbl@hyph@enc{#2}}
+\ifx\babelcatcodetablenum\@undefined
+  \def\babelcatcodetablenum{5211}
+\fi
 \def\bbl@luapatterns#1#2{%
   \bbl@get@enc#1::\@@@
-  \begingroup
-    \ifx\catcodetable\@undefined
-      \let\savecatcodetable\luatexsavecatcodetable
-      \let\initcatcodetable\luatexinitcatcodetable
-      \let\catcodetable\luatexcatcodetable
+  \setbox\z@\hbox\bgroup
+    \begingroup
+      \ifx\catcodetable\@undefined
+        \let\savecatcodetable\luatexsavecatcodetable
+        \let\initcatcodetable\luatexinitcatcodetable
+        \let\catcodetable\luatexcatcodetable
+      \fi
+      \savecatcodetable\babelcatcodetablenum\relax
+      \initcatcodetable\numexpr\babelcatcodetablenum+1\relax
+      \catcodetable\numexpr\babelcatcodetablenum+1\relax
+      \catcode`\#=6  \catcode`\$=3 \catcode`\&=4 \catcode`\^=7
+      \catcode`\_=8  \catcode`\{=1 \catcode`\}=2 \catcode`\~=13
+      \catcode`\@=11 \catcode`\^^I=10 \catcode`\^^J=12
+      \catcode`\<=12 \catcode`\>=12 \catcode`\*=12 \catcode`\.=12
+      \catcode`\-=12 \catcode`\/=12 \catcode`\[=12 \catcode`\]=12
+      \catcode`\`=12 \catcode`\'=12 \catcode`\"=12
+      \input #1\relax
+      \catcodetable\babelcatcodetablenum\relax
+    \endgroup
+    \def\bbl@tempa{#2}%
+    \ifx\bbl@tempa\@empty\else
+      \input #2\relax
     \fi
-    \savecatcodetable5211
-    \initcatcodetable5212
-    \catcodetable5212
-    \catcode`\#=6  \catcode`\$=3 \catcode`\&=4 \catcode`\^=7
-    \catcode`\_=8  \catcode`\{=1 \catcode`\}=2 \catcode`\~=13
-    \catcode`\@=11 \catcode`\^^I=10 \catcode`\^^J=12
-    \catcode`\<=12 \catcode`\>=12 \catcode`\*=12 \catcode`\.=12
-    \catcode`\-=12 \catcode`\/=12 \catcode`\[=12 \catcode`\]=12
-    \catcode`\`=12 \catcode`\'=12 \catcode`\"=12
-    \input #1\relax
-    \catcodetable5211
-  \endgroup
-  \def\bbl@tempa{#2}%
-  \ifx\bbl@tempa\@empty\else
-    \input #2\relax
-  \fi}%
+  \egroup}%
 \def\bbl@patterns@lua#1{%
   \language=\expandafter\ifx\csname l@#1:\f@encoding\endcsname\relax
     \csname l@#1\endcsname
@@ -371,7 +379,7 @@
          \ifx\bbl@tempb\@empty\else % if not a synonymous
            \def\bbl@tempc{{##3}{##4}}%
          \fi
-         \bbl@csarg\edef{hyphendata@##2}{\bbl@tempc}%
+         \bbl@csarg\xdef{hyphendata@##2}{\bbl@tempc}%
        \fi}%
      \bbl@languages
      \@ifundefined{bbl@hyphendata@\the\language}%
@@ -454,7 +462,7 @@
          \ifx\bbl@tempb\@empty\else % if not a synonymous
            \def\bbl@tempc{{##3}{##4}}%
          \fi
-         \bbl@csarg\edef{hyphendata@##2}{\bbl@tempc}%
+         \bbl@csarg\xdef{hyphendata@##2}{\bbl@tempc}%
        \fi}%
      \bbl@languages
      \@ifundefined{bbl@hyphendata@\the\language}%