From 5661a7ba01d57427f66f7e1f2f599d2e121e6d22 Mon Sep 17 00:00:00 2001
From: Inari Listenmaa <inari.listenmaa@gmail.com>
Date: Sun, 19 Apr 2020 18:23:54 +0200
Subject: [PATCH] (Hun) Change word order in relVP

---
 src/hungarian/ResHun.gf | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/hungarian/ResHun.gf b/src/hungarian/ResHun.gf
index ea358939..5426e0d2 100644
--- a/src/hungarian/ResHun.gf
+++ b/src/hungarian/ResHun.gf
@@ -278,6 +278,10 @@ oper
     "vannak"
     "lenni" ;
 
+  megvan : Verb = copula ** {
+    s = \\vf => "meg" + copula.s ! vf ;
+    } ;
+
 ------------------
 -- VP
 
@@ -330,9 +334,14 @@ oper
   Sentence : Type = {s : Str} ;
 
   predVP : NounPhrase -> VerbPhrase -> ClSlash = \np,vp -> vp ** {
-    s = let rel : RClause = relVP' (np2rp np) vp ;
-         in \\t,a,p => rel.s ! t ! a ! p ! np.agr.p2 ! sc2case vp.sc
-                    ++ np.empty ; -- standard trick for prodrop+metavariable problem
+    s = \\t,a,p => let subjcase : Case = case vp.sc of {
+                                               SCNom => Nom ;
+                                               SCDat => Dat }
+                        in np.s ! subjcase
+                        ++ vp.s ! agr2vf np.agr
+                        ++ vp.obj
+                        ++ vp.adv
+                        ++ np.empty -- standard trick for prodrop+metavariable problem
     } ;
 
   -- Relative
@@ -351,9 +360,9 @@ oper
                                                SCNom => Nom ;
                                                SCDat => Dat }
                         in rp.s ! n ! subjcase
-                        ++ vp.s ! VFin rp.agr.p1 n -- variable by number
                         ++ vp.obj
                         ++ vp.adv
+                        ++ vp.s ! VFin rp.agr.p1 n -- variable by number
     } ;
 
   relSlash : RP -> ClSlash -> RClause = \rp,cls -> {