diff --git a/src/romance/DiffRomance.gf b/src/romance/DiffRomance.gf index e9d0c055..22021c0d 100644 --- a/src/romance/DiffRomance.gf +++ b/src/romance/DiffRomance.gf @@ -169,5 +169,20 @@ oper contractInf : Bool -> Bool -> Bool = \_,_ -> False ; -- only True in Ita, by orB -} + chooseTA : RTense -> Anteriority + -> (VF => Str) -> (VF => Str) + -> Number -> Person -> Mood -> Str -> Str * Str ; + chooseTA t a verb vaux n p m part = case of { + => ; --# notpresent + => ; --# notpresent + => ; --# notpresent + => ; --# notpresent + => ; --# notpresent + => ; --# notpresent + => ; --# notpresent + => ; --# notpresent + => ; --# notpresent + => + } ; +} ; diff --git a/src/romance/ResRomance.gf b/src/romance/ResRomance.gf index bd0ab912..ad38ed32 100644 --- a/src/romance/ResRomance.gf +++ b/src/romance/ResRomance.gf @@ -228,18 +228,7 @@ oper ---- } ; - vps : Str * Str = case of { - => ; --# notpresent - => ; --# notpresent - => ; --# notpresent - => ; --# notpresent - => ; --# notpresent - => ; --# notpresent - => ; --# notpresent - => ; --# notpresent - => ; --# notpresent - => - } ; + vps : Str * Str = chooseTA te a verb vaux num per m part ; fin = vps.p1 ; inf = vps.p2 ; diff --git a/src/romance/SentenceRomance.gf b/src/romance/SentenceRomance.gf index 8ade9cc9..a2ac17c2 100644 --- a/src/romance/SentenceRomance.gf +++ b/src/romance/SentenceRomance.gf @@ -113,19 +113,8 @@ incomplete concrete SentenceRomance of Sentence = ---- VPAgrClit g n => verb ! VPart g n ---- } ; - vpss : Str * Str = case of { + vpss : Str * Str = chooseTA te a verb vaux num per m part ; - => ; --# notpresent - => ; --# notpresent - => ; --# notpresent - => ; --# notpresent - => ; --# notpresent - => ; --# notpresent - => ; --# notpresent - => ; --# notpresent - => ; --# notpresent - => - } ; fin = vpss.p1 ; inf = vpss.p2 ; hypt = verbHyphen vp.s ; -- in French, -t- in some cases, otherwise - ; empty in other langs