upgraded resources, esp. romance

2026-04-23 11:42:49 -06:00 · 2005-05-31 17:42:39 +00:00
parent 04ae4c37cb
commit 24b595c98f
17 changed files with 167 additions and 47 deletions
--- a/lib/resource/french/ClauseFre.gf
+++ b/lib/resource/french/ClauseFre.gf
@@ -1,5 +1,4 @@
 --# -path=.:../romance:../abstract:../../prelude

 concrete ClauseFre of Clause = CategoriesFre **
----  ClauseI with (Rules=RulesFre), (Verbphrase=VerbphraseFre) ;
   ClauseRomance with (SyntaxRomance=SyntaxFre) ;
--- a/lib/resource/french/SyntaxFre.gf
+++ b/lib/resource/french/SyntaxFre.gf
@@ -330,4 +330,9 @@ oper

  negNe = elisNe ; negPas = "pas" ;

+  progressiveSats subj vp =    
+    mkSatsCopula subj 
+      (["en train"] ++ elisDe ++
+       vp.s ! VIInfinit ! (pgen2gen subj.g) ! subj.n ! subj.p) ;
+
 }
--- a/lib/resource/french/TypesFre.gf
+++ b/lib/resource/french/TypesFre.gf
@@ -153,7 +153,8 @@ oper
    VFin VFut n p    => aller ! Indic Futur n p ;
    VFin VCondit n p => aller ! Cond n p ;
    VImper np    => aller ! Imper np ;
-    VPart g n    => aller ! Part (PPasse g n)
+    VPart g n    => aller ! Part (PPasse g n) ;
+    VGer         => aller ! Part PPres -- *en* allant
    } ;

 -- The full conjunction is a table on $VForm$: