diff --git a/examples-3.0/tutorial/semantics/Base.gf b/examples-3.0/tutorial/semantics/Base.gf index 4586c3106..85868d7ac 100644 --- a/examples-3.0/tutorial/semantics/Base.gf +++ b/examples-3.0/tutorial/semantics/Base.gf @@ -30,7 +30,7 @@ fun -- lexicon - UseInt : Int -> PN ; + UseInt : Int -> PN ; Number : CN ; Even, Odd, Prime : AP ; diff --git a/lib/resource-1.4/Make.hs b/lib/resource-1.4/Make.hs index fff30cf80..61d1901d3 100644 --- a/lib/resource-1.4/Make.hs +++ b/lib/resource-1.4/Make.hs @@ -36,7 +36,7 @@ langsAPI = langsLang `except` ["Bul","Cat","Hin","Ina","Rus","Tha"] langsMath = langsAPI -- languages for which to run treebank test -langsTest = langsLang `except` ["Cat","Hin","Spa","Tha"] +langsTest = langsLang `except` ["Bul","Cat","Hin","Rus","Spa","Tha"] -- languages for which langs.pgf is built langsPGF = langsTest `only` ["Eng","Fre","Swe"] diff --git a/lib/resource-1.4/Makefile b/lib/resource-1.4/Makefile index a1160d995..c15db69a3 100644 --- a/lib/resource-1.4/Makefile +++ b/lib/resource-1.4/Makefile @@ -7,10 +7,17 @@ present: $(RUNMAKE) present lang $(RUNMAKE) present api -alltenses: +alltenses: lang api + +lang: $(RUNMAKE) lang + +api: $(RUNMAKE) api +math: + $(RUNMAKE) math + test: $(RUNMAKE) test diff --git a/lib/resource-1.4/danish/LexiconDan.gf b/lib/resource-1.4/danish/LexiconDan.gf index 11a47a78b..a9c5e350b 100644 --- a/lib/resource-1.4/danish/LexiconDan.gf +++ b/lib/resource-1.4/danish/LexiconDan.gf @@ -102,6 +102,7 @@ lin important_A = regADeg "vigtig" ; industry_N = mk2N "industri" "industrien" ; iron_N = mk2N "jern" "jernet" ; + john_PN = mkPN "John" utrum ; king_N = mk2N "konge" "kongen" ; know_V2 = dirV2 vide_V ; lake_N = mk2N "sø" "søen" ; @@ -354,6 +355,11 @@ lin language_N = mk2N "sprog" "sproget" ; rule_N = mkN "regel" "regeln" "regler" "reglerne" ; +---- question_N = regN "fråga" ; +---- ready_A = regA "färdig" ; +---- reason_N = regN "anledning" ; + today_Adv = mkAdv "idag" ; +---- uncertain_A = mk3A "osäker" "osäkert" "osäkra" ; } ; diff --git a/lib/resource-1.4/italian/LexiconIta.gf b/lib/resource-1.4/italian/LexiconIta.gf index cb06d40df..61bf0fdd8 100644 --- a/lib/resource-1.4/italian/LexiconIta.gf +++ b/lib/resource-1.4/italian/LexiconIta.gf @@ -101,6 +101,7 @@ lin important_A = regADeg "importante" ; industry_N = regN "industria" ; iron_N = regN "ferro" ; + john_PN = mkPN "Giovanni" masculine ; king_N = regN "ré" ; know_V2 = dirV2 (verboV (conoscere_37 "conoscere")) ; --- savoir_V2 : VS lake_N = regN "lago" ; @@ -354,5 +355,6 @@ lin language_N = regN "lingua" ; rule_N = regN "regola" ; + today_Adv = mkAdv "oggi" ; } ; diff --git a/lib/resource-1.4/norwegian/LexiconNor.gf b/lib/resource-1.4/norwegian/LexiconNor.gf index b674dd97d..5972338de 100644 --- a/lib/resource-1.4/norwegian/LexiconNor.gf +++ b/lib/resource-1.4/norwegian/LexiconNor.gf @@ -100,6 +100,7 @@ lin important_A = regADeg "viktig" ; industry_N = mk2N "industri" "industrien" ; iron_N = regGenN "jern" neutrum ; + john_PN = mkPN "John" utrum ; king_N = regGenN "konge" masculine ; know_V2 = dirV2 IrregNor.vite_V ; lake_N = regGenN "vann" neutrum ; @@ -353,6 +354,12 @@ lin language_N = mk2N "språk" "språket" ; rule_N = mkN "regel" "regelen" "regler" "reglene" ; +---- question_N = regN "fråga" ; +---- ready_A = regA "färdig" ; +---- reason_N = regN "anledning" ; + today_Adv = mkAdv "idag" ; +---- uncertain_A = mk3A "osäker" "osäkert" "osäkra" ; + } ; -- a" -> e" 86