Fjernet et overflødigt flag

giellalt · Mar 10, 2025 · d8a073b · d8a073b
1 parent a0c6d1f
commit d8a073b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/src/fst/morphology/affixes/noun_to_noun.lexc b/src/fst/morphology/affixes/noun_to_noun.lexc
@@ -14351,7 +14351,7 @@ LEXICON Z1+ssZmorf !!= * @CODE@ derivationsmorfemer til nominer
 +USAQ+Der/nn+KASIK+Der/nn:%>%TRUNCusakasik tup- ;
 +USAQ+Der/nn+NNGUAQ+Der/nn:%>%TRUNCusannguaq Z1nnguaqZ ;
 +USAQ+Der/nn:%>%TRUNCusaq tp ;
-+UTE+Der/nn:%>%TRUNCut tpt ;
++UTE@U.UTE.OFF@+Der/nn:%>%TRUNCut@U.UTE.OFF@ tpt ;
 +UTE+Der/nn+ARAQ+Der/nn:%>%TRUNCuteeraq Z1+qaZmorf ;
 +UTE+Der/vv+NNGUAQ+Der/nn:%>%TRUNCutinnguaq Z1nnguaqZ ;
 +UTE+Der/nn+SSAQ+Der/nn:%>%TRUNCutissaq tp ;

diff --git a/src/fst/morphology/root.lexc b/src/fst/morphology/root.lexc
@@ -432,6 +432,14 @@ TA+     !!≈ * **@CODE@** = præfiks
 @U.copula.OFF@
 !for at blokere: Avatauiuserput
 
+!<<<<<<< Updated upstream
+=======
+!blokering af UTE-nn. On i nouns og Off i der-infl
+!@U.UTE.ON@
+!@U.UTE.OFF@
+!@C.UTE@
+
+!>>>>>>> Stashed changes
 
 PJAT_FOR_AT_FAA_SKIDTET_TIL_AT_KOMPILERE !!≈ * **@CODE@**  en dummy, der kan kommenteres ind og ud, når make instisterer på 'nothing to do' efter bestemte fejltyper
 

diff --git a/src/fst/morphology/stems/nouns.lexc b/src/fst/morphology/stems/nouns.lexc
@@ -2925,7 +2925,9 @@ inissisimaffik Z2-Zmorf ;
 initooq Z1Zmorf ;
 initoorsuusoq Z1Zmorf ;
 innaajunnarsisoq Z1Zmorf ;
+!innaallagiaq@U.UTE.ON@ Z1+ssZmorf ;
 innaallagiaq Z1+ssZmorf ;
+
 innaallagiaq+LIUR+Der/nv+Gram/IV+UTE+Der/vn:innaallagialiuut tptmorf ;
 innaallagiartortoq+Err/Sub:innaallagiatortoq Z1Zmorf ;
 innaallagisserisoq Z1Zmorf ;