diff options
| -rw-r--r-- | Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf | bin | 325397 -> 329503 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx | 54 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua | 9 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua | 12 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua | 20 |
6 files changed, 80 insertions, 19 deletions
diff --git a/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf b/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf Binary files differindex e62e9ac89bc..496bd53c98e 100644 --- a/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf +++ b/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf diff --git a/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx b/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx index 9c30812c2ef..ff52e804274 100644 --- a/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx +++ b/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx @@ -27,7 +27,7 @@ %<package-info>\NeedsTeXFormat{LaTeX2e}[1999/12/01] %<package-info>\ProvidesPackage{arabluatex} %<*package-info> - [2016/09/09 v1.4.2 This is ArabTeX for LuaLaTeX] + [2016/09/14 v1.4.3 This is ArabTeX for LuaLaTeX] %</package-info> % %<*driver> @@ -145,7 +145,7 @@ \defaultfontfeatures{RawFeature={+liga}} \setmainfont{Old Standard}[SmallCapsFont={Latin Modern Roman Caps}, RawFeature={+mark;+ccmp;+ss05;+ss06}] -\usepackage{arabluatex}[2016/09/09] +\usepackage{arabluatex}[2016/09/14] \usepackage{varioref} \usepackage{hypdoc} \hypersetup{unicode=true, colorlinks, allcolors=blue, @@ -161,7 +161,7 @@ \usepackage[position=below]{caption} \usepackage{longtable} \usepackage{booktabs} -\usepackage[defaultlines=2,all]{nowidow} +\usepackage[defaultlines=3,all]{nowidow} \usepackage{tikz} \usepackage[breakable, skins, listings, xparse]{tcolorbox} \DeclareTCBListing{arabluacode}{s O{}}{colback=white, boxrule=.15mm, @@ -198,7 +198,7 @@ %</driver> % \fi % -% \CheckSum{372} +% \CheckSum{376} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -1524,7 +1524,7 @@ vowels (see §~3). % \arb[novoc]{a"'} & \dmg{a"'} & \loc{a"'} & \verb|a"'| \\ % \arb[novoc]{u"'} & \dmg{u"'} & \loc{u"'} & \verb|u"'| \\ % \arb[novoc]{w"'} & \dmg{w"'} & \loc{w"'} & \verb|w"'| \\ -% \arb[novoc]{i"'} & \dmg{i"'} & \loc{i"'} & \verb|i"'| \\ \pagebreak +% \arb[novoc]{i"'} & \dmg{i"'} & \loc{i"'} & \verb|i"'| \\ % \arb[novoc]{y"'} & \dmg{y"'} & \loc{y"'} & \verb|y"'| \\ % \bottomrule % \caption*{\Cref*{tab:quoted-hamza}: \enquote{Quoted} \arb[trans]{hamzaT}} @@ -1712,6 +1712,37 @@ vowels (see §~3). % \arb[trans]{B--aN}, |B"| \arb[voc]{B"}\,. % \end{quote} % +% \paragraph{Brackets} +% \NEWfeature{v1.4.3} The various bracket symbols are useful in +% technical documents such as critical editions for indicating that +% some words or some letters must be added or +% removed. \package{arabluatex} will automatically fit those symbols +% to the direction of the text. For the time being, the following +% symbols are supported: +% \begin{compactitem} +% \item parentheses: |()| +% \item square brackets: |[]| +% \item angle brackets: |<>| +% \item braces: |{}| +% \end{compactitem} +% +% \DescribeMacro{\abraces} Parentheses, square and angle brackets may +% be input directly at the keyboard; however, words or letters that +% are to be read between braces must be passed as arguments to the +% command \cs{abraces}:--- +% \iffalse +%<*example> +% \fi +\begin{arabluacode} + \begin{arab} + \abraces{wa-qAla} 'inna 'abI kAna mina 'l-muqAtilaTi + wa-kAna--<--t> 'ummI min `u.zamA'i buyUti 'l-zamAzimaTi. + \end{arab} +\end{arabluacode} +% \iffalse +%</example> +% \fi +% % \section{Transliteration} % \label{sec:transliteration} % It may be more appropriate to speak of \enquote{romanization} than @@ -2352,7 +2383,7 @@ wa-ya.sIru ta.hta 'l-jild-i % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{arabluatex}% -[2016/09/09 v1.4.2 ArabTeX-like interface for LuaLaTeX] +[2016/09/14 v1.4.3 ArabTeX-like interface for LuaLaTeX] \RequirePackage{ifluatex} % \end{macrocode} % \package{arabluatex} requires \LuaLaTeX\ of course. Issue a warning @@ -2635,6 +2666,17 @@ wa-ya.sIru ta.hta 'l-jild-i \fi} % \end{macrocode} % \end{macro} +% \begin{macro}{\abraces} +% \cs{abraces}\marg{Arabic text} puts its argument between +% braces. This macro is written in Lua and is dependent on the +% current value of |tex.textdir|. +% \changes{v1.4.3}{2016/09/14}{New command \cs{abraces} which +% expresses its argument between braces.} +% \begin{macrocode} +\NewDocumentCommand{\abraces}{+m}{% + \luadirect{tex.sprint(abraces(\luastringN{#1}))}} +% \end{macrocode} +% \end{macro} % \begin{macro}{\LRmarginpar} \cs{LRmarginpar} is supposed to be % inserted in an Arabic environment. It typsets his argument in a % marginal note from left to right. diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua index c0e02324e07..35dccff7485 100644 --- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua +++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua @@ -589,3 +589,12 @@ function abjadify(n) end return "\\arb[novoc]{"..abjadnum.."}" end + +function abraces(str) + if tex.textdir == "TRT" then + str = "\\}"..str.."\\{" + elseif tex.textdir == "TLT" then + str = "\\{"..str.."\\}" + end + return str +end diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty index 9ef92eab1eb..705bf4592b6 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} \ProvidesPackage{arabluatex}% -[2016/09/09 v1.4.2 ArabTeX-like interface for LuaLaTeX] +[2016/09/14 v1.4.3 ArabTeX-like interface for LuaLaTeX] \RequirePackage{ifluatex} \ifluatex\else \PackageError{arabluatex}{lualatex needed}{% @@ -162,6 +162,8 @@ \NewDocumentCommand{\abjad}{m}% {\luadirect{tex.sprint(abjadify(#1))}} \fi} +\NewDocumentCommand{\abraces}{+m}{% + \luadirect{tex.sprint(abraces(\luastringN{#1}))}} \DeclareDocumentCommand{\LRmarginpar}{m}{\marginpar{\textdir TLT #1}} \DeclareDocumentCommand{\LRfootnote}{m}{\bgroup\pardir TLT\LR{\footnote{#1}}\egroup} diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua index e0ffbce92a4..ae0dc4e29bf 100644 --- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua +++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua @@ -55,9 +55,9 @@ hamzafv = { {a="'i'([^uaiUAI])", b="إI%1"}, -- madda (historic writing below) {a="'a'([^uaiUAI])", b="آ%1"}, - {a="([^uiUI])\'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="%1آ%2"}, - {a="^\'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="آ%1"}, - {a="(%W)\'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="%1آ%2"}, + {a="([^uiUI])\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="%1آ%2"}, + {a="^\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="آ%1"}, + {a="(%W)\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="%1آ%2"}, {a="(A)(')(uN?)$", b="aآء%3"}, {a="(A)(')(uN?)(%W)", b="aآء%3%4"}, {a="(A)(')(iN?)$", b="aآء%3"}, @@ -153,9 +153,9 @@ hamzafveasy = { -- differences marked below with 'easy' {a="'i'([^uaiUAI])", b="إI%1"}, -- madda (historic writing below) {a="'a'([^uaiUAI])", b="آ%1"}, - {a="([^uiUI])\'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="%1آ%2"}, - {a="^\'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="آ%1"}, - {a="(%W)\'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="%1آ%2"}, + {a="([^uiUI])\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="%1آ%2"}, + {a="^\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="آ%1"}, + {a="(%W)\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="%1آ%2"}, --easy (begin) {a="(A)(')(uN?)$", b="aاء%3"}, {a="(A)(')(uN?)(%W)", b="aاء%3%4"}, diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua index e28cd7e6338..8ea7f7d1dd9 100644 --- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua +++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua @@ -190,9 +190,9 @@ hamza = { {a="'i'([^uaiUAI])", b="إI%1"}, -- madda (historic writing below) {a="'a'([^uaiUAI])", b="آ%1"}, - {a="([^uiUI])\'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="%1آ%2"}, - {a="^\'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="آ%1"}, - {a="(%W)\'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="%1آ%2"}, + {a="([^uiUI])\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="%1آ%2"}, + {a="^\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="آ%1"}, + {a="(%W)\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="%1آ%2"}, {a="(A)(')(uN?)$", b="aآء%3"}, {a="(A)(')(uN?)(%W)", b="aآء%3%4"}, {a="(A)(')(iN?)$", b="aآء%3"}, @@ -279,9 +279,9 @@ hamzaeasy = { -- differences marked below with 'easy' {a="'i'([^uaiUAI])", b="إI%1"}, -- madda (historic writing below) {a="'a'([^uaiUAI])", b="آ%1"}, - {a="([^uiUI])\'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="%1آ%2"}, - {a="^\'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="آ%1"}, - {a="(%W)\'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="%1آ%2"}, + {a="([^uiUI])\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="%1آ%2"}, + {a="^\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="آ%1"}, + {a="(%W)\'a?A([%_%^%.]?[%`%'btjghxdrzsfqklmnywAY])", b="%1آ%2"}, --easy (begin) {a="(A)(')(uN?)$", b="aاء%3"}, {a="(A)(')(uN?)(%W)", b="aاء%3%4"}, @@ -671,6 +671,14 @@ punctuation = { {a="%)", b="-@("}, {a="%+%@%(", b=")"}, {a="%-%@%(", b="("}, + {a="%<", b="+@<"}, + {a="%>", b="-@<"}, + {a="%+%@%<", b=">"}, + {a="%-%@%<", b="<"}, + {a="%[", b="+@["}, + {a="%]", b="-@["}, + {a="%+%@%[", b="]"}, + {a="%-%@%[", b="["}, {a="%.", b="."}, {a="([^0-9])%,", b="%1،"}, {a="%?", b="؟"}, |