From ff19032b7fb63699f041d811467ceb12fa76d7e1 Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Thu, 13 Apr 2006 14:19:27 +0000
Subject: [PATCH] extended unix grammars with character-based spelling

---
 resource-1.0/english/CatEng.gf      |  2 +-
 resource-1.0/english/RelativeEng.gf | 18 ++++++++++++++----
 resource-1.0/english/ResEng.gf      |  1 +
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/resource-1.0/english/CatEng.gf b/resource-1.0/english/CatEng.gf
index a07865b63..91e5dfcc3 100644
--- a/resource-1.0/english/CatEng.gf
+++ b/resource-1.0/english/CatEng.gf
@@ -30,7 +30,7 @@ concrete CatEng of Cat = CommonX ** open ResEng, Prelude in {
 -- Relative
 
     RCl = {s : Tense => Anteriority => Polarity => Agr => Str} ;
-    RP = {s : Case => Str ; a : RAgr} ;
+    RP = {s : RCase => Str ; a : RAgr} ;
 
 -- Verb
 
diff --git a/resource-1.0/english/RelativeEng.gf b/resource-1.0/english/RelativeEng.gf
index c81b949b7..9b0b9b562 100644
--- a/resource-1.0/english/RelativeEng.gf
+++ b/resource-1.0/english/RelativeEng.gf
@@ -15,20 +15,30 @@ concrete RelativeEng of Relative = CatEng ** open ResEng in {
             RNoAg => ag ;
             RAg a => a
             } ;
-          cl = mkClause (rp.s ! Nom) agr vp
+          cl = mkClause (rp.s ! RC Nom) agr vp
         in
         cl.s ! t ! ant ! b ! ODir
       } ;
 
+-- Preposition stranding: "that we are looking at". Pied-piping is
+-- deferred to $ExtEng.gf$ ("at which we are looking").
+
     RelSlash rp slash = {
-      s = \\t,a,p,_ => slash.c2 ++ rp.s ! Acc ++ slash.s ! t ! a ! p ! ODir
+      s = \\t,a,p,_ => rp.s ! RC Acc ++ slash.s ! t ! a ! p ! ODir ++ slash.c2
       } ;
 
     FunRP p np rp = {
-      s = \\c => np.s ! c ++ p.s ++ rp.s ! Acc ;
+      s = \\c => np.s ! Acc ++ p.s ++ rp.s ! RPrep ;
       a = RAg np.a
       } ;
 
-    IdRP = mkIP "which" "which" "whose" Sg ** {a = RNoAg} ;
+    IdRP = {
+      s = table {
+        RC Gen => "whose" ; 
+        RC _   => "that" ;
+        RPrep  => "which"
+        } ;
+      a = RNoAg
+      } ;
 
 }
diff --git a/resource-1.0/english/ResEng.gf b/resource-1.0/english/ResEng.gf
index df2dcc9a1..341db3641 100644
--- a/resource-1.0/english/ResEng.gf
+++ b/resource-1.0/english/ResEng.gf
@@ -62,6 +62,7 @@ resource ResEng = ParamX ** open Prelude in {
 --2 For $Relative$
  
     RAgr = RNoAg | RAg {n : Number ; p : Person} ;
+    RCase = RPrep | RC Case ;
 
 --2 For $Numeral$