summaryrefslogtreecommitdiff
path: root/next-lib/src
diff options
context:
space:
mode:
Diffstat (limited to 'next-lib/src')
-rw-r--r--next-lib/src/english/ExtraEng.gf13
-rw-r--r--next-lib/src/english/ExtraEngAbs.gf2
-rw-r--r--next-lib/src/english/RelativeEng.gf10
3 files changed, 19 insertions, 6 deletions
diff --git a/next-lib/src/english/ExtraEng.gf b/next-lib/src/english/ExtraEng.gf
index b41663e12..6954539f0 100644
--- a/next-lib/src/english/ExtraEng.gf
+++ b/next-lib/src/english/ExtraEng.gf
@@ -50,4 +50,17 @@ concrete ExtraEng of ExtraEngAbs = CatEng **
oper
neg = CNeg False ;
+
+ lin
+ that_RP =
+ { s = table {
+ RC _ Gen => "whose" ;
+ RC _ _ => "that" ;
+ RPrep Neutr => "which" ;
+ RPrep _ => "whom"
+ } ;
+ a = RNoAg
+ } ;
+
+
}
diff --git a/next-lib/src/english/ExtraEngAbs.gf b/next-lib/src/english/ExtraEngAbs.gf
index f71b7080d..f97f2551d 100644
--- a/next-lib/src/english/ExtraEngAbs.gf
+++ b/next-lib/src/english/ExtraEngAbs.gf
@@ -13,4 +13,6 @@ abstract ExtraEngAbs = Extra ** {
CompoundCN : CN -> CN -> CN ; -- rock album
+ that_RP : RP ; -- "that" as a relational pronoun (IdRP is "which" / "who")
+
}
diff --git a/next-lib/src/english/RelativeEng.gf b/next-lib/src/english/RelativeEng.gf
index 1ec1fc10a..fdaeee907 100644
--- a/next-lib/src/english/RelativeEng.gf
+++ b/next-lib/src/english/RelativeEng.gf
@@ -38,13 +38,11 @@ concrete RelativeEng of Relative = CatEng ** open ResEng in {
} ;
IdRP =
- let varr : Str -> Str = \x -> variants {x ; "that"} --- for bwc
- in {
- s = table {
+ { s = table {
RC _ Gen => "whose" ;
- RC Neutr _ => varr "which" ;
- RC _ Acc => varr "whom" ;
- RC _ Nom => varr "who" ;
+ RC Neutr _ => "which" ;
+ RC _ Acc => "whom" ;
+ RC _ Nom => "who" ;
RPrep Neutr => "which" ;
RPrep _ => "whom"
} ;