Skip to content

Commit

Permalink
fst-huller og en i-ADVL vs. ADVL konflikt
Browse files Browse the repository at this point in the history
  • Loading branch information
@planggard
planggard committed Aug 21, 2023
1 parent dea4236 commit 4fb4206
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 67 deletions.
4 changes: 4 additions & 0 deletions src/cg3/dep_KalEng.cg3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4334,6 +4334,10 @@ TO (1 (/Gram/TV\ TAQ\ Der/vn\ N/l) OR ("ilassut") LINK NEGATE 0 ("aasaq")) ;
#;
SETPARENT:M0295I @i-ADVL> + Trm TO (1 NIUTE + N); #Kuannersuarni AATSITASSARSIORNISSAMUT suliniummut atatillugu isumaqatigiingaatsiarput kisianni, namminiilivinnermut aamma aalisarnermut atatillugu taama isumaqatigiitsiginngillat, inuiaqatigiilerinermut ilisimatooq oqarpoq.

SETPARENT:M0295J @i-ADVL> + Sem/Geo + Lok IF
(NOT p (*))
TO (1 Rel + &&POSS34_POSS& LINK 1A NIQ + &&POSS34_POSS&); #CANADAMI orpippassuit ikuallannerisa nunatta qilaa aappillersimatittaaraat

##MAP-regler ved oratio obliqua
##Først en specialitet ved
#MAP:M0299 @SUBJ> TARGET Abs + Sg IF (*1 Abs + Sg LINK 1 CONT + 3SgO LINK *1 Par + 3Sg)(*-1 ORATIOOBLVERB) #Typen Subjekt (obj CONT+TRANSVERB+3SgO) Par
Expand Down
5 changes: 4 additions & 1 deletion src/cg3/disambiguator.cg3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5484,7 +5484,8 @@ REMOVE:0113D OBLIQUE + 1SgPoss IF (0 2SgPoss LINK *1 1Sg + 2SgO)(NEGATE 1 1Sg);

REMOVE:0112 OBLIQUE + 1SgPoss IF (NEGATE -1 ("uanga") + 1Sg)(NEGATE *0 VERB-NOTCONT + 1Sg)(NEGATE 0*W 1Sg OR 1SgPoss OR 1SgO)(NEGATE 0 FAM + POSSESSUM + Ins LINK *1 HTR) # (0*W (someset)) Sidste NEGATE forebygger sletning af possessum i mik-objekter når der er tale om familiebetegnelser
(NEGATE 0 ("toqqusaaq"))
(NEGATE *-1 DIRTALESTART LINK *1 _TARGET_ BARRIER V LINK NOT -1 ("illit") OR (Rel Pl) LINK *1 VFIN + (/3[SP][gl]/r) BARRIER VFIN LINK *1 VFIN + ("aki"))#PL20230206 - Maani ULLORIAATINNGUANNI tiigereqanngilaq, ataqqinartuaraq akisimavoq. NB: ("aki") skal udvides til et sæt af ytringsverber
(NEGATE *-1 DIRTALESTART LINK *1 _TARGET_ BARRIER V LINK NOT -1 ("illit") OR (Rel Pl) LINK *1 VFIN + (/3[SP][gl]/r) BARRIER VFIN LINK *1 VFIN + ("aki"))#PL20230206 - Maani ULLORIAATINNGUANNI tiigereqanngilaq, ataqqinartuaraq akisimavoq. NB: ("aki") skal udvides til et sæt af ytringsverber
(NEGATE 0 1SgPoss LINK *-1W VFIN + 1Sg)#Siniffimmut nallariarlunga timiga vindruanik ilioraaffigilerpara. QALASINNI.
;
SELECT:0112A OBLIQUE + 1SgPoss IF (0 Lok + Pl + (/"angerlar"\ Gram/IV\ SIMA\ Der/vv\ VIK/l) LINK *0 1Sg); #angerlarsimaffinni er sjældent Lok Pl (reglen må gerne omplaceres til et bedre sted)

Expand Down Expand Up @@ -17695,6 +17696,8 @@ SELECT:Sem0805 (/^i?Sem/L$/r) + POSSESSUM3 IF (-1 (Num Rel)); #fjerner Sem/an og

REMOVE:Sem0815 ("akunneq") + (/^i?Sem/ac/r) IF (0 (/^i?Sem/cc/r) + POSSESSUM); #"mellem", ikke "time"

REMOVE:Sem820 ("akunneq") + (/^i?Sem/cc/r) IF (0 (/^i?Sem/L/r) + POSSESSUM3 LINK -1 Rel) ;

##############
AFTER-SECTIONS

Expand Down
2 changes: 2 additions & 0 deletions src/cg3/functions.cg3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4057,6 +4057,8 @@ MAP:M0295H @i-ADVL> TARGET TIMENOUN + Lok IF (1 <fn:Appear> + N) #Laila Kristian

MAP:M0295I @i-ADVL> TARGET Trm IF (1 NIUTE + N); #Kuannersuarni AATSITASSARSIORNISSAMUT suliniummut atatillugu isumaqatigiingaatsiarput kisianni, namminiilivinnermut aamma aalisarnermut atatillugu taama isumaqatigiitsiginngillat, inuiaqatigiilerinermut ilisimatooq oqarpoq.

MAP:M0295J @i-ADVL> TARGET Sem/Geo + Lok IF (1 Rel + &&POSS34_POSS& LINK 1 NIQ + &&POSS34_POSS&); #CANADAMI orpippassuit ikuallannerisa nunatta qilaa aappillersimatittaaraat

#MAP-regler ved oratio obliqua

#Først en specialitet ved
Expand Down
65 changes: 1 addition & 64 deletions src/fst/affixes/derivations-inflections.lexc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44729,70 +44729,6 @@ LEXICON XIirXmorf2 !!= * @CODE@ til iR såsom *er*
+SIMA+Der/vv+TIGE+Der/vv:%>simatig flex-iv_schwa ;
+SIMA+Der/vv+TIGE+Der/vv+NNGIT+Der/vv:%>simatiginngi IV-mod_nngit ;
+SIMA+Der/vv+TIP+Der/vv:%>simatip HTR_C_TAQ_tsi ;
!+SIMA+Der/vv+TIP+Der/vv+HTR+Der/vv:%>simatitsi IV_voq ;
!+SIMA+Der/vv+TIP+Der/vv+INNAR+Der/vv:%>simatiinnar Gaq ;
!+SIMA+Der/vv+TIP+Der/vv+INNAR+Der/vv+NIAR+Der/vv:%>simatiinnarniar Gaq ;
!+SIMA+Der/vv+TIP+Der/vv+INNAR+Der/vv+NIAR+Der/vv+GUNAR+Der/vv:%>simatiinnarniarunar Gaq ;
!+SIMA+Der/vv+TIP+Der/vv+INNAR+Der/vv+GUMA+Der/vv:%>simatiinnaruma Saq ;
!+SIMA+Der/vv+TIP+Der/vv+NIAR+Der/vv:%>simatinniar Gaq ;
!+SIMA+Der/vv+TIP+Der/vv+NIAR+Der/vv+TAR+Der/vv+SIMA+Der/vv:%>simatinniartarsima Saq ;
!+SIMA+Der/vv+TIP+Der/vv+NIQAR+Der/vv:%>simatinneqar IV_r ;
!+SIMA+Der/vv+TIP+Der/vv+Gram/Refl+SSA+Der/vv:%>simatissa IV-mod_ssa ;
!+SIMA+Der/vv+TIP+Der/vv+SSA+Der/vv:%>simatissa TV-mod_ssa ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv:%>simatittuar flex-iv ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv:%>simatittuar Gaq ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+GALUAR+Der/vv:%>simatittuaraluar IV-mod_C ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+GALUAR+Der/vv:%>simatittuaraluar Gaq ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+GUMAAR+Der/vv:%>simatittuarumaar IV-mod_C ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+GUMAAR+Der/vv:%>simatittuarumaar Gaq ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+GUNAR+Der/vv:%>simatittuarunar IV-mod_C ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+GUNAR+Der/vv:%>simatittuarunar Gaq ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+GUNNAR+Der/vv:%>simatittuarunnar flex-iv ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+GUNNAR+Der/vv:%>simatittuarunnar Gaq ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+INNAR+Der/vv:%>simatittuaannar IV-mod_C ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+INNAR+Der/vv:%>simatittuaannar Gaq ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+KANNIR+Der/vv:%>simatittuakanner Gaq ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+KANNIR+Der/vv:%>simatittuakanner XIiX ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+LIR+Der/vv:%>simatittualer IV-mod_iC ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+LIR+Der/vv:%>simatittualer TV-mod_ir ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+LIR+Der/vv+GALUAR+Der/vv:%>simatittualeraluar IV-mod_C ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+LIR+Der/vv+GALUAR+Der/vv:%>simatittualeraluar Gaq ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+LIR+Der/vv+GUMAAR+Der/vv:%>simatittualerumaar IV-mod_C ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+LIR+Der/vv+GUMAAR+Der/vv:%>simatittualerumaar Gaq ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+LIR+Der/vv+GUNAR+Der/vv:%>simatittualerunar IV-mod_C ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+LIR+Der/vv+GUNAR+Der/vv:%>simatittualerunar Gaq ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+LIR+Der/vv+NIKUU+Der/vv:%>simatittualernikuu IV-mod_V ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+LIR+Der/vv+NIKUU+Der/vv:%>simatittualernikuu Saq ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+LIR+Der/vv+NNGUATSIAR+Der/vv:%>simatittualinnguatsiar IV-mod_C ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+LIR+Der/vv+NNGUATSIAR+Der/vv:%>simatittualinnguatsiar Gaq ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+LIR+Der/vv+PAJAAR+Der/vv:%>simatittualipajaar flex-iv ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+LIR+Der/vv+PAJAAR+Der/vv:%>simatittualipajaar Gaq ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+LIR+Der/vv+PALUP+Der/vv:%>simatittualerpalup IV-mod_C ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+LIR+Der/vv+PALUP+Der/vv:%>simatittualerpalup Taq ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+LIR+Der/vv+PASIP+Der/vv:%>simatittualerpasip TV-mod_iC ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+LIR+Der/vv+PASIP+Der/vv:%>simatittualerpasip IV-mod_iC ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+LIR+Der/vv+SINNAA+Der/vv:%>simatittualersinnaa IV-mod_V ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+LIR+Der/vv+SINNAA+Der/vv:%>simatittualersinnaa Saq ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+LIR+Der/vv+SINNAR+Der/vv:%>simatittualersinnar IV-mod_C ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+LIR+Der/vv+SINNAR+Der/vv:%>simatittualersinnar Gaq ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+LIR+Der/vv+SSA+Der/vv:%>simatittualissa IV-mod_ssa ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+LIR+Der/vv+SSA+Der/vv:%>simatittualissa TV-mod_ssa ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+LLUINNAR+Der/vv:%>simatittuarluinnar IV-mod_C ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+LLUINNAR+Der/vv:%>simatittuarluinnar Gaq ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+NIKUU+Der/vv:%>simatittuarnikuu IV-mod_V ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+NIKUU+Der/vv:%>simatittuarnikuu Saq ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+NNGUATSIAR+Der/vv:%>simatittuannguatsiar IV-mod_C ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+NNGUATSIAR+Der/vv:%>simatittuannguatsiar Gaq ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+PALUP+Der/vv:%>simatittuarpalup IV-mod_C ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+PALUP+Der/vv:%>simatittuarpalup Taq ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+PASIP+Der/vv:%>simatittuarpasip TV-mod_iC ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+PASIP+Der/vv:%>simatittuarpasip IV-mod_iC ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+SINNAA+Der/vv:%>simatittuarsinnaa IV-mod_V ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+SINNAA+Der/vv:%>simatittuarsinnaa Saq ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+SINNAR+Der/vv:%>simatittuarsinnar IV-mod_C ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+SINNAR+Der/vv:%>simatittuarsinnar Gaq ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+SSA+Der/vv:%>simatittuassa IV-mod_ssa ;
!+SIMA+Der/vv+TIP+Der/vv+TUAR+Der/vv+SSA+Der/vv:%>simatittuassa TV-mod_ssa ;
+SIMA+Der/vv+TSIAR+Der/vv:%>simatsiar flex-iv ;
+SIMA+Der/vv+TSIAR+Der/vv+INNAR+Der/vv:%>simatsiaannar IV-mod_C ;
+SIMA+Der/vv+TSIAR+Der/vv+LIR+Der/vv:%>simatsialer IV-mod_iC ;
Expand Down Expand Up @@ -44846,6 +44782,7 @@ LEXICON XIirXmorf2 !!= * @CODE@ til iR såsom *er*
+SIMAAR+Der/vv+SINNAA+Der/vv+LIR+Der/vv:%>simaarsinnaaler IV-mod_iC ;
+SIMAAR+Der/vv+SINNAA+Der/vv+LIR+Der/vv+SIMA+Der/vv:%>simaarsinnaalersima IV-mod_V ;
+SIMAAR+Der/vv+SSA+Der/vv:%>simaassa IV-mod_ssa ;
+SIMAAR+Der/vv+TAAR+Der/vv:%>simaartaar IV-mod_C ;
+SIMAAR+Der/vv+TAR+Der/vv:%>simaartar flex-iv ;
+SIMAAR+Der/vv+TAR+Der/vv+NNGIT+Der/vv:%>simaartanngi IV-mod_nngit ;
+SIMAAR+Der/vv+TIGE+Der/vv:%>simaartig flex-iv_schwa ;
Expand Down
3 changes: 3 additions & 0 deletions src/fst/stems/nouns.lexc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35764,6 +35764,7 @@ tusarliuttoq Z1Zmorf ;
tusarnaar+Gram/TV+TAQ+Der/vn+SSAQ+Der/nn+LIAQ+Der/nn+LIAQ+Der/nn+Orth/Alt:tusarnaagassialiaq Z1Zmorf ;
tusarnaaqqissaartoq Z1Zmorf ;
tusarnaariaq Z1Zmorf ;
tusarnaar+Gram/TV+TE+Der/vn:tusarnaar%>ti Z1eZmorf ;
tusarnaar+Gram/TV+UTE+Der/vn:tusarnaarut tptmorf ;
!tusarnaartoq Z1Zmorf ; !KW06022023
tusarnaarumasarfik Z2-Zmorf ;
Expand Down Expand Up @@ -38290,6 +38291,8 @@ viking N_Loan ;
villa N_Loan_V ;
village N_Loan_e ;
villiaumit N_Loan_GEM ;
vindrue N_Loan_e ;
vindrue+Orth/alt:vindrua Z1Zmorf ;
vingummi N_Loan_i ;
vinkel N_Loan ;
vinyl N_Loan ;
Expand Down
4 changes: 2 additions & 2 deletions src/fst/stems/verbs.lexc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ aappilarrajaar IV_long_stem ;
aappillap IV_k_stem ;
aappillarip XIiXmorf_stem ;
aappillarissi XIi_voqXmorf_stem ;
aappillersar HTR_r_GAQ_i ;
!aappillersar HTR_r_GAQ_i ;
aappiller XIirXmorf_stem ;
aappisar IV_r_UTE_gennemgang ;
aappiup HTR_UTE_SSAQ_ssi ;
Expand Down Expand Up @@ -12174,7 +12174,6 @@ [email protected]@ HTR_r_GAQ_i ;
nioorartip HTR_C_TAQ_tsi ;
nioqqa IV_voq_stem ;
nioqqusi XIi_voqXmorf_stem ;
nioqqut+LIUR+Der/nv:niqqutissior tptmorf ;
nioqqaannar IV_r_stem ;
nior IV_r_stem ;
nioror HTR_r_GAQ_i ;
Expand Down Expand Up @@ -21160,6 +21159,7 @@ sukkisaartitsi XIi_voqXmorf_stem ;
sukkititsi XIi_voqXmorf_stem ;
sukkiutige:sukkiutig HTR_schwa_SAQ_nnip ;
sukkiutaar HTR_r_GAQ_si ;
sukkoq+GUP+Der/nv:sukkugup IV_k_stem ;
sukkor IV_r ;
sukkuarassip HTR_C_TAQ_tsi ;
sukkugup IV_k_stem ;
Expand Down

0 comments on commit 4fb4206

Please sign in to comment.