mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-21 17:12:50 -06:00
restored passives in Translate, generalized IdRP in Eng
This commit is contained in:
@@ -27,7 +27,7 @@ concrete TranslateBul of Translate =
|
|||||||
DocumentationBul,
|
DocumentationBul,
|
||||||
|
|
||||||
ChunkBul,
|
ChunkBul,
|
||||||
ExtensionsBul [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP],
|
ExtensionsBul [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, PassVPSlash, PassAgentVPSlash],
|
||||||
|
|
||||||
DictionaryBul **
|
DictionaryBul **
|
||||||
open MorphoBul, ResBul, ParadigmsBul, SyntaxBul, CommonScand, (E = ExtraBul), Prelude in {
|
open MorphoBul, ResBul, ParadigmsBul, SyntaxBul, CommonScand, (E = ExtraBul), Prelude in {
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ concrete TranslateChi of Translate =
|
|||||||
DocumentationChi,
|
DocumentationChi,
|
||||||
|
|
||||||
ChunkChi,
|
ChunkChi,
|
||||||
ExtensionsChi [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP],
|
ExtensionsChi [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, PassVPSlash, PassAgentVPSlash],
|
||||||
|
|
||||||
DictionaryChi **
|
DictionaryChi **
|
||||||
|
|
||||||
|
|||||||
@@ -22,13 +22,13 @@ concrete TranslateEng of Translate =
|
|||||||
UseCl -- replaced by UseCl | ContractedUseCl
|
UseCl -- replaced by UseCl | ContractedUseCl
|
||||||
],
|
],
|
||||||
QuestionEng,
|
QuestionEng,
|
||||||
RelativeEng,
|
RelativeEng - [IdRP],
|
||||||
IdiomEng [NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP],
|
IdiomEng [NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP],
|
||||||
ConstructionEng,
|
ConstructionEng,
|
||||||
DocumentationEng,
|
DocumentationEng,
|
||||||
|
|
||||||
ChunkEng,
|
ChunkEng,
|
||||||
ExtensionsEng [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP],
|
ExtensionsEng [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, PassVPSlash, PassAgentVPSlash],
|
||||||
|
|
||||||
DictionaryEng **
|
DictionaryEng **
|
||||||
open MorphoEng, ResEng, ParadigmsEng, (G = GrammarEng), (E = ExtraEng), Prelude in {
|
open MorphoEng, ResEng, ParadigmsEng, (G = GrammarEng), (E = ExtraEng), Prelude in {
|
||||||
@@ -50,5 +50,13 @@ lin
|
|||||||
PPos = {s = [] ; p = CPos} ;
|
PPos = {s = [] ; p = CPos} ;
|
||||||
PNeg = {s = [] ; p = CNeg True} | {s = [] ; p = CNeg False} ;
|
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
|
||||||
|
} ;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ concrete TranslateFin of Translate =
|
|||||||
DocumentationFin,
|
DocumentationFin,
|
||||||
|
|
||||||
ChunkFin,
|
ChunkFin,
|
||||||
ExtensionsFin [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP],
|
ExtensionsFin [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, PassVPSlash, PassAgentVPSlash],
|
||||||
|
|
||||||
DictionaryFin **
|
DictionaryFin **
|
||||||
|
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ concrete TranslateFre of Translate =
|
|||||||
DocumentationFre,
|
DocumentationFre,
|
||||||
|
|
||||||
ChunkFre,
|
ChunkFre,
|
||||||
ExtensionsFre [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP],
|
ExtensionsFre [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, PassVPSlash, PassAgentVPSlash],
|
||||||
|
|
||||||
DictionaryFre **
|
DictionaryFre **
|
||||||
open PhonoFre, MorphoFre, ResFre, CommonRomance, ParadigmsFre, SyntaxFre, Prelude, (G = GrammarFre) in {
|
open PhonoFre, MorphoFre, ResFre, CommonRomance, ParadigmsFre, SyntaxFre, Prelude, (G = GrammarFre) in {
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ concrete TranslateGer of Translate =
|
|||||||
DocumentationGer,
|
DocumentationGer,
|
||||||
|
|
||||||
ChunkGer,
|
ChunkGer,
|
||||||
ExtensionsGer [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP],
|
ExtensionsGer [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, PassVPSlash, PassAgentVPSlash],
|
||||||
|
|
||||||
DictionaryGer **
|
DictionaryGer **
|
||||||
open MorphoGer, ResGer, ParadigmsGer, SyntaxGer, CommonScand, (E = ExtraGer), Prelude in {
|
open MorphoGer, ResGer, ParadigmsGer, SyntaxGer, CommonScand, (E = ExtraGer), Prelude in {
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ concrete TranslateHin of Translate =
|
|||||||
DocumentationHin,
|
DocumentationHin,
|
||||||
|
|
||||||
ChunkHin,
|
ChunkHin,
|
||||||
ExtensionsHin [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP],
|
ExtensionsHin [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, PassVPSlash, PassAgentVPSlash],
|
||||||
|
|
||||||
DictionaryHin **
|
DictionaryHin **
|
||||||
open MorphoHin, ResHin, ParadigmsHin, SyntaxHin, CommonScand, (E = ExtraHin), Prelude in {
|
open MorphoHin, ResHin, ParadigmsHin, SyntaxHin, CommonScand, (E = ExtraHin), Prelude in {
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ concrete TranslateIta of Translate =
|
|||||||
DocumentationIta,
|
DocumentationIta,
|
||||||
|
|
||||||
ChunkIta,
|
ChunkIta,
|
||||||
ExtensionsIta [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP],
|
ExtensionsIta [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, PassVPSlash, PassAgentVPSlash],
|
||||||
|
|
||||||
DictionaryIta **
|
DictionaryIta **
|
||||||
open MorphoIta, ResIta, ParadigmsIta, SyntaxIta, CommonScand, (E = ExtraIta), Prelude in {
|
open MorphoIta, ResIta, ParadigmsIta, SyntaxIta, CommonScand, (E = ExtraIta), Prelude in {
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ concrete TranslateSpa of Translate =
|
|||||||
DocumentationSpa,
|
DocumentationSpa,
|
||||||
|
|
||||||
ChunkSpa,
|
ChunkSpa,
|
||||||
ExtensionsSpa [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP],
|
ExtensionsSpa [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, PassVPSlash, PassAgentVPSlash],
|
||||||
|
|
||||||
DictionarySpa **
|
DictionarySpa **
|
||||||
open MorphoSpa, ResSpa, ParadigmsSpa, SyntaxSpa, CommonScand, (E = ExtraSpa), Prelude in {
|
open MorphoSpa, ResSpa, ParadigmsSpa, SyntaxSpa, CommonScand, (E = ExtraSpa), Prelude in {
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ concrete TranslateSwe of Translate =
|
|||||||
DocumentationSwe,
|
DocumentationSwe,
|
||||||
|
|
||||||
ChunkSwe,
|
ChunkSwe,
|
||||||
ExtensionsSwe [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, that_RP, who_RP],
|
ExtensionsSwe [CompoundCN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, PassVPSlash, PassAgentVPSlash],
|
||||||
|
|
||||||
DictionarySwe **
|
DictionarySwe **
|
||||||
open MorphoSwe, ResSwe, ParadigmsSwe, SyntaxSwe, CommonScand, (E = ExtraSwe), Prelude in {
|
open MorphoSwe, ResSwe, ParadigmsSwe, SyntaxSwe, CommonScand, (E = ExtraSwe), Prelude in {
|
||||||
|
|||||||
Reference in New Issue
Block a user