From 7f81aa43af09d37f857361096d3b2c4f27dceef6 Mon Sep 17 00:00:00 2001
From: krasimir <krasimir@chalmers.se>
Date: Thu, 27 Nov 2008 06:32:18 +0000
Subject: [PATCH] move lincat Subj, Prep to Slavic

---
 next-lib/src/bulgarian/CatBul.gf | 2 --
 next-lib/src/russian/CatRus.gf   | 2 --
 next-lib/src/slavic/CatSlavic.gf | 3 +++
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/next-lib/src/bulgarian/CatBul.gf b/next-lib/src/bulgarian/CatBul.gf
index c089bcbc1..78989e9d3 100644
--- a/next-lib/src/bulgarian/CatBul.gf
+++ b/next-lib/src/bulgarian/CatBul.gf
@@ -89,8 +89,6 @@ concrete CatBul of Cat = CatSlavic with (ResSlavic = ResBul) ** open Prelude, (R
 -- Structural
 
     Conj = {s : Str; distr : Bool; conj : Bool; n : Number} ;
-    Subj = {s : Str} ;
-    Prep = {s : Str; c : Case} ;
 
 -- Open lexical classes, e.g. Lexicon
 
diff --git a/next-lib/src/russian/CatRus.gf b/next-lib/src/russian/CatRus.gf
index 97c7522ee..317921d4a 100644
--- a/next-lib/src/russian/CatRus.gf
+++ b/next-lib/src/russian/CatRus.gf
@@ -72,8 +72,6 @@ concrete CatRus of Cat = CommonX ** CatSlavic with (ResSlavic = ResRus) ** open
 -- case of "или", the result is however plural if any of the disjuncts is.
 
     Conj = {s1,s2 : Str ; n : Number} ; 
-    Subj = {s : Str} ;
-    Prep = {s : Str ; c: Case } ;
 
 -- Open lexical classes, e.g. Lexicon
 
diff --git a/next-lib/src/slavic/CatSlavic.gf b/next-lib/src/slavic/CatSlavic.gf
index f757a6044..1a0883702 100644
--- a/next-lib/src/slavic/CatSlavic.gf
+++ b/next-lib/src/slavic/CatSlavic.gf
@@ -3,6 +3,9 @@ incomplete concrete CatSlavic of Cat = open Prelude, CommonSlavic, ResSlavic in
 lincat
   CN = {s : NForm => Str; g : Gender; anim : Animacy} ;
 
+  Subj = {s : Str} ;
+  Prep = {s : Str; c: Case} ;
+
   N  = {s : NForm => Str; g : Gender; anim : Animacy} ;
   N2 = {s : NForm => Str; g : Gender; anim : Animacy} ** {c2 : Preposition} ;
   N3 = {s : NForm => Str; g : Gender; anim : Animacy} ** {c2,c3 : Preposition} ;