texlive[44670] Master/texmf-dist: arabluatex (21jun17)
commits+karl at tug.org
commits+karl at tug.org
Fri Jun 23 00:36:05 CEST 2017
Revision: 44670
http://tug.org/svn/texlive?view=revision&revision=44670
Author: karl
Date: 2017-06-23 00:36:05 +0200 (Fri, 23 Jun 2017)
Log Message:
-----------
arabluatex (21jun17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf
trunk/Master/texmf-dist/doc/lualatex/arabluatex/samples/al-Jahiz.pdf
trunk/Master/texmf-dist/doc/lualatex/arabluatex/samples/template-01.pdf
trunk/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx
trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty
trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua
trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_novoc.lua
trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua
trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua
Modified: trunk/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/lualatex/arabluatex/samples/al-Jahiz.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/lualatex/arabluatex/samples/template-01.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx
===================================================================
--- trunk/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx 2017-06-22 22:35:49 UTC (rev 44669)
+++ trunk/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx 2017-06-22 22:36:05 UTC (rev 44670)
@@ -27,7 +27,7 @@
%<package-info>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package-info>\ProvidesPackage{arabluatex}
%<*package-info>
- [2017/05/06 v1.8.4 An ArabTeX-like interface for LuaLaTeX]
+ [2017/06/20 v1.8.5 An ArabTeX-like interface for LuaLaTeX]
%</package-info>
%
%<*driver>
@@ -104,6 +104,15 @@
annote = {New impression, 1996}
}
+ at Manual{din31635,
+ label = {{DIN 31~635}},
+ title = {Information and Documentation - Romanization of the
+ Arabic Alphabet for Arabic, Ottoman-Turkish,
+ Persian, Kurdish, Urdu and Pushto},
+ date = {2011/07},
+ url = {http://www.din.de}
+}
+
@InProceedings{dmg,
author = {Brockelmann, Carl and Fischer, August and Heffening,
W. and Taeschner, Franz},
@@ -146,7 +155,7 @@
\defaultfontfeatures{RawFeature={+liga}}
\setmainfont{Old Standard}[SmallCapsFont={Latin Modern Roman Caps},
RawFeature={+mark;+ccmp;+ss05;+ss06}]
-\usepackage{arabluatex}[2017/05/06]
+\usepackage{arabluatex}[2017/06/20]
\usepackage[nopar]{quran}
\usepackage{varioref}
\usepackage{hyperxmp}
@@ -787,6 +796,51 @@
% \caption*{\Cref*{tab:arabtex-consonants}: Standard Arab\TeX\ (consonants)}
% \end{longtable}
%
+% \subsection{Additional characters}
+% \changes{v1.8.5}{2017/06/20}{Six additional Persian characters are
+% now available}
+% \NEWfeature{v1.8.5}\Cref{tab:arabtex-additional-characters} gives
+% the Arab\TeX\ equivalents for some additional Persian characters.
+%
+% \begin{longtable}{lllll}
+% \captionlistentry{Arab\TeX\ additional characters}\\[-1em]
+% \toprule
+% Letter & \multicolumn{3}{l}{Transliteration\footnotemark}
+% & Arab\TeX\ notation \\
+% & \texttt{dmg} & \texttt{loc} & \texttt{arabica}\footnotemark
+% & \\ \midrule
+% \endfirsthead
+% \toprule
+% Letter & \multicolumn{3}{l}{Transliteration}
+% & Arab\TeX\ notation \\
+% & \texttt{dmg} & \texttt{loc} & \texttt{arabica} & \\ \midrule
+% \endhead
+% \addtocounter{footnote}{-1}
+% \footnotetext{See below \vref{sec:transliteration}.}
+% \stepcounter{footnote}
+% \footnotetext{The characters that are listed in this table are not
+% included in this standard. However, as \texttt{arabica} is based on
+% \texttt{dmg}, the \texttt{dmg} equivalents have been used here.}
+% \label{tab:arabtex-additional-characters}
+% \arb[novoc]{p} & \dmg{p} & \loc{p} & \brill{p} & \verb|p| \\
+% \arb[novoc]{^c} & \dmg{^c} & \loc{^c} & \brill{^c} & \verb|^c| \\
+% \arb[novoc]{^z} & \dmg{^z} & \loc{^z} & \brill{^z} & \verb|^z| \\
+% \arb[novoc]{v}\footnote{\label{fn:not-in-dmg}This character is not found in
+% \textcite[2]{dmg}. It is taken from the \textcite{din31635} standard.} &
+% \dmg{v} & \loc{v} & \brill{v} & \verb|v| \\
+% \arb[novoc]{g} & \dmg{g} & \loc{g} & \brill{g} & \verb|g| \\
+% \arb[novoc]{^n}\footnote{See \cref{fn:not-in-dmg}.} & \dmg{^n} &
+% \loc{^n} & \brill{^n} & \verb|^n| \\
+% \bottomrule
+% \caption*{\Cref*{tab:arabtex-additional-characters}: Standard
+% Arab\TeX\ (additional characters)}
+% \end{longtable}
+% \begin{quoting}
+% \textsc{Rem.} The alveolar consonants \arb[novoc]{^c} and
+% \arb[novoc]{^z} are processed as solar letters by
+% \package{arabluatex}.
+% \end{quoting}
+%
% \subsection{Vowels}
% \subsubsection{Long vowels}
% \Cref{tab:arabtex-long-vowels} gives the Arab\TeX\ equivalents for
@@ -2283,7 +2337,7 @@
% transliterated Arabic text is printed in italics by default. This
% also can be changed either globally in the preamble or locally at
% any point of the document by the \cs{SetTranslitStyle}\marg{style}
-% command , where \meta{style} may be any font shape selection
+% command, where \meta{style} may be any font shape selection
% command, eg. \cs{upshape}, \cs{itshape}, \cs{slshape}, and so forth.
%
% \paragraph{Font} \NEWfeature{v1.4} \DescribeMacro{\SetTranslitFont}
@@ -2929,7 +2983,7 @@
% viz. |acadian|, |canadien|, |francais|, |frenchb| or |french| all
% redefine the list environments, which breaks the standard definition
% file that is used by \package{arabluatex}. Therefore,
-% \package{babel-french} must be loaded with the |StandardLayout=true|
+% \package{babel-french} must be loaded with the |StandardLists=true|
% option, like so:---%
% \iffalse
%<*example>
@@ -2936,7 +2990,7 @@
% \fi
\begin{arabluaverbatim}
\usepackage[french]{babel}
-\frenchbsetup{StandardLayout=true}
+\frenchsetup{StandardLists=true}
\end{arabluaverbatim}
% \iffalse
%</example>
@@ -3088,7 +3142,7 @@
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{arabluatex}%
-[2017/05/06 v1.8.4 An ArabTeX-like interface for LuaLaTeX]
+[2017/06/20 v1.8.5 An ArabTeX-like interface for LuaLaTeX]
\RequirePackage{ifluatex}
% \end{macrocode}
% \package{arabluatex} requires \LuaLaTeX\ of course. Issue a warning
Modified: trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty 2017-06-22 22:35:49 UTC (rev 44669)
+++ trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty 2017-06-22 22:36:05 UTC (rev 44670)
@@ -41,7 +41,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{arabluatex}%
-[2017/05/06 v1.8.4 An ArabTeX-like interface for LuaLaTeX]
+[2017/06/20 v1.8.5 An ArabTeX-like interface for LuaLaTeX]
\RequirePackage{ifluatex}
\ifluatex\else
\PackageError{arabluatex}{lualatex needed}{%
Modified: trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua 2017-06-22 22:35:49 UTC (rev 44669)
+++ trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua 2017-06-22 22:36:05 UTC (rev 44670)
@@ -354,12 +354,16 @@
-- al- + lām
{a="^(a)l%-(l)", b="ا%1ل%2%2"},
{a="([%(%[%|%<%s%-o])(a)l%-(l)", b="%1ا%2ل%3%3"}, --p
- -- al- + solar consonant
- {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="ا%1ل%2%2"},
- {a="([%(%[%|%<%s%-o])(a)l%-([%_%^%.]?[tdrzsn])", b="%1ا%2ل%3%3"}, --p
- -- assim. art. + solar consonant
- {a="^(a)([%_%^%.]?[tdrzsn])%-", b="ا%1ل%2"},
- {a="([%(%[%|%<%s%-o])(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل%3"}, --p
+ -- al- + solar consonant ('c' and '^n' are additional characters)
+ {a="^(a)l%-(%^n)", b="ا%1ل%2"}, -- ^n is lunar
+ {a="([%(%[%|%<%s%-o])(a)l%-(%^n)", b="%1ا%2ل%3"}, -- ^n is lunar --p
+ {a="^(a)l%-([%_%^%.]?[tdrzsnc])", b="ا%1ل%2%2"},
+ {a="([%(%[%|%<%s%-o])(a)l%-([%_%^%.]?[tdrzsnc])", b="%1ا%2ل%3%3"}, --p
+ -- assim. art. + solar consonant ('c' and '^n' are additional characters)
+ {a="^(a)(%^n)%-", b="ا%1ل"}, -- ^n is lunar
+ {a="([%(%[%|%<%s%-o])(a)(%^n)%-", b="%1ا%2ل"}, -- ^n is lunar --p
+ {a="^(a)([%_%^%.]?[tdrzsnc])%-", b="ا%1ل%2"},
+ {a="([%(%[%|%<%s%-o])(a)([%_%^%.]?[tdrzsnc])%-", b="%1ا%2ل%3"}, --p
-- al- + initial unstable hamza
{a="^(a)l%-(\"?[uai])", b="ا%1ل%2ٱ"},
{a="([%(%[%|%<%s%-o])(a)l%-(\"?[uai])", b="%1ا%2ل%3ٱ"}, --p
@@ -378,15 +382,23 @@
-- art. with waṣla + lām
{a="'l%-(l)", b="ٱل%1%1"},
-- art. with waṣla + solar consonant
- {a="'l%-([%_%^%.]?[tdrzsn])", b="ٱل%1%1"},
+ -- ('c' and '^n' are additional characters)
+ {a="'l%-(%^n)", b="ٱل%1"}, -- ^n is lunar
+ {a="'l%-([%_%^%.]?[tdrzsnc])", b="ٱل%1%1"},
-- li-/la- + art. + lām
{a="l([ai])%-l%-(l)", b="ل%1%2%2"},
-- assim. art. with waṣla + solar consonant
- {a="'([%_%^%.]?[tdrzsn])%-", b="ٱل%1"},
+ -- ('c' and '^n' are additional characters)
+ {a="'(%^n)%-", b="ٱل"}, -- ^n is lunar
+ {a="'([%_%^%.]?[tdrzsnc])%-", b="ٱل%1"},
-- li-/la- + art. + solar consonant is a special orthography
- {a="l([ai])%-l%-([%_%^%.]?[tdrzsn])", b="ل%1ل%2%2"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-l%-(%^n)", b="ل%1ل%2"}, -- ^n is lunar
+ {a="l([ai])%-l%-([%_%^%.]?[tdrzsnc])", b="ل%1ل%2%2"},
-- li-/la- + assim. art. + solar consonant is a special orthography
- {a="l([ai])%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="ل%1ل%3%3"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-(%^n)%-(%^n)", b="ل%1ل%3"}, -- ^n is lunar
+ {a="l([ai])%-([%_%^%.]?[tdrzsnc])%-([%_%^%.]?[tdrzsnc])", b="ل%1ل%3%3"},
-- art. with waṣla + initial unstable hamza
{a="'l%-(\"?[uai])", b="ٱل%1ٱ"},
-- art. with waṣla + lunar consonant (i.e. what remains)
@@ -423,12 +435,16 @@
-- al- + lām
{a="^(a)l%-(l)", b="ا%1ل%2%2"},
{a="([%(%[%|%<%s%-o])(a)l%-(l)", b="%1ا%2ل%3%3"}, --p
- -- al- + solar consonant
- {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="ا%1ل%2%2"},
- {a="([%(%[%|%<%s%-o])(a)l%-([%_%^%.]?[tdrzsn])", b="%1ا%2ل%3%3"}, --p
- -- assim. art. + solar consonant
- {a="^(a)([%_%^%.]?[tdrzsn])%-", b="ا%1ل%2"},
- {a="([%(%[%|%<%s%-o])(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل%3"}, --p
+ -- al- + solar consonant ('c' and '^n' are additional characters)
+ {a="^(a)l%-(%^n)", b="ا%1ل%2"}, -- ^n is lunar
+ {a="([%(%[%|%<%s%-o])(a)l%-(%^n)", b="%1ا%2ل%3"}, -- ^n is lunar --p
+ {a="^(a)l%-([%_%^%.]?[tdrzsnc])", b="ا%1ل%2%2"},
+ {a="([%(%[%|%<%s%-o])(a)l%-([%_%^%.]?[tdrzsnc])", b="%1ا%2ل%3%3"}, --p
+ -- assim. art. + solar consonant ('c' and '^n' are additional characters)
+ {a="^(a)(%^n)%-", b="ا%1ل"}, -- ^n is lunar
+ {a="([%(%[%|%<%s%-o])(a)(%^n)%-", b="%1ا%2ل"}, -- ^n is lunar --p
+ {a="^(a)([%_%^%.]?[tdrzsnc])%-", b="ا%1ل%2"},
+ {a="([%(%[%|%<%s%-o])(a)([%_%^%.]?[tdrzsnc])%-", b="%1ا%2ل%3"}, --p
-- al- + initial unstable hamza
{a="^(a)l%-(\"?[uai])", b="ا%1ل%2ٱ"},
{a="([%(%[%|%<%s%-o])(a)l%-(\"?[uai])", b="%1ا%2ل%3ٱ"}, --p
@@ -447,15 +463,23 @@
-- art. with waṣla + lām
{a="'l%-(l)", b="ٱل%1%1"},
-- art. with waṣla + solar consonant
- {a="'l%-([%_%^%.]?[tdrzsn])", b="ٱل%1%1"},
+ -- ('c' and '^n' are additional characters)
+ {a="'l%-(%^n)", b="ٱل%1"}, -- ^n is lunar
+ {a="'l%-([%_%^%.]?[tdrzsnc])", b="ٱل%1%1"},
-- li-/la- + art. + lām
{a="l([ai])%-l%-(l)", b="ل%1%2%2"},
-- assim. art. with waṣla + solar consonant
- {a="'([%_%^%.]?[tdrzsn])%-", b="ٱل%1"},
+ -- ('c' and '^n' are is an additional characters)
+ {a="'(%^n)%-", b="ٱل"}, -- ^n is lunar
+ {a="'([%_%^%.]?[tdrzsnc])%-", b="ٱل%1"},
-- li-/la- + art. + solar consonant is a special orthography
- {a="l([ai])%-l%-([%_%^%.]?[tdrzsn])", b="ل%1ل%2%2"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-l%-(%^n)", b="ل%1ل%2"}, -- ^n is lunar
+ {a="l([ai])%-l%-([%_%^%.]?[tdrzsnc])", b="ل%1ل%2%2"},
-- li-/la- + assim. art. + solar consonant is a special orthography
- {a="l([ai])%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="ل%1ل%3%3"},
+ -- ('c and '^n' are additional characters)
+ {a="l([ai])%-(%^n)%-(%^n)", b="ل%1ل%3"}, -- ^n is lunar
+ {a="l([ai])%-([%_%^%.]?[tdrzsnc])%-([%_%^%.]?[tdrzsnc])", b="ل%1ل%3%3"},
-- art. with waṣla + initial unstable hamza
{a="'l%-(\"?[uai])", b="ٱل%1ٱ"},
-- art. with waṣla + lunar consonant (i.e. what remains)
@@ -511,6 +535,8 @@
{a="bb", b="بّ"},
{a="BB", b="ـّ"},
{a="([%_%^%.])([tghdsz])([tghdsz])", b="%1%2|%3"},
+ -- same as above for additional characters:
+ {a="([%_%^%.])([cn])([cn])", b="%1%2|%3"},
{a="tt", b="تّ"},
{a="%_t%_t", b="ثّ"},
{a="jj", b="جّ"},
@@ -539,6 +565,14 @@
{a="hh", b="هّ"},
{a="ww", b="وّ"},
{a="yy", b="يّ"},
+ -- additional characters + šaddah (begin)
+ {a="pp", b="پّ"},
+ {a="vv", b="ڤّ"},
+ {a="gg", b="گّ"},
+ {a="%^c%^c", b="چّ"},
+ {a="%^z%^z", b="ژّ"},
+ {a="%^n%^n", b="ڭّ"},
+ -- additional characters + šaddah (end)
-- sukūn begin
-- first, take out hyphen if any:
{a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])%-([uaiUAI])", b="%1%2"},
@@ -565,6 +599,11 @@
{a="%.t", b="ط"},
{a="%.z", b="ظ"},
{a="%.g", b="غ"},
+ -- additional characters (begin)
+ {a="%^c", b="چ"},
+ {a="%^z", b="ژ"},
+ {a="%^n", b="ڭ"},
+ -- additional characters (end)
{a="(U)(A)", b="%1ا"},
{a="WA", b="وْا"},
{a="(a)W\"", b="%1وا"},
@@ -619,6 +658,8 @@
{a="bb", b="بّ"},
{a="BB", b="ـّ"},
{a="([%_%^%.])([tghdsz])([tghdsz])", b="%1%2|%3"},
+ -- same as above for additional characters:
+ {a="([%_%^%.])([cn])([cn])", b="%1%2|%3"},
{a="tt", b="تّ"},
{a="%_t%_t", b="ثّ"},
{a="jj", b="جّ"},
@@ -647,6 +688,14 @@
{a="hh", b="هّ"},
{a="ww", b="وّ"},
{a="yy", b="يّ"},
+ -- additional characters + šaddah (begin)
+ {a="pp", b="پّ"},
+ {a="vv", b="ڤّ"},
+ {a="gg", b="گّ"},
+ {a="%^c%^c", b="چّ"},
+ {a="%^z%^z", b="ژّ"},
+ {a="%^n%^n", b="ڭّ"},
+ -- additional characters + šaddah (end)
-- sukūn begin
-- first, take out hyphen if any:
{a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])%-([uaiUAI])", b="%1%2"},
@@ -673,6 +722,11 @@
{a="%.t", b="ط"},
{a="%.z", b="ظ"},
{a="%.g", b="غ"},
+ -- additional characters (begin)
+ {a="%^c", b="چ"},
+ {a="%^z", b="ژ"},
+ {a="%^n", b="ڭ"},
+ -- additional characters (end)
{a="(U)(A)", b="%1ا"},
{a="WA", b="وْا"},
{a="(a)W\"", b="%1وا"},
@@ -727,6 +781,8 @@
{a="bb", b="بّ"},
{a="BB", b="ـّ"},
{a="([%_%^%.])([tghdsz])([tghdsz])", b="%1%2|%3"},
+ -- same as above for additional characters:
+ {a="([%_%^%.])([cn])([cn])", b="%1%2|%3"},
{a="tt", b="تّ"},
{a="%_t%_t", b="ثّ"},
{a="jj", b="جّ"},
@@ -755,6 +811,14 @@
{a="hh", b="هّ"},
{a="ww", b="وّ"},
{a="yy", b="يّ"},
+ -- additional characters + šaddah (begin)
+ {a="pp", b="پّ"},
+ {a="vv", b="ڤّ"},
+ {a="gg", b="گّ"},
+ {a="%^c%^c", b="چّ"},
+ {a="%^z%^z", b="ژّ"},
+ {a="%^n%^n", b="ڭّ"},
+ -- additional characters + šaddah (end)
-- sukūn begin ('easy' needs these rules to be taken out); but
-- first take out every previously generated sukūn by hamza rules,
-- so there be no need to edit them:
@@ -784,6 +848,11 @@
{a="%.t", b="ط"},
{a="%.z", b="ظ"},
{a="%.g", b="غ"},
+ -- additional characters (begin)
+ {a="%^c", b="چ"},
+ {a="%^z", b="ژ"},
+ {a="%^n", b="ڭ"},
+ -- additional characters (end)
{a="(U)(A)", b="%1ا"},
{a="WA", b="وْا"},
{a="(a)W\"", b="%1وا"},
@@ -821,6 +890,11 @@
{a="w", b="و"},
{a="y", b="ي"},
{a="T", b="ة"},
+ -- additional characters (begin)
+ {a="p", b="پ"},
+ {a="v", b="ڤ"},
+ {a="g", b="گ"},
+ -- additional characters (end)
{a="\"$", b=""},
{a="\"(%W)", b="%1"},
{a="\"([^uaiUAI])", b="%1"},
@@ -849,6 +923,11 @@
{a="w", b="و"},
{a="y", b="ي"},
{a="T", b="ة"},
+ -- additional characters (begin)
+ {a="p", b="پ"},
+ {a="v", b="ڤ"},
+ {a="g", b="گ"},
+ -- additional characters (end)
-- easy (begin): \" needs to put back the sukūn
{a="\"$", b="ْ"},
{a="\"(%W)", b="ْ%1"},
Modified: trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_novoc.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_novoc.lua 2017-06-22 22:35:49 UTC (rev 44669)
+++ trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_novoc.lua 2017-06-22 22:36:05 UTC (rev 44670)
@@ -74,12 +74,16 @@
-- al- + lām
{a="^(a)l%-(l)", b="ا%1ل%2"},
{a="([%(%[%|%<%s%-])(a)l%-(l)", b="%1ا%2ل%3"}, --p
- -- al- + solar consonant
- {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="ا%1ل%2"},
- {a="([%(%[%|%<%s%-])(a)l%-([%_%^%.]?[tdrzsn])", b="%1ا%2ل%3"}, --p
- -- assim. art. + solar consonant
- {a="^(a)([%_%^%.]?[tdrzsn])%-", b="ا%1ل"},
- {a="([%(%[%|%<%s%-])(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل"}, --p
+ -- al- + solar consonant ('c' and '^n' are additional characters)
+ {a="^(a)l%-(%^n)", b="ا%1ل%2"}, -- ^n is lunar
+ {a="([%(%[%|%<%s%-])(a)l%-(%^n)", b="%1ا%2ل%3"}, -- ^n is lunar --p
+ {a="^(a)l%-([%_%^%.]?[tdrzsnc])", b="ا%1ل%2"},
+ {a="([%(%[%|%<%s%-])(a)l%-([%_%^%.]?[tdrzsnc])", b="%1ا%2ل%3"}, --p
+ -- assim. art. + solar consonant ('c' and '^n' are additional characters)
+ {a="^(a)(%^n)%-", b="ا%1ل"}, -- ^n is lunar
+ {a="([%(%[%|%<%s%-])(a)(%^n)%-", b="%1ا%2ل"}, -- ^n is lunar --p
+ {a="^(a)([%_%^%.]?[tdrzsnc])%-", b="ا%1ل"},
+ {a="([%(%[%|%<%s%-])(a)([%_%^%.]?[tdrzsnc])%-", b="%1ا%2ل"}, --p
-- al- + initial unstable hamza
{a="^(a)l%-(\")([uai])", b="ا%1لٱ%3"},
{a="([%(%[%|%<%s%-])(a)l%-(\")([uai])", b="%1ا%2لٱ%4"}, --p
@@ -94,15 +98,23 @@
-- art. with waṣla + lām
{a="'l%-(l)", b="ال%1"},
-- art. with waṣla + solar consonant
- {a="'l%-([%_%^%.]?[tdrzsn])", b="ال%1"},
+ -- ('c' and '^n' are additional characters)
+ {a="'l%-(%^n)", b="ال%1"}, -- ^n is lunar
+ {a="'l%-([%_%^%.]?[tdrzsnc])", b="ال%1"},
-- li-/la- + art. + lām
{a="l([ai])%-l%-(l)", b="ل%1%2"},
-- assim. art. with waṣla + solar consonant
- {a="'([%_%^%.]?[tdrzsn])%-", b="ال"},
+ -- ('c' and '^n' are additional characters)
+ {a="'(%^n)%-", b="ال"}, -- ^n is lunar
+ {a="'([%_%^%.]?[tdrzsnc])%-", b="ال"},
-- li-/la- + art. + solar consonant is a special orthography
- {a="l([ai])%-l%-([%_%^%.]?[tdrzsn])", b="ل%1ل%2"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-l%-(%^n)", b="ل%1ل%2"}, -- ^n is lunar
+ {a="l([ai])%-l%-([%_%^%.]?[tdrzsnc])", b="ل%1ل%2"},
-- li-/la + assim. art. + solar consonant is a special orthography
- {a="l([ai])%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="ل%1ل%3"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-(%^n)%-(%^n)", b="ل%1ل%3"}, -- ^n is lunar
+ {a="l([ai])%-([%_%^%.]?[tdrzsnc])%-([%_%^%.]?[tdrzsnc])", b="ل%1ل%3"},
-- art. with waṣla + initial unstable hamza
{a="'l%-(\")([uai])", b="الٱ%2"},
{a="'l%-([uai])", b="الا%1"},
Modified: trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua 2017-06-22 22:35:49 UTC (rev 44669)
+++ trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua 2017-06-22 22:36:05 UTC (rev 44670)
@@ -213,12 +213,16 @@
-- al- + lām
{a="^(a)l%-(l)", b="%1l-%2"},
{a="([%(%[%|%<%s%-o])(a)l%-(l)", b="%1%2l-%3"}, --p
- -- al- + solar consonant
- {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="%1%2-%2"},
- {a="([%(%[%|%<%s%-o])(a)l%-([%_%^%.]?[tdrzsn])", b="%1%2%3-%3"}, --p
- -- assim. art. + solar consonant
- {a="^(a)([%_%^%.]?[tdrzsn])%-", b="%1%2-"},
- {a="([%(%[%|%<%s%-o])(a)([%_%^%.]?[tdrzsn])%-", b="%1%2%3-"}, --p
+ -- al- + solar consonant ('c' and '^n' are additional characters)
+ {a="^(a)l%-(%^n)", b="%1l-%2"}, -- ^n is lunar
+ {a="([%(%[%|%<%s%-o])(a)l%-(%^n)", b="%1%2l-%3"}, --^n is lunar --p
+ {a="^(a)l%-([%_%^%.]?[tdrzsnc])", b="%1%2-%2"},
+ {a="([%(%[%|%<%s%-o])(a)l%-([%_%^%.]?[tdrzsnc])", b="%1%2%3-%3"}, --p
+ -- assim. art. + solar consonant ('c' and '^n' are additional characters)
+ {a="^(a)(%^n)%-", b="%1l-"}, -- ^n is lunar
+ {a="([%(%[%|%<%s%-o])(a)(%^n)%-", b="%1%2l-"}, --^n is lunar --p
+ {a="^(a)([%_%^%.]?[tdrzsnc])%-", b="%1%2-"},
+ {a="([%(%[%|%<%s%-o])(a)([%_%^%.]?[tdrzsnc])%-", b="%1%2%3-"}, --p
-- al- + initial unstable hamza
{a="^(a)l%-(\"?[uai])", b="%1l-%2"},
{a="([%(%[%|%<%s%-o])(a)l%-(\"?[uai])", b="%1%2l-%3"}, --p
@@ -235,15 +239,23 @@
-- art. with waṣla + lām
{a="'l%-(l)", b="'l-%1"},
-- art. with waṣla + solar consonant
- {a="'l%-([%_%^%.]?[tdrzsn])", b="'%1-%1"},
+ -- ('c' and '^n' are additional characters)
+ {a="'l%-(%^n)", b="'l-%1"}, -- ^n is lunar
+ {a="'l%-([%_%^%.]?[tdrzsnc])", b="'%1-%1"},
-- li-/la- + art. + lām
{a="l([ai])%-l%-(l)", b="l%1-%2%2"},
-- assim. art. with waṣla + solar consonant
- {a="'([%_%^%.]?[tdrzsn])%-", b="'%1-"},
+ -- ('c' and '^n' are additional characters)
+ {a="'(%^n)%-", b="'l-"}, -- ^n is lunar
+ {a="'([%_%^%.]?[tdrzsnc])%-", b="'%1-"},
-- li-/la- + art. + solar consonant is a special orthography
- {a="l([ai])%-l%-([%_%^%.]?[tdrzsn])", b="l%1-%2-%2"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-l%-(%^n)", b="l%1-l-%2"}, -- ^n is lunar
+ {a="l([ai])%-l%-([%_%^%.]?[tdrzsnc])", b="l%1-%2-%2"},
-- li-/la- + assim. art. + solar consonant is a special orthography
- {a="l([ai])%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="l%1-%2-%3"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-(%^n)%-(%^n)", b="l%1-l-%3"}, -- ^n is lunar
+ {a="l([ai])%-([%_%^%.]?[tdrzsnc])%-([%_%^%.]?[tdrzsnc])", b="l%1-%2-%3"},
-- art. with waṣla + initial unstable hamza
{a="'l%-(\"?[uai])", b="'l-%1"},
-- art. with waṣla + lunar consonant (i.e. what remains)
@@ -353,6 +365,11 @@
{a="%.t", b="ṭ"},
{a="%.z", b="ẓ"},
{a="%.g", b="ġ"},
+ -- additional characters (begin)
+ {a="%^c", b="č"},
+ {a="%^z", b="ž"},
+ {a="%^n", b="ñ"},
+ -- additional characters (end)
-- the following needs to be moved above shortening rules
-- {a="(U)(A)", b="ū"},
{a="WA", b="w"},
@@ -389,6 +406,11 @@
{a="w", b="w"},
{a="y", b="y"},
{a="T", b="t"},
+ -- additional characters (begin)
+ {a="p", b="p"},
+ {a="v", b="v"},
+ {a="g", b="g"},
+ -- additional characters (end)
{a="\"", b=""},
{a="B", b=""}
}
@@ -495,12 +517,16 @@
-- al- + lām
{a="^(a)l%-(l)", b="%1l-%2"},
{a="(%s)(a)l%-(l)", b="%1%2l-%3"},
- -- al- + solar consonant
- {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="%1l-%2"},
- {a="(%s)(a)l%-([%_%^%.]?[tdrzsn])", b="%1%2l-%3"},
- -- assim. art. + solar consonant
- {a="^(a)([%_%^%.]?[tdrzsn])%-", b="%1l-"},
- {a="(%s)(a)([%_%^%.]?[tdrzsn])%-", b="%1%2l-"},
+ -- al- + solar consonant ('c' and '^n' are additional characters)
+ {a="^(a)l%-(%^n)", b="%1l-%2"}, -- ^n is lunar
+ {a="(%s)(a)l%-(%^n)", b="%1%2l-%3"}, -- ^n is lunar
+ {a="^(a)l%-([%_%^%.]?[tdrzsnc])", b="%1l-%2"},
+ {a="(%s)(a)l%-([%_%^%.]?[tdrzsnc])", b="%1%2l-%3"},
+ -- assim. art. + solar consonant ('c' and '^n' are additional characters)
+ {a="^(a)(%^n)%-", b="%1l-"}, -- ^n is lunar
+ {a="(%s)(a)(%^n)%-", b="%1%2l-"}, -- ^n is lunar
+ {a="^(a)([%_%^%.]?[tdrzsnc])%-", b="%1l-"},
+ {a="(%s)(a)([%_%^%.]?[tdrzsnc])%-", b="%1%2l-"},
-- al- + initial unstable hamza
{a="^(a)l%-([uai])", b="%1l-%2"},
{a="(%s)(a)l%-([uai])", b="%1%2l-%3"},
@@ -512,15 +538,23 @@
-- art. with waṣla + lām
{a="'l%-(l)", b="al-%1"},
-- art. with waṣla + solar consonant
- {a="'l%-([%_%^%.]?[tdrzsn])", b="al-%1"},
+ -- ('c' and '^n' are additional characters)
+ {a="'l%-(%^n)", b="al-%1"}, -- ^n is lunar
+ {a="'l%-([%_%^%.]?[tdrzsnc])", b="al-%1"},
-- li-/la- + art. + lām
{a="l([ai])%-l%-(l)", b="l%1-l-%2"},
-- assim. art. with waṣla + solar consonant
- {a="'([%_%^%.]?[tdrzsn])%-", b="al-"},
+ -- ('c' and '^n' are additional characters)
+ {a="'(%^n)%-", b="al-"}, -- ^n is lunar
+ {a="'([%_%^%.]?[tdrzsnc])%-", b="al-"},
-- li-/la- + art. + solar consonant is a special orthography
- {a="l([ai])%-l%-([%_%^%.]?[tdrzsn])", b="l%1-l-%2"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-l%-(%^n)", b="l%1-l-%2"}, -- ^n is lunar
+ {a="l([ai])%-l%-([%_%^%.]?[tdrzsnc])", b="l%1-l-%2"},
-- li-/la- + assim. art. + solar consonant is a special orthography
- {a="l([ai])%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="l%1-l-%3"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-(%^n)%-(%^n)", b="l%1-l-%3"}, -- ^n is lunar
+ {a="l([ai])%-([%_%^%.]?[tdrzsnc])%-([%_%^%.]?[tdrzsnc])", b="l%1-l-%3"},
-- art. with waṣla + initial unstable hamza
{a="'l%-([uai])", b="al-%1"},
-- art. with waṣla + lunar consonant (i.e. what remains)
@@ -576,6 +610,11 @@
{a="%.t", b="ṭ"},
{a="%.z", b="ẓ"},
{a="%.g", b="gh"},
+ -- additional characters (begin)
+ {a="%^c", b="ch"},
+ {a="%^z", b="zh"},
+ {a="%^n", b="ñ"},
+ -- additional characters (end)
{a="(U)(A)", b="ū"},
{a="WA", b="w"},
{a="(a)W", b="%1w"},
@@ -611,6 +650,11 @@
{a="w", b="w"},
{a="y", b="y"},
{a="T", b="t"},
+ -- additional characters (begin)
+ {a="p", b="p"},
+ {a="v", b="v"},
+ {a="g", b="g"},
+ -- additional characters (end)
{a="\"", b=""},
{a="B", b=""}
}
@@ -709,12 +753,16 @@
-- al- + lām
{a="^(a)l%-(l)", b="%1l-%2"},
{a="(%s)(a)l%-(l)", b="%1%2l-%3"},
- -- al- + solar consonant
- {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="%1l-%2"},
- {a="(%s)(a)l%-([%_%^%.]?[tdrzsn])", b="%1%2l-%3"},
- -- assim. art. + solar consonant
- {a="^(a)([%_%^%.]?[tdrzsn])%-", b="%1l-"},
- {a="(%s)(a)([%_%^%.]?[tdrzsn])%-", b="%1%2l-"},
+ -- al- + solar consonant ('c' and '^n' are additional characters)
+ {a="^(a)l%-(%^n)", b="%1l-%2"}, -- ^n is lunar
+ {a="(%s)(a)l%-(%^n)", b="%1%2l-%3"}, -- ^n is lunar
+ {a="^(a)l%-([%_%^%.]?[tdrzsnc])", b="%1l-%2"},
+ {a="(%s)(a)l%-([%_%^%.]?[tdrzsnc])", b="%1%2l-%3"},
+ -- assim. art. + solar consonant ('c' and '^n' are additional characters)
+ {a="^(a)(%^n)%-", b="%1l-"}, -- ^n is lunar
+ {a="(%s)(a)(%^n)%-", b="%1%2l-"}, -- ^n is lunar
+ {a="^(a)([%_%^%.]?[tdrzsnc])%-", b="%1l-"},
+ {a="(%s)(a)([%_%^%.]?[tdrzsnc])%-", b="%1%2l-"},
-- al- + initial unstable hamza
{a="^(a)l%-([uai])", b="%1l-%2"},
{a="(%s)(a)l%-([uai])", b="%1%2l-%3"},
@@ -726,15 +774,23 @@
-- art. with waṣla + lām
{a="'l%-(l)", b="l-%1"},
-- art. with waṣla + solar consonant
- {a="'l%-([%_%^%.]?[tdrzsn])", b="l-%1"},
+ -- ('c' and '^n' are additional characters)
+ {a="'l%-(%^n)", b="l-%1"}, -- ^n is lunar
+ {a="'l%-([%_%^%.]?[tdrzsnc])", b="l-%1"},
-- li-/la- + art. + lām
{a="l([ai])%-l%-(l)", b="l%1-l-%2"},
-- assim. art. with waṣla + solar consonant
- {a="'([%_%^%.]?[tdrzsn])%-", b="l-"},
+ -- ('c' and '^n' are additional characters)
+ {a="'(%^n)%-", b="l-"}, -- ^n is lunar
+ {a="'([%_%^%.]?[tdrzsnc])%-", b="l-"},
-- li-/la- + art. + solar consonant is a special orthography
- {a="l([ai])%-l%-([%_%^%.]?[tdrzsn])", b="l%1-l-%2"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-l%-(%^n)", b="l%1-l-%2"}, -- ^n is lunar
+ {a="l([ai])%-l%-([%_%^%.]?[tdrzsnc])", b="l%1-l-%2"},
-- li-/la- + assim. art. + solar consonant is a special orthography
- {a="l([ai])%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="l%1-l-%3"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-(%^n)%-(%^n)", b="l%1-l-%3"}, -- ^n is lunar
+ {a="l([ai])%-([%_%^%.]?[tdrzsnc])%-([%_%^%.]?[tdrzsnc])", b="l%1-l-%3"},
-- art. with waṣla + initial unstable hamza
{a="'l%-([uai])", b="l-%1"},
-- art. with waṣla + lunar consonant (i.e. what remains)
@@ -790,6 +846,11 @@
{a="%.t", b="ṭ"},
{a="%.z", b="ẓ"},
{a="%.g", b="ġ"},
+ -- additional characters (begin)
+ {a="%^c", b="č"},
+ {a="%^z", b="ž"},
+ {a="%^n", b="ñ"},
+ -- additional characters (end)
{a="(U)(A)", b="ū"},
{a="WA", b="w"},
{a="(a)W", b="%1w"},
@@ -825,6 +886,11 @@
{a="w", b="w"},
{a="y", b="y"},
{a="T", b="t"},
+ -- additional characters (begin)
+ {a="p", b="p"},
+ {a="v", b="v"},
+ {a="g", b="g"},
+ -- additional characters (end)
{a="\"", b=""},
{a="B", b=""}
}
Modified: trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua 2017-06-22 22:35:49 UTC (rev 44669)
+++ trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua 2017-06-22 22:36:05 UTC (rev 44670)
@@ -471,12 +471,16 @@
-- al- + lām
{a="^(a)l%-(l)", b="ا%1ل%2%2"},
{a="([%(%[%|%<%s%-o])(a)l%-(l)", b="%1ا%2ل%3%3"}, --p
- -- al- + solar consonant
- {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="ا%1ل%2%2"},
- {a="([%(%[%|%<%s%-o])(a)l%-([%_%^%.]?[tdrzsn])", b="%1ا%2ل%3%3"}, --p
- -- assim. art. + solar consonant
- {a="^(a)([%_%^%.]?[tdrzsn])%-", b="ا%1ل%2"},
- {a="([%(%[%|%<%s%-o])(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل%3"}, --p
+ -- al- + solar consonant ('c' and '^n' are additional characters)
+ {a="^(a)l%-(%^n)", b="ا%1ل%2"}, -- ^n is lunar
+ {a="([%(%[%|%<%s%-o])(a)l%-(%^n)", b="%1ا%2ل%3"},-- ^n is lunar --p
+ {a="^(a)l%-([%_%^%.]?[tdrzsnc])", b="ا%1ل%2%2"},
+ {a="([%(%[%|%<%s%-o])(a)l%-([%_%^%.]?[tdrzsnc])", b="%1ا%2ل%3%3"}, --p
+ -- assim. art. + solar consonant ('c' and '^n' are additional characters)
+ {a="^(a)(%^n)%-", b="ا%1ل"}, -- ^n is lunar
+ {a="([%(%[%|%<%s%-o])(a)(%^n)%-", b="%1ا%2ل"},-- ^n is lunar --p
+ {a="^(a)([%_%^%.]?[tdrzsnc])%-", b="ا%1ل%2"},
+ {a="([%(%[%|%<%s%-o])(a)([%_%^%.]?[tdrzsnc])%-", b="%1ا%2ل%3"}, --p
-- al- + initial unstable hamza
{a="^(a)l%-(\")([uai])", b="ا%1ل%3ٱ"},
{a="([%(%[%|%<%s%-o])(a)l%-(\")([uai])", b="%1ا%2ل%4ٱ"}, --p
@@ -498,15 +502,23 @@
-- art. with waṣla + lām
{a="'l%-(l)", b="ال%1%1"},
-- art. with waṣla + solar consonant
- {a="'l%-([%_%^%.]?[tdrzsn])", b="ال%1%1"},
+ -- ('c' and '^n' are additional characters)
+ {a="'l%-(%^n)", b="ال%1"}, -- ^n is lunar
+ {a="'l%-([%_%^%.]?[tdrzsnc])", b="ال%1%1"},
-- li-/la- + art. + lām
{a="l([ai])%-l%-(l)", b="ل%1%2%2"},
- -- assim. art. with waṣla + solar consonant
- {a="'([%_%^%.]?[tdrzsn])%-", b="ال%1"},
+ -- assim. art. with waṣla + solar consonant ('c' and '^n' are
+ -- additional characters)
+ {a="'(%^n)%-", b="ال"}, -- ^n is lunar
+ {a="'([%_%^%.]?[tdrzsnc])%-", b="ال%1"},
-- li-/la- + art. + solar consonant is a special orthography
- {a="l([ai])%-l%-([%_%^%.]?[tdrzsn])", b="ل%1ل%2%2"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-l%-(%^n)", b="ل%1ل%2"}, -- '^n' is lunar
+ {a="l([ai])%-l%-([%_%^%.]?[tdrzsnc])", b="ل%1ل%2%2"},
-- li-/la + assim. art. + solar consonant is a special orthography
- {a="l([ai])%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="ل%1ل%3%3"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-(%^n)%-(%^n)", b="ل%1ل%3"}, -- ^n is lunar
+ {a="l([ai])%-([%_%^%.]?[tdrzsnc])%-([%_%^%.]?[tdrzsnc])", b="ل%1ل%3%3"},
-- art. with waṣla + initial unstable hamza
{a="'l%-(\")([uai])", b="ال%2ٱ"},
{a="'l%-([uai])", b="ال%1ا"},
@@ -549,12 +561,17 @@
-- al- + lām (easy)
{a="^(a)l%-(l)", b="ا%1ل%2"},
{a="([%(%[%|%<%s%-o])(a)l%-(l)", b="%1ا%2ل%3"}, --p
- -- al- + solar consonant (easy)
- {a="^(a)l%-([%_%^%.]?[tdrzsn])", b="ا%1ل%2"},
- {a="([%(%[%|%<%s%-o])(a)l%-([%_%^%.]?[tdrzsn])", b="%1ا%2ل%3"}, --p
- -- assim. art. + solar consonant (easy)
- {a="^(a)([%_%^%.]?[tdrzsn])%-", b="ا%1ل"},
- {a="([%(%[%|%<%s%-o])(a)([%_%^%.]?[tdrzsn])%-", b="%1ا%2ل"}, --p
+ -- al- + solar consonant (easy) ('c' and '^n' are additional characters)
+ {a="^(a)l%-(%^n)", b="ا%1ل%2"}, -- ^n is lunar
+ {a="([%(%[%|%<%s%-o])(a)l%-(%^n)", b="%1ا%2ل%3"}, -- ^n is lunar --p
+ {a="^(a)l%-([%_%^%.]?[tdrzsnc])", b="ا%1ل%2"},
+ {a="([%(%[%|%<%s%-o])(a)l%-([%_%^%.]?[tdrzsnc])", b="%1ا%2ل%3"}, --p
+ -- assim. art. + solar consonant (easy) ('c' and '^n' are
+ -- additional characters)
+ {a="^(a)(%^n)%-", b="ا%1ل"}, -- ^n is lunar
+ {a="([%(%[%|%<%s%-o])(a)(%^n)%-", b="%1ا%2ل"}, -- ^n is lunar --p
+ {a="^(a)([%_%^%.]?[tdrzsnc])%-", b="ا%1ل"},
+ {a="([%(%[%|%<%s%-o])(a)([%_%^%.]?[tdrzsnc])%-", b="%1ا%2ل"}, --p
-- al- + initial unstable hamza
{a="^(a)l%-(\")([uai])", b="ا%1ل%3ٱ"},
{a="([%(%[%|%<%s%-o])(a)l%-(\")([uai])", b="%1ا%2ل%4ٱ"}, --p
@@ -576,15 +593,23 @@
-- art. with waṣla + lām (easy)
{a="'l%-(l)", b="ال%1"},
-- art. with waṣla + solar consonant (easy)
- {a="'l%-([%_%^%.]?[tdrzsn])", b="ال%1"},
+ -- ('c' and '^n' are additional characters)
+ {a="'l%-(%^n)", b="ال%1"}, -- ^n is lunar
+ {a="'l%-([%_%^%.]?[tdrzsnc])", b="ال%1"},
-- li-/la- + art. + lām (easy)
{a="l([ai])%-l%-(l)", b="ل%1%2"},
-- assim. art. with waṣla + solar consonant (easy)
- {a="'([%_%^%.]?[tdrzsn])%-", b="ال"},
+ -- ('c' and '^n' are additional characters)
+ {a="'(%^n)%-", b="ال"}, -- ^n is lunar
+ {a="'([%_%^%.]?[tdrzsnc])%-", b="ال"},
-- li-/la- + art. + solar consonant is a special orthography (easy)
- {a="l([ai])%-l%-([%_%^%.]?[tdrzsn])", b="ل%1ل%2"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-l%-(%^n)", b="ل%1ل%2"}, -- ^n is lunar
+ {a="l([ai])%-l%-([%_%^%.]?[tdrzsnc])", b="ل%1ل%2"},
-- li-/la + assim. art. + solar consonant is a special orthography (easy)
- {a="l([ai])%-([%_%^%.]?[tdrzsn])%-([%_%^%.]?[tdrzsn])", b="ل%1ل%3"},
+ -- ('c' and '^n' are additional characters)
+ {a="l([ai])%-(%^n)%-(%^n)", b="ل%1ل%3"}, -- ^n is lunar
+ {a="l([ai])%-([%_%^%.]?[tdrzsnc])%-([%_%^%.]?[tdrzsnc])", b="ل%1ل%3"},
-- art. with waṣla + initial unstable hamza
{a="'l%-(\")([uai])", b="ال%2ٱ"},
{a="'l%-([uai])", b="ال%1ا"},
@@ -640,6 +665,8 @@
{a="bb", b="بّ"},
{a="BB", b="ـّ"},
{a="([%_%^%.])([tghdsz])([tghdsz])", b="%1%2|%3"},
+ -- same as above for additional characters:
+ {a="([%_%^%.])([cn])([cn])", b="%1%2|%3"},
{a="tt", b="تّ"},
{a="%_t%_t", b="ثّ"},
{a="jj", b="جّ"},
@@ -668,6 +695,14 @@
{a="hh", b="هّ"},
{a="ww", b="وّ"},
{a="yy", b="يّ"},
+ -- additional characters + šaddah (begin)
+ {a="pp", b="پّ"},
+ {a="vv", b="ڤّ"},
+ {a="gg", b="گّ"},
+ {a="%^c%^c", b="چّ"},
+ {a="%^z%^z", b="ژّ"},
+ {a="%^n%^n", b="ڭّ"},
+ -- additional characters + šaddah (end)
{a="_t", b="ث"},
{a="%^g", b="ج"},
{a="%.h", b="ح"},
@@ -679,6 +714,11 @@
{a="%.t", b="ط"},
{a="%.z", b="ظ"},
{a="%.g", b="غ"},
+ -- additional characters (begin)
+ {a="%^c", b="چ"},
+ {a="%^z", b="ژ"},
+ {a="%^n", b="ڭ"},
+ -- additional characters (end)
{a="(U)(A)", b="%1ا"},
{a="WA", b="وا"},
{a="(a)W\"", b="%1وْا"},
@@ -716,6 +756,11 @@
{a="w", b="و"},
{a="y", b="ي"},
{a="T", b="ة"},
+ -- additional characters (begin)
+ {a="p", b="پ"},
+ {a="v", b="ڤ"},
+ {a="g", b="گ"},
+ -- additional characters (end)
{a="\"$", b="ْ"},
{a="\"(%W)", b="ْ%1"},
{a="\"([^uaiUAI])", b="ْ%1"},
More information about the tex-live-commits
mailing list