From dcf7a34212483b0e0786b66d17cda2dbbb462561 Mon Sep 17 00:00:00 2001 From: aarne Date: Thu, 13 Apr 2017 06:48:13 +0000 Subject: [PATCH] fixed ta_V in Swe and blad in Dut --- lib/src/Lang.labels | 3 +++ lib/src/dutch/LexiconDut.gf | 2 +- lib/src/swedish/IrregSwe.gf | 3 ++- lib/src/swedish/IrregSweAbs.gf | 1 + lib/src/translator/DictionarySwe.gf | 2 +- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/src/Lang.labels b/lib/src/Lang.labels index 1c3d47901..21d23be57 100644 --- a/lib/src/Lang.labels +++ b/lib/src/Lang.labels @@ -84,6 +84,8 @@ SentAP amod acl DetQuantOrd head nummod amod -- quite wrong; again for same reason as DetQuant function DetCN det head +IDetCN det head +IDetQuant head empty CountNP det head PredetNP det head PPartNP head amod -- only in core RGL @@ -183,6 +185,7 @@ Det DET Digits NUM IAdv ADV IDet DET +IQuant DET IP PRON Interj INTJ N NOUN diff --git a/lib/src/dutch/LexiconDut.gf b/lib/src/dutch/LexiconDut.gf index a94aeee0a..ba1dac219 100644 --- a/lib/src/dutch/LexiconDut.gf +++ b/lib/src/dutch/LexiconDut.gf @@ -194,7 +194,7 @@ lake_N = mkN "meer" neuter ; lamp_N = mkN "lamp" utrum ; language_N = mkN "taal" utrum ; laugh_V = lachen_V ; -leaf_N = mkN "blad" neuter ; +leaf_N = mkN "blad" "bladeren" neuter ; learn_V2 = mkV2 "leren" ; leather_N = mkN "leer" neuter ; leave_V2 = mkV2 (mkV "verlaten" "verliet" "verlieten" "verlaten") ; diff --git a/lib/src/swedish/IrregSwe.gf b/lib/src/swedish/IrregSwe.gf index 36ff601c5..ee36d517b 100644 --- a/lib/src/swedish/IrregSwe.gf +++ b/lib/src/swedish/IrregSwe.gf @@ -164,7 +164,8 @@ concrete IrregSwe of IrregSweAbs = CatSwe ** open ParadigmsSwe in { svika_V = irregV "svika" "svek" "svikit" ; sy_V = irregV "sy" "sydde" "sytt" ; sätta_V = irregV "sätta" "satte" "satt" ; - taga_V = mkV "ta" "tar" "ta" "tog" "tagit" "tagen" | mkV "taga" "tog" "tagit" ; + ta_V = mkV "ta" "tar" "ta" "tog" "tagit" "tagen" ; + taga_V = mkV "taga" "tog" "tagit" ; tiga_V = irregV "tiga" "teg" "tigit" ; tillåta_V = irregV "tillåta" "tillät" "tillåtit" ; tillsluta_V = irregV "tillsluta" "tillslöt" "tillslutit" ; diff --git a/lib/src/swedish/IrregSweAbs.gf b/lib/src/swedish/IrregSweAbs.gf index 6a51732f1..531e5f269 100644 --- a/lib/src/swedish/IrregSweAbs.gf +++ b/lib/src/swedish/IrregSweAbs.gf @@ -159,6 +159,7 @@ abstract IrregSweAbs = Cat ** { svika_V : V ; sy_V : V ; sätta_V : V ; + ta_V : V ; taga_V : V ; tiga_V : V ; tillåta_V : V ; diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index b3a9c214f..50cf3b1cb 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -56113,7 +56113,7 @@ lin taiwanese_A = mkA "taiwanesisk" ; -- status=guess lin taiyuan_PN = mkPN "Taiyuan" neutrum ; -- src=geonames status=guess lin taka_N = variants {} ; -- status=guess lin take_N = mkN "tro" ; -- comment=5 -lin take_V2 = mkV2 I.taga_V ; +lin take_V2 = mkV2 (mkV "ta" "tar" "ta" "tog" "tagit" "tagen") | mkV2 I.taga_V ; lin take_after_V2 = dirV2 (partV (mkV "ta" "tar" "ta" "tog" "tagit" "tagen")"ut") ; -- comment=6 lin take_apart_V2 = dirV2 (partV (mkV "ta" "tar" "ta" "tog" "tagit" "tagen")"ut") ; -- comment=6 lin take_aside_V2 = dirV2 (partV (mkV "ta" "tar" "ta" "tog" "tagit" "tagen")"ut") ; -- comment=6