diff -r 95d956108461 -r 460c24a6a6ba test/Tools/isac/Knowledge/rlang.sml
--- a/test/Tools/isac/Knowledge/rlang.sml	Tue Sep 28 08:58:06 2010 +0200
+++ b/test/Tools/isac/Knowledge/rlang.sml	Tue Sep 28 09:06:56 2010 +0200
@@ -79,7 +79,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 2]")) => ()
-	 | _ => raise error "rlang.sml: diff.behav. in Schalk I s.86 Bsp 5 [x = 2]";
+	 | _ => error "rlang.sml: diff.behav. in Schalk I s.86 Bsp 5 [x = 2]";
 
 (*-----------------  Schalk I s.86 Bsp 19 ------------------------*)
 "Schalk I s.86 Bsp 19 (x - 5)*(10 - x) = (3 - x)*(2 + x) + 2*(x + 20)";
@@ -109,7 +109,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 8]")) => ()
-	 | _ => raise error "rlang.sml: diff.behav. in Schalk I s.86 Bsp 19 [x = 8]";
+	 | _ => error "rlang.sml: diff.behav. in Schalk I s.86 Bsp 19 [x = 8]";
 
 (*-----------------  Schalk I s.86 Bsp 23 ------------------------*)
 "Schalk I s.86 Bsp 19 ((2*x+5)^^^2+(3*x+4)^^^2=(13*x+2)*(x+1)+2*(15+14*x))";
@@ -139,7 +139,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = -9]")) => ()
-	 | _ => raise error "rlang.sml: diff.behav. in Schalk I s.86 Bsp 23 [x = -9]";
+	 | _ => error "rlang.sml: diff.behav. in Schalk I s.86 Bsp 23 [x = -9]";
 
 (*-----------------  Schalk I s.86 Bsp 25 ------------------------*)
 "Schalk I s.86 Bsp 25 ((2*x+1)^^^3+(x+1)^^^3=(2*x+1)^^^2*2*x+(x+2)^^^3+x^^^2)";
@@ -169,7 +169,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = -6 / 5]")) => ()
-	 | _ => raise error "rlang.sml: diff.behav. in Schalk I s.86 Bsp 25 [x = -6 / 5]";
+	 | _ => error "rlang.sml: diff.behav. in Schalk I s.86 Bsp 25 [x = -6 / 5]";
 
 (*-----------------  Schalk I s.86 Bsp 28b ------------------------*)
 "Schalk I s.86 Bsp 28b ((3*x+5)/18 - x/2 = -((3*x - 2)/9))";
@@ -197,7 +197,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt; f2str f;
 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[]")) => ()
-	 | _ => raise error "rlang.sml: diff.behav. in Schalk I s.86 Bsp 28b []";
+	 | _ => error "rlang.sml: diff.behav. in Schalk I s.86 Bsp 28b []";
 
 (*WN---v *)
 val bdv= (term_of o the o (parse thy)) "bdv";
@@ -205,12 +205,12 @@
 val t = (term_of o the o (parse thy)) "3 * x / 5";
 val SOME (t',_) = rewrite_set_inst_ PolyEq.thy true 
 				    [(bdv, v)] make_ratpoly_in t;
-if term2str t' = "3 / 5 * x" then () else raise error "rlang.sml: 1";
+if term2str t' = "3 / 5 * x" then () else error "rlang.sml: 1";
 
 val t = str2term "(3*x+5)/18 - x/2  - -(3*x - 2)/9 = 0";
 val subst = [(str2term "bdv", str2term "x")];
 val SOME (t',_) = rewrite_set_inst_ thy false subst make_ratpoly_in t;
-if term2str t' = "1 / 18 = 0" then () else raise error "rlang.sml: 2";
+if term2str t' = "1 / 18 = 0" then () else error "rlang.sml: 2";
 (*WN---^ *)
 
 (*-----------------  Schalk I s.87 Bsp 36b ------------------------*)
@@ -240,7 +240,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = -237 / 65]")) => ()
-	 | _ => raise error "rlang.sml: diff.behav. in Schalk I s.86 Bsp 36b [x = -237 / 65]";
+	 | _ => error "rlang.sml: diff.behav. in Schalk I s.86 Bsp 36b [x = -237 / 65]";
 
 
 (*WN---v *)
@@ -249,7 +249,7 @@
 val SOME (t',_) = rewrite_set_inst_ thy false subst make_ratpoly_in t;
 term2str t';
 if term2str t' = "79 / 12 + 65 / 36 * x = 0" then () 
-else raise error "rlang.sml: 3";
+else error "rlang.sml: 3";
 (*WN---^ *)
 
 
@@ -279,7 +279,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "296 + -3900 * x = 0")) then ()
-else raise error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 38b";
+else error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 38b";
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
@@ -291,7 +291,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 74 / 975]")) => ()
-	 | _ => raise error "rlang.sml: diff.behav. in Schalk I s.86 Bsp 38b [x = 74 / 975]";
+	 | _ => error "rlang.sml: diff.behav. in Schalk I s.86 Bsp 38b [x = 74 / 975]";
 
 (*-----------------  Schalk I s.87 Bsp 40b ------------------------*)
 "Schalk I s.87 Bsp 40b ((x+3)/(2*x - 4)=3)";
