From af53e6e31b17dcbd3af300fdaf1a4a5ab1027eaa Mon Sep 17 00:00:00 2001
From: "inari.listenmaa" <inari.listenmaa@gmail.com>
Date: Tue, 26 Mar 2013 11:33:54 +0000
Subject: [PATCH] Corrected VRefl in DiffCat
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixed VRefl in DiffCat from "se" to "es" and tonic from "sÌ" to "si". Also some trivial formatting things in MorphoCat and IdiomCat.
---
 lib/src/catalan/DiffCat.gf   |  4 ++--
 lib/src/catalan/IdiomCat.gf  |  6 +-----
 lib/src/catalan/MorphoCat.gf | 25 +++++++++++++------------
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/lib/src/catalan/DiffCat.gf b/lib/src/catalan/DiffCat.gf
index ddedc4966..bcc044482 100644
--- a/lib/src/catalan/DiffCat.gf
+++ b/lib/src/catalan/DiffCat.gf
@@ -143,8 +143,8 @@ oper
         in
         case p of { 
         P3 => case c of {
-          Acc | CPrep P_a => "se" ;
-          _ => "sÌ"
+          Acc | CPrep P_a => "es" ;
+          _ => "si"
           } ;
         _ => pro
         } ; 
diff --git a/lib/src/catalan/IdiomCat.gf b/lib/src/catalan/IdiomCat.gf
index c68cbe901..9271986c3 100644
--- a/lib/src/catalan/IdiomCat.gf
+++ b/lib/src/catalan/IdiomCat.gf
@@ -40,13 +40,9 @@ concrete IdiomCat of Idiom = CatCat **
     ImpPl1 vp = {s =
       mkImperative False P1 vp ! RPos ! Masc ! Pl --- fem
       } ;
-
+      
     CleftAdv ad s = mkClause [] True False (agrP3 Masc Sg) 
       (insertComplement (\\_ => conjThat ++ s.s ! Indic)
         (insertComplement (\\_ => ad.s) (predV copula))) ;
 
-        
-
-
-
 }
diff --git a/lib/src/catalan/MorphoCat.gf b/lib/src/catalan/MorphoCat.gf
index 6e9720db4..ddf2f9828 100644
--- a/lib/src/catalan/MorphoCat.gf
+++ b/lib/src/catalan/MorphoCat.gf
@@ -4,6 +4,7 @@
 --
 -- Aarne Ranta 2002 -- 2005
 -- Jordi Saludes 2008: Derived from MorphoSpa. 
+-- Inari Listenmaa 2012: Added smart paradigms for adjectives.
 --
 -- This resource morphology contains definitions needed in the resource
 -- syntax. To build a lexicon, it is better to use $ParadigmsCat$, which
@@ -63,19 +64,19 @@ oper
     mkNoun (numForms vi vins) ;
 
   mkNomReg : Str -> Noun = \noi ->
-        let
-                mkNounMas : (Str -> Number => Str) -> Noun = \rule -> mkNoun (rule noi) Masc
-        in
+    let
+       mkNounMas : (Str -> Number => Str) -> Noun = \rule -> mkNoun (rule noi) Masc
+    in
     case last noi of {
-      "a"                                                 => mkNoun (nomCasa "es" noi) Fem ;
-          "s"|"x"|"ç"                                 => mkNounMas nomCas ;
-          "i"                                                => mkNounMas nomFre ;
-          "í"                                                => mkNounMas (nomCasa "ins") ;
-          "à"                                                => mkNounMas (nomCasa "ans") ;
-          "ó"                                                => mkNounMas (nomCasa "ons") ;
-          "g"                                                => mkNounMas nomFaig ;
-      _                                                   => mkNounMas nomCep
-     } ;
+      "a"          => mkNoun (nomCasa "es" noi) Fem ;
+      "s"|"x"|"ç"  => mkNounMas nomCas ;
+      "i"          => mkNounMas nomFre ;
+      "í"          => mkNounMas (nomCasa "ins") ;
+      "à"          => mkNounMas (nomCasa "ans") ;
+      "ó"          => mkNounMas (nomCasa "ons") ;
+      "g"          => mkNounMas nomFaig ;
+       _           => mkNounMas nomCep
+    } ;
 
 --2 Adjectives
 --