From 0df4d4bef6cef116f7d0e3f83f921b52dbd795a2 Mon Sep 17 00:00:00 2001 From: aarne Date: Mon, 7 Apr 2014 07:57:55 +0000 Subject: [PATCH] restored passives in Translate, generalized IdRP in Eng --- lib/src/translator/TranslateBul.gf | 2 +- lib/src/translator/TranslateChi.gf | 2 +- lib/src/translator/TranslateEng.gf | 12 ++++++++++-- lib/src/translator/TranslateFin.gf | 2 +- lib/src/translator/TranslateFre.gf | 2 +- lib/src/translator/TranslateGer.gf | 2 +- lib/src/translator/TranslateHin.gf | 2 +- lib/src/translator/TranslateIta.gf | 2 +- lib/src/translator/TranslateSpa.gf | 2 +- lib/src/translator/TranslateSwe.gf | 2 +- 10 files changed, 19 insertions(+), 11 deletions(-) diff --git a/lib/src/translator/TranslateBul.gf b/lib/src/translator/TranslateBul.gf index fee04edea..2ab5ba914 100644 --- a/lib/src/translator/TranslateBul.gf +++ b/lib/src/translator/TranslateBul.gf @@ -27,7 +27,7 @@ concrete TranslateBul of Translate = DocumentationBul, ChunkBul, - ExtensionsBul [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP], + ExtensionsBul [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, PassVPSlash, PassAgentVPSlash], DictionaryBul ** open MorphoBul, ResBul, ParadigmsBul, SyntaxBul, CommonScand, (E = ExtraBul), Prelude in { diff --git a/lib/src/translator/TranslateChi.gf b/lib/src/translator/TranslateChi.gf index 633e5f48c..8582d4310 100644 --- a/lib/src/translator/TranslateChi.gf +++ b/lib/src/translator/TranslateChi.gf @@ -30,7 +30,7 @@ concrete TranslateChi of Translate = DocumentationChi, ChunkChi, - ExtensionsChi [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP], + ExtensionsChi [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, PassVPSlash, PassAgentVPSlash], DictionaryChi ** diff --git a/lib/src/translator/TranslateEng.gf b/lib/src/translator/TranslateEng.gf index 3dd2d4413..2601f9203 100644 --- a/lib/src/translator/TranslateEng.gf +++ b/lib/src/translator/TranslateEng.gf @@ -22,13 +22,13 @@ concrete TranslateEng of Translate = UseCl -- replaced by UseCl | ContractedUseCl ], QuestionEng, - RelativeEng, + RelativeEng - [IdRP], IdiomEng [NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP], ConstructionEng, DocumentationEng, ChunkEng, - ExtensionsEng [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP], + ExtensionsEng [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, PassVPSlash, PassAgentVPSlash], DictionaryEng ** open MorphoEng, ResEng, ParadigmsEng, (G = GrammarEng), (E = ExtraEng), Prelude in { @@ -50,5 +50,13 @@ lin PPos = {s = [] ; p = CPos} ; PNeg = {s = [] ; p = CNeg True} | {s = [] ; p = CNeg False} ; + IdRP = ExtensionsEng.that_RP | G.IdRP | ExtensionsEng.who_RP | + { s = table { + RC _ (NCase Gen) | RC _ NPNomPoss => "whose" ; + RC _ NPAcc => [] ; + _ => "which" + } ; + a = RNoAg + } ; } diff --git a/lib/src/translator/TranslateFin.gf b/lib/src/translator/TranslateFin.gf index 111824d5d..3966a23b8 100644 --- a/lib/src/translator/TranslateFin.gf +++ b/lib/src/translator/TranslateFin.gf @@ -30,7 +30,7 @@ concrete TranslateFin of Translate = DocumentationFin, ChunkFin, - ExtensionsFin [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP], + ExtensionsFin [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, PassVPSlash, PassAgentVPSlash], DictionaryFin ** diff --git a/lib/src/translator/TranslateFre.gf b/lib/src/translator/TranslateFre.gf index 544637ce6..4e745c7ab 100644 --- a/lib/src/translator/TranslateFre.gf +++ b/lib/src/translator/TranslateFre.gf @@ -28,7 +28,7 @@ concrete TranslateFre of Translate = DocumentationFre, ChunkFre, - ExtensionsFre [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP], + ExtensionsFre [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, PassVPSlash, PassAgentVPSlash], DictionaryFre ** open PhonoFre, MorphoFre, ResFre, CommonRomance, ParadigmsFre, SyntaxFre, Prelude, (G = GrammarFre) in { diff --git a/lib/src/translator/TranslateGer.gf b/lib/src/translator/TranslateGer.gf index e0dbb71d8..751b6b4ea 100644 --- a/lib/src/translator/TranslateGer.gf +++ b/lib/src/translator/TranslateGer.gf @@ -26,7 +26,7 @@ concrete TranslateGer of Translate = DocumentationGer, ChunkGer, - ExtensionsGer [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP], + ExtensionsGer [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, PassVPSlash, PassAgentVPSlash], DictionaryGer ** open MorphoGer, ResGer, ParadigmsGer, SyntaxGer, CommonScand, (E = ExtraGer), Prelude in { diff --git a/lib/src/translator/TranslateHin.gf b/lib/src/translator/TranslateHin.gf index 404f34fbb..8e9972de4 100644 --- a/lib/src/translator/TranslateHin.gf +++ b/lib/src/translator/TranslateHin.gf @@ -27,7 +27,7 @@ concrete TranslateHin of Translate = DocumentationHin, ChunkHin, - ExtensionsHin [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP], + ExtensionsHin [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, PassVPSlash, PassAgentVPSlash], DictionaryHin ** open MorphoHin, ResHin, ParadigmsHin, SyntaxHin, CommonScand, (E = ExtraHin), Prelude in { diff --git a/lib/src/translator/TranslateIta.gf b/lib/src/translator/TranslateIta.gf index 10c0b4f79..33b472cd1 100644 --- a/lib/src/translator/TranslateIta.gf +++ b/lib/src/translator/TranslateIta.gf @@ -26,7 +26,7 @@ concrete TranslateIta of Translate = DocumentationIta, ChunkIta, - ExtensionsIta [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP], + ExtensionsIta [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, PassVPSlash, PassAgentVPSlash], DictionaryIta ** open MorphoIta, ResIta, ParadigmsIta, SyntaxIta, CommonScand, (E = ExtraIta), Prelude in { diff --git a/lib/src/translator/TranslateSpa.gf b/lib/src/translator/TranslateSpa.gf index ea69d3ca5..a8115bd99 100644 --- a/lib/src/translator/TranslateSpa.gf +++ b/lib/src/translator/TranslateSpa.gf @@ -26,7 +26,7 @@ concrete TranslateSpa of Translate = DocumentationSpa, ChunkSpa, - ExtensionsSpa [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP], + ExtensionsSpa [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, PassVPSlash, PassAgentVPSlash], DictionarySpa ** open MorphoSpa, ResSpa, ParadigmsSpa, SyntaxSpa, CommonScand, (E = ExtraSpa), Prelude in { diff --git a/lib/src/translator/TranslateSwe.gf b/lib/src/translator/TranslateSwe.gf index b4aad22de..82384460e 100644 --- a/lib/src/translator/TranslateSwe.gf +++ b/lib/src/translator/TranslateSwe.gf @@ -26,7 +26,7 @@ concrete TranslateSwe of Translate = DocumentationSwe, ChunkSwe, - ExtensionsSwe [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP], + ExtensionsSwe [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, PassVPSlash, PassAgentVPSlash], DictionarySwe ** open MorphoSwe, ResSwe, ParadigmsSwe, SyntaxSwe, CommonScand, (E = ExtraSwe), Prelude in {