1 files changed, 11 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/generic/babel/luababel.def b/Master/texmf-dist/tex/generic/babel/luababel.def
index d843a2e3e55..5f489e8062d 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-2020 Javier Bezos and Johannes L. Braams.
+%% Copyright (C) 2012-2021 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.
@@ -745,6 +745,7 @@
     \edef\bbl@langfeatures{#2,}}}
 \directlua{
 Babel.script_blocks = {
+  ['dflt'] = {},
   ['Arab'] = {{0x0600, 0x06FF}, {0x08A0, 0x08FF}, {0x0750, 0x077F},
               {0xFE70, 0xFEFF}, {0xFB50, 0xFDFF}, {0x1EE00, 0x1EEFF}},
   ['Armn'] = {{0x0530, 0x058F}},
@@ -1408,26 +1409,23 @@ end
   {}
 \IfBabelLayout{graphics}
   {\let\bbl@pictresetdir\relax
-   \def\bbl@pictsetdir{%
+   \def\bbl@pictsetdir#1{%
      \ifcase\bbl@thetextdir
        \let\bbl@pictresetdir\relax
      \else
-       \textdir TLT\relax
-       \def\bbl@pictresetdir{\textdir TRT\relax}%
+       \bodydir TLT
+       % \(text|par)dir required in pgf:
+       \def\bbl@pictresetdir{\bodydir TRT\pardir TRT\textdir TRT\relax}%
      \fi}%
-   \let\bbl@OL@@picture\@picture
-   \let\bbl@OL@put\put
-   \bbl@sreplace\@picture{\hskip-}{\bbl@pictsetdir\hskip-}%
-   \def\put(#1,#2)#3{%  Not easy to patch. Better redefine.
-     \@killglue
-     \raise#2\unitlength
-     \hb@xt@\z@{\kern#1\unitlength{\bbl@pictresetdir#3}\hss}}%
+   \ifx\AddToHook\@undefined\else
+     \AddToHook{env/picture/begin}{\bbl@pictsetdir\z@}%
+   \fi
    \AtBeginDocument
      {\ifx\tikz@atbegin@node\@undefined\else
         \let\bbl@OL@pgfpicture\pgfpicture
         \bbl@sreplace\pgfpicture{\pgfpicturetrue}%
-          {\bbl@pictsetdir\pgfpicturetrue}%
-        \bbl@add\pgfsys@beginpicture{\bbl@pictsetdir}%
+          {\bbl@pictsetdir\@ne\pgfpicturetrue}%
+        \bbl@add\pgfsys@beginpicture{\bbl@pictsetdir\@ne}%
         \bbl@add\tikz@atbegin@node{\bbl@pictresetdir}%
       \fi}}
   {}