From 33f1eeb7d1a94c8f34b13a69c9082e1a8807fba8 Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Wed, 30 Nov 2011 20:24:23 +0000
Subject: splits in Phrasebook Kind category: Drink and Plur; some new words in
 Tha,Eng,Fin,Swe

---
 examples/phrasebook/SentencesI.gf | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'examples/phrasebook/SentencesI.gf')

diff --git a/examples/phrasebook/SentencesI.gf b/examples/phrasebook/SentencesI.gf
index 0eb83e26d..0aa330b3c 100644
--- a/examples/phrasebook/SentencesI.gf
+++ b/examples/phrasebook/SentencesI.gf
@@ -20,6 +20,9 @@ incomplete concrete SentencesI of Sentences = Numeral **
     Item = NP ;
     Kind = CN ;
     MassKind = CN ;
+    MassKind = CN ;
+    PlurKind = CN ;
+    DrinkKind = CN ;
     Quality = AP ;
     Property = A ;
     Object = NP ;
@@ -73,7 +76,7 @@ incomplete concrete SentencesI of Sentences = Numeral **
     PNo = mkPhrase no_Utt ;
     PYesToNo = mkPhrase yes_Utt ;
 
-    GObjectPlease o = lin Text (mkPhr noPConj (mkUtt o) please_Voc) ;
+    GObjectPlease o = lin Text (mkPhr noPConj (mkUtt o) please_Voc) | lin Text (mkUtt o) ;
 
     Is = mkCl ;
     IsMass m q = mkCl (mkNP m) q ;
@@ -93,10 +96,14 @@ incomplete concrete SentencesI of Sentences = Numeral **
     ObjNumber n k = mkNP n k ;
     ObjIndef k = mkNP a_Quant k ;
     ObjPlural k = mkNP aPl_Det k ;
+    ObjPlur k = mkNP aPl_Det k ;
     ObjMass k = mkNP k ;
     ObjAndObj = mkNP and_Conj ;
     OneObj o = o ; 
 
+    MassDrink d = d ;
+    KindDrink d = d ;
+
     This kind = mkNP this_Quant kind ;
     That kind = mkNP that_Quant kind ;
     These kind = mkNP this_Quant plNum kind ;
@@ -106,6 +113,9 @@ incomplete concrete SentencesI of Sentences = Numeral **
     ThisMass kind = mkNP this_Quant kind ;
     ThatMass kind = mkNP that_Quant kind ;
     TheMass kind = mkNP the_Quant kind ;
+    ThesePlur kind = mkNP this_Quant plNum kind ;
+    ThosePlur kind = mkNP that_Quant plNum kind ;
+    ThesPlur kind = mkNP the_Quant plNum kind ;
 
     SuchKind quality kind = mkCN quality kind ;
     SuchMassKind quality kind = mkCN quality kind ;
@@ -261,6 +271,11 @@ oper
     VWait = mkVP <lin V wait_V2 : V> ; 
     VWrite = mkVP <lin V write_V2 : V> ; 
 
+    V2Buy o = mkVP buy_V2 o ;
+    V2Drink o = mkVP drink_V2 o ;
+    V2Eat o = mkVP eat_V2 o ;
+    V2Wait o = mkVP wait_V2 o.name ;
+
 -- other new things allowed by the resource
 
 ---    PBecause a b = SSubjS a because_Subj b ;
-- 
cgit v1.2.3