From 87c50c0a79a759db9a51cc6366d1dfd64e606a30 Mon Sep 17 00:00:00 2001 From: Robert Alessi Date: Wed, 30 Mar 2016 19:17:53 +0200 Subject: =?UTF-8?q?wrong=20=CA=BEalif=20mamd=C5=ABda=20+=20hamza=20+=20u?= =?UTF-8?q?=20in=20voc=20and=20fullvoc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arabluatex.dtx | 20 ++++++++++---------- arabluatex_fullvoc.lua | 2 ++ arabluatex_voc.lua | 2 ++ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/arabluatex.dtx b/arabluatex.dtx index 716415b..52ae732 100644 --- a/arabluatex.dtx +++ b/arabluatex.dtx @@ -591,7 +591,7 @@ consonants, though three of them are also used as vowels % \caption*{\Cref*{tab:arabtex-short-vowels}: Standard Arab\TeX\ (short vowels)} % \end{longtable} % -% Whether Arabic texts are vocalized or not is essentially a matter of +% Whether Arabic texts be vocalized or not is essentially a matter of % personal choice. So one may use |voc| mode and decide not to write % vowels except at some particular places for disambiguation purposes, % or use |novoc| mode, not write vowels---as |novoc| normally does not @@ -644,7 +644,7 @@ consonants, though three of them are also used as vowels % |qAla| \arb[voc]{qAla} \arb[trans]{qAla}, |bI`a| \arb[voc]{bI`a} % \arb[trans]{bI`a}, |.tUruN| \arb[voc]{.tUruN} \arb[trans]{.tUruN}, % |.tInuN| \arb[voc]{.tInuN} \arb[trans]{.tInuN}, |murU'aTuN| -% \arb[trans]{murU'aTuN} \arb[voc]{murU'aTuN} +% \arb[voc]{murU'aTuN} \arb[trans]{murU'aTuN}. % \end{quote} % % \paragraph{\arb[trans]{'alif maq.sUraT}} It is written \meta{\_A} or @@ -688,7 +688,7 @@ consonants, though three of them are also used as vowels % \arb[voc]{BawT} or \arb[voc]{B_aUT} instead of \arb[voc]{BAT}: see % \textcite[i. 12 A]{Wright}. \package{arabluatex} preserves this % particular writing; the same applies to words ending in -% \arb[voc]{BayT} for \arb[voc]{BAT}. long vowels \meta{U, I} shall +% \arb[voc]{BayT} for \arb[voc]{BAT}\,. Long vowels \meta{U, I} shall % receive no \arb[trans]{sukUn} after a \arb[trans]{'alif ma.h_dUfaT} % and are discarded in |trans| mode: % \begin{quote} @@ -817,7 +817,7 @@ consonants, though three of them are also used as vowels % \arb[voc]{al-^say'u} \arb[trans]{al-^say'u}, |'a^syA'u| % \arb[voc]{'a^syA'u} \arb[trans]{'a^syA'u}, |'a^syA'a| % \arb[voc]{'a^syA'a} \arb[trans]{'a^syA'a}, |.zim'aN| \arb[voc]{.zim'aN} -% \arb[trans]{.zim'aN} +% \arb[trans]{.zim'aN}. % \end{quote} % % \paragraph{\arb[trans]{maddaT}} \label{ref:madda}At the beginning of @@ -868,7 +868,7 @@ consonants, though three of them are also used as vowels % |`allaqa| \arb[voc]{`allaqa} \arb[trans]{`allaqa}, |mAdduN| % \arb[voc]{mAdduN} \arb[trans]{mAdduN}, |'ammara| % \arb[voc]{'ammara} \arb[trans]{ammara}, |murruN| \arb[voc]{murruN} -% \arb[trans]{murruN} +% \arb[trans]{murruN}. % \end{quote} % % \subparagraph{The euphonic \arb[trans]{ta^sdId}} @@ -1047,11 +1047,11 @@ consonants, though three of them are also used as vowels % \end{quote} % % \subparagraph{\arb[trans]{'alifu 'l-wa.sli} preceded by a consonant -% with \arb[trans]{sukUn}} -% The vowel which the consonant takes, either its original vowel, or -% that which belongs to the connective \arb[trans]{'alif} or the -% \arb[trans]{kasraT}; in most of the cases \parencite[i. 22 -% A--C]{Wright}, it is encoded explicitly, like so:--- +% with \arb[trans]{sukUn}} The vowel which the consonant takes is +% either its original vowel, or that which belongs to the connective +% \arb[trans]{'alif} or the \arb[trans]{kasraT}; in most of the +% cases \parencite[i. 22 A--C]{Wright}, it is encoded explicitly, like +% so:--- % \begin{quote} % |'antumu| |'l-kA_dibUna| \arb[fullvoc]{'antumu 'l-kA_dibUna} % \arb[trans]{'antumu 'l-kA_dibUna}, |ra'aytumu| |'l-rajula| diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua index 317d607..b157653 100644 --- a/arabluatex_fullvoc.lua +++ b/arabluatex_fullvoc.lua @@ -49,6 +49,8 @@ hamzafv = { -- madda (historic writing below) {a="'a'([^uaiUAI])", b="آ%1"}, {a="'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="آ%1"}, + {a="(A)(')(uN?)$", b="aآء%3"}, + {a="(A)(')(uN?)(%W)", b="aآء%3%4"}, {a="(A)(')(iN?)$", b="aآء%3"}, {a="(A)(')(iN?)(%W)", b="aآء%3%4"}, {a="(A)(')(i)", b="aآئ%3"}, -- historic madda diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua index 4983ad0..5989898 100644 --- a/arabluatex_voc.lua +++ b/arabluatex_voc.lua @@ -81,6 +81,8 @@ hamza = { -- madda (historic writing below) {a="'a'([^uaiUAI])", b="آ%1"}, {a="'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="آ%1"}, + {a="(A)(')(uN?)$", b="aآء%3"}, + {a="(A)(')(uN?)(%W)", b="aآء%3%4"}, {a="(A)(')(iN?)$", b="aآء%3"}, {a="(A)(')(iN?)(%W)", b="aآء%3%4"}, {a="(A)(')(i)", b="aآئ%3"}, -- historic madda -- cgit v1.2.3