*** empty log message ***

2 files changed, 28 insertions, 35 deletions

diff --git a/grammars/health/ExtraIta.gf b/grammars/health/ExtraIta.gf
index 68b5d40c2..11bbeba29 100644
--- a/grammars/health/ExtraIta.gf
+++ b/grammars/health/ExtraIta.gf
@@ -2,20 +2,16 @@
 --

 -- Aarne Ranta, Janna Khegai 2003

 

-resource ExtraIta = open ResourceIta, Prelude, SyntaxIta, MorphoIta in {

+resource ExtraIta = open PredicationIta, Prelude, SyntaxIta, MorphoIta, ResourceIta in {

 

 oper 

-   NPLock = NounPhrase ** {lock_NP : {}} ;

-   CNLock = CommNounPhrase ** {lock_CN : {}} ;

-   SLock = Sentence ** {lock_S : {}} ;

-oper

 

   averBisogno : CN -> VP = \cn ->

     PosVG (PredTV (mkTransVerbPrep (verbPres avere) "bisogno"** {lock_TV = <>}) (IndefOneNP cn)) ;

 

 -- the following are too low-level and should be provided by the resources

 

-  injuredBody: AP -> NPLock -> CNLock -> SLock = \injured, patient, head ->

+  injuredBody: AP -> NP -> CN -> S = \injured, patient, head ->

     (PredVP patient

       {s = \\g,v => pronRefl patient.n patient.p ++

               verbEssere.s ! v ++

@@ -29,10 +25,6 @@ oper
 

   datAdv : NP -> AdV = \np ->

     {s = np.s ! Aton dative; lock_AdV = <> } ;

-

--- from Predication:

-  predV2: TransVerb -> NPLock -> NounPhrase -> SLock = \F, x, y -> 

-     predVerbPhrase x ((predVerbGroup True) (complTransVerb F y)) ** { lock_S = <>} ;

  

 };

 

diff --git a/grammars/health/HealthResourceIta.gf b/grammars/health/HealthResourceIta.gf
index 25003dcf7..b125aac4d 100644
--- a/grammars/health/HealthResourceIta.gf
+++ b/grammars/health/HealthResourceIta.gf
@@ -1,11 +1,21 @@
 -- use this path to read the grammar from the same directory

 --# -path=.:../newresource/abstract:../prelude:../newresource/italian:../newresource/romance

 

-concrete HealthIta of Health = open ResourceIta, Prelude, SyntaxIta, ExtraIta, MorphoIta in {

+concrete HealthIta of Health = open ResourceIta, Prelude, SyntaxIta, ExtraIta, MorphoIta, ParadigmsIta, ResourceExtIta, PredicationIta in {

 

 flags 

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

-

+lincat 

+  Patient = NP ;

+  BodyPart = CN ;

+  Symptom = NP ;

+  SymptomDegree = AP ;

+  Prop = S ;

+  Illness = CN ; 

+  Condition = VP ;

+  Specialization = CN ;

+  Medicine  = CN ;

+             

 lin

   ShePatient = SheNP ;

   TheyPatient = TheyNP ;

@@ -17,31 +27,14 @@ lin
 illness) ;

 

   BeInCondition = PredVP ;

-

-  CatchCold =

-    PosTV (tvDir vAvere) (IndefOneNP (mkCN (nSale "raffreddore"

-masculine))) ;

-

+  CatchCold = PosTV (tvDir vAvere) (IndefOneNP (mkCN (nSale "raffreddore" masculine))) ;

   Pregnant = PosA (apSolo "gravido" postpos) ;

-

   Complain = predV2 (tvDir vAvere) ;

 

-  PainInMod pat loc deg =

-    PredVP pat

-      (AdvVP (PosTV (tvDir vAvere)

-                    (IndefOneNP (ModAdj deg (mkCN (nSale "dolore"

-masculine)))))

-             (datAdv (DefOneNP loc))) ;

-

-  FeverMod deg = partitNP (ModAdj deg (mkCN (nSale "febbre" feminine)));

-

   PainIn pat loc =

     PredVP pat (AdvVP (PosV (averCosa "male")) (datAdv (DefOneNP loc))) ;

 

-  Fever = partitNP (mkCNomReg (nSale "febbre" feminine)) ;

-

-  High = apSolo "alto" postpos ;

-  Terrible = apTale "terribile" postpos ;

+  Fever = partitNP (mkCN (nSale "febbre" feminine)) ;

   Head = mkCN (nRana "testa") ;

   Leg = mkCN (nRana "gamba") ;

 

@@ -49,14 +42,22 @@ masculine)))))
   PainKiller = mkCN (nSale "calmante" masculine) ;

   NeedDoctor pat doc = PredVP pat (averBisogno doc) ;

   NeedMedicine pat med = PredVP pat (averBisogno med) ;

-  TakeMedicine pat med = predV2 (tvDir (vCorrere "prendere")) pat

-(IndefOneNP med) ;

+  TakeMedicine pat med = predV2 (tvDir (vCorrere "prendere" "")) pat (IndefOneNP med) ;

 

-  Injured = injuredBody (mkAdjective (adjSolo "ferito") True) ;

-  Broken = injuredBody (mkAdjective (adjSolo "rotto") True) ;

+  Injured = injuredBody (apSolo "ferito" prepos) ;

+  Broken = injuredBody (apSolo "rotto" prepos) ;

 

   And = conjS ;

 

+--  FeverMod deg = partitNP (ModAdj deg (mkCN (nSale "febbre" feminine)));

+--  High = apSolo "alto" postpos ;

+--  Terrible = apTale "terribile" postpos ;

+--  PainInMod pat loc deg =

+--    PredVP pat

+--      (AdvVP (PosTV (tvDir vAvere)

+--        (IndefOneNP (ModAdj deg (mkCN (nSale "dolore" masculine)))))

+--             (datAdv (DefOneNP loc))) ;

+

 

 };