diff --git a/devel/phrases/Travel.gf b/devel/phrases/Travel.gf index f7fa73bb5..144499815 100644 --- a/devel/phrases/Travel.gf +++ b/devel/phrases/Travel.gf @@ -45,6 +45,7 @@ cat fun HowMuchCost : Product -> Order ; + IWantToHave : Product -> Order ; This : Kind -> Product ; diff --git a/devel/phrases/TravelEng.gf b/devel/phrases/TravelEng.gf index e04e7fce4..e238603d4 100644 --- a/devel/phrases/TravelEng.gf +++ b/devel/phrases/TravelEng.gf @@ -66,21 +66,20 @@ printname cat Kind = "what kind of product do you mean?" ; lin - HowMuchCost p = {s = ["how much does"] ++ - variants { - p.s ; - -- no kind given - "this" ; - -- no product given at all - "it" - } ++ - "cost"} ; + HowMuchCost p = {s = ["how much does"] ++ item p ++ "cost"} ; + IWantToHave p = {s = ["I would like to have"] ++ item p} ; - This k = {s = "this" ++ k.s} ; + This k = {s = "this" ++ variants {k.s ; []}} ; Beer = {s = "beer"} ; Shirt = {s = "shirt"} ; - +oper + item : SS -> Str = \p -> + variants { + p.s ; + -- no product given at all + "it" + } ; } diff --git a/devel/phrases/TravelTha.gf b/devel/phrases/TravelTha.gf index d697b0db5..c637f0d1c 100644 --- a/devel/phrases/TravelTha.gf +++ b/devel/phrases/TravelTha.gf @@ -70,6 +70,7 @@ printname cat lin HowMuchCost p = ss (p.s ++ thao_s ++ rai_s) ; + IWantToHave p = ss (khoo_s ++ p.s ++ noi_s) ; This k = ss (k.s ++ nii_s) ; diff --git a/devel/phrases/TravelThaiP.gf b/devel/phrases/TravelThaiP.gf index 5462563ec..b0d6f9e2d 100644 --- a/devel/phrases/TravelThaiP.gf +++ b/devel/phrases/TravelThaiP.gf @@ -70,6 +70,7 @@ printname cat lin HowMuchCost p = ss (p.s ++ "tao" ++ "rai") ; + IWantToHave p = ss ("kor" ++ p.s ++ "noy") ; This k = ss (k.s ++ "nee") ; diff --git a/lib/resource-1.0/thai/StringsTha.gf b/lib/resource-1.0/thai/StringsTha.gf index 77ed218be..972b2d134 100644 --- a/lib/resource-1.0/thai/StringsTha.gf +++ b/lib/resource-1.0/thai/StringsTha.gf @@ -47,7 +47,9 @@ nai_s = "ไหน" ; -- where2 nam_s = "นำ" ; -- water nan_s = "นั้น" ; -- that nii_s = "นี้" ; -- this +nit_s = "นิด" ; -- little1 noon_s = "นอน" ; -- sleep1 +noi_s = "หน่อย" ; -- little2 nvg_s = "หนึง" ; -- one pay_s = "ไป" ; -- go peet_s = "แปด" ; -- eight @@ -69,7 +71,7 @@ sip_s = "สิบ" ; -- ten soog_s = "สอง" ; -- two svv_s = "สือ" ; -- book2 thii_s = "ที่" ; -- Ord -thoot_s = "โทษ" ; -- sorry2 +thoot_s = "โท" ; -- sorry2 thao_s = "เท่า" ; -- how-much1 tog_s = "ต้อง" ; -- must waa_s = "ว่า" ; -- that Conj diff --git a/lib/resource-1.0/thai/StringsThai.gf b/lib/resource-1.0/thai/StringsThai.gf index f654035a4..08989928b 100644 --- a/lib/resource-1.0/thai/StringsThai.gf +++ b/lib/resource-1.0/thai/StringsThai.gf @@ -47,7 +47,9 @@ nai_s = "a&hn" ; -- where2 nam_s = "na+" ; -- water nan_s = "naT2n" ; -- that nii_s = "ni:T2" ; -- this +nit_s = "nid" ; -- little1 noon_s = "nOn" ; -- sleep1 +noi_s = "hnT1Oy" ; -- little2 nvg_s = "hnvg" ; -- one pay_s = "a&p" ; -- go peet_s = "e'pd" ; -- eight diff --git a/lib/resource-1.0/thai/pronunciation/StringsTha.gf b/lib/resource-1.0/thai/pronunciation/StringsTha.gf index fe44b6850..599ecd653 100644 --- a/lib/resource-1.0/thai/pronunciation/StringsTha.gf +++ b/lib/resource-1.0/thai/pronunciation/StringsTha.gf @@ -13,6 +13,7 @@ ca_s = "c`a" ; -- Modal cet_s = "c`et" ; -- seven chan_s = "ch~an" ; -- I chay_s = "ch^ay" ; -- yes +cheut_s = "ch~eevvt" ; -- shirt2 chuay_s = "ch^uay" ; -- help1 di_s = "d`i" ; -- I (fem)1 dii_s = "d-ii" ; -- hello2 @@ -25,7 +26,7 @@ hoog_s = "h^OOg" ; -- room hok_s = "k`o" ; -- six jai_s = "-ay" ; -- understand2 kaaw_s = "k-aw" ; -- nine -kew_s = "k^ääw" ; -- glass (drink Classif) +kew_s = "k^ääw" ; -- glass (drink Classif) khaw_s = "kh~aw" ; -- he khon_s = "kh-on" ; -- people Classif khoo_s = "kh~OO" ; -- please @@ -45,27 +46,33 @@ nag_s = "n~ag" ; -- book1 nai_s = "n~ay" ; -- where2 nam_s = "n-am" ; -- water nan_s = "n~an" ; -- that +nii_s = "n~ii" ; -- this +nit_s = "n'it" ; -- little1 noon_s = "n-OOn" ; -- sleep1 +noi_s = "n`OOy" ; -- little2 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 phom_s = "ph~om" ; -- I (masc) puu_s = "ph^uu" ; -- woman1 +rai_s = "r-ay" ; -- how-much2 rak_s = "r'ak" ; -- love raw_s = "r-aw" ; -- we rooy_s = "r~OOy" ; -- hundred saam_s = "s~aam" ; -- three sawat_s = "s`awt" ; -- hello1 -seen_s = "s~ään" ; -- hundred thousand +seen_s = "s~ään" ; -- hundred thousand +seua_s = "s^eevvO" ; -- shirt1 si_s = "s'i" ; -- Imperative sii_s = "s`ii" ; -- four sip_s = "s`ip" ; -- ten soog_s = "s~OOg" ; -- two svv_s = "s~vvO" ; -- book2 thii_s = "th^ii" ; -- Ord -thoot_s = "th^oot" ; -- sorry2 +thoot_s = "th-oo" ; -- sorry2 +thao_s = "th^aw" ; -- how-much1 tog_s = "t^OOg" ; -- must waa_s = "w^aa" ; -- that Conj way_s = "w~ay" ; -- can-potent