diff --git a/lib/resource-1.0/romance/ExtraRomance.gf b/lib/resource-1.0/romance/ExtraRomance.gf index d00d0462d..cd70f2c08 100644 --- a/lib/resource-1.0/romance/ExtraRomance.gf +++ b/lib/resource-1.0/romance/ExtraRomance.gf @@ -1,8 +1,21 @@ -incomplete concrete ExtraRomance of ExtraRomanceAbs = CatRomance ** +incomplete concrete ExtraRomance of ExtraRomanceAbs = CatRomance ** open CommonRomance, + Coordination, ResRomance in { lin TPasseSimple = {s = []} ** {t = RPasse} ; --# notpresent + lincat + VPI = {s : Str} ; + [VPI] = {s1,s2 : Str} ; + lin + BaseVPI = twoSS ; + ConsVPI = consrSS comma ; + + MkVPI vp = {s = infVP vp (agrP3 Masc Sg)} ; + ConjVPI = conjunctSS ; + ComplVPIVV v vpi = + insertComplement (\\a => prepCase v.c2.c ++ vpi.s) (predV v) ; + } diff --git a/lib/resource-1.0/romance/ExtraRomanceAbs.gf b/lib/resource-1.0/romance/ExtraRomanceAbs.gf index 53bfbe5f5..6a6403471 100644 --- a/lib/resource-1.0/romance/ExtraRomanceAbs.gf +++ b/lib/resource-1.0/romance/ExtraRomanceAbs.gf @@ -1,4 +1,5 @@ -abstract ExtraRomanceAbs = Extra ** { +abstract ExtraRomanceAbs = Cat, Extra[ + VPI,ListVPI,BaseVPI,ConsVPI,MkVPI,ComplVPIVV,ConjVPI] ** { fun TPasseSimple : Tense ; --# notpresent