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/Words.gf | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

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

diff --git a/examples/phrasebook/Words.gf b/examples/phrasebook/Words.gf
index 205f1258e..12d9830ee 100644
--- a/examples/phrasebook/Words.gf
+++ b/examples/phrasebook/Words.gf
@@ -1,7 +1,7 @@
 --2 Words and idiomatic phrases of the Phrasebook
 
 
--- (c) 2009 Aarne Ranta under LGPL --%
+-- (c) 2010 Aarne Ranta under LGPL --%
 
 abstract Words = Sentences ** {
 
@@ -10,19 +10,19 @@ abstract Words = Sentences ** {
 -- kinds of items (so far mostly food stuff)
 
     Apple : Kind ;
-    Beer : MassKind ;
+    Beer : DrinkKind ;
     Bread : MassKind ; 
     Cheese : MassKind ;
     Chicken : MassKind ; 
-    Coffee : MassKind ; 
+    Coffee : DrinkKind ; 
     Fish : MassKind ; 
     Meat : MassKind ;
     Milk : MassKind ; 
     Pizza : Kind ; 
     Salt : MassKind ;
-    Tea : MassKind ; 
-    Water : MassKind ; 
-    Wine : MassKind ;
+    Tea : DrinkKind ; 
+    Water : DrinkKind ; 
+    Wine : DrinkKind ;
 
 -- properties of kinds (so far mostly of food)
 
@@ -207,9 +207,19 @@ abstract Words = Sentences ** {
     Rice : MassKind ;
     Pork : MassKind ;
     Beef : MassKind ;
+    Noodles : PlurKind ;
+    Shrimps : PlurKind ;
     
+    Chili : MassKind ;
+    Garlic : MassKind ;
+
     Durian : Kind ;
     Mango : Kind ;
     Pineapple : Kind ;
 
+    Coke : DrinkKind ;
+    IceCream : DrinkKind ; --- both mass and plural
+
+    Beach : PlaceKind ;
+
 }
-- 
cgit v1.2.3