From 6624bece17efb67a841d5b560d7fb94824e1a107 Mon Sep 17 00:00:00 2001 From: aarne Date: Thu, 27 May 2010 20:44:39 +0000 Subject: [PATCH] adjustments in Phrasebook --- src/finnish/NounFin.gf | 4 ++-- src/german/ParadigmsGer.gf | 3 ++- src/german/ResGer.gf | 7 ++++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/finnish/NounFin.gf b/src/finnish/NounFin.gf index 63ab64fc3..6aa4a5811 100644 --- a/src/finnish/NounFin.gf +++ b/src/finnish/NounFin.gf @@ -82,8 +82,8 @@ concrete NounFin of Noun = CatFin ** open ResFin, MorphoFin, Prelude in { } ; DetQuantOrd quant num ord = { - s1 = \\c => quant.s1 ! num.n ! c ++ num.s ! Sg ! c ++ ord.s ! NCase Pl c ; - sp = \\c => quant.sp ! num.n ! c ++ num.s ! Sg ! c ++ ord.s ! NCase Pl c ; + s1 = \\c => quant.s1 ! num.n ! c ++ num.s ! Sg ! c ++ ord.s ! NCase num.n c ; + sp = \\c => quant.sp ! num.n ! c ++ num.s ! Sg ! c ++ ord.s ! NCase num.n c ; s2 = quant.s2 ; n = num.n ; isNum = num.isNum ; diff --git a/src/german/ParadigmsGer.gf b/src/german/ParadigmsGer.gf index 5a50fe363..859eae270 100644 --- a/src/german/ParadigmsGer.gf +++ b/src/german/ParadigmsGer.gf @@ -385,7 +385,8 @@ mkV2 : overload { regA : Str -> A = \a -> case a of { teu + "er" => mk3A a (teu + "rer") (teu + "reste") ; _ + "e" => mk3A a (a + "r") (a + "ste") ; - _ => mk3A a (a + "er") (a + "este") + _ + ("t" | "d" | "s" | "sch" | "z") => mk3A a (a + "er") (a + "este") ; + _ => mk3A a (a + "er") (a + "ste") } ; invarA = \s -> {s = \\_,_ => s ; lock_A = <>} ; ---- comparison diff --git a/src/german/ResGer.gf b/src/german/ResGer.gf index 2bb8a1125..0662ab519 100644 --- a/src/german/ResGer.gf +++ b/src/german/ResGer.gf @@ -320,7 +320,12 @@ resource ResGer = ParamX ** open Prelude in { mkN wein wein wein weines weine weinen ; regA : Str -> Adjective = \blau -> - mkA blau blau (blau + "er") (blau + "est") ; + let blauest : Str = case blau of { + _ + ("t" | "d" | "s" | "sch" | "z") => blau + "est" ; + _ => blau + "st" + } + in + mkA blau blau (blau + "er") blauest ; regV : Str -> Verb = \legen -> let