From 8613a7892955ca97a6377a98e05f2f564945346d Mon Sep 17 00:00:00 2001 From: aarneranta Date: Fri, 20 Dec 2024 11:17:11 +0100 Subject: [PATCH 1/6] changed a runtime + to BIND in Amharic --- src/amharic/ResAmh.gf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/amharic/ResAmh.gf b/src/amharic/ResAmh.gf index b21ec291..0195ae06 100644 --- a/src/amharic/ResAmh.gf +++ b/src/amharic/ResAmh.gf @@ -995,8 +995,8 @@ pronNP : (N,A,G,D : Str) -> PerNumGen -> NP = \N,A,G,D,png-> { { s = \\c =>case c of { - Gen|Dat => affix!c + word; - _ => word + affix!c + Gen|Dat => affix!c ++ Predef.BIND ++ word; + _ => word ++ Predef.BIND ++ affix!c }; a = {png = Per3 n Masc ; isPron = False }; lock_NP = <> From 66b5e4108f63db0c2061e2acc5762b8da4c922af Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Fri, 24 Jan 2025 14:44:35 +0100 Subject: [PATCH 2/6] add empty file for MorphoDictChi (TODO populate from WN) --- src/morphodict/MorphoDictChi.gf | 7 +++++++ src/morphodict/MorphoDictChiAbs.gf | 3 +++ 2 files changed, 10 insertions(+) create mode 100644 src/morphodict/MorphoDictChi.gf create mode 100644 src/morphodict/MorphoDictChiAbs.gf diff --git a/src/morphodict/MorphoDictChi.gf b/src/morphodict/MorphoDictChi.gf new file mode 100644 index 00000000..6dbea5e6 --- /dev/null +++ b/src/morphodict/MorphoDictChi.gf @@ -0,0 +1,7 @@ +--# -path=.:alltenses +concrete MorphoDictChi of MorphoDictChiAbs = +CatChi [N,A,V,Adv,Prep] ** +open +ParadigmsChi +in +{} \ No newline at end of file diff --git a/src/morphodict/MorphoDictChiAbs.gf b/src/morphodict/MorphoDictChiAbs.gf new file mode 100644 index 00000000..f2b4aee6 --- /dev/null +++ b/src/morphodict/MorphoDictChiAbs.gf @@ -0,0 +1,3 @@ +abstract MorphoDictChiAbs = + Cat [N,A,V,Adv,Prep] ** +{} From 70e41e47a79bcc0610bb81ad92589e8457f60cf4 Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Fri, 24 Jan 2025 14:57:46 +0100 Subject: [PATCH 3/6] remove redundant lincat Interj (inherited from CommonX) --- src/albanian/CatSqi.gf | 1 - src/kazakh/CatKaz.gf | 1 - 2 files changed, 2 deletions(-) diff --git a/src/albanian/CatSqi.gf b/src/albanian/CatSqi.gf index dee0df43..8cc39528 100644 --- a/src/albanian/CatSqi.gf +++ b/src/albanian/CatSqi.gf @@ -9,7 +9,6 @@ lincat V, VA, VV, VS, VQ = Verb ; lincat V2, V2S, V2Q = Verb ** {c2 : Compl} ; lincat V3, V2A, V2V = Verb ** {c2,c3 : Compl} ; lincat Prep = Compl ; -lincat Interj = {s : Str} ; lincat Voc = {s : Str} ; lincat Numeral = {s : Str} ; diff --git a/src/kazakh/CatKaz.gf b/src/kazakh/CatKaz.gf index edc13811..fdc021bb 100644 --- a/src/kazakh/CatKaz.gf +++ b/src/kazakh/CatKaz.gf @@ -9,7 +9,6 @@ lincat V3, V2A, V2V = Verb ** {c2,c3 : Compl} ; lincat A = {s : Str} ; lincat A2 = A ** {c2 : Compl} ; lincat Prep = Compl ; -lincat Interj = {s : Str} ; lincat Voc = {s : Str} ; } From 08793614ab3ea4fb6dcbbda4fb31856edb3662b2 Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Fri, 24 Jan 2025 15:08:17 +0100 Subject: [PATCH 4/6] also remove redundant lincats Voc,PConj,Phr,Utt from Sqi --- src/albanian/CatSqi.gf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/albanian/CatSqi.gf b/src/albanian/CatSqi.gf index 8cc39528..b029edc3 100644 --- a/src/albanian/CatSqi.gf +++ b/src/albanian/CatSqi.gf @@ -9,7 +9,6 @@ lincat V, VA, VV, VS, VQ = Verb ; lincat V2, V2S, V2Q = Verb ** {c2 : Compl} ; lincat V3, V2A, V2V = Verb ** {c2,c3 : Compl} ; lincat Prep = Compl ; -lincat Voc = {s : Str} ; lincat Numeral = {s : Str} ; lincat Digits = {s : Str; n : Number; tail : DTail} ; @@ -23,7 +22,4 @@ lincat Det = {s : Case => Gender => Str; spec : Species; n : Number} ; lincat NP = {s: Case => Str; a : Agr} ; lincat Pron = {s: Case => Str; acc_clit, dat_clit : Str; a : Agr} ; -lincat PConj = {s : Str} ; -lincat Phr, Utt = {s : Str} ; - } From 33bd050b7a6d998aefbf1fa8ece9f4f32041c024 Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Fri, 24 Jan 2025 15:09:18 +0100 Subject: [PATCH 5/6] also remove lincat Voc from Kaz --- src/kazakh/CatKaz.gf | 1 - 1 file changed, 1 deletion(-) diff --git a/src/kazakh/CatKaz.gf b/src/kazakh/CatKaz.gf index fdc021bb..aa9f2ac2 100644 --- a/src/kazakh/CatKaz.gf +++ b/src/kazakh/CatKaz.gf @@ -9,6 +9,5 @@ lincat V3, V2A, V2V = Verb ** {c2,c3 : Compl} ; lincat A = {s : Str} ; lincat A2 = A ** {c2 : Compl} ; lincat Prep = Compl ; -lincat Voc = {s : Str} ; } From 6876b79d43bfd6daf5a03b5a72d5f74cd5236658 Mon Sep 17 00:00:00 2001 From: Aarne Ranta Date: Sun, 2 Feb 2025 15:32:17 +0100 Subject: [PATCH 6/6] added MarkupFre to LangFre --- src/french/LangFre.gf | 1 + 1 file changed, 1 insertion(+) diff --git a/src/french/LangFre.gf b/src/french/LangFre.gf index 97046240..041fe57d 100644 --- a/src/french/LangFre.gf +++ b/src/french/LangFre.gf @@ -3,6 +3,7 @@ concrete LangFre of Lang = GrammarFre, LexiconFre + ,MarkupFre - [stringMark] ,DocumentationFre --# notpresent ,ConstructionFre ** {