From c1425a2915549ff7fa0bfe834099127dd17acc04 Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Fri, 29 Mar 2019 20:28:33 +0100 Subject: [PATCH 1/2] (Spa) Fix typos in youPolPl_Pron and youPolPlFem_Pron --- src/spanish/ExtendSpa.gf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/spanish/ExtendSpa.gf b/src/spanish/ExtendSpa.gf index d08f16e8d..c92248f61 100644 --- a/src/spanish/ExtendSpa.gf +++ b/src/spanish/ExtendSpa.gf @@ -61,11 +61,11 @@ concrete ExtendSpa of Extend = CatSpa ** ExtendRomanceFunctor - Fem Sg P3 ; youPolPl_Pron = mkPronoun - "ustedes" "los" "les" "usted" + "ustedes" "los" "les" "ustedes" "su" "su" "sus" "sus" Masc Pl P3 ; youPolPlFem_Pron = mkPronoun - "ustedes" "las" "les" "usted" + "ustedes" "las" "les" "ustedes" "su" "su" "sus" "sus" Fem Pl P3 ; From d5cf083d05ede3a29819b2da55cde6a5c044b2f6 Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Fri, 29 Mar 2019 20:42:17 +0100 Subject: [PATCH 2/2] (Extend,Romance) Add SubjRelNP: force RS to be in subjunctive Default implementation as RelNP in ExtendFunctor, actual implementation for Romance. --- src/abstract/Extend.gf | 2 ++ src/common/ExtendFunctor.gf | 2 +- src/romance/ExtendRomanceFunctor.gf | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/abstract/Extend.gf b/src/abstract/Extend.gf index 747b28085..a96b384a7 100644 --- a/src/abstract/Extend.gf +++ b/src/abstract/Extend.gf @@ -211,6 +211,8 @@ abstract Extend = Cat ** { UseComp_estar : Comp -> VP ; -- (Cat, Spa, Por) "está cheio" instead of "é cheio" + SubjRelNP : NP -> RS -> NP ; -- Force RS in subjunctive: lo que les *resulte* mejor + iFem_Pron : Pron ; -- I (Fem) youFem_Pron : Pron ; -- you (Fem) weFem_Pron : Pron ; -- we (Fem) diff --git a/src/common/ExtendFunctor.gf b/src/common/ExtendFunctor.gf index fabed10ca..b16e3c603 100644 --- a/src/common/ExtendFunctor.gf +++ b/src/common/ExtendFunctor.gf @@ -96,7 +96,7 @@ lin DetNPMasc = DetNP ; DetNPFem = DetNP ; - + SubjRelNP = RelNP ; UseComp_estar = UseComp ; -- DEFAULT UseComp iFem_Pron = i_Pron ; -- DEFAULT I (masc) youFem_Pron = youSg_Pron ; -- DEFAULT you (masc) diff --git a/src/romance/ExtendRomanceFunctor.gf b/src/romance/ExtendRomanceFunctor.gf index 5d5b90403..85731c31c 100644 --- a/src/romance/ExtendRomanceFunctor.gf +++ b/src/romance/ExtendRomanceFunctor.gf @@ -51,7 +51,11 @@ incomplete concrete ExtendRomanceFunctor of Extend = -- s = \\agr,t,a,p,m => cls.s ! agr ! DDir ! t ! a ! p ! m ++ cls.c2.s ; -- c = Nom -- } ; - + SubjRelNP np rs = heavyNPpol np.isNeg { + s = \\c => (np.s ! c).ton ++ rs.s ! Conjunct ! np.a ; + a = np.a ; + hasClit = False + } ; lin PredVPS np vpi = { s = \\m => (np.s ! Nom).comp ++ vpi.s ! m ! np.a ! np.isNeg