Symbolic and Nound fixes for Russian

3 files changed, 8 insertions, 5 deletions

diff --git a/Setup.hs b/Setup.hs
index cf3db3518..179088374 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -231,7 +231,7 @@ langsLang = langs `except` ["Amh","Ara","Lat","Hin","Tha","Tur"]
 langsAPI  = langsLang `except` ["Hin","Ina","Tha"]
 
 -- languages for which to compile Symbolic 
-langsSymbolic  = langsAPI `except` ["Rus"]
+langsSymbolic  = langsAPI -- `except` ["Rus"]
 
 -- languages for which to run demo test
 langsDemo = langsLang `except` ["Ara","Hin","Ina","Tha"]
diff --git a/examples/phrasebook/SentencesRus.gf b/examples/phrasebook/SentencesRus.gf
index a88953ea1..67e06d7f1 100644
--- a/examples/phrasebook/SentencesRus.gf
+++ b/examples/phrasebook/SentencesRus.gf
@@ -2,8 +2,8 @@ concrete SentencesRus of Sentences = NumeralRus ** SentencesI - [
   NameNN, SHave, SHaveNo, SHaveNoMass, QDoHave, AHaveCurr
  ]  with 
   (Syntax = SyntaxRus),
---  (Symbolic = SymbolicRus),
-  (Lexicon = LexiconRus), (Grammar = GrammarRus) ** open Prelude, SyntaxRus in {
+  (Symbolic = SymbolicRus),
+  (Lexicon = LexiconRus), (Grammar = GrammarRus) ** open Prelude, SyntaxRus, (P = ParadigmsRus) in {
     lin
       SHave p obj = mkS (mkCl (mkVP have_V3 obj p.name)) ;
       SHaveNo p obj = mkS (mkCl (mkVP have_not_V3 (mkNP obj) p.name)) ;
@@ -12,4 +12,6 @@ concrete SentencesRus of Sentences = NumeralRus ** SentencesI - [
 
       AHaveCurr p curr = mkCl (mkVP have_V3 (mkNP aPl_Det curr) p.name) ;
 
+  lin NameNN = mkNP (P.mkN "NN") ;
+
 }
\ No newline at end of file
diff --git a/examples/phrasebook/WordsRus.gf b/examples/phrasebook/WordsRus.gf
index 63b2e6e8b..ea9348eba 100644
--- a/examples/phrasebook/WordsRus.gf
+++ b/examples/phrasebook/WordsRus.gf
@@ -185,6 +185,7 @@ flags coding = utf8 ;
     Husband = xOf sing (P.mkN "муж") ;
     Son = xOf sing (P.mkN "сын") ;
     Daughter = xOf sing (P.mkN "дочь" "дочери" "дочери" "дочь" "дочерью" "дочери" "дочь" "дочери" "дочерей" "дочерям" "дочерей" "дочерьми" "дочерях" P.feminine P.animate) ;
+--    Daughter = xOf sing E.daughter_N ;
     Children = xOf plur L.child_N ; 
 
 
@@ -256,8 +257,8 @@ flags coding = utf8 ;
       relativePerson n (mkCN x) (\a,b,c -> mkNP (mkNP the_Quant a c) (SyntaxRus.mkAdv possess_Prep b)) p ;
 
      mkTransport : N -> {name : CN ; by : Adv} = \n -> {
-      name = mkCN n ; 
-      by = SyntaxRus.mkAdv on_Prep (mkNP the_Det n)
+      name = mkCN n ;  
+     by = SyntaxRus.mkAdv on_Prep (mkNP the_Det n)
       } ;
 
   far_IAdv = ss "как далеко" ** {lock_IAdv = <>} ;