(Hun) Generalise Postposition to Adposition, allow it to preposition

src/hungarian/AdverbHun.gf

@@ -12,7 +12,7 @@ lin
 
   -- : Prep -> NP -> Adv ;
   PrepNP prep np = {
-    s = np.s ! prep.c ++ prep.s ;
+    s = prep.pr ++ np.s ! prep.c ++ prep.s ;
     } ;
 
 -- Adverbs can be modified by 'adadjectives', just like adjectives.

src/hungarian/CatHun.gf

@@ -87,7 +87,7 @@ concrete CatHun of Cat = CommonX ** open ResHun, Prelude in {
 -- Constructed in StructuralHun.
     Conj = ResHun.Conj ;
     Subj = SS ;
-    Prep = ResHun.Postposition ;
+    Prep = ResHun.Adposition ;
 
 
 

src/hungarian/ParadigmsHun.gf

@@ -85,6 +85,9 @@ oper
     mkPrep : Str -> Case -> Prep ; -- Postposition and case
     } ;
 
+  prePrep : Str -> Case -> Prep -- Preposition
+    = \s,c -> lin Prep {pr=s ; s=[] ; c=c} ;
+
   casePrep : Case -> Prep ; -- No postposition, only case
 
   -- mkConj : (_,_ : Str) -> Number -> Conj = \s1,s2,num ->

src/hungarian/ResHun.gf

@@ -102,14 +102,18 @@ oper
     } ;
 
 --------------------------------------------------------------------------------
--- Postpositions
+-- Adpositions
 
   -- TODO: personal suffixes, e.g. felettem, általam, not *felett/által én
-  Postposition : Type = {s : Str ; c : Case} ;
+  Adposition : Type = {
+    pr : Str ; -- Preposition
+    s : Str ;  -- Postposition
+    c : Case ;
+    } ;
 
-  mkPrep : Str -> Postposition = \str -> {s=str ; c=Nom} ;
+  mkPrep : Str -> Adposition = \str -> {s=str ; c=Nom ; pr=[]} ;
 
-  emptyPP : Postposition = mkPrep [] ;
+  emptyAdp : Adposition = mkPrep [] ;
 
 ------------------
 -- Conj
@@ -144,7 +148,7 @@ oper
     s : Degree => Number => Str
     } ;
   Adjective2 : Type = Adjective ** {
-    c2 : Postposition ;
+    c2 : Adposition ;
     } ;
 
   mkAdj : Str -> Adjective = \sg -> {