6 files changed, 75 insertions, 2 deletions

diff --git a/examples/phrasebook/SentencesTha.gf b/examples/phrasebook/SentencesTha.gf
index 3964a8dba..399401daf 100644
--- a/examples/phrasebook/SentencesTha.gf
+++ b/examples/phrasebook/SentencesTha.gf
@@ -1,10 +1,15 @@
-concrete SentencesTha of Sentences = NumeralTha ** SentencesI - [ACitizen, WherePlace, WherePerson] with 
+concrete SentencesTha of Sentences = NumeralTha ** SentencesI - [
+    GObjectPlease,
+    ACitizen, WherePlace, WherePerson
+  ] with 
   (Syntax = SyntaxTha),
   (Symbolic = SymbolicTha),
   (Lexicon = LexiconTha) ** open SyntaxTha, (P = ParadigmsTha), (R = ResTha) in {
 
 flags coding=utf8 ;
 lin
+  GObjectPlease o = lin Text (mkPhr (lin PConj (ss "ขอ")) (mkUtt o) (lin Voc (ss "หน่อย"))) | lin Text (mkUtt o) ;
+
   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)) ;
diff --git a/examples/phrasebook/Words.gf b/examples/phrasebook/Words.gf
index a8356151e..7dccbc7c1 100644
--- a/examples/phrasebook/Words.gf
+++ b/examples/phrasebook/Words.gf
@@ -234,4 +234,13 @@ abstract Words = Sentences ** {
 
     Smoke : VerbPhrase ;
 
+    ADoctor : Person -> Action ;
+    AProfessor : Person -> Action ;
+    ALawyer : Person -> Action ;
+    AEngineer : Person -> Action ;
+    ATeacher : Person -> Action ;
+    ACook : Person -> Action ;
+    AStudent : Person -> Action ;
+    ABusinessman : Person -> Action ;
+
 }
diff --git a/examples/phrasebook/WordsEng.gf b/examples/phrasebook/WordsEng.gf
index 387ff1863..6c637284c 100644
--- a/examples/phrasebook/WordsEng.gf
+++ b/examples/phrasebook/WordsEng.gf
@@ -293,4 +293,15 @@ concrete WordsEng of Words = SentencesEng **
 
     Smoke = mkVP (P.mkV "smoke") ;
 
+    ADoctor = mkProfession (mkN "doctor") ;
+    AProfessor = mkProfession (mkN "professor") ;
+    ALawyer = mkProfession (mkN "lawyer") ;
+    AEngineer =  mkProfession (mkN "engineer") ;
+    ATeacher = mkProfession (mkN "teacher") ;
+    ACook = mkProfession (mkN "cook") ;
+    AStudent = mkProfession (mkN "student") ;
+    ABusinessman = mkProfession (mkN "businessman" "businessmen") ;
+
+  oper
+    mkProfession : N -> NPPerson -> Cl = \n,p -> mkCl p.name n ;
 }
diff --git a/examples/phrasebook/WordsFin.gf b/examples/phrasebook/WordsFin.gf
index 98a2e334d..16b6f9b71 100644
--- a/examples/phrasebook/WordsFin.gf
+++ b/examples/phrasebook/WordsFin.gf
@@ -210,7 +210,7 @@ concrete WordsFin of Words = SentencesFin **
       mkQS (mkQCl (mkIP which_IDet trans.name) (mkVP (mkVP L.go_V) place.to)) ;
 
     IsTranspPlace trans place =
-      mkQS (mkQCl (mkCl (mkVP (mkVP (mkVP (mkV "p��st�")) trans.by) place.to))) ;
+      mkQS (mkQCl (mkCl (mkVP (mkVP (mkVP (mkV "p��st�")) place.to) trans.by))) ;
       -- p��seek� keskustaan bussilla
       -- mkQS (mkQCl (E.AdvPredNP place.to L.go_V (E.PartCN (trans.name)))) ; 
       -- meneek� keskustaan bussia
@@ -312,4 +312,17 @@ concrete WordsFin of Words = SentencesFin **
     SunShine = mkCl (mkNP the_Det L.sun_N) (mkVP (mkV "paistaa")) ;
 
     Smoke = mkVP (mkV "tupakoida") ;
