mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-02 07:42:50 -06:00
fix the digits in NumberalBul
This commit is contained in:
@@ -530,18 +530,19 @@ resource ResBul = ParamX ** open Prelude, Predef in {
|
||||
\dva, dvama, dve, vtori ->
|
||||
table {
|
||||
NCard dg => digitGenderSpecies dva dvama dve ! dg ;
|
||||
NOrd aform => let vtora = init vtori + "à" ;
|
||||
vtoro = init vtori + "î"
|
||||
NOrd aform => let vtora : Str = case vtori of {_+"â" => vtori; _ => init vtori} + "à" ;
|
||||
vtoro : Str = case vtori of {_+"â" => vtori; _ => init vtori} + "î";
|
||||
i : Str = case vtori of {_+"â" => "è"; _ => ""}
|
||||
in case aform of {
|
||||
ASg Masc Indef => vtori ;
|
||||
ASg Masc Def => vtori+"ÿ" ;
|
||||
ASgMascDefNom => vtori+"ÿò" ;
|
||||
ASg Masc Def => vtori+i+"ÿ" ;
|
||||
ASgMascDefNom => vtori+i+"ÿò" ;
|
||||
ASg Fem Indef => vtora ;
|
||||
ASg Fem Def => vtora+"òà" ;
|
||||
ASg Neut Indef => vtoro ;
|
||||
ASg Neut Def => vtoro+"òî" ;
|
||||
APl Indef => vtori ;
|
||||
APl Def => vtori+"òå"
|
||||
APl Indef => vtori+i ;
|
||||
APl Def => vtori+i+"òå"
|
||||
}
|
||||
} ;
|
||||
|
||||
@@ -565,23 +566,26 @@ resource ResBul = ParamX ** open Prelude, Predef in {
|
||||
|
||||
digitGenderSpecies : Str -> Str -> Str -> CardForm => Str =
|
||||
\dva, dvama, dve
|
||||
-> let addDef : Str -> Str =
|
||||
\s -> case s of {
|
||||
-> let addDef : Str -> Gender -> Str =
|
||||
\s,g -> case s of {
|
||||
dves+"òà" => dves+"òàòå" ;
|
||||
dv+"à" => dv+"àòà" ;
|
||||
"0" => s+"òà" ;
|
||||
"1" => s+case g of {Masc => "ÿò"; Fem => "òà"; Neut => "òî"} ;
|
||||
"2" => s+case g of {Masc => "òà"; _ => "òå"} ;
|
||||
x => x+"òå"
|
||||
}
|
||||
}
|
||||
in table {
|
||||
CFMasc Indef NonHuman => dva ;
|
||||
CFMasc Def NonHuman => addDef dva ;
|
||||
CFMascDefNom NonHuman => addDef dva ;
|
||||
CFMasc Def NonHuman => addDef dva Masc ;
|
||||
CFMascDefNom NonHuman => addDef dva Masc ;
|
||||
CFMasc Indef Human => dvama ;
|
||||
CFMasc Def Human => addDef dvama ;
|
||||
CFMascDefNom Human => addDef dvama ;
|
||||
CFMasc Def Human => addDef dvama Masc ;
|
||||
CFMascDefNom Human => addDef dvama Masc ;
|
||||
CFFem Indef => dve ;
|
||||
CFFem Def => addDef dve ;
|
||||
CFFem Def => addDef dve Fem ;
|
||||
CFNeut Indef => dve ;
|
||||
CFNeut Def => addDef dve
|
||||
CFNeut Def => addDef dve Neut
|
||||
} ;
|
||||
|
||||
mkIP : Str -> Str -> GenNum -> {s : Role => QForm => Str ; gn : GenNum} =
|
||||
|
||||
Reference in New Issue
Block a user