Update functions.cg3

giellalt · Jul 26, 2024 · f10351d · f10351d
1 parent 8481d33
commit f10351d
Showing 1 changed file with 26 additions and 15 deletions.
diff --git a/src/cg3/functions.cg3 b/src/cg3/functions.cg3
@@ -432,13 +432,13 @@ LIST @-FADVL-partitive> = @-FADVL-partitive>; # partitive, ablative Adverbial to
 LIST @-F<ADVL-partitive = @-F<ADVL-partitive; # partitive, ablative Adverbial to the right of a non-finite verb
 LIST <ablabout> = <ablabout> ;
 #LIST @ADVL <ablabout> = @ADVL <ablabout>;
-LIST @ADVL-ablabout> = @ADVL-ablabout>; # partitive, ablative Adverbial to the left of the verb
-LIST @<ADVL-ablabout = @<ADVL-ablabout; # partitive, ablative Adverbial to the right of the verb
+#LIST @ADVL> <ablabout> = @ADVL> <ablabout>; # partitive, ablative Adverbial to the left of the verb
+#LIST @<ADVL <ablabout> = @<ADVL <ablabout>; # partitive, ablative Adverbial to the right of the verb
 
 #LIST @-FADVL <ablabout> = @-FADVL <ablabout>; # ablative Adverbial of a non-finite verb
-LIST @-FADVL-ablabout> = @-FADVL-ablabout>; # partitive, ablative Adverbial to the left of a non-finite verb
+#LIST @-FADVL> <ablabout> = @-FADVL> <ablabout>; # partitive, ablative Adverbial to the left of a non-finite verb
 LIST @-F<ADVL-partitive = @-F<ADVL-partitive; # partitive, ablative Adverbial to the right of a non-finite verb
-LIST @-F<ADVL-ablabout = @-F<ADVL-ablabout; # partitive, ablative Adverbial to the right of a non-finite verb
+#LIST @-F<ADVL <ablabout> = @-F<ADVL <ablabout>; # partitive, ablative Adverbial to the right of a non-finite verb
 
 
 ###LIST @ADVL> <hab> = @ADVL> <hab>; # Habitive adverbial to the left of the finite verb
@@ -2084,22 +2084,28 @@ MAP (@IMP-PTCLE) TARGET ImperParticle;
 MAP (@INTERJ) TARGET Interj;
 
 # седе, весемеде, сембода
-MAP (@CMP-STD>) TARGET (Pron Dem Sg Abl Indef) OR (Num SP Abl Indef) OR (Pron SP Abl Indef) OR (adj indf nsg cx:abl encl:AKgroup) OR (pron:dem indf nsg cx:abl) OR NAdjSPAbl OR (V Inf Abl) IF (1 (A) OR Ex/A OR (n/adj) OR (AJJ) OR LAMO OR Adv OR AdvNEJgroup OR POSTPTAKESABL);# седе покш
+#MAP (@CMP-STD>) TARGET (Pron Dem Sg Abl Indef) OR (Num SP Abl Indef) OR (Pron SP Abl Indef) OR (adj indf nsg cx:abl encl:AKgroup) OR (pron:dem indf nsg cx:abl) OR NAdjSPAbl OR (V Inf Abl) IF (1 (A) OR Ex/A OR (n/adj) OR (AJJ) OR LAMO OR Adv OR AdvNEJgroup OR POSTPTAKESABL);# седе покш
+MAP (@>A) TARGET (Pron Dem Sg Abl Indef) OR (Num SP Abl Indef) OR (Pron SP Abl Indef) OR (adj indf nsg cx:abl encl:AKgroup) OR (pron:dem indf nsg cx:abl) OR NAdjSPAbl OR (V Inf Abl) IF (1 (A) OR Ex/A OR (n/adj) OR (AJJ)) ;# седе покш
     #весемеде вадрятнень
+MAP (@>ADVL) TARGET (Pron Dem Sg Abl Indef) OR (Num SP Abl Indef) OR (Pron SP Abl Indef) OR (adj indf nsg cx:abl encl:AKgroup) OR (pron:dem indf nsg cx:abl) OR NAdjSPAbl OR (V Inf Abl) IF (1 LAMO OR Adv OR AdvNEJgroup OR POSTPTAKESABL);# седе мейле
     #Варжасаськ, мезьста ащи почвань лядкссь календамода меле.
     #Штобу почвасонть улевель седе ламо перегной, сонзэ удобрить навозсо.
-MAP (@CMP-STD>) TARGET (Pron Dem Sg Abl Indef) OR (Pron SP Abl Indef) OR (adj indf nsg cx:abl encl:AKgroup) OR (pron:dem indf nsg cx:abl) OR NAdjSPAbl OR (V Inf Abl) IF (1 (Pcle Neg)) (2 LAMO OR PEK);# седе а ламо сяда аф лама
+#MAP (@CMP-STD>) TARGET (Pron Dem Sg Abl Indef) OR (Pron SP Abl Indef) OR (adj indf nsg cx:abl encl:AKgroup) OR (pron:dem indf nsg cx:abl) OR NAdjSPAbl OR (V Inf Abl) IF (1 (Pcle Neg)) (2 LAMO OR PEK);# седе а ламо сяда аф лама
+MAP (@>ADVL) TARGET (Pron Dem Sg Abl Indef) OR (Pron SP Abl Indef) OR (adj indf nsg cx:abl encl:AKgroup) OR (pron:dem indf nsg cx:abl) OR NAdjSPAbl OR (V Inf Abl) IF (1 (Pcle Neg)) (2 LAMO OR PEK);# седе а ламо сяда аф лама
     #омбонстнэсэ — седе а ламо.
 
 # MOVE IT SOMEWHERE ELSE
 # COMPARATIVE