+
+    ADoctor = mkProfession (mkN "l��k�ri" "l��k�reit�") ;
+    AProfessor = mkProfession (mkN "professori" "professoreita") ;
+    ALawyer = mkProfession (mkN "laki" L.man_N) ;
+    AEngineer =  mkProfession (mkN "insin��ri" "insin��rej�") ;
+    ATeacher = mkProfession (mkN "opettaja" "opettajia") ;
+    ACook = mkProfession (mkN "kokki") ;
+    AStudent = mkProfession (mkN "opiskelija" "opiskelijoita") ;
+    ABusinessman = mkProfession (mkN "liike" L.man_N) ;
+
+  oper
+    mkProfession : N -> NPPerson -> Cl = \n,p -> mkCl p.name n ;
+
 }
diff --git a/examples/phrasebook/WordsSwe.gf b/examples/phrasebook/WordsSwe.gf
index 1e48579df..024541c81 100644
--- a/examples/phrasebook/WordsSwe.gf
+++ b/examples/phrasebook/WordsSwe.gf
@@ -257,6 +257,7 @@ concrete WordsSwe of Words = SentencesSwe **
     Rice = mkCN (mkN "ris" "ris") ;
     Pork = mkCN (mkN "fl�sk" "fl�sk") ;
     Beef = mkCN (mkN "n�tk�tt" "n�tk�tt") ;
+    Egg = mkCN L.egg_N ;
     Noodles = mkCN (mkN "nudel" "nudlar") ;
     Shrimps = mkCN (mkN "r�ka") ;
     Chili = mkCN (mkN "chili" "chilier") ;
@@ -266,6 +267,29 @@ concrete WordsSwe of Words = SentencesSwe **
     Pineapple = mkCN (mkN "ananas" "ananaser") ;
     Coke = mkCN (mkN "kola") ;
     IceCream = mkCN (mkN "glass") ;
+    Salad = mkCN (mkN "sallad" "sallader") ;
+    OrangeJuice = mkCN (mkN "apelsinjuice" "apelsinjuicer") ;
+    Lemonade = mkCN (mkN "l�sk") ;
     Beach = mkPlace (mkN "badstrand" "badstr�nder") "p�" ;
 
+    ItsRaining = mkCl (mkVP L.rain_V0) ;
+    ItsCold = mkCl (mkVP L.cold_A) ;
+    ItsWarm = mkCl (mkVP L.warm_A) ;
+    ItsWindy = mkCl (mkVP (mkV "bl�ser")) ;
+    SunShine = mkCl (mkNP the_Det L.sun_N) (skina_V) ;
+
+    Smoke = mkVP (mkV "r�ker") ;
+
+    ADoctor = mkProfession (mkN "l�kare" "l�kare") ;
+    AProfessor = mkProfession (mkN "professor" "professorer") ;
+    ALawyer = mkProfession (mkN "jurist" "jurister") ;
+    AEngineer =  mkProfession (mkN "ingenj�r" "ingenj�rer") ;
+    ATeacher = mkProfession (mkN "l�rare" "l�rare") ;
+    ACook = mkProfession (mkN "kock") ;
+    AStudent = mkProfession (mkN "student" "srudenter") ;
+    ABusinessman = mkProfession (mkN "aff�rsman" "aff�rsmannen" "aff�rsm�n" "aff�rsm�nnen") ;
+
+  oper
+    mkProfession : N -> NPPerson -> Cl = \n,p -> mkCl p.name (mkVP (CompBareCN (mkCN n))) ;
+
 }
diff --git a/examples/phrasebook/WordsTha.gf b/examples/phrasebook/WordsTha.gf
index 0762706b3..293766c60 100644
--- a/examples/phrasebook/WordsTha.gf
+++ b/examples/phrasebook/WordsTha.gf
@@ -303,5 +303,16 @@ concrete WordsTha of Words = SentencesTha **
 
     Smoke = mkVP (P.mkV (R.thword "สูบ" "บุ" "รี")) ;
 
+    ADoctor = mkProfession (P.personN "หมอ") ;
+    AProfessor = mkProfession (P.personN (R.thword "อา" "จารย์")) ;
+    ALawyer = mkProfession (P.personN (R.thword "มัก" "กฎ" "หมาย")) ;
+    AEngineer =  mkProfession (P.personN (R.thword "วิ" "ศวกร")) ;
+    ATeacher = mkProfession (P.personN "ครู") ;
+    ACook = mkProfession (P.personN (R.thword "ภัก" "ษกาน")) ;
+    AStudent = mkProfession (P.personN (R.thword "นัก" "ศึก" "ษา")) ;
+    ABusinessman = mkProfession (P.personN (R.thword "ฝู้" "ประ" "กอบ" "การ")) ;
+
+  oper
+    mkProfession : N -> NPPerson -> Cl = \n,p -> mkCl p.name n ;
 }