@@ -321,7 +321,7 @@
 (*val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;*)
 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "15 + -5 * x = 0")) then ()
-else raise error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 40b";
+else error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 40b";
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
@@ -332,7 +332,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 3]")) => ()
-	 | _ => raise error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 40b [x = 3]";
+	 | _ => error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 40b [x = 3]";
 
 
 (*-----------------  Schalk I s.87 Bsp 44a ------------------------*)
@@ -365,20 +365,20 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 1]")) => ()
-	 | _ => raise error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 44a [x = 1]";
+	 | _ => error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 44a [x = 1]";
 
 (*WN---v *)
 val t = str2term "(1/2 + (5*x)/2)^^^2 - ((13*x)/2 - 5/2)^^^2 - (6*x)^^^2 + 29";
 val subst = [(str2term "bdv", str2term "x")];
 val SOME (t',_) = rewrite_set_inst_ thy false subst make_ratpoly_in t;
 if term2str t' = "23 + 35 * x + -72 * x ^^^ 2" then () 
-else raise error "rlang.sml: 4";
+else error "rlang.sml: 4";
 
 val t = str2term "(1/2 + (5*x)/2)^^^2 - ((13*x)/2 - 5/2)^^^2 + (6*x)^^^2 - 29";
 val subst = [(str2term "bdv", str2term "x")];
 val SOME (t',_) = rewrite_set_inst_ thy false subst make_ratpoly_in t;
 if term2str t' = "-35 + 35 * x" then () 
-else raise error "rlang.sml: 4.1";
+else error "rlang.sml: 4.1";
 (*WN---^ *)
 
 (*-----------------  Schalk I s.87 Bsp 52a ------------------------*)
@@ -404,7 +404,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "16 + 12 * x = 0")) then ()
-else raise error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 52a";
+else error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 52a";
             (*Subproblem["degree_1", "polynomial", "univariate", "equation"]*)
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
@@ -416,7 +416,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = -4 / 3]")) => ()
-	 | _ => raise error "rlang.sml: diff.behav. in  Schalk I s.87 Bsp 52a [x = -4 / 3]";
+	 | _ => error "rlang.sml: diff.behav. in  Schalk I s.87 Bsp 52a [x = -4 / 3]";
 
 (*-----------------  Schalk I s.87 Bsp 55b ------------------------*)
 "Schalk I s.87 Bsp 55b (x/(x^^^2 - 6*x+9) - 1/(x^^^2 - 3*x) =1/x)";
@@ -447,7 +447,7 @@
 (*val (p,_,f,nxt,_,pt) = me nxt p [1] pt; 040209 MGs norm_Rational*)
 (* val nxt = Subproblem ("PolyEq",["polynomial","univariate","equation"])*)
 if f= Form' (FormKF (~1, EdUndef, 0, Nundef, "-6 * x + 5 * x ^^^ 2 = 0"))then()
-else raise error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 55b";
+else error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 55b";
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 (*nxt=Model_Problem["bdv_only","degree_2","polynomial","univariate","equation*)
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
@@ -477,11 +477,11 @@
 val nxt = ("Check_elementwise",Check_elementwise "Assumptions")*)
 val [(aaa,ppp)] = get_assumptions_ pt p;
 if term2str aaa = "9 * x + -6 * x ^^^ 2 + x ^^^ 3 ~= 0" then ()
-else raise error "rlang.sml: diff.behav. in I s.87 Bsp 55b [x = 6 / 5], asms";
+else error "rlang.sml: diff.behav. in I s.87 Bsp 55b [x = 6 / 5], asms";
 (*WN060717 unintentionally changed some rls/ord while 
      completing knowl. for thes2file...
 if term2str aaa = "9 * x + (x ^^^ 3 + -6 * x ^^^ 2) ~= 0" then ()
-else raise error "rlang.sml: diff.behav. in I s.87 Bsp 55b [x = 6 / 5], asms";
+else error "rlang.sml: diff.behav. in I s.87 Bsp 55b [x = 6 / 5], asms";
 .... but it became even better*)
 
 (*22.10.03:
@@ -502,7 +502,7 @@
 val nxt =Check_Postcond ["rational","univariate","equation"])        *)
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 6 / 5]")) => ()
-	| _ => raise error "rlang.sml: diff.behav. in  Schalk I s.87 Bsp 55b [x = 6 / 5]";
+	| _ => error "rlang.sml: diff.behav. in  Schalk I s.87 Bsp 55b [x = 6 / 5]";
 
 (*-----------------  Schalk I s.88 Bsp 64c ------------------------*)
 "Schalk I s.88 Bsp 64c (((x - 1)/(x+1)+1)/((x - 1)/(x+1) - (x+1)/(x - 1))=2)";
