refactored romance VP. Now it is possible to parse with Spanish and Catalan; for the rest, some Slash rules still pose a problem. Some clitic and agreement things unfinished. All this in next-lib only; resource 1.4 untouched

1 files changed, 16 insertions, 12 deletions

diff --git a/next-lib/src/french/MorphoFre.gf b/next-lib/src/french/MorphoFre.gf
index 96ce22850..1bd470097 100644
--- a/next-lib/src/french/MorphoFre.gf
+++ b/next-lib/src/french/MorphoFre.gf
@@ -163,18 +163,22 @@ oper
   mkPronoun : (_,_,_,_,_,_,_ : Str) -> 
               Gender -> Number -> Person -> Pronoun =
     \il,le,lui,Lui,son,sa,ses,g,n,p ->
-    {s = table {
-       Ton x => prepCase x ++ Lui ;
-       Aton Nom => il ;
-       Aton Acc => le ; 
-       Aton (CPrep P_de) => "en" ; --- hmm
-       Aton (CPrep _) => lui ; 
-       Poss {n = Sg ; g = Masc} => son ;
-       Poss {n = Sg ; g = Fem}  => sa ;
-       Poss {n = Pl}    => ses
-       } ;
-     a = {g = g ; n = n ; p = p} ;
-     hasClit = True
+    let
+      alui : Case -> Str = \x -> prepCase x ++ Lui ;
+    in {
+    s = table {
+      Nom        => {c1 = [] ; c2 = []  ; comp = il ; ton = Lui} ;
+      Acc        => {c1 = le ; c2 = []  ; comp = [] ; ton = Lui} ;
+      CPrep P_a  => {c1 = [] ; c2 = lui ; comp = [] ; ton = alui (CPrep P_a)} ;
+      c          => {c1 = [] ; c2 = []  ; comp, ton = alui c}
+      } ;
+    poss = \\n,g => case <n,g> of {
+      <Sg,Masc> => son ;
+      <Sg,Fem>  => sa ;
+      _         => ses
+      } ;
+    a = {g = g ; n = n ; p = p} ;
+    hasClit = True
     } ;
 
   elisPoss : Str -> Str = \s ->