"Committed_by_peb"

6 files changed, 41 insertions, 9 deletions

diff --git a/grammars/ljung/fin_dep_types/Findep.gf b/grammars/ljung/fin_dep_types/Findep.gf
index cd722ec35..94cfe54cf 100644
--- a/grammars/ljung/fin_dep_types/Findep.gf
+++ b/grammars/ljung/fin_dep_types/Findep.gf
@@ -6,9 +6,10 @@ lin
 Sg = {s = "SINGULAR"};
 -- Pl = {s = "PLURAL"};
 
-s  n g b x y = {s = x.s ++ y.s};
-np n g b x y = {s = x.s ++ y.s};
-vp n g b x y = {s = x.s ++ y.s};
+s   n g b x y = {s = x.s ++ y.s};
+np  n g b x y = {s = x.s ++ y.s};
+vpt n g b x y = {s = x.s ++ y.s};
+vpi       x   = {s = x.s};
 
 npBest n g   x = {s = x.s};
 npPl     g b x = {s = x.s};
@@ -18,6 +19,10 @@ ett = {s = "ett"};
 den = {s = "den"};
 det = {s = "det"};
 
+ingen  = {s = "ingen"};
+inget  = {s = "inget"};
+inga g = {s = "inga"};
+
 alla g = {s = "alla"};
 de   g = {s = "de"};
 
@@ -26,11 +31,21 @@ katter   = {s = "katter"};
 katten   = {s = "katten"};
 katterna = {s = "katterna"};
 
+hund     = {s = "hund"};
+hundar   = {s = "hundar"};
+hunden   = {s = "hunden"};
+hundarna = {s = "hundarna"};
+
 barn n   = {s = "barn"};
 barnet   = {s = "barnet"};
 barnen   = {s = "barnen"};
 
+djur n   = {s = "djur"};
+djuret   = {s = "djuret"};
+djuren   = {s = "djuren"};
+
 jagar  = {s = "jagar"};
+sover  = {s = "sover"};
 
 }
 
diff --git a/grammars/ljung/fin_dep_types/FindepAbs.gf b/grammars/ljung/fin_dep_types/FindepAbs.gf
index 3f3bad71c..a1931ade8 100644
--- a/grammars/ljung/fin_dep_types/FindepAbs.gf
+++ b/grammars/ljung/fin_dep_types/FindepAbs.gf
@@ -12,10 +12,10 @@ Sg, Pl : Num;
 Best, OBest : Def;
 Utr, Neu : Gen;
 
-
-s  : (n:Num) -> (g:Gen) -> (b:Def) -> NP n g b -> VP -> S;
-np : (n:Num) -> (g:Gen) -> (b:Def) -> D n g b -> N n g b -> NP n g b;
-vp : (n:Num) -> (g:Gen) -> (b:Def) -> V -> NP n g b -> VP;
+s   : (n:Num) -> (g:Gen) -> (b:Def) -> NP n g b -> VP -> S;
+np  : (n:Num) -> (g:Gen) -> (b:Def) -> D n g b -> N n g b -> NP n g b;
+vpt : (n:Num) -> (g:Gen) -> (b:Def) -> V -> NP n g b -> VP;
+vpi : V -> VP;
 
 npBest : (n:Num) -> (g:Gen)  -> N n g Best -> NP n g Best;
 npPl   : (g:Gen) -> (b:Def) -> N Pl g b   -> NP Pl g b;
@@ -23,7 +23,11 @@ npPl   : (g:Gen) -> (b:Def) -> N Pl g b   -> NP Pl g b;
 en  : D Sg Utr OBest;
 ett : D Sg Neu OBest;
 den : D Sg Utr Best;
-det : D Sg Neu OBest;
+det : D Sg Neu Best;
+
+ingen : D Sg Utr OBest;
+inget : D Sg Neu OBest;
+inga  : (g:Gen) -> D Pl g OBest;
 
 alla : (g:Gen) -> D Pl g OBest;
 de   : (g:Gen) -> D Pl g Best;
@@ -33,11 +37,21 @@ katten : N Sg Utr Best;
 katter : N Pl Utr OBest;
 katterna : N Pl Utr Best;
 
+hund   : N Sg Utr OBest;
+hunden : N Sg Utr Best;
+hundar : N Pl Utr OBest;
+hundarna : N Pl Utr Best;
+
 barn   : (n:Num) -> N n Neu OBest;
 barnet : N Sg Neu Best;
 barnen : N Pl Neu Best;
 
+djur   : (n:Num) -> N n Neu OBest;
+djuret : N Sg Neu Best;
+djuren : N Pl Neu Best;
+
 jagar : V;
+sover : V;
 
 }
 
diff --git a/grammars/ljung/thesis/FragmentAbstract.gf b/grammars/ljung/thesis/FragmentAbstract.gf
index 9c1f5df57..5141180ca 100644
--- a/grammars/ljung/thesis/FragmentAbstract.gf
+++ b/grammars/ljung/thesis/FragmentAbstract.gf
@@ -11,7 +11,7 @@ np_p 	 : N  	    -> NP;
 vp_t 	 : V  -> NP -> VP;
 d_a, d_m : D;
 n_c, n_f : N;
-v_e      : V;
+v_e, v_h : V;
 
 }
 
diff --git a/grammars/ljung/thesis/FragmentNumber.gf b/grammars/ljung/thesis/FragmentNumber.gf
index 9dd05adb2..82829d0d1 100644
--- a/grammars/ljung/thesis/FragmentNumber.gf
+++ b/grammars/ljung/thesis/FragmentNumber.gf
@@ -21,6 +21,7 @@ d_m	 = { s = "many"; n = Pl };
 n_c	 = { s = table { Sg => "lion"; Pl => "lions" } };
 n_f	 = { s = table { _ => "fish" } };
 v_e	 = { s = table { Sg => "eats" ; Pl => "eat" } };
+v_h	 = { s = table { Sg => "hunts" ; Pl => "hunt" } };
 
 }
 
diff --git a/grammars/ljung/thesis/FragmentSimple.gf b/grammars/ljung/thesis/FragmentSimple.gf
index bdf2581d0..7de175ffe 100644
--- a/grammars/ljung/thesis/FragmentSimple.gf
+++ b/grammars/ljung/thesis/FragmentSimple.gf
@@ -12,6 +12,7 @@ d_m	 = { s = "many" };
 n_c	 = { s = variants { "lion" ; "lions" } };
 n_f	 = { s = "fish" };
 v_e	 = { s = variants { "eats" ; "eat" } };
+v_h	 = { s = variants { "hunts" ; "hunt" } };
 
 }
 
diff --git a/grammars/ljung/thesis/FragmentSwedish.gf b/grammars/ljung/thesis/FragmentSwedish.gf
index db8396bd1..587be7136 100644
--- a/grammars/ljung/thesis/FragmentSwedish.gf
+++ b/grammars/ljung/thesis/FragmentSwedish.gf
@@ -21,6 +21,7 @@ d_m	 = { s = table { _ => "maanga" }; n = Pl };
 n_c	 = { s = table { _ => "lejon" }; g = Neu };
 n_f	 = { s = table { Sg => "fisk"; Pl => "fiskar" }; g = Utr };
 v_e	 = { s = "aeter" };
+v_h	 = { s = "jagar" };
 
 }