@@ -530,7 +530,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt; f2str f;
 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "-3 + -1 * x = 0")) then ()
-else raise error "rlangsml: diff.behav. in Schalk I s.88 Bsp 64c";
+else error "rlangsml: diff.behav. in Schalk I s.88 Bsp 64c";
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
@@ -542,7 +542,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 case f of Form' (FormKF (_,_,0,_,"[x = -3]")) => ()
-	 | _ => raise error "rlang.sml: diff.behav. in  Schalk I s.88 Bsp 64c [x = -3]";
+	 | _ => error "rlang.sml: diff.behav. in  Schalk I s.88 Bsp 64c [x = -3]";
 
 (*-----------------  Schalk I s.88 Bsp 79a (2) ------------------------*)
 "Schalk I s.88 Bsp 79a (2) (m1*v1+m2*v2=0)";
@@ -571,7 +571,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[m1 = -1 * m2 * v2 / v1]")) => ()
-	 | _ => raise error "rlang.sml: diff.behav. in  Schalk I s.88 Bsp 79a (2) [m1 = -1 * m2 * v2 / v1]";
+	 | _ => error "rlang.sml: diff.behav. in  Schalk I s.88 Bsp 79a (2) [m1 = -1 * m2 * v2 / v1]";
 
 (*-----------------  Schalk I s.89 Bsp 90a(1) ------------------------*)
 "Schalk I s.89 Bsp 90a (1) (f=((w+u)/(w+v))*v0)";
@@ -613,7 +613,7 @@
             0,
             Nundef,
             "f * w + -1 * u * v0 + -1 * v0 * w + f * v = 0")) then ()
-else raise error "rlang.sml: diff.behav. in Schalk I s.89 Bsp 90a";
+else error "rlang.sml: diff.behav. in Schalk I s.89 Bsp 90a";
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 (*val nxt = Model_Problem ["degree_1","polynomial","univariate","equation"])*)
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
@@ -646,10 +646,10 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 case f of Form'  (FormKF (~1,EdUndef,0,Nundef,
         "[v = (u * v0 + v0 * w + -1 * f * w) / f]")) => ()
-	 | _ => raise error "rlang.sml: diff.behav. in  Schalk I s.89 Bsp 90a (1) [v=...]";
+	 | _ => error "rlang.sml: diff.behav. in  Schalk I s.89 Bsp 90a (1) [v=...]";
 if get_assumptions_ pt p = 
    [(str2term"(u * v0 + v0 * w + -1 * f * w) / f + w ~= 0",[])] then () 
-else raise error "rlang.sml: diff.behav. in I s.89 Bsp 90a (1) [v=...] asm";
+else error "rlang.sml: diff.behav. in I s.89 Bsp 90a (1) [v=...] asm";
 
 
 (*-----------------  Schalk I s.89 Bsp 90a(2) ------------------------*)
@@ -682,7 +682,7 @@
             0,
             Nundef,
             "f * v + -1 * u * v0 + (f + -1 * v0) * w = 0")) then ()
-else raise error "rlang.sml: diff.behav. in Schalk I s.89 Bsp 90a (2)";
+else error "rlang.sml: diff.behav. in Schalk I s.89 Bsp 90a (2)";
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
@@ -693,12 +693,12 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[w = (u * v0 + -1 * f * v) / (f + -1 * v0)]")) => ()
-	 | _ => raise error "rlang.sml: diff.behav. in Schalk I Bsp 90a(2)";
+	 | _ => error "rlang.sml: diff.behav. in Schalk I Bsp 90a(2)";
 if get_assumptions_ pt p = 
 [(str2term"v + (u * v0 + -1 * f * v) / (f + -1 * v0) ~= 0",[]),
  (str2term"f + -1 * v0 ~= 0",[])]
 then writeln "asm should be simplified ???" 
-else raise error "rlang.sml: diff.behav. in Schalk I Bsp 90a(2) asm";
+else error "rlang.sml: diff.behav. in Schalk I Bsp 90a(2) asm";
 
 (*-----------------  Schalk I s.89 Bsp 98a(1) ------------------------*)
 "Schalk I s.89 Bsp 98a (1) (1/R=1/R1+1/R2)";
@@ -727,7 +727,7 @@
 if f = Form'
       (FormKF
         (~1, EdUndef, 0, Nundef, "-1 * R * R2 + (R2 + -1 * R) * R1 = 0"))then()
