new vocab updated for dan and nor (buggy)

lib/resource/abstract/TestResource.gf

@@ -6,7 +6,7 @@ fun
   Big, Happy, Small, Old, Young : ADeg ;
   American, Finnish : A ;
   Married : A2 ; 
-  Man, Woman, Car, House, Light, Bar, Bottle, Wine, Level : N ;
+  Man, Woman, Car, House, Light, Bar, Bottle, Wine : N ;
   Walk, Run : V ;
   Send, Wait, Love, Drink, SwitchOn, SwitchOff : V2 ;
   Give, Prefer : V3 ;

lib/resource/danish/SyntaxDan.gf

@@ -82,7 +82,7 @@ instance SyntaxDan of SyntaxScand = TypesDan **
   auxHar = "har" ;
   auxHade = "havde" ;
   auxHa = "have" ;
-  auxSka = "val" ;
+  auxSka = "vil" ;
   auxSkulle = "ville" ;
 
   infinAtt = "at" ;

lib/resource/danish/TestResourceDan.gf

@@ -1,6 +1,7 @@
 --# -path=.:../scandinavian:../abstract:../../prelude
 
-concrete TestResourceDan of TestResource = RulesDan, StructuralDan ** open MorphoDan, SyntaxDan in {
+concrete TestResourceDan of TestResource = RulesDan, StructuralDan ** 
+  open Prelude, MorphoDan, SyntaxDan in {
 
 flags startcat=Phr ; lexer=text ; unlexer=text ;
 
@@ -47,4 +48,22 @@ lin
 
   John = mkProperName "Johan" NUtr ;
   Mary = mkProperName "Maria" NUtr ;
+
+--- next
+   AlreadyAdv = advPre "allerede" ;
+   NowAdv = advPre "nu" ;
+
+   Paint = extTransVerb (vNopart (vHusk "mål")) [] ;
+   Green = mkAdjective "grøn" "grønt" "grøne" "grønnere" "grønnest" ;
+
+   Beg = extTransVerb (mkVerb "bede" "beder" "bedes" "bad" "bedt" "bed") [] ** {s3 = "at"} ;
+   Promise  = extTransVerb (vNopart (vSpis "lov")) [] ** {isAux = False} ;
+   Promise2 = extTransVerb (vNopart (vSpis "lov")) [] ** {s3 = "att"} ;
+   Wonder = extTransVerb (vNopart (vHusk "undr")) [] ;
+   Ask = extTransVerb (mkVerb "spørge" "spørger""spørges""spurgte""spurgt""spørg") [] ;
+   Tell = extTransVerb (mkVerb "fortælle" "fortæller" "fortælles"
+   "fortalte" "fortalt" "fortæll") [] ;
+   Look = extTransVerb (mkVerb "se" "ser" "ses" "så" "set" "sedd") []
+   ; ---- ut
+
 } ;

lib/resource/norwegian/TestResourceNor.gf

@@ -1,6 +1,7 @@
 --# -path=.:../scandinavian:../abstract:../../prelude
 
-concrete TestResourceNor of TestResource = RulesNor, StructuralNor ** open MorphoNor, SyntaxNor in {
+concrete TestResourceNor of TestResource = RulesNor, StructuralNor **
+  open Prelude, MorphoNor, SyntaxNor in {
 
 flags startcat=Phr ; lexer=text ; unlexer=text ;
 
@@ -32,7 +33,7 @@ lin
   Give = extTransVerb (vNopart (mkVerb "gi" "gir" "gives" "gav" "givet" "gi")) [] ** {s3 = "til"} ; ---- ?
   Prefer = extTransVerb (vNopart (vSpis "foretrekk")) [] ** {s3 = "for"} ;
 
-  Say = vNopart (mkVerb "si" "sier" "sies" "sagde" "sagt" "sig") ;  ---- ?
+  Say = vNopart (mkVerb "si" "sier" "sies" "sa" "sagt" "sig") ;  ---- ?
   Prove = vNopart (vSpis "bevis") ;
   SwitchOn = mkDirectVerb (vHusk "lukk" ** {s1 = "opp"}) ;
   SwitchOff = mkDirectVerb (vHusk "slukk" ** {s1 = []}) ;
@@ -46,4 +47,23 @@ lin
 
   John = mkProperName "Johan" (NUtr Masc) ;
   Mary = mkProperName "Maria" (NUtr NoMasc) ;
+
+--- next
+   AlreadyAdv = advPre "allerede" ;
+   NowAdv = advPre "nå" ;
+
+   Paint = extTransVerb (vNopart (vHusk "mål")) [] ;
+   Green = mkAdjective "grønn" "grønt" "grøne" "grønnere" "grønnest" ;
+
+   Beg = extTransVerb (mkVerb "be" "ber" "bes" "bad" "bedt" "be") [] ** {s3 = "at"} ;
+   Promise  = extTransVerb (vNopart (vSpis "lov")) [] ** {isAux = False} ;
+   Promise2 = extTransVerb (vNopart (vSpis "lov")) [] ** {s3 = "att"} ;
+   Wonder = extTransVerb (vNopart (vHusk "undr")) [] ;
+   Ask = extTransVerb (mkVerb "spørre" "spør""spørs""spurde""spurt""spør") [] ;
+   Tell = extTransVerb (mkVerb "fortelle" "forteller" "fortelles"
+   "fortalte" "fortalt" "fortell") [] ;
+   Look = extTransVerb (mkVerb "se" "ser" "ses" "så" "sett" "sedd") []
+   ; ---- ut
+
+
 } ;

lib/resource/swedish/TestResourceSwe.gf

@@ -52,7 +52,7 @@ lin
 
 --- next
    AlreadyAdv = advPre "redan" ;
-   NowAdv = advPre "now" ;
+   NowAdv = advPre "nu" ;
 
    Paint = extTransVerb (vNopart (vTala "mål")) [] ;
    Green = aFin "grön" ;