From 49fdc61eab575ecf8074de217400f972836873b8 Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Thu, 5 Sep 2019 16:14:36 +0200 Subject: [PATCH] (Fin) Add SOFT_BIND before commas --- src/finnish/PhraseFin.gf | 2 +- src/finnish/SentenceFin.gf | 6 +++--- src/finnish/SymbolFin.gf | 2 +- src/finnish/VerbFin.gf | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/finnish/PhraseFin.gf b/src/finnish/PhraseFin.gf index e890bf05c..015ac8989 100644 --- a/src/finnish/PhraseFin.gf +++ b/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 = SOFT_BIND ++ "," ++ np.s ! NPSep} ; oper addNegation : P.Bool -> Str = \isNeg -> case isNeg of {P.True => "ei" ; _ => []} ; diff --git a/src/finnish/SentenceFin.gf b/src/finnish/SentenceFin.gf index 269b47ab0..f5d9b5f0d 100644 --- a/src/finnish/SentenceFin.gf +++ b/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} ; } diff --git a/src/finnish/SymbolFin.gf b/src/finnish/SymbolFin.gf index 26763536b..a922c4521 100644 --- a/src/finnish/SymbolFin.gf +++ b/src/finnish/SymbolFin.gf @@ -38,7 +38,7 @@ lin MkSymb s = s ; BaseSymb = infixSS "ja" ; - ConsSymb = infixSS "," ; + ConsSymb = infixSS (SOFT_BIND ++ ",") ; } diff --git a/src/finnish/VerbFin.gf b/src/finnish/VerbFin.gf index bad8752ec..d50db2158 100644 --- a/src/finnish/VerbFin.gf +++ b/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 =