enabled many more functions, in particular verb patterns, in App, to increase translation quality. This comes with 30% longer translation time with my benchmark but should still be OK.

12 files changed, 36 insertions, 96 deletions

diff --git a/examples/app/App.gf b/examples/app/App.gf
index 5791ae58d..7f5c45f17 100644
--- a/examples/app/App.gf
+++ b/examples/app/App.gf
@@ -1,10 +1,9 @@
 abstract App = 
   Translate - [
   -- Verb
-    ComplVS, ComplVQ, ComplVA,
-    Slash2V3, Slash3V3, SlashV2V, SlashV2S, SlashV2Q, SlashV2A,
+    SlashV2V, 
+    Slash2V3, Slash3V3, SlashV2S, SlashV2Q, SlashV2A, 
     SlashVV, SlashV2VNP,
-    PassVP, ReflVP,
     AdvVPSlash, AdVVPSlash, VPSlashPrep,
   -- Sentence
     PredSCVP, 
@@ -14,11 +13,7 @@ abstract App =
     ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
   -- Idiom
     CleftNP, CleftAdv,
-    ExistIP,
-    ExistNPAdv, ExistIPAdv,
-    ImpP3,
-    SelfAdvVP, SelfAdVVP, SelfNP
-    
+    ImpP3    
   -- Construction
   -- Extensions
   ]
diff --git a/examples/app/AppBul.gf b/examples/app/AppBul.gf
index 528164c2d..eb23ce0f7 100644
--- a/examples/app/AppBul.gf
+++ b/examples/app/AppBul.gf
@@ -4,10 +4,9 @@ concrete AppBul of App =
 
   TranslateBul - [
   -- Verb
-    ComplVS, ComplVQ, ComplVA,
-    Slash2V3, Slash3V3, SlashV2V, SlashV2S, SlashV2Q, SlashV2A,
+    SlashV2V, 
+    Slash2V3, Slash3V3, SlashV2S, SlashV2Q, SlashV2A, 
     SlashVV, SlashV2VNP,
-    PassVP, ReflVP,
     AdvVPSlash, AdVVPSlash, VPSlashPrep,
   -- Sentence
     PredSCVP, 
@@ -17,11 +16,7 @@ concrete AppBul of App =
     ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
   -- Idiom
     CleftNP, CleftAdv,
-    ExistIP,
-    ExistNPAdv, ExistIPAdv,
-    ImpP3,
-    SelfAdvVP, SelfAdVVP, SelfNP
-    
+    ImpP3    
   -- Construction
   -- Extensions
   ]
diff --git a/examples/app/AppChi.gf b/examples/app/AppChi.gf
index e889b0554..28c7abb2e 100644
--- a/examples/app/AppChi.gf
+++ b/examples/app/AppChi.gf
@@ -4,10 +4,9 @@ concrete AppChi of App =
 
   TranslateChi - [
   -- Verb
-    ComplVS, ComplVQ, ComplVA,
-    Slash2V3, Slash3V3, SlashV2V, SlashV2S, SlashV2Q, SlashV2A,
+    SlashV2V, 
+    Slash2V3, Slash3V3, SlashV2S, SlashV2Q, SlashV2A, 
     SlashVV, SlashV2VNP,
-    PassVP, ReflVP,
     AdvVPSlash, AdVVPSlash, VPSlashPrep,
   -- Sentence
     PredSCVP, 
@@ -17,11 +16,7 @@ concrete AppChi of App =
     ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
   -- Idiom
     CleftNP, CleftAdv,
-    ExistIP,
-    ExistNPAdv, ExistIPAdv,
-    ImpP3,
-    SelfAdvVP, SelfAdVVP, SelfNP
-    
+    ImpP3    
   -- Construction
   -- Extensions
   ]
diff --git a/examples/app/AppDut.gf b/examples/app/AppDut.gf
index 6657cc6d0..620b8ceb8 100644
--- a/examples/app/AppDut.gf
+++ b/examples/app/AppDut.gf
@@ -4,10 +4,9 @@ concrete AppDut of App =
 
   TranslateDut - [
   -- Verb
-    ComplVS, ComplVQ, ComplVA,
-    Slash2V3, Slash3V3, SlashV2V, SlashV2S, SlashV2Q, SlashV2A,
+    SlashV2V, 
+    Slash2V3, Slash3V3, SlashV2S, SlashV2Q, SlashV2A, 
     SlashVV, SlashV2VNP,
-    PassVP, ReflVP,
     AdvVPSlash, AdVVPSlash, VPSlashPrep,
   -- Sentence
     PredSCVP, 
@@ -17,11 +16,7 @@ concrete AppDut of App =
     ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
   -- Idiom
     CleftNP, CleftAdv,
-    ExistIP,
-    ExistNPAdv, ExistIPAdv,
-    ImpP3,
-    SelfAdvVP, SelfAdVVP, SelfNP
-    
+    ImpP3    
   -- Construction
   -- Extensions
   ]
