diff --git a/grammars/health/Health.gf b/grammars/health/Health.gf index 8d732c41e..a55f4fcb9 100644 --- a/grammars/health/Health.gf +++ b/grammars/health/Health.gf @@ -20,8 +20,11 @@ fun Complain : Patient -> Symptom -> Prop ; ShePatient : Patient ; + HePatient : Patient ; + WePatient : Patient ; TheyPatient : Patient ; IPatientHe : Patient ; + IPatientShe : Patient ; Influenza : Illness ; Malaria : Illness ; @@ -68,8 +71,9 @@ fun Arm : BodyPart ; Back : BodyPart ; Shoulder : BodyPart ; --- Knee : BodyPart ; -- Tooth : BodyPart ; +-- Knee : BodyPart ; + Fever : Symptom ; -- Sickness: Symptom ; diff --git a/grammars/health/HealthEng.gf b/grammars/health/HealthEng.gf index dec34e3e5..537c7af88 100644 --- a/grammars/health/HealthEng.gf +++ b/grammars/health/HealthEng.gf @@ -22,6 +22,9 @@ lin ShePatient = SheNP ; TheyPatient = TheyNP ; IPatientHe = INP ; + IPatientShe = INP ; + HePatient = HeNP ; + WePatient = WeNP ; And x y = ConjS AndConj (TwoS x y) ; diff --git a/grammars/health/HealthFre.gf b/grammars/health/HealthFre.gf index b89ba21fd..ae8e14b90 100644 --- a/grammars/health/HealthFre.gf +++ b/grammars/health/HealthFre.gf @@ -28,6 +28,9 @@ lin ShePatient = SheNP ; TheyPatient = TheyNP ; IPatientHe = INP ; + IPatientShe = INP ; + HePatient = HeNP ; + WePatient = WeNP ; HaveIllness = predV2 (tvDir vAvoir) ; Complain = predV2 (tvDir vAvoir) ; @@ -106,8 +109,9 @@ lin Arm = mkCNomReg "bras" Masc ** {lock_CN = <> }; Back = mkCNomReg "dos" Masc ** {lock_CN = <> }; Shoulder = mkCNomReg "epaule" Fem ** {lock_CN = <> }; --- Knee = mkCNomReg "genou" Masc ** {lock_CN = <> }; -- Tooth = mkCNomReg "dents" Masc ** {lock_CN = <> }; +-- Knee = mkCNomReg "genou" Masc ** {lock_CN = <> }; + -- High = AdjP1 (mkAdjReg "élevé" adjPost ** {lock_Adj1 = <> }) ; diff --git a/grammars/health/HealthRus.gf b/grammars/health/HealthRus.gf index 96e7040ef..ac72a9044 100644 --- a/grammars/health/HealthRus.gf +++ b/grammars/health/HealthRus.gf @@ -24,6 +24,11 @@ lin TheyPatient = TheyNP ; IPatientHe = { s = INP.s ; g = PGen Masc; anim = INP.anim ; n = INP.n ; nComp = INP.nComp ; p = INP.p ; pron = INP.pron; lock_NP = <>} ; + IPatientShe = { s = INP.s ; g = PGen Fem; anim = INP.anim ; + n = INP.n ; nComp = INP.nComp ; p = INP.p ; pron = INP.pron; lock_NP = <>} ; + HePatient = HeNP ; + WePatient = WeNP ; + Influenza = UseN ( gripp**{lock_N = <>}) ; Malaria = UseN ( malaria**{lock_N = <>}) ; diff --git a/grammars/health/HealthSwe.gf b/grammars/health/HealthSwe.gf index b385ea94a..4ff5e5f21 100644 --- a/grammars/health/HealthSwe.gf +++ b/grammars/health/HealthSwe.gf @@ -30,6 +30,9 @@ lin ShePatient = mkPronPatient hon_35 ; TheyPatient = mkPronPatient de_38 ; IPatientHe = mkPronPatient jag_32 ; + IPatientShe = mkPronPatient jag_32 ; + HePatient = mkPronPatient han_34 ; + WePatient = mkPronPatient vi_36 ; Influenza = UseN (nApa "influens") ; Malaria = UseN (nApa "malari");