diff --git a/lib/src/german/ConjunctionGer.gf b/lib/src/german/ConjunctionGer.gf index bb73396e9..52d2cdf8d 100644 --- a/lib/src/german/ConjunctionGer.gf +++ b/lib/src/german/ConjunctionGer.gf @@ -24,8 +24,15 @@ concrete ConjunctionGer of Conjunction = -- These fun's are generated from the list cat's. - BaseS = twoTable Order ; - ConsS = consrTable Order comma ; + BaseS x y = { -- twoTable Order ; + s1 = x.s ; + s2 = table {Inv => y.s ! Main ; o => y.s ! o} + } ; + ConsS x xs = { -- consrTable Order comma ; + s1 = \\o => x.s ! Inv ++ comma ++ xs.s1 ! case o of {Inv => Main ; _ => o} ; + s2 = xs.s2 + } ; + BaseAdv = twoSS ; ConsAdv = consrSS comma ; BaseNP x y = twoTable PCase x y ** {a = conjAgr x.a y.a} ; diff --git a/lib/src/scandinavian/ConjunctionScand.gf b/lib/src/scandinavian/ConjunctionScand.gf index 9237f42c9..03b3226f2 100644 --- a/lib/src/scandinavian/ConjunctionScand.gf +++ b/lib/src/scandinavian/ConjunctionScand.gf @@ -29,8 +29,14 @@ incomplete concrete ConjunctionScand of Conjunction = -- These fun's are generated from the list cat's. - BaseS = twoTable Order ; - ConsS = consrTable Order comma ; + BaseS x y = { -- twoTable Order ; + s1 = x.s ; + s2 = table {Inv => y.s ! Main ; o => y.s ! o} + } ; + ConsS x xs = { -- consrTable Order comma ; + s1 = \\o => x.s ! Inv ++ comma ++ xs.s1 ! case o of {Inv => Main ; _ => o} ; + s2 = xs.s2 + } ; BaseAdv = twoSS ; ConsAdv = consrSS comma ; BaseNP x y = twoTable NPForm x y ** {a = conjAgr x.a y.a} ;