Merge branch 'master' of https://github.com/GrammaticalFramework/gf-rgl

src/finnish/ExtendFin.gf

@@ -6,6 +6,7 @@ concrete ExtendFin of Extend =
     MkVPI2,ConjVPI2,ComplVPI2,ComplVPIVV
     ,ExistCN, ExistMassCN, ICompAP, ByVP
     ,CompoundN, GenNP, GenIP, AdvIsNP, EmbedSSlash
+    ,PassVPSlash, PassAgentVPSlash
     ]
   with
     (Grammar = GrammarFin) **
@@ -160,4 +161,15 @@ lin
                   NPSep    => mikaInt ! Sg ! Nom }
            } ;
        in {s = appCompl True Pos ss.c2 thatWhich ++ ss.s} ;
+
+  PassVPSlash vp = S.passVP vp vp.c2 ;
+
+  PassAgentVPSlash vp np = {
+      s = {s = vp.s.s ; h = vp.s.h ; p = vp.s.p ; sc = npform2subjcase vp.c2.c} ; 
+      s2 = \\b,p,a => np.s ! NPSep ++ vp.s2 ! b ! p ! a ;
+      adv = vp.adv ;
+      ext = vp.ext ;
+      vptyp = vp.vptyp ;
+      } ; 
+
 }

src/finnish/ParadigmsFin.gf

@@ -599,6 +599,8 @@ mkVS = overload {
         <nukk + "e", nuk + "een"> => dRae ukko ukon ;
         <arp + "i", arv + "en"> => dArpi ukko ukon ;
         <_ + ("us" | "ys"), _ + "den"> => dLujuus ukko ;
+        <laid + ("u"|"a"|"ä") + "n", laitu + "men"> 
+          => dLiitin ukko ukon ; -- laidun,hapan,sydän not caught in previous
         <_, _ + "n"> => ukot ;
         _ => 
           Predef.error (["second argument should end in n, not"] ++ ukon)

src/finnish/PhraseFin.gf

@@ -23,7 +23,7 @@ concrete PhraseFin of Phrase = CatFin ** open ResFin, StemFin, (P = Prelude) in
     PConjConj conj = {s = conj.s2} ;
 
     NoVoc = {s = []} ;
-    VocNP np = {s = "," ++ np.s ! NPSep} ;
+    VocNP np = {s = P.SOFT_BIND ++ "," ++ np.s ! NPSep} ;
 
 oper
   addNegation : P.Bool -> Str = \isNeg -> case isNeg of {P.True => "ei" ; _ => []} ;

src/finnish/SentenceFin.gf

@@ -61,10 +61,10 @@ concrete SentenceFin of Sentence = CatFin ** open Prelude, ResFin, StemFin in {
     } ;
 
     AdvS a s = {s = a.s ++ s.s} ;
-    ExtAdvS a s = {s = a.s ++ "," ++ s.s} ;
+    ExtAdvS a s = {s = a.s ++ SOFT_BIND ++ "," ++ s.s} ;
 
-    RelS s r = {s = s.s ++ "," ++ r.s ! agrP3 Sg} ; ---- mikä
+    RelS s r = {s = s.s ++ SOFT_BIND ++ "," ++ r.s ! agrP3 Sg} ; ---- mikä
 
-    SSubjS a subj b = {s = a.s ++ "," ++ subj.s ++ b.s} ;
+    SSubjS a subj b = {s = a.s ++ SOFT_BIND ++ "," ++ subj.s ++ b.s} ;
 
 }

src/finnish/SymbolFin.gf

@@ -38,7 +38,7 @@ lin
   MkSymb s = s ;
 
   BaseSymb = infixSS "ja" ;
-  ConsSymb = infixSS "," ;
+  ConsSymb = infixSS (SOFT_BIND ++ ",") ;
 
 }
 

src/finnish/VerbFin.gf

@@ -29,8 +29,8 @@ concrete VerbFin of Verb = CatFin ** open Prelude, ResFin, StemFin in {
                }
          ) ;
 
-    ComplVS v s  = insertExtrapos ("," ++ etta_Conj ++ s.s) (predSV v) ;
-    ComplVQ v q  = insertExtrapos ("," ++ q.s) (predSV v) ;
+    ComplVS v s  = insertExtrapos (SOFT_BIND ++ "," ++ etta_Conj ++ s.s) (predSV v) ;
+    ComplVQ v q  = insertExtrapos (SOFT_BIND ++ "," ++ q.s) (predSV v) ;
     ComplVA v ap = 
       insertObj 
         (\\_,b,agr => 
@@ -39,9 +39,9 @@ concrete VerbFin of Verb = CatFin ** open Prelude, ResFin, StemFin in {
         (predSV v) ;
 
     SlashV2S v s = 
-      insertExtrapos ("," ++ etta_Conj ++ s.s) (predSV v) ** {c2 = v.c2} ;
+      insertExtrapos (SOFT_BIND ++ "," ++ etta_Conj ++ s.s) (predSV v) ** {c2 = v.c2} ;
     SlashV2Q v q = 
-      insertExtrapos ("," ++ q.s) (predSV v) ** {c2 = v.c2} ;
+      insertExtrapos (SOFT_BIND ++ "," ++ q.s) (predSV v) ** {c2 = v.c2} ;
     SlashV2V v vp = 
       insertObj (\\_,b,a => infVP v.sc b a vp (vvtype2infform v.vi)) (predSV v) ** {c2 = v.c2} ;
     SlashV2A v ap =