From 55ce676bc6e8a4cd7faada847ceb909ebb5633d8 Mon Sep 17 00:00:00 2001
From: krangelov <kr.angelov@gmail.com>
Date: Tue, 3 Sep 2019 20:53:44 +0200
Subject: [PATCH] using simple SC in Bulgarian too

---
 src/bulgarian/AdjectiveBul.gf | 2 +-
 src/bulgarian/CatBul.gf       | 3 +--
 src/bulgarian/NounBul.gf      | 2 +-
 src/bulgarian/SentenceBul.gf  | 8 ++++----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/bulgarian/AdjectiveBul.gf b/src/bulgarian/AdjectiveBul.gf
index d73efab06..921fa875d 100644
--- a/src/bulgarian/AdjectiveBul.gf
+++ b/src/bulgarian/AdjectiveBul.gf
@@ -40,7 +40,7 @@ concrete AdjectiveBul of Adjective = CatBul ** open ResBul, Prelude in {
       } ;
 
     SentAP ap sc = {
-      s = \\a,p => ap.s ! a ! p ++ sc.s ! {gn=aform2gennum a; p=p} ;
+      s = \\a,p => ap.s ! a ! p ++ sc.s ;
       isPre = False
       } ;
 
diff --git a/src/bulgarian/CatBul.gf b/src/bulgarian/CatBul.gf
index a3028a7d4..a9d7ca17a 100644
--- a/src/bulgarian/CatBul.gf
+++ b/src/bulgarian/CatBul.gf
@@ -1,5 +1,5 @@
 --# -coding=utf8
-concrete CatBul of Cat = CommonX - [IAdv,AdV,SC] ** open ResBul, Prelude, Predef, (R = ParamX) in {
+concrete CatBul of Cat = CommonX - [IAdv,AdV] ** open ResBul, Prelude, Predef, (R = ParamX) in {
 
   lincat
 -- Tensed/Untensed
@@ -46,7 +46,6 @@ concrete CatBul of Cat = CommonX - [IAdv,AdV,SC] ** open ResBul, Prelude, Predef
 
     IAdv = {s : QForm => Str} ;
     AdV  = {s : Str; p : Polarity} ;
-    SC   = {s : Agr => Str} ;
 
 -- Noun
 
diff --git a/src/bulgarian/NounBul.gf b/src/bulgarian/NounBul.gf
index e57de9f15..9dce948e0 100644
--- a/src/bulgarian/NounBul.gf
+++ b/src/bulgarian/NounBul.gf
@@ -193,7 +193,7 @@ concrete NounBul of Noun = CatBul ** open ResBul, Prelude in {
       g = cn.g
     } ;
 
-    SentCN cn sc = {s = \\nf => cn.s ! nf ++ sc.s ! agrP3 (gennum cn.g (numNForm nf)); g=cn.g} ;
+    SentCN cn sc = {s = \\nf => cn.s ! nf ++ sc.s; g=cn.g} ;
 
     ApposCN cn np = {s = \\nf => cn.s ! nf ++ np.s ! RSubj; g=cn.g} ;
 
diff --git a/src/bulgarian/SentenceBul.gf b/src/bulgarian/SentenceBul.gf
index d12365fe8..a1addf890 100644
--- a/src/bulgarian/SentenceBul.gf
+++ b/src/bulgarian/SentenceBul.gf
@@ -11,7 +11,7 @@ concrete SentenceBul of Sentence = CatBul ** open Prelude, ResBul in {
                                 VMedial  _ => np.s ! RSubj ;
                                 VPhrasal c => linCase c (personPol np.p) ++ np.s ! RObj CPrep}) np.gn np.p vp ;
 
-    PredSCVP sc vp = mkClause (sc.s ! {gn=GSg Masc; p=P3}) (GSg Masc) (NounP3 Pos) vp ;
+    PredSCVP sc vp = mkClause sc.s (GSg Masc) (NounP3 Pos) vp ;
 
     ImpVP vp = {
       s = \\p,gn => 
@@ -55,9 +55,9 @@ concrete SentenceBul of Sentence = CatBul ** open Prelude, ResBul in {
       c2 = slash.c2
     } ;
 
-    EmbedS  s  = {s = \\_ => "χε" ++ s.s} ;
-    EmbedQS qs = {s = \\_ => qs.s ! QIndir} ;
-    EmbedVP vp = {s = \\agr => daComplex Simul vp.p vp ! Perf ! agr} ;
+    EmbedS  s  = {s = "χε" ++ s.s} ;
+    EmbedQS qs = {s = qs.s ! QIndir} ;
+    EmbedVP vp = {s = daComplex Simul vp.p vp ! Perf ! agrP3 (GSg Masc)} ;
 
     UseCl t p cl = {
       s = t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.p ! Main