ExtraCat fixed

lib/src/catalan/ExtraCat.gf

@@ -1,47 +1,49 @@
 concrete ExtraCat of ExtraCatAbs = ExtraRomanceCat ** 
-  open CommonRomance, PhonoCat, MorphoCat, ParadigmsCat, ParamX, ResCat in {
+  open CommonRomance, ParadigmsCat, PhonoCat, MorphoCat, ParamX, ResCat in {
 
---  lin
---    i8fem_Pron =  mkPronoun
---      "yo" "me" "me" "mí"
---      "mi" "mi" "mis" "mis"
---      Fem Sg P1 ;
-      these8fem_NP = mkNP "aquestes" Fem Pl ;
+lin
+	i8fem_Pron =  mkPronoun
+      	"jo" "em" "em" "mi"  ("mon"|["el meu"]) ("ma"|["la meva"]) "mes"
+		Fem Sg P1 ;
+
+      these8fem_NP = makeNP "aquestes" Fem Pl ;
       they8fem_Pron = mkPronoun
       "elles" "les" "les" "elles"
       "llur" "llur" "llurs"
       Fem Pl P3 ;
---    this8fem_NP = pn2np (mkPN ["esta"] Fem) ;
---    those8fem_NP = mkNP ["esas"] Fem Pl ;
+    this8fem_NP = pn2np (mkPN ["aquesta"] Fem) ;
+    those8fem_NP = makeNP ["aquestes"] Fem Pl ;
 
---    we8fem_Pron = mkPronoun 
---      "nosotras" "nos" "nos" "nosotras"
---      "nuestro" "nuestra" "nuestros" "nuestras"
---      Fem Pl P1 ;
---    whoPl8fem_IP = {s = \\c => prepCase c ++ "quién" ; a = aagr Fem Pl} ;
---    whoSg8fem_IP = {s = \\c => prepCase c ++ "quién" ; a = aagr Fem Sg} ;
+    we8fem_Pron = 
+	  mkPronoun 
+	    "nosaltres" "ens" "ens" "nosaltres"
+	    ["el nostre"] ["la nostra"] ["els nostres"]
+      	Fem Pl P1 ;
 
---    youSg8fem_Pron = mkPronoun 
---      "tu" "te" "te" "tí"
---      "tu" "tu" "tus" "tus"
---      Fem Sg P2 ;
---    youPl8fem_Pron = mkPronoun
---      "vosotras" "vos" "vos" "vosotras"
---      "vuestro" "vuestra" "vuestros" "vuestras"
---      Fem Pl P2 ;
---    youPol8fem_Pron = mkPronoun
---      "usted" "la" "le" "usted"
---      "su" "su" "sus" "sus"
---      Fem Sg P3 ;
+    whoPl8fem_IP = {s = \\c => prepCase c ++ "qui" ; a = aagr Fem Pl} ;
+    whoSg8fem_IP = {s = \\c => prepCase c ++ "qui" ; a = aagr Fem Sg} ;
 
---    youPolPl_Pron = mkPronoun
---      "ustedes" "las" "les" "usted"
---      "su" "su" "sus" "sus"
---      Masc Pl P3 ;
---    youPolPl8fem_Pron = mkPronoun
---      "ustedes" "las" "les" "usted"
---      "su" "su" "sus" "sus"
---      Fem Pl P3 ;
+    youSg8fem_Pron = mkPronoun 
+  		"tu" "et" "et" "tu"
+    	("ton"|["el teu"]) ("ta"|["la teva"]) ("tes"|["les teves"])
+      	Fem Sg P2 ;
+    youPl8fem_Pron = mkPronoun
+      "vosaltres" "us" "us" "vosaltres"
+      ["el vostre"] ["la vostra"] ["els vostres"]
+      Fem Pl P2 ;
+    youPol8fem_Pron = mkPronoun
+      "vosté" "la" "li" "vosté"
+      ["el seu"] ["la seva"] ["els seus"]
+      Fem Sg P3 ;
+
+oper
+	vostePl : ParadigmsCat.Gender -> Pron = \g -> mkPronoun
+      "vostés" "els" "li" "vostés"
+      "llur" "llur" "llurs"
+      g Pl P3 ;
+lin
+    youPolPl_Pron = vostePl Masc;
+    youPolPl8fem_Pron = vostePl Fem;
 
 
 }

lib/src/catalan/ExtraCatAbs.gf

@@ -3,26 +3,26 @@
 
 abstract ExtraCatAbs = ExtraRomanceAbs ** {
 
---  fun
+fun
 
 -- Feminine variants of pronouns (those in $Structural$ are
 -- masculine, which is the default when gender is unknown).
 
---    i8fem_Pron : Pron ;
---    these8fem_NP : NP ;
---    they8fem_Pron : Pron ;
---    this8fem_NP : NP ;
---    those8fem_NP : NP ;
+    i8fem_Pron : Pron ;
+    these8fem_NP : NP ;
+    they8fem_Pron : Pron ;
+    this8fem_NP : NP ;
+    those8fem_NP : NP ;
 
---    we8fem_Pron : Pron ;  -- nosotras
---    whoPl8fem_IP : IP ;
---    whoSg8fem_IP : IP ;
+    we8fem_Pron : Pron ; 
+    whoPl8fem_IP : IP ;
+    whoSg8fem_IP : IP ;
 
---    youSg8fem_Pron : Pron ;
---    youPl8fem_Pron : Pron ; -- vosotras
---    youPol8fem_Pron : Pron ; -- usted
+    youSg8fem_Pron : Pron ;
+    youPl8fem_Pron : Pron ; 
+    youPol8fem_Pron : Pron ; -- vosté
 
---    youPolPl_Pron : Pron ;  -- ustedes
---    youPolPl8fem_Pron : Pron ;
+    youPolPl_Pron : Pron ;  -- vostés
+    youPolPl8fem_Pron : Pron ;
 
 }

lib/src/catalan/StructuralCat.gf

@@ -149,18 +149,16 @@ lin
   youSg_Pron = mkPronoun 
     "tu" "et" "et" "tu"
     ("ton"|["el teu"]) ("ta"|["la teva"]) ("tes"|["les teves"])
-    Fem Sg P2 ;
+    Masc Sg P2 ;
   youPl_Pron =
     mkPronoun
       "vosaltres" "us" "us" "vosaltres"
       ["el vostre"] ["la vostra"] ["els vostres"]
-      Fem Pl P2 ;
-  youPol_Pron = he_Pron ;
-{-    mkPronoun
+      Masc Pl P2 ;
+  youPol_Pron = mkPronoun
       "vosté" "el" "li" "vosté"
-      ["el seu"] ["la seva"] ["els seus"] ["les seves"]
-      Fem Pl P2 ;
--}	  
+      ["el seu"] ["la seva"] ["els seus"]
+      Masc Pl P2 ;
    not_Predet = {s = \\a,c => prepCase c ++ "no pas" ; c = Nom} ;
    have_V2 = dirV2 (verbV (tenir_108 "tenir")) ;