aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Alessi <alessi@robertalessi.net>2016-03-24 21:21:48 +0100
committerRobert Alessi <alessi@robertalessi.net>2016-03-24 21:21:48 +0100
commit3935c8e7fae78ab7fc6f52a912e6290b91fe2e92 (patch)
treef4ecc4b597503e8fdfb1b22e712f9efe5a3d13ff
parent605e4673b5b10138450b89bf2a9fc4d490657099 (diff)
downloadarabluatex-3935c8e7fae78ab7fc6f52a912e6290b91fe2e92.tar.gz
bugfix: wrong 'lla_dI with bi-; still documenting
-rw-r--r--arabluatex.dtx103
-rw-r--r--arabluatex_fullvoc.lua2
-rw-r--r--arabluatex_novoc.lua2
-rw-r--r--arabluatex_voc.lua2
4 files changed, 89 insertions, 20 deletions
diff --git a/arabluatex.dtx b/arabluatex.dtx
index 0541b69..eff2045 100644
--- a/arabluatex.dtx
+++ b/arabluatex.dtx
@@ -312,7 +312,7 @@
312% 312%
313% \subsection{Options} 313% \subsection{Options}
314% \package{arabluatex} may be loaded with four global options, each of 314% \package{arabluatex} may be loaded with four global options, each of
315% which may be overriden at any point of the document (see below **): 315% which may be overriden at any point of the document (see below **o):
316% 316%
317% \DescribeOption{voc}\hfill\arabluaverb{default}\\ In this mode, 317% \DescribeOption{voc}\hfill\arabluaverb{default}\\ In this mode,
318% which is the one selected by default, every short vowel written 318% which is the one selected by default, every short vowel written
@@ -332,7 +332,7 @@
332% 332%
333% \DescribeOption{novoc}\\ None of the diacritics is showed in |novoc| 333% \DescribeOption{novoc}\\ None of the diacritics is showed in |novoc|
334% mode, unless otherwise specified (see \enquote{quoting} technique 334% mode, unless otherwise specified (see \enquote{quoting} technique
335% below **). 335% below \vref{sec:quoting}).
336% 336%
337% \DescribeOption{trans} \\ This mode transliterates the Arab\TeX\ 337% \DescribeOption{trans} \\ This mode transliterates the Arab\TeX\
338% input into one of the accepted standards. At present, two standards 338% input into one of the accepted standards. At present, two standards
@@ -428,7 +428,7 @@ consonants, though three of them are also used as vowels
428% Letter & \multicolumn{2}{l}{Transliteration\footnotemark} 428% Letter & \multicolumn{2}{l}{Transliteration\footnotemark}
429% & Arab\TeX\ notation \\ 429% & Arab\TeX\ notation \\
430% & \texttt{dmg} & \texttt{loc} & \\ \midrule 430% & \texttt{dmg} & \texttt{loc} & \\ \midrule
431% \endhead \footnotetext{See below **} 431% \endhead \footnotetext{See below **t}
432% \label{tab:arabtex-consonants} 432% \label{tab:arabtex-consonants}
433% \arb[novoc]{a}\footnote{For \arb[trans]{'alif} as a consonant, see 433% \arb[novoc]{a}\footnote{For \arb[trans]{'alif} as a consonant, see
434% \textcite[i. 16 D]{Wright}.} & \dmg{a} & \loc{a} & \verb|a| \\ 434% \textcite[i. 16 D]{Wright}.} & \dmg{a} & \loc{a} & \verb|a| \\
@@ -473,7 +473,7 @@ consonants, though three of them are also used as vowels
473% Letter & \multicolumn{2}{l}{Transliteration\footnotemark} 473% Letter & \multicolumn{2}{l}{Transliteration\footnotemark}
474% & Arab\TeX\ notation \\ 474% & Arab\TeX\ notation \\
475% & \texttt{dmg} & \texttt{loc} & \\ \midrule 475% & \texttt{dmg} & \texttt{loc} & \\ \midrule
476% \endhead \footnotetext{See below **} 476% \endhead \footnotetext{See below **t}
477% \label{tab:arabtex-long-vowels} 477% \label{tab:arabtex-long-vowels}
478% \arb[novoc]{A} & \dmg{A} & \loc{A} & \verb|A| \\ 478% \arb[novoc]{A} & \dmg{A} & \loc{A} & \verb|A| \\
479% \arb[novoc]{U} & \dmg{U} & \loc{U} & \verb|U| \\ 479% \arb[novoc]{U} & \dmg{U} & \loc{U} & \verb|U| \\
@@ -516,7 +516,7 @@ consonants, though three of them are also used as vowels
516% Letter & \multicolumn{2}{l}{Transliteration\footnotemark} 516% Letter & \multicolumn{2}{l}{Transliteration\footnotemark}
517% & Arab\TeX\ notation \\ 517% & Arab\TeX\ notation \\
518% & \texttt{dmg} & \texttt{loc} & \\ \midrule 518% & \texttt{dmg} & \texttt{loc} & \\ \midrule
519% \endhead \footnotetext{See below **} 519% \endhead \footnotetext{See below **t}
520% \label{tab:arabtex-short-vowels} 520% \label{tab:arabtex-short-vowels}
521% \arb[voc]{Ba} & \dmg{Ba} & \loc{Ba} & \verb|a| \\ 521% \arb[voc]{Ba} & \dmg{Ba} & \loc{Ba} & \verb|a| \\
522% \arb[voc]{Bu} & \dmg{Bu} & \loc{Bu} & \verb|u| \\ 522% \arb[voc]{Bu} & \dmg{Bu} & \loc{Bu} & \verb|u| \\
@@ -533,7 +533,7 @@ consonants, though three of them are also used as vowels
533% vowels except at some particular places for disambiguation purposes, 533% vowels except at some particular places for disambiguation purposes,
534% or use |novoc| mode, not write vowels---as |novoc| normally does not 534% or use |novoc| mode, not write vowels---as |novoc| normally does not
535% show them---except, again, where disambiguation is needed.\footnote{See 535% show them---except, again, where disambiguation is needed.\footnote{See
536% below **} 536% below \vref{sec:quoting}}
537% 537%
538% \iffalse 538% \iffalse
539%<*example> 539%<*example>
@@ -553,7 +553,7 @@ consonants, though three of them are also used as vowels
553% \begin{compactitem} 553% \begin{compactitem}
554% \item at the commencement of a word, to indicate that a connective 554% \item at the commencement of a word, to indicate that a connective
555% \arb[trans]{'alif} is needed, with the exception of the article (see 555% \arb[trans]{'alif} is needed, with the exception of the article (see
556% below **); 556% below \vref{sec:quoting});
557% \item when \package{arabluatex} needs to perform a contextual 557% \item when \package{arabluatex} needs to perform a contextual
558% analysis to determine the carrier of the \arb[trans]{hamzaT}; 558% analysis to determine the carrier of the \arb[trans]{hamzaT};
559% \item in the various transliteration modes, as vowels are always 559% \item in the various transliteration modes, as vowels are always
@@ -692,7 +692,7 @@ consonants, though three of them are also used as vowels
692% \paragraph{\arb[trans]{hamzaT}} It is written \meta{\texttt{'}}, its 692% \paragraph{\arb[trans]{hamzaT}} It is written \meta{\texttt{'}}, its
693% carrier being determined by contextual analysis. In case one wishes 693% carrier being determined by contextual analysis. In case one wishes
694% to bypass this mechanism, he can use the \enquote{quoting} feature 694% to bypass this mechanism, he can use the \enquote{quoting} feature
695% that is described below **. 695% that is described below \vref{sec:quoting}.
696% \begin{quote} 696% \begin{quote}
697% \textbf{Initial \arb[trans]{hamzaT}}: |'asaduN| \arb[voc]{'asaduN} 697% \textbf{Initial \arb[trans]{hamzaT}}: |'asaduN| \arb[voc]{'asaduN}
698% \arb[trans]{'asaduN}, |'u_htuN| \arb[voc]{'u_htuN} 698% \arb[trans]{'asaduN}, |'u_htuN| \arb[voc]{'u_htuN}
@@ -755,12 +755,12 @@ consonants, though three of them are also used as vowels
755% \arb[trans]{.zim'aN} 755% \arb[trans]{.zim'aN}
756% \end{quote} 756% \end{quote}
757% 757%
758% \paragraph{\arb[trans]{maddaT}} At the beginning of a syllabe, 758% \paragraph{\arb[trans]{maddaT}} \label{ref:madda}At the beginning of
759% \arb[trans]{'alif} with \arb[trans]{hamzaT} and \arb[trans]{fat.haT} 759% a syllabe, \arb[trans]{'alif} with \arb[trans]{hamzaT} and
760% (\arb[voc]{'a}) followed by \arb[trans]{'alifu 'l-maddi} 760% \arb[trans]{fat.haT} (\arb[voc]{'a}) followed by \arb[trans]{'alifu
761% (\arb[trans]{'alif} of prolongation) or \arb[trans]{'alif} with 761% 'l-maddi} (\arb[trans]{'alif} of prolongation) or \arb[trans]{'alif}
762% \arb[trans]{hamzaT} and \arb[trans]{jazmaT} (\arb[voc]{a"'"}) are 762% with \arb[trans]{hamzaT} and \arb[trans]{jazmaT} (\arb[voc]{a"'"})
763% both represented in writing \arb[trans]{'alif} with 763% are both represented in writing \arb[trans]{'alif} with
764% \arb[trans]{maddaT}: \arb[voc]{A"'} \parencite[see][i. 25 764% \arb[trans]{maddaT}: \arb[voc]{A"'} \parencite[see][i. 25
765% A--B]{Wright}. 765% A--B]{Wright}.
766% 766%
@@ -1022,8 +1022,8 @@ consonants, though three of them are also used as vowels
1022% is needed by the |dmg| transliteration mode as in this mode any 1022% is needed by the |dmg| transliteration mode as in this mode any
1023% vowel at the commencement of a word preceded by a word that ends 1023% vowel at the commencement of a word preceded by a word that ends
1024% with a vowel, either short or long, is absorbed by this vowel 1024% with a vowel, either short or long, is absorbed by this vowel
1025% viz. \arb[trans]{`al_A 'l-.tarIqi}. See ** on the \enquote{pipe} 1025% viz. \arb[trans]{`al_A 'l-.tarIqi}. See **p on the \enquote{pipe}
1026% and ** on |dmg| mode.} |al-l_ahu| \arb[fullvoc]{yA| al-l_ahu} 1026% and **t on |dmg| mode.} |al-l_ahu| \arb[fullvoc]{yA| al-l_ahu}
1027% \arb[trans]{yA| al-l_ahu}, 1027% \arb[trans]{yA| al-l_ahu},
1028% \verb+'a-fa|+\footnote{\label{fn:pipe-allah-02}See 1028% \verb+'a-fa|+\footnote{\label{fn:pipe-allah-02}See
1029% \cref{fn:pipe-allah-01}.}|-al-l_ahi| |la-ta.g`alanna| 1029% \cref{fn:pipe-allah-01}.}|-al-l_ahi| |la-ta.g`alanna|
@@ -1037,8 +1037,77 @@ consonants, though three of them are also used as vowels
1037% |'l-qA'ilu| \arb[fullvoc]{li-l-l_ahi 'l-qA'ilu} 1037% |'l-qA'ilu| \arb[fullvoc]{li-l-l_ahi 'l-qA'ilu}
1038% \arb[trans]{li-l-l_ahi 'l-qA'ilu}. 1038% \arb[trans]{li-l-l_ahi 'l-qA'ilu}.
1039% \end{quote} 1039% \end{quote}
1040%
1041% 1040%
1041% \paragraph{The conjunctive \arb[voc]{alla_dI}}
1042% Although it is compounded of the article \arb[fullvoc]{al}, the
1043% demonstrative letter \arb[novoc]{l} and the demonstrative pronoun
1044% \arb[voc]{_dA}, both masculine and feminine forms that are written
1045% defectively are encoded |alla_dI| and |allatI| respectively. Forms
1046% starting with the connective \arb[trans]{'alif} are encoded
1047% |'lla_dI| and |'llatI|:---
1048% \begin{quote}
1049% |'a_hAfu| |mina| |'l-maliki| |'lla_dI| |ya.zlimu| |'l-nAsa|
1050% \arb[fullvoc]{'a_hAfu mina 'l-maliki 'lla_dI ya.zlimu 'l-nAsa}
1051% \arb[trans]{'a_hAfu mina 'l-maliki 'lla_dI ya.zlimu 'l-nAsa},
1052% |`udtu| |'l-^say_ha| |'lladI| |huwa| |marI.duN|
1053% \arb[fullvoc]{`udtu 'l-^say_ha 'lladI huwa marI.duN}
1054% \arb[trans]{`udtu 'l-^say_ha 'lladI huwa marI.duN}, |mA| |'anA|
1055% |bi-'lla_dI| |qA'iluN| |la-ka| |^say'aN| \arb[fullvoc]{mA 'anA
1056% bi-'lla_dI qA'iluN la-ka ^say'aN} \arb[trans]{mA 'anA bi-'lla_dI
1057% qA'iluN la-ka ^say'aN}.
1058%
1059% |'ari-nA| |'lla_dayni| |'a.dallA-nA| |mina| |'l-jinni|
1060% |wa-'l-'insi| \arb[fullvoc]{'ari-nA 'lla_dayni 'a.dallA-nA mina
1061% 'l-jinni wa-'l-'insi} \arb[trans]{'ari-nA 'lla_dayni 'a.dallA-nA
1062% mina 'l-jinni wa-'l-'insi}.
1063% \end{quote}
1064% The other forms are encoded regularly as |al-l| or |'l-l|:---
1065% \begin{quote}
1066% |fa-'innA| |na_dkuru| |'l-.sawtayni| |'l-la_dayni| |rawaynA-humA|
1067% |`an| |ja.h.zaTa| \arb[fullvoc]{fa-'innA na_dkuru 'l-.sawtayni
1068% 'l-la_dayni rawaynA-humA `an \cap{ja.h.zaTa}} \arb[trans]{fa-'innA
1069% na_dkuru 'l-.sawtayni 'l-la_dayni rawaynA-humA `an
1070% \cap{ja.h.zaTa}}.
1071%
1072% And also: |al-la_dAni| \arb[fullvoc]{al-la_dAni}
1073% \arb[trans]{al-la_dAni}, |al-la_dayni| \arb[fullvoc]{al-la_dayni}
1074% \arb[trans]{al-la_dayni}, |al-latAni| \arb[fullvoc]{al-latAni}
1075% \arb[trans]{al-latAni}, |al-latayni| \arb[fullvoc]{al-latayni}
1076% \arb[trans]{al-latayni}, |al-lAtI| \arb[fullvoc]{al-lAtI}
1077% \arb[trans]{al-lAtI}, \verb+al-lA'|Ati+\footnote{Note here the
1078% \enquote{pipe} character \enquote*{\textbar}: as already
1079% stated \vpageref{ref:madda}, the sequence |'A| usually encodes
1080% \arb[trans]{'alif} with \arb[trans]{hamzaT} followed by
1081% \arb[trans]{'alif} of prolongation which is represented in writing
1082% \arb[trans]{'alif} with \arb[trans]{maddaT}: \arb[voc]{A"'}. The
1083% \enquote{pipe} character prevents this rule from being
1084% applied. See **p.}
1085% \arb[fullvoc]{al-lA'|Ati} \arb[trans]{al-lA'|Ati}, |al-lA'I|
1086% \arb[fullvoc]{al-lA'I} \arb[trans]{al-lA'I}, and so forth.
1087% \end{quote}
1088%
1089% \subsection{Quoting}
1090% \label{sec:quoting}
1091% It is here referred to \enquote{quoting} after the package
1092% \package{arabtex}.\footnote{See \textcite[22]{pkg:arabtex}} The
1093% \enquote{quoting} mechanism of \package{arabluatex} is designed to
1094% be very similar in effect to the one of \package{arabtex}.
1095%
1096% To start with an example, suppose one types the following in |novoc|
1097% mode: \arb[novoc]{`ullima `ilma 'l-hay'aTi}; is it
1098% \arb[fullvoc]{`ullima}, \emph{he was taught the science of
1099% astronomy}, or \arb[fullvoc]{`allama}, \emph{he taught the science
1100% of astronomy}? In order to disambiguate this clause, it may be
1101% sensible to put a \arb[trans]{.dammaT} above the first \arb[voc]{`}:
1102% \arb[novoc]{`"ullima `ilma 'l-hay'aTi}, which is achieved by
1103% \enquote{quoting} the vowel |u|, like so: |`"ullima|, or, with no
1104% other vowel than the required |u|: |`"ullm|.
1105%
1106% This is how the \enquote{quoting} mechanism works: metaphorically
1107% speaking, it acts as a \emph{toggle switch}. If something, in a
1108% given mode, is supposed to be visible, \enquote{quoting} hides it;
1109% conversely, if it is supposed not to, it makes it visible.
1110%
1042% 1111%
1043% \StopEventually{} 1112% \StopEventually{}
1044% 1113%
diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index 34031b9..a849cd1 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -120,7 +120,7 @@ hamzafv = {
120trigraphsfv = { -- trigraphs or more 120trigraphsfv = { -- trigraphs or more
121 -- 'llatI / 'llad_I 121 -- 'llatI / 'llad_I
122 {a="^'ll(a)([%_]?[dt])", b="ٱلّ%1%2"}, 122 {a="^'ll(a)([%_]?[dt])", b="ٱلّ%1%2"},
123 {a="(%s)'ll(a)([%_]?[dt])", b="%1ٱلّ%2%3"}, 123 {a="([%s%-])'ll(a)([%_]?[dt])", b="%1ٱلّ%2%3"},
124 -- al- + lām 124 -- al- + lām
125 {a="^(a)l%-(l)", b="ا%1ل%2%2"}, 125 {a="^(a)l%-(l)", b="ا%1ل%2%2"},
126 {a="([%s%-])(a)l%-(l)", b="%1ا%2ل%3%3"}, 126 {a="([%s%-])(a)l%-(l)", b="%1ا%2ل%3%3"},
diff --git a/arabluatex_novoc.lua b/arabluatex_novoc.lua
index 1a5c913..9aa141e 100644
--- a/arabluatex_novoc.lua
+++ b/arabluatex_novoc.lua
@@ -27,7 +27,7 @@ trigraphsnv = { -- trigraphs or more
27 {a="l%-l_ah", b="l-ll_ah"}, 27 {a="l%-l_ah", b="l-ll_ah"},
28 -- 'llatI / 'llad_I 28 -- 'llatI / 'llad_I
29 {a="^'ll(a)([%_]?[dt])", b="ال%1%2"}, 29 {a="^'ll(a)([%_]?[dt])", b="ال%1%2"},
30 {a="(%s)'ll(a)([%_]?[dt])", b="%1ال%2%3"}, 30 {a="([%s%-])'ll(a)([%_]?[dt])", b="%1ال%2%3"},
31 -- al- + lām 31 -- al- + lām
32 {a="^(a)l%-(l)", b="ا%1ل%2"}, 32 {a="^(a)l%-(l)", b="ا%1ل%2"},
33 {a="([%s%-])(a)l%-(l)", b="%1ا%2ل%3"}, 33 {a="([%s%-])(a)l%-(l)", b="%1ا%2ل%3"},
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index a30a2f1..ecdb067 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -151,7 +151,7 @@ hamza = {
151trigraphs = { -- trigraphs or more 151trigraphs = { -- trigraphs or more
152 -- 'llatI / 'llad_I 152 -- 'llatI / 'llad_I
153 {a="^'ll(a)([%_]?[dt])", b="الّ%1%2"}, 153 {a="^'ll(a)([%_]?[dt])", b="الّ%1%2"},
154 {a="(%s)'ll(a)([%_]?[dt])", b="%1الّ%2%3"}, 154 {a="([%s%-])'ll(a)([%_]?[dt])", b="%1الّ%2%3"},
155 -- al- + lām 155 -- al- + lām
156 {a="^(a)l%-(l)", b="ا%1ل%2%2"}, 156 {a="^(a)l%-(l)", b="ا%1ل%2%2"},
157 {a="([%s%-])(a)l%-(l)", b="%1ا%2ل%3%3"}, 157 {a="([%s%-])(a)l%-(l)", b="%1ا%2ل%3%3"},