-else raise error "rlang.sml: diff.behav. in Schalk I s.89 Bsp 98a (1)";
+else error "rlang.sml: diff.behav. in Schalk I s.89 Bsp 98a (1)";
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
@@ -738,12 +738,12 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[R1 = R * R2 / (R2 + -1 * R)]")) => ()
-	 | _ => raise error "rlang.sml: diff.behav. in 98a(1) [R1 = ...]";
+	 | _ => error "rlang.sml: diff.behav. in 98a(1) [R1 = ...]";
 if get_assumptions_ pt p = [(str2term"R * R2 * R2 ~= (R2 + -1 * R) * 0",[]),
 			    (str2term"R2 + -1 * R ~= 0",[]),
 			    (str2term"R2 + -1 * R ~= 0",[])] 
     then writeln "asm should be simplified"
-else raise error "rlang.sml: diff.behav. in 98a(1) asm";
+else error "rlang.sml: diff.behav. in 98a(1) asm";
 
 (*-----------------  Schalk I s.89 Bsp 104a(1) ------------------------*)
 "Schalk I s.89 Bsp 104a (1) (y^^^2=2*p*x)";
@@ -772,10 +772,10 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 case f of Form' (FormKF (_,_,0,_,"[p = y ^^^ 2 / (2 * x)]")) => ()
-	 | _ => raise error "rlang.sml: diff.behav. in  Schalk I s.89 Bsp 104a (1) [p = y^2/(2*x)]";
+	 | _ => error "rlang.sml: diff.behav. in  Schalk I s.89 Bsp 104a (1) [p = y^2/(2*x)]";
 if get_assumptions_ pt p = [(str2term"-2 * x ~= 0",[])] 
 then writeln"should be x ~= 0\nshould be x ~= 0\nshould be x ~= 0\n" 
-else raise error "rlang.sml: diff.behav. in  I s.89 Bsp 104a(1) asm";
+else error "rlang.sml: diff.behav. in  I s.89 Bsp 104a(1) asm";
 
 
 (*-----------------  Schalk I s.89 Bsp 104a(2) ------------------------*)
@@ -806,9 +806,9 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 case f of Form' (FormKF (_,_,0,_,"[y = sqrt (2 * p * x), y = -1 * sqrt (2 * p * x)]")) => ()
-| _ => raise error "rlang.sml: diff.behav. Schalk I s.89 Bsp 104a(2) [x = ]";
+| _ => error "rlang.sml: diff.behav. Schalk I s.89 Bsp 104a(2) [x = ]";
 if get_assumptions_ pt p = [(str2term"0 <= -1 * (-2 * p * x)",[]),(str2term"0 <= -1 * (-2 * p * x)",[])] then writeln "asm should be simplified\nshould be simplified"
-else raise error "rlang.sml: diff.behav. in I s.89 Bsp 104a(2) asm";
+else error "rlang.sml: diff.behav. in I s.89 Bsp 104a(2) asm";
 
 
 (*-----------------  Schalk I s.90 Bsp 118a (1) ------------------------*)
@@ -852,14 +852,14 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;f2str f;get_asm (fst p, fst p) pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;f2str f;get_asm (fst p, fst p) pt;
 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = sqrt ((a ^^^ 2 * b ^^^ 2 + -1 * a ^^^ 2 * y ^^^ 2) / b ^^^ 2),\n x = -1 * sqrt ((a ^^^ 2 * b ^^^ 2 + -1 * a ^^^ 2 * y ^^^ 2) / b ^^^ 2)]")) => writeln"should be simplified MG"
-| _ => raise error "rlang.sml: diff.behav. in  Schalk I s.89 Bsp 118a(2) [x = ]";
+| _ => error "rlang.sml: diff.behav. in  Schalk I s.89 Bsp 118a(2) [x = ]";
 val asms = get_assumptions_ pt p;
 if asms = [(str2term"0 * b ^^^ 2 <= -1 * (a ^^^ 2 * y ^^^ 2 + -1 * a ^^^ 2 * b ^^^ 2)", []),
 	   (str2term"b ^^^ 2 ~= 0", []),
 	   (str2term"0 * b ^^^ 2 <= -1 * (a ^^^ 2 * y ^^^ 2 + -1 * a ^^^ 2 * b ^^^ 2)", []),
 	   (str2term"b ^^^ 2 ~= 0", [])
 	   ] then writeln"should be simplified MG"
-else raise error "rlang.sml: diff.behav. in Schalk I s.89 Bsp 118a(2) asms";
+else error "rlang.sml: diff.behav. in Schalk I s.89 Bsp 118a(2) asms";
 
 (*-----------------  Schalk I s.102 Bsp 268(1) ------------------------*)
 "Schalk I s.102 Bsp 268(1) (A = (1/2)*(x1*(y2-y3)+x2*(y3 - y1)+x3*(y1 - y2)))";
@@ -889,9 +889,9 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x2 =\n (-2 * A + x1 * y2 + x3 * y1 + -1 * x1 * y3 + -1 * x3 * y2) /\n (y1 + -1 * y3)]")) => ()
-| _ => raise error "rlang.sml: diff.behav. Schalk I s.102 Bsp 268(1) [x2=...]";
+| _ => error "rlang.sml: diff.behav. Schalk I s.102 Bsp 268(1) [x2=...]";
 if get_assumptions_ pt p = [(str2term"y1 / 2 + -1 * y3 / 2 ~= 0",[])] then ()
