From 7cce7e64622380deab723f587e74911dafe3aba8 Mon Sep 17 00:00:00 2001 From: aarne Date: Tue, 24 Jan 2006 21:51:17 +0000 Subject: [PATCH] infinitive marks in EmbedVP, bugs noticed --- lib/resource-1.0/english/SentenceEng.gf | 2 +- lib/resource-1.0/french/StructuralFre.gf | 2 +- lib/resource-1.0/german/SentenceGer.gf | 2 +- lib/resource-1.0/romance/SentenceRomance.gf | 2 +- lib/resource-1.0/scandinavian/SentenceScand.gf | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/resource-1.0/english/SentenceEng.gf b/lib/resource-1.0/english/SentenceEng.gf index 7eacdca8f..02716c771 100644 --- a/lib/resource-1.0/english/SentenceEng.gf +++ b/lib/resource-1.0/english/SentenceEng.gf @@ -36,6 +36,6 @@ concrete SentenceEng of Sentence = CatEng ** open ResEng in { EmbedS s = {s = conjThat ++ s.s} ; EmbedQS qs = {s = qs.s ! QIndir} ; - EmbedVP vp = {s = infVP vp (agrP3 Sg)} ; --- agr + EmbedVP vp = {s = "to" ++ infVP vp (agrP3 Sg)} ; --- agr } diff --git a/lib/resource-1.0/french/StructuralFre.gf b/lib/resource-1.0/french/StructuralFre.gf index 88e37b127..6a57e7a55 100644 --- a/lib/resource-1.0/french/StructuralFre.gf +++ b/lib/resource-1.0/french/StructuralFre.gf @@ -86,7 +86,7 @@ lin there7to_Adv = ss "là" ; --- y there_Adv = ss "là" ; therefore_PConj = ss "donc" ; - these_NP = pn2np (mkPN ["celles-ci"] Fem) ; + these_NP = pn2np (mkPN ["celles-ci"] Fem) ; ---- Pl these_Quant = {s = \\_,c => prepCase c ++ "ces"} ; ---- ci they_Pron = mkPronoun "elles" "les" "leur" "eux" "leur" "leur" "leurs" diff --git a/lib/resource-1.0/german/SentenceGer.gf b/lib/resource-1.0/german/SentenceGer.gf index 66e197f51..6c7b7ceb7 100644 --- a/lib/resource-1.0/german/SentenceGer.gf +++ b/lib/resource-1.0/german/SentenceGer.gf @@ -35,6 +35,6 @@ concrete SentenceGer of Sentence = CatGer ** open ResGer in { EmbedS s = {s = conjThat ++ s.s ! Sub} ; EmbedQS qs = {s = qs.s ! QIndir} ; - EmbedVP vp = {s = (vp.s ! agrP3 Sg ! VPInfinit Simul).inf} ; --- agr + EmbedVP vp = {s = "zu" ++ (vp.s ! agrP3 Sg ! VPInfinit Simul).inf} ; --- agr ---- compl } diff --git a/lib/resource-1.0/romance/SentenceRomance.gf b/lib/resource-1.0/romance/SentenceRomance.gf index 103cbc8ec..00e05e36c 100644 --- a/lib/resource-1.0/romance/SentenceRomance.gf +++ b/lib/resource-1.0/romance/SentenceRomance.gf @@ -38,6 +38,6 @@ incomplete concrete SentenceRomance of Sentence = EmbedS s = {s = conjThat ++ s.s ! Indic} ; --- mood EmbedQS qs = {s = qs.s ! QIndir} ; - EmbedVP vp = {s = infVP vp (agrP3 Masc Sg)} ; --- agr + EmbedVP vp = {s = infVP vp (agrP3 Masc Sg)} ; --- agr ---- compl } diff --git a/lib/resource-1.0/scandinavian/SentenceScand.gf b/lib/resource-1.0/scandinavian/SentenceScand.gf index a4dc19470..9cd762344 100644 --- a/lib/resource-1.0/scandinavian/SentenceScand.gf +++ b/lib/resource-1.0/scandinavian/SentenceScand.gf @@ -38,6 +38,6 @@ incomplete concrete SentenceScand of Sentence = EmbedS s = {s = conjThat ++ s.s ! Sub} ; EmbedQS qs = {s = qs.s ! QIndir} ; - EmbedVP vp = {s = infVP vp (agrP3 utrum Sg)} ; --- agr + EmbedVP vp = {s = infMark ++ infVP vp (agrP3 utrum Sg)} ; --- agr }