aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Alessi <alessi@robertalessi.net>2017-01-08 11:40:29 +0100
committerRobert Alessi <alessi@robertalessi.net>2017-01-08 11:40:29 +0100
commit61a7054eeaa8b034209629c111d2c95ca7e24a19 (patch)
tree44090a5c390cd9af987e9688fa158fbe5bd14469
parentec06c0db190168b8dd4a15ef29f70d47043fb8f7 (diff)
downloadarabluatex-1.7.1.tar.gz
bugfixes: 'quoting' after a consonant did not take away the sukūn in 'default' fullvoc mode; long vowels were not shortened before 'llaḏī in dmg mode; a bit of tidy-up in the documentationv1.7.1
-rw-r--r--arabluatex.dtx77
-rw-r--r--arabluatex_fullvoc.lua2
-rw-r--r--arabluatex_trans.lua32
3 files changed, 56 insertions, 55 deletions
diff --git a/arabluatex.dtx b/arabluatex.dtx
index 6b498fc..85fe903 100644
--- a/arabluatex.dtx
+++ b/arabluatex.dtx
@@ -1240,12 +1240,12 @@ vowels (see §~3).
1240% \end{compactenum} 1240% \end{compactenum}
1241% \begin{quote} 1241% \begin{quote}
1242% \textbf{Article}: |bAb-u| |'l-madrasaT-i| \arb[fullvoc]{bAb-u 1242% \textbf{Article}: |bAb-u| |'l-madrasaT-i| \arb[fullvoc]{bAb-u
1243% 'l-madrasaT-i} \arb[trans]{bAb-u 'l-madrasaT-i}, |al-maqAlaT-u| 1243% 'l-madrasaT-i} \arb[trans]{bAb-u 'l-madrasaT-i},
1244% |'l-'_Ul_A| \arb[fullvoc]{al-maqAlaT-u 'l-'_Ul_A} 1244% |al-maqA|\allowbreak|laT-u| |'l-'_Ul_A| \arb[fullvoc]{al-maqAlaT-u
1245% \arb[trans]{al-maqAlaT-u 'l-'_Ul_A}, |al-lu.gaT-u| 1245% 'l-'_Ul_A} \arb[trans]{al-maqAlaT-u 'l-'_Ul_A}, |al-lu.gaT-u|
1246% |'l-`arabiyyaT-u| \arb[fullvoc]{al-lu.gaT-u 'l-`arabiyyaT-u} 1246% |'l-`ara|\allowbreak|biyyaT-u| \arb[fullvoc]{al-lu.gaT-u
1247% \arb[trans]{al-lu.gaT-u 'l-`arabiyyaT-u}, |fI| |.sinA`aT-i| 1247% 'l-`arabiyyaT-u} \arb[trans]{al-lu.gaT-u 'l-`arabiyyaT-u}, |fI|
1248% |'l-.tibb-i| \arb[fullvoc]{fI .sinA`aT-i 'l-.tibb-i} 1248% |.sinA`aT-i| |'l-.tibb-i| \arb[fullvoc]{fI .sinA`aT-i 'l-.tibb-i}
1249% \arb[trans]{fI .sinA`aT-i 'l-.tibb-i}, |'il_A| |'l-intiqA.d-i| 1249% \arb[trans]{fI .sinA`aT-i 'l-.tibb-i}, |'il_A| |'l-intiqA.d-i|
1250% \arb[fullvoc]{'il_A 'l-intiqA.d-i} \arb[trans]{'il_A 1250% \arb[fullvoc]{'il_A 'l-intiqA.d-i} \arb[trans]{'il_A
1251% 'l-intiqA.d-i}, |fI| |'l-ibtidA'-i| \arb[fullvoc]{fI 'l-ibtidA'-i} 1251% 'l-intiqA.d-i}, |fI| |'l-ibtidA'-i| \arb[fullvoc]{fI 'l-ibtidA'-i}
@@ -1269,10 +1269,10 @@ vowels (see §~3).
1269% particle \arb[fullvoc]{la}: |la-l-.haqq-u| 1269% particle \arb[fullvoc]{la}: |la-l-.haqq-u|
1270% \arb[fullvoc]{la-l-.haqq-u} \arb[trans]{la-l-.haqq-u}. 1270% \arb[fullvoc]{la-l-.haqq-u} \arb[trans]{la-l-.haqq-u}.
1271% \item With the other particles, \arb[trans]{'alif-u 'l-wa.sl-i} is 1271% \item With the other particles, \arb[trans]{'alif-u 'l-wa.sl-i} is
1272% expressed: |fI| |'l-madInaT-i| \arb[fullvoc]{fI 'l-madInaT-i} 1272% expressed: |fI| |'l-madIna|\allowbreak|T-i| \arb[fullvoc]{fI
1273% \arb[trans]{fI 'l-madInaT-i}, |wa-'l-rajul-u| 1273% 'l-madInaT-i} \arb[trans]{fI 'l-madInaT-i}, |wa-'l-rajul-u|
1274% \arb[fullvoc]{wa-'l-rajul-u} \arb[trans]{wa-'l-rajul-u}, 1274% \arb[fullvoc]{wa-'l-rajul-u} \arb[trans]{wa-'l-rajul-u},
1275% |bi-'l-qalam-i| \arb[fullvoc]{bi-'l-qalam-i} 1275% |bi-'l-|\allowbreak|qalam-i| \arb[fullvoc]{bi-'l-qalam-i}
1276% \arb[trans]{bi-'l-qalam-i}, |bi-'l-ru`b-i| 1276% \arb[trans]{bi-'l-qalam-i}, |bi-'l-ru`b-i|
1277% \arb[fullvoc]{bi-'l-ru`b-i} \arb[trans]{bi-'l-ru`b-i}. 1277% \arb[fullvoc]{bi-'l-ru`b-i} \arb[trans]{bi-'l-ru`b-i}.
1278% \end{compactenum} 1278% \end{compactenum}
@@ -1285,9 +1285,9 @@ vowels (see §~3).
1285% \arb[trans]{wa-ustu`mila}, |qad-i| |in.sarafa| \arb[fullvoc]{qadi 1285% \arb[trans]{wa-ustu`mila}, |qad-i| |in.sarafa| \arb[fullvoc]{qadi
1286% in.sarafa} \arb[trans]{qadi in.sarafa}, |al-iqtidAr-u| 1286% in.sarafa} \arb[trans]{qadi in.sarafa}, |al-iqtidAr-u|
1287% \arb[fullvoc]{al-iqtidAr-u} \arb[trans]{al-iqtidAr-u}, |'il_A| 1287% \arb[fullvoc]{al-iqtidAr-u} \arb[trans]{al-iqtidAr-u}, |'il_A|
1288% |'l-intiqA.d-i| \arb[fullvoc]{'il_A 'l-intiqA.d-i} 1288% |'l-inti|\allowbreak|qA.d-i| \arb[fullvoc]{'il_A 'l-intiqA.d-i}
1289% \arb[trans]{'il_A 'l-intiqA.d-i}, |lawi| |istaqbala| 1289% \arb[trans]{'il_A 'l-intiqA.d-i}, |law| |istaqbala|
1290% \arb[fullvoc]{lawi istaqbala} \arb[trans]{lawi istaqbala}. 1290% \arb[fullvoc]{law istaqbala} \arb[trans]{law istaqbala}.
1291% 1291%
1292% \textbf{Other cases}: |'awi| |ismu-hu| \arb[fullvoc]{'awi ismu-hu} 1292% \textbf{Other cases}: |'awi| |ismu-hu| \arb[fullvoc]{'awi ismu-hu}
1293% \arb[trans]{'awi ismu-hu}, |zayduN| |ibn-u| |`amriNU| 1293% \arb[trans]{'awi ismu-hu}, |zayduN| |ibn-u| |`amriNU|
@@ -1333,15 +1333,16 @@ vowels (see §~3).
1333% this rule applies:--- 1333% this rule applies:---
1334% \begin{quote} 1334% \begin{quote}
1335% |fI| |`aynay| |'l-malik-i| \arb[fullvoc]{fI `aynay 'l-malik-i} 1335% |fI| |`aynay| |'l-malik-i| \arb[fullvoc]{fI `aynay 'l-malik-i}
1336% \arb[trans]{fI `aynay 'l-malik-i}, |ix^say| |'l-qawm-a| 1336% \arb[trans]{fI `aynay 'l-malik-i}, |ix^say|
1337% \arb[fullvoc]{ix^say 'l-qawm-a} \arb[trans]{ix^say 'l-qawm-a}, 1337% |'l-qaw|\allowbreak|m-a| \arb[fullvoc]{ix^say 'l-qawm-a}
1338% |mu.s.tafaw| |'l-l_ah-i| \arb[fullvoc]{mu.s.tafaw 'l-l_ah-i} 1338% \arb[trans]{ix^say 'l-qawm-a}, |mu.s.tafaw| |'l-l_ah-i|
1339% \arb[trans]{mu.s.tafaw 'l-l_ah-i}. 1339% \arb[fullvoc]{mu.s.tafaw 'l-l_ah-i} \arb[trans]{mu.s.ta\-faw
1340% 'l-l_ah-i}.
1340% 1341%
1341% |ramaW| |'l-.hijAraT-a| \arb[fullvoc]{ramaW 'l-.hijAraT-a} 1342% |ramaW| |'l-.hijAraT-a| \arb[fullvoc]{ramaW 'l-.hijAraT-a}
1342% \arb[trans]{ramaW 'l-.hijAraT-a}, |fa-lammA| |ra'aW | |'l-najm-a| 1343% \arb[trans]{ramaW 'l-.hijAraT-a}, |fa-lammA| |ra'aW |\allowbreak{}
1343% \arb[fullvoc]{fa-lammA ra'aW 'l-najm-a} \arb[trans]{fa-lammA ra'aW 1344% |'l-najm-a| \arb[fullvoc]{fa-lammA ra'aW 'l-najm-a}
1344% 'l-najm-a}. 1345% \arb[trans]{fa-lammA ra'aW 'l-najm-a}.
1345% \end{quote} 1346% \end{quote}
1346% 1347%
1347% \subparagraph{\arb[trans]{'alif-u 'l-wa.sl-i} preceded by a consonant 1348% \subparagraph{\arb[trans]{'alif-u 'l-wa.sl-i} preceded by a consonant
@@ -1402,17 +1403,17 @@ vowels (see §~3).
1402% \enquote{pipe} and \vref{sec:transliteration} on |dmg| mode.} 1403% \enquote{pipe} and \vref{sec:transliteration} on |dmg| mode.}
1403% |al-l_ah-u| \arb[fullvoc]{yA| al-l_ah-u} \arb[trans]{yA| 1404% |al-l_ah-u| \arb[fullvoc]{yA| al-l_ah-u} \arb[trans]{yA|
1404% al-l_ah-u}, \verb+'a-fa|+\footnote{\label{fn:pipe-allah-02}See 1405% al-l_ah-u}, \verb+'a-fa|+\footnote{\label{fn:pipe-allah-02}See
1405% \cref{fn:pipe-allah-01}.}|-al-l_ah-i| |la-ta.g`alanna| 1406% \cref{fn:pipe-allah-01}.}|-al-|\allowbreak|l_ah-i|
1406% \arb[fullvoc]{'a-fa|-al-l_ah-i la-ta.g`alanna} 1407% |la-ta.g`alanna| \arb[fullvoc]{'a-fa|-al-l_ah-i la-ta.g`alanna}
1407% \arb[trans]{'a-fa|-al-l_ah-i la-ta.g`alanna}, |bi-'l-l_ah-i| 1408% \arb[trans]{'a-fa|-al-l_ah-i la-ta.g`alanna},
1408% \arb[fullvoc]{bi-'l-l_ah-i} \arb[trans]{bi-'l-l_ah-i}, 1409% |bi-'l-|\allowbreak|l_ah-i| \arb[fullvoc]{bi-'l-l_ah-i}
1409% |wa-'l-l_ah-i| \arb[fullvoc]{wa-'l-l_ah-i} 1410% \arb[trans]{bi-'l-l_ah-i}, |wa-'l-l_ah-i|
1410% \arb[trans]{wa-'l-l_ah-i}, |bi-sm-i| |'l-l_ah-i| 1411% \arb[fullvoc]{wa-'l-l_ah-i} \arb[trans]{wa-'l-l_ah-i}, |bi-sm-i|
1411% \arb[fullvoc]{bi-sm-i 'l-l_ah-i} \arb[trans]{bi-sm-i 'l-l_ah-i}, 1412% |'l-l_ah-i| \arb[fullvoc]{bi-sm-i 'l-l_ah-i} \arb[trans]{bi-sm-i
1412% |al-.hamd-u| |li-l-l_ah-i| \arb[fullvoc]{al-.hamd-u li-l-l_ah-i} 1413% 'l-l_ah-i}, |al-.hamd-u| |li-l-l_ah-i| \arb[fullvoc]{al-.hamd-u
1413% \arb[trans]{al-.hamd-u li-l-l_ah-i}, |li-l-l_ah-i| |'l-qA'il-u| 1414% li-l-l_ah-i} \arb[trans]{al-.hamd-u li-l-l_ah-i}, |li-l-l_ah-i|
1414% \arb[fullvoc]{li-l-l_ah-i 'l-qA'il-u} \arb[trans]{li-l-l_ah-i 1415% |'l-qA'il-u| \arb[fullvoc]{li-l-l_ah-i 'l-qA'il-u}
1415% 'l-qA'il-u}. 1416% \arb[trans]{li-l-l_ah-i 'l-qA'il-u}.
1416% \end{quote} 1417% \end{quote}
1417% 1418%
1418% \paragraph{The conjunctive \arb[voc]{alla_dI}} 1419% \paragraph{The conjunctive \arb[voc]{alla_dI}}
@@ -1558,9 +1559,9 @@ vowels (see §~3).
1558% \begin{quote} 1559% \begin{quote}
1559% |fI "istisqA'-a| \arb[voc]{fI "istisqA'-a} \arb[trans]{fI 1560% |fI "istisqA'-a| \arb[voc]{fI "istisqA'-a} \arb[trans]{fI
1560% "istisqA'-a}, |wa-"istisqA'-u| \arb[voc]{wa-"istisqA'-u} 1561% "istisqA'-a}, |wa-"istisqA'-u| \arb[voc]{wa-"istisqA'-u}
1561% \arb[trans]{wa-"istisqA'-u}, |qAla| |"uhrub| |fa-lan| |tuqtala| 1562% \arb[trans]{wa-"is\-tisqA'-u}, |qAla| |"uhrub| |fa-lan|
1562% \arb[voc]{qAla "uhrub fa-lan tuqtala} \arb[trans]{qAla "uhrub 1563% |tuqtala| \arb[voc]{qAla "uhrub fa-lan tuqtala} \arb[trans]{qAla
1563% fa-lan tuqtala}. 1564% "uhrub fa-lan tuqtala}.
1564% \end{quote} 1565% \end{quote}
1565% \item \arb[trans]{sukUn}:--- 1566% \item \arb[trans]{sukUn}:---
1566% \begin{quote} 1567% \begin{quote}
@@ -2264,11 +2265,11 @@ word that \cs{arbnull} is applied to.
2264% |\cap{`u_tm_an-u}| \arb[voc]{\cap{`u_tm_an-u}} 2265% |\cap{`u_tm_an-u}| \arb[voc]{\cap{`u_tm_an-u}}
2265% \arb[trans]{\cap{`u_tm_an-u}}, |.daraba| |\cap{zayd-u}| |bn-u| 2266% \arb[trans]{\cap{`u_tm_an-u}}, |.daraba| |\cap{zayd-u}| |bn-u|
2266% |\cap{_h_alidiN}| |\cap{sa`d-a}| |bn-a| |\cap{`awf-i}| |bn-i| 2267% |\cap{_h_alidiN}| |\cap{sa`d-a}| |bn-a| |\cap{`awf-i}| |bn-i|
2267% |\cap{`abd-i}| |\cap{'l-l_ah-i}| \arb[fullvoc]{.daraba 2268% |\cap{|\allowbreak|`abd-i}| |\cap{'l-l_ah-i}|
2268% \cap{zayd-u} bn-u \cap{_h_alidiN} \cap{sa`d-a} bn-a \cap{`awf-i} 2269% \arb[fullvoc]{.daraba \cap{zayd-u} bn-u \cap{_h_alidiN}
2269% bn-i \cap{`abd-i} \cap{'l-l_ah-i}} \arb[trans]{.daraba 2270% \cap{sa`d-a} bn-a \cap{`awf-i} bn-i \cap{`abd-i} \cap{'l-l_ah-i}}
2270% \cap{zayd-u} bn-u \cap{_h_alidiN} \cap{sa`d-a} bn-a \cap{`awf-i} 2271% \arb[trans]{.daraba \cap{zayd-u} bn-u \cap{_h_alidiN} \cap{sa`d-a}
2271% bn-i \cap{`abd-i} \cap{'l-l_ah-i}}. 2272% bn-a \cap{`awf-i} bn-i \cap{`abd-i} \cap{'l-l_ah-i}}.
2272% \end{quote} 2273% \end{quote}
2273% However, \cs{cap} must be used cautiously in some very particular 2274% However, \cs{cap} must be used cautiously in some very particular
2274% cases, for the closing brace of its argument may prevent a rule from 2275% cases, for the closing brace of its argument may prevent a rule from
diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index 8e5671d..097aa5d 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -660,7 +660,7 @@ digraphsfv = {
660-- {a="(n)(ْ)(%s)(ل)", b="%1%3%4"}, 660-- {a="(n)(ْ)(%s)(ل)", b="%1%3%4"},
661-- {a="(n)(ْ)(%s)(م)", b="%1%3%4"}, 661-- {a="(n)(ْ)(%s)(م)", b="%1%3%4"},
662-- {a="(n)(ْ)(%s)(ن)", b="%1%3%4"}, 662-- {a="(n)(ْ)(%s)(ن)", b="%1%3%4"},
663-- {a="ْ\"", b="\""}, 663 {a="ْ\"", b="\""},
664 -- sukūn end 664 -- sukūn end
665 {a="_t", b="ث"}, 665 {a="_t", b="ث"},
666 {a="%^g", b="ج"}, 666 {a="%^g", b="ج"},
diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index c216017..5e7dbe5 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -309,24 +309,24 @@ digraphstrdmg = {
309 {a="(%-)(\"?ayni)(%p?)$", b="\\arbup{%2}%3"}, 309 {a="(%-)(\"?ayni)(%p?)$", b="\\arbup{%2}%3"},
310 {a="(%-)(\"?[uai])(%p?%s)", b="\\arbup{%2}%3"}, 310 {a="(%-)(\"?[uai])(%p?%s)", b="\\arbup{%2}%3"},
311 {a="(%-)(\"?[uai])(%p?)$", b="\\arbup{%2}%3"}, 311 {a="(%-)(\"?[uai])(%p?)$", b="\\arbup{%2}%3"},
312 -- ʾiʿrāb hyphen (end) 312 -- ʾiʿrāb hyphen (end) shorten long vowels preceding ʾalif
313 -- shorten long vowels preceding ʾalif conjunctionis 313 -- conjunctionis—without forgetting 'lla_dI
314 {a="(U)(A)", b="U"}, 314 {a="(U)(A)", b="U"},
315 {a="(aW)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="awu"}, 315 {a="(aW)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])([%S]-o)", b="awu"},
316 {a="(%_a)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="a"}, 316 {a="(%_a)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])([%S]-o)", b="a"},
317 {a="(%_A)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="ạ"}, 317 {a="(%_A)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])([%S]-o)", b="ạ"},
318 {a="(A)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="a"}, 318 {a="(A)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])([%S]-o)", b="a"},
319 {a="(Y)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="ạ"}, 319 {a="(Y)(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])([%S]-o)", b="ạ"},
320 {a="([%_]?[Uu])(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="u"}, 320 {a="([%_]?[Uu])(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])([%S]-o)", b="u"},
321 {a="([%_]?[Ii])(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)([%S]-o)", b="i"}, 321 {a="([%_]?[Ii])(o)('[%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])([%S]-o)", b="i"},
322 --p (next 7 lines, just after %s) 322 --p (next 7 lines, just after %s)
323 {a="(aW)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="awu%2%3"}, 323 {a="(aW)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])", b="awu%2%3"},
324 {a="(%_a)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="a%2%3"}, 324 {a="(%_a)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])", b="a%2%3"},
325 {a="(%_A)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ%2%3"}, 325 {a="(%_A)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])", b="ạ%2%3"},
326 {a="(A)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="a%2%3"}, 326 {a="(A)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])", b="a%2%3"},
327 {a="(Y)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="ạ%2%3"}, 327 {a="(Y)(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])", b="ạ%2%3"},
328 {a="([%_]?[Uu])(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="u%2%3"}, 328 {a="([%_]?[Uu])(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])", b="u%2%3"},
329 {a="([%_]?[Ii])(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy]%-)", b="i%2%3"}, 329 {a="([%_]?[Ii])(%s)([%(%[%|%<]?['][%_%^%.]?[l'btjghxdrzs`fqkmnwy][%-l])", b="i%2%3"},
330 {a="%-%-", b=""}, 330 {a="%-%-", b=""},
331-- {a="T([^uai])", b="%1"}, 331-- {a="T([^uai])", b="%1"},
332 {a="T(%p?%s)", b="h%1"}, 332 {a="T(%p?%s)", b="h%1"},