From e8312c1137f8e9f4af3ad7d34f484e20d8925bc1 Mon Sep 17 00:00:00 2001 From: aarne Date: Thu, 22 Jun 2006 21:00:18 +0000 Subject: [PATCH] grammar.langua,rule in Lexicon --- lib/resource-1.0/abstract/Lexicon.gf | 3 +++ lib/resource-1.0/danish/LexiconDan.gf | 4 ++++ lib/resource-1.0/english/LexiconEng.gf | 4 ++++ lib/resource-1.0/finnish/LexiconFin.gf | 4 ++++ lib/resource-1.0/french/LexiconFre.gf | 5 +++++ lib/resource-1.0/german/LexiconGer.gf | 6 ++++++ lib/resource-1.0/italian/LexiconIta.gf | 5 +++++ lib/resource-1.0/norwegian/LexiconNor.gf | 4 ++++ lib/resource-1.0/russian/LexiconRus.gf | 8 +++++++- lib/resource-1.0/spanish/LexiconSpa.gf | 4 ++++ lib/resource-1.0/swedish/LexiconSwe.gf | 5 +++++ 11 files changed, 51 insertions(+), 1 deletion(-) diff --git a/lib/resource-1.0/abstract/Lexicon.gf b/lib/resource-1.0/abstract/Lexicon.gf index 3d82e1eec..a453a59ac 100644 --- a/lib/resource-1.0/abstract/Lexicon.gf +++ b/lib/resource-1.0/abstract/Lexicon.gf @@ -128,6 +128,7 @@ fun gold_N : N ; good_A : A ; go_V : V ; + grammar_N : N ; grass_N : N ; green_A : A ; guts_N : N ; @@ -164,6 +165,7 @@ fun know_V2 : V2 ; lake_N : N ; lamp_N : N ; + language_N : N ; laugh_V : V ; leaf_N : N ; learn_V2 : V2 ; @@ -239,6 +241,7 @@ fun round_A : A ; rubber_N : N ; rub_V2 : V2 ; + rule_N : N ; run_V : V ; salt_N : N ; sand_N : N ; diff --git a/lib/resource-1.0/danish/LexiconDan.gf b/lib/resource-1.0/danish/LexiconDan.gf index a7ed48bd2..0d24d4ccd 100644 --- a/lib/resource-1.0/danish/LexiconDan.gf +++ b/lib/resource-1.0/danish/LexiconDan.gf @@ -350,6 +350,10 @@ lin wipe_V2 = dirV2 (regV "viske") ; breathe_V = regV "ånde" ; + grammar_N = regN "grammatik" ; + language_N = mk2N "sprog" "sproget" ; + rule_N = mkN "regel" "regeln" "regler" "reglerne" ; + } ; diff --git a/lib/resource-1.0/english/LexiconEng.gf b/lib/resource-1.0/english/LexiconEng.gf index 3d95943aa..fb094f22a 100644 --- a/lib/resource-1.0/english/LexiconEng.gf +++ b/lib/resource-1.0/english/LexiconEng.gf @@ -351,6 +351,10 @@ lin -- other_A = regA "other" ; + grammar_N = regN "grammar" ; + language_N = regN "language" ; + rule_N = regN "rule" ; + oper aboutP = mkPrep "about" ; atP = mkPrep "at" ; diff --git a/lib/resource-1.0/finnish/LexiconFin.gf b/lib/resource-1.0/finnish/LexiconFin.gf index 01f30da39..5e176c4a2 100644 --- a/lib/resource-1.0/finnish/LexiconFin.gf +++ b/lib/resource-1.0/finnish/LexiconFin.gf @@ -367,6 +367,10 @@ lin breathe_V = regV "hengittää" ; + grammar_N = regN "kielioppi" ; + language_N = reg2N "kieli" "kieliä" ; + rule_N = regN "sääntö" ; + oper mkOrd : N -> Ord ; mkOrd x = {s = \\n,c => x.s ! NCase n c; lock_Ord = <> } ; diff --git a/lib/resource-1.0/french/LexiconFre.gf b/lib/resource-1.0/french/LexiconFre.gf index da0636690..531953ef7 100644 --- a/lib/resource-1.0/french/LexiconFre.gf +++ b/lib/resource-1.0/french/LexiconFre.gf @@ -352,4 +352,9 @@ lin split_V2 = fendre_V2 ; sit_V = reflV (v2V asseoir_V2) ; + grammar_N = regN "grammaire" ; + language_N = regN "langue" ; + rule_N = regN "règle" ; + + } ; diff --git a/lib/resource-1.0/german/LexiconGer.gf b/lib/resource-1.0/german/LexiconGer.gf index e2ccacc4e..6dbabdeb7 100644 --- a/lib/resource-1.0/german/LexiconGer.gf +++ b/lib/resource-1.0/german/LexiconGer.gf @@ -348,4 +348,10 @@ lin tie_V2 = dirV2 (regV "binden") ; wash_V2 = dirV2 (regV "waschen") ; wipe_V2 = dirV2 (regV "wischen") ; + + grammar_N = reg2N "Grammatik" "Grammatiken" feminine ; + language_N = regN "Sprache" ; + rule_N = reg2N "Regel" "Regel" feminine ; + + } ; diff --git a/lib/resource-1.0/italian/LexiconIta.gf b/lib/resource-1.0/italian/LexiconIta.gf index 4652cdffa..6cc618ef0 100644 --- a/lib/resource-1.0/italian/LexiconIta.gf +++ b/lib/resource-1.0/italian/LexiconIta.gf @@ -350,4 +350,9 @@ lin wipe_V2 = dirV2 (regV "asciugare") ; breathe_V = (regV "respirare") ; + grammar_N = regN "grammatica" ; + language_N = regN "lingua" ; + rule_N = regN "regola" ; + + } ; diff --git a/lib/resource-1.0/norwegian/LexiconNor.gf b/lib/resource-1.0/norwegian/LexiconNor.gf index ebac3dfad..29e3587c8 100644 --- a/lib/resource-1.0/norwegian/LexiconNor.gf +++ b/lib/resource-1.0/norwegian/LexiconNor.gf @@ -349,6 +349,10 @@ lin breathe_V = regV "puste" ; + grammar_N = regN "grammatikk" ; + language_N = mk2N "språk" "språket" ; + rule_N = mkN "regel" "regelen" "regler" "reglene" ; + } ; -- a" -> e" 86 diff --git a/lib/resource-1.0/russian/LexiconRus.gf b/lib/resource-1.0/russian/LexiconRus.gf index c5817829d..5904cea64 100644 --- a/lib/resource-1.0/russian/LexiconRus.gf +++ b/lib/resource-1.0/russian/LexiconRus.gf @@ -399,5 +399,11 @@ paris_PN = mkPN "Париж" Masc Inanimate ; -} + + grammar_N = nNoga "грамматик"; + language_N = nBank "Ñзык" ; + rule_N = nChislo "правил" ; + +} + diff --git a/lib/resource-1.0/spanish/LexiconSpa.gf b/lib/resource-1.0/spanish/LexiconSpa.gf index a6da3b488..3015830d5 100644 --- a/lib/resource-1.0/spanish/LexiconSpa.gf +++ b/lib/resource-1.0/spanish/LexiconSpa.gf @@ -348,5 +348,9 @@ lin wipe_V2 = dirV2 (regV "secar") ; breathe_V = (regV "respirar") ; + grammar_N = regN "gramática" ; + language_N = regN "lengua" ; + rule_N = regN "regla" ; + } ; diff --git a/lib/resource-1.0/swedish/LexiconSwe.gf b/lib/resource-1.0/swedish/LexiconSwe.gf index b8c7bc75c..25efd1390 100644 --- a/lib/resource-1.0/swedish/LexiconSwe.gf +++ b/lib/resource-1.0/swedish/LexiconSwe.gf @@ -351,4 +351,9 @@ lin fight_V2 = mkV2 (mkV "slåss" "slåss" "slåss" "slogs" "slagits" "slagen") (mkPrep "med") ; + grammar_N = mk1N "grammatikerna" ; + language_N = mk2N "språk" "språk" ; + rule_N = mkN "regel" "regeln" "regler" "reglerna" ; + + } ;