1 files changed, 4 insertions, 4 deletions

diff --git a/arabluatex.dtx b/arabluatex.dtx
index 5e531a0..0e0f281 100644
--- a/arabluatex.dtx
+++ b/arabluatex.dtx
@@ -4328,7 +4328,7 @@
 \RequirePackage{luacolor}
 \RequirePackage{etoolbox}
 \RequirePackage{arabluatex-patch}
-\RequirePackage{luaotfload}
+\RequirePackage{fontspec}
 \RequirePackage{luacode}
 \RequirePackage{xparse}
 \RequirePackage{adjustbox}
@@ -4351,7 +4351,7 @@
   \PackageInfo{arabluatex}{%
     \string\arabicfont\ is not defined.\MessageBreak
     arabluatex will try to load Amiri}%
-  \font \arabicfont = {name:Amiri:script=arab} at \f@size pt\fi}%
+  \newfontfamily\arabicfont{Amiri}[Script=Arabic]\fi}%
 %    \end{macrocode}
 % \begin{macro}{\setRL}
 %   This neutralizes what may be defined by other packages:
@@ -4703,7 +4703,7 @@
 % The |arab| environment does for paragraphs the same as \cs{arb} does
 % for short insertions of Arabic text.
 %    \begin{macrocode}
-\NewDocumentEnvironment{arab}{O{\al@mode} +b}%
+\NewDocumentEnvironment{arab}{!O{\al@mode} +b}%
 {\par\edef\@tempa{#1}%
   \ifx\@tempa\al@mode@voc%
   \booltrue{al@rlmode}%
@@ -4760,7 +4760,7 @@
 %    \end{macrocode}
 % Then follows the environment itself:
 %    \begin{macrocode}
-\NewDocumentEnvironment{arabverse}{O{}}%
+\NewDocumentEnvironment{arabverse}{!O{}}%
 {\bgroup\setkeys[al]{verse}[width, gutter, color, utf, delim,
   metre]{#1}%
   \if@pkg@export\ifal@verse@export%