diff --git a/src/catalan/ParadigmsCat.gf b/src/catalan/ParadigmsCat.gf index c65a8af46..89e1f13df 100644 --- a/src/catalan/ParadigmsCat.gf +++ b/src/catalan/ParadigmsCat.gf @@ -28,6 +28,7 @@ resource ParadigmsCat = open (Predef=Predef), Prelude, + DiffCat, MorphoCat, BeschCat, CatCat in { @@ -64,6 +65,9 @@ oper mkPrep : Str -> Prep ; -- other preposition + CopulaType : Type ; + serCopula : CopulaType ; + estarCopula : CopulaType ; --2 Nouns @@ -157,7 +161,7 @@ oper mkA : (bo : A) -> (millor : A) -> A ; -- special comparison (default with "mas") mkA : A -> CopulaType -> A -- force copula type - + } ; -- The functions above create postfix adjectives. To switch @@ -295,10 +299,13 @@ oper Gender = MorphoCat.Gender ; Number = MorphoCat.Number ; + CopulaType = DiffCat.CopulaType ; masculine = Masc ; feminine = Fem ; singular = Sg ; plural = Pl ; + serCopula = DiffCat.serCopula ; + estarCopula = DiffCat.estarCopula ; accusative = complAcc ** {lock_Prep = <>} ; genitive = complGen ** {lock_Prep = <>} ; @@ -344,7 +351,7 @@ oper isPre = a.isPre ; copTyp = serCopula ; lock_A = <>} ; compADeg a = {s = table {Posit => a.s ! Posit ; _ => \\f => "més" ++ a.s ! Posit ! f} ; - isPre = a.isPre ; copTyp = a.copTyp ; + isPre = a.isPre ; copTyp = a.copTyp ; lock_A = <>} ; regADeg a = compADeg (regA a) ; diff --git a/src/portuguese/ParadigmsPor.gf b/src/portuguese/ParadigmsPor.gf index 8677cd798..fe3ab9945 100644 --- a/src/portuguese/ParadigmsPor.gf +++ b/src/portuguese/ParadigmsPor.gf @@ -35,6 +35,7 @@ resource ParadigmsPor = Prelude, MorphoPor, BeschPor, + DiffPor, CatPor in { flags optimize=all ; @@ -79,6 +80,18 @@ oper dative : Prep ; -- preposition "a" and its contractions dative = lin Prep complDat ; + CopulaType : Type ; + CopulaType = DiffPor.CopulaType ; + + serCopula : CopulaType ; + serCopula = DiffPor.serCopula ; + + estarCopula : CopulaType ; + estarCopula = DiffPor.estarCopula ; + + ficarCopula : CopulaType ; + ficarCopula = DiffPor.ficarCopula ; + mkPrep = overload { mkPrep : Str -> Prep -- other preposition = \p -> lin Prep {s = p ; c = Acc ; isDir = False} ; diff --git a/src/spanish/ParadigmsSpa.gf b/src/spanish/ParadigmsSpa.gf index a9720d768..0f1492897 100644 --- a/src/spanish/ParadigmsSpa.gf +++ b/src/spanish/ParadigmsSpa.gf @@ -28,6 +28,7 @@ resource ParadigmsSpa = (Predef=Predef), Prelude, MorphoSpa, + DiffSpa, BeschSpa, CatSpa in { @@ -60,6 +61,10 @@ oper genitive : Prep ; -- preposition "de" and its contractions dative : Prep ; -- preposition "a" and its contractions + CopulaType : Type ; + serCopula : CopulaType ; + estarCopula : CopulaType ; + mkPrep : overload { mkPrep : Str -> Prep ; -- other preposition mkPrep : Str -> Prep -> Prep ; -- compound prepositions, e.g. "antes de", made as mkPrep "antes" genitive @@ -322,10 +327,13 @@ oper Gender = MorphoSpa.Gender ; Number = MorphoSpa.Number ; + CopulaType = DiffSpa.CopulaType ; masculine = Masc ; feminine = Fem ; singular = Sg ; plural = Pl ; + serCopula = DiffSpa.serCopula ; + estarCopula = DiffSpa.estarCopula ; accusative = complAcc ** {lock_Prep = <>} ; genitive = complGen ** {lock_Prep = <>} ;