Merge pull request #201 from inariksit/here_are_Cl

Extend + DictSpa

src/abstract/Extend.gf

@@ -115,6 +115,9 @@ abstract Extend = Cat ** {
     ExistMassCN   : CN -> Cl ;  -- there is beer / there is no beer
     ExistPluralCN : CN -> Cl ;  -- there are trees / there are no trees
 
+-- generalisation of existential, with adverb as a parameter
+    AdvIsNP : Adv -> NP -> Cl ;  -- here is the tree / here are the trees
+
 -- infinitive for purpose AR 21/8/2013
 
     PurposeVP : VP -> Adv ;  -- to become happy

src/common/ExtendFunctor.gf

@@ -54,6 +54,7 @@ lin
   ExistCN cn = ExistNP (DetCN (DetQuant IndefArt NumSg) cn) ;
   ExistMassCN cn = ExistNP (MassNP cn) ;
   ExistPluralCN cn = ExistNP (DetCN (DetQuant IndefArt NumPl) cn) ;
+  AdvIsNP adv np = PredVP np (UseComp (CompAdv adv)) ;  -- here is the tree / here are the trees
   PurposeVP = variants {} ;     -- VP -> Adv ; -- to become happy
   ComplBareVS = ComplVS ;     -- VS -> S -> VP ; -- say she runs ; DEFAULT say that she runs
   SlashBareV2S = SlashV2S ;     -- V2S -> S -> VPSlash ; -- answer (to him) it is good ; DEFAULT answer that it is good

src/english/ExtendEng.gf

@@ -4,7 +4,7 @@ concrete ExtendEng of Extend =
   CatEng ** ExtendFunctor -
   [
     VPS, ListVPS, VPI, ListVPI, VPS2, ListVPS2, VPI2, ListVPI2, RNP, RNPList,
-    AdAdV, AdjAsCN, AdjAsNP, ApposNP,
+    AdAdV, AdjAsCN, AdjAsNP, ApposNP, AdvIsNP,
     BaseVPS, ConsVPS, BaseVPI, ConsVPI, BaseVPS2, ConsVPS2, BaseVPI2, ConsVPI2,
     MkVPS, ConjVPS, PredVPS, MkVPI, ConjVPI, ComplVPIVV,
     MkVPS2, ConjVPS2, ComplVPS2, MkVPI2, ConjVPI2, ComplVPI2,
@@ -328,6 +328,8 @@ concrete ExtendEng of Extend =
   lin
     ApposNP np1 np2 = {s = \\c => np1.s ! c ++ comma ++ np2.s ! c; a = np1.a} ;
 
+    AdvIsNP adv np = PredVP {s = \\_ => adv.s ; a = np.a} (UseComp (CompNP np)) ;
+
 ---- TODO: RNPList construction
 
   lin

src/finnish/ExtendFin.gf

@@ -5,7 +5,7 @@ concrete ExtendFin of Extend =
     VPI2,VPS2,MkVPS,MkVPS2,ConjVPS2,ComplVPS2, ConsVPS, BaseVPS, ListVPS, VPS, ConjVPS,PredVPS,
     MkVPI2,ConjVPI2,ComplVPI2,ComplVPIVV
     ,ExistCN, ExistMassCN, ICompAP, ByVP
-    ,CompoundN, GenNP, GenIP
+    ,CompoundN, GenNP, GenIP, AdvIsNP
     ]
   with
     (Grammar = GrammarFin) **
@@ -148,4 +148,5 @@ lin
 
     ByVP vp = lin Adv {s = S.infVP vp.s.sc Pos (Ag Sg P3) vp Inf3Adess} ; ---- Agr ?
 
+    AdvIsNP adv np = S.mkClause (\_ -> adv.s) np.a (UseComp (CompNP np)) ;
 }

src/persian/ExtendPes.gf

@@ -2,7 +2,7 @@
 
 concrete ExtendPes of Extend =
   CatPes ** ExtendFunctor - [
-    GenNP, ApposNP, ICompAP
+    GenNP, ApposNP, ICompAP, AdvIsNP
     ,GerundNP,GerundCN,GerundAdv,EmbedPresPart
     ]
   with (Grammar=GrammarPes)
@@ -32,4 +32,7 @@ lin
 
   -- : VP -> SC ;
   EmbedPresPart vp = lin SC {s = showVPH Inf defaultAgr vp} ;
+
+  -- : Adv -> NP -> Cl -- here is the car / here are the cars
+  AdvIsNP adv np = mkClause (indeclNP adv.s ** {a = np.a}) (UseComp (CompNP np)) ;
 }

src/romance/ExtendRomanceFunctor.gf

@@ -118,6 +118,7 @@ incomplete concrete ExtendRomanceFunctor of Extend =
     ExistCN cn = ExistNP (DetCN (DetQuant IndefArt NumSg) cn) ;
     ExistMassCN cn = ExistNP (MassNP cn) ;
     ExistPluralCN cn = ExistNP (DetCN (DetQuant IndefArt NumPl) cn) ;
