diff options
author | Robert Alessi <alessi@robertalessi.net> | 2017-08-05 18:21:54 +0200 |
---|---|---|
committer | Robert Alessi <alessi@robertalessi.net> | 2017-08-05 18:21:54 +0200 |
commit | 4cd9c3227105a71e4aa05338de397fad8943c545 (patch) | |
tree | a1b958d42e8fa763c60c0a1cbfba951d04d3e57d | |
parent | e52624588903132af81cf1119ed1ec5c0207f448 (diff) | |
download | arabluatex-4cd9c3227105a71e4aa05338de397fad8943c545.tar.gz |
much work was needed on the final hamzah. in such words as ^say'aN, \SetArbDflt now puts the hamzah on the line while \SetArbEasy puts it above yāʾ without dots
-rw-r--r-- | arabluatex_fullvoc.lua | 80 | ||||
-rw-r--r-- | arabluatex_novoc.lua | 4 | ||||
-rw-r--r-- | arabluatex_voc.lua | 76 |
3 files changed, 66 insertions, 94 deletions
diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua index 6f690f8..cf33a3a 100644 --- a/arabluatex_fullvoc.lua +++ b/arabluatex_fullvoc.lua | |||
@@ -95,27 +95,15 @@ hamzafv = { | |||
95 | {a="([%s%(%[%<%-])(')([ua])", b="%1أ%3"}, | 95 | {a="([%s%(%[%<%-])(')([ua])", b="%1أ%3"}, |
96 | {a="([%s%(%[%<%-])(')(i)", b="%1إ%3"}, | 96 | {a="([%s%(%[%<%-])(')(i)", b="%1إ%3"}, |
97 | -- final | 97 | -- final |
98 | -- ^say'aN, .zim'aN, mi'aT are special orthographies | 98 | -- mi'aT is special orthography (unlike ^say'aN and .zim'aN): |
99 | {a="(%^sa%.?[yY])(\"?%|?)(%')(aN)", b="%1%2ئ%4"}, | 99 | -- {a="(%^sa%.?[yY])(\"?%|?)(%')(aN)", b="%1%2ئ%4"}, --new |
100 | {a="(.zi?m)(%')(aN)", b="%1ئ%3"}, | 100 | -- {a="(.zi?m)(%')(aN)", b="%1ئ%3"}, --new |
101 | {a="(mi)(%')(a[Tt])", b="%1ائ%3"}, | 101 | {a="(mi)(%')(a[Tt])", b="%1ائ%3"}, |
102 | {a="(mi)(%')(aN%_?[AY])", b="%1أ%3"}, | 102 | {a="(mi)(%')(aN%_?[AY])", b="%1أ%3"}, |
103 | -- hamzah + pr. suffix: the carrier passes into yāʾ before ī so | 103 | -- final hamzah is on the line after a letter of prolongation or a |
104 | -- take out the following two lines: | 104 | -- consonant with sukūn |
105 | -- {a="(')(I%p?)$", b="إ%2"}, -- affix pr. 1st person sg. | 105 | {a="([^Auai])(')(\"?[uai]N?)(%p?)$", b="%1ء%3%4"}, --new |
106 | -- {a="(')(I)(%p?%s)", b="إ%2%3"}, -- affix pr. 1st person sg. | 106 | {a="([^Auai])(')(\"?[uai]N?)(%p?%s)", b="%1ء%3%4"}, |
107 | -- | ||
108 | -- The Munjid says that such words as radI'aN do not have the | ||
109 | -- hamzah alone on the line so replace the following two lines with | ||
110 | -- the next six: | ||
111 | -- {a="([^uai])(')([uai]N?%p?)$", b="%1ء%3"}, | ||
112 | -- {a="([^uai])(')([uai]N?)(%p?%s)", b="%1ء%3%4"}, | ||
113 | {a="([Iy])(')(aN%p?)$", b="%1ئ%3"}, | ||
114 | {a="([Iy])(')(aN)(%p?%s)", b="%1ئ%3%4"}, | ||
115 | {a="([^uai])(')(aN)(%p?)$", b="%1ء%3ا%4"}, | ||
116 | {a="([^uai])(')(aN)(%p?%s)", b="%1ء%3ا%4"}, | ||
117 | {a="([^uai])(')([ui]N?%p?)$", b="%1ء%3"}, | ||
118 | {a="([^uai])(')([ui]N?)(%p?%s)", b="%1ء%3%4"}, | ||
119 | -- u | 107 | -- u |
120 | {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"}, | 108 | {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"}, |
121 | {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"}, | 109 | {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"}, |
@@ -141,7 +129,7 @@ hamzafv = { | |||
141 | {a="(i)(')(%p?%s)", b="%1ئْ%3"}, | 129 | {a="(i)(')(%p?%s)", b="%1ئْ%3"}, |
142 | -- | 130 | -- |
143 | -- middle | 131 | -- middle |
144 | {a="(U)(')", b="%1ء"}, | 132 | {a="([Uw])(')", b="%1ء"}, --new |
145 | {a="([Iy])(')", b="%1ئ"}, | 133 | {a="([Iy])(')", b="%1ئ"}, |
146 | {a="([^uai])(')([uU])", b="%1ؤ%3"}, | 134 | {a="([^uai])(')([uU])", b="%1ؤ%3"}, |
147 | {a="([^uai])(')(%_?[aAY])", b="%1أ%3"}, | 135 | {a="([^uai])(')(%_?[aAY])", b="%1أ%3"}, |
@@ -235,27 +223,25 @@ hamzafveasy = { -- differences marked below with 'easy' | |||
235 | {a="([%s%(%[%<%-])(')([ua])", b="%1أ%3"}, | 223 | {a="([%s%(%[%<%-])(')([ua])", b="%1أ%3"}, |
236 | {a="([%s%(%[%<%-])(')(i)", b="%1إ%3"}, | 224 | {a="([%s%(%[%<%-])(')(i)", b="%1إ%3"}, |
237 | -- final | 225 | -- final |
238 | -- ^say'aN, .zim'aN, mi'aT are special orthographies | 226 | -- mi'aT is special orthography (unlike ^say'aN and .zim'aN) |
239 | {a="(%^sa%.?[yY])(\"?%|?)(%')(aN)", b="%1%2ئ%4"}, | 227 | -- {a="(%^sa%.?[yY])(\"?%|?)(%')(aN)", b="%1%2ئ%4"}, --new |
240 | {a="(.zi?m)(%')(aN)", b="%1ئ%3"}, | 228 | -- {a="(.zi?m)(%')(aN)", b="%1ئ%3"}, --new |
241 | {a="(mi)(%')(a[Tt])", b="%1ائ%3"}, | 229 | {a="(mi)(%')(a[Tt])", b="%1ائ%3"}, |
242 | {a="(mi)(%')(aN%_?[AY])", b="%1أ%3"}, | 230 | {a="(mi)(%')(aN%_?[AY])", b="%1أ%3"}, |
243 | -- hamzah + pr. suffix: the carrier passes into yāʾ before ī so | 231 | -- easy (begin) |
244 | -- take out the following two lines: | ||
245 | -- {a="(')(I%p?)$", b="إ%2"}, -- affix pr. 1st person sg. | ||
246 | -- {a="(')(I)(%p?%s)", b="إ%2%3"}, -- affix pr. 1st person sg. | ||
247 | -- | ||
248 | -- The Munjid says that such words as radI'aN do not have the | 232 | -- The Munjid says that such words as radI'aN do not have the |
249 | -- hamzah alone on the line so replace the following two lines with | 233 | -- hamzah alone on the line, so take out the following two lines |
250 | -- the next two: | 234 | -- (final hamzah is on the line after a letter of prolongation or a |
251 | -- {a="([^uai])(')([uai]N?%p?)$", b="%1ء%3"}, | 235 | -- consonant with sukūn) |
252 | -- {a="([^uai])(')([uai]N?)(%p?%s)", b="%1ء%3%4"}, | 236 | -- {a="([^Auai])(')(\"?[uai]N?)(%p?)$", b="%1ء%3%4"}, --new |
253 | {a="([Iy])(')(aN%p?)$", b="%1ئ%3"}, | 237 | -- {a="([^Auai])(')(\"?[uai]N?)(%p?%s)", b="%1ء%3%4"}, |
254 | {a="([Iy])(')(aN)(%p?%s)", b="%1ئ%3%4"}, | 238 | {a="([^Auai])(')(\"?aN)(%p?)$", b="%1ئ%3%4"}, --new |
255 | {a="([^uai])(')(aN)(%p?)$", b="%1ء%3ا%4"}, | 239 | {a="([^Auai])(')(\"?aN)(%p?%s)", b="%1ئ%3%4"}, --new |
256 | {a="([^uai])(')(aN)(%p?%s)", b="%1ء%3ا%4"}, | 240 | {a="([^uai])(')(\"?a)(%p?)$", b="%1ء%3%4"}, --new |
257 | {a="([^uai])(')([ui]N?%p?)$", b="%1ء%3"}, | 241 | {a="([^uai])(')(\"?a)(%p?%s)", b="%1ء%3%4"}, --new |
258 | {a="([^uai])(')([ui]N?)(%p?%s)", b="%1ء%3%4"}, | 242 | {a="([^uai])(')(\"?[ui]N?)(%p?)$", b="%1ء%3%4"}, --new |
243 | {a="([^uai])(')(\"?[ui]N?)(%p?%s)", b="%1ء%3%4"}, --new | ||
244 | --easy (end) | ||
259 | -- u | 245 | -- u |
260 | {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"}, | 246 | {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"}, |
261 | {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"}, | 247 | {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"}, |
@@ -281,7 +267,7 @@ hamzafveasy = { -- differences marked below with 'easy' | |||
281 | {a="(i)(')(%p?%s)", b="%1ئْ%3"}, | 267 | {a="(i)(')(%p?%s)", b="%1ئْ%3"}, |
282 | -- | 268 | -- |
283 | -- middle | 269 | -- middle |
284 | {a="(U)(')", b="%1ء"}, | 270 | {a="([Uw])(')", b="%1ء"}, --new |
285 | {a="([Iy])(')", b="%1ئ"}, | 271 | {a="([Iy])(')", b="%1ئ"}, |
286 | {a="([^uai])(')([uU])", b="%1ؤ%3"}, | 272 | {a="([^uai])(')([uU])", b="%1ؤ%3"}, |
287 | {a="([^uai])(')(%_?[aAY])", b="%1أ%3"}, | 273 | {a="([^uai])(')(%_?[aAY])", b="%1أ%3"}, |
@@ -321,7 +307,7 @@ tanwinfv = { -- with assimilations (\SetArbDflt*) | |||
321 | {a="%-?(aN)(_A)(%s)([rlmnwy])", b="ًى%3%4%4"}, | 307 | {a="%-?(aN)(_A)(%s)([rlmnwy])", b="ًى%3%4%4"}, |
322 | {a="%-?(aN)(Y)(%s)([rlmnwy])", b="ًى%3%4%4"}, | 308 | {a="%-?(aN)(Y)(%s)([rlmnwy])", b="ًى%3%4%4"}, |
323 | {a="(T)%-?(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"}, | 309 | {a="(T)%-?(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"}, |
324 | {a="(ء)%-?(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"}, | 310 | {a="(ء)%-?(aN)(%s)([rlmnwy])", b="%1%2%3%4%4"}, --new |
325 | {a="([^TA])%-?(aN)(%s)([rlmnwy])", b="%1ًا%3%4%4"}, | 311 | {a="([^TA])%-?(aN)(%s)([rlmnwy])", b="%1ًا%3%4%4"}, |
326 | {a="%-?(iNI?)(%s)([rlmnwy])", b="ٍ%2%3%3"}, | 312 | {a="%-?(iNI?)(%s)([rlmnwy])", b="ٍ%2%3%3"}, |
327 | -- assimilations (end) | 313 | -- assimilations (end) |
@@ -333,7 +319,7 @@ tanwinfv = { -- with assimilations (\SetArbDflt*) | |||
333 | {a="%-?(\"aN)(_A)", b="ى"}, | 319 | {a="%-?(\"aN)(_A)", b="ى"}, |
334 | {a="%-?(\"aN)(Y)", b="ى"}, | 320 | {a="%-?(\"aN)(Y)", b="ى"}, |
335 | {a="(T)%-?(\"aN)", b="%1"}, | 321 | {a="(T)%-?(\"aN)", b="%1"}, |
336 | {a="(ء)%-?(\"aN)", b="%1"}, | 322 | {a="([آ])()%-?(\"aN)", b="%1%2"}, --new |
337 | {a="([^TA])%-?(\"aN)", b="%1ا"}, | 323 | {a="([^TA])%-?(\"aN)", b="%1ا"}, |
338 | {a="%-?(\"iNI?)", b=""}, | 324 | {a="%-?(\"iNI?)", b=""}, |
339 | -- quoted tanwīn (end) | 325 | -- quoted tanwīn (end) |
@@ -342,7 +328,7 @@ tanwinfv = { -- with assimilations (\SetArbDflt*) | |||
342 | {a="%-?(aN)(_A)", b="ًى"}, | 328 | {a="%-?(aN)(_A)", b="ًى"}, |
343 | {a="%-?(aN)(Y)", b="ًى"}, | 329 | {a="%-?(aN)(Y)", b="ًى"}, |
344 | {a="(T)%-?(aN)", b="%1ً"}, | 330 | {a="(T)%-?(aN)", b="%1ً"}, |
345 | {a="(ء)%-?(aN)", b="%1ً"}, | 331 | {a="([آ])()%-?(aN)", b="%1%2ً"}, --new |
346 | {a="([^TA])%-?(aN)", b="%1ًا"}, | 332 | {a="([^TA])%-?(aN)", b="%1ًا"}, |
347 | {a="%-?(iNI?)", b="ٍ"} | 333 | {a="%-?(iNI?)", b="ٍ"} |
348 | } | 334 | } |
@@ -368,7 +354,7 @@ tanwinfveasy = { -- no assimilations (see below) | |||
368 | --easy {a="%-?(aN)(_A)(%s)([rlmnwy])", b="ًى%3%4%4"}, | 354 | --easy {a="%-?(aN)(_A)(%s)([rlmnwy])", b="ًى%3%4%4"}, |
369 | --easy {a="%-?(aN)(Y)(%s)([rlmnwy])", b="ًى%3%4%4"}, | 355 | --easy {a="%-?(aN)(Y)(%s)([rlmnwy])", b="ًى%3%4%4"}, |
370 | --easy {a="(T)%-?(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"}, | 356 | --easy {a="(T)%-?(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"}, |
371 | --easy {a="(ء)%-?(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"}, | 357 | --easy {a="(ء)%-?(aN)(%s)([rlmnwy])", b="%1%2%3%4%4"}, --new |
372 | --easy {a="([^TA])%-?(aN)(%s)([rlmnwy])", b="%1ًا%3%4%4"}, | 358 | --easy {a="([^TA])%-?(aN)(%s)([rlmnwy])", b="%1ًا%3%4%4"}, |
373 | --easy {a="%-?(iNI?)(%s)([rlmnwy])", b="ٍ%2%3%3"}, | 359 | --easy {a="%-?(iNI?)(%s)([rlmnwy])", b="ٍ%2%3%3"}, |
374 | -- assimilations (end) | 360 | -- assimilations (end) |
@@ -380,7 +366,7 @@ tanwinfveasy = { -- no assimilations (see below) | |||
380 | {a="%-?(\"aN)(_A)", b="ى"}, | 366 | {a="%-?(\"aN)(_A)", b="ى"}, |
381 | {a="%-?(\"aN)(Y)", b="ى"}, | 367 | {a="%-?(\"aN)(Y)", b="ى"}, |
382 | {a="(T)%-?(\"aN)", b="%1"}, | 368 | {a="(T)%-?(\"aN)", b="%1"}, |
383 | {a="(ء)%-?(\"aN)", b="%1"}, | 369 | {a="([آ])()%-?(\"aN)", b="%1%2"}, --new |
384 | {a="([^TA])%-?(\"aN)", b="%1ا"}, | 370 | {a="([^TA])%-?(\"aN)", b="%1ا"}, |
385 | {a="%-?(\"iNI?)", b=""}, | 371 | {a="%-?(\"iNI?)", b=""}, |
386 | -- quoted tanwīn (end) | 372 | -- quoted tanwīn (end) |
@@ -389,7 +375,7 @@ tanwinfveasy = { -- no assimilations (see below) | |||
389 | {a="%-?(aN)(_A)", b="ًى"}, | 375 | {a="%-?(aN)(_A)", b="ًى"}, |
390 | {a="%-?(aN)(Y)", b="ًى"}, | 376 | {a="%-?(aN)(Y)", b="ًى"}, |
391 | {a="(T)%-?(aN)", b="%1ً"}, | 377 | {a="(T)%-?(aN)", b="%1ً"}, |
392 | {a="(ء)%-?(aN)", b="%1ً"}, | 378 | {a="([آ])()%-?(aN)", b="%1%2ً"}, --new |
393 | {a="([^TA])%-?(aN)", b="%1ًا"}, | 379 | {a="([^TA])%-?(aN)", b="%1ًا"}, |
394 | {a="%-?(iNI?)", b="ٍ"} | 380 | {a="%-?(iNI?)", b="ٍ"} |
395 | } | 381 | } |
@@ -554,7 +540,7 @@ trigraphsfveasy = { -- trigraphs or more (see 'easy' tag below for the diffs) | |||
554 | } | 540 | } |
555 | 541 | ||
556 | digraphsfvidgham = { | 542 | digraphsfvidgham = { |
557 | -- iʿrāb: straight double quote must be discarded | 543 | -- ʾiʿrāb: straight double quote must be discarded |
558 | {a="(%-)(\"?[UI]na)(%p?%s)", b="%2%3"}, | 544 | {a="(%-)(\"?[UI]na)(%p?%s)", b="%2%3"}, |
559 | {a="(%-)(\"?[UI]na)(%p?)$", b="%2%3"}, | 545 | {a="(%-)(\"?[UI]na)(%p?)$", b="%2%3"}, |
560 | {a="(%-)(\"?At[ui])(%p?%s)", b="%2%3"}, | 546 | {a="(%-)(\"?At[ui])(%p?%s)", b="%2%3"}, |
@@ -808,7 +794,7 @@ digraphsfv = { | |||
808 | } | 794 | } |
809 | 795 | ||
810 | digraphsfveasy = { -- see the differences under 'easy' marker below | 796 | digraphsfveasy = { -- see the differences under 'easy' marker below |
811 | -- iʿrāb: straight double quote must be discarded | 797 | -- ʾiʿrāb: straight double quote must be discarded |
812 | {a="(%-)(\"?[UI]na)(%p?%s)", b="%2%3"}, | 798 | {a="(%-)(\"?[UI]na)(%p?%s)", b="%2%3"}, |
813 | {a="(%-)(\"?[UI]na)(%p?)$", b="%2%3"}, | 799 | {a="(%-)(\"?[UI]na)(%p?)$", b="%2%3"}, |
814 | {a="(%-)(\"?At[ui])(%p?%s)", b="%2%3"}, | 800 | {a="(%-)(\"?At[ui])(%p?%s)", b="%2%3"}, |
diff --git a/arabluatex_novoc.lua b/arabluatex_novoc.lua index caf66f9..77f6568 100644 --- a/arabluatex_novoc.lua +++ b/arabluatex_novoc.lua | |||
@@ -47,7 +47,7 @@ tanwinnv = { | |||
47 | {a="%-?(\"aN)(_A)", b="ًى"}, | 47 | {a="%-?(\"aN)(_A)", b="ًى"}, |
48 | {a="%-?(\"aN)(Y)", b="ًى"}, | 48 | {a="%-?(\"aN)(Y)", b="ًى"}, |
49 | {a="(T)%-?(\"aN)", b="%1ً"}, | 49 | {a="(T)%-?(\"aN)", b="%1ً"}, |
50 | {a="(ء)%-?(\"aN)", b="%1ً"}, | 50 | {a="([آ])()%-?(\"aN)", b="%1%2ً"}, --new |
51 | {a="([^TA])%-?(\"aN)", b="%1ًا"}, | 51 | {a="([^TA])%-?(\"aN)", b="%1ًا"}, |
52 | {a="%-?(\"iNI?)", b="ٍ"}, | 52 | {a="%-?(\"iNI?)", b="ٍ"}, |
53 | -- "quoted" tanwīn (end) | 53 | -- "quoted" tanwīn (end) |
@@ -56,7 +56,7 @@ tanwinnv = { | |||
56 | {a="%-?(aN)(_A)", b="ى"}, | 56 | {a="%-?(aN)(_A)", b="ى"}, |
57 | {a="%-?(aN)(Y)", b="ى"}, | 57 | {a="%-?(aN)(Y)", b="ى"}, |
58 | {a="(T)%-?(aN)", b="%1"}, | 58 | {a="(T)%-?(aN)", b="%1"}, |
59 | {a="(ء)%-?(aN)", b="%1"}, | 59 | {a="([آ])()%-?(aN)", b="%1%2"}, --new |
60 | {a="([^TA])%-?(aN)", b="%1ا"}, | 60 | {a="([^TA])%-?(aN)", b="%1ا"}, |
61 | {a="%-?(iNI?)", b=""}, | 61 | {a="%-?(iNI?)", b=""}, |
62 | -- initial straight double quote gives a connective ʾalif. This has | 62 | -- initial straight double quote gives a connective ʾalif. This has |
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua index a914ba4..68b290d 100644 --- a/arabluatex_voc.lua +++ b/arabluatex_voc.lua | |||
@@ -231,27 +231,15 @@ hamza = { | |||
231 | {a="([%s%(%[%<%-])(')([ua])", b="%1أ%3"}, | 231 | {a="([%s%(%[%<%-])(')([ua])", b="%1أ%3"}, |
232 | {a="([%s%(%[%<%-])(')(i)", b="%1إ%3"}, | 232 | {a="([%s%(%[%<%-])(')(i)", b="%1إ%3"}, |
233 | -- final | 233 | -- final |
234 | -- ^say'aN, .zim'aN, mi'aT are special orthographies | 234 | -- mi'aT is special orthography (unlike ^say'aN and .zim'aN): |
235 | {a="(%^sa%.?[yY])(\"?%|?)(%')(aN)", b="%1%2ئ%4"}, | 235 | -- {a="(%^sa%.?[yY])(\"?%|?)(%')(aN)", b="%1%2ئ%4"}, --new |
236 | {a="(.zi?m)(%')(aN)", b="%1ئ%3"}, | 236 | -- {a="(.zi?m)(%')(aN)", b="%1ئ%3"}, --new |
237 | {a="(mi)(%')(a[Tt])", b="%1ائ%3"}, | 237 | {a="(mi)(%')(a[Tt])", b="%1ائ%3"}, |
238 | {a="(mi)(%')(aN%_?[AY])", b="%1أ%3"}, | 238 | {a="(mi)(%')(aN%_?[AY])", b="%1أ%3"}, |
239 | -- hamzah + pr. suffix: the carrier passes into yāʾ before ī so | 239 | -- final hamzah is on the line after a letter of prolongation or a |
240 | -- take out the following two lines: | 240 | -- consonant with sukūn |
241 | -- {a="(')(I%p?)$", b="إ%2"}, -- affix pr. 1st person sg. | 241 | {a="([^Auai])(')(\"?[uai]N?)(%p?)$", b="%1ء%3%4"}, --new |
242 | -- {a="(')(I)(%p?%s)", b="إ%2%3"}, -- affix pr. 1st person sg. | 242 | {a="([^Auai])(')(\"?[uai]N?)(%p?%s)", b="%1ء%3%4"}, |
243 | -- | ||
244 | -- The Munjid says that such words as radI'aN do not have the | ||
245 | -- hamzah alone on the line so replace the following two lines with | ||
246 | -- the next two: | ||
247 | -- {a="([^uai])(')([uai]N?%p?)$", b="%1ء%3"}, | ||
248 | -- {a="([^uai])(')([uai]N?)(%p?%s)", b="%1ء%3%4"}, | ||
249 | {a="([Iy])(')(aN%p?)$", b="%1ئ%3"}, | ||
250 | {a="([Iy])(')(aN)(%p?%s)", b="%1ئ%3%4"}, | ||
251 | {a="([^uai])(')(aN)(%p?)$", b="%1ء%3ا%4"}, | ||
252 | {a="([^uai])(')(aN)(%p?%s)", b="%1ء%3ا%4"}, | ||
253 | {a="([^uai])(')([ui]N?%p?)$", b="%1ء%3"}, | ||
254 | {a="([^uai])(')([ui]N?)(%p?%s)", b="%1ء%3%4"}, | ||
255 | -- u | 243 | -- u |
256 | {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"}, | 244 | {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"}, |
257 | {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"}, | 245 | {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"}, |
@@ -277,7 +265,7 @@ hamza = { | |||
277 | {a="(i)(')(%p?%s)", b="%1ئ%3"}, | 265 | {a="(i)(')(%p?%s)", b="%1ئ%3"}, |
278 | -- | 266 | -- |
279 | -- middle | 267 | -- middle |
280 | {a="(U)(')", b="%1ء"}, | 268 | {a="([Uw])(')", b="%1ء"}, --new |
281 | {a="([Iy])(')", b="%1ئ"}, | 269 | {a="([Iy])(')", b="%1ئ"}, |
282 | {a="([^uai])(')([uU])", b="%1ؤ%3"}, | 270 | {a="([^uai])(')([uU])", b="%1ؤ%3"}, |
283 | {a="([^uai])(')(%_?[aAY])", b="%1أ%3"}, | 271 | {a="([^uai])(')(%_?[aAY])", b="%1أ%3"}, |
@@ -362,27 +350,25 @@ hamzaeasy = { -- differences marked below with 'easy' | |||
362 | {a="([%s%(%[%<%-])(')([ua])", b="%1أ%3"}, | 350 | {a="([%s%(%[%<%-])(')([ua])", b="%1أ%3"}, |
363 | {a="([%s%(%[%<%-])(')(i)", b="%1إ%3"}, | 351 | {a="([%s%(%[%<%-])(')(i)", b="%1إ%3"}, |
364 | -- final | 352 | -- final |
365 | -- ^say'aN, .zim'aN, mi'aT are special orthographies | 353 | -- mi'aT is special orthography (unlike ^say'aN and .zim'aN) |
366 | {a="(%^sa%.?[yY])(\"?%|?)(%')(aN)", b="%1%2ئ%4"}, | 354 | -- {a="(%^sa%.?[yY])(\"?%|?)(%')(aN)", b="%1%2ئ%4"}, --new |
367 | {a="(.zi?m)(%')(aN)", b="%1ئ%3"}, | 355 | -- {a="(.zi?m)(%')(aN)", b="%1ئ%3"}, --new |
368 | {a="(mi)(%')(a[Tt])", b="%1ائ%3"}, | 356 | {a="(mi)(%')(a[Tt])", b="%1ائ%3"}, |
369 | {a="(mi)(%')(aN%_?[AY])", b="%1أ%3"}, | 357 | {a="(mi)(%')(aN%_?[AY])", b="%1أ%3"}, |
370 | -- hamzah + pr. suffix: the carrier passes into yāʾ before ī so | 358 | -- easy (begin) |
371 | -- take out the following two lines: | ||
372 | -- {a="(')(I%p?)$", b="إ%2"}, -- affix pr. 1st person sg. | ||
373 | -- {a="(')(I)(%p?%s)", b="إ%2%3"}, -- affix pr. 1st person sg. | ||
374 | -- | ||
375 | -- The Munjid says that such words as radI'aN do not have the | 359 | -- The Munjid says that such words as radI'aN do not have the |
376 | -- hamzah alone on the line so replace the following two lines with | 360 | -- hamzah alone on the line, so take out the following two lines |
377 | -- the next two: | 361 | -- (final hamzah is on the line after a letter of prolongation or a |
378 | -- {a="([^uai])(')([uai]N?%p?)$", b="%1ء%3"}, | 362 | -- consonant with sukūn) |
379 | -- {a="([^uai])(')([uai]N?)(%p?%s)", b="%1ء%3%4"}, | 363 | -- {a="([^Auai])(')(\"?[uai]N?)(%p?)$", b="%1ء%3%4"}, --new |
380 | {a="([Iy])(')(aN%p?)$", b="%1ئ%3"}, | 364 | -- {a="([^Auai])(')(\"?[uai]N?)(%p?%s)", b="%1ء%3%4"}, |
381 | {a="([Iy])(')(aN)(%p?%s)", b="%1ئ%3%4"}, | 365 | {a="([^Auai])(')(\"?aN)(%p?)$", b="%1ئ%3%4"}, --new |
382 | {a="([^uai])(')(aN)(%p?)$", b="%1ء%3ا%4"}, | 366 | {a="([^Auai])(')(\"?aN)(%p?%s)", b="%1ئ%3%4"}, --new |
383 | {a="([^uai])(')(aN)(%p?%s)", b="%1ء%3ا%4"}, | 367 | {a="([^uai])(')(\"?a)(%p?)$", b="%1ء%3%4"}, --new |
384 | {a="([^uai])(')([ui]N?%p?)$", b="%1ء%3"}, | 368 | {a="([^uai])(')(\"?a)(%p?%s)", b="%1ء%3%4"}, --new |
385 | {a="([^uai])(')([ui]N?)(%p?%s)", b="%1ء%3%4"}, | 369 | {a="([^uai])(')(\"?[ui]N?)(%p?)$", b="%1ء%3%4"}, --new |
370 | {a="([^uai])(')(\"?[ui]N?)(%p?%s)", b="%1ء%3%4"}, --new | ||
371 | --easy (end) | ||
386 | -- u | 372 | -- u |
387 | {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"}, | 373 | {a="(u)(')([uai]N?%p?)$", b="%1ؤ%3"}, |
388 | {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"}, | 374 | {a="(u)(')([uai]N?)(%p?%s)", b="%1ؤ%3%4"}, |
@@ -408,7 +394,7 @@ hamzaeasy = { -- differences marked below with 'easy' | |||
408 | {a="(i)(')(%p?%s)", b="%1ئ%3"}, | 394 | {a="(i)(')(%p?%s)", b="%1ئ%3"}, |
409 | -- | 395 | -- |
410 | -- middle | 396 | -- middle |
411 | {a="(U)(')", b="%1ء"}, | 397 | {a="([Uw])(')", b="%1ء"}, --new |
412 | {a="([Iy])(')", b="%1ئ"}, | 398 | {a="([Iy])(')", b="%1ئ"}, |
413 | {a="([^uai])(')([uU])", b="%1ؤ%3"}, | 399 | {a="([^uai])(')([uU])", b="%1ؤ%3"}, |
414 | {a="([^uai])(')(%_?[aAY])", b="%1أ%3"}, | 400 | {a="([^uai])(')(%_?[aAY])", b="%1أ%3"}, |
@@ -443,7 +429,7 @@ tanwin = { | |||
443 | {a="%-?(aN)(_A)(%s)([rlmnwy])", b="ًى%3%4%4"}, | 429 | {a="%-?(aN)(_A)(%s)([rlmnwy])", b="ًى%3%4%4"}, |
444 | {a="%-?(aN)(Y)(%s)([rlmnwy])", b="ًى%3%4%4"}, | 430 | {a="%-?(aN)(Y)(%s)([rlmnwy])", b="ًى%3%4%4"}, |
445 | {a="(T)%-?(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"}, | 431 | {a="(T)%-?(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"}, |
446 | {a="(ء)%-?(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"}, | 432 | {a="(ء)%-?(aN)(%s)([rlmnwy])", b="%1%2%3%4%4"}, --new |
447 | {a="([^TA])%-?(aN)(%s)([rlmnwy])", b="%1ًا%3%4%4"}, | 433 | {a="([^TA])%-?(aN)(%s)([rlmnwy])", b="%1ًا%3%4%4"}, |
448 | {a="%-?(iNI?)(%s)([rlmnwy])", b="ٍ%2%3%3"}, | 434 | {a="%-?(iNI?)(%s)([rlmnwy])", b="ٍ%2%3%3"}, |
449 | -- assimilations (end) | 435 | -- assimilations (end) |
@@ -455,7 +441,7 @@ tanwin = { | |||
455 | {a="%-?(\"aN)(_A)", b="ى"}, | 441 | {a="%-?(\"aN)(_A)", b="ى"}, |
456 | {a="%-?(\"aN)(Y)", b="ى"}, | 442 | {a="%-?(\"aN)(Y)", b="ى"}, |
457 | {a="(T)%-?(\"aN)", b="%1"}, | 443 | {a="(T)%-?(\"aN)", b="%1"}, |
458 | {a="(ء)%-?(\"aN)", b="%1"}, | 444 | {a="([آ])()%-?(\"aN)", b="%1%2"}, --new |
459 | {a="([^TA])%-?(\"aN)", b="%1ا"}, | 445 | {a="([^TA])%-?(\"aN)", b="%1ا"}, |
460 | {a="%-?(\"iNI?)", b=""}, | 446 | {a="%-?(\"iNI?)", b=""}, |
461 | -- quoted tanwīn (end) | 447 | -- quoted tanwīn (end) |
@@ -464,7 +450,7 @@ tanwin = { | |||
464 | {a="%-?(aN)(_A)", b="ًى"}, | 450 | {a="%-?(aN)(_A)", b="ًى"}, |
465 | {a="%-?(aN)(Y)", b="ًى"}, | 451 | {a="%-?(aN)(Y)", b="ًى"}, |
466 | {a="(T)%-?(aN)", b="%1ً"}, | 452 | {a="(T)%-?(aN)", b="%1ً"}, |
467 | {a="(ء)%-?(aN)", b="%1ً"}, | 453 | {a="([آ])()%-?(aN)", b="%1%2ً"}, --new |
468 | {a="([^TA])%-?(aN)", b="%1ًا"}, | 454 | {a="([^TA])%-?(aN)", b="%1ًا"}, |
469 | {a="%-?(iNI?)", b="ٍ"} | 455 | {a="%-?(iNI?)", b="ٍ"} |
470 | } | 456 | } |
@@ -485,7 +471,7 @@ tanwineasy = { -- 'easy' requires some lines to be taken out: | |||
485 | -- {a="%-?(aN)(_A)(%s)([rlmnwy])", b="ًى%3%4%4"}, | 471 | -- {a="%-?(aN)(_A)(%s)([rlmnwy])", b="ًى%3%4%4"}, |
486 | -- {a="%-?(aN)(Y)(%s)([rlmnwy])", b="ًى%3%4%4"}, | 472 | -- {a="%-?(aN)(Y)(%s)([rlmnwy])", b="ًى%3%4%4"}, |
487 | -- {a="(T)%-?(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"}, | 473 | -- {a="(T)%-?(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"}, |
488 | -- {a="(ء)%-?(aN)(%s)([rlmnwy])", b="%1ً%3%4%4"}, | 474 | -- {a="(ء)%-?(aN)(%s)([rlmnwy])", b="%1%2%3%4%4"}, --new |
489 | -- {a="([^TA])%-?(aN)(%s)([rlmnwy])", b="%1ًا%3%4%4"}, | 475 | -- {a="([^TA])%-?(aN)(%s)([rlmnwy])", b="%1ًا%3%4%4"}, |
490 | -- {a="%-?(iNI?)(%s)([rlmnwy])", b="ٍ%2%3%3"}, | 476 | -- {a="%-?(iNI?)(%s)([rlmnwy])", b="ٍ%2%3%3"}, |
491 | -- assimilations (end) | 477 | -- assimilations (end) |
@@ -497,7 +483,7 @@ tanwineasy = { -- 'easy' requires some lines to be taken out: | |||
497 | {a="%-?(\"aN)(_A)", b="ى"}, | 483 | {a="%-?(\"aN)(_A)", b="ى"}, |
498 | {a="%-?(\"aN)(Y)", b="ى"}, | 484 | {a="%-?(\"aN)(Y)", b="ى"}, |
499 | {a="(T)%-?(\"aN)", b="%1"}, | 485 | {a="(T)%-?(\"aN)", b="%1"}, |
500 | {a="(ء)%-?(\"aN)", b="%1"}, | 486 | {a="([آ])()%-?(\"aN)", b="%1%2"}, --new |
501 | {a="([^TA])%-?(\"aN)", b="%1ا"}, | 487 | {a="([^TA])%-?(\"aN)", b="%1ا"}, |
502 | {a="%-?(\"iNI?)", b=""}, | 488 | {a="%-?(\"iNI?)", b=""}, |
503 | -- quoted tanwīn (end) | 489 | -- quoted tanwīn (end) |
@@ -506,7 +492,7 @@ tanwineasy = { -- 'easy' requires some lines to be taken out: | |||
506 | {a="%-?(aN)(_A)", b="ًى"}, | 492 | {a="%-?(aN)(_A)", b="ًى"}, |
507 | {a="%-?(aN)(Y)", b="ًى"}, | 493 | {a="%-?(aN)(Y)", b="ًى"}, |
508 | {a="(T)%-?(aN)", b="%1ً"}, | 494 | {a="(T)%-?(aN)", b="%1ً"}, |
509 | {a="(ء)%-?(aN)", b="%1ً"}, | 495 | {a="([آ])()%-?(aN)", b="%1%2ً"}, --new |
510 | {a="([^TA])%-?(aN)", b="%1ًا"}, | 496 | {a="([^TA])%-?(aN)", b="%1ًا"}, |
511 | {a="%-?(iNI?)", b="ٍ"} | 497 | {a="%-?(iNI?)", b="ٍ"} |
512 | } | 498 | } |