babel (19may17)

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

59 files changed, 381 insertions, 166 deletions

diff --git a/Master/texmf-dist/tex/generic/babel/UKenglish.sty b/Master/texmf-dist/tex/generic/babel/UKenglish.sty
index 7d6c01a8452..0cdf3958c32 100644
--- a/Master/texmf-dist/tex/generic/babel/UKenglish.sty
+++ b/Master/texmf-dist/tex/generic/babel/UKenglish.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `UKenglish')
+%% bbcompat.dtx  (with options: `styfile,UKenglish')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/USenglish.sty b/Master/texmf-dist/tex/generic/babel/USenglish.sty
index 18b6877a918..ab864c2016d 100644
--- a/Master/texmf-dist/tex/generic/babel/USenglish.sty
+++ b/Master/texmf-dist/tex/generic/babel/USenglish.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `USenglish')
+%% bbcompat.dtx  (with options: `styfile,USenglish')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/afrikaans.sty b/Master/texmf-dist/tex/generic/babel/afrikaans.sty
index 2b922fb66d7..8e516364bec 100644
--- a/Master/texmf-dist/tex/generic/babel/afrikaans.sty
+++ b/Master/texmf-dist/tex/generic/babel/afrikaans.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `afrikaans')
+%% bbcompat.dtx  (with options: `styfile,afrikaans')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/albanian.sty b/Master/texmf-dist/tex/generic/babel/albanian.sty
index c21f77378a9..1bc0d30e100 100644
--- a/Master/texmf-dist/tex/generic/babel/albanian.sty
+++ b/Master/texmf-dist/tex/generic/babel/albanian.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `albanian')
+%% bbcompat.dtx  (with options: `styfile,albanian')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/american.sty b/Master/texmf-dist/tex/generic/babel/american.sty
index 32b26472b1b..677b98851f1 100644
--- a/Master/texmf-dist/tex/generic/babel/american.sty
+++ b/Master/texmf-dist/tex/generic/babel/american.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `american')
+%% bbcompat.dtx  (with options: `styfile,american')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/austrian.sty b/Master/texmf-dist/tex/generic/babel/austrian.sty
index 18ae3670324..c90892b3680 100644
--- a/Master/texmf-dist/tex/generic/babel/austrian.sty
+++ b/Master/texmf-dist/tex/generic/babel/austrian.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `austrian')
+%% bbcompat.dtx  (with options: `styfile,austrian')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def
index 4d3a6bbcae9..815dedaecb6 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}[2017/04/28 v3.9t The Babel package]
+%%\ProvidesFile{babel.dtx}[2017/05/19 v3.10 The Babel package]
 %% Babel package for LaTeX2e.
 %% Copyright (C) 1989-2008 by Johannes Braams,
 %%                            TeXniek
@@ -56,7 +56,7 @@
     \wlog{File: #1 #4 #3 <#2>}%
     \let\ProvidesFile\@undefined}
 \fi
-\ProvidesFile{babel.def}[2017/04/28 3.9t Babel common definitions]
+\ProvidesFile{babel.def}[2017/05/19 3.10 Babel common definitions]
 \ifx\AtBeginDocument\@undefined
   \input plain.def\relax
 \fi
@@ -67,7 +67,7 @@
   \let\bbl@afterlang\relax
   \let\bbl@language@opts\@empty
 \fi
-\def\bbl@tempa{3.9t}%
+\def\bbl@tempa{3.10}%
 \ifx\bbl@version\bbl@tempa\else
   \input switch.def\relax
 \fi
@@ -152,6 +152,38 @@
 \def\bbl@ifblank#1{%
   \bbl@ifblank@i#1\@nil\@nil\@secondoftwo\@firstoftwo\@nil}
 \long\def\bbl@ifblank@i#1#2\@nil#3#4#5\@nil{#4}
