From 4ccec2fcdfaf4756369046f9be9b8b9b79d82e86 Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Wed, 10 Apr 2019 14:53:35 +0200 Subject: [PATCH 1/3] (Spa) Add missing accents to how_IAdv and which_IQuant --- src/spanish/StructuralSpa.gf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/spanish/StructuralSpa.gf b/src/spanish/StructuralSpa.gf index 050647a2..3afa41c7 100644 --- a/src/spanish/StructuralSpa.gf +++ b/src/spanish/StructuralSpa.gf @@ -51,7 +51,7 @@ lin here_Adv = mkAdv "aquí" ; here7to_Adv = mkAdv ["para aquí"] ; here7from_Adv = mkAdv ["de aquí"] ; - how_IAdv = ss "como" ; + how_IAdv = ss "cómo" ; how8many_IDet = mkIDet "cuántos" "cuántas" Pl ; how8much_IAdv = ss "cuánto" ; if_Subj = ss "si" ** {m = Indic} ; @@ -139,8 +139,8 @@ lin when_Subj = ss "cuando" ** {m = Indic} ; where_IAdv = ss "dónde" ; which_IQuant = {s = table { - Sg => \\g,c => prepCase c ++ "cual" ; - Pl => \\g,c => prepCase c ++ "cuales" + Sg => \\g,c => prepCase c ++ "cuál" ; + Pl => \\g,c => prepCase c ++ "cuáles" } } ; whoPl_IP = {s = \\c => prepCase c ++ "quién" ; a = aagr Masc Pl} ; From 00649a04c01b233376d4756216030a3dc298b9f6 Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Thu, 11 Apr 2019 11:32:25 +0200 Subject: [PATCH 2/3] (Spa) remove underscore from an adverb --- src/spanish/DictSpa.gf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/spanish/DictSpa.gf b/src/spanish/DictSpa.gf index 129f1388..39261bfc 100644 --- a/src/spanish/DictSpa.gf +++ b/src/spanish/DictSpa.gf @@ -42686,7 +42686,7 @@ lin emergencia_A = mkA "emergencia" ; lin acrocianosis_N = mkN "acrocianosis" "acrocianosis" feminine ; lin cribado_N = mkN "cribado" ; lin bastoncillo_N = mkN "bastoncillo" ; -lin de_verdad_Adv = mkAdv "de_verdad" ; +lin de_verdad_Adv = mkAdv "de verdad" ; lin monitoreo_N = mkN "monitoreo" ; lin monitorear_V = mkV "monitorear" ; lin levemente_Adv = mkAdv "levemente" ; From a3302848ac78edc0b278fc9a50ec703419550087 Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Thu, 11 Apr 2019 11:46:58 +0200 Subject: [PATCH 3/3] (ExtendFunctor,Eng,Romance) Add construction "how to walk" Default implementation: "how does one walk" --- src/abstract/Extend.gf | 3 ++- src/common/ExtendFunctor.gf | 1 + src/english/ExtendEng.gf | 3 ++- src/romance/ExtendRomanceFunctor.gf | 2 ++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/abstract/Extend.gf b/src/abstract/Extend.gf index a96b384a..b48daa44 100644 --- a/src/abstract/Extend.gf +++ b/src/abstract/Extend.gf @@ -137,7 +137,8 @@ abstract Extend = Cat ** { -- proper structure of "it is AP to VP" - PredAPVP : AP -> VP -> Cl ; -- it is good to walk + PredAPVP : AP -> VP -> Cl ; -- it is good to walk + PredIAdvVP : IAdv -> VP -> QCl ; -- how to walk? -- to use an AP as CN or NP without CN diff --git a/src/common/ExtendFunctor.gf b/src/common/ExtendFunctor.gf index b16e3c60..8c7867d7 100644 --- a/src/common/ExtendFunctor.gf +++ b/src/common/ExtendFunctor.gf @@ -63,6 +63,7 @@ lin FrontComplDirectVS = variants {} ; -- NP -> VS -> Utt -> Cl ; -- "I am here", she said FrontComplDirectVQ = variants {} ; -- NP -> VQ -> Utt -> Cl ; -- "where", she asked PredAPVP ap vp = ImpersCl (UseComp (CompAP (SentAP ap (EmbedVP vp)))) ; -- DEFAULT it is (good to walk) + PredIAdvVP iadv vp = QuestIAdv iadv (GenericCl vp) ; -- DEFAULT how does one walk AdjAsCN = variants {} ; -- AP -> CN ; -- a green one ; en grön (Swe) AdjAsNP = variants {} ; -- AP -> NP ; -- green (is good) ReflRNP = variants {} ; -- VPSlash -> RNP -> VP ; -- love my family and myself diff --git a/src/english/ExtendEng.gf b/src/english/ExtendEng.gf index baef208a..935b737b 100644 --- a/src/english/ExtendEng.gf +++ b/src/english/ExtendEng.gf @@ -15,7 +15,7 @@ concrete ExtendEng of Extend = FocusAP, FocusAdV, FocusAdv, FocusObj, GenIP, GenModIP, GenModNP, GenNP, GenRP, GerundAdv, GerundCN, GerundNP, IAdvAdv, ICompAP, InOrderToVP, MkVPS, NominalizeVPSlashNP, PassAgentVPSlash, PassVPSlash, PastPartAP, PastPartAgentAP, PositAdVAdj, PredVPS, PredVPSVV, PredetRNP, PrepCN, - PresPartAP, PurposeVP, ReflPoss, ReflPron, ReflRNP, SlashBareV2S, SlashV2V, StrandQuestSlash, StrandRelSlash, + PredIAdvVP, PresPartAP, PurposeVP, ReflPoss, ReflPron, ReflRNP, SlashBareV2S, SlashV2V, StrandQuestSlash, StrandRelSlash, UncontractedNeg, UttAccIP, UttAccNP, UttAdV, UttDatIP, UttDatNP, UttVPShort, WithoutVP, BaseVPS2, ConsVPS2, ConjVPS2, ComplVPS2, MkVPS2 ] with @@ -191,6 +191,7 @@ concrete ExtendEng of Extend = ByVP vp = {s = "by" ++ (GerundAdv (lin VP vp)).s} ; + PredIAdvVP iadv vp = {s = \\t,a,p,q => iadv.s ++ infVP VVInf vp False Simul CPos (agrP3 Sg)} ; NominalizeVPSlashNP vpslash np = let vp : ResEng.VP = insertObjPre (\\_ => vpslash.c2 ++ np.s ! NPAcc) vpslash ; diff --git a/src/romance/ExtendRomanceFunctor.gf b/src/romance/ExtendRomanceFunctor.gf index 85731c31..ef2b2f6e 100644 --- a/src/romance/ExtendRomanceFunctor.gf +++ b/src/romance/ExtendRomanceFunctor.gf @@ -190,6 +190,8 @@ incomplete concrete ExtendRomanceFunctor of Extend = InOrderToVP = variants {} ; -- VP -> Adv ; -- (in order) to publish the document + PredIAdvVP iadv vp = {s = \\_,_,_,_ => iadv.s ++ infStr vp} ; + ApposNP np1 np2 = np1 ** { s = \\c => { c1 = (np1.s ! c).c1 ++ (np2.s ! c).c1 ;