diff --git a/examples/app/AppEng.gf b/examples/app/AppEng.gf
index f3f39e448..9ac21a783 100644
--- a/examples/app/AppEng.gf
+++ b/examples/app/AppEng.gf
@@ -4,10 +4,9 @@ concrete AppEng of App =
 
   TranslateEng - [
   -- Verb
-    ComplVS, ComplVQ, ComplVA,
-    Slash2V3, Slash3V3, SlashV2V, SlashV2S, SlashV2Q, SlashV2A,
+    SlashV2V, 
+    Slash2V3, Slash3V3, SlashV2S, SlashV2Q, SlashV2A, 
     SlashVV, SlashV2VNP,
-    PassVP, ReflVP,
     AdvVPSlash, AdVVPSlash, VPSlashPrep,
   -- Sentence
     PredSCVP, 
@@ -17,11 +16,7 @@ concrete AppEng of App =
     ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
   -- Idiom
     CleftNP, CleftAdv,
-    ExistIP,
-    ExistNPAdv, ExistIPAdv,
-    ImpP3,
-    SelfAdvVP, SelfAdVVP, SelfNP
-    
+    ImpP3    
   -- Construction
   -- Extensions
   ]
diff --git a/examples/app/AppFin.gf b/examples/app/AppFin.gf
index 3a2143b1a..69fc9cac4 100644
--- a/examples/app/AppFin.gf
+++ b/examples/app/AppFin.gf
@@ -4,10 +4,9 @@ concrete AppFin of App =
 
   TranslateFin - [
   -- Verb
-    ComplVS, ComplVQ, ComplVA,
-    Slash2V3, Slash3V3, SlashV2V, SlashV2S, SlashV2Q, SlashV2A,
+    SlashV2V, 
+    Slash2V3, Slash3V3, SlashV2S, SlashV2Q, SlashV2A, 
     SlashVV, SlashV2VNP,
-    PassVP, ReflVP,
     AdvVPSlash, AdVVPSlash, VPSlashPrep,
   -- Sentence
     PredSCVP, 
@@ -17,11 +16,7 @@ concrete AppFin of App =
     ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
   -- Idiom
     CleftNP, CleftAdv,
-    ExistIP,
-    ExistNPAdv, ExistIPAdv,
-    ImpP3,
-    SelfAdvVP, SelfAdVVP, SelfNP
-    
+    ImpP3    
   -- Construction
   -- Extensions
   ]
diff --git a/examples/app/AppFre.gf b/examples/app/AppFre.gf
index 92fcff805..8af43c2f9 100644
--- a/examples/app/AppFre.gf
+++ b/examples/app/AppFre.gf
@@ -4,10 +4,9 @@ concrete AppFre of App =
 
   TranslateFre - [
   -- Verb
-    ComplVS, ComplVQ, ComplVA,
-    Slash2V3, Slash3V3, SlashV2V, SlashV2S, SlashV2Q, SlashV2A,
+    SlashV2V, 
+    Slash2V3, Slash3V3, SlashV2S, SlashV2Q, SlashV2A, 
     SlashVV, SlashV2VNP,
-    PassVP, ReflVP,
     AdvVPSlash, AdVVPSlash, VPSlashPrep,
   -- Sentence
     PredSCVP, 
@@ -17,11 +16,7 @@ concrete AppFre of App =
     ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
   -- Idiom
     CleftNP, CleftAdv,
-    ExistIP,
-    ExistNPAdv, ExistIPAdv,
-    ImpP3,
-    SelfAdvVP, SelfAdVVP, SelfNP
-    
+    ImpP3    
   -- Construction
   -- Extensions
   ]
diff --git a/examples/app/AppGer.gf b/examples/app/AppGer.gf
index eb90a0f39..a754e6ddc 100644
--- a/examples/app/AppGer.gf
+++ b/examples/app/AppGer.gf
@@ -4,10 +4,9 @@ concrete AppGer of App =
 
   TranslateGer - [
   -- Verb
-    ComplVS, ComplVQ, ComplVA,
-    Slash2V3, Slash3V3, SlashV2V, SlashV2S, SlashV2Q, SlashV2A,
+    SlashV2V, 
+    Slash2V3, Slash3V3, SlashV2S, SlashV2Q, SlashV2A, 
     SlashVV, SlashV2VNP,
-    PassVP, ReflVP,
     AdvVPSlash, AdVVPSlash, VPSlashPrep,
   -- Sentence
     PredSCVP, 
@@ -17,11 +16,7 @@ concrete AppGer of App =
     ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
   -- Idiom
     CleftNP, CleftAdv,
-    ExistIP,
-    ExistNPAdv, ExistIPAdv,
-    ImpP3,
-    SelfAdvVP, SelfAdVVP, SelfNP
-    
+    ImpP3    
   -- Construction
   -- Extensions
   ]
