verse: added 'tadwirwidth' parameter; switched back to '\al@verse@stroke' which renders much better

1 files changed, 9 insertions, 5 deletions

diff --git a/arabluatex.dtx b/arabluatex.dtx
index 53fcc5a..78e8832 100644
--- a/arabluatex.dtx
+++ b/arabluatex.dtx
@@ -2973,8 +2973,11 @@ wa-ya.sIru ta.hta 'l-jild-i
 %   are defined here just before the environment |arabverse|:
 %    \begin{macrocode}
 \newlength{\al@bayt@width}
+\newlength{\al@tadwir@width}
 \setlength{\al@bayt@width}{.3\textwidth}
+\setlength{\al@tadwir@width}{.15\al@bayt@width}
 \define@key[al]{verse}{width}{\setlength{\al@bayt@width}{#1}}
+\define@key[al]{verse}{tadwirwidth}{\setlength{\al@tadwir@width}{#1}}
 \define@key[al]{verse}{metre}{\arb{#1}}
 \define@boolkey[al]{verse}{utf}[true]{}
 \define@choicekey[al]{verse}{mode}{fullvoc, voc, novoc,
@@ -2989,7 +2992,7 @@ wa-ya.sIru ta.hta 'l-jild-i
   \ifx\al@mode\al@mode@trans%
   \ifal@verse@utf\setRL\else\setLR\fi%
   \else\setRL\fi}%
-{\hfill\setkeys[al]{verse}[width,utf,mode]{#1}\egroup}
+{\hfill\setkeys[al]{verse}[width,tadwirwidth,utf,mode]{#1}\egroup}
 %    \end{macrocode}
 % \begin{macro}{\bayt}
 %   \changes{v1.6}{2016/11/30}{New macro \cs{bayt} for typesetting
@@ -3018,17 +3021,18 @@ wa-ya.sIru ta.hta 'l-jild-i
   \edef\al@tatweel{--}%
   \adjustbox{width=\al@bayt@width, height=\Height}{\arb{#1}}%
   \IfNoValueTF{#2}{%
-    \hspace{.15\al@bayt@width}%
+    \hspace{\al@tadwir@width}%
   }{%
     \edef\@tempa{#2}%
     \ifx\@tempa\al@tatweel%
     \ifx\al@mode\al@mode@trans%
-    \hspace{.15\al@bayt@width}%    
+    \hspace{\al@tadwir@width}%
     \else%
-    \adjustbox{width=.15\al@bayt@width, height=\Height}{\arb{--}}%
+    % \adjustbox{width=\al@tadwir@width, height=\Height}{\arb{--}}%
+    \makebox[\al@tadwir@width][s]{\al@verse@stroke}%
     \fi%
     \else%
-    \adjustbox{center=.15\al@bayt@width, height=\Height}{\arb{#2}}
+    \adjustbox{center=\al@tadwir@width, height=\Height}{\arb{#2}}
     \fi}%
   \adjustbox{width=\al@bayt@width, height=\Height}{\arb{#3}}%
 }