babel (4jan18)

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

76 files changed, 480 insertions, 222 deletions

diff --git a/Master/texmf-dist/tex/generic/babel/babel-bidi-basic-r.lua b/Master/texmf-dist/tex/generic/babel/babel-bidi-basic-r.lua
index fab6721456a..2970d9c016c 100644
--- a/Master/texmf-dist/tex/generic/babel/babel-bidi-basic-r.lua
+++ b/Master/texmf-dist/tex/generic/babel/babel-bidi-basic-r.lua
@@ -91,7 +91,6 @@ function Babel.pre_otfload(head)
             attr_dir = at.value
           end
         end
-        texio.write_nl(attr_dir)
         if attr_dir == 1 then
           strong = 'r'
         elseif attr_dir == 2 then
@@ -103,6 +102,7 @@ function Babel.pre_otfload(head)
         outer = strong_lr
         new_dir = false
       end
+
       if dir == 'nsm' then dir = strong end             -- W1
       dir_real = dir               -- We need dir_real to set strong below
       if dir == 'al' then dir = 'r' end -- W3
diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def
index cd6e92b3584..81f324c8fba 100644
--- a/Master/texmf-dist/tex/generic/babel/babel.def
+++ b/Master/texmf-dist/tex/generic/babel/babel.def
@@ -40,7 +40,7 @@
     \wlog{File: #1 #4 #3 <#2>}%
     \let\ProvidesFile\@undefined}
 \fi
-\ProvidesFile{babel.def}[2017/11/03 3.15 Babel common definitions]
+\ProvidesFile{babel.def}[2018/01/04 3.16 Babel common definitions]
 \ifx\AtBeginDocument\@undefined
   \input plain.def\relax
 \fi
@@ -358,7 +358,8 @@
   \let\languagename\bbl@main@language
   \bbl@patterns{\languagename}}
 \AtBeginDocument{%
-  \expandafter\selectlanguage\expandafter{\bbl@main@language}}
+  \expandafter\selectlanguage\expandafter{\bbl@main@language}%
+  \ifcase\bbl@engine\or\pagedir\bodydir\fi}  % TODO - a better place
 \def\select@language@x#1{%
   \ifcase\bbl@select@type
     \bbl@ifsamestring\languagename{#1}{}{\select@language{#1}}%
@@ -1156,50 +1157,36 @@
   \UseTextSymbol{OT1}{\DJ}}
 \DeclareTextCommand{\SS}{OT1}{SS}
 \ProvideTextCommandDefault{\SS}{\UseTextSymbol{OT1}{\SS}}
-\ProvideTextCommand{\glq}{OT1}{%
+\ProvideTextCommandDefault{\glq}{%
   \textormath{\quotesinglbase}{\mbox{\quotesinglbase}}}
-\ProvideTextCommand{\glq}{T1}{%
-  \textormath{\quotesinglbase}{\mbox{\quotesinglbase}}}
-\ProvideTextCommandDefault{\glq}{\UseTextSymbol{OT1}\glq}
 \ProvideTextCommand{\grq}{T1}{%
   \textormath{\textquoteleft}{\mbox{\textquoteleft}}}
+\ProvideTextCommand{\grq}{TU}{%
+  \textormath{\textquoteleft}{\mbox{\textquoteleft}}}
 \ProvideTextCommand{\grq}{OT1}{%
-  \save@sf@q{\kern-.0125em%
-  \textormath{\textquoteleft}{\mbox{\textquoteleft}}%
-  \kern.07em\relax}}
+  \save@sf@q{\kern-.0125em
+    \textormath{\textquoteleft}{\mbox{\textquoteleft}}%
+    \kern.07em\relax}}
 \ProvideTextCommandDefault{\grq}{\UseTextSymbol{OT1}\grq}
-\ProvideTextCommand{\glqq}{OT1}{%
+\ProvideTextCommandDefault{\glqq}{%
   \textormath{\quotedblbase}{\mbox{\quotedblbase}}}
-\ProvideTextCommand{\glqq}{T1}{%
-  \textormath{\quotedblbase}{\mbox{\quotedblbase}}}
-\ProvideTextCommandDefault{\glqq}{\UseTextSymbol{OT1}\glqq}
 \ProvideTextCommand{\grqq}{T1}{%
   \textormath{\textquotedblleft}{\mbox{\textquotedblleft}}}
+\ProvideTextCommand{\grqq}{TU}{%
+  \textormath{\textquotedblleft}{\mbox{\textquotedblleft}}}
 \ProvideTextCommand{\grqq}{OT1}{%
-  \save@sf@q{\kern-.07em%
-  \textormath{\textquotedblleft}{\mbox{\textquotedblleft}}%
-  \kern.07em\relax}}
+  \save@sf@q{\kern-.07em
+    \textormath{\textquotedblleft}{\mbox{\textquotedblleft}}%
+    \kern.07em\relax}}
 \ProvideTextCommandDefault{\grqq}{\UseTextSymbol{OT1}\grqq}
