diff --git a/lib/src/french/ExtraRomanceFre.gf b/lib/src/french/ExtraRomanceFre.gf index ba7d7b160..763e64bf9 100644 --- a/lib/src/french/ExtraRomanceFre.gf +++ b/lib/src/french/ExtraRomanceFre.gf @@ -1,2 +1,2 @@ -concrete ExtraRomanceFre of ExtraRomanceAbs = CatFre ** ExtraRomance with +concrete ExtraRomanceFre of ExtraRomanceAbs = CatFre ** ExtraRomance - [ProDrop] with (ResRomance = ResFre) ; diff --git a/lib/src/german/ParadigmsGer.gf b/lib/src/german/ParadigmsGer.gf index ee2f122d1..8de23c11d 100644 --- a/lib/src/german/ParadigmsGer.gf +++ b/lib/src/german/ParadigmsGer.gf @@ -81,7 +81,12 @@ mkN : overload { -- Worst case: give all four singular forms, two plural forms (others + dative), -- and the gender. - mkN : (x1,_,_,_,_,x6 : Str) -> Gender -> N -- worst case: mann, mann, manne, mannes, männer, männern + mkN : (x1,_,_,_,_,x6 : Str) -> Gender -> N ; -- worst case: mann, mann, manne, mannes, männer, männern + +-- compound nouns + + mkN : Str -> N -> N ; -- Auto + Fahrer -> Autofahrer + }; @@ -509,7 +514,9 @@ mkV2 : overload { mkN = overload { mkN : Str -> N = regN ; mkN : (x1,x2 : Str) -> Gender -> N = reg2N ; - mkN : (x1,_,_,_,_,x6 : Str) -> Gender -> N = mk6N + mkN : (x1,_,_,_,_,x6 : Str) -> Gender -> N = mk6N ; + mkN : Str -> N -> N -- Auto + Fahrer -> Autofahrer + = \s,x -> lin N {s = \\n,c => s + Predef.toLower (x.s ! n ! c) ; g = x.g} ; };