diff --git a/examples/peacekeeping/finnish/PeaceLexExt_Fin.gf b/examples/peacekeeping/finnish/PeaceLexExt_Fin.gf index 45b015166..eade50a49 100644 --- a/examples/peacekeeping/finnish/PeaceLexExt_Fin.gf +++ b/examples/peacekeeping/finnish/PeaceLexExt_Fin.gf @@ -20,16 +20,23 @@ concrete PeaceLexExt_Fin of PeaceLexExt = corpse_N = regN "ruumis" ; doctor_N = regN "lääkäri"; enemy_N = regN "vihollinen"; + face_N = regN "naama" ; ---- kasvot food_N = regN "ruoka"; friend_N = regN "ystävä"; + ground_N = regN "maa" ; + knife_N = reg2N "veitsi" "veitsiä" ; ---- veistä landmine_N = regN "maamiina" ; + map_N = regN "kartta" ; medicine_N = regN "lääke" ; + police8officer_N = regN "poliisi" ; skin_N = regN "iho" ; soldier_N = regN "sotilas" ; weapon_N = regN "ase"; -- Verbs cough_V = regV "yskiä" ; + drop_V2 = dirV2 (regV "pudottaa") ; + hurt_V = regV "sattua" ; need_V2 = dirV2 (regV "tarvita"); own_V2 = dirV2 (regV "omistaa") ; show_V3 = dirdirV3 (regV "näyttää") ; diff --git a/examples/peacekeeping/finnish/PeacePhrases_Fin.gf b/examples/peacekeeping/finnish/PeacePhrases_Fin.gf index f02b04d55..ee8f5ea61 100644 --- a/examples/peacekeeping/finnish/PeacePhrases_Fin.gf +++ b/examples/peacekeeping/finnish/PeacePhrases_Fin.gf @@ -1,7 +1,14 @@ --# -path=.:..:present:prelude concrete PeacePhrases_Fin of PeacePhrases = - PeaceCat_Fin ** { + PeaceCat_Fin ** open LangFin, ParadigmsFin in { +lin + Hello = { s = "terve" ++ "." } ; + GoodMorning = { s = ["hyvää huomenta"] ++ "." } ; + GoodEvening = { s = ["hyvää iltaa"] ++ "." } ; + WhatIsNamePron p = PhrUtt NoPConj (UttQS (UseQCl TPres ASimul PPos + (QuestVP whatSg_IP (UseComp (CompNP (DetCN (DetSg (SgQuant (PossPron p)) NoOrd) + (UseN (reg2N "nimi" "nimiä")))))))) NoVoc ; } \ No newline at end of file diff --git a/lib/resource-1.0/Makefile b/lib/resource-1.0/Makefile index daba50c73..0529751b5 100644 --- a/lib/resource-1.0/Makefile +++ b/lib/resource-1.0/Makefile @@ -14,7 +14,7 @@ pretest: echo "gr -cat=Cl -number=11 -prob | tb" | $(GF) -probs=lang.gfprob -path=present:prelude -nocf ../present/Lang???.gfc langs: - echo "s ;; pm | wf langs.gfcm" | $(GF) -nocf -src */Lang??*.gf english/LangEng.gf +RTS -p -M800M -K100M + echo "s ;; pm | wf langs.gfcm" | $(GF) -nocf -src */Lang??*.gf english/LangEng.gf +RTS -M800M -K100M cp -p */*.gfc */*.gfr ../alltenses present: