From e9063a42dce340e5f8d2acad256da0f8bc34924e Mon Sep 17 00:00:00 2001
From: aarne <unknown>
Date: Thu, 31 Mar 2005 16:14:12 +0000
Subject: [PATCH] Romance almost complete

---
 lib/resource/french/SyntaxFre.gf     | 15 +++------------
 lib/resource/italian/SyntaxIta.gf    |  2 ++
 lib/resource/romance/RulesRomance.gf |  6 +++---
 lib/resource/spanish/SyntaxSpa.gf    |  3 +++
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/lib/resource/french/SyntaxFre.gf b/lib/resource/french/SyntaxFre.gf
index f1c98d8cb..309fd4cf5 100644
--- a/lib/resource/french/SyntaxFre.gf
+++ b/lib/resource/french/SyntaxFre.gf
@@ -50,19 +50,10 @@ oper
   npGenPossNum = \nu,ton,mec ->
     \\c => prepCase c ++ ton.s ! Poss Pl mec.g ++ nu.s ! mec.g ++ mec.s ! Pl ;
 
----- We miss "il y en a"
-
   existNounPhrase = \unemaison -> 
-    predVerbGroupClause
-      pronImpers
-      (predClauseGroup 
-        verbAvoir
-        (complTransVerbGen 
-          (mkTransVerbCas verbAvoir dative)
-          pronY
-          (\\_,_,_ => unemaison.s ! Ton Acc)
-        )
-      ) ;
+    sats2clause (
+      insertObject (mkSatsObject pronImpers (mkTransVerbCas verbAvoir dative) pronY) 
+        accusative [] unemaison) ;
 
   reflPron : Number => Person => NPFormA => Str = \\n,p => 
     case p of {
diff --git a/lib/resource/italian/SyntaxIta.gf b/lib/resource/italian/SyntaxIta.gf
index 8538badd9..9fe98d144 100644
--- a/lib/resource/italian/SyntaxIta.gf
+++ b/lib/resource/italian/SyntaxIta.gf
@@ -39,6 +39,8 @@ oper
 
   npGenPossNum = \nu,ton,mec ->
     \\c => artDef mec.g Pl c ++ ton.s ! Poss Pl mec.g ++ nu.s ! mec.g ++ mec.s ! Pl ; 
+
+  existNounPhrase = variants {} ; ----
 {- ----
   existNounPhrase = \delvino -> {
     s = \\m => 
diff --git a/lib/resource/romance/RulesRomance.gf b/lib/resource/romance/RulesRomance.gf
index 94030568d..9e54abe88 100644
--- a/lib/resource/romance/RulesRomance.gf
+++ b/lib/resource/romance/RulesRomance.gf
@@ -117,7 +117,7 @@ lin
     s = \\c => np.s ! case2pform c ;
     g = pgen2gen np.g ;
     n = np.n
-    };
+    } ;
   FunIP = funIntPron ;
 
   QuestCl = questClause ;
@@ -178,8 +178,8 @@ lin
 
   OneNP = nounPhraseOn ;
 
------  ExistCN A = existNounPhrase (indefNounPhrase Sg A) ;
+  ExistCN A = existNounPhrase (indefNounPhrase Sg A) ;
 
------  ExistNumCN nu A = existNounPhrase (indefNounPhraseNum nu A) ;
+  ExistNumCN nu A = existNounPhrase (indefNounPhraseNum nu A) ;
 
 }
diff --git a/lib/resource/spanish/SyntaxSpa.gf b/lib/resource/spanish/SyntaxSpa.gf
index c8b87abd5..800f85d60 100644
--- a/lib/resource/spanish/SyntaxSpa.gf
+++ b/lib/resource/spanish/SyntaxSpa.gf
@@ -11,6 +11,8 @@ oper
 
   nounPhraseOn = mkNameNounPhrase "se" Masc ; --- can be plural dep. on object
 
+  pronImpers = pronIl ; ---- should be [] ?
+
   partitiveNounPhrase = \n,vino ->
     normalNounPhrase 
       (table {
@@ -35,6 +37,7 @@ oper
   npGenPossNum = \nu,ton,mec ->
     \\c => artDef mec.g Pl c ++ ton.s ! Poss Pl mec.g ++ nu.s ! mec.g ++ mec.s ! Pl ; 
 
+  existNounPhrase = variants {} ;
 {- ----
   existNounPhrase = \delvino -> {
     s = \\m =>