-MAP (@CMP-STD>) TARGET PronDemSgAblIndf IF (1 A OR (n/adj));
-MAP (@CMP-STD>) TARGET PronPersAbl IF (1 A OR (n/adj));
+#MAP (@CMP-STD>) TARGET PronDemSgAblIndf IF (1 A OR (n/adj));
+#MAP (@CMP-STD>) TARGET PronPersAbl IF (1 A OR (n/adj));
+MAP (@>A) TARGET PronDemSgAblIndf OR PronPersAbl IF (1 A OR (n/adj));
 # корты мондень покш тевде. consider ordering.
-MAP (@CMP-STD>) TARGET EJSTENoPX IF (1 A OR (n/adj));#!CHECKME 2024-07-14
+#MAP (@CMP-STD>) TARGET EJSTENoPX IF (1 A OR (n/adj));#!CHECKME 2024-07-14
 MAP (@CMP-STD>) TARGET PronDemPlAblIndf;
+MAP (@>A) TARGET EJSTENoPX OR PronDemPlAblIndf IF (1 A OR (n/adj));#!CHECKME 2024-07-14
 
 #
+ #These should be temporal adverbials pointing to main
 MAP (@CMP-STD>) TARGET NumOrdSgAbl;
 MAP (@CMP-STD>) TARGET NumOrdPlAbl;
 
@@ -2278,15 +2284,20 @@ MAP (@SUBJ>) TARGET VESENOMSG IF (1* VFINPL3SUBJ BARRIER CLB OR EOS OR N);
 
 MAP:IntercedingMeriat  (@SUBJ>) TARGET (Sg Nom Def) IF (1 Comma) (2 ("меремс" ScPl2) OR ("меремс" ScSg2)) (3 Comma) (4* VFINSG3SUBJ BARRIER CLB OR EOS LINK NEGATE 0* SUBJECTCANDIDATESG3 BARRIER CLB OR EOS);
 
-MAP:TalkAboutABL (@ADVL-ablabout>) TARGET (Pron Indef SP Abl) IF (NEGATE 1 POSTPTAKESABL OR BASHKATAKESABL OR NOUNTAKESABL) (1* VERBTAKESABL);
+#MAP:TalkAboutABL (@ADVL> <ablabout>) TARGET (Pron Indef SP Abl) IF (NEGATE 1 POSTPTAKESABL OR BASHKATAKESABL OR NOUNTAKESABL) (1* VERBTAKESABL);
+MAP:TalkAboutABL (@ADVL>) TARGET (Pron Indef SP Abl) IF (NEGATE 1 POSTPTAKESABL OR BASHKATAKESABL OR NOUNTAKESABL) (1* VERBTAKESABL);
    #мезде-бути: Ансяк кенкшенть эйстэ а васоло кавто аштиця бабинетне мезде-бути кортнесть.
 
-MAP:TalkAboutABL (@ADVL-ablabout>) TARGET NOUNSPAbl IF (*1 TALKABOUTVABLARGFIN BARRIER CLB OR EOS OR @CVP); 
-MAP:TalkAboutABL (@<ADVL-ablabout) TARGET NOUNSPAbl IF (*-1 TALKABOUTVABLARGFIN BARRIER CLB OR BOS OR @CVP); 
-#MAP:TalkAboutABL (@<ADVL-ablabout) TARGET NOUNSPAbl IF (*-1 TALKABOUTVABLARGFIN BARRIER CLB OR BOS OR @CVP); 
+#MAP:TalkAboutABL (@ADVL> <ablabout>) TARGET NOUNSPAbl IF (*1 TALKABOUTVABLARGFIN BARRIER CLB OR EOS OR @CVP);
+MAP:TalkAboutABL (@ADVL>) TARGET NOUNSPAbl IF (*1 TALKABOUTVABLARGFIN BARRIER CLB OR EOS OR @CVP); 
+#MAP:TalkAboutABL (@<ADVL <ablabout>) TARGET NOUNSPAbl IF (*-1 TALKABOUTVABLARGFIN BARRIER CLB OR BOS OR @CVP); 
+MAP:TalkAboutABL (@<ADVL) TARGET NOUNSPAbl IF (*-1 TALKABOUTVABLARGFIN BARRIER CLB OR BOS OR @CVP); 
+#MAP:TalkAboutABL (@<ADVL <ablabout>) TARGET NOUNSPAbl IF (*-1 TALKABOUTVABLARGFIN BARRIER CLB OR BOS OR @CVP); 
 	#This may still need a noun list for conceivable partitives
-MAP:TalkAboutABL (@-FADVL-ablabout>) TARGET NOUNSPAbl IF (*1 TALKABOUTVABLARGINF BARRIER CLB OR EOS OR @CVP); 
-MAP:TalkAboutABL (@-F<ADVL-ablabout) TARGET NOUNSPAbl IF (*-1 TALKABOUTVABLARGINF BARRIER CLB OR BOS OR @CVP); 
+#MAP:TalkAboutABL (@-FADVL> <ablabout>) TARGET NOUNSPAbl IF (*1 TALKABOUTVABLARGINF BARRIER CLB OR EOS OR @CVP); 
+MAP:TalkAboutABL (@-FADVL>) TARGET NOUNSPAbl IF (*1 TALKABOUTVABLARGINF BARRIER CLB OR EOS OR @CVP); 
+#MAP:TalkAboutABL (@-F<ADVL <ablabout>) TARGET NOUNSPAbl IF (*-1 TALKABOUTVABLARGINF BARRIER CLB OR BOS OR @CVP); 
+MAP:TalkAboutABL (@-F<ADVL) TARGET NOUNSPAbl IF (*-1 TALKABOUTVABLARGINF BARRIER CLB OR BOS OR @CVP);