diff options
Diffstat (limited to 'Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty')
-rw-r--r-- | Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty | 45 |
1 files changed, 26 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty index 533057b63a3..ebe1ff2a831 100644 --- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty +++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty @@ -11,7 +11,7 @@ %% This file is part of the `arabluatex' package %% %% ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX -%% Copyright (C) 2016--2018 Robert Alessi +%% Copyright (C) 2016--2019 Robert Alessi %% %% Please send error reports and suggestions for improvements to Robert %% Alessi <alessi@robertalessi.net> @@ -39,9 +39,9 @@ %% - arabluatex_novoc.lua %% - arabluatex_trans.lua %% -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{arabluatex}% -[2018/10/11 v1.15.1 An ArabTeX-like interface for LuaLaTeX] +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\ProvidesPackage{arabluatex} + [2019/03/22 v1.16 An ArabTeX-like interface for LuaLaTeX] \RequirePackage{ifluatex} \ifluatex\else \PackageError{arabluatex}{lualatex needed}{% @@ -72,13 +72,14 @@ \RequirePackage{etoolbox} \RequirePackage{arabluatex-patch} \RequirePackage{fontspec} -\RequirePackage{amsmath} \RequirePackage{luacode} \RequirePackage{xparse} \RequirePackage{environ} \RequirePackage{adjustbox} \RequirePackage{xstring} -\newbool{al@rlmode} +\PassOptionsToPackage{normalem}{ulem} +\RequirePackage{ulem} +\providebool{al@rlmode} \luadirect{dofile(kpse.find_file("arabluatex.lua"))} \AtBeginDocument{\ifdefined\arabicfont\relax\else \PackageWarning{arabluatex}{\string\arabicfont\ is not defined.^^J @@ -97,6 +98,9 @@ {\luadirect{mkarbbreak(\luastringN{#2}, "out")}} {\luadirect{mkarbbreak(\luastringN{#2}, "dflt")}} } +\def\oline{\@ifstar\@oline\@@oline} +\def\@oline#1{\ensuremath{\overline{\mbox{#1}}}} +\def\@@oline{\bgroup \ULdepth=-3ex \ULset} \AtBeginDocument{\ifdef{\aemph}% {\RenewDocumentCommand{\aemph}{s m}{% \IfBooleanTF{#1}{% @@ -163,7 +167,7 @@ \luastringO{\al@arb@rules}, \luastringO{\al@input@scheme}))}\egroup% \else% \ifx\@tempa\al@mode@trans% - \bgroup\textdir TLT\al@trans@style% + \bgroup\textdir TLT\al@trans@font\al@trans@style% \luadirect{tex.sprint(processtrans(\luastringN{#2}, \luastringO{\al@trans@convention}, \luastringO{\al@arb@rules}, @@ -199,7 +203,7 @@ \luastringO{\al@arb@rules}, \luastringO{\al@input@scheme}))}\egroup% \else% \ifx\@tempa\al@mode@trans% - \bgroup\pardir TLT\textdir TLT\al@trans@style% + \bgroup\pardir TLT\textdir TLT\al@trans@font\al@trans@style% \luadirect{tex.sprint(processtrans(\luastringO{\BODY}, \luastringO{\al@trans@convention}, \luastringO{\al@arb@rules}, @@ -225,18 +229,23 @@ metre]{#1}% \if@pkg@export\ifal@verse@export% \ArbOutFile{\begin{arabverse}}% - \ifx\al@mode\al@mode@trans% - \luadirect{tooutfile(\luastringN{[#1]})}% - \else% + % \ifx\al@mode\al@mode@trans% + % \luadirect{tooutfile(\luastringN{[#1]})}% + % \else% \IfSubStr[1]{#1}{utf}% {\luadirect{tooutfile(\luastringN{[#1]})}}% {\luadirect{tooutfile(\luastringN{[#1, utf]})}}% - \fi + % \fi \else\fi\else\fi\egroup% \par\centering\noindent\bgroup\setkeys[al]{verse}[metre]{#1}% - \ifx\al@mode\al@mode@trans% - \ifal@verse@utf\setRL\else\setLR\fi% - \else\setRL\fi% + % \ifx\al@mode\al@mode@trans% + % \ifal@verse@utf\setRL\else\setLR\fi% + % \else\setRL\fi% + \ifal@verse@utf% + \ifx\al@mode\al@mode@trans\setLR\else\setRL\fi% + \else% + \ifx\al@mode\al@mode@trans\setLR\else\setRL\fi% + \fi% \arab@v@export{#1} }% {\endarab@v@export @@ -255,8 +264,6 @@ \def\al@verse@stroke{\leavevmode\xleaders\hbox{\arb{--}}\hfill\kern0pt} \NewDocumentCommand{\bayt}{s m o m}{% \IfBooleanTF{#1}{\relax}{\relax}% - {^^^^200b}% quick fix to a bug (or a missing feature) in either - % luacolor or adjustbox \ifdefined\savenotes\savenotes\else\fi% \edef\al@tatweel{--}% \adjustbox{width=\al@bayt@width, height=\Height}{\arb@utf{#2}}% @@ -286,12 +293,12 @@ \ifdefined\abjad% \RenewDocumentCommand{\abjad}{m}% {\ifbool{al@rlmode}% - {\aemph{\luadirect{tex.sprint(abjadify(\luastring{#1}))}}} + {\oline*{\luadirect{tex.sprint(abjadify(\luastring{#1}))}}} {\luadirect{tex.sprint(abjadify(\luastring{#1}))}}} \else% \NewDocumentCommand{\abjad}{m}% {\ifbool{al@rlmode}% - {\aemph{\luadirect{tex.sprint(abjadify(\luastring{#1}))}}} + {\oline*{\luadirect{tex.sprint(abjadify(\luastring{#1}))}}} {\luadirect{tex.sprint(abjadify(\luastring{#1}))}}} \fi} \NewDocumentCommand{\ayah}{m}{% |