babel (14feb18)

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

23 files changed, 636 insertions, 60 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 2970d9c016c..f394eaafec3 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
@@ -7,7 +7,7 @@
 -- babel.dtx  (with options: `basic-r')
 -- 
 --
--- Copyright (C) 2012-2017 Javier Bezos and Johannes L. Braams.
+-- Copyright (C) 2012-2018 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.
diff --git a/Master/texmf-dist/tex/generic/babel/babel-bidi.lua b/Master/texmf-dist/tex/generic/babel/babel-bidi.lua
index f2fc552eda6..54b6ac3ed9f 100644
--- a/Master/texmf-dist/tex/generic/babel/babel-bidi.lua
+++ b/Master/texmf-dist/tex/generic/babel/babel-bidi.lua
@@ -7,7 +7,7 @@
 -- babel.dtx  (with options: `bidi')
 -- 
 --
--- Copyright (C) 2012-2017 Javier Bezos and Johannes L. Braams.
+-- Copyright (C) 2012-2018 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.
diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def
index 1d6c7c725d5..62dfa7ed7c0 100644
--- a/Master/texmf-dist/tex/generic/babel/babel.def
+++ b/Master/texmf-dist/tex/generic/babel/babel.def
@@ -7,7 +7,7 @@
 %% babel.dtx  (with options: `core')
 %% 
 %%
-%% Copyright (C) 2012-2017 Javier Bezos and Johannes L. Braams.
+%% Copyright (C) 2012-2018 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.
@@ -40,18 +40,36 @@
     \wlog{File: #1 #4 #3 <#2>}%
     \let\ProvidesFile\@undefined}
 \fi
-\ProvidesFile{babel.def}[2018/01/24 3.17 Babel common definitions]
+\ProvidesFile{babel.def}[2018/02/14 3.18 Babel common definitions]
 \ifx\AtBeginDocument\@undefined
   \input plain.def\relax
 \fi
 \ifx\bbl@ifshorthand\@undefined
+  \let\bbl@opt@shorthands\@nnil
   \def\bbl@ifshorthand#1#2#3{#2}%
-  \def\bbl@opt@safe{BR}
+  \let\bbl@language@opts\@empty
+  \ifx\babeloptionstrings\@undefined
+    \let\bbl@opt@strings\@nnil
+  \else
+    \let\bbl@opt@strings\babeloptionstrings
+  \fi
+  \def\BabelStringsDefault{generic}
+  \def\bbl@tempa{normal}
+  \ifx\babeloptionmath\bbl@tempa
+    \def\bbl@mathnormal{\noexpand\textormath}
+  \fi
   \def\AfterBabelLanguage#1#2{}
+  \ifx\BabelModifiers\@undefined\let\BabelModifiers\relax\fi
   \let\bbl@afterlang\relax
-  \let\bbl@language@opts\@empty
+  \def\bbl@opt@safe{BR}
+  \ifx\@uclclist\@undefined\let\@uclclist\@empty\fi
+  \ifx\bbl@trace\@undefined\def\bbl@trace#1{}\fi
 \fi
-\input switch.def\relax
+\ifx\bbl@switchflag\@undefined % Prevent double input
+  \let\bbl@switchflag\relax
+  \input switch.def\relax
+\fi
+\bbl@trace{Compatibility with language.def}
 \ifx\bbl@languages\@undefined
   \ifx\directlua\@undefined
     \openin1 = language.def
@@ -78,6 +96,7 @@
     \input luababel.def
   \fi
 \fi
+\bbl@trace{Basic macros}
 \def\bbl@stripslash{\expandafter\@gobble\string}
 \def\bbl@add#1#2{%
   \bbl@ifunset{\bbl@stripslash#1}%
@@ -228,6 +247,7 @@
     {\bbl@exp{\let\<org@\bbl@tempa>\<\bbl@tempa\space>}}%
     \@namedef{\bbl@tempa\space}}
 \@onlypreamble\bbl@redefinerobust
+\bbl@trace{Hooks}
 \def\AddBabelHook#1#2{%
   \bbl@ifunset{bbl@hk@#1}{\EnableBabelHook{#1}}{}%
   \def\bbl@tempa##1,#2=##2,##3\@empty{\def\bbl@tempb{##2}}%
@@ -249,6 +269,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,foreign=0,foreign*=0}
+\bbl@trace{Defining babelensure}
 \newcommand\babelensure[2][]{%  TODO - revise test files
   \AddBabelHook{babel-ensure}{afterextras}{%
     \ifcase\bbl@select@type
@@ -308,6 +329,7 @@
   \contentsname\listfigurename\listtablename\indexname\figurename
   \tablename\partname\enclname\ccname\headtoname\pagename\seename
   \alsoname\proofname\glossaryname}
+\bbl@trace{Macros for setting language files up}
 \def\bbl@ldfinit{%
   \let\bbl@screset\@empty
   \let\BabelStrings\bbl@opt@string
@@ -366,6 +388,7 @@
   \else
     \select@language{#1}%
   \fi}
+\bbl@trace{Shorhands}
 \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}}%
@@ -683,6 +706,7 @@
 \ifx\f@encoding\@undefined
   \def\f@encoding{OT1}
 \fi
+\bbl@trace{Language attributes}
 \newcommand\languageattribute[2]{%
   \def\bbl@tempc{#1}%
   \bbl@fixname\bbl@tempc
@@ -749,6 +773,7 @@
 \def\bbl@clear@ttrib#1-#2.{%
   \expandafter\let\csname#1@attr@#2\endcsname\@undefined}
 \AtBeginDocument{\bbl@clear@ttribs}
+\bbl@trace{Macros for saving definitions}
 \def\babel@beginsave{\babel@savecnt\z@}
 \newcount\babel@savecnt
 \babel@beginsave
@@ -769,6 +794,7 @@
     \let\bbl@nonfrenchspacing\nonfrenchspacing
   \fi}
 \let\bbl@nonfrenchspacing\nonfrenchspacing
+\bbl@trace{Short tags}
 \def\babeltags#1{%
   \edef\bbl@tempa{\zap@space#1 \@empty}%
   \def\bbl@tempb##1=##2\@@{%
@@ -783,6 +809,7 @@
     \bbl@tempc}%
   \bbl@for\bbl@tempa\bbl@tempa{%
     \expandafter\bbl@tempb\bbl@tempa\@@}}
+\bbl@trace{Hyphens}
 \@onlypreamble\babelhyphenation
 \AtEndOfPackage{%
   \newcommand\babelhyphenation[2][\@empty]{%
@@ -846,6 +873,7 @@
 \def\bbl@hy@empty{\hskip\z@skip}
 \def\bbl@hy@@empty{\discretionary{}{}{}}
 \def\bbl@disc#1#2{\nobreak\discretionary{#2-}{}{#1}\bbl@allowhyphens}
+\bbl@trace{Multiencoding strings}
 \def\bbl@toglobal#1{\global\let#1#1}
 \def\bbl@recatcode#1{%
   \@tempcnta="7F
@@ -1070,6 +1098,7 @@
     \bbl@xin@{,}{\bbl@language@opts}%
     \chardef\bbl@opt@hyphenmap\ifin@4\else\@ne\fi
   \fi}
+\bbl@trace{Macros related to glyphs}
 \def\set@low@box#1{\setbox\tw@\hbox{,}\setbox\z@\hbox{#1}%
     \dimen\z@\ht\z@ \advance\dimen\z@ -\ht\tw@%
     \setbox\z@\hbox{\lower\dimen\z@ \box\z@}\ht\z@\ht\tw@ \dp\z@\dp\tw@}
@@ -1227,6 +1256,7 @@
   \chardef\l@english\z@
 \fi
 \main@language{english}
+\bbl@trace{Bidi layout}
 \providecommand\IfBabelLayout[3]{#3}%
 \newcommand\BabelPatchSection[1]{%
   \@ifundefined{#1}{}{%
@@ -1237,6 +1267,7 @@
 \def\bbl@presec@x#1[#2]#3{%
   \bbl@exp{%
     \\\select@language@x{\bbl@main@language}%
+    \\\@nameuse{bbl@sspre@#1}%
     \\\@nameuse{bbl@ss@#1}%
       [\\\foreignlanguage{\languagename}{\unexpanded{#2}}]%
       {\\\foreignlanguage{\languagename}{\unexpanded{#3}}}%
@@ -1244,10 +1275,11 @@
 \def\bbl@presec@s#1#2{%
   \bbl@exp{%
     \\\select@language@x{\bbl@main@language}%
+    \\\@nameuse{bbl@sspre@#1}%
     \\\@nameuse{bbl@ss@#1}*%
       {\\\foreignlanguage{\languagename}{\unexpanded{#2}}}%
     \\\select@language@x{\languagename}}}
-\IfBabelLayout{sectioning}%   at begin document ???
+\IfBabelLayout{sectioning}%
   {\BabelPatchSection{part}%
    \BabelPatchSection{chapter}%
    \BabelPatchSection{section}%
@@ -1257,6 +1289,9 @@
    \BabelPatchSection{subparagraph}%
    \def\babel@toc#1{%
      \select@language@x{\bbl@main@language}}}{}
+\IfBabelLayout{captions}%
+  {\BabelPatchSection{caption}}{}
+\bbl@trace{Input engine specific macros}
 \ifcase\bbl@engine
   \input txtbabel.def
 \or
@@ -1264,15 +1299,7 @@
 \or
   \input xebabel.def
 \fi
-{\def\format{lplain}
-\ifx\fmtname\format
-\else
-  \def\format{LaTeX2e}
-  \ifx\fmtname\format
-  \else
-    \aftergroup\endinput
-  \fi
-\fi}
+\bbl@trace{Creating languages and reading ini files}
 \newcommand\babelprovide[2][]{%
   \let\bbl@savelangname\languagename
   \def\languagename{#2}%
@@ -1563,6 +1590,16 @@
       \bbl@read@ini{##1}%
     \endgroup}%           boxed, to avoid extra spaces:
   {\setbox\z@\hbox{\InputIfFileExists{babel-#1.tex}{}{}}}}
+{\def\format{lplain}
+\ifx\fmtname\format
+\else
+  \def\format{LaTeX2e}
+  \ifx\fmtname\format
+  \else
+    \aftergroup\endinput
+  \fi
+\fi}
+\bbl@trace{Cross referencing macros}
 \ifx\bbl@opt@safe\@empty\else
   \def\@newl@bel#1#2#3{%
    {\@safe@activestrue
@@ -1640,6 +1677,7 @@
   \let\org@bibcite\bibcite
   \let\org@@bibitem\@bibitem
 \fi
+\bbl@trace{Marks}
 \IfBabelLayout{sectioning}
   {\ifx\bbl@opt@headfoot\@nnil
      \g@addto@macro\@resetactivechars{%
@@ -1670,6 +1708,7 @@
        {\@temptokena\expandafter{\bbl@tempb{#2}}}%
      \bbl@exp{\\\org@markboth{\the\toks@}{\the\@temptokena}}}
    \bbl@tempc}  % end \IfBabelLayout
+\bbl@trace{Preventing clashes with other packages}
 \bbl@xin@{R}\bbl@opt@safe
 \ifin@
   \AtBeginDocument{%
@@ -1741,6 +1780,7 @@
   \closeout15
   }
 \@onlypreamble\substitutefontfamily
+\bbl@trace{Encoding and fonts}
 \newcommand\BabelNonASCII{LGR,X2,OT2,OT3,OT6,LHE,LWN,LMA,LMC,LMS,LMU,}
 \let\org@TeX\TeX
 \let\org@LaTeX\LaTeX
@@ -1798,6 +1838,7 @@
 \else
   \DeclareTextFontCommand{\textlatin}{\latintext}
 \fi
+\bbl@trace{Basic (internal) bidi support}
 \def\bbl@alscripts{,Arabic,Syriac,Thaana,}
 \def\bbl@rscripts{%
   ,Imperial Aramaic,Avestan,Cypriot,Hatran,Hebrew,%
@@ -1915,6 +1956,7 @@
     \bbl@severypar{\bbl@xeeverypar\the\everypar}}
 \fi
 \DeclareRobustCommand\babelsublr[1]{\leavevmode{\bbl@textdir\z@#1}}
+\bbl@trace{Local Language Configuration}
 \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 b95260eb477..2c3d5df23c5 100644
--- a/Master/texmf-dist/tex/generic/babel/babel.sty
+++ b/Master/texmf-dist/tex/generic/babel/babel.sty
@@ -7,7 +7,7 @@
 %% babel.dtx  (with options: `package')
 %% 
 %%
-%% Copyright (C) 2012-2017 Javier Bezos and Johannes L. Braams.
+%% Copyright (C) 2012-2018 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.
@@ -32,16 +32,22 @@
 %% extension |.ins|) which are part of the distribution.
 %%
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
-\ProvidesPackage{babel}[2018/01/24 3.17 The Babel package]
+\ProvidesPackage{babel}[2018/02/14 3.18 The Babel package]
 \@ifpackagewith{babel}{debug}
-  {\let\bbl@debug\@firstofone}
-  {\let\bbl@debug\@gobble}
-\input switch.def\relax
+  {\providecommand\bbl@trace[1]{\message{^^J[ #1 ]}}%
+   \let\bbl@debug\@firstofone}
+  {\providecommand\bbl@trace[1]{}%
+   \let\bbl@debug\@gobble}
+\ifx\bbl@switchflag\@undefined % Prevent double input
+  \let\bbl@switchflag\relax
+  \input switch.def\relax
+\fi
 \ifx\directlua\@undefined\else
   \ifx\bbl@luapatterns\@undefined
     \input luababel.def
   \fi
 \fi
+\bbl@trace{Basic macros}
 \def\bbl@stripslash{\expandafter\@gobble\string}
 \def\bbl@add#1#2{%
   \bbl@ifunset{\bbl@stripslash#1}%
@@ -198,6 +204,7 @@
         luatexbase.priority_in_callback('hpack_filter',
           'luaotfload.node_processor') or nil)}}{}
 \fi
+\bbl@trace{Defining option 'base'}
 \@ifpackagewith{babel}{base}{%
   \ifx\directlua\@undefined
     \DeclareOption*{\bbl@patterns{\CurrentOption}}%
@@ -212,6 +219,7 @@
   \global\let\@ifl@ter@@\@ifl@ter
   \def\@ifl@ter#1#2#3#4#5{\global\let\@ifl@ter\@ifl@ter@@}%
   \endinput}{}%
+\bbl@trace{key=value and another general options}
 \bbl@csarg\let{tempa\expandafter}\csname opt@babel.sty\endcsname
 \def\bbl@tempb#1.#2{%
    #1\ifx\@empty#2\else,\bbl@afterfi\bbl@tempb#2\fi}%
@@ -305,6 +313,7 @@
     \bbl@add@list\bbl@language@opts{\CurrentOption}%
   \fi}
 \ProcessOptions*
+\bbl@trace{Conditional loading of shorthands}
 \def\bbl@sh@string#1{%
   \ifx#1\@empty\else
     \ifx#1t\string~%
@@ -346,6 +355,7 @@
     \ifx\bbl@language@opts\@empty\else\bbl@language@opts,\fi
       \bbl@opt@main}
 \fi
