From dd48c035ab4bc2baebf4bb0070356929234a4510 Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Thu, 16 Dec 2010 15:52:29 +0000
Subject: [PATCH] added to Romance the constructs missing for Query

---
 lib/src/romance/AdjectiveRomance.gf      |  6 ++++++
 lib/src/romance/ConjunctionRomance.gf    |  9 ++++++++
 lib/src/romance/QuestionRomance.gf       | 26 ++++++++++++++----------
 lib/src/scandinavian/ConjunctionScand.gf |  2 +-
 lib/src/swedish/LexiconSwe.gf            |  2 +-
 5 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/lib/src/romance/AdjectiveRomance.gf b/lib/src/romance/AdjectiveRomance.gf
index 521e9f45c..03a6b1975 100644
--- a/lib/src/romance/AdjectiveRomance.gf
+++ b/lib/src/romance/AdjectiveRomance.gf
@@ -56,4 +56,10 @@ incomplete concrete AdjectiveRomance of Adjective =
       isPre = False ---- A2 has no isPre
       } ;
 
+    AdvAP ap adv = {
+      s = \\a => ap.s ! a ++ adv.s ;
+      isPre = False
+      } ;
+
+
 }
diff --git a/lib/src/romance/ConjunctionRomance.gf b/lib/src/romance/ConjunctionRomance.gf
index 8d98dd715..86bfda615 100644
--- a/lib/src/romance/ConjunctionRomance.gf
+++ b/lib/src/romance/ConjunctionRomance.gf
@@ -20,6 +20,9 @@ incomplete concrete ConjunctionRomance of Conjunction =
       c = ss.c
       } ;
 
+    ConjIAdv = conjunctDistrSS ;
+
+    ConjCN co ns = conjunctDistrTable Number co ns ** {g = ns.g} ;
 
 -- These fun's are generated from the list cat's.
 
@@ -41,12 +44,18 @@ incomplete concrete ConjunctionRomance of Conjunction =
     ConsAP xs x = consrTable AForm comma xs x ** {isPre = andB xs.isPre x.isPre} ;
     BaseRS x y = twoTable2 Mood Agr x y ** {c = y.c} ;
     ConsRS xs x = consrTable2 Mood Agr comma xs x ** {c = xs.c} ;
+    BaseIAdv = twoSS ;
+    ConsIAdv = consrSS comma ;
+    BaseCN x y = twoTable Number x y ** {g = conjGender x.g y.g} ;
+    ConsCN x xs = consrTable Number comma x xs ** {g = conjGender x.g xs.g} ;
 
   lincat
     [S] = {s1,s2 : Mood => Str} ;
     [Adv] = {s1,s2 : Str} ;
+    [IAdv] = {s1,s2 : Str} ;
     [NP] = {s1,s2 : Case => Str ; a : Agr} ;
     [AP] = {s1,s2 : AForm  => Str ; isPre : Bool} ;
     [RS] = {s1,s2 : Mood => Agr => Str ; c : Case} ;
+    [CN] = {s1,s2 : Number => Str ; g : Gender} ;
 
 }
diff --git a/lib/src/romance/QuestionRomance.gf b/lib/src/romance/QuestionRomance.gf
index cbcd2a9aa..7f6e5ff0e 100644
--- a/lib/src/romance/QuestionRomance.gf
+++ b/lib/src/romance/QuestionRomance.gf
@@ -99,16 +99,20 @@ incomplete concrete QuestionRomance of Question =
 
     CompIP p = {s = \\_  => p.s ! Nom} ;
 
+  lincat 
+    QVP = ResRomance.VP ;
+  lin
+    ComplSlashIP vp ip = insertObject vp.c2 (heavyNP {s = ip.s ; a = ip.a ** {p = P3}}) vp ;
+    AdvQVP vp adv = insertAdv adv.s vp ;
+    AddAdvQVP vp adv = insertAdv adv.s vp ;
+
+    QuestQVP qp vp = { 
+      s = \\t,a,b,_ => 
+        let
+          cl = mkClause (qp.s ! Nom) False False (agrP3 qp.a.g qp.a.n) vp  
+        in
+        cl.s ! DDir ! t ! a ! b ! Indic
+      } ;   
+
 }
 
-{- ---b 
-    IDetCN idet num ord cn = 
-      let 
-        g = cn.g ;
-        n = idet.n ;
-        a = aagr g n
-      in {
-      s = \\c => idet.s ! g ! c ++ num.s ! g ++ ord.s ! a ++ cn.s ! n ; 
-      a = a
-      } ;
--}
diff --git a/lib/src/scandinavian/ConjunctionScand.gf b/lib/src/scandinavian/ConjunctionScand.gf
index 5de87b477..9237f42c9 100644
--- a/lib/src/scandinavian/ConjunctionScand.gf
+++ b/lib/src/scandinavian/ConjunctionScand.gf
@@ -24,7 +24,7 @@ incomplete concrete ConjunctionScand of Conjunction =
     ConjIAdv = conjunctDistrSS ;   
 
     ConjCN co ns = conjunctDistrTable3 Number DetSpecies Case co ns ** 
-      {g = utrum ; isMod = True} ; ----
+      {g = neutrum ; isMod = False} ; ----
 
 
 -- These fun's are generated from the list cat's.
diff --git a/lib/src/swedish/LexiconSwe.gf b/lib/src/swedish/LexiconSwe.gf
index 9833d5550..89805fe9b 100644
--- a/lib/src/swedish/LexiconSwe.gf
+++ b/lib/src/swedish/LexiconSwe.gf
@@ -165,7 +165,7 @@ lin
   ship_N = regGenN "skepp" neutrum ;
   shirt_N = regGenN "skjorta" utrum ;
   shoe_N = mk2N "sko" "skor" ;
-  shop_N = mk2N "affär" "affären" ;
+  shop_N = mk2N "affär" "affärer" ;
   short_A = regA "kort" ;
   silver_N = mkN "silver" "silvret" "silver" "silvren" ;
   sister_N = mk2N "syster" "systrar" ;