From 5052c9bab0421a5e21a133bdd9e046bb8a806428 Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Wed, 25 Jan 2006 20:27:38 +0000
Subject: [PATCH] swedish lexicon fixes

---
 lib/resource-1.0/swedish/LexiconSwe.gf   | 6 +++---
 lib/resource-1.0/swedish/ParadigmsSwe.gf | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/resource-1.0/swedish/LexiconSwe.gf b/lib/resource-1.0/swedish/LexiconSwe.gf
index 7fb8a2450..c6593f30b 100644
--- a/lib/resource-1.0/swedish/LexiconSwe.gf
+++ b/lib/resource-1.0/swedish/LexiconSwe.gf
@@ -148,7 +148,7 @@ lin
   religion_N = mk2N "religion" "religioner" ;
   restaurant_N = mk2N "restaurang" "restauranger" ;
   river_N = mkN "å" "ån" "åar" "åarna" ;
-  rock_N = regN "sten" utrum ;
+  rock_N = mkN "sten" "stenen" "stenar" "stenarna" ;
   roof_N = regN "tak" neutrum ;
   rubber_N = mkN "gummi" "gummit" "gummin" "gummina" ;
   run_V = (irregV "springa" "sprang" "sprungit") ;
@@ -163,7 +163,7 @@ lin
   sheep_N = mk2N "får" "får" ;
   ship_N = regN "skepp" neutrum ;
   shirt_N = regN "skjorta" utrum ;
-  shoe_N = regN "sko" utrum ;
+  shoe_N = mk2N "sko" "skor" ;
   shop_N = mk2N "affär" "affären" ;
   short_A = regA "kort" ;
   silver_N = mkN "silver" "silvret" "silver" "silvren" ;
@@ -175,7 +175,7 @@ lin
   speak_V2 = dirV2 (regV "tala") ;
   star_N = regN "stjärna" utrum ;
   steel_N = regN "stål" utrum ;
-  stone_N = regN "sten" utrum ;
+  stone_N = mkN "sten" "stenen" "stenar" "stenarna" ;
   stove_N = regN "spis" utrum ;
   student_N = mk2N "student" "studenter" ;
   stupid_A = mk3A "dum" "dumt" "dumma" ;
diff --git a/lib/resource-1.0/swedish/ParadigmsSwe.gf b/lib/resource-1.0/swedish/ParadigmsSwe.gf
index bbcad51a8..3540a8ef9 100644
--- a/lib/resource-1.0/swedish/ParadigmsSwe.gf
+++ b/lib/resource-1.0/swedish/ParadigmsSwe.gf
@@ -318,9 +318,10 @@ oper
   decl2Noun : Str -> N = \bil ->
     let 
       bb : Str * Str = case bil of {
-        pojk + "e"                       => <pojk + "ar",    bil + "n"> ;
-        nyck + "e" + l@("l" | "r" | "n") => <nyck + l + "ar",bil + "n"> ;
-        _                                => <bil + "ar",     bil + "en">
+        pojk + "e"                 => <pojk + "ar",    bil  + "n"> ;
+        nyck + "e" + l@("l" | "r") => <nyck + l + "ar",bil  + "n"> ;
+        sock + "e" + "n"           => <sock + "nar",   sock + "nen"> ;
+        _                          => <bil + "ar",     bil  + "en">
         } ;
     in mkN bil bb.p2 bb.p1 (bb.p1 + "na") ;