*** empty log message ***

5 files changed, 14 insertions, 13 deletions

diff --git a/grammars/health/ExtraSwe.gf b/grammars/health/ExtraSwe.gf
index af1a829ba..0f6f4e4fb 100644
--- a/grammars/health/ExtraSwe.gf
+++ b/grammars/health/ExtraSwe.gf
@@ -60,6 +60,7 @@ oper
   } ;

 

   verbTa = {s = table {VPres Infinit _ => "ta" ; VPres Indicat _ => "tar" ; VPres Imperat _ => "ta"}; s1 =""} ;

+  verbHa = {s = table {VPres Infinit _ => "ha" ; VPres Indicat _ => "har" ; VPres Imperat _ => "ha"}; s1 =""} ;

   verbBehova = {s = table {VPres Infinit _ => "behöva" ; VPres Indicat _ => "behöver" ; VPres Imperat _ => 

             "behöv"}; s1 =""} ;

 

diff --git a/grammars/health/HealthFre.gf b/grammars/health/HealthFre.gf
index 677daaee8..5d8818108 100644
--- a/grammars/health/HealthFre.gf
+++ b/grammars/health/HealthFre.gf
@@ -9,7 +9,6 @@ concrete HealthFre of Health = open PredicationFre, ResourceFre, Prelude, Syntax
 -- because of the UTF8 problem with non-utf8 resource grammars! 

 

 flags 

-  coding=utf8 ;

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

 

 lincat 

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

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

-concrete HealthResourceIta of HealthResource = open ResourceIta, Prelude, SyntaxIta, ExtraIta, MorphoIta in {

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

+

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

 

 flags 

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

diff --git a/grammars/health/HealthRus.gf b/grammars/health/HealthRus.gf
index 749cbcc90..869d83e31 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 {

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

 

 flags 

   coding=utf8 ;

@@ -50,17 +50,17 @@ lin
    (extVerb verbSlomat Act Past)**{lock_TV = <>}) patient (mkNounPhrase patient.n painkiller ** {lock_NP = <>}) ;

                                

   HaveIllness patient symptom = U_predTransVerb True tvHave

-     patient (mkNounPhrase Sg symptom) ;

+     patient (mkNounPhrase Sg symptom ** {lock_NP = <>}) ;

   Complain = U_predTransVerb True tvHave ;

 

   NeedDoctor = predNeedShortAdjective True ; 

   NeedMedicine = predNeedShortAdjective True ; 

 

   PainIn patient head = U_predTransVerb True (mkDirectVerb 

-    (extVerb verbBolet_2 Act Present )) patient (mkNounPhrase patient.n head) ;

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

  

   PainInMod patient head degree = U_predTransVerb True (mkDirectVerb

-    (extVerb have Act Present)) patient (mkNounPhrase Sg (ModAdj degree 

-      (AppFun (mkFun bol "Š²" Prepos ** {lock_Fun = <>}) (mkNounPhrase patient.n head** {lock_NP = <>}))));

+    (extVerb have Act Present) ** {lock_TV =<>}) patient (mkNounPhrase Sg (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 406d8d975..3c4b1d1af 100644
--- a/grammars/health/HealthSwe.gf
+++ b/grammars/health/HealthSwe.gf
@@ -44,7 +44,7 @@ lin
   Terrible = AdjP1 (extAdjective (aFin "hemsk")** {lock_Adj1 = <>}) ;

  

   BeInCondition = PredVP ; 

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

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

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

   NeedMedicine patient illness = predV2 (mkDirectVerb verbBehova** {lock_TV =<>}) patient 

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

@@ -55,11 +55,11 @@ lin
   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 verbHava ** {lock_TV =<>}) ;

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

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

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

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

 

-  PainIn patient head = predV2 (mkDirectVerb verbHava** {lock_TV =<>}) patient 

+  PainIn patient head = predV2 (mkDirectVerb verbHa** {lock_TV =<>}) patient 

    (

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

     ( AppFun 

@@ -67,7 +67,7 @@ lin
        ((defNounPhrase patient.n head)** {lock_NP = <>})

     )

    ) ;

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

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

     (

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

       ( modCommNounPhrase degree