From d5b8c4d6c68269a82f59e071229dc3182ee3e304 Mon Sep 17 00:00:00 2001 From: aarne Date: Sun, 11 Feb 2007 22:15:37 +0000 Subject: [PATCH] thai word list corrections --- lib/resource-1.0/thai/StringsThai.gf | 6 ++-- .../thai/pronunciation/StringsTha.gf | 30 +++++++++---------- src/GF/Text/Thai.hs | 3 ++ 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/lib/resource-1.0/thai/StringsThai.gf b/lib/resource-1.0/thai/StringsThai.gf index 4544fc634..b2c45b55a 100644 --- a/lib/resource-1.0/thai/StringsThai.gf +++ b/lib/resource-1.0/thai/StringsThai.gf @@ -19,7 +19,7 @@ hay_s = "a%hT2" ; -- give hok_s = "ho?k" ; -- six kaaw_s = "eka:" ; -- nine kew_s = "e'kT2w" ; -- glass (drink Classif) -khaw_s = "ek1w" ; -- he +khaw_s = "ek1a:" ; -- he khon_s = "k2n" ; -- people Classif khoog_s = "k1Og" ; -- Possessive khun_s = "k2un'" ; -- you @@ -52,8 +52,8 @@ thii_s = "t5i:T1" ; -- Ord tog_s = "tT2Og" ; -- must waa_s = "wT1a:" ; -- that Conj way_s = "a&hw" ; -- can-potent -yaa_s = "Oya:" ; -- Neg Imper -yaak_s = "Oya:k" ; -- want +yaa_s = "[y`aa]OyT1a:" ; -- Neg Imper +yaak_s = "[y`aak]Oya:k" ; -- want yay_s = "a%hy'" ; -- big yig_s = "hy'ig" ; -- woman2 yii_s = "yi:T1" ; -- two' diff --git a/lib/resource-1.0/thai/pronunciation/StringsTha.gf b/lib/resource-1.0/thai/pronunciation/StringsTha.gf index eb9c99905..82b50bbb7 100644 --- a/lib/resource-1.0/thai/pronunciation/StringsTha.gf +++ b/lib/resource-1.0/thai/pronunciation/StringsTha.gf @@ -7,7 +7,7 @@ resource StringsTha = { oper baan_s = "b^aan" ; -- house -biar_s = "b-eiiO" ; +biar_s = "b-va" ; ca_s = "c`a" ; -- Modal cet_s = "c`et" ; -- seven chan_s = "ch~an" ; -- I @@ -17,43 +17,43 @@ et_s = "O`et" ; -- one' haa_s = "h^aa" ; -- five hay_s = "h^ay" ; -- give hok_s = "k`o" ; -- six -kaaw_s = "k-eaa" ; -- nine -kew_s = "k^äw" ; -- glass (drink Classif) -khaw_s = "kh`ew" ; -- he +kaaw_s = "k-aw" ; -- nine +kew_s = "k^ääw" ; -- glass (drink Classif) +khaw_s = "kh~aw" ; -- he khon_s = "kh-on" ; -- people Classif -khoog_s = "kh~Og" ; -- Possessive +khoog_s = "kh~OOg" ; -- Possessive khun_s = "kh-un" ; -- you lag_s = "l~ag" ; -- houses Classif lap_s = "l`ap" ; -- sleep2 -lem_s = "l^em" ; -- books Classif +lem_s = "l^eem" ; -- books Classif may_s = "m-ay" ; -- not m'ay_s = "m~ay" ; -- Question mvvn_s = "m`vvn" ; -- ten thousand nag_s = "n~ag" ; -- book1 nan_s = "n~an" ; -- that -noon_s = "n-On" ; -- sleep1 +noon_s = "n-OOn" ; -- sleep1 nvg_s = "n~vg" ; -- one pay_s = "p-ay" ; -- go -peet_s = "p`ät" ; -- eight +peet_s = "p`äät" ; -- eight pen_s = "p-en" ; -- be, can-know phan_s = "ph-an" ; -- thousand puu_s = "ph^uu" ; -- woman1 rak_s = "r'ak" ; -- love -raw_s = "r-eaa" ; -- we -rooy_s = "r~Oy" ; -- hundred +raw_s = "r-aw" ; -- we +rooy_s = "r~OOy" ; -- hundred saam_s = "s~aam" ; -- three -seen_s = "s~än" ; -- hundred thousand +seen_s = "s~ään" ; -- hundred thousand si_s = "s'i" ; -- Imperative sii_s = "s`ii" ; -- four sip_s = "s`ip" ; -- ten -soog_s = "s~Og" ; -- two +soog_s = "s~OOg" ; -- two svv_s = "s~vvO" ; -- book2 thii_s = "th^ii" ; -- Ord -tog_s = "t^Og" ; -- must +tog_s = "t^OOg" ; -- must waa_s = "w^aa" ; -- that Conj way_s = "w~ay" ; -- can-potent -yaa_s = "O`aay" ; -- Neg Imper -yaak_s = "O`aayk" ; -- want +yaa_s = "y`aa" ; -- Neg Imper +yaak_s = "y`aak" ; -- want yay_s = "y~ay" ; -- big yig_s = "y~ig" ; -- woman2 yii_s = "y^ii" ; -- two' diff --git a/src/GF/Text/Thai.hs b/src/GF/Text/Thai.hs index 177e76dd2..2ac752a2b 100644 --- a/src/GF/Text/Thai.hs +++ b/src/GF/Text/Thai.hs @@ -138,6 +138,9 @@ pronSyllable s = ([0x0e42],[0x0e30],_,_,_,_) -> "o" -- o:-a. + ([],[0x0e2d],_,[0x0e22],_,_) -> "OOy" -- Oy + ([],[0x0e2d],_,_,_,_) -> "OO" -- O + ([],[],[],_,_,_) -> "o" (i,m,f,_,_,_) -> concatMap pronThaiChar (reverse $ f ++ m ++ i) ----