msyds/gf-rgl
1
0
Fork 0
forked from GitHub/gf-rgl
Code Pull Requests Activity

Merge pull request #223 from inariksit/spanish

Browse Source 
Typofixes in Spanish + new construction (Functor+Eng+Spa)
This commit is contained in:
Inari Listenmaa
2019-04-11 12:43:44 +02:00
committed by GitHub
parent dee8917e56 a3302848ac
commit 7cbcd6e7ca
6 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/abstract/Extend.gf
View File

@@ -137,7 +137,8 @@ abstract Extend = Cat ** {
-- proper structure of "it is AP to VP" -- 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 -- to use an AP as CN or NP without CN

1
src/common/ExtendFunctor.gf
View File

@@ -63,6 +63,7 @@ lin
FrontComplDirectVS = variants {} ; -- NP -> VS -> Utt -> Cl ; -- "I am here", she said FrontComplDirectVS = variants {} ; -- NP -> VS -> Utt -> Cl ; -- "I am here", she said
FrontComplDirectVQ = variants {} ; -- NP -> VQ -> Utt -> Cl ; -- "where", she asked 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) 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) AdjAsCN = variants {} ; -- AP -> CN ; -- a green one ; en grön (Swe)
AdjAsNP = variants {} ; -- AP -> NP ; -- green (is good) AdjAsNP = variants {} ; -- AP -> NP ; -- green (is good)
ReflRNP = variants {} ; -- VPSlash -> RNP -> VP ; -- love my family and myself ReflRNP = variants {} ; -- VPSlash -> RNP -> VP ; -- love my family and myself

3
src/english/ExtendEng.gf
View File

@@ -15,7 +15,7 @@ concrete ExtendEng of Extend =
FocusAP, FocusAdV, FocusAdv, FocusObj, GenIP, GenModIP, GenModNP, GenNP, GenRP, FocusAP, FocusAdV, FocusAdv, FocusObj, GenIP, GenModIP, GenModNP, GenNP, GenRP,
GerundAdv, GerundCN, GerundNP, IAdvAdv, ICompAP, InOrderToVP, MkVPS, NominalizeVPSlashNP, GerundAdv, GerundCN, GerundNP, IAdvAdv, ICompAP, InOrderToVP, MkVPS, NominalizeVPSlashNP,
PassAgentVPSlash, PassVPSlash, PastPartAP, PastPartAgentAP, PositAdVAdj, PredVPS, PredVPSVV, PredetRNP, PrepCN, 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 UncontractedNeg, UttAccIP, UttAccNP, UttAdV, UttDatIP, UttDatNP, UttVPShort, WithoutVP, BaseVPS2, ConsVPS2, ConjVPS2, ComplVPS2, MkVPS2
] ]
with with
@@ -191,6 +191,7 @@ concrete ExtendEng of Extend =
ByVP vp = {s = "by" ++ (GerundAdv (lin VP vp)).s} ; 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 = NominalizeVPSlashNP vpslash np =
let vp : ResEng.VP = insertObjPre (\\_ => vpslash.c2 ++ np.s ! NPAcc) vpslash ; let vp : ResEng.VP = insertObjPre (\\_ => vpslash.c2 ++ np.s ! NPAcc) vpslash ;

2
src/romance/ExtendRomanceFunctor.gf
View File

@@ -190,6 +190,8 @@ incomplete concrete ExtendRomanceFunctor of Extend =
InOrderToVP = variants {} ; -- VP -> Adv ; -- (in order) to publish the document InOrderToVP = variants {} ; -- VP -> Adv ; -- (in order) to publish the document
PredIAdvVP iadv vp = {s = \\_,_,_,_ => iadv.s ++ infStr vp} ;
ApposNP np1 np2 = np1 ** { ApposNP np1 np2 = np1 ** {
s = \\c => { s = \\c => {
c1 = (np1.s ! c).c1 ++ (np2.s ! c).c1 ; c1 = (np1.s ! c).c1 ++ (np2.s ! c).c1 ;

2
src/spanish/DictSpa.gf
View File

@@ -42686,7 +42686,7 @@ lin emergencia_A = mkA "emergencia" ;
lin acrocianosis_N = mkN "acrocianosis" "acrocianosis" feminine ; lin acrocianosis_N = mkN "acrocianosis" "acrocianosis" feminine ;
lin cribado_N = mkN "cribado" ; lin cribado_N = mkN "cribado" ;
lin bastoncillo_N = mkN "bastoncillo" ; 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 monitoreo_N = mkN "monitoreo" ;
lin monitorear_V = mkV "monitorear" ; lin monitorear_V = mkV "monitorear" ;
lin levemente_Adv = mkAdv "levemente" ; lin levemente_Adv = mkAdv "levemente" ;

6
src/spanish/StructuralSpa.gf
View File

@@ -51,7 +51,7 @@ lin
here_Adv = mkAdv "aquí" ; here_Adv = mkAdv "aquí" ;
here7to_Adv = mkAdv ["para aquí"] ; here7to_Adv = mkAdv ["para aquí"] ;
here7from_Adv = mkAdv ["de aquí"] ; here7from_Adv = mkAdv ["de aquí"] ;
how_IAdv = ss "como" ; how_IAdv = ss "cómo" ;
how8many_IDet = mkIDet "cuántos" "cuántas" Pl ; how8many_IDet = mkIDet "cuántos" "cuántas" Pl ;
how8much_IAdv = ss "cuánto" ; how8much_IAdv = ss "cuánto" ;
if_Subj = ss "si" ** {m = Indic} ; if_Subj = ss "si" ** {m = Indic} ;
@@ -139,8 +139,8 @@ lin
when_Subj = ss "cuando" ** {m = Indic} ; when_Subj = ss "cuando" ** {m = Indic} ;
where_IAdv = ss "dónde" ; where_IAdv = ss "dónde" ;
which_IQuant = {s = table { which_IQuant = {s = table {
Sg => \\g,c => prepCase c ++ "cual" ; Sg => \\g,c => prepCase c ++ "cuál" ;
Pl => \\g,c => prepCase c ++ "cuales" Pl => \\g,c => prepCase c ++ "cuáles"
} }
} ; } ;
whoPl_IP = {s = \\c => prepCase c ++ "quién" ; a = aagr Masc Pl} ; whoPl_IP = {s = \\c => prepCase c ++ "quién" ; a = aagr Masc Pl} ;