new pronoun exceptions carried out in Romance and Finnish in Phrasebook

9 files changed, 130 insertions, 26 deletions

diff --git a/examples/phrasebook/Sentences.gf b/examples/phrasebook/Sentences.gf
index cb99d94fa..60ae3f6a7 100644
--- a/examples/phrasebook/Sentences.gf
+++ b/examples/phrasebook/Sentences.gf
@@ -122,8 +122,8 @@ abstract Sentences = Numeral ** {
     Too  : Property -> Quality ;                 -- too Italian      
     PropQuality : Property -> Quality ;          -- Italian
 
-    MassDrink : DrinkKind -> MassKind ;          -- beer
-    KindDrink : DrinkKind -> Kind ;              -- (one) beer
+    MassDrink   : DrinkKind -> MassKind ;               -- beer
+    DrinkNumber : Number -> DrinkKind -> PrimObject ;   -- five beers
 
 -- Determiners.
 
@@ -183,9 +183,9 @@ abstract Sentences = Numeral ** {
     Modality ;    -- can, want, must
   fun
     ADoVerbPhrase       : Person -> VerbPhrase -> Action ;                       -- I swim
-    AModVerbPhrase       : Modality -> Person -> VerbPhrase -> Action ;           -- I can swim
+    AModVerbPhrase      : Modality -> Person -> VerbPhrase -> Action ;           -- I can swim
     ADoVerbPhrasePlace  : Person -> VerbPhrase -> Place -> Action ;              -- I swim in the hotel
-    AModVerbPhrasePlace  : Modality -> Person -> VerbPhrase -> Place -> Action ;  -- I can swim in the hotel
+    AModVerbPhrasePlace : Modality -> Person -> VerbPhrase -> Place -> Action ;  -- I can swim in the hotel
 
     QWhereDoVerbPhrase  : Person -> VerbPhrase -> Question ;                     -- where do you swim
     QWhereModVerbPhrase : Modality -> Person -> VerbPhrase -> Question ;         -- where can I swim
diff --git a/examples/phrasebook/SentencesCat.gf b/examples/phrasebook/SentencesCat.gf
index a02641b91..ec5977fdc 100644
--- a/examples/phrasebook/SentencesCat.gf
+++ b/examples/phrasebook/SentencesCat.gf
@@ -1,6 +1,7 @@
 concrete SentencesCat of Sentences = NumeralCat ** SentencesI - [
   IsMass,
   IFemale, YouFamFemale, YouPolFemale, IMale, YouFamMale, YouPolMale,
+  WeMale, WeFemale, YouPlurFamMale, YouPlurFamFemale, YouPlurPolFemale, YouPlurPolMale, TheyMale, TheyFemale, 
   WherePlace, WherePerson, ABePlace,
   Superlative
  ] 
@@ -18,18 +19,40 @@ lincat
 lin
       IsMass m q = mkCl (mkNP the_Det m) q ; -- le vin allemand est bon
 
-  IFemale = 
-    {name = mkNP (ProDrop i8fem_Pron) ; isPron = True ; poss = mkQuant i_Pron} ; 
-  YouFamFemale = 
-    {name = mkNP (ProDrop youSg8fem_Pron) ; isPron = True ; poss = mkQuant youSg_Pron} ;
-  YouPolFemale = 
-     {name = mkNP (ProDrop youPol8fem_Pron) ; isPron = True ; poss = mkQuant youPol_Pron};
-  IMale = 
-     {name = mkNP (ProDrop i_Pron) ; isPron = True ; poss = mkQuant i_Pron} ; 
-  YouFamMale = 
-     {name = mkNP (ProDrop youSg_Pron) ; isPron = True ; poss = mkQuant youSg_Pron} ; 
-  YouPolMale = 
-     {name = mkNP (ProDrop youPol_Pron) ; isPron = True ; poss = mkQuant youPol_Pron} ;
+      IFemale = 
+        {name = mkNP (ProDrop i8fem_Pron) ; isPron = True ; poss = mkQuant i_Pron} ; 
+      YouFamFemale = 
+        {name = mkNP (ProDrop youSg8fem_Pron) ; isPron = True ; poss = mkQuant youSg_Pron} ;
+      YouPolFemale = 
+         {name = mkNP (ProDrop youPol8fem_Pron) ; isPron = True ; poss = mkQuant youPol_Pron};
+      IMale = 
+         {name = mkNP (ProDrop i_Pron) ; isPron = True ; poss = mkQuant i_Pron} ; 
+      YouFamMale = 
+         {name = mkNP (ProDrop youSg_Pron) ; isPron = True ; poss = mkQuant youSg_Pron} ; 
+      YouPolMale = 
+         {name = mkNP (ProDrop youPol_Pron) ; isPron = True ; poss = mkQuant youPol_Pron} ;
+      He = 
+        {name = mkNP (ProDrop he_Pron) ; isPron = True ; poss = mkQuant he_Pron} ; 
+      She = 
+        {name = mkNP (ProDrop she_Pron) ; isPron = True ; poss = mkQuant she_Pron} ; 
+      WeMale = 
+        {name = mkNP (ProDrop we_Pron) ; isPron = True ; poss = mkQuant we_Pron} ; 
+      WeFemale = 
+        {name = mkNP (ProDrop we8fem_Pron) ; isPron = True ; poss = mkQuant we_Pron} ; 
+      YouPlurFamMale = 
+        {name = mkNP (ProDrop youPl_Pron) ; isPron = True ; poss = mkQuant youPl_Pron} ; 
+      YouPlurFamFemale = 
+        {name = mkNP (ProDrop youPl8fem_Pron) ; isPron = True ; poss = mkQuant youPl_Pron} ; 
+      YouPlurPolMale = 
+        {name = mkNP (ProDrop youPolPl_Pron) ; isPron = True ; poss = mkQuant youPolPl_Pron} ;
+      YouPlurPolFemale = 
+        {name = mkNP (ProDrop youPolPl8fem_Pron) ; isPron = True ; poss = mkQuant youPolPl_Pron};
+      TheyMale = 
+        {name = mkNP (ProDrop they_Pron) ; isPron = True ; poss = mkQuant they_Pron} ; 
+      TheyFemale = 
+        {name = mkNP (ProDrop they8fem_Pron) ; isPron = True ; poss = mkQuant they_Pron} ; 
+
+
    ABePlace p place = mkCl p.name (mkVP (mkVP ser) place.at) ;
    WherePlace place = mkQS (mkQCl where_IAdv (mkCl place.name ser) ) ;
    WherePerson person = mkQS (mkQCl where_IAdv (mkCl person.name ser) ) ;
diff --git a/examples/phrasebook/SentencesFin.gf b/examples/phrasebook/SentencesFin.gf
index 1fcbb7b9b..c704c4e57 100644
--- a/examples/phrasebook/SentencesFin.gf
+++ b/examples/phrasebook/SentencesFin.gf
@@ -1,6 +1,7 @@
 concrete SentencesFin of Sentences = NumeralFin ** SentencesI - 
   [Is, IsMass, NameNN, ObjMass,
    IFemale, YouFamFemale, YouPolFemale, IMale, YouFamMale, YouPolMale,
+   WeMale, WeFemale, YouPlurFamMale, YouPlurFamFemale, YouPlurPolFemale, YouPlurPolMale, 
    NPPlace, CNPlace, placeNP, mkCNPlace, mkCNPlacePl,
    GObjectPlease
   ] with 
@@ -34,6 +35,10 @@ concrete SentencesFin of Sentences = NumeralFin ** SentencesI -
         {name = mkNP (ProDrop youSg_Pron) ; isPron = True ; poss = ProDropPoss youSg_Pron} ; 
     YouPolMale, YouPolFemale = 
         {name = mkNP (ProDrop youPol_Pron) ; isPron = True ; poss = ProDropPoss youPol_Pron} ;
+    WeMale, WeFemale = 
+        {name = mkNP (ProDrop we_Pron) ; isPron = True ; poss = ProDropPoss we_Pron} ; 
+    YouPlurFamMale, YouPlurFamFemale, YouPlurPolMale, YouPlurPolFemale = 
+        {name = mkNP (ProDrop youPl_Pron) ; isPron = True ; poss = ProDropPoss youPl_Pron} ;
 
     ObjMass = PartCN ;
 
diff --git a/examples/phrasebook/SentencesFre.gf b/examples/phrasebook/SentencesFre.gf
index 73c4043ec..f600a5d29 100644
--- a/examples/phrasebook/SentencesFre.gf
+++ b/examples/phrasebook/SentencesFre.gf
@@ -1,7 +1,7 @@
 concrete SentencesFre of Sentences = NumeralFre ** SentencesI - [
   IsMass,
   QProp,
-  IFemale, YouFamFemale, YouPolFemale,
+  IFemale, YouFamFemale, YouPolFemale, WeFemale, YouPlurFamFemale, YouPlurPolFemale, YouPlurPolMale, TheyFemale, 
   PYesToNo,
   SHaveNo,SHaveNoMass,
   Superlative
@@ -23,7 +23,18 @@ concrete SentencesFre of Sentences = NumeralFre ** SentencesI - [
       YouFamFemale = 
         {name = mkNP youSg8fem_Pron ; isPron = True ; poss = mkQuant youSg_Pron} ; 
       YouPolFemale = 
-        {name = mkNP youPol8fem_Pron ; isPron = True ; poss = mkQuant youPol_Pron};
+        {name = mkNP youPol8fem_Pron ; isPron = True ; poss = mkQuant youPol_Pron} ;
+      WeFemale = 
+        {name = mkNP we8fem_Pron ; isPron = True ; poss = mkQuant we_Pron} ; 
+      YouPlurFamFemale = 
+        {name = mkNP youPl8fem_Pron ; isPron = True ; poss = mkQuant youPl_Pron} ; 
+      YouPlurPolMale = 
+        {name = mkNP youPl_Pron ; isPron = True ; poss = mkQuant youPol_Pron};
+      YouPlurPolFemale = 
+        {name = mkNP youPl8fem_Pron ; isPron = True ; poss = mkQuant youPol_Pron};
+      TheyFemale = 
+        {name = mkNP they8fem_Pron ; isPron = True ; poss = mkQuant they_Pron} ; 
+
 
       PYesToNo = mkPhrase (lin Utt (ss "si")) ;
 
diff --git a/examples/phrasebook/SentencesI.gf b/examples/phrasebook/SentencesI.gf
index 0aa330b3c..dfacb8d13 100644
--- a/examples/phrasebook/SentencesI.gf
+++ b/examples/phrasebook/SentencesI.gf
@@ -102,7 +102,7 @@ incomplete concrete SentencesI of Sentences = Numeral **
     OneObj o = o ; 
 
     MassDrink d = d ;
-    KindDrink d = d ;
+    DrinkNumber n k = mkNP n k ;
 
     This kind = mkNP this_Quant kind ;
     That kind = mkNP that_Quant kind ;
diff --git a/examples/phrasebook/SentencesIta.gf b/examples/phrasebook/SentencesIta.gf
index 80e0fc70f..e845c1c54 100644
--- a/examples/phrasebook/SentencesIta.gf
+++ b/examples/phrasebook/SentencesIta.gf
@@ -1,6 +1,7 @@
 concrete SentencesIta of Sentences = NumeralIta ** SentencesI - [
   IsMass,
   IFemale, YouFamFemale, YouPolFemale, IMale, YouFamMale, YouPolMale,
+  WeMale, WeFemale, YouPlurFamMale, YouPlurFamFemale, YouPlurPolFemale, YouPlurPolMale, TheyMale, TheyFemale, 
   mkPerson, Superlative, SHaveNoMass
  ] 
   with 
@@ -18,16 +19,36 @@ concrete SentencesIta of Sentences = NumeralIta ** SentencesI - [
 
       IFemale = 
         {name = mkNP (ProDrop i8fem_Pron) ; isPron = True ; poss = PossFamQuant i_Pron} ; 
-      YouFamFemale = 
-        {name = mkNP (ProDrop youSg8fem_Pron) ; isPron = True ; poss = PossFamQuant youSg_Pron} ; 
-      YouPolFemale = 
-        {name = mkNP (ProDrop youPol8fem_Pron) ; isPron = True ; poss = PossFamQuant youPol_Pron};
       IMale = 
         {name = mkNP (ProDrop i_Pron) ; isPron = True ; poss = PossFamQuant i_Pron} ; 
       YouFamMale = 
         {name = mkNP (ProDrop youSg_Pron) ; isPron = True ; poss = PossFamQuant youSg_Pron} ; 
+      YouFamFemale = 
+        {name = mkNP (ProDrop youSg8fem_Pron) ; isPron = True ; poss = PossFamQuant youSg_Pron} ; 
       YouPolMale = 
         {name = mkNP (ProDrop youPol_Pron) ; isPron = True ; poss = PossFamQuant youPol_Pron} ;
+      YouPolFemale = 
+        {name = mkNP (ProDrop youPol8fem_Pron) ; isPron = True ; poss = PossFamQuant youPol_Pron};
+      He = 
+        {name = mkNP (ProDrop he_Pron) ; isPron = True ; poss = PossFamQuant he_Pron} ; 
+      She = 
+        {name = mkNP (ProDrop she_Pron) ; isPron = True ; poss = PossFamQuant she_Pron} ; 
+      WeMale = 
+        {name = mkNP (ProDrop we_Pron) ; isPron = True ; poss = PossFamQuant we_Pron} ; 
+      WeFemale = 
+        {name = mkNP (ProDrop we8fem_Pron) ; isPron = True ; poss = PossFamQuant we_Pron} ; 
+      YouPlurFamMale = 
+        {name = mkNP (ProDrop youPl_Pron) ; isPron = True ; poss = PossFamQuant youPl_Pron} ; 
+      YouPlurFamFemale = 
+        {name = mkNP (ProDrop youPl8fem_Pron) ; isPron = True ; poss = PossFamQuant youPl_Pron} ; 
+      YouPlurPolMale = 
+        {name = mkNP (ProDrop youPolPl_Pron) ; isPron = True ; poss = PossFamQuant youPolPl_Pron} ;
+      YouPlurPolFemale = 
+        {name = mkNP (ProDrop youPolPl8fem_Pron) ; isPron = True ; poss = PossFamQuant youPolPl_Pron};
+      TheyMale = 
+        {name = mkNP (ProDrop they_Pron) ; isPron = True ; poss = PossFamQuant they_Pron} ; 
+      TheyFemale = 
+        {name = mkNP (ProDrop they8fem_Pron) ; isPron = True ; poss = PossFamQuant they_Pron} ; 
 
       SHaveNoMass p k =  mkS negativePol (mkCl p.name (ComplCN have_V2 k)) ;
 
diff --git a/examples/phrasebook/SentencesSpa.gf b/examples/phrasebook/SentencesSpa.gf
index fcb6e0a7e..db378bd89 100644
--- a/examples/phrasebook/SentencesSpa.gf
+++ b/examples/phrasebook/SentencesSpa.gf
@@ -1,6 +1,7 @@
 concrete SentencesSpa of Sentences = NumeralSpa ** SentencesI - [
   IsMass,
   IFemale, YouFamFemale, YouPolFemale, IMale, YouFamMale, YouPolMale,
+  WeMale, WeFemale, YouPlurFamMale, YouPlurFamFemale, YouPlurPolFemale, YouPlurPolMale, TheyMale, TheyFemale, 
   WherePlace, WherePerson, ABePlace,
   Superlative
  ] 
@@ -31,6 +32,26 @@ flags coding = utf8 ;
         {name = mkNP (ProDrop youSg_Pron) ; isPron = True ; poss = mkQuant youSg_Pron} ; 
       YouPolMale = 
         {name = mkNP (ProDrop youPol_Pron) ; isPron = True ; poss = mkQuant youPol_Pron} ;
+      He = 
+        {name = mkNP (ProDrop he_Pron) ; isPron = True ; poss = mkQuant he_Pron} ; 
+      She = 
+        {name = mkNP (ProDrop she_Pron) ; isPron = True ; poss = mkQuant she_Pron} ; 
+      WeMale = 
+        {name = mkNP (ProDrop we_Pron) ; isPron = True ; poss = mkQuant we_Pron} ; 
+      WeFemale = 
+        {name = mkNP (ProDrop we8fem_Pron) ; isPron = True ; poss = mkQuant we_Pron} ; 
+      YouPlurFamMale = 
+        {name = mkNP (ProDrop youPl_Pron) ; isPron = True ; poss = mkQuant youPl_Pron} ; 
+      YouPlurFamFemale = 
+        {name = mkNP (ProDrop youPl8fem_Pron) ; isPron = True ; poss = mkQuant youPl_Pron} ; 
+      YouPlurPolMale = 
+        {name = mkNP (ProDrop youPolPl_Pron) ; isPron = True ; poss = mkQuant youPolPl_Pron} ;
+      YouPlurPolFemale = 
+        {name = mkNP (ProDrop youPolPl8fem_Pron) ; isPron = True ; poss = mkQuant youPolPl_Pron};
+      TheyMale = 
+        {name = mkNP (ProDrop they_Pron) ; isPron = True ; poss = mkQuant they_Pron} ; 
+      TheyFemale = 
+        {name = mkNP (ProDrop they8fem_Pron) ; isPron = True ; poss = mkQuant they_Pron} ; 
 
       ABePlace p place = mkCl p.name (mkVP (mkVP estar) place.at) ;
 
diff --git a/examples/phrasebook/SentencesSwe.gf b/examples/phrasebook/SentencesSwe.gf
index ddcdc006e..9e3ae577f 100644
--- a/examples/phrasebook/SentencesSwe.gf
+++ b/examples/phrasebook/SentencesSwe.gf
@@ -1,6 +1,6 @@
 concrete SentencesSwe of Sentences = NumeralSwe ** SentencesI - [
-    PYesToNo,NameNN
-    ---- , KindDrink  -- should be utrum gender when countable
+    PYesToNo, NameNN,
+    DrinkNumber  -- should be utrum gender when countable
  ] with 
   (Syntax = SyntaxSwe),
   (Symbolic = SymbolicSwe),
@@ -9,6 +9,6 @@ concrete SentencesSwe of Sentences = NumeralSwe ** SentencesI - [
   lin 
     PYesToNo = mkPhrase (lin Utt (ss "jo")) ;
     NameNN = mkNP (P.mkPN "NN") ;
-----    KindDrink d = mkCN (P.mkN [] [] [] [] P.utrum) (lin Adv (mkUtt d)) ; --- an awful hack...
+    DrinkNumber n d = mkNP n (mkCN (P.mkN [] [] [] [] P.utrum) (lin Adv (mkUtt d))) ; --- empty classifier - quite a hack...
   
 }
diff --git a/examples/phrasebook/missing.txt b/examples/phrasebook/missing.txt
index dec6fb188..83026b33f 100644
--- a/examples/phrasebook/missing.txt
+++ b/examples/phrasebook/missing.txt
@@ -1,9 +1,18 @@
+v v v v v v v
 DisambPhrasebookEng :
 PhrasebookBul : Baht Beach Beef Chili Coke Durian Garlic IceCream Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur
 PhrasebookCat : Baht Beach Beef Chili Coke Durian Garlic IceCream MMust Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur
 PhrasebookDan : Baht Beach Beef Chili Coke Durian Garlic IceCream Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur
 PhrasebookDut : Baht Beach Beef Chili Coke Durian Garlic IceCream Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur
+*************
+DisambPhrasebookEng :
+PhrasebookBul : Baht Beef Durian Mango Pineapple Pork Rice Thai
+PhrasebookCat : Baht Beef Durian MMust Mango Pineapple Pork Rice Thai
+PhrasebookDan : Baht Beef Durian Mango Pineapple Pork Rice Thai
+PhrasebookDut : Baht Beef Durian Mango Pineapple Pork Rice Thai
+^ ^ ^ ^ ^ ^ ^
 PhrasebookEng :
+v v v v v v v
 PhrasebookFin :
 PhrasebookFre : Baht Beach Beef Chili Coke Durian Garlic IceCream Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur
 PhrasebookGer : AModVerbPhrase AModVerbPhrasePlace Baht Beach Beef Chili Coke Durian Garlic IceCream Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur
@@ -16,3 +25,17 @@ PhrasebookSpa : Baht Beach Beef Chili Coke Durian Garlic IceCream Mango Noodles
 PhrasebookSwe :
 PhrasebookTha :
 PhrasebookUrd : Baht Beach Beef Chili Coke Durian Garlic IceCream MMust Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur
+*************
+PhrasebookFin : Baht Beef Durian Mango Pineapple Pork Rice Thai
+PhrasebookFre : Baht Beef Durian Mango Pineapple Pork Rice Thai
+PhrasebookGer : AModVerbPhrase AModVerbPhrasePlace Baht Beef Durian Mango Pineapple Pork Rice Thai
+PhrasebookIta : Baht Beef Durian MCan MMust Mango Pineapple Pork Rice Thai
+PhrasebookNor : Baht Beef Durian Mango Pineapple Pork Rice Thai
+PhrasebookPol : Baht Beef Durian Mango Pineapple Pork Rice Thai
+PhrasebookRon : Baht Beef Durian Mango Pineapple Pork Rice Thai
+PhrasebookRus : Baht Beef Belgian Belgium Durian Flemish Mango Pineapple Pork Rice Thai
+PhrasebookSpa : Baht Beef Durian Mango Pineapple Pork Rice Thai
+PhrasebookSwe : Baht Beef Durian Mango Pineapple Pork Rice Thai
+PhrasebookTha :
+PhrasebookUrd : Baht Beef Durian MMust Mango Pineapple Pork Rice Thai
+^ ^ ^ ^ ^ ^ ^