diff --git a/resource-0.6/english/SyntaxEng.gf b/resource-0.6/english/SyntaxEng.gf index 2c67bf265..38855c8a6 100644 --- a/resource-0.6/english/SyntaxEng.gf +++ b/resource-0.6/english/SyntaxEng.gf @@ -634,10 +634,10 @@ s ; s2 = [] ; isAux = False} ; (try.s ! InfImp ++ try.s1) ; -- ... try in {s = \\b,v => if_then_Str b - (try.s ! v ++ try.s1 ++ to ++ run.s ! True ! InfImp) + (try.s ! v ++ try.s1) (dont ! v) ; s2 = \\b,v => if_then_Str b - (run.s2 ! True ! v) + (to ++ run.s ! True ! InfImp ++ run.s2 ! True ! v) (trnot ++ run.s ! True ! InfImp ++ run.s2 ! True ! v) ; isAuxT = taux ; isAuxF = True diff --git a/resource-0.6/english/TestResourceEng.gf b/resource-0.6/english/TestResourceEng.gf index 0a18ebd5b..f1e2c719e 100644 --- a/resource-0.6/english/TestResourceEng.gf +++ b/resource-0.6/english/TestResourceEng.gf @@ -2,7 +2,7 @@ concrete TestResourceEng of TestResource = StructuralEng ** open SyntaxEng, ParadigmsEng in { -flags startcat=Phr ; lexer=textlit ; parser=chart ; unlexer=text ; +flags startcat=Phr ; lexer=textlit ; unlexer=text ; -- a random sample from the lexicon diff --git a/resource-0.6/german/MorphoGer.gf b/resource-0.6/german/MorphoGer.gf index b7e704882..178525760 100644 --- a/resource-0.6/german/MorphoGer.gf +++ b/resource-0.6/german/MorphoGer.gf @@ -492,7 +492,7 @@ oper -- Modal auxiliary verbs verbumAux : (_,_,_,_,_ : Str) -> Verbum = \können,kann,konnte,könnte,gekonnt -> - let k = (verbumStrongLaufen können kann konnte könnte gekonnt) + let k = mkVerbum können kann kann konnte könnte gekonnt ;--- (verbumStrongLaufen können kann konnte könnte gekonnt) in table { VInd Sg P1 => kann ; diff --git a/resource-0.6/german/SyntaxGer.gf b/resource-0.6/german/SyntaxGer.gf index 486447368..cdb8def0c 100644 --- a/resource-0.6/german/SyntaxGer.gf +++ b/resource-0.6/german/SyntaxGer.gf @@ -605,7 +605,7 @@ oper complVerbVerb : VerbVerb -> VerbGroup -> VerbGroup = \will, essen -> will ** { - s3 = \\b,_ => negation b ++ + s3 = \\b,n => essen.s3 ! True ! n ++ negation b ++ essen.s2 ++ zuInfinitive will.isAux ++ essen.s ! VInf ; s4 = essen.s4 } ; diff --git a/resource-0.6/german/TestResourceGer.gf b/resource-0.6/german/TestResourceGer.gf index 61e4abec2..aa24dc51d 100644 --- a/resource-0.6/german/TestResourceGer.gf +++ b/resource-0.6/german/TestResourceGer.gf @@ -3,7 +3,7 @@ concrete TestResourceGer of TestResource = StructuralGer ** open SyntaxGer in { -flags startcat=Phr ; lexer=text ; parser=chart ; unlexer=text ; +flags startcat=Phr ; lexer=text ; unlexer=text ; -- a random sample from the lexicon