some Thai corrections from Nui

examples/phrasebook/GreetingsTha.gf

@@ -7,28 +7,28 @@ concrete GreetingsTha of Greetings =
 flags coding = utf8 ;
 
 lin 
-  GBye = mkGreeting (thbind "เจอ" "กัน" "นะ") ;
-  GCheers = mkGreeting (thbind "ไช" "โย") ;
-  GDamn = mkGreeting (thbind "a'ช่ง") ; ---- google
-  GExcuse, GExcusePol = mkGreeting (thbind "ขอ" "โทษ") ;
-  GGoodDay = mkGreeting (thbind "สวัส" "ดี") ;
-  GGoodEvening = mkGreeting (thbind "สวัส" "ดี") ;
-  GGoodMorning = mkGreeting (thbind "สวัส" "ดี") ;
-  GGoodNight = mkGreeting (thbind "รา" "ตรี" "สวัส" "ดิ์") ;
-  GGoodbye = mkGreeting (thbind "ลา" "ก่อน") ;
-  GHello = mkGreeting (thbind "หวัส" "ดี") ;
-  GHelp = mkGreeting (thbind "ช่วย" "ด้วย") ;
-  GHowAreYou = mkGreeting (thbind "สบาย" "ดี" "ไหม") ;
-  GLookOut = mkGreeting (thbind "ระ" "วัง") ; ---- google
+  GBye = mkGreeting (thword "ลา" "ก่อน") ;
+  GCheers = mkGreeting (thword "ไช" "โย") ;
+  GDamn = mkGreeting (thword "ชิบ" "หาย") ;
+  GExcuse, GExcusePol = mkGreeting (thword "ขอ" "โทษ") ;
+  GGoodDay = mkGreeting (thword "สวัส" "ดี") ;
+  GGoodEvening = mkGreeting (thword "สวัส" "ดี") ;
+  GGoodMorning = mkGreeting (thword "สวัส" "ดี") ;
+  GGoodNight = mkGreeting (thword "รา" "ตรี" "สวัส" "ดิ์") ;
+  GGoodbye = mkGreeting (thword "ลา" "ก่อน") ;
+  GHello = mkGreeting (thword "หวัส" "ดี") ;
+  GHelp = mkGreeting (thword "ช่วย" "ด้วย") ;
+  GHowAreYou = mkGreeting (thword "สบาย" "ดี" "ไหม") ;
+  GLookOut = mkGreeting (thword "ระ" "วัง") ; ---- google
   GNiceToMeetYou, GNiceToMeetYouPol = 
     mkGreeting (thbind "ยิน" "ดี" "ฑี่" "ได้" "รู้" "จัก") ;
-  GPleaseGive, GPleaseGivePol = mkGreeting (thbind "ช่วย") ; ----
-  GSeeYouSoon = mkGreeting (thbind "เจอ" "กัน" "นะ") ;
-  GSorry, GSorryPol = mkGreeting (thbind "ขอ" "โทษ") ;
-  GThanks = mkGreeting (thbind "ขอบ" "คุณ") ;
-  GTheCheck = mkGreeting (thbind "เช็ค" "บิล") ;
-  GCongratulations = mkGreeting (thbind "ยิน" "ดี" "ด้วย") ;
-  GHappyBirthday = mkGreeting (thbind "สุค" "สันต์" "วัน" "เกิด") ;
-  GGoodLuck = mkGreeting (thbind "โจค" "ดี" "นะ") ; 
+  GPleaseGive, GPleaseGivePol = mkGreeting (thword "ช่วย") ; ----
+  GSeeYouSoon = mkGreeting (thword "เจอ" "กัน" "นะ") ;
+  GSorry, GSorryPol = mkGreeting (thword "ขอ" "โทษ") ;
+  GThanks = mkGreeting (thword "ขอบ" "คุณ") ;
+  GTheCheck = mkGreeting (thword "เช็ค" "บิล") ;
+  GCongratulations = mkGreeting (thword "ยิน" "ดี" "ด้วย") ;
+  GHappyBirthday = mkGreeting (thword "สุค" "สันต์" "วัน" "เกิด") ;
+  GGoodLuck = mkGreeting (thword "โจค" "ดี" "นะ") ; 
 }
 

