arabluatex (28jul17)

git-svn-id: svn://tug.org/texlive/trunk@44908 c570f23f-e606-0410-a88d-b1316a301751

9 files changed, 67 insertions, 60 deletions

diff --git a/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.el b/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.el
index 5343fbbf17c..31ed17218df 100644
--- a/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.el
+++ b/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.el
@@ -79,6 +79,7 @@
     "LRfootnote"
     "RLfootnote"
     "FixArbFtnmk"
+    "MkArbBreak"
     '("setRL" 0)
     '("setLR" 0))
    (LaTeX-add-environments
diff --git a/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf b/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf
index ef777788c01..d411066a279 100644
--- a/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf
+++ b/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf
diff --git a/Master/texmf-dist/doc/lualatex/arabluatex/samples/al-Jahiz.pdf b/Master/texmf-dist/doc/lualatex/arabluatex/samples/al-Jahiz.pdf
index 613ae832b67..6a28adf5e28 100644
--- a/Master/texmf-dist/doc/lualatex/arabluatex/samples/al-Jahiz.pdf
+++ b/Master/texmf-dist/doc/lualatex/arabluatex/samples/al-Jahiz.pdf
diff --git a/Master/texmf-dist/doc/lualatex/arabluatex/samples/template-01.pdf b/Master/texmf-dist/doc/lualatex/arabluatex/samples/template-01.pdf
index 16cee35f2a1..6e1b63266d7 100644
--- a/Master/texmf-dist/doc/lualatex/arabluatex/samples/template-01.pdf
+++ b/Master/texmf-dist/doc/lualatex/arabluatex/samples/template-01.pdf
diff --git a/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx b/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx
index 3cd91982679..04175d63632 100644
--- a/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx
+++ b/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx
@@ -27,7 +27,7 @@
 %<package-info>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package-info>\ProvidesPackage{arabluatex}
 %<*package-info>
-    [2017/07/05 v1.9 An ArabTeX-like interface for LuaLaTeX]
+    [2017/07/28 v1.9.1 An ArabTeX-like interface for LuaLaTeX]
 %</package-info>
 %
 %<*driver>
@@ -155,7 +155,7 @@
 \defaultfontfeatures{RawFeature={+liga}}
 \setmainfont{Old Standard}[SmallCapsFont={Latin Modern Roman Caps},
   RawFeature={+mark;+ccmp;+ss05;+ss06}]
-\usepackage{arabluatex}[2017/07/05]
+\usepackage{arabluatex}[2017/07/28]
 \usepackage[nopar]{quran}
 \usepackage{varioref}
 \usepackage{hyperxmp}
@@ -3254,7 +3254,7 @@ wa-ya.sIru ta.hta 'l-jild-i
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{arabluatex}%
-[2017/07/05 v1.9 An ArabTeX-like interface for LuaLaTeX]
+[2017/07/28 v1.9.1 An ArabTeX-like interface for LuaLaTeX]
 \RequirePackage{ifluatex}
 %    \end{macrocode}
 % \package{arabluatex} requires \LuaLaTeX\ of course. Issue a warning
@@ -3721,9 +3721,9 @@ wa-ya.sIru ta.hta 'l-jild-i
 %   argument left-to-right.
 %    \begin{macrocode}
 \DeclareDocumentCommand{\LRfootnote}{m}{\bgroup\pardir
-  TLT\LR{\footnote{#1}}\egroup}
+  TLT\textdir TLT\footnote{#1}\egroup}
 \DeclareDocumentCommand{\RLfootnote}{m}{\bgroup\pardir
-  TRT\LR{\footnote{#1}}\egroup}
+  TRT\textdir TRT\footnote{#1}\egroup}
 %    \end{macrocode}
 %   \end{macro}
 % \end{macro}
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty
index 8914c3115b5..fc4b56a83b2 100644
--- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty
+++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty
@@ -41,7 +41,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{arabluatex}%
-[2017/07/05 v1.9 An ArabTeX-like interface for LuaLaTeX]
+[2017/07/28 v1.9.1 An ArabTeX-like interface for LuaLaTeX]
 \RequirePackage{ifluatex}
 \ifluatex\else
  \PackageError{arabluatex}{lualatex needed}{%
@@ -238,9 +238,9 @@
   \luadirect{tex.sprint(abraces(\luastringN{#1}))}}
 \DeclareDocumentCommand{\LRmarginpar}{m}{\marginpar{\textdir TLT #1}}
 \DeclareDocumentCommand{\LRfootnote}{m}{\bgroup\pardir
-  TLT\LR{\footnote{#1}}\egroup}
+  TLT\textdir TLT\footnote{#1}\egroup}
 \DeclareDocumentCommand{\RLfootnote}{m}{\bgroup\pardir
-  TRT\LR{\footnote{#1}}\egroup}
+  TRT\textdir TRT\footnote{#1}\egroup}
 \NewDocumentCommand{\FixArbFtnmk}{}{%
   \@ifpackageloaded{scrextend}%
   {\AtBeginDocument{\deffootnote{2em}{1.6em}{\LR{\thefootnotemark}.\enskip}}}%
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua
index 919a35ed2a3..b7237dbdf60 100644
--- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua
+++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua
@@ -102,7 +102,7 @@ hamzafv = {
 -- u
    {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"},
    {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"},
-   {a="(u)('%p?)$", b="%1ؤْ"},
+   {a="(u)(')(%p?)$", b="%1ؤْ%3"},
    {a="(u)(')(%p?%s)", b="%1ؤْ%3"},
 -- a
    {a="(a)(')(A%p?)$", b="%1آ"},
@@ -115,27 +115,27 @@ hamzafv = {
    {a="(a)(')(aN)(%p?%s)", b="%1أً%4"},
    {a="(a)(')([i]N?%p?)$", b="%1إ%3"},
    {a="(a)(')([i]N?)(%p?%s)", b="%1إ%3%4"},
-   {a="(a)('%p?)$", b="%1أْ"},
+   {a="(a)(')(%p?)$", b="%1أْ%3"},
    {a="(a)(')(%p?%s)", b="%1أْ%3"},
 -- i
    {a="(i)(')([uai]N?%p?)$", b="%1ئ%3"},
    {a="(i)(')([uai]N?)(%p?%s)", b="%1ئ%3%4"},
-   {a="(i)('%p?)$", b="%1ئْ"},
+   {a="(i)(')(%p?)$", b="%1ئْ%3"},
    {a="(i)(')(%p?%s)", b="%1ئْ%3"},
 --
    -- middle
    {a="(U)(')", b="%1ء"},
    {a="([Iy])(')", b="%1ئ"},
    {a="([^uai])(')([uU])", b="%1ؤ%3"},
-   {a="([^uai])(')([aA])", b="%1أ%3"},
+   {a="([^uai])(')(%_?[aAY])", b="%1أ%3"},
    {a="([^uai])(')([iI])", b="%1ئ%3"},
    {a="(u)(')([uU])", b="%1ؤ%3"},
-   {a="(u)(')([aA])", b="%1ؤ%3"},
+   {a="(u)(')(%_?[aAY])", b="%1ؤ%3"},
    {a="(u)(')([iI])", b="%1ئ%3"},
-   {a="(a)(')([aA])", b="%1أ%3"},
+   {a="(a)(')(%_?[aAY])", b="%1أ%3"},
    {a="(a)(')([uU])", b="%1ؤ%3"},
    {a="(a)(')([iI])", b="%1ئ%3"},
-   {a="(i)(')([aA])", b="%1ئ%3"},
+   {a="(i)(')(%_?[aAY])", b="%1ئ%3"},
    {a="(i)(')([uU])", b="%1ئ%3"},
    {a="(i)(')([iI])", b="%1ئ%3"},
    {a="(a)(')([^uaiUAI])", b="%1أْ%3"},
@@ -225,7 +225,7 @@ hamzafveasy = { -- differences marked below with 'easy'
 -- u
    {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"},
    {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"},
-   {a="(u)('%p?)$", b="%1ؤْ"},
+   {a="(u)(')(%p?)$", b="%1ؤْ%3"},
    {a="(u)(')(%p?%s)", b="%1ؤْ%3"},
 -- a
    {a="(a)(')(A%p?)$", b="%1آ"},
@@ -238,27 +238,27 @@ hamzafveasy = { -- differences marked below with 'easy'
    {a="(a)(')(aN)(%p?%s)", b="%1أً%4"},
    {a="(a)(')([i]N?%p?)$", b="%1إ%3"},
    {a="(a)(')([i]N?)(%p?%s)", b="%1إ%3%4"},
-   {a="(a)('%p?)$", b="%1أْ"},
+   {a="(a)(')(%p?)$", b="%1أْ%3"},
    {a="(a)(')(%p?%s)", b="%1أْ%3"},
 -- i
    {a="(i)(')([uai]N?%p?)$", b="%1ئ%3"},
    {a="(i)(')([uai]N?)(%p?%s)", b="%1ئ%3%4"},
-   {a="(i)('%p?)$", b="%1ئْ"},
+   {a="(i)(')(%p?)$", b="%1ئْ%3"},
    {a="(i)(')(%p?%s)", b="%1ئْ%3"},
 --
    -- middle
    {a="(U)(')", b="%1ء"},
    {a="([Iy])(')", b="%1ئ"},
    {a="([^uai])(')([uU])", b="%1ؤ%3"},
-   {a="([^uai])(')([aA])", b="%1أ%3"},
+   {a="([^uai])(')(%_?[aAY])", b="%1أ%3"},
    {a="([^uai])(')([iI])", b="%1ئ%3"},
    {a="(u)(')([uU])", b="%1ؤ%3"},
-   {a="(u)(')([aA])", b="%1ؤ%3"},
+   {a="(u)(')(%_?[aAY])", b="%1ؤ%3"},
    {a="(u)(')([iI])", b="%1ئ%3"},
-   {a="(a)(')([aA])", b="%1أ%3"},
+   {a="(a)(')(%_?[aAY])", b="%1أ%3"},
    {a="(a)(')([uU])", b="%1ؤ%3"},
    {a="(a)(')([iI])", b="%1ئ%3"},
-   {a="(i)(')([aA])", b="%1ئ%3"},
+   {a="(i)(')(%_?[aAY])", b="%1ئ%3"},
    {a="(i)(')([uU])", b="%1ئ%3"},
    {a="(i)(')([iI])", b="%1ئ%3"},
    {a="(a)(')([^uaiUAI])", b="%1أْ%3"},
@@ -597,11 +597,13 @@ digraphsfvidgham = {
    {a="%^n%^n", b="ڭّ"},
    -- additional characters + šaddah (end)
    -- sukūn begin
-   -- first, take out hyphen if any:
-   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwyY])%-([uaiUAI])", b="%1%2"},
-   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy]%p?)$", b="%1ْ"},
+   -- first, take out hyphen if any (next two lines):
+   {a="([ai]Y)%-([uaiUAI])", b="%1%2"},
+   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])%-([uaiUAI])", b="%1%2"},
+   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])(%p?)$", b="%1ْ%2"},
    {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])(%p?%s)", b="%1ْ%2"},
-   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwyY])([%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"},
+   {a="([ai]Y)([%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"},
+   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"},
    -- take out sukūn in cases of assimilation
    {a="(n)(ْ)(%s)(ر)", b="%1%3%4"},
    {a="(n)(ْ)(%s)(و)", b="%1%3%4"},
@@ -722,11 +724,13 @@ digraphsfv = {
    {a="%^n%^n", b="ڭّ"},
    -- additional characters + šaddah (end)
    -- sukūn begin
-   -- first, take out hyphen if any:
-   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwyY])%-([uaiUAI])", b="%1%2"},
-   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy]%p?)$", b="%1ْ"},
+   -- first, take out hyphen if any (next two lines):
+   {a="([ai]Y)%-([uaiUAI])", b="%1%2"},
+   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])%-([uaiUAI])", b="%1%2"},
+   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])(%p?)$", b="%1ْ%2"},
    {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])(%p?%s)", b="%1ْ%2"},
-   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwyY])([%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"},
+   {a="([ai]Y)([%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"},
+   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"},
    -- take out sukūn in cases of assimilation
 --   {a="(n)(ْ)(%s)(ر)", b="%1%3%4"},
 --   {a="(n)(ْ)(%s)(و)", b="%1%3%4"},
@@ -850,11 +854,13 @@ digraphsfveasy = { -- see the differences under 'easy' marker below
    -- first take out every previously generated sukūn by hamza rules,
    -- so there be no need to edit them:
    {a="ْ", b=""}, 
-   -- first, take out hyphen if any:
---   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwyY])%-([uaiUAI])", b="%1%2"},
---   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy]%p?)$", b="%1ْ"},
+   -- first, take out hyphen if any (next two lines):
+--   {a="([ai]Y)%-([uaiUAI])", b="%1%2"},
+--   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])%-([uaiUAI])", b="%1%2"},
+--   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])(%p?)$", b="%1ْ%2"},
 --   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])(%p?%s)", b="%1ْ%2"},
---   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwyY])([%_]?[^%_uaiUAIًٌٍ])", b="%1ْ%2"},
+--   {a="([ai]Y)([%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"},
+--   {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([%_]?[^%_uaiUAIYًٌٍ])", b="%1ْ%2"},
    -- take out sukūn in cases of assimilation
 --   {a="(n)(ْ)(%s)(ر)", b="%1%3%4"},
 --   {a="(n)(ْ)(%s)(و)", b="%1%3%4"},
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua
index 404ae220a58..23ecf2cc7c6 100644
--- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua
+++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_trans.lua
@@ -136,15 +136,15 @@ hamzatrdmg = {
    {a="(U)(')", b="%1ʾ"},
    {a="([Iy])(')", b="%1ʾ"},
    {a="([^uai])(')([uU])", b="%1ʾ%3"},
-   {a="([^uai])(')([aA])", b="%1ʾ%3"},
+   {a="([^uai])(')(%_?[aAY])", b="%1ʾ%3"},
    {a="([^uai])(')([iI])", b="%1ʾ%3"},
    {a="(u)(')([uU])", b="%1ʾ%3"},
-   {a="(u)(')([aA])", b="%1ʾ%3"},
+   {a="(u)(')(%_?[aAY])", b="%1ʾ%3"},
    {a="(u)(')([iI])", b="%1ʾ%3"},
-   {a="(a)(')([aA])", b="%1ʾ%3"},
+   {a="(a)(')(%_?[aAY])", b="%1ʾ%3"},
    {a="(a)(')([uU])", b="%1ʾ%3"},
    {a="(a)(')([iI])", b="%1ʾ%3"},
-   {a="(i)(')([aA])", b="%1ʾ%3"},
+   {a="(i)(')(%_?[aAY])", b="%1ʾ%3"},
    {a="(i)(')([uU])", b="%1ʾ%3"},
    {a="(i)(')([iI])", b="%1ʾ%3"},
    {a="(a)(')([^uaiUAI])", b="%1ʾ%3"},
@@ -505,15 +505,15 @@ hamzatrloc = {
    {a="(U)(')", b="%1ʾ"},
    {a="([Iy])(')", b="%1ʾ"},
    {a="([^uai])(')([uU])", b="%1ʾ%3"},
-   {a="([^uai])(')([aA])", b="%1ʾ%3"},
+   {a="([^uai])(')(%_?[aAY])", b="%1ʾ%3"},
    {a="([^uai])(')([iI])", b="%1ʾ%3"},
    {a="(u)(')([uU])", b="%1ʾ%3"},
-   {a="(u)(')([aA])", b="%1ʾ%3"},
+   {a="(u)(')(%_?[aAY])", b="%1ʾ%3"},
    {a="(u)(')([iI])", b="%1ʾ%3"},
-   {a="(a)(')([aA])", b="%1ʾ%3"},
+   {a="(a)(')(%_?[aAY])", b="%1ʾ%3"},
    {a="(a)(')([uU])", b="%1ʾ%3"},
    {a="(a)(')([iI])", b="%1ʾ%3"},
-   {a="(i)(')([aA])", b="%1ʾ%3"},
+   {a="(i)(')(%_?[aAY])", b="%1ʾ%3"},
    {a="(i)(')([uU])", b="%1ʾ%3"},
    {a="(i)(')([iI])", b="%1ʾ%3"},
    {a="(a)(')([^uaiUAI])", b="%1ʾ%3"},
@@ -763,15 +763,15 @@ hamzatrarabica = { -- ≠ from hamzatrloc: initial hamza has to be held
    {a="(U)(')", b="%1ʾ"},
    {a="([Iy])(')", b="%1ʾ"},
    {a="([^uai])(')([uU])", b="%1ʾ%3"},
-   {a="([^uai])(')([aA])", b="%1ʾ%3"},
+   {a="([^uai])(')(%_?[aAY])", b="%1ʾ%3"},
    {a="([^uai])(')([iI])", b="%1ʾ%3"},
    {a="(u)(')([uU])", b="%1ʾ%3"},
-   {a="(u)(')([aA])", b="%1ʾ%3"},
+   {a="(u)(')(%_?[aAY])", b="%1ʾ%3"},
    {a="(u)(')([iI])", b="%1ʾ%3"},
-   {a="(a)(')([aA])", b="%1ʾ%3"},
+   {a="(a)(')(%_?[aAY])", b="%1ʾ%3"},
    {a="(a)(')([uU])", b="%1ʾ%3"},
    {a="(a)(')([iI])", b="%1ʾ%3"},
-   {a="(i)(')([aA])", b="%1ʾ%3"},
+   {a="(i)(')(%_?[aAY])", b="%1ʾ%3"},
    {a="(i)(')([uU])", b="%1ʾ%3"},
    {a="(i)(')([iI])", b="%1ʾ%3"},
    {a="(a)(')([^uaiUAI])", b="%1ʾ%3"},
diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua
index ca1aa99ca87..09133043bef 100644
--- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua
+++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_voc.lua
@@ -238,7 +238,7 @@ hamza = {
 -- u
    {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"},
    {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"},
-   {a="(u)('%p?)$", b="%1ؤ"},
+   {a="(u)(')(%p?)$", b="%1ؤ%3"},
    {a="(u)(')(%p?%s)", b="%1ؤ%3"},
 -- a
    {a="(a)(')(A%p?)$", b="%1آ"},
@@ -251,27 +251,27 @@ hamza = {
    {a="(a)(')(aN)(%p?%s)", b="%1أً%4"},
    {a="(a)(')([i]N?%p?)$", b="%1إ%3"},
    {a="(a)(')([i]N?)(%p?%s)", b="%1إ%3%4"},
-   {a="(a)('%p?)$", b="%1أ"},
+   {a="(a)(')(%p?)$", b="%1أ%3"},
    {a="(a)(')(%p?%s)", b="%1أ%3"},
 -- i
    {a="(i)(')([uai]N?%p?)$", b="%1ئ%3"},
    {a="(i)(')([uai]N?)(%p?%s)", b="%1ئ%3%4"},
-   {a="(i)('%p?)$", b="%1ئ"},
+   {a="(i)(')(%p?)$", b="%1ئ%3"},
    {a="(i)(')(%p?%s)", b="%1ئ%3"},
 --
    -- middle
    {a="(U)(')", b="%1ء"},
    {a="([Iy])(')", b="%1ئ"},
    {a="([^uai])(')([uU])", b="%1ؤ%3"},
-   {a="([^uai])(')([aA])", b="%1أ%3"},
+   {a="([^uai])(')(%_?[aAY])", b="%1أ%3"},
    {a="([^uai])(')([iI])", b="%1ئ%3"},
    {a="(u)(')([uU])", b="%1ؤ%3"},
-   {a="(u)(')([aA])", b="%1ؤ%3"},
+   {a="(u)(')(%_?[aAY])", b="%1ؤ%3"},
    {a="(u)(')([iI])", b="%1ئ%3"},
-   {a="(a)(')([aA])", b="%1أ%3"},
+   {a="(a)(')(%_?[aAY])", b="%1أ%3"},
    {a="(a)(')([uU])", b="%1ؤ%3"},
    {a="(a)(')([iI])", b="%1ئ%3"},
-   {a="(i)(')([aA])", b="%1ئ%3"},
+   {a="(i)(')(%_?[aAY])", b="%1ئ%3"},
    {a="(i)(')([uU])", b="%1ئ%3"},
    {a="(i)(')([iI])", b="%1ئ%3"},
    {a="(a)(')([^uaiUAI])", b="%1أ%3"},
@@ -352,7 +352,7 @@ hamzaeasy = { -- differences marked below with 'easy'
 -- u
    {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"},
    {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"},
-   {a="(u)('%p?)$", b="%1ؤ"},
+   {a="(u)(')(%p?)$", b="%1ؤ%3"},
    {a="(u)(')(%p?%s)", b="%1ؤ%3"},
 -- a
    {a="(a)(')(A%p?)$", b="%1آ"},
@@ -365,27 +365,27 @@ hamzaeasy = { -- differences marked below with 'easy'
    {a="(a)(')(aN)(%p?%s)", b="%1أً%4"},
    {a="(a)(')([i]N?%p?)$", b="%1إ%3"},
    {a="(a)(')([i]N?)(%p?%s)", b="%1إ%3%4"},
-   {a="(a)('%p?)$", b="%1أ"},
+   {a="(a)(')(%p?)$", b="%1أ%3"},
    {a="(a)(')(%p?%s)", b="%1أ%3"},
 -- i
    {a="(i)(')([uai]N?%p?)$", b="%1ئ%3"},
    {a="(i)(')([uai]N?)(%p?%s)", b="%1ئ%3%4"},
-   {a="(i)('%p?)$", b="%1ئ"},
+   {a="(i)(')(%p?)$", b="%1ئ%3"},
    {a="(i)(')(%p?%s)", b="%1ئ%3"},
 --
    -- middle
    {a="(U)(')", b="%1ء"},
    {a="([Iy])(')", b="%1ئ"},
    {a="([^uai])(')([uU])", b="%1ؤ%3"},
-   {a="([^uai])(')([aA])", b="%1أ%3"},
+   {a="([^uai])(')(%_?[aAY])", b="%1أ%3"},
    {a="([^uai])(')([iI])", b="%1ئ%3"},
    {a="(u)(')([uU])", b="%1ؤ%3"},
-   {a="(u)(')([aA])", b="%1ؤ%3"},
+   {a="(u)(')(%_?[aAY])", b="%1ؤ%3"},
    {a="(u)(')([iI])", b="%1ئ%3"},
-   {a="(a)(')([aA])", b="%1أ%3"},
+   {a="(a)(')(%_?[aAY])", b="%1أ%3"},
    {a="(a)(')([uU])", b="%1ؤ%3"},
    {a="(a)(')([iI])", b="%1ئ%3"},
-   {a="(i)(')([aA])", b="%1ئ%3"},
+   {a="(i)(')(%_?[aAY])", b="%1ئ%3"},
    {a="(i)(')([uU])", b="%1ئ%3"},
    {a="(i)(')([iI])", b="%1ئ%3"},
    {a="(a)(')([^uaiUAI])", b="%1أ%3"},