chunks for the rest of verb categories

lib/src/experimental/Chunk.gf

@@ -38,22 +38,31 @@ fun
   RP_Gen_Chunk : RP -> Chunk ;
   RP_Acc_Chunk : RP -> Chunk ;
   Subj_Chunk : Subj -> Chunk ;
-  VP_np_Chunk,
+
-  VP_none_Chunk,
+  VP_none_Chunk, VP_none_inf_Chunk : PrVP_none -> Chunk ;
-  VP_s_Chunk,
+  VP_np_Chunk,   VP_np_inf_Chunk : PrVP_np -> Chunk ;
-  VP_v_Chunk : PrVP_v -> Chunk ;
+  VP_s_Chunk,    VP_s_inf_Chunk : PrVP_s -> Chunk ;
-  VP_np_inf_Chunk,
+  VP_v_Chunk,   VP_v_inf_Chunk : PrVP_v -> Chunk ;
-  VP_none_inf_Chunk,
+  VP_a_Chunk,   VP_a_inf_Chunk : PrVP_a -> Chunk ;
-  VP_s_inf_Chunk,
+  VP_q_Chunk,   VP_q_inf_Chunk : PrVP_q -> Chunk ;
-  VP_v_inf_Chunk : PrVP_v -> Chunk ;
+  VP_np_np_Chunk,   VP_np_np_inf_Chunk : PrVP_np_np -> Chunk ;
-  V_np_prespart_Chunk,
+  VP_np_s_Chunk,    VP_np_s_inf_Chunk : PrVP_np_s -> Chunk ;
-  V_none_prespart_Chunk,
+  VP_np_v_Chunk,   VP_np_v_inf_Chunk : PrVP_np_v -> Chunk ;
-  V_s_prespart_Chunk,
+  VP_np_q_Chunk,   VP_np_q_inf_Chunk : PrVP_np_q -> Chunk ;
-  V_v_prespart_Chunk : PrV_np -> Chunk ;
+  VP_np_a_Chunk,   VP_np_a_inf_Chunk : PrVP_np_a -> Chunk ;
-  V_np_pastpart_Chunk,
+
-  V_none_pastpart_Chunk,
+  V_none_prespart_Chunk,  V_none_pastpart_Chunk : PrV_none -> Chunk ;
-  V_s_pastpart_Chunk,
+  V_np_prespart_Chunk,  V_np_pastpart_Chunk : PrV_np -> Chunk ;
-  V_v_pastpart_Chunk : PrV_v -> Chunk ;
+  V_s_prespart_Chunk,  V_s_pastpart_Chunk : PrV_s -> Chunk ;
+  V_v_prespart_Chunk,  V_v_pastpart_Chunk : PrV_v -> Chunk ;
+  V_q_prespart_Chunk,  V_q_pastpart_Chunk : PrV_q -> Chunk ;
+  V_a_prespart_Chunk,  V_a_pastpart_Chunk : PrV_q -> Chunk ;
+
+  V_np_np_prespart_Chunk,  V_np_np_pastpart_Chunk : PrV_np_np -> Chunk ;
+  V_np_s_prespart_Chunk,  V_np_s_pastpart_Chunk : PrV_np_s -> Chunk ;
+  V_np_v_prespart_Chunk,  V_np_v_pastpart_Chunk : PrV_np_v -> Chunk ;
+  V_np_q_prespart_Chunk,  V_np_q_pastpart_Chunk : PrV_np_q -> Chunk ;
+  V_np_a_prespart_Chunk,  V_np_a_pastpart_Chunk : PrV_np_q -> Chunk ;
 
   refl_SgP1_Chunk,
   refl_SgP2_Chunk,

lib/src/experimental/ChunkEng.gf

@@ -43,10 +43,19 @@ lin
   RP_Acc_Chunk rp = ss (rp.s ! RPrep Masc) ; ----
   RP_Gen_Chunk rp = ss (rp.s ! RC Neutr (NCase Gen)) ;
   Subj_Chunk subj = subj ;
