From 90e2f11045ff79e455003946aa09a0141070216e Mon Sep 17 00:00:00 2001
From: "kr.angelov" <kr.angelov@gmail.com>
Date: Wed, 13 Nov 2013 20:58:08 +0000
Subject: [PATCH] now ago_Prep is postposition in English

---
 lib/src/bulgarian/DictEngBul.gf | 3 +--
 lib/src/english/AdverbEng.gf    | 2 +-
 lib/src/english/CatEng.gf       | 2 +-
 lib/src/english/DictEng.gf      | 3 +--
 lib/src/english/DictEngAbs.gf   | 1 -
 lib/src/english/ParadigmsEng.gf | 4 +++-
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/src/bulgarian/DictEngBul.gf b/lib/src/bulgarian/DictEngBul.gf
index afd0c60ca..cab6735d9 100644
--- a/lib/src/bulgarian/DictEngBul.gf
+++ b/lib/src/bulgarian/DictEngBul.gf
@@ -1262,9 +1262,8 @@ lin agnosia_N = variants {};
 lin agnostic_A = variants {};
 lin agnostic_N = mkN014a "агностик";
 lin agnosticism_N = mkN011 "агностицизъм";
-lin ago_A = variants {};
 lin ago_Adv = variants {};
-lin ago_Prep = variants {};
+lin ago_Prep = mkPrep "преди" Acc;
 lin agog_A = variants {};
 lin agon_N = variants {};
 lin agonadal_A = variants {};
diff --git a/lib/src/english/AdverbEng.gf b/lib/src/english/AdverbEng.gf
index 96796fa30..ba1a2dcd4 100644
--- a/lib/src/english/AdverbEng.gf
+++ b/lib/src/english/AdverbEng.gf
@@ -9,7 +9,7 @@ concrete AdverbEng of Adverb = CatEng ** open ResEng, Prelude in {
       s = cadv.s ++ a.s ! AAdv ++ cadv.p ++ s.s
       } ;
 
-    PrepNP prep np = {s = prep.s ++ np.s ! NPAcc} ;
+    PrepNP prep np = {s = preOrPost prep.isPre prep.s (np.s ! NPAcc)} ;
 
     AdAdv = cc2 ;
     PositAdAAdj a = {s = a.s ! AAdv} ;
diff --git a/lib/src/english/CatEng.gf b/lib/src/english/CatEng.gf
index 30e3613a5..d02235b7f 100644
--- a/lib/src/english/CatEng.gf
+++ b/lib/src/english/CatEng.gf
@@ -87,7 +87,7 @@ concrete CatEng of Cat = CommonX - [Pol] ** open ResEng, Prelude in {
 ---b    Conj = {s : Str ; n : Number} ;
 ---b    DConj = {s1,s2 : Str ; n : Number} ;
     Subj = {s : Str} ;
-    Prep = {s : Str} ;
+    Prep = {s : Str; isPre : Bool} ;
 
 -- Open lexical classes, e.g. Lexicon
 
diff --git a/lib/src/english/DictEng.gf b/lib/src/english/DictEng.gf
index 39a379159..72f5aca5b 100644
--- a/lib/src/english/DictEng.gf
+++ b/lib/src/english/DictEng.gf
@@ -1250,9 +1250,8 @@ lin agnosia_N = mkN "agnosia" ;
 lin agnostic_A = compoundA (mkA "agnostic");
 lin agnostic_N = mkN human (mkN "agnostic" "agnostics");
 lin agnosticism_N = mkN "agnosticism" ;
-lin ago_A = mkA "ago" ;
 lin ago_Adv = mkAdv "ago";
-lin ago_Prep = mkPrep "ago";
+lin ago_Prep = mkPost "ago";
 lin agog_A = compoundA (mkA "agog");
 lin agon_N = mkN "agon" ;
 lin agonadal_A = mkA "agonadal" ;
diff --git a/lib/src/english/DictEngAbs.gf b/lib/src/english/DictEngAbs.gf
index c9e5ec8e2..b075cbf30 100644
--- a/lib/src/english/DictEngAbs.gf
+++ b/lib/src/english/DictEngAbs.gf
@@ -1247,7 +1247,6 @@ fun agnosia_N : N;
 fun agnostic_A : A;
 fun agnostic_N : N;
 fun agnosticism_N : N;
-fun ago_A : A;
 fun ago_Adv : Adv;
 fun ago_Prep : Prep ;
 fun agog_A : A;
diff --git a/lib/src/english/ParadigmsEng.gf b/lib/src/english/ParadigmsEng.gf
index 1874fe4e4..4456585ef 100644
--- a/lib/src/english/ParadigmsEng.gf
+++ b/lib/src/english/ParadigmsEng.gf
@@ -202,6 +202,7 @@ oper
 -- build $PP$s in the resource API, just requires a string.
 
   mkPrep : Str -> Prep ; -- e.g. "in front of"
+  mkPost : Str -> Prep ; -- e.g. "ago"
   noPrep : Prep ;  -- no preposition
 
 -- (These two functions are synonyms.)
@@ -486,7 +487,8 @@ mkInterj : Str -> Interj
   mkAdA x = lin AdA (ss x) ;
   mkAdN x = lin AdN (ss x) ;
 
-  mkPrep p = lin Prep (ss p) ;
+  mkPrep p = lin Prep {s=p; isPre=True} ;
+  mkPost p = lin Prep {s=p; isPre=False} ;
   noPrep = mkPrep [] ;
 
   mk5V a b c d e = lin V (mkVerb a b c d e ** {s1 = []}) ;