3 files changed, 12 insertions, 12 deletions

diff --git a/arabluatex_novoc.lua b/arabluatex_novoc.lua
index e1e40cc..c2ee6f6 100644
--- a/arabluatex_novoc.lua
+++ b/arabluatex_novoc.lua
@@ -148,9 +148,9 @@ shortvnv = {
    {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="ِ"},
    {a="u", b=""},
    {a="a", b=""},
    {a="i", b=""}
diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index f1407be..0adb69e 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -379,14 +379,14 @@ digraphstrdmg = {
    -- ʾiʿrāb hyphen (begin)
    {a="(%-)(\"?[UI]na)(%p*%s)", b="\\arbup{%2}%3"},
    {a="(%-)(\"?[UI]na)(%p*)$", b="\\arbup{%2}%3"},
-   {a="(%-)(\"?At[ui])(%p*%s)", b="\\arbup{%2}%3"},
-   {a="(%-)(\"?At[ui])(%p*)$", b="\\arbup{%2}%3"},
+   {a="(%-)(\"?At%.?[ui])(%p*%s)", b="\\arbup{%2}%3"},
+   {a="(%-)(\"?At%.?[ui])(%p*)$", b="\\arbup{%2}%3"},
    {a="(%-)(\"?Ani)(%p*%s)", b="\\arbup{%2}%3"},
    {a="(%-)(\"?Ani)(%p*)$", b="\\arbup{%2}%3"},
-   {a="(%-)(\"?ayni)(%p*%s)", b="\\arbup{%2}%3"},
-   {a="(%-)(\"?ayni)(%p*)$", b="\\arbup{%2}%3"},
-   {a="(%-)(\"?[uai])(%p*%s)", b="\\arbup{%2}%3"},
-   {a="(%-)(\"?[uai])(%p*)$", b="\\arbup{%2}%3"},
+   {a="(%-)(\"?%.?ayni)(%p*%s)", b="\\arbup{%2}%3"},
+   {a="(%-)(\"?%.?ayni)(%p*)$", b="\\arbup{%2}%3"},
+   {a="(%-)(\"?%.?[uai])(%p*%s)", b="\\arbup{%2}%3"},
+   {a="(%-)(\"?%.?[uai])(%p*)$", b="\\arbup{%2}%3"},
    -- ʾiʿrāb hyphen (end) shorten long vowels preceding ʾalif
    -- conjunctionis—without forgetting 'lla_dI
    {a="(U)(A)", b="U"},
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index fdb9eaa..3155f91 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -837,9 +837,9 @@ 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="ِ"},
    {a="u", b="ُ"},
    {a="a", b="َ"},
    {a="i", b="ِ"}