English and Swedish resource functions for Query

lib/src/abstract/Adjective.gf

@@ -29,6 +29,10 @@ abstract Adjective = Cat ** {
 
     AdAP    : AdA -> AP -> AP ; -- very warm
 
+-- It can also be postmodified by an adverb, typically a prepositional phrase.
+
+    AdvAP   : AP -> Adv -> AP ; -- warm by nature
+
 -- The formation of adverbs from adjective (e.g. "quickly") is covered
 -- in [Adverb Adverb.html].
 

lib/src/abstract/Conjunction.gf

@@ -17,11 +17,13 @@ abstract Conjunction = Cat ** {
 --2 Rules
 
   fun
-    ConjS   : Conj -> [S] -> S ;     -- "he walks and she runs"
-    ConjRS  : Conj -> [RS] -> RS ;   -- "who walks and whose mother runs"
-    ConjAP  : Conj -> [AP] -> AP ;   -- "cold and warm"
-    ConjNP  : Conj -> [NP] -> NP ;   -- "she or we"
-    ConjAdv : Conj -> [Adv] -> Adv ; -- "here or there"
+    ConjS    : Conj -> [S] -> S ;       -- "he walks and she runs"
+    ConjRS   : Conj -> [RS] -> RS ;     -- "who walks and whose mother runs"
+    ConjAP   : Conj -> [AP] -> AP ;     -- "cold and warm"
+    ConjNP   : Conj -> [NP] -> NP ;     -- "she or we"
+    ConjAdv  : Conj -> [Adv] -> Adv ;   -- "here or there"
+    ConjIAdv : Conj -> [IAdv] -> IAdv ; -- "where and with whom"
+    ConjCN   : Conj -> [CN] -> CN ;     -- "man and woman"
 
 --2 Categories
 
@@ -33,6 +35,8 @@ abstract Conjunction = Cat ** {
     [Adv]{2} ; 
     [NP]{2} ; 
     [AP]{2} ;
+    [IAdv]{2} ;
+    [CN] {2} ;
 
 --2 List constructors
 

lib/src/abstract/Extra.gf

@@ -63,26 +63,7 @@ abstract Extra = Cat ** {
     
     UseFoc : Temp -> Pol -> Foc -> Utt ;
 
-  cat
-    [CN] {2} ;
   fun
-    ConjCN : Conj -> [CN] -> CN ; -- (every) man and woman
-
     PartVP : VP -> AP ; -- looking at Mary
 
-  cat 
-    QVP ;          -- buy what where
-    [IAdv] {2} ;   -- when and where
-  fun
-    ComplSlashIP  : VPSlash -> IP -> QVP ;   -- buys what 
-    AdvQVP        : VP  ->   IAdv -> QVP ;   -- lives where 
-    AddAdvQVP     : QVP ->   IAdv -> QVP ;   -- buys what where 
-
-    QuestQVP      : IP -> QVP -> QCl ;       -- who buys what where
-
-    ConjIAdv      : Conj -> [IAdv] -> IAdv ; -- when, where and with whom
-
-    AdvAP : AP -> Adv -> AP ;  -- hungry as a wolf
-
-    UseCopula : VP ;
 }

lib/src/abstract/Noun.gf

@@ -133,4 +133,4 @@ abstract Noun = Cat ** {
     ApposCN : CN -> NP -> CN ;    -- city Paris (, numbers x and y)
 
 
-} ;
+}

lib/src/abstract/Question.gf

@@ -42,4 +42,14 @@ abstract Question = Cat ** {
 
 -- More $IP$, $IDet$, and $IAdv$ are defined in $Structural$.
 
+-- Wh questions with two or more question words require a new, special category.
+
+  cat 
+    QVP ;          -- buy what where
+  fun
+    ComplSlashIP  : VPSlash -> IP -> QVP ;   -- buys what 
+    AdvQVP        : VP  ->   IAdv -> QVP ;   -- lives where 
+    AddAdvQVP     : QVP ->   IAdv -> QVP ;   -- buys what where 
+
+    QuestQVP      : IP -> QVP -> QCl ;       -- who buys what where
 }

lib/src/abstract/Verb.gf

@@ -69,4 +69,7 @@ abstract Verb = Cat ** {
     CompAdv  : Adv -> Comp ;            -- (be) here
     CompCN   : CN  -> Comp ;            -- (be) a man/men
 
+-- Copula alone
+
+    UseCopula : VP ;                    -- be
 }