+
   VP_none_Chunk, 
   VP_np_Chunk, 
   VP_s_Chunk, 
-  VP_v_Chunk = \vp -> 
+  VP_v_Chunk,
+  VP_a_Chunk,
+  VP_q_Chunk,
+  VP_np_np_Chunk, 
+  VP_np_s_Chunk, 
+  VP_np_a_Chunk,
+  VP_np_q_Chunk,
+  VP_np_v_Chunk 
+   = \vp -> 
     let verb = vp.v ! (PI.VASgP1 | PI.VASgP3 | PI.VAPl) 
     in
     allAgrSS (\a -> 
@@ -57,15 +66,42 @@ lin
   VP_none_inf_Chunk, 
   VP_np_inf_Chunk, 
   VP_s_inf_Chunk, 
-  VP_v_inf_Chunk = \vp -> allAgrSS (\a -> PI.infVP (VVInf | VVAux) a vp) ;
+  VP_a_inf_Chunk, 
-  V_np_prespart_Chunk,
+  VP_q_inf_Chunk, 
+  VP_v_inf_Chunk,
+  VP_np_np_inf_Chunk, 
+  VP_np_s_inf_Chunk, 
+  VP_np_a_inf_Chunk, 
+  VP_np_q_inf_Chunk, 
+  VP_np_v_inf_Chunk 
+   = \vp -> allAgrSS (\a -> PI.infVP (VVInf | VVAux) a vp) ;
+
   V_none_prespart_Chunk,
+  V_np_prespart_Chunk,
   V_s_prespart_Chunk,
-  V_v_prespart_Chunk = \v -> ss (PI.vPresPart v PI.defaultAgr) ;
+  V_a_prespart_Chunk,
-  V_np_pastpart_Chunk,
+  V_q_prespart_Chunk,
+  V_v_prespart_Chunk,
+  V_np_np_prespart_Chunk,
+  V_np_s_prespart_Chunk,
+  V_np_a_prespart_Chunk,
+  V_np_q_prespart_Chunk,
+  V_np_v_prespart_Chunk 
+    = \v -> ss (PI.vPresPart v PI.defaultAgr) ;
+
   V_none_pastpart_Chunk,
+  V_np_pastpart_Chunk,
   V_s_pastpart_Chunk,
-  V_v_pastpart_Chunk = \v -> ss (PI.vPastPart v PI.defaultAgr) ;
+  V_a_pastpart_Chunk,
+  V_q_pastpart_Chunk,
+  V_v_pastpart_Chunk,
+  V_np_np_pastpart_Chunk,
+  V_np_s_pastpart_Chunk,
+  V_np_a_pastpart_Chunk,
+  V_np_q_pastpart_Chunk,
+  V_np_v_pastpart_Chunk 
+    = \v -> ss (PI.vPastPart v PI.defaultAgr) ;
+
   copula_inf_Chunk = ss "to be" | ss "be" ;
 
 

lib/src/experimental/ChunkFin.gf

@@ -45,10 +45,19 @@ lin
   RP_Acc_Chunk rp = ss (rp.s ! Sg ! NPAcc) ;
   RP_Gen_Chunk rp = ss (rp.s ! Sg ! NPCase Gen) ;
   Subj_Chunk subj = subj ;
+
   VP_none_Chunk, 
   VP_np_Chunk, 
   VP_s_Chunk, 
-  VP_v_Chunk = \vp -> 
+  VP_v_Chunk,
+  VP_a_Chunk,
+  VP_q_Chunk,
+  VP_np_np_Chunk, 
+  VP_np_s_Chunk, 
+  VP_np_a_Chunk,
+  VP_np_q_Chunk,
+  VP_np_v_Chunk 
+   = \vp -> 
     let verb = vp.v ! PI.defaultAgr ;
     in
     allAgrSS (\a -> 
@@ -59,15 +68,42 @@ lin
   VP_none_inf_Chunk, 
   VP_np_inf_Chunk, 
   VP_s_inf_Chunk, 
-  VP_v_inf_Chunk = \vp -> allAgrSS (\a -> PI.infVP VVInf a vp) ;
+  VP_a_inf_Chunk, 
-  V_np_prespart_Chunk,
+  VP_q_inf_Chunk, 
+  VP_v_inf_Chunk,
+  VP_np_np_inf_Chunk, 
+  VP_np_s_inf_Chunk, 
+  VP_np_a_inf_Chunk, 
+  VP_np_q_inf_Chunk, 
+  VP_np_v_inf_Chunk 
+    = \vp -> allAgrSS (\a -> PI.infVP VVInf a vp) ;
+
   V_none_prespart_Chunk,
+  V_np_prespart_Chunk,
   V_s_prespart_Chunk,
-  V_v_prespart_Chunk = \v -> ss (PI.vPresPart v PI.defaultAgr) ;
+  V_a_prespart_Chunk,
-  V_np_pastpart_Chunk,
+  V_q_prespart_Chunk,
+  V_v_prespart_Chunk,
+  V_np_np_prespart_Chunk,
+  V_np_s_prespart_Chunk,
+  V_np_a_prespart_Chunk,
+  V_np_q_prespart_Chunk,
+  V_np_v_prespart_Chunk 
+    = \v -> ss (PI.vPresPart v PI.defaultAgr) ;
+
   V_none_pastpart_Chunk,
+  V_np_pastpart_Chunk,
   V_s_pastpart_Chunk,
-  V_v_pastpart_Chunk = \v -> ss (PI.vPastPart v PI.defaultAgr) ;
+  V_a_pastpart_Chunk,
+  V_q_pastpart_Chunk,
+  V_v_pastpart_Chunk,
+  V_np_np_pastpart_Chunk,
+  V_np_s_pastpart_Chunk,
+  V_np_a_pastpart_Chunk,
+  V_np_q_pastpart_Chunk,
+  V_np_v_pastpart_Chunk 
+    = \v -> ss (PI.vPastPart v PI.defaultAgr) ;
+
   copula_inf_Chunk = ss "olla" ;
 
   refl_SgP1_Chunk = ss "itseni" ;

lib/src/experimental/ChunkSwe.gf

@@ -43,10 +43,19 @@ lin
   RP_Acc_Chunk rp = ss (rp.s ! Utr ! Sg ! RNom) ;
   RP_Gen_Chunk rp = ss (rp.s ! Utr ! Sg ! RGen) ;
   Subj_Chunk subj = subj ;
+
   VP_none_Chunk, 
   VP_np_Chunk, 
   VP_s_Chunk, 
-  VP_v_Chunk = \vp -> 
+  VP_v_Chunk,
+  VP_a_Chunk,
+  VP_q_Chunk,
+  VP_np_np_Chunk, 
+  VP_np_s_Chunk, 
+  VP_np_a_Chunk,
+  VP_np_q_Chunk,
+  VP_np_v_Chunk 
+  = \vp -> 
     let verb = vp.v ! PI.UUnit
     in
     allAgrSS (\a -> 
@@ -57,15 +66,42 @@ lin
   VP_none_inf_Chunk, 
   VP_np_inf_Chunk, 
   VP_s_inf_Chunk, 
-  VP_v_inf_Chunk = \vp -> allAgrSS (\a -> PI.infVP PI.UUnit a vp) ;
+  VP_a_inf_Chunk, 
-  V_np_prespart_Chunk,
+  VP_q_inf_Chunk, 
+  VP_v_inf_Chunk,
+  VP_np_np_inf_Chunk, 
+  VP_np_s_inf_Chunk, 
+  VP_np_a_inf_Chunk, 
+  VP_np_q_inf_Chunk, 
+  VP_np_v_inf_Chunk 
+    = \vp -> allAgrSS (\a -> PI.infVP PI.UUnit a vp) ;
+
   V_none_prespart_Chunk,
+  V_np_prespart_Chunk,
   V_s_prespart_Chunk,
-  V_v_prespart_Chunk = \v -> ss (PI.vPresPart v PI.defaultAgr) ;
+  V_a_prespart_Chunk,
-  V_np_pastpart_Chunk,
+  V_q_prespart_Chunk,
+  V_v_prespart_Chunk,
+  V_np_np_prespart_Chunk,
+  V_np_s_prespart_Chunk,
+  V_np_a_prespart_Chunk,
+  V_np_q_prespart_Chunk,
+  V_np_v_prespart_Chunk 
+    = \v -> ss (PI.vPresPart v PI.defaultAgr) ;
+
   V_none_pastpart_Chunk,
+  V_np_pastpart_Chunk,
   V_s_pastpart_Chunk,
-  V_v_pastpart_Chunk = \v -> ss (PI.vPastPart v PI.defaultAgr) ;
+  V_a_pastpart_Chunk,
+  V_q_pastpart_Chunk,
+  V_v_pastpart_Chunk,
+  V_np_np_pastpart_Chunk,
+  V_np_s_pastpart_Chunk,
+  V_np_a_pastpart_Chunk,
+  V_np_q_pastpart_Chunk,
+  V_np_v_pastpart_Chunk 
+    = \v -> ss (PI.vPastPart v PI.defaultAgr) ;
+
   copula_inf_Chunk = ss "att vara" | ss "vara" ;
 
   refl_SgP1_Chunk = ss "mig själv" ;

lib/src/experimental/NDPredTrans.probs

@@ -65244,18 +65244,46 @@ VP_none_Chunk	0.1
 VP_np_Chunk	0.05
 VP_s_Chunk	0.01
 VP_v_Chunk	0.1
+VP_a_Chunk	0.01
+VP_q_Chunk	0.01
 VP_none_inf_Chunk	0.01
 VP_np_inf_Chunk	0.005
 VP_s_inf_Chunk	0.001
 VP_v_inf_Chunk	0.01
+VP_a_inf_Chunk	0.001
+VP_q_inf_Chunk	0.001
+VP_np_np_Chunk	0.05
+VP_np_s_Chunk	0.01
+VP_np_v_Chunk	0.1
+VP_np_a_Chunk	0.01
+VP_np_q_Chunk	0.01
+VP_np_np_inf_Chunk	0.005
+VP_np_s_inf_Chunk	0.001
+VP_np_v_inf_Chunk	0.01
+VP_np_a_inf_Chunk	0.001
+VP_np_q_inf_Chunk	0.001
 V_none_prespart_Chunk	0.01
 V_np_prespart_Chunk	0.005
 V_s_prespart_Chunk	0.001
 V_v_prespart_Chunk	0.01
+V_a_prespart_Chunk	0.001
+V_q_prespart_Chunk	0.001
 V_none_pastpart_Chunk	0.01
 V_np_pastpart_Chunk	0.005
 V_s_pastpart_Chunk	0.001
 V_v_pastpart_Chunk	0.01
+V_a_pastpart_Chunk	0.001
+V_q_pastpart_Chunk	0.001
+V_np_np_prespart_Chunk	0.005
+V_np_s_prespart_Chunk	0.001
+V_np_v_prespart_Chunk	0.01
+V_np_a_prespart_Chunk	0.001
+V_np_q_prespart_Chunk	0.001
+V_np_np_pastpart_Chunk	0.005
+V_np_s_pastpart_Chunk	0.001
+V_np_v_pastpart_Chunk	0.01
+V_np_a_pastpart_Chunk	0.001
+V_np_q_pastpart_Chunk	0.001
 PhrUtt 0.99
 PhrChunk 0.01
 OneChunk 0.8