From 3c144b163a4718a565ebd9f421c2c5d65ff3397a Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Thu, 8 Jun 2006 09:44:22 +0000
Subject: [PATCH] updated lexicon in animal

---
 examples/animal/AnimalsFre.gf  | 10 +++++-----
 examples/animal/AnimalsSwe.gf  |  4 ++--
 examples/animal/QuestionsI.gf  |  7 ++++---
 examples/animal/QuestionsI.gfe |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/examples/animal/AnimalsFre.gf b/examples/animal/AnimalsFre.gf
index 5c09490a1..198c84ad7 100644
--- a/examples/animal/AnimalsFre.gf
+++ b/examples/animal/AnimalsFre.gf
@@ -4,11 +4,11 @@ concrete AnimalsFre of Animals = QuestionsFre **
   open LangFre, ParadigmsFre, IrregFre in {
 
   lin
-    Dog   = regN "chien" masculine ;
-    Cat   = regN "chat" masculine ;
-    Mouse = regN "souris" feminine ;
-    Lion  = regN "lion" masculine ;
-    Zebra = regN "zèbre" masculine ;
+    Dog   = regN "chien" ;
+    Cat   = regN "chat" ;
+    Mouse = regGenN "souris" feminine ;
+    Lion  = regN "lion" ;
+    Zebra = regGenN "zèbre" masculine ;
     Chase = dirV2 (regV "chasser") ;
     Eat   = dirV2 (regV "manger") ;
     See   = voir_V2 ;
diff --git a/examples/animal/AnimalsSwe.gf b/examples/animal/AnimalsSwe.gf
index 34275ae16..8f256885a 100644
--- a/examples/animal/AnimalsSwe.gf
+++ b/examples/animal/AnimalsSwe.gf
@@ -4,11 +4,11 @@ concrete AnimalsSwe of Animals = QuestionsSwe **
   open LangSwe, ParadigmsSwe, IrregSwe in {
 
   lin
-    Dog = regN "hund" utrum ;
+    Dog = regN "hund" ;
     Cat = mk2N "katt" "katter" ;
     Mouse = mkN "mus" "musen" "möss" "mössen" ;
     Lion = mk2N "lejon" "lejon" ;
-    Zebra = regN "zebra" utrum ;
+    Zebra = regN "zebra" ;
     Chase = dirV2 (regV "jaga") ;
     Eat = dirV2 äta_V ;
     See = dirV2 se_V ;
diff --git a/examples/animal/QuestionsI.gf b/examples/animal/QuestionsI.gf
index 4d03b77b7..e3db18905 100644
--- a/examples/animal/QuestionsI.gf
+++ b/examples/animal/QuestionsI.gf
@@ -1,7 +1,7 @@
--- File generated by GF from QuestionsI.gfe
+-- File generated by GF from ./QuestionsI.gfe
 incomplete concrete QuestionsI of Questions = open Lang in {
   lincat Action = V2 ;
-  lin Answer = \woman_N -> \love_V2 -> \man_N -> % Lang.PhrUtt % Lang.NoPConj (% Lang.UttS (% Lang.UseCl % Lang.TPres % Lang.ASimul % Lang.PPos (% Lang.PredVP (% Lang.DetCN (% Lang.DetSg (% Lang.SgQuant % Lang.DefArt)% Lang.NoOrd)(% Lang.UseN % Lang.woman_N)) (% Lang.ComplV2 % Lang.love_V2 (% Lang.DetCN (% Lang.DetPl (% Lang.PlQuant % Lang.IndefArt)% Lang.NoNum % Lang.NoOrd)(% Lang.UseN % Lang.man_N)))))) % Lang.NoVoc ;
+  lin Answer = \woman_N -> \love_V2 -> \man_N -> % Lang.PhrUtt % Lang.NoPConj (% Lang.UttNP (% Lang.DetCN (% Lang.DetSg (% Lang.SgQuant % Lang.DefArt)% Lang.NoOrd)(% Lang.ApposCN (% Lang.ApposCN (% Lang.UseN % Lang.woman_N)(% Lang.DetCN (% Lang.DetPl (% Lang.PlQuant % Lang.IndefArt)% Lang.NoNum % Lang.NoOrd)(% Lang.UseN % Lang.love_N)))(% Lang.DetCN (% Lang.DetPl (% Lang.PlQuant % Lang.IndefArt)% Lang.NoNum % Lang.NoOrd)(% Lang.UseN % Lang.man_N)))))% Lang.NoVoc ;
   lincat Entity = N ;
   lincat Phrase = Phr ;
   lin Who = \love_V2 -> \man_N -> % Lang.PhrUtt % Lang.NoPConj (% Lang.UttAdv (% Lang.AdvSC (% Lang.EmbedQS (% Lang.UseQCl % Lang.TPres % Lang.ASimul % Lang.PPos (% Lang.QuestVP % Lang.whoSg_IP (% Lang.ComplV2 % Lang.love_V2 (% Lang.DetCN (% Lang.DetPl (% Lang.PlQuant % Lang.IndefArt)% Lang.NoNum % Lang.NoOrd)(% Lang.UseN % Lang.man_N)))))))) % Lang.NoVoc ;
@@ -14,7 +14,8 @@ PhrUtt NoPConj (UttQS (UseQCl TPres ASimul PPos (QuestVP whoSg_IP (ComplV2 love_
 AMBIGUOUS in Whom
 whom does the man love
 PhrUtt NoPConj (UttQS (UseQCl TPres ASimul PPos (QuestSlash whoSg_IP (SlashV2 (DetCN (DetSg (SgQuant DefArt) NoOrd) (UseN man_N)) love_V2)))) NoVoc
-PARSED in Answer
+AMBIGUOUS in Answer
 the woman loves men
+PhrUtt NoPConj (UttNP (DetCN (DetSg (SgQuant DefArt) NoOrd) (ApposCN (UseN woman_N) (DetCN (DetPl (PlQuant IndefArt) NoNum NoOrd) (ApposCN (UseN love_N) (DetCN (DetPl (PlQuant IndefArt) NoNum NoOrd) (UseN man_N))))))) NoVoc
 PhrUtt NoPConj (UttS (UseCl TPres ASimul PPos (PredVP (DetCN (DetSg (SgQuant DefArt) NoOrd) (UseN woman_N)) (ComplV2 love_V2 (DetCN (DetPl (PlQuant IndefArt) NoNum NoOrd) (UseN man_N)))))) NoVoc
 -}
diff --git a/examples/animal/QuestionsI.gfe b/examples/animal/QuestionsI.gfe
index 649e203bc..70350bf73 100644
--- a/examples/animal/QuestionsI.gfe
+++ b/examples/animal/QuestionsI.gfe
@@ -1,4 +1,4 @@
---# -resource=../../lib/resource-1.0/english/LangEng.gf
+--# -resource=../../lib/present/LangEng.gfc
 --# -path=.:present:prelude
 
 -- to compile: gf -examples QuestionsI.gfe