query language extended and generalized

lib/src/abstract/Extra.gf

@@ -63,5 +63,11 @@ 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
+        
 }

lib/src/abstract/Verb.gf

@@ -65,7 +65,8 @@ abstract Verb = Cat ** {
 -- Adjectival phrases, noun phrases, and adverbs can be used.
 
     CompAP   : AP  -> Comp ;            -- (be) small
-    CompNP   : NP  -> Comp ;            -- (be) a man
+    CompNP   : NP  -> Comp ;            -- (be) the man
     CompAdv  : Adv -> Comp ;            -- (be) here
+    CompCN   : CN  -> Comp ;            -- (be) a man/men
 
 }