scandinavian topological sentence model

lib/resource/english/CategoriesEng.gf

@@ -75,6 +75,7 @@ lincat
   Tense  = {s : Str ; t : Tense} ;
   Ant    = {s : Str ; a : Anteriority} ;
 
+  PP     = {s : Str} ;
   Adv    = {s : Str} ;
   AdV    = {s : Str} ;
   AdA    = {s : Str} ;
@@ -90,7 +91,7 @@ lincat
 
   IP     = {s : NPForm => Str ; n : Number ; g : Gender} ;
   IDet   = {s : Str ; n : Number} ;
-  IAdv   = {s : Str } ;
+  IAdv   = {s : Str} ;
   QCl    = {s : Bool => SForm => QuestForm => Str} ;
   QS     = {s :                  QuestForm => Str} ;
   Imp    = {s : Number => Str} ;

lib/resource/english/ClauseEng.gf

@@ -25,7 +25,7 @@ concrete ClauseEng of Clause = CategoriesEng **
   SPredSuperl np a = predBeGroup np (complAdjective (superlAdjPhrase a)) ;
   SPredCN np v = predBeGroup np (complCommNoun v) ;
   SPredNP np v = predBeGroup np (complNounPhrase v) ;
-  SPredPP np v = predBeGroup np (complAdverb v) ;
+  SPredAdv np v = predBeGroup np (complAdverb v) ;
 
   SPredAV np v x = predBeGroup np (complVerbAdj v x) ;
   SPredObjA2V np v x y = predBeGroup np (complVerbAdj2 True v x y) ;
@@ -52,7 +52,7 @@ concrete ClauseEng of Clause = CategoriesEng **
   QPredSuperl np a = predBeGroupQ np (complAdjective (superlAdjPhrase a)) ;
   QPredCN np v = predBeGroupQ np (complCommNoun v) ;
   QPredNP np v = predBeGroupQ np (complNounPhrase v) ;
-  QPredPP np v = predBeGroupQ np (complAdverb v) ;
+  QPredAdv np v = predBeGroupQ np (complAdverb v) ;
   QPredAV np v x = predBeGroupQ np (complVerbAdj v x) ;
   QPredObjA2V np v x y = predBeGroupQ np (complVerbAdj2 True v x y) ;
 

lib/resource/english/SimpleEng.gf

@@ -0,0 +1,8 @@
+--# -path=.:../abstract:../../prelude
+
+concrete SimpleEng of Simple = CategoriesEng ** SimpleI with
+  (Categories = CategoriesEng),
+  (Rules = RulesEng),
+  (Structural = StructuralEng),
+  (Verbphrase = VerbphraseEng)
+  ;

lib/resource/english/SimpleLangEng.gf

@@ -0,0 +1,21 @@
+--# -path=.:../abstract:../../prelude
+
+concrete SimpleLangEng of SimpleLang = 
+  SimpleEng, 
+  StructuralEng,
+  BasicEng,
+  TimeEng,
+  CountryEng
+
+   ** open Prelude, ParadigmsEng in {
+
+lin
+  AdvDate d = prefixSS "on" d ;
+  AdvTime t = prefixSS "at" t ;
+  NWeekday w = w ;
+  PNWeekday w = nounPN w ;
+
+  PNCountry x = x ;
+  ANationality x = x ;
+  NLanguage x = x ;
+}

lib/resource/english/SyntaxEng.gf

@@ -668,7 +668,6 @@ oper
 
   param Order = Dir | Inv ;
 
-  ---- compiles to 4k lines gfr. also relSlash, relVerbPhrase are bad
   oper
   Verbal = VForm => Agr => Str ;
 
@@ -701,12 +700,12 @@ oper
        Inv => \\b,sf =>  
          let
            does = vp.s  ! b ! sf ! ag ;
-           walk = vp.s2 ! b ! sf ! ag
+           walk = vp.s2 ! False ! sf ! ag
          in
          case sf of {
            VFinite t Simul => case b of {
-             True => auxTense b t ag ++ it ++ walk ;
-             _    => does            ++ it ++ walk
+             True => if_then_Str vp.isAux does (auxTense b t ag)++ it ++ walk ;
+             _    => does ++ it ++ walk
             } ;
            _ => does ++ it ++ walk
            }

lib/resource/english/VerbphraseEng.gf

@@ -41,7 +41,7 @@ concrete VerbphraseEng of Verbphrase = CategoriesEng **
   PredSuperl a = predClauseBeGroup (complAdjective (superlAdjPhrase a)) ;
   PredCN v = predClauseBeGroup (complCommNoun v) ;
   PredNP v = predClauseBeGroup (complNounPhrase v) ;
-  PredPP v = predClauseBeGroup (complAdverb v) ;
+  PredAdv v = predClauseBeGroup (complAdverb v) ;
 
   PredAV v x = predClauseBeGroup (complVerbAdj v x) ;
   PredObjA2V v x y = predClauseBeGroup (complVerbAdj2 True v x y) ;