diff --git a/lib/resource/abstract/Basic.gf b/lib/resource/abstract/Basic.gf index 6e3aea5f8..5b35cf8ac 100644 --- a/lib/resource/abstract/Basic.gf +++ b/lib/resource/abstract/Basic.gf @@ -53,6 +53,7 @@ abstract Basic = Categories ** { cow_N : N ; die_V : V ; dirty_ADeg : ADeg ; + distance_N3 : N3 ; doctor_N : N ; dog_N : N ; door_N : N ; @@ -60,6 +61,7 @@ abstract Basic = Categories ** { easy_A2V : A2V ; eat_V2 : V2 ; enemy_N : N ; + empty_ADeg : ADeg ; factory_N : N ; father_N2 : N2 ; fear_VS : VS ; diff --git a/lib/resource/english/BasicEng.gf b/lib/resource/english/BasicEng.gf index 05e00f4ec..69578f721 100644 --- a/lib/resource/english/BasicEng.gf +++ b/lib/resource/english/BasicEng.gf @@ -61,12 +61,14 @@ lin cow_N = regN "cow" ; die_V = (regV "die") ; dirty_ADeg = regADeg "dirty" ; + distance_N3 = mkN3 (regN "distance") "from" "to" ; doctor_N = regN "doctor" ; dog_N = regN "dog" ; door_N = regN "door" ; drink_V2 = dirV2 (irregV "drink" "drank" "drunk") ; easy_A2V = mkA2V (regA "easy") "for" ; eat_V2 = dirV2 (irregV "eat" "ate" "eaten") ; + empty_ADeg = regADeg "empty" ; enemy_N = regN "enemy" ; factory_N = regN "factory" ; father_N2 = regN2 "father" ; diff --git a/lib/resource/french/BasicFre.gf b/lib/resource/french/BasicFre.gf index 7abfc5840..c8c2b5082 100644 --- a/lib/resource/french/BasicFre.gf +++ b/lib/resource/french/BasicFre.gf @@ -61,12 +61,14 @@ lin cow_N = regN "vache" feminine ; die_V = mourir_V ; dirty_ADeg = regADeg "sale" ; + distance_N3 = mkN3 (regN "distance" feminine) genitive dative ; doctor_N = regN "médecin" masculine ; dog_N = regN "chien" masculine ; door_N = regN "porte" feminine ; drink_V2 = boire_V2 ; easy_A2V = mkA2V (regA "facile") dative genitive ; eat_V2 = dirV2 (regV "manger") ; + empty_ADeg = regADeg "vide" ; enemy_N = regN "ennemi" masculine ; factory_N = regN "usine" feminine ; father_N2 = deN2 (regN "père" masculine) ; diff --git a/lib/resource/italian/BasicIta.gf b/lib/resource/italian/BasicIta.gf index 93d1f99a4..bad5b0f18 100644 --- a/lib/resource/italian/BasicIta.gf +++ b/lib/resource/italian/BasicIta.gf @@ -60,12 +60,14 @@ lin cow_N = regN "vacca" ; die_V = verboV (morire_105 "morire") ; dirty_ADeg = regADeg "sporco" ; + distance_N3 = mkN3 (regN "distanza") genitive dative ; doctor_N = mkN "medico" "medici" masculine ; dog_N = regN "cane" ; door_N = regN "porta" ; drink_V2 = dirV2 (verboV (bere_27 "bere")) ; easy_A2V = mkA2V (regA "facile") dative genitive ; eat_V2 = dirV2 (regV "mangiare") ; + empty_ADeg = regADeg "vuoto" ; enemy_N = regN "nemico" ; factory_N = regN "stabilimento" ; father_N2 = diN2 (regN "padre") ; diff --git a/lib/resource/norwegian/BasicNor.gf b/lib/resource/norwegian/BasicNor.gf index 33469b832..72a10338e 100644 --- a/lib/resource/norwegian/BasicNor.gf +++ b/lib/resource/norwegian/BasicNor.gf @@ -60,12 +60,14 @@ lin cow_N = mkN "ku" "kua" "kyr" "kyrne" ; ---- die_V = dø_V ; dirty_ADeg = mk3ADeg "skitten" "skittent" "skitne" ; ---- + distance_N3 = mkN3 (regN "avstand" masculine) "fra" "til" ; doctor_N = mk2N "lege" "legen" ; dog_N = regN "hund" masculine ; door_N = regN "dør" feminine ; drink_V2 = dirV2 drikke_V ; easy_A2V = mkA2V (regA "grei") "før" ; eat_V2 = dirV2 (mk2V "spise" "spiste") ; + empty_ADeg = mkADeg "tom" "tomt" "tomme" "tommere" "tommest" ; enemy_N = regN "fiende" masculine ; factory_N = mk2N "fabrikk" "fabrikken" ; father_N2 = mkN2 ( (mkN "far" "faren" "fedre" "fedrene")) "til" ; diff --git a/lib/resource/norwegian/ParadigmsNor.gf b/lib/resource/norwegian/ParadigmsNor.gf index d040a569c..a3193639c 100644 --- a/lib/resource/norwegian/ParadigmsNor.gf +++ b/lib/resource/norwegian/ParadigmsNor.gf @@ -271,7 +271,7 @@ oper Gender = SyntaxNor.NounGender ; Number = TypesNor.Number ; Case = TypesNor.Case ; - masculine = NUtr NoMasc ; + masculine = NUtr Masc ; feminine = NUtr NoMasc ; neutrum = NNeutr ; singular = Sg ; diff --git a/lib/resource/spanish/BasicSpa.gf b/lib/resource/spanish/BasicSpa.gf index 1a9f228e5..f30c9acc8 100644 --- a/lib/resource/spanish/BasicSpa.gf +++ b/lib/resource/spanish/BasicSpa.gf @@ -63,12 +63,14 @@ lin cow_N = regN "vaca" ; die_V = verboV (morir_35b "morir") ; dirty_ADeg = regADeg "sucio" ; + distance_N3 = mkN3 (regN "distancia") genitive dative ; doctor_N = regN "médico" ; -- médica dog_N = regN "perro" ; -- perra door_N = regN "puerta" ; drink_V2 = dirV2 (regV "tomar") ; -- beber easy_A2V = mkA2V (regA "fácil") dative genitive ; eat_V2 = dirV2 (regV "comer") ; + empty_ADeg = regADeg "vacío" ; enemy_N = regN "enemigo" ; -- enemiga factory_N = regN "fábrica" ; father_N2 = deN2 (regN "padre") ; diff --git a/lib/resource/swedish/BasicSwe.gf b/lib/resource/swedish/BasicSwe.gf index d5ddb8407..a9d3faea5 100644 --- a/lib/resource/swedish/BasicSwe.gf +++ b/lib/resource/swedish/BasicSwe.gf @@ -58,6 +58,7 @@ lin cousin_N = mk2N "kusin" "kusinerna" ; cow_N = mk2N "ko" "kor" ; die_V = (mkV "dö" "dör" "dö" "dog" "dött" "dödd") ; ---- + distance_N3 = mkN3 (mk2N "avstånd" "avstånd") "från" "till" ; dirty_ADeg = regADeg "smutsig" ; doctor_N = mk2N "läkare" "läkare" ; dog_N = regN "hund" utrum ; @@ -65,6 +66,7 @@ lin drink_V2 = dirV2 (irregV "dricka" "drack" "druckit") ; easy_A2V = mkA2V (mk2A "lätt" "lätt") "för" ; eat_V2 = dirV2 (irregV "äta" "åt" "ätit") ; + empty_ADeg = mkADeg "tom" "tomt" "tomma" "tomma" "tommare" "tommast" "tommaste" ; enemy_N = regN "fiende" neutrum ; factory_N = mk2N "fabrik" "fabriker" ; father_N2 = mkN2 (mascN (mkN "far" "fadern" "fäder" "fäderna")) "till" ;