From 28e3f120076b261a356cb0733307ffd196b9e20b Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Thu, 16 Dec 2010 16:27:13 +0000
Subject: [PATCH] fixes in QueryFre

---
 examples/query/LexQueryFre.gf |  2 +-
 examples/query/QueryFre.gf    | 12 ++++++++----
 examples/query/QueryI.gf      |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/examples/query/LexQueryFre.gf b/examples/query/LexQueryFre.gf
index 6bfa934ee..85d42ff0d 100644
--- a/examples/query/LexQueryFre.gf
+++ b/examples/query/LexQueryFre.gf
@@ -5,7 +5,7 @@ oper
   located_A : A = mkA "situé" ;
 
   giveMe = \np -> mkVP (mkV2 (mkV "montrer")) np ; ---
-  know_V2 = connaître_V2 ;
+  know_V2 = IrregFre.savoir_V2 ;
 
 -- structural words
   about_Prep : Prep = mkPrep "sur" ;
diff --git a/examples/query/QueryFre.gf b/examples/query/QueryFre.gf
index a837dedbd..8fd24473b 100644
--- a/examples/query/QueryFre.gf
+++ b/examples/query/QueryFre.gf
@@ -1,6 +1,8 @@
 --# -path=.:present
 
-concrete QueryFre of Query = QueryI - [namePrep, propCalled, SFun] with 
+concrete QueryFre of Query = QueryI - 
+  [namePrep, propCalled, SFun, SAll, IWhat] 
+with 
   (Syntax = SyntaxFre),
   (Lang = LangFre),
   (LexQuery = LexQueryFre) **
@@ -18,13 +20,15 @@ in {
 -- deviations from functor
 oper
 -- prep not "av"
-  namePrep = on_Prep ;
+  namePrep = possess_Prep ;
 -- verb "heta"
   propCalled : NP -> Prop = \i -> 
-      propVP (mkVP (mkAdV "aussi") (mkVP (mkV2 (reflV (mkV "appeler")) for_Prep) i)) ;
+      propVP (mkVP (mkAdV "aussi") (mkVP (mkV2 (reflV (mkV "appeler"))) i)) ;
 
 lin
+  SAll k = mkNP all_Predet (mkNP thePl_Det k) | mkNP thePl_Det k ;
   SFun s r = mkNP (mkNP the_Quant plNum r.cn) (mkAdv r.prep s) ;
+  IWhat = mkIP (mkIDet which_IQuant) | mkIP (mkIDet which_IQuant pluralNum) ;
 
 
 -- lexicon
@@ -38,7 +42,7 @@ lin
       relAP (mkAP (mkA "employé")) by8agent_Prep
     | relAP (mkAP (mkA "payé")) by8agent_Prep
     | relAP (mkAP (mkA "actif")) at_Prep
-    | relAP (mkAP (mkA "professionnellement aktif")) at_Prep
+    | relAP (mkAP (mkA "professionnellement actif")) at_Prep
     | relVP (mkVP (mkV "travailler")) at_Prep
     ;
 
diff --git a/examples/query/QueryI.gf b/examples/query/QueryI.gf
index 58e078a62..05d3ee938 100644
--- a/examples/query/QueryI.gf
+++ b/examples/query/QueryI.gf
@@ -70,7 +70,7 @@ lin
     in
       mkUtt (mkImp (giveMe info))
     | mkUtt (mkQCl whatSg_IP 
-        (mkClSlash (mkClSlash (mkNP youSg_Pron) know_V2) (mkAdv about_Prep s)))
+        (mkClSlash (mkClSlash (mkNP youSg_Pron) LexQuery.know_V2) (mkAdv about_Prep s)))
     | mkUtt info ;
 
   QCalled i = mkUtt (mkQS (mkQCl how_IAdv (mkCl i