examples/phrasebook/WordsTha.gf

@@ -72,7 +72,7 @@ concrete WordsTha of Words = SentencesTha **
     University = mkPlace L.university_N at_Prep ;
 --    Zoo = mkPlace "zoo" "ัต" ;
    
---    CitRestaurant cit = mkCNPlace (mkCN cit (mkN "รเสตัุรันต")) in_Prep to_Prep ;
+    CitRestaurant cit = mkCNPlace (mkCN cit L.restaurant_N) at_Prep noPrep ;
 
 
 -- Currencies; $crown$ is ambiguous between Danish and Swedish crowns.
@@ -96,7 +96,7 @@ concrete WordsTha of Words = SentencesTha **
 --    Catalan = mkNPNationality (mkNP (mkPN "Cัตัลัน")) (mkNP (mkPN "Cัตัลoนิั")) (mkA "Cัตัลoนิัน") ;
 --    Danish = mkNat "Dันิสห" "Dเนมัรก" ;
 --    Dutch =  mkNPNationality (mkNP (mkPN "Dุตจห")) (mkNP the_Quant (mkN "Nเตหเรลันดส")) (mkA "Dุตจห") ;
---    English = mkNat "Eนงลิสห" "Eนงลันด" ;
+--    English = mkNat "Eนงลิสห" "Eนงลันด" ; -- citizen, language, adjective, country
 --    Finnish = mkNat "Fินนิสห" "Fินลันด" ;
 --    Flemish = mkNP (mkPN "Fลเมิสห") ;
 --    French = mkNat "Fรเนจห" "Fรันจเ" ; 
@@ -145,12 +145,12 @@ concrete WordsTha of Words = SentencesTha **
 --    AThirsty p = mkCl p.name (mkA "ตหิรสตย") ;
 --    ATired p = mkCl p.name (mkA "ติรเด") ;
     AUnderstand p = mkCl p.name (mkV (R.thword "เข้า" "ไจ")) ;
-    AWant p obj = mkCl p.name (mkV2 (mkV "วันต")) obj ;
+--    AWant p obj = mkCl p.name (mkV2 (mkV "วันต")) obj ;
     AWantGo p place = mkCl p.name want_VV (mkVP (mkVP L.go_V) place.to) ;
 
 -- miscellaneous
 
-    QWhatName p = mkQS (mkQCl whatSg_IP (mkVP (nameOf p))) ;
+--    QWhatName p = mkQS (mkQCl whatSg_IP (mkVP (nameOf p))) ;
 --    QWhatAge p = mkQS (mkQCl (ICompAP (mkAP L.old_A)) p.name) ;
 --    HowMuchCost item = mkQS (mkQCl how8much_IAdv (mkCl item IrregTha.cost_V)) ; 
 --    ItCost item price = mkCl item (mkV2 IrregTha.cost_V) price ;
@@ -176,14 +176,14 @@ concrete WordsTha of Words = SentencesTha **
 -- "ตหเ วิฝเ oฝ มย สoน" for non-pronouns.
 
     Wife = xOf "เมีย" ; ---- familiar
-    Husband = xOf "ผัว" ; ---- familiar
-    Son = xOf (R.thbind "ลูก จาย") ;
+--    Husband = xOf "ผัว" ; ---- familiar
+    Son = xOf (R.thbind "ลูก ชาย") ;
     Daughter = xOf  (R.thbind "ลูก สาว") ;
     Children = xOf L.child_N.s ; ----
 
 -- week days
 
---    Monday = mkDay "Moนดัย" ;
+    Monday = mkDay (R.thword "วัน" "จัน" "ทร์") ;
 --    Tuesday = mkDay "Tุเสดัย" ;
 --    Wednesday = mkDay "Wเดนเสดัย" ;
 --    Thursday = mkDay "Tหุรสดัย" ;
@@ -229,13 +229,13 @@ concrete WordsTha of Words = SentencesTha **
 --    mkNat : Str -> Str -> NPNationality = \nat,co -> 
 --      mkNPNationality (mkNP (mkPN nat)) (mkNP (mkPN co)) (mkA nat) ;
 
---    mkDay : Str -> {name : NP ; point : Adv ; habitual : Adv} = \d ->
---      let day = mkNP (mkPN d) in 
---      mkNPDay day (SyntaxTha.mkAdv on_Prep day) 
---        (SyntaxTha.mkAdv on_Prep (mkNP a_Quant plNum (mkCN (mkN d)))) ;
+    mkDay : Str -> {name : NP ; point : Adv ; habitual : Adv} = \d ->
+      let day = lin NP (ss d) in 
+      mkNPDay day (SyntaxTha.mkAdv noPrep day) 
+        (SyntaxTha.mkAdv noPrep (mkNP a_Quant plNum (mkCN (mkN d)))) ;
     
     mkPlace : N -> Prep -> {name : CN ; at : Prep ; to : Prep; isPl : Bool} = \p,i -> 
-      mkCNPlace (mkCN p) i to_Prep ;
+      mkCNPlace (mkCN p) i noPrep ;
 
     open_Adv = P.mkAdv "เปิด" ;
     closed_Adv = P.mkAdv "ปิด" ;
@@ -249,7 +249,7 @@ concrete WordsTha of Words = SentencesTha **
 
     mkTransport : N -> {name : CN ; by : Adv} = \n -> {
       name = mkCN n ; 
-      by = SyntaxTha.mkAdv by8means_Prep (mkNP n)
+      by = SyntaxTha.mkAdv (mkPrep "โดย") (mkNP n)
       } ;
 
     mkSuperl : A -> Det = \a -> SyntaxTha.mkDet the_Art (SyntaxTha.mkOrd a) ;
@@ -257,4 +257,6 @@ concrete WordsTha of Words = SentencesTha **
 --   far_IAdv = ExtraTha.IAdvAdv (ss "ฝัร") ;
 
   at_Prep = mkPrep "ที่" ;
+  noPrep = mkPrep [] ;
 }
+  

lib/src/thai/LexiconTha.gf

@@ -60,7 +60,7 @@ lin
 --  ceiling_N = regN "ceiling" ;
 --  chair_N = regN "chair" ;
   cheese_N = mkN (thword "เนย" "แข็ง") "ก้อน" ; 
-  child_N = mkN (thword "เด็ก") ;
+  child_N = personN (thword "เด็ก") ;
 --  church_N = regN "church" ;
   city_N = mkN "นคร" "แห่ง" ;
 --  clean_A = regADeg "clean" ;
@@ -194,7 +194,7 @@ lin
 --  love_N = regN "love" ;
   love_V2 = mkV2 rak_s ;
   man_N = personN (thword "ชาย") ;
-  married_A2 = mkA2 (mkA (thword "แต่ง" "งัน" "แล้ว")) "กับ" ;
+  married_A2 = mkA2 (mkA (thword "แต่ง" "งาน" "แล้ว")) "กับ" ;
   meat_N = mkN (thword "เนื้อ") ;
   milk_N = mkN (thword "นาม" "นม") kew_s ;
   moon_N = mkN (thword "เดือน") ;
@@ -243,7 +243,7 @@ lin
 --  read_V2 = dirV2 (irregV "read" "read" "read") ;
   red_A = mkA (thword "แดง") ;
 --  religion_N = regN "religion" ;
-  restaurant_N = placeN "เหลา" ;
+  restaurant_N = placeN (thword "ร้าน" "อาหาร") ;
 --  right_Ord = ss "right" ;
   river_N = mkN (thword "แม่" "น้ำ") ;
   road_N = mkN (thword "ทาง") ;