+\bbl@trace{Defining IfBabelLayout}
 \ifx\bbl@opt@layout\@nnil
   \newcommand\IfBabelLayout[3]{#3}%
 \else
@@ -357,6 +367,7 @@
       \expandafter\@secondoftwo
     \fi}
 \fi
+\bbl@trace{Language options}
 \let\bbl@afterlang\relax
 \let\BabelModifiers\relax
 \let\bbl@loaded\@empty
diff --git a/Master/texmf-dist/tex/generic/babel/blplain.tex b/Master/texmf-dist/tex/generic/babel/blplain.tex
index c073dc47925..9c7a14215d3 100644
--- a/Master/texmf-dist/tex/generic/babel/blplain.tex
+++ b/Master/texmf-dist/tex/generic/babel/blplain.tex
@@ -7,7 +7,7 @@
 %% babel.dtx  (with options: `blplain')
 %% 
 %%
-%% Copyright (C) 2012-2017 Javier Bezos and Johannes L. Braams.
+%% Copyright (C) 2012-2018 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.
diff --git a/Master/texmf-dist/tex/generic/babel/bplain.tex b/Master/texmf-dist/tex/generic/babel/bplain.tex
index 70da67552f8..57c5be41992 100644
--- a/Master/texmf-dist/tex/generic/babel/bplain.tex
+++ b/Master/texmf-dist/tex/generic/babel/bplain.tex
@@ -7,7 +7,7 @@
 %% babel.dtx  (with options: `bplain')
 %% 
 %%
-%% Copyright (C) 2012-2017 Javier Bezos and Johannes L. Braams.
+%% Copyright (C) 2012-2018 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.
diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg
index 98d4fa97d73..16d728edcd4 100644
--- a/Master/texmf-dist/tex/generic/babel/hyphen.cfg
+++ b/Master/texmf-dist/tex/generic/babel/hyphen.cfg
@@ -7,7 +7,7 @@
 %% babel.dtx  (with options: `patterns')
 %% 
 %%
-%% Copyright (C) 2012-2017 Javier Bezos and Johannes L. Braams.
+%% Copyright (C) 2012-2018 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.
@@ -36,7 +36,7 @@
     \wlog{File: #1 #4 #3 <#2>}%
     \let\ProvidesFile\@undefined}
 \fi
-\ProvidesFile{hyphen.cfg}[2018/01/24 3.17 Babel hyphens]
+\ProvidesFile{hyphen.cfg}[2018/02/14 3.18 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.17> and hyphenation patterns for }%
+\toks8{Babel <3.18> 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/ar/babel-ar-DZ.ini b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar-DZ.ini
new file mode 100644
index 00000000000..2fee81351fe
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar-DZ.ini
@@ -0,0 +1,153 @@
+; This file is part of babel. For further details see:
+;   https://www.ctan.org/pkg/babel
+; Data has been collected mainly from the following sources:
+; * babel language styles (license LPPL):
+;   https://www.ctan.org/pkg/babel-contrib
+; * polyglossia language styles (license LPPL)
+;   https://www.ctan.org/pkg/polyglossia
+; * Common Locale Data Repository (license Unicode):
+;   http://cldr.unicode.org/
+;   http://unicode.org/copyright.html
+
+[identification]
+charset = utf8
+version = 1.0
+date = 2018-02-05
+name.local = العربية
+name.english = Arabic
+name.babel = arabic-dz
+name.babel.A = arabic-algeria
+tag.bcp47 = ar
+tag.opentype = ARA
+region.local = الجزائر
+region.english = Algeria
+region.tag.bcp47 = DZ
+script.name = Arabic
+script.tag.bcp47 = Arab
+script.tag.opentype = arab
+level = 1
+encodings = 
+derivate = no
+
+[captions]
+preface = مدخل
+ref = المراجع
+abstract = ملخص
+bib = المصادر
+chapter = باب
+appendix = الملاحق
+contents = المحتويات
+listfigure = قائمة الأشكال
+listtable = قائمة الجداول
+index = الفهرس
+figure = شكل
+table = جدول
+part = القسم
+encl = المرفقات
+cc = نسخة ل‬
+headto = إلى
+page = صفحة
+see = راجع
+also = راجع أيضًا
+proof = برهان
+glossary = قاموس
+
+[date.gregorian]
+date.long = [d] [MMMM]، [y]
+date.short = [d]‏/[M]‏/[y]
+months.wide.1 = جانفي
+months.wide.2 = فيفري
+months.wide.3 = مارس
+months.wide.4 = أفريل
+months.wide.5 = ماي
+months.wide.6 = جوان
+months.wide.7 = جويلية
+months.wide.8 = أوت
+months.wide.9 = سبتمبر
+months.wide.10 = أكتوبر
+months.wide.11 = نوفمبر
+months.wide.12 = ديسمبر
+months.narrow.1 = ج
+months.narrow.2 = ف
+months.narrow.3 = م
+months.narrow.4 = أ
+months.narrow.5 = م
+months.narrow.6 = ج
+months.narrow.7 = ج
+months.narrow.8 = أ
+months.narrow.9 = س
+months.narrow.10 = أ
+months.narrow.11 = ن
+months.narrow.12 = د
+days.wide.mon = الاثنين
+days.wide.tue = الثلاثاء
+days.wide.wed = الأربعاء
+days.wide.thu = الخميس
+days.wide.fri = الجمعة
+days.wide.sat = السبت
+days.wide.sun = الأحد
+days.abbreviated.mon = الاثنين
+days.abbreviated.tue = الثلاثاء
+days.abbreviated.wed = الأربعاء
+days.abbreviated.thu = الخميس
+days.abbreviated.fri = الجمعة
+days.abbreviated.sat = السبت
+days.abbreviated.sun = الأحد
+days.narrow.mon = ن
+days.narrow.tue = ث
+days.narrow.wed = ر
+days.narrow.thu = خ
+days.narrow.fri = ج
+days.narrow.sat = س
+days.narrow.sun = ح
+dayPeriods.abbreviated.am = ص
+dayPeriods.abbreviated.pm = م
+dayPeriods.narrow.am = ص
+dayPeriods.narrow.pm = م
+dayPeriods.wide.am = ص
+dayPeriods.wide.pm = م
+
+[time.gregorian]
+time.medium = [h]:[mm]:[ss] [a]
+time.short = [h]:[mm] [a]
+
+[typography]
+frenchspacing = 
+hyphenrules = 
+lefthyphenmin = 
+righthyphenmin = 
+hyphenchar = 
+prehyphenchar = 
+posthyphenchar = 
+exhyphenchar = 
+preexhyphenchar = 
+postexhyphenchar = 
+hyphenationmin = 
+
+[characters]
+delimiters.quotes = ”“’‘
+auxiliary = [\u200C\u200D\u200E\u200F پ چ ژ ڜ ڢ ڤ ڥ ٯ ڧ ڨ ک گ ی]
+exemplarCharacters = [\u064B \u064C \u064D \u064E \u064F \u0650 \u0651 \u0652 \u0670 ء أ ؤ إ ئ ا آ ب ة ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ك ل م ن ه و ى ي]
+index = [ا ب ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ك ل م ن ه و ي]
+punctuation = [\\- ‐ – — ، ؛ \\: ! ؟ . ' \" ( ) \\[ \\]]
+
+[numbers]
+defaultNumberingSystem = latn
+minimumGroupingDigits = 1
+decimal = ,
+exponential = E
+group = .
+infinity = ∞
+list = ;
+minusSign = ‎-
+nan = ليس رقمًا
+perMille = ‰
+percentSign = ‎%‎
+plusSign = ‎+
+superscriptingExponent = ×
+
+[counters]
+alph = 
+Alph = 
+ordinals = 
+
diff --git a/Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar-MA.ini b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar-MA.ini
new file mode 100644
index 00000000000..00ffc97cfba
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar-MA.ini
@@ -0,0 +1,153 @@
+; This file is part of babel. For further details see:
+;   https://www.ctan.org/pkg/babel
+; Data has been collected mainly from the following sources:
+; * babel language styles (license LPPL):
+;   https://www.ctan.org/pkg/babel-contrib
+; * polyglossia language styles (license LPPL)
+;   https://www.ctan.org/pkg/polyglossia
+; * Common Locale Data Repository (license Unicode):
+;   http://cldr.unicode.org/
+;   http://unicode.org/copyright.html
+
+[identification]
+charset = utf8
+version = 1.0
+date = 2018-02-05
+name.local = العربية
+name.english = Arabic
+name.babel = arabic-ma
+name.babel.A = arabic-morocco
+tag.bcp47 = ar
+tag.opentype = ARA
+region.local = المغرب
+region.english = Morocco
+region.tag.bcp47 = MA
+script.name = Arabic
+script.tag.bcp47 = Arab
+script.tag.opentype = arab
+level = 1
+encodings = 
+derivate = no
+
+[captions]
+preface = مدخل
+ref = المراجع
+abstract = ملخص
+bib = المصادر
+chapter = باب
+appendix = الملاحق
+contents = المحتويات
+listfigure = قائمة الأشكال
+listtable = قائمة الجداول
+index = الفهرس
+figure = شكل
+table = جدول
+part = القسم
+encl = المرفقات
+cc = نسخة ل‬
+headto = إلى
+page = صفحة
+see = راجع
+also = راجع أيضًا
+proof = برهان
+glossary = قاموس
+
+[date.gregorian]
+date.long = [d] [MMMM]، [y]
+date.short = [d]‏/[M]‏/[y]
+months.wide.1 = يناير
+months.wide.2 = فبراير
+months.wide.3 = مارس
+months.wide.4 = أبريل
+months.wide.5 = ماي
+months.wide.6 = يونيو
+months.wide.7 = يوليوز
+months.wide.8 = غشت
+months.wide.9 = شتنبر
+months.wide.10 = أكتوبر
+months.wide.11 = نونبر
+months.wide.12 = دجنبر
+months.narrow.1 = ي
+months.narrow.2 = ف
+months.narrow.3 = م
+months.narrow.4 = أ
+months.narrow.5 = م
+months.narrow.6 = ن
+months.narrow.7 = ل
+months.narrow.8 = غ
+months.narrow.9 = ش
+months.narrow.10 = ك
+months.narrow.11 = ب
+months.narrow.12 = د
+days.wide.mon = الاثنين
+days.wide.tue = الثلاثاء
+days.wide.wed = الأربعاء
+days.wide.thu = الخميس
+days.wide.fri = الجمعة
+days.wide.sat = السبت
+days.wide.sun = الأحد
+days.abbreviated.mon = الاثنين
+days.abbreviated.tue = الثلاثاء
+days.abbreviated.wed = الأربعاء
+days.abbreviated.thu = الخميس
+days.abbreviated.fri = الجمعة
+days.abbreviated.sat = السبت
+days.abbreviated.sun = الأحد
+days.narrow.mon = ن
+days.narrow.tue = ث
+days.narrow.wed = ر
+days.narrow.thu = خ
+days.narrow.fri = ج
+days.narrow.sat = س
+days.narrow.sun = ح
+dayPeriods.abbreviated.am = ص
+dayPeriods.abbreviated.pm = م
+dayPeriods.narrow.am = ص
+dayPeriods.narrow.pm = م
+dayPeriods.wide.am = ص
+dayPeriods.wide.pm = م
+
+[time.gregorian]
+time.medium = [HH]:[mm]:[ss]
+time.short = [HH]:[mm]
+
+[typography]
+frenchspacing = 
+hyphenrules = 
+lefthyphenmin = 
+righthyphenmin = 
+hyphenchar = 
+prehyphenchar = 
+posthyphenchar = 
+exhyphenchar = 
+preexhyphenchar = 
+postexhyphenchar = 
+hyphenationmin = 
+
+[characters]
+delimiters.quotes = ”“’‘
+auxiliary = [\u200C\u200D\u200E\u200F پ چ ژ ڜ ڢ ڤ ڥ ٯ ڧ ڨ ک ڭ گ ݣ ی]
+exemplarCharacters = [\u064B \u064C \u064D \u064E \u064F \u0650 \u0651 \u0652 \u0670 ء أ ؤ إ ئ ا آ ب ة ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ك ل م ن ه و ى ي]
+index = [ا ب ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ك ل م ن ه و ي]
+punctuation = [\\- ‐ – — ، ؛ \\: ! ؟ . ' \" ( ) \\[ \\]]
+
+[numbers]
+defaultNumberingSystem = latn
+minimumGroupingDigits = 1
+decimal = ,
+exponential = E
+group = .
+infinity = ∞
+list = ;
+minusSign = ‎-
+nan = ليس رقمًا
+perMille = ‰
+percentSign = ‎%‎
+plusSign = ‎+
+superscriptingExponent = ×
+
+[counters]
+alph = 
+Alph = 
+ordinals = 
+
diff --git a/Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar-SY.ini b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar-SY.ini
new file mode 100644
index 00000000000..46788019d47
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar-SY.ini
@@ -0,0 +1,151 @@
+; This file is part of babel. For further details see:
+;   https://www.ctan.org/pkg/babel
+; Data has been collected mainly from the following sources:
+; * babel language styles (license LPPL):
+;   https://www.ctan.org/pkg/babel-contrib
+; * polyglossia language styles (license LPPL)
+;   https://www.ctan.org/pkg/polyglossia
+; * Common Locale Data Repository (license Unicode):
+;   http://cldr.unicode.org/
+;   http://unicode.org/copyright.html
+
+[identification]
+charset = utf8
+version = 1.0
+date = 2018-02-05
+name.local = العربية
+name.english = Arabic
+name.babel = arabic-sy
+name.babel.A = arabic-syria
+tag.bcp47 = ar
+tag.opentype = ARA
+region.local = سوريا
+region.english = Syria
+region.tag.bcp47 = SY
+script.name = Arabic
+script.tag.bcp47 = Arab
+script.tag.opentype = arab
+level = 1
+encodings = 
+derivate = no
+
+[captions]
+preface = مدخل
+ref = المراجع
+abstract = ملخص
+bib = المصادر
+chapter = باب
+appendix = الملاحق
+contents = المحتويات
+listfigure = قائمة الأشكال
+listtable = قائمة الجداول
+index = الفهرس
+figure = شكل
+table = جدول
+part = القسم
+encl = المرفقات
+cc = نسخة ل‬
+headto = إلى
+page = صفحة
+see = راجع
+also = راجع أيضًا
+proof = برهان
+glossary = قاموس
+
+[date.gregorian]
+months.wide.1 = كانون الثاني
+months.wide.2 = شباط
+months.wide.3 = آذار
+months.wide.4 = نيسان
+months.wide.5 = أيار
+months.wide.6 = حزيران
+months.wide.7 = تموز
+months.wide.8 = آب
+months.wide.9 = أيلول
+months.wide.10 = تشرين الأول
+months.wide.11 = تشرين الثاني
+months.wide.12 = كانون الأول
+months.narrow.1 = ك
+months.narrow.2 = ش
+months.narrow.3 = آ
+months.narrow.4 = ن
+months.narrow.5 = أ
+months.narrow.6 = ح
+months.narrow.7 = ت
+months.narrow.8 = آ
+months.narrow.9 = أ
+months.narrow.10 = ت
+months.narrow.11 = ت
+months.narrow.12 = ك
+days.wide.mon = الاثنين
+days.wide.tue = الثلاثاء
+days.wide.wed = الأربعاء
+days.wide.thu = الخميس
+days.wide.fri = الجمعة
+days.wide.sat = السبت
+days.wide.sun = الأحد
+days.abbreviated.mon = الاثنين
+days.abbreviated.tue = الثلاثاء
+days.abbreviated.wed = الأربعاء
+days.abbreviated.thu = الخميس
+days.abbreviated.fri = الجمعة
+days.abbreviated.sat = السبت
+days.abbreviated.sun = الأحد
+days.narrow.mon = ن
+days.narrow.tue = ث
+days.narrow.wed = ر
+days.narrow.thu = خ
+days.narrow.fri = ج
+days.narrow.sat = س
+days.narrow.sun = ح
+dayPeriods.abbreviated.am = ص
+dayPeriods.abbreviated.pm = م
+dayPeriods.narrow.am = ص
+dayPeriods.narrow.pm = م
+dayPeriods.wide.am = ص
+dayPeriods.wide.pm = م
+
+[time.gregorian]
+time.medium = [h]:[mm]:[ss] [a]
+time.short = [h]:[mm] [a]
+
+[typography]
+frenchspacing = 
+hyphenrules = 
+lefthyphenmin = 
+righthyphenmin = 
+hyphenchar = 
+prehyphenchar = 
+posthyphenchar = 
+exhyphenchar = 
+preexhyphenchar = 
+postexhyphenchar = 
+hyphenationmin = 
+
+[characters]
+delimiters.quotes = ”“’‘
+auxiliary = [\u200C\u200D\u200E\u200F پ چ ژ ڜ ڢ ڤ ڥ ٯ ڧ ڨ ک گ ی]
+exemplarCharacters = [\u064B \u064C \u064D \u064E \u064F \u0650 \u0651 \u0652 \u0670 ء أ ؤ إ ئ ا آ ب ة ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ك ل م ن ه و ى ي]
+index = [ا ب ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ك ل م ن ه و ي]
+punctuation = [\\- ‐ – — ، ؛ \\: ! ؟ . ' \" ( ) \\[ \\]]
+
+[numbers]
+defaultNumberingSystem = arab
+minimumGroupingDigits = 1
+decimal = .
+exponential = E
+group = ,
+infinity = ∞
+list = ;
+minusSign = ‎-
+nan = ليس رقمًا
+perMille = ‰
+percentSign = ‎%‎
+plusSign = ‎+
+superscriptingExponent = ×
+
+[counters]
+alph = 
+Alph = 
+ordinals = 
+
diff --git a/Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar.ini b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar.ini
index e986941e941..3b7cb6f0ee8 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar.ini
+++ b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar.ini
@@ -11,8 +11,8 @@
 
 [identification]
 charset = utf8
-version = 1.0
-date = 2017-09-01
+version = 1.1
+date = 2018-02-05
 name.local = العربية
 name.english = Arabic
 name.babel = arabic
@@ -32,7 +32,7 @@ abstract = ملخص
 bib = المصادر
 chapter = باب
 appendix = الملاحق
-contents = الفهرس
+contents = المحتويات
 listfigure = قائمة الأشكال
 listtable = قائمة الجداول
 index = الفهرس
diff --git a/Master/texmf-dist/tex/generic/babel/locale/ar/babel-arabic-algeria.tex b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-arabic-algeria.tex
new file mode 100644
index 00000000000..93b4bcb2fc6
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-arabic-algeria.tex
@@ -0,0 +1,12 @@
+% This file is part of babel. For further details see:
+% https://www.ctan.org/pkg/babel
+\ifx\BabelBeforeIni\undefined
+  \PackageError{babel}%
+    {This file is a component of babel and cannot\MessageBreak
+     be loaded directly. I'll stop immediately}%
+    {Just use babel as documented.}%
+  \stop
+\fi
+\BabelBeforeIni{ar-DZ}{%
+}
+\endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/ar/babel-arabic-dz.tex b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-arabic-dz.tex
new file mode 100644
index 00000000000..eb659bd580c
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-arabic-dz.tex
@@ -0,0 +1,4 @@
+% This file is part of babel. For further details see:
+% https://www.ctan.org/pkg/babel
+\input{babel-arabic-algeria}
+\endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/ar/babel-arabic-ma.tex b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-arabic-ma.tex
new file mode 100644
index 00000000000..4c9f811fcac
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-arabic-ma.tex
@@ -0,0 +1,4 @@
+% This file is part of babel. For further details see:
+% https://www.ctan.org/pkg/babel
+\input{babel-arabic-morocco}
+\endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/ar/babel-arabic-morocco.tex b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-arabic-morocco.tex
new file mode 100644
index 00000000000..eb6b8efa262
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-arabic-morocco.tex
@@ -0,0 +1,12 @@
+% This file is part of babel. For further details see:
+% https://www.ctan.org/pkg/babel
+\ifx\BabelBeforeIni\undefined
+  \PackageError{babel}%
+    {This file is a component of babel and cannot\MessageBreak
+     be loaded directly. I'll stop immediately}%
+    {Just use babel as documented.}%
+  \stop
+\fi
+\BabelBeforeIni{ar-MA}{%
+}
+\endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/ar/babel-arabic-sy.tex b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-arabic-sy.tex
new file mode 100644
index 00000000000..a073afaeed9
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-arabic-sy.tex
@@ -0,0 +1,4 @@
+% This file is part of babel. For further details see:
+% https://www.ctan.org/pkg/babel
+\input{babel-arabic-syria}
+\endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/locale/ar/babel-arabic-syria.tex b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-arabic-syria.tex
new file mode 100644
index 00000000000..dab1df681fb
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-arabic-syria.tex
@@ -0,0 +1,12 @@
+% This file is part of babel. For further details see:
+% https://www.ctan.org/pkg/babel
+\ifx\BabelBeforeIni\undefined
+  \PackageError{babel}%
+    {This file is a component of babel and cannot\MessageBreak
+     be loaded directly. I'll stop immediately}%
+    {Just use babel as documented.}%
+  \stop
+\fi
+\BabelBeforeIni{ar-SY}{%
+}
+\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 7e09edcd9d8..447e2919076 100644
--- a/Master/texmf-dist/tex/generic/babel/luababel.def
+++ b/Master/texmf-dist/tex/generic/babel/luababel.def
@@ -7,7 +7,7 @@
 %% babel.dtx  (with options: `luatex')
 %% 
 %%
-%% Copyright (C) 2012-2017 Javier Bezos and Johannes L. Braams.
+%% Copyright (C) 2012-2018 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.
@@ -32,6 +32,7 @@
 %% extension |.ins|) which are part of the distribution.
 %%
 \ifx\AddBabelHook\@undefined
+\bbl@trace{Read language.dat}
 \begingroup
   \toks@{}
   \count@\z@ % 0=start, 1=0th, 2=normal
@@ -112,6 +113,7 @@
     \repeat
   \fi
 \endgroup
+\bbl@trace{Macros for reading patterns files}
 \def\bbl@get@enc#1:#2:#3\@@@{\def\bbl@hyph@enc{#2}}
 \ifx\babelcatcodetablenum\@undefined
   \def\babelcatcodetablenum{5211}
@@ -335,6 +337,7 @@
 \ifx\DisableBabelHook\@undefined\endinput\fi
 \AddBabelHook{babel-fontspec}{afterextras}{\bbl@switchfont}
 \DisableBabelHook{babel-fontspec}
+\bbl@trace{Font handling with fontspec}
 \@onlypreamble\babelfont
 \newcommand\babelfont[2][]{%  1=langs/scripts 2=fam
   \edef\bbl@tempa{#1}%
@@ -448,8 +451,25 @@
   \expandafter\addto\csname extras#1\endcsname{%
     \babel@save\bbl@langfeatures
     \edef\bbl@langfeatures{#2,}}}
+\bbl@trace{Redefinitions for bidi layout}
 \ifx\bbl@opt@layout\@nnil\endinput\fi  % if no layout
 \ifx\bbl@beforeforeign\leavevmode % A poor test for bidi=
+  \def\bbl@nextfake#1{%
+    \mathdir\bodydir  % non-local, use always inside a group!
+    \bbl@exp{%
+      #1%              Once entered in math, set boxes to restore values
+      \everyvbox{%
+        \the\everyvbox
+        \bodydir\the\bodydir
+        \mathdir\the\mathdir
+        \everyhbox{\the\everyhbox}%
+        \everyvbox{\the\everyvbox}}%
+      \everyhbox{%
+        \the\everyhbox
+        \bodydir\the\bodydir
+        \mathdir\the\mathdir
+        \everyhbox{\the\everyhbox}%
+        \everyvbox{\the\everyvbox}}}}%
   \def\@hangfrom#1{%
     \setbox\@tempboxa\hbox{{#1}}%
     \hangindent\wd\@tempboxa
@@ -458,6 +478,12 @@
     \fi
     \noindent\box\@tempboxa}
 \fi
+\IfBabelLayout{tabular}
+  {\def\@tabular{%
+     \leavevmode\hbox\bgroup\bbl@nextfake$%
+     \let\@acol\@tabacol       \let\@classz\@tabclassz
+     \let\@classiv\@tabclassiv \let\\\@tabularcr\@tabarray}}
+  {}
 \IfBabelLayout{lists}
   {\def\list#1#2{%
      \ifnum \@listdepth >5\relax
@@ -500,6 +526,7 @@
       \def\@Roman#1{\babelsublr{\ensureascii{\bbl@asciiRoman#1}}}%
       \def\labelenumii{)\theenumii(}%
       \def\p@enumiii{\p@enumii)\theenumii(}}{}}{}
+\bbl@trace{Bidi footnotes}
 \ifx\bbl@beforeforeign\leavevmode
   \def\bbl@footnote#1#2#3{%
     \@ifnextchar[%
diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf
index f11e9b3820b..5f9fb22e75a 100644
--- a/Master/texmf-dist/tex/generic/babel/nil.ldf
+++ b/Master/texmf-dist/tex/generic/babel/nil.ldf
@@ -7,7 +7,7 @@
 %% babel.dtx  (with options: `nil')
 %% 
 %%
-%% Copyright (C) 2012-2017 Javier Bezos and Johannes L. Braams.
+%% Copyright (C) 2012-2018 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.
@@ -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}[2018/01/24 3.17 Nil language]
+\ProvidesLanguage{nil}[2018/02/14 3.18 Nil language]
 \LdfInit{nil}{datenil}
 \ifx\l@nohyphenation\@undefined
    \@nopatterns{nil}
diff --git a/Master/texmf-dist/tex/generic/babel/plain.def b/Master/texmf-dist/tex/generic/babel/plain.def
index 3f4390d742f..1766c77135d 100644
--- a/Master/texmf-dist/tex/generic/babel/plain.def
+++ b/Master/texmf-dist/tex/generic/babel/plain.def
@@ -7,7 +7,7 @@
 %% babel.dtx  (with options: `plain')
 %% 
 %%
-%% Copyright (C) 2012-2017 Javier Bezos and Johannes L. Braams.
+%% Copyright (C) 2012-2018 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.
@@ -352,23 +352,6 @@
 \ifx\scriptsize\@undefined
   \let\scriptsize\sevenrm
 \fi
-\let\bbl@opt@shorthands\@nnil
-\def\bbl@ifshorthand#1#2#3{#2}%
-\ifx\babeloptionstrings\@undefined
-  \let\bbl@opt@strings\@nnil
-\else
-  \let\bbl@opt@strings\babeloptionstrings
-\fi
-\def\bbl@tempa{normal}
-\ifx\babeloptionmath\bbl@tempa
-  \def\bbl@mathnormal{\noexpand\textormath}
-\fi
-\def\BabelStringsDefault{generic}
-\ifx\BabelModifiers\@undefined\let\BabelModifiers\relax\fi
-\let\bbl@afterlang\relax
-\let\bbl@language@opts\@empty
-\ifx\@uclclist\@undefined\let\@uclclist\@empty\fi
-\def\AfterBabelLanguage#1#2{}
 \endinput
 %%
 %% End of file `plain.def'.
diff --git a/Master/texmf-dist/tex/generic/babel/switch.def b/Master/texmf-dist/tex/generic/babel/switch.def
index 501e9d932c4..79e2859dfe5 100644
--- a/Master/texmf-dist/tex/generic/babel/switch.def
+++ b/Master/texmf-dist/tex/generic/babel/switch.def
@@ -7,7 +7,7 @@
 %% babel.dtx  (with options: `kernel')
 %% 
 %%
-%% Copyright (C) 2012-2017 Javier Bezos and Johannes L. Braams.
+%% Copyright (C) 2012-2018 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.
@@ -36,7 +36,7 @@
     \wlog{File: #1 #4 #3 <#2>}%
     \let\ProvidesFile\@undefined}
 \fi
-\ProvidesFile{switch.def}[2018/01/24 3.17 Babel switching mechanism]
+\ProvidesFile{switch.def}[2018/02/14 3.18 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.17}
-\def\bbl@date{2018/01/24}
+\def\bbl@version{3.18}
+\def\bbl@date{2018/02/14}
 \def\adddialect#1#2{%
   \global\chardef#1#2\relax
   \bbl@usehooks{adddialect}{{#1}{#2}}%
@@ -283,9 +283,12 @@
   \bbl@iflanguage\bbl@tempf{%
     \expandafter\bbl@patterns\expandafter{\bbl@tempf}%
     \languageshorthands{none}%
-    \bbl@ifunset{\bbl@tempf hyphenmins}%
-      {\set@hyphenmins\tw@\thr@@\relax}%
-      {\bbl@exp{\\\set@hyphenmins\@nameuse{\bbl@tempf hyphenmins}}}}}
+    \expandafter\ifx\csname\bbl@tempf hyphenmins\endcsname\relax
+      \set@hyphenmins\tw@\thr@@\relax
+    \else
+      \expandafter\expandafter\expandafter\set@hyphenmins
+      \csname\bbl@tempf hyphenmins\endcsname\relax
+    \fi}}
 \let\endhyphenrules\@empty
 \def\providehyphenmins#1#2{%
   \expandafter\ifx\csname #1hyphenmins\endcsname\relax
diff --git a/Master/texmf-dist/tex/generic/babel/txtbabel.def b/Master/texmf-dist/tex/generic/babel/txtbabel.def
index 9e547703fc0..525ac3ff5df 100644
--- a/Master/texmf-dist/tex/generic/babel/txtbabel.def
+++ b/Master/texmf-dist/tex/generic/babel/txtbabel.def
@@ -7,7 +7,7 @@
 %% babel.dtx  (with options: `texxet')
 %% 
 %%
-%% Copyright (C) 2012-2017 Javier Bezos and Johannes L. Braams.
+%% Copyright (C) 2012-2018 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.
@@ -31,6 +31,9 @@
 %% and covered by LPPL is defined by the unpacking scripts (with
 %% extension |.ins|) which are part of the distribution.
 %%
+\bbl@trace{Redefinitions for bidi layout}
+\def\bbl@sspre@caption{%
+  \bbl@exp{\everyhbox{\\\bbl@textdir\bbl@cs{wdir@\bbl@main@language}}}}
 \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}
@@ -171,6 +174,7 @@
        \endgroup
      \fi}}%
   {}
+\bbl@trace{Bidi footnotes}
 \ifx\bbl@beforeforeign\leavevmode
   \def\bbl@footnote#1#2#3{%
     \@ifnextchar[%
diff --git a/Master/texmf-dist/tex/generic/babel/xebabel.def b/Master/texmf-dist/tex/generic/babel/xebabel.def
index 73c210e76d2..31085b2ce9b 100644
--- a/Master/texmf-dist/tex/generic/babel/xebabel.def
+++ b/Master/texmf-dist/tex/generic/babel/xebabel.def
@@ -7,7 +7,7 @@
 %% babel.dtx  (with options: `xetex')
 %% 
 %%
-%% Copyright (C) 2012-2017 Javier Bezos and Johannes L. Braams.
+%% Copyright (C) 2012-2018 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.
@@ -76,6 +76,7 @@
 \ifx\DisableBabelHook\@undefined\endinput\fi
 \AddBabelHook{babel-fontspec}{afterextras}{\bbl@switchfont}
 \DisableBabelHook{babel-fontspec}
+\bbl@trace{Font handling with fontspec}
 \@onlypreamble\babelfont
 \newcommand\babelfont[2][]{%  1=langs/scripts 2=fam
   \edef\bbl@tempa{#1}%