-else raise error "rlang.sml: diff.behav. in I s.102 Bsp 268(1) asm";
+else error "rlang.sml: diff.behav. in I s.102 Bsp 268(1) asm";
 
 (*--------------------  Schalk II ----------------------------*)
 (*--------------------  Schalk II ----------------------------*)
@@ -926,7 +926,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt; f2str f;
 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "-2 + x = 0")) then ()
-else raise error "rlang.sml: diff.behav. in Schalk II s.56 Bsp 67b";
+else error "rlang.sml: diff.behav. in Schalk II s.56 Bsp 67b";
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
@@ -937,7 +937,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 2]")) => ()
-	 | _ => raise error "rlang.sml: diff.behav. in  Schalk II s.56 Bsp 67b [x=2]";
+	 | _ => error "rlang.sml: diff.behav. in  Schalk II s.56 Bsp 67b [x=2]";
 
 (*-----------------  Schalk II s.56 Bsp 68a ------------------------*)
 "Schalk II s.56 Bsp 68a (5*sqrt(x) - 1 = 7*sqrt(x) - 5)";
@@ -983,7 +983,7 @@
 if f = Form'
       (FormKF
          (~1, EdUndef, 0, Nundef, "256 + -2368 * x + 576 * x ^^^ 2 = 0"))then()
-else raise error "rlang.sml: diff.behav. in Schalk II s.56 Bsp 68a";
+else error "rlang.sml: diff.behav. in Schalk II s.56 Bsp 68a";
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 get_assumptions_ pt p;
 (* val nxt = ("Model_Problem",  Model_Problem
@@ -1001,7 +1001,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 if f = Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 4, x = 1 / 9]")) 
 then writeln "only [x = 4] !\nonly [x = 4] !\nonly [x = 4] !\n"
-else raise error "rlang.sml: diff.behav. in II 68a";
+else error "rlang.sml: diff.behav. in II 68a";
 val asms = get_assumptions_ pt p;
 if asms2str asms = 
 "[(0 <= (25 * (1 / 9) + -1 * (16 + 49 * (1 / 9))) * -56, []),\
@@ -1019,7 +1019,7 @@
     (str2term"9 ~= 0", []),
     (str2term"0 <= (25 * (1 / 9) + -1 * (16 + 49 * (1 / 9))) * -56", [])]*)
     then "should get True * False!!!"
-else raise error "rlang.sml: diff.behav. in II 68a asms";
+else error "rlang.sml: diff.behav. in II 68a asms";
 
 (*-----------------  Schalk II s.56 Bsp 73b ------------------------*)
 "Schalk II s.56 Bsp 73b (sqrt(x+1)+sqrt(4*x+4)=sqrt(9*x+9))";
@@ -1056,7 +1056,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "0 = 0")) then ()
-else raise error "rlang.sml: diff.behav. in Schalk II s.56 Bsp 73b";
+else error "rlang.sml: diff.behav. in Schalk II s.56 Bsp 73b";
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
@@ -1069,7 +1069,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val asm = get_assumptions_ pt p;
 if asm=[] andalso f = Form' (FormKF (~1,EdUndef,0,Nundef,"UniversalList")) andalso nxt = ("End_Proof'",End_Proof') then ()
-else raise error "rlang.sml: diff.behav. in UniversalList 2";
+else error "rlang.sml: diff.behav. in UniversalList 2";
 
 (*-----------------  Schalk II s.56 Bsp 74a ------------------------*)
 "Schalk II s.56 Bsp 74a (sqrt(4*x+1) - sqrt(x+3) = sqrt(x - 2))";
@@ -1107,7 +1107,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "-24 + 4 * x = 0")) then ()
-else raise error "rlang.sml: diff.behav. in Schalk II s.56 Bsp 74a";
+else error "rlang.sml: diff.behav. in Schalk II s.56 Bsp 74a";
 (*-> ubproblem ("PolyEq", ["degree_1", ...]*)
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
@@ -1120,7 +1120,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 6]")) => ()
-	 | _ => raise error "rlang.sml: diff.behav. in  Schalk II s.56 Bsp 74a [x = 6]";
+	 | _ => error "rlang.sml: diff.behav. in  Schalk II s.56 Bsp 74a [x = 6]";
 
 
 (*-----------------  Schalk II s.56 Bsp 77b ------------------------*)
@@ -1167,7 +1167,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 (*val (p,_,f,nxt,_,pt) = me nxt p [1] pt; since MGs norm_Rational*)
 if f = Form'(FormKF (~1, EdUndef, 0, Nundef, "451584 + -112896 * x = 0"))then()
-else raise error "rlang.sml: diff.behav. in Schalk II s.56 Bsp 77b";
+else error "rlang.sml: diff.behav. in Schalk II s.56 Bsp 77b";
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 (* val nxt = ("Model_Problem",
    Model_Problem ["degree_1","polynomial","univariate","equation"])*)
