From 0051dd7a966f38536488d8b284670fef989a89ac Mon Sep 17 00:00:00 2001
From: bringert <unknown>
Date: Wed, 9 Mar 2005 15:57:00 +0000
Subject: [PATCH] Remove som compound stuff that should not be in the swadesh
 lists.

---
 lib/resource/abstract/SwadeshLex.gf   |  6 ------
 lib/resource/english/SwadeshLexEng.gf |  6 ------
 lib/resource/swedish/SwadeshLexSwe.gf | 12 ++++--------
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/lib/resource/abstract/SwadeshLex.gf b/lib/resource/abstract/SwadeshLex.gf
index dabc214ff..98c547583 100644
--- a/lib/resource/abstract/SwadeshLex.gf
+++ b/lib/resource/abstract/SwadeshLex.gf
@@ -169,10 +169,6 @@ abstract SwadeshLex = Categories ** {
     worm_N : N ;
     year_N : N ;
 
-    name_N2 : N2 ;
-    mother_N2 : N2 ;
-    father_N2 : N2 ;
-
     -- Verbs
 
     bite_V : V ;
@@ -232,6 +228,4 @@ abstract SwadeshLex = Categories ** {
     wash_V : V ;
     wipe_V : V ;
 
-    give_V3 : V3 ;
-
 }
\ No newline at end of file
diff --git a/lib/resource/english/SwadeshLexEng.gf b/lib/resource/english/SwadeshLexEng.gf
index 8a7f6f494..6e5069f11 100644
--- a/lib/resource/english/SwadeshLexEng.gf
+++ b/lib/resource/english/SwadeshLexEng.gf
@@ -176,10 +176,6 @@ concrete SwadeshLexEng of SwadeshLex = CategoriesEng
     worm_N = regN "worm" ;
     year_N = regN "year" ;
 
-    name_N2 = mkN2 (regN "name") "of" ;
-    mother_N2 = mother_N2 ;
-    father_N2 = father_N2 ;
-
     -- Verbs
 
     bite_V = bite_V ;
@@ -239,6 +235,4 @@ concrete SwadeshLexEng of SwadeshLex = CategoriesEng
     wash_V = regV "wash" ;
     wipe_V = regV "wipe" ;
 
-    give_V3 = dirV3 give_V "to" ;
-
 }
\ No newline at end of file
diff --git a/lib/resource/swedish/SwadeshLexSwe.gf b/lib/resource/swedish/SwadeshLexSwe.gf
index 2bec1acb9..9f55f713d 100644
--- a/lib/resource/swedish/SwadeshLexSwe.gf
+++ b/lib/resource/swedish/SwadeshLexSwe.gf
@@ -111,7 +111,8 @@ concrete SwadeshLexSwe of SwadeshLex = CategoriesSwe
     egg_N = mk2N "ägg" "ägg" ;
     eye_N = mkN "öga" "ögat" "ögon" "ögonen" ;
     fat_N = mk2N "fett" "fetter" ;
---    father_N = UseN2 father_N2 ;
+--    father_N = mascN (mkN "far" "fadern" "fäder" "fäderna") ; 
+    father_N = UseN2 father_N2 ;
     feather_N = mk2N "fjäder" "fjädrar" ;
     fingernail_N = mk2N "nagel" "naglar" ;
     fire_N = mk2N "eld" "eldar" ;
@@ -139,7 +140,8 @@ concrete SwadeshLexSwe of SwadeshLex = CategoriesSwe
     man_N = man_N ;
     meat_N = meat_N ;
     moon_N = moon_N ;
---    mother_N = UseN2 mother_N2 ;
+--    mother_N = mkN "mor" "modern" "mödrar" "mödrarna" ;
+    mother_N = UseN2 mother_N2 ;
     mountain_N = mountain_N ;
     mouth_N = mk2N "mun" "munnar" ;
     name_N = mk2N "namn" "namn" ;
@@ -177,10 +179,6 @@ concrete SwadeshLexSwe of SwadeshLex = CategoriesSwe
     worm_N = mk2N "mask" "maskar" ;
     year_N = mk2N "år" "år" ;
 
---    name_N2 = mkN2 (mk2N "namn" "namn") "på" ;
-    mother_N2 = mother_N2 ;
-    father_N2 = father_N2 ;
-
     -- Verbs
 
     bite_V = bita_V ;
@@ -240,6 +238,4 @@ concrete SwadeshLexSwe of SwadeshLex = CategoriesSwe
     wash_V = regV "tvätta" ;
     wipe_V = regV "torka" ;
 
-    give_V3 = dirV3 giva_V "to" ;
-
 }
\ No newline at end of file