From f42b3349bb888e412d985bf48ac9d16f5b5cbed1 Mon Sep 17 00:00:00 2001 From: aarne Date: Tue, 24 Aug 2010 14:40:50 +0000 Subject: [PATCH] corrected IrregGer.wissen_V --- lib/src/german/IrregGer.gf | 6 +++++- lib/src/german/LexiconGer.gf | 2 +- lib/src/german/VerbGer.gf | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/src/german/IrregGer.gf b/lib/src/german/IrregGer.gf index 35f85aafb..9c35e5dc3 100644 --- a/lib/src/german/IrregGer.gf +++ b/lib/src/german/IrregGer.gf @@ -212,7 +212,11 @@ in { lin werfen_V = irregV "werfen" "wirft" "warf" "würfe" "geworfen" ; lin wiegen_V = irregV "wiegen" "wiegt" "wog" "wöge" "gewogen" ; lin winden_V = irregV "winden" "windt" "wand" "wände" "gewunden" ; - lin wissen_V = irregV "wissen" "weiß" "wußte" "wüßte" "gewußt" ; + lin wissen_V = M.mkV + "wissen" "weiß" "weißt" "weiß" "wisst" "wisse" + "wusste" "wusstest" "wussten" "wusstet" + "wüsste" "gewusst" [] + M.VHaben ** {lock_V = <>} ; lin wollen_V = M.mkV "wollen" "will" "willst" "will" "wollt" "woll" "wollte" "wolltest" "wollten" "wolltet" diff --git a/lib/src/german/LexiconGer.gf b/lib/src/german/LexiconGer.gf index 61ab8dd32..1aeda1a17 100644 --- a/lib/src/german/LexiconGer.gf +++ b/lib/src/german/LexiconGer.gf @@ -108,7 +108,7 @@ lin jump_V = seinV (irregV "springen" "springt" "sprang" "spränge" "gesprungen") ; king_N = mkN "König" ; know_V2 = dirV2 (irregV "kennen" "kennt" "kannte" "kännte" "gekannt") ; ---- infl - know_VS = mkVS (irregV "wissen" "weiß" "wußte" "wüßte" "gewußt") ; ---- infl + know_VS = mkVS wissen_V ; lake_N = reg2N "See" "Seen" masculine ; --- infl lamp_N = mkN "Lampe"; learn_V2 = dirV2 (regV "lernen") ; diff --git a/lib/src/german/VerbGer.gf b/lib/src/german/VerbGer.gf index 42995c82a..cdd5e1466 100644 --- a/lib/src/german/VerbGer.gf +++ b/lib/src/german/VerbGer.gf @@ -70,6 +70,8 @@ concrete VerbGer of Verb = CatGer ** open Prelude, ResGer in { CompNP np = {s = \\_ => np.s ! NPC Nom} ; CompAdv a = {s = \\_ => a.s} ; +-- CompCN cn + AdvVP vp adv = insertAdv adv.s vp ; AdVVP adv vp = insertAdV adv.s vp ; @@ -78,6 +80,5 @@ concrete VerbGer of Verb = CatGer ** open Prelude, ResGer in { PassV2 v = insertInf (v.s ! VPastPart APred) (predV werdenPass) ; ----b UseVS, UseVQ = \v -> v ** {c2 = noPreposition Acc} ; }