diff --git a/src/amharic/PatternsAmh.gf b/src/amharic/PatternsAmh.gf index 5cd9f618..ff64c712 100644 --- a/src/amharic/PatternsAmh.gf +++ b/src/amharic/PatternsAmh.gf @@ -128,10 +128,8 @@ C1eC2aC3 = {C1 ="" ; C1C2="'"; C2C3 ="!"; C3="#"}; peC1aC2C3 = { C1 = "ä" ; C1C2="'"; C2C3 ="'"; C3=""}; penC1aC2C3e = { C1 = "än" ; C1C2="'"; C2C3 ="'"; C3=""}; pteC1aC2C3 = { C1 = "t" ; C1C2="'"; C2C3 ="'"; C3=""}; - pteC1aC2C3 = { C1 = "t" ; C1C2="'"; C2C3 ="'"; C3=""};-- 3 pteC1aC2C3u = { C1 = "t" ; C1C2="'"; C2C3 ="'"; C3="&"}; pyeC1aC2C3 = { C1 = "y" ; C1C2="'"; C2C3 ="'"; C3=""}; - pteC1aC2C3 = { C1 = "t" ; C1C2="'"; C2C3 ="'"; C3=""}; pyeC1aC2C3u = { C1 = "y" ; C1C2="'"; C2C3 ="'"; C3="&"}; --Passive Jus_Imperat mkV3gdl @@ -343,7 +341,6 @@ leC1AC2aC3 = {C1 ="l" ; C1C2="!"; C2C3 ="'"; C3=""}; enC1AC2aC3 = { C1 = "(n" ; C1C2="!"; C2C3 ="'"; C3=""}; C1AC2aC3 = { C1 = "" ; C1C2="!"; C2C3 ="'"; C3=""}; C1AC2aC3i = { C1 = "" ; C1C2="!"; C2C3 ="'"; C3="#"}; -C1AC2aC3u = { C1 = "" ; C1C2="!"; C2C3 ="'"; C3="&"}; yC1AC2aC3 = { C1 = "y" ; C1C2="!"; C2C3 ="'"; C3=""}; tC1AC2aC3 = { C1 = "t" ; C1C2="!"; C2C3 ="'"; C3=""}; yC1AC2aC3u = { C1 = "y" ; C1C2="!"; C2C3 ="'"; C3="&"}; @@ -661,7 +658,7 @@ C1AC2n = { C1 = "" ; C1C2="!"; C2 ="n"}; C1AC2k = { C1 = "" ; C1C2="!"; C2 ="k"}; C1AC2sh = { C1 = "" ; C1C2="!"; C2 ="x"}; C1AC2achehu = { C1 = "" ; C1C2 ="!"; C2 ="!ch&"}; -C1AC2a = { C1 = "" ; C1C2="!"; C2 ="'"}; +C1AC2a = { C1 = "" ; C1C2="!"; C2 ="'"}; C1AC2ach = { C1 = "" ; C1C2="!"; C2 ="'c"}; C1AC2u = { C1 = "" ; C1C2="!"; C2 ="&"}; -- Imper -- mkV2yz @@ -701,7 +698,6 @@ C1C2ek = { C1 = "" ; C1C2=""; C2 ="'k"}; C1C2esh = { C1 = "" ; C1C2=""; C2 ="'x"}; C1C2achehu = { C1 = "" ; C1C2=""; C2 ="!ch&"}; C1C2o = { C1 = "" ; C1C2=""; C2 ="/"}; -C1C2a = { C1 = "" ; C1C2=""; C2="!"}; C1C2ew = { C1 = "" ; C1C2=""; C2="'w"}; --CompPer mkV2yz y!l'h& !l !l !l cX7l 7l l'c !l @@ -721,81 +717,12 @@ meC1aC2= {C1 ="m'" ; C1C2="!"; C2 =""}; --Infinitve mkV2yz C1aC2ii= {C1 ="" ; C1C2="!"; C2 ="#"}; - - --mkV2yz -- yz -- catch - --Perf -- - C1AC2hu = {C1 ="" ; C1C2="!"; C2 ="h&"}; - C1AC2n = { C1 = "" ; C1C2="!"; C2 ="n"}; - C1AC2k = { C1 = "" ; C1C2="!"; C2 ="k"}; - C1AC2sh = { C1 = "" ; C1C2="!"; C2 ="x"}; - C1AC2achehu = { C1 = "" ; C1C2 ="!"; C2 ="!ch&"}; - C1AC2a = { C1 = "" ; C1C2="!"; C2 ="'"}; - C1AC2ach = { C1 = "" ; C1C2="!"; C2 ="'c"}; - C1AC2u = { C1 = "" ; C1C2="!"; C2 ="&"}; - -- Imper -- mkV2yz - eC1C2alehu = { C1 = "ä" ; C1C2=""; C2 ="!l'h&"}; - enC1C2alen = { C1 = "än" ; C1C2=""; C2 ="!l'n"}; - teC1C2yaleh = { C1 = "t" ; C1C2=""; C2 ="!l'h"}; - teC1C2aleh = { C1 = "t" ; C1C2=""; C2 ="y!l'x"}; - teC1C2alachehu = { C1 = "t" ; C1C2=""; C2 ="!l!ch&"}; - yeC1C2al = { C1 = "y" ; C1C2=""; C2 ="!l"}; - teC1C2alech = { C1 = "t" ; C1C2=""; C2 ="!l'c"}; - yeC1C2alu = { C1 = "y" ; C1C2=""; C2 ="!l&"}; - - -- Cont -- mkV2yz - eC1C2 = { C1 = "ä" ; C1C2=""; C2 =""}; - enC1C2 = { C1 = "än" ; C1C2=""; C2 =""}; - teC1C2 = { C1 = "t" ; C1C2=""; C2 =""}; - --teC1C2 = { C1 = "t" ; C1C2=""; C2 =""};3 - teC1C2u = { C1 = "t" ; C1C2=""; C2 ="&"}; - yeC1C2 = { C1 = "y" ; C1C2=""; C2 =""}; - --teC1C2 = { C1 = "t" ; C1C2=""; C2 =""}; - yeC1C2u = { C1 = "y" ; C1C2=""; C2 ="&"}; - - - --Jus_Imperat mkV2yz - leC1aC2a = {C1 ="l" ; C1C2="!"; C2 =""}; - enC1aC2a = { C1 = "än" ; C1C2="!"; C2 =""}; - C1aC2 = { C1 = "" ; C1C2="!"; C2 =""}; - C1aC2i = { C1 = "" ; C1C2="!"; C2 ="#"}; - C1eC2u = { C1 = "" ; C1C2="!"; C2 ="&"}; - yC1aC2a = { C1 = "y" ; C1C2="!"; C2 =""}; - tC1aC2a = { C1 = "t" ; C1C2="!"; C2 =""}; - yC1aC2u = { C1 = "y" ; C1C2="!"; C2 ="&"}; - --Gerund mkV2yz - C1C2ie = {C1 ="" ; C1C2=""; C2 ="%"}; - C1C2en = { C1 = "" ; C1C2=""; C2 ="'n"}; - C1C2ek = { C1 = "" ; C1C2=""; C2 ="'k"}; - C1C2esh = { C1 = "" ; C1C2=""; C2 ="'x"}; - C1C2achehu = { C1 = "" ; C1C2=""; C2 ="!ch&"}; - C1C2o = { C1 = "" ; C1C2=""; C2 ="/"}; - C1C2a = { C1 = "" ; C1C2=""; C2="!"}; - C1C2ew = { C1 = "" ; C1C2=""; C2="'w"}; - - --CompPer mkV2yz y!l'h& !l !l !l cX7l 7l l'c !l - C1C2iealehu = {C1 ="" ; C1C2=""; C2 ="%y!l'h&"}; - C1C2enal = { C1 = "" ; C1C2=""; C2 ="'n!l"}; - C1C2ekal = { C1 = "" ; C1C2=""; C2 ="'k!l"}; - C1C2eshal = { C1 = "" ; C1C2=""; C2 ="'x!l"}; - C1C2achehual = { C1 = "" ; C1C2=""; C2 ="!cX7l"}; - C1C2oal = { C1 = "" ; C1C2=""; C2 ="7l"}; - C1C2alech = { C1 = "" ; C1C2=""; C2="!l'c"}; - C1C2ewal = { C1 = "" ; C1C2=""; C2="'w!l"}; - - - --Infinitve mkV2yz - meC1aC2= {C1 ="m'" ; C1C2="!"; C2 =""}; - - --Infinitve mkV2yz - C1aC2ii= {C1 ="" ; C1C2="!"; C2 ="#"}; - --nore -- nr -- live --Perf -- C1oC2hu = {C1 ="" ; C1C2="/"; C2 ="h&"}; C1oC2n = { C1 = "" ; C1C2="/"; C2 ="n"}; C1oC2k = { C1 = "" ; C1C2="/"; C2 ="k"}; C1oC2sh = { C1 = "" ; C1C2="/"; C2 ="x"}; -C1oC2achehu = { C1 = "" ; C1C2 ="/"; C2 ="!ch&"}; C1oC2a = { C1 = "" ; C1C2="/"; C2 ="'"}; C1oC2ach = { C1 = "" ; C1C2="/"; C2 ="'c"}; C1oC2u = { C1 = "" ; C1C2="/"; C2 ="&"}; @@ -858,87 +785,12 @@ meC1oC2= {C1 ="m'" ; C1C2="/"; C2 =""}; C1uaC2i= {C1 ="" ; C1C2="7"; C2 ="#"}; - - - --nore -- nr -- live - --Perf -- - C1oC2hu = {C1 ="" ; C1C2="/"; C2 ="h&"}; - C1oC2n = { C1 = "" ; C1C2="/"; C2 ="n"}; - C1oC2k = { C1 = "" ; C1C2="/"; C2 ="k"}; - C1oC2sh = { C1 = "" ; C1C2="/"; C2 ="x"}; - C1oC2achehu = { C1 = "" ; C1C2 ="/"; C2 ="!ch&"}; - C1oC2a = { C1 = "" ; C1C2="/"; C2 ="'"}; - C1oC2ach = { C1 = "" ; C1C2="/"; C2 ="'c"}; - C1oC2u = { C1 = "" ; C1C2="/"; C2 ="&"}; - -- Imper -- mkV2nr - eC1oC2alehu = { C1 = "ä" ; C1C2="/"; C2 ="!l'h&"}; - enC1oC2alen = { C1 = "än" ; C1C2="/"; C2 ="!l'n"}; - teC1oC2yaleh = { C1 = "t" ; C1C2="/"; C2 ="!l'h"}; - teC1oC2alesh = { C1 = "t" ; C1C2="/"; C2 ="y!l'x"}; - teC1oC2alachehu = { C1 = "t" ; C1C2="/"; C2 ="!l!ch&"}; - yeC1oC2al = { C1 = "y" ; C1C2="/"; C2 ="!l"}; - teC1oC2alech = { C1 = "t" ; C1C2="/"; C2 ="!l'c"}; - yeC1oC2alu = { C1 = "y" ; C1C2="/"; C2 ="!l&"}; - - -- Imper -- mkV2nr - eC1oC2 = { C1 = "ä" ; C1C2="/"; C2 =""}; - enC1oC2 = { C1 = "än" ; C1C2="/"; C2 =""}; - teC1oC2 = { C1 = "t" ; C1C2="/"; C2 =""}; - teC1oC2i = { C1 = "t" ; C1C2="/"; C2 ="#"}; - teC1oC2u = { C1 = "t" ; C1C2="/"; C2 ="&"}; - yeC1oC2 = { C1 = "y" ; C1C2="/"; C2 =""}; - --teC1oC2 = { C1 = "t" ; C1C2="/"; C2 ="!l'c"}; - yeC1oC2u = { C1 = "y" ; C1C2="/"; C2 ="&"}; - - --Jus_Imperat mkV2nr - leC1uC2 = {C1 ="l" ; C1C2="&"; C2 =""}; - enC1uC2 = { C1 = "än" ; C1C2="&"; C2 =""}; - C1uC2 = { C1 = "" ; C1C2="&"; C2 =""}; - C1uC2i = { C1 = "" ; C1C2="&"; C2 ="#"}; - C1uC2u = { C1 = "" ; C1C2="&"; C2 ="&"}; - yC1uC2 = { C1 = "y" ; C1C2="&"; C2 =""}; - tC1uC2 = { C1 = "t" ; C1C2="&"; C2 =""}; - yC1uC2u = { C1 = "y" ; C1C2="&"; C2 ="&"}; - - - - --Gerund mkV2nr - C1oC2ie = {C1 ="" ; C1C2="/"; C2 ="%"}; - C1oC2en = { C1 = "" ; C1C2="/"; C2 ="'n"}; - C1oC2ek = { C1 = "" ; C1C2="/"; C2 ="'k"}; - C1oC2esh = { C1 = "" ; C1C2="/"; C2 ="'x"}; - C1oC2achehu = { C1 = "" ; C1C2="/"; C2 ="!ch&"}; - C1oC2o = { C1 = "" ; C1C2="/"; C2 ="/"}; - C1oC2A = { C1 = "" ; C1C2="/"; C2="!"}; - C1oC2ew = { C1 = "" ; C1C2="/"; C2="'w"}; - - --CompPer mkV2nr y!l'h& !l !l !l cX7l 7l l'c !l - C1oC2iealehu = {C1 ="" ; C1C2="/"; C2 ="%y!l'h& "}; - C1oC2enal = { C1 = "" ; C1C2="/"; C2 ="'n!l"}; - C1oC2ekal = { C1 = "" ; C1C2="/"; C2 ="'k!l"}; - C1oC2eshal = { C1 = "" ; C1C2="/"; C2 ="'x!l"}; - C1oC2achehual = { C1 = "" ; C1C2="/"; C2 ="!cX7l"}; - C1oC2oal = { C1 = "" ; C1C2="/"; C2 ="7l"}; - C1oC2Alech = { C1 = "" ; C1C2="/"; C2="!l'c"}; - C1oC2ewal = { C1 = "" ; C1C2="/"; C2="'w!l"}; - - --Infinitve mkV2nr - meC1oC2= {C1 ="m'" ; C1C2="/"; C2 =""}; - - --Participle mkV2nr - C1uaC2i= {C1 ="" ; C1C2="7"; C2 ="#"}; - - --mkV2wN -- wN -- swim --- Eg lie, see, say --Perf -- C1AC2ehu = {C1 ="" ; C1C2="!"; C2 ="'h&"}; C1AC2en = { C1 = "" ; C1C2="!"; C2 ="'n"}; C1AC2ek = { C1 = "" ; C1C2="!"; C2 ="'k"}; C1AC2esh = { C1 = "" ; C1C2="!"; C2 ="'x"}; ---C1AC2achehu = { C1 = "" ; C1C2 ="!"; C2 ="!ch&"}; ---C1AC2a = { C1 = "" ; C1C2="!"; C2 ="'"}; ---C1AC2ach = { C1 = "" ; C1C2="!"; C2 ="'c"}; ---C1AC2u = { C1 = "" ; C1C2="!"; C2 ="&"}; -- Imper -- mkV2wN eC1aC2alehu = { C1 = "ä" ; C1C2="!"; C2 ="!l'h&"}; enC1aC2alen = { C1 = "än" ; C1C2="!"; C2 ="!l'n"}; @@ -992,74 +844,6 @@ C1aC2tewal = { C1 = "" ; C1C2="!"; C2="t'w!l"}; meC1aC2et= {C1 ="m'" ; C1C2="!"; C2 ="'t"}; --nore -- nr -- live - - - --mkV2wN -- wN -- swim --- Eg lie, see, say - --Perf -- - C1AC2ehu = {C1 ="" ; C1C2="!"; C2 ="'h&"}; - C1AC2en = { C1 = "" ; C1C2="!"; C2 ="'n"}; - C1AC2ek = { C1 = "" ; C1C2="!"; C2 ="'k"}; - C1AC2esh = { C1 = "" ; C1C2="!"; C2 ="'x"}; - --C1AC2achehu = { C1 = "" ; C1C2 ="!"; C2 ="!ch&"}; - --C1AC2a = { C1 = "" ; C1C2="!"; C2 ="'"}; - --C1AC2ach = { C1 = "" ; C1C2="!"; C2 ="'c"}; - --C1AC2u = { C1 = "" ; C1C2="!"; C2 ="&"}; - -- Imper -- mkV2wN - eC1aC2alehu = { C1 = "ä" ; C1C2="!"; C2 ="!l'h&"}; - enC1aC2alen = { C1 = "än" ; C1C2="!"; C2 ="!l'n"}; - teC1aC2yaleh = { C1 = "t" ; C1C2="!"; C2 ="!l'h"}; - teC1aC2alesh = { C1 = "t" ; C1C2="!"; C2 ="y!l'x"}; - teC1aC2alachehu = { C1 = "t" ; C1C2="!"; C2 ="!l!ch&"}; - yeC1aC2al = { C1 = "y" ; C1C2="!"; C2 ="!l"}; - teC1aC2alech = { C1 = "t" ; C1C2="!"; C2 ="!l'c"}; - yeC1aC2alu = { C1 = "y" ; C1C2="!"; C2 ="!l&"}; - - -- Cont -- mkV2wN - eC1aC2 = { C1 = "ä" ; C1C2="!"; C2 =""}; - enC1aC2 = { C1 = "än" ; C1C2="!"; C2 =""}; - teC1aC2 = { C1 = "t" ; C1C2="!"; C2 =""}; - --teC1aC2 = { C1 = "t" ; C1C2="!"; C2 =""}; - teC1aC2u = { C1 = "t" ; C1C2="!"; C2 ="&"}; - yeC1aC2 = { C1 = "y" ; C1C2="!"; C2 =""}; - --teC1aC2 = { C1 = "t" ; C1C2="!"; C2 =""}; - yeC1aC2u = { C1 = "y" ; C1C2="!"; C2 ="&"}; - - --Jus_Imperat mkV2wN - --leC1aC2a = {C1 ="l" ; C1C2="!"; C2 =""}; - --enC1aC2a = { C1 = "än" ; C1C2="!"; C2 =""}; - --C1aC2 = { C1 = "" ; C1C2="!"; C2 =""}; - --C1aC2i = { C1 = "" ; C1C2="!"; C2 ="#"}; - --C1eC2u = { C1 = "" ; C1C2="!"; C2 ="&"}; - --yC1aC2a = { C1 = "y" ; C1C2="!"; C2 =""}; - --tC1aC2a = { C1 = "t" ; C1C2="!"; C2 =""}; - --yC1aC2u = { C1 = "y" ; C1C2="!"; C2 ="&"}; - --Gerund mkV2wN - C1aC2cie = {C1 ="" ; C1C2="!"; C2 ="c%"}; - C1aC2ten = { C1 = "" ; C1C2="!"; C2 ="t'n"}; - C1aC2tek = { C1 = "" ; C1C2="!"; C2 ="t'k"}; - C1aC2tesh = { C1 = "" ; C1C2="!"; C2 ="t'x"}; - C1aC2tachehu = { C1 = "" ; C1C2="!"; C2 ="t!ch&"}; - C1aC2to = { C1 = "" ; C1C2="!"; C2 ="t/"}; - C1aC2ta = { C1 = "" ; C1C2="!"; C2="t!"}; - C1aC2tew = { C1 = "" ; C1C2="!"; C2="t'w"}; - - --ComPer mkV2wN y!l'h& !l !l !l cX7l 7l l'c !l - C1aC2ciealehu = {C1 ="" ; C1C2="!"; C2 ="c%y!l'h&"}; - C1aC2tenal = { C1 = "" ; C1C2="!"; C2 ="t'n!l"}; - C1aC2tekal = { C1 = "" ; C1C2="!"; C2 ="t'k!l"}; - C1aC2teshal = { C1 = "" ; C1C2="!"; C2 ="t'x!l"}; - C1aC2tachehual = { C1 = "" ; C1C2="!"; C2 ="t!cX7l"}; - C1aC2toal = { C1 = "" ; C1C2="!"; C2 ="t7l"}; - C1aC2talech = { C1 = "" ; C1C2="!"; C2="t!l'c"}; - C1aC2tewal = { C1 = "" ; C1C2="!"; C2="t'w!l"}; - - --Infinitve mkV2wN - meC1aC2et= {C1 ="m'" ; C1C2="!"; C2 ="'t"}; - --nore -- nr -- live - - - - ----------- This much is enough for the duo-radicals--- --There are few verbs still remaining like the case of shete, hede , --washe, aye, ale , all need unique froms for them selves. I will get --back here later!! @@ -1109,63 +893,8 @@ tC1eC2 = { C1 = "t" ; C1C2=""; C2 =""}; meC1C2et= {C1 ="m'" ; C1C2=""; C2 ="'t"}; - - - - ----------- This much is enough for the duo-radicals--- - --There are few verbs still remaining like the case of shete, hede , --washe, aye, ale , all need unique froms for them selves. I will get --back here later!! - - --seTe -- st -- give - --Perf -- - C1eC2hu = {C1 ="" ; C1C2="'"; C2 ="'h&"}; - C1eC2n = { C1 = "" ; C1C2="'"; C2 ="'n"}; - C1eC2k = { C1 = "" ; C1C2="'"; C2 ="'k"}; - C1eC2sh = { C1 = "" ; C1C2="'"; C2 ="'x"}; - C1eC2achehu = { C1 = "" ; C1C2 ="'"; C2 ="'ch&"}; - C1eC2a = { C1 = "" ; C1C2="'"; C2 ="'"}; - C1eC2ach = { C1 = "" ; C1C2="'"; C2 ="'c"}; - --C1eC2u = { C1 = "" ; C1C2="'"; C2 ="&"}; same as C1aC2u (bela) - -- Imper -- mkV2sT - --eC1eC2alehu = { C1 = "ä" ; C1C2="'"; C2 ="!l'h&"}; eC1aC2alehu - --enC1eC2alen = { C1 = "än" ; C1C2="'"; C2 ="!l'n"};enC1aC2alen - --teC1eC2yaleh = { C1 = "t" ; C1C2="'"; C2 ="!l'h"};teC1aC2yaleh - --teC1eC2aleh = { C1 = "t" ; C1C2="'"; C2 ="y!l'x"};teC1aC2aleh - --teC1eC2alachehu = { C1 = "t" ; C1C2="'"; C2 ="!l!ch&"};teC1aC2alachehu - --yeC1eC2al = { C1 = "y" ; C1C2="'"; C2 ="!l"};yeC1aC2al - --teC1eC2alech = { C1 = "t" ; C1C2="'"; C2 ="!l'c"};teC1aC2alech - --yeC1eC2alu = { C1 = "y" ; C1C2="'"; C2 ="!l&"};yeC1aC2alu - - --Jus_Imperat mkV2sT - - leC1eC2 = {C1 ="l" ; C1C2=""; C2 =""}; - enC1eC2 = { C1 = "än" ; C1C2=""; C2 =""}; - C1C2 = { C1 = "" ; C1C2=""; C2 =""}; - C1eC2i = { C1 = "" ; C1C2=""; C2 ="#"}; - --C1eC2u = { C1 = "" ; C1C2=""; C2 ="&"}; C1C2u - yC1eC2 = { C1 = "y" ; C1C2=""; C2 =""}; - tC1eC2 = { C1 = "t" ; C1C2=""; C2 =""}; - --yC1eC2u = { C1 = "y" ; C1C2=""; C2 ="&"};yC1C2u - - - --Gerund mkV2sT - - --C1eC2ie = {C1 ="" ; C1C2="'"; C2 ="c%"}; C1aC2cie - --C1eC2en = { C1 = "" ; C1C2="'"; C2 ="'n"};C1aC2ten - --C1eC2ek = { C1 = "" ; C1C2="'"; C2 ="'k"}; C1aC2tek - --C1eC2esh = { C1 = "" ; C1C2="'"; C2 ="'x"}; C1aC2tesh - --C1eC2achehu = { C1 = "" ; C1C2="'"; C2 ="!ch&"};C1aC2tachehu - --C1eC2o = { C1 = "" ; C1C2="'"; C2 ="/"};C1aC2to - --C1eC2A = { C1 = "" ; C1C2="'"; C2="!"};C1aC2ta - --C1eC2ew = { C1 = "" ; C1C2="'"; C2="'w"}; C1aC2tew - --Infinitve mkV2sT - meC1C2et= {C1 ="m'" ; C1C2=""; C2 ="'t"}; - - - - ---- Quadro_Radical - --Starting with type Tri-Radical Roots -- Eg. dbdb - fight -- qzqz - freeze @@ -1238,152 +967,4 @@ meC1aC2C3aC4 = {C1 ="m'" ; C1C2="'"; C2C3 =""; C3C4="'"; C4= "" }; --Participle mkV4dbdb C1eC2C3aC4i = {C1 ="" ; C1C2="'"; C2C3 =""; C3C4="!"; C4= "#" }; - - ---- Quadro_Radical - - - --Starting with type Tri-Radical Roots - -- Eg. dbdb - fight - -- qzqz - freeze - -- wrwr - throw - -- tnfs - breath - - --Perf -- - C1aC2aC3aC4hu = {C1 ="" ; C1C2="'"; C2C3 ="'"; C3C4="'"; C4= "h&" }; - C1aC2aC3aC4n = { C1 = "" ; C1C2="'"; C2C3 ="'"; C3C4="'"; C4= "n" }; - C1aC2aC3aC4k = { C1 = "" ; C1C2="'"; C2C3 ="'"; C3C4="'"; C4= "k" }; - C1aC2aC3aC4sh = { C1 = "" ; C1C2="'"; C2C3 ="'"; C3C4="'"; C4= "x" }; - C1aC2aC3aC4achehu = { C1 = "" ; C1C2="'"; C2C3 ="'"; C3C4="'"; C4= "!ch&" }; - C1aC2aC3aC4a = { C1 = "" ; C1C2="'"; C2C3 ="'"; C3C4="'"; C4= "'" }; - C1aC2aC3aC4ech = { C1 = "" ; C1C2="'"; C2C3 ="'"; C3C4="'"; C4= "'c" }; - C1aC2aC3aC4u = { C1 = "" ; C1C2="'"; C2C3 ="'"; C3C4="'"; C4= "&" }; - --Imper --mkV4dbdb - eC1aC2aC3C4alehu = { C1 = "ä" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "!l'h&" }; - enC1aC2aC3C4alen = { C1 = "än" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "!l'n" }; - teC1aC2aC3C4yaleh = { C1 = "t" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "!l'h" }; - teC1aC2aC3C4aleh = { C1 = "t" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "y!l'x" }; - teC1aC2aC3C4alachehu = { C1 = "t" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "!l!ch&" }; - yeC1aC2aC3C4al = { C1 = "y" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "!l" }; - teC1aC2aC3C4alech = { C1 = "t" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "!l'c" }; - yeC1aC2aC3C4alu = { C1 = "y" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "!l&" }; - - --Cont --mkV4dbdb - eC1aC2aC3C4 = { C1 = "ä" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "" }; - enC1aC2aC3C4 = { C1 = "än" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "" }; - teC1aC2aC3C4 = { C1 = "t" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "" }; - teC1aC2aC3C4i = { C1 = "t" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "#" }; - teC1aC2aC3C4u = { C1 = "t" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "&" }; - yeC1aC2aC3C4 = { C1 = "y" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "" }; - --teC1aC2aC3C4 = { C1 = "t" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "" }; - yeC1aC2aC3C4u = { C1 = "y" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "&" }; - - - - --Jus_Imperat mkV4dbdb - leC1aC2C3C4 = {C1 ="l" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "" }; - enC1aC2C3C4 = { C1 = "än" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "" }; - C1aC2C3C4 = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "" }; - C1aC2C3C4i = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "#" }; - C1aC2C3C4u = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "&" }; - yC1aC2C3C4 = { C1 = "y" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "" }; - tC1aC2C3C4 = { C1 = "t" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "" }; - yC1aC2C3C4u = { C1 = "y" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "&" }; - --Gerund mkV4dbdb - C1aC2C3C4ie = {C1 ="" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "%" }; - C1aC2C3C4en = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "'n" }; - C1aC2C3C4ek = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "'k" }; - C1aC2C3C4esh = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "'x" }; - C1aC2C3C4achehu = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "!ch&" }; - C1aC2C3C4o = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "/" }; - C1aC2C3C4a = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "!" }; - C1aC2C3C4ew = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "'w" }; - - --CompPerf mkV4dbdb y!l'h& !l !l !l cX7l 7l l'c !l - C1aC2C3C4iealehu = {C1 ="" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "%y!l'h&" }; - C1aC2C3C4enal = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "'n!l" }; - C1aC2C3C4ekal = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "'k!l" }; - C1aC2C3C4eshal = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "'x!l" }; - C1aC2C3C4achehual = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "!cX7l" }; - C1aC2C3C4oal = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "7l" }; - C1aC2C3C4alech = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "!l'c" }; - C1aC2C3C4ewal = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "'w!l" }; - - --Infinitve mkV4dbdb - meC1aC2C3aC4 = {C1 ="m'" ; C1C2="'"; C2C3 =""; C3C4="'"; C4= "" }; - - --Participle mkV4dbdb - C1eC2C3aC4i = {C1 ="" ; C1C2="'"; C2C3 =""; C3C4="!"; C4= "#" }; - - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -{- -resource PatternsAmh = { - -flags coding=utf8 ; - - oper ---perf -C1aC2aC3ku = {C1 ="" ; C1C2="ኧ"; C2C3 ="ኧ"; C3="ኩ"}; -C1aC2aC3n = { C1 = "" ; C1C2="ኧ"; C2C3 ="ኧ"; C3="ን"}; -C1aC2aC3k = { C1 = "" ; C1C2="ኧ"; C2C3 ="ኧ"; C3="ክ"}; -C1aC2aC3sh = { C1 = "" ; C1C2="ኧ"; C2C3 ="ኧ"; C3="ሽ"}; -C1aC2aC3achehu = { C1 = "" ; C1C2="ኧ"; C2C3 ="ኧ"; C3="አችሁ"}; -C1aC2aC3e = { C1 = "" ; C1C2="ኧ"; C2C3 ="ኧ"; C3="ኧ"}; -C1aC2aC3ech = { C1 = "" ; C1C2="ኧ"; C2C3 ="ኧ"; C3="ኧች"}; -C1aC2aC3u = { C1 = "" ; C1C2="ኧ"; C2C3 ="ኧ"; C3="ኡ"}; - ---imper -eC1aC2C3alehu = { C1 = "እ" ; C1C2="ኧ"; C2C3 =""; C3="አለሁ"}; -enC1aC2C3alen = { C1 = "እን" ; C1C2="ኧ"; C2C3 =""; C3="አለን"}; -teC1aC2C3yaleh = { C1 = "ት" ; C1C2="ኧ"; C2C3 =""; C3="አለህ"}; -teC1aC2C3aleh = { C1 = "ት" ; C1C2="ኧ"; C2C3 =""; C3="ያለሽ"}; -teC1aC2C3alachehu = { C1 = "ት" ; C1C2="ኧ"; C2C3 =""; C3="አላችሁ"}; -yeC1aC2C3al = { C1 = "ይ" ; C1C2="ኧ"; C2C3 =""; C3="አል"}; -teC1aC2C3alech = { C1 = "ት" ; C1C2="ኧ"; C2C3 =""; C3="አለች"}; -yeC1aC2C3alu = { C1 = "ይ" ; C1C2="ኧ"; C2C3 =""; C3="አሉ"}; - - -} --} - - - - - diff --git a/src/amharic/PhraseAmh.gf b/src/amharic/PhraseAmh.gf index 5eae3093..d3f62cc4 100644 --- a/src/amharic/PhraseAmh.gf +++ b/src/amharic/PhraseAmh.gf @@ -22,12 +22,9 @@ concrete PhraseAmh of Phrase = CatAmh ** open UttIP ip = ip ; --- Acc also UttVP vp = {s = vp.obj.s ++ vp.inf} ; UttIAdv iadv = iadv ; - UttCN n = {s = n.s ! Sg ! Indef!Nom} ; - UttCard n = {s = n.s ! Masc!Sg!Indef!Nom} ; UttImpSg pol imp = {s = pol.s ++ imp.s!pol.p!Masc!Sg}; UttImpPl pol imp = {s = pol.s ++ imp.s ! pol.p! Masc! Pl} ; --- TO DO UttImpPol pol imp = {s = pol.s ++ imp.s ! pol.p ! Masc!Pl} ; -- TO DO --- - UttQS qs = {s = qs.s } ; -- TO DO {- PConjConj conj = {s = conj.s2} ; --- diff --git a/src/common/ExtendFunctor.gf b/src/common/ExtendFunctor.gf index fdcb7dc8..845cb64c 100644 --- a/src/common/ExtendFunctor.gf +++ b/src/common/ExtendFunctor.gf @@ -139,9 +139,6 @@ lin SubjunctRelCN cn rs = RelCN cn rs ; -- no difference from indicative -lincat - X = {s : Str} ; - lin UseComp_estar = UseComp ; UseComp_ser = UseComp ; diff --git a/src/greek/ResGre.gf b/src/greek/ResGre.gf index 7a8a26cd..9e8b12e1 100644 --- a/src/greek/ResGre.gf +++ b/src/greek/ResGre.gf @@ -670,31 +670,6 @@ resource ResGre = ParamX ** open Prelude in { g = g } ; - - mkNoun_anthropos : (s1,_ : Str) -> Gender -> Noun = - \anthropos, anthropon, g -> - let - anthrop = Predef.tk 2 anthropos ; - anthrOp = Predef.tk 2 anthropon ; - in { - s = table { - Sg => table { - Nom => anthropos ; - Gen|CPrep P_Dat => anthrOp + "ου" ; - Acc |CPrep P_se |CPrep PNul => anthrop + "ο"; - Vocative => anthrop + "ε" - } ; - Pl => table { - Nom | Vocative=> anthrop + "οι" ; - Gen |CPrep P_Dat=> anthropon ; - Acc |CPrep P_se |CPrep PNul => anthrOp + "ους" - } - } ; - g = g - } ; - - - ----------------Neuter nouns in -ς , with stress movement,syllabic augmentation, irregular (φως, γεγονός, ημίφως) -------------- mkNoun_fws: (s1,_ : Str) -> Gender -> Noun = \fws, fwtos, g -> diff --git a/src/hebrew/PatternsHeb.gf b/src/hebrew/PatternsHeb.gf index 2c5ca77b..b696c7a8 100644 --- a/src/hebrew/PatternsHeb.gf +++ b/src/hebrew/PatternsHeb.gf @@ -72,9 +72,7 @@ taC1C2eC3o = { C1 = "ת" ; C1C2=""; C2C3 =""; C3="ו"}; taC1C2aC3nah = { C1 = "ת" ; C1C2=""; C2C3 =""; C3="נה"}; yaC1C2aC3 = { C1 = "י" ; C1C2=""; C2C3 =""; C3=""}; -taC1C2aC3 = { C1 = "ת" ; C1C2=""; C2C3 =""; C3=""}; yaC1C2aC3u = { C1 = "י" ; C1C2=""; C2C3 =""; C3="ו"}; -taC1C2aC3nah = { C1 = "ת" ; C1C2=""; C2C3 =""; C3="נה"}; C1uC2aC3 = { C1 = "" ; C1C2="ו"; C2C3 =""; C3=""}; diff --git a/src/mongolian/ExtraMon.gf b/src/mongolian/ExtraMon.gf index 54671ec8..ab517734 100644 --- a/src/mongolian/ExtraMon.gf +++ b/src/mongolian/ExtraMon.gf @@ -742,10 +742,8 @@ met_CAdv = lin CAdv {s = " мэт" ; c2 = noPrep Nom} ; meterhueue_CAdv = lin CAdv {s = " мэтэрхүү" ; c2 = noPrep Nom} ; net_CAdv = lin CAdv {s = " нэт" ; c2 = noPrep Nom} ; shig_CAdv = lin CAdv {s = " шиг" ; c2 = noPrep Nom} ; -shig_CAdv = lin CAdv {s = " шиг" ; c2 = noPrep Nom} ; atlaa_Conj = mkConj "атлаа" ; ba_Conj = mkConj "ба" ; -ba_Conj = mkConj "ба" ; bas_Conj = mkConj "бас" ; boegoeoed_Conj = mkConj "бөгөөд" ; boegoeoetoel_Conj = mkConj "бөгөөтөл" ; diff --git a/src/mongolian/ResMon.gf b/src/mongolian/ResMon.gf index b4391e21..435713a0 100644 --- a/src/mongolian/ResMon.gf +++ b/src/mongolian/ResMon.gf @@ -86,7 +86,6 @@ oper hlaar4 : Suffix = \\vt => "хл" + aa4!vt + "р" ; haar4 : Suffix = \\vt => "х" + aa4!vt + "р" ; tal4 : Suffix = \\vt => "т" + a4!vt + "л" ; - saar4 : Suffix = \\vt => "с" + aa4!vt + "р" ; nguut2 : Suffix = table {MascA | MascO => "нгуут" ; FemE | FemOE => "нгүүт"} ; ngaa4 : Suffix = \\vt => "нг" + aa4!vt ; aad4 : Suffix = \\vt => aa4!vt + "д" ; diff --git a/src/morphodict/MorphoDictAra.gf b/src/morphodict/MorphoDictAra.gf index a94708a7..3d77aae4 100644 --- a/src/morphodict/MorphoDictAra.gf +++ b/src/morphodict/MorphoDictAra.gf @@ -16,10 +16,8 @@ oper 'إِرْهابِي_N' = wmkN { g = masc ; sg = "إِرْهابِي" } ; oper 'عَاصِمَة_N' = wmkN { g = fem ; pl = "عَوَاصِم" ; root = "عصم" ; sg = "عَاصِمَة" } ; oper 'رِعايَة_N' = wmkN { g = fem ; root = "رعي" ; sg = "رِعايَة" } ; oper 'طِفْل_N' = wmkN { g = masc ; pl = "أَطْفَال" ; root = "طفل" ; sg = "طِفْل" } ; -oper 'طِفْل_N' = wmkN { g = masc ; pl = "أَطْفَال" ; root = "طفل" ; sg = "طِفْل" } ; oper 'مَدِينَة_N' = wmkN { g = fem ; pl = "مُدُن" ; root = "مدن" ; sg = "مَدِينَة" } ; oper 'دَوْلَة_N' = wmkN { g = fem ; pl = "دُوَل" ; sg = "دَوْلَة" } ; -oper 'دَوْلَة_N' = wmkN { g = fem ; pl = "دُوَل" ; sg = "دَوْلَة" } ; oper 'ثَقَافَة_N' = wmkN { g = fem ; pl = "ثَقَافَات" ; root = "ثقف" ; sg = "ثَقَافَة" } ; oper 'اِنْخِفَاض_N' = wmkN { g = masc ; pl = "اِنْخِفَاضَات" ; sg = "اِنْخِفَاض" } ; oper 'تَوْزِيع_N' = wmkN { g = masc ; sg = "تَوْزِيع" } ; @@ -65,15 +63,11 @@ oper 'فُنْدُق_N' = wmkN { g = masc ; pl = "فَنَادِق" ; sg = "فُ oper 'فِهْرِس_N' = wmkN { g = masc ; pl = "فَهَارِس" ; sg = "فِهْرِس" } ; oper 'تَضَخُّم_N' = wmkN { g = masc ; root = "ضخم" ; sg = "تَضَخُّم" } ; oper 'مَوْضِع_N' = wmkN { g = masc ; pl = "مَوَاضِع" ; root = "وضع" ; sg = "مَوْضِع" } ; -oper 'رَئِيس_N' = wmkN { g = masc ; pl = "رُؤَسَاء" ; root = "رءس" ; sg = "رَئِيس" } ; -oper 'رَئِيس_N' = wmkN { g = masc ; pl = "رُؤَسَاء" ; root = "رءس" ; sg = "رَئِيس" } ; oper 'مُنْتَج_N' = wmkN { g = masc ; pl = "مُنْتَجَات" ; sg = "مُنْتَج" } ; oper 'مَلِكَة_N' = wmkN { g = fem ; pl = "مَلِكَات" ; sg = "مَلِكَة" } ; oper 'مُعَدَّل_N' = wmkN { g = masc ; root = "عدل" ; sg = "مُعَدَّل" } ; -oper 'مُعَدَّل_N' = wmkN { g = masc ; root = "عدل" ; sg = "مُعَدَّل" } ; oper 'مَاء_N' = wmkN { g = masc ; pl = "مِيَاه" ; root = "موه" ; sg = "مَاء" } ; oper 'عَالَم_N' = wmkN { g = masc ; pl = "عَالَمُون" ; sg = "عَالَم" } ; -oper 'عَالَم_N' = wmkN { g = masc ; pl = "عَالَمُون" ; sg = "عَالَم" } ; oper 'مَنْطِقَة_N' = wmkN { g = fem ; pl = "مَنْطِقَات" ; root = "نطق" ; sg = "مَنْطِقَة" } ; oper 'كِتَاب_N' = wmkN { g = masc ; pl = "كُتُب" ; sg = "كِتَاب" } ; oper 'عُمْلَة_N' = wmkN { g = fem ; pl = "عُمْلَات" ; root = "عمل" ; sg = "عُمْلَة" } ; @@ -82,7 +76,6 @@ oper 'شَرْق_N' = wmkN { g = masc ; sg = "شَرْق" } ; oper 'رَأْس_N' = wmkN { g = masc ; pl = "رُؤُوس" ; sg = "رَأْس" } ; oper 'سُكّان_N' = wmkN { g = fem ; sg = "سُكّان" } ; oper 'مَلَكِيَّة_N' = wmkN { g = fem ; pl = "مَلَكِيَّات" ; root = "ملك" ; sg = "مَلَكِيَّة" } ; -oper 'سُكّان_N' = wmkN { g = fem ; sg = "سُكّان" } ; oper 'جُمْهُورِيَّة_N' = wmkN { g = fem ; pl = "جُمْهُورِيَّات" ; sg = "جُمْهُورِيَّة" } ; oper 'رُوسِيَّة_N' = wmkN { g = fem ; pl = "رُوسِيَّات" ; sg = "رُوسِيَّة" } ; oper 'جَنُوب_N' = wmkN { g = masc ; root = "جنب" ; sg = "جَنُوب" } ; @@ -126,7 +119,6 @@ oper 'عَرَبِي_A' = wmkA { fem_pl = "عَرَبِيَّات" ; fem_sg = " oper 'حُر_A' = wmkA { fem_pl = "حُرَّات" ; fem_sg = "حُرَّة" ; masc_pl = "أَحْرَار" ; masc_sg = "حُر" ; root = "حرر" } ; oper 'هَجِين_A' = wmkA { fem_pl = "هَجَائِن" ; fem_sg = "هَجِين" ; masc_pl = "هِجَان" ; masc_sg = "هَجِين" ; root = "هجن" } ; oper 'رَسْمِي_A' = wmkA { fem_pl = "رَسْمِيَّات" ; fem_sg = "رَسْمِيَّة" ; masc_pl = "رَسْمِيُّون" ; masc_sg = "رَسْمِي" } ; -oper 'رَسْمِي_A' = wmkA { fem_pl = "رَسْمِيَّات" ; fem_sg = "رَسْمِيَّة" ; masc_pl = "رَسْمِيُّون" ; masc_sg = "رَسْمِي" } ; oper 'أُرْثُوذُكْسِيَّة_A' = wmkA { fem_sg = "nan" ; masc_sg = "nan" } ; oper 'مُرَبَّع_A' = wmkA { fem_pl = "مُرَبَّعَات" ; fem_sg = "مُرَبَّعَة" ; masc_pl = "مُرَبَّعُون" ; masc_sg = "مُرَبَّع" } ; oper 'مُسْلِم_A' = wmkA { fem_pl = "مُسْلِمَات" ; fem_sg = "مُسْلِمَة" ; masc_pl = "مُسْلِمُون" ; masc_sg = "مُسْلِم" ; root = "سلم" } ; diff --git a/src/polish/CatPol.gf b/src/polish/CatPol.gf index cf29fa91..c7767cfb 100644 --- a/src/polish/CatPol.gf +++ b/src/polish/CatPol.gf @@ -107,8 +107,6 @@ concrete CatPol of Cat = CommonX - [CAdv] ** open ResPol, Prelude, (R = ParamX) VP = VerbPhrase; Comp = { s: GenNum => Str }; - Ord = { s : AForm => Str }; - A = Adj; A2 = Adj ** { c : Complement }; diff --git a/src/rukiga/PhraseCgg.gf b/src/rukiga/PhraseCgg.gf index 72f19571..66b7e8ee 100644 --- a/src/rukiga/PhraseCgg.gf +++ b/src/rukiga/PhraseCgg.gf @@ -30,8 +30,6 @@ lin } }; UttImpPol = UttImpPl; - --UttAdv : Adv -> Utt ; -- here - UttAdv adv = {s= adv.s}; -- better but can be improved upon UttVP vp = case of { diff --git a/src/russian/ParadigmsRus.gf b/src/russian/ParadigmsRus.gf index fa1efe6b..5a676b19 100644 --- a/src/russian/ParadigmsRus.gf +++ b/src/russian/ParadigmsRus.gf @@ -393,8 +393,6 @@ oper = \word, g, anim, zi, rel, p -> lin N2 (mkFun (noMinorCases (Z.makeNoun word g anim rel AdjType (Z.parseIndex zi))) p) ; } ; - nullPrep : Prep = lin Prep {s=[] ; c=Gen ; neggen=False ; hasPrep=False} ; - mkN3 = overload { mkN3 : N -> Prep -> Prep -> N3 = \n, p2, p3 -> lin N3 (mkFun2 n p2 p3) ; diff --git a/src/spanish/ExtendSpa.gf b/src/spanish/ExtendSpa.gf index 7c9e1e5a..c98388ba 100644 --- a/src/spanish/ExtendSpa.gf +++ b/src/spanish/ExtendSpa.gf @@ -125,10 +125,4 @@ oper comp = \\a => vps.comp ! a ++ (let agr = complAgr a in vps.s.s ! VPart agr.g agr.n) ++ agent ; } ; -lin ExistsNP np = - mkClause [] True False np.a - (insertComplement (\\_ => (np.s ! Nom).ton) - (predV (mkV "existir"))) ; - - } ;