diff --git a/examples/tram/Tram.gf b/examples/tram/Tram.gf index d8d497fdc..6a7fa1763 100644 --- a/examples/tram/Tram.gf +++ b/examples/tram/Tram.gf @@ -30,7 +30,7 @@ fun -- PClick : Click -> Place ; -- click associated with a "here" -- PHere : Place ; -- indexical "here", without a click - FromThisPlace : Dep ; -- "from this place" - ToThisPlace : Dest ; -- "to this place" +-- FromThisPlace : Dep ; -- "from this place" +-- ToThisPlace : Dest ; -- "to this place" } diff --git a/lib/resource-1.0/french/StructuralFre.gf b/lib/resource-1.0/french/StructuralFre.gf index 5aad85756..e760be671 100644 --- a/lib/resource-1.0/french/StructuralFre.gf +++ b/lib/resource-1.0/french/StructuralFre.gf @@ -5,7 +5,7 @@ concrete StructuralFre of Structural = CatFre ** lin - above_Prep = {s = ["au dessus"] ; c = genitive ; isDir = False} ; + above_Prep = {s = ["au dessus"] ; c = MorphoFre.genitive ; isDir = False} ; after_Prep = mkPreposition "après" ; all_Predet = {s = aagrForms "tout" "toute" "tous" "toutes"} ; almost_AdA, almost_AdN = ss "presque" ; diff --git a/lib/resource-1.0/german/log.txt b/lib/resource-1.0/german/log.txt index 9432feb97..a9caae84f 100644 --- a/lib/resource-1.0/german/log.txt +++ b/lib/resource-1.0/german/log.txt @@ -258,3 +258,10 @@ Known bugs: double infinitives in subordinate clauses. Known uncertainties: marked with ----, mostly in Structural and Basic. Work: ca 27h for whole German (but with support in 0.6 esp. morphology, Swedish). + + +22/1 + +Fixed double infinitives with a new field (isAux : Bool) in VP. Used in +mkClause. + diff --git a/lib/resource-1.0/romance/AdverbRomance.gf b/lib/resource-1.0/romance/AdverbRomance.gf index 8d97833ac..8f818f023 100644 --- a/lib/resource-1.0/romance/AdverbRomance.gf +++ b/lib/resource-1.0/romance/AdverbRomance.gf @@ -12,7 +12,7 @@ incomplete concrete AdverbRomance of Adverb = s = cadv.s ++ a.s ! Posit ! AA ++ conjThan ++ s.s ! Conjunct --- ne } ; - PrepNP prep np = {s = prep.s ++ np.s ! Ton Acc} ; + PrepNP prep np = {s = prep.s ++ np.s ! case2npform prep.c} ; AdAdv = cc2 ; diff --git a/lib/resource-1.0/romance/CatRomance.gf b/lib/resource-1.0/romance/CatRomance.gf index cac60880f..429179e8f 100644 --- a/lib/resource-1.0/romance/CatRomance.gf +++ b/lib/resource-1.0/romance/CatRomance.gf @@ -69,7 +69,7 @@ incomplete concrete CatRomance of Cat = PConj = {s : Str} ; CAdv = {s : Str} ; Subj = {s : Str ; m : Mood} ; - Prep = {s : Str} ; + Prep = {s : Str ; c : Case} ; -- Open lexical classes, e.g. Basic