Skip to content

Commit

Permalink
Mindre problemer ved Poss-Poss og problem med POSS>>
Browse files Browse the repository at this point in the history
  • Loading branch information
planggard committed Aug 22, 2023
1 parent 9746eb9 commit d2700c2
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 12 deletions.
24 changes: 14 additions & 10 deletions src/cg3/dep_KalEng.cg3
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ SETPARENT:M_tidlig0072A @POSS>> + Rel + Pl IF
(NEGATE 1 Rel + CONJ-C)#2020-mi innuttaasut 16-IT 74-illu akornanni ukiullit 42 pct.-ii meeqqat atuarfiannit qaffasinnerusumik ilinniagaqarsimapput, ukiut qulit ingerlanerini 9,2 pct.-imik qaffallutik.
(NEGATE 2 Rel LINK 1 POSSESSUM3)#MALITTARISASSAT nutaat ilaasa qasukkarneqarnissaat ilimananngilaq
(NEGATE 0 Der/vn LINK *-1 Rel + Pl BARRIER (*) - Adv - OBLIQUE)#Pissaanermillu piginnittut NUIMASUT amerlasuut qallunaajunerat, qallunaatut oqaluttuunerat aamma/imaluunniit sivisuumik ilinniagaqarsimanerat ilumoorpoq.
(NEGATE 1 (Num Rel Pl) LINK 1 ("misse") + &&IV_SUBJ& LINK *1 INTRANSVERB + &&IV_SUBJ& BARRIER V)#Aamma atuaruk Canadap INUISA 20.000-t missaat orpippassuit ikuallannerini qimagussorneqartariaqartut

TO (1 Rel + Pl LINK *1 3PlPossUdenMWE BARRIER (*) - Gram/Cong - OBLIQUE LINK *1 3PlPossUdenMWE BARRIER V)
;
Expand Down Expand Up @@ -4544,7 +4545,9 @@ SETPARENT:D0324 @ADVL> + ("kinguneq") + Sg + POSSESSUM3 - AFFINGERET IF

#MAP:M0325 @ADVL> TARGET TIME + Via IF (*1 IteCau BARRIER V) ;
#
#MAP:M0326 @ADVL> TARGET ADVERBIEL - POSSESSUM IF (1 ORATIOOBLVERB + V OR DIRTALE + V) ; #ersarissumik oqarpoq
SETPARENT:M0326 @ADVL> + ADVERBIEL - POSSESSUM IF
(NOT p (*))
TO (1 ORATIOOBLVERB + V OR DIRTALE + V) ; #ersarissumik oqarpoq
#
##En særregel, der blokerer at Lok efter Lok i et helt andet syntagme ikke læses som @N< i forbindelse med atatip etc. PL20200424 kommentar til Liv: Forstår ikke dit valg af @>N i regel M0330X så jeg retter til @i-ADVL>
#MAP:M0330X @i-ADVL> TARGET Lok IF (1 Trm)(2 ("pi") + CONT OR ("ata") + CONT OR ("tunnga") + CONT) ;
Expand Down Expand Up @@ -7267,16 +7270,17 @@ SETPARENT:M0640F @SUBJ> + Rel + Sg - 4SgPoss IF
TO (*1 TRANSVERB + TIMEVERB BARRIER VERB-NOTCONT LINK *1A TRANSVERB + 3Sg - OBJVERB BARRIER OBJVERB);


