better treatment of variant relative pronouns in Eng, based on suggestions by DrBean in gf-dev

This commit is contained in:
aarne
2016-05-20 17:13:06 +00:00
parent 44d654aca5
commit 743047e7a5
5 changed files with 50 additions and 34 deletions
+41 -11
View File
@@ -48,16 +48,6 @@ concrete ExtraEng of ExtraEngAbs = CatEng **
insertObj (\\a => vpi.s ! vv.typ ! a) (predVV vv) ;
lin
that_RP =
{ s = table {
RC _ (NCase Gen) => "whose" ;
RC _ _ => "that" ;
_ => "that" ---- "in that" ?
-- RPrep Neutr => "which" ;
-- RPrep _ => "whom"
} ;
a = RNoAg
} ;
each_Det = mkDeterminer Sg "each" ;
any_Quant = mkQuant "any" "any" ;
@@ -283,4 +273,44 @@ lin
g = cn.g
} ;
}
that_RP =
{ s = table {
RC _ (NCase Gen) | RC _ NPNomPoss => "whose" ;
RC Neutr _ => "that" ;
RC _ NPAcc => "that" ;
RC _ (NCase Nom) => "that" ;
RPrep Neutr => "which" ;
RPrep _ => "who"
} ;
a = RNoAg
} ;
who_RP =
{ s = table {
RC _ (NCase Gen) | RC _ NPNomPoss => "whose" ;
_ => "who"
} ;
a = RNoAg
} ;
which_RP =
{ s = table {
RC _ (NCase Gen) | RC _ NPNomPoss => "whose" ;
_ => "which"
} ;
a = RNoAg
} ;
emptyRP =
{ s = table {
RC _ (NCase Gen) | RC _ NPNomPoss => "whose" ;
RC _ NPAcc => [] ;
RC _ (NCase Nom) => "that" ;
RPrep Neutr => "which" ;
RPrep _ => "who"
} ;
a = RNoAg
} ;
}