@@ -1181,7 +1181,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[]")) => ()
-	 | _ => raise error "rlang.sml: diff.behav. in  Schalk II s.56 Bsp 77b []";
+	 | _ => error "rlang.sml: diff.behav. in  Schalk II s.56 Bsp 77b []";
 (*added 040209 at introducing MGs norm_Rational ?!*)
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 
@@ -1214,7 +1214,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 case f of   Form' (FormKF (_,_,0,_,"[x = 5, x = -5]")) => ()
-  | _ => raise error "rlang.sml: diff.behav. in  Schalk II s.66 Bsp 4 []";
+  | _ => error "rlang.sml: diff.behav. in  Schalk II s.66 Bsp 4 []";
 
 
 (*-----------------  Schalk II s.66 Bsp 8a ------------------------*)
@@ -1242,7 +1242,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "-8 + 2 * x ^^^ 2 = 0")) then ()
-else raise error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 8a";
+else error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 8a";
 (*-> Subproblem ("PolyEq", ["polynomial", ...])*)
 (* 
  val Form' (FormKF (~1, EdUndef, 0, Nundef, str)) = f;
@@ -1257,7 +1257,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 2, x = -2]")) => ()
-	 | _ => raise error "rlang.sml: diff.behav. in  Schalk II s.66 Bsp 8a [x = 2, x = -2]";
+	 | _ => error "rlang.sml: diff.behav. in  Schalk II s.66 Bsp 8a [x = 2, x = -2]";
 
 (*-----------------  Schalk II s.66 Bsp 10b ------------------------*)
 "Schalk II s.66 Bsp 10b (1/(x^^^2 - 9)+(2*x+3)/(x+3)=(3*x+4)/(x - 3))";
@@ -1290,7 +1290,7 @@
             0,
             Nundef,
             "60 + 28 * x + -13 * x ^^^ 2 + -1 * x ^^^ 3 = 0")) then ()
-else raise error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 10b";
+else error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 10b";
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
@@ -1332,7 +1332,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "-25 + x ^^^ 2 = 0")) then ()
-else raise error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 20a";
+else error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 20a";
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
@@ -1345,7 +1345,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 5, x = -5]")) => ()
-	 | _ => raise error "rlang.sml: diff.behav. in  Schalk II s.66 Bsp 20a [x = 5, x = -5]";
+	 | _ => error "rlang.sml: diff.behav. in  Schalk II s.66 Bsp 20a [x = 5, x = -5]";
 
 (*-----------------  Schalk II s.66 Bsp 23b ------------------------*)
 "Schalk II s.66 Bsp 23b (2*sqrt(261 - x) - sqrt(2+2*x)=sqrt(2)*sqrt(5 - 3*x))";
@@ -1384,7 +1384,7 @@
 if f = Form'
       (FormKF
        (~1, EdUndef, 0, Nundef, "-1064944 + 32 * x + -48 * x ^^^ 2 = 0"))then()
-else raise error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 23b";
+else error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 23b";
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
@@ -1393,7 +1393,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 case f of Form' (FormKF (~1,EdUndef,_,Nundef,"[]")) => ()
-	 | _ => raise error "rlang.sml: diff.behav. in  Schalk II s.66 Bsp 23b []";
+	 | _ => error "rlang.sml: diff.behav. in  Schalk II s.66 Bsp 23b []";
 
 (*-----------------  Schalk II s.66 Bsp 28a ------------------------*)
 "Schalk II s.66 Bsp 28a (A=(c/d)*sqrt(4*a^^^2 - c^^^2))";
@@ -1427,7 +1427,7 @@
             "c ^^^ 4 / d ^^^ 2 + A ^^^ 2 * d ^^^ 2 / d ^^^ 2 +\n-4 * c ^^^ 2 / d ^^^ 2 * a ^^^ 2 =\n0")) then ()*)
 if f2str f = 
    "c ^^^ 4 / d ^^^ 2 + A ^^^ 2 / 1 + -4 * c ^^^ 2 / d ^^^ 2 * a ^^^ 2 = 0"
-then () else raise error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 28a";
+then () else error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 28a";
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
@@ -1438,7 +1438,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[a = sqrt ((c ^^^ 4 + A ^^^ 2 * d ^^^ 2) / (4 * c ^^^ 2)),\n a = -1 * sqrt ((c ^^^ 4 + A ^^^ 2 * d ^^^ 2) / (4 * c ^^^ 2))]")) => ()
-| _ => raise error "rlang.sml: diff.behav. in  Schalk II s.66 Bsp 28a [a=...]";
+| _ => error "rlang.sml: diff.behav. in  Schalk II s.66 Bsp 28a [a=...]";
 
 
 