+    AdvIsNP adv np = mkClause adv.s False False np.a (UseComp_estar (CompNP np)) ;
 
   lin
     ComplBareVS = ComplVS ;     -- VS -> S -> VP ; -- say she runs ; DEFAULT say that she runs

src/spanish/DictSpa.gf

@@ -25813,7 +25813,7 @@ lin manivela_N = mkN "manivela" ;
 lin maniático_A = mkA "maniático" ;
 lin maniático_N = mkN "maniático" ;
 lin manjar_blanco_N = mkAN manjar_N "blanco" ; -- to-check segmentation
-lin mano_N = mkN "mano" ;
+lin mano_N = mkN "mano" feminine ;
 lin mano_a_mano_Adv = mkAdv "mano a mano" ;
 lin mano_de_obra_N = mkN mano_N "de obra" ;
 lin manojo_N = mkN "manojo" ;
@@ -35264,10 +35264,10 @@ lin rorcual_N = mkN "rorcual" ;
 lin roridula_N = mkN "roridula" ;
 lin rosa_A = mkA "rosa" ;
 lin rosa_N = mkN "rosa" ;
-lin rosa_amarillento_N = mkAN rosa_N "amarillento" ; -- to-check segmentation
+lin rosa_amarillento_N = mkAN rosa_N "amarillento" ;
 lin rosa_de_jericó_N = mkN rosa_N "de jericó" ;
 lin rosa_de_muerto_N = mkN rosa_N "de muerto" ;
-lin rosa_salmón_N = mkAN rosa_N "salmón" ; -- to-check segmentation
+lin rosa_salmón_N = mkN rosa_N "salmón" ;
 lin rosacruz_A = mkA "rosacruz" ;
 lin rosadizo_A = mkA "rosadizo" ;
 lin rosado_A = mkA "rosado" ;
@@ -35282,10 +35282,10 @@ lin roseta_N = mkN "roseta" ;
 lin rosetas_de_maíz_N = mkN rosetas_N "de maíz" ;
 lin rositas_de_maíz_N = mkN rositas_N "de maíz" ;
 lin rosmarinus_N = mkN "rosmarinus" ;
-lin rosmarinus_officinalis_N = mkAN rosmarinus_N "officinalis" ; -- to-check segmentation
+lin rosmarinus_officinalis_N = mkN rosmarinus_N "officinalis" ;
 lin rosquilla_N = mkN "rosquilla" ;
 lin rostro_N = mkN "rostro" ;
-lin rostro_humano_N = mkAN rostro_N "humano" ; -- to-check segmentation
+lin rostro_humano_N = mkAN rostro_N "humano" ;
 lin rosácea_N = mkN "rosácea" ;
 lin rotacional_A = mkA "rotacional" ;
 lin rotación_N = mkN "rotación" ;
@@ -35317,10 +35317,10 @@ lin rubio_N = mkN "rubio" ;
 lin rublo_N = mkN "rublo" ;
 lin ruborizarse_V = reflV ruborizar_V ;
 lin rubricar_V = mkV "rubricar" ;
-lin rubus_caesius_N = mkAN rubus_N "caesius" ; -- to-check segmentation
-lin rubus_canadensis_N = mkAN rubus_N "canadensis" ; -- to-check segmentation
-lin rubus_idaeus_strigosus_N = mkAN (mkAN rubus_N "idaeus") "strigosus" ; -- to-check segmentation
-lin rubus_strigosus_N = mkAN rubus_N "strigosus" ; -- to-check segmentation
+lin rubus_caesius_N = mkN rubus_N "caesius" ;
+lin rubus_canadensis_N = mkN rubus_N "canadensis" ;
+lin rubus_idaeus_strigosus_N = mkN (mkN rubus_N "idaeus") "strigosus" ;
+lin rubus_strigosus_N = mkN rubus_N "strigosus" ;
 lin rubéola_N = mkN "rubéola" ;
 lin rubí_N = mkN "rubí" ;
 lin ruda_N = mkN "ruda" ;

src/swedish/ExtendSwe.gf

@@ -12,7 +12,7 @@ concrete ExtendSwe of Extend = CatSwe **
     AdAdV, PositAdVAdj, GerundCN, GerundNP, GerundAdv, PresPartAP, PastPartAP, PastPartAgentAP,
     RNP, RNPList, ReflRNP, ReflPron, ReflPoss, PredetRNP, ConjRNP,
     Base_rr_RNP, Base_nr_RNP, Base_rn_RNP, Cons_rr_RNP, Cons_nr_RNP,
-    CompoundN, CompoundAP
+    CompoundN, CompoundAP, AdvIsNP
   ]
   with (Grammar = GrammarSwe)
     **
@@ -228,4 +228,6 @@ concrete ExtendSwe of Extend = CatSwe **
     InOrderToVP vp = {  -- infinitive: att dricka öl, att vara glad
       s = "för att" ++ infVP vp {g = Utr ; n = Sg ; p = P3}
     } ;
+
+    AdvIsNP adv np = PredVP {s = \\_ => adv.s ; a = np.a ; isPron = False} (UseComp (CompNP np)) ;
 }