PhrasebookTha corrections from Nui

7 files changed, 26 insertions, 14 deletions

diff --git a/examples/phrasebook/DisambPhrasebookEng.gf b/examples/phrasebook/DisambPhrasebookEng.gf
index e5182933f..8d606c909 100644
--- a/examples/phrasebook/DisambPhrasebookEng.gf
+++ b/examples/phrasebook/DisambPhrasebookEng.gf
@@ -19,7 +19,7 @@ concrete DisambPhrasebookEng of Phrasebook = PhrasebookEng -
     PImperativeFamPos, 
     PImperativeFamNeg, 
     PImperativePolPos, 
-    PImperativePlurNeg,
+    PImperativePolNeg,
     PImperativePlurPos,
     PImperativePlurNeg 
    ] 
diff --git a/examples/phrasebook/Makefile b/examples/phrasebook/Makefile
index b2788cda2..7c9b871d9 100644
--- a/examples/phrasebook/Makefile
+++ b/examples/phrasebook/Makefile
@@ -1,11 +1,11 @@
 compile = runghc Compile 
 
-all: fin demo missing
+all: demo missing
 
-demo: compdemo linkdemo
+demo: compdemo fin linkdemo
 
 compdemo:
-	$(compile) Bul Dan Dut Nor Pol Ron Spa
+	$(compile) Bul Dan Dut Nor Pol Spa
 	$(compile) -opt Cat Eng Fre Ger Rus Swe Tha Urd DisambPhrasebookEng
 #	$(compile) -opt Bul Cat Dan Dut Eng Fre Ger Ita Nor Pol Ron Rus Spa Swe Tha Urd DisambPhrasebookEng
 
