1.1 --- a/isac-java/src/java-tests/isac/gui/mawen/TestUseCases.scala	Wed Aug 02 10:56:36 2017 +0200
     1.2 +++ b/isac-java/src/java-tests/isac/gui/mawen/TestUseCases.scala	Wed Aug 02 11:51:30 2017 +0200
     1.3 @@ -313,7 +313,7 @@
     1.4      assertEquals(ast,
     1.5        Appl(List(Constant("HOL.eq"), Appl(List(Variable("Program"), Constant("Simplify.Simplify"), Variable("t_t"))), Appl(List(Constant("Script.Repeat"), Appl(List(Constant("Script.Seq"), Appl(List(Constant("Script.Try"), Appl(List(Constant("Script.Rewrite'_Set"), Variable("klammern_aufloesen"), Constant("HOL.False"))))), Appl(List(Constant("Script.Seq"), Appl(List(Constant("Script.Try"), Appl(List(Constant("Script.Rewrite'_Set"), Variable("ordne_alphabetisch"), Constant("HOL.False"))))), Appl(List(Constant("Script.Seq"), Appl(List(Constant("Script.Try"), Appl(List(Constant("Script.Rewrite'_Set"), Variable("fasse_zusammen"), Constant("HOL.False"))))), Appl(List(Constant("Script.Try"), Appl(List(Constant("Script.Rewrite'_Set"), Variable("verschoenere"), Constant("HOL.False"))))))))))), Variable("t_t")))))
     1.6      )
     1.7 -    assertEquals(math_string_of(ast), "Program Simplify  t_t = Repeat Seq (Try (Rewrite'_Set klammern_aufloesen False )) Seq (Try (Rewrite'_Set ordne_alphabetisch False )) Seq (Try (Rewrite'_Set fasse_zusammen False )) (Try (Rewrite'_Set verschoenere False )) t_t")
     1.8 +    assertEquals(math_string_of(ast), "Program Simplify  t_t = Repeat Seq Try (Rewrite'_Set klammern_aufloesen False ) Seq Try (Rewrite'_Set ordne_alphabetisch False ) Seq Try (Rewrite'_Set fasse_zusammen False ) Try (Rewrite'_Set verschoenere False ) t_t")
     1.9     
    1.10      println("\\--END isac.gui.mawen.TestUseCases#testUC_ifthenelse");
    1.11    }

     2.1 --- a/isac-java/src/java-tests/isac/gui/mawen/syntax/TestAst.scala	Wed Aug 02 10:56:36 2017 +0200
     2.2 +++ b/isac-java/src/java-tests/isac/gui/mawen/syntax/TestAst.scala	Wed Aug 02 11:51:30 2017 +0200
     2.3 @@ -121,7 +121,6 @@
     2.4      assertEquals("aaa + bbb", Ast.math_string_of(TestDATAeditor.nest_CURSOR_BOX_3A))   
     2.5      assertEquals("aaa + bbb", Ast.math_string_of(TestDATAeditor.nest_CURSOR_BOX_3B))
     2.6      
     2.7 -    println(Ast.math_string_of(TestDATAeditor.box_05))
     2.8      assertEquals("d_d x x + d_d x (sin (x ^ 2))", Ast.math_string_of(TestDATAeditor.box_05))   
     2.9      assertEquals("d_d bdv (sin (u)) = cos (u) * d_d bdv u", Ast.math_string_of(TestDATAeditor.box_06))   
    2.10      assertEquals("d_d x x + cos (x ^ 2) * d_d x #", Ast.math_string_of(TestDATAeditor.box_07_with_cursor))   

     3.1 --- a/isac-java/src/java/isac/gui/mawen/syntax/ast.scala	Wed Aug 02 10:56:36 2017 +0200
     3.2 +++ b/isac-java/src/java/isac/gui/mawen/syntax/ast.scala	Wed Aug 02 11:51:30 2017 +0200
     3.3 @@ -103,7 +103,7 @@
     3.4      case Appl(List(Constant(str), a)) => {
     3.5        val uniop = XSyntax.isa_math(str)
     3.6        if (Set("Diff ", "Integrate ", "solve ").contains(uniop)) uniop + to_tuple(a, 0, "none")
     3.7 -      else if (prior == 99 & XSyntax.isa_prior(str) == 99) //FIXME: handles "d_d x (! sin(_) !)" as special case
     3.8 +      else if (prior == 99 & XSyntax.isa_prior(str) == 70) //FIXME: handles "d_d x (! sin(_) !)" as special case
     3.9          XLibrary.enclose("(", ")", uniop + XLibrary.enclose("(", ")", to_str(a, 0, "none")))
    3.10        else
    3.11          uniop + XLibrary.enclose("(", ")", to_str(a, 0, "none"))