generalized and extended Phrasebook in many ways

1 files changed, 32 insertions, 13 deletions

diff --git a/examples/phrasebook/Sentences.gf b/examples/phrasebook/Sentences.gf
index 73fb8a109..694028183 100644
--- a/examples/phrasebook/Sentences.gf
+++ b/examples/phrasebook/Sentences.gf
@@ -2,11 +2,14 @@ abstract Sentences = Numeral ** {
 
   cat
     Phrase ;
-    Sentence ; Question ; 
+    Sentence ; Question ; Proposition ; 
     Object ; Item ; Kind ; Quality ; Property ;  
-    Place ; PlaceKind ; Currency ; Price ; Language ;
-    Person ; Action ;
-
+    Place ; PlaceKind ; Currency ; Price ; 
+    Person ; Action ; 
+    Nationality ; Language ; Citizenship ; Country ;
+    Day ;   -- weekday type
+    Date ;  -- definite date
+    Name ;  
   fun
     -- these phrases are formed here, not in Phrasebook, as they are functorial
     PSentence : Sentence -> Phrase ;
@@ -21,19 +24,22 @@ abstract Sentences = Numeral ** {
     PCurrency : Currency -> Phrase ;
     PPrice    : Price    -> Phrase ;
     PLanguage : Language -> Phrase ;
+    PCitizenship : Citizenship -> Phrase ;
+    PCountry  : Country -> Phrase ;
+    PDay      : Day -> Phrase ;
+
+    Is       : Item -> Quality -> Proposition ;
 
-    Is    : Item -> Quality -> Sentence ;
-    IsNot : Item -> Quality -> Sentence ;
+    SProp    : Proposition -> Sentence ;
+    SPropNot : Proposition -> Sentence ;
+    QProp    : Proposition -> Question ;
 
-    WhetherIs : Item -> Quality -> Question ;
-    WhereIs   : Place -> Question ;
+    WhereIs : Place -> Question ;
 
-    SAction : Action -> Sentence ;
-    SNotAction : Action -> Sentence ;
-    QAction : Action -> Question ;
+    PropAction : Action -> Proposition ;
 
     HowMuchCost : Item -> Question ;
-    ItCost : Item -> Price -> Sentence ;
+    ItCost : Item -> Price -> Proposition ;
     AmountCurrency : Numeral -> Currency -> Price ;
 
     ObjItem   : Item -> Object ;
@@ -48,6 +54,19 @@ abstract Sentences = Numeral ** {
 
     ThePlace : PlaceKind -> Place ;
 
-    I, YouFam, YouPol : Person ;
+    IMale, IFemale, 
+    YouFamMale, YouFamFemale, 
+    YouPolMale, YouPolFemale : Person ;
+
+    LangNat    : Nationality -> Language ;
+    CitiNat    : Nationality -> Citizenship ;
+    CountryNat : Nationality -> Country ;
+    PropCit    : Citizenship -> Property ;
+
+    OnDay : Day -> Date ;
+    Today : Date ;
 
+    PersonName : Name -> Person ;
+----    NameString : String -> Name ; ---- creates ambiguities with all words
+    NameNN : Name ; -- the name "NN"
 }