From 0eec602222f9b03c3593c74060c8560e00a7b29f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 15 Mar 2020 21:32:29 +0000 Subject: arabluatex (15mar20) git-svn-id: svn://tug.org/texlive/trunk@54331 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/lualatex/arabluatex/arabluatex.lua | 8 ++++---- .../texmf-dist/tex/lualatex/arabluatex/arabluatex.sty | 18 ++++++++++-------- 2 files changed, 14 insertions(+), 12 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua index 868e11692d3..cc3f713bfa8 100644 --- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua +++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua @@ -724,7 +724,7 @@ local function processarbtoutf(str) bbody = string.sub(bbody, 2, -2) if tonumber(bbody) ~= nil then bbody = arabluatex.abjadify(bbody) - return string.format("\\oline*{\\arb[novoc]{%s}}", bbody) + return string.format("\\aoline*{\\arb[novoc]{%s}}", bbody) else return string.format("%s{%s}", btag, bbody) end @@ -1183,12 +1183,12 @@ end function arabluatex.aemph(str, opt) if tex.textdir == "TRT" then - str = "\\oline{\\textdir TRT{}"..str.."}" + str = "\\aoline{\\textdir TRT{}"..str.."}" elseif tex.textdir == "TLT" then if opt == "over" then - str = "\\oline{"..str.."}" + str = "\\aoline{"..str.."}" else - str = "\\uline{"..str.."}" + str = "\\auline{"..str.."}" end end return str diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty index a7c85007d86..808fb4e503f 100644 --- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty +++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty @@ -41,7 +41,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{arabluatex} - [2020/02/29 v1.18 An ArabTeX-like interface for LuaLaTeX] + [2020/03/15 v1.19 ArabTeX for LuaLaTeX] \RequirePackage{iftex} \RequireLuaTeX \RequirePackage{xkeyval} @@ -70,8 +70,7 @@ \RequirePackage{xparse} \RequirePackage{adjustbox} \RequirePackage{xstring} -\PassOptionsToPackage{normalem}{ulem} -\RequirePackage{ulem} +\RequirePackage{lua-ul} \providebool{al@rlmode} \luadirect{dofile(kpse.find_file("arabluatex.lua"))} \AtBeginDocument{\ifdefined\arabicfont\relax\else @@ -94,9 +93,12 @@ {\luadirect{arabluatex.mkarbbreak(\luastringN{#2}, "out")}} {\luadirect{arabluatex.mkarbbreak(\luastringN{#2}, "dflt")}} } -\def\oline{\@ifstar\@oline\@@oline} -\def\@oline#1{\ensuremath{\overline{\mbox{#1}}}} -\def\@@oline{\bgroup \ULdepth=-3ex \ULset} +\newunderlinetype\@aoverLine{\leaders\vrule height 3ex depth -2.9ex} +\def\aoline{\@ifstar\@aoline\@@aoline} +\def\@aoline#1{\ensuremath{\overline{\mbox{#1}}}} +\def\@@aoline#1{{\@aoverLine#1}} +\newunderlinetype\@aunderLine{\leaders\vrule height -.65ex depth .75ex} +\def\auline#1{{\@aunderLine#1}} \AtBeginDocument{\ifdef{\aemph}% {\RenewDocumentCommand{\aemph}{s m}{% \IfBooleanTF{#1}{% @@ -341,13 +343,13 @@ \ifdefined\abjad% \RenewDocumentCommand{\abjad}{m}% {\ifbool{al@rlmode}% - {\oline*{% + {\aoline*{% \luadirect{tex.sprint(arabluatex.abjadify(\luastring{#1}))}}} {\luadirect{tex.sprint(arabluatex.abjadify(\luastring{#1}))}}} \else% \NewDocumentCommand{\abjad}{m}% {\ifbool{al@rlmode}% - {\oline*{% + {\aoline*{% \luadirect{tex.sprint(arabluatex.abjadify(\luastring{#1}))}}} {\luadirect{tex.sprint(arabluatex.abjadify(\luastring{#1}))}}} \fi} -- cgit v1.2.3