Norwegian

lib/resource/danish/StructuralDan.gf

@@ -49,8 +49,8 @@ concrete StructuralDan of Structural =
 
   ThisDet  = mkDeterminerSgGender2 ["den her"] ["det her"] (DefP Indef) ;
   ThatDet  = mkDeterminerSgGender2 ["den der"] ["det der"] (DefP Indef) ;
-  TheseNumDet = mkDeterminerPlNum ["de her"] (DefP Def) ; 
-  ThoseNumDet = mkDeterminerPlNum ["de der"] (DefP Def) ; 
+  TheseNumDet = mkDeterminerPlNum ["de her"] (DefP Indef) ; 
+  ThoseNumDet = mkDeterminerPlNum ["de der"] (DefP Indef) ; 
 
   HowIAdv = ss "hvor" ;
   WhenIAdv = ss "hvornår" ;

lib/resource/danish/SyntaxDan.gf

@@ -82,8 +82,8 @@ instance SyntaxDan of SyntaxScand = TypesDan **
   auxHar = "har" ;
   auxHade = "havde" ;
   auxHa = "have" ;
-  auxSka = "skal" ;
-  auxSkulle = "skulle" ;
+  auxSka = "val" ;
+  auxSkulle = "ville" ;
 
   infinAtt = "at" ;
 
@@ -101,4 +101,15 @@ instance SyntaxDan of SyntaxScand = TypesDan **
   pronVems = "hvis" ; ---- ??
   pronVad = "hvad" ;
 
+--- added with Nor
+
+  conjGender : Gender -> Gender -> Gender = \m,n ->
+    case <m,n> of {
+      <Utr,Utr> => Utr ;
+      _ => Neutr
+      } ;
+
+  mkDeterminerSgGender3 : Str -> Str -> Str -> SpeciesP -> Determiner = \en,_,ett -> 
+    mkDeterminerSgGender (table {Utr => en ; Neutr => ett}) ;
+
 }

lib/resource/danish/TestResourceDan.gf

@@ -33,7 +33,7 @@ lin
   Prefer = extTransVerb (vNopart (vSpis "foretrækk")) [] ** {s3 = "for"} ;
 
   Say = vNopart (mkVerb "sige" "siger" "siges" "sagde" "sagt" "sig") ;
-  Prove = vNopart (vSpis "bevise") ;
+  Prove = vNopart (vSpis "bevis") ;
   SwitchOn = mkDirectVerb (vHusk "lukk" ** {s1 = "op"}) ;
   SwitchOff = mkDirectVerb (vHusk "slukk" ** {s1 = []}) ;
 

lib/resource/danish/TypesDan.gf

@@ -10,6 +10,7 @@
 instance TypesDan of TypesScand = {
 
 param
+  Gender  = Utr | Neutr ;
   NounGender = NUtr | NNeutr ;
 
 oper
@@ -17,6 +18,8 @@ oper
   sexNoun _ = NoMasc ;
   gen2nounGen = \s -> case s of {Utr => NUtr ; Neutr => NNeutr} ;
 
+  utrum = Utr ; neutrum = Neutr ;
+
 param
   AdjFormPos = Strong GenNum | Weak ;