diff --git a/examples/phrasebook/Sentences.gf b/examples/phrasebook/Sentences.gf
index b6cde22d7..5e9354bd7 100644
--- a/examples/phrasebook/Sentences.gf
+++ b/examples/phrasebook/Sentences.gf
@@ -202,7 +202,7 @@ abstract Sentences = Numeral ** {
     PImperativeFamPos,    -- eat
     PImperativeFamNeg,    -- don't eat
     PImperativePolPos,    -- essen Sie
-    PImperativePlurNeg,   -- essen Sie nicht
+    PImperativePolNeg,    -- essen Sie nicht
     PImperativePlurPos,   -- esst
     PImperativePlurNeg :  -- esst nicht
       VerbPhrase -> Phrase ;
diff --git a/examples/phrasebook/SentencesI.gf b/examples/phrasebook/SentencesI.gf
index f45fa4a22..b292657ea 100644
--- a/examples/phrasebook/SentencesI.gf
+++ b/examples/phrasebook/SentencesI.gf
@@ -238,7 +238,8 @@ oper
 -- for languages with GenNP, use "p's wife"
 --   relativePerson n x (\a,b,c -> mkNP (GenNP b) a c) p ;
 
-  phrasePlease : Utt -> Text = \u -> lin Text (mkPhr noPConj u please_Voc) | lin Text u ;
+  phrasePlease : Utt -> Text = \u -> --- lin Text (mkPhr noPConj u please_Voc) | 
+                                     lin Text u ;
 
 ------------------------------------------------------------------------------------------
 -- New things added 30/11/2011 by AR
diff --git a/examples/phrasebook/SentencesTha.gf b/examples/phrasebook/SentencesTha.gf
index acb0cac81..3964a8dba 100644
--- a/examples/phrasebook/SentencesTha.gf
+++ b/examples/phrasebook/SentencesTha.gf
@@ -1,9 +1,16 @@
-concrete SentencesTha of Sentences = NumeralTha ** SentencesI - [ACitizen] with 
+concrete SentencesTha of Sentences = NumeralTha ** SentencesI - [ACitizen, WherePlace, WherePerson] with 
   (Syntax = SyntaxTha),
   (Symbolic = SymbolicTha),
   (Lexicon = LexiconTha) ** open SyntaxTha, (P = ParadigmsTha), (R = ResTha) in {
 
+flags coding=utf8 ;
 lin
   ACitizen p n = mkCl p.name (mkVP (mkCN n (P.personN R.khon_s))) ;
 
+  WherePlace place = mkQS (mkQCl where_IAdv (mkCl place.name yuu_V)) ;
+  WherePerson person = mkQS (mkQCl where_IAdv (mkCl person.name yuu_V)) ;
+
+oper
+  yuu_V : V = R.regV "อยู่" ;
+
 }
diff --git a/examples/phrasebook/WordsEng.gf b/examples/phrasebook/WordsEng.gf
index 5f3ccd879..91a6bb871 100644
--- a/examples/phrasebook/WordsEng.gf
+++ b/examples/phrasebook/WordsEng.gf
@@ -269,6 +269,7 @@ concrete WordsEng of Words = SentencesEng **
     Rice = mkCN (mkN "rice") ;
     Pork = mkCN (mkN "pork") ;
     Beef = mkCN (mkN "beef") ;
+    Egg = mkCN L.egg_N ;
     Noodles = mkCN (mkN "noodle") ;
     Shrimps = mkCN (mkN "shrimp") ;
     Chili = mkCN (mkN "chili") ;
diff --git a/examples/phrasebook/WordsTha.gf b/examples/phrasebook/WordsTha.gf
index 011f8123b..726f12a98 100644
--- a/examples/phrasebook/WordsTha.gf
+++ b/examples/phrasebook/WordsTha.gf
@@ -77,7 +77,7 @@ concrete WordsTha of Words = SentencesTha **
 
 -- Currencies; $crown$ is ambiguous between Danish and Swedish crowns.
 
-    DanishCrown = mkCN (mkA (R.thword "เดน" "มาร์ค")) (mkN "โครน") | mkCurrency "โครน" ;
+    DanishCrown = mkCN (mkA (R.thword "เดน" "มาร์ค")) (mkN "โครน") | mkCurrency "โครน" ; ---#
     Dollar = mkCurrency (R.thword "ดอล" "ล่า" "ห์") ;
     Euro = mkCurrency (R.thword "ยู" "โร") ;
     Lei = mkCurrency "ลี" ;
@@ -175,8 +175,10 @@ concrete WordsTha of Words = SentencesTha **
 -- below. Languages without productive genitives must use an equivalent of
 -- "ตหเ วิฝเ oฝ มย สoน" for non-pronouns.
 
-    Wife = xOf "เมีย" ; ---- familiar
-    Husband = xOf "ผัว" ; ---- familiar
+    Wife = xOf (R.thword "ภร" "รยา") ; -- polite
+    Husband = xOf (R.thword "สา" "มี") ; -- polite
+---    Wife = xOf "เมีย" ; ---- familiar
+---    Husband = xOf "ผัว" ; ---- familiar
     Son = xOf (R.thword "ลูก ชาย") ;
     Daughter = xOf  (R.thword "ลูก สาว") ;
     Children = xOf L.child_N.s ; ----
@@ -269,15 +271,16 @@ concrete WordsTha of Words = SentencesTha **
     Thai = mkNat "ไทย" ;
     Baht = mkCurrency "บาท" ;
 
-    Rice = mkCN (mkN ("ฆ้าว")) ;
+    Rice = mkCN (mkN ("ข้าว")) ;
     Pork = mkCN (mkN ("หมู")) ;
     Beef = mkCN (mkN ("เนื้อ")) ;
-    Noodles = mkCN (mkN ("เส้ม")) ;
+    Egg = mkCN L.egg_N ;
+    Noodles = mkCN (mkN (R.thword "ก๋วย" "เตี๋ยว")) ;
     Shrimps = mkCN (mkN ("กุ้ง")) ;
     Chili = mkCN (mkN "พริก") ;
-    Garlic = mkCN (mkN (R.thword "กระ" "เทียม")) ;
+    Garlic = mkCN (mkN (R.thword "กะ" "เทียม")) ;
     Durian = mkCN (mkN (R.thword "ทุ" "เรียน")) ;
-    Mango = mkCN (mkN (R.thword "ฆะ" "ม่วง")) ;
+    Mango = mkCN (mkN (R.thword "มะ" "ม่วง")) ;
     Pineapple = mkCN (mkN (R.thword "สับ" "ปะ" "รด")) ;
     Coke = mkCN (mkN ("โค้ก")) ;
     IceCream = mkCN (mkN (R.thword "ไอ" "ศ" "กรีม")) ;