+\def\bbl@forkv#1#2{%
+  \def\bbl@kvcmd##1##2##3{#2}%
+  \bbl@kvnext#1,\@nil,}
+\def\bbl@kvnext#1,{%
+  \ifx\@nil#1\relax\else
+    \bbl@ifblank{#1}{}{\bbl@forkv@eq#1=\@empty=\@nil{#1}}%
+    \expandafter\bbl@kvnext
+  \fi}
+\def\bbl@forkv@eq#1=#2=#3\@nil#4{%
+  \bbl@trim@def\bbl@forkv@a{#1}%
+  \bbl@trim{\expandafter\bbl@kvcmd\expandafter{\bbl@forkv@a}}{#2}{#4}}
+\def\bbl@vforeach#1#2{%
+  \def\bbl@forcmd##1{#2}%
+  \bbl@fornext#1,\@nil,}
+\def\bbl@fornext#1,{%
+  \ifx\@nil#1\relax\else
+    \bbl@ifblank{#1}{}{\bbl@trim\bbl@forcmd{#1}}%
+    \expandafter\bbl@fornext
+  \fi}
+\def\bbl@foreach#1{\expandafter\bbl@vforeach\expandafter{#1}}
+\def\bbl@replace#1#2#3{% in #1 -> repl #2 by #3
+  \toks@{}%
+  \def\bbl@replace@aux##1#2##2#2{%
+    \ifx\bbl@nil##2%
+      \toks@\expandafter{\the\toks@##1}%
+    \else
+      \toks@\expandafter{\the\toks@##1#3}%
+      \bbl@afterfi
+      \bbl@replace@aux##2#2%
+    \fi}%
+  \expandafter\bbl@replace@aux#1#2\bbl@nil#2%
+  \edef#1{\the\toks@}}
 \def\bbl@exp#1{%
   \begingroup
     \let\\\noexpand
@@ -234,7 +266,7 @@
   adddialect=2,patterns=2,defaultcommands=0,encodedcommands=2,write=0,%
   beforeextras=0,afterextras=0,stopcommands=0,stringprocess=0,%
   hyphenation=2,initiateactive=3,afterreset=0}
-\newcommand\babelensure[2][]{%
+\newcommand\babelensure[2][]{%  TODO - revise test files
   \AddBabelHook{babel-ensure}{afterextras}{%
     \ifcase\bbl@select@type
       \@nameuse{bbl@e@\languagename}%
@@ -247,7 +279,7 @@
       \ifx\@empty##1\else\noexpand##1\expandafter\bbl@tempb\fi}%
     \edef\bbl@tempa{\bbl@tempb#1\@empty}%
     \def\bbl@tempb##1=##2\@@{\@namedef{bbl@ens@##1}{##2}}%
-    \bbl@for\bbl@tempa\bbl@tempa{\expandafter\bbl@tempb\bbl@tempa\@@}%
+    \bbl@foreach\bbl@tempa{\bbl@tempb##1\@@}%
     \def\bbl@tempc{\bbl@ensure}%
     \expandafter\bbl@add\expandafter\bbl@tempc\expandafter{%
       \expandafter{\bbl@ens@include}}%
@@ -257,8 +289,8 @@
     \bbl@exp{%
   \endgroup
   \def\<bbl@e@#2>{\the\toks@{\bbl@ens@fontenc}}}}
-\def\bbl@ensure#1#2#3{%
-  \def\bbl@tempb##1{% elt for \bbl@ensured list
+\def\bbl@ensure#1#2#3{% 1: include 2: exclude 3: fontenc
+  \def\bbl@tempb##1{% elt for (excluding) \bbl@captionslist list
     \ifx##1\@empty\else
       \in@{##1}{#2}%
       \ifin@\else
@@ -278,7 +310,7 @@
       \fi
       \expandafter\bbl@tempb
     \fi}%
-  \expandafter\bbl@tempb\bbl@ensured\@empty
+  \expandafter\bbl@tempb\bbl@captionslist\today\@empty
   \def\bbl@tempa##1{% elt for include list
     \ifx##1\@empty\else
       \bbl@csarg\in@{ensure@\languagename\expandafter}\expandafter{##1}%
@@ -288,11 +320,21 @@
       \expandafter\bbl@tempa
     \fi}%
   \bbl@tempa#1\@empty}
-\def\bbl@ensured{%
+\def\bbl@captionslist{%
   \prefacename\refname\abstractname\bibname\chaptername\appendixname
   \contentsname\listfigurename\listtablename\indexname\figurename
   \tablename\partname\enclname\ccname\headtoname\pagename\seename
-  \alsoname\proofname\glossaryname\today}
+  \alsoname\proofname\glossaryname}
+\def\bbl@ldfinit{%
+  \let\bbl@screset\@empty
+  \let\BabelStrings\bbl@opt@string
+  \let\BabelOptions\@empty
+  \let\BabelLanguages\relax
+  \ifx\originalTeX\@undefined
+    \let\originalTeX\@empty
+  \else
+    \originalTeX
+  \fi}
 \def\LdfInit#1#2{%
   \chardef\atcatcode=\catcode`\@
   \catcode`\@=11\relax
@@ -308,26 +350,20 @@
       \ldf@quit{#1}%
     \fi
   \fi
-  \let\bbl@screset\@empty
-  \let\BabelStrings\bbl@opt@strings
-  \let\BabelOptions\@empty
-  \let\BabelLanguages\relax
-  \ifx\originalTeX\@undefined
-    \let\originalTeX\@empty
-  \else
-    \originalTeX
-  \fi}
+  \bbl@ldfinit}
 \def\ldf@quit#1{%
   \expandafter\main@language\expandafter{#1}%
   \catcode`\@=\atcatcode \let\atcatcode\relax
   \catcode`\==\eqcatcode \let\eqcatcode\relax
   \endinput}
-\def\ldf@finish#1{%
-  \loadlocalcfg{#1}%
+\def\bbl@afterldf#1{%
   \bbl@afterlang
   \let\bbl@afterlang\relax
   \let\BabelModifiers\relax
-  \let\bbl@screset\relax
+  \let\bbl@screset\relax}%
+\def\ldf@finish#1{%
+  \loadlocalcfg{#1}%
+  \bbl@afterldf{#1}%
   \expandafter\main@language\expandafter{#1}%
   \catcode`\@=\atcatcode \let\atcatcode\relax
   \catcode`\==\eqcatcode \let\eqcatcode\relax}
@@ -346,16 +382,20 @@
   \else
     \select@language{#1}%
   \fi}
-\def\bbl@add@special#1{%
-  \begingroup
-    \def\do{\noexpand\do\noexpand}%
-    \def\@makeother{\noexpand\@makeother\noexpand}%
-  \edef\x{\endgroup
-    \def\noexpand\dospecials{\dospecials\do#1}%
-    \expandafter\ifx\csname @sanitize\endcsname\relax \else
-      \def\noexpand\@sanitize{\@sanitize\@makeother#1}%
-    \fi}%
-  \x}
+\def\bbl@add@special#1{% 1:a macro like \", \?, etc.
+  \bbl@add\dospecials{\do#1}% test @sanitize = \relax, for back. compat.
+  \bbl@ifunset{@sanitize}{}{\bbl@add\@sanitize{\@makeother#1}}%
+  \ifx\nfss@catcodes\@undefined\else % TODO - same for above
+    \begingroup
+      \catcode`#1\active
+      \nfss@catcodes
+      \ifnum\catcode`#1=\active
+        \endgroup
+        \bbl@add\nfss@catcodes{\@makeother#1}%
+      \else
+        \endgroup
+      \fi
+  \fi}
 \def\bbl@remove@special#1{%
   \begingroup
     \def\x##1##2{\ifnum`#1=`##2\noexpand\@empty
@@ -457,11 +497,11 @@
 \@ifpackagewith{babel}{KeepShorthandsActive}%
   {\let\bbl@restoreactive\@gobble}%
   {\def\bbl@restoreactive#1{%
-     \edef\bbl@tempa{%
-       \noexpand\AfterBabelLanguage\noexpand\CurrentOption
+     \bbl@exp{%
+       \\\AfterBabelLanguage\\\CurrentOption
          {\catcode`#1=\the\catcode`#1\relax}%
-       \noexpand\AtEndOfPackage{\catcode`#1=\the\catcode`#1\relax}}%
-     \bbl@tempa}%
+       \\\AtEndOfPackage
+         {\catcode`#1=\the\catcode`#1\relax}}}%
    \AtEndOfPackage{\let\bbl@restoreactive\@gobble}}
 \def\bbl@sh@select#1#2{%
   \expandafter\ifx\csname#1@sh@#2@sel\endcsname\relax
@@ -663,25 +703,23 @@
   \def\bbl@tempc{#1}%
   \bbl@fixname\bbl@tempc
   \bbl@iflanguage\bbl@tempc{%
-    \bbl@loopx\bbl@attr{#2}{%
+    \bbl@vforeach{#2}{%
       \ifx\bbl@known@attribs\@undefined
         \in@false
       \else
-        \@expandtwoargs\in@{,\bbl@tempc-\bbl@attr,}{,\bbl@known@attribs,}%
+        \@expandtwoargs\in@{,\bbl@tempc-##1,}{,\bbl@known@attribs,}%
       \fi
       \ifin@
         \bbl@warning{%
-          You have more than once selected the attribute '\bbl@attr'\\%
+          You have more than once selected the attribute '##1'\\%
           for language #1}%
       \else
-        \edef\bbl@tempa{%
-          \noexpand\bbl@add@list
-          \noexpand\bbl@known@attribs{\bbl@tempc-\bbl@attr}}%
-        \bbl@tempa
-        \edef\bbl@tempa{\bbl@tempc-\bbl@attr}%
+        \bbl@exp{%
+          \\\bbl@add@list\\\bbl@known@attribs{\bbl@tempc-##1}}%
+        \edef\bbl@tempa{\bbl@tempc-##1}%
         \expandafter\bbl@ifknown@ttrib\expandafter{\bbl@tempa}\bbl@attributes%
-        {\csname\bbl@tempc @attr@\bbl@attr\endcsname}%
-        {\@attrerr{\bbl@tempc}{\bbl@attr}}%
+        {\csname\bbl@tempc @attr@##1\endcsname}%
+        {\@attrerr{\bbl@tempc}{##1}}%
      \fi}}}
 \@onlypreamble\languageattribute
 \newcommand*{\@attrerr}[2]{%
@@ -732,18 +770,13 @@
 \babel@beginsave
 \def\babel@save#1{%
   \expandafter\let\csname babel@\number\babel@savecnt\endcsname#1\relax
-  \begingroup
-    \toks@\expandafter{\originalTeX\let#1=}%
-    \edef\x{\endgroup
-      \def\noexpand\originalTeX{\the\toks@ \expandafter\noexpand
-         \csname babel@\number\babel@savecnt\endcsname\relax}}%
-  \x
+  \toks@\expandafter{\originalTeX\let#1=}%
+  \bbl@exp{%
+    \def\\\originalTeX{\the\toks@\<babel@\number\babel@savecnt>\relax}}%
   \advance\babel@savecnt\@ne}
-\def\babel@savevariable#1{\begingroup
-    \toks@\expandafter{\originalTeX #1=}%
-    \edef\x{\endgroup
-      \def\noexpand\originalTeX{\the\toks@ \the#1\relax}}%
-  \x}
+\def\babel@savevariable#1{%
+  \toks@\expandafter{\originalTeX #1=}%
+  \bbl@exp{\def\\\originalTeX{\the\toks@\the#1\relax}}}
 \def\bbl@frenchspacing{%
   \ifnum\the\sfcode`\.=\@m
     \let\bbl@nonfrenchspacing\relax
@@ -781,8 +814,8 @@
     \ifx\@empty#1%
       \protected@edef\bbl@hyphenation@{\bbl@hyphenation@\space#2}%
     \else
-      \edef\bbl@tempb{\zap@space#1 \@empty}%
-      \bbl@for\bbl@tempa\bbl@tempb{%
+      \bbl@vforeach{#1}{%
+        \def\bbl@tempa{##1}%
         \bbl@fixname\bbl@tempa
         \bbl@iflanguage\bbl@tempa{%
           \bbl@csarg\protected@edef{hyphenation@\bbl@tempa}{%
@@ -863,10 +896,9 @@
     \bbl@loop\bbl@tempa{##2}{% empty items and spaces are ok
       \advance\count@\@ne
       \toks@\expandafter{\bbl@tempa}%
-      \edef\bbl@tempb{%
-        \bbl@templ{\romannumeral\count@}{\the\toks@}%
-        \count@=\the\count@\relax}%
-      \expandafter\SetString\bbl@tempb}}%
+      \bbl@exp{%
+        \\\SetString\bbl@templ{\romannumeral\count@}{\the\toks@}%
+        \count@=\the\count@\relax}}}%
   \newcommand\SetCase[3][]{%
     \bbl@patchuclc
     \bbl@forlang\bbl@tempa{%
@@ -923,7 +955,7 @@
     \let\bbl@sc@fontenc\space % <-   "      "
     \def\bbl@tempa##1=##2\@nil{%
       \bbl@csarg\edef{sc@\zap@space##1 \@empty}{##2 }}%
-    \bbl@for\bbl@tempb{label=#1}{\expandafter\bbl@tempa\bbl@tempb\@nil}%
+    \bbl@vforeach{label=#1}{\bbl@tempa##1\@nil}%
     \def\bbl@tempa##1 ##2{% space -> comma
       ##1%
       \ifx\@empty##2\else\ifx,##1,\else,\fi\bbl@afterfi\bbl@tempa##2\fi}%
@@ -931,13 +963,13 @@
     \edef\bbl@sc@label{\expandafter\zap@space\bbl@sc@label\@empty}%
     \edef\bbl@sc@charset{\expandafter\zap@space\bbl@sc@charset\@empty}%
     \def\bbl@encstring##1##2{%
-      \bbl@for\bbl@tempc\bbl@sc@fontenc{%
-        \bbl@ifunset{T@\bbl@tempc}%
+      \bbl@foreach\bbl@sc@fontenc{%
+        \bbl@ifunset{T@####1}%
           {}%
-          {\ProvideTextCommand##1\bbl@tempc{##2}%
+          {\ProvideTextCommand##1{####1}{##2}%
            \bbl@toglobal##1%
            \expandafter
-           \bbl@toglobal\csname\bbl@tempc\string##1\endcsname}}}%
+           \bbl@toglobal\csname####1\string##1\endcsname}}}%
     \def\bbl@sctest{%
       \@expandtwoargs
       \in@{,\bbl@opt@strings,}{,\bbl@sc@label,\bbl@sc@fontenc,}}%
@@ -996,7 +1028,7 @@
   \bbl@forlang\bbl@tempa{%
     \edef\bbl@LC{\bbl@tempa\bbl@stripslash#1}%
     \bbl@ifunset{\bbl@LC}% eg, \germanchaptername
-      {\global\expandafter
+      {\global\expandafter  % TODO - con \bbl@exp ?
        \bbl@add\csname\bbl@G\bbl@tempa\expandafter\endcsname\expandafter
          {\expandafter\bbl@scset\expandafter#1\csname\bbl@LC\endcsname}}%
       {}%
@@ -1051,9 +1083,9 @@
     \fi}%
   \bbl@tempa}
 \AtEndOfPackage{%
-  \ifx\bbl@hymapopt\@undefined
+  \ifx\bbl@opt@hyphenmap\@undefined
     \@expandtwoargs\in@{,}{\bbl@language@opts}%
-    \chardef\bbl@hymapopt\ifin@4\else\@ne\fi
+    \chardef\bbl@opt@hyphenmap\ifin@4\else\@ne\fi
   \fi}
 \def\set@low@box#1{\setbox\tw@\hbox{,}\setbox\z@\hbox{#1}%
     \dimen\z@\ht\z@ \advance\dimen\z@ -\ht\tw@%
@@ -1240,6 +1272,153 @@
     \aftergroup\endinput
   \fi
 \fi}
+\newcommand\babelprovide[2][]{%
+  \let\bbl@savelangname\languagename
+  \def\languagename{#2}%
+  \let\bbl@KVP@captions\@nil
+  \let\bbl@KVP@main\@nil
+  \let\bbl@KVP@hyphenrules\@nil
+  \bbl@forkv{#1}{\bbl@csarg\def{KVP@##1}{##2}}%  TODO - error handling
+  \bbl@ifunset{date#2}%
+    {\bbl@provide@new{#2}}%
+    {\bbl@ifblank{#1}%
+      {\bbl@error
+        {If you want to modify `#2' you must tell how in\\%
+         the optional argument. Currently there are two\\%
+         options: captions=lang-tag, hyphenrules=lang-list}%
+        {Use this macro as documented}
+}%
+      {\bbl@provide@renew{#2}}}%
+  \babelensure{#2}%
+  \let\languagename\bbl@savelangname}
+\def\bbl@provide@new#1{%
+  \bbl@provide@hyphens{#1}%
+  \@namedef{date#1}{}% marks lang exists - required by \StartBabelCommands
+  \@namedef{extras#1}{}%
+  \@namedef{noextras#1}{}%
+  \StartBabelCommands*{#1}{captions}%
+    \ifx\bbl@KVP@captions\@nil
+      \def\bbl@tempb##1{%               elt for \bbl@captionslist
+        \ifx##1\@empty\else
+          \bbl@exp{%
+            \\\SetString\\##1{%
+              \\\bbl@nocaption{\bbl@stripslash##1}{\<#1\bbl@stripslash##1>}}}%
+          \expandafter\bbl@tempb
+        \fi}%
+      \expandafter\bbl@tempb\bbl@captionslist\@empty
+    \else
+      \bbl@read@ini{\bbl@KVP@captions}%  Here all letters cat = 11
+      \bbl@after@ini
+      \bbl@savestrings
+    \fi
+  \StartBabelCommands*{#1}{date}%
+    \bbl@exp{%
+      \\\SetString\\\today{\\\bbl@nocaption{today}{\<#1today>}}}%
+  \EndBabelCommands
+  \expandafter\gdef\csname#1hyphenmins\endcsname{23}%
+  \ifx\bbl@KVP@main\@nil\else
+     \expandafter\main@language\expandafter{#1}%
+  \fi}
+\def\bbl@provide@renew#1{%
+  \bbl@provide@hyphens{#1}%
+  \ifx\bbl@KVP@captions\@nil\else
+    \StartBabelCommands*{#1}{captions}%
+      \bbl@read@ini{\bbl@KVP@captions}%   Here all letters cat = 11
+      \bbl@after@ini
+      \bbl@savestrings
+    \EndBabelCommands
+  \fi}
+\def\bbl@provide@hyphens#1{%
+  \let\bbl@tempa\relax
+  \ifx\bbl@KVP@hyphenrules\@nil\else
+    \bbl@replace\bbl@KVP@hyphenrules{ }{,}%
+    \bbl@foreach\bbl@KVP@hyphenrules{%
+      \ifx\bbl@tempa\relax    %  if not yet found
+        \bbl@ifsamestring{##1}{+}%
+          {{\bbl@exp{\\\addlanguage\<l@##1>}}}%
+          {}%
+        \bbl@ifunset{l@##1}%
+           {}%
+           {\bbl@exp{\let\bbl@tempa\<l@##1>}}%
+      \fi}%
+  \fi
+  \ifx\bbl@tempa\relax %        if no option or no language found
+    \bbl@ifunset{l@#1}%         no hyphenrules found - fallback
+      {\bbl@exp{\\\adddialect\<l@#1>\language}}%
+      {}%
+  \else
+    \bbl@exp{\\\adddialect\<l@#1>\bbl@tempa}%  found in opt list
+  \fi}
+\def\bbl@read@ini#1{%
+  \openin1=babel-#1.ini
+  \ifeof1
+    \bbl@error
+      {There is no ini file for the requested language\\%
+       (#1). Perhaps you misspelled it or your installation\\%
+       is not complete.}%
+      {Fix the name or reinstall babel.}%
+  \else
+    \let\bbl@section\@empty
+    \let\bbl@savestrings\@empty
+    \loop
+      \endlinechar\m@ne
+      \read1 to \bbl@line
+      \endlinechar`\^^M
+    \if T\ifeof1F\fi T\relax % Trick, because inside \loop
+      \ifx\bbl@line\@empty\else
+        \expandafter\bbl@iniline\bbl@line\bbl@iniline
+      \fi
+    \repeat
+  \fi}
+\def\bbl@iniline#1\bbl@iniline{%
+  \@ifnextchar[\bbl@inisec{\@ifnextchar;\bbl@iniskip\bbl@inikv}#1\@@} %]
+\def\bbl@iniskip#1\@@{}%      if starts with ;
+\def\bbl@inisec[#1]#2\@@{%    if starts with opening bracket
+  \def\bbl@section{#1}%
+  \bbl@debug{\message{[[ #1 ]]^^J}}}
+\def\bbl@inikv#1=#2\@@{%      otherwise, key=value
+  \bbl@trim@def\bbl@tempa{#1}%
+  \bbl@trim\toks@{#2}%
+  \bbl@ifunset{bbl@ini@\bbl@section}%
+    {}%
+    {\bbl@exp{%
+       \<bbl@ini@\bbl@section>\bbl@tempa=\the\toks@\\\@nil}}}
+\def\bbl@after@ini{%
+  % make sure Script and Language takes some value
+  \bbl@exp{\\\bbl@ifblank{\@nameuse{bbl@lotf@\languagename}}}%
+    {\bbl@csarg\gdef{lotf@\languagename}{dflt}}{}%
+  \bbl@exp{\\\bbl@ifblank{\@nameuse{bbl@sotf@\languagename}}}%
+    {\bbl@csarg\gdef{sotf@\languagename}{DFLT}}{}}
+\def\bbl@exportkey#1#2#3#4{% 1:bbl id,2:ini name,3:ini key,4:ini val
+  \bbl@ifsamestring{#2}{#3}%
+    {\bbl@csarg\gdef{#1@\languagename}{#4}}%
+    {}}
+\ifcase\bbl@engine
+  \bbl@csarg\def{ini@captions.licr}#1=#2\@nil{% TODO - copypaste pattern
+    \bbl@ifblank{#2}%
+      {\bbl@exp{%
+         \toks@{\\\bbl@nocaption{#1}\<\languagename#1name>}}}%
+      {\toks@{#2}}%
+    \bbl@exp{%
+      \\\bbl@add\\\bbl@savestrings{% NOTE - with date will be global
+        \\\SetString\<#1name>{\the\toks@}}}}
+\else
+  \def\bbl@ini@captions#1=#2\@nil{%
+    \bbl@ifblank{#2}%
+      {\bbl@exp{%
+         \toks@{\\\bbl@nocaption{#1}\<\languagename#1name>}}}%
+      {\toks@{#2}}%
+    \bbl@exp{%
+      \\\bbl@add\\\bbl@savestrings{%
+        \\\SetString\<#1name>{\the\toks@}}}}
+\fi
+\def\bbl@ini@identification#1=#2\@nil{% TODO - not only with captions
+  \bbl@exportkey{lname}{name.english}{#1}{#2}%
+  \bbl@exportkey{lbcp}{tag.bcp47}{#1}{#2}%
+  \bbl@exportkey{lotf}{tag.opentype}{#1}{#2}%
+  \bbl@exportkey{sname}{script.name}{#1}{#2}%
+  \bbl@exportkey{sbcp}{script.tag.bcp47}{#1}{#2}%
+  \bbl@exportkey{sotf}{script.tag.opentype}{#1}{#2}}
 \ifx\bbl@opt@safe\@empty\else
   \def\@newl@bel#1#2#3{%
    {\@safe@activestrue
@@ -1417,11 +1596,10 @@
 \let\ensureascii\@firstofone
 \AtBeginDocument{%
   \in@false
-  \bbl@loopx\bbl@tempa\BabelNonASCII{% is there a non-ascii enc?
+  \bbl@foreach\BabelNonASCII{% is there a non-ascii enc?
     \ifin@\else
-      \edef\bbl@tempb{{,\bbl@tempa enc.def,}{,\@filelist,}}%
-      \lowercase\expandafter{\expandafter\in@\bbl@tempb}%
-    \fi}
+      \lowercase{\@expandtwoargs\in@{,#1enc.def,}{,\@filelist,}}%
+    \fi}%
   \ifin@ % if a non-ascii has been loaded
     \def\ensureascii#1{{\fontencoding{OT1}\selectfont#1}}%
     \DeclareTextCommandDefault{\TeX}{\org@TeX}%
@@ -1439,7 +1617,7 @@
              \def\ensureascii##1{{\fontencoding{#1}\selectfont##1}}%
            \fi}%
       \fi}%
-    \bbl@loopx\bbl@tempa\@filelist{\expandafter\bbl@tempb\bbl@tempa\@@}%
+    \bbl@foreach\@filelist{\bbl@tempb#1\@@}%  TODO - \@@ de mas??
     \@expandtwoargs\in@{,\cf@encoding,}{,\BabelNonASCII,}%
     \ifin@\else
       \edef\ensureascii#1{{%
diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty
index 2021e85f21a..f183ce68e6b 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}[2017/04/28 v3.9t The Babel package]
+%%\ProvidesFile{babel.dtx}[2017/05/19 v3.10 The Babel package]
 %% Babel package for LaTeX2e.
 %% Copyright (C) 1989-2008 by Johannes Braams,
 %%                            TeXniek
@@ -48,10 +48,12 @@
 %%                         by Javier Bezos
 %%                            all rights reserved.
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
-\ProvidesPackage{babel}[2017/04/28 3.9t The Babel package]
+\ProvidesPackage{babel}[2017/05/19 3.10 The Babel package]
 \@ifpackagewith{babel}{debug}
- {\input switch.def\relax}
- {\def\bbl@tempa{3.9t}%
+ {\let\bbl@debug\@firstofone
+  \input switch.def\relax}
+ {\let\bbl@debug\@gobble
+  \def\bbl@tempa{3.10}%
 \ifx\bbl@version\bbl@tempa\else
   \input switch.def\relax
 \fi}
@@ -115,6 +117,38 @@
 \def\bbl@ifblank#1{%
   \bbl@ifblank@i#1\@nil\@nil\@secondoftwo\@firstoftwo\@nil}
 \long\def\bbl@ifblank@i#1#2\@nil#3#4#5\@nil{#4}
+\def\bbl@forkv#1#2{%
+  \def\bbl@kvcmd##1##2##3{#2}%
+  \bbl@kvnext#1,\@nil,}
+\def\bbl@kvnext#1,{%
+  \ifx\@nil#1\relax\else
+    \bbl@ifblank{#1}{}{\bbl@forkv@eq#1=\@empty=\@nil{#1}}%
+    \expandafter\bbl@kvnext
+  \fi}
+\def\bbl@forkv@eq#1=#2=#3\@nil#4{%
+  \bbl@trim@def\bbl@forkv@a{#1}%
+  \bbl@trim{\expandafter\bbl@kvcmd\expandafter{\bbl@forkv@a}}{#2}{#4}}
+\def\bbl@vforeach#1#2{%
+  \def\bbl@forcmd##1{#2}%
+  \bbl@fornext#1,\@nil,}
+\def\bbl@fornext#1,{%
+  \ifx\@nil#1\relax\else
+    \bbl@ifblank{#1}{}{\bbl@trim\bbl@forcmd{#1}}%
+    \expandafter\bbl@fornext
+  \fi}
+\def\bbl@foreach#1{\expandafter\bbl@vforeach\expandafter{#1}}
+\def\bbl@replace#1#2#3{% in #1 -> repl #2 by #3
+  \toks@{}%
+  \def\bbl@replace@aux##1#2##2#2{%
+    \ifx\bbl@nil##2%
+      \toks@\expandafter{\the\toks@##1}%
+    \else
+      \toks@\expandafter{\the\toks@##1#3}%
+      \bbl@afterfi
+      \bbl@replace@aux##2#2%
+    \fi}%
+  \expandafter\bbl@replace@aux#1#2\bbl@nil#2%
+  \edef#1{\the\toks@}}
 \def\bbl@exp#1{%
   \begingroup
     \let\\\noexpand
@@ -192,8 +226,7 @@
     \fi
   \fi}
 \let\bbl@tempc\@empty
-\bbl@for\bbl@tempa\bbl@tempa{%
-  \expandafter\bbl@tempd\bbl@tempa.\@empty\@nnil}
+\bbl@foreach\bbl@tempa{\bbl@tempd#1.\@empty\@nnil}
 \expandafter\let\csname opt@babel.sty\endcsname\bbl@tempc
 \DeclareOption{KeepShorthandsActive}{}
 \DeclareOption{activeacute}{}
@@ -210,11 +243,11 @@
 \DeclareOption{strings}{\def\bbl@opt@strings{\BabelStringsDefault}}
 \DeclareOption{strings=encoded}{\let\bbl@opt@strings\relax}
 \def\BabelStringsDefault{generic}
-\DeclareOption{hyphenmap=off}{\chardef\bbl@hymapopt\z@}
-\DeclareOption{hyphenmap=first}{\chardef\bbl@hymapopt\@ne}
-\DeclareOption{hyphenmap=select}{\chardef\bbl@hymapopt\tw@}
-\DeclareOption{hyphenmap=other}{\chardef\bbl@hymapopt\thr@@}
-\DeclareOption{hyphenmap=other*}{\chardef\bbl@hymapopt4\relax}
+\DeclareOption{hyphenmap=off}{\chardef\bbl@opt@hyphenmap\z@}
+\DeclareOption{hyphenmap=first}{\chardef\bbl@opt@hyphenmap\@ne}
+\DeclareOption{hyphenmap=select}{\chardef\bbl@opt@hyphenmap\tw@}
+\DeclareOption{hyphenmap=other}{\chardef\bbl@opt@hyphenmap\thr@@}
+\DeclareOption{hyphenmap=other*}{\chardef\bbl@opt@hyphenmap4\relax}
 \DeclareOption{safe=none}{\let\bbl@opt@safe\@empty}
 \DeclareOption{safe=bib}{\def\bbl@opt@safe{B}}
 \DeclareOption{safe=ref}{\def\bbl@opt@safe{R}}
@@ -343,16 +376,12 @@
          {\noexpand\bbl@load@language{\bbl@tempa}}}%
      \bbl@tempb}%
      \@empty}
-\bbl@for\bbl@tempa\@classoptionslist{%
-  \bbl@ifunset{ds@\bbl@tempa}%
-    {\IfFileExists{\bbl@tempa.ldf}%
-      {\edef\bbl@tempb{%
-         \noexpand\DeclareOption
-           {\bbl@tempa}%
-           {\noexpand\bbl@load@language{\bbl@tempa}}}%
-       \bbl@tempb}%
-      \@empty}%
-    \@empty}
+\bbl@foreach\@classoptionslist{%
+  \bbl@ifunset{ds@#1}%
+    {\IfFileExists{#1.ldf}%
+      {\DeclareOption{#1}{\bbl@load@language{#1}}}%
+      {}}%
+    {}}
 \ifx\bbl@opt@main\@nnil\else
   \expandafter
   \let\expandafter\bbl@loadmain\csname ds@\bbl@opt@main\endcsname
diff --git a/Master/texmf-dist/tex/generic/babel/bahasa.sty b/Master/texmf-dist/tex/generic/babel/bahasa.sty
index 55c75e82da0..9aa1c88a7ce 100644
--- a/Master/texmf-dist/tex/generic/babel/bahasa.sty
+++ b/Master/texmf-dist/tex/generic/babel/bahasa.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `bahasa')
+%% bbcompat.dtx  (with options: `styfile,bahasa')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/bahasam.sty b/Master/texmf-dist/tex/generic/babel/bahasam.sty
index 98c9a0e7535..cdd3ee32a6f 100644
--- a/Master/texmf-dist/tex/generic/babel/bahasam.sty
+++ b/Master/texmf-dist/tex/generic/babel/bahasam.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `bahasam')
+%% bbcompat.dtx  (with options: `styfile,bahasam')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/basque.sty b/Master/texmf-dist/tex/generic/babel/basque.sty
index 51f74b1532b..011ae537a66 100644
--- a/Master/texmf-dist/tex/generic/babel/basque.sty
+++ b/Master/texmf-dist/tex/generic/babel/basque.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `basque')
+%% bbcompat.dtx  (with options: `styfile,basque')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/blplain.tex b/Master/texmf-dist/tex/generic/babel/blplain.tex
index 5229065aca4..d81d99177d5 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}[2017/04/28 v3.9t The Babel package]
+%%\ProvidesFile{babel.dtx}[2017/05/19 v3.10 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 cb55c63c05d..4ef65deba93 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}[2017/04/28 v3.9t The Babel package]
+%%\ProvidesFile{babel.dtx}[2017/05/19 v3.10 The Babel package]
 %% Babel package for LaTeX2e.
 %% Copyright (C) 1989-2008 by Johannes Braams,
 %%                            TeXniek
diff --git a/Master/texmf-dist/tex/generic/babel/breton.sty b/Master/texmf-dist/tex/generic/babel/breton.sty
index f7a5e405d27..30254afbeef 100644
--- a/Master/texmf-dist/tex/generic/babel/breton.sty
+++ b/Master/texmf-dist/tex/generic/babel/breton.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `breton')
+%% bbcompat.dtx  (with options: `styfile,breton')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/british.sty b/Master/texmf-dist/tex/generic/babel/british.sty
index 7961f024391..73105587673 100644
--- a/Master/texmf-dist/tex/generic/babel/british.sty
+++ b/Master/texmf-dist/tex/generic/babel/british.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `british')
+%% bbcompat.dtx  (with options: `styfile,british')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/bulgarian.sty b/Master/texmf-dist/tex/generic/babel/bulgarian.sty
index 9d86b73e1e5..d4868661c7a 100644
--- a/Master/texmf-dist/tex/generic/babel/bulgarian.sty
+++ b/Master/texmf-dist/tex/generic/babel/bulgarian.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `bulgarian')
+%% bbcompat.dtx  (with options: `styfile,bulgarian')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/catalan.sty b/Master/texmf-dist/tex/generic/babel/catalan.sty
index cbc7788b945..071a98082e0 100644
--- a/Master/texmf-dist/tex/generic/babel/catalan.sty
+++ b/Master/texmf-dist/tex/generic/babel/catalan.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `catalan')
+%% bbcompat.dtx  (with options: `styfile,catalan')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/croatian.sty b/Master/texmf-dist/tex/generic/babel/croatian.sty
index 9a5ccbc52a4..1b822b5e7a7 100644
--- a/Master/texmf-dist/tex/generic/babel/croatian.sty
+++ b/Master/texmf-dist/tex/generic/babel/croatian.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `croatian')
+%% bbcompat.dtx  (with options: `styfile,croatian')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/czech.sty b/Master/texmf-dist/tex/generic/babel/czech.sty
index 99e2a235ada..60df29108d1 100644
--- a/Master/texmf-dist/tex/generic/babel/czech.sty
+++ b/Master/texmf-dist/tex/generic/babel/czech.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `czech')
+%% bbcompat.dtx  (with options: `styfile,czech')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/danish.sty b/Master/texmf-dist/tex/generic/babel/danish.sty
index 497cfea88d0..c08157aaace 100644
--- a/Master/texmf-dist/tex/generic/babel/danish.sty
+++ b/Master/texmf-dist/tex/generic/babel/danish.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `danish')
+%% bbcompat.dtx  (with options: `styfile,danish')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/dutch.sty b/Master/texmf-dist/tex/generic/babel/dutch.sty
index 2326073a85c..9ed815ceb45 100644
--- a/Master/texmf-dist/tex/generic/babel/dutch.sty
+++ b/Master/texmf-dist/tex/generic/babel/dutch.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `dutch')
+%% bbcompat.dtx  (with options: `styfile,dutch')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/english.sty b/Master/texmf-dist/tex/generic/babel/english.sty
index 142e3883d54..e28be7ef94a 100644
--- a/Master/texmf-dist/tex/generic/babel/english.sty
+++ b/Master/texmf-dist/tex/generic/babel/english.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `english')
+%% bbcompat.dtx  (with options: `styfile,english')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/esperanto.sty b/Master/texmf-dist/tex/generic/babel/esperanto.sty
index 5f4c0bad53f..2d5d3898b93 100644
--- a/Master/texmf-dist/tex/generic/babel/esperanto.sty
+++ b/Master/texmf-dist/tex/generic/babel/esperanto.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `esperanto')
+%% bbcompat.dtx  (with options: `styfile,esperanto')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/estonian.sty b/Master/texmf-dist/tex/generic/babel/estonian.sty
index e4b7cb18116..f4256990dfd 100644
--- a/Master/texmf-dist/tex/generic/babel/estonian.sty
+++ b/Master/texmf-dist/tex/generic/babel/estonian.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `estonian')
+%% bbcompat.dtx  (with options: `styfile,estonian')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/finnish.sty b/Master/texmf-dist/tex/generic/babel/finnish.sty
index 974a4e2b0b7..eeb8941c776 100644
--- a/Master/texmf-dist/tex/generic/babel/finnish.sty
+++ b/Master/texmf-dist/tex/generic/babel/finnish.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `finnish')
+%% bbcompat.dtx  (with options: `styfile,finnish')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/francais.sty b/Master/texmf-dist/tex/generic/babel/francais.sty
index 2e2c568a5c3..a7d479481b0 100644
--- a/Master/texmf-dist/tex/generic/babel/francais.sty
+++ b/Master/texmf-dist/tex/generic/babel/francais.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `francais')
+%% bbcompat.dtx  (with options: `styfile,francais')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/galician.sty b/Master/texmf-dist/tex/generic/babel/galician.sty
index 021135727fc..e1de53c693e 100644
--- a/Master/texmf-dist/tex/generic/babel/galician.sty
+++ b/Master/texmf-dist/tex/generic/babel/galician.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `galician')
+%% bbcompat.dtx  (with options: `styfile,galician')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/germanb.sty b/Master/texmf-dist/tex/generic/babel/germanb.sty
index 21a2a9b8cf9..a42a3c772dc 100644
--- a/Master/texmf-dist/tex/generic/babel/germanb.sty
+++ b/Master/texmf-dist/tex/generic/babel/germanb.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `germanb')
+%% bbcompat.dtx  (with options: `styfile,germanb')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/greek.sty b/Master/texmf-dist/tex/generic/babel/greek.sty
index 54c1cc09264..6ff22d5ed86 100644
--- a/Master/texmf-dist/tex/generic/babel/greek.sty
+++ b/Master/texmf-dist/tex/generic/babel/greek.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `greek')
+%% bbcompat.dtx  (with options: `styfile,greek')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/hebrew.sty b/Master/texmf-dist/tex/generic/babel/hebrew.sty
index e7bda310ed3..ecf06f5c2ba 100644
--- a/Master/texmf-dist/tex/generic/babel/hebrew.sty
+++ b/Master/texmf-dist/tex/generic/babel/hebrew.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `hebrew')
+%% bbcompat.dtx  (with options: `styfile,hebrew')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg
index b851d625c26..2a42ed321a0 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}[2017/04/28 v3.9t The Babel package]
+%%\ProvidesFile{babel.dtx}[2017/05/19 v3.10 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}[2017/04/28 3.9t Babel hyphens]
+\ProvidesFile{hyphen.cfg}[2017/05/19 3.10 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.9t> and hyphenation patterns for }%
+\toks8{Babel <3.10> 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/icelandic.sty b/Master/texmf-dist/tex/generic/babel/icelandic.sty
index b011585ee88..81c7904bee6 100644
--- a/Master/texmf-dist/tex/generic/babel/icelandic.sty
+++ b/Master/texmf-dist/tex/generic/babel/icelandic.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `icelandic')
+%% bbcompat.dtx  (with options: `styfile,icelandic')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/interlingua.sty b/Master/texmf-dist/tex/generic/babel/interlingua.sty
index 12b5f1cf110..9039f01ba74 100644
--- a/Master/texmf-dist/tex/generic/babel/interlingua.sty
+++ b/Master/texmf-dist/tex/generic/babel/interlingua.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `interlingua')
+%% bbcompat.dtx  (with options: `styfile,interlingua')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/irish.sty b/Master/texmf-dist/tex/generic/babel/irish.sty
index f6f1bcc9ea2..a04a3cfee83 100644
--- a/Master/texmf-dist/tex/generic/babel/irish.sty
+++ b/Master/texmf-dist/tex/generic/babel/irish.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `irish')
+%% bbcompat.dtx  (with options: `styfile,irish')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/italian.sty b/Master/texmf-dist/tex/generic/babel/italian.sty
index 0d30b8921a1..7a06e92390c 100644
--- a/Master/texmf-dist/tex/generic/babel/italian.sty
+++ b/Master/texmf-dist/tex/generic/babel/italian.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `italian')
+%% bbcompat.dtx  (with options: `styfile,italian')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/latin.sty b/Master/texmf-dist/tex/generic/babel/latin.sty
index 0b86a8ba44c..843916ad06f 100644
--- a/Master/texmf-dist/tex/generic/babel/latin.sty
+++ b/Master/texmf-dist/tex/generic/babel/latin.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `latin')
+%% bbcompat.dtx  (with options: `styfile,latin')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/lsorbian.sty b/Master/texmf-dist/tex/generic/babel/lsorbian.sty
index d1e131f52cc..b755fff5107 100644
--- a/Master/texmf-dist/tex/generic/babel/lsorbian.sty
+++ b/Master/texmf-dist/tex/generic/babel/lsorbian.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `lsorbian')
+%% bbcompat.dtx  (with options: `styfile,lsorbian')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/magyar.sty b/Master/texmf-dist/tex/generic/babel/magyar.sty
index e0dc24d91cb..40e6a5fd0e5 100644
--- a/Master/texmf-dist/tex/generic/babel/magyar.sty
+++ b/Master/texmf-dist/tex/generic/babel/magyar.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `magyar')
+%% bbcompat.dtx  (with options: `styfile,magyar')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/naustrian.sty b/Master/texmf-dist/tex/generic/babel/naustrian.sty
index 92bae5b9213..ccddfdd7edc 100644
--- a/Master/texmf-dist/tex/generic/babel/naustrian.sty
+++ b/Master/texmf-dist/tex/generic/babel/naustrian.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `naustrian')
+%% bbcompat.dtx  (with options: `styfile,naustrian')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/ngermanb.sty b/Master/texmf-dist/tex/generic/babel/ngermanb.sty
index 668e01b8438..39c09a66509 100644
--- a/Master/texmf-dist/tex/generic/babel/ngermanb.sty
+++ b/Master/texmf-dist/tex/generic/babel/ngermanb.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `ngermanb')
+%% bbcompat.dtx  (with options: `styfile,ngermanb')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf
index d70837a6a66..e0e67ad406e 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}[2017/04/28 v3.9t The Babel package]
+%%\ProvidesFile{babel.dtx}[2017/05/19 v3.10 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}[2017/04/28 3.9t Nil language]
+\ProvidesLanguage{nil}[2017/05/19 3.10 Nil language]
 \LdfInit{nil}{datenil}
 \ifx\l@nohyphenation\@undefined
    \@nopatterns{nil}
diff --git a/Master/texmf-dist/tex/generic/babel/norsk.sty b/Master/texmf-dist/tex/generic/babel/norsk.sty
index 9c49a8e6cd6..3f89d0e2c06 100644
--- a/Master/texmf-dist/tex/generic/babel/norsk.sty
+++ b/Master/texmf-dist/tex/generic/babel/norsk.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `norsk')
+%% bbcompat.dtx  (with options: `styfile,norsk')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/plain.def b/Master/texmf-dist/tex/generic/babel/plain.def
index 6793f38f045..57341d51c9b 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}[2017/04/28 v3.9t The Babel package]
+%%\ProvidesFile{babel.dtx}[2017/05/19 v3.10 The Babel package]
 %% Babel package for LaTeX2e.
 %% Copyright (C) 1989-2008 by Johannes Braams,
 %%                            TeXniek
@@ -119,7 +119,7 @@
 \def\@endofldf{}
 \@onlypreamble\@endofldf
 \let\bbl@afterlang\@empty
-\chardef\bbl@hymapopt\z@
+\chardef\bbl@opt@hyphenmap\z@
 \ifx\if@filesw\@undefined
   \expandafter\let\csname if@filesw\expandafter\endcsname
     \csname iffalse\endcsname
diff --git a/Master/texmf-dist/tex/generic/babel/polish.sty b/Master/texmf-dist/tex/generic/babel/polish.sty
index b33904153f0..fb609193d7a 100644
--- a/Master/texmf-dist/tex/generic/babel/polish.sty
+++ b/Master/texmf-dist/tex/generic/babel/polish.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `polish')
+%% bbcompat.dtx  (with options: `styfile,polish')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/portuges.sty b/Master/texmf-dist/tex/generic/babel/portuges.sty
index 6a0a382ab73..1748409cf86 100644
--- a/Master/texmf-dist/tex/generic/babel/portuges.sty
+++ b/Master/texmf-dist/tex/generic/babel/portuges.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `portuges')
+%% bbcompat.dtx  (with options: `styfile,portuges')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/romanian.sty b/Master/texmf-dist/tex/generic/babel/romanian.sty
index 4bc595f8402..4170c23e4a0 100644
--- a/Master/texmf-dist/tex/generic/babel/romanian.sty
+++ b/Master/texmf-dist/tex/generic/babel/romanian.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `romanian')
+%% bbcompat.dtx  (with options: `styfile,romanian')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/russianb.sty b/Master/texmf-dist/tex/generic/babel/russianb.sty
index 9b14a3764a9..1c37b6ecd18 100644
--- a/Master/texmf-dist/tex/generic/babel/russianb.sty
+++ b/Master/texmf-dist/tex/generic/babel/russianb.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `russianb')
+%% bbcompat.dtx  (with options: `styfile,russianb')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/samin.sty b/Master/texmf-dist/tex/generic/babel/samin.sty
index 92d3c693909..41f64109bea 100644
--- a/Master/texmf-dist/tex/generic/babel/samin.sty
+++ b/Master/texmf-dist/tex/generic/babel/samin.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `samin')
+%% bbcompat.dtx  (with options: `styfile,samin')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/scottish.sty b/Master/texmf-dist/tex/generic/babel/scottish.sty
index 874b926dbca..51f9930d656 100644
--- a/Master/texmf-dist/tex/generic/babel/scottish.sty
+++ b/Master/texmf-dist/tex/generic/babel/scottish.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `scottish')
+%% bbcompat.dtx  (with options: `styfile,scottish')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/serbian.sty b/Master/texmf-dist/tex/generic/babel/serbian.sty
index 6245d8632c3..9e23edaba82 100644
--- a/Master/texmf-dist/tex/generic/babel/serbian.sty
+++ b/Master/texmf-dist/tex/generic/babel/serbian.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `serbian')
+%% bbcompat.dtx  (with options: `styfile,serbian')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/slovak.sty b/Master/texmf-dist/tex/generic/babel/slovak.sty
index 2126d6c84a5..15c1e277c77 100644
--- a/Master/texmf-dist/tex/generic/babel/slovak.sty
+++ b/Master/texmf-dist/tex/generic/babel/slovak.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `slovak')
+%% bbcompat.dtx  (with options: `styfile,slovak')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/slovene.sty b/Master/texmf-dist/tex/generic/babel/slovene.sty
index 5399aab67b4..d515622871a 100644
--- a/Master/texmf-dist/tex/generic/babel/slovene.sty
+++ b/Master/texmf-dist/tex/generic/babel/slovene.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `slovene')
+%% bbcompat.dtx  (with options: `styfile,slovene')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/spanish.sty b/Master/texmf-dist/tex/generic/babel/spanish.sty
index 18de3e71752..c286f0a6697 100644
--- a/Master/texmf-dist/tex/generic/babel/spanish.sty
+++ b/Master/texmf-dist/tex/generic/babel/spanish.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `spanish')
+%% bbcompat.dtx  (with options: `styfile,spanish')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/swedish.sty b/Master/texmf-dist/tex/generic/babel/swedish.sty
index 98458ab5ba9..a1e42203285 100644
--- a/Master/texmf-dist/tex/generic/babel/swedish.sty
+++ b/Master/texmf-dist/tex/generic/babel/swedish.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `swedish')
+%% bbcompat.dtx  (with options: `styfile,swedish')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/switch.def b/Master/texmf-dist/tex/generic/babel/switch.def
index 89156b84423..a06711562f7 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}[2017/04/28 v3.9t The Babel package]
+%%\ProvidesFile{babel.dtx}[2017/05/19 v3.10 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}[2017/04/28 3.9t Babel switching mechanism]
+\ProvidesFile{switch.def}[2017/05/19 3.10 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.9t}
-\def\bbl@date{2017/04/28}
+\def\bbl@version{3.10}
+\def\bbl@date{2017/05/19}
 \def\adddialect#1#2{%
   \global\chardef#1#2\relax
   \bbl@usehooks{adddialect}{{#1}{#2}}%
@@ -135,8 +135,8 @@
   \expandafter\ifx\csname date\languagename\endcsname\relax\else
     \if@filesw
       \protected@write\@auxout{}{\string\select@language{\languagename}}%
-      \bbl@for\bbl@tempa\BabelContentsFiles{%
-        \addtocontents{\bbl@tempa}{\xstring\select@language{\languagename}}}%
+      \bbl@foreach\BabelContentsFiles{%
+        \addtocontents{##1}{\xstring\select@language{\languagename}}}%
       \bbl@usehooks{write}{}%
     \fi
   \fi}
@@ -172,14 +172,14 @@
   \bbl@usehooks{beforeextras}{}%
   \csname extras#1\endcsname\relax
   \bbl@usehooks{afterextras}{}%
-  \ifcase\bbl@hymapopt\or
+  \ifcase\bbl@opt@hyphenmap\or
     \def\BabelLower##1##2{\lccode##1=##2\relax}%
     \ifnum\bbl@hymapsel>4\else
       \csname\languagename @bbl@hyphenmap\endcsname
     \fi
-    \chardef\bbl@hymapopt\z@
+    \chardef\bbl@opt@hyphenmap\z@
   \else
-    \ifnum\bbl@hymapsel>\bbl@hymapopt\else
+    \ifnum\bbl@hymapsel>\bbl@opt@hyphenmap\else
       \csname\languagename @bbl@hyphenmap\endcsname
     \fi
   \fi
@@ -346,6 +346,14 @@
   {\let\bbl@info\@gobble
    \let\bbl@warning\@gobble}
   {}
+\def\bbl@nocaption#1#2{% 1: text to be printed 2: caption macro \langXname
+  \gdef#2{\textbf{?#1?}}%
+  #2%
+  \bbl@warning{%
+    \string#2 not set. Please, define\\%
+    it in the preamble with something like:\\%
+    \string\renewcommand\string#2{..}\\%
+    Reported}}
 \def\@nolanerr#1{%
   \bbl@error
     {You haven't defined the language #1\space yet}%
diff --git a/Master/texmf-dist/tex/generic/babel/turkish.sty b/Master/texmf-dist/tex/generic/babel/turkish.sty
index b5f763bb892..b05d537eaed 100644
--- a/Master/texmf-dist/tex/generic/babel/turkish.sty
+++ b/Master/texmf-dist/tex/generic/babel/turkish.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `turkish')
+%% bbcompat.dtx  (with options: `styfile,turkish')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/ukraineb.sty b/Master/texmf-dist/tex/generic/babel/ukraineb.sty
index bb757d9327e..17344a98205 100644
--- a/Master/texmf-dist/tex/generic/babel/ukraineb.sty
+++ b/Master/texmf-dist/tex/generic/babel/ukraineb.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `ukraineb')
+%% bbcompat.dtx  (with options: `styfile,ukraineb')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/usorbian.sty b/Master/texmf-dist/tex/generic/babel/usorbian.sty
index 2e87cd5c2f7..1aa770efaf6 100644
--- a/Master/texmf-dist/tex/generic/babel/usorbian.sty
+++ b/Master/texmf-dist/tex/generic/babel/usorbian.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `usorbian')
+%% bbcompat.dtx  (with options: `styfile,usorbian')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
diff --git a/Master/texmf-dist/tex/generic/babel/welsh.sty b/Master/texmf-dist/tex/generic/babel/welsh.sty
index 6bba740600f..12f520f46cb 100644
--- a/Master/texmf-dist/tex/generic/babel/welsh.sty
+++ b/Master/texmf-dist/tex/generic/babel/welsh.sty
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bbcompat.dtx  (with options: `welsh')
+%% bbcompat.dtx  (with options: `styfile,welsh')
 %% This is a generated file.
 %% 
 %% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.