From 04f9a50da0d400e63b94ea715ad3c2094a2cf146 Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Mon, 7 Apr 2014 20:23:11 +0000
Subject: [PATCH] some new ParadigmsFre and DictionarySwe

---
 lib/src/french/ParadigmsFre.gf      | 10 +++++++++-
 lib/src/translator/DictionarySwe.gf | 26 +++++++++++++-------------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/lib/src/french/ParadigmsFre.gf b/lib/src/french/ParadigmsFre.gf
index 329cf7c94..52a86d507 100644
--- a/lib/src/french/ParadigmsFre.gf
+++ b/lib/src/french/ParadigmsFre.gf
@@ -232,6 +232,10 @@ oper
 -- reused as one-place verbs.
 
     mkV : V2 -> V ; -- make 2-place to 1-place (e.g. from IrregFre)
+
+-- Particle verbs ("avoir" + "besoin")
+
+    mkV : V -> Str -> V  ;
   } ;
 
 -- The function $mkV$ gives the default compound auxiliary "avoir".
@@ -277,6 +281,7 @@ oper
 
   mkV0  : V -> V0 ;  --%
   mkVS  : V -> VS ;
+  subjVS  : V -> VS ;
   mkVV  : V -> VV ;  -- plain infinitive: "je veux parler"
   deVV  : V -> VV ;  -- "j'essaie de parler"
   aVV   : V -> VV ;  -- "j'arrive ŕ parler"
@@ -414,7 +419,8 @@ oper
   A2S, A2V : Type = A2 ;
 
   mkV0  v = v ** {lock_V0 = <>} ;
-  mkVS  v = v ** {m = \\_ => Indic ; lock_VS = <>} ;  ---- more moods
+  mkVS  v = v ** {m = \\_ => Indic ; lock_VS = <>} ; 
+  subjVS  v = v ** {m = \\_ => Conjunct ; lock_VS = <>} ;
 
   mkV2S = overload {
     mkV2S : V -> V2S = \v -> mmkV2 v dative ** {mn,mp = Indic ; lock_V2S = <>} ;
@@ -484,6 +490,8 @@ oper
       {s = v ; vtyp = VTyp VHabere (getVerbT v) ; lock_V = <>} ;
    mkV : V -> V
     = \v -> v ;
+    mkV : V -> Str -> V 
+    = \v,_ -> v ;  ---- to recognize particles in dict, not yet in lincat V
   } ;
 
   regV : Str -> V ;
diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf
index 1e77618e4..76029b608 100644
--- a/lib/src/translator/DictionarySwe.gf
+++ b/lib/src/translator/DictionarySwe.gf
@@ -28431,22 +28431,22 @@ lin impute_V2 = mkV2 (mkV "tillskriva" "tillskrev" "tillskrivit"); -- status=gue
 lin imputrescible_A = variants {} ;
 lin in_1_Adv = mkAdv "inne" ;
 lin in_2_Adv = mkAdv "in" ;
-lin in_A = mkA "av" ; -- comment=4
-lin in_Adv = mkAdv "av" ; -- comment=14
-lin in_N = mkN "under" neutrum; -- comment=7
+lin in_A = mkA "inne" ; ---- fashionable, innegrej
+lin in_Adv = mkAdv "inne" ; 
+lin in_N = mkN "mode" ; ----
 lin in_Prep = S.in_Prep ;
-lin in_accordance_with_Prep = variants {} ;
-lin in_addition_Adv = mkAdv "dessutom" ; -- comment=2
+lin in_accordance_with_Prep = mkPrep "i enlighet med" ;
+lin in_addition_Adv = mkAdv "dessutom" ; 
 lin in_addition_to_Prep = mkPrep "jämte" ;
-lin in_case_of_Prep = variants {} ;
+lin in_case_of_Prep = mkPrep "i fall av" ;
 lin in_chief_A = variants {} ;
 lin in_fighting_N = variants {} ;
-lin in_front_of_Prep = variants {} ;
-lin in_general_Adv = variants {} ;
-lin in_lieu_of_Prep = variants {} ;
+lin in_front_of_Prep = mkPrep "framför" ;
+lin in_general_Adv = mkPrep "i allmänhet" ;
+lin in_lieu_of_Prep = mkPrep "i stället för" ;
 lin in_loco_parentis_Adv = variants {} ;
-lin in_order_to_Prep = mkPrep "i syftet av" ;
-lin in_particular_Adv = variants {} ;
+lin in_order_to_Prep = mkPrep "i syftet av att" ;
+lin in_particular_Adv = mkPrep "i synnerhet" ;
 lin in_patient_N = variants {} ;
 lin in_place_of_Prep = variants {} ;
 lin in_point_of_Prep = variants {} ;
@@ -30199,7 +30199,7 @@ lin jamaican_N = mkN "jamaicanska" ;
 lin jamb_N = variants {} ;
 lin jambalaya_N = variants {} ;
 lin jamboree_N = variants {} ;
-lin james_PN = variants {} ;
+lin james_PN = mkPN "James" ;
 lin jamjar_N = mkN "syltburk" ; -- status=guess
 lin jammer_N = variants {} ;
 lin jamming_N = variants {} ;
@@ -34427,7 +34427,7 @@ lin marvellous_A = mkA "underbar" ;
 lin marxism_N = variants {} ;
 lin marxistFem_N = variants {} ;
 lin marxistMasc_N = variants {} ;
-lin mary_PN = variants {} ;
+lin mary_PN = mkPN "Mary" ;
 lin maryland_PN = variants {} ;
 lin maryport_PN = variants {} ;
 lin marzipan_N = mkN "marsipan" ; -- SaldoWN