@@ -1479,7 +1479,7 @@
             0,
             Nundef,
             "b * a ^^^ 2 + -1 * a * b ^^^ 2 + (a ^^^ 2 + b ^^^ 2 + -2 * a * b) * x +\n(b + -1 * a) * x ^^^ 2 =\n0")) then ()
-else raise error "rlang.sml: diff.behav. in chalk I s.87 Bsp 38b";
+else error "rlang.sml: diff.behav. in chalk I s.87 Bsp 38b";
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
@@ -1502,7 +1502,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;(*1 additional for MGs norm_Rational*)
 if p = ([],Res) andalso f = Form' (FormKF (~1,EdUndef,0,Nundef,
 "[x =\n (2 * a * b + -1 * a ^^^ 2 + -1 * b ^^^ 2 +\n  sqrt\n   (a ^^^ 4 + b ^^^ 4 + -4 * a * a * b ^^^ 2 + -4 * a * b * a ^^^ 2 +\n    -4 * b * b * a ^^^ 2 +\n    4 * a * a * b ^^^ 2 +\n    4 * a * b * a ^^^ 2 +\n    2 * a ^^^ 2 * b ^^^ 2)) /\n (-2 * a + 2 * b),\n x =\n (2 * a * b + -1 * a ^^^ 2 + -1 * b ^^^ 2 +\n  -1 *\n  sqrt\n   (a ^^^ 4 + b ^^^ 4 + -4 * a * a * b ^^^ 2 + -4 * a * b * a ^^^ 2 +\n    -4 * b * b * a ^^^ 2 +\n    4 * a * a * b ^^^ 2 +\n    4 * a * b * a ^^^ 2 +\n    2 * a ^^^ 2 * b ^^^ 2)) /\n (-2 * a + 2 * b)]")) andalso nxt = ("End_Proof'",End_Proof') then writeln"simplify MG"
-else raise error "rlang.sml: diff.behav. in rational-a-b";
+else error "rlang.sml: diff.behav. in rational-a-b";
 
 (*-----------------  Schalk II s.68 Bsp 56a ------------------------*)
 "Schalk II s.68 Bsp 56a ((a+b*x)/(a-b*x) - (a - b*x)/(a+b*x)= (4*a*b)/(a^^^2 - b^^^2))";
@@ -1629,7 +1629,7 @@
             Nundef,
             (*"-4 * b ^^^ 2 + -4 * a * b + 4 * b ^^^ 2 + 8 * a * b +\n(-2 * a + -4 * a + -4 * b + 2 * a + 8 * b) * x +\n-4 * x ^^^ 2 =\n0" before MG*)
 	    "4 * a * b + (-4 * a + 4 * b) * x + -4 * x ^^^ 2 = 0")) then ()
-else raise error "rlang.sml: diff.behav. in Schalk II s.68 Bsp 61b";
+else error "rlang.sml: diff.behav. in Schalk II s.68 Bsp 61b";
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 (*val nxt = ("Model_Problem", Model_Problem
      ["abcFormula","degree_2","polynomial","univariate","equation"])*)
@@ -1649,7 +1649,7 @@
 (*if f = Form' (FormKF (~1,EdUndef,0,Nundef, with norm_Rational before MG
 "[x =\n (-2 * a + -4 * b + 6 * a +\n  sqrt\n   (32 * a * b + -16 * a ^^^ 2 + -48 * b ^^^ 2 + 24 * a ^^^ 2 +\n    64 * b ^^^ 2 +\n    8 * a ^^^ 2)) /\n -8,\n x =\n (-2 * a + -4 * b + 6 * a +\n  -1 *\n  sqrt\n   (32 * a * b + -16 * a ^^^ 2 + -48 * b ^^^ 2 + 24 * a ^^^ 2 +\n    64 * b ^^^ 2 +\n    8 * a ^^^ 2)) /\n -8]")) then writeln"simplify MG"*)
 if f = Form' (FormKF (~1,EdUndef,0,Nundef,"[x =\n (-4 * b + 4 * a + sqrt (32 * a * b + 16 * a ^^^ 2 + 16 * b ^^^ 2)) / -8,\n x =\n (-4 * b + 4 * a + -1 * sqrt (32 * a * b + 16 * a ^^^ 2 + 16 * b ^^^ 2)) /\n -8]")) then ()
-else raise error "rlang.sml: diff.behav. Bsp 61b";
+else error "rlang.sml: diff.behav. Bsp 61b";
 (*WN.18.12.03: extreme run-time !!!*)
 
 
@@ -1681,7 +1681,7 @@
             0,
             Nundef,
             "-4 * a * b + (-4 * b + 2 * a) * x + 2 * x ^^^ 2 = 0")) then ()
-else raise error "rlang.sml: diff.behav. in Schalk II s.68 Bsp 62b";
+else error "rlang.sml: diff.behav. in Schalk II s.68 Bsp 62b";
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 (*val nxt =  ("Model_Problem", Model_Problem
      ["abcFormula","degree_2","polynomial","univariate","equation"])*)
