From fbd12b72d50bcd3b47a9f1584cb14a5ea60388f7 Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Sat, 3 Dec 2011 10:08:00 +0000
Subject: [PATCH] completed StructuralTha (almost)

---
 lib/src/thai/LexiconTha.gf    |  6 ++--
 lib/src/thai/StructuralTha.gf | 52 +++++++++++++++++------------------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/lib/src/thai/LexiconTha.gf b/lib/src/thai/LexiconTha.gf
index 204996a25..9fa56e9dc 100644
--- a/lib/src/thai/LexiconTha.gf
+++ b/lib/src/thai/LexiconTha.gf
@@ -35,7 +35,7 @@ lin
   black_A = mkA (thword "ดำ") ;
   blood_N = mkN (thword "เลือด") ;
   blow_V = mkV (thword "พัด") ;
---  blue_A = regADeg "blue" ;
+  blue_A = mkA (thword "สี" "น้ำ" "เงิน") ;
 --  boat_N = regN "boat" ;
   bone_N = mkN (thword "กระดูก") ;
   book_N = mkN (thword nag_s svv_s) lem_s ;
@@ -124,7 +124,7 @@ lin
 --  forget_V2 = dirV2 (irregDuplV "forget" "forgot" "forgotten") ;
   freeze_V = mkV (thword "แข็ง") ;
 --  fridge_N = regN "fridge" ;
---  friend_N = regN "friend" ;
+  friend_N = personN "เพี่อน" ;
 --  fromP = mkPrep "from" ;
   fruit_N = mkN (thword "หมาก") ;
   full_A = mkA (thword "เต็ม") ;
@@ -150,7 +150,7 @@ lin
   hear_V2 = mkV2 (thword "ยิน") ;
   heart_N = mkN (thword "ใจ") ;
   heavy_A = mkA (thword "หนัก") ;
---  hill_N = regN "hill" ;
+  hill_N = placeN (thword "เนิน" "เขา") ;
   hit_V2 = mkV2 (thword "ตี") ;
   hold_V2 = mkV2 (thword "อุ้ม") ;
 --  hope_VS = mkVS (regV "hope") ;
diff --git a/lib/src/thai/StructuralTha.gf b/lib/src/thai/StructuralTha.gf
index fa3674f62..939c3a165 100644
--- a/lib/src/thai/StructuralTha.gf
+++ b/lib/src/thai/StructuralTha.gf
@@ -13,69 +13,69 @@ concrete StructuralTha of Structural = CatTha **
   and_Conj = {s1 = [] ; s2 = "และ"} ;
   because_Subj = ss (thword "เพ" "ราะ") ;
   before_Prep = ss "ก่อน" ;
---  behind_Prep = ss "behind" ;
---  between_Prep = ss "between" ;
+  behind_Prep = ss "หลัง" ;
+  between_Prep = ss (thword "ระ" "หวา่ง") ;
 --  both7and_DConj = sd2 "both" "and" ** {n = Pl} ;
---  but_PConj = ss "but" ;
+  but_PConj = ss "แต่" ;
   by8agent_Prep = ss [] ;
   by8means_Prep = ss "ผ่าน" ;
   can8know_VV = {s = pen_s ; typ = VVPost} ;
   can_VV = {s = "ได้" ; typ = VVPost} ;
---  during_Prep = ss "during" ;
+  during_Prep = ss "ที" ;
 --  either7or_DConj = sd2 "either" "or" ** {n = Sg} ;
---  everybody_NP = regNP "everybody" Sg ;
+  everybody_NP = mkNP (thword "ทัว" "ห้นา") ;
   every_Det = quantDet "ทุก" ;
---  everything_NP = regNP "everything" Sg ;
---  everywhere_Adv = ss "everywhere" ;
+  everything_NP = mkNP (thword "ทุก" "สิ่ง") ;
+  everywhere_Adv = ss (thword "ทุก" "ที") ;
   few_Det = quantDet (thword "สอง" "สาม") ;
   for_Prep = ss "ให้" ;
   from_Prep = ss "จาก" ;
   have_V2 = mkV2 "มี" ;
   he_Pron = ss khaw_s ;
