romance under reconstruction

lib/resource/scandinavian/CategoriesScand.gf

@@ -43,7 +43,7 @@ lincat
 
   VS     = Verb ;
   VQ     = Verb ;
-  VV     = Verb ** {s3 : Str} ;
+  VV     = Verb ** {isAux : Bool} ;
   VA     = Verb ;
 
   V2S    = TransVerb ;
@@ -69,9 +69,11 @@ lincat
   Cl     = Clause ;
       -- = {s : Bool => SForm => Order => Str} ;
   Slash  = Clause ** {s2 : Preposition} ;
+
   RP     = {s : RelCase => GenNum => Str ; g : RelGender} ;
   RS     = {s :                  GenNum => Person => Str} ;
   RCl    = {s : Bool => SForm => GenNum => Person => Str} ;
+
   IP     = NounPhrase ;
   IDet   = {s : NounGender => Str ; n : Number ; b : SpeciesP} ;
   QS     = {s :                  QuestForm => Str} ;
@@ -88,4 +90,6 @@ lincat
   ListNP = {s1,s2 : NPForm => Str ; g : Gender ; n : Number ; p : Person} ;
   ListAdv = {s1,s2 : Str} ; 
 
+  Subj    = {s : Str} ;
+
 }

lib/resource/scandinavian/RulesScand.gf

@@ -51,7 +51,7 @@ lin
   ComparADeg = comparAdjPhrase ;
   SuperlNP = superlNounPhrase ;
 
--- verbs and verb phrases
+-- verbs and verb phrases mostly in $Clause$
 
   PredAS = predAdjSent ;
   PredV0 = predVerb0 ;
@@ -65,7 +65,7 @@ lin
 
   AdjPart = adjPastPart ;
 
-  UseV2V x = x ;
+  UseV2V x = x ** {isAux = False} ;
   UseV2S x = x ;
   UseV2Q x = x ;
   UseA2S x = x ;
@@ -119,12 +119,6 @@ lin
 
   IDetCN d n = detNounPhrase d n ;
   FunIP = funIntPron ;
---  NounIPOne = nounIntPron singular ;
---  NounIPMany = nounIntPron plural ;
---  WhoOne = intPronWho singular ;
---  WhoMany = intPronWho plural ;
---  WhatOne = intPronWhat singular ;
---  WhatMany = intPronWhat plural ;
 
   QuestCl = questClause ;
   IntSlash = intSlash ;

lib/resource/scandinavian/SyntaxScand.gf

@@ -855,18 +855,19 @@ oper
 -- ("försöka"); this distinction cannot be done in the multilingual
 -- API and leads to some anomalies in Swedish, but less so than in English.
 
-  VerbVerb : Type = Verb ** {s3 : Str} ;
+  VerbVerb : Type = Verb ** {isAux : Bool} ;
 
   complVerbVerb : VerbVerb -> VerbPhrase -> VerbGroup = \vilja, simma ->
     useVerb vilja 
       (\\g,n,p => 
               vilja.s1 ++
-              vilja.s3 ++
+              if_then_Str vilja.isAux [] "att" ++ ---- vilja.s3 ++
               simma.s ! VIInfinit ! g ! n ! p) ;
 
   transVerbVerb : VerbVerb -> TransVerb -> TransVerb = \vilja,hitta ->
     {s  = vilja.s ;
-     s1 = vilja.s1 ++ vilja.s3 ++
+     s1 = vilja.s1 ++ 
+          if_then_Str vilja.isAux [] "att" ++ ---- vilja.s3 ++
           hitta.s ! VI (Inf Act) ++ hitta.s1 ;
      s2 = hitta.s2
     } ;
@@ -927,7 +928,7 @@ oper
     \jag,vilja,se ->
       predVerbGroupClause jag (useVerb vilja (\\g,n,p => 
               vilja.s1 ++
-              vilja.s3 ++
+              if_then_Str vilja.isAux [] "att" ++ ---- vilja.s3 ++
               se.s ! VI (Inf Act))
               )  ** {s2 = se.s2} ;