Norwegian checked

examples/stoneage/StoneageNor.gf

@@ -2,8 +2,6 @@
 concrete StoneageNor of Stoneage 
   = open SyntaxNor, ResourceNor, ParadigmsNor, VerbsNor, SwadeshLexNor, StoneageResNor in {
 
---- rough-translated from Swedish by AR 11/3/2005. To be fixed soon.
-
 flags
   startcat=S; optimize=share;
 

lib/resource/norwegian/BasicNor.gf

@@ -5,7 +5,6 @@ concrete BasicNor of Basic = CategoriesNor ** open ParadigmsNor,VerbsNor in {
 flags startcat=Phr ; lexer=textlit ; parser=chart ; unlexer=text ;
   optimize=values ;
 
---- rough-translated from Swedish by AR 11/3/2005. To be fixed soon.
 
 lin
   airplane_N = mk2N "fly" "flyet" ;

lib/resource/norwegian/MorphoNor.gf

@@ -121,7 +121,12 @@ extractPositive : Adj -> {s : AdjFormPos => Case => Str} = \adj ->
     mkVerb (spis + "e") (spis + "er") (spis + "es") (spis + "te") (spis + "t") spis ;
 
   vLev : Str -> Verbum = \lev ->
-    mkVerb (lev + "e") (lev + "er") (lev + "es") (lev + "de") (lev + "d") lev ;
+    let lever = case last lev of {
+      "r" => lev ;
+      _   => lev + "er"
+      }
+    in 
+    mkVerb (lev + "e") lever (lev + "es") (lev + "de") (lev + "d") lev ;
 
   vBo : Str -> Verbum = \bo -> 
     mkVerb bo (bo + "r") (bo + "es") (bo + "dde") (bo + "dd") bo ;
@@ -142,7 +147,14 @@ extractPositive : Adj -> {s : AdjFormPos => Case => Str} = \adj ->
 
   irregVerb : (drikke,drakk,drukket : Str) -> Verbum = 
     \drikke,drakk,drukket ->
-    mkVerb drikke (drikke + "r")  (drikke + "s") drakk drukket (init drikke) ; 
+    let
+      drikk = init drikke ;
+      drikker = case last (init drikke) of {
+        "r" => drikk ;
+        _   => drikke + "r"
+        }
+    in 
+    mkVerb drikke drikker  (drikke + "s") drakk drukket drikk ; 
 
 -- pronouns
 

lib/resource/norwegian/StructuralNor.gf

@@ -65,7 +65,7 @@ concrete StructuralNor of Structural =
   some_NDet = mkDeterminerPlNum "noen" IndefP ;
   something_NP = nameNounPhrase (mkProperName "noe" NNeutr) ;
   somewhere_Adv = advPost ["et eller annet sted"] ; ---- ?
-  that_Det = mkDeterminerSgGender2 ["den der"] ["det der"] (DefP Indef) ;
+  that_Det = mkDeterminerSgGender2 ["den der"] ["det der"] (DefP Def) ;
   that_NP = regNameNounPhrase ["det"] NNeutr ;
   therefore_Adv = ss "derfor" ;
   these_NDet = mkDeterminerPlNum ["disse"] (DefP Def) ;

lib/resource/norwegian/SwadeshLexNor.gf

@@ -4,8 +4,6 @@ concrete SwadeshLexNor of SwadeshLex = CategoriesNor
   ** open ResourceNor, SyntaxNor, ParadigmsNor, VerbsNor, 
           BasicNor, Prelude in {
 
---- rough-translated from Swedish by AR 11/3/2005. To be fixed soon.
-
   lin
 
     -- Pronouns
@@ -136,77 +134,75 @@ concrete SwadeshLexNor of SwadeshLex = CategoriesNor
     hair_N = mk2N "hår" "håret" ;
     hand_N = mk2N "hånd" "hånden" ;
 
----- fixed till here AR
+    head_N = mk2N "hode" "hodet" ;
-    head_N = mkN "huvud" "huvudet" "huvuden" "huvudene" ;
+    heart_N = mk2N "hjerte" "hjertet" ;
-    heart_N = mkN "hjerte" "hjertat" "hjertan" "hjertane" ;
+    horn_N = mk2N "horn" "hornet" ;
-    horn_N = mk2N "horn" "horn" ;
+    husband_N = mkN "ektemann" "ektemannen" "ektemenn" "ektemennen" ;
-    husband_N = mk2N "make" "maken" ;
     ice_N = mk2N "is" "isen" ;
-    knee_N = mkN "kne" "kneet" "knen" "knene" ;
+    knee_N = mkN "kne" "kneet" "knær" "knæne" ;
     lake_N = lake_N ;
-    leaf_N = mk2N "løv" "løv" ;
+    leaf_N = mk2N "løv" "løvet" ;
-    leg_N = mk2N "ben" "ben" ;
+    leg_N = mk2N "bein" "beinet" ;
-    liver_N = mk2N "lever" "levren" ;
+    liver_N = mkN "lever" "leveren" "levrer" "levrene" ;
-    louse_N = mkN "lus" "lusen" "løss" "løssen" ;
+    louse_N = mk2N "lus" "lusa" ;
     man_N = man_N ;
     meat_N = meat_N ;
     moon_N = moon_N ;
-    mother_N = mkN "mor" "modern" "mødrar" "mødrarne" ;
+    mother_N = mkN "mor" "moren" "mødre" "mødrene" ;
 --    mother_N = UseN2 mother_N2 ;
     mountain_N = mountain_N ;
-    mouth_N = mk2N "mun" "munnen" ;
+    mouth_N = mk2N "munn" "munnen" ;
-    name_N = mk2N "namn" "namn" ;
+    name_N = mk2N "navn" "navnet" ;
-    neck_N = mk2N "nacke" "nacken" ;
+    neck_N = mk2N "nakke" "nakken" ;
-    night_N = mk2N "natt" "netter" ;
+    night_N = mkN "natt" "natta" "netter" "nettene" ;
-    nose_N = mk2N "nese" "nesa" ; 
+    nose_N = mk2N "nese" "nesen" ; 
-    person_N = mk2N "person" "personer" ;
+    person_N = mk2N "person" "personen" ;
-    rain_N = mk2N "regn" "regn" ;
+    rain_N = mk2N "regn" "regnet" ;
     river_N = river_N ;
-    road_N = mk2N "veg" "vegen" ;
+    road_N = mk2N "vei" "veien" ;
-    root_N = mk2N "rot" "røtter" ;
+    root_N = mkN "rot" "rota" "røtter" "røttene" ;
-    rope_N = mk2N "rep" "rep" ;
+    rope_N = mk2N "tau" "tauet" ;
-    salt_N = mk2N "salt" "salter" ;
+    salt_N = mk2N "salt" "saltet" ;
-    sand_N = mk2N "sand" "sander" ;
+    sand_N = mk2N "sand" "sanden" ;
     sea_N = sea_N ;
-    seed_N = mk2N "frø" "frøn" ;
+    seed_N = mk2N "frø" "frøet" ;
-    skin_N = mk2N "skinn" "skinn" ;
+    skin_N = mk2N "skinn" "skinnet" ;
-    sky_N = mk2N "himmel" "himlen" ; 
+    sky_N = mkN "himmel" "himmelen" "himler" "himlene" ; 
-    smoke_N = mk2N "røk" "røken" ;
+    smoke_N = mk2N "røyk" "røyken" ;
     snake_N = snake_N ;
-    snow_N = mkN "snø" "snøn" "snøer" "snøerne" ;
+    snow_N = mk2N "snø" "snøen" ;
     star_N = star_N ;
     stick_N = mk2N "pinne" "pinnen" ;
     stone_N = stone_N ;
     sun_N = sun_N ;
-    tail_N = mk2N "svans" "svansen" ;
+    tail_N = mk2N "hale" "halen" ;
     tongue_N = mk2N "tunge" "tunga" ; 
-    tooth_N = mk2N "tand" "tender" ;
+    tooth_N = mkN "tann" "tanna" "tenner" "tennene" ;
     tree_N = tree_N ;
     water_N = water_N ;
-    wife_N = mk2N "fru" "fruen" ;
+    wife_N = mk2N "kone" "kona" ;
     wind_N = mk2N "vind" "vinden" ;
     wing_N = mk2N "vinge" "vingen" ;
     woman_N = woman_N ;
-    worm_N = mk2N "mask" "masken" ;
+    worm_N = mk2N "mark" "marken" ;
-    year_N = mk2N "år" "år" ;
+    year_N = mk2N "år" "året" ;
 
     -- Verbs
 
     bite_V = VerbsNor.bite_V ;
     blow_V = mk2V "blåse" "blåste" ;
-    breathe_V = depV (regV "ande") ;
+    breathe_V = regV "puste" ;
     burn_V = brenne_V ;
     come_V = komme_V ;
-    count_V = regV "rekne" ;
+    count_V = regV "regne" ;
     cut_V = skjære_V ;
     die_V = dø_V ;
-    dig_V = mk2V "greve" "grevde" ;
+    dig_V = mk2V "grave" "gravde" ;
     drink_V = drikke_V ;
     eat_V = mk2V "spise" "spiste" ; ---- ete
     fall_V = falle_V ;
-    fear_V = regV "frukte" ;
+    fear_V = regV "frykte" ;
-      -- FIXME: passive forms are very strange
+    fight_V = slåss_V ;
-    fight_V = mkV "slåss" "slåss" "slåss" "slogs" "slagits" "slagen" ;
     float_V = flyte_V ;
     flow_V = renne_V ;
     fly_V = fly_V ;
@@ -215,25 +211,25 @@ concrete SwadeshLexNor of SwadeshLex = CategoriesNor
     hear_V = mk2V "høre" "hørde" ;
     hit_V = slå_V;
     hold_V = holde_V ;
-    hunt_V = regV "jage" ;
+    hunt_V = regV "jakte" ;
-    kill_V = regV "døde" ;
+    kill_V = mk2V "drepe" "drepte" ;
     know_V = vite_V ;
-    laugh_V = regV "skratte" ;
+    laugh_V = mkV "le" "ler" "les" "lo" "ledd" "le" ;
     lie_V = ligge_V ;
     live_V = mk2V "leve" "levde" ;
     play_V = mk2V "leke" "lekte" ;
     pull_V = dra_V ;
-    push_V = mk2V "trykke" "trykte" ;
+    push_V = irregV "skyve" "skjøv" "skjøvet" ;
     rub_V = gni_V ;
     say_V = si_V ;
-    scratch_V = regV "klie" ;
+    scratch_V = regV "klø" ;
     see_V = se_V ;
     sew_V = mk2V "sy" "sydde" ;
     sing_V = synge_V ;
     sit_V = sitte_V ;
     sleep_V = sove_V ;
     smell_V = regV "lukte" ;
-    spit_V = regV "spotte" ;
+    spit_V = regV "spytte" ;
     split_V = mk2V "kløyve" "kløyvde" ;
     squeeze_V = mk2V "klemme" "klemte" ;
     stab_V = stikke_V ;