-  here_Adv = ss (thword "ที่นี่") ;
---  here7to_Adv = ss ["to here"] ;
---  here7from_Adv = ss ["from here"] ;
+  here_Adv = ss (thword "ที่" "นี่") ;
+  here7to_Adv = ss "ที่นี่" ; ----
+  here7from_Adv = ss (thword "จาก" "นี่") ; ----
   how_IAdv = ss (thword "อย่าง" "ไร") ;
   how8many_IDet = quantDet "กี่" ;
   how8much_IAdv = ss (thword "เท่า" "ไร") ;
---  in8front_Prep = ss ["in front of"] ;
+  in8front_Prep = ss "หน้า" ;
   i_Pron  = ss chan_s ;
   if_Subj = ss (thword "ถ้า") ;
   in_Prep = ss (thword "ใน") ;
   it_Pron  = ss "มัน" ;
---  less_CAdv = ss "less" ;
+  less_CAdv = {s = "น้อย" ; p = "กว่า"} ; ----
   many_Det = quantDet "หลาย" ;
-  more_CAdv = {s = thword "มาก" "กว่า" ; p = []} ; ----
---  most_Predet = ss "most" ;
+  more_CAdv = {s = "มาก" ; p = "กว่า"} ; ----
+  most_Predet = ss (thword "มาก" "ที่" "สุด") ;
   much_Det = quantDet "มาก" ;
   must_VV = {s = tog_s ; typ = VVPre} ;
   no_Utt = ss may_s ;
   on_Prep = ss "บน" ;
   only_Predet = ss (thword "เฑา" "นั้น") ;
   or_Conj = {s1 = [] ; s2 = "หริอ"} ;
---  otherwise_PConj = ss "otherwise" ;
---  part_Prep = ss "of" ;
+  otherwise_PConj = ss (thword "ไม่" "งัน") ;
+  part_Prep = ss "" ; ----
   please_Voc = ss "ขอ" ;
   possess_Prep = ss "ของ" ;
---  quite_Adv = ss "quite" ;
+  quite_Adv = ss (thword "คอน" "ข้าง") ;
   she_Pron = ss khaw_s ;
---  so_AdA = ss "so" ;
---  somebody_NP = regNP "somebody" Sg ;
+  so_AdA = ss (thword "เท่า" "กัน") ; ----
+  somebody_NP = mkNP (thword "บาง" "คน") ;
   somePl_Det = quantDet ("บ้าง") ;
   someSg_Det = quantDet ("บ้าง") ;
---  something_NP = regNP "something" Sg ;
---  somewhere_Adv = ss "somewhere" ;
+  something_NP = mkNP (thword "บาง" "สิ่ง") ;
+  somewhere_Adv = mkAdv (thword "บาง" "แห่ง") ;
   that_Quant = demDet nan_s ;
   there_Adv = ss (thword "ที่" "นั่น") ;
---  there7to_Adv = ss "there" ;
---  there7from_Adv = ss ["from there"] ;
---  therefore_PConj = ss "therefore" ;
+  there7to_Adv = ss (thword "ที่" "นั่น") ; ----
+  there7from_Adv = ss (thword "จาก" "นั่น") ; ----
+  therefore_PConj = ss (thword "เพราะ" "ฉะ" "นั้น") ;
   they_Pron = mkNP khaw_s ;
   this_Quant = demDet nii_s ;
---  through_Prep = ss "through" ;
+  through_Prep = ss "ผ่าน" ;
   too_AdA = ss (thword "เกิน" "ไป") ;
   to_Prep = ss "ถืง" ;
---  under_Prep = ss "under" ;
+  under_Prep = ss "ใต้" ;
   very_AdA = ss "มาก" ;
   want_VV = {s = yaak_s ; typ = VVMid} ;
   we_Pron = ss raw_s ;