Norwegian

lib/resource-1.0/swedish/LexiconSwe.gf

@@ -46,7 +46,7 @@ lin
   cheese_N = regN "ost" utrum ;
   child_N = regN "barn" neutrum ;
   church_N = regN "kyrka" utrum ;
-  city_N = mk2N "stad" "städer" ;
+  city_N = mkN "stad" "staden" "städer" "städerna" ;
   clean_A = regA "ren" ;
   clever_A = regA "klok" ;
   close_V2 = dirV2 (mk2V "stänga" "stängde") ;
@@ -55,7 +55,7 @@ lin
   come_V = (mkV "komma" "kommer" "kom" "kom" "kommit" "kommen") ;
   computer_N = mk2N "dator" "datorer" ;
   country_N = mkN "land" "landet" "länder" "länderna" ;
-  cousin_N = mk2N "kusin" "kusinerna" ;
+  cousin_N = mk2N "kusin" "kusiner" ;
   cow_N = mk2N "ko" "kor" ;
   die_V = (mkV "dö" "dör" "dö" "dog" "dött" "dödd") ; ----
   distance_N3 = mkN3 (mk2N "avstånd" "avstånd") "från" "till" ;
@@ -125,7 +125,6 @@ lin
   narrow_A = regA "smal" ;
   new_A = mkA "ny" "nytt" "nya" "nya" "nyare" "nyast" "nyaste" ;
   newspaper_N = regN "tidning" utrum ;
-
   oil_N = regN "olja" utrum ;
   old_A = mkA "gammal" "gammalt" "gamla" "gamla" "äldre" "äldst" "äldsta" ;
   open_V2 = dirV2 (regV "öppna") ;
@@ -141,7 +140,7 @@ lin
   priest_N = mk2N "präst" "präster" ;
   probable_AS = mkAS (regA "sannolik") ;
   queen_N = regN "drottning" utrum ;
-  radio_N = regN "radio" utrum ; ----
+  radio_N = mkN "radio" "radion" "radioapparater" "radioapparaterna" ; -- SAOL
   rain_V0 = mkV0 (regV "regna") ;
   read_V2 = dirV2 (mk2V "läsa" "läste") ;
   red_A = mk2A "röd" "rött" ;

lib/resource-1.0/swedish/NumeralSwe.gf

@@ -13,7 +13,7 @@ lin
   n3 = mkTal  "tre"  "tretton" "trettio" "tredje"  "trettonde" ;
   n4 = mkTal  "fyra" "fjorton" "fyrtio"  "fjärde"  "fjortonde" ;
   n5 = mkTal  "fem"  "femton"  "femtio"  "femte"   "femtonde" ;
-  n6 = mkTal  "sex"  "sexton"  "sextion" "sjätte"  "sextonde" ;
+  n6 = mkTal  "sex"  "sexton"  "sextio"  "sjätte"  "sextonde" ;
   n7 = mkTal  "sju"  "sjutton" "sjuttio" "sjunde"  "sjuttonde" ;
   n8 = mkTal  "åtta" "arton"   "åttio"   "åttonde" "artonde" ;
   n9 = mkTal  "nio"  "nitton"  "nittio"  "nionde"  "nittonde" ;
@@ -39,7 +39,7 @@ lin
     {s = \\g => d.s ! ental ! invNum ++ "hundra" ++ e.s ! g ; n = Pl} ;
   pot2as3 n = n ;
   pot3 n = 
-    numPl (\\g => n.s ! invNum ++ "tusen" ++ cardOrd "tusen" "tusende" ! g) ;
+    numPl (\\g => n.s ! invNum ++ cardOrd "tusen" "tusende" ! g) ;
   pot3plus n m = 
     {s = \\g => n.s ! invNum ++ "tusen" ++ m.s ! g ; n = Pl} ;
 

lib/resource-1.0/swedish/ParadigmsSwe.gf

@@ -78,6 +78,11 @@ oper
 
   mk2N : (nyckel,nycklar : Str) -> N ;
 
+-- This heuristic takes just the plural definite form and infers the others.
+-- It does not work if there are changes in the stem.
+
+  mk1N : (bilarna : Str) -> N ;
+  
 
 --3 Compound nouns 
 --
@@ -296,6 +301,14 @@ oper
       }
     } ** {lock_N = <>} ;
 
+  mk1N bilarna = case bilarna of {
+    ap  + "orna" => decl1Noun (ap + "a") ;
+    bil + "arna" => decl2Noun bil ;
+    rad + "erna" => decl3Noun rad ;
+    rik +  "ena" => decl4Noun (rik + "e") ;
+    husen        => decl5Noun (Predef.tk 2 husen)
+    } ;
+
   mk2N bil bilar = 
    ifTok N bil bilar (decl5Noun bil) (
      case Predef.dp 2 bilar of {
@@ -442,14 +455,13 @@ oper
   depV v = {s = v.s ; vtype = VPass ; lock_V = <>} ;
   reflV v = {s = v.s ; vtype = VRefl ; lock_V = <>} ;
 
-  mkV2 v p = v ** {s = v.s ; c2 = p ; lock_V2 = <>} ;
+  mkV2 v p = v ** {c2 = p ; lock_V2 = <>} ;
   dirV2 v = mkV2 v [] ;
 
-  mkV3 v p q = v ** {s = v.s ; c2 = p ; c3 = q ; lock_V3 = <>} ;
+  mkV3 v p q = v ** {c2 = p ; c3 = q ; lock_V3 = <>} ;
   dirV3 v p = mkV3 v [] p ;
   dirdirV3 v = dirV3 v [] ;
 
-
   mkV0  v = v ** {lock_V0 = <>} ;
   mkVS  v = v ** {lock_VS = <>} ;
   mkVV  v = v ** {c2 = "att" ; lock_VV = <>} ;