forked from GitHub/gf-core
make I, you, who and what pronouns Masc. The Fem and Neut forms are moved to ExtraBul.gf
This commit is contained in:
@@ -3,4 +3,19 @@ concrete ExtraBul of ExtraBulAbs = CatBul **
|
|||||||
|
|
||||||
lin
|
lin
|
||||||
GenNP np = {s = \\aform => np.s ! Gen aform} ;
|
GenNP np = {s = \\aform => np.s ! Gen aform} ;
|
||||||
|
|
||||||
|
i8fem_Pron = mkNP "àç" "ìåí" "ìîé" "ìîÿ" "ìîÿò" "ìîÿ" "ìîÿòà" "ìîå" "ìîåòî" "ìîè" "ìîèòå" (GSg Fem) P1 ;
|
||||||
|
i8neut_Pron = mkNP "àç" "ìåí" "ìîé" "ìîÿ" "ìîÿò" "ìîÿ" "ìîÿòà" "ìîå" "ìîåòî" "ìîè" "ìîèòå" (GSg Neut) P1 ;
|
||||||
|
|
||||||
|
whatSg8fem_IP = mkIP "êàêâà" (GSg Fem) ;
|
||||||
|
whatSg8neut_IP = mkIP "êàêâî" (GSg Neut) ;
|
||||||
|
|
||||||
|
whoSg8fem_IP = mkIP "êîÿ" (GSg Fem) ;
|
||||||
|
whoSg8neut_IP = mkIP "êîå" (GSg Neut) ;
|
||||||
|
|
||||||
|
youSg8fem_Pron = mkNP "òè" "òåá" "òâîé" "òâîÿ" "òâîÿò" "òâîÿ" "òâîÿòà" "òâîå" "òâîåòî" "òâîè" "òâîèòå" (GSg Fem) P2 ;
|
||||||
|
youSg8neut_Pron = mkNP "òè" "òåá" "òâîé" "òâîÿ" "òâîÿò" "òâîÿ" "òâîÿòà" "òâîå" "òâîåòî" "òâîè" "òâîèòå" (GSg Neut) P2 ;
|
||||||
|
|
||||||
|
youPol8fem_Pron = mkNP "âèå" "âàñ" "âàø" "âàøèÿ" "âàøèÿò" "âàøà" "âàøàòà" "âàøå" "âàøåòî" "âàøè" "âàøèòå" (GSg Fem) P2 ;
|
||||||
|
youPol8neut_Pron = mkNP "âèå" "âàñ" "âàø" "âàøèÿ" "âàøèÿò" "âàøà" "âàøàòà" "âàøå" "âàøåòî" "âàøè" "âàøèòå" (GSg Neut) P2 ;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,2 +1,21 @@
|
|||||||
abstract ExtraBulAbs = Extra ** {
|
abstract ExtraBulAbs = Extra ** {
|
||||||
|
|
||||||
|
fun
|
||||||
|
-- Feminine variants of pronouns (those in $Structural$ are
|
||||||
|
-- masculine, which is the default when gender is unknown).
|
||||||
|
|
||||||
|
i8fem_Pron : Pron ;
|
||||||
|
i8neut_Pron : Pron ;
|
||||||
|
|
||||||
|
whatSg8fem_IP : IP ;
|
||||||
|
whatSg8neut_IP : IP ;
|
||||||
|
|
||||||
|
whoSg8fem_IP : IP ;
|
||||||
|
whoSg8neut_IP : IP ;
|
||||||
|
|
||||||
|
youSg8fem_Pron : Pron ;
|
||||||
|
youSg8neut_Pron : Pron ;
|
||||||
|
|
||||||
|
youPol8fem_Pron : Pron ;
|
||||||
|
youPol8neut_Pron : Pron ;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ concrete StructuralBul of Structural = CatBul **
|
|||||||
how8many_IDet = mkDeterminerPl ["êîëêî ìíîãî"] ;
|
how8many_IDet = mkDeterminerPl ["êîëêî ìíîãî"] ;
|
||||||
if_Subj = ss "àêî" ;
|
if_Subj = ss "àêî" ;
|
||||||
in8front_Prep = ss "ïðåä" ;
|
in8front_Prep = ss "ïðåä" ;
|
||||||
i_Pron = mkNP "àç" "ìåí" "ìîé" "ìîÿ" "ìîÿò" "ìîÿ" "ìîÿòà" "ìîå" "ìîåòî" "ìîè" "ìîèòå" (GSg (variants {Masc;Fem})) P1 ;
|
i_Pron = mkNP "àç" "ìåí" "ìîé" "ìîÿ" "ìîÿò" "ìîÿ" "ìîÿòà" "ìîå" "ìîåòî" "ìîè" "ìîèòå" (GSg Masc) P1 ;
|
||||||
in_Prep = ss (pre { "â" ;
|
in_Prep = ss (pre { "â" ;
|
||||||
"âúâ" / strs {"â" ; "ô" ; "Â" ; "Ô"}
|
"âúâ" / strs {"â" ; "ô" ; "Â" ; "Ô"}
|
||||||
}) ;
|
}) ;
|
||||||
@@ -136,7 +136,7 @@ concrete StructuralBul of Structural = CatBul **
|
|||||||
-}
|
-}
|
||||||
we_Pron = mkNP "íèå" "íàñ" "íàø" "íàøèÿ" "íàøèÿò" "íàøà" "íàøàòà" "íàøå" "íàøåòî" "íàøè" "íàøèòå" GPl P1 ;
|
we_Pron = mkNP "íèå" "íàñ" "íàø" "íàøèÿ" "íàøèÿò" "íàøà" "íàøàòà" "íàøå" "íàøåòî" "íàøè" "íàøèòå" GPl P1 ;
|
||||||
whatPl_IP = mkIP "êàêâè" GPl ;
|
whatPl_IP = mkIP "êàêâè" GPl ;
|
||||||
whatSg_IP = variants { mkIP "êàêúâ" (GSg Masc); mkIP "êàêâà" (GSg Fem); mkIP "êàêâî" (GSg Neut) } ;
|
whatSg_IP = mkIP "êàêúâ" (GSg Masc) ;
|
||||||
when_IAdv = ss "êîãà" ;
|
when_IAdv = ss "êîãà" ;
|
||||||
{-
|
{-
|
||||||
when_Subj = ss "when" ;
|
when_Subj = ss "when" ;
|
||||||
@@ -146,7 +146,7 @@ concrete StructuralBul of Structural = CatBul **
|
|||||||
whichPl_IDet = mkDeterminer Pl ["which"] ;
|
whichPl_IDet = mkDeterminer Pl ["which"] ;
|
||||||
whichSg_IDet = mkDeterminer Sg ["which"] ;
|
whichSg_IDet = mkDeterminer Sg ["which"] ;
|
||||||
-}
|
-}
|
||||||
whoSg_IP = variants { mkIP "êîé" (GSg Masc); mkIP "êîÿ" (GSg Fem); mkIP "êîå" (GSg Neut) } ;
|
whoSg_IP = mkIP "êîé" (GSg Masc) ;
|
||||||
whoPl_IP = mkIP "êîè" GPl ;
|
whoPl_IP = mkIP "êîè" GPl ;
|
||||||
why_IAdv = ss "çàùî" ;
|
why_IAdv = ss "çàùî" ;
|
||||||
without_Prep = ss "áåç" ;
|
without_Prep = ss "áåç" ;
|
||||||
@@ -154,8 +154,8 @@ concrete StructuralBul of Structural = CatBul **
|
|||||||
"ñúñ" / strs {"ñ" ; "ç" ; "Ñ" ; "Ç"}
|
"ñúñ" / strs {"ñ" ; "ç" ; "Ñ" ; "Ç"}
|
||||||
}) ;
|
}) ;
|
||||||
yes_Phr = ss "äà" ;
|
yes_Phr = ss "äà" ;
|
||||||
youSg_Pron = mkNP "òè" "òåá" "òâîé" "òâîÿ" "òâîÿò" "òâîÿ" "òâîÿòà" "òâîå" "òâîåòî" "òâîè" "òâîèòå" (GSg (variants {Masc;Fem})) P2 ;
|
youSg_Pron = mkNP "òè" "òåá" "òâîé" "òâîÿ" "òâîÿò" "òâîÿ" "òâîÿòà" "òâîå" "òâîåòî" "òâîè" "òâîèòå" (GSg Masc) P2 ;
|
||||||
youPl_Pron = mkNP "âèå" "âàñ" "âàø" "âàøèÿ" "âàøèÿò" "âàøà" "âàøàòà" "âàøå" "âàøåòî" "âàøè" "âàøèòå" GPl P2 ;
|
youPl_Pron = mkNP "âèå" "âàñ" "âàø" "âàøèÿ" "âàøèÿò" "âàøà" "âàøàòà" "âàøå" "âàøåòî" "âàøè" "âàøèòå" GPl P2 ;
|
||||||
youPol_Pron = mkNP "âèå" "âàñ" "âàø" "âàøèÿ" "âàøèÿò" "âàøà" "âàøàòà" "âàøå" "âàøåòî" "âàøè" "âàøèòå" (GSg (variants {Masc;Fem})) P2 ;
|
youPol_Pron = mkNP "âèå" "âàñ" "âàø" "âàøèÿ" "âàøèÿò" "âàøà" "âàøàòà" "âàøå" "âàøåòî" "âàøè" "âàøèòå" (GSg Masc) P2 ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user