From e461296274dc10f52ca91b2079b125483f2a67f1 Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Wed, 3 Dec 2014 13:18:23 +0000
Subject: [PATCH] added Predef.BIND to elision words in Catalan.

---
 lib/src/catalan/DiffCat.gf  | 12 ++++++------
 lib/src/catalan/PhonoCat.gf | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/src/catalan/DiffCat.gf b/lib/src/catalan/DiffCat.gf
index 64034f4f5..1d6bd8df7 100644
--- a/lib/src/catalan/DiffCat.gf
+++ b/lib/src/catalan/DiffCat.gf
@@ -23,15 +23,15 @@ oper
     prepCase = \c -> case c of {
       Nom => [] ;
       Acc => [] ; 
-      CPrep P_de => "de" ;
+      CPrep P_de => elisDe ;
       CPrep P_a  => "a"
       } ;
 
         
     artDef : Bool -> Gender -> Number -> Case -> Str = \isNP,g,n,c ->
       case <g,n,c> of {        ---- TODO: check the NP forms
-        <Masc,Sg, CPrep P_de> => pre {"del" ; ["de l'"] / vocalForta} ;
-        <Masc,Sg, CPrep P_a>  => pre {"al" ; ["a l'"]  / vocalForta} ;
+        <Masc,Sg, CPrep P_de> => pre {"del" ; ("de l'" ++ Predef.BIND) / vocalForta} ;
+        <Masc,Sg, CPrep P_a>  => pre {"al"  ; ("a l'"  ++ Predef.BIND)  / vocalForta} ;
         <Masc,Sg, _>    => elisEl ;
         <Fem, Sg, _>    => prepCase c ++ elisLa ;
         <Masc,Pl, CPrep P_de> => "dels" ;
@@ -46,13 +46,13 @@ oper
 
     artIndef = \isNP,g,n,c -> case isNP of {
      True => case <n,c> of {
-      <Sg,CPrep P_de>   => genForms ["d' ++ Predef.BIND ++ un"] ["d' ++ Predef.BIND ++ una"] ! g ;
+      <Sg,CPrep P_de>   => genForms ("d' ++ Predef.BIND ++ un") ("d' ++ Predef.BIND ++ una") ! g ;
       <Sg,_> => prepCase c ++ genForms "un" "una" ! g ;
-      <Pl,CPrep P_de>   => genForms ["d' ++ Predef.BIND ++ uns"] ["d' ++ Predef.BIND ++ unes"] ! g ; -- AR 3/12/2014
+      <Pl,CPrep P_de>   => genForms ("d' ++ Predef.BIND ++ uns") ("d' ++ Predef.BIND ++ unes") ! g ; -- AR 3/12/2014
       <Pl,_> => prepCase c ++ genForms "uns" "unes" ! g 
       } ;
      _ => case <n,c> of {
-      <Sg,CPrep P_de>   => genForms ["d' ++ Predef.BIND ++ un"] ["d' ++ Predef.BIND ++ una"] ! g ;
+      <Sg,CPrep P_de>   => genForms ("d' ++ Predef.BIND ++ un") ("d' ++ Predef.BIND ++ una") ! g ;
       <Sg,_> => prepCase c ++ genForms "un" "una" ! g ;
       <Pl,_> => prepCase c --- ++ genForms "uns" "unes" ! g --- take this as a determiner
       }
diff --git a/lib/src/catalan/PhonoCat.gf b/lib/src/catalan/PhonoCat.gf
index ed9f9b852..cd5afad72 100644
--- a/lib/src/catalan/PhonoCat.gf
+++ b/lib/src/catalan/PhonoCat.gf
@@ -32,15 +32,15 @@ oper
 	} ;
 	
 	
-elisDe = pre { "de" ; "d'" / vocal };
-elisEl = pre { "el" ; "l'" / vocal } ;
-elisLa = pre { "la" ; "l'" / vocalForta } ;
-elisEm = pre { "em" ; "m'" / vocal } ;
-elisEt = pre { "et" ; "t'" / vocal } ;
+elisDe = pre { "de" ; ("d'" ++ Predef.BIND) / vocal };
+elisEl = pre { "el" ; ("l'" ++ Predef.BIND) / vocal } ;
+elisLa = pre { "la" ; ("l'" ++ Predef.BIND) / vocalForta } ;
+elisEm = pre { "em" ; ("m'" ++ Predef.BIND) / vocal } ;
+elisEt = pre { "et" ; ("t'" ++ Predef.BIND) / vocal } ;
 
 -- AR after pre syntax change 25/5/2009
 elisEs = pre {
-  vocal => "s'" ;
+  vocal => "s'" ++ Predef.BIND ;
   "s"   => "se" ;
   _     => "es"
   } ;