diff --git a/src/translator/Translate.gf b/src/translator/Translate.gf index 10b09b5e..b8578e95 100644 --- a/src/translator/Translate.gf +++ b/src/translator/Translate.gf @@ -7,22 +7,23 @@ abstract Translate = Numeral, Conjunction, Verb - [ - SlashV2V, PassV2, ComplVV, -- to be generalized - UseCopula ---- overgenerating ?? + PassV2, -- generalized to VPSlash and agents +-- SlashV2V, ComplVV, -- generalized. But (1) more expensive (2) not available for all languages + UseCopula ---- overgenerating, unnecessary ], Adverb, Phrase, Sentence, Question, Relative, - Idiom [NP, VP, Cl, Tense, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP], ---- why only these? + Idiom, Symbol [PN, Symb, String, CN, Card, NP, MkSymb, SymbPN, CNNumNP], ---- why only these? Chunk, Construction, - Extensions - [VPI,VPS], + Extensions - [VPI,VPS,SlashV2V,ComplVV], Dictionary, Documentation diff --git a/src/translator/TranslateBul.gf b/src/translator/TranslateBul.gf index 2ab5ba91..cb71b7f5 100644 --- a/src/translator/TranslateBul.gf +++ b/src/translator/TranslateBul.gf @@ -12,17 +12,14 @@ concrete TranslateBul of Translate = ConjunctionBul, VerbBul - [ UseCopula, - SlashV2V, PassV2, ComplVV -- generalized in Extensions + PassV2 -- generalized in Extensions ], AdverbBul, PhraseBul, SentenceBul, QuestionBul, RelativeBul, - IdiomBul [ - NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP, - neutr, sjalv - ], + IdiomBul, -- ConstructionBul, DocumentationBul, diff --git a/src/translator/TranslateChi.gf b/src/translator/TranslateChi.gf index 8582d431..ef269c6e 100644 --- a/src/translator/TranslateChi.gf +++ b/src/translator/TranslateChi.gf @@ -12,7 +12,7 @@ concrete TranslateChi of Translate = VerbChi - [ UseCopula, -- just removed - SlashV2V, PassV2, ComplVV, -- generalized + PassV2, -- generalized CompAP, AdvVP -- Chi exceptions ], AdverbChi, @@ -22,10 +22,7 @@ concrete TranslateChi of Translate = QuestCl -- Chi exception ], RelativeChi, - IdiomChi [ - NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP, - neutr, sjalv - ], + IdiomChi, ConstructionChi, DocumentationChi, diff --git a/src/translator/TranslateEng.gf b/src/translator/TranslateEng.gf index 2601f920..2bf1276d 100644 --- a/src/translator/TranslateEng.gf +++ b/src/translator/TranslateEng.gf @@ -12,8 +12,8 @@ concrete TranslateEng of Translate = ], ConjunctionEng, VerbEng - [ - UseCopula, -- just removed - SlashV2V, PassV2, ComplVV, -- generalized in Extensions + UseCopula, -- just removed: not needed + PassV2, -- generalized in Extensions ComplVS, SlashV2S, ComplSlash -- Eng exceptions ], AdverbEng, @@ -23,7 +23,7 @@ concrete TranslateEng of Translate = ], QuestionEng, RelativeEng - [IdRP], - IdiomEng [NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP], + IdiomEng, ConstructionEng, DocumentationEng, diff --git a/src/translator/TranslateFin.gf b/src/translator/TranslateFin.gf index 3966a23b..6239822e 100644 --- a/src/translator/TranslateFin.gf +++ b/src/translator/TranslateFin.gf @@ -15,17 +15,14 @@ concrete TranslateFin of Translate = ConjunctionFin, VerbFin - [ UseCopula, - SlashV2V, PassV2, ComplVV -- generalized in Extensions + PassV2 -- generalized in Extensions ], AdverbFin, PhraseFin, SentenceFin, QuestionFin, RelativeFin, - IdiomFin [ - NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP, - neutr, sjalv - ], + IdiomFin, ConstructionFin, DocumentationFin, @@ -41,7 +38,7 @@ flags literal=Symb ; coding = utf8 ; -- the overrides ----- lin - UsePron p = G.UsePron (E.ProDrop p) | G.UsePron p ; - PossPron p = E.ProDropPoss p | G.PossPron p ; + UsePron p = G.UsePron p | G.UsePron (E.ProDrop p) ; + PossPron p = G.PossPron p | E.ProDropPoss p ; } diff --git a/src/translator/TranslateFre.gf b/src/translator/TranslateFre.gf index 4e745c7a..df1ed6c0 100644 --- a/src/translator/TranslateFre.gf +++ b/src/translator/TranslateFre.gf @@ -11,7 +11,7 @@ concrete TranslateFre of Translate = ConjunctionFre, VerbFre - [ UseCopula, - SlashV2V, PassV2, ComplVV -- generalized in Extensions + PassV2 -- generalized in Extensions ], AdverbFre, PhraseFre, @@ -20,10 +20,7 @@ concrete TranslateFre of Translate = QuestCl,QuestIAdv -- french-specific overrides ], RelativeFre, - IdiomFre [ - NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP, - neutr, sjalv - ], + IdiomFre, ConstructionFre, DocumentationFre, diff --git a/src/translator/TranslateGer.gf b/src/translator/TranslateGer.gf index 751b6b4e..ef9925bc 100644 --- a/src/translator/TranslateGer.gf +++ b/src/translator/TranslateGer.gf @@ -11,17 +11,14 @@ concrete TranslateGer of Translate = ConjunctionGer, VerbGer - [ UseCopula, - SlashV2V, PassV2, ComplVV -- generalized in Extensions + PassV2 ], AdverbGer, PhraseGer, SentenceGer, QuestionGer, RelativeGer, - IdiomGer [ - NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP, - neutr, sjalv - ], + IdiomGer, ConstructionGer, DocumentationGer, diff --git a/src/translator/TranslateHin.gf b/src/translator/TranslateHin.gf index 8e9972de..b85b0d00 100644 --- a/src/translator/TranslateHin.gf +++ b/src/translator/TranslateHin.gf @@ -12,17 +12,14 @@ concrete TranslateHin of Translate = ConjunctionHin, VerbHin - [ UseCopula, - SlashV2V, PassV2, ComplVV -- generalized in Extensions + PassV2 -- generalized in Extensions ], AdverbHin, PhraseHin, SentenceHin, QuestionHin, RelativeHin, - IdiomHin [ - NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP, - neutr, sjalv - ], + IdiomHin, -- ConstructionHin, DocumentationHin, diff --git a/src/translator/TranslateIta.gf b/src/translator/TranslateIta.gf index 33b472cd..dceb973f 100644 --- a/src/translator/TranslateIta.gf +++ b/src/translator/TranslateIta.gf @@ -11,17 +11,14 @@ concrete TranslateIta of Translate = ConjunctionIta, VerbIta - [ UseCopula, - SlashV2V, PassV2, ComplVV -- generalized in Extensions + PassV2 -- generalized in Extensions ], AdverbIta, PhraseIta, SentenceIta, QuestionIta, RelativeIta, - IdiomIta [ - NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP, - neutr, sjalv - ], + IdiomIta, -- ConstructionIta, DocumentationIta, diff --git a/src/translator/TranslateSpa.gf b/src/translator/TranslateSpa.gf index a8115bd9..e858c679 100644 --- a/src/translator/TranslateSpa.gf +++ b/src/translator/TranslateSpa.gf @@ -11,17 +11,14 @@ concrete TranslateSpa of Translate = ConjunctionSpa, VerbSpa - [ UseCopula, - SlashV2V, PassV2, ComplVV -- generalized in Extensions + PassV2 -- generalized in Extensions ], AdverbSpa, PhraseSpa, SentenceSpa, QuestionSpa, RelativeSpa, - IdiomSpa [ - NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP, - neutr, sjalv - ], + IdiomSpa, -- ConstructionSpa, DocumentationSpa, diff --git a/src/translator/TranslateSwe.gf b/src/translator/TranslateSwe.gf index 82384460..1e18b8ee 100644 --- a/src/translator/TranslateSwe.gf +++ b/src/translator/TranslateSwe.gf @@ -10,18 +10,15 @@ concrete TranslateSwe of Translate = ], ConjunctionSwe, VerbSwe - [ - UseCopula, - SlashV2V, PassV2, ComplVV -- generalized in Extensions + UseCopula, -- not needed + PassV2 -- generalized in Extensions ], AdverbSwe, PhraseSwe, SentenceSwe, QuestionSwe, RelativeSwe, - IdiomSwe [ - NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP, - neutr, sjalv - ], + IdiomSwe, ConstructionSwe, DocumentationSwe, diff --git a/src/translator/todo/TopDictSwe.gf b/src/translator/todo/TopDictSwe.gf index 61744ff2..eb440e9a 100644 --- a/src/translator/todo/TopDictSwe.gf +++ b/src/translator/todo/TopDictSwe.gf @@ -1346,7 +1346,7 @@ lin note_3_N = mkN "not" "noter" ; lin note_2_N = mkN "anmärkning" | mkN "notis" "notiser" ; lin note_1_N = mkN "anteckning" ; lin season_N = mkN "årstid" "årstider" ; -lin argument_N = mkN "argumentat" "argument" ; +lin argument_N = mkN "argument" "argument" ; lin listen_V = mkV "lyssnar" ; -- comment=2 lin show_N = mkN "show" "shower" ; lin responsibility_N = mkN "ansvar" neutrum | mkN "tillräknelighet" ; -- SaldoWN -- comment=7