-\ProvideTextCommand{\flq}{OT1}{%
+\ProvideTextCommandDefault{\flq}{%
   \textormath{\guilsinglleft}{\mbox{\guilsinglleft}}}
-\ProvideTextCommand{\flq}{T1}{%
-  \textormath{\guilsinglleft}{\mbox{\guilsinglleft}}}
-\ProvideTextCommandDefault{\flq}{\UseTextSymbol{OT1}\flq}
-\ProvideTextCommand{\frq}{OT1}{%
-  \textormath{\guilsinglright}{\mbox{\guilsinglright}}}
-\ProvideTextCommand{\frq}{T1}{%
+\ProvideTextCommandDefault{\frq}{%
   \textormath{\guilsinglright}{\mbox{\guilsinglright}}}
-\ProvideTextCommandDefault{\frq}{\UseTextSymbol{OT1}\frq}
-\ProvideTextCommand{\flqq}{OT1}{%
-  \textormath{\guillemotleft}{\mbox{\guillemotleft}}}
-\ProvideTextCommand{\flqq}{T1}{%
+\ProvideTextCommandDefault{\flqq}{%
   \textormath{\guillemotleft}{\mbox{\guillemotleft}}}
-\ProvideTextCommandDefault{\flqq}{\UseTextSymbol{OT1}\flqq}
-\ProvideTextCommand{\frqq}{OT1}{%
+\ProvideTextCommandDefault{\frqq}{%
   \textormath{\guillemotright}{\mbox{\guillemotright}}}
-\ProvideTextCommand{\frqq}{T1}{%
-  \textormath{\guillemotright}{\mbox{\guillemotright}}}
-\ProvideTextCommandDefault{\frqq}{\UseTextSymbol{OT1}\frqq}
 \def\umlauthigh{%
   \def\bbl@umlauta##1{\leavevmode\bgroup%
       \expandafter\accent\csname\f@encoding dqpos\endcsname
@@ -1240,7 +1227,39 @@
   \chardef\l@english\z@
 \fi
 \main@language{english}
-\ifcase\bbl@engine\or
+\providecommand\IfBabelLayout[3]{#3}%
+\newcommand\BabelPatchSection[1]{%
+  \@ifundefined{#1}{}{%
+    \bbl@exp{\let\<bbl@ss@#1>\<#1>}%
+    \@namedef{#1}{%
+      \@ifstar{\bbl@presec@s{#1}}%
+              {\@dblarg{\bbl@presec@x{#1}}}}}}
+\def\bbl@presec@x#1[#2]#3{%
+  \bbl@exp{%
+    \\\select@language@x{\bbl@main@language}%
+    \\\@nameuse{bbl@ss@#1}%
+      [\\\foreignlanguage{\languagename}{\unexpanded{#2}}]%
+      {\\\foreignlanguage{\languagename}{\unexpanded{#3}}}%
+    \\\select@language@x{\languagename}}}
+\def\bbl@presec@s#1#2{%
+  \bbl@exp{%
+    \\\select@language@x{\bbl@main@language}%
+    \\\@nameuse{bbl@ss@#1}*%
+      {\\\foreignlanguage{\languagename}{\unexpanded{#2}}}%
+    \\\select@language@x{\languagename}}}
+\IfBabelLayout{sectioning}%   at begin document ???
+  {\BabelPatchSection{part}%
+   \BabelPatchSection{chapter}%
+   \BabelPatchSection{section}%
+   \BabelPatchSection{subsection}%
+   \BabelPatchSection{subsubsection}%
+   \BabelPatchSection{paragraph}%
+   \BabelPatchSection{subparagraph}%
+   \def\babel@toc#1{%
+     \select@language@x{\bbl@main@language}}}{}
+\ifcase\bbl@engine
+  \input txtbabel.def
+\or
   \input luababel.def
 \or
   \input xebabel.def
@@ -1279,6 +1298,12 @@
         {Use this macro as documented}}%
       {\bbl@provide@renew{#2}}}%
   \bbl@exp{\\\babelensure[exclude=\\\today]{#2}}%
+  \bbl@ifunset{bbl@ensure@\languagename}%
+    {\bbl@exp{%
+      \\\DeclareRobustCommand\<bbl@ensure@\languagename>[1]{%
+        \\\foreignlanguage{\languagename}%
+        {####1}}}}%
+    {}%
   \ifx\bbl@KVP@script\@nil\else
     \bbl@csarg\edef{sname@#2}{\bbl@KVP@script}%
   \fi
@@ -1380,10 +1405,10 @@
     \let\bbl@inireader\bbl@iniskip
     \bbl@info{Importing data from babel-#1.ini for \languagename}%
     \loop
+    \if T\ifeof1F\fi T\relax % Trick, because inside \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
@@ -1470,21 +1495,23 @@
        \bbl@TG@@date
        \global\bbl@csarg\let{date@\languagename}\bbl@toreplace
        \bbl@exp{%
-         \gdef\<\languagename date>####1####2####3{%
+         \gdef\<\languagename date>{\\\protect\<\languagename date >}%
+         \gdef\<\languagename date >####1####2####3{%
+           \\\bbl@usedategrouptrue
            \<bbl@ensure@\languagename>{%
              \<bbl@date@\languagename>{####1}{####2}{####3}}}%
          \\\bbl@add\\\bbl@savetoday{%
            \\\SetString\\\today{%
-             \<\languagename date>{\year}{\month}{\day}}}}}}%
+             \<\languagename date>{\\\the\year}{\\\the\month}{\\\the\day}}}}}}%
       {}}
-\newcommand\BabelDateSpace{\nobreakspace{}}
+\newcommand\BabelDateSpace{\nobreakspace}
 \newcommand\BabelDateDot{.\@}
 \newcommand\BabelDated[1]{{\number#1}}
 \newcommand\BabelDatedd[1]{{\ifnum#1<10 0\fi\number#1}}
 \newcommand\BabelDateM[1]{{\number#1}}
 \newcommand\BabelDateMM[1]{{\ifnum#1<10 0\fi\number#1}}
 \newcommand\BabelDateMMMM[1]{{%
-  \csname month\romannumeral\month name\endcsname}}%
+  \csname month\romannumeral#1name\endcsname}}%
 \newcommand\BabelDatey[1]{{\number#1}}%
 \newcommand\BabelDateyy[1]{{%
   \ifnum#1<10 0\number#1 %
@@ -1512,6 +1539,30 @@
   \bbl@replace\bbl@toreplace{[yy]}{\BabelDateyy{####1}}%
   \bbl@replace\bbl@toreplace{[yyyy]}{\BabelDateyyyy{####1}}%
   \bbl@replace@finish@iii\bbl@toreplace}
+\def\bbl@provide@lsys#1{%
+  \bbl@ifunset{bbl@lname@#1}%
+    {\bbl@ini@ids{#1}}%
+    {}%
+  \bbl@csarg\let{lsys@#1}\@empty
+  \bbl@ifunset{bbl@sname@#1}{\bbl@csarg\gdef{sname@#1}{Default}}{}%
+  \bbl@ifunset{bbl@sotf#1}{\bbl@csarg\gdef{sotf@#1}{DFLT}}{}%
+  \bbl@csarg\bbl@add@list{lsys@#1}{Script=\bbl@cs{sname@#1}}%
+  \bbl@ifunset{bbl@lname@#1}{}%
+    {\bbl@csarg\bbl@add@list{lsys@#1}{Language=\bbl@cs{lname@#1}}}%
+  \bbl@csarg\bbl@toglobal{lsys@#1}}%
+ %  \bbl@exp{% TODO - should be global
+ %    \<keys_if_exist:nnF>{fontspec-opentype/Script}{\bbl@cs{sname@#1}}%
+ %      {\\\newfontscript{\bbl@cs{sname@#1}}{\bbl@cs{sotf@#1}}}%
+ %    \<keys_if_exist:nnF>{fontspec-opentype/Language}{\bbl@cs{lname@#1}}%
+ %      {\\\newfontlanguage{\bbl@cs{lname@#1}}{\bbl@cs{lotf@#1}}}}}
+\def\bbl@ini@ids#1{%
+  \def\BabelBeforeIni##1##2{%
+    \begingroup
+      \bbl@add\bbl@secpost@identification{\closein1 }%
+      \catcode`\[=12 \catcode`\]=12 \catcode`\==12
+      \bbl@read@ini{##1}%
+    \endgroup}%           boxed, to avoid extra spaces:
+  {\setbox\z@\hbox{\InputIfFileExists{babel-#1.tex}{}{}}}}
 \ifx\bbl@opt@safe\@empty\else
   \def\@newl@bel#1#2#3{%
    {\@safe@activestrue
@@ -1589,29 +1640,36 @@
   \let\org@bibcite\bibcite
   \let\org@@bibitem\@bibitem
 \fi
-\bbl@redefine\markright#1{%
-  \bbl@ifblank{#1}%
-    {\org@markright{}}%
-    {\toks@{#1}%
-     \bbl@exp{%
-       \\\org@markright{\\\protect\\\foreignlanguage{\languagename}%
-         {\\\protect\\\bbl@restore@actives\the\toks@}}}}}
-\ifx\@mkboth\markboth
-  \def\bbl@tempc{\let\@mkboth\markboth}
-\else
-  \def\bbl@tempc{}
-\fi
-\bbl@redefine\markboth#1#2{%
-  \protected@edef\bbl@tempb##1{%
-    \protect\foreignlanguage{\languagename}{\protect\bbl@restore@actives##1}}%
-  \bbl@ifblank{#1}%
-    {\toks@{}}%
-    {\toks@\expandafter{\bbl@tempb{#1}}}%
-  \bbl@ifblank{#2}%
-    {\@temptokena{}}%
-    {\@temptokena\expandafter{\bbl@tempb{#2}}}%
-  \bbl@exp{\\\org@markboth{\the\toks@}{\the\@temptokena}}}
-\bbl@tempc
+\IfBabelLayout{sectioning}
+  {\ifx\bbl@opt@headfoot\@nnil
+     \g@addto@macro\@resetactivechars{%
+       \set@typeset@protect
+       \expandafter\select@language@x\expandafter{\bbl@main@language}%
+       \let\protect\noexpand}%
+   \fi}
+  {\bbl@redefine\markright#1{%
+     \bbl@ifblank{#1}%
+       {\org@markright{}}%
+       {\toks@{#1}%
+        \bbl@exp{%
+          \\\org@markright{\\\protect\\\foreignlanguage{\languagename}%
+            {\\\protect\\\bbl@restore@actives\the\toks@}}}}}
+   \ifx\@mkboth\markboth
+     \def\bbl@tempc{\let\@mkboth\markboth}
+   \else
+     \def\bbl@tempc{}
+   \fi
+   \bbl@redefine\markboth#1#2{%
+     \protected@edef\bbl@tempb##1{%
+       \protect\foreignlanguage{\languagename}{\protect\bbl@restore@actives##1}}%
+     \bbl@ifblank{#1}%
+       {\toks@{}}%
+       {\toks@\expandafter{\bbl@tempb{#1}}}%
+     \bbl@ifblank{#2}%
+       {\@temptokena{}}%
+       {\@temptokena\expandafter{\bbl@tempb{#2}}}%
+     \bbl@exp{\\\org@markboth{\the\toks@}{\the\@temptokena}}}
+   \bbl@tempc}  % end \IfBabelLayout
 \bbl@xin@{R}\bbl@opt@safe
 \ifin@
   \AtBeginDocument{%
@@ -1760,17 +1818,16 @@
     \global\bbl@csarg\chardef{wdir@#1}\z@
   \fi}
 \def\bbl@switchdir{%
+  \bbl@ifunset{bbl@lsys@\languagename}{\bbl@provide@lsys{\languagename}}{}%
   \bbl@ifunset{bbl@wdir@\languagename}{\bbl@provide@dirs{\languagename}}{}%
   \bbl@exp{\\\bbl@setdirs\bbl@cs{wdir@\languagename}}}
 \def\bbl@setdirs#1{% TODO - math
   \ifcase\bbl@select@type % TODO - strictly, not the right test
-    \bbl@pagedir{#1}%
     \bbl@bodydir{#1}%
     \bbl@pardir{#1}%
   \fi
   \bbl@textdir{#1}}
-\ifcase\bbl@engine
-\or
+\ifodd\bbl@engine  % luatex=1
   \AddBabelHook{babel-bidi}{afterextras}{\bbl@switchdir}
   \DisableBabelHook{babel-bidi}
   \def\bbl@getluadir#1{%
@@ -1797,7 +1854,7 @@
   \def\bbl@bodydir{\bbl@setdir{body}\bodydir}
   \def\bbl@pagedir{\bbl@setdir{page}\pagedir}
   \def\bbl@dirparastext{\pardir\the\textdir\relax}%   %%%%
-\or
+\else % pdftex=0, xetex=2
   \AddBabelHook{babel-bidi}{afterextras}{\bbl@switchdir}
   \DisableBabelHook{babel-bidi}
   \newcount\bbl@dirlevel
@@ -1847,15 +1904,17 @@
     \let\bbl@xebidipar\relax
     \TeXXeTstate\@ne
     \def\bbl@xeeverypar{%
-      \ifcase\bbl@thepardir\else
+      \ifcase\bbl@thepardir
+        \ifcase\bbl@thetextdir\else\beginR\fi
+      \else
         {\setbox\z@\lastbox\beginR\box\z@}%
-      \fi
-      \ifcase\bbl@thetextdir\else\beginR\fi}%
+      \fi}%
     \let\bbl@severypar\everypar
     \newtoks\everypar
     \everypar=\bbl@severypar
     \bbl@severypar{\bbl@xeeverypar\the\everypar}}
 \fi
+\DeclareRobustCommand\babelsublr[1]{\leavevmode{\bbl@textdir\z@#1}}
 \ifx\loadlocalcfg\@undefined
   \@ifpackagewith{babel}{noconfigs}%
     {\let\loadlocalcfg\@gobble}%
diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty
index c5ce24b584f..bd3fe93537c 100644
--- a/Master/texmf-dist/tex/generic/babel/babel.sty
+++ b/Master/texmf-dist/tex/generic/babel/babel.sty
@@ -32,7 +32,7 @@
 %% extension |.ins|) which are part of the distribution.
 %%
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
-\ProvidesPackage{babel}[2017/11/03 3.15 The Babel package]
+\ProvidesPackage{babel}[2018/01/04 3.16 The Babel package]
 \@ifpackagewith{babel}{debug}
   {\let\bbl@debug\@firstofone}
   {\let\bbl@debug\@gobble}
@@ -179,23 +179,25 @@
     \fi}%
   \bbl@languages
 \fi
-\@ifpackagewith{babel}{bidi=basic-r}{% must go before any \DeclareOption
-  \let\bbl@beforeforeign\leavevmode
-  \AtEndOfPackage{\EnableBabelHook{babel-bidi}}%
-  \RequirePackage{luatexbase}%
-  \directlua{
-    require('babel-bidi.lua')
-    require('babel-bidi-basic-r.lua')
-    luatexbase.add_to_callback('pre_linebreak_filter',
-      Babel.pre_otfload,
-      'Babel.pre_otfload',
-      luatexbase.priority_in_callback('pre_linebreak_filter',
-        'luaotfload.node_processor') or nil)
-    luatexbase.add_to_callback('hpack_filter',
-      Babel.pre_otfload,
-      'Babel.pre_otfload',
-      luatexbase.priority_in_callback('hpack_filter',
-        'luaotfload.node_processor') or nil)}}{}
+\ifodd\bbl@engine
+  \@ifpackagewith{babel}{bidi=basic-r}{% must go before any \DeclareOption
+    \let\bbl@beforeforeign\leavevmode
+    \AtEndOfPackage{\EnableBabelHook{babel-bidi}}%
+    \RequirePackage{luatexbase}%
+    \directlua{
+      require('babel-bidi.lua')
+      require('babel-bidi-basic-r.lua')
+      luatexbase.add_to_callback('pre_linebreak_filter',
+        Babel.pre_otfload,
+        'Babel.pre_otfload',
+        luatexbase.priority_in_callback('pre_linebreak_filter',
+          'luaotfload.node_processor') or nil)
+      luatexbase.add_to_callback('hpack_filter',
+        Babel.pre_otfload,
+        'Babel.pre_otfload',
+        luatexbase.priority_in_callback('hpack_filter',
+          'luaotfload.node_processor') or nil)}}{}
+\fi
 \@ifpackagewith{babel}{base}{%
   \ifx\directlua\@undefined
     \DeclareOption*{\bbl@patterns{\CurrentOption}}%
@@ -250,24 +252,40 @@
 \DeclareOption{safe=none}{\let\bbl@opt@safe\@empty}
 \DeclareOption{safe=bib}{\def\bbl@opt@safe{B}}
 \DeclareOption{safe=ref}{\def\bbl@opt@safe{R}}
-\DeclareOption{bidi=basic-r}%
-  {\newattribute\bbl@attr@dir
-   \let\bbl@beforeforeign\leavevmode
-   \AtEndOfPackage{\EnableBabelHook{babel-bidi}}}
+\ifodd\bbl@engine
+  \DeclareOption{bidi=basic-r}%
+    {\let\bbl@beforeforeign\leavevmode
+     \newattribute\bbl@attr@dir
+     \bbl@exp{\output{\bodydir\pagedir\the\output}}%
+     \AtEndOfPackage{\EnableBabelHook{babel-bidi}}}
+\else
+  \DeclareOption{bidi=basic-r}%
+    {\bbl@error
+      {The bidi method `basic-r' is available only in\\%
+       luatex. I'll continue with `bidi=default', so\\%
+       expect wrong results}%
+      {See the manual for further details.}%
+    \let\bbl@beforeforeign\leavevmode
+    \AtEndOfPackage{%
+      \EnableBabelHook{babel-bidi}%
+      \bbl@xebidipar}}
+\fi
 \DeclareOption{bidi=default}%
   {\let\bbl@beforeforeign\leavevmode
-   \ifcase\bbl@engine\or
+   \ifodd\bbl@engine
      \newattribute\bbl@attr@dir
+     \bbl@exp{\output{\bodydir\pagedir\the\output}}%
    \fi
    \AtEndOfPackage{%
      \EnableBabelHook{babel-bidi}%
-     \ifcase\bbl@engine\or\or
+     \ifodd\bbl@engine\else
        \bbl@xebidipar
      \fi}}
 \let\bbl@opt@shorthands\@nnil
 \let\bbl@opt@config\@nnil
 \let\bbl@opt@main\@nnil
 \let\bbl@opt@headfoot\@nnil
+\let\bbl@opt@layout\@nnil
 \def\bbl@tempa#1=#2\bbl@tempa{%
   \bbl@csarg\ifx{opt@#1}\@nnil
     \bbl@csarg\edef{opt@#1}{#2}%
@@ -276,7 +294,7 @@
       Bad option `#1=#2'. Either you have misspelled the\\%
       key or there is a previous setting of `#1'}{%
       Valid keys are `shorthands', `config', `strings', `main',\\%
-      `headfoot', `safe', `math'}
+      `headfoot', `safe', `math', among others.}
   \fi}
 \let\bbl@language@opts\@empty
 \DeclareOption*{%
@@ -328,6 +346,17 @@
     \ifx\bbl@language@opts\@empty\else\bbl@language@opts,\fi
       \bbl@opt@main}
 \fi
+\ifx\bbl@opt@layout\@nnil
+  \newcommand\IfBabelLayout[3]{#3}%
+\else
+  \newcommand\IfBabelLayout[1]{%
+    \@expandtwoargs\in@{.#1.}{.\bbl@opt@layout.}%
+    \ifin@
+      \expandafter\@firstoftwo
+    \else
+      \expandafter\@secondoftwo
+    \fi}
+\fi
 \let\bbl@afterlang\relax
 \let\BabelModifiers\relax
 \let\bbl@loaded\@empty
diff --git a/Master/texmf-dist/tex/generic/babel/francais.sty b/Master/texmf-dist/tex/generic/babel/francais.sty
index 88d4cee16a3..8a7510f0800 100644
--- a/Master/texmf-dist/tex/generic/babel/francais.sty
+++ b/Master/texmf-dist/tex/generic/babel/francais.sty
@@ -42,8 +42,8 @@
     \bblstyerror
   \fi
 \fi
-\def\CurrentOption{francais}
-\input frenchb.ldf\relax
+\def\CurrentOption{french}
+\input french.ldf\relax
 %%
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg
index 2a78efdda22..6205a7080df 100644
--- a/Master/texmf-dist/tex/generic/babel/hyphen.cfg
+++ b/Master/texmf-dist/tex/generic/babel/hyphen.cfg
@@ -36,7 +36,7 @@
     \wlog{File: #1 #4 #3 <#2>}%
     \let\ProvidesFile\@undefined}
 \fi
-\ProvidesFile{hyphen.cfg}[2017/11/03 3.15 Babel hyphens]
+\ProvidesFile{hyphen.cfg}[2018/01/04 3.16 Babel hyphens]
 \xdef\bbl@format{\jobname}
 \ifx\AtBeginDocument\@undefined
   \def\@empty{}
@@ -67,7 +67,7 @@
   \countdef\last@language=19
   \def\addlanguage{\alloc@9\language\chardef\@cclvi}
 \fi
-\toks8{Babel <3.15> and hyphenation patterns for }%
+\toks8{Babel <3.16> 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/locale/az/babel-azerbaijani-cyrl.tex b/Master/texmf-dist/tex/generic/babel/locale/az/babel-azerbaijani-cyrl.tex
index b5c5ec1ee6c..45611a214b4 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/az/babel-azerbaijani-cyrl.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/az/babel-azerbaijani-cyrl.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{azerbaijani-cyrillic}
+\input{babel-azerbaijani-cyrillic}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/az/babel-azerbaijani-latn.tex b/Master/texmf-dist/tex/generic/babel/locale/az/babel-azerbaijani-latn.tex
index b66f6a70f8d..c965c2ef3e5 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/az/babel-azerbaijani-latn.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/az/babel-azerbaijani-latn.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{azerbaijani-latin}
+\input{babel-azerbaijani-latin}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/bs/babel-bosnian-cyrl.tex b/Master/texmf-dist/tex/generic/babel/locale/bs/babel-bosnian-cyrl.tex
index 0e4cb1377eb..c24ef19ceda 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/bs/babel-bosnian-cyrl.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/bs/babel-bosnian-cyrl.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{bosnian-cyrillic}
+\input{babel-bosnian-cyrillic}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/bs/babel-bosnian-latn.tex b/Master/texmf-dist/tex/generic/babel/locale/bs/babel-bosnian-latn.tex
index 355ce0781ad..1f1147e5972 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/bs/babel-bosnian-latn.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/bs/babel-bosnian-latn.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{bosnian-latin}
+\input{babel-bosnian-latin}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/de/babel-austrian.tex b/Master/texmf-dist/tex/generic/babel/locale/de/babel-austrian.tex
index 66432ce554c..8fb22b4c450 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/de/babel-austrian.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/de/babel-austrian.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{german-austria}
+\input{babel-german-austria}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/de/babel-german-at.tex b/Master/texmf-dist/tex/generic/babel/locale/de/babel-german-at.tex
index 66432ce554c..8fb22b4c450 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/de/babel-german-at.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/de/babel-german-at.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{german-austria}
+\input{babel-german-austria}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/de/babel-german-ch.tex b/Master/texmf-dist/tex/generic/babel/locale/de/babel-german-ch.tex
index 059f049512e..9b9708d2947 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/de/babel-german-ch.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/de/babel-german-ch.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{german-switzerland}
+\input{babel-german-switzerland}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/de/babel-nswissgerman.tex b/Master/texmf-dist/tex/generic/babel/locale/de/babel-nswissgerman.tex
index 059f049512e..9b9708d2947 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/de/babel-nswissgerman.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/de/babel-nswissgerman.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{german-switzerland}
+\input{babel-german-switzerland}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/de/babel-swissgerman.tex b/Master/texmf-dist/tex/generic/babel/locale/de/babel-swissgerman.tex
index 059f049512e..9b9708d2947 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/de/babel-swissgerman.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/de/babel-swissgerman.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{german-switzerland}
+\input{babel-german-switzerland}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/dsb/babel-lsorbian.tex b/Master/texmf-dist/tex/generic/babel/locale/dsb/babel-lsorbian.tex
index dc945fdb956..3c0f708bdcb 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/dsb/babel-lsorbian.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/dsb/babel-lsorbian.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{lowersorbian}
+\input{babel-lowersorbian}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/en/babel-american.tex b/Master/texmf-dist/tex/generic/babel/locale/en/babel-american.tex
index 1ba35184de8..7ad0eba4be1 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/en/babel-american.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/en/babel-american.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{english-unitedstates}
+\input{babel-english-unitedstates}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/en/babel-australian.tex b/Master/texmf-dist/tex/generic/babel/locale/en/babel-australian.tex
index f3d54bafde5..fc115022565 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/en/babel-australian.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/en/babel-australian.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{english-australia}
+\input{babel-english-australia}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/en/babel-british.tex b/Master/texmf-dist/tex/generic/babel/locale/en/babel-british.tex
index b49b74f8b01..a38f537313e 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/en/babel-british.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/en/babel-british.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{english-unitedkingdom}
+\input{babel-english-unitedkingdom}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/en/babel-canadian.tex b/Master/texmf-dist/tex/generic/babel/locale/en/babel-canadian.tex
index 85243a6593e..abe1825246c 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/en/babel-canadian.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/en/babel-canadian.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{english-canada}
+\input{babel-english-canada}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/en/babel-english-au.tex b/Master/texmf-dist/tex/generic/babel/locale/en/babel-english-au.tex
index f3d54bafde5..fc115022565 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/en/babel-english-au.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/en/babel-english-au.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{english-australia}
+\input{babel-english-australia}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/en/babel-english-ca.tex b/Master/texmf-dist/tex/generic/babel/locale/en/babel-english-ca.tex
index 85243a6593e..abe1825246c 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/en/babel-english-ca.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/en/babel-english-ca.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{english-canada}
+\input{babel-english-canada}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/en/babel-english-gb.tex b/Master/texmf-dist/tex/generic/babel/locale/en/babel-english-gb.tex
index b49b74f8b01..a38f537313e 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/en/babel-english-gb.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/en/babel-english-gb.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{english-unitedkingdom}
+\input{babel-english-unitedkingdom}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/en/babel-english-nz.tex b/Master/texmf-dist/tex/generic/babel/locale/en/babel-english-nz.tex
index 1b666452b7d..1cda3ed3713 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/en/babel-english-nz.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/en/babel-english-nz.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{english-newzealand}
+\input{babel-english-newzealand}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/en/babel-english-us.tex b/Master/texmf-dist/tex/generic/babel/locale/en/babel-english-us.tex
index 1ba35184de8..7ad0eba4be1 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/en/babel-english-us.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/en/babel-english-us.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{english-unitedstates}
+\input{babel-english-unitedstates}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/en/babel-newzealand.tex b/Master/texmf-dist/tex/generic/babel/locale/en/babel-newzealand.tex
index 1b666452b7d..1cda3ed3713 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/en/babel-newzealand.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/en/babel-newzealand.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{english-newzealand}
+\input{babel-english-newzealand}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/en/babel-ukenglish.tex b/Master/texmf-dist/tex/generic/babel/locale/en/babel-ukenglish.tex
index b49b74f8b01..a38f537313e 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/en/babel-ukenglish.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/en/babel-ukenglish.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{english-unitedkingdom}
+\input{babel-english-unitedkingdom}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/en/babel-usenglish.tex b/Master/texmf-dist/tex/generic/babel/locale/en/babel-usenglish.tex
index 1ba35184de8..7ad0eba4be1 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/en/babel-usenglish.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/en/babel-usenglish.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{english-unitedstates}
+\input{babel-english-unitedstates}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/es/babel-mexican.tex b/Master/texmf-dist/tex/generic/babel/locale/es/babel-mexican.tex
index b9bb453db32..9aa175b66e8 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/es/babel-mexican.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/es/babel-mexican.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{spanish-mexico}
+\input{babel-spanish-mexico}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/es/babel-spanish-mx.tex b/Master/texmf-dist/tex/generic/babel/locale/es/babel-spanish-mx.tex
index b9bb453db32..9aa175b66e8 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/es/babel-spanish-mx.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/es/babel-spanish-mx.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{spanish-mexico}
+\input{babel-spanish-mexico}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/fr/babel-french-be.tex b/Master/texmf-dist/tex/generic/babel/locale/fr/babel-french-be.tex
index 427fc973fa5..61e6236cedd 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/fr/babel-french-be.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/fr/babel-french-be.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{french-belgium}
+\input{babel-french-belgium}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/fr/babel-french-ca.tex b/Master/texmf-dist/tex/generic/babel/locale/fr/babel-french-ca.tex
index b4ae9d45ec7..3de94e1a603 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/fr/babel-french-ca.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/fr/babel-french-ca.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{french-canada}
+\input{babel-french-canada}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/fr/babel-french-ch.tex b/Master/texmf-dist/tex/generic/babel/locale/fr/babel-french-ch.tex
index 34effe40d6f..ca424ab3282 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/fr/babel-french-ch.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/fr/babel-french-ch.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{french-switzerland}
+\input{babel-french-switzerland}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/fr/babel-french-lu.tex b/Master/texmf-dist/tex/generic/babel/locale/fr/babel-french-lu.tex
index ed8a18e3f1b..c0eac24cd18 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/fr/babel-french-lu.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/fr/babel-french-lu.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{french-luxembourg}
+\input{babel-french-luxembourg}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/ha/babel-hausa-gh.tex b/Master/texmf-dist/tex/generic/babel/locale/ha/babel-hausa-gh.tex
index 5f382a8f047..d4d272e94a4 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/ha/babel-hausa-gh.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/ha/babel-hausa-gh.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{hausa-ghana}
+\input{babel-hausa-ghana}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/ha/babel-hausa-ne.tex b/Master/texmf-dist/tex/generic/babel/locale/ha/babel-hausa-ne.tex
index 1f555bcccba..bfd315c158e 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/ha/babel-hausa-ne.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/ha/babel-hausa-ne.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{hausa-niger}
+\input{babel-hausa-niger}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/hsb/babel-usorbian.tex b/Master/texmf-dist/tex/generic/babel/locale/hsb/babel-usorbian.tex
index 6a41d80a628..f5a8e2d9e90 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/hsb/babel-usorbian.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/hsb/babel-usorbian.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{uppersorbian}
+\input{babel-uppersorbian}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/ms/babel-malay-bn.tex b/Master/texmf-dist/tex/generic/babel/locale/ms/babel-malay-bn.tex
index ff3f5f96e08..a6d5a773c63 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/ms/babel-malay-bn.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/ms/babel-malay-bn.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{malay-brunei}
+\input{babel-malay-brunei}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/ms/babel-malay-sg.tex b/Master/texmf-dist/tex/generic/babel/locale/ms/babel-malay-sg.tex
index 2cef1df3b9e..1ce48cc6b78 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/ms/babel-malay-sg.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/ms/babel-malay-sg.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{malay-singapore}
+\input{babel-malay-singapore}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/nb/babel-norsk.tex b/Master/texmf-dist/tex/generic/babel/locale/nb/babel-norsk.tex
index 85d250208a8..1deba93b91c 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/nb/babel-norsk.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/nb/babel-norsk.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{norwegianbokmal}
+\input{babel-norwegianbokmal}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/nn/babel-nynorsk.tex b/Master/texmf-dist/tex/generic/babel/locale/nn/babel-nynorsk.tex
index 5aedc14b2e4..38ff404d243 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/nn/babel-nynorsk.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/nn/babel-nynorsk.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{norwegiannynorsk}
+\input{babel-norwegiannynorsk}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/pa/babel-punjabi-arab.tex b/Master/texmf-dist/tex/generic/babel/locale/pa/babel-punjabi-arab.tex
index 0bac116d639..ca61762f9b9 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/pa/babel-punjabi-arab.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/pa/babel-punjabi-arab.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{punjabi-arabic}
+\input{babel-punjabi-arabic}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/pa/babel-punjabi-guru.tex b/Master/texmf-dist/tex/generic/babel/locale/pa/babel-punjabi-guru.tex
index 501a05e92c6..01e59e098af 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/pa/babel-punjabi-guru.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/pa/babel-punjabi-guru.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{punjabi-gurmukhi}
+\input{babel-punjabi-gurmukhi}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/pt/babel-brazilian.tex b/Master/texmf-dist/tex/generic/babel/locale/pt/babel-brazilian.tex
index 1f815bb817a..136d1f04e99 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/pt/babel-brazilian.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/pt/babel-brazilian.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{portuguese-brazil}
+\input{babel-portuguese-brazil}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/pt/babel-portuguese-br.tex b/Master/texmf-dist/tex/generic/babel/locale/pt/babel-portuguese-br.tex
index 1f815bb817a..136d1f04e99 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/pt/babel-portuguese-br.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/pt/babel-portuguese-br.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{portuguese-brazil}
+\input{babel-portuguese-brazil}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/pt/babel-portuguese-pt.tex b/Master/texmf-dist/tex/generic/babel/locale/pt/babel-portuguese-pt.tex
index b08ced3490f..421489463b6 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/pt/babel-portuguese-pt.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/pt/babel-portuguese-pt.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{portuguese-portugal}
+\input{babel-portuguese-portugal}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/ru/babel-ru.ini b/Master/texmf-dist/tex/generic/babel/locale/ru/babel-ru.ini
index b773c65aeb5..897c135b52c 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/ru/babel-ru.ini
+++ b/Master/texmf-dist/tex/generic/babel/locale/ru/babel-ru.ini
@@ -183,4 +183,3 @@ superscriptingExponent = ×
 alph = 
 Alph = 
 ordinals = 
-
diff --git a/Master/texmf-dist/tex/generic/babel/locale/se/babel-samin.tex b/Master/texmf-dist/tex/generic/babel/locale/se/babel-samin.tex
index f6c48020cd3..4dd0a439f49 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/se/babel-samin.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/se/babel-samin.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{northernsami}
+\input{babel-northernsami}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/shi/babel-tachelhit-latn.tex b/Master/texmf-dist/tex/generic/babel/locale/shi/babel-tachelhit-latn.tex
index 89a519b0d66..f701e02d5cb 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/shi/babel-tachelhit-latn.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/shi/babel-tachelhit-latn.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{tachelhit-latin}
+\input{babel-tachelhit-latin}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/shi/babel-tachelhit-tfng.tex b/Master/texmf-dist/tex/generic/babel/locale/shi/babel-tachelhit-tfng.tex
index 167683178d2..f5ef938de88 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/shi/babel-tachelhit-tfng.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/shi/babel-tachelhit-tfng.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{tachelhit-tifinagh}
+\input{babel-tachelhit-tifinagh}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/sl/babel-slovene.tex b/Master/texmf-dist/tex/generic/babel/locale/sl/babel-slovene.tex
index 764608eedcc..d8632e72ccd 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/sl/babel-slovene.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/sl/babel-slovene.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{slovenian}
+\input{babel-slovenian}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-cyrl-ba.tex b/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-cyrl-ba.tex
index 1cf43ca50c4..0f3fe82c325 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-cyrl-ba.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-cyrl-ba.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{serbian-cyrillic-bosniaherzegovina}
+\input{babel-serbian-cyrillic-bosniaherzegovina}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-cyrl-me.tex b/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-cyrl-me.tex
index 91761d29c1e..59a091ca86e 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-cyrl-me.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-cyrl-me.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{serbian-cyrillic-montenegro}
+\input{babel-serbian-cyrillic-montenegro}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-cyrl-xk.tex b/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-cyrl-xk.tex
index 5ee14b568af..b39f2cf4447 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-cyrl-xk.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-cyrl-xk.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{serbian-cyrillic-kosovo}
+\input{babel-serbian-cyrillic-kosovo}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-cyrl.tex b/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-cyrl.tex
index 8ec044d6d25..e2b96703abe 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-cyrl.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-cyrl.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{serbian-cyrillic}
+\input{babel-serbian-cyrillic}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-latn-ba.tex b/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-latn-ba.tex
index 898b04ad633..c2efb27e728 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-latn-ba.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-latn-ba.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{serbian-latin-bosniaherzegovina}
+\input{babel-serbian-latin-bosniaherzegovina}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-latn-me.tex b/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-latn-me.tex
index aa74a7910f1..0a03046db8a 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-latn-me.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-latn-me.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{serbian-latin-montenegro}
+\input{babel-serbian-latin-montenegro}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-latn-xk.tex b/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-latn-xk.tex
index b9a019a6fb6..bbb7a4241cc 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-latn-xk.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-latn-xk.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{serbian-latin-kosovo}
+\input{babel-serbian-latin-kosovo}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-latn.tex b/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-latn.tex
index 9114b5ff362..7d8cb4fd1c7 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-latn.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/sr/babel-serbian-latn.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{serbian-latin}
+\input{babel-serbian-latin}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/uz/babel-uzbek-arab.tex b/Master/texmf-dist/tex/generic/babel/locale/uz/babel-uzbek-arab.tex
index 9f1db3ab119..a93632bebc7 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/uz/babel-uzbek-arab.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/uz/babel-uzbek-arab.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{uzbek-arabic}
+\input{babel-uzbek-arabic}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/uz/babel-uzbek-cyrl.tex b/Master/texmf-dist/tex/generic/babel/locale/uz/babel-uzbek-cyrl.tex
index e195b0578c2..aff3c462b23 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/uz/babel-uzbek-cyrl.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/uz/babel-uzbek-cyrl.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{uzbek-cyrillic}
+\input{babel-uzbek-cyrillic}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/uz/babel-uzbek-latn.tex b/Master/texmf-dist/tex/generic/babel/locale/uz/babel-uzbek-latn.tex
index df7759623d2..3dce3067c2b 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/uz/babel-uzbek-latn.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/uz/babel-uzbek-latn.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{uzbek-latin}
+\input{babel-uzbek-latin}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/vai/babel-vai-latn.tex b/Master/texmf-dist/tex/generic/babel/locale/vai/babel-vai-latn.tex
index 74c94ac1568..340da8d7560 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/vai/babel-vai-latn.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/vai/babel-vai-latn.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{vai-latin}
+\input{babel-vai-latin}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/vai/babel-vai-vaii.tex b/Master/texmf-dist/tex/generic/babel/locale/vai/babel-vai-vaii.tex
index 9ccecc85bb0..00dc31a8405 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/vai/babel-vai-vaii.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/vai/babel-vai-vaii.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{vai-vai}
+\input{babel-vai-vai}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/vi/babel-vietnam.tex b/Master/texmf-dist/tex/generic/babel/locale/vi/babel-vietnam.tex
index a0c241123ab..47541a1ca86 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/vi/babel-vietnam.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/vi/babel-vietnam.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{vietnamese}
+\input{babel-vietnamese}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-chinese-hans-hk.tex b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-chinese-hans-hk.tex
index da6861e7190..930487aa92f 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-chinese-hans-hk.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-chinese-hans-hk.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{chinese-simplified-hongkongsarchina}
+\input{babel-chinese-simplified-hongkongsarchina}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-chinese-hans-mo.tex b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-chinese-hans-mo.tex
index bff1415cd15..00047ad13fc 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-chinese-hans-mo.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-chinese-hans-mo.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{chinese-simplified-macausarchina}
+\input{babel-chinese-simplified-macausarchina}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-chinese-hans-sg.tex b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-chinese-hans-sg.tex
index 2027f3a7e2f..ad7a5ebdbbf 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-chinese-hans-sg.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-chinese-hans-sg.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{chinese-simplified-singapore}
+\input{babel-chinese-simplified-singapore}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-chinese-hans.tex b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-chinese-hans.tex
index c18a7c64977..4ee11ade6a6 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-chinese-hans.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-chinese-hans.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{chinese-simplified}
+\input{babel-chinese-simplified}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-chinese-hant-hk.tex b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-chinese-hant-hk.tex
index f7453d9ae83..6c16f135f59 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-chinese-hant-hk.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-chinese-hant-hk.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{chinese-traditional-hongkongsarchina}
+\input{babel-chinese-traditional-hongkongsarchina}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-chinese-hant-mo.tex b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-chinese-hant-mo.tex
index 429e74e2438..3c813efc8bd 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-chinese-hant-mo.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-chinese-hant-mo.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{chinese-traditional-macausarchina}
+\input{babel-chinese-traditional-macausarchina}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-chinese-hant.tex b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-chinese-hant.tex
index 8f643a34979..f413d5412e9 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-chinese-hant.tex
+++ b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-chinese-hant.tex
@@ -1,4 +1,4 @@
 % This file is part of babel. For further details see:
 % https://www.ctan.org/pkg/babel
-\input{chinese-traditional}
+\input{babel-chinese-traditional}
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/luababel.def b/Master/texmf-dist/tex/generic/babel/luababel.def
index 0ffb8d44cad..29da71ddf77 100644
--- a/Master/texmf-dist/tex/generic/babel/luababel.def
+++ b/Master/texmf-dist/tex/generic/babel/luababel.def
@@ -406,31 +406,6 @@
   \bbl@exp{\<fontspec_set_family:Nnn>\\#1%
     {\bbl@cs{lsys@\languagename},#2}}{#3}%
   \bbl@toglobal#1}%
-\def\bbl@provide@lsys#1{%
-  \bbl@ifunset{bbl@lname@#1}%
-    {\bbl@ini@ids{#1}}%
-    {}%
-  \bbl@csarg\let{lsys@#1}\@empty
-  \bbl@ifunset{bbl@sname@#1}{\bbl@csarg\gdef{sname@#1}{Default}}{}%
-  \bbl@ifunset{bbl@sotf#1}{\bbl@csarg\gdef{sotf@#1}{DFLT}}{}%
-  \bbl@csarg\bbl@add@list{lsys@#1}{Script=\bbl@cs{sname@#1}}%
-  \bbl@ifunset{bbl@lname@#1}{}%
-    {\bbl@csarg\bbl@add@list{lsys@#1}{Language=\bbl@cs{lname@#1}}}%
-  \bbl@csarg\bbl@toglobal{lsys@#1}}%
- %  \bbl@exp{% TODO - should be global
- %    \<keys_if_exist:nnF>{fontspec-opentype/Script}{\bbl@cs{sname@#1}}%
- %      {\\\newfontscript{\bbl@cs{sname@#1}}{\bbl@cs{sotf@#1}}}%
- %    \<keys_if_exist:nnF>{fontspec-opentype/Language}{\bbl@cs{lname@#1}}%
- %      {\\\newfontlanguage{\bbl@cs{lname@#1}}{\bbl@cs{lotf@#1}}}}}
-\def\bbl@ini@ids#1{%
-  \def\BabelBeforeIni##1##2{%
-    \begingroup
-      \bbl@add\bbl@secpost@identification{%
-        \def\bbl@iniline########1\bbl@iniline{}}%
-      \catcode`\[=12 \catcode`\]=12 \catcode`\==12
-      \bbl@read@ini{##1}%
-    \endgroup}
-  \InputIfFileExists{babel-#1.tex}{}{}}
 \def\bbl@font@rst#1#2#3#4{%
   \bbl@csarg\def{famrst@#4}{\bbl@font@set{#1}#2#3}}
 \def\bbl@font@fams{rm,sf,tt}
@@ -473,6 +448,54 @@
   \expandafter\addto\csname extras#1\endcsname{%
     \babel@save\bbl@langfeatures
     \edef\bbl@langfeatures{#2,}}}
+\ifx\bbl@opt@layout\@nnil\endinput\fi  % if no layout
+\ifx\bbl@beforeforeign\leavevmode % A poor test for bidi=
+  \def\@hangfrom#1{%
+    \setbox\@tempboxa\hbox{{#1}}%
+    \hangindent\wd\@tempboxa
+    \ifnum\bbl@getluadir{page}=\bbl@getluadir{par}\else
+      \shapemode\@ne
+    \fi
+    \noindent\box\@tempboxa}
+\fi
+\IfBabelLayout{lists}
+  {\def\list#1#2{%
+     \ifnum \@listdepth >5\relax
+       \@toodeep
+     \else
+       \global\advance\@listdepth\@ne
+     \fi
+     \rightmargin\z@
+     \listparindent\z@
+     \itemindent\z@
+     \csname @list\romannumeral\the\@listdepth\endcsname
+     \def\@itemlabel{#1}%
+     \let\makelabel\@mklab
+     \@nmbrlistfalse
+     #2\relax
+     \@trivlist
+     \parskip\parsep
+     \parindent\listparindent
+     \advance\linewidth -\rightmargin
+     \advance\linewidth -\leftmargin
+     \advance\@totalleftmargin \leftmargin
+     \parshape \@ne
+     \@totalleftmargin \linewidth
+     \ifnum\bbl@getluadir{page}=\bbl@getluadir{par}\else
+       \shapemode\tw@
+     \fi
+     \ignorespaces}}
+  {}
+\IfBabelLayout{counters}%  Global or language dependent? At begin doc?
+  {\let\bbl@latinarabic=\@arabic
+   \def\@arabic#1{\babelsublr{\bbl@latinarabic#1}}%
+   \@ifpackagewith{babel}{bidi=default}
+     {\let\bbl@asciiroman=\@roman
+      \def\@roman#1{\babelsublr{\ensureascii{\bbl@asciiroman#1}}}%
+      \let\bbl@asciiRoman=\@Roman
+      \def\@Roman#1{\babelsublr{\ensureascii{\bbl@asciiRoman#1}}}%
+      \def\labelenumii{)\theenumii(}%
+      \def\p@enumiii{\p@enumii)\theenumii(}}}{}
 \endinput
 %%
 %% End of file `luababel.def'.
diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf
index a9fe897dc8f..8e69ddf22ee 100644
--- a/Master/texmf-dist/tex/generic/babel/nil.ldf
+++ b/Master/texmf-dist/tex/generic/babel/nil.ldf
@@ -31,7 +31,7 @@
 %% and covered by LPPL is defined by the unpacking scripts (with
 %% extension |.ins|) which are part of the distribution.
 %%
-\ProvidesLanguage{nil}[2017/11/03 3.15 Nil language]
+\ProvidesLanguage{nil}[2018/01/04 3.16 Nil language]
 \LdfInit{nil}{datenil}
 \ifx\l@nohyphenation\@undefined
    \@nopatterns{nil}
diff --git a/Master/texmf-dist/tex/generic/babel/switch.def b/Master/texmf-dist/tex/generic/babel/switch.def
index 3a0426fa3d9..54d03e1c6b5 100644
--- a/Master/texmf-dist/tex/generic/babel/switch.def
+++ b/Master/texmf-dist/tex/generic/babel/switch.def
@@ -36,7 +36,7 @@
     \wlog{File: #1 #4 #3 <#2>}%
     \let\ProvidesFile\@undefined}
 \fi
-\ProvidesFile{switch.def}[2017/11/03 3.15 Babel switching mechanism]
+\ProvidesFile{switch.def}[2018/01/04 3.16 Babel switching mechanism]
 \ifx\AtBeginDocument\@undefined
   \input plain.def\relax
 \fi
@@ -57,8 +57,8 @@
   \countdef\last@language=19
   \def\addlanguage{\alloc@9\language\chardef\@cclvi}
 \fi
-\def\bbl@version{3.15}
-\def\bbl@date{2017/11/03}
+\def\bbl@version{3.16}
+\def\bbl@date{2018/01/04}
 \def\adddialect#1#2{%
   \global\chardef#1#2\relax
   \bbl@usehooks{adddialect}{{#1}{#2}}%
@@ -121,9 +121,7 @@
   \select@language{\languagename}%
   \expandafter\ifx\csname date\languagename\endcsname\relax\else
     \if@filesw
-      \protected@write\@auxout{}{\string\select@language{\languagename}}%
-      \bbl@foreach\BabelContentsFiles{%
-        \addtocontents{##1}{\xstring\select@language{\languagename}}}%
+      \protected@write\@auxout{}{\string\babel@aux{\languagename}{}}%
       \bbl@usehooks{write}{}%
     \fi
   \fi}
@@ -143,7 +141,14 @@
       \let\bbl@select@type\z@
       \expandafter\bbl@switch\expandafter{\languagename}%
     \fi}}
+\def\babel@aux#1#2{%
+  \select@language{#1}%
+  \bbl@foreach\BabelContentsFiles{%
+    \@writefile{##1}{\babel@toc{#1}{#2}}}} %% TODO - ok in plain?
+\def\babel@toc#1#2{%
+  \select@language{#1}}
 \let\select@language@x\select@language
+\newif\ifbbl@usedategroup
 \def\bbl@switch#1{%
   \originalTeX
   \expandafter\def\expandafter\originalTeX\expandafter{%
@@ -162,7 +167,16 @@
       \csname captions#1\endcsname\relax
       \csname date#1\endcsname\relax
     \fi
-  \fi
+  \else\ifbbl@usedategroup
+    \bbl@usedategroupfalse
+    \ifhmode
+      \hskip\z@skip % trick to ignore spaces
+      \csname date#1\endcsname\relax
+      \loop\ifdim\lastskip>\z@\unskip\repeat\unskip
+    \else
+      \csname date#1\endcsname\relax
+    \fi
+  \fi\fi
   \bbl@usehooks{beforeextras}{}%
   \csname extras#1\endcsname\relax
   \bbl@usehooks{afterextras}{}%
diff --git a/Master/texmf-dist/tex/generic/babel/txtbabel.def b/Master/texmf-dist/tex/generic/babel/txtbabel.def
new file mode 100644
index 00000000000..c4c5f582f3b
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/babel/txtbabel.def
@@ -0,0 +1,158 @@
+%%
+%% This is file `txtbabel.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% babel.dtx  (with options: `texxet')
+%% 
+%%
+%% Copyright (C) 2012-2017 Javier Bezos and Johannes L. Braams.
+%% Copyright (C) 1989-2012 Johannes L. Braams and
+%%           any individual authors listed elsewhere in this file.
+%% All rights reserved.
+%%
+%% This file is part of the Babel system.
+%% --------------------------------------
+%%
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% The Current Maintainer of this work is Javier Bezos.
+%%
+%% The list of derived (unpacked) files belonging to the distribution
+%% and covered by LPPL is defined by the unpacking scripts (with
+%% extension |.ins|) which are part of the distribution.
+%%
+\ifx\bbl@opt@layout\@nnil\endinput\fi  % No layout
+\def\bbl@startskip{\ifcase\bbl@thepardir\leftskip\else\rightskip\fi}
+\def\bbl@endskip{\ifcase\bbl@thepardir\rightskip\else\leftskip\fi}
+\ifx\bbl@beforeforeign\leavevmode % A poor test for bidi=
+  \def\@hangfrom#1{%
+    \setbox\@tempboxa\hbox{{#1}}%
+    \hangindent\ifcase\bbl@thepardir\wd\@tempboxa\else-\wd\@tempboxa\fi
+    \noindent\box\@tempboxa}
+  \def\raggedright{%
+    \let\\\@centercr
+    \bbl@startskip\z@skip
+    \@rightskip\@flushglue
+    \bbl@endskip\@rightskip
+    \parindent\z@
+    \parfillskip\bbl@startskip}
+  \def\raggedleft{%
+    \let\\\@centercr
+    \bbl@startskip\@flushglue
+    \bbl@endskip\z@skip
+    \parindent\z@
+    \parfillskip\bbl@endskip}
+\fi
+\IfBabelLayout{lists}
+  {\def\list#1#2{%
+    \ifnum \@listdepth >5\relax
+      \@toodeep
+    \else
+      \global\advance\@listdepth\@ne
+    \fi
+    \rightmargin\z@
+    \listparindent\z@
+    \itemindent\z@
+    \csname @list\romannumeral\the\@listdepth\endcsname
+    \def\@itemlabel{#1}%
+    \let\makelabel\@mklab
+    \@nmbrlistfalse
+    #2\relax
+    \@trivlist
+    \parskip\parsep
+    \parindent\listparindent
+    \advance\linewidth-\rightmargin
+    \advance\linewidth-\leftmargin
+    \advance\@totalleftmargin
+      \ifcase\bbl@thepardir\leftmargin\else\rightmargin\fi
+    \parshape\@ne\@totalleftmargin\linewidth
+    \ignorespaces}%
+  \def\labelenumii{)\theenumii(}%
+  \def\p@enumiii{\p@enumii)\theenumii(}}
+  {}
+\IfBabelLayout{contents}
+  {\def\@dottedtocline#1#2#3#4#5{%
+     \ifnum#1>\c@tocdepth\else
+       \vskip \z@ \@plus.2\p@
+       {\bbl@startskip#2\relax
+        \bbl@endskip\@tocrmarg
+        \parfillskip-\bbl@endskip
+        \parindent#2\relax
+        \@afterindenttrue
+        \interlinepenalty\@M
+        \leavevmode
+        \@tempdima#3\relax
+        \advance\bbl@startskip\@tempdima
+        \null\nobreak\hskip-\bbl@startskip
+        {#4}\nobreak
+        \leaders\hbox{%
+          $\m@th\mkern\@dotsep mu\hbox{.}\mkern\@dotsep mu$}%
+          \hfill\nobreak
+          \hb@xt@\@pnumwidth{\hfil\normalfont\normalcolor#5}%
+          \par}%
+     \fi}}
+  {}
+\IfBabelLayout{columns}
+  {\def\@outputdblcol{%
+     \if@firstcolumn
+       \global\@firstcolumnfalse
+       \global\setbox\@leftcolumn\copy\@outputbox
+       \splitmaxdepth\maxdimen
+       \vbadness\maxdimen
+       \setbox\@outputbox\vbox{\unvbox\@outputbox\unskip}%
+       \setbox\@outputbox\vsplit\@outputbox to\maxdimen
+       \toks@\expandafter{\topmark}%
+       \xdef\@firstcoltopmark{\the\toks@}%
+       \toks@\expandafter{\splitfirstmark}%
+       \xdef\@firstcolfirstmark{\the\toks@}%
+       \ifx\@firstcolfirstmark\@empty
+         \global\let\@setmarks\relax
+       \else
+         \gdef\@setmarks{%
+           \let\firstmark\@firstcolfirstmark
+           \let\topmark\@firstcoltopmark}%
+       \fi
+     \else
+       \global\@firstcolumntrue
+       \setbox\@outputbox\vbox{%
+         \hb@xt@\textwidth{%
+           \hskip\columnwidth
+           \hfil
+           {\normalcolor\vrule \@width\columnseprule}%
+           \hfil
+           \hb@xt@\columnwidth{\box\@leftcolumn \hss}%
+           \hskip-\textwidth
+           \hb@xt@\columnwidth{\box\@outputbox \hss}%
+           \hskip\columnsep
+           \hskip\columnwidth}}%
+       \@combinedblfloats
+       \@setmarks
+       \@outputpage
+       \begingroup
+         \@dblfloatplacement
+         \@startdblcolumn
+         \@whilesw\if@fcolmade \fi{\@outputpage
+         \@startdblcolumn}%
+       \endgroup
+     \fi}}%
+  {}
+\IfBabelLayout{counters}%  Global or language dependent? At begin doc?
+  {\let\bbl@latinarabic=\@arabic
+   \def\@arabic#1{\babelsublr{\bbl@latinarabic#1}}%
+   \let\bbl@asciiroman=\@roman
+   \def\@roman#1{\babelsublr{\ensureascii{\bbl@asciiroman#1}}}%
+   \let\bbl@asciiRoman=\@Roman
+   \def\@Roman#1{\babelsublr{\ensureascii{\bbl@asciiRoman#1}}}}{}
+\endinput
+%%
+%% End of file `txtbabel.def'.
diff --git a/Master/texmf-dist/tex/generic/babel/xebabel.def b/Master/texmf-dist/tex/generic/babel/xebabel.def
index b3a75c9fd2b..73c210e76d2 100644
--- a/Master/texmf-dist/tex/generic/babel/xebabel.def
+++ b/Master/texmf-dist/tex/generic/babel/xebabel.def
@@ -147,31 +147,6 @@
   \bbl@exp{\<fontspec_set_family:Nnn>\\#1%
     {\bbl@cs{lsys@\languagename},#2}}{#3}%
   \bbl@toglobal#1}%
-\def\bbl@provide@lsys#1{%
-  \bbl@ifunset{bbl@lname@#1}%
-    {\bbl@ini@ids{#1}}%
-    {}%
-  \bbl@csarg\let{lsys@#1}\@empty
-  \bbl@ifunset{bbl@sname@#1}{\bbl@csarg\gdef{sname@#1}{Default}}{}%
-  \bbl@ifunset{bbl@sotf#1}{\bbl@csarg\gdef{sotf@#1}{DFLT}}{}%
-  \bbl@csarg\bbl@add@list{lsys@#1}{Script=\bbl@cs{sname@#1}}%
-  \bbl@ifunset{bbl@lname@#1}{}%
-    {\bbl@csarg\bbl@add@list{lsys@#1}{Language=\bbl@cs{lname@#1}}}%
-  \bbl@csarg\bbl@toglobal{lsys@#1}}%
- %  \bbl@exp{% TODO - should be global
- %    \<keys_if_exist:nnF>{fontspec-opentype/Script}{\bbl@cs{sname@#1}}%
- %      {\\\newfontscript{\bbl@cs{sname@#1}}{\bbl@cs{sotf@#1}}}%
- %    \<keys_if_exist:nnF>{fontspec-opentype/Language}{\bbl@cs{lname@#1}}%
- %      {\\\newfontlanguage{\bbl@cs{lname@#1}}{\bbl@cs{lotf@#1}}}}}
-\def\bbl@ini@ids#1{%
-  \def\BabelBeforeIni##1##2{%
-    \begingroup
-      \bbl@add\bbl@secpost@identification{%
-        \def\bbl@iniline########1\bbl@iniline{}}%
-      \catcode`\[=12 \catcode`\]=12 \catcode`\==12
-      \bbl@read@ini{##1}%
-    \endgroup}
-  \InputIfFileExists{babel-#1.tex}{}{}}
 \def\bbl@font@rst#1#2#3#4{%
   \bbl@csarg\def{famrst@#4}{\bbl@font@set{#1}#2#3}}
 \def\bbl@font@fams{rm,sf,tt}
@@ -214,6 +189,7 @@
   \expandafter\addto\csname extras#1\endcsname{%
     \babel@save\bbl@langfeatures
     \edef\bbl@langfeatures{#2,}}}
+\input txtbabel.def
 \endinput
 %%
 %% End of file `xebabel.def'.