fixed pre expressions, parsing {} patterns, and the path in resource Make.hs

1 files changed, 10 insertions, 2 deletions

diff --git a/next-lib/src/catalan/PhonoCat.gf b/next-lib/src/catalan/PhonoCat.gf
index f750aeb01..61420cc45 100644
--- a/next-lib/src/catalan/PhonoCat.gf
+++ b/next-lib/src/catalan/PhonoCat.gf
@@ -34,8 +34,16 @@ elisEl = pre { "el" ; "l'" / vocal } ;
 elisLa = pre { "la" ; "l'" / vocalForta } ;
 elisEm = pre { "em" ; "m'" / vocal } ;
 elisEt = pre { "et" ; "t'" / vocal } ;
+
+-- AR after pre syntax change 25/5/2009
 elisEs = pre {
-			pre { "es" ; "s'" / vocal} ;
-			"se" / strs { "s" } } ;
+  vocal => "s'" ;
+  "s"   => "se" ;
+  _     => "es"
+  } ;
+
+--elisEs = pre {
+--			pre { "es" ; "s'" / vocal} ;
+--			"se" / strs { "s" } } ;
 
 }