@@ -1699,7 +1699,7 @@
 (*val (p,_,f,nxt,_,pt) = me nxt p [1] pt;introduc.MGs norm_Rational*)
 if f = Form' (FormKF (~1,EdUndef,0,Nundef,
         "[x = (-2 * a + 4 * b + sqrt (16 * a * b + 16 * b ^^^ 2 + 4 * a ^^^ 2)) / 4,\n x =\n (-2 * a + 4 * b + -1 * sqrt (16 * a * b + 16 * b ^^^ 2 + 4 * a ^^^ 2)) / 4]")) then writeln "simplify MG"
-else raise error "rlang.sml: diff.behav. in II 62b [x=...]";
+else error "rlang.sml: diff.behav. in II 62b [x=...]";
 val asms = get_assumptions_ pt p;
 if asms = [(str2term"0 <= ((-2 * a + 4 * b + sqrt (16 * a * b + 16 * b ^^^ 2 + 4 * a ^^^ 2)) / 4 + a) ^^^ 2 + ((-2 * a + 4 * b + sqrt (16 * a * b + 16 * b ^^^ 2 + 4 * a ^^^ 2)) / 4 - 2 * b) ^^^ 2", []),
 	   (str2term"0 <= a + 2 * b", []),
@@ -1710,7 +1710,7 @@
 	   (str2term"8 * (-4 * a * b) <= (-4 * b + 2 * a) ^^^ 2", []),
 	   (str2term"8 * (-4 * a * b) <= (-4 * b + 2 * a) ^^^ 2", [])] 
 then writeln "should be simplified MG"
-else raise error "rlang.sml: diff.behav. in II 62b asms";
+else error "rlang.sml: diff.behav. in II 62b asms";
 
 "------ WN.TEST---------------------------------";
 "------ WN.TEST---------------------------------";
@@ -1732,7 +1732,7 @@
 val subst = [(str2term "bdv", str2term "x")];
 val SOME (t',_) = rewrite_set_inst_ thy false subst make_ratpoly_in t;
 if term2str t' = "x ^^^ 2 + 2 * x ^^^ 3 = 0" then () 
-else raise error "rlang.sml: 7";
+else error "rlang.sml: 7";
 *)
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
@@ -1746,7 +1746,7 @@
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
 if f = Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 0, x = 0, x = -1 / 2]")) then()
-else raise error "rlang.sml WN.TEST new behaviour";
+else error "rlang.sml WN.TEST new behaviour";
 
 "------ rlang.sml end---------------------------------";
 
@@ -1798,7 +1798,7 @@
 if f = Form' (FormKF (~1,EdUndef,0,Nundef,
 "[a = sqrt ((-1 * b ^^^ 2 + 4 * r ^^^ 2) / 1),\n a = -1 * sqrt ((-1 * b ^^^ 2 + 4 * r ^^^ 2) / 1)]")) andalso nxt = ("End_Proof'",End_Proof')
 then writeln"simplify result\nsimplify result\nsimplify result"
-else raise error "rlang.sml: diff.behav. in Pythagoras";
+else error "rlang.sml: diff.behav. in Pythagoras";
 val asms = get_assumptions_ pt p;
 (*if asms = [(str2term"0 <= -4 * (b ^^^ 2 / 4 + -4 * r ^^^ 2 / 4)", []),
            (str2term"0 <= -4 * (b ^^^ 2 / 4 + -4 * r ^^^ 2 / 4)", [])]*)
@@ -1806,7 +1806,7 @@
    "[(0 <= -4 * (b ^^^ 2 / 4 + -1 * r ^^^ 2 / 1), []),\
    \(0 <= -4 * (b ^^^ 2 / 4 + -1 * r ^^^ 2 / 1), [])]"
 then writeln"simplify result\nsimplify result\nsimplify result"
-else raise error "rlang.sml: diff.behav. in Pythagoras asms";
+else error "rlang.sml: diff.behav. in Pythagoras asms";
 
 
 "-------------------- WN.15.5.03: equation within the maximum example ------";
@@ -1864,7 +1864,7 @@
             0,
             Nundef,
             "-16 * r ^^^ 4 + 8 * r ^^^ 2 * u ^^^ 2 = 0")) then ()
-else raise error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 38b";
+else error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 38b";
 val (p,_,f,nxt,_,pt) = me nxt p c pt;
 (*val nxt = Model_Problem ["sq_only","degree_2","polynomial","univariate","equation"]) *)
 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
@@ -1880,4 +1880,4 @@
 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
 val (p,_,f,nxt,_,pt) = me nxt p c pt;
 if f = Form' (FormKF (~1,EdUndef,0,Nundef,"[u = sqrt (2 * r ^^^ 2 / 1), u = -1 * sqrt (2 * r ^^^ 2 / 1)]")) then()
-else raise error "rlang.sml WN.TEST new behaviour in max-rooteq";
+else error "rlang.sml WN.TEST new behaviour in max-rooteq";