diff options
author | Robert Alessi <alessi@robertalessi.net> | 2018-08-06 19:33:10 +0200 |
---|---|---|
committer | Robert Alessi <alessi@robertalessi.net> | 2018-08-06 19:33:10 +0200 |
commit | c38ff6105eeed14af80103911064cc13ba960db1 (patch) | |
tree | 36f7f237e814de523c9b1c2e7e247c345ea1eb9b | |
parent | 47e0cb507cc8758bef0caca70a5bab9618261ba6 (diff) | |
download | arabluatex-c38ff6105eeed14af80103911064cc13ba960db1.tar.gz |
new command \arbmetre and new option 'color' for arabverse environment.
a quick fix to a bug (or a missing feature) in either 'adjustbox' or 'luacolor' has been added.
-rw-r--r-- | arabluatex.dtx | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/arabluatex.dtx b/arabluatex.dtx index f17c67b..3dcfc1f 100644 --- a/arabluatex.dtx +++ b/arabluatex.dtx | |||
@@ -528,7 +528,7 @@ | |||
528 | % \textsc{Rem.} By default Amiri places the \arb[trans]{kasraT} in | 528 | % \textsc{Rem.} By default Amiri places the \arb[trans]{kasraT} in |
529 | % combination with the \arb[trans]{ta^sdId} below the consonant, | 529 | % combination with the \arb[trans]{ta^sdId} below the consonant, |
530 | % like so: \arb{BBi}\,. That is correct, as at least in the oldest | 530 | % like so: \arb{BBi}\,. That is correct, as at least in the oldest |
531 | % manuscripts {\newfontfamily\arabicfont{Amiri}[Script=Arabic, | 531 | % manuscripts {\renewfontfamily\arabicfont{Amiri}[Script=Arabic, |
532 | % RawFeature={+ss05}]\arb{BBi}} may stand for \arb{BBa} as | 532 | % RawFeature={+ss05}]\arb{BBi}} may stand for \arb{BBa} as |
533 | % well as \arb{BBi}\,. See \textcite[i. 14 C--D]{Wright}. The placement | 533 | % well as \arb{BBi}\,. See \textcite[i. 14 C--D]{Wright}. The placement |
534 | % of the \arb[trans]{kasraT} above the consonant may be obtained by | 534 | % of the \arb[trans]{kasraT} above the consonant may be obtained by |
@@ -4432,17 +4432,23 @@ wa-ya.sIru ta.hta 'l-jild-i | |||
4432 | % \begin{environment}{arabverse} | 4432 | % \begin{environment}{arabverse} |
4433 | % \changes{v1.6}{2016/12/17}{New environment \texttt{arabverse} for | 4433 | % \changes{v1.6}{2016/12/17}{New environment \texttt{arabverse} for |
4434 | % typesetting Arabic poetry} The |arabverse| environment may receive | 4434 | % typesetting Arabic poetry} The |arabverse| environment may receive |
4435 | % different options: |mode|, |width|, |gutter|, |metre|, |utf| | 4435 | % different options: |mode|, |width|, |gutter|, |metre|, |color|, |
4436 | % and |delim|; all of them are defined here just before the | 4436 | % |utf| and |delim|; all of them are defined here just before the |
4437 | % |arabverse| environment: | 4437 | % |arabverse| environment. \changes{v1.13}{2018/07/30}{New command |
4438 | % \cs{arbmetre}}\cs{arbmetre} does nothing. It takes the metre as | ||
4439 | % argument so that it can be distinguished from the last \cs{bayt} | ||
4440 | % command. \changes{v1.13}{2018/08/06}{New option \texttt{color} to | ||
4441 | % \texttt{arabverse} environment.} | ||
4438 | % \begin{macrocode} | 4442 | % \begin{macrocode} |
4443 | \NewDocumentCommand{\arbmetre}{m}{#1} | ||
4439 | \newlength{\al@bayt@width} | 4444 | \newlength{\al@bayt@width} |
4440 | \newlength{\al@gutter@width} | 4445 | \newlength{\al@gutter@width} |
4441 | \setlength{\al@bayt@width}{.3\textwidth} | 4446 | \setlength{\al@bayt@width}{.3\textwidth} |
4442 | \setlength{\al@gutter@width}{.15\al@bayt@width} | 4447 | \setlength{\al@gutter@width}{.15\al@bayt@width} |
4443 | \define@key[al]{verse}{width}{\setlength{\al@bayt@width}{#1}} | 4448 | \define@key[al]{verse}{width}{\setlength{\al@bayt@width}{#1}} |
4444 | \define@key[al]{verse}{gutter}{\setlength{\al@gutter@width}{#1}} | 4449 | \define@key[al]{verse}{gutter}{\setlength{\al@gutter@width}{#1}} |
4445 | \define@key[al]{verse}{metre}{\arb{#1}} | 4450 | \define@key[al]{verse}{metre}{\arb{\arbmetre{#1}}} |
4451 | \define@key[al]{verse}{color}[]{\color{#1}} | ||
4446 | \define@boolkey[al]{verse}{utf}[true]{} | 4452 | \define@boolkey[al]{verse}{utf}[true]{} |
4447 | \define@boolkey[al]{verse}{delim}[true]{} | 4453 | \define@boolkey[al]{verse}{delim}[true]{} |
4448 | \define@choicekey[al]{verse}{mode}{fullvoc, voc, novoc, | 4454 | \define@choicekey[al]{verse}{mode}{fullvoc, voc, novoc, |
@@ -4457,7 +4463,7 @@ wa-ya.sIru ta.hta 'l-jild-i | |||
4457 | \ifx\al@mode\al@mode@trans% | 4463 | \ifx\al@mode\al@mode@trans% |
4458 | \ifal@verse@utf\setRL\else\setLR\fi% | 4464 | \ifal@verse@utf\setRL\else\setLR\fi% |
4459 | \else\setRL\fi}% | 4465 | \else\setRL\fi}% |
4460 | {\hfill\setkeys[al]{verse}[width,gutter,utf,mode]{#1}\egroup} | 4466 | {\hfill\setkeys[al]{verse}[width,gutter,utf,mode]{#1}\egroup\par} |
4461 | % \end{macrocode} | 4467 | % \end{macrocode} |
4462 | % \begin{macro}{\bayt} | 4468 | % \begin{macro}{\bayt} |
4463 | % \changes{v1.6}{2016/12/17}{New macro \cs{bayt} for typesetting | 4469 | % \changes{v1.6}{2016/12/17}{New macro \cs{bayt} for typesetting |
@@ -4484,6 +4490,8 @@ wa-ya.sIru ta.hta 'l-jild-i | |||
4484 | \NewDocumentCommand{\SetHemistichDelim}{m}{\def\al@hemistich@delim{#1}} | 4490 | \NewDocumentCommand{\SetHemistichDelim}{m}{\def\al@hemistich@delim{#1}} |
4485 | \def\al@verse@stroke{\leavevmode\xleaders\hbox{\arb{--}}\hfill\kern0pt} | 4491 | \def\al@verse@stroke{\leavevmode\xleaders\hbox{\arb{--}}\hfill\kern0pt} |
4486 | \NewDocumentCommand{\bayt}{m o m}{% | 4492 | \NewDocumentCommand{\bayt}{m o m}{% |
4493 | {^^^^200b}% quick fix to a bug (or a missing feature) in either | ||
4494 | % luacolor or adjustbox | ||
4487 | \ifdefined\savenotes\savenotes\else\fi% | 4495 | \ifdefined\savenotes\savenotes\else\fi% |
4488 | \edef\al@tatweel{--}% | 4496 | \edef\al@tatweel{--}% |
4489 | \adjustbox{width=\al@bayt@width, height=\Height}{\arb@utf{#1}}% | 4497 | \adjustbox{width=\al@bayt@width, height=\Height}{\arb@utf{#1}}% |