From d6cfd33c166ea171f9fc85679791f1832bed1347 Mon Sep 17 00:00:00 2001 From: aarne Date: Fri, 5 Apr 2013 08:38:13 +0000 Subject: [PATCH] a couple of fixes in Ger --- lib/src/german/DictEngGer.gf | 2 +- lib/src/german/DictGer.gf | 2 +- lib/src/german/NounGer.gf | 5 +++++ lib/src/german/ParseGer.gf | 9 +++++---- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/src/german/DictEngGer.gf b/lib/src/german/DictEngGer.gf index de48105ef..927a19a24 100644 --- a/lib/src/german/DictEngGer.gf +++ b/lib/src/german/DictEngGer.gf @@ -16976,7 +16976,7 @@ lin hieroglyphic_A = variants {}; lin hieroglyphics_N = variants {}; lin higgledy_piggledy_A = variants {}; lin higgledy_piggledy_Adv = variants {}; -lin high_A = mk3A "hoch" "höher" "höchste"; +lin high_A = mkA "hoch" "hoh" "höher" "höchste"; lin high_Adv = variants {}; lin high_class_A = variants {}; lin high_falutin_A = variants {}; diff --git a/lib/src/german/DictGer.gf b/lib/src/german/DictGer.gf index 805acf9f1..fcaffeae6 100644 --- a/lib/src/german/DictGer.gf +++ b/lib/src/german/DictGer.gf @@ -17493,7 +17493,7 @@ lin hobel_N = reg2N "Hobel" "Hobel" masculine ; hobelbank_N = reg2N "Hobelbank" "Hobelbänke" feminine ; hobelmaschine_N = reg2N "Hobelmaschine" "Hobelmaschinen" feminine ; - hoch_A = mk3A "hoch" "höher" "höchste" ; + hoch_A = mkA "hoch" "hoh" "höher" "höchste" ; hoch_N = reg2N "Hoch" "Hochs" neuter ; hochachtungsvoll_A = mk3A "hochachtungsvoll" "hochachtungsvoller" "hochachtungsvollste" ; hochbegabung_N = mkN "Hochbegabung" ; diff --git a/lib/src/german/NounGer.gf b/lib/src/german/NounGer.gf index 2080c27a5..1c9597ac3 100644 --- a/lib/src/german/NounGer.gf +++ b/lib/src/german/NounGer.gf @@ -195,4 +195,9 @@ concrete NounGer of Noun = CatGer ** open ResGer, MorphoGer, Prelude in { isMod = cn.isMod } ; + PossNP cn np = { + s = \\a,n,c => cn.s ! a ! n ! c ++ np.s ! NPP CVonDat ; + g = cn.g + } ; + } diff --git a/lib/src/german/ParseGer.gf b/lib/src/german/ParseGer.gf index 4ebb48260..58890876a 100644 --- a/lib/src/german/ParseGer.gf +++ b/lib/src/german/ParseGer.gf @@ -69,17 +69,18 @@ lin g = cn.g } ; -{- + DashCN noun1 noun2 = { -- type-checking - s = \\n,c => noun1.s ! Sg ! Nom ++ "-" ++ noun2.s ! n ! c ; + s = \\n,c => glue (noun1.s ! Sg ! Nom) (noun2.s ! n ! c) ; g = noun2.g } ; GerundN v = { -- parsing - s = \\n,c => v.s ! VPresPart ; + s = \\n,c => v.s ! VInf False ; --- formalisieren, not formalisierung g = Neutr } ; - + +{- GerundAP v = { -- beckoning s = \\agr => v.s ! VPresPart ; isPre = True