Scharolta's DictionaryGer fixes

lib/src/german/MorphoGer.gf

@@ -18,7 +18,7 @@ oper
 -- For $StructuralGer$.
 
   mkPrep : Str -> PCase -> Preposition = \s,c -> 
-    {s = s ; c = c ; isPrep = True} ;
+    {s = s ; s2 = [] ; c = c ; isPrep = True} ;
 
   nameNounPhrase : {s : Case => Str} ->  {s : PCase => Str ; a : Agr ; isPron : Bool} = \name -> heavyNP {
       s = \\c => usePrepC c (\k -> name.s ! k) ;

lib/src/german/ParadigmsGer.gf

@@ -178,7 +178,11 @@ mkN : overload {
 
 -- A preposition is formed from a string and a case.
 
-  mkPrep : Str -> Case -> Prep ; -- e.g. "durch" + accusative
+  mkPrep : overload {
+    mkPrep : Str -> Case -> Prep ; -- e.g. "durch" + accusative
+    mkPrep : Case -> Str -> Prep ; -- postposition
+    mkPrep : Str -> Case -> Str -> Prep ; -- both sides
+    } ;
 
 -- Often just a case with the empty string is enough.
 
@@ -483,10 +487,14 @@ mkV2 : overload {
 
   mkAdv s = {s = s ; lock_Adv = <>} ;
 
-  mkPrep s c = {s = s ; c = c ; isPrep = True ; lock_Prep = <>} ;
+  mkPrep = overload {
-  accPrep = {s = [] ; c = accusative ; isPrep = False ; lock_Prep = <>} ;
+    mkPrep : Str -> PCase -> Prep = \s,c -> {s = s ; s2 = [] ; c = c ; isPrep = True ; lock_Prep = <>} ;
-  datPrep = {s = [] ; c = dative ; isPrep = False ; lock_Prep = <>} ;
+    mkPrep : PCase -> Str -> Prep = \c,s -> {s = [] ; s2 = s ; c = c ; isPrep = True ; lock_Prep = <>} ;
-  genPrep = {s = [] ; c = genitive ; isPrep = False ; lock_Prep = <>} ;
+    mkPrep : Str -> PCase -> Str -> Prep = \s,c,t -> {s = s ; s2 = t ; c = c ; isPrep = True ; lock_Prep = <>}
+    } ;
+  accPrep = {s,s2 = [] ; c = accusative ; isPrep = False ; lock_Prep = <>} ;
+  datPrep = {s,s2 = [] ; c = dative ; isPrep = False ; lock_Prep = <>} ;
+  genPrep = {s,s2 = [] ; c = genitive ; isPrep = False ; lock_Prep = <>} ;
   --von_Prep = mkPrep "von" dative ;
   von_Prep = mkPrep [] vonDat_Case ;
   zu_Prep = mkPrep [] zuDat_Case ;
@@ -562,7 +570,7 @@ mkV2 : overload {
 
   mkV3 = overload {
     mkV3 : V -> V3 
-      = \v -> lin V3 (v ** {c2 = mkPrep [] accusative ; c3 = mkPrep [] dative}) ; 
+      = \v -> lin V3 (v ** {c2 = accPrep ; c3 = datPrep}) ;
     mkV3 : V -> Prep -> Prep -> V3
       = \v,c,d -> v ** {c2 = c ; c3 = d ; lock_V3 = <>} ;
     } ;
@@ -631,6 +639,10 @@ mkV2 : overload {
       = \n,x -> mkCompoundN n.co x ;
     mkN : Str -> Gender -> Gender -> N 
       = \s,g,h -> reg1N s g | reg1N s h ;
+
+    mkN : (x1,_,_,_,_,x6 : Str) -> N  
+      = \a,b,c,d,e,f -> mk6N a b c d e f ((regN a).g) ; ---- temporary: to deal with genderless uses AR 29/5/2014
+
     };
 
     mkCompoundN : Str -> N -> N  -- Auto + Fahrer -> Autofahrer
@@ -683,7 +695,7 @@ mkV2 : overload {
     mkV2 : Str -> V2 = \s -> dirV2 (regV s) ;
     mkV2 : V -> V2 = dirV2 ;
     mkV2 : V -> Prep -> V2 = prepV2;
-    mkV2 : V -> Case -> V2 = \v,c -> prepV2 v (lin Prep {s = [] ; c = c ; isPrep = False}) ;
+    mkV2 : V -> Case -> V2 = \v,c -> prepV2 v (lin Prep {s,s2 = [] ; c = c ; isPrep = False}) ;
     } ;
 
 }

lib/src/german/ResGer.gf

@@ -379,17 +379,17 @@ resource ResGer = ParamX ** open Prelude in {
 
 -- Prepositions for complements indicate the complement case.
 
-  Preposition : Type = {s : Str ; c : PCase ; isPrep : Bool} ;
+  Preposition : Type = {s : Str ; s2 : Str ; c : PCase ; isPrep : Bool} ; -- s2 is postposition
 
 -- To apply a preposition to a complement.
 
   appPrep : Preposition -> (PCase => Str) -> Str = \prep,arg ->
-    prep.s ++ arg ! prep.c ;
+    prep.s ++ arg ! prep.c ++ prep.s2 ;
 
 -- To build a preposition from just a case.
 
   noPreposition : Case -> Preposition = \c -> 
-    {s = [] ; c = NPC c ; isPrep = False} ;
+    {s,s2 = [] ; c = NPC c ; isPrep = False} ;
 
 -- Pronouns and articles
 -- Here we define personal and relative pronouns.