From ee24714756cd5070fd782f3d897ca61193822fe7 Mon Sep 17 00:00:00 2001
From: aarne <unknown>
Date: Wed, 9 Mar 2005 15:27:54 +0000
Subject: [PATCH] bug fixes in swe paradigms

---
 lib/resource/abstract/Resource.gf   |  1 +
 lib/resource/english/ResourceEng.gf |  3 ++-
 lib/resource/swedish/MorphoSwe.gf   | 21 +++++++++++++++------
 lib/resource/swedish/ResourceSwe.gf |  1 +
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/lib/resource/abstract/Resource.gf b/lib/resource/abstract/Resource.gf
index c675bc1ba..117b17478 100644
--- a/lib/resource/abstract/Resource.gf
+++ b/lib/resource/abstract/Resource.gf
@@ -1,3 +1,4 @@
 --# -path=.:../../prelude
 
+---- abstract Resource = Rules, Verbphrase ** {} ;
 abstract Resource = Rules, Clause, Structural ** {} ;
diff --git a/lib/resource/english/ResourceEng.gf b/lib/resource/english/ResourceEng.gf
index 95db5dcd2..ad54176b1 100644
--- a/lib/resource/english/ResourceEng.gf
+++ b/lib/resource/english/ResourceEng.gf
@@ -1,3 +1,4 @@
 --# -path=.:../abstract:../../prelude
 
-concrete ResourceEng of Resource = RulesEng, ClauseEng, StructuralEng ** {} ;
+concrete ResourceEng of Resource = RulesEng, ClauseEng,     StructuralEng ** {} ;
+---- concrete ResourceEng of Resource = RulesEng, VerbphraseEng ** {} ;
diff --git a/lib/resource/swedish/MorphoSwe.gf b/lib/resource/swedish/MorphoSwe.gf
index 61e35dcc6..0b64f1bf3 100644
--- a/lib/resource/swedish/MorphoSwe.gf
+++ b/lib/resource/swedish/MorphoSwe.gf
@@ -31,7 +31,8 @@ oper
    let 
      l  = last bil ;
      b  = Predef.tk 2 bil ; 
-     ar = Predef.dp 2 bilar 
+     ar = Predef.dp 2 bilar ;
+     bile = Predef.tk 2 bilar
    in 
    case ar of {
       "or" => case l of {
@@ -40,14 +41,21 @@ oper
          "o" => mkNoun bil (bil + "n")  bilar (bilar + "na") ;
          _   => mkNoun bil (bil + "en") bilar (bilar + "na")
          } ;
-      "ar" => ifTok Subst (Predef.tk 2 bilar) bil 
+      "ar" => ifTok Subst bil bilar 
+                (decl5Noun bil) 
+                (ifTok Subst bile bil 
                  (decl2Noun bil)
                  (case l of {
-                    "e" => decl2Noun bil ;
-                    _   => mkNoun bil (bil + "n") bilar (bilar + "na") 
+                    "e" => decl2Noun bil ; -- pojke-pojkar
+                    _   => mkNoun bil (bile + "en") bilar (bilar + "na") -- mun-munnar
                     }
-                 ) ;
-      "er" => decl3Noun bil ;
+                 )
+                ) ;
+      "er" => case l of {
+        "e" => sVarelse (init bil) ;
+        "å" => sNivå bil ;
+        _   => mkNoun bil (bil + "en") (bilar) (bilar + "na")
+      } ;
       "en" => ifTok Subst bil bilar (sLik bil) (sRike bil) ; -- ben-ben
       _ => ifTok Subst bil bilar (
              case Predef.dp 3 bil of {
@@ -77,6 +85,7 @@ oper
   decl2Noun : Str -> Subst = \bil ->
     case last bil of {
       "e" => sPojke (init bil) ;
+      "o" | "u" | "y" => mkNoun bil (bil + "n") (bil + "ar") (bil + "arna") ;
       _ => mkNoun bil (bil + "en") (bil + "ar") (bil + "arna")
       } ;
 
diff --git a/lib/resource/swedish/ResourceSwe.gf b/lib/resource/swedish/ResourceSwe.gf
index 0354275fc..79ac28114 100644
--- a/lib/resource/swedish/ResourceSwe.gf
+++ b/lib/resource/swedish/ResourceSwe.gf
@@ -1,4 +1,5 @@
 --# -path=.:../scandinavian:../abstract:../../prelude
 
+---- concrete ResourceSwe of Resource = RulesSwe, VerbphraseSwe ** {} ;
 concrete ResourceSwe of Resource = RulesSwe, StructuralSwe, ClauseSwe ** {} ;