forked from GitHub/gf-core
provide both genders for Plural in Cat/mkPronoun
This commit is contained in:
@@ -3,13 +3,13 @@ concrete ExtraCat of ExtraCatAbs = ExtraRomanceCat **
|
|||||||
|
|
||||||
lin
|
lin
|
||||||
i8fem_Pron = mkPronoun
|
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 ;
|
Fem Sg P1 ;
|
||||||
|
|
||||||
these8fem_NP = makeNP "aquestes" Fem Pl ;
|
these8fem_NP = makeNP "aquestes" Fem Pl ;
|
||||||
they8fem_Pron = mkPronoun
|
they8fem_Pron = mkPronoun
|
||||||
"elles" "les" "les" "elles"
|
"elles" "les" "les" "elles"
|
||||||
"llur" "llur" "llurs"
|
"llur" "llur" "llurs" "llurs"
|
||||||
Fem Pl P3 ;
|
Fem Pl P3 ;
|
||||||
this8fem_NP = pn2np (mkPN ["aquesta"] Fem) ;
|
this8fem_NP = pn2np (mkPN ["aquesta"] Fem) ;
|
||||||
those8fem_NP = makeNP ["aquestes"] Fem Pl ;
|
those8fem_NP = makeNP ["aquestes"] Fem Pl ;
|
||||||
@@ -17,7 +17,7 @@ lin
|
|||||||
we8fem_Pron =
|
we8fem_Pron =
|
||||||
mkPronoun
|
mkPronoun
|
||||||
"nosaltres" "ens" "ens" "nosaltres"
|
"nosaltres" "ens" "ens" "nosaltres"
|
||||||
["el nostre"] ["la nostra"] ["els nostres"]
|
["el nostre"] ["la nostra"] ["els nostres"] ["les nostres"]
|
||||||
Fem Pl P1 ;
|
Fem Pl P1 ;
|
||||||
|
|
||||||
whoPl8fem_IP = {s = \\c => prepCase c ++ "qui" ; a = aagr Fem Pl} ;
|
whoPl8fem_IP = {s = \\c => prepCase c ++ "qui" ; a = aagr Fem Pl} ;
|
||||||
@@ -25,21 +25,21 @@ lin
|
|||||||
|
|
||||||
youSg8fem_Pron = mkPronoun
|
youSg8fem_Pron = mkPronoun
|
||||||
"tu" "et" "et" "tu"
|
"tu" "et" "et" "tu"
|
||||||
["el teu"] ["la teva"] ["les teves"]
|
["el teu"] ["la teva"] ["els teus"] ["les teves"]
|
||||||
Fem Sg P2 ;
|
Fem Sg P2 ;
|
||||||
youPl8fem_Pron = mkPronoun
|
youPl8fem_Pron = mkPronoun
|
||||||
"vosaltres" "us" "us" "vosaltres"
|
"vosaltres" "us" "us" "vosaltres"
|
||||||
["el vostre"] ["la vostra"] ["els vostres"]
|
["el vostre"] ["la vostra"] ["els vostres"] ["les vostres"]
|
||||||
Fem Pl P2 ;
|
Fem Pl P2 ;
|
||||||
youPol8fem_Pron = mkPronoun
|
youPol8fem_Pron = mkPronoun
|
||||||
"vosté" "la" "li" "vosté"
|
"vosté" "la" "li" "vosté"
|
||||||
["el seu"] ["la seva"] ["els seus"]
|
["el seu"] ["la seva"] ["els seus"] ["les seves"]
|
||||||
Fem Sg P3 ;
|
Fem Sg P3 ;
|
||||||
|
|
||||||
oper
|
oper
|
||||||
vostePl : ParadigmsCat.Gender -> Pron = \g -> lin Pron (mkPronoun
|
vostePl : ParadigmsCat.Gender -> Pron = \g -> lin Pron (mkPronoun
|
||||||
"vostés" "els" "li" "vostés"
|
"vostés" "els" "li" "vostés"
|
||||||
"llur" "llur" "llurs"
|
"llur" "llur" "llurs" "llurs"
|
||||||
g Pl P3) ;
|
g Pl P3) ;
|
||||||
lin
|
lin
|
||||||
youPolPl_Pron = vostePl Masc;
|
youPolPl_Pron = vostePl Masc;
|
||||||
|
|||||||
@@ -131,9 +131,9 @@ oper
|
|||||||
-- All the eight personal pronouns can be built by the following macro.
|
-- All the eight personal pronouns can be built by the following macro.
|
||||||
-- The use of "en" as atonic genitive is debatable.
|
-- The use of "en" as atonic genitive is debatable.
|
||||||
|
|
||||||
mkPronoun : (_,_,_,_,_,_,_ : Str) ->
|
mkPronoun : (_,_,_,_,_,_,_,_ : Str) ->
|
||||||
Gender -> Number -> Person -> Pronoun =
|
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
|
let
|
||||||
aell : Case -> Str = \x -> prepCase x ++ Ell ;
|
aell : Case -> Str = \x -> prepCase x ++ Ell ;
|
||||||
in {
|
in {
|
||||||
@@ -146,7 +146,8 @@ oper
|
|||||||
poss = \\n,g => case <n,g> of {
|
poss = \\n,g => case <n,g> of {
|
||||||
<Sg,Masc> => son ;
|
<Sg,Masc> => son ;
|
||||||
<Sg,Fem> => sa ;
|
<Sg,Fem> => sa ;
|
||||||
_ => ses
|
<Pl,Masc> => elsSeus ;
|
||||||
|
<Pl,Fem> => lesSeves
|
||||||
} ;
|
} ;
|
||||||
a = Ag g n p ;
|
a = Ag g n p ;
|
||||||
hasClit = True ; isPol = False
|
hasClit = True ; isPol = False
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ lin
|
|||||||
from_Prep = complGen ; ---
|
from_Prep = complGen ; ---
|
||||||
he_Pron =
|
he_Pron =
|
||||||
mkPronoun
|
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 ;
|
Masc Sg P3 ;
|
||||||
here_Adv = mkAdv "aquí" ; -- acÌ
|
here_Adv = mkAdv "aquí" ; -- acÌ
|
||||||
here7to_Adv = mkAdv ["cap aquí"] ;
|
here7to_Adv = mkAdv ["cap aquí"] ;
|
||||||
@@ -54,12 +54,12 @@ lin
|
|||||||
i_Pron =
|
i_Pron =
|
||||||
mkPronoun
|
mkPronoun
|
||||||
"jo" "em" "em" "mi"
|
"jo" "em" "em" "mi"
|
||||||
["el meu"] ["la meva"] "mes"
|
["el meu"] ["la meva"] ["els meus"] ["les meves"]
|
||||||
Fem Sg P1 ;
|
Fem Sg P1 ;
|
||||||
in_Prep = mkPrep "en" ;
|
in_Prep = mkPrep "en" ;
|
||||||
it_Pron = mkPronoun
|
it_Pron = mkPronoun
|
||||||
"ell" "ho" "li" "ell"
|
"ell" "ho" "li" "ell"
|
||||||
["el seu"] ["la seva"] ["els seus"]
|
["el seu"] ["la seva"] ["els seus"] ["les seves"]
|
||||||
Masc Sg P3 ;
|
Masc Sg P3 ;
|
||||||
|
|
||||||
less_CAdv = X.mkCAdv "menys" conjThan ; ----
|
less_CAdv = X.mkCAdv "menys" conjThan ; ----
|
||||||
@@ -85,7 +85,7 @@ lin
|
|||||||
she_Pron =
|
she_Pron =
|
||||||
mkPronoun
|
mkPronoun
|
||||||
"ella" "la" "li" "ella"
|
"ella" "la" "li" "ella"
|
||||||
["el seu"] ["la seva"] "ses"
|
["el seu"] ["la seva"] ["els seus"] ["les seves"]
|
||||||
Fem Sg P3 ;
|
Fem Sg P3 ;
|
||||||
so_AdA = ss "tan" ;
|
so_AdA = ss "tan" ;
|
||||||
somebody_NP = pn2np (mkPN ["alg˙"] Masc) ;
|
somebody_NP = pn2np (mkPN ["alg˙"] Masc) ;
|
||||||
@@ -111,7 +111,7 @@ lin
|
|||||||
therefore_PConj = ss ["per tant"] ;
|
therefore_PConj = ss ["per tant"] ;
|
||||||
they_Pron = mkPronoun
|
they_Pron = mkPronoun
|
||||||
"elles" "les" "les" "elles"
|
"elles" "les" "les" "elles"
|
||||||
"llur" "llur" "llurs"
|
"llur" "llur" "llurs" "llurs"
|
||||||
Fem Pl P3 ;
|
Fem Pl P3 ;
|
||||||
|
|
||||||
this_Quant =
|
this_Quant =
|
||||||
@@ -133,7 +133,7 @@ lin
|
|||||||
we_Pron =
|
we_Pron =
|
||||||
mkPronoun
|
mkPronoun
|
||||||
"nosaltres" "ens" "ens" "nosaltres"
|
"nosaltres" "ens" "ens" "nosaltres"
|
||||||
["el nostre"] ["la nostra"] ["els nostres"]
|
["el nostre"] ["la nostra"] ["els nostres"] ["les nostres"]
|
||||||
Fem Pl P1 ;
|
Fem Pl P1 ;
|
||||||
whatSg_IP = {s = \\c => prepCase c ++ ["què"] ; a = aagr Masc Sg} ;
|
whatSg_IP = {s = \\c => prepCase c ++ ["què"] ; a = aagr Masc Sg} ;
|
||||||
whatPl_IP = {s = \\c => prepCase c ++ ["què"] ; a = aagr Masc Pl} ; ---
|
whatPl_IP = {s = \\c => prepCase c ++ ["què"] ; a = aagr Masc Pl} ; ---
|
||||||
@@ -153,16 +153,16 @@ lin
|
|||||||
yes_Utt = ss "sí" ;
|
yes_Utt = ss "sí" ;
|
||||||
youSg_Pron = mkPronoun
|
youSg_Pron = mkPronoun
|
||||||
"tu" "et" "et" "tu"
|
"tu" "et" "et" "tu"
|
||||||
["el teu"] ["la teva"] ["les teves"]
|
["el teu"] ["la teva"] ["els teus"] ["les teves"]
|
||||||
Masc Sg P2 ;
|
Masc Sg P2 ;
|
||||||
youPl_Pron =
|
youPl_Pron =
|
||||||
mkPronoun
|
mkPronoun
|
||||||
"vosaltres" "us" "us" "vosaltres"
|
"vosaltres" "us" "us" "vosaltres"
|
||||||
["el vostre"] ["la vostra"] ["els vostres"]
|
["el vostre"] ["la vostra"] ["els vostres"] ["les vostres"]
|
||||||
Masc Pl P2 ;
|
Masc Pl P2 ;
|
||||||
youPol_Pron = mkPronoun
|
youPol_Pron = mkPronoun
|
||||||
"vosté" "el" "li" "vosté"
|
"vosté" "el" "li" "vosté"
|
||||||
["el seu"] ["la seva"] ["els seus"]
|
["el seu"] ["la seva"] ["els seus"] ["les seves"]
|
||||||
Masc Pl P2 ;
|
Masc Pl P2 ;
|
||||||
not_Predet = {s = \\a,c => prepCase c ++ "no pas" ; c = Nom ;
|
not_Predet = {s = \\a,c => prepCase c ++ "no pas" ; c = Nom ;
|
||||||
a = PNoAg} ;
|
a = PNoAg} ;
|
||||||
|
|||||||
Reference in New Issue
Block a user