Add some prepositions, merge with pronouns (TODO: merge with articles too)

src/gaelic/AdverbGla.gf

@@ -1,6 +1,6 @@
 concrete AdverbGla of Adverb = CatGla ** open ResGla, ParadigmsGla, Prelude in {
-{-
 lin
+{-
 
   -- : A -> Adv ;
   PositAdvAdj adj =
@@ -10,10 +10,17 @@ lin
 
   -- : CAdv -> A -> S  -> Adv ; -- more warmly than he runs
   ComparAdvAdjS cadv a s =
-
+-}
   -- : Prep -> NP -> Adv ;
-  PrepNP prep np =  ;
-
+  PrepNP prep np = {
+    s = prep.s ! np.a ++
+          case <prep.replacesPron, np.a> of {
+            <_, NotPron _> | <False, _>
+              => np.s ! CC (prep.c2 ! np.d) ;
+            _ => np.empty -- empty string to avoid metavariables
+          }
+    } ;
+{-
 -- Adverbs can be modified by 'adadjectives', just like adjectives.
 
   -- : AdA -> Adv -> Adv ;             -- very quickly