From 5cb91cd027fc6d545ac29ba0b32db9be0b27199c Mon Sep 17 00:00:00 2001 From: aarne Date: Wed, 19 Dec 2007 20:53:29 +0000 Subject: [PATCH] corrections prompted by Janna's examples in resource --- lib/resource/Examples/ExamplesI.gf | 26 ++++++++++++------------- lib/resource/danish/LexiconDan.gf | 2 +- lib/resource/finnish/LexiconFin.gf | 8 +++++--- lib/resource/finnish/ParadigmsFin.gf | 2 ++ lib/resource/french/StructuralFre.gf | 4 ++-- lib/resource/german/ResGer.gf | 2 +- lib/resource/norwegian/LexiconNor.gf | 4 ++-- lib/resource/romance/QuestionRomance.gf | 2 +- 8 files changed, 27 insertions(+), 23 deletions(-) diff --git a/lib/resource/Examples/ExamplesI.gf b/lib/resource/Examples/ExamplesI.gf index 1dbb7fb7d..b8cffb9b4 100644 --- a/lib/resource/Examples/ExamplesI.gf +++ b/lib/resource/Examples/ExamplesI.gf @@ -11,16 +11,16 @@ lin (PositA young_A) (PositA beautiful_A))))))) (UseCl TPast ASimul PPos (PredVP everything_NP (ComplVA become_VA (PositA probable_AS)))))))) ; - ex03 = mkText (UseCl TPres ASimul PPos (CleftNP (PredetNP only_Predet - (DetCN (DetPl ( IndefArt) (NumDigits n2_Digits) NoOrd) (UseN woman_N))) - (UseRCl TCond ASimul PPos (RelSlash IdRP - (AdvSlash (SlashPrep (PredVP (UsePron i_Pron) (ComplVV want_VV - (PassV2 see_V2))) with_Prep) (PrepNP in_Prep (DetCN (DetSg - (DefArt) NoOrd) (UseN rain_N)))))))) ; + ex03 = mkText (UseCl TPres ASimul PPos (ExistNP (PredetNP only_Predet + (DetCN (DetPl IndefArt (NumNumeral (num (pot2as3 (pot1as2 (pot0as1 + (pot0 n2)))))) NoOrd) (AdvCN (RelCN (UseN woman_N) (UseRCl TCond ASimul + PPos (RelSlash IdRP (SlashPrep (PredVP (UsePron i_Pron) (ComplVV want_VV + (PassV2 see_V2))) with_Prep)))) (PrepNP in_Prep (DetCN (DetSg DefArt NoOrd) + (UseN rain_N)))))))) ; ex04 = mkText (UttNP (DetCN someSg_Det (RelCN (UseN day_N) (UseRCl TFut ASimul PPos - (RelCl (ExistNP (AdvNP (DetCN (DetSg ( IndefArt) NoOrd) - (UseN peace_N)) (PrepNP on_Prep (DetCN (DetSg ( IndefArt) + (RelCl (ExistNP (AdvNP (DetCN (DetSg MassDet NoOrd) + (UseN peace_N)) (PrepNP on_Prep (DetCN (DetSg DefArt NoOrd) (UseN earth_N)))))))))) ; ex05 = mkText (UseCl TPres ASimul PPos (PredVP (UsePron they_Pron) (AdvVP @@ -48,7 +48,7 @@ lin youSg_Pron)love_V2)))))) ; ex10 = mkText (UseCl TPres ASimul PPos (PredSCVP (EmbedS (UseCl TPres ASimul PNeg - (PredVP (UsePron i_Pron) (UseComp (CompAP (ReflA2 married_A2)))))) + (PredVP (UsePron she_Pron) (UseComp (CompAP (ReflA2 married_A2)))))) (ComplV2 kill_V2 (UsePron i_Pron)))) ; ex11 = (TQuestMark (PhrUtt (PConjConj and_Conj) (UttQS (UseQCl TPres ASimul @@ -109,7 +109,7 @@ lin ex23 = mkText (UttVP (PassV2 know_V2)) ; - ex24 = mkText (UseCl TPres ASimul PPos (PredVP (DetCN (DetSg MassDet NoOrd) (SentCN + ex24 = mkText (UseCl TPres ASimul PPos (PredVP (DetCN (DetSg IndefArt NoOrd) (SentCN (UseN song_N) (EmbedVP (UseV sing_V)))) (UseComp (CompAP (PositA (UseA2 easy_A2V)))))) ; @@ -119,13 +119,13 @@ lin ex26 = mkText (UseCl TPres ASimul PPos (PredVP (UsePron she_Pron) (UseComp (CompAP (AdAP almost_AdA (SentAP (ComplA2 married_A2 (DetCN (DetSg ( - (PossPron she_Pron)) NoOrd) (UseN cousin_N))) (EmbedQS (UseQCl - TPast ASimul PPos (QuestCl (PredVP (UsePron youPol_Pron) + (PossPron she_Pron)) NoOrd) (UseN cousin_N))) (SubjS if_Subj (UseCl + TPast ASimul PPos ((PredVP (UsePron youPol_Pron) (ComplV2 watch_V2 (DetCN (DetSg ( DefArt) NoOrd) (UseN television_N))))))))))))) ; ex27 = mkText (UseCl TPres ASimul PPos (ImpersCl (ComplVV can8know_VV (UseComp - (CompAdv (PositAdvAdj important_A)))))) ; + (CompAP (PositA important_A)))))) ; } diff --git a/lib/resource/danish/LexiconDan.gf b/lib/resource/danish/LexiconDan.gf index 0d24d4ccd..11a47a78b 100644 --- a/lib/resource/danish/LexiconDan.gf +++ b/lib/resource/danish/LexiconDan.gf @@ -317,7 +317,7 @@ lin flow_V = regV "strømme" ; fly_V = vaereV flyve_V ; freeze_V = fryse_V ; - give_V3 = dirdirV3 give_V ; + give_V3 = dirV3 give_V (mkPrep "til"); hit_V2 = dirV2 (slå_V) ; hold_V2 = dirV2 (holde_V) ; hunt_V2 = dirV2 (regV "jage") ; diff --git a/lib/resource/finnish/LexiconFin.gf b/lib/resource/finnish/LexiconFin.gf index eee95e0a8..7d78cd6c3 100644 --- a/lib/resource/finnish/LexiconFin.gf +++ b/lib/resource/finnish/LexiconFin.gf @@ -68,7 +68,8 @@ lin dog_N = nLukko "koira" ; door_N = nArpi "ovi" ; drink_V2 = dirV2 (regV "juoda") ; - easy_A2V = mkA2V (mkA (nLukko "helppo")) (casePrep allative) ; + easy_A2V = mkA2V (mkADeg (nLukko "helppo") "helpompi" "helpoin") + (casePrep allative) ; eat_V2 = dirV2 (regV "syödä") ; empty_A = mkADeg (nLukko "tyhjä") "tyhjempi" "tyhjin" ; enemy_N = regN "vihollinen" ; @@ -82,7 +83,7 @@ lin fridge_N = regN "jääkaappi" ; friend_N = nLukko "ystävä" ; fruit_N = nLukko "hedelmä" ; - fun_AV = mkAV (mkA (nLukko "hauska")) ; + fun_AV = mkAV (mkADeg (nLukko "hauska") "hauskempi" "hauskin") ; garden_N = nKukko "puutarha" "puutarhan" "puutarhoja" ; girl_N = nLukko "tyttö" ; glove_N = regN "käsine" ; @@ -145,7 +146,8 @@ lin play_V2 = mkV2 (regV "pelata") cpartitive ; --- leikkiä, soittaa policeman_N = regN "poliisi" ; priest_N = regN "pappi" ; - probable_AS = mkAS (mkA (nNainen "todennäköistä")) ; --- for vowel harmony + probable_AS = mkAS --- for vowel harmony + (mkADeg (nNainen "todennäköistä") "tonennäköisempi" "todennälöisin") ; queen_N = regN "kuningatar" ; radio_N = reg2N "radio" "radioita" ; rain_V0 = mkV0 (reg2V "sataa" "satoi") ; diff --git a/lib/resource/finnish/ParadigmsFin.gf b/lib/resource/finnish/ParadigmsFin.gf index 3f4b82e1d..49a075ee0 100644 --- a/lib/resource/finnish/ParadigmsFin.gf +++ b/lib/resource/finnish/ParadigmsFin.gf @@ -502,6 +502,8 @@ reg3N = \vesi,veden,vesi } ; mk1A = \x -> {s = \\_ => (noun2adj x).s ; lock_A = <>} ; + ---- mkADeg (noun2adj x).s ... + mkA2 = \x,c -> x ** {c2 = c ; lock_A2 = <>} ; mkADeg x kivempi kivin = let diff --git a/lib/resource/french/StructuralFre.gf b/lib/resource/french/StructuralFre.gf index 0ed11ac39..23bd4ba6d 100644 --- a/lib/resource/french/StructuralFre.gf +++ b/lib/resource/french/StructuralFre.gf @@ -119,10 +119,10 @@ lin mkPronoun "nous" "nous" "nous" "nous" "notre" "notre" "nos" Masc Pl P1 ; whatSg_IP = - {s = \\c => prepCase c ++ quelPron ! a ; a = a} + {s = \\c => prepCase c ++ "quoi" ; a = a} where {a = aagr Masc Sg} ; whatPl_IP = - {s = \\c => prepCase c ++ quelPron ! a ; a = a} + {s = \\c => prepCase c ++ "quoi" ; a = a} where {a = aagr Masc Pl} ; when_IAdv = ss "quand" ; when_Subj = ss "quand" ** {m = Indic} ; diff --git a/lib/resource/german/ResGer.gf b/lib/resource/german/ResGer.gf index 374c7e95e..58fc7cec5 100644 --- a/lib/resource/german/ResGer.gf +++ b/lib/resource/german/ResGer.gf @@ -581,7 +581,7 @@ resource ResGer = ParamX ** open Prelude in { infVP : Bool -> VP -> ((Agr => Str) * Str * Str) = \isAux, vp -> < \\agr => vp.n2 ! agr ++ vp.a2, - (vp.s ! (notB isAux) ! agrP3 Sg ! VPInfinit Simul).inf, + vp.a1 ! Pos ++ (vp.s ! (notB isAux) ! agrP3 Sg ! VPInfinit Simul).inf, vp.inf ++ vp.ext > ; diff --git a/lib/resource/norwegian/LexiconNor.gf b/lib/resource/norwegian/LexiconNor.gf index 282f5c612..b674dd97d 100644 --- a/lib/resource/norwegian/LexiconNor.gf +++ b/lib/resource/norwegian/LexiconNor.gf @@ -16,7 +16,7 @@ lin baby_N = mk2N "baby" "babyen" ; bad_A = regADeg "dårlig" ; ---- bank_N = mk2N "bank" "banken" ; - beautiful_A = mk3ADeg "vakker" "vakkert" "vakra" ; + beautiful_A = mk3ADeg "vakker" "vakkert" "vakre" ; become_VA = mkVA (vaereV bli_V) ; beer_N = regGenN "øl" neutrum ; beg_V2V = mkV2V be_V noPrep (mkPrep "at") ; @@ -315,7 +315,7 @@ lin flow_V = renne_V ; fly_V = vaereV IrregNor.fly_V ; freeze_V = fryse_V ; - give_V3 = dirdirV3 gi_V ; + give_V3 = dirV3 gi_V (mkPrep "til"); hit_V2 = dirV2 (slå_V) ; hold_V2 = dirV2 (holde_V) ; hunt_V2 = dirV2 (regV "jakte") ; diff --git a/lib/resource/romance/QuestionRomance.gf b/lib/resource/romance/QuestionRomance.gf index 134448629..bb878abe9 100644 --- a/lib/resource/romance/QuestionRomance.gf +++ b/lib/resource/romance/QuestionRomance.gf @@ -53,7 +53,7 @@ incomplete concrete QuestionRomance of Question = } ; PrepIP p ip = { - s = p.s ++ ip.s ! accusative + s = p.s ++ ip.s ! p.c } ; AdvIP ip adv = {