tuning resource API

lib/resource/english/RulesEng.gf

@@ -26,6 +26,8 @@ flags
   lexer=text ;
   unlexer=text ;
 
+  optimize=all ;
+
 lin 
   UseN = noun2CommNounPhrase ;
   UsePN = nameNounPhrase ;
@@ -44,6 +46,8 @@ lin
   DefNumNP = defNounPhraseNum plural ;
 
   DetNP = detNounPhrase ;
+  NDetNP = numDetNounPhrase ;
+  NDetNum = justNumDetNounPhrase ; 
   MassNP = detNounPhrase (mkDeterminer Sg []) ;
 
   AppN2 = appFunComm ;
@@ -109,6 +113,8 @@ lin
   PrepNP p = prepPhrase p.s ; ---
   AdvCN = advCommNounPhrase ;
   AdvAP = advAdjPhrase ;
+  AdvAdv = cc2 ;
+
 
 --3 Sentences and relative clauses
 --
@@ -126,13 +132,8 @@ lin
 --3 Questions and imperatives
 --
 
-  WhoOne = intPronWho singular ;
-  WhoMany = intPronWho plural ;
-  WhatOne = intPronWhat singular ;
-  WhatMany = intPronWhat plural ;
+  IDetCN d n = nounPhraseInt (detNounPhrase d n) ;
   FunIP = funIntPron ;
-  NounIPOne = nounIntPron singular ;
-  NounIPMany = nounIntPron plural ;
 
   QuestCl = questClause ;
   IntSlash = intSlash ;
@@ -147,6 +148,9 @@ lin
   ImperMany = imperUtterance plural ;
 
   AdvCl = advClause ;
+  AdvVP = advVerbPhrase ;
+
+  AdCPhr = advSentence ;
   AdvPhr = advSentence ;
 
 
@@ -169,6 +173,11 @@ lin
   ConjNP = conjunctNounPhrase ;
   ConjDNP = conjunctDistrNounPhrase ;
 
+  TwoAdv = twoSentence ;
+  ConsAdv = consSentence ;
+  ConjAdv = conjunctSentence ;
+  ConjDAdv = conjunctDistrSentence ;
+
   SubjS = subjunctSentence ;
   SubjImper = subjunctImperative ;
   SubjQS = subjunctQuestion ;