diff --git a/src/french/MorphoFre.gf b/src/french/MorphoFre.gf index 0f58d9352..91e4cfbde 100644 --- a/src/french/MorphoFre.gf +++ b/src/french/MorphoFre.gf @@ -128,6 +128,9 @@ oper adjIndien : Str -> Adj = \indien -> mkAdj indien (indien+"s") (indien+"ne") (indien+"nement") ; + + adjTel : Str -> Adj = \tel -> + mkAdj tel (tel+"s") (tel+"le") (tel+"lement") ; adjFrancais : Str -> Adj = \francais -> mkAdj francais francais (francais+"e") (francais+"ement") ; @@ -136,14 +139,20 @@ oper let {ch = Predef.tk 2 cher} in mkAdj cher (cher + "s") (ch + "ère") (ch + "èrement") ; + adjPublic : Str -> Adj = \public -> + let publique = init public + "que" in + mkAdj public (init public+"s") (publique) (publique+"ment") ; + mkAdjReg : Str -> Adj = \creux -> case Predef.dp 3 creux of { "eux" => adjHeureux creux ; _ => case Predef.dp 2 creux of { "al" => adjBanal creux ; "en" => adjIndien creux ; + "el" => adjTel creux ; "on" => adjIndien creux ; "er" => adjCher creux ; + "ic" => adjPublic creux ; _ => case Predef.dp 1 creux of { "s" => adjFrancais creux ; "x" => adjFrancais creux ; diff --git a/src/german/MakeStructuralGer.gf b/src/german/MakeStructuralGer.gf index 380c3c047..6b2482a03 100644 --- a/src/german/MakeStructuralGer.gf +++ b/src/german/MakeStructuralGer.gf @@ -29,5 +29,9 @@ oper mmkQuant : Quant -> A -> Quant = \q,a -> q ** { s,sp = \\x,n,g,c => q.s ! x ! n ! g ! c ++ a.s ! Posit ! agrAdj g q.a n ((prepC c).c) } ; + -- e.g. derjenige + mmbQuant : Quant -> A -> Quant = \q,a -> q ** { + s,sp = \\x,n,g,c => q.s ! x ! n ! g ! c + a.s ! Posit ! agrAdj g q.a n ((prepC c).c) + } ; } diff --git a/src/german/ParadigmsGer.gf b/src/german/ParadigmsGer.gf index 4554a4243..263f4593a 100644 --- a/src/german/ParadigmsGer.gf +++ b/src/german/ParadigmsGer.gf @@ -50,7 +50,7 @@ oper anDat_Case : Case ; -- preposition "an" accusative with contraction "am" --% inAcc_Case : Case ; -- preposition "in" accusative with contraction "ins" --% - inDat_Case : Case ; -- preposition "in" dative with contraction "am" --% + inDat_Case : Case ; -- preposition "in" dative with contraction "im" --% zuDat_Case : Case ; -- preposition "zu" dative with contractions "zum", "zur" --% vonDat_Case : Case ;