From b1dca38cb5e8f95db0bafba68ec500af34c30120 Mon Sep 17 00:00:00 2001
From: krasimir <krasimir@chalmers.se>
Date: Fri, 22 Feb 2008 10:45:30 +0000
Subject: [PATCH] added IDet and IDetCN

---
 lib/resource/bulgarian/CatBul.gf        |  2 +-
 lib/resource/bulgarian/QuestionBul.gf   | 11 +++++++----
 lib/resource/bulgarian/StructuralBul.gf |  8 +++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/resource/bulgarian/CatBul.gf b/lib/resource/bulgarian/CatBul.gf
index 9b092afc2..3f34bafa1 100644
--- a/lib/resource/bulgarian/CatBul.gf
+++ b/lib/resource/bulgarian/CatBul.gf
@@ -35,7 +35,7 @@ concrete CatBul of Cat = open ResBul, Prelude, (R = ParamX) in {
     QCl = {s : ResBul.Tense => Anteriority => Polarity => QForm => Str} ;
     IP = {s : Str ; gn : GenNum} ;
     IComp = {s : Str} ;    
-    IDet = {s : DGender => Case => Str; n : Number; countable : Bool; spec : Species} ;
+    IDet = {s : GenNum => Str; n : Number} ;
 
 -- Verb
 
diff --git a/lib/resource/bulgarian/QuestionBul.gf b/lib/resource/bulgarian/QuestionBul.gf
index b1298a3c8..e962a729a 100644
--- a/lib/resource/bulgarian/QuestionBul.gf
+++ b/lib/resource/bulgarian/QuestionBul.gf
@@ -29,10 +29,13 @@ concrete QuestionBul of Question = CatBul ** open ResBul, Prelude in {
       gn = ip.gn
       } ;
 
-   -- IDetCN idet num ord cn = {
-   --   s = \\c => idet.s ++ num.s ++ ord.s ++ cn.s ! idet.n ! c ; 
-   --   gn = idet.gn
-   --   } ;
+    IDetCN idet num ord cn = {
+      s = idet.s ! gennum cn.g idet.n ++                   
+          num.s ! dgenderSpecies cn.g Indef Nom ++
+          ord.s ! aform (gennum cn.g num.n) Indef Nom ++
+          cn.s ! NF idet.n Indef ; 
+      gn = gennum cn.g idet.n
+      } ;
 
     CompIAdv a = a ;
 
diff --git a/lib/resource/bulgarian/StructuralBul.gf b/lib/resource/bulgarian/StructuralBul.gf
index c58e76395..897593cf4 100644
--- a/lib/resource/bulgarian/StructuralBul.gf
+++ b/lib/resource/bulgarian/StructuralBul.gf
@@ -55,7 +55,7 @@ concrete StructuralBul of Structural = CatBul **
   here7to_Adv = ss ["до тук"] ;
   here7from_Adv = ss ["от тук"] ;
   how_IAdv = ss "как" ;
-  how8many_IDet = mkDeterminerPl ["колко много"] ;
+  how8many_IDet = {s = \\_ => "колко"; n = Pl} ;
   if_Subj = ss "ако" ;
   in8front_Prep = ss "пред" ;
   i_Pron  = mkNP "аз" "мен" "мой" "моя" "моят" "моя" "моята" "мое" "моето" "мои" "моите" (GSg Masc) P1 ;
@@ -138,10 +138,8 @@ concrete StructuralBul of Structural = CatBul **
   when_Subj = ss "when" ;
 -}
   where_IAdv = ss "къде" ;
-{-
-  whichPl_IDet = mkDeterminer Pl ["which"] ;
-  whichSg_IDet = mkDeterminer Sg ["which"] ;
--}
+  whichPl_IDet = {s = table GenNum ["кой";"коя";"кое";"кои"]; n = Pl} ;
+  whichSg_IDet = {s = table GenNum ["кой";"коя";"кое";"кои"]; n = Sg} ;
   whoSg_IP = mkIP "кой" (GSg Masc) ;
   whoPl_IP = mkIP "кои" GPl ;
   why_IAdv = ss "защо" ;