3 files changed, 21 insertions, 12 deletions

diff --git a/arabluatex.dtx b/arabluatex.dtx
index a80d8cb..7e2196d 100644
--- a/arabluatex.dtx
+++ b/arabluatex.dtx
@@ -760,10 +760,11 @@ vowels (see §~3).
 %        & \texttt{dmg} & \texttt{loc} & \texttt{arabica} & \\ \midrule
 % \endhead \footnotetext{See below \vref{sec:transliteration}.}
 % \label{tab:arabtex-consonants}
-% \arb[novoc]{a}\footnote{For \arb[trans]{'alif} as a consonant, see
-% \textcite[i. 16 D]{Wright}. The \arb[trans]{hamzaT} itself is
-% encoded \texttt{<'>}. See below \vref{ref:hamza}.} & \dmg{a} &
-% \loc{a} & \brill{a} & \verb|a| \\
+% \arb[voc]{'i 'a 'u}\footnote{For \arb[trans]{'alif} as a consonant,
+% see \textcite[i. 16 D]{Wright}. The \arb[trans]{hamzaT} itself is
+% encoded \texttt{<'>} and may be followed by either \meta{u, a} or
+% \meta{i}. See below \vref{ref:hamza}.} & \dmg{'u 'a 'i} &
+% \loc{|'u, |'a, |'i} & \brill{|'u, |'a, |'i} & |'u| or |'a| or |'i| \\
 % \arb[novoc]{b} & \dmg{b} & \loc{b} & \brill{b} & |b| \\
 % \arb[novoc]{t} & \dmg{t} & \loc{t} & \brill{t} & |t| \\
 % \arb[novoc]{_t} & \dmg{_t} & \loc{_t} & \brill{_t} & |_t| \\
diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index f687c5f..919a35e 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -93,8 +93,10 @@ hamzafv = {
    -- ^say'aN and .zim'aN are special orthographies
    {a="(%^sa%.?[yY])(\"?%|?)(%')(aN)", b="%1%2ئ%4"},
    {a="(.zi?m)(%')(aN)", b="%1ئ%3"},
-   {a="(')(I%p?)$", b="إ%2"}, -- affix pr. 1st person sg.
-   {a="(')(I)(%p?%s)", b="إ%2%3"}, -- affix pr. 1st person sg.
+   -- hamzah + pr. suffix: the carrier passes into yāʾ before ī so
+   -- take out the following two lines:
+   -- {a="(')(I%p?)$", b="إ%2"}, -- affix pr. 1st person sg.
+   -- {a="(')(I)(%p?%s)", b="إ%2%3"}, -- affix pr. 1st person sg.
    {a="([^uai])(')([uai]N?%p?)$", b="%1ء%3"},
    {a="([^uai])(')([uai]N?)(%p?%s)", b="%1ء%3%4"},
 -- u
@@ -214,8 +216,10 @@ hamzafveasy = { -- differences marked below with 'easy'
    -- ^say'aN and .zim'aN are special orthographies
    {a="(%^sa%.?[yY])(\"?%|?)(%')(aN)", b="%1%2ئ%4"},
    {a="(.zi?m)(%')(aN)", b="%1ئ%3"},
-   {a="(')(I%p?)$", b="إ%2"}, -- affix pr. 1st person sg.
-   {a="(')(I)(%p?%s)", b="إ%2%3"}, -- affix pr. 1st person sg.
+   -- hamzah + pr. suffix: the carrier passes into yāʾ before ī so
+   -- take out the following two lines:
+   -- {a="(')(I%p?)$", b="إ%2"}, -- affix pr. 1st person sg.
+   -- {a="(')(I)(%p?%s)", b="إ%2%3"}, -- affix pr. 1st person sg.
    {a="([^uai])(')([uai]N?%p?)$", b="%1ء%3"},
    {a="([^uai])(')([uai]N?)(%p?%s)", b="%1ء%3%4"},
 -- u
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index 4ebe744..ca1aa99 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -229,8 +229,10 @@ hamza = {
    -- ^say'aN and .zim'aN are special orthographies
    {a="(%^sa%.?[yY])(\"?%|?)(%')(aN)", b="%1%2ئ%4"},
    {a="(.zi?m)(%')(aN)", b="%1ئ%3"},
-   {a="(')(I%p?)$", b="إ%2"}, -- affix pr. 1st person sg.
-   {a="(')(I)(%p?%s)", b="إ%2%3"}, -- affix pr. 1st person sg.
+   -- hamzah + pr. suffix: the carrier passes into yāʾ before ī so
+   -- take out the following two lines:
+   -- {a="(')(I%p?)$", b="إ%2"}, -- affix pr. 1st person sg.
+   -- {a="(')(I)(%p?%s)", b="إ%2%3"}, -- affix pr. 1st person sg.
    {a="([^uai])(')([uai]N?%p?)$", b="%1ء%3"},
    {a="([^uai])(')([uai]N?)(%p?%s)", b="%1ء%3%4"},
 -- u
@@ -341,8 +343,10 @@ hamzaeasy = { -- differences marked below with 'easy'
    -- ^say'aN and .zim'aN are special orthographies
    {a="(%^sa%.?[yY])(\"?%|?)(%')(aN)", b="%1%2ئ%4"},
    {a="(.zi?m)(%')(aN)", b="%1ئ%3"},
-   {a="(')(I%p?)$", b="إ%2"}, -- affix pr. 1st person sg.
-   {a="(')(I)(%p?%s)", b="إ%2%3"}, -- affix pr. 1st person sg.
+   -- hamzah + pr. suffix: the carrier passes into yāʾ before ī so
+   -- take out the following two lines:
+   -- {a="(')(I%p?)$", b="إ%2"}, -- affix pr. 1st person sg.
+   -- {a="(')(I)(%p?%s)", b="إ%2%3"}, -- affix pr. 1st person sg.
    {a="([^uai])(')([uai]N?%p?)$", b="%1ء%3"},
    {a="([^uai])(')([uai]N?)(%p?%s)", b="%1ء%3%4"},
 -- u