2 files changed, 14 insertions, 15 deletions

diff --git a/arabluatex.dtx b/arabluatex.dtx
index 626d7dc..787184c 100644
--- a/arabluatex.dtx
+++ b/arabluatex.dtx
@@ -143,10 +143,9 @@
 \def\actualchar{ =} % there's a bug in doxitem; quick fix.
 \usepackage{fontspec,luatextra}
 \defaultfontfeatures{RawFeature={+liga}}
-\setmainfont{Old Standard}[SmallCapsFont={Latin Modern Roman Caps}]
-\newfontfamily\translitfont{Latin Modern Roman}[Ligatures=TeX]
+\setmainfont{Old Standard}[SmallCapsFont={Latin Modern Roman Caps},
+RawFeature={+mark;+ccmp;+ss05;+ss06}]
 \usepackage{arabluatex}[2016/07/09]
-\SetTranslitFont{\translitfont}
 \usepackage{varioref}
 \usepackage{hypdoc}
 \hypersetup{unicode=true, colorlinks, allcolors=blue,
diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index 91ca869..7068a47 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -133,23 +133,23 @@ tanwintrdmg = {
    {a="%-?iNI", b="i\\arbup{n}"},
    -- tanwīn preceding ʾalif conjunctionis
    {a="%-?(uN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="\\arbup{uni}%2%3"},
-   {a="%-?(aN)(_A)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ\\arbup{ni}%3%4"},
-   {a="%-?(aN)(Y)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ\\arbup{ni}%3%4"},
+   {a="%-?(aN)(_A)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ\\arbup{ni}%3%4"},
+   {a="%-?(aN)(Y)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ\\arbup{ni}%3%4"},
    {a="(T)%-?(aN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="t\\arbup{ani}%3%4"},
    {a="([^TA])%-?(aN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1\\arbup{ani}%3%4"},
    {a="%-?(iN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="\\arbup{ini}%2%3"},
 -- tanwīn + alif without hamza and kasra (ibn)
    {a="%-?(uN)(%s)(i)", b="\\arbup{uni}%2'"},
-   {a="%-?(aN)(_A)(%s)(i)", b="ạ\\arbup{ni}%3%'"},
-   {a="%-?(aN)(Y)(%s)(i)", b="ạ\\arbup{ni}%3%'"},
+   {a="%-?(aN)(_A)(%s)(i)", b="ạ\\arbup{ni}%3%'"},
+   {a="%-?(aN)(Y)(%s)(i)", b="ạ\\arbup{ni}%3%'"},
    {a="(T)%-?(aN)(%s)(i)", b="t\\arbup{ani}%3%'"},
    {a="([^TA])%-?(aN)(%s)(i)", b="%1\\arbup{ani}%3%'"},
    {a="%-?(iN)(%s)(i)", b="\\arbup{ini}%2%'"},
    --
 -- {a="uN", b="\\arbup{un}"}, (now included in the last line of this table)
    {a="%-?(\"?At)%-?([ui])N", b="\\arbup{%1%2n}"},
-   {a="%-?(aN)(_A)", b="ạ\\arbup{n}"},
-   {a="%-?(aN)(Y)", b="ạ\\arbup{n}"},
+   {a="%-?(aN)(_A)", b="ạ\\arbup{n}"},
+   {a="%-?(aN)(Y)", b="ạ\\arbup{n}"},
    {a="(T)%-?(\"?aN)", b="t\\arbup{an}"},
    {a="([^TA])%-?(\"?aN)", b="%1\\arbup{an}"},
    {a="%-?([ui])N", b="\\arbup{%1n}"}
@@ -272,8 +272,8 @@ digraphstrdmg = {
 -- {a="([%_]?[uaiUAIY])(%s)([uai])", b="%1%2'"}, -- initial alif without hamza
    {a="(aW)(%s)(\"?[uai])", b="awu%2%3"},
    {a="([^%_][uai])(%s)(\"?[uai])", b="%1%2'"},
-   {a="(%_A)(%s)(\"?[uai])", b="ạ%2'"},
-   {a="(Y)(%s)(\"?[uai])", b="ạ%2'"},
+   {a="(%_A)(%s)(\"?[uai])", b="ạ%2'"},
+   {a="(Y)(%s)(\"?[uai])", b="ạ%2'"},
    {a="(%_a)(%s)(\"?[uai])", b="a%2'"},
    {a="(A)(%s)(\"?[uai])", b="a%2'"},
    {a="([%_]?[Uu])(%s)(\"?[uai])", b="u%2'"},
@@ -294,9 +294,9 @@ digraphstrdmg = {
    {a="(U)(A)", b="U"},
    {a="(aW)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="awu%2%3"},
    {a="(%_a)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="a%2%3"},
-   {a="(%_A)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ%2%3"},
+   {a="(%_A)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ%2%3"},
    {a="(A)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="a%2%3"},
-   {a="(Y)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ%2%3"},
+   {a="(Y)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ%2%3"},
    {a="([%_]?[Uu])(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="u%2%3"},
    {a="([%_]?[Ii])(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="i%2%3"},
    {a="%-%-", b=""},
@@ -318,7 +318,7 @@ digraphstrdmg = {
 --   {a="(U)(A)", b="ū"},
    {a="WA", b="w"},
    {a="(a)W", b="%1w"},
-   {a="_A", b="ạ��"},
+   {a="_A", b="ā��"},
    {a="_u", b="ū"},
    {a="_a", b="ā"},
    {a="_i", b="ī"},
@@ -358,7 +358,7 @@ longvtrdmg = {
    {a="A", b="ā"},
    {a="U", b="ū"},
    {a="I", b="ī"},
-   {a="Y", b="ạ��"}
+   {a="Y", b="ā��"}
 }
 
 shortvtrdmg = {