diff --git a/examples/stoneage1/StoneageEng.gf b/examples/stoneage1/StoneageEng.gf index fa1c52f10..cc8de20a0 100644 --- a/examples/stoneage1/StoneageEng.gf +++ b/examples/stoneage1/StoneageEng.gf @@ -1,4 +1,4 @@ ---# -path=.:compiled:resource-1.0/swadesh +--# -path=.:compiled:prelude:resource-1.0/swadesh concrete StoneageEng of Stoneage = StoneageI with (Lang = LangEng), diff --git a/examples/stoneage1/StoneageFin.gf b/examples/stoneage1/StoneageFin.gf new file mode 100644 index 000000000..6efe406b7 --- /dev/null +++ b/examples/stoneage1/StoneageFin.gf @@ -0,0 +1,6 @@ +--# -path=.:compiled:resource-1.0/swadesh + +concrete StoneageFin of Stoneage = StoneageI with + (Lang = LangFin), + (Swadesh = SwadeshFin) ; + diff --git a/examples/stoneage1/StoneageFre.gf b/examples/stoneage1/StoneageFre.gf new file mode 100644 index 000000000..8f6986022 --- /dev/null +++ b/examples/stoneage1/StoneageFre.gf @@ -0,0 +1,6 @@ +--# -path=.:compiled:prelude:resource-1.0/swadesh + +concrete StoneageFre of Stoneage = StoneageI with + (Lang = LangFre), + (Swadesh = SwadeshFre) ; + diff --git a/examples/stoneage1/StoneageIta.gf b/examples/stoneage1/StoneageIta.gf new file mode 100644 index 000000000..8d0b7e4e9 --- /dev/null +++ b/examples/stoneage1/StoneageIta.gf @@ -0,0 +1,6 @@ +--# -path=.:compiled:prelude:resource-1.0/swadesh + +concrete StoneageIta of Stoneage = StoneageI with + (Lang = LangIta), + (Swadesh = SwadeshIta) ; + diff --git a/examples/stoneage1/StoneageNor.gf b/examples/stoneage1/StoneageNor.gf new file mode 100644 index 000000000..ec0f54ce8 --- /dev/null +++ b/examples/stoneage1/StoneageNor.gf @@ -0,0 +1,6 @@ +--# -path=.:compiled:prelude:resource-1.0/swadesh + +concrete StoneageNor of Stoneage = StoneageI with + (Lang = LangNor), + (Swadesh = SwadeshNor) ; + diff --git a/examples/stoneage1/StoneageSpa.gf b/examples/stoneage1/StoneageSpa.gf new file mode 100644 index 000000000..3f8b908b6 --- /dev/null +++ b/examples/stoneage1/StoneageSpa.gf @@ -0,0 +1,6 @@ +--# -path=.:compiled:prelude:resource-1.0/swadesh + +concrete StoneageSpa of Stoneage = StoneageI with + (Lang = LangSpa), + (Swadesh = SwadeshSpa) ; + diff --git a/examples/stoneage1/StoneageSwe.gf b/examples/stoneage1/StoneageSwe.gf index 16ef024c5..376c34896 100644 --- a/examples/stoneage1/StoneageSwe.gf +++ b/examples/stoneage1/StoneageSwe.gf @@ -1,4 +1,4 @@ ---# -path=.:compiled:resource-1.0/swadesh +--# -path=.:compiled:prelude:resource-1.0/swadesh concrete StoneageSwe of Stoneage = StoneageI with (Lang = LangSwe), diff --git a/lib/resource-1.0/swadesh/MkV2.hs b/lib/resource-1.0/swadesh/MkV2.hs index 5281b63c7..2907392eb 100644 --- a/lib/resource-1.0/swadesh/MkV2.hs +++ b/lib/resource-1.0/swadesh/MkV2.hs @@ -4,9 +4,9 @@ mkV2 file = do ls <- readFile file >>= return . lines mapM_ (putStrLn . mkOne) ls ---mkOne = mkOneV2 +mkOne = mkOneV2 -mkOne = mkOneQuote +--mkOne = mkOneQuote mkOneQuote li = if elem '"' li then "-- " ++ li else li diff --git a/lib/resource-1.0/swadesh/SwadeshFin.gf b/lib/resource-1.0/swadesh/SwadeshFin.gf index 7499cb085..e56addbfe 100644 --- a/lib/resource-1.0/swadesh/SwadeshFin.gf +++ b/lib/resource-1.0/swadesh/SwadeshFin.gf @@ -1,8 +1,7 @@ ---# -path=.:../abstract:../../prelude +--# -path=.:../finnish:../common:../abstract:../../prelude -concrete SwadeshFin of Swadesh = CatFin - ** open ResourceFin, SyntaxFin, ParadigmsFin, - BasicFin, Prelude in { +concrete SwadeshFin of Swadesh = CatFin + ** open MorphoFin, LangFin, ParadigmsFin, Prelude in { flags optimize=values ; @@ -23,14 +22,21 @@ concrete SwadeshFin of Swadesh = CatFin -- Determiners - this_Det = this_Det ; - that_Det = that_Det ; - all_Det = ResourceFin.all_NDet ; + this_Det = DetSg (SgQuant this_Quant) NoOrd ; + that_Det = DetSg (SgQuant that_Quant) NoOrd ; + all_Det = mkDet Pl {s = \\nf => + let + kaiket = (nhn (sKorpi "kaikki" "kaiken" "kaikkena")).s + in + case nf of { + NCase Pl Nom => "kaikki" ; + _ => kaiket ! nf + } + } ; many_Det = many_Det ; some_Det = someSg_Det ; - few_Det = mkDeterminer Pl (\\c => (nhn (sTalo "muutama")).s ! NCase Pl c) ; - other_Det = mkDeterminer Pl (\\c => (nhn (sPuu "muu")).s ! NCase Pl c) ; - + few_Det = mkDet Sg (regN "harva") ; + other_Det = mkDet Sg (regN "muu") ; -- Adverbs @@ -39,6 +45,7 @@ concrete SwadeshFin of Swadesh = CatFin where_IAdv = where_IAdv; when_IAdv = when_IAdv; how_IAdv = how_IAdv; + far_Adv = mkAdv "kaukana" ; -- not : Adv ; -- ? @@ -48,9 +55,9 @@ concrete SwadeshFin of Swadesh = CatFin -- Prepositions - at_Prep = prepCase Adess ; - in_Prep = prepCase Iness ; - with_Prep = prepPostpGen "kanssa" ; + at_Prep = casePrep adessive ; + in_Prep = casePrep inessive ; + with_Prep = postGenPrep "kanssa" ; -- Numerals @@ -68,10 +75,9 @@ concrete SwadeshFin of Swadesh = CatFin cold_A = cold_A ; correct_A = regA "oikea" ; dirty_A = dirty_A ; - dry_A = mkA (regN "kuiva") "kuivempi" "kuivin" ; - dull_A = mkA (regN "tylsä") "tylsempi" "tylsin" ; - far_A = regA "kaukainen" ; - full_A = mkA (reg3N "täysi" "täyden" "täysiä") "täydempi" "täysin" ; + dry_A = mkADeg (regN "kuiva") "kuivempi" "kuivin" ; + dull_A = mkADeg (regN "tylsä") "tylsempi" "tylsin" ; + full_A = mkADeg (reg3N "täysi" "täyden" "täysiä") "täydempi" "täysin" ; good_A = good_A ; green_A = green_A ; heavy_A = regA "raskas" ; @@ -87,11 +93,11 @@ concrete SwadeshFin of Swadesh = CatFin short_A = short_A ; small_A = small_A ; smooth_A = regA "sileä" ; - straight_A = mkA (regN "suora") "suorempi" "suorin" ; + straight_A = mkADeg (regN "suora") "suorempi" "suorin" ; thick_A = thick_A ; thin_A = thin_A ; warm_A = warm_A ; - wet_A = mkA (regN "märkä") "märempi" "märin" ; + wet_A = mkADeg (regN "märkä") "märempi" "märin" ; white_A = white_A ; wide_A = regA "leveä" ; yellow_A = yellow_A ; @@ -188,63 +194,67 @@ concrete SwadeshFin of Swadesh = CatFin -- Verbs - bite_V = regV "purra" ; + bite_V = dirV2 (regV "purra") ; blow_V = regV "puhaltaa" ; - breathe_V = regV "hengittää" ; + breathe_V = dirV2 (regV "hengittää") ; burn_V = regV "palaa" ; - come_V = BasicFin.come_V ; - count_V = regV "laskea" ; - cut_V = reg3V "leikata" "leikkaan" "leikkasi" ; + come_V = come_V ; + count_V = dirV2 (regV "laskea") ; + cut_V = dirV2 (reg2V "leikata" "leikkasi") ; die_V = regV "kuolla"; dig_V = regV "kaivaa" ; - drink_V = UseV2 drink_V2 ; - eat_V = UseV2 eat_V2 ; + drink_V = dirV2 ( drink_V2) ; + eat_V = dirV2 ( eat_V2) ; fall_V = reg3V "pudota" "putoan" "putosi" ; - fear_V = reg3V "pelätä" "pelkään" "pelkäsi" ; - fight_V = regV "taistella" ; + fear_V = dirV2 (reg3V "pelätä" "pelkään" "pelkäsi") ; + fight_V = dirV2 (regV "taistella") ; float_V = regV "kellua" ; flow_V = reg3V "virrata" "virtaan" "virtasi" ; fly_V = regV "lentää" ; freeze_V = regV "jäätyä" ; - give_V = regV "antaa" ; - hear_V = UseV2 hear_V2 ; - hit_V = regV "lyödä" ; - hold_V = regV "pitää" ; - hunt_V = regV "metsästää" ; - kill_V = regV "tappaa" ; - know_V =reg2V "tietää" "tiesin" ; + give_V = dirdirV3 (regV "antaa") ; + hear_V = dirV2 ( hear_V2) ; + hit_V = dirV2 (regV "lyödä") ; + hold_V = dirV2 (regV "pitää") ; + hunt_V = dirV2 (regV "metsästää") ; + kill_V = dirV2 (regV "tappaa") ; + know_V = dirV2 (reg2V "tuntea" "tunsin") ; laugh_V = reg3V "nauraa" "nauran" "nauroi" ; lie_V = reg3V "maata" "makaan" "makasi" ; live_V = live_V ; - play_V = UseV2 play_V2 ; - pull_V = regV "vetää" ; - push_V = regV "työntää" ; - rub_V = regV "hieroa" ; + play_V = play_V2 ; + pull_V = dirV2 (regV "vetää") ; + push_V = dirV2 (regV "työntää") ; + rub_V = dirV2 (regV "hieroa") ; say_V = regV "sanoa" ; - scratch_V = regV "raapia" ; - see_V = UseV2 see_V2 ; + scratch_V = dirV2 (regV "raapia") ; + see_V = ( see_V2) ; sew_V = regV "kylvää" ; sing_V = regV "laulaa" ; sit_V = regV "istua" ; sleep_V = sleep_V ; - smell_V = reg2V "haistaa" "haistoi" ; + smell_V = dirV2 (reg2V "haistaa" "haistoi") ; spit_V = regV "sylkeä" ; - split_V = reg2V "halkaista" "halkaisi" ; - squeeze_V = regV "puristaa" ; - stab_V = regV "pistää" ; + split_V = dirV2 (reg2V "halkaista" "halkaisi") ; + squeeze_V = dirV2 (regV "puristaa") ; + stab_V = dirV2 (regV "pistää") ; stand_V = mkV "seistä" "seisoo" "seison" "seisovat" "seiskää" "seistään" "seisoi" "seisoin" "seisoisi" "seissyt" "seisty" "seistyn" ; --- *seisoivät - suck_V = regV "imeä" ; + suck_V = dirV2 (regV "imeä") ; swell_V = mkV "turvota" "turpoaa" "turpoan" "turpoavat" "turvotkaa" "turvotaan" "turposi" "turposin" "turpoaisi" "turvonnut" "turvottu" "turvotun" ; swim_V = reg3V "uida" "uin" "ui" ; think_V = reg3V "ajatella" "ajattelen" "ajatteli" ; - throw_V = regV "heittää" ; - tie_V = regV "sitoa" ; + throw_V = dirV2 (regV "heittää") ; + tie_V = dirV2 (regV "sitoa") ; turn_V = regV "kääntyä" ; vomit_V = regV "oksentaa" ; walk_V = walk_V ; - wash_V = regV "pestä" ; - wipe_V = regV "pyyhkiä" ; + wash_V = dirV2 (regV "pestä") ; + wipe_V = dirV2 (regV "pyyhkiä") ; -} \ No newline at end of file +oper + regA = regADeg ; ---- + + +} diff --git a/lib/resource-1.0/swadesh/SwadeshFre.gf b/lib/resource-1.0/swadesh/SwadeshFre.gf index 5f59acf90..3a7b97531 100644 --- a/lib/resource-1.0/swadesh/SwadeshFre.gf +++ b/lib/resource-1.0/swadesh/SwadeshFre.gf @@ -1,8 +1,7 @@ ---# -path=.:../abstract:../../prelude:../romance +--# -path=.:../french:../common:../abstract:../../prelude:../romance -concrete SwadeshFre of Swadesh = CatFre - ** open StructuralFre, RulesFre, SyntaxFre, ParadigmsFre, VerbsFre, - BasicFre, Prelude in { +concrete SwadeshFre of Swadesh = CatFre + ** open PhonoFre, MorphoFre, LangFre, ParadigmsFre, IrregFre, Prelude in { lin @@ -21,14 +20,19 @@ concrete SwadeshFre of Swadesh = CatFre -- Determiners - this_Det = this_Det ; - that_Det = that_Det ; - all_Det = all_NDet ; + this_Det = DetSg (SgQuant this_Quant) NoOrd ; + that_Det = DetSg (SgQuant that_Quant) NoOrd ; + all_Det = { + s = \\g,c => prepCase c ++ genForms "tous" "toutes" ! g ++ "les" ; + n = Pl + } ; many_Det = many_Det ; some_Det = someSg_Det ; - few_Det = mkDeterminer1 Pl ("peu" ++ elisDe) ; - other_Det = mkDeterminer1 Pl ["d'autres"] ; - + few_Det = {s = \\g,c => prepCase c ++ "peu" ++ elisDe ; n = Pl} ; + other_Det = { + s = \\g,c => prepCase c ++ "d'autres" ; -- de d'autres + n = Pl + } ; -- Adverbs @@ -37,6 +41,7 @@ concrete SwadeshFre of Swadesh = CatFre where_IAdv = where_IAdv; when_IAdv = when_IAdv; how_IAdv = how_IAdv; + far_Adv = mkAdv "loin" ; -- not : Adv ; -- ? @@ -46,9 +51,9 @@ concrete SwadeshFre of Swadesh = CatFre -- Prepositions - at_Prep = justCase dative.p1 ; - in_Prep = StructuralFre.in_Prep ; - with_Prep = StructuralFre.with_Prep ; + at_Prep = dative ; + in_Prep = in_Prep ; + with_Prep = with_Prep ; -- Numerals @@ -66,9 +71,8 @@ concrete SwadeshFre of Swadesh = CatFre cold_A = cold_A ; correct_A = regA "correct" ; dirty_A = dirty_A ; - dry_A = compA (mkA "sec" "sèche" "secs" "sèches") ; + dry_A = (mkA "sec" "sèche" "secs" "sèches") ; dull_A = regA "émoussé" ; - far_A = regA "lointain" ; full_A = regA "plein" ; good_A = good_A ; green_A = green_A ; @@ -186,61 +190,61 @@ concrete SwadeshFre of Swadesh = CatFre -- Verbs - bite_V = UseV2 mordre_V2 ; + bite_V = ( mordre_V2) ; blow_V = regV "souffler" ; - breathe_V = regV "respirer" ; + breathe_V = dirV2 (regV "respirer") ; burn_V = regV "brûler" ; come_V = venir_V ; - count_V = regV "conter" ; - cut_V = regV "tailler" ; + count_V = dirV2 (regV "conter") ; + cut_V = dirV2 (regV "tailler") ; die_V = mourir_V ; dig_V = regV "creuser" ; - drink_V = UseV2 boire_V2 ; - eat_V = regV "manger" ; + drink_V = ( boire_V2) ; + eat_V = dirV2 (regV "manger") ; fall_V = regV "tomber" ; - fear_V = UseV2 craindre_V2 ; - fight_V = regV "lutter" ; + fear_V = ( craindre_V2) ; + fight_V = dirV2 (regV "lutter") ; float_V = regV "flotter" ; flow_V = regV "couler" ; fly_V = regV "voler" ; freeze_V = reg3V "geler" "gèle" "gèlera" ; - give_V = regV "donner" ; - hear_V = UseV2 entendre_V2 ; - hit_V = regV "frapper" ; - hold_V = UseV2 tenir_V2 ; - hunt_V = regV "chasser" ; - kill_V = regV "tuer" ; - know_V = UseV2 savoir_V2 ; --- connaître - laugh_V = UseV2 rire_V2 ; - lie_V = UseV2 étendre_V2 ; ---- reflexive - live_V = UseV2 vivre_V2 ; + give_V = dirdirV3 (regV "donner") ; + hear_V = ( entendre_V2) ; + hit_V = dirV2 (regV "frapper") ; + hold_V = ( tenir_V2) ; + hunt_V = dirV2 (regV "chasser") ; + kill_V = dirV2 (regV "tuer") ; + know_V = ( connaître_V2) ; + laugh_V = rire_V2 ; + lie_V = reflV étendre_V2 ; + live_V = vivre_V2 ; play_V = regV "jouer" ; - pull_V = regV "tirer" ; - push_V = regV "pousser" ; - rub_V = regV "frotter" ; - say_V = UseV2 dire_V2 ; - scratch_V = regV "gratter" ; - see_V = UseV2 voir_V2 ; - sew_V = UseV2 coudre_V2 ; + pull_V = dirV2 (regV "tirer") ; + push_V = dirV2 (regV "pousser") ; + rub_V = dirV2 (regV "frotter") ; + say_V = dire_V2 ; + scratch_V = dirV2 (regV "gratter") ; + see_V = ( voir_V2) ; + sew_V = coudre_V2 ; sing_V = regV "chanter" ; - sit_V = UseV2 asseoir_V2 ; --- refl - sleep_V = UseV2 dormir_V2 ; - smell_V = UseV2 sentir_V2 ; + sit_V = reflV asseoir_V2 ; + sleep_V = dormir_V2 ; + smell_V = ( sentir_V2) ; spit_V = regV "cracher" ; - split_V = UseV2 fendre_V2 ; - squeeze_V = regV "serrer" ; - stab_V = regV "poignarder" ; - stand_V = reg3V "lever" "lève" "lèvera" ; ---- refl ---- - suck_V = regV "sucer" ; + split_V = ( fendre_V2) ; + squeeze_V = dirV2 (regV "serrer") ; + stab_V = dirV2 (regV "poignarder") ; + stand_V = reflV (reg3V "lever" "lève" "lèvera") ; + suck_V = dirV2 (regV "sucer") ; swell_V = regV "gonfler" ; swim_V = regV "nager" ; think_V = regV "penser" ; - throw_V = regV "jeter" ; - tie_V = regV "lier" ; + throw_V = dirV2 (regV "jeter") ; + tie_V = dirV2 (regV "lier") ; turn_V = regV "tourner" ; vomit_V = regV "vomir" ; walk_V = regV "marcher" ; - wash_V = regV "laver" ; - wipe_V = regV "essuyer" ; + wash_V = dirV2 (regV "laver") ; + wipe_V = dirV2 (regV "essuyer") ; -} \ No newline at end of file +} diff --git a/lib/resource-1.0/swadesh/SwadeshIta.gf b/lib/resource-1.0/swadesh/SwadeshIta.gf index f151c9ab2..97506fbaa 100644 --- a/lib/resource-1.0/swadesh/SwadeshIta.gf +++ b/lib/resource-1.0/swadesh/SwadeshIta.gf @@ -1,11 +1,9 @@ ---# -path=.:../abstract:../../prelude:../romance +--# -path=.:../italian:../common:../abstract:../../prelude:../romance -concrete SwadeshIta of Swadesh = CatIta - ** open StructuralIta, RulesIta, SyntaxIta, ParadigmsIta, - BasicIta, BeschIta, Prelude in { +concrete SwadeshIta of Swadesh = CatIta + ** open PhonoIta, MorphoIta, LangIta, ParadigmsIta, BeschIta, Prelude in { lin - -- Pronouns i_NP = i_Pron ; @@ -21,14 +19,19 @@ concrete SwadeshIta of Swadesh = CatIta -- Determiners - this_Det = this_Det ; - that_Det = that_Det ; - all_Det = all_NDet ; + this_Det = DetSg (SgQuant this_Quant) NoOrd ; + that_Det = DetSg (SgQuant that_Quant) NoOrd ; + all_Det = { + s = \\g,c => prepCase c ++ genForms ["tutti i"] ["tutte le"] ! g ; + n = Pl + } ; many_Det = many_Det ; some_Det = someSg_Det ; - few_Det = mkDeterminer Pl "pochi" "poche" ; - other_Det = mkDeterminer Pl "altri" "altre" ; - + few_Det = {s = \\g,c => prepCase c ++ genForms "pochi" "poche" ! g ; n = Pl} ; + other_Det = { + s = \\g,c => prepCase c ++ genForms "altri" "altre" ! g ; + n = Pl + } ; -- Adverbs @@ -37,6 +40,7 @@ concrete SwadeshIta of Swadesh = CatIta where_IAdv = where_IAdv; when_IAdv = when_IAdv; how_IAdv = how_IAdv; + far_Adv = mkAdv "lontano" ; -- not : Adv ; -- ? @@ -46,9 +50,9 @@ concrete SwadeshIta of Swadesh = CatIta -- Prepositions - at_Prep = justCase dative.p1 ; - in_Prep = StructuralIta.in_Prep ; - with_Prep = StructuralIta.with_Prep ; + at_Prep = dative ; + in_Prep = in_Prep ; + with_Prep = with_Prep ; -- Numerals @@ -68,7 +72,6 @@ concrete SwadeshIta of Swadesh = CatIta dirty_A = dirty_A ; dry_A = regA "secco" ; dull_A = regA "noioso" ; - far_A = regA "lontano" ; full_A = regA "pieno" ; good_A = good_A ; green_A = green_A ; @@ -186,61 +189,61 @@ concrete SwadeshIta of Swadesh = CatIta -- Verbs - bite_V = verboV (esplodere_51 "mordere") ; + bite_V = dirV2 (verboV (esplodere_51 "mordere")) ; blow_V = regV "soffiare" ; - breathe_V = regV "respirare" ; + breathe_V = dirV2 (regV "respirare") ; burn_V = regV "bruciare" ; - come_V = BasicIta.come_V ; - count_V = regV "contare" ; - cut_V = regV "tagliare" ; - die_V = BasicIta.die_V ; + come_V = come_V ; + count_V = dirV2 (regV "contare") ; + cut_V = dirV2 (regV "tagliare") ; + die_V = die_V ; dig_V = regV "scavare" ; - drink_V = drink_V2 ; - eat_V = regV "mangiare" ; + drink_V = dirV2 (drink_V2) ; + eat_V = dirV2 (regV "mangiare") ; fall_V = essereV (verboV (cadere_28 "cadere")) ; - fear_V = fear_VS ; - fight_V = regV "lottare" ; + fear_V = dirV2 (fear_VS) ; + fight_V = dirV2 (regV "lottare") ; float_V = regV "galleggiare" ; flow_V = verboV (finire_100 "fluire") ; fly_V = regV "volare" ; freeze_V = regV "gelare" ; - give_V = verboV (dare_15 "dare") ; - hear_V = hear_V2 ; - hit_V = regV "colpire" ; - hold_V = verboV (venire_110 "tenire") ; - hunt_V = regV "cacciare" ; - kill_V = verboV (ridere_74 "uccidere") ; - know_V = know_V2 ; + give_V = dirdirV3 (verboV (dare_15 "dare")) ; + hear_V = dirV2 (hear_V2) ; + hit_V = dirV2 (regV "colpire") ; + hold_V = dirV2 (verboV (venire_110 "tenire")) ; + hunt_V = dirV2 (regV "cacciare") ; + kill_V = dirV2 (verboV (ridere_74 "uccidere")) ; + know_V = dirV2 (know_V2) ; laugh_V = verboV (ridere_74 "ridere") ; lie_V = verboV (piacere_64 "giacere") ; live_V = live_V ; play_V = regV "giocare" ; - pull_V = regV "tirare" ; - push_V = verboV (cingere_31 "spingere") ; - rub_V = regV "strofinare" ; + pull_V = dirV2 (regV "tirare") ; + push_V = dirV2 (verboV (cingere_31 "spingere")) ; + rub_V = dirV2 (regV "strofinare") ; say_V = say_VS ; - scratch_V = regV "graffiare" ; - see_V = see_V2 ; + scratch_V = dirV2 (regV "graffiare") ; + see_V = dirV2 (see_V2) ; sew_V = verboV (cucire_103 "cucire") ; sing_V = regV "cantare" ; sit_V = verboV (sedere_84 "sedere") ; --- refl? sleep_V = sleep_V ; - smell_V = verboV (sentire_99 "sentire") ; + smell_V = dirV2 (verboV (sentire_99 "sentire")) ; spit_V = regV "sputare" ; - split_V = verboV (ridere_74 "dividere") ; - squeeze_V = verboV (temere_20 "spremere") ; - stab_V = regV "pugnalare" ; + split_V = dirV2 (verboV (ridere_74 "dividere")) ; + squeeze_V = dirV2 (verboV (temere_20 "spremere")) ; + stab_V = dirV2 (regV "pugnalare") ; stand_V = verboV (stare_16 "stare") ; ---- in piedi - suck_V = regV "succhiare" ; + suck_V = dirV2 (regV "succhiare") ; swell_V = regV "gonfiare" ; swim_V = regV "nuotare" ; think_V = regV "pensare" ; - throw_V = regV "gettare" ; - tie_V = regV "legare" ; + throw_V = dirV2 (regV "gettare") ; + tie_V = dirV2 (regV "legare") ; turn_V = regV "tornare" ; vomit_V = regV "vomitare" ; walk_V = regV "camminare" ; - wash_V = regV "lavare" ; - wipe_V = regV "asciugare" ; + wash_V = dirV2 (regV "lavare") ; + wipe_V = dirV2 (regV "asciugare") ; } diff --git a/lib/resource-1.0/swadesh/SwadeshNor.gf b/lib/resource-1.0/swadesh/SwadeshNor.gf index 746ee3c7d..fad6d8cd7 100644 --- a/lib/resource-1.0/swadesh/SwadeshNor.gf +++ b/lib/resource-1.0/swadesh/SwadeshNor.gf @@ -1,8 +1,7 @@ ---# -path=.:../abstract:../scandinavian:../../prelude +--# -path=.:../norwegian:../common:../abstract:../scandinavian:../../prelude -concrete SwadeshNor of Swadesh = CatNor - ** open ResourceNor, SyntaxNor, ParadigmsNor, VerbsNor, - BasicNor, Prelude in { +concrete SwadeshNor of Swadesh = CatNor + ** open MorphoNor, LangNor, ParadigmsNor, IrregNor, Prelude in { lin @@ -21,14 +20,13 @@ concrete SwadeshNor of Swadesh = CatNor -- Determiners - this_Det = this_Det ; - that_Det = that_Det ; - all_Det = all_NDet ; + this_Det = DetSg (SgQuant this_Quant) NoOrd ; + that_Det = DetSg (SgQuant that_Quant) NoOrd ; + all_Det = {s = \\_,_ => "alle" ; n = Pl ; det = DDef Indef} ; many_Det = many_Det ; some_Det = someSg_Det ; - few_Det = mkDeterminerPl "få" IndefP ; - other_Det = mkDeterminerPl "andre" IndefP ; - + few_Det = {s = \\_,_ => "få" ; n = Pl ; det = DDef Indef} ; + other_Det = {s = \\_,_ => "andre" ; n = Pl ; det = DDef Indef} ; -- Adverbs @@ -68,20 +66,19 @@ concrete SwadeshNor of Swadesh = CatNor dirty_A = dirty_A ; dry_A = mk2A "tørr" "tørt" ; dull_A = regA "sløv" ; - far_A = regA "fjern" ; full_A = regA "full" ; good_A = good_A ; green_A = green_A ; - heavy_A = irregA "tung" "tyngre" "tyngst" ; + heavy_A = irregADeg "tung" "tyngre" "tyngst" ; left_A = mkA "venstre" "venstre" "venstre" ; long_A = long_A ; narrow_A = narrow_A ; - near_A = mkA "nære" "nære" "nære" "nærmere" "nærmest" ; + near_A = mkADeg "nære" "nære" "nære" "nærmere" "nærmest" ; new_A = new_A ; old_A = old_A ; red_A = red_A ; right_A = mkA "høyre" "høyre" "høyre" ; - rotten_A = mk3A "råtten" "råttent" "råtne" ; + rotten_A = mk3ADeg "råtten" "råttent" "råtne" ; round_A = regA "rund" ; sharp_A = mk2A "kvass" "kvast" ; short_A = short_A ; @@ -100,7 +97,7 @@ concrete SwadeshNor of Swadesh = CatNor -- Nouns animal_N = mk2N "dyr" "dyret" ; - ashes_N = mk2N "aske" "aska" ; + ashes_N = mk2N "aske" "aska" ; back_N = mk2N "rygg" "ryggen" ; bark_N = mk2N "bark" "barken" ; belly_N = mk2N "mage" "magen" ; @@ -124,13 +121,13 @@ concrete SwadeshNor of Swadesh = CatNor fingernail_N = mk2N "negl" "neglen" ; fire_N = mk2N "ild" "ilden" ; fish_N = fish_N ; - flower_N = mk2N "blomst" "blomsten" ; - fog_N = mk2N "tåke" "tåka" ; + flower_N = mk2N "blomst" "blomsten" ; + fog_N = mk2N "tåke" "tåka" ; foot_N = mk2N "fot" "føtter" ; forest_N = mk2N "skog" "skogen" ; fruit_N = fruit_N ; grass_N = mk2N "gras" "graset" ; - guts_N = mk2N "tarm" "tarmen" ; ---- involler + guts_N = mk2N "tarm" "tarmen" ; ---- involler hair_N = mk2N "hår" "håret" ; hand_N = mk2N "hånd" "hånden" ; @@ -155,7 +152,7 @@ concrete SwadeshNor of Swadesh = CatNor name_N = mk2N "navn" "navnet" ; neck_N = mk2N "nakke" "nakken" ; night_N = mkN "natt" "natta" "netter" "nettene" ; - nose_N = mk2N "nese" "nesen" ; + nose_N = mk2N "nese" "nesen" ; person_N = mk2N "person" "personen" ; rain_N = mk2N "regn" "regnet" ; river_N = river_N ; @@ -167,7 +164,7 @@ concrete SwadeshNor of Swadesh = CatNor sea_N = sea_N ; seed_N = mk2N "frø" "frøet" ; skin_N = mk2N "skinn" "skinnet" ; - sky_N = mkN "himmel" "himmelen" "himler" "himlene" ; + sky_N = mkN "himmel" "himmelen" "himler" "himlene" ; smoke_N = mk2N "røyk" "røyken" ; snake_N = snake_N ; snow_N = mk2N "snø" "snøen" ; @@ -176,7 +173,7 @@ concrete SwadeshNor of Swadesh = CatNor stone_N = stone_N ; sun_N = sun_N ; tail_N = mk2N "hale" "halen" ; - tongue_N = mk2N "tunge" "tunga" ; + tongue_N = mk2N "tunge" "tunga" ; tooth_N = mkN "tann" "tanna" "tenner" "tennene" ; tree_N = tree_N ; water_N = water_N ; @@ -189,61 +186,61 @@ concrete SwadeshNor of Swadesh = CatNor -- Verbs - bite_V = VerbsNor.bite_V ; + bite_V = dirV2 (IrregNor.bite_V) ; blow_V = mk2V "blåse" "blåste" ; - breathe_V = regV "puste" ; + breathe_V = dirV2 (regV "puste") ; burn_V = brenne_V ; come_V = komme_V ; - count_V = regV "regne" ; - cut_V = skjære_V ; + count_V = dirV2 (regV "regne") ; + cut_V = dirV2 (skjære_V) ; die_V = dø_V ; dig_V = mk2V "grave" "gravde" ; - drink_V = drikke_V ; - eat_V = mk2V "spise" "spiste" ; ---- ete + drink_V = dirV2 (drikke_V) ; + eat_V = dirV2 (mk2V "spise" "spiste") ; fall_V = falle_V ; - fear_V = regV "frykte" ; - fight_V = slåss_V ; + fear_V = dirV2 (regV "frykte") ; + fight_V = dirV2 (slåss_V) ; float_V = flyte_V ; flow_V = renne_V ; fly_V = fly_V ; freeze_V = fryse_V ; - give_V = gi_V ; - hear_V = mk2V "høre" "hørde" ; - hit_V = slå_V; - hold_V = holde_V ; - hunt_V = regV "jakte" ; - kill_V = mk2V "drepe" "drepte" ; - know_V = vite_V ; + give_V = dirdirV3 gi_V ; + hear_V = dirV2 (mk2V "høre" "hørde") ; + hit_V = dirV2 (slå_V) ; + hold_V = dirV2 (holde_V) ; + hunt_V = dirV2 (regV "jakte") ; + kill_V = dirV2 (mk2V "drepe" "drepte") ; + know_V = dirV2 (vite_V) ; laugh_V = mkV "le" "ler" "les" "lo" "ledd" "le" ; lie_V = ligge_V ; live_V = mk2V "leve" "levde" ; play_V = mk2V "leke" "lekte" ; - pull_V = dra_V ; - push_V = irregV "skyve" "skjøv" "skjøvet" ; - rub_V = gni_V ; + pull_V = dirV2 (dra_V) ; + push_V = dirV2 (irregV "skyve" "skjøv" "skjøvet") ; + rub_V = dirV2 (gni_V) ; say_V = si_V ; - scratch_V = regV "klø" ; - see_V = se_V ; + scratch_V = dirV2 (regV "klø") ; + see_V = dirV2 (se_V) ; sew_V = mk2V "sy" "sydde" ; sing_V = synge_V ; sit_V = sitte_V ; sleep_V = sove_V ; - smell_V = regV "lukte" ; + smell_V = dirV2 (regV "lukte") ; spit_V = regV "spytte" ; - split_V = mk2V "kløyve" "kløyvde" ; - squeeze_V = mk2V "klemme" "klemte" ; - stab_V = stikke_V ; + split_V = dirV2 (mk2V "kløyve" "kløyvde") ; + squeeze_V = dirV2 (mk2V "klemme" "klemte") ; + stab_V = dirV2 (stikke_V) ; stand_V = stå_V ; - suck_V = suge_V ; + suck_V = dirV2 (suge_V) ; swell_V = partV (regV "hovne") "opp" ; swim_V = regV "simme" ; think_V = mk2V "tenke" "tenkte" ; - throw_V = regV "kaste" ; - tie_V = regV "knytte" ; + throw_V = dirV2 (regV "kaste") ; + tie_V = dirV2 (regV "knytte") ; turn_V = mk2V "vende" "vendte" ; vomit_V = partV (regV "kaste") "opp" ; walk_V = gå_V ; - wash_V = regV "vaske" ; - wipe_V = regV "tørke" ; + wash_V = dirV2 (regV "vaske") ; + wipe_V = dirV2 (regV "tørke") ; } diff --git a/lib/resource-1.0/swadesh/SwadeshSpa.gf b/lib/resource-1.0/swadesh/SwadeshSpa.gf index 509cc2302..f556ff10e 100644 --- a/lib/resource-1.0/swadesh/SwadeshSpa.gf +++ b/lib/resource-1.0/swadesh/SwadeshSpa.gf @@ -1,8 +1,7 @@ ---# -path=.:../abstract:../../prelude:../romance +--# -path=.:../spanish:../common:../abstract:../../prelude:../romance -concrete SwadeshSpa of Swadesh = CatSpa - ** open StructuralSpa, RulesSpa, SyntaxSpa, ParadigmsSpa, - BasicSpa, BeschSpa, Prelude in { +concrete SwadeshSpa of Swadesh = CatSpa + ** open PhonoSpa, MorphoSpa, LangSpa, ParadigmsSpa, BeschSpa, Prelude in { -- words contributed by Ana Bove, May 2005 @@ -23,14 +22,19 @@ concrete SwadeshSpa of Swadesh = CatSpa -- Determiners - this_Det = this_Det ; - that_Det = that_Det ; - all_Det = all_NDet ; + this_Det = DetSg (SgQuant this_Quant) NoOrd ; + that_Det = DetSg (SgQuant that_Quant) NoOrd ; + all_Det = { + s = \\g,c => prepCase c ++ genForms ["todos los"] ["todas las"] ! g ; + n = Pl + } ; many_Det = many_Det ; some_Det = someSg_Det ; - few_Det = mkDeterminer Pl "pocos" "pocas" ; - other_Det = mkDeterminer Pl "otros" "otras" ; - + few_Det = {s = \\g,c => prepCase c ++ genForms "pocos" "pocas" ! g ; n = Pl} ; + other_Det = { + s = \\g,c => prepCase c ++ genForms "otros" "otras" ! g ; + n = Pl + } ; -- Adverbs @@ -39,6 +43,7 @@ concrete SwadeshSpa of Swadesh = CatSpa where_IAdv = where_IAdv; when_IAdv = when_IAdv; how_IAdv = how_IAdv; + far_Adv = mkAdv "lejos" ; ----? -- not : Adv ; -- ? @@ -48,9 +53,9 @@ concrete SwadeshSpa of Swadesh = CatSpa -- Prepositions - at_Prep = justCase dative.p1 ; - in_Prep = StructuralSpa.in_Prep ; - with_Prep = StructuralSpa.with_Prep ; + at_Prep = dative ; + in_Prep = in_Prep ; + with_Prep = with_Prep ; -- Numerals @@ -71,7 +76,6 @@ concrete SwadeshSpa of Swadesh = CatSpa dirty_A = dirty_A ; dry_A = regA "seco" ; dull_A = regA "desafilado" ; - far_A = regA "lejos" ; ----? full_A = regA "lleno" ; good_A = good_A ; green_A = green_A ; @@ -189,60 +193,61 @@ concrete SwadeshSpa of Swadesh = CatSpa -- Verbs - bite_V = verboV (morder_50b "morder") ; + bite_V = dirV2 (verboV (morder_50b "morder")) ; blow_V = regV "soplar" ; - breathe_V = regV "respirar" ; + breathe_V = dirV2 (regV "respirar") ; burn_V = regV "quemar" ; - come_V = BasicSpa.come_V ; - count_V = verboV (contar_38b "contar") ; - cut_V = regV "cortar" ; - die_V = BasicSpa.die_V ; + come_V = come_V ; + count_V = dirV2 (verboV (contar_38b "contar")) ; + cut_V = dirV2 (regV "cortar") ; + die_V = die_V ; dig_V = regV "escarbar" ; - drink_V = regV "tomar" ; - eat_V = regV "comer" ; + drink_V = dirV2 (regV "tomar") ; + eat_V = dirV2 (regV "comer") ; fall_V = verboV (caer_20 "caer") ; - fear_V = fear_VS ; - fight_V = regV "pelear" ; + fear_V = dirV2 (fear_VS) ; + fight_V = dirV2 (regV "pelear") ; float_V = regV "flotar" ; - flow_V = verboV (influir_45 "fluir") ; -- circular + flow_V = verboV (influir_45 "fluir") ; -- circular fly_V = regV "volar" ; freeze_V = regV "congelar" ; - give_V = verboV (dar_27 "dar") ; - hear_V = hear_V2 ; - hit_V = regV "golpear" ; -- pegar - hold_V = verboV (tener_4 "tener") ; -- agarrar - hunt_V = regV "cazar" ; - kill_V = regV "matar" ; - know_V = know_V2 ; - laugh_V = regV "reir" ; ----V reír_67 - lie_V = regV "mentir" ; -- "acostarse" + give_V = dirdirV3 (verboV (dar_27 "dar")) ; + hear_V = dirV2 (hear_V2) ; + hit_V = dirV2 (regV "golpear") ; + hold_V = dirV2 (verboV (tener_4 "tener")) ; + hunt_V = dirV2 (regV "cazar") ; + kill_V = dirV2 (regV "matar") ; + know_V = dirV2 (know_V2) ; + laugh_V = regV "reir" ; ----V reír_67 + lie_V = reflV (regV "acostar") ; -- "acostarse" live_V = live_V ; play_V = regV "jugar" ; - pull_V = regV "tirar" ; - push_V = regV "empujar" ; - rub_V = regV "resfregar" ; -- frotar + pull_V = dirV2 (regV "tirar") ; + push_V = dirV2 (regV "empujar") ; + rub_V = dirV2 (regV "resfregar") ; say_V = say_VS ; - scratch_V = regV "rascar" ; - see_V = see_V2 ; + scratch_V = dirV2 (regV "rascar") ; + see_V = dirV2 (see_V2) ; sew_V = regV "coser" ; sing_V = regV "cantar" ; - sit_V = regV "sentar" ; ----V verboV (sedere_84 "sentarse") ; + sit_V = reflV (regV "sentar") ; sleep_V = sleep_V ; - smell_V = verboV (oler_52 "oler") ; + smell_V = dirV2 (verboV (oler_52 "oler")) ; spit_V = regV "escupir" ; - split_V = regV "separar" ; -- dividir, partir - squeeze_V = regV "exprimir" ; - stab_V = regV "apuñalar" ; - stand_V = verboV (estar_2 "estar") ; ---- "estar de pie" ; - suck_V = regV "chupar" ; + split_V = dirV2 (regV "separar") ; -- dividir,) ; + squeeze_V = dirV2 (regV "exprimir") ; + stab_V = dirV2 (regV "apuñalar") ; + stand_V = verboV (estar_2 "estar") ; ---- "estar de pie" ; + suck_V = dirV2 (regV "chupar") ; swell_V = regV "tragar" ; swim_V = regV "nadar" ; think_V = regV "pensar" ; - throw_V = regV "tirar" ; - tie_V = regV "atar" ; + throw_V = dirV2 (regV "tirar") ; + tie_V = dirV2 (regV "atar") ; turn_V = regV "doblar" ; vomit_V = regV "vomitar" ; walk_V = regV "caminar" ; - wash_V = regV "lavar" ; - wipe_V = regV "secar" ; + wash_V = dirV2 (regV "lavar") ; + wipe_V = dirV2 (regV "secar") ; + }