From a70f2c286ce519f235efdf513ad9f35e4abda127 Mon Sep 17 00:00:00 2001 From: aarne Date: Wed, 8 Feb 2006 10:52:58 +0000 Subject: [PATCH] Romance reflexives in lexicon; German infinitival phrase --- lib/resource-1.0/french/LexiconFre.gf | 13 +++---------- lib/resource-1.0/german/ResGer.gf | 7 +++++++ lib/resource-1.0/german/VerbGer.gf | 13 +++++-------- lib/resource-1.0/italian/LexiconIta.gf | 4 ++-- lib/resource-1.0/spanish/LexiconSpa.gf | 4 ++-- 5 files changed, 19 insertions(+), 22 deletions(-) diff --git a/lib/resource-1.0/french/LexiconFre.gf b/lib/resource-1.0/french/LexiconFre.gf index 05ae4dff0..336c449cd 100644 --- a/lib/resource-1.0/french/LexiconFre.gf +++ b/lib/resource-1.0/french/LexiconFre.gf @@ -208,7 +208,7 @@ lin wine_N = regN "vin" masculine ; win_V2 = dirV2 (regV "gagner") ; ---- vaincre woman_N = regN "femme" feminine ; - wonder_VQ = mkVQ (regV "étonner") ; ----- s'étonner + wonder_VQ = mkVQ (reflV (regV "étonner")) ; wood_N = regN "bois" masculine ; write_V2 = écrire_V2 ; yellow_A = regA "jaune" ; @@ -221,14 +221,7 @@ lin add_V3 = dirV3 (regV "ajouter") dative ; number_N = regN "nombre" masculine ; ---- numéro put_V2 = mettre_V2 ; - stop_V = regV "arrêter" ; ---- s'arrêter + stop_V = reflV (regV "arrêter") ; jump_V = regV "sauter" ; -{- - here_Adv = mkAdv "ici" ; - here7to_Adv = mkAdv "ici" ; - here7from_Adv = mkAdv ["d'ici"] ; - there_Adv = mkAdv "là" ; ---- y, là-bas - there7to_Adv = mkAdv "là" ; --- y - there7from_Adv = mkAdv ["de là"] ; ---- en --} + } ; diff --git a/lib/resource-1.0/german/ResGer.gf b/lib/resource-1.0/german/ResGer.gf index fb98900a7..22e73088b 100644 --- a/lib/resource-1.0/german/ResGer.gf +++ b/lib/resource-1.0/german/ResGer.gf @@ -515,6 +515,13 @@ resource ResGer = ParamX ** open Prelude in { } } ; + infVP : Bool -> VP -> ((Agr => Str) * Str * Str) = \isAux, vp -> + < + \\agr => vp.n2 ! agr ++ vp.a2, + infPart isAux ++ (vp.s ! agrP3 Sg ! VPInfinit Simul).inf, + vp.inf ++ vp.ext + > ; + -- The nominative case is not used as reflexive, but defined here -- so that we can reuse this in personal pronouns. -- The missing Sg "ihrer" shows that a dependence on gender would diff --git a/lib/resource-1.0/german/VerbGer.gf b/lib/resource-1.0/german/VerbGer.gf index f94fdcbb8..9a0cbbd92 100644 --- a/lib/resource-1.0/german/VerbGer.gf +++ b/lib/resource-1.0/german/VerbGer.gf @@ -11,15 +11,12 @@ concrete VerbGer of Verb = CatGer ** open Prelude, ResGer in { ComplVV v vp = let - compl : Agr -> (Str * Str) = \a -> - let - vpi = vp.s ! a ! VPInfinit Simul - in - ; - obj : Agr => Str = \\a => (compl a).p1 ; - inf : Str = (compl (agrP3 Sg)).p2 ; --- agr makes no diff here + vpi = infVP v.isAux vp in - insertInf inf (insertObj obj (predVGen v.isAux v)) ; + insertExtrapos vpi.p3 ( + insertInf vpi.p2 ( + insertObj vpi.p1 ( + predVGen v.isAux v))) ; ComplVS v s = insertExtrapos (conjThat ++ s.s ! Sub) (predV v) ; diff --git a/lib/resource-1.0/italian/LexiconIta.gf b/lib/resource-1.0/italian/LexiconIta.gf index 667bcd224..f1f7ab9a5 100644 --- a/lib/resource-1.0/italian/LexiconIta.gf +++ b/lib/resource-1.0/italian/LexiconIta.gf @@ -207,7 +207,7 @@ lin wine_N = regN "vino" ; win_V2 = dirV2 (verboV (vincere_94 "vincere")) ; woman_N = regN "donna" ; - wonder_VQ = mkVQ (regV "domandare") ; ---- domandarsi + wonder_VQ = mkVQ (reflV (regV "domandare")) ; wood_N = regN "legno" ; write_V2 = dirV2 (verboV (scrivere_82 "scrivere")) ; yellow_A = regADeg "giallo" ; @@ -220,7 +220,7 @@ lin add_V3 = dirV3 (verboV (giungere_55 "aggiungere")) dative ; number_N = regN "numero" ; put_V2 = dirV2 (verboV (mettere_57 "mettere")) ; - stop_V = regV "fermare" ; ---- fermarsi + stop_V = reflV (regV "fermare") ; jump_V = regV "saltare" ; {- here_Adv = mkAdv "quì" ; diff --git a/lib/resource-1.0/spanish/LexiconSpa.gf b/lib/resource-1.0/spanish/LexiconSpa.gf index b631b8315..5a38ae085 100644 --- a/lib/resource-1.0/spanish/LexiconSpa.gf +++ b/lib/resource-1.0/spanish/LexiconSpa.gf @@ -16,7 +16,7 @@ lin bad_A = prefA (mkADeg (regA "malo") (regA "peor")) ; bank_N = regN "banco" ; beautiful_A = prefA (regADeg "bello") ; -- bella - become_VA = regV "conventir" ; --- convertirse en, volverse, ponerse + become_VA = reflV (regV "convertir") ; --- convertirse en, volverse, ponerse beer_N = regN "cerveza" ; beg_V2V = mkV2V (regV "rogar") accusative dative ; -- pedir big_A = prefA (regADeg "grande") ; @@ -206,7 +206,7 @@ lin wine_N = regN "vino" ; win_V2 = dirV2 (regV "ganar") ; woman_N = femN (regN "mujer") ; - wonder_VQ = mkVQ (regV "preguntar") ; ---- preguntarse + wonder_VQ = mkVQ (reflV (regV "preguntar")) ; wood_N = regN "madera" ; write_V2 = dirV2 (special_ppV (regV "escribir") "escrito") ; yellow_A = regADeg "amarillo" ;