*** empty log message ***

1 files changed, 29 insertions, 18 deletions

diff --git a/grammars/health/HealthSwe.gf b/grammars/health/HealthSwe.gf
index 3c4b1d1af..32d41ab2a 100644
--- a/grammars/health/HealthSwe.gf
+++ b/grammars/health/HealthSwe.gf
@@ -8,14 +8,14 @@
 -- use this path to read the grammar from the same directory

 

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

-concrete HealthSwe of Health = open PredicationSwe, ResourceSwe, Prelude, SyntaxSwe, ExtraSwe in {

+concrete HealthSwe of Health = open PredicationSwe, ResourceSwe, Prelude, SyntaxSwe, ExtraSwe, ParadigmsSwe in {

 

 flags 

   startcat=Phr ; lexer=text ; parser=chart ; unlexer=text ;

 

 lincat 

   Patient = patientNPCategory ;

-  Body = CN ;

+  BodyPart = CN ;

   Symptom = NP ;

   SymptomDegree = AP ;

   Prop = S ;

@@ -33,15 +33,12 @@ lin
 

   Influenza = n2n (extCommNoun NoMasc (sApa "influens")) ** {lock_CN = <>} ; 

   Malaria = n2n (extCommNoun NoMasc (sApa "malari")) ** {lock_CN = <>} ; 

-  Head = n2n (extCommNoun NoMasc (sHus "huvud")) ** {lock_CN = <>} ;

-  Leg = n2n (extCommNoun NoMasc (sHus "ben")) ** {lock_CN = <>} ;

+

   Dentist  = n2n (extCommNoun Masc (sKikare "tandläkar")) ** {lock_CN = <>} ;

   PainKiller = n2n (extCommNoun NoMasc (sBil "smärtstillande")) ** {lock_CN = <>} ;

 

   CatchCold = PosVG ( PredAP( AdjP1 (extAdjective (aGrund("förkyl")) ** {lock_Adj1 = <>}) ));

   Pregnant = PosVG ( PredAP( AdjP1 (extAdjective (aGrund("gravi") )** {lock_Adj1 = <>}) ));

-  High = AdjP1 (extAdjective (aFin "hög")** {lock_Adj1 = <>}) ;

-  Terrible = AdjP1 (extAdjective (aFin "hemsk")** {lock_Adj1 = <>}) ;

  

   BeInCondition = PredVP ; 

   HaveIllness patient illness = predV2 (mkDirectVerb verbHa** {lock_TV =<>}) patient 

@@ -53,7 +50,6 @@ lin
   NeedDoctor patient illness = predV2 (mkDirectVerb verbBehova** {lock_TV =<>}) patient                                 

                                 (DetNP (enDet  ** {lock_Det = <>}) illness) ;

   Fever = DetNP (nullDet  ** {lock_Det = <>}) (n2n (extCommNoun NoMasc (sFeber "feb")) ** {lock_CN = <>}) ;

-  FeverMod degree = DetNP (nullDet  ** {lock_Det = <>}) (ModAdj degree (n2n (extCommNoun NoMasc (sFeber "feb")) ** {lock_CN = <>})) ;

  

   Complain = predV2 (mkDirectVerb verbHa ** {lock_TV =<>}) ;

   Broken patient head = predV2 (mkTransVerb verbHa "brutit" ** {lock_TV =<>} ) patient 

@@ -63,20 +59,35 @@ lin
    (

     DetNP (nullDet  ** {lock_Det = <>}) 

     ( AppFun 

-       ((mkFun (extCommNoun NoMasc (sBil "ont")) "i") ** {lock_Fun = <>})

+       ((mkFun (extCommNoun NoMasc (sBil "ont")**{lock_N =<>}) "i") ** {lock_Fun = <>})

        ((defNounPhrase patient.n head)** {lock_NP = <>})

     )

    ) ;

-  PainInMod patient head degree =  predV2 (mkDirectVerb verbHa** {lock_TV =<>}) patient

-    (

-      DetNP (nullDet  ** {lock_Det = <>}) 

-      ( modCommNounPhrase degree 

-           ( AppFun 

-               ((mkFun (extCommNoun NoMasc (sBil "ont")) "i") ** {lock_Fun = <>}) 

-               ((defNounPhrase patient.n head)** {lock_NP = <>})

-           ) ** {lock_CN = <>}

-      )

-    ) ;

+

+  Head = n2n (extCommNoun NoMasc(sHus "huvud")) ** {lock_CN = <>} ;

+  Leg = n2n (extCommNoun NoMasc (sHus "ben")) ** {lock_CN = <>} ;

+  Stomac = n2n (nPojke "mage") ** {lock_CN = <>} ;

+  Throat = n2n (nBil "hals") ** {lock_CN = <>} ;

+  Ear = n2n (mkN "öra" "örat" "öron" "öronen" Neutr NoMasc) ** {lock_CN = <>} ;

+  Chest = n2n (extCommNoun NoMasc (sHus "bröst")) ** {lock_CN = <>} ;

+  Foot = n2n (mkN "fot" "foten" "fötter" "fötterna" Utr NoMasc) ** {lock_CN = <>} ;

+  Arm = n2n (mkN "hand" "handen" "händer" "händerna" Utr NoMasc) ** {lock_CN = <>} ;

+  Back = n2n (nBil "rygg") ** {lock_CN = <>} ;

+  Shoulder = n2n (nNyckel "axel") ** {lock_CN = <>} ;

+

+--  High = AdjP1 (extAdjective (aFin "hög")** {lock_Adj1 = <>}) ;

+--  Terrible = AdjP1 (extAdjective (aFin "hemsk")** {lock_Adj1 = <>}) ;

+--  FeverMod degree = DetNP (nullDet  ** {lock_Det = <>}) (ModAdj degree (n2n (extCommNoun NoMasc (sFeber "feb")) ** {lock_CN = <>})) ;

+--  PainInMod patient head degree =  predV2 (mkDirectVerb verbHa** {lock_TV =<>}) patient

+--    (

+--      DetNP (nullDet  ** {lock_Det = <>}) 

+--      ( modCommNounPhrase degree 

+--           ( AppFun 

+--               ((mkFun (extCommNoun NoMasc (sBil "ont")) "i") ** {lock_Fun = <>}) 

+--               ((defNounPhrase patient.n head)** {lock_NP = <>})

+--           ) ** {lock_CN = <>}

+--      )

+--    ) ;

 

   Injured = injuredBody ;