From 087b30adc98932dde2edb0f3bd01c56007af4bb5 Mon Sep 17 00:00:00 2001
From: janna <unknown>
Date: Wed, 8 Dec 2004 22:16:18 +0000
Subject: [PATCH] *** empty log message ***

---
 grammars/health/HealthRus.gf |  8 ++++----
 grammars/health/HealthSwe.gf | 11 ++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/grammars/health/HealthRus.gf b/grammars/health/HealthRus.gf
index 9f2ee73ea..e4291dc2a 100644
--- a/grammars/health/HealthRus.gf
+++ b/grammars/health/HealthRus.gf
@@ -65,7 +65,7 @@ lin
   Antidepressant = IndefOneNP (UseN ( antidepressant**{lock_N = <>})); 
   PainKiller = IndefOneNP (UseN ( obezbolivauchee**{lock_N = <>}));
 
-  Fever = mkNounPhrase Sg (UseN ( temperatura**{lock_N = <>}))** {lock_NP = <>}; 
+  Fever = mkNounPhrase singular (UseN ( temperatura**{lock_N = <>}))** {lock_NP = <>}; 
   BeInCondition = PredVP ; 
   CatchCold = PosVG (PredAP (AdjP1 (prostuzhen ** {lock_Adj1 = <>}))) ;
   Pregnant = PosVG (PredAP (AdjP1 (beremenen ** {lock_Adj1 = <>}))) ;
@@ -78,7 +78,7 @@ lin
    (extVerb verbSlomat active past)**{lock_TV = <>}) patient (mkNounPhrase patient.n painkiller ** {lock_NP = <>}) ;
                                
   HaveIllness patient symptom = U_predTransVerb true tvHave
-     patient (mkNounPhrase Sg symptom ** {lock_NP = <>}) ;
+     patient (mkNounPhrase singular symptom ** {lock_NP = <>}) ;
   Complain = U_predTransVerb true tvHave ;
 
   NeedDoctor = predNeedShortAdjective true ; 
@@ -101,11 +101,11 @@ lin
 
 --  High = AdjP1 (extAdjective vusokij ** {lock_Adj1 = <>});
 --  Terrible = AdjP1 (extAdjective uzhasnuj ** {lock_Adj1 = <>});
---  FeverMod degree =  mkNounPhrase Sg 
+--  FeverMod degree =  mkNounPhrase singular 
 -- (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 
+-- (mkNounPhrase singular (ModAdj degree 
 --(AppFun (mkFun bol "в" Prepos ** {lock_Fun = <>}) 
 -- (mkNounPhrase patient.n head** {lock_NP = <>}))) ** {lock_NP =<>});
 };
diff --git a/grammars/health/HealthSwe.gf b/grammars/health/HealthSwe.gf
index 4ff5e5f21..b5dcd2e43 100644
--- a/grammars/health/HealthSwe.gf
+++ b/grammars/health/HealthSwe.gf
@@ -1,7 +1,8 @@
 -- The UTF8 version currently differs from the non-UTF8 !!!
 
 -- The difference with the UTF8 version is that 
--- operation "verbVara" doesn't need to be replaced
+-- operations "verbVara" (vbVara see ExtraSweU.gf) 
+-- and "predAP" (predAP, see ExtraSweU.gf) need to be replaced
 -- using the UTF8 encoding (because of the UTF8 problem 
 -- with UTF8 resource grammars) 
 
@@ -100,10 +101,10 @@ lin
   Leg = UseN (nRep "ben") ;
   Stomac = UseN  (nPojke "mage")  ;
   Throat = UseN  (nBil "hals") ;
-  Ear = UseN  (mkN "öra" "örat" "öron" "öronen" Neutr NoMasc) ;
+  Ear = UseN  (mkN "öra" "örat" "öron" "öronen" neutrum nonmasculine) ;
   Chest = UseN (nRep "bröst") ;
-  Foot = UseN  (mkN "fot" "foten" "fötter" "fötterna" Utr NoMasc) ;
-  Arm = UseN  (mkN "hand" "handen" "händer" "händerna" Utr NoMasc) ;
+  Foot = UseN  (mkN "fot" "foten" "fötter" "fötterna" utrum nonmasculine) ;
+  Arm = UseN  (mkN "hand" "handen" "händer" "händerna" utrum nonmasculine) ;
   Back = UseN  (nBil "rygg") ;
   Shoulder = UseN  (nNyckel "axel") ;
 
@@ -115,7 +116,7 @@ lin
 --      DetNP (nullDet  ** {lock_Det = <>}) 
 --      ( modCommNounPhrase degree 
 --           ( AppFun 
---               ((mkFun (extCommNoun NoMasc (sBil "ont")) "i") ** {lock_Fun = <>}) 
+--               ((mkFun (extCommNoun nonmasculine (sBil "ont")) "i") ** {lock_Fun = <>}) 
 --               ((defNounPhrase patient.n head)** {lock_NP = <>})
 --           ) ** {lock_CN = <>}
 --      )