From 3a73854f60e370860c14ae8ac0c21de6f845b978 Mon Sep 17 00:00:00 2001
From: Robert Alessi <alessi@robertalessi.net>
Date: Fri, 11 Mar 2016 10:52:58 +0100
Subject: =?UTF-8?q?bugfix:=20quoting=20suk=C5=ABn=20in=20fullvoc=20mode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 arabluatex.lua         |  4 ++--
 arabluatex_fullvoc.lua | 32 ++++++++++++++++++++++++++++++--
 arabluatex_voc.lua     |  6 +++---
 3 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/arabluatex.lua b/arabluatex.lua
index 158282d..8ebc30b 100644
--- a/arabluatex.lua
+++ b/arabluatex.lua
@@ -174,8 +174,8 @@ local function fullvoc(str)
 	for i = 1,#digraphsfv do
 		inside = string.gsub(inside, digraphsfv[i].a, digraphsfv[i].b)
 	end
-	for i = 1,#single do
-		inside = string.gsub(inside, single[i].a, single[i].b)
+	for i = 1,#singlefv do
+		inside = string.gsub(inside, singlefv[i].a, singlefv[i].b)
 	end
 	for i = 1,#longv do
 		inside = string.gsub(inside, longv[i].a, longv[i].b)
diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index 8fb564e..021d75a 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -173,10 +173,10 @@ digraphsfv = {
    {a="ww", b="وّ"},
    {a="yy", b="يّ"},
    -- sukūn begin
-   {a="\"", b=""},
    {a="([%_%^%.]?[btjghxdrzs%`fqklmnwy])$", b="%1ْ"},
    {a="([%_%^%.]?[btjghxdrzs%`fqklmnwy])([%s])", b="%1ْ%2"},
-   {a="([%_%^%.]?[btjghxdrzs%`fqklmnwy])([^%_uaiUAIًٌٍ])", b="%1ْ%2"},
+   {a="([%_%^%.]?[btjghxdrzs%`fqklmnwy])([%_]?[^uaiUAIًٌٍ])", b="%1ْ%2"},
+   {a="ْ\"", b="\""},
    -- sukūn end
    {a="_t", b="ث"},
    {a="%^g", b="ج"},
@@ -201,3 +201,31 @@ digraphsfv = {
    {a="%.k", b="ک"},
    {a="%.n", b="ں"},
 }
+
+singlefv = {
+	{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="\"$", b=""},
+	{a="\"(%W)", b="%1"},
+	{a="\"([^uaiUAI])", b="%1"},
+	{a="([^0-9])%-([^0-9])", b="%1%2"},
+	{a="B", b="ـ"},
+}
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index 25d46bb..268495f 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -284,9 +284,9 @@ longv = {
 }
 
 shortv = {
-	{a="\"u", b="ُ"},
-	{a="\"a", b="َ"},
-	{a="\"i", b="ِ"},
+	{a="\"u", b=""},
+	{a="\"a", b=""},
+	{a="\"i", b=""},
 	{a="u", b="ُ"},
 	{a="a", b="َ"},
 	{a="i", b="ِ"}
-- 
cgit v1.2.3