1 files changed, 31 insertions, 27 deletions

diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index 9724901..0544a63 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -36,32 +36,32 @@ numbers = {
 }
 
 raw = {
-        {a="A", b="َا"},
-        {a="U", b="ُو"},
-        {a="I", b="ِي"},
-        {a="b", b="ب"},
-        {a="t", b="ت"},
-        {a="j", b="ج"},
-        {a="x", b="خ"},
-        {a="d", b="د"},
-        {a="r", b="ر"},
-        {a="z", b="ز"},
-        {a="s", b="س"},
-        {a="f", b="ف"},
-        {a="`", b="ع"},
-        {a="f", b="ف"},
-        {a="q", b="ق"},
-        {a="k", b="ك"},
-        {a="l", b="ل"},
-        {a="m", b="م"},
-        {a="n", b="ن"},
-        {a="h", b="ه"},
-        {a="w", b="و"},
-        {a="y", b="ي"},
-        {a="T", b="ة"},
-        {a="u", b="ُ"},
-        {a="a", b="َ"},
-        {a="i", b="ِ"}
+   {a="A", b="َا"},
+   {a="U", b="ُو"},
+   {a="I", b="ِي"},
+   {a="b", b="ب"},
+   {a="t", b="ت"},
+   {a="j", b="ج"},
+   {a="x", b="خ"},
+   {a="d", b="د"},
+   {a="r", b="ر"},
+   {a="z", b="ز"},
+   {a="s", b="س"},
+   {a="f", b="ف"},
+   {a="`", b="ع"},
+   {a="f", b="ف"},
+   {a="q", b="ق"},
+   {a="k", b="ك"},
+   {a="l", b="ل"},
+   {a="m", b="م"},
+   {a="n", b="ن"},
+   {a="h", b="ه"},
+   {a="w", b="و"},
+   {a="y", b="ي"},
+   {a="T", b="ة"},
+   {a="u", b="ُ"},
+   {a="a", b="َ"},
+   {a="i", b="ِ"}
 }
 
 hamza = {
@@ -76,8 +76,12 @@ hamza = {
    {a="''([Uu])", b="ؤؤ%1"},
    {a="''([Aa])", b="أأ%1"},
    {a="''([Ii])", b="ئئ%1"},
-   -- initial long u
+   -- initial long u and i (for a, see below)
    {a="%'%_U", b="أU"},
+   {a="%'%_I", b="إI"},
+   -- taḫfīfu 'l-hamza
+   {a="'u'([^uaiUAI])", b="أU%1"},
+   {a="'i'([^uaiUAI])", b="إI%1"},   
    -- madda (historic writing below)
    {a="'a'([^uaiUAI])", b="آ%1"},
    {a="'a?A([%_%^%.]?[%`%'btjghdrzsfqklmnywAY])", b="آ%1"},