diff --git a/examples/app/AppHin.gf b/examples/app/AppHin.gf
index 6e5df5511..74ce40d34 100644
--- a/examples/app/AppHin.gf
+++ b/examples/app/AppHin.gf
@@ -4,10 +4,9 @@ concrete AppHin of App =
 
   TranslateHin - [
   -- Verb
-    ComplVS, ComplVQ, ComplVA,
-    Slash2V3, Slash3V3, SlashV2V, SlashV2S, SlashV2Q, SlashV2A,
+    SlashV2V, 
+    Slash2V3, Slash3V3, SlashV2S, SlashV2Q, SlashV2A, 
     SlashVV, SlashV2VNP,
-    PassVP, ReflVP,
     AdvVPSlash, AdVVPSlash, VPSlashPrep,
   -- Sentence
     PredSCVP, 
@@ -17,11 +16,7 @@ concrete AppHin of App =
     ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
   -- Idiom
     CleftNP, CleftAdv,
-    ExistIP,
-    ExistNPAdv, ExistIPAdv,
-    ImpP3,
-    SelfAdvVP, SelfAdVVP, SelfNP
-    
+    ImpP3    
   -- Construction
   -- Extensions
   ]
diff --git a/examples/app/AppIta.gf b/examples/app/AppIta.gf
index d27bc82ac..e7d9bee13 100644
--- a/examples/app/AppIta.gf
+++ b/examples/app/AppIta.gf
@@ -4,10 +4,9 @@ concrete AppIta of App =
 
   TranslateIta - [
   -- Verb
-    ComplVS, ComplVQ, ComplVA,
-    Slash2V3, Slash3V3, SlashV2V, SlashV2S, SlashV2Q, SlashV2A,
+    SlashV2V, 
+    Slash2V3, Slash3V3, SlashV2S, SlashV2Q, SlashV2A, 
     SlashVV, SlashV2VNP,
-    PassVP, ReflVP,
     AdvVPSlash, AdVVPSlash, VPSlashPrep,
   -- Sentence
     PredSCVP, 
@@ -17,11 +16,7 @@ concrete AppIta of App =
     ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
   -- Idiom
     CleftNP, CleftAdv,
-    ExistIP,
-    ExistNPAdv, ExistIPAdv,
-    ImpP3,
-    SelfAdvVP, SelfAdVVP, SelfNP
-    
+    ImpP3    
   -- Construction
   -- Extensions
   ]
diff --git a/examples/app/AppSpa.gf b/examples/app/AppSpa.gf
index f6983652d..eb915461d 100644
--- a/examples/app/AppSpa.gf
+++ b/examples/app/AppSpa.gf
@@ -5,10 +5,9 @@ concrete AppSpa of App =
 
   TranslateSpa - [
   -- Verb
-    ComplVS, ComplVQ, ComplVA,
-    Slash2V3, Slash3V3, SlashV2V, SlashV2S, SlashV2Q, SlashV2A,
+    SlashV2V, 
+    Slash2V3, Slash3V3, SlashV2S, SlashV2Q, SlashV2A, 
     SlashVV, SlashV2VNP,
-    PassVP, ReflVP,
     AdvVPSlash, AdVVPSlash, VPSlashPrep,
   -- Sentence
     PredSCVP, 
@@ -18,11 +17,7 @@ concrete AppSpa of App =
     ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
   -- Idiom
     CleftNP, CleftAdv,
-    ExistIP,
-    ExistNPAdv, ExistIPAdv,
-    ImpP3,
-    SelfAdvVP, SelfAdVVP, SelfNP
-    
+    ImpP3    
   -- Construction
   -- Extensions
   ]
diff --git a/examples/app/AppSwe.gf b/examples/app/AppSwe.gf
index adcf8fbc3..b1c7e73f6 100644
--- a/examples/app/AppSwe.gf
+++ b/examples/app/AppSwe.gf
@@ -3,10 +3,9 @@
 concrete AppSwe of App = 
   TranslateSwe - [
   -- Verb
-    ComplVS, ComplVQ, ComplVA,
-    Slash2V3, Slash3V3, SlashV2V, SlashV2S, SlashV2Q, SlashV2A,
+    SlashV2V, 
+    Slash2V3, Slash3V3, SlashV2S, SlashV2Q, SlashV2A, 
     SlashVV, SlashV2VNP,
-    PassVP, ReflVP,
     AdvVPSlash, AdVVPSlash, VPSlashPrep,
   -- Sentence
     PredSCVP, 
@@ -16,11 +15,7 @@ concrete AppSwe of App =
     ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
   -- Idiom
     CleftNP, CleftAdv,
-    ExistIP,
-    ExistNPAdv, ExistIPAdv,
-    ImpP3,
-    SelfAdvVP, SelfAdVVP, SelfNP
-    
+    ImpP3    
   -- Construction
   -- Extensions
   ]