adverbs at_home, from_home in Eng,Fin,Swe ; display categories in ParseFin ; some corrections in Fin and Swe Dict

lib/src/english/DictEng.gf

@@ -3855,6 +3855,7 @@ lin asystole_N = mkN "asystole" ;
 lin at_N = mkN "at" ;
 lin at_all_Adv = mkAdv "at all";
 lin at_Prep = mkPrep "at";
+lin at_home_Adv = mkAdv "at home" ;
 lin at_home_N = mkN "at-home" "at-homes";
 lin at_least_AdN = mkAdN "at least";
 lin atabrine_N = mkN "atabrine" ;
@@ -21893,6 +21894,7 @@ lin frolic_N = mkN "frolic" "frolics";
 lin frolic_V = mkV "frolic" "frolics" "frolicked" "frolicked" "frolicking";
 lin frolicsome_A = compoundA (mkA "frolicsome");
 lin from_Prep = mkPrep "from";
+lin from_home_Adv = mkAdv "from home";
 lin frome_PN = mkPN "Frome";
 lin frond_N = mkN "frond" "fronds";
 lin front_N = mkN "front" "fronts";

lib/src/english/DictEngAbs.gf

@@ -3852,6 +3852,7 @@ fun asystole_N : N;
 fun at_N : N;
 fun at_all_Adv : Adv;
 fun at_Prep : Prep ;
+fun at_home_Adv : Adv ;
 fun at_home_N : N;
 fun at_least_AdN : AdN;
 fun atabrine_N : N;
@@ -21871,6 +21872,7 @@ fun frolic_N : N;
 fun frolic_V : V;
 fun frolicsome_A : A;
 fun from_Prep : Prep ;
+fun from_home_Adv : Adv ;
 fun frome_PN : PN;
 fun frond_N : N;
 fun front_N : N;

lib/src/english/ParseEngAbs.gf

@@ -87,4 +87,27 @@ fun FeatN  : N  -> Feat;
     FeatVQ : VQ -> Feat;
     FeatVA : VA -> Feat;
 
+
+-- for displaying inflection tables
+
+cat 
+  NDisplay ; ADisplay ; VDisplay ;
+fun 
+  DisplayN   : N -> NDisplay ;
+  DisplayN2  : N2 -> NDisplay ;
+  DisplayN3  : N3 -> NDisplay ;
+  DisplayA   : A -> ADisplay ;
+  DisplayA2  : A2 -> ADisplay ;
+  DisplayV   : V -> VDisplay ;
+  DisplayV2  : V2 -> VDisplay ;
+  DisplayV3  : V3 -> VDisplay ;
+  DisplayVA  : VA -> VDisplay ;
+  DisplayVQ  : VQ -> VDisplay ;
+  DisplayVS  : VS -> VDisplay ;
+  DisplayVV  : VV -> VDisplay ;
+  DisplayV2A : V2A -> VDisplay ;
+  DisplayV2Q : V2Q -> VDisplay ;
+  DisplayV2S : V2S -> VDisplay ;
+  DisplayV2V : V2V -> VDisplay ;
+
 }

lib/src/finnish/DictEngFin.gf

@@ -8433,9 +8433,9 @@ choc_N = mkWN (k17 "suklaa") ; --UNCHK
 chock_Adv = mkWAdv (k99 "kukkuroillaan") ; --UNCHK
 chock_N = mkWN (k9 "kiila") ; --UNCHK
 chock_V2 = mkWV2 (k53A "pönkittää") ; --UNCHK
-chocolate_N = mkWN (k10 "umbra") "poltettu" ; --UNCHK
+chocolate_N = mkN "suklaa" ;
 choice_A = mkWA (k38 "erinomainen") ; --UNCHK
-choir_N = mkWN (kH1 "kuori") ; --UNCHK
+choir_N = mkN "kuoro" ; ---ARB mkWN (kH1 "kuori") ; --UNCHK
 choir_school_N = mkWN (compoundN "katedraali" (k1 "koulu")) ; --UNCHK
 choirboy_N = mkWN (compoundN "kuori" (k10A "poika")) ; --UNCHK
 choirmaster_N = mkWN (k6 "kanttori") ; --UNCHK
@@ -16752,7 +16752,7 @@ faucal_A = mkWA "nielu-" ; --UNCHK
 fauces_N = mkWN (k1 "nielu") ; --UNCHK
 faucet_N = mkWN (k9 "hana") ; --UNCHK
 fauld_N = mkWN (k1 "levy") ; --UNCHK
-fault_N = mkWN (k10 "moka") ; --UNCHK
+fault_N = mkN "virhe" ;
 fault_V2 = mkWV2 (k61A "moittia") ; --UNCHK
 faultfinding_N = mkWN (k39 "nalkutus") ; --UNCHK
 faultless_A = mkWA (k34A "nuhteeton") ; --UNCHK
@@ -25744,7 +25744,7 @@ lick_N = mkWN (k5 "tälli") ; --UNCHK
 lick_V = mkWV (k53A "rökittää") ; --UNCHK
 lick_V2 = mkWV2 (k53A "rökittää") ; --UNCHK
 licking_N = mkWN (k39 "löylytys") ; --UNCHK
-licorice_N = mkWN (k1 "laku") ; --UNCHK
+licorice_N = mkN "lakritsi" ;
 lidar_N = mkWN (compoundN "lidar-mitta" (k48A "laite")) ; --UNCHK
 lidded_A = mkWA (k10 "oleva") "puoliummessa" ; --UNCHK
 lidless_A = mkWA "kanneton" ; --UNCHK
@@ -28468,7 +28468,7 @@ missy_N = mkWN (k38 "neitonen") ; --UNCHK
 mist_N = mkWN (k1A "utu") ; --UNCHK
 mist_V = mkWV (k52A "sumentua") ; --UNCHK
 mist_V2 = mkWV2 (k52A "sumentua") ; --UNCHK
-mistake_N = mkWN (k10 "moka") ; --UNCHK
+mistake_N = mkN "erehdys" ;
 mistake_V = mkWV (k71 "tehdä") "virhe" ; --UNCHK
 mistake_V2 = mkWV2 (k71 "tehdä") "virhe" ; --UNCHK
 mister_N = mkWN (k9 "herra") ; --UNCHK
@@ -43758,7 +43758,7 @@ storeyed_A = mkWA (k38 "kerroksinen") ; --UNCHK
 storied_A = mkWA (k41A "värikäs") ; --UNCHK
 stork_N = mkWN (k12 "haikara") ; --UNCHK
 storksbill_N = mkWN (k5A "pielikki") ; --UNCHK
-storm_N = mkWN (k4A "rynnäkkö") ; --UNCHK
+storm_N = mkN "myrsky" ; ---ARB mkWN (k4A "rynnäkkö") ;
 storm_V = mkWV (k73A "rynnätä") ; --UNCHK
 storm_V2 = mkWV2 (k73A "rynnätä") ; --UNCHK
 storm_centre_N = mkWN (compoundN "myrsky" (k39 "keskus")) ; --UNCHK
@@ -57063,4 +57063,10 @@ wow_Interj = mkInterj "vau" ;
 yeah_Interj = mkInterj "yess" ;
 yes_Interj = mkInterj "kyllä" ;
 
+-- other stuff
+
+at_home_Adv = mkAdv "kotona" ;
+from_home_Adv = mkAdv "kotoa" ;
+home_Adv = mkAdv "kotiin" ;
+
 }

lib/src/finnish/stemmed/ParseFin.gf

@@ -128,5 +128,23 @@ lin
 --      insertObj (\\_,b,a => infVPGen pol.p v.sc b a vps v.vi) (predSV v) ** {c2 = v.c2} ; --- or vps.c2 ??
 
 --in Verb,   SlashV2VNP : V2V -> NP -> VPSlash -> VPSlash
+
+lincat 
+  NDisplay = {s : NForm => Str} ;
+  ADisplay = {s : Degree => NForm => Str} ; 
+  VDisplay = {s : VForm => Str} ; 
+
+lin
+  DisplayN n = snoun2nounSep n ;
+  DisplayA a = {
+    s = table {
+       Posit  => (snoun2nounSep {s = \\f => a.s ! Posit  ! sAN f ; h = a.h}).s ; 
+       Compar => (snoun2nounSep {s = \\f => a.s ! Compar ! sAN f ; h = a.h}).s ; 
+       Superl => (snoun2nounSep {s = \\f => a.s ! Superl ! sAN f ; h = a.h}).s 
+      }
+    } ;
+ 
+  DisplayV v = sverb2verbSep v ;
+
 }
 

lib/src/swedish/DictEngSwe.gf

@@ -3901,6 +3901,7 @@ lin asystole_N = variants {};
 lin at_N = mkN "för"; -- comment=6
 lin at_Prep = mkPrep "vid"; --
 lin at_all_Adv = variants {};
+lin at_home_Adv = mkAdv "hemma" ;
 lin at_home_N = variants {};
 lin at_least_AdN = S.at_least_AdN;
 lin at_the_behest_of_Prep = variants {};
@@ -22721,6 +22722,7 @@ lin frolic_N = variants {};
 lin frolic_V = variants {};
 lin frolicsome_A = variants {};
 lin from_Prep = S.from_Prep;
+lin from_home_Adv = mkAdv "hemifrån" ;
 lin frome_PN = variants {};
 lin frond_N = mkN "palmblad" neutrum;
 lin front_N = mkN "front" "fronter"; -- comment=4
@@ -54956,7 +54958,7 @@ lin storeyed_A = variants {};
 lin storied_A = variants {};
 lin stork_N = mkN "stork"; -- status=guess
 lin storksbill_N = variants {};
-lin storm_N = mkN "oväder" neutrum; -- comment=3
+lin storm_N = mkN "storm" ; 
 lin storm_V = mkV "stormar";
 lin storm_V2 = variants {};
 lin storm_beaten_A = variants {};