1 files changed, 48 insertions, 25 deletions
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'.