From 485b095462d6c0de0570cda35f6151ed5771a8e9 Mon Sep 17 00:00:00 2001
From: Aarne Ranta <aarne@chalmers.se>
Date: Tue, 19 Dec 2017 14:16:14 +0100
Subject: [PATCH 1/2] fixed a bug in German infinitives where some fields were
 left out

---
 src/german/ResGer.gf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/german/ResGer.gf b/src/german/ResGer.gf
index 8a8a09df6..c6571ca1f 100644
--- a/src/german/ResGer.gf
+++ b/src/german/ResGer.gf
@@ -755,14 +755,14 @@ resource ResGer = ParamX ** open Prelude in {
   infVP : Bool -> VP -> ((Agr => Str) * Str * Str * Str) = \isAux, vp -> let vps = useVP vp in
     <
      \\agr => (vp.nn ! agr).p1 ++ (vp.nn ! agr).p2 ++  vp.a2,
-     vp.a1 ! Pos ++ (vps.s ! (notB isAux) ! agrP3 Sg ! VPInfinit Simul).inf,
+     vp.a1 ! Pos ++ vp.adj ++ (vps.s ! (notB isAux) ! agrP3 Sg ! VPInfinit Simul).inf,
      vp.inf,
-     vp.ext
+     vp.infExt ++ vp.ext
     > ;
 
   useInfVP : Bool -> VP -> Str = \isAux,vp ->
     let vpi = infVP isAux vp in
-    vpi.p1 ! agrP3 Sg ++ vpi.p3 ++ vpi.p2 ;
+    vpi.p1 ! agrP3 Sg ++ vpi.p3 ++ vpi.p2 ++ vpi.p4 ;
 
 -- The nominative case is not used as reflexive, but defined here
 -- so that we can reuse this in personal pronouns. 

From 3338c891bcff63f873a36d24f331a35fbae58a2c Mon Sep 17 00:00:00 2001
From: Aarne Ranta <aarne@chalmers.se>
Date: Tue, 19 Dec 2017 16:28:42 +0100
Subject: [PATCH 2/2] removed superfluous preposition from SymbolPes

---
 src/persian/SymbolPes.gf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/persian/SymbolPes.gf b/src/persian/SymbolPes.gf
index 602547a3b..b6a37e93a 100644
--- a/src/persian/SymbolPes.gf
+++ b/src/persian/SymbolPes.gf
@@ -7,8 +7,8 @@ concrete SymbolPes of Symbol = CatPes ** open Prelude, ResPes in {
  lin
 -- SymbPN i = {s = \\_ => i.s ; g = Masc} ;
   SymbPN i = {s = i.s ; animacy = Inanimate} ; -- "از" is removed for Phrasebook
-  IntPN i  = {s = i.s ++ "از" ; animacy = Inanimate} ;
-  FloatPN i = {s = i.s ++ "از" ; animacy = Inanimate} ;
+  IntPN i  = {s = i.s ; animacy = Inanimate} ;
+  FloatPN i = {s = i.s ; animacy = Inanimate} ;
   NumPN i = {s = i.s ; animacy = Inanimate} ;
   CNIntNP cn i = {
     s = \\ez => cn.s ! aEzafa ! Sg  ++ i.s ;