From 45787ff1e60e6d1c2848d1aa50fa56cf55ba438a Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Mon, 2 Dec 2013 11:09:28 +0000
Subject: [PATCH] interjections in DictEng Fin and Ger

---
 lib/src/demo/Makefile          |  2 +-
 lib/src/finnish/DictEngFin.gf  | 39 ++++++++++++++++++++++++++++++++++
 lib/src/finnish/MorphoFin.gf   |  2 +-
 lib/src/german/DictEngGer.gf   | 39 ++++++++++++++++++++++++++++++++++
 lib/src/german/ParadigmsGer.gf |  3 +++
 5 files changed, 83 insertions(+), 2 deletions(-)

diff --git a/lib/src/demo/Makefile b/lib/src/demo/Makefile
index dc76d930e..2c390ed0a 100644
--- a/lib/src/demo/Makefile
+++ b/lib/src/demo/Makefile
@@ -1,4 +1,4 @@
-compile = runghc Compile 
+compile = runghc +RTS -K200M -RTS Compile 
 
 all: src compdemo linkdemo
 
diff --git a/lib/src/finnish/DictEngFin.gf b/lib/src/finnish/DictEngFin.gf
index 0c0d3b746..b371fc3f9 100644
--- a/lib/src/finnish/DictEngFin.gf
+++ b/lib/src/finnish/DictEngFin.gf
@@ -56887,4 +56887,43 @@ teach_V = mkWV (k53A "opettaa") ; -- 29
 swap_N = mkN "vaihdos" ;
 stop_N = mkWN (k39 "pysähdys") ; -- 29
 
+-- from Phrasebook
+
+ah_Interj = mkInterj "aah" ;
+alas_Interj = mkInterj "voi voi" ;
+amen_Interj = mkInterj "aamen" ;
+bye_Interj = mkInterj "hei sitten" ;
+bye_bye_Interj = mkInterj "heippa" ;
+cheers_Interj = mkInterj "kippis" ;
+damn_Interj = mkInterj "pahus" ;
+egad_Interj = mkInterj "voi veljet" ;
+er_Interj = mkInterj "öh" ;
+excuse_me_Interj = mkInterj "anteeksi" ;
+good_afternoon_Interj = mkInterj "hyvää iltapäivää" ;
+good_evening_Interj = mkInterj "hyvää iltaa" ;
+good_luck_Interj = mkInterj "onnea matkaan" ;
+good_morning_Interj = mkInterj "hyvää huomenta" ;
+good_night_Interj = mkInterj "hyvää yötä" ;
+goodbye_Interj = mkInterj "näkemiin" ;
+hell_Interj = mkInterj "helvetti" ;
+hello_Interj = mkInterj "terve" ;
+hey_Interj = mkInterj "hei" ;
+hi_Interj = mkInterj "moi" ;
+no_Interj = mkInterj "ei" ;
+nope_Interj = mkInterj "ei" ;
+oh_Interj = mkInterj "oi" ;
+ok_Interj = mkInterj "okei" ;
+okay_Interj = mkInterj "okei" ;
+quack_Interj = mkInterj "kvaak" ;
+sorry_Interj = mkInterj "anteeksi" ;
+thanks_Interj = mkInterj "kiitos" ;
+uh_Interj = mkInterj "uh" ;
+uh_uh_Interj = mkInterj "uhhuh" ;
+uh_huh_Interj = mkInterj "uhhuh" ;
+well_Interj = mkInterj "no" ;
+whoopee_Interj = mkInterj "jippii" ;
+wow_Interj = mkInterj "vau" ;
+yeah_Interj = mkInterj "yess" ;
+yes_Interj = mkInterj "kyllä" ;
+
 }
