mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-20 00:22:51 -06:00
Corrected VRefl in DiffCat
Fixed VRefl in DiffCat from "se" to "es" and tonic from "sÌ" to "si". Also some trivial formatting things in MorphoCat and IdiomCat.
This commit is contained in:
@@ -143,8 +143,8 @@ oper
|
|||||||
in
|
in
|
||||||
case p of {
|
case p of {
|
||||||
P3 => case c of {
|
P3 => case c of {
|
||||||
Acc | CPrep P_a => "se" ;
|
Acc | CPrep P_a => "es" ;
|
||||||
_ => "sÌ"
|
_ => "si"
|
||||||
} ;
|
} ;
|
||||||
_ => pro
|
_ => pro
|
||||||
} ;
|
} ;
|
||||||
|
|||||||
@@ -45,8 +45,4 @@ concrete IdiomCat of Idiom = CatCat **
|
|||||||
(insertComplement (\\_ => conjThat ++ s.s ! Indic)
|
(insertComplement (\\_ => conjThat ++ s.s ! Indic)
|
||||||
(insertComplement (\\_ => ad.s) (predV copula))) ;
|
(insertComplement (\\_ => ad.s) (predV copula))) ;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
--
|
--
|
||||||
-- Aarne Ranta 2002 -- 2005
|
-- Aarne Ranta 2002 -- 2005
|
||||||
-- Jordi Saludes 2008: Derived from MorphoSpa.
|
-- Jordi Saludes 2008: Derived from MorphoSpa.
|
||||||
|
-- Inari Listenmaa 2012: Added smart paradigms for adjectives.
|
||||||
--
|
--
|
||||||
-- This resource morphology contains definitions needed in the resource
|
-- This resource morphology contains definitions needed in the resource
|
||||||
-- syntax. To build a lexicon, it is better to use $ParadigmsCat$, which
|
-- syntax. To build a lexicon, it is better to use $ParadigmsCat$, which
|
||||||
@@ -63,19 +64,19 @@ oper
|
|||||||
mkNoun (numForms vi vins) ;
|
mkNoun (numForms vi vins) ;
|
||||||
|
|
||||||
mkNomReg : Str -> Noun = \noi ->
|
mkNomReg : Str -> Noun = \noi ->
|
||||||
let
|
let
|
||||||
mkNounMas : (Str -> Number => Str) -> Noun = \rule -> mkNoun (rule noi) Masc
|
mkNounMas : (Str -> Number => Str) -> Noun = \rule -> mkNoun (rule noi) Masc
|
||||||
in
|
in
|
||||||
case last noi of {
|
case last noi of {
|
||||||
"a" => mkNoun (nomCasa "es" noi) Fem ;
|
"a" => mkNoun (nomCasa "es" noi) Fem ;
|
||||||
"s"|"x"|"ç" => mkNounMas nomCas ;
|
"s"|"x"|"ç" => mkNounMas nomCas ;
|
||||||
"i" => mkNounMas nomFre ;
|
"i" => mkNounMas nomFre ;
|
||||||
"í" => mkNounMas (nomCasa "ins") ;
|
"í" => mkNounMas (nomCasa "ins") ;
|
||||||
"à" => mkNounMas (nomCasa "ans") ;
|
"à" => mkNounMas (nomCasa "ans") ;
|
||||||
"ó" => mkNounMas (nomCasa "ons") ;
|
"ó" => mkNounMas (nomCasa "ons") ;
|
||||||
"g" => mkNounMas nomFaig ;
|
"g" => mkNounMas nomFaig ;
|
||||||
_ => mkNounMas nomCep
|
_ => mkNounMas nomCep
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
--2 Adjectives
|
--2 Adjectives
|
||||||
--
|
--
|
||||||
|
|||||||
Reference in New Issue
Block a user