From b13ed4999fe5598a8c0dfd83686aad50b799b168 Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Thu, 13 Dec 2007 22:05:14 +0000
Subject: [PATCH] removed gfcc via gfc everywhere; workaround for russian in
 present

---
 resource/russian/ResRus.gf      | 5 ++++-
 resource/russian/SentenceRus.gf | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/resource/russian/ResRus.gf b/resource/russian/ResRus.gf
index ee5990fe..3d314309 100644
--- a/resource/russian/ResRus.gf
+++ b/resource/russian/ResRus.gf
@@ -196,7 +196,10 @@ oper
    case t of { Present => VPresent p ; PastRus => VPast; Future => VFuture p } ;
 
    getTense : Tense -> RusTense= \t ->
-   case t of { Pres => Present  ; Fut => Future; _ => PastRus} ;
+   case t of { Pres => Present  
+    ; Fut => Future   --# notpresent
+    ; _ => PastRus    --# notpresent
+    } ;
 
   
    getVoice: VerbForm -> Voice = \vf ->
diff --git a/resource/russian/SentenceRus.gf b/resource/russian/SentenceRus.gf
index 40243f21..8d995d58 100644
--- a/resource/russian/SentenceRus.gf
+++ b/resource/russian/SentenceRus.gf
@@ -84,19 +84,23 @@ concrete SentenceRus of Sentence = CatRus ** open Prelude, ResRus in {
 
     UseCl  t a p cl = {s = case t.t of { 
       Cond => cl.s! p.p ! ClCondit ; --# notpresent
+      Pres => cl.s! p.p ! ClIndic Present a.a ;  ---- AR work-around 13/12/2007
       _ => cl.s! p.p ! ClIndic (getTense t.t) a.a}};
 
     UseQCl t a p qcl= {s = case t.t of { 
       Cond => qcl.s! p.p ! ClCondit ; --# notpresent
+      Pres => qcl.s! p.p ! ClIndic Present a.a ;
       _ => qcl.s!p.p! ClIndic (getTense t.t) a.a }};
 
     UseRCl t a p rcl ={s = \\gn,c,anim => case t.t of { 
       Cond => [", "] ++ rcl.s! p.p ! ClCondit ! gn !c !anim ; --# notpresent
+      Pres => [", "] ++ rcl.s! p.p ! ClIndic Present a.a !gn !c !anim;
       _ => [", "] ++ rcl.s! p.p ! ClIndic (getTense t.t) a.a !gn !c !anim}};
 
     UseSlash  t a p cl = {
       s = case t.t of { 
         Cond => cl.s! p.p ! ClCondit ; --# notpresent
+        Pres => cl.s! p.p ! ClIndic Present a.a ;
         _ => cl.s! p.p ! ClIndic (getTense t.t) a.a
         } ;
       s2 = cl.s2 ;