From 5e70b381bca27310d2b2c5567c63b57bf9150579 Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Sat, 10 Jan 2015 17:50:54 +0000
Subject: [PATCH] some fixes in DictionarySwe ; in ParadigmsSwe, a compounding
 function mkN : Str -> N -> N

---
 lib/src/swedish/ParadigmsSwe.gf     | 10 ++++++++++
 lib/src/translator/DictionarySwe.gf |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/src/swedish/ParadigmsSwe.gf b/lib/src/swedish/ParadigmsSwe.gf
index b592fd656..aa755c5c7 100644
--- a/lib/src/swedish/ParadigmsSwe.gf
+++ b/lib/src/swedish/ParadigmsSwe.gf
@@ -101,6 +101,8 @@ oper
 -- such as "fotboll", just given as one argument. But compound nouns can be formed from their parts as well,
 
     mkN : (regering, makt : N) -> N ;   -- regeringsmakt, using the co form of regering
+
+    mkN : Str -> N -> N ;   -- över + flöde
     } ;
 
 -- The default compound form can be changed:
@@ -365,6 +367,14 @@ oper
         co => a.co + co + "s"
         }
       } ;
+    mkN : Str -> N -> N = \a,b -> lin N {
+      s = \\n,d,c => a + b.s ! n ! d ! c ;
+      g = b.g ;
+      co = case b.co  of {
+        _ + "s" => a + b.co ;
+        co => a + co + "s"
+        }
+      } ;
     } ;
 
 -- The default compound form can be changed:
diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf
index c1aed5e97..68632bc90 100644
--- a/lib/src/translator/DictionarySwe.gf
+++ b/lib/src/translator/DictionarySwe.gf
@@ -20507,7 +20507,7 @@ lin falsetto_N = mkN "falsett" ; -- SaldoWN
 lin falsie_N = variants {} ; -- status=guess
 lin falsification_N = mkN "förfalskning" ; -- status=guess
 lin falsifier_N = variants {} ; -- status=guess
-lin falsify_V2 = mkV2 (mkV (mkV ":") "falsifiera") ; -- status=guess, src=wikt
+lin falsify_V2 = mkV2 (mkV "falsifiera") ; -- status=guess, src=wikt
 lin falsity_N = variants {} ; -- status=guess
 lin falter_V = mkV "vacklar" ; -- comment=3
 lin falter_V2 = variants {} ; -- status=guess
@@ -32723,7 +32723,7 @@ lin locator_N = variants {} ; -- status=guess
 lin loch_N = mkN "sjö" ; -- comment=4
 lin lochgelly_PN = mkPN "Lochgelly" neutrum ; -- src=geonames status=guess
 lin lochia_N = variants {} ; -- status=guess
-lin lock_N = mkN "lås" | mkN "spärr" ; -- SaldoWN -- comment=9
+lin lock_N = mkN "lås" "lås" | mkN "spärr" ; -- SaldoWN -- comment=9
 lin lock_V = mkV "omfamnar" ; -- comment=5
 lin lock_V2 = dirV2 (partV (mkV "låser")"in") ; -- comment=3
 lin lock_away_V2 = dirV2 (partV (mkV "låser")"in") ; -- comment=3