From 884fec6d73854a8027dac0edfeb3b63a52c0a1a4 Mon Sep 17 00:00:00 2001 From: Robert Alessi Date: Mon, 26 Jun 2017 01:32:21 +0200 Subject: bugfix: initial hamzah after hyphen was broken; a couple of typos --- arabluatex.dtx | 12 ++++++------ arabluatex_fullvoc.lua | 12 ++++++------ arabluatex_trans.lua | 18 +++++++++--------- arabluatex_voc.lua | 12 ++++++------ 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/arabluatex.dtx b/arabluatex.dtx index a83cd73..17dbe1f 100644 --- a/arabluatex.dtx +++ b/arabluatex.dtx @@ -3061,18 +3061,18 @@ qAla barzawayhi bn-u 'azhar-a, ra's-u 'a.tibbA'-i fAris-a... \begin{arabluacode} \begin{arab} \textcolor{red}{\cap{m}uha_d_dabu \cap{'l-d}Ini \cap{`a}bdu - \cap{'l-r}a.hImi bni \cap{`a}liyyiN} huwa ^say_hu-nA 'l-'imAmu + \cap{'l-r}a.hImi bnu \cap{`a}liyyiN} huwa ^say_hu-nA 'l-'imAmu 'l-.sadru 'l-kabIru 'l-`Alimu 'l-fA.dilu \cap{m}uha_d_dabu - \cap{'l-d}Ini \cap{'a}bU \cap{m}u.hammadiN \cap{`a}bdu - \cap{'l-r}a.hImi bni \cap{`a}liyyi bni \cap{.h}AmidiN wa-yu`rafu + \cap{'l-d}Ini \cap{'a}bU \cap{m}u.hammadiN \cap{`a}bdi + \cap{'l-r}a.hImi bnu \cap{`a}liyyi bni \cap{.h}AmidiN wa-yu`rafu bi-\cap{'l-d}a_hwari. \end{arab} \begin{arab}[trans] \textcolor{red}{\cap{m}uha_d_dabu \cap{'l-d}Ini \cap{`a}bdu - \cap{'l-r}a.hImi bni \cap{`a}liyyiN} huwa ^say_hu-nA 'l-'imAmu + \cap{'l-r}a.hImi bnu \cap{`a}liyyiN} huwa ^say_hu-nA 'l-'imAmu 'l-.sadru 'l-kabIru 'l-`Alimu 'l-fA.dilu \cap{m}uha_d_dabu - \cap{'l-d}Ini \cap{'a}bU \cap{m}u.hammadiN \cap{`a}bdu - \cap{'l-r}a.hImi bni \cap{`a}liyyi bni \cap{.h}AmidiN wa-yu`rafu + \cap{'l-d}Ini \cap{'a}bU \cap{m}u.hammadiN \cap{`a}bdi + \cap{'l-r}a.hImi bnu \cap{`a}liyyi bni \cap{.h}AmidiN wa-yu`rafu bi-\cap{'l-d}a_hwari. \end{arab} \end{arabluacode} diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua index acd423e..ae4f42a 100644 --- a/arabluatex_fullvoc.lua +++ b/arabluatex_fullvoc.lua @@ -78,11 +78,11 @@ hamzafv = { -- then the 'initial' rules for the remaining cases {a="^(')([ua])", b="أ%2"}, {a="^(')(i)", b="إ%2"}, - -- consider replacing initial %W with [%s%(%[%<]: + -- consider replacing initial %W with [%s%(%[%<%-]: -- {a="(%W)(')([ua])", b="%1أ%3"}, -- {a="(%W)(')(i)", b="%1إ%3"}, - {a="([%s%(%[%<])(')([ua])", b="%1أ%3"}, - {a="([%s%(%[%<])(')(i)", b="%1إ%3"}, + {a="([%s%(%[%<%-])(')([ua])", b="%1أ%3"}, + {a="([%s%(%[%<%-])(')(i)", b="%1إ%3"}, -- final -- ^say'aN and .zim'aN are special orthographies {a="(%^sa%.?[yY])(\"?%|?)(%')(aN)", b="%1%2ئ%4"}, @@ -193,11 +193,11 @@ hamzafveasy = { -- differences marked below with 'easy' -- then the 'initial' rules for the remaining cases {a="^(')([ua])", b="أ%2"}, {a="^(')(i)", b="إ%2"}, - -- consider replacing initial %W with [%s%(%[%<]: + -- consider replacing initial %W with [%s%(%[%<%-]: -- {a="(%W)(')([ua])", b="%1أ%3"}, -- {a="(%W)(')(i)", b="%1إ%3"}, - {a="([%s%(%[%<])(')([ua])", b="%1أ%3"}, - {a="([%s%(%[%<])(')(i)", b="%1إ%3"}, + {a="([%s%(%[%<%-])(')([ua])", b="%1أ%3"}, + {a="([%s%(%[%<%-])(')(i)", b="%1إ%3"}, -- final -- ^say'aN and .zim'aN are special orthographies {a="(%^sa%.?[yY])(\"?%|?)(%')(aN)", b="%1%2ئ%4"}, diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua index 31e00b2..52167e2 100644 --- a/arabluatex_trans.lua +++ b/arabluatex_trans.lua @@ -108,11 +108,11 @@ hamzatrdmg = { -- then the 'initial' rules for the remaining cases {a="^(')([ua])", b="ʾ%2"}, {a="^(')(i)", b="ʾ%2"}, - -- consider replacing initial %W with [%s%(%[%<]: + -- consider replacing initial %W with [%s%(%[%<%-]: -- {a="(%W)(')([ua])", b="%1ʾ%3"}, -- {a="(%W)(')(i)", b="%1ʾ%3"}, - {a="([%s%(%[%<])(')([ua])", b="%1ʾ%3"}, - {a="([%s%(%[%<])(')(i)", b="%1ʾ%3"}, + {a="([%s%(%[%<%-])(')([ua])", b="%1ʾ%3"}, + {a="([%s%(%[%<%-])(')(i)", b="%1ʾ%3"}, -- final {a="([Iy])(')(aN)$", b="%1ʾ%3"}, {a="([Iy])(')(aN)(%W)", b="%1ʾ%3%4"}, @@ -474,11 +474,11 @@ hamzatrloc = { -- initial (needs both ^ and %W patterns) {a="^(')([ua])", b="%2"}, {a="^(')(i)", b="%2"}, - -- consider replacing initial %W with [%s%(%[%<]: + -- consider replacing initial %W with [%s%(%[%<%-]: -- {a="(%W)(')([ua])", b="%1%3"}, -- {a="(%W)(')(i)", b="%1%3"}, - {a="([%s%(%[%<])(')([ua])", b="%1%3"}, - {a="([%s%(%[%<])(')(i)", b="%1%3"}, + {a="([%s%(%[%<%-])(')([ua])", b="%1%3"}, + {a="([%s%(%[%<%-])(')(i)", b="%1%3"}, -- final {a="([Iy])(')(aN)$", b="%1ʾ%3"}, {a="([Iy])(')(aN)(%W)", b="%1ʾ%3%4"}, @@ -729,11 +729,11 @@ hamzatrarabica = { -- ≠ from hamzatrloc: initial hamza has to be held -- hold it for now (see below, beginning of digraphs table) {a="^(')([ua])", b="@%2"}, {a="^(')(i)", b="@%2"}, - -- consider replacing initial %W with [%s%(%[%<]: + -- consider replacing initial %W with [%s%(%[%<%-]: -- {a="(%W)(')([ua])", b="%1@%3"}, -- {a="(%W)(')(i)", b="%1@%3"}, - {a="([%s%(%[%<])(')([ua])", b="%1@%3"}, - {a="([%s%(%[%<])(')(i)", b="%1@%3"}, + {a="([%s%(%[%<%-])(')([ua])", b="%1@%3"}, + {a="([%s%(%[%<%-])(')(i)", b="%1@%3"}, -- final {a="([Iy])(')(aN)$", b="%1ʾ%3"}, {a="([Iy])(')(aN)(%W)", b="%1ʾ%3%4"}, diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua index 9251ee9..8f6b9bb 100644 --- a/arabluatex_voc.lua +++ b/arabluatex_voc.lua @@ -214,11 +214,11 @@ hamza = { -- then the 'initial' rules for the remaining cases {a="^(')([ua])", b="أ%2"}, {a="^(')(i)", b="إ%2"}, - -- consider replacing initial %W with [%s%(%[%<]: + -- consider replacing initial %W with [%s%(%[%<%-]: -- {a="(%W)(')([ua])", b="%1أ%3"}, -- {a="(%W)(')(i)", b="%1إ%3"}, - {a="([%s%(%[%<])(')([ua])", b="%1أ%3"}, - {a="([%s%(%[%<])(')(i)", b="%1إ%3"}, + {a="([%s%(%[%<%-])(')([ua])", b="%1أ%3"}, + {a="([%s%(%[%<%-])(')(i)", b="%1إ%3"}, -- final -- ^say'aN and .zim'aN are special orthographies {a="(%^sa%.?[yY])(\"?%|?)(%')(aN)", b="%1%2ئ%4"}, @@ -320,11 +320,11 @@ hamzaeasy = { -- differences marked below with 'easy' -- then the 'initial' rules for the remaining cases {a="^(')([ua])", b="أ%2"}, {a="^(')(i)", b="إ%2"}, - -- consider replacing initial %W with [%s%(%[%<]: + -- consider replacing initial %W with [%s%(%[%<%-]: -- {a="(%W)(')([ua])", b="%1أ%3"}, -- {a="(%W)(')(i)", b="%1إ%3"}, - {a="([%s%(%[%<])(')([ua])", b="%1أ%3"}, - {a="([%s%(%[%<])(')(i)", b="%1إ%3"}, + {a="([%s%(%[%<%-])(')([ua])", b="%1أ%3"}, + {a="([%s%(%[%<%-])(')(i)", b="%1إ%3"}, -- final -- ^say'aN and .zim'aN are special orthographies {a="(%^sa%.?[yY])(\"?%|?)(%')(aN)", b="%1%2ئ%4"}, -- cgit v1.2.3