diff --git a/lib/src/catalan/ExtraCat.gf b/lib/src/catalan/ExtraCat.gf index 7850dc269..5eab3676e 100644 --- a/lib/src/catalan/ExtraCat.gf +++ b/lib/src/catalan/ExtraCat.gf @@ -3,13 +3,13 @@ concrete ExtraCat of ExtraCatAbs = ExtraRomanceCat ** lin i8fem_Pron = mkPronoun - "jo" "em" "em" "mi" ["el meu"] ["la meva"] "mes" + "jo" "em" "em" "mi" ["el meu"] ["la meva"] ["els meus"] ["les meves"] Fem Sg P1 ; these8fem_NP = makeNP "aquestes" Fem Pl ; they8fem_Pron = mkPronoun "elles" "les" "les" "elles" - "llur" "llur" "llurs" + "llur" "llur" "llurs" "llurs" Fem Pl P3 ; this8fem_NP = pn2np (mkPN ["aquesta"] Fem) ; those8fem_NP = makeNP ["aquestes"] Fem Pl ; @@ -17,7 +17,7 @@ lin we8fem_Pron = mkPronoun "nosaltres" "ens" "ens" "nosaltres" - ["el nostre"] ["la nostra"] ["els nostres"] + ["el nostre"] ["la nostra"] ["els nostres"] ["les nostres"] Fem Pl P1 ; whoPl8fem_IP = {s = \\c => prepCase c ++ "qui" ; a = aagr Fem Pl} ; @@ -25,21 +25,21 @@ lin youSg8fem_Pron = mkPronoun "tu" "et" "et" "tu" - ["el teu"] ["la teva"] ["les teves"] + ["el teu"] ["la teva"] ["els teus"] ["les teves"] Fem Sg P2 ; youPl8fem_Pron = mkPronoun "vosaltres" "us" "us" "vosaltres" - ["el vostre"] ["la vostra"] ["els vostres"] + ["el vostre"] ["la vostra"] ["els vostres"] ["les vostres"] Fem Pl P2 ; youPol8fem_Pron = mkPronoun "vosté" "la" "li" "vosté" - ["el seu"] ["la seva"] ["els seus"] + ["el seu"] ["la seva"] ["els seus"] ["les seves"] Fem Sg P3 ; oper vostePl : ParadigmsCat.Gender -> Pron = \g -> lin Pron (mkPronoun "vostés" "els" "li" "vostés" - "llur" "llur" "llurs" + "llur" "llur" "llurs" "llurs" g Pl P3) ; lin youPolPl_Pron = vostePl Masc; diff --git a/lib/src/catalan/MorphoCat.gf b/lib/src/catalan/MorphoCat.gf index 15e48474a..457f9ca46 100644 --- a/lib/src/catalan/MorphoCat.gf +++ b/lib/src/catalan/MorphoCat.gf @@ -131,9 +131,9 @@ oper -- All the eight personal pronouns can be built by the following macro. -- The use of "en" as atonic genitive is debatable. - mkPronoun : (_,_,_,_,_,_,_ : Str) -> + mkPronoun : (_,_,_,_,_,_,_,_ : Str) -> Gender -> Number -> Person -> Pronoun = - \ell,el,li,Ell,son,sa,ses,g,n,p -> + \ell,el,li,Ell,son,sa,elsSeus,lesSeves,g,n,p -> let aell : Case -> Str = \x -> prepCase x ++ Ell ; in { @@ -146,7 +146,8 @@ oper poss = \\n,g => case of { => son ; => sa ; - _ => ses + => elsSeus ; + => lesSeves } ; a = Ag g n p ; hasClit = True ; isPol = False diff --git a/lib/src/catalan/StructuralCat.gf b/lib/src/catalan/StructuralCat.gf index 27205f60f..8162d54d9 100644 --- a/lib/src/catalan/StructuralCat.gf +++ b/lib/src/catalan/StructuralCat.gf @@ -40,7 +40,7 @@ lin from_Prep = complGen ; --- he_Pron = mkPronoun - "ell" "el" "li" "ell" ["el seu"] ["la seva"] "ses" + "ell" "el" "li" "ell" ["el seu"] ["la seva"] ["els seus"] ["les seves"] Masc Sg P3 ; here_Adv = mkAdv "aquĂ­" ; -- acĂŚ here7to_Adv = mkAdv ["cap aquĂ­"] ; @@ -54,12 +54,12 @@ lin i_Pron = mkPronoun "jo" "em" "em" "mi" - ["el meu"] ["la meva"] "mes" + ["el meu"] ["la meva"] ["els meus"] ["les meves"] Fem Sg P1 ; in_Prep = mkPrep "en" ; it_Pron = mkPronoun "ell" "ho" "li" "ell" - ["el seu"] ["la seva"] ["els seus"] + ["el seu"] ["la seva"] ["els seus"] ["les seves"] Masc Sg P3 ; less_CAdv = X.mkCAdv "menys" conjThan ; ---- @@ -85,7 +85,7 @@ lin she_Pron = mkPronoun "ella" "la" "li" "ella" - ["el seu"] ["la seva"] "ses" + ["el seu"] ["la seva"] ["els seus"] ["les seves"] Fem Sg P3 ; so_AdA = ss "tan" ; somebody_NP = pn2np (mkPN ["algË™"] Masc) ; @@ -111,7 +111,7 @@ lin therefore_PConj = ss ["per tant"] ; they_Pron = mkPronoun "elles" "les" "les" "elles" - "llur" "llur" "llurs" + "llur" "llur" "llurs" "llurs" Fem Pl P3 ; this_Quant = @@ -133,7 +133,7 @@ lin we_Pron = mkPronoun "nosaltres" "ens" "ens" "nosaltres" - ["el nostre"] ["la nostra"] ["els nostres"] + ["el nostre"] ["la nostra"] ["els nostres"] ["les nostres"] Fem Pl P1 ; whatSg_IP = {s = \\c => prepCase c ++ ["què"] ; a = aagr Masc Sg} ; whatPl_IP = {s = \\c => prepCase c ++ ["què"] ; a = aagr Masc Pl} ; --- @@ -153,16 +153,16 @@ lin yes_Utt = ss "sĂ­" ; youSg_Pron = mkPronoun "tu" "et" "et" "tu" - ["el teu"] ["la teva"] ["les teves"] + ["el teu"] ["la teva"] ["els teus"] ["les teves"] Masc Sg P2 ; youPl_Pron = mkPronoun "vosaltres" "us" "us" "vosaltres" - ["el vostre"] ["la vostra"] ["els vostres"] + ["el vostre"] ["la vostra"] ["els vostres"] ["les vostres"] Masc Pl P2 ; youPol_Pron = mkPronoun "vostĂ©" "el" "li" "vostĂ©" - ["el seu"] ["la seva"] ["els seus"] + ["el seu"] ["la seva"] ["els seus"] ["les seves"] Masc Pl P2 ; not_Predet = {s = \\a,c => prepCase c ++ "no pas" ; c = Nom ; a = PNoAg} ;