Towards cleaner english morphology: use mkPrep instead of ss in StructuralEng.

1 files changed, 20 insertions, 20 deletions

diff --git a/next-lib/src/english/StructuralEng.gf b/next-lib/src/english/StructuralEng.gf
index b79f90098..32b78cc78 100644
--- a/next-lib/src/english/StructuralEng.gf
+++ b/next-lib/src/english/StructuralEng.gf
@@ -4,8 +4,8 @@ concrete StructuralEng of Structural = CatEng **
   flags optimize=all ;
 
   lin
-  above_Prep = ss "above" ;
-  after_Prep = ss "after" ;
+  above_Prep = P.mkPrep "above" ;
+  after_Prep = P.mkPrep "after" ;
   all_Predet = ss "all" ;
   almost_AdA, almost_AdN = ss "almost" ;
   although_Subj = ss "although" ;
@@ -13,13 +13,13 @@ concrete StructuralEng of Structural = CatEng **
   and_Conj = sd2 [] "and" ** {n = Pl} ;
 ---b  and_Conj = ss "and" ** {n = Pl} ;
   because_Subj = ss "because" ;
-  before_Prep = ss "before" ;
-  behind_Prep = ss "behind" ;
-  between_Prep = ss "between" ;
+  before_Prep = P.mkPrep "before" ;
+  behind_Prep = P.mkPrep "behind" ;
+  between_Prep = P.mkPrep "between" ;
   both7and_DConj = sd2 "both" "and" ** {n = Pl} ;
   but_PConj = ss "but" ;
-  by8agent_Prep = ss "by" ;
-  by8means_Prep = ss "by" ;
+  by8agent_Prep = P.mkPrep "by" ;
+  by8means_Prep = P.mkPrep "by" ;
   can8know_VV, can_VV = {
     s = table { 
       VVF VInf => ["be able to"] ;
@@ -32,7 +32,7 @@ concrete StructuralEng of Structural = CatEng **
       } ;
     isAux = True
     } ;
-  during_Prep = ss "during" ;
+  during_Prep = P.mkPrep "during" ;
   either7or_DConj = sd2 "either" "or" ** {n = Sg} ;
   everybody_NP = regNP "everybody" Sg ;
   every_Det = mkDeterminer Sg "every" ;
@@ -40,8 +40,8 @@ concrete StructuralEng of Structural = CatEng **
   everywhere_Adv = ss "everywhere" ;
   few_Det = mkDeterminer Pl "few" ;
 ---  first_Ord = ss "first" ; DEPRECATED
-  for_Prep = ss "for" ;
-  from_Prep = ss "from" ;
+  for_Prep = P.mkPrep "for" ;
+  from_Prep = P.mkPrep "from" ;
   he_Pron = mkPron "he" "him" "his" "his" Sg P3 Masc ;
   here_Adv = ss "here" ;
   here7to_Adv = ss ["to here"] ;
@@ -49,9 +49,9 @@ concrete StructuralEng of Structural = CatEng **
   how_IAdv = ss "how" ;
   how8many_IDet = mkDeterminer Pl ["how many"] ;
   if_Subj = ss "if" ;
-  in8front_Prep = ss ["in front of"] ;
+  in8front_Prep = P.mkPrep ["in front of"] ;
   i_Pron  = mkPron "I" "me" "my" "mine" Sg P1 Masc ;
-  in_Prep = ss "in" ;
+  in_Prep = P.mkPrep "in" ;
   it_Pron  = mkPron "it" "it" "its" "its" Sg P3 Neutr ;
   less_CAdv = ss "less" ;
   many_Det = mkDeterminer Pl "many" ;
@@ -72,14 +72,14 @@ concrete StructuralEng of Structural = CatEng **
     } ;
 ---b  no_Phr = ss "no" ;
   no_Utt = ss "no" ;
-  on_Prep = ss "on" ;
+  on_Prep = P.mkPrep "on" ;
 ----  one_Quant = mkDeterminer Sg "one" ; -- DEPRECATED
   only_Predet = ss "only" ;
   or_Conj = sd2 [] "or" ** {n = Sg} ;
   otherwise_PConj = ss "otherwise" ;
-  part_Prep = ss "of" ;
+  part_Prep = P.mkPrep "of" ;
   please_Voc = ss "please" ;
-  possess_Prep = ss "of" ;
+  possess_Prep = P.mkPrep "of" ;
   quite_Adv = ss "quite" ;
   she_Pron = mkPron "she" "her" "her" "hers" Sg P3 Fem ;
   so_AdA = ss "so" ;
@@ -95,10 +95,10 @@ concrete StructuralEng of Structural = CatEng **
   therefore_PConj = ss "therefore" ;
   they_Pron = mkPron "they" "them" "their" "theirs" Pl P3 Masc ; ---- 
   this_Quant = mkQuant "this" "these" ;
-  through_Prep = ss "through" ;
+  through_Prep = P.mkPrep "through" ;
   too_AdA = ss "too" ;
-  to_Prep = ss "to" ;
-  under_Prep = ss "under" ;
+  to_Prep = P.mkPrep "to" ;
+  under_Prep = P.mkPrep "under" ;
   very_AdA = ss "very" ;
   want_VV = P.mkVV (P.regV "want") ;
   we_Pron = mkPron "we" "us" "our" "ours" Pl P1 Masc ;
@@ -113,8 +113,8 @@ concrete StructuralEng of Structural = CatEng **
   whoPl_IP = mkIP "who" "whom" "whose" Pl ;
   whoSg_IP = mkIP "who" "whom" "whose" Sg ;
   why_IAdv = ss "why" ;
-  without_Prep = ss "without" ;
-  with_Prep = ss "with" ;
+  without_Prep = P.mkPrep "without" ;
+  with_Prep = P.mkPrep "with" ;
 ---b  yes_Phr = ss "yes" ;
   yes_Utt = ss "yes" ;
   youSg_Pron = mkPron "you" "you" "your" "yours" Sg P2 Masc ;