1
0
forked from GitHub/gf-rgl

(Ita) Update A,A2 to not have Degree

This commit is contained in:
Inari Listenmaa
2021-09-13 15:33:40 +08:00
parent 57390d366c
commit 47ea6a6830
4 changed files with 57 additions and 52 deletions

View File

@@ -81,6 +81,8 @@ instance DiffIta of DiffRomance - [contractInf] = open CommonRomance, PhonoIta,
_ => prepCase c ++ artDef False g Sg (CPrep P_di) _ => prepCase c ++ artDef False g Sg (CPrep P_di)
} ; } ;
-} -}
piuComp = "più" ;
conjunctCase : Case -> Case = \c -> case c of { conjunctCase : Case -> Case = \c -> case c of {
Nom => Nom ; Nom => Nom ;
_ => Acc _ => Acc

View File

@@ -45,8 +45,8 @@ lin
s1 = heading1 (nounHeading adjective_Category).s ; s1 = heading1 (nounHeading adjective_Category).s ;
s2 = frameTable ( s2 = frameTable (
tr (th "" ++ th (heading singular_Parameter) ++ th (heading plural_Parameter)) ++ tr (th "" ++ th (heading singular_Parameter) ++ th (heading plural_Parameter)) ++
tr (th (heading masculine_Parameter) ++ td (adj.s ! Posit ! (genNum2Aform Masc Sg)) ++ td (adj.s ! Posit ! (genNum2Aform Masc Pl))) ++ tr (th (heading masculine_Parameter) ++ td (adj.s ! (genNum2Aform Masc Sg)) ++ td (adj.s ! genNum2Aform Masc Pl)) ++
tr (th (heading feminine_Parameter) ++ td (adj.s ! Posit ! (genNum2Aform Fem Sg)) ++ td (adj.s ! Posit ! (genNum2Aform Fem Pl))) tr (th (heading feminine_Parameter) ++ td (adj.s ! (genNum2Aform Fem Sg)) ++ td (adj.s ! genNum2Aform Fem Pl))
) )
} ; } ;

View File

@@ -15,7 +15,7 @@ oper
mkPredet = overload { mkPredet = overload {
mkPredet : A -> Predet = \adj -> lin Predet { mkPredet : A -> Predet = \adj -> lin Predet {
s = \\a,c => prepCase c ++ adj.s ! Posit ! genNum2Aform a.g a.n ; s = \\a,c => prepCase c ++ adj.s ! genNum2Aform a.g a.n ;
c = Nom ; c = Nom ;
a = PNoAg a = PNoAg
} ; } ;

View File

@@ -371,20 +371,23 @@ oper
makeNP x g n = {s = (pn2np (mk2PN x g)).s; a = agrP3 g n ; hasClit = False ; isPol = False ; isNeg = False} ** {lock_NP = <>} ; makeNP x g n = {s = (pn2np (mk2PN x g)).s; a = agrP3 g n ; hasClit = False ; isPol = False ; isNeg = False} ** {lock_NP = <>} ;
mk5A a b c d e = mk5A a b c d e =
compADeg {s = \\_ => (mkAdj a b c d e).s ; isPre = False ; copTyp = serCopula ; lock_A = <>} ; compADeg (mkAdj a b c d e) ;
regA a = compADeg {s = \\_ => (mkAdjReg a).s ; isPre = False ; copTyp = serCopula ; lock_A = <>} ; regA a = compADeg (mkAdjReg a) ;
prefA a = {s = a.s ; isPre = True ; copTyp = a.copTyp ; lock_A = <>} ; prefA a = a ** {isPre = True} ;
adjCopula a cop = a ** {copTyp = cop} ; adjCopula a cop = a ** {copTyp = cop} ;
mkA2 a p = a ** {c2 = p ; lock_A2 = <>} ; mkA2 a p = a ** {c2 = p ; lock_A2 = <>} ;
mkADeg a b = mkADeg a b = a ** {
{s = table {Posit => a.s ! Posit ; _ => b.s ! Posit} ; compar = \\num => b.s ! AF Masc num ; -- mejor, mejores
isPre = a.isPre ; copTyp = serCopula ; lock_A = <>} ; isDeg = True } ;
compADeg a = compADeg a = lin A
{s = table {Posit => a.s ! Posit ; _ => \\f => "più" ++ a.s ! Posit ! f} ; {s = a.s ;
isPre = a.isPre ; copTyp = a.copTyp ; compar = \\_ => nonExist ; --
lock_A = <>} ; isPre = False ; -- default values
copTyp = serCopula ;
isDeg = False
} ;
regADeg a = compADeg (regA a) ; regADeg a = compADeg (regA a) ;
mkAdv x = ss x ** {lock_Adv = <>} ; mkAdv x = ss x ** {lock_Adv = <>} ;
@@ -527,7 +530,7 @@ oper
prefA : A -> A ; prefA : A -> A ;
adjCopula : A -> CopulaType -> A ; adjCopula : A -> CopulaType -> A ;
mkADeg : A -> A -> A ; mkADeg : A -> A -> A ;
compADeg : A -> A ; compADeg : Adj -> A ;
regADeg : Str -> A ; regADeg : Str -> A ;
mkV = overload { mkV = overload {