regenerated clones with complete abstract and ready-maked Lexicon-based words in Phrasebook

1 files changed, 56 insertions, 34 deletions

diff --git a/examples/phrasebook/WordsSwe.gf b/examples/phrasebook/WordsSwe.gf
index b48bb3e18..abd665746 100644
--- a/examples/phrasebook/WordsSwe.gf
+++ b/examples/phrasebook/WordsSwe.gf
@@ -1,7 +1,7 @@
 -- (c) 2009 Aarne Ranta under LGPL
 
 concrete WordsSwe of Words = SentencesSwe ** 
-    open SyntaxSwe, ParadigmsSwe, IrregSwe, (L = LexiconSwe), Prelude in {
+    open SyntaxSwe, ParadigmsSwe, IrregSwe, (L = LexiconSwe), ExtraSwe, Prelude in {
 
   lin
 
@@ -11,8 +11,10 @@ concrete WordsSwe of Words = SentencesSwe **
     Beer = mkCN L.beer_N ;
     Bread = mkCN L.bread_N ;
     Cheese = mkCN (mkN "ost") ;
+    Chicken = mkCN (mkN "kyckling") ;
     Coffee = mkCN (mkN "kaffe" neutrum) ;
     Fish = mkCN L.fish_N ;
+    Meat = mkCN (mkN "kött" "kött") ;
     Milk = mkCN L.milk_N ;
     Pizza = mkCN (mkN "pizza") ;
     Salt = mkCN L.salt_N ;
@@ -23,12 +25,14 @@ concrete WordsSwe of Words = SentencesSwe **
 -- properties
 
     Bad = L.bad_A ;
+    Cheap = mkA "billig" ;
     Boring = mkA "tråkig" ;
     Cold = L.cold_A ;
     Delicious = mkA "läcker" ;
     Expensive = mkA "dyr" ;
     Fresh = mkA "färsk" ;
     Good = L.good_A ;
+    Suspect = mkA "suspekt" "suspekt" ;
     Warm = L.warm_A ;
 
 -- places
@@ -36,19 +40,26 @@ concrete WordsSwe of Words = SentencesSwe **
     Airport = mkPlace (mkN "flygplats" "flygplatser") "på" ;
     Bar = mkPlace (mkN "bar" "barer") "i" ;
     Church = mkPlace (mkN "kyrka") "i" ;
+    Cinema = mkPlace (mkN "bio" "bio" "bion" "biona") "på" ; ---- ?
     Hospital = mkPlace (mkN "sjukhus" "sjukhus") "på" ;
+    Hotel = mkPlace (mkN "hotell" "hotell") "på" ;
     Museum = mkPlace (mkN "museum" "museet" "museer" "museerna") "på" ;
+    Park = mkPlace (mkN "park" "parker") "i" ;
     Restaurant = mkPlace (mkN "restaurang" "restauranger") "på" ;
+    Shop = mkPlace (mkN "affär" "affär") "i" ;
+    School = mkPlace (mkN "skola") "på" ;
     Station = mkPlace (mkN "station" "stationer") "på" ;
+    Theatre = mkPlace (mkN "teater" "teatrar") "på" ;
     Toilet = mkPlace (mkN "toalett" "toaletter") "på" ;
+    University = mkPlace (mkN "universitet" "universitet") "på" ;
 
 -- currencies
 
-    DanishCrown = mkCN (mkA "dansk") (mkN "krona") ;
+    DanishCrown = mkCN (mkA "dansk") (mkN "krona") | mkCN (mkN "krona") ;
     Dollar = mkCN (mkN "dollar" "dollar") ;
     Euro = mkCN (mkN "euro" "euro") ;
     Lei = mkCN (mkN "lei" "lei") ;
-    SwedishCrown = mkCN (mkA "svensk") (mkN "krona") ;
+    SwedishCrown = mkCN (mkA "svensk") (mkN "krona") | mkCN (mkN "krona") ;
 
 -- nationalities
 
@@ -64,13 +75,23 @@ concrete WordsSwe of Words = SentencesSwe **
 
 -- actions
 
+    AHasAge p num = mkCl p.name (mkNP num L.year_N) ;
     AHasName p name = mkCl p.name (mkV2 (mkV "heter")) name ;
+    AHasChildren p num = mkCl p.name have_V2 (mkNP num L.child_N) ;
+    AHasRoom p num = mkCl p.name have_V2 
+      (mkNP (mkNP a_Det (mkN "rum" "rum")) 
+        (SyntaxSwe.mkAdv for_Prep (mkNP num (mkN "person" "personer")))) ;
+    AHasTable p num = mkCl p.name have_V2 
+      (mkNP (mkNP a_Det (mkN "bord" "bord")) 
+        (SyntaxSwe.mkAdv for_Prep (mkNP num (mkN "person" "personer")))) ;
     AHungry p = mkCl p.name (mkA "hungrig") ;
     AIll p = mkCl p.name (mkA "sjuk") ;
     AKnow p = mkCl p.name (mkV "veta" "vet" "vet" "visste" "vetat" "visst") ; 
     ALike p item = mkCl p.name (mkV2 (mkV "tycker") (mkPrep "om")) item ;
     ALive p co = mkCl p.name (mkVP (mkVP (mkV "bo")) (SyntaxSwe.mkAdv in_Prep co)) ;
     ALove p q = mkCl p.name (mkV2 (mkV "älska")) q.name ;
+    AMarried p = mkCl p.name (mkA "gift") ;
+    AReady p = mkCl p.name (mkA "färdig") ;
     AScared p = mkCl p.name (mkA "rädd") ;
     ASpeak p lang = mkCl p.name  (mkV2 (mkV "tala")) lang ;
     AThirsty p = mkCl p.name (mkA "törstig") ;
@@ -82,6 +103,9 @@ concrete WordsSwe of Words = SentencesSwe **
 -- miscellaneous
 
     QWhatName p = mkQS (mkQCl whatSg_IP p.name (mkV2 (mkV "heter"))) ;
+    QWhatAge p = mkQS (mkQCl (ICompAP (mkAP L.old_A)) p.name) ;
+    HowMuchCost item = mkQS (mkQCl how8much_IAdv (mkCl item (mkV "kosta"))) ; 
+    ItCost item price = mkCl item (mkV2 (mkV "kosta")) price ;
 
     PropOpen p = mkCl p.name open_A ;
     PropClosed p = mkCl p.name closed_A ;
@@ -90,8 +114,23 @@ concrete WordsSwe of Words = SentencesSwe **
     PropOpenDay p d = mkCl p.name (mkVP (mkVP open_A) d.habitual) ; 
     PropClosedDay p d = mkCl p.name (mkVP (mkVP closed_A) d.habitual) ; 
 
-    HowMuchCost item = mkQS (mkQCl how8much_IAdv (mkCl item (mkV "kosta"))) ; 
-    ItCost item price = mkCl item (mkV2 (mkV "kosta")) price ;
+-- Building phrases from strings is complicated: the solution is to use
+-- mkText : Text -> Text -> Text ;
+
+    PSeeYou d = mkText (lin Text (ss ("vi ses"))) (mkPhrase (mkUtt d)) ;
+    PSeeYouPlace p d = 
+      mkText (lin Text (ss ("vi ses"))) 
+        (mkText (mkPhrase (mkUtt p.at)) (mkPhrase (mkUtt d))) ;
+
+-- Relations are expressed as "my wife" or "my son's wife", as defined by $xOf$
+-- below. Languages without productive genitives must use an equivalent of
+-- "the wife of my son" for non-pronouns.
+
+    Wife = xOf sing (mkN "fru" "fruar") ;
+    Husband = xOf sing L.man_N ;
+    Son = xOf sing (mkN "son" "söner") ;
+    Daughter = xOf sing (mkN "dotter" "döttrar") ;
+    Children = xOf plur L.child_N ;
 
 -- week days
 
@@ -103,42 +142,25 @@ concrete WordsSwe of Words = SentencesSwe **
     Saturday = mkDay "lördag" ;
     Sunday = mkDay "söndag" ;
 
+    Tomorrow = ParadigmsSwe.mkAdv "imorgon" ;
+
   oper
-    mkNat : Str -> Str -> {lang : NP ; prop : A ; country : NP} = \nat,co -> 
-      {lang = mkNP (mkPN (nat + "a")) ; 
-       prop = mkA nat ; country = mkNP (mkPN co)} ;
+    mkNat : Str -> Str -> NPNationality = \nat,co -> 
+      mkNPNationality (mkNP (mkPN (nat + "a"))) (mkNP (mkPN co)) (mkA nat) ;
 
     mkDay : Str -> {name : NP ; point : Adv ; habitual : Adv} = \d ->
-      let day = mkNP (mkPN d) in
-      {name = day ; 
-       point = SyntaxSwe.mkAdv on_Prep day ; 
-       habitual = SyntaxSwe.mkAdv on_Prep (mkNP a_Quant plNum (mkCN (mkN d)))
-      } ;
-
-    mkPlace : N -> Str -> {name : CN ; at : Prep ; to : Prep} = \p,i -> {
-      name = mkCN p ;
-      at = mkPrep i ;
-      to = to_Prep
-      } ;
+      let day = mkNP (mkPN d) in 
+      mkNPDay day (SyntaxSwe.mkAdv on_Prep day) 
+        (SyntaxSwe.mkAdv on_Prep (mkNP a_Quant plNum (mkCN (mkN d)))) ;
+
+    mkPlace : N -> Str -> {name : CN ; at : Prep ; to : Prep} = \p,i -> 
+      mkCNPlace (mkCN p) (mkPrep i) to_Prep ;
 
     open_A = mkA "öppen" "öppet" ;
     closed_A = mkA "stängd" "stängt" ;
 
-    NPPerson : Type = {name : NP ; isPron : Bool ; poss : Quant} ;
-
-    xOf : Bool -> N -> NPPerson -> NPPerson = \n,x,p -> 
-      let num = if_then_else Num n plNum sgNum in {
-      name = case p.isPron of {
-        True => mkNP p.poss num x ;
-        _    => mkNP (mkNP the_Quant num x) 
-                       (SyntaxSwe.mkAdv possess_Prep p.name)
-        } ;
-      isPron = False ;
-      poss = SyntaxSwe.mkQuant he_Pron -- not used because not pron
-      } ;
-
-    nameOf : NPPerson -> NP = \p -> (xOf sing L.name_N p).name ;
+    xOf : GNumber -> N -> NPPerson -> NPPerson = \n,x,p -> 
+      relativePerson n (mkCN x) (\a,b,c -> mkNP (GenNP b) a c) p ;
 
-    sing = False ; plur = True ;
 
 }