adjustments in Phrasebook and synopsis

3 files changed, 13 insertions, 9 deletions

diff --git a/examples/phrasebook/SentencesTha.gf b/examples/phrasebook/SentencesTha.gf
index 2e2aebe09..ea5d7fbe9 100644
--- a/examples/phrasebook/SentencesTha.gf
+++ b/examples/phrasebook/SentencesTha.gf
@@ -1,6 +1,7 @@
 concrete SentencesTha of Sentences = NumeralTha ** SentencesI - [
     PGreetingMale, PGreetingFemale,
     GObjectPlease,
+    IMale, YouFamMale, YouFamFemale,
     ACitizen
   ] with 
   (Syntax = SyntaxTha),
@@ -17,6 +18,9 @@ lin
 
   ACitizen p n = mkCl p.name (mkVP (mkCN n (P.personN R.khon_s))) ;
 
+  IMale = mkPerson (R.mkNP "ผม") ;
+  YouFamMale, YouFamFemale = mkPerson (R.mkNP "เธอ") ;
+
 oper
   thpron = R.thpron ;
 }
diff --git a/examples/phrasebook/WordsTha.gf b/examples/phrasebook/WordsTha.gf
index b6f3215b1..89659eb15 100644
--- a/examples/phrasebook/WordsTha.gf
+++ b/examples/phrasebook/WordsTha.gf
@@ -155,12 +155,12 @@ concrete WordsTha of Words = SentencesTha **
     HowMuchCost item = mkQS (mkQCl (mkIComp how8much_IAdv) item) ;
     ItCost item price = mkCl item (mkV2 (R.thword "เป็น" "รา" "คา")) price ;
 
-    PropOpen p = mkCl p.name open_Adv ;
-    PropClosed p = mkCl p.name closed_Adv ;
-    PropOpenDate p d = mkCl p.name (mkVP (mkVP open_Adv) d) ; 
-    PropClosedDate p d = mkCl p.name (mkVP (mkVP closed_Adv) d) ; 
-    PropOpenDay p d = mkCl p.name (mkVP (mkVP open_Adv) d.habitual) ; 
-    PropClosedDay p d = mkCl p.name (mkVP (mkVP closed_Adv) d.habitual) ; 
+    PropOpen p = mkCl p.name open_A ;
+    PropClosed p = mkCl p.name closed_A ;
+    PropOpenDate p d = mkCl p.name (mkVP (mkVP open_A) d) ; 
+    PropClosedDate p d = mkCl p.name (mkVP (mkVP closed_A) d) ; 
+    PropOpenDay p d = mkCl p.name (mkVP (mkVP open_A) d.habitual) ; 
+    PropClosedDay p d = mkCl p.name (mkVP (mkVP closed_A) d.habitual) ; 
 
 -- Building phrases from strings is complicated: the solution is to use
 -- mkText : Text -> Text -> Text ;
@@ -244,8 +244,8 @@ concrete WordsTha of Words = SentencesTha **
     mkPlace : N -> {name : CN ; at : Prep ; to : Prep; isPl : Bool} = \p -> 
       mkCNPlace (mkCN p) at_Prep noPrep ;
 
-    open_Adv = P.mkAdv "เปิด" ;
-    closed_Adv = P.mkAdv "ปิด" ;
+    open_A = P.mkA "เปิด" ;
+    closed_A = P.mkA "ปิด" ;
 
     xOf : Str -> NPPerson -> NPPerson = \f,p -> 
       {name = mkNP the_Det (mkCN (personN f) (SyntaxTha.mkAdv possess_Prep p.name)) ; 
diff --git a/examples/phrasebook/missing.txt b/examples/phrasebook/missing.txt
index d16355ca4..93d0b9d03 100644
--- a/examples/phrasebook/missing.txt
+++ b/examples/phrasebook/missing.txt
@@ -1,5 +1,5 @@
 DisambPhrasebookEng :
-PhrasebookBul : ABusinessman ACook ADoctor AEngineer ALawyer AProfessor AStudent ATeacher Baht Beach Beef Chili Coke Durian Egg Garlic IceCream ItsCold ItsRaining ItsWarm ItsWindy Lemonade Mango Noodles ObjPlur OrangeJuice Pineapple Pork Rice Salad Shrimps Smoke SunShine Thai ThesPlur ThesePlur ThosePlur
+PhrasebookBul : Noodles
 PhrasebookCat : ABusinessman ACook ADoctor AEngineer ALawyer AProfessor AStudent ATeacher Baht Beach Beef Chili Coke Durian Egg Garlic IceCream ItsCold ItsRaining ItsWarm ItsWindy Lemonade MMust Mango Noodles ObjPlur OrangeJuice Pineapple Pork Rice Salad Shrimps Smoke SunShine Thai ThesPlur ThesePlur ThosePlur
 PhrasebookDan : ABusinessman ACook ADoctor AEngineer ALawyer AProfessor AStudent ATeacher Baht Beach Beef Chili Coke Durian Egg Garlic IceCream ItsCold ItsRaining ItsWarm ItsWindy Lemonade Mango Noodles ObjPlur OrangeJuice Pineapple Pork Rice Salad Shrimps Smoke SunShine Thai ThesPlur ThesePlur ThosePlur
 PhrasebookDut : ABusinessman ACook ADoctor AEngineer ALawyer AProfessor AStudent ATeacher Baht Beach Beef Chili Coke Durian Egg Garlic IceCream ItsCold ItsRaining ItsWarm ItsWindy Lemonade Mango Noodles ObjPlur OrangeJuice Pineapple Pork Rice Salad Shrimps Smoke SunShine Thai ThesPlur ThesePlur ThosePlur