aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arabluatex_fullvoc.lua4
-rw-r--r--arabluatex_trans.lua7
-rw-r--r--arabluatex_voc.lua3
3 files changed, 5 insertions, 9 deletions
diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index e4a9495..ea7df9f 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -458,7 +458,7 @@ digraphsfv = {
458 {a="ww", b="وّ"}, 458 {a="ww", b="وّ"},
459 {a="yy", b="يّ"}, 459 {a="yy", b="يّ"},
460 -- sukūn begin 460 -- sukūn begin
461 --tmp: next line is added 461 -- first, take out hyphen if any:
462 {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])%-([uaiUAI])", b="%1%2"}, 462 {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])%-([uaiUAI])", b="%1%2"},
463 {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])$", b="%1ْ"}, 463 {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])$", b="%1ْ"},
464 {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([%s])", b="%1ْ%2"}, 464 {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([%s])", b="%1ْ%2"},
@@ -560,7 +560,7 @@ digraphsfveasy = { -- see the diffenrences under 'easy' marker below
560 -- first take out every previously generated sukūn by hamza rules, 560 -- first take out every previously generated sukūn by hamza rules,
561 -- so there be no need to edit them: 561 -- so there be no need to edit them:
562 {a="ْ", b=""}, 562 {a="ْ", b=""},
563 --tmp: next line is added 563 -- first, take out hyphen if any:
564-- {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])%-([uaiUAI])", b="%1%2"}, 564-- {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])%-([uaiUAI])", b="%1%2"},
565-- {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])$", b="%1ْ"}, 565-- {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])$", b="%1ْ"},
566-- {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([%s])", b="%1ْ%2"}, 566-- {a="([%_%^%.]?[Bbtjghxdrzs%`fqklmnwy])([%s])", b="%1ْ%2"},
diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index 76e297e..b98647d 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -138,7 +138,7 @@ tanwintrdmg = {
138 {a="(T)%-?(aN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="t\\arbup{ani}%3%4"}, 138 {a="(T)%-?(aN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="t\\arbup{ani}%3%4"},
139 {a="([^TA])%-?(aN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1\\arbup{ani}%3%4"}, 139 {a="([^TA])%-?(aN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="%1\\arbup{ani}%3%4"},
140 {a="%-?(iN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="\\arbup{ini}%2%3"}, 140 {a="%-?(iN)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="\\arbup{ini}%2%3"},
141-- tmp (+ ibn) 141-- tanwīn + alif without hamza and kasra (ibn)
142 {a="%-?(uN)(%s)(i)", b="\\arbup{uni}%2'"}, 142 {a="%-?(uN)(%s)(i)", b="\\arbup{uni}%2'"},
143 {a="%-?(aN)(_A)(%s)(i)", b="ạ\\arbup{ni}%3%'"}, 143 {a="%-?(aN)(_A)(%s)(i)", b="ạ\\arbup{ni}%3%'"},
144 {a="%-?(aN)(Y)(%s)(i)", b="ạ\\arbup{ni}%3%'"}, 144 {a="%-?(aN)(Y)(%s)(i)", b="ạ\\arbup{ni}%3%'"},
@@ -146,7 +146,7 @@ tanwintrdmg = {
146 {a="([^TA])%-?(aN)(%s)(i)", b="%1\\arbup{ani}%3%'"}, 146 {a="([^TA])%-?(aN)(%s)(i)", b="%1\\arbup{ani}%3%'"},
147 {a="%-?(iN)(%s)(i)", b="\\arbup{ini}%2%'"}, 147 {a="%-?(iN)(%s)(i)", b="\\arbup{ini}%2%'"},
148 -- 148 --
149-- {a="uN", b="\\arbup{un}"}, (now included in the last line of this table) 149-- {a="uN", b="\\arbup{un}"}, (now included in the last line of this table)
150 {a="%-?(aN)(_A)", b="ạ\\arbup{n}"}, 150 {a="%-?(aN)(_A)", b="ạ\\arbup{n}"},
151 {a="%-?(aN)(Y)", b="ạ\\arbup{n}"}, 151 {a="%-?(aN)(Y)", b="ạ\\arbup{n}"},
152 {a="(T)%-?(\"?aN)", b="t\\arbup{an}"}, 152 {a="(T)%-?(\"?aN)", b="t\\arbup{an}"},
@@ -271,8 +271,6 @@ digraphstrdmg = {
271-- {a="([%_]?[uaiUAIY])(%s)([uai])", b="%1%2'"}, -- initial alif without hamza 271-- {a="([%_]?[uaiUAIY])(%s)([uai])", b="%1%2'"}, -- initial alif without hamza
272 {a="(aW)(%s)(\"?[uai])", b="awu%2%3"}, 272 {a="(aW)(%s)(\"?[uai])", b="awu%2%3"},
273 {a="([^%_][uai])(%s)(\"?[uai])", b="%1%2'"}, 273 {a="([^%_][uai])(%s)(\"?[uai])", b="%1%2'"},
274--tmp (more complex, see next 4 l.)
275-- {a="([%_]?[AYa])(%s)(\"?[uai])", b="a%2'"},
276 {a="(%_A)(%s)(\"?[uai])", b="ạ%2'"}, 274 {a="(%_A)(%s)(\"?[uai])", b="ạ%2'"},
277 {a="(Y)(%s)(\"?[uai])", b="ạ%2'"}, 275 {a="(Y)(%s)(\"?[uai])", b="ạ%2'"},
278 {a="(%_a)(%s)(\"?[uai])", b="a%2'"}, 276 {a="(%_a)(%s)(\"?[uai])", b="a%2'"},
@@ -294,7 +292,6 @@ digraphstrdmg = {
294 -- shorten long vowels preceding ʾalif conjunctionis 292 -- shorten long vowels preceding ʾalif conjunctionis
295 {a="(U)(A)", b="U"}, 293 {a="(U)(A)", b="U"},
296 {a="(aW)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="awu%2%3"}, 294 {a="(aW)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="awu%2%3"},
297--tmp {a="([%_]?[AYa])(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="a%2%3"},
298 {a="(%_a)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="a%2%3"}, 295 {a="(%_a)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="a%2%3"},
299 {a="(%_A)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ%2%3"}, 296 {a="(%_A)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ%2%3"},
300 {a="(A)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="a%2%3"}, 297 {a="(A)(%s)(['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="a%2%3"},
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index 0331794..0e5cfc6 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -450,8 +450,7 @@ digraphs = {
450 {a="^\"[uai]", b="ٱ"}, 450 {a="^\"[uai]", b="ٱ"},
451 {a="([%s%-])\"[uai]", b="%1ٱ"}, 451 {a="([%s%-])\"[uai]", b="%1ٱ"},
452 {a="(aW)(%s)([uai])", b="awuا%2%3"}, 452 {a="(aW)(%s)([uai])", b="awuا%2%3"},
453--tmp-out {a="(%-)([uai])", b="%1ا%2"}, -- hyphen + initial alif without hamza 453 -- hyphen + initial alif without hamza:
454 --tmp-added hyphen + initial alif without hamza:
455 {a="(%-)([uai])([%^%_%.%`]?)(%a)", b="%1ا%3%4"}, 454 {a="(%-)([uai])([%^%_%.%`]?)(%a)", b="%1ا%3%4"},
456 {a="^([uai])", b="ا%1"}, -- initial alif without hamza 455 {a="^([uai])", b="ا%1"}, -- initial alif without hamza
457 {a="(%s)([uai])", b="%1ا"}, -- initial alif without hamza 456 {a="(%s)([uai])", b="%1ا"}, -- initial alif without hamza