diff --git a/lib/src/Makefile b/lib/src/Makefile index df398befe..f11b0e8df 100644 --- a/lib/src/Makefile +++ b/lib/src/Makefile @@ -137,11 +137,14 @@ TranslateSwe: TranslateSwe.pgf TranslateHin: TranslateHin.pgf TranslateFin: TranslateFin.pgf TranslateFre: TranslateFre.pgf +TranslateIta: TranslateIta.pgf +TranslateSpa: TranslateSpa.pgf S=-s GFMKT=mkdir -p ../translator && gf $S -make -literal=Symb -probs=$(TPROBSFILE) -gfo-dir ../translator TRANSLATE8=TranslateEng.pgf TranslateBul.pgf TranslateChi.pgf TranslateGer.pgf TranslateSwe.pgf TranslateHin.pgf TranslateFin.pgf TranslateFre.pgf +TRANSLATE10=TranslateEng.pgf TranslateBul.pgf TranslateChi.pgf TranslateGer.pgf TranslateSwe.pgf TranslateHin.pgf TranslateFin.pgf TranslateFre.pgf TranslateIta.pgf TranslateSpa.pgf # Without dependencies: Translate8: @@ -155,11 +158,13 @@ Translate8.pgf: $(TRANSLATE8) TranslateEng.pgf:: ; $(GFMKT) -name=TranslateEng translator/TranslateEng.gf TranslateBul.pgf:: ; $(GFMKT) -name=TranslateBul translator/TranslateBul.gf TranslateChi.pgf:: ; $(GFMKT) -name=TranslateChi translator/TranslateChi.gf +RTS -K64M -TranslateFin.pgf:: ; $(GFMKT) -name=TranslateFin translator/TranslateFin.gf +RTS -K32M +TranslateFin.pgf:: ; $(GFMKT) -name=TranslateFin translator/TranslateFin.gf +RTS -K64M TranslateGer.pgf:: ; $(GFMKT) -name=TranslateGer translator/TranslateGer.gf TranslateHin.pgf:: ; $(GFMKT) -name=TranslateHin translator/TranslateHin.gf -TranslateFre.pgf:: ; $(GFMKT) -name=TranslateFre translator/TranslateFre.gf +TranslateFre.pgf:: ; $(GFMKT) -name=TranslateFre translator/TranslateFre.gf +RTS -K64M TranslateSwe.pgf:: ; $(GFMKT) -name=TranslateSwe translator/TranslateSwe.gf +TranslateIta.pgf:: ; $(GFMKT) -name=TranslateIta translator/TranslateIta.gf +RTS -K64M +TranslateSpa.pgf:: ; $(GFMKT) -name=TranslateSpa translator/TranslateSpa.gf +RTS -K64M # Selected language pairs: TranslateEngFin: ; $(GFMKT) -name=TranslateEngFin TranslateEng.pgf TranslateFin.pgf diff --git a/lib/src/french/ExtraFre.gf b/lib/src/french/ExtraFre.gf index 686031ce8..e9b4df6b6 100644 --- a/lib/src/french/ExtraFre.gf +++ b/lib/src/french/ExtraFre.gf @@ -32,10 +32,10 @@ concrete ExtraFre of ExtraFreAbs = ExtraRomanceFre ** we8fem_Pron = mkPronoun "nous" "nous" "nous" "nous" "notre" "notre" "nos" Fem Pl P1 ; whoPl8fem_IP = - {s = \\c => artDef a.g a.n c + quelPron ! a ; a = a} - where {a = aagr Fem Sg} ; + {s = \\c => "les" + quelPron ! a ; a = a} + where {a = aagr Fem Pl} ; whoSg8fem_IP = - {s = \\c => artDef a.g a.n c + quelPron ! a ; a = a} + {s = \\c => "la" + quelPron ! a ; a = a} where {a = aagr Fem Pl} ; youSg8fem_Pron = mkPronoun diff --git a/lib/src/translator/TranslateBul.gf b/lib/src/translator/TranslateBul.gf index 519494f42..45f285b2f 100644 --- a/lib/src/translator/TranslateBul.gf +++ b/lib/src/translator/TranslateBul.gf @@ -1,25 +1,39 @@ ---# -path=alltenses:../bulgarian:../abstract +--# -path=.:src/chunk:alltenses + concrete TranslateBul of Translate = TenseX - [IAdv, CAdv], CatBul, NounBul - [PPartNP], AdjectiveBul, NumeralBul, - SymbolBul [PN, Symb, String, CN, Card, NP, MkSymb, SymbPN, CNNumNP], + SymbolBul [ + PN, Symb, String, CN, Card, NP, MkSymb, SymbPN, CNNumNP + ], ConjunctionBul, - VerbBul - [SlashV2V, PassV2, UseCopula, ComplVV], + VerbBul - [ + UseCopula, + SlashV2V, PassV2, ComplVV -- generalized in Extensions + ], AdverbBul, PhraseBul, SentenceBul, QuestionBul, RelativeBul, - IdiomBul [NP, VP, Tense, Cl, ProgrVP, ExistNP], - ExtensionsBul, + IdiomBul [ + NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP, + neutr, sjalv + ], +-- ConstructionBul, + DocumentationBul, + + ChunkBul, + ExtensionsBul [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP], + DictionaryBul ** -open ResBul, Prelude in { +open MorphoBul, ResBul, ParadigmsBul, SyntaxBul, CommonScand, (E = ExtraBul), Prelude in { flags literal=Symb ; - coding = utf8 ; } + diff --git a/lib/src/translator/TranslateEng.gf b/lib/src/translator/TranslateEng.gf index 8e3a3cfba..deecd325e 100644 --- a/lib/src/translator/TranslateEng.gf +++ b/lib/src/translator/TranslateEng.gf @@ -28,10 +28,8 @@ concrete TranslateEng of Translate = DocumentationEng, ChunkEng, + ExtensionsEng [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP], - ExtensionsEng - [ - VPI,VPS - ], DictionaryEng ** open MorphoEng, ResEng, ParadigmsEng, (G = GrammarEng), (E = ExtraEng), Prelude in { diff --git a/lib/src/translator/TranslateHin.gf b/lib/src/translator/TranslateHin.gf index b89c3ab74..bc73c9647 100644 --- a/lib/src/translator/TranslateHin.gf +++ b/lib/src/translator/TranslateHin.gf @@ -1,28 +1,38 @@ ---# -path=.:../abstract:../hindi:../hindustani +--# -path=.:src/chunk:alltenses + concrete TranslateHin of Translate = TenseX - [AdN,Adv,SC], --- TextX - [AdN,Adv,SC], CatHin, NounHin - [PPartNP], AdjectiveHin, NumeralHin, + SymbolHin [ + PN, Symb, String, CN, Card, NP, MkSymb, SymbPN, CNNumNP + ], ConjunctionHin, - VerbHin - [SlashV2V, PassV2, UseCopula, ComplVV, VPSlashPrep], + VerbHin - [ + UseCopula, + SlashV2V, PassV2, ComplVV -- generalized in Extensions + ], AdverbHin, PhraseHin, SentenceHin, - RelativeHin, QuestionHin, - IdiomHin [NP, VP, Tense, Cl, ProgrVP, ExistNP], + RelativeHin, + IdiomHin [ + NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP, + neutr, sjalv + ], +-- ConstructionHin, + DocumentationHin, - SymbolHin [PN, Symb, String, CN, Card, NP, MkSymb, SymbPN, CNNumNP, addGenitiveS], + ChunkHin, + ExtensionsHin [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP], - ExtensionsHin, DictionaryHin ** -open MorphoHin, ResHin, ParadigmsHin, Prelude in { +open MorphoHin, ResHin, ParadigmsHin, SyntaxHin, CommonScand, (E = ExtraHin), Prelude in { flags literal=Symb ; - coding=utf8 ; } diff --git a/lib/src/translator/TranslateIta.gf b/lib/src/translator/TranslateIta.gf new file mode 100644 index 000000000..c11d8df1b --- /dev/null +++ b/lib/src/translator/TranslateIta.gf @@ -0,0 +1,38 @@ +--# -path=.:src/chunk:alltenses + +concrete TranslateIta of Translate = + TenseIta, + NounIta - [PPartNP], + AdjectiveIta, + NumeralIta, + SymbolIta [ + PN, Symb, String, CN, Card, NP, MkSymb, SymbPN, CNNumNP + ], + ConjunctionIta, + VerbIta - [ + UseCopula, + SlashV2V, PassV2, ComplVV -- generalized in Extensions + ], + AdverbIta, + PhraseIta, + SentenceIta, + QuestionIta, + RelativeIta, + IdiomIta [ + NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP, + neutr, sjalv + ], +-- ConstructionIta, + DocumentationIta, + + ChunkIta, + ExtensionsIta [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP], + + DictionaryIta ** +open MorphoIta, ResIta, ParadigmsIta, SyntaxIta, CommonScand, (E = ExtraIta), Prelude in { + +flags + literal=Symb ; + +} + diff --git a/lib/src/translator/TranslateSpa.gf b/lib/src/translator/TranslateSpa.gf new file mode 100644 index 000000000..1d82d11e4 --- /dev/null +++ b/lib/src/translator/TranslateSpa.gf @@ -0,0 +1,38 @@ +--# -path=.:src/chunk:alltenses + +concrete TranslateSpa of Translate = + TenseSpa, + NounSpa - [PPartNP], + AdjectiveSpa, + NumeralSpa, + SymbolSpa [ + PN, Symb, String, CN, Card, NP, MkSymb, SymbPN, CNNumNP + ], + ConjunctionSpa, + VerbSpa - [ + UseCopula, + SlashV2V, PassV2, ComplVV -- generalized in Extensions + ], + AdverbSpa, + PhraseSpa, + SentenceSpa, + QuestionSpa, + RelativeSpa, + IdiomSpa [ + NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP, + neutr, sjalv + ], +-- ConstructionSpa, + DocumentationSpa, + + ChunkSpa, + ExtensionsSpa [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP], + + DictionarySpa ** +open MorphoSpa, ResSpa, ParadigmsSpa, SyntaxSpa, CommonScand, (E = ExtraSpa), Prelude in { + +flags + literal=Symb ; + +} + diff --git a/lib/src/translator/TranslateSwe.gf b/lib/src/translator/TranslateSwe.gf index cd7823cf6..e5d366fa3 100644 --- a/lib/src/translator/TranslateSwe.gf +++ b/lib/src/translator/TranslateSwe.gf @@ -15,7 +15,7 @@ concrete TranslateSwe of Translate = ], AdverbSwe, PhraseSwe, - SentenceSwe - [SlashVS], + SentenceSwe, QuestionSwe, RelativeSwe, IdiomSwe [ @@ -26,10 +26,8 @@ concrete TranslateSwe of Translate = DocumentationSwe, ChunkSwe, + ExtensionsSwe [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP], - ExtensionsSwe - [ - VPI,VPS - ], DictionarySwe ** open MorphoSwe, ResSwe, ParadigmsSwe, SyntaxSwe, CommonScand, (E = ExtraSwe), Prelude in {