summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdfbin335114 -> 325397 bytes
-rw-r--r--Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx46
-rw-r--r--Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty4
-rw-r--r--Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua34
-rw-r--r--Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua2
5 files changed, 46 insertions, 40 deletions
diff --git a/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf b/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf
index 0423606c510..e62e9ac89bc 100644
--- a/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf
+++ b/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx b/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx
index 626d7dcee86..9c30812c2ef 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/07/09 v1.4.1 This is ArabTeX for LuaLaTeX]
+ [2016/09/09 v1.4.2 This is ArabTeX for LuaLaTeX]
%</package-info>
%
%<*driver>
@@ -143,10 +143,9 @@
\def\actualchar{ =} % there's a bug in doxitem; quick fix.
\usepackage{fontspec,luatextra}
\defaultfontfeatures{RawFeature={+liga}}
-\setmainfont{Old Standard}[SmallCapsFont={Latin Modern Roman Caps}]
-\newfontfamily\translitfont{Latin Modern Roman}[Ligatures=TeX]
-\usepackage{arabluatex}[2016/07/09]
-\SetTranslitFont{\translitfont}
+\setmainfont{Old Standard}[SmallCapsFont={Latin Modern Roman Caps},
+ RawFeature={+mark;+ccmp;+ss05;+ss06}]
+\usepackage{arabluatex}[2016/09/09]
\usepackage{varioref}
\usepackage{hypdoc}
\hypersetup{unicode=true, colorlinks, allcolors=blue,
@@ -199,7 +198,7 @@
%</driver>
% \fi
%
-% \CheckSum{371}
+% \CheckSum{372}
%
% \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
@@ -594,7 +593,7 @@ vowels (see §~3).
\enquote{sawfa 'u`Idu-hu 'ilay-ka fI 'l-masA'-i
wa-'adfa`u la-ka 'ujraTaN.} fa-qAla ju.hA:
\enquote{'anA 'AsifuN jiddaN 'annI lA 'asta.tI`u 'an
- 'u.haqqiqa la-ka ra.gbabata-ka fa-'l-.himAr-u laysa hunA
+ 'u.haqqiqa la-ka ra.gbata-ka fa-'l-.himAr-u laysa hunA
'l-yawm-a.} wa-qabla 'an yutimma ju.hA kalAma-hu bada'a
'l-.himAr-u yanhaqu fI 'i.s.tabli-hi. fa-qAla la-hu
.sadIqu-hu: \enquote{'innI 'asma`u .himAra-ka yA ju.hA
@@ -632,7 +631,8 @@ vowels (see §~3).
%\section{Standard Arab\TeX\ input}
%\subsection{Consonants}
% \Cref{tab:arabtex-consonants} gives the Arab\TeX\ equivalents for
-% all of the Arabic consonants.\linebreak
+% all of the Arabic consonants.
+%
% \newcommand{\dmg}[1]{%
% \SetTranslitConvention{dmg}%
% \arb[trans]{#1}}
@@ -689,7 +689,8 @@ vowels (see §~3).
% \subsection{Vowels}
% \subsubsection{Long vowels}
% \Cref{tab:arabtex-long-vowels} gives the Arab\TeX\ equivalents for
-% the Arabic long vowels.
+% the Arabic long vowels.
+%
% \begin{longtable}{llll}
% \captionlistentry{Arab\TeX\ long vowels}\\[-1em]
% \toprule
@@ -739,6 +740,7 @@ vowels (see §~3).
% \subsubsection{Short vowels}
% \Cref{tab:arabtex-short-vowels} gives the Arab\TeX\ equivalents for
% the Arabic short vowels.
+%
% \begin{longtable}{llll}
% \captionlistentry{Arab\TeX\ short vowels}\\[-1em]
% \toprule
@@ -783,7 +785,7 @@ vowels (see §~3).
%
% That said, there is no need to write the short vowels
% \arb[trans]{fat.haT}, \arb[trans]{.dammaT} or \arb[trans]{kasraT}
-% except in the following cases:
+% except in the following cases:---
% \begin{compactitem}
% \item at the commencement of a word, to indicate that a connective
% \arb[trans]{'alif} is needed, with the exception of the article (see
@@ -957,21 +959,21 @@ vowels (see §~3).
%
% \arb[trans]{hamzaT} followed by the long vowel \arb[novoc]{I} is
% encoded |'_I|: |'_ImAnuN| \arb[voc]{'_ImAnuN}
-% \arb[trans]{'_ImAnuN}.
+% \arb[trans]{'_ImA\-nuN}.
%
% \textbf{Middle \arb[trans]{hamzaT}}: |xA.ti'-Ina|
% \arb[voc]{xA.ti'-Ina} \arb[trans]{xA.ti'-Ina}, |ru'UsuN|
% \arb[voc]{ru'UsuN}, \arb[trans]{ru'UsuN}, |xa.tI'aTuN|
% \arb[voc]{xa.tI'aTuN} \arb[trans]{xa.tI'aTuN}, |su'ila|
% \arb[voc]{su'ila} \arb[trans]{su'ila}, |'as'ilaTuN|
-% \arb[voc]{'as'ilaTuN} \arb[trans]{'as'ilaTuN}, |mas'alaTuN|
+% \arb[voc]{'as'i\-laTuN} \arb[trans]{'as'ilaTuN}, |mas'alaTuN|
% \arb[voc]{mas'alaTuN} \arb[trans]{mas'alaTuN}, |'as'alu|
% \arb[voc]{'as'alu} \arb[trans]{'as'alu}, |yatasA'alUna|
-% \arb[voc]{yatasA'alUna} \arb[trans]{yatasA'alUna}, |murU'aTuN|
-% \arb[voc]{murU'aTuN} \arb[trans]{murU'aTuN}, |ta'xIruN|
-% \arb[fullvoc]{ta'xIruN} \arb[trans]{ta'xIruN}, |ta'axxara|
-% \arb[voc]{ta'axxara} \arb[trans]{ta'axxara}, |ji'tu-ka|
-% \arb[voc]{ji'tu-ka} \arb[trans]{ji'tu-ka}, |qA'iluN|
+% \arb[voc]{yatasA'alUna}\linebreak \arb[trans]{yatasA'alUna},
+% |murU'aTuN| \arb[voc]{murU'aTuN} \arb[trans]{murU'aTuN},
+% |ta'xIruN| \arb[fullvoc]{ta'xIruN} \arb[trans]{ta'xIruN},
+% |ta'axxara| \arb[voc]{ta'axxara} \arb[trans]{ta'axxara},
+% |ji'tu-ka| \arb[voc]{ji'tu-ka} \arb[trans]{ji'tu-ka}, |qA'iluN|
% \arb[voc]{qA'iluN} \arb[trans]{qA'iluN}.
%
% From \textcite[i. 14 B]{Wright}:--- All consonants, whatsoever,
@@ -1502,7 +1504,8 @@ vowels (see §~3).
% like so: \meta{\texttt{"'}} allows to determine the carrier of the
% \arb[trans]{hamzaT} freely, without any consideration for the
% context. \Cref{tab:quoted-hamza} gives the equivalents for all the
-% possible carriers the \arb[trans]{hamzaT} may take:
+% possible carriers the \arb[trans]{hamzaT} may take.
+%
% \begin{longtable}{llll}
% \captionlistentry{\enquote{Quoted} \arb[trans]{hamzaT}}\\[-1em]
% \toprule
@@ -1521,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"'| \\
+% \arb[novoc]{i"'} & \dmg{i"'} & \loc{i"'} & \verb|i"'| \\ \pagebreak
% \arb[novoc]{y"'} & \dmg{y"'} & \loc{y"'} & \verb|y"'| \\
% \bottomrule
% \caption*{\Cref*{tab:quoted-hamza}: \enquote{Quoted} \arb[trans]{hamzaT}}
@@ -2008,6 +2011,7 @@ muhaddamaTaN mi'_danatu-hu}: \arb[trans]{ra'aytu
% are currently used by \package{arabluatex}. The additional
% characters that are defined in \vref{tab:additional-arabic-codings}
% are also available.
+%
% \begin{longtable}{lllll}
% \captionlistentry{Buckwalter scheme}\\[-1em]
% \toprule
@@ -2348,7 +2352,7 @@ wa-ya.sIru ta.hta 'l-jild-i
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{arabluatex}%
-[2016/07/09 v1.4.1 ArabTeX-like interface for LuaLaTeX]
+[2016/09/09 v1.4.2 ArabTeX-like interface for LuaLaTeX]
\RequirePackage{ifluatex}
% \end{macrocode}
% \package{arabluatex} requires \LuaLaTeX\ of course. Issue a warning
@@ -2518,7 +2522,7 @@ wa-ya.sIru ta.hta 'l-jild-i
% formatting directives as argument, like so:
% \cs{SetArbUp}\marg{code}.
% \begin{macrocode}
-\NewDocumentCommand{\al@arbup@dflt}{m}{\textsuperscript{#1}}%
+\NewDocumentCommand{\al@arbup@dflt}{m}{\textsuperscript{\thinspace#1}}%
\NewDocumentCommand{\al@arbup}{m}{\al@arbup@dflt{#1}}
\NewDocumentCommand{\arbup}{m}{\al@arbup{#1}}
\NewDocumentCommand{\ArbUpDflt}{}{\let\al@arbup=\al@arbup@dflt}
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty
index befb074e3e8..9ef92eab1eb 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/07/09 v1.4.1 ArabTeX-like interface for LuaLaTeX]
+[2016/09/09 v1.4.2 ArabTeX-like interface for LuaLaTeX]
\RequirePackage{ifluatex}
\ifluatex\else
\PackageError{arabluatex}{lualatex needed}{%
@@ -94,7 +94,7 @@
\NewDocumentCommand{\SetTranslitStyle}{m}{\def\al@trans@style{#1}}
\def\al@trans@convention{dmg}
\NewDocumentCommand{\SetTranslitConvention}{m}{\def\al@trans@convention{#1}}
-\NewDocumentCommand{\al@arbup@dflt}{m}{\textsuperscript{#1}}%
+\NewDocumentCommand{\al@arbup@dflt}{m}{\textsuperscript{\thinspace#1}}%
\NewDocumentCommand{\al@arbup}{m}{\al@arbup@dflt{#1}}
\NewDocumentCommand{\arbup}{m}{\al@arbup{#1}}
\NewDocumentCommand{\ArbUpDflt}{}{\let\al@arbup=\al@arbup@dflt}
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua
index 2fdb94ab768..82459e946f4 100644
--- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua
+++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua
@@ -40,7 +40,7 @@ captr = {
{a="b", b="B"},
{a="t", b="T"},
{a="ṯ", b="Ṯ"},
- {a="ǧ", b="Ǧ"},
+ {a="ğ", b="Ğ"},
{a="ḥ", b="Ḥ"},
{a="ḫ", b="Ḫ"},
{a="d", b="D"},
@@ -133,23 +133,23 @@ tanwintrdmg = {
{a="%-?iNI", b="i\\arbup{n}"},
-- tanwīn preceding ʾalif conjunctionis
{a="%-?(uN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="\\arbup{uni}%2%3"},
- {a="%-?(aN)(_A)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ\\arbup{ni}%3%4"},
- {a="%-?(aN)(Y)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ\\arbup{ni}%3%4"},
+ {a="%-?(aN)(_A)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ\\arbup{ni}%3%4"},
+ {a="%-?(aN)(Y)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ\\arbup{ni}%3%4"},
{a="(T)%-?(aN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="t\\arbup{ani}%3%4"},
{a="([^TA])%-?(aN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1\\arbup{ani}%3%4"},
{a="%-?(iN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="\\arbup{ini}%2%3"},
-- tanwīn + alif without hamza and kasra (ibn)
{a="%-?(uN)(%s)(i)", b="\\arbup{uni}%2'"},
- {a="%-?(aN)(_A)(%s)(i)", b="ạ\\arbup{ni}%3%'"},
- {a="%-?(aN)(Y)(%s)(i)", b="ạ\\arbup{ni}%3%'"},
+ {a="%-?(aN)(_A)(%s)(i)", b="ạ\\arbup{ni}%3%'"},
+ {a="%-?(aN)(Y)(%s)(i)", b="ạ\\arbup{ni}%3%'"},
{a="(T)%-?(aN)(%s)(i)", b="t\\arbup{ani}%3%'"},
{a="([^TA])%-?(aN)(%s)(i)", b="%1\\arbup{ani}%3%'"},
{a="%-?(iN)(%s)(i)", b="\\arbup{ini}%2%'"},
--
-- {a="uN", b="\\arbup{un}"}, (now included in the last line of this table)
{a="%-?(\"?At)%-?([ui])N", b="\\arbup{%1%2n}"},
- {a="%-?(aN)(_A)", b="ạ\\arbup{n}"},
- {a="%-?(aN)(Y)", b="ạ\\arbup{n}"},
+ {a="%-?(aN)(_A)", b="ạ\\arbup{n}"},
+ {a="%-?(aN)(Y)", b="ạ\\arbup{n}"},
{a="(T)%-?(\"?aN)", b="t\\arbup{an}"},
{a="([^TA])%-?(\"?aN)", b="%1\\arbup{an}"},
{a="%-?([ui])N", b="\\arbup{%1n}"}
@@ -272,8 +272,8 @@ digraphstrdmg = {
-- {a="([%_]?[uaiUAIY])(%s)([uai])", b="%1%2'"}, -- initial alif without hamza
{a="(aW)(%s)(\"?[uai])", b="awu%2%3"},
{a="([^%_][uai])(%s)(\"?[uai])", b="%1%2'"},
- {a="(%_A)(%s)(\"?[uai])", b="ạ%2'"},
- {a="(Y)(%s)(\"?[uai])", b="ạ%2'"},
+ {a="(%_A)(%s)(\"?[uai])", b="ạ%2'"},
+ {a="(Y)(%s)(\"?[uai])", b="ạ%2'"},
{a="(%_a)(%s)(\"?[uai])", b="a%2'"},
{a="(A)(%s)(\"?[uai])", b="a%2'"},
{a="([%_]?[Uu])(%s)(\"?[uai])", b="u%2'"},
@@ -294,17 +294,17 @@ digraphstrdmg = {
{a="(U)(A)", b="U"},
{a="(aW)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="awu%2%3"},
{a="(%_a)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="a%2%3"},
- {a="(%_A)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ%2%3"},
+ {a="(%_A)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ%2%3"},
{a="(A)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="a%2%3"},
- {a="(Y)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ%2%3"},
+ {a="(Y)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ%2%3"},
{a="([%_]?[Uu])(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="u%2%3"},
{a="([%_]?[Ii])(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="i%2%3"},
{a="%-%-", b=""},
-- {a="T([^uai])", b="%1"},
- {a="T(%p?%s)", b="%1"},
- {a="T(%p?)$", b="%1"},
+ {a="T(%p?%s)", b="h%1"},
+ {a="T(%p?)$", b="h%1"},
{a="_t", b="ṯ"},
- {a="%^g", b="ǧ"},
+ {a="%^g", b="ğ"},
{a="%.h", b="ḥ"},
{a="_h", b="ḫ"},
{a="_d", b="ḏ"},
@@ -318,7 +318,7 @@ digraphstrdmg = {
-- {a="(U)(A)", b="ū"},
{a="WA", b="w"},
{a="(a)W", b="%1w"},
- {a="_A", b="ạ̄"},
+ {a="_A", b="ạ̄"},
{a="_u", b="ū"},
{a="_a", b="ā"},
{a="_i", b="ī"},
@@ -333,7 +333,7 @@ digraphstrdmg = {
singletrdmg = {
{a="b", b="b"},
{a="t", b="t"},
- {a="j", b="ǧ"},
+ {a="j", b="ğ"},
{a="x", b="ḫ"},
{a="d", b="d"},
{a="r", b="r"},
@@ -358,7 +358,7 @@ longvtrdmg = {
{a="A", b="ā"},
{a="U", b="ū"},
{a="I", b="ī"},
- {a="Y", b="ạ̄"}
+ {a="Y", b="ạ̄"}
}
shortvtrdmg = {
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua
index 20ed016cb1c..e28cd7e6338 100644
--- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua
+++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua
@@ -473,6 +473,8 @@ trigraphs = { -- trigraphs or more
}
trigraphseasy = { -- differences marked below with 'easy'
+ -- Allah (easy)
+ {a="l%-l_ah", b="l-ll_ah"},
-- 'llatI / 'llad_I
{a="^'ll(a)([%_]?[dt])", b="الّ%1%2"},
{a="([%s%-])'ll(a)([%_]?[dt])", b="%1الّ%2%3"},