From 8f727d1302cdd8215c358cfda1d5b7a0690c8a8c Mon Sep 17 00:00:00 2001 From: planggard <63806188+planggard@users.noreply.github.com> Date: Tue, 5 Sep 2023 21:14:06 +0200 Subject: [PATCH] Ny regel for type Ukiup ataatsip matuma siorna --- src/cg3/disambiguator.cg3 | 2 +- src/cg3/functions.cg3 | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/cg3/disambiguator.cg3 b/src/cg3/disambiguator.cg3 index 320df154c..b20a2f541 100644 --- a/src/cg3/disambiguator.cg3 +++ b/src/cg3/disambiguator.cg3 @@ -1856,7 +1856,7 @@ Sem/Time %Othertime ("aallar" QQAAR UTE) ("aasaq") (/"aasaq"\ U\ Der/nv\ Gram/IV #("nali") #PL 20230107 skal sikkert slettes efter regression "nalunaaquttap-akunneq" (/"piffik"\ SSAQ/l) "poorski" ("qaammat") ("qangali") "qangangaatsiaq" ("qeqqa") ("sapaat") ("sapaatip-akunneq") ("sekund") (/"silattor"\ Gram/IV\ NNGIT\ Der/vv\ Gram/IV\ NIQ/l) "sivisoorsuaq" ("sivisu") "sivitsunngitsoq" ("siulleq") (/"siu"\ LLIQ\ Der/nn\ PAAQ/l) ("siuneq") ("siorna") "siornatigut" (/"suli"\ Gram/IV\ NNGIT\ Der/vv\ Gram/IV\ VIK/l) "taamanikkut" ("taarsi") "time" "tiimi" ("ualeq") ("ukiaq") "ukiaru" ("ukiar" TUQ) ("ukiartoq") ("ukioq") ("ullaa") "ullaaq" "ullaaralaaq" "ullaaralaannguaq" ("ullaaq" RALAAQ NNGUAQ) "ullaaror" "ullaassaq" ("ulloq") ("ullumi") ("unnuaq") "unnuaqeqqa" ("unnuk") ("unnup" Par) "upernaaq"; -LIST TIMEUNIT = "minut" "min." "nalunaaquttap-akunneq" "sekund" "time" "tiimi" ; +LIST TIMEUNIT = "minut" "min." "nalunaaquttap-akunneq" "sekund" "time" "tiimi" "ukioq" ; SET CLOCK = (Num Trm) - AFFINGERET | ("qiteq" Trm 3SgPoss) ; SET TIMENOUN = UGEDAGE | OTHERDAY | SEASON | HOLIDAY | MAANED | CLOCK | OTHERTIME | ("[0123456789]{4}"r) | (/"[012][0-9]:[0-5][0-9]"/r); SET TIME = TEMPUSVERB | TIMEVERB | OTHERTIME | TIDSPARTIKEL ; diff --git a/src/cg3/functions.cg3 b/src/cg3/functions.cg3 index 289775fa3..0d85be777 100644 --- a/src/cg3/functions.cg3 +++ b/src/cg3/functions.cg3 @@ -3,7 +3,7 @@ # =============================================================================== # # =============================================================================== # # W E S T G R E E N L A N D I C S Y N T A C T I C F U N C T I O N S # -# =============================================================================== # +# =============================================================================== # # =============================================================================== # # ============================= # @@ -1607,6 +1607,10 @@ MAP:M_faste0916 @ADVL>N TARGET Lok + 3SgPoss IF (1 ("qileroq")); #SEEQQUANI qile MAP:M_faste0920 @i-ADVL> TARGET ("oqallip") + TIP + HTR + Cont + 4Sg IF (1 ("aallar") + KAA + TIP + TAQ + SSAQ + LIAQ); #Qineqqusaarnermik nuanneraluartitsiinnartunut qallunaatut paasisartunut ilisimatitsissutigisinnaavarput, tusagassiortup Clement Kjærsgaardip OQALLITSITSILLUNI aallakaatitassiaa, KNR1-imi aamma KNR2-mi unnugu aallakaatinneqassammat. MAP:M_faste0921 @>N TARGET ("fru") + Abs OR ("hr") + Abs IF (1 Sem/Hum + Abs); #FRU Jensen utoqqalilluni aatsaat taamak qungujullattaartigilerpoq. + +#udtrykket Ukiup ataatsip matuma siornatigut +MAP:M_faste0925 @>N TARGET TIMEUNIT + Rel IF (*1 ("manna" Rel) BARRIER (*) - (Num Rel)); + ####### # MWE #