555 new words checked in DictEngFin; latin1 flags in some esoteric files

lib/src/english/DictEngAbs.gf

@@ -20539,8 +20539,8 @@ fun fiord_N : N;
 fun fipple_N : N;
 fun fir_N : N;
 fun fir_cone_N : N;
-fun fire_1_N : N;
-fun fire_2_N : N;
+fun fire_1_N : N; --- ??
+fun fire_2_N : N; --- ??
 fun fire_V : V;
 fun fire_V2 : V2;
 fun fire_alarm_N : N;

lib/src/finnish/Kotus.gf

@@ -1,4 +1,4 @@
---# -path=.:alltenses
+--# -coding=latin1
 
 resource Kotus = open MorphoFin, Prelude in {
 

lib/src/finnish/stemmed/WNKotus.gf

@@ -1,4 +1,5 @@
 --# -path=.:..:../../abstract:../../common:../../english:../kotus
+--# -coding=latin1
 
 resource WNKotus = open Kotus, MorphoFin, ParadigmsFin, CatFin, StemFin, Prelude in {
 

lib/src/french/DictEngFre.gf

@@ -1,4 +1,4 @@
---# -path=.:alltenses
+--# -coding=latin1
 
 concrete DictEngFre of DictEngAbs = CatFre ** open ParadigmsFre,
   (S = StructuralFre),

lib/src/french/ParseFre.gf

@@ -7,7 +7,7 @@ concrete ParseFre of ParseEngAbs =
   NumeralFre,
   SymbolFre [PN, Symb, String, CN, Card, NP, MkSymb, SymbPN, CNNumNP],
   ConjunctionFre,
-  VerbFre - [SlashV2V, PassV2, UseCopula, ComplVV  , SlashV2VNP],
+  VerbFre - [SlashV2V, PassV2, UseCopula, ComplVV],
   AdverbFre,
   PhraseFre,
   SentenceFre - [  SlashVP, SlashVS],

lib/src/romance/SentenceRomance.gf

@@ -33,19 +33,23 @@ incomplete concrete SentenceRomance of Sentence =
 ---- one shortcut left: polarity change from negative elements ("rien" etc) ignored
 ---- thus we get "la fille que personne ne voit pas"
 
-    SlashVP np vps = {
-
-      c2 = vps.c2 ;
-
-      s = \\agr0,d,te,a,b,m => 
-        let
+    SlashVP np vps = 
+      let
           isNeg = np.isNeg ;
           subj = (np.s ! Nom).comp ;
           hasClit = np.hasClit ;
           isPol = np.isPol ;
           agr = np.a ;
+
+      in {
+
+      c2 = vps.c2 ;
+
+      s = \\agr0,d,te,a,b,m => 
+        let
+
           vp : VP = case <vps.c2.c, vps.c2.isDir> of {
-              <Acc,True> => insertAgr agr0 vps ;                         -- la fille qu'il a trouvée is decided here
+              <Acc,True> => insertAgr agr0 vps ;    -- la fille qu'il a trouvée is decided here
               _ => vps
               } ;
 
@@ -80,14 +84,9 @@ incomplete concrete SentenceRomance of Sentence =
           num = agr.n ;
           per = agr.p ;
 
-          compl = case isPol of {
-            True => vp.comp ! {g = gen ; n = Sg ; p = per} ;
-            _ => vp.comp ! agr
-            } ;
-
-          ext = vp.ext ! b ;
-
           vtyp  = vp.s.vtyp ;
+          verb = vp.s.s ;
+          vaux = auxVerb vp.s.vtyp ;
 
           refl  = case isVRefl vtyp of {
             True => reflPron num per Acc ; ---- case ?
@@ -96,8 +95,13 @@ incomplete concrete SentenceRomance of Sentence =
 
           clit = refl ++ vp.clit1 ++ vp.clit2 ++ vp.clit3.s ; ---- refl first?
 
-          verb = vp.s.s ;
-          vaux = auxVerb vp.s.vtyp ;
+
+          compl = case isPol of {
+            True => vp.comp ! {g = gen ; n = Sg ; p = per} ;
+            _ => vp.comp ! agr
+            } ;
+
+          ext = vp.ext ! b ;
 
           part = case vp.agr of {
             VPAgrSubj     => verb ! VPart agr.g agr.n ;
@@ -105,6 +109,7 @@ incomplete concrete SentenceRomance of Sentence =
             } ;
 
           vps : Str * Str = case <te,a> of {
+
             <RPast,Simul> => <verb ! VFin (VImperf m) num per, []> ; --# notpresent
             <RPast,Anter> => <vaux ! VFin (VImperf m) num per, part> ; --# notpresent
             <RFut,Simul>  => <verb ! VFin (VFut) num per, []> ; --# notpresent
@@ -116,7 +121,6 @@ incomplete concrete SentenceRomance of Sentence =
             <RPres,Anter> => <vaux ! VFin (VPres m) num per, part> ; --# notpresent
             <RPres,Simul> => <verb ! VFin (VPres m) num per, []> 
             } ;
-
           fin = vps.p1 ;
           inf = vps.p2 ;
         in