add more global variables

66 files changed, 598 insertions, 429 deletions

diff --git a/js/Sources/CLKINV_f.js b/js/Sources/CLKINV_f.js
index 12ff04eb..a36af2c0 100644
--- a/js/Sources/CLKINV_f.js
+++ b/js/Sources/CLKINV_f.js
@@ -9,9 +9,9 @@ function CLKINV_f() {
         this.model.blocktype = new ScilabString(["d"]);
         this.model.firing = new ScilabDouble([-1]);
         this.model.dep_ut = new ScilabDouble([false,false]);
-        var exprs = string(this.prt);
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKINV_f\",sz(1),sz(2));"]);
-        this.x = standard_define([1,1],this.model,exprs,gr_i);
+        this.exprs = string(this.prt);
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKINV_f\",sz(1),sz(2));"]);
+        this.x = standard_define([1,1],this.model,this.exprs,this.gr_i);
         return new EventInBlock(this.x);
     }
     CLKINV_f.prototype.details = function CLKINV_f() {
@@ -24,13 +24,14 @@ function CLKINV_f() {
     }
     CLKINV_f.prototype.set = function CLKINV_f() {
         this.prt = parseFloat(arguments[0]["prt"])
+        this.exprs = parseFloat(arguments[0]["exprs"])
         this.x = arg1;
         this.graphics = arg1.graphics;
         this.model = arg1.model;
-        var exprs = this.graphics.exprs;
-        var exprs = exprs[1-1];
+        this.exprs = this.graphics.exprs;
+        this.exprs = this.exprs[1-1];
         while (true) {
-            [ok,this.prt,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CLKINV_f")],[" "],["Event input port"],[" "]],"Port Number",list("vec",1),exprs);
+            [ok,this.prt,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CLKINV_f")],[" "],["Event input port"],[" "]],"Port Number",list("vec",1),this.exprs);
             this.prt = int(this.prt);
             if (!ok) {
                 break;
@@ -41,7 +42,7 @@ function CLKINV_f() {
                 this.model.ipar = new ScilabDouble([this.prt]);
                 this.model.evtout = new ScilabDouble([1]);
                 this.model.firing = new ScilabDouble([-1]);
-                this.graphics.exprs = new ScilabDouble([exprs]);
+                this.graphics.exprs = new ScilabDouble([this.exprs]);
                 this.x.graphics = this.graphics;
                 this.x.model = this.model;
                 break;
diff --git a/js/Sources/CLKINV_f.pickle b/js/Sources/CLKINV_f.pickle
index f8dde500..fc4275e0 100644
--- a/js/Sources/CLKINV_f.pickle
+++ b/js/Sources/CLKINV_f.pickle
@@ -2,16 +2,20 @@ c__builtin__
 set
 p0
 ((lp1
-S'prt'
+S'exprs'
 p2
-aS'x'
+aS'prt'
 p3
-aS'model'
+aS'gr_i'
 p4
 aS'graphics'
 p5
-atp6
-Rp7
+aS'x'
+p6
+aS'model'
+p7
+atp8
+Rp9
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Sources/CLKIN_f.js b/js/Sources/CLKIN_f.js
index 849ee2f2..7d77c8f0 100644
--- a/js/Sources/CLKIN_f.js
+++ b/js/Sources/CLKIN_f.js
@@ -9,8 +9,8 @@ function CLKIN_f() {
         this.model.blocktype = new ScilabString(["d"]);
         this.model.firing = new ScilabDouble([-1]);
         this.model.dep_ut = new ScilabDouble([false,false]);
-        var exprs = string(this.prt);
-        this.x = standard_define([1,1],this.model,exprs," ");
+        this.exprs = string(this.prt);
+        this.x = standard_define([1,1],this.model,this.exprs," ");
         return new BasicBlock(this.x);
     }
     CLKIN_f.prototype.details = function CLKIN_f() {
@@ -23,13 +23,14 @@ function CLKIN_f() {
     }
     CLKIN_f.prototype.set = function CLKIN_f() {
         this.prt = parseFloat(arguments[0]["prt"])
+        this.exprs = parseFloat(arguments[0]["exprs"])
         this.x = arg1;
         this.graphics = arg1.graphics;
         this.model = arg1.model;
-        var exprs = this.graphics.exprs;
-        var exprs = exprs[1-1];
+        this.exprs = this.graphics.exprs;
+        this.exprs = this.exprs[1-1];
         while (true) {
-            [ok,this.prt,exprs] = scicos_getvalue("Set Event Input block parameters","Port number",list("vec",1),exprs);
+            [ok,this.prt,this.exprs] = scicos_getvalue("Set Event Input block parameters","Port number",list("vec",1),this.exprs);
             this.prt = int(this.prt);
             if (!ok) {
                 break;
@@ -40,7 +41,7 @@ function CLKIN_f() {
                 this.model.ipar = new ScilabDouble([this.prt]);
                 this.model.evtout = new ScilabDouble([1]);
                 this.model.firing = new ScilabDouble([-1]);
-                this.graphics.exprs = new ScilabDouble([exprs]);
+                this.graphics.exprs = new ScilabDouble([this.exprs]);
                 this.x.graphics = this.graphics;
                 this.x.model = this.model;
                 break;
diff --git a/js/Sources/CLKIN_f.pickle b/js/Sources/CLKIN_f.pickle
index e733f1cb..c480a912 100644
--- a/js/Sources/CLKIN_f.pickle
+++ b/js/Sources/CLKIN_f.pickle
@@ -2,16 +2,20 @@ c__builtin__
 set
 p0
 ((lp1
-S'prt'
+S'exprs'
 p2
-aS'x'
+aS'prt'
 p3
-aS'model'
+aS'gr_i'
 p4
 aS'graphics'
 p5
-atp6
-Rp7
+aS'x'
+p6
+aS'model'
+p7
+atp8
+Rp9
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Sources/CLOCK_c.js b/js/Sources/CLOCK_c.js
index 4010f34a..259f09de 100644
--- a/js/Sources/CLOCK_c.js
+++ b/js/Sources/CLOCK_c.js
@@ -21,7 +21,7 @@ function CLOCK_c() {
         split.graphics.orig = [[380.71066],[172]];
         split.graphics.pein = 3;
         split.graphics.peout = [[5],[6]];
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLOCK_c\",sz(1),sz(2));"]);
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLOCK_c\",sz(1),sz(2));"]);
         var diagram = scicos_diagram();
         diagram.objs[1-1] = output_port;
         diagram.objs[2-1] = evtdly;
@@ -32,7 +32,7 @@ function CLOCK_c() {
         this.x = scicos_block();
         this.x.gui = "CLOCK_c";
         this.x.graphics.sz = [2,2];
-        this.x.graphics.gr_i = gr_i;
+        this.x.graphics.gr_i = this.gr_i;
         this.x.graphics.peout = 0;
         this.x.model.sim = "csuper";
         this.x.model.evtout = 1;
@@ -65,13 +65,13 @@ function CLOCK_c() {
         }
         var newpar = list();
         var xx = arg1.model.rpar.objs[path-1];
-        var exprs = xx.graphics.exprs;
+        this.exprs = xx.graphics.exprs;
         this.model = xx.model;
         var t0_old = this.model.firing;
         var dt_old = this.model.rpar[1-1];
         var model_n = this.model;
         while (true) {
-            [ok,this.dt,this.t0,this.exprs0] = scicos_getvalue([[msprintf("Set %s block parameters","CLOCK_c")],[" "],["Event clock generator"],[" "],["  Do not start if \'Initialisation Time\' is negative"],[" "]],["Period","Initialisation Time"],list("vec",1,"vec",1),exprs);
+            [ok,this.dt,this.t0,this.exprs0] = scicos_getvalue([[msprintf("Set %s block parameters","CLOCK_c")],[" "],["Event clock generator"],[" "],["  Do not start if \'Initialisation Time\' is negative"],[" "]],["Period","Initialisation Time"],list("vec",1,"vec",1),this.exprs);
             if (!ok) {
                 break;
             }
diff --git a/js/Sources/CLOCK_c.pickle b/js/Sources/CLOCK_c.pickle
index 5e7b423d..628a2fc5 100644
--- a/js/Sources/CLOCK_c.pickle
+++ b/js/Sources/CLOCK_c.pickle
@@ -2,18 +2,24 @@ c__builtin__
 set
 p0
 ((lp1
-S'x'
+S'exprs0'
 p2
-aS'model'
+aS't0'
 p3
-aS'dt'
+aS'exprs'
 p4
-aS't0'
+aS'gr_i'
 p5
-aS'exprs0'
+aS'graphics'
 p6
-atp7
-Rp8
+aS'x'
+p7
+aS'model'
+p8
+aS'dt'
+p9
+atp10
+Rp11
 .(dp0
 S'diagram.objs[1-1]'
 p1
diff --git a/js/Sources/CLOCK_f.js b/js/Sources/CLOCK_f.js
index c071dc88..8783f17d 100644
--- a/js/Sources/CLOCK_f.js
+++ b/js/Sources/CLOCK_f.js
@@ -21,7 +21,7 @@ function CLOCK_f() {
         split.graphics.orig = [[380.71066],[172]];
         split.graphics.pein = 3;
         split.graphics.peout = [[5],[6]];
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLOCK_f\",sz(1),sz(2));"]);
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLOCK_f\",sz(1),sz(2));"]);
         var diagram = scicos_diagram();
         diagram.objs[1-1] = output_port;
         diagram.objs[2-1] = evtdly;
@@ -32,7 +32,7 @@ function CLOCK_f() {
         this.x = scicos_block();
         this.x.gui = "CLOCK_f";
         this.x.graphics.sz = [2,2];
-        this.x.graphics.gr_i = gr_i;
+        this.x.graphics.gr_i = this.gr_i;
         this.x.graphics.peout = 0;
         this.x.model.sim = "csuper";
         this.x.model.evtout = 1;
@@ -65,13 +65,13 @@ function CLOCK_f() {
         }
         var newpar = list();
         var xx = arg1.model.rpar.objs[path-1];
-        var exprs = xx.graphics.exprs;
+        this.exprs = xx.graphics.exprs;
         this.model = xx.model;
         var t0_old = this.model.firing;
         var dt_old = this.model.rpar;
         var model_n = this.model;
         while (true) {
-            [ok,this.dt,this.t0,this.exprs0] = scicos_getvalue("Set Clock  block parameters",["Period","Init time"],list("vec",1,"vec",1),exprs);
+            [ok,this.dt,this.t0,this.exprs0] = scicos_getvalue("Set Clock  block parameters",["Period","Init time"],list("vec",1,"vec",1),this.exprs);
             if (!ok) {
                 break;
             }
@@ -88,7 +88,7 @@ function CLOCK_f() {
                 break;
             }
         }
-        if (!and([t0_old,dt_old]==[this.t0,this.dt])||!and(this.exprs0==exprs)) {
+        if (!and([t0_old,dt_old]==[this.t0,this.dt])||!and(this.exprs0==this.exprs)) {
             newpar[size(newpar)+1-1] = path;
         }
         if (t0_old!=this.t0) {
diff --git a/js/Sources/CLOCK_f.pickle b/js/Sources/CLOCK_f.pickle
index c46d28aa..0947595e 100644
--- a/js/Sources/CLOCK_f.pickle
+++ b/js/Sources/CLOCK_f.pickle
@@ -2,18 +2,24 @@ c__builtin__
 set
 p0
 ((lp1
-S'x'
+S'exprs0'
 p2
-aS'model'
+aS't0'
 p3
-aS'dt'
+aS'exprs'
 p4
-aS't0'
+aS'gr_i'
 p5
-aS'exprs0'
+aS'graphics'
 p6
-atp7
-Rp8
+aS'x'
+p7
+aS'model'
+p8
+aS'dt'
+p9
+atp10
+Rp11
 .(dp0
 S'diagram.objs[1-1]'
 p1
diff --git a/js/Sources/CONST.js b/js/Sources/CONST.js
index 8465ca55..f3a25e18 100644
--- a/js/Sources/CONST.js
+++ b/js/Sources/CONST.js
@@ -9,9 +9,9 @@ function CONST() {
         this.model.rpar = new ScilabDouble([this.C]);
         this.model.blocktype = new ScilabString(["d"]);
         this.model.dep_ut = new ScilabDouble([false,false]);
-        var exprs = strcat(sci2exp(this.C));
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST\",sz(1),sz(2));"]);
-        this.x = standard_define([2,2],this.model,exprs,gr_i);
+        this.exprs = strcat(sci2exp(this.C));
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST\",sz(1),sz(2));"]);
+        this.x = standard_define([2,2],this.model,this.exprs,this.gr_i);
         return new BasicBlock(this.x);
     }
     CONST.prototype.details = function CONST() {
@@ -24,12 +24,13 @@ function CONST() {
     }
     CONST.prototype.set = function CONST() {
         this.C = parseFloat(arguments[0]["C"])
+        this.exprs = arguments[0]["exprs"]
         this.x = arg1;
         this.graphics = arg1.graphics;
-        var exprs = this.graphics.exprs;
+        this.exprs = this.graphics.exprs;
         this.model = arg1.model;
         while (true) {
-            [ok,this.C,exprs] = scicos_getvalue(["Set Contant Block"],"Constant",list("vec",-1),exprs);
+            [ok,this.C,this.exprs] = scicos_getvalue(["Set Contant Block"],"Constant",list("vec",-1),this.exprs);
             if (!ok) {
                 break;
             }
@@ -42,7 +43,7 @@ function CONST() {
             } else {
                 this.model.rpar = new ScilabDouble(this.C.slice());
                 this.model.out = new ScilabDouble([nout]);
-                this.graphics.exprs = new ScilabDouble([exprs]);
+                this.graphics.exprs = new ScilabDouble([this.exprs]);
                 this.x.graphics = this.graphics;
                 this.x.model = this.model;
                 break;
diff --git a/js/Sources/CONST.pickle b/js/Sources/CONST.pickle
index ed25e5f0..4820fb4d 100644
--- a/js/Sources/CONST.pickle
+++ b/js/Sources/CONST.pickle
@@ -2,16 +2,20 @@ c__builtin__
 set
 p0
 ((lp1
-S'x'
+S'C'
 p2
-aS'model'
+aS'exprs'
 p3
-aS'C'
+aS'gr_i'
 p4
 aS'graphics'
 p5
-atp6
-Rp7
+aS'x'
+p6
+aS'model'
+p7
+atp8
+Rp9
 .(dp0
 S'sz'
 p1
diff --git a/js/Sources/CONST_f.js b/js/Sources/CONST_f.js
index abe2b3c8..518831b3 100644
--- a/js/Sources/CONST_f.js
+++ b/js/Sources/CONST_f.js
@@ -9,9 +9,9 @@ function CONST_f() {
         this.model.rpar = new ScilabDouble([this.C]);
         this.model.blocktype = new ScilabString(["d"]);
         this.model.dep_ut = new ScilabDouble([false,false]);
-        var exprs = strcat(sci2exp(this.C));
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_f\",sz(1),sz(2));"]);
-        this.x = standard_define([2,2],this.model,exprs,gr_i);
+        this.exprs = strcat(sci2exp(this.C));
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_f\",sz(1),sz(2));"]);
+        this.x = standard_define([2,2],this.model,this.exprs,this.gr_i);
         return new BasicBlock(this.x);
     }
     CONST_f.prototype.details = function CONST_f() {
@@ -24,12 +24,13 @@ function CONST_f() {
     }
     CONST_f.prototype.set = function CONST_f() {
         this.C = parseFloat(arguments[0]["C"])
+        this.exprs = arguments[0]["exprs"]
         this.x = arg1;
         this.graphics = arg1.graphics;
-        var exprs = this.graphics.exprs;
+        this.exprs = this.graphics.exprs;
         this.model = arg1.model;
         while (true) {
-            [ok,this.C,exprs] = scicos_getvalue(["Set Contant Block"],"Constant",list("vec",-1),exprs);
+            [ok,this.C,this.exprs] = scicos_getvalue(["Set Contant Block"],"Constant",list("vec",-1),this.exprs);
             if (!ok) {
                 break;
             }
@@ -39,7 +40,7 @@ function CONST_f() {
             } else {
                 this.model.rpar = new ScilabDouble(this.C.slice());
                 this.model.out = new ScilabDouble([nout]);
-                this.graphics.exprs = new ScilabDouble([exprs]);
+                this.graphics.exprs = new ScilabDouble([this.exprs]);
                 this.x.graphics = this.graphics;
                 this.x.model = this.model;
                 break;
diff --git a/js/Sources/CONST_f.pickle b/js/Sources/CONST_f.pickle
index 4c58ae17..473b5774 100644
--- a/js/Sources/CONST_f.pickle
+++ b/js/Sources/CONST_f.pickle
@@ -2,16 +2,20 @@ c__builtin__
 set
 p0
 ((lp1
-S'x'
+S'C'
 p2
-aS'model'
+aS'exprs'
 p3
-aS'C'
+aS'gr_i'
 p4
 aS'graphics'
 p5
-atp6
-Rp7
+aS'x'
+p6
+aS'model'
+p7
+atp8
+Rp9
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Sources/CONST_m.js b/js/Sources/CONST_m.js
index 3a207f1c..ea17b2c4 100644
--- a/js/Sources/CONST_m.js
+++ b/js/Sources/CONST_m.js
@@ -12,9 +12,9 @@ function CONST_m() {
         this.model.opar = list();
         this.model.blocktype = new ScilabString(["d"]);
         this.model.dep_ut = new ScilabDouble([false,false]);
-        var exprs = sci2exp(this.C);
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_m\",sz(1),sz(2));"]);
-        this.x = standard_define([2,2],this.model,exprs,gr_i);
+        this.exprs = sci2exp(this.C);
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_m\",sz(1),sz(2));"]);
+        this.x = standard_define([2,2],this.model,this.exprs,this.gr_i);
         return new BasicBlock(this.x);
     }
     CONST_m.prototype.details = function CONST_m() {
@@ -27,12 +27,13 @@ function CONST_m() {
     }
     CONST_m.prototype.set = function CONST_m() {
         this.C = inverse(arguments[0]["C"])
+        this.exprs = arguments[0]["exprs"]
         this.x = arg1;
         this.graphics = arg1.graphics;
-        var exprs = this.graphics.exprs;
+        this.exprs = this.graphics.exprs;
         this.model = arg1.model;
         while (true) {
-            [ok,this.C,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CONST_m")],[" "],["Constant value generator"],[" "]],"Constant Value",list("vec",-1),exprs);
+            [ok,this.C,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CONST_m")],[" "],["Constant value generator"],[" "]],"Constant Value",list("vec",-1),this.exprs);
             if (!ok) {
                 break;
             }
@@ -70,7 +71,7 @@ function CONST_m() {
                     this.model = tmpvar0[0];
                     this.graphics = tmpvar0[1];
                     var ok = tmpvar0[2];
-                    this.graphics.exprs = new ScilabDouble([exprs]);
+                    this.graphics.exprs = new ScilabDouble([this.exprs]);
                     this.x.graphics = this.graphics;
                     this.x.model = this.model;
                     break;
diff --git a/js/Sources/CONST_m.pickle b/js/Sources/CONST_m.pickle
index 6b37f902..5ada7cb9 100644
--- a/js/Sources/CONST_m.pickle
+++ b/js/Sources/CONST_m.pickle
@@ -2,18 +2,22 @@ c__builtin__
 set
 p0
 ((lp1
-S'x'
+S'C'
 p2
-aS'model'
+aS'exprs'
 p3
-aS'type'
+aS'gr_i'
 p4
-aS'C'
-p5
 aS'graphics'
+p5
+aS'x'
 p6
-atp7
-Rp8
+aS'model'
+p7
+aS'type'
+p8
+atp9
+Rp10
 .(dp0
 S'arg1'
 p1
diff --git a/js/Sources/CURVE_c.js b/js/Sources/CURVE_c.js
index a8827ea6..3bd5134d 100644
--- a/js/Sources/CURVE_c.js
+++ b/js/Sources/CURVE_c.js
@@ -18,9 +18,9 @@ function CURVE_c() {
         this.model.evtin = new ScilabDouble([1]);
         this.model.evtout = new ScilabDouble([1]);
         this.model.firing = new ScilabDouble([0]);
-        var exprs = [[sci2exp(this.Method)],[sci2exp(this.xx)],[sci2exp(this.yy)],[this.PeriodicOption],[Graf]];
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CURVE_c\",sz(1),sz(2));"]);
-        this.x = standard_define([2,2],this.model,exprs,gr_i);
+        this.exprs = [[sci2exp(this.Method)],[sci2exp(this.xx)],[sci2exp(this.yy)],[this.PeriodicOption],[Graf]];
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CURVE_c\",sz(1),sz(2));"]);
+        this.x = standard_define([2,2],this.model,this.exprs,this.gr_i);
         return new BasicBlock(this.x);
     }
     CURVE_c.prototype.details = function CURVE_c() {
@@ -42,22 +42,23 @@ function CURVE_c() {
         this.yy = inverse(arguments[0]["yy"])
         this.PeriodicOption = arguments[0]["PeriodicOption"]
         this.graf = arguments[0]["graf"]
+        this.exprs = arguments[0]["exprs"]
         this.x = arg1;
         this.model = arg1.model;
         this.graphics = arg1.graphics;
-        var exprs = this.graphics.exprs;
+        this.exprs = this.graphics.exprs;
         var ok = false;
         var SaveExit = false;
         while (true) {
             var Ask_again = false;
-            [ok,this.Method,this.xx,this.yy,this.PeriodicOption,this.graf,exprs] = scicos_getvalue("Spline data",["Spline Method (0..7)","x","y","Periodic signal(y/n)?","Launch graphic window(y/n)?"],list("vec",1,"vec",-1,"vec",-1,"str",1,"str",1),exprs);
+            [ok,this.Method,this.xx,this.yy,this.PeriodicOption,this.graf,this.exprs] = scicos_getvalue("Spline data",["Spline Method (0..7)","x","y","Periodic signal(y/n)?","Launch graphic window(y/n)?"],list("vec",1,"vec",-1,"vec",-1,"str",1,"str",1),this.exprs);
             if (!ok) {
                 break;
             }
             if (this.PeriodicOption=="y"||this.PeriodicOption=="Y") {
                 var PO = 1;
             } else {
-                exprs[4-1] = "n";
+                this.exprs[4-1] = "n";
                 var PO = 0;
             }
             var mtd = int(this.Method);
@@ -87,7 +88,7 @@ function CURVE_c() {
                 var tmpvar2 = cleandata(this.xy);
                 this.xy = tmpvar2[0];
                 var N = size(this.xy,"r");
-                exprs[5-1] = "n";
+                this.exprs[5-1] = "n";
                 if (this.graf=="y"||this.graf=="Y") {
                     var ipar = [[N],[mtd],[PO]];
                     var rpar = [];
@@ -118,16 +119,16 @@ function CURVE_c() {
                         var DChange = true;
                     }
                     if (DChange) {
-                        exprs[2-1] = strcat(sci2exp(xy2.slice()[1-1]));
-                        exprs[3-1] = strcat(sci2exp(xy2.slice()[2-1]));
+                        this.exprs[2-1] = strcat(sci2exp(xy2.slice()[1-1]));
+                        this.exprs[3-1] = strcat(sci2exp(xy2.slice()[2-1]));
                     }
-                    exprs[1-1] = sci2exp(New_methhod);
+                    this.exprs[1-1] = sci2exp(New_methhod);
                     if (oipar[3-1]==1) {
                         var perop = "y";
                     } else {
                         var perop = "n";
                     }
-                    exprs[4-1] = perop;
+                    this.exprs[4-1] = perop;
                     var SaveExit = true;
                 } else {
                     var tmpvar4 = Do_Spline(N,mtd,this.xy.slice()[1-1],this.xy.slice()[2-1]);
@@ -144,7 +145,7 @@ function CURVE_c() {
                             var orpar = [[this.xy.slice()[1-1]],[this.xy.slice()[2-1]]];
                         }
                     }
-                    exprs[1-1] = sci2exp(mtd);
+                    this.exprs[1-1] = sci2exp(mtd);
                     var oipar = [[N],[mtd],[PO]];
                     var SaveExit = true;
                 }
@@ -158,7 +159,7 @@ function CURVE_c() {
                 }
                 this.model.rpar = new ScilabDouble(orpar);
                 this.model.ipar = new ScilabDouble(oipar);
-                this.graphics.exprs = new ScilabDouble([exprs]);
+                this.graphics.exprs = new ScilabDouble([this.exprs]);
                 this.x.model = this.model;
                 this.x.graphics = this.graphics;
                 break;
diff --git a/js/Sources/CURVE_c.pickle b/js/Sources/CURVE_c.pickle
index 19b20933..c186f931 100644
--- a/js/Sources/CURVE_c.pickle
+++ b/js/Sources/CURVE_c.pickle
@@ -10,7 +10,7 @@ aS'inrpar'
 p4
 aS'sok'
 p5
-aS'graphics'
+aS'wp'
 p6
 aS'Pd3'
 p7
@@ -46,106 +46,110 @@ aS'xt'
 p22
 aS'sample5'
 p23
-aS'Pulse_exprs2'
+aS'sTp2'
 p24
-aS'Cx'
+aS'Pulse_exprs2'
 p25
-aS'filen'
+aS'Cx'
 p26
-aS'xa'
+aS'filen'
 p27
-aS'random_u_exprs2'
+aS'sample4'
 p28
-aS'sAmp2'
+aS'xa'
 p29
-aS'zok'
+aS'random_u_exprs2'
 p30
-aS'offset'
+aS'sAmp2'
 p31
-aS'yt'
+aS'zok'
 p32
-aS'sdelay'
+aS'offset'
 p33
-aS'ixy'
+aS'yt'
 p34
-aS'seed4'
+aS'sdelay'
 p35
-aS'seed5'
+aS'ixy'
 p36
-aS'Sawt2_exprs2'
+aS'seed4'
 p37
-aS'Amp'
+aS'seed5'
 p38
-aS'PeriodicOption'
+aS'Sawt2_exprs2'
 p39
-aS'var4'
+aS'Amp'
 p40
-aS'ymx1'
+aS'PeriodicOption'
 p41
-aS'Cformat'
+aS'var4'
 p42
-aS'ya'
+aS'ymx1'
 p43
-aS'Bias3'
+aS'Cformat'
 p44
-aS'xls_open'
+aS'ya'
 p45
-aS'myans'
+aS'Bias3'
 p46
-aS'xmx1'
+aS'xls_open'
 p47
-aS'inipar'
+aS'myans'
 p48
-aS'xls_read'
+aS'xmx1'
 p49
-aS'sTp'
+aS'inipar'
 p50
-aS'Sin_exprs2'
+aS'xls_read'
 p51
-aS'argn'
+aS'sTp'
 p52
-aS'wp'
+aS'Sin_exprs2'
 p53
-aS'phase'
+aS'argn'
 p54
-aS'iipar'
+aS'graphics'
 p55
-aS'min5'
+aS'phase'
 p56
-aS'mok'
+aS'iipar'
 p57
-aS'Pw3'
+aS'min5'
 p58
-aS'sheetN'
+aS'mok'
 p59
-aS'xgetmouse'
+aS'Pw3'
 p60
-aS'max5'
+aS'sheetN'
 p61
-aS'rparin'
+aS'xgetmouse'
 p62
-aS'sample4'
+aS'max5'
 p63
-aS'Cy'
+aS'rparin'
 p64
-aS'sTp2'
+aS'exprs'
 p65
-aS'yy'
+aS'Cy'
 p66
-aS'x'
+aS'gr_i'
 p67
-aS'model'
+aS'yy'
 p68
-aS'ORDER2'
+aS'x'
 p69
-aS'irpar'
+aS'model'
 p70
-aS'graf'
+aS'ORDER2'
 p71
-aS'xye'
+aS'irpar'
 p72
-atp73
-Rp74
+aS'graf'
+p73
+aS'xye'
+p74
+atp75
+Rp76
 .(dp0
 S'mean4'
 p1
diff --git a/js/Sources/CURV_f.js b/js/Sources/CURV_f.js
index ce2f2207..c7e3fd39 100644
--- a/js/Sources/CURV_f.js
+++ b/js/Sources/CURV_f.js
@@ -15,8 +15,8 @@ function CURV_f() {
         this.model.ipar = new ScilabDouble([size(xx,1)],[axisdata.slice()]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = new ScilabDouble([false,true]);
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CURV_f\",sz(1),sz(2));"]);
-        this.x = standard_define([2,2],this.model,[],gr_i);
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CURV_f\",sz(1),sz(2));"]);
+        this.x = standard_define([2,2],this.model,[],this.gr_i);
         return new BasicBlock(this.x);
     }
     CURV_f.prototype.details = function CURV_f() {
diff --git a/js/Sources/CURV_f.pickle b/js/Sources/CURV_f.pickle
index d4d844a0..3d37146b 100644
--- a/js/Sources/CURV_f.pickle
+++ b/js/Sources/CURV_f.pickle
@@ -6,10 +6,14 @@ S'x'
 p2
 aS'model'
 p3
-aS'graphics'
+aS'gr_i'
 p4
-atp5
-Rp6
+aS'exprs'
+p5
+aS'graphics'
+p6
+atp7
+Rp8
 .(dp0
 S'arg1'
 p1
diff --git a/js/Sources/Counter.js b/js/Sources/Counter.js
index de94c91f..26085612 100644
--- a/js/Sources/Counter.js
+++ b/js/Sources/Counter.js
@@ -13,9 +13,9 @@ function Counter() {
         this.model.ipar = new ScilabDouble([this.rule],[this.maxim],[this.minim]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = new ScilabDouble([false,false]);
-        var exprs = [[string(this.minim)],[string(this.maxim)],[string(this.rule)]];
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Counter\",sz(1),sz(2));"]);
-        this.x = standard_define([3,2],this.model,exprs,gr_i);
+        this.exprs = [[string(this.minim)],[string(this.maxim)],[string(this.rule)]];
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Counter\",sz(1),sz(2));"]);
+        this.x = standard_define([3,2],this.model,this.exprs,this.gr_i);
         return new BasicBlock(this.x);
     }
     Counter.prototype.details = function Counter() {
@@ -33,12 +33,13 @@ function Counter() {
         this.minim = parseFloat(arguments[0]["minim"])
         this.maxim = parseFloat(arguments[0]["maxim"])
         this.rule = parseFloat(arguments[0]["rule"])
+        this.exprs = arguments[0]["exprs"]
         this.x = arg1;
         this.graphics = arg1.graphics;
-        var exprs = this.graphics.exprs;
+        this.exprs = this.graphics.exprs;
         this.model = arg1.model;
         while (true) {
-            [ok,this.minim,this.maxim,this.rule,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","Counter")],[" "],["Integer counter generator"],[" "]],["Minimum","Maximum","Rule (1:Increment, 2:Decrement)"],list("vec",1,"vec",1,"vec",1),exprs);
+            [ok,this.minim,this.maxim,this.rule,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","Counter")],[" "],["Integer counter generator"],[" "]],["Minimum","Maximum","Rule (1:Increment, 2:Decrement)"],list("vec",1,"vec",1,"vec",1),this.exprs);
             if (!ok) {
                 break;
             }
@@ -49,7 +50,7 @@ function Counter() {
             } else if ((this.rule!=1&&this.rule!=2)) {
                 block_parameter_error(msprintf("Wrong value for \'Rule\' parameter: %d",this.rule),msprintf("Must be in the interval %s.","[1,2]"));
             } else {
-                this.graphics.exprs = new ScilabDouble([exprs]);
+                this.graphics.exprs = new ScilabDouble([this.exprs]);
                 this.model.dstate = new ScilabDouble([0]);
                 this.model.ipar = new ScilabDouble([this.rule],[this.maxim],[this.minim]);
                 this.x.graphics = this.graphics;
diff --git a/js/Sources/Counter.pickle b/js/Sources/Counter.pickle
index eabc335f..cbddeb7d 100644
--- a/js/Sources/Counter.pickle
+++ b/js/Sources/Counter.pickle
@@ -8,14 +8,18 @@ aS'maxim'
 p3
 aS'rule'
 p4
-aS'graphics'
+aS'exprs'
 p5
-aS'x'
+aS'gr_i'
 p6
-aS'model'
+aS'graphics'
 p7
-atp8
-Rp9
+aS'x'
+p8
+aS'model'
+p9
+atp10
+Rp11
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/Sources/FROMWSB.js b/js/Sources/FROMWSB.js
index 9d1ab635..2c8e6e64 100644
--- a/js/Sources/FROMWSB.js
+++ b/js/Sources/FROMWSB.js
@@ -7,8 +7,8 @@ function FROMWSB() {
         scs_m_1.objs[3-1] = scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[358.9421,271.584],sz=[20,20],flip=true,theta=0,exprs="1",pin=4,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=-2,intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
         scs_m_1.objs[4-1] = scicos_link(xx=[[338.9421],[358.9421]],yy=[[281.584],[281.584]],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[3,1,1]);
         this.model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list());
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMWSB\",sz(1),sz(2));"]);
-        this.x = standard_define([5,2],this.model,[],gr_i);
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMWSB\",sz(1),sz(2));"]);
+        this.x = standard_define([5,2],this.model,[],this.gr_i);
         return new BasicBlock(this.x);
     }
     FROMWSB.prototype.details = function FROMWSB() {
diff --git a/js/Sources/FROMWSB.pickle b/js/Sources/FROMWSB.pickle
index 165976fe..6a6d8bcd 100644
--- a/js/Sources/FROMWSB.pickle
+++ b/js/Sources/FROMWSB.pickle
@@ -2,14 +2,20 @@ c__builtin__
 set
 p0
 ((lp1
-S'x'
+S'exprs'
 p2
-aS'model'
+aS'gr_i'
 p3
-aS'xxn'
+aS'graphics'
 p4
-atp5
-Rp6
+aS'x'
+p5
+aS'model'
+p6
+aS'xxn'
+p7
+atp8
+Rp9
 .(dp0
 S'ppath'
 p1
diff --git a/js/Sources/FROMWS_c.js b/js/Sources/FROMWS_c.js
index 0626ae40..02a6c352 100644
--- a/js/Sources/FROMWS_c.js
+++ b/js/Sources/FROMWS_c.js
@@ -16,9 +16,9 @@ function FROMWS_c() {
         this.model.firing = new ScilabDouble([0]);
         this.model.blocktype = new ScilabString(["d"]);
         this.model.dep_ut = new ScilabDouble([false,true]);
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMWS_c\",sz(1),sz(2));"]);
-        var exprs = [[string(this.varnam)],[string(this.Method)],[string(this.ZC)],[string(this.OutEnd)]];
-        this.x = standard_define([3.5,2],this.model,exprs,gr_i);
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMWS_c\",sz(1),sz(2));"]);
+        this.exprs = [[string(this.varnam)],[string(this.Method)],[string(this.ZC)],[string(this.OutEnd)]];
+        this.x = standard_define([3.5,2],this.model,this.exprs,this.gr_i);
         return new BasicBlock(this.x);
     }
     FROMWS_c.prototype.details = function FROMWS_c() {
@@ -38,12 +38,13 @@ function FROMWS_c() {
         this.Method = parseFloat(arguments[0]["Method"])
         this.ZC = parseFloat(arguments[0]["ZC"])
         this.OutEnd = parseFloat(arguments[0]["OutEnd"])
+        this.exprs = arguments[0]["exprs"]
         this.x = arg1;
         this.graphics = arg1.graphics;
-        var exprs = this.graphics.exprs;
+        this.exprs = this.graphics.exprs;
         this.model = arg1.model;
         while (true) {
-            [ok,this.varnam,this.Method,this.ZC,this.OutEnd,exprs] = scicos_getvalue("Set From_Workspace block parameters",["Variable name","Interpolation Method","Enable zero crossing(0:No, 1:Yes)?","Output at end(0:Zero, 1:Hold, 2:Repeat)"],list("str",1,"vec",1,"vec",1,"vec",1),exprs);
+            [ok,this.varnam,this.Method,this.ZC,this.OutEnd,this.exprs] = scicos_getvalue("Set From_Workspace block parameters",["Variable name","Interpolation Method","Enable zero crossing(0:No, 1:Yes)?","Output at end(0:Zero, 1:Hold, 2:Repeat)"],list("str",1,"vec",1,"vec",1,"vec",1),this.exprs);
             if (!ok) {
                 break;
             }
@@ -72,7 +73,7 @@ function FROMWS_c() {
                 this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
                 if (ok) {
-                    this.graphics.exprs = new ScilabDouble([exprs]);
+                    this.graphics.exprs = new ScilabDouble([this.exprs]);
                     this.x.graphics = this.graphics;
                     this.x.model = this.model;
                     break;
diff --git a/js/Sources/FROMWS_c.pickle b/js/Sources/FROMWS_c.pickle
index e3017752..817652dd 100644
--- a/js/Sources/FROMWS_c.pickle
+++ b/js/Sources/FROMWS_c.pickle
@@ -6,20 +6,24 @@ S'_str2code'
 p2
 aS'ZC'
 p3
-aS'OutEnd'
+aS'exprs'
 p4
-aS'graphics'
+aS'gr_i'
 p5
-aS'x'
+aS'OutEnd'
 p6
-aS'model'
+aS'graphics'
 p7
-aS'Method'
+aS'x'
 p8
-aS'varnam'
+aS'model'
 p9
-atp10
-Rp11
+aS'Method'
+p10
+aS'varnam'
+p11
+atp12
+Rp13
 .(dp0
 S'arg1'
 p1
diff --git a/js/Sources/GENSIN_f.js b/js/Sources/GENSIN_f.js
index ff8153de..9a9f29eb 100644
--- a/js/Sources/GENSIN_f.js
+++ b/js/Sources/GENSIN_f.js
@@ -11,9 +11,9 @@ function GENSIN_f() {
         this.model.rpar = new ScilabDouble([1],[1],[0]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = new ScilabDouble([false,true]);
-        var exprs = [[string(rpar[1-1])],[string(rpar[2-1])],[string(rpar[3-1])]];
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSIN_f\",sz(1),sz(2));"]);
-        this.x = standard_define([3,2],this.model,exprs,gr_i);
+        this.exprs = [[string(rpar[1-1])],[string(rpar[2-1])],[string(rpar[3-1])]];
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSIN_f\",sz(1),sz(2));"]);
+        this.x = standard_define([3,2],this.model,this.exprs,this.gr_i);
         return new BasicBlock(this.x);
     }
     GENSIN_f.prototype.details = function GENSIN_f() {
@@ -31,12 +31,13 @@ function GENSIN_f() {
         this.M = arguments[0]["M"]
         this.F = arguments[0]["F"]
         this.P = arguments[0]["P"]
+        this.exprs = arguments[0]["exprs"]
         this.x = arg1;
         this.graphics = arg1.graphics;
-        var exprs = this.graphics.exprs;
+        this.exprs = this.graphics.exprs;
         this.model = arg1.model;
         while (true) {
-            [ok,this.M,this.F,this.P,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","GENSIN_f")],[" "],["Sine wave generator"],[" "]],["Magnitude","Frequency (rad/s)","Phase (rad)"],list("vec",1,"vec",1,"vec",1),exprs);
+            [ok,this.M,this.F,this.P,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","GENSIN_f")],[" "],["Sine wave generator"],[" "]],["Magnitude","Frequency (rad/s)","Phase (rad)"],list("vec",1,"vec",1,"vec",1),this.exprs);
             if (!ok) {
                 break;
             }
@@ -52,7 +53,7 @@ function GENSIN_f() {
                 this.model.rpar = new ScilabDouble([this.M],[this.F],[this.P]);
                 this.model.out2 = new ScilabDouble([1]);
                 this.model.outtyp = new ScilabDouble([1]);
-                this.graphics.exprs = new ScilabDouble([exprs]);
+                this.graphics.exprs = new ScilabDouble([this.exprs]);
                 this.x.graphics = this.graphics;
                 this.x.model = this.model;
                 break;
diff --git a/js/Sources/GENSIN_f.pickle b/js/Sources/GENSIN_f.pickle
index 2058c781..2043a20b 100644
--- a/js/Sources/GENSIN_f.pickle
+++ b/js/Sources/GENSIN_f.pickle
@@ -2,20 +2,24 @@ c__builtin__
 set
 p0
 ((lp1
-S'F'
+S'P'
 p2
-aS'M'
+aS'F'
 p3
-aS'P'
+aS'M'
 p4
-aS'graphics'
+aS'exprs'
 p5
-aS'x'
+aS'gr_i'
 p6
-aS'model'
+aS'graphics'
 p7
-atp8
-Rp9
+aS'x'
+p8
+aS'model'
+p9
+atp10
+Rp11
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Sources/GENSQR_f.js b/js/Sources/GENSQR_f.js
index 3c0b2f65..162dbe83 100644
--- a/js/Sources/GENSQR_f.js
+++ b/js/Sources/GENSQR_f.js
@@ -11,9 +11,9 @@ function GENSQR_f() {
         this.model.dstate = new ScilabDouble([this.Amplitude]);
         this.model.blocktype = new ScilabString(["d"]);
         this.model.dep_ut = new ScilabDouble([false,false]);
-        var exprs = string(this.Amplitude);
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSQR_f\",sz(1),sz(2));"]);
-        this.x = standard_define([3,2],this.model,exprs,gr_i);
+        this.exprs = string(this.Amplitude);
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSQR_f\",sz(1),sz(2));"]);
+        this.x = standard_define([3,2],this.model,this.exprs,this.gr_i);
         return new BasicBlock(this.x);
     }
     GENSQR_f.prototype.details = function GENSQR_f() {
@@ -27,19 +27,20 @@ function GENSQR_f() {
     }
     GENSQR_f.prototype.set = function GENSQR_f() {
         this.Amplitude = parseFloat(arguments[0]["Amplitude"])
+        this.exprs = parseFloat(arguments[0]["exprs"])
         this.x = arg1;
         this.graphics = arg1.graphics;
-        var exprs = this.graphics.exprs;
+        this.exprs = this.graphics.exprs;
         this.model = arg1.model;
-        if (size(exprs,"*")==2) {
-            var exprs = exprs[2-1];
+        if (size(this.exprs,"*")==2) {
+            this.exprs = this.exprs[2-1];
         }
         while (true) {
-            [ok,this.Amplitude,exprs] = scicos_getvalue(["Set Square generator block parameters"],["Amplitude"],list("vec",1),exprs);
+            [ok,this.Amplitude,this.exprs] = scicos_getvalue(["Set Square generator block parameters"],["Amplitude"],list("vec",1),this.exprs);
             if (!ok) {
                 break;
             }
-            this.graphics.exprs = new ScilabDouble([exprs]);
+            this.graphics.exprs = new ScilabDouble([this.exprs]);
             this.model.dstate = new ScilabDouble([this.Amplitude]);
             this.model.out2 = new ScilabDouble([1]);
             this.model.outtyp = new ScilabDouble([1]);
diff --git a/js/Sources/GENSQR_f.pickle b/js/Sources/GENSQR_f.pickle
index b2ee098e..ddab6644 100644
--- a/js/Sources/GENSQR_f.pickle
+++ b/js/Sources/GENSQR_f.pickle
@@ -2,16 +2,20 @@ c__builtin__
 set
 p0
 ((lp1
-S'x'
+S'exprs'
 p2
-aS'model'
+aS'gr_i'
 p3
 aS'Amplitude'
 p4
 aS'graphics'
 p5
-atp6
-Rp7
+aS'x'
+p6
+aS'model'
+p7
+atp8
+Rp9
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Sources/GEN_SQR.js b/js/Sources/GEN_SQR.js
index 0ed8569e..f119e1dc 100644
--- a/js/Sources/GEN_SQR.js
+++ b/js/Sources/GEN_SQR.js
@@ -45,9 +45,9 @@ function GEN_SQR() {
         var Amax = 1;
         var rule = 1;
         var F = 1;
-        var exprs = [sci2exp(Amin),sci2exp(Amax),sci2exp(rule),sci2exp(F)];
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GEN_SQR\",sz(1),sz(2));"]);
-        this.x = standard_define([3,2],this.model,exprs,gr_i);
+        this.exprs = [sci2exp(Amin),sci2exp(Amax),sci2exp(rule),sci2exp(F)];
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GEN_SQR\",sz(1),sz(2));"]);
+        this.x = standard_define([3,2],this.model,this.exprs,this.gr_i);
         return new BasicBlock(this.x);
     }
     GEN_SQR.prototype.details = function GEN_SQR() {
@@ -63,11 +63,12 @@ function GEN_SQR() {
         scicos_context.Amax = arguments[0]["scicos_context.Amax"]
         scicos_context.rule = arguments[0]["scicos_context.rule"]
         scicos_context.F = arguments[0]["scicos_context.F"]
+        this.exprs = arguments[0]["exprs"]
         var y = this.needcompile;
         arg1.model.ipar = 1;
         var typ = list();
         this.graphics = arg1.graphics;
-        var exprs = this.graphics.exprs;
+        this.exprs = this.graphics.exprs;
         var Btitre = "Set GEN_SQR parameters";
         var Exprs0 = [["Amin"],["Amax"],["rule"],["F"]];
         var Bitems = [["Minimum Value"],["Maximum Value"],["Initial Value( 1= Minimum Value 2= Maximum Value)"],["Period (sec)"]];
@@ -76,7 +77,7 @@ function GEN_SQR() {
         this.x = arg1;
         var ok = false;
         while (!ok) {
-            [ok,scicos_context.Amin,scicos_context.Amax,scicos_context.rule,scicos_context.F,exprs] = scicos_getvalue(Btitre,Bitems,Ss,exprs);
+            [ok,scicos_context.Amin,scicos_context.Amax,scicos_context.rule,scicos_context.F,this.exprs] = scicos_getvalue(Btitre,Bitems,Ss,this.exprs);
             if (!ok) {
                 return;
             }
@@ -93,7 +94,7 @@ function GEN_SQR() {
                 var ok = tmpvar1[3];
                 if (ok) {
                     var y = max(2,this.needcompile,needcompile2);
-                    this.x.graphics.exprs = exprs;
+                    this.x.graphics.exprs = this.exprs;
                     this.x.model.rpar = sblock;
                     break;
                 }
diff --git a/js/Sources/GEN_SQR.pickle b/js/Sources/GEN_SQR.pickle
index 2f6fdb8a..fce61f2d 100644
--- a/js/Sources/GEN_SQR.pickle
+++ b/js/Sources/GEN_SQR.pickle
@@ -8,18 +8,22 @@ aS'scicos_context.Amax'
 p3
 aS'scicos_context.rule'
 p4
-aS'graphics'
+aS'exprs'
 p5
-aS'x'
+aS'gr_i'
 p6
-aS'scicos_context.Amin'
+aS'graphics'
 p7
-aS'scicos_context.F'
+aS'x'
 p8
 aS'model'
 p9
-atp10
-Rp11
+aS'scicos_context.F'
+p10
+aS'scicos_context.Amin'
+p11
+atp12
+Rp13
 .(dp0
 S'model.odstate'
 p1
diff --git a/js/Sources/Ground_g.js b/js/Sources/Ground_g.js
index 343fe0c4..b30d73e8 100644
--- a/js/Sources/Ground_g.js
+++ b/js/Sources/Ground_g.js
@@ -13,9 +13,9 @@ function Ground_g() {
         this.model.opar = list(C);
         this.model.blocktype = new ScilabString(["d"]);
         this.model.dep_ut = new ScilabDouble([false,false]);
-        var exprs = [];
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground_g\",sz(1),sz(2));"]);
-        this.x = standard_define([2,2],this.model,exprs,gr_i);
+        this.exprs = [];
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground_g\",sz(1),sz(2));"]);
+        this.x = standard_define([2,2],this.model,this.exprs,this.gr_i);
         return new BasicBlock(this.x);
     }
     Ground_g.prototype.details = function Ground_g() {
diff --git a/js/Sources/Ground_g.pickle b/js/Sources/Ground_g.pickle
index 4ff6abff..12e7a77c 100644
--- a/js/Sources/Ground_g.pickle
+++ b/js/Sources/Ground_g.pickle
@@ -6,8 +6,14 @@ S'x'
 p2
 aS'model'
 p3
-atp4
-Rp5
+aS'gr_i'
+p4
+aS'exprs'
+p5
+aS'graphics'
+p6
+atp7
+Rp8
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Sources/INIMPL_f.js b/js/Sources/INIMPL_f.js
index bfcbde45..75664e3c 100644
--- a/js/Sources/INIMPL_f.js
+++ b/js/Sources/INIMPL_f.js
@@ -13,9 +13,9 @@ function INIMPL_f() {
         mo.outputs = "n";
         this.model.equations = new ScilabDouble([mo]);
         this.prt = 1;
-        var exprs = "1";
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INIMPL_f\",sz(1),sz(2));"]);
-        this.x = standard_define([1,1],this.model,exprs,gr_i);
+        this.exprs = "1";
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INIMPL_f\",sz(1),sz(2));"]);
+        this.x = standard_define([1,1],this.model,this.exprs,this.gr_i);
         this.x.graphics.out_implicit = ["I"];
         return new ImplicitInBlock(this.x);
     }
@@ -29,15 +29,16 @@ function INIMPL_f() {
     }
     INIMPL_f.prototype.set = function INIMPL_f() {
         this.prt = parseFloat(arguments[0]["prt"])
+        this.exprs = parseFloat(arguments[0]["exprs"])
         this.x = arg1;
         this.graphics = arg1.graphics;
-        var exprs = this.graphics.exprs;
+        this.exprs = this.graphics.exprs;
         this.model = arg1.model;
-        if (size(exprs,"*")==2) {
-            var exprs = exprs[1-1];
+        if (size(this.exprs,"*")==2) {
+            this.exprs = this.exprs[1-1];
         }
         while (true) {
-            [ok,this.prt,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","INIMPL_f")],[" "],["Implicit input port"],[" "]],"Port Number",list("vec",1),exprs);
+            [ok,this.prt,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","INIMPL_f")],[" "],["Implicit input port"],[" "]],"Port Number",list("vec",1),this.exprs);
             if (!ok) {
                 break;
             }
@@ -50,7 +51,7 @@ function INIMPL_f() {
                     var y = needcompile;
                 }
                 this.model.ipar = new ScilabDouble([this.prt]);
-                this.graphics.exprs = new ScilabDouble([exprs]);
+                this.graphics.exprs = new ScilabDouble([this.exprs]);
                 this.x.graphics = this.graphics;
                 this.x.model = this.model;
                 break;
diff --git a/js/Sources/INIMPL_f.pickle b/js/Sources/INIMPL_f.pickle
index 7a3db6b1..737ac91e 100644
--- a/js/Sources/INIMPL_f.pickle
+++ b/js/Sources/INIMPL_f.pickle
@@ -2,16 +2,20 @@ c__builtin__
 set
 p0
 ((lp1
-S'prt'
+S'exprs'
 p2
-aS'x'
+aS'prt'
 p3
-aS'model'
+aS'gr_i'
 p4
 aS'graphics'
 p5
-atp6
-Rp7
+aS'x'
+p6
+aS'model'
+p7
+atp8
+Rp9
 .(dp0
 S'arg1'
 p1
diff --git a/js/Sources/IN_f.js b/js/Sources/IN_f.js
index d1b6534d..6ff481fa 100644
--- a/js/Sources/IN_f.js
+++ b/js/Sources/IN_f.js
@@ -10,9 +10,9 @@ function IN_f() {
         this.model.ipar = new ScilabDouble([prt]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = new ScilabDouble([false,false]);
-        var exprs = sci2exp(prt);
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IN_f\",sz(1),sz(2));"]);
-        this.x = standard_define([1,1],this.model,exprs,gr_i);
+        this.exprs = sci2exp(prt);
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IN_f\",sz(1),sz(2));"]);
+        this.x = standard_define([1,1],this.model,this.exprs,this.gr_i);
         return new ExplicitInBlock(this.x);
     }
     IN_f.prototype.details = function IN_f() {
@@ -27,20 +27,20 @@ function IN_f() {
         this.x = arg1;
         this.graphics = arg1.graphics;
         this.model = arg1.model;
-        var exprs = this.graphics.exprs;
-        if (size(exprs,"*")==2) {
-            var exprs = exprs[1-1];
+        this.exprs = this.graphics.exprs;
+        if (size(this.exprs,"*")==2) {
+            this.exprs = this.exprs[1-1];
         }
-        if (size(exprs,"*")==1) {
-            var exprs = [[exprs[1-1]],["[-1 -2]"],["-1"]];
+        if (size(this.exprs,"*")==1) {
+            this.exprs = [[this.exprs[1-1]],["[-1 -2]"],["-1"]];
         }
         while (true) {
-            var tmpvar0 = getvalue(_("Set Input block parameters"),[[_("Port number")],[_("Outport size ([-1 -2] for inherit)")],[_("Outport Type (-1 for inherit)")]],list("vec",1,"vec",-1,"vec",1),exprs);
+            var tmpvar0 = getvalue(_("Set Input block parameters"),[[_("Port number")],[_("Outport size ([-1 -2] for inherit)")],[_("Outport Type (-1 for inherit)")]],list("vec",1,"vec",-1,"vec",1),this.exprs);
             var ok = tmpvar0[0];
             var prt = tmpvar0[1];
             var otsz = tmpvar0[2];
             var ot = tmpvar0[3];
-            var exprs = tmpvar0[4];
+            this.exprs = tmpvar0[4];
             if (!ok) {
                 break;
             }
@@ -61,7 +61,7 @@ function IN_f() {
                 this.model.out = new ScilabDouble([otsz[1-1]]);
                 this.model.out2 = new ScilabDouble([otsz[2-1]]);
                 this.model.outtyp = new ScilabDouble([ot]);
-                this.graphics.exprs = new ScilabDouble(exprs);
+                this.graphics.exprs = new ScilabDouble(this.exprs);
                 this.x.graphics = this.graphics;
                 this.x.model = this.model;
                 break;
diff --git a/js/Sources/IN_f.pickle b/js/Sources/IN_f.pickle
index 3594fa55..c3788a09 100644
--- a/js/Sources/IN_f.pickle
+++ b/js/Sources/IN_f.pickle
@@ -6,10 +6,14 @@ S'x'
 p2
 aS'model'
 p3
-aS'graphics'
+aS'gr_i'
 p4
-atp5
-Rp6
+aS'exprs'
+p5
+aS'graphics'
+p6
+atp7
+Rp8
 .(dp0
 S'needcompile'
 p1
diff --git a/js/Sources/Modulo_Count.js b/js/Sources/Modulo_Count.js
index d2ada870..22d253bb 100644
--- a/js/Sources/Modulo_Count.js
+++ b/js/Sources/Modulo_Count.js
@@ -11,9 +11,9 @@ function Modulo_Count() {
         this.model.ipar = new ScilabDouble([this.base]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = new ScilabDouble([false,false]);
-        var exprs = [[string(this.ini_c)],[string(this.base)]];
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Modulo_Count\",sz(1),sz(2));"]);
-        this.x = standard_define([3,2],this.model,exprs,gr_i);
+        this.exprs = [[string(this.ini_c)],[string(this.base)]];
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Modulo_Count\",sz(1),sz(2));"]);
+        this.x = standard_define([3,2],this.model,this.exprs,this.gr_i);
         return new BasicBlock(this.x);
     }
     Modulo_Count.prototype.details = function Modulo_Count() {
@@ -29,12 +29,13 @@ function Modulo_Count() {
     Modulo_Count.prototype.set = function Modulo_Count() {
         this.ini_c = parseFloat(arguments[0]["ini_c"])
         this.base = parseFloat(arguments[0]["base"])
+        this.exprs = arguments[0]["exprs"]
         this.x = arg1;
         this.graphics = arg1.graphics;
-        var exprs = this.graphics.exprs;
+        this.exprs = this.graphics.exprs;
         this.model = arg1.model;
         while (true) {
-            [ok,this.ini_c,this.base,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","Modulo_Count")],[" "],["Modulo counter (0 to N counter)"],[" "]],["Initial State (zero or positive number)","Upper Limit (positive number)"],list("vec",1,"vec",1),exprs);
+            [ok,this.ini_c,this.base,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","Modulo_Count")],[" "],["Modulo counter (0 to N counter)"],[" "]],["Initial State (zero or positive number)","Upper Limit (positive number)"],list("vec",1,"vec",1),this.exprs);
             this.ini_c = int(this.ini_c);
             this.base = int(this.base);
             if (!ok) {
@@ -45,7 +46,7 @@ function Modulo_Count() {
             } else if (this.base<=0) {
                 block_parameter_error(msprintf("Wrong values for \'Upper Limit\' parameter: %d.",this.base),"Strictly positive integer expected.");
             } else {
-                this.graphics.exprs = new ScilabDouble([exprs]);
+                this.graphics.exprs = new ScilabDouble([this.exprs]);
                 this.model.ipar = new ScilabDouble([this.base]);
                 this.model.dstate = new ScilabDouble([this.ini_c]);
                 this.x.graphics = this.graphics;
diff --git a/js/Sources/Modulo_Count.pickle b/js/Sources/Modulo_Count.pickle
index 5f0e8a6d..b331cc4a 100644
--- a/js/Sources/Modulo_Count.pickle
+++ b/js/Sources/Modulo_Count.pickle
@@ -2,18 +2,22 @@ c__builtin__
 set
 p0
 ((lp1
-S'x'
+S'ini_c'
 p2
-aS'model'
+aS'exprs'
 p3
-aS'ini_c'
+aS'gr_i'
 p4
 aS'base'
 p5
 aS'graphics'
 p6
-atp7
-Rp8
+aS'x'
+p7
+aS'model'
+p8
+atp9
+Rp10
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Sources/PULSE_SC.js b/js/Sources/PULSE_SC.js
index 0048829d..796d4e50 100644
--- a/js/Sources/PULSE_SC.js
+++ b/js/Sources/PULSE_SC.js
@@ -40,9 +40,9 @@ function PULSE_SC() {
         var W = 30;
         var F = 1;
         var A = 1;
-        var exprs = [sci2exp(E),sci2exp(W),sci2exp(F),sci2exp(A)];
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PULSE_SC\",sz(1),sz(2));"]);
-        this.x = standard_define([3,2],this.model,exprs,gr_i);
+        this.exprs = [sci2exp(E),sci2exp(W),sci2exp(F),sci2exp(A)];
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PULSE_SC\",sz(1),sz(2));"]);
+        this.x = standard_define([3,2],this.model,this.exprs,this.gr_i);
         return new BasicBlock(this.x);
     }
     PULSE_SC.prototype.details = function PULSE_SC() {
@@ -58,11 +58,12 @@ function PULSE_SC() {
         scicos_context.W = arguments[0]["scicos_context.W"]
         scicos_context.F = arguments[0]["scicos_context.F"]
         scicos_context.A = arguments[0]["scicos_context.A"]
+        this.exprs = arguments[0]["exprs"]
         var y = this.needcompile;
         arg1.model.ipar = 1;
         var typ = list();
         this.graphics = arg1.graphics;
-        var exprs = this.graphics.exprs;
+        this.exprs = this.graphics.exprs;
         var Btitre = "Set Pulse Generator parameters";
         var Exprs0 = [["E"],["W"],["F"],["A"]];
         var Bitems = [["Phase delay (secs):"],["Pulse Width (% of period):"],["Period (secs):"],["Amplitude:"]];
@@ -71,7 +72,7 @@ function PULSE_SC() {
         this.x = arg1;
         var ok = false;
         while (!ok) {
-            [ok,scicos_context.E,scicos_context.W,scicos_context.F,scicos_context.A,exprs] = scicos_getvalue(Btitre,Bitems,Ss,exprs);
+            [ok,scicos_context.E,scicos_context.W,scicos_context.F,scicos_context.A,this.exprs] = scicos_getvalue(Btitre,Bitems,Ss,this.exprs);
             if (!ok) {
                 return;
             }
@@ -88,7 +89,7 @@ function PULSE_SC() {
                 var ok = tmpvar1[3];
                 if (ok) {
                     var y = max(2,this.needcompile,needcompile2);
-                    this.x.graphics.exprs = exprs;
+                    this.x.graphics.exprs = this.exprs;
                     this.x.model.rpar = sblock;
                     break;
                 }
diff --git a/js/Sources/PULSE_SC.pickle b/js/Sources/PULSE_SC.pickle
index 40948305..7cd361a3 100644
--- a/js/Sources/PULSE_SC.pickle
+++ b/js/Sources/PULSE_SC.pickle
@@ -6,20 +6,24 @@ S'needcompile'
 p2
 aS'scicos_context.W'
 p3
-aS'graphics'
+aS'exprs'
 p4
-aS'x'
+aS'gr_i'
 p5
-aS'model'
+aS'graphics'
 p6
-aS'scicos_context.A'
+aS'x'
 p7
-aS'scicos_context.F'
+aS'model'
 p8
-aS'scicos_context.E'
+aS'scicos_context.A'
 p9
-atp10
-Rp11
+aS'scicos_context.F'
+p10
+aS'scicos_context.E'
+p11
+atp12
+Rp13
 .(dp0
 S'model.odstate'
 p1
diff --git a/js/Sources/RAMP.js b/js/Sources/RAMP.js
index d0d6e161..3ac0a879 100644
--- a/js/Sources/RAMP.js
+++ b/js/Sources/RAMP.js
@@ -14,9 +14,9 @@ function RAMP() {
         this.model.nmode = new ScilabDouble([1]);
         this.model.nzcross = new ScilabDouble([1]);
         this.model.dep_ut = new ScilabDouble([false,true]);
-        var exprs = [string(rpar)];
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAMP\",sz(1),sz(2));"]);
-        this.x = standard_define([2,2],this.model,exprs,gr_i);
+        this.exprs = [string(rpar)];
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAMP\",sz(1),sz(2));"]);
+        this.x = standard_define([2,2],this.model,this.exprs,this.gr_i);
         return new BasicBlock(this.x);
     }
     RAMP.prototype.details = function RAMP() {
@@ -34,12 +34,13 @@ function RAMP() {
         this.slope = parseFloat(arguments[0]["slope"])
         this.stt = parseFloat(arguments[0]["stt"])
         this.iout = parseFloat(arguments[0]["iout"])
+        this.exprs = arguments[0]["exprs"]
         this.x = arg1;
         this.graphics = arg1.graphics;
-        var exprs = this.graphics.exprs;
+        this.exprs = this.graphics.exprs;
         this.model = arg1.model;
         while (true) {
-            [ok,this.slope,this.stt,this.iout,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","RAMP")],[" "],["Ramp function"],[" "]],["Slope","Start Time","Initial Value"],list("vec",1,"vec",1,"vec",1),exprs);
+            [ok,this.slope,this.stt,this.iout,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","RAMP")],[" "],["Ramp function"],[" "]],["Slope","Start Time","Initial Value"],list("vec",1,"vec",1,"vec",1),this.exprs);
             if (!ok) {
                 break;
             }
@@ -47,7 +48,7 @@ function RAMP() {
                 block_parameter_error(msprintf("Wrong value for \'Start Time\' parameter: %e.",this.stt),"Null or positive integer expected.");
             } else {
                 this.model.rpar = new ScilabDouble([this.slope],[this.stt],[this.iout]);
-                this.graphics.exprs = new ScilabDouble([exprs]);
+                this.graphics.exprs = new ScilabDouble([this.exprs]);
                 this.x.graphics = this.graphics;
                 this.x.model = this.model;
                 break;
diff --git a/js/Sources/RAMP.pickle b/js/Sources/RAMP.pickle
index 90ce1880..ec96548a 100644
--- a/js/Sources/RAMP.pickle
+++ b/js/Sources/RAMP.pickle
@@ -8,14 +8,18 @@ aS'iout'
 p3
 aS'stt'
 p4
-aS'graphics'
+aS'exprs'
 p5
-aS'x'
+aS'gr_i'
 p6
-aS'model'
+aS'graphics'
 p7
-atp8
-Rp9
+aS'x'
+p8
+aS'model'
+p9
+atp10
+Rp11
 .(dp0
 S'slope'
 p1
diff --git a/js/Sources/RAND_f.js b/js/Sources/RAND_f.js
index 9e4444cb..73084f93 100644
--- a/js/Sources/RAND_f.js
+++ b/js/Sources/RAND_f.js
@@ -15,9 +15,9 @@ function RAND_f() {
         this.model.ipar = new ScilabDouble([this.flag]);
         this.model.blocktype = new ScilabString(["d"]);
         this.model.dep_ut = new ScilabDouble([false,false]);
-        var exprs = [[string(this.flag)],[sci2exp(this.a.slice())],[sci2exp(this.b.slice())],[string(this.model.dstate[1-1])]];
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAND_f\",sz(1),sz(2));"]);
-        this.x = standard_define([3,2],this.model,exprs,gr_i);
+        this.exprs = [[string(this.flag)],[sci2exp(this.a.slice())],[sci2exp(this.b.slice())],[string(this.model.dstate[1-1])]];
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAND_f\",sz(1),sz(2));"]);
+        this.x = standard_define([3,2],this.model,this.exprs,this.gr_i);
         return new BasicBlock(this.x);
     }
     RAND_f.prototype.details = function RAND_f() {
@@ -37,18 +37,19 @@ function RAND_f() {
         this.a = parseFloat(arguments[0]["a"])
         this.b = parseFloat(arguments[0]["b"])
         this.seed_c = arguments[0]["seed_c"]
+        this.exprs = inverse(arguments[0]["exprs"])
         this.x = arg1;
         this.graphics = arg1.graphics;
-        var exprs = this.graphics.exprs;
+        this.exprs = this.graphics.exprs;
         this.model = arg1.model;
-        if (size(exprs,"*")==5) {
-            var exprs = exprs.slice(1-1,3);
+        if (size(this.exprs,"*")==5) {
+            this.exprs = this.exprs.slice(1-1,3);
         }
-        if (size(exprs,"*")==3) {
-            var exprs = [[exprs],[string(this.model.dstate[1-1])]];
+        if (size(this.exprs,"*")==3) {
+            this.exprs = [[this.exprs],[string(this.model.dstate[1-1])]];
         }
         while (true) {
-            [ok,this.flag,this.a,this.b,this.seed_c,exprs] = scicos_getvalue([["Set Random generator block parameters"],["flag = 0 : Uniform distribution A is min and A+B max"],["flag = 1 : Normal distribution A is mean and B deviation"],[" "],["A and B must be vector with equal sizes"],["seed is the seed of random number generator (integer<2**31)"]],["flag","A","B","seed"],list("vec",1,"vec",-1,"vec","size(%2,\'*\')","vec",1),exprs);
+            [ok,this.flag,this.a,this.b,this.seed_c,this.exprs] = scicos_getvalue([["Set Random generator block parameters"],["flag = 0 : Uniform distribution A is min and A+B max"],["flag = 1 : Normal distribution A is mean and B deviation"],[" "],["A and B must be vector with equal sizes"],["seed is the seed of random number generator (integer<2**31)"]],["flag","A","B","seed"],list("vec",1,"vec",-1,"vec","size(%2,\'*\')","vec",1),this.exprs);
             if (!ok) {
                 break;
             }
@@ -56,7 +57,7 @@ function RAND_f() {
                 message("flag must be equal to 1 or 0");
             } else {
                 var nout = size(this.a,"*");
-                this.graphics.exprs = new ScilabDouble(exprs);
+                this.graphics.exprs = new ScilabDouble(this.exprs);
                 this.model.out = new ScilabDouble([nout]);
                 this.model.ipar = new ScilabDouble([this.flag]);
                 this.model.rpar = new ScilabDouble([this.a.slice()],[this.b.slice()]);
diff --git a/js/Sources/RAND_f.pickle b/js/Sources/RAND_f.pickle
index 3810200f..7e695747 100644
--- a/js/Sources/RAND_f.pickle
+++ b/js/Sources/RAND_f.pickle
@@ -8,16 +8,20 @@ aS'b'
 p3
 aS'seed_c'
 p4
-aS'flag'
+aS'exprs'
 p5
-aS'graphics'
+aS'flag'
 p6
-aS'x'
+aS'gr_i'
 p7
-aS'model'
+aS'graphics'
 p8
-atp9
-Rp10
+aS'x'
+p9
+aS'model'
+p10
+atp11
+Rp12
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js
index f7d0217b..56333efc 100644
--- a/js/Sources/RAND_m.js
+++ b/js/Sources/RAND_m.js
@@ -24,9 +24,9 @@ function RAND_m() {
         this.model.blocktype = new ScilabString(["d"]);
         this.model.firing = new ScilabDouble([]);
         this.model.dep_ut = new ScilabDouble([false,false]);
-        var exprs = [[sci2exp(1)],[string(this.flag)],[sci2exp([this.a])],[sci2exp([this.b])],[sci2exp([this.model.dstate[1-1],int(rand()*(10^7-1))])]];
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAND_m\",sz(1),sz(2));"]);
-        this.x = standard_define([3,2],this.model,exprs,gr_i);
+        this.exprs = [[sci2exp(1)],[string(this.flag)],[sci2exp([this.a])],[sci2exp([this.b])],[sci2exp([this.model.dstate[1-1],int(rand()*(10^7-1))])]];
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAND_m\",sz(1),sz(2));"]);
+        this.x = standard_define([3,2],this.model,this.exprs,this.gr_i);
         return new BasicBlock(this.x);
     }
     RAND_m.prototype.details = function RAND_m() {
@@ -48,15 +48,16 @@ function RAND_m() {
         this.a = parseFloat(arguments[0]["a"])
         this.b = parseFloat(arguments[0]["b"])
         this.seed_c = arguments[0]["seed_c"]
+        this.exprs = arguments[0]["exprs"]
         this.x = arg1;
         this.graphics = arg1.graphics;
-        var exprs = this.graphics.exprs;
+        this.exprs = this.graphics.exprs;
         this.model = arg1.model;
-        if (size(exprs,"*")==14) {
-            exprs[9-1] = [];
+        if (size(this.exprs,"*")==14) {
+            this.exprs[9-1] = [];
         }
         while (true) {
-            [ok,this.typ,this.flag,this.a,this.b,this.seed_c,exprs] = scicos_getvalue([["Set Random generator block parameters"],["flag = 0 : Uniform distribution A is min and A+B max"],["flag = 1 : Normal distribution A is mean and B deviation"],[" "],["A and B must be matrix with equal sizes"]],["Datatype(1=real double  2=complex)","flag","A","B","SEED"],list("vec",1,"vec",1,"mat",[-1,-2],"mat","[-1 -2]","mat",[1,2]),exprs);
+            [ok,this.typ,this.flag,this.a,this.b,this.seed_c,this.exprs] = scicos_getvalue([["Set Random generator block parameters"],["flag = 0 : Uniform distribution A is min and A+B max"],["flag = 1 : Normal distribution A is mean and B deviation"],[" "],["A and B must be matrix with equal sizes"]],["Datatype(1=real double  2=complex)","flag","A","B","SEED"],list("vec",1,"vec",1,"mat",[-1,-2],"mat","[-1 -2]","mat",[1,2]),this.exprs);
             if (!ok) {
                 break;
             }
@@ -85,7 +86,7 @@ function RAND_m() {
                     var ok = tmpvar0[2];
                     if (ok) {
                         this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([4]));
-                        this.graphics.exprs = new ScilabDouble([exprs]);
+                        this.graphics.exprs = new ScilabDouble([this.exprs]);
                         this.model.ipar = new ScilabDouble([this.flag]);
                         this.x.graphics = this.graphics;
                         this.x.model = this.model;
diff --git a/js/Sources/RAND_m.pickle b/js/Sources/RAND_m.pickle
index 06b6608f..bd5f8157 100644
--- a/js/Sources/RAND_m.pickle
+++ b/js/Sources/RAND_m.pickle
@@ -8,18 +8,22 @@ aS'b'
 p3
 aS'seed_c'
 p4
-aS'flag'
+aS'exprs'
 p5
-aS'graphics'
+aS'flag'
 p6
-aS'x'
+aS'gr_i'
 p7
-aS'model'
+aS'graphics'
 p8
-aS'typ'
+aS'x'
 p9
-atp10
-Rp11
+aS'model'
+p10
+aS'typ'
+p11
+atp12
+Rp13
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/Sources/READAU_f.js b/js/Sources/READAU_f.js
index dd7d168d..76498f48 100644
--- a/js/Sources/READAU_f.js
+++ b/js/Sources/READAU_f.js
@@ -20,9 +20,9 @@ function READAU_f() {
         this.model.ipar = new ScilabDouble([length(fname)],[this._str2code[frmt-1]],[ievt],[this.N],[M],[this.swap],[offset],[this._str2code[fname-1]],[tmask],[outmask]);
         this.model.blocktype = new ScilabString(["d"]);
         this.model.dep_ut = new ScilabDouble([false,false]);
-        var exprs = [[fname],[string(this.N)],[string(this.swap)]];
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"READAU_f\",sz(1),sz(2));"]);
-        this.x = standard_define([5,2],this.model,exprs,gr_i);
+        this.exprs = [[fname],[string(this.N)],[string(this.swap)]];
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"READAU_f\",sz(1),sz(2));"]);
+        this.x = standard_define([5,2],this.model,this.exprs,this.gr_i);
         return new BasicBlock(this.x);
     }
     READAU_f.prototype.details = function READAU_f() {
@@ -40,9 +40,10 @@ function READAU_f() {
         this.fname1 = parseFloat(arguments[0]["fname1"])
         this.N = parseFloat(arguments[0]["N"])
         this.swap = parseFloat(arguments[0]["swap"])
+        this.exprs = arguments[0]["exprs"]
         this.x = arg1;
         this.graphics = arg1.graphics;
-        var exprs = this.graphics.exprs;
+        this.exprs = this.graphics.exprs;
         this.model = arg1.model;
         var out = this.model.out;
         var dstate = this.model.dstate;
@@ -50,9 +51,9 @@ function READAU_f() {
         var imask = 9+ipar[1-1];
         var tmask = ipar[imask-1];
         var lunit = dstate[3-1];
-        var fname = exprs[1-1];
+        var fname = this.exprs[1-1];
         while (true) {
-            [ok,this.fname1,this.N,this.swap,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","READAU_f")],[" "],["(Read Audio File)"],[" "],["Read is done on a binary \'.au\' file"]],["Input File Name","Buffer size","Swap Mode (0:No, 1:Yes)"],list("str",1,"vec",1,"vec",1),exprs);
+            [ok,this.fname1,this.N,this.swap,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","READAU_f")],[" "],["(Read Audio File)"],[" "],["Read is done on a binary \'.au\' file"]],["Input File Name","Buffer size","Swap Mode (0:No, 1:Yes)"],list("str",1,"vec",1,"vec",1),this.exprs);
             var tmask1 = [];
             var outmask = 1;
             var frmt1 = "uc";
@@ -86,7 +87,7 @@ function READAU_f() {
                     }
                     this.model.dstate = new ScilabDouble(dstate);
                     this.model.ipar = new ScilabDouble(ipar);
-                    this.graphics.exprs = new ScilabDouble([exprs]);
+                    this.graphics.exprs = new ScilabDouble([this.exprs]);
                     this.x.graphics = this.graphics;
                     this.x.model = this.model;
                     break;
diff --git a/js/Sources/READAU_f.pickle b/js/Sources/READAU_f.pickle
index c112ea3e..429a17d5 100644
--- a/js/Sources/READAU_f.pickle
+++ b/js/Sources/READAU_f.pickle
@@ -8,18 +8,22 @@ aS'fname1'
 p3
 aS'N'
 p4
-aS'swap'
+aS'exprs'
 p5
-aS'graphics'
+aS'gr_i'
 p6
-aS'x'
+aS'swap'
 p7
-aS'model'
+aS'graphics'
 p8
-aS'alreadyran'
+aS'x'
 p9
-atp10
-Rp11
+aS'model'
+p10
+aS'alreadyran'
+p11
+atp12
+Rp13
 .(dp0
 S'tmask'
 p1
diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js
index 4a11e2ae..0e72d59d 100644
--- a/js/Sources/READC_f.js
+++ b/js/Sources/READC_f.js
@@ -24,9 +24,9 @@ function READC_f() {
         this.model.blocktype = new ScilabString(["d"]);
         this.model.firing = new ScilabDouble([-1]);
         this.model.dep_ut = new ScilabDouble([false,false]);
-        var exprs = [["[]"],[sci2exp(this.outmask)],[fname],[frmt],[string(this.M)],[string(this.N)],[string(this.offset)],[string(this.swap)]];
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"READC_f\",sz(1),sz(2));"]);
-        this.x = standard_define([4,2],this.model,exprs,gr_i);
+        this.exprs = [["[]"],[sci2exp(this.outmask)],[fname],[frmt],[string(this.M)],[string(this.N)],[string(this.offset)],[string(this.swap)]];
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"READC_f\",sz(1),sz(2));"]);
+        this.x = standard_define([4,2],this.model,this.exprs,this.gr_i);
         return new BasicBlock(this.x);
     }
     READC_f.prototype.details = function READC_f() {
@@ -54,20 +54,21 @@ function READC_f() {
         this.N = parseFloat(arguments[0]["N"])
         this.offset = parseFloat(arguments[0]["offset"])
         this.swap = parseFloat(arguments[0]["swap"])
+        this.exprs = arguments[0]["exprs"]
         this.x = arg1;
         this.model = this.x.model;
         this.graphics = arg1.graphics;
-        var exprs = this.graphics.exprs;
+        this.exprs = this.graphics.exprs;
         var out = this.model.out;
         var dstate = this.model.dstate;
         var ipar = this.model.ipar;
         var imask = 9+ipar[1-1];
         var tmask = ipar[imask-1];
         var lunit = dstate[3-1];
-        var fname = exprs[3-1];
-        var frmt = exprs[4-1];
+        var fname = this.exprs[3-1];
+        var frmt = this.exprs[4-1];
         while (true) {
-            [ok,this.tmask1,this.outmask,this.fname1,this.frmt1,this.M,this.N,this.offset,this.swap,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","READC_f")],[" "],["Read from C binary file"]],["Time Record Selection","Outputs Record Selection","Input File Name","Input Format","Record Size","Buffer Size","Initial Record Index","Swap Mode (0:No, 1:Yes)"],list("vec",-1,"vec",-1,"str",1,"str",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
+            [ok,this.tmask1,this.outmask,this.fname1,this.frmt1,this.M,this.N,this.offset,this.swap,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","READC_f")],[" "],["Read from C binary file"]],["Time Record Selection","Outputs Record Selection","Input File Name","Input Format","Record Size","Buffer Size","Initial Record Index","Swap Mode (0:No, 1:Yes)"],list("vec",-1,"vec",-1,"str",1,"str",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs);
             if (!ok) {
                 break;
             }
@@ -130,7 +131,7 @@ function READC_f() {
                     }
                     this.model.dstate = new ScilabDouble(dstate);
                     this.model.ipar = new ScilabDouble(ipar);
-                    this.graphics.exprs = new ScilabDouble([exprs]);
+                    this.graphics.exprs = new ScilabDouble([this.exprs]);
                     this.x.graphics = this.graphics;
                     this.x.model = this.model;
                     break;
diff --git a/js/Sources/READC_f.pickle b/js/Sources/READC_f.pickle
index 635dc478..7c21df9c 100644
--- a/js/Sources/READC_f.pickle
+++ b/js/Sources/READC_f.pickle
@@ -14,22 +14,26 @@ aS'fname1'
 p6
 aS'N'
 p7
-aS'swap'
+aS'exprs'
 p8
-aS'offset'
+aS'gr_i'
 p9
-aS'graphics'
+aS'swap'
 p10
-aS'x'
+aS'offset'
 p11
-aS'model'
+aS'graphics'
 p12
-aS'tmask1'
+aS'x'
 p13
-aS'alreadyran'
+aS'model'
 p14
-atp15
-Rp16
+aS'tmask1'
+p15
+aS'alreadyran'
+p16
+atp17
+Rp18
 .(dp0
 S'tmask'
 p1
diff --git a/js/Sources/RFILE_f.js b/js/Sources/RFILE_f.js
index 4c5b6c2e..4cc3f634 100644
--- a/js/Sources/RFILE_f.js
+++ b/js/Sources/RFILE_f.js
@@ -20,9 +20,9 @@ function RFILE_f() {
         this.model.ipar = new ScilabDouble([length(fname)],[length(frmt)],[0],[this.N],[this._str2code[fname-1]],[this._str2code[frmt-1]],[tmask],[this.outmask]);
         this.model.blocktype = new ScilabString(["d"]);
         this.model.dep_ut = new ScilabDouble([false,false]);
-        var exprs = [[sci2exp([])],[sci2exp(this.outmask)],[fname],[frmt],[string(this.N)],[sci2exp(out)]];
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RFILE_f\",sz(1),sz(2));"]);
-        this.x = standard_define([3,2],this.model,exprs,gr_i);
+        this.exprs = [[sci2exp([])],[sci2exp(this.outmask)],[fname],[frmt],[string(this.N)],[sci2exp(out)]];
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RFILE_f\",sz(1),sz(2));"]);
+        this.x = standard_define([3,2],this.model,this.exprs,this.gr_i);
         return new BasicBlock(this.x);
     }
     RFILE_f.prototype.details = function RFILE_f() {
@@ -44,9 +44,10 @@ function RFILE_f() {
         this.fname1 = parseFloat(arguments[0]["fname1"])
         this.frmt1 = parseFloat(arguments[0]["frmt1"])
         this.N = parseFloat(arguments[0]["N"])
+        this.exprs = arguments[0]["exprs"]
         this.x = arg1;
         this.graphics = arg1.graphics;
-        var exprs = this.graphics.exprs;
+        this.exprs = this.graphics.exprs;
         this.model = arg1.model;
         var dstate = this.model.dstate;
         var ipar = this.model.ipar;
@@ -55,13 +56,13 @@ function RFILE_f() {
         var imask = 5+ipar[1-1]+ipar[2-1];
         var tmask = ipar[imask-1];
         var lunit = dstate[3-1];
-        var fname = exprs[3-1];
-        var frmt = exprs[4-1];
-        if (size(exprs,"*")>5) {
-            exprs[6-1] = [];
+        var fname = this.exprs[3-1];
+        var frmt = this.exprs[4-1];
+        if (size(this.exprs,"*")>5) {
+            this.exprs[6-1] = [];
         }
         while (true) {
-            [ok,this.tmask1,this.outmask,this.fname1,this.frmt1,this.N,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","RFILE_f")],[" "],["Read from an input file"],[" "],["Read is done on:"],["&nbsp; - A binary file if no format given"],["&nbsp; - A formatted text file if a  format (fortran type) is given"]],["Time Record Selection","Outputs Record Selection","Input File Name","Input Format","Buffer Size"],list("vec",-1,"vec",-1,"str",1,"str",1,"vec",1),exprs);
+            [ok,this.tmask1,this.outmask,this.fname1,this.frmt1,this.N,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","RFILE_f")],[" "],["Read from an input file"],[" "],["Read is done on:"],["&nbsp; - A binary file if no format given"],["&nbsp; - A formatted text file if a  format (fortran type) is given"]],["Time Record Selection","Outputs Record Selection","Input File Name","Input Format","Buffer Size"],list("vec",-1,"vec",-1,"str",1,"str",1,"vec",1),this.exprs);
             if (!ok) {
                 break;
             }
@@ -113,7 +114,7 @@ function RFILE_f() {
                     }
                     this.model.dstate = new ScilabDouble(dstate);
                     this.model.ipar = new ScilabDouble(ipar);
-                    this.graphics.exprs = new ScilabDouble([exprs]);
+                    this.graphics.exprs = new ScilabDouble([this.exprs]);
                     this.x.graphics = this.graphics;
                     this.x.model = this.model;
                     break;
diff --git a/js/Sources/RFILE_f.pickle b/js/Sources/RFILE_f.pickle
index 8be76902..a3cf5177 100644
--- a/js/Sources/RFILE_f.pickle
+++ b/js/Sources/RFILE_f.pickle
@@ -12,16 +12,20 @@ aS'fname1'
 p5
 aS'N'
 p6
-aS'graphics'
+aS'exprs'
 p7
-aS'x'
+aS'gr_i'
 p8
-aS'model'
+aS'graphics'
 p9
-aS'tmask1'
+aS'x'
 p10
-atp11
-Rp12
+aS'model'
+p11
+aS'tmask1'
+p12
+atp13
+Rp14
 .(dp0
 S'tmask'
 p1
diff --git a/js/Sources/SAWTOOTH_f.js b/js/Sources/SAWTOOTH_f.js
index b3ec717e..2cfae4d2 100644
--- a/js/Sources/SAWTOOTH_f.js
+++ b/js/Sources/SAWTOOTH_f.js
@@ -8,9 +8,9 @@ function SAWTOOTH_f() {
         this.model.dstate = new ScilabDouble([0]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = new ScilabDouble([false,true]);
-        var exprs = " ";
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAWTOOTH_f\",sz(1),sz(2));"]);
-        this.x = standard_define([3,2],this.model,exprs,gr_i);
+        this.exprs = " ";
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAWTOOTH_f\",sz(1),sz(2));"]);
+        this.x = standard_define([3,2],this.model,this.exprs,this.gr_i);
         return new BasicBlock(this.x);
     }
     SAWTOOTH_f.prototype.details = function SAWTOOTH_f() {
diff --git a/js/Sources/SAWTOOTH_f.pickle b/js/Sources/SAWTOOTH_f.pickle
index 40c4ca73..0fd8076d 100644
--- a/js/Sources/SAWTOOTH_f.pickle
+++ b/js/Sources/SAWTOOTH_f.pickle
@@ -6,8 +6,14 @@ S'x'
 p2
 aS'model'
 p3
-atp4
-Rp5
+aS'gr_i'
+p4
+aS'exprs'
+p5
+aS'graphics'
+p6
+atp7
+Rp8
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Sources/STEP.js b/js/Sources/STEP.js
index 972a8fe3..c5d93cd3 100644
--- a/js/Sources/STEP.js
+++ b/js/Sources/STEP.js
@@ -13,9 +13,9 @@ function STEP() {
         this.model.rpar = new ScilabDouble(rpar);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = new ScilabDouble([false,false]);
-        var exprs = [[string(1)],[string(rpar)]];
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP\",sz(1),sz(2));"]);
-        this.x = standard_define([2,2],this.model,exprs,gr_i);
+        this.exprs = [[string(1)],[string(rpar)]];
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP\",sz(1),sz(2));"]);
+        this.x = standard_define([2,2],this.model,this.exprs,this.gr_i);
         return new BasicBlock(this.x);
     }
     STEP.prototype.details = function STEP() {
@@ -33,12 +33,13 @@ function STEP() {
         this.temps = arguments[0]["temps"]
         this.in1 = arguments[0]["in1"]
         this.fi = arguments[0]["fi"]
+        this.exprs = arguments[0]["exprs"]
         this.x = arg1;
         this.graphics = arg1.graphics;
-        var exprs = this.graphics.exprs;
+        this.exprs = this.graphics.exprs;
         this.model = arg1.model;
         while (true) {
-            [ok,this.temps,this.in1,this.fi,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","STEP_FUNCTION")],[" "],["Step Function"],[" "]],["Step Time","Initial Value","Final Value"],list("vec",1,"vec",-1,"vec",-1),exprs);
+            [ok,this.temps,this.in1,this.fi,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","STEP_FUNCTION")],[" "],["Step Function"],[" "]],["Step Time","Initial Value","Final Value"],list("vec",1,"vec",-1,"vec",-1),this.exprs);
             if (!ok) {
                 break;
             }
@@ -70,7 +71,7 @@ function STEP() {
                     var rpar = [[this.in1],[this.fi]];
                 }
                 this.model.rpar = new ScilabDouble(rpar);
-                this.graphics.exprs = new ScilabDouble([exprs]);
+                this.graphics.exprs = new ScilabDouble([this.exprs]);
                 this.x.graphics = this.graphics;
                 this.x.model = this.model;
                 break;
diff --git a/js/Sources/STEP.pickle b/js/Sources/STEP.pickle
index e49533dc..e522ccd5 100644
--- a/js/Sources/STEP.pickle
+++ b/js/Sources/STEP.pickle
@@ -2,20 +2,24 @@ c__builtin__
 set
 p0
 ((lp1
-S'graphics'
+S'fi'
 p2
 aS'in1'
 p3
 aS'temps'
 p4
-aS'fi'
+aS'exprs'
 p5
-aS'x'
+aS'gr_i'
 p6
-aS'model'
+aS'graphics'
 p7
-atp8
-Rp9
+aS'x'
+p8
+aS'model'
+p9
+atp10
+Rp11
 .(dp0
 S'arg1'
 p1
diff --git a/js/Sources/STEP_FUNCTION.js b/js/Sources/STEP_FUNCTION.js
index f79a4986..5d81952f 100644
--- a/js/Sources/STEP_FUNCTION.js
+++ b/js/Sources/STEP_FUNCTION.js
@@ -47,8 +47,8 @@ function STEP_FUNCTION() {
         this.model.out2 = new ScilabDouble([1]);
         this.model.outtyp = new ScilabDouble([1]);
         this.model.rpar = scs_m_1;
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP_FUNCTION\",sz(1),sz(2));"]);
-        this.x = standard_define([2,2],this.model,[],gr_i);
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP_FUNCTION\",sz(1),sz(2));"]);
+        this.x = standard_define([2,2],this.model,[],this.gr_i);
         return new BasicBlock(this.x);
     }
     STEP_FUNCTION.prototype.details = function STEP_FUNCTION() {
diff --git a/js/Sources/STEP_FUNCTION.pickle b/js/Sources/STEP_FUNCTION.pickle
index 50a906e4..0f17e3e0 100644
--- a/js/Sources/STEP_FUNCTION.pickle
+++ b/js/Sources/STEP_FUNCTION.pickle
@@ -2,16 +2,20 @@ c__builtin__
 set
 p0
 ((lp1
-S'x'
+S'exprs'
 p2
-aS'model'
+aS'gr_i'
 p3
-aS'xxn'
-p4
 aS'graphics'
+p4
+aS'x'
 p5
-atp6
-Rp7
+aS'model'
+p6
+aS'xxn'
+p7
+atp8
+Rp9
 .(dp0
 S'lnk.ct'
 p1
diff --git a/js/Sources/SampleCLK.js b/js/Sources/SampleCLK.js
index f09912f7..4fe2eb15 100644
--- a/js/Sources/SampleCLK.js
+++ b/js/Sources/SampleCLK.js
@@ -8,8 +8,8 @@ function SampleCLK() {
         this.model.blocktype = new ScilabString(["d"]);
         this.model.firing = new ScilabDouble([-1]);
         this.model.dep_ut = new ScilabDouble([false,false]);
-        var exprs = [[sci2exp(1)],[sci2exp(0)]];
-        this.x = standard_define([2,2],this.model,exprs," ");
+        this.exprs = [[sci2exp(1)],[sci2exp(0)]];
+        this.x = standard_define([2,2],this.model,this.exprs," ");
         return new BasicBlock(this.x);
     }
     SampleCLK.prototype.details = function SampleCLK() {
@@ -25,12 +25,13 @@ function SampleCLK() {
     SampleCLK.prototype.set = function SampleCLK() {
         this.frequ = arguments[0]["frequ"]
         this.offset = arguments[0]["offset"]
+        this.exprs = arguments[0]["exprs"]
         this.x = arg1;
         this.graphics = arg1.graphics;
         this.model = arg1.model;
-        var exprs = this.graphics.exprs;
+        this.exprs = this.graphics.exprs;
         while (true) {
-            [ok,this.frequ,this.offset,exprs] = scicos_getvalue("Set block parameters",["Sample time","Offset"],list("vec",1,"vec",1),exprs);
+            [ok,this.frequ,this.offset,this.exprs] = scicos_getvalue("Set block parameters",["Sample time","Offset"],list("vec",1,"vec",1),this.exprs);
             if (!ok) {
                 break;
             }
@@ -50,7 +51,7 @@ function SampleCLK() {
                 this.model.rpar = new ScilabDouble([this.frequ],[this.offset]);
                 this.model.evtout = new ScilabDouble([1]);
                 this.model.firing = new ScilabDouble([-1]);
-                this.graphics.exprs = new ScilabDouble([exprs]);
+                this.graphics.exprs = new ScilabDouble([this.exprs]);
                 this.x.graphics = this.graphics;
                 this.x.model = this.model;
                 break;
diff --git a/js/Sources/SampleCLK.pickle b/js/Sources/SampleCLK.pickle
index 1f55629a..91e03ca2 100644
--- a/js/Sources/SampleCLK.pickle
+++ b/js/Sources/SampleCLK.pickle
@@ -2,18 +2,22 @@ c__builtin__
 set
 p0
 ((lp1
-S'x'
+S'frequ'
 p2
-aS'model'
-p3
 aS'offset'
+p3
+aS'exprs'
 p4
-aS'frequ'
+aS'gr_i'
 p5
 aS'graphics'
 p6
-atp7
-Rp8
+aS'x'
+p7
+aS'model'
+p8
+atp9
+Rp10
 .(dp0
 S'needcompile'
 p1
diff --git a/js/Sources/Sigbuilder.js b/js/Sources/Sigbuilder.js
index 1a558e26..96c8d9b7 100644
--- a/js/Sources/Sigbuilder.js
+++ b/js/Sources/Sigbuilder.js
@@ -11,8 +11,8 @@ function Sigbuilder() {
         scs_m_1.objs[7-1] = scicos_block(gui="CLKOUTV_f",graphics=scicos_graphics(orig=[339.49528,505.10704],sz=[20,30],flip=true,theta=0,exprs="1",pin=[],pout=[],pein=8,peout=[],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="output",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
         scs_m_1.objs[8-1] = scicos_link(xx=[[349.49528],[349.49528]],yy=[[565.10704],[535.10704]],id="drawlink",thick=[0,0],ct=[5,-1],from=[3,1,0],to=[7,1,1]);
         this.model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list());
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Sigbuilder\",sz(1),sz(2));"]);
-        this.x = standard_define([3,2],this.model,[],gr_i);
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Sigbuilder\",sz(1),sz(2));"]);
+        this.x = standard_define([3,2],this.model,[],this.gr_i);
         return new BasicBlock(this.x);
     }
     Sigbuilder.prototype.details = function Sigbuilder() {
diff --git a/js/Sources/Sigbuilder.pickle b/js/Sources/Sigbuilder.pickle
index f22a37dd..b46e3a46 100644
--- a/js/Sources/Sigbuilder.pickle
+++ b/js/Sources/Sigbuilder.pickle
@@ -2,22 +2,28 @@ c__builtin__
 set
 p0
 ((lp1
-S'xxn'
+S'N'
 p2
-aS'y'
+aS'exprs'
 p3
-aS'x'
+aS'gr_i'
 p4
-aS'model'
+aS'graphics'
 p5
-aS'N'
+aS'y'
 p6
-aS'ORDER2'
+aS'x'
 p7
-aS'order'
+aS'model'
 p8
-atp9
-Rp10
+aS'order'
+p9
+aS'ORDER2'
+p10
+aS'xxn'
+p11
+atp12
+Rp13
 .(dp0
 S'Y[j-1]'
 p1
diff --git a/js/Sources/TIME_f.js b/js/Sources/TIME_f.js
index 86f44525..1cb47909 100644
--- a/js/Sources/TIME_f.js
+++ b/js/Sources/TIME_f.js
@@ -6,8 +6,8 @@ function TIME_f() {
         this.model.out = new ScilabDouble([1]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = new ScilabDouble([false,true]);
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_f\",sz(1),sz(2));"]);
-        this.x = standard_define([2,2],this.model,[],gr_i);
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_f\",sz(1),sz(2));"]);
+        this.x = standard_define([2,2],this.model,[],this.gr_i);
         return new BasicBlock(this.x);
     }
     TIME_f.prototype.details = function TIME_f() {
diff --git a/js/Sources/TIME_f.pickle b/js/Sources/TIME_f.pickle
index 8cc9b048..edb635fb 100644
--- a/js/Sources/TIME_f.pickle
+++ b/js/Sources/TIME_f.pickle
@@ -6,8 +6,14 @@ S'x'
 p2
 aS'model'
 p3
-atp4
-Rp5
+aS'gr_i'
+p4
+aS'exprs'
+p5
+aS'graphics'
+p6
+atp7
+Rp8
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Sources/TKSCALE.js b/js/Sources/TKSCALE.js
index b132a0e6..ec4bba02 100644
--- a/js/Sources/TKSCALE.js
+++ b/js/Sources/TKSCALE.js
@@ -11,9 +11,9 @@ function TKSCALE() {
         this.model.rpar = new ScilabDouble([this.a],[this.b],[this.f]);
         this.model.blocktype = new ScilabString(["d"]);
         this.model.dep_ut = new ScilabDouble([false,false]);
-        var exprs = [[sci2exp(this.a)],[sci2exp(this.b)],[sci2exp(this.f)]];
-        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TKSCALE\",sz(1),sz(2));"]);
-        this.x = standard_define([3,2],this.model,exprs,gr_i);
+        this.exprs = [[sci2exp(this.a)],[sci2exp(this.b)],[sci2exp(this.f)]];
+        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TKSCALE\",sz(1),sz(2));"]);
+        this.x = standard_define([3,2],this.model,this.exprs,this.gr_i);
         return new BasicBlock(this.x);
     }
     TKSCALE.prototype.details = function TKSCALE() {
@@ -31,13 +31,14 @@ function TKSCALE() {
         this.a = parseFloat(arguments[0]["a"])
         this.b = parseFloat(arguments[0]["b"])
         this.f = parseFloat(arguments[0]["f"])
+        this.exprs = arguments[0]["exprs"]
         this.x = arg1;
         this.graphics = arg1.graphics;
-        var exprs = this.graphics.exprs;
+        this.exprs = this.graphics.exprs;
         this.model = arg1.model;
-        [ok,this.a,this.b,this.f,exprs] = scicos_getvalue("Set scale block parameters",["Min value","Max value","Normalization"],list("vec",1,"vec",1,"vec",1),exprs);
+        [ok,this.a,this.b,this.f,this.exprs] = scicos_getvalue("Set scale block parameters",["Min value","Max value","Normalization"],list("vec",1,"vec",1,"vec",1),this.exprs);
         if (ok) {
-            this.graphics.exprs = new ScilabDouble([exprs]);
+            this.graphics.exprs = new ScilabDouble([this.exprs]);
             this.model.rpar = new ScilabDouble([this.a],[this.b],[this.f]);
             this.x.graphics = this.graphics;
             this.x.model = this.model;
diff --git a/js/Sources/TKSCALE.pickle b/js/Sources/TKSCALE.pickle
index 4547b11f..61242ea0 100644
--- a/js/Sources/TKSCALE.pickle
+++ b/js/Sources/TKSCALE.pickle
@@ -8,14 +8,18 @@ aS'b'
 p3
 aS'f'
 p4
-aS'graphics'
+aS'exprs'
 p5
-aS'x'
+aS'gr_i'
 p6
-aS'model'
+aS'graphics'
 p7
-atp8
-Rp9
+aS'x'
+p8
+aS'model'
+p9
+atp10
+Rp11
 .(dp0
 S'a'
 p1