remade phrasebook doc

3 files changed, 47 insertions, 32 deletions

diff --git a/examples/phrasebook/Implementation.html b/examples/phrasebook/Implementation.html
index e6227956c..5cb0635fb 100644
--- a/examples/phrasebook/Implementation.html
+++ b/examples/phrasebook/Implementation.html
@@ -23,6 +23,7 @@ gfdoc - a rudimentary GF document generator.
       Proposition = Cl ;
       Item = NP ;
       Kind = CN ;
+      MassKind = CN ;
       Quality = AP ;
       Property = A ;
       Object = NP ;
@@ -50,6 +51,7 @@ gfdoc - a rudimentary GF document generator.
   
       PObject x = mkPhrase (mkUtt x) ;
       PKind x = mkPhrase (mkUtt x) ;
+      PMassKind x = mkPhrase (mkUtt x) ;
       PQuality x = mkPhrase (mkUtt x) ;
       PNumber x = mkPhrase (mkUtt x) ;
       PPlace x = mkPhrase (mkUtt x.name) ;
@@ -65,6 +67,7 @@ gfdoc - a rudimentary GF document generator.
   
       PYes = mkPhrase yes_Utt ;
       PNo = mkPhrase no_Utt ;
+      PYesToNo = mkPhrase yes_Utt ;
   
       Is = mkCl ;
   
@@ -82,6 +85,7 @@ gfdoc - a rudimentary GF document generator.
       ObjItem i = i ;
       ObjNumber n k = mkNP n k ;
       ObjIndef k = mkNP a_Quant k ;
+      ObjMass k = mkNP k ;
       ObjAndObj = mkNP and_Conj ;
       OneObj o = o ; 
   
@@ -90,9 +94,13 @@ gfdoc - a rudimentary GF document generator.
       These kind = mkNP this_Quant plNum kind ;
       Those kind = mkNP that_Quant plNum kind ;
       The kind = mkNP the_Quant kind ;
-      The kind = mkNP the_Quant kind ;
       Thes kind = mkNP the_Quant plNum kind ;
+      ThisMass kind = mkNP this_Quant kind ;
+      ThatMass kind = mkNP that_Quant kind ;
+      TheMass kind = mkNP the_Quant kind ;
+  
       SuchKind quality kind = mkCN quality kind ;
+      SuchMassKind quality kind = mkCN quality kind ;
       Very property = mkAP very_AdA (mkAP property) ;
       Too property = mkAP too_AdA (mkAP property) ;
       PropQuality property = mkAP property ;
@@ -121,7 +129,8 @@ gfdoc - a rudimentary GF document generator.
   
       NNumeral n = mkCard <lin Numeral n : Numeral>  ;
   
-      AHave p kind = mkCl p.name have_V2 (mkNP kind) ;
+      AHave p kind = mkCl p.name have_V2 (mkNP aPl_Det kind) ;
+      AHaveMass p kind = mkCl p.name have_V2 (mkNP kind) ;
       AHaveCurr p curr = mkCl p.name have_V2 (mkNP aPl_Det curr) ;
       ACitizen p n = mkCl p.name n ;
       ABePlace p place = mkCl p.name place.at ;
diff --git a/examples/phrasebook/Ontology.html b/examples/phrasebook/Ontology.html
index 098814653..e431598da 100644
--- a/examples/phrasebook/Ontology.html
+++ b/examples/phrasebook/Ontology.html
@@ -29,6 +29,7 @@ are defined in other modules.
       PrimObject ;  -- single object of wanting, ordering, etc   e.g. "three pizzas"
       Item ;        -- a single entity                           e.g. "this pizza"
       Kind ;        -- a type of an item                         e.g. "pizza"
+      MassKind ;    -- a type mass (uncountable)                 e.g. "water"
       Quality ;     -- qualification of an item, can be complex  e.g. "very good"
       Property ;    -- basic property of an item, one word       e.g. "good"
       Place ;       -- location                                  e.g. "the bar" 
@@ -56,22 +57,23 @@ Many of the categories are accessible as Phrases, i.e. as translation units.
       PSentence    : Sentence -> Phrase ;
       PQuestion    : Question -> Phrase ;
   
-      PObject      : Object   -> Phrase ;
-      PKind        : Kind     -> Phrase ;
-      PQuality     : Quality  -> Phrase ;
-      PNumber      : Number   -> Phrase ;
-      PPlace       : Place    -> Phrase ;
-      PPlaceKind   : PlaceKind-> Phrase ;
-      PCurrency    : Currency -> Phrase ;
-      PPrice       : Price    -> Phrase ;
-      PLanguage    : Language -> Phrase ;
+      PObject      : Object      -> Phrase ;
+      PKind        : Kind        -> Phrase ;
+      PMassKind    : MassKind    -> Phrase ;
+      PQuality     : Quality     -> Phrase ;
+      PNumber      : Number      -> Phrase ;
+      PPlace       : Place       -> Phrase ;
+      PPlaceKind   : PlaceKind   -> Phrase ;
+      PCurrency    : Currency    -> Phrase ;
+      PPrice       : Price       -> Phrase ;
+      PLanguage    : Language    -> Phrase ;
       PCitizenship : Citizenship -> Phrase ;
-      PCountry     : Country -> Phrase ;
-      PDay         : Day -> Phrase ;
+      PCountry     : Country     -> Phrase ;
+      PDay         : Day         -> Phrase ;
       PByTransport : ByTransport -> Phrase ;
-      PTransport   : Transport -> Phrase ;
+      PTransport   : Transport   -> Phrase ;
   
-      PYes, PNo : Phrase ;
+      PYes, PNo, PYesToNo : Phrase ;  -- yes, no, si/doch (pos. answer to neg. question)
 </pre>
 
 This is the way to build propositions about inanimate items.
@@ -99,10 +101,12 @@ Here are some general syntactic constructions.
       ObjItem   : Item -> PrimObject ;             -- this pizza
       ObjNumber : Number -> Kind -> PrimObject ;   -- five pizzas
       ObjIndef  : Kind -> PrimObject ;             -- a pizza
+      ObjMass   : MassKind -> PrimObject ;         -- water
       ObjAndObj : PrimObject -> Object -> Object ; -- this pizza and a beer
       OneObj    : PrimObject -> Object ;           -- this pizza
   
       SuchKind : Quality -> Kind -> Kind ;         -- Italian pizza
+      SuchMassKind : Quality -> MassKind -> MassKind ; -- Italian water
       Very : Property -> Quality ;                 -- very Italian
       Too  : Property -> Quality ;                 -- too Italian      
       PropQuality : Property -> Quality ;          -- Italian
@@ -110,10 +114,11 @@ Here are some general syntactic constructions.
 
 Determiners.
 <pre>
-      This, That, These, Those : Kind -> Item ;    -- this pizza,...,those pizzas
-      The, Thes : Kind -> Item ;                   -- the pizza, the pizzas
+      This, That, These, Those : Kind -> Item ;         -- this pizza,...,those pizzas
+      The, Thes : Kind -> Item ;                        -- the pizza, the pizzas
+      ThisMass, ThatMass, TheMass : MassKind -> Item ;  -- this/that/the water
   
-      AmountCurrency : Number -> Currency -> Price ;  -- five euros
+      AmountCurrency : Number -> Currency -> Price ;    -- five euros
   
       ThePlace : PlaceKind -> Place ;                   -- the bar
       APlace : PlaceKind -> Place ;                     -- a bar
@@ -141,7 +146,8 @@ Determiners.
 Actions are typically language-dependent, not only lexically but also
 structurally. However, these ones are mostly functorial.
 <pre>
-      AHave     : Person -> Kind        -> Action ;  -- you have a pizza
+      AHave     : Person -> Kind        -> Action ;  -- you have pizzas
+      AHaveMass : Person -> MassKind    -> Action ;  -- you have water
       AHaveCurr : Person -> Currency    -> Action ;  -- you have dollars
       ACitizen  : Person -> Citizenship -> Action ;  -- you are Swedish
       ABePlace  : Person -> Place       -> Action ;  -- you are in the bar
@@ -161,19 +167,19 @@ structurally. However, these ones are mostly functorial.
 kinds of items (so far mostly food stuff)
 <pre>
       Apple : Kind ;
-      Beer : Kind ;
-      Bread : Kind ; 
-      Cheese : Kind ;
-      Chicken : Kind ; 
-      Coffee : Kind ; 
-      Fish : Kind ; 
-      Meat : Kind ;
-      Milk : Kind ; 
+      Beer : MassKind ;
+      Bread : MassKind ; 
+      Cheese : MassKind ;
+      Chicken : MassKind ; 
+      Coffee : MassKind ; 
+      Fish : MassKind ; 
+      Meat : MassKind ;
+      Milk : MassKind ; 
       Pizza : Kind ; 
-      Salt : Kind ; 
-      Tea : Kind ; 
-      Water : Kind ; 
-      Wine : Kind ;
+      Salt : MassKind ; 
+      Tea : MassKind ; 
+      Water : MassKind ; 
+      Wine : MassKind ;
 </pre>
 
 properties of kinds (so far mostly of food)
diff --git a/examples/phrasebook/phrasebook.html b/examples/phrasebook/phrasebook.html
index 41378602c..f9c06462a 100644
--- a/examples/phrasebook/phrasebook.html
+++ b/examples/phrasebook/phrasebook.html
@@ -252,6 +252,6 @@ Here are the steps to follow for contributors:
 </UL>
 
 
-<!-- html code generated by txt2tags 2.5 (http://txt2tags.sf.net) -->
+<!-- html code generated by txt2tags 2.4 (http://txt2tags.sf.net) -->
 <!-- cmdline: txt2tags -thtml phrasebook.txt -->
 </BODY></HTML>