(re)define \LR{} \AtBeginDocument{} in case luabidi is loaded

1 files changed, 6 insertions, 6 deletions

diff --git a/arabluatex.dtx b/arabluatex.dtx
index 847bb2e..72792db 100644
--- a/arabluatex.dtx
+++ b/arabluatex.dtx
@@ -187,20 +187,20 @@
 \RequirePackage{environ}
 \luadirect{dofile(kpse.find_file("arabluatex.lua"))}
 %    \end{macrocode}
-% This is needed by the current version of \package{luabidi}.
+% This is needed by the current versions of \package{polyglossia} and
+% \package{luabidi}.  \package{luabidi} provides a \cs{Footnote}
+% command. Use it as well if it is loaded.
 %    \begin{macrocode}
 \luadirect{tex.enableprimitives("luatex",tex.extraprimitives("omega"))}
 %    \end{macrocode}
-% \package{luabidi} provides a \cs{Footnote} command. Use it for now.
-%    \begin{macrocode}
-\RequirePackage{luabidi}
-%    \end{macrocode}
 %    \begin{macrocode}
 \AtBeginDocument{\ifdefined\arabicfont\relax\else
 \PackageWarning{arabluatex}{\string\arabicfont\ is not defined!^^JI
   will try to load Amiri}%
 \newfontfamily\arabicfont[Script=Arabic]{Amiri}\fi}%
-\DeclareDocumentCommand{\LR}{+m}{\bgroup\textdir TLT\rmfamily#1\egroup}
+\AtBeginDocument{\ifdef{\LR}%
+  {\renewrobustcmd{\LR}[1]{\bgroup\textdir TLT\rmfamily#1\egroup}}
+  {\newrobustcmd{\LR}[1]{\bgroup\textdir TLT\rmfamily#1\egroup}}}
 \DeclareDocumentCommand{\txarb}{+m}{\bgroup\textdir TRT\arabicfont#1\egroup}
 \DeclareDocumentCommand{\arb}{O{\al@mode} +m}%
 {\edef\@tempa{#1}%