Småting med semantik

giellalt · Nov 14, 2023 · 9094ed3 · 9094ed3
1 parent b9d52f9
commit 9094ed3
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/src/cg3/dependency.cg3 b/src/cg3/dependency.cg3
@@ -82,6 +82,10 @@ SETPARENT:M_faste0925 @>N + TIMEUNIT + Rel IF
 TO (*1 ("manna" Rel) BARRIER (*) - (Num Rel) LINK 1 ("siuneq") OR ("kinguneq"));
 #!! @RULENAME@
 
+SETPARENT:M_faste0930 @i-ADVL> + ("kalaallisut") OR (/"kalaaleq"\ \(Sem/Hnat\ \)?N\ Aeq\ Sg/l) IF 
+(NOT p (*))
+TO (1 ("oqaaseq" Pl));  
+
 SETPARENT:D_tidlig0042B @ADVL>N + OTHERTIME OR SEASON IF
 (NOT p (*))
 (1 Num LINK 1 ("manna") + Rel )
@@ -1449,7 +1453,9 @@ SETPARENT:M_faste0420 @i-ADVL> + ("angi") + Ins OR ("miki") + Ins TO (*1 ("angi"
 #MAP:M_faste0470 @OBJ> TARGET Num + Abs IF (1 ("qaanger") + Par + 3SgO); #Qatserisartut pujorsiortartullu Ilulissani akunnittarfimmi nutaami ikuallattumik qamisaareerlutik ullaaq TALLIMAT qaangilaaraa aatsaat angerlarsinnaalerput.
 #!! @RULENAME@
 
-SETPARENT:M_faste0480 @>N + (/"kalaaleq"\ N\ Aeq\ Sg/l) TO (1 ("ordbog") OR ("oqaaseq") - LIK_QAR OR <ac-cat> - LIK_QAR);
+SETPARENT:M_faste0480 @>N + (/"kalaaleq"\ N\ Aeq\ Sg/l) IF
+(NOT p (*))
+TO (1 ("ordbog") OR ("oqaaseq") - LIK_QAR OR <ac-cat> - LIK_QAR);
 
 #psykolog@RULENAME@
 

diff --git a/src/cg3/disambiguator.cg3 b/src/cg3/disambiguator.cg3
@@ -12860,6 +12860,9 @@ SELECT:Sem0925 ("aqup") + TUQ + (/^i?Sem/Vground/r) IF (*0 (/^i?Sem/Vground/r));
 
 REMOVE:Sem0930 ("peqar") + (/^i?Sem/have/r) IF (0 (/^i?Sem/exist/r) LINK NOT *-1 Ins); #skal nok have nogle undtagelser
 
+REMOVE:Sem0935 ("oqaaseq") + (/^i?Sem/ac/r) IF (0 (/^i?Sem/ling/r) + Pl LINK -1 (/"kalaaleq"\ Sem/Hnat\ N\ Aeq\ Sg/l) OR ("kalaallisut")); #kalaallisut oqaatsivut
+
+#SUBSTITUTE:Sem0005 (Sem/Hnat) (Sem/ling) TARGET ("kalaaleq" Sem/Hnat N Aeq Sg) IF (1 ("oqaaseq")); 
 
 ##############
 AFTER-SECTIONS

diff --git a/src/cg3/functions.cg3 b/src/cg3/functions.cg3
@@ -1325,7 +1325,7 @@ MAP:M_faste0460 @i-ADVL> TARGET (/"ingerlap"\ HTR\ Der/vv\ Gram/IV\ TUQ\ Der/vn\
 MAP:M_faste0470 @OBJ> TARGET Num + Abs IF (1 ("qaanger") + Par + 3SgO); #Qatserisartut pujorsiortartullu Ilulissani akunnittarfimmi nutaami ikuallattumik qamisaareerlutik ullaaq TALLIMAT qaangilaaraa aatsaat angerlarsinnaalerput.
 
 #det grønlandske sprog
-MAP:M_faste0480 @>N TARGET (/"kalaaleq"\ N\ Aeq\ Sg/l) IF (1 ("ordbog") OR ("oqaaseq") - LIK_QAR OR <ac-cat> - LIK_QAR);
+MAP:M_faste0480 @>N TARGET (/"kalaaleq"\ \(Sem/ling\ \)?N\ Aeq\ Sg/l) IF (1 ("ordbog") OR ("oqaaseq") - LIK_QAR OR <ac-cat> - LIK_QAR);
 
 #psykolog
 MAP:M_faste0490 @i-ADVL>N TARGET (/"pi"\ Gram/IV\ SSUSIQ/l) + POSSESSUM3 IF (-1 ("tarni") + Rel)(1 (/"ilisima"\ Gram/TV\ TAQ\ Der/vn\ LIK/l));
@@ -1644,6 +1644,9 @@ MAP:M_faste0921 @>N TARGET ("fru") + Abs OR ("hr") + Abs IF (1 Sem/Hum +  Abs);
 
 MAP:M_faste0925 @ADVL> TARGET ("toqqar") + CONT IF (*1 V); #Inuit allat utaqqisut isigeqqajaavaannga, TOQQARLUGILLU qiviaraangakkit allamut saapallattarput.
 
+MAP:M_faste0930 @i-ADVL> TARGET ("kalaallisut") OR (/"kalaaleq"\ \(Sem/Hnat\ \)?N\ Aeq\ Sg/l) IF (1 ("oqaaseq" Pl)); 
+
+
 #######
 
 # MWE #

diff --git a/src/fst/affixes/derivations-inflections.lexc b/src/fst/affixes/derivations-inflections.lexc
@@ -32694,6 +32694,7 @@ LEXICON XIi_voqXmorf2 !!= * @CODE@
 +LLAP+Der/vv+QATTAAR+Der/vv:%>llaqattaar flex-iv ;
 +LLAP+Der/vv+QATTAAR+Der/vv+PALUP+Der/vv:%>llaqattaarpalup IV-mod_C ;
 +LLAP+Der/vv+QATTAAR+Der/vv+PALUP+Der/vv+TAR+Der/vv:%>llaqattaarpaluttar flex-iv ;
++LLAP+Der/vv+QQAJAA+Der/vv:%>llaqqajaa IV-mod_V ;
 +LLAP+Der/vv+QQU+Der/vv:%>llaqqu DOTR_IV_V ;
 +LLAP+Der/vv+QQU+Der/vv+LAAR+Der/vv:%>llaqqulaar Gaq ;
 +LLAP+Der/vv+QQU+Der/vv+LAAR+Der/vv+SINNAA+Der/vv:%>llaqqulaarsinnaa Saq ;

diff --git a/src/fst/stems/particles.lexc b/src/fst/stems/particles.lexc
@@ -389,7 +389,7 @@ jaa oqq ;
 kakkaak oqq ;
 kakkaak+SUAQ+Der/nn+Sg:kakkaassuaq oqq ;
 kakkaak+SUAQ+Der/nn+Pl:kakkaassuit oqq ;
-!kalaallisut	part ; !PL20210707 forsøgsvist udkommenteret
+!kalaallisut	adv ; !PL20210707 forsøgsvist udkommenteret PL20231113 problem for gloss. Ind igen
 kalaallisuinnaq part ;
 kalaallisuinnavik part ;
 kalaallisuinnavik+Orth/Alt:kalaallisuinnaavik part ;