diff --git a/lib/src/chinese/DictEngChi.gf b/lib/src/chinese/DictEngChi.gf index ba4878066..6edb942ab 100644 --- a/lib/src/chinese/DictEngChi.gf +++ b/lib/src/chinese/DictEngChi.gf @@ -97,7 +97,8 @@ lin when_IAdv = S.when_IAdv ; --CHECKED when_Subj = S.when_Subj ; --CHECKED where_IAdv = S.where_IAdv ; --CHECKED - which_IQuant = S.which_IQuant ; --CHECKED + whichPl_IDet = S.whichPl_IDet ; --CHECKED + whichSg_IDet = S.whichSg_IDet ; --CHECKED whoPl_IP = S.whoPl_IP ; --CHECKED whoSg_IP = S.whoSg_IP ; --CHECKED why_IAdv = S.why_IAdv ; --CHECKED diff --git a/lib/src/finnish/DictEngFin.gf b/lib/src/finnish/DictEngFin.gf index 1c5084ffa..8988dd885 100644 --- a/lib/src/finnish/DictEngFin.gf +++ b/lib/src/finnish/DictEngFin.gf @@ -52198,7 +52198,8 @@ zymotic_A = mkWA "tsymoosiin" "liittyvä" ; when_IAdv = S.when_IAdv ; --CHECKED when_Subj = S.when_Subj ; --CHECKED where_IAdv = S.where_IAdv ; --CHECKED - which_IQuant = S.which_IQuant ; --CHECKED + whichPl_IDet = S.whichPl_IDet ; --CHECKED + whichSg_IDet = S.whichSg_IDet ; --CHECKED whoPl_IP = S.whoPl_IP ; --CHECKED whoSg_IP = S.whoSg_IP ; --CHECKED why_IAdv = S.why_IAdv ; --CHECKED diff --git a/lib/src/scandinavian/CommonScand.gf b/lib/src/scandinavian/CommonScand.gf index 548fe5d69..ccf95aba0 100644 --- a/lib/src/scandinavian/CommonScand.gf +++ b/lib/src/scandinavian/CommonScand.gf @@ -319,8 +319,10 @@ oper eext = vp.eext } ; - infVP : VP -> Agr -> Str = \vp,a -> - vp.a1 ! Pos ++ (vp.s ! VPInfinit Simul).inf ++ vp.n2 ! a ++ vp.a2 ++ vp.ext ; --- a1 + infVP : VP -> Agr -> Str = \vp,a -> infVPPlus vp a Simul Pos ; + + infVPPlus : VP -> Agr -> Anteriority -> Polarity -> Str = \vp,a,ant,pol -> + vp.a1 ! pol ++ (vp.s ! VPInfinit ant).inf ++ vp.n2 ! a ++ vp.a2 ++ vp.ext ; --- a1 -- For $Sentence$. diff --git a/lib/src/swedish/DictEngSwe.gf b/lib/src/swedish/DictEngSwe.gf index 890facc81..ed0df7fbf 100644 --- a/lib/src/swedish/DictEngSwe.gf +++ b/lib/src/swedish/DictEngSwe.gf @@ -23973,7 +23973,8 @@ lin whet_V2 = mkV2 (slipa_vb_1_V) | mkV2 (mkV "skärpa") | mkV2 (fila_vb_1_V) ; lin whether_Prep = mkPrep "huruvida" ; -- lin whetstone_N = bryne_nn_1_N ; -- comment=2 lin whey_N = vassle_nn_1_N | vassla_nn_1_N ; -- status=guess status=guess -lin which_IQuant = S.which_IQuant ; -- comment=CHECKED +lin whichPl_IDet = S.whichPl_IDet ; -- comment=CHECKED +lin whichSg_IDet = S.whichSg_IDet ; -- comment=CHECKED lin while_N = stund_nn_1_N ; -- comment=2 lin whim_N = ryck_nn_2_N ; -- comment=4 lin whimper_N = gny_nn_1_N ; -- comment=1 diff --git a/lib/src/swedish/ParseSwe.gf b/lib/src/swedish/ParseSwe.gf index c6e29062a..8a6c73d1b 100644 --- a/lib/src/swedish/ParseSwe.gf +++ b/lib/src/swedish/ParseSwe.gf @@ -1,4 +1,4 @@ ---# -path=.:folketslexikon:alltenses +--# -path=.:../english/:../scandinavian:alltenses concrete ParseSwe of ParseEngAbs = TenseSwe, NounSwe - [PPartNP], @@ -19,7 +19,7 @@ concrete ParseSwe of ParseEngAbs = ClSlash, RCl, EmptyRelSlash], DictEngSwe ** -open MorphoSwe, ResSwe, ParadigmsSwe, SyntaxSwe, Prelude in { +open MorphoSwe, ResSwe, ParadigmsSwe, SyntaxSwe, CommonScand, Prelude in { flags literal=Symb ; @@ -82,7 +82,7 @@ lin (predVc v) ; -} - ComplVV v a p vp = mkVP v vp ; ---- + ComplVV v ant pol vp = insertObj (\\a => v.c2.s ++ ant.s ++ pol.s ++ infVPPlus vp a ant.a pol.p) (predV v) ; {-