diff --git a/lib/src/finnish/MorphoFin.gf b/lib/src/finnish/MorphoFin.gf
index 29507812c..b33567f8c 100644
--- a/lib/src/finnish/MorphoFin.gf
+++ b/lib/src/finnish/MorphoFin.gf
@@ -750,7 +750,7 @@ resource MorphoFin = ResFin ** open Prelude in {
       tulta = tult + a ;
       tulevaP = (noun2adj (nhn (sKukko tuleva (tuleva + "n") (init tuleva + "ia")))).s  ;
       tultavaP = (noun2adj (nhn (sKukko (tulta + "v" + a) (tulta + "v" + a + "n") (tulta + "vi" + a)))).s  ;
-      tulemaP = (noun2adj (nhn (sKukko tulema (tulema + "n") (init tulema + "ia")))).s  ;
+      tulemaP = (noun2adj (nhn (sKukko tulema (tulema + "n") (init tulema + "i" + a)))).s  ;
 
     in
     {s = table {
diff --git a/lib/src/german/DictEngGer.gf b/lib/src/german/DictEngGer.gf
index 6c75f0404..2c1e5c8da 100644
--- a/lib/src/german/DictEngGer.gf
+++ b/lib/src/german/DictEngGer.gf
@@ -43294,4 +43294,43 @@ lin zurich_PN = variants {};
  lin zolpidem_N = mkN "Zolpidem" ; -- 1.0000000 ---M
 
 
+-- from Phrasebook etc
+
+ah_Interj = mkInterj "ach" ;
+--alas_Interj = mkInterj "voi voi" ;
+amen_Interj = mkInterj "amen" ;
+bye_Interj = mkInterj "auf Wiedersehen" ;
+bye_bye_Interj = mkInterj "tschüss" ;
+cheers_Interj = mkInterj "zum Wohl" ;
+damn_Interj = mkInterj "Donnerwetter" ;
+--egad_Interj = mkInterj "voi veljet" ;
+--er_Interj = mkInterj "öh" ;
+excuse_me_Interj = mkInterj "Entschuldigung" ;
+good_afternoon_Interj = mkInterj "guten Tag" ;
+good_evening_Interj = mkInterj "guten Abend" ;
+good_luck_Interj = mkInterj "viel Glück" ;
+good_morning_Interj = mkInterj "guten Morgen" ;
+good_night_Interj = mkInterj "gute Nacht" ;
+goodbye_Interj = mkInterj "auf Wiedersehen" ;
+hell_Interj = mkInterj "Teufel" ;
+hello_Interj = mkInterj "hallo" ;
+hey_Interj = mkInterj "hallo" ;
+hi_Interj = mkInterj "hallo" ;
+no_Interj = mkInterj "nein" ;
+nope_Interj = mkInterj "nein" ;
+--oh_Interj = mkInterj "oi" ;
+--ok_Interj = mkInterj "OK" ;
+okay_Interj = mkInterj "alles klar" ;
+--quack_Interj = mkInterj "kvaak" ;
+sorry_Interj = mkInterj "Entschuldigung" ;
+thanks_Interj = mkInterj "Danke" ;
+--uh_Interj = mkInterj "uh" ;
+--uh_uh_Interj = mkInterj "uhhuh" ;
+--uh_huh_Interj = mkInterj "uhhuh" ;
+well_Interj = mkInterj "na" ;
+--whoopee_Interj = mkInterj "jippii" ;
+--wow_Interj = mkInterj "vau" ;
+yeah_Interj = mkInterj "jawohl" ;
+yes_Interj = mkInterj "ja" ;
+
 }
diff --git a/lib/src/german/ParadigmsGer.gf b/lib/src/german/ParadigmsGer.gf
index 3b7343939..2b5c8f0dc 100644
--- a/lib/src/german/ParadigmsGer.gf
+++ b/lib/src/german/ParadigmsGer.gf
@@ -293,6 +293,9 @@ mkV2 : overload {
   AS, A2S, AV, A2V : Type ; --%
 
 
+  mkInterj : Str -> Interj
+    = \s -> lin Interj {s = s} ;
+
 --.
 --2 Definitions of paradigms
 --