1 files changed, 52 insertions, 24 deletions

diff --git a/grammars/health/HealthRus.gf b/grammars/health/HealthRus.gf
index ddbaf9473..96e7040ef 100644
--- a/grammars/health/HealthRus.gf
+++ b/grammars/health/HealthRus.gf
@@ -1,7 +1,7 @@
 -- use this path to read the grammar from the same directory

 --# -path=.:../newresource/abstract:../prelude:../newresource/russian

 

-concrete HealthRus of Health = open PredicationRus, ResourceRus, Prelude, SyntaxRus, ExtraRus in {

+concrete HealthRus of Health = open PredicationRus, ResourceRus, Prelude, SyntaxRus, ExtraRus, ResourceExtRus, ParadigmsRus in {

 

 flags 

   coding=utf8 ;

@@ -15,8 +15,8 @@ lincat
   Prop = S ;

   Illness = CN ; 

   Condition = VP ;

-  Specialization = CN ;

-  Medicine  = CN ;

+  Specialization = NP ;

+  Medicine  = NP ;

 lin 

   And x y = ConjS AndConj (TwoS x y) ;

 

@@ -25,20 +25,48 @@ lin
   IPatientHe =  { s = INP.s ; g = PGen Masc; anim = INP.anim ;

     n = INP.n ; nComp = INP.nComp ; p = INP.p ; pron = INP.pron; lock_NP = <>} ;

 

-  Influenza = n2n gripp ** {lock_CN = <>}; 

-  Malaria = n2n malaria ** {lock_CN = <>} ; 

+  Influenza = UseN ( gripp**{lock_N = <>}) ; 

+  Malaria = UseN ( malaria**{lock_N = <>}) ; 

+  Diarrhea = UseN ( ponos **{lock_N = <>});  

+  SkinAllergy = ModAdj (AdjP1(adj1Staruyj "кожн")) (UseN ( allergiya **{lock_N = <>}));  

+  Heartburn = UseN ( izzhoga **{lock_N = <>});  

+  Rheumatism = UseN ( revmatizm **{lock_N = <>});  

+  Cystitis = UseN ( tsistit **{lock_N = <>});  

+  Asthma = UseN ( astma **{lock_N = <>}); 

+  Arthritis = UseN ( artrit **{lock_N = <>}); 

+  Diabetes = UseN ( diabet **{lock_N = <>}); 

+  Tonsillitis = UseN ( angina **{lock_N = <>}); 

+  Constipation = UseN ( zapor **{lock_N = <>}); 

+  

+  Dentist  = IndefOneNP ( UseN ( stomatolog**{lock_N = <>})) ; 

+  Gynecologist = IndefOneNP (UseN ( ginekolog**{lock_N = <>})) ; 

+  Urologist = IndefOneNP (UseN ( urolog**{lock_N = <>})) ; 

+  Pediatrician = IndefOneNP (UseN ( pediatr**{lock_N = <>})) ; 

+  Physician = IndefOneNP (UseN ( terapevt**{lock_N = <>})) ; 

+  Dermatologist = IndefOneNP (UseN ( dermatolog**{lock_N = <>})) ; 

+  Cardiologist = IndefOneNP (UseN ( kardiolog**{lock_N = <>})) ; 

+  Neuropathologist = IndefOneNP (UseN ( nevropatolog**{lock_N = <>})) ; 

+  Ophthalmologist = IndefOneNP (UseN ( okulist**{lock_N = <>})) ; 

+  Surgeon = IndefOneNP (UseN ( khirurg**{lock_N = <>})) ; 

 

-  Dentist  =  n2n stomatolog ** {lock_CN = <>};

-  PainKiller = n2n obezbolivauchee ** {lock_CN = <>};

+  SleepingPeels = IndefOneNP (UseN ( snotvornoe**{lock_N = <>})); 

+  Sedative = IndefOneNP (UseN ( uspokoitelnoe**{lock_N = <>})); 

+  Vitamins = IndefManyNP (UseN ( vitamin**{lock_N = <>})); 

+  EyeDrops = IndefManyNP (ModAdj (AdjP1 (glaznoj**{lock_Adj1 = <>})) (UseN ( kaplya**{lock_N = <>}))); 

+  Antibiotics = IndefManyNP (UseN ( antibiotik**{lock_N = <>})); 

+  Viagra = IndefOneNP (UseN ( viagra**{lock_N = <>})); 

+  Laxative = IndefOneNP (UseN ( slabitelnoe**{lock_N = <>})); 

+  Insulin = MassNP (UseN (insulin**{lock_N = <>})); 

+  Antidepressant = IndefOneNP (UseN ( antidepressant**{lock_N = <>})); 

+  PainKiller = IndefOneNP (UseN ( obezbolivauchee**{lock_N = <>}));

 

-  Fever = mkNounPhrase Sg (n2n temperatura)** {lock_NP = <>}; 

+  Fever = mkNounPhrase Sg (UseN ( temperatura**{lock_N = <>}))** {lock_NP = <>}; 

   BeInCondition = PredVP ; 

   CatchCold = PosVG (PredAP (AdjP1 (prostuzhen ** {lock_Adj1 = <>}))) ;

   Pregnant = PosVG (PredAP (AdjP1 (beremenen ** {lock_Adj1 = <>}))) ;

-  

-

-  TakeMedicine patient painkiller = predV2 (mkDirectVerb 

-    (extVerb verbPrinimat Act Present)**{lock_TV = <>}) patient (mkNounPhrase Sg painkiller ** {lock_NP = <>}) ; 

+                                 

+  TakeMedicine = predV2 (mkDirectVerb 

+    (extVerb verbPrinimat Act Present)**{lock_TV = <>}) ; 

   Injured patient painkiller = predV2 (mkDirectVerb

    (extVerb verbPoranit Act Past)**{lock_TV = <>}) patient (mkNounPhrase patient.n painkiller ** {lock_NP = <>}) ;

   Broken patient painkiller = predV2 (mkDirectVerb

@@ -54,22 +82,22 @@ lin
   PainIn patient head = U_predTransVerb True (mkDirectVerb 

     (extVerb verbBolet_2 Act Present ) ** {lock_TV =<>}) patient (mkNounPhrase patient.n head ** {lock_NP =<>}) ;

  

- Head = n2n golova ** {lock_CN = <>};

- Leg = n2n noga ** {lock_CN = <>};

-  Stomac = n2n zhivot ** {lock_CN = <>};

-  Throat = n2n gorlo ** {lock_CN = <>};

-  Ear = n2n ukho ** {lock_CN = <>};

-  Chest = n2n grud ** {lock_CN = <>};

-  Foot = n2n stopa ** {lock_CN = <>};

-  Arm = n2n ruka ** {lock_CN = <>};

-  Back = n2n spina ** {lock_CN = <>};

-  Shoulder = n2n plecho ** {lock_CN = <>};

---  Knee = n2n koleno ** {lock_CN = <>};

+ Head = UseN ( golova**{lock_N = <>});

+ Leg = UseN ( noga**{lock_N = <>});

+  Stomac = UseN ( zhivot**{lock_N = <>});

+  Throat = UseN ( gorlo**{lock_N = <>});

+  Ear = UseN ( ukho**{lock_N = <>});

+  Chest = UseN ( grud**{lock_N = <>});

+  Foot = UseN ( stopa**{lock_N = <>});

+  Arm = UseN ( ruka**{lock_N = <>});

+  Back = UseN ( spina**{lock_N = <>});

+  Shoulder = UseN ( plecho**{lock_N = <>});

+--  Knee = UseN ( koleno**{lock_N = <>});

 

 --  High = AdjP1 (extAdjective vusokij ** {lock_Adj1 = <>});

 --  Terrible = AdjP1 (extAdjective uzhasnuj ** {lock_Adj1 = <>});

 --  FeverMod degree =  mkNounPhrase Sg 

--- (ModAdj degree (n2n temperatura** {lock_CN = <>})) ** {lock_NP = <>};

+-- (ModAdj degree (UseN ( temperatura**{lock_N = <>}))) ** {lock_NP = <>};

 --  PainInMod patient head degree = U_predTransVerb True (mkDirectVerb

 --    (extVerb have Act Present) ** {lock_TV =<>}) patient 

 -- (mkNounPhrase Sg (ModAdj degree