#MAP:M0649 @POSS> TARGET Rel + Pl IF (*1 3PlPossUdenMWE BARRIER (*) - @<APPOS - @N<)
#(NEGATE 0 LU OR LUUNNIIT LINK -1 Rel + Pl + @N<)#Tassami arfinilinnik ukioqartungali inersimasut titartaarusussuseerutsissimavaannga, pulateriaarsuillu ipititsisartut matoqqasut AMMASULLUUNNIIT titartarnissaat kisiat ilikkarsimavara.
# (NEGATE *1 TRANSVERB + 3Pl BARRIER V)#Ullumilu INUIT 1.200-t missaat aqqut taanna ukiumut aqqutigisarpaat.
#(NEGATE 0 4PlPoss LINK NEGATE *1 V + 3Pl OR V + 4Pl)#Nunanut allanut unammisartut arfininngormat tikikkamilli ullormut marloriarlutik sungiusartarsimapput, unammisartullu QASUSUISSUTSIMIK misilitsinnerat naammaginartorujussuarmik ingerlasimavoq, nunanut allanut unammisartut sungiusaasuat Preben Clausen paasissutissiivoq.
#(NEGATE -*1 Rel + Pl LINK *1 _TARGET_ + Gram/Dem + Rel BARRIER (*) - Rel - %AmbiguøsN LINK 1 3PlPoss )#Angutit marluk TAAKKU tigummigallagassanngortinneqarnissaat, unnerluussisussaatitaasup Lars Jørgen Petersenip piumasariniarpaa.
#(NEGATE *-1 Rel + Pl BARRIER 3PlPoss - TIME OR V)#Timarit.is-imit pissarsiarineqartut ilaat katersuinermi aallarniutigineqarsimapput, ukiunilu siullerni marlunni Atuagagdliutit 1952-ip 1955-illu akornanni SAQQUMMERSARTUT oqaasertaat Oqaasileriffiup allattaasitaamut nuutsissutaa atorlugu katersorneqarsimapput.
#(NEGATE 0 Der/vn LINK *-1 Rel + Pl BARRIER (*) - OBLIQUE)#Aamma nunatsinni katerinnerit 200-init amerlanerusunit PEQATAAFFIGINIEQARTUT inerteqqutigineqarnissaat pilersaarutaanngilaq, Bjørn Tegner Bay oqarpoq.
#(NEGATE 1 ("meeraq") LINK 1 (/"angerlar"\ Gram/IV\ SIMA\ Der/vv\ Gram/IV\ VIK/l))#Fast udtryk: Meeqqat MEEQQAT angerlarsimaffiiniittut ilisimasaqarfiginerulerpavut
SETPARENT:M0649 @POSS> + Rel + Pl IF
(NOT p (*))
(NEGATE 0 LU OR LUUNNIIT LINK -1 Rel + Pl + @N<)#Tassami arfinilinnik ukioqartungali inersimasut titartaarusussuseerutsissimavaannga, pulateriaarsuillu ipititsisartut matoqqasut AMMASULLUUNNIIT titartarnissaat kisiat ilikkarsimavara.
(NEGATE *1 TRANSVERB + 3Pl BARRIER V)#Ullumilu INUIT 1.200-t missaat aqqut taanna ukiumut aqqutigisarpaat.
(NEGATE 0 4PlPoss LINK NEGATE *1 V + 3Pl OR V + 4Pl)#Nunanut allanut unammisartut arfininngormat tikikkamilli ullormut marloriarlutik sungiusartarsimapput, unammisartullu QASUSUISSUTSIMIK misilitsinnerat naammaginartorujussuarmik ingerlasimavoq, nunanut allanut unammisartut sungiusaasuat Preben Clausen paasissutissiivoq.
(NEGATE -*1 Rel + Pl LINK *1 _TARGET_ + Gram/Dem + Rel BARRIER (*) - Rel - %AmbiguøsN LINK 1 3PlPoss )#Angutit marluk TAAKKU tigummigallagassanngortinneqarnissaat, unnerluussisussaatitaasup Lars Jørgen Petersenip piumasariniarpaa.
(NEGATE *-1 Rel + Pl BARRIER 3PlPoss - TIME OR V)#Timarit.is-imit pissarsiarineqartut ilaat katersuinermi aallarniutigineqarsimapput, ukiunilu siullerni marlunni Atuagagdliutit 1952-ip 1955-illu akornanni SAQQUMMERSARTUT oqaasertaat Oqaasileriffiup allattaasitaamut nuutsissutaa atorlugu katersorneqarsimapput.
(NEGATE 0 Der/vn LINK *-1 Rel + Pl BARRIER (*) - OBLIQUE)#Aamma nunatsinni katerinnerit 200-init amerlanerusunit PEQATAAFFIGINIEQARTUT inerteqqutigineqarnissaat pilersaarutaanngilaq, Bjørn Tegner Bay oqarpoq.
(NEGATE 1 ("meeraq") LINK 1 (/"angerlar"\ Gram/IV\ SIMA\ Der/vv\ Gram/IV\ VIK/l))#Fast udtryk: Meeqqat MEEQQAT angerlarsimaffiiniittut ilisimasaqarfiginerulerpavut

#;
TO (*1 3PlPossUdenMWE BARRIER (*) - @<APPOS - @N<);
##SIUMUKKUT Inuit Ataqatigiillu inissisimanerat.
SETPARENT:M0649A @POSS> + Rel + Pl IF
(NOT p (*))
Expand Down
2 changes: 1 addition & 1 deletion src/cg3/disambiguator.cg3
Original file line number Diff line number Diff line change
Expand Up @@ -3919,7 +3919,7 @@ SELECT:Sel0001 Num IF (*1 ("misse") OR ("miss." Adv)) (NEGATE 0 ("miss." Adv)) ;
REMOVE:Int0115 Num + Rel IF (*1 ("miss." Adv) BARRIER (*) - NUMHOVED - NUM) ;
REMOVE:Int0116 Num + Abs IF (*1 ("misse") OR ("miss." Adv) BARRIER NUMHOVED OR NUM) ;
REMOVE:Int0117A Rel IF (*1 ("miss." Adv) BARRIER (*) - NUMHOVED - NUM LINK NEGATE 0 Rel) ;

REMOVE:Int0117B ("misse") + Sg IF (0 ("misse") + Abs + Pl LINK *1 INTRANSVERB + 3Pl BARRIER V - (/NIR\ Der/vv\ Gram/TV\ V\ Par\ 4Sg/l)); #Aamma atuaruk Canadap inuisa 20.000-t MISSAAT orpippassuit ikuallannerini qimagussorneqartariaqartut
#APPEND ("$1"v Orth/Append Sem/Unit N Rel Sg) TARGET ("([a-z].*)"r) (0 NUMHOVED) (NOT 0 Rel + Sg) (*-1 Num )(*1 ("misse") OR ("miss.") + Adv)
#(NEGATE 0 ("million") OR ("milliard") OR ("krone"))
#;
Expand Down
2 changes: 2 additions & 0 deletions src/cg3/functions.cg3
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,8 @@ MAP:M_tidlig0072A @POSS>> TARGET Rel + Pl IF (1 Rel + Pl LINK *1 3PlPossUdenMWE
(NEGATE 1 Rel + CONJ-C)#2020-mi innuttaasut 16-IT 74-illu akornanni ukiullit 42 pct.-ii meeqqat atuarfiannit qaffasinnerusumik ilinniagaqarsimapput, ukiut qulit ingerlanerini 9,2 pct.-imik qaffallutik.
(NEGATE 2 Rel LINK 1 POSSESSUM3 LINK NEGATE 1 POSSESSUM3 )#MALITTARISASSAT nutaat ilaasa qasukkarneqarnissaat ilimananngilaq
(NEGATE 0 Der/vn LINK *-1 Rel + Pl BARRIER (*) - Adv - OBLIQUE)#Pissaanermillu piginnittut NUIMASUT amerlasuut qallunaajunerat, qallunaatut oqaluttuunerat aamma/imaluunniit sivisuumik ilinniagaqarsimanerat ilumoorpoq.
(NEGATE 1 (Num Rel Pl) LINK 1 ("misse") + &&IV_SUBJ& LINK *1 INTRANSVERB + &&IV_SUBJ& BARRIER V)#Aamma atuaruk Canadap INUISA 20.000-t missaat orpippassuit ikuallannerini qimagussorneqartariaqartut

;

MAP:M_tidlig0073 @POSS>> TARGET Rel + Pl IF (1 Rel + Pl LINK 1 3PlPoss - Rel LINK 1 3PlPoss ) #MITTARFISSUALIORNERIT innuttaasut aningaasaqarnerannut iluaqutaanerat isigigaanni, mittarfissualiornerit iluatsilluarput, Justus Hansen oqarpoq.
Expand Down
1 change: 0 additions & 1 deletion src/fst/root.lexc
Original file line number Diff line number Diff line change
Expand Up @@ -1628,7 +1628,6 @@ PJAT_FOR_AT_FAA_SKIDTET_TIL_AT_KOMPILERE !en dummy, der kan kommenteres ind og u
+TAAMA !uiguut anneq vist kun i forbindelsen qanormiaataama. Ikke medtaget i K, K_plur eller Krestr
+TAAQ +TAAQ +SUAQ
+TAAR ! Baade vv og nv.
!+TAAR +HTR +SINNAA +GUNNAIR ! as in avaqqutaarisinnaajunnaarlunga IN: Malersortinneq
+TALLAP
+TAQ +TAQ +GALUAQ +TAQ +LIK +TAQ +NNGUAQ +TAQ +PAK +TAQ +PAK +SSUAQ +TAQ +TUAQ
+TAR
Expand Down
1 change: 1 addition & 0 deletions src/fst/stems/propernouns.lexc
Original file line number Diff line number Diff line change
Expand Up @@ -3393,6 +3393,7 @@ Danmarin Zateq_oqsZmorf ;
Danmark-ekspedition Zateq_oqsZmorf ;
Danmark-ekspeditionen Zateq_oqsZmorf ;
!Danmark:Danmarki Z1ateqpropZ ; !set i AG 1953 PL20230723 udkommenteret
Danmarks% Meteorologiske% Institut Zateq_oqsZmorf ;
Danmarks% Nationalmuseum Zateq_oqsZmorf ;
Danmarksekspedition Zateq_oqsZmorf ;
Danmarksekspeditionen Zateq_oqsZmorf ;
Expand Down

0 comments on commit d2700c2

Please sign in to comment.