remove exprs and gr_i from default global list

66 files changed, 406 insertions, 538 deletions

diff --git a/js/Sources/CLKINV_f.js b/js/Sources/CLKINV_f.js
index 622fd0e7..8462599e 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 ScilabBoolean([false,false]);
-        this.exprs = string(this.prt);
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKINV_f\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),this.gr_i);
+        var exprs = string(this.prt);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKINV_f\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([exprs]),gr_i);
         return new EventInBlock(this.x);
     }
     CLKINV_f.prototype.details = function CLKINV_f() {
@@ -24,8 +24,8 @@ function CLKINV_f() {
         return options;
     }
     CLKINV_f.prototype.set = function CLKINV_f() {
-        this.exprs = this.graphics.exprs;
-        this.exprs = this.exprs[1-1];
+        var exprs = this.graphics.exprs;
+        var exprs = exprs[1-1];
         while (true) {
             var ok = true;
             this.prt = parseFloat(arguments[0]["prt"]);
@@ -39,7 +39,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([this.exprs]);
+                this.graphics.exprs = new ScilabDouble([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 ac287eee..8c9907a4 100644
--- a/js/Sources/CLKINV_f.pickle
+++ b/js/Sources/CLKINV_f.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'exprs'
+S'prt'
 p2
-aS'prt'
+aS'x'
 p3
-aS'gr_i'
+aS'model'
 p4
 aS'graphics'
 p5
-aS'x'
-p6
-aS'model'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Sources/CLKIN_f.js b/js/Sources/CLKIN_f.js
index 7c23fc38..4025cf52 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 ScilabBoolean([false,false]);
-        this.exprs = string(this.prt);
-        this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs])," ");
+        var exprs = string(this.prt);
+        this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([exprs])," ");
         return new BasicBlock(this.x);
     }
     CLKIN_f.prototype.details = function CLKIN_f() {
@@ -23,8 +23,8 @@ function CLKIN_f() {
         return options;
     }
     CLKIN_f.prototype.set = function CLKIN_f() {
-        this.exprs = this.graphics.exprs;
-        this.exprs = this.exprs[1-1];
+        var exprs = this.graphics.exprs;
+        var exprs = exprs[1-1];
         while (true) {
             var ok = true;
             this.prt = parseFloat(arguments[0]["prt"]);
@@ -39,7 +39,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([this.exprs]);
+                this.graphics.exprs = new ScilabDouble([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 04cda836..1c20c047 100644
--- a/js/Sources/CLKIN_f.pickle
+++ b/js/Sources/CLKIN_f.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'exprs'
+S'prt'
 p2
-aS'prt'
+aS'x'
 p3
-aS'gr_i'
+aS'model'
 p4
 aS'graphics'
 p5
-aS'x'
-p6
-aS'model'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Sources/CLOCK_c.js b/js/Sources/CLOCK_c.js
index 1b458be2..851894ab 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]];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLOCK_c\",sz(1),sz(2));"]);
+        var 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 = this.gr_i;
+        this.x.graphics.gr_i = gr_i;
         this.x.graphics.peout = 0;
         this.x.model.sim = "csuper";
         this.x.model.evtout = 1;
@@ -59,7 +59,7 @@ function CLOCK_c() {
             }
         }
         var newpar = list();
-        this.exprs = xx.graphics.exprs;
+        var exprs = xx.graphics.exprs;
         this.model = xx.model;
         var t0_old = this.model.firing;
         var dt_old = this.model.rpar[1-1];
diff --git a/js/Sources/CLOCK_c.pickle b/js/Sources/CLOCK_c.pickle
index 9141878c..229102f8 100644
--- a/js/Sources/CLOCK_c.pickle
+++ b/js/Sources/CLOCK_c.pickle
@@ -6,20 +6,16 @@ S'exprs0'
 p2
 aS't0'
 p3
-aS'exprs'
-p4
-aS'gr_i'
-p5
 aS'graphics'
-p6
+p4
 aS'x'
-p7
+p5
 aS'model'
-p8
+p6
 aS'dt'
-p9
-atp10
-Rp11
+p7
+atp8
+Rp9
 .(dp0
 S'diagram.objs[1-1]'
 p1
diff --git a/js/Sources/CLOCK_f.js b/js/Sources/CLOCK_f.js
index df9054ba..ecdc94c0 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]];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLOCK_f\",sz(1),sz(2));"]);
+        var 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 = this.gr_i;
+        this.x.graphics.gr_i = gr_i;
         this.x.graphics.peout = 0;
         this.x.model.sim = "csuper";
         this.x.model.evtout = 1;
@@ -59,7 +59,7 @@ function CLOCK_f() {
             }
         }
         var newpar = list();
-        this.exprs = xx.graphics.exprs;
+        var exprs = xx.graphics.exprs;
         this.model = xx.model;
         var t0_old = this.model.firing;
         var dt_old = this.model.rpar;
@@ -85,7 +85,7 @@ function CLOCK_f() {
                 break;
             }
         }
-        if (!and([t0_old,dt_old]==[this.t0,this.dt])||!and(this.exprs0==this.exprs)) {
+        if (!and([t0_old,dt_old]==[this.t0,this.dt])||!and(this.exprs0==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 f4725772..c213a912 100644
--- a/js/Sources/CLOCK_f.pickle
+++ b/js/Sources/CLOCK_f.pickle
@@ -6,20 +6,16 @@ S'exprs0'
 p2
 aS't0'
 p3
-aS'exprs'
-p4
-aS'gr_i'
-p5
 aS'graphics'
-p6
+p4
 aS'x'
-p7
+p5
 aS'model'
-p8
+p6
 aS'dt'
-p9
-atp10
-Rp11
+p7
+atp8
+Rp9
 .(dp0
 S'diagram.objs[1-1]'
 p1
diff --git a/js/Sources/CONST.js b/js/Sources/CONST.js
index 69c4d6e7..c953464e 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 ScilabBoolean([false,false]);
-        this.exprs = strcat(sci2exp(this.C));
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([this.exprs]),this.gr_i);
+        var exprs = strcat(sci2exp(this.C));
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([exprs]),gr_i);
         return new BasicBlock(this.x);
     }
     CONST.prototype.details = function CONST() {
@@ -24,7 +24,7 @@ function CONST() {
         return options;
     }
     CONST.prototype.set = function CONST() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.C = parseFloat(arguments[0]["C"]);
@@ -42,7 +42,7 @@ function CONST() {
             } else {
                 this.model.rpar = new ScilabDouble(this.C.slice());
                 this.model.out = new ScilabDouble([nout]);
-                this.graphics.exprs = new ScilabDouble([this.exprs]);
+                this.graphics.exprs = new ScilabDouble([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 92cb5675..859ab831 100644
--- a/js/Sources/CONST.pickle
+++ b/js/Sources/CONST.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'C'
+S'x'
 p2
-aS'exprs'
+aS'model'
 p3
-aS'gr_i'
+aS'C'
 p4
 aS'graphics'
 p5
-aS'x'
-p6
-aS'model'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'sz'
 p1
diff --git a/js/Sources/CONST_f.js b/js/Sources/CONST_f.js
index 993cb024..20613408 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 ScilabBoolean([false,false]);
-        this.exprs = strcat(sci2exp(this.C));
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_f\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([this.exprs]),this.gr_i);
+        var exprs = strcat(sci2exp(this.C));
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_f\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([exprs]),gr_i);
         return new BasicBlock(this.x);
     }
     CONST_f.prototype.details = function CONST_f() {
@@ -24,7 +24,7 @@ function CONST_f() {
         return options;
     }
     CONST_f.prototype.set = function CONST_f() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.C = parseFloat(arguments[0]["C"]);
@@ -38,7 +38,7 @@ function CONST_f() {
             } else {
                 this.model.rpar = new ScilabDouble(this.C.slice());
                 this.model.out = new ScilabDouble([nout]);
-                this.graphics.exprs = new ScilabDouble([this.exprs]);
+                this.graphics.exprs = new ScilabDouble([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 710c4d0f..3ed3282f 100644
--- a/js/Sources/CONST_f.pickle
+++ b/js/Sources/CONST_f.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'C'
+S'x'
 p2
-aS'exprs'
+aS'model'
 p3
-aS'gr_i'
+aS'C'
 p4
 aS'graphics'
 p5
-aS'x'
-p6
-aS'model'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Sources/CONST_m.js b/js/Sources/CONST_m.js
index 23772a0a..7516aac2 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 ScilabBoolean([false,false]);
-        this.exprs = sci2exp(this.C);
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_m\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i);
+        var exprs = sci2exp(this.C);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_m\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([exprs]),gr_i);
         return new BasicBlock(this.x);
     }
     CONST_m.prototype.details = function CONST_m() {
@@ -27,7 +27,7 @@ function CONST_m() {
         return options;
     }
     CONST_m.prototype.set = function CONST_m() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.C = inverse(arguments[0]["C"]);
@@ -68,7 +68,7 @@ function CONST_m() {
                     this.model = tmpvar0[0];
                     this.graphics = tmpvar0[1];
                     var ok = tmpvar0[2];
-                    this.graphics.exprs = new ScilabDouble([this.exprs]);
+                    this.graphics.exprs = new ScilabDouble([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 752c9d95..0ac43ba7 100644
--- a/js/Sources/CONST_m.pickle
+++ b/js/Sources/CONST_m.pickle
@@ -2,22 +2,18 @@ c__builtin__
 set
 p0
 ((lp1
-S'C'
+S'x'
 p2
-aS'exprs'
+aS'model'
 p3
-aS'gr_i'
+aS'type'
 p4
-aS'graphics'
+aS'C'
 p5
-aS'x'
+aS'graphics'
 p6
-aS'model'
-p7
-aS'type'
-p8
-atp9
-Rp10
+atp7
+Rp8
 .(dp0
 S'arg1'
 p1
diff --git a/js/Sources/CURVE_c.js b/js/Sources/CURVE_c.js
index 46004f4e..a64f7824 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]);
-        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 = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
+        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 = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i);
         return new BasicBlock(this.x);
     }
     CURVE_c.prototype.details = function CURVE_c() {
@@ -37,7 +37,7 @@ function CURVE_c() {
         return options;
     }
     CURVE_c.prototype.set = function CURVE_c() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         var ok = false;
         var SaveExit = false;
         while (true) {
@@ -54,7 +54,7 @@ function CURVE_c() {
             if (this.PeriodicOption=="y"||this.PeriodicOption=="Y") {
                 var PO = 1;
             } else {
-                this.exprs[4-1] = "n";
+                exprs[4-1] = "n";
                 var PO = 0;
             }
             var mtd = int(this.Method);
@@ -84,7 +84,7 @@ function CURVE_c() {
                 var tmpvar2 = cleandata(this.xy);
                 this.xy = tmpvar2[0];
                 var N = size(this.xy,"r");
-                this.exprs[5-1] = "n";
+                exprs[5-1] = "n";
                 if (this.graf=="y"||this.graf=="Y") {
                     var ipar = [[N],[mtd],[PO]];
                     var rpar = [];
@@ -115,16 +115,16 @@ function CURVE_c() {
                         var DChange = true;
                     }
                     if (DChange) {
-                        this.exprs[2-1] = strcat(sci2exp(xy2.slice()[1-1]));
-                        this.exprs[3-1] = strcat(sci2exp(xy2.slice()[2-1]));
+                        exprs[2-1] = strcat(sci2exp(xy2.slice()[1-1]));
+                        exprs[3-1] = strcat(sci2exp(xy2.slice()[2-1]));
                     }
-                    this.exprs[1-1] = sci2exp(New_methhod);
+                    exprs[1-1] = sci2exp(New_methhod);
                     if (oipar[3-1]==1) {
                         var perop = "y";
                     } else {
                         var perop = "n";
                     }
-                    this.exprs[4-1] = perop;
+                    exprs[4-1] = perop;
                     var SaveExit = true;
                 } else {
                     var tmpvar4 = Do_Spline(N,mtd,this.xy.slice()[1-1],this.xy.slice()[2-1]);
@@ -141,7 +141,7 @@ function CURVE_c() {
                             var orpar = [[this.xy.slice()[1-1]],[this.xy.slice()[2-1]]];
                         }
                     }
-                    this.exprs[1-1] = sci2exp(mtd);
+                    exprs[1-1] = sci2exp(mtd);
                     var oipar = [[N],[mtd],[PO]];
                     var SaveExit = true;
                 }
@@ -155,7 +155,7 @@ function CURVE_c() {
                 }
                 this.model.rpar = new ScilabDouble(orpar);
                 this.model.ipar = new ScilabDouble(oipar);
-                this.graphics.exprs = new ScilabDouble([this.exprs]);
+                this.graphics.exprs = new ScilabDouble([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 81ff6fbd..2280a785 100644
--- a/js/Sources/CURVE_c.pickle
+++ b/js/Sources/CURVE_c.pickle
@@ -10,7 +10,7 @@ aS'inrpar'
 p4
 aS'sok'
 p5
-aS'wp'
+aS'graphics'
 p6
 aS'Pd3'
 p7
@@ -46,110 +46,106 @@ aS'xt'
 p22
 aS'sample5'
 p23
-aS'sTp2'
-p24
 aS'Pulse_exprs2'
-p25
+p24
 aS'Cx'
-p26
+p25
 aS'filen'
+p26
+aS'xa'
 p27
-aS'sample4'
+aS'random_u_exprs2'
 p28
-aS'xa'
+aS'sAmp2'
 p29
-aS'random_u_exprs2'
+aS'zok'
 p30
-aS'sAmp2'
+aS'offset'
 p31
-aS'zok'
+aS'yt'
 p32
-aS'offset'
+aS'sdelay'
 p33
-aS'yt'
+aS'ixy'
 p34
-aS'sdelay'
+aS'seed4'
 p35
-aS'ixy'
+aS'seed5'
 p36
-aS'seed4'
+aS'Sawt2_exprs2'
 p37
-aS'seed5'
+aS'Amp'
 p38
-aS'Sawt2_exprs2'
+aS'PeriodicOption'
 p39
-aS'Amp'
+aS'var4'
 p40
-aS'PeriodicOption'
+aS'ymx1'
 p41
-aS'var4'
+aS'Cformat'
 p42
-aS'ymx1'
+aS'ya'
 p43
-aS'Cformat'
+aS'Bias3'
 p44
-aS'ya'
+aS'xls_open'
 p45
-aS'Bias3'
+aS'myans'
 p46
-aS'xls_open'
+aS'xmx1'
 p47
-aS'myans'
+aS'inipar'
 p48
-aS'xmx1'
+aS'xls_read'
 p49
-aS'inipar'
+aS'sTp'
 p50
-aS'xls_read'
+aS'Sin_exprs2'
 p51
-aS'sTp'
+aS'argn'
 p52
-aS'Sin_exprs2'
+aS'wp'
 p53
-aS'argn'
+aS'phase'
 p54
-aS'graphics'
+aS'iipar'
 p55
-aS'phase'
+aS'min5'
 p56
-aS'iipar'
+aS'mok'
 p57
-aS'min5'
+aS'Pw3'
 p58
-aS'mok'
+aS'sheetN'
 p59
-aS'Pw3'
+aS'xgetmouse'
 p60
-aS'sheetN'
+aS'max5'
 p61
-aS'xgetmouse'
+aS'rparin'
 p62
-aS'max5'
+aS'sample4'
 p63
-aS'rparin'
+aS'Cy'
 p64
-aS'exprs'
+aS'sTp2'
 p65
-aS'Cy'
-p66
-aS'gr_i'
-p67
 aS'yy'
-p68
+p66
 aS'x'
-p69
+p67
 aS'model'
-p70
+p68
 aS'ORDER2'
-p71
+p69
 aS'irpar'
-p72
+p70
 aS'graf'
-p73
+p71
 aS'xye'
-p74
-atp75
-Rp76
+p72
+atp73
+Rp74
 .(dp0
 S'mean4'
 p1
diff --git a/js/Sources/CURV_f.js b/js/Sources/CURV_f.js
index 8939719f..4d7dcf7e 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 ScilabBoolean([false,true]);
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CURV_f\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CURV_f\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),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 1b556535..28f07de4 100644
--- a/js/Sources/CURV_f.pickle
+++ b/js/Sources/CURV_f.pickle
@@ -6,14 +6,10 @@ S'x'
 p2
 aS'model'
 p3
-aS'gr_i'
-p4
-aS'exprs'
-p5
 aS'graphics'
-p6
-atp7
-Rp8
+p4
+atp5
+Rp6
 .(dp0
 S'arg1'
 p1
diff --git a/js/Sources/Counter.js b/js/Sources/Counter.js
index 2a589faf..e7dc1018 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 ScilabBoolean([false,false]);
-        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 = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
+        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 = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i);
         return new BasicBlock(this.x);
     }
     Counter.prototype.details = function Counter() {
@@ -30,7 +30,7 @@ function Counter() {
         return options;
     }
     Counter.prototype.set = function Counter() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.minim = parseFloat(arguments[0]["minim"]);
@@ -46,7 +46,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([this.exprs]);
+                this.graphics.exprs = new ScilabDouble([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 5ef7d0ee..ef83c392 100644
--- a/js/Sources/Counter.pickle
+++ b/js/Sources/Counter.pickle
@@ -8,18 +8,14 @@ aS'maxim'
 p3
 aS'rule'
 p4
-aS'exprs'
-p5
-aS'gr_i'
-p6
 aS'graphics'
-p7
+p5
 aS'x'
-p8
+p6
 aS'model'
-p9
-atp10
-Rp11
+p7
+atp8
+Rp9
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/Sources/FROMWSB.js b/js/Sources/FROMWSB.js
index d411920b..e8e2d6ef 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());
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMWSB\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([5,2]),this.model,new ScilabDouble([]),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMWSB\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([5,2]),this.model,new ScilabDouble([]),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 f5bb2608..752ae120 100644
--- a/js/Sources/FROMWSB.pickle
+++ b/js/Sources/FROMWSB.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'exprs'
+S'x'
 p2
-aS'gr_i'
+aS'model'
 p3
-aS'graphics'
+aS'xxn'
 p4
-aS'x'
+aS'graphics'
 p5
-aS'model'
-p6
-aS'xxn'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'ppath'
 p1
diff --git a/js/Sources/FROMWS_c.js b/js/Sources/FROMWS_c.js
index 5e1810ea..6243ec1c 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 ScilabBoolean([false,true]);
-        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 = new standard_define(new ScilabDouble([3.5,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
+        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 = new standard_define(new ScilabDouble([3.5,2]),this.model,new ScilabDouble(exprs),gr_i);
         return new BasicBlock(this.x);
     }
     FROMWS_c.prototype.details = function FROMWS_c() {
@@ -34,7 +34,7 @@ function FROMWS_c() {
         return options;
     }
     FROMWS_c.prototype.set = function FROMWS_c() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.varnam = arguments[0]["varnam"];
@@ -73,7 +73,7 @@ function FROMWS_c() {
                 this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
                 if (ok) {
-                    this.graphics.exprs = new ScilabDouble([this.exprs]);
+                    this.graphics.exprs = new ScilabDouble([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 4fcf93b0..11118752 100644
--- a/js/Sources/FROMWS_c.pickle
+++ b/js/Sources/FROMWS_c.pickle
@@ -6,24 +6,20 @@ S'_str2code'
 p2
 aS'ZC'
 p3
-aS'exprs'
-p4
-aS'gr_i'
-p5
 aS'OutEnd'
-p6
+p4
 aS'graphics'
-p7
+p5
 aS'x'
-p8
+p6
 aS'model'
-p9
+p7
 aS'Method'
-p10
+p8
 aS'varnam'
-p11
-atp12
-Rp13
+p9
+atp10
+Rp11
 .(dp0
 S'arg1'
 p1
diff --git a/js/Sources/GENSIN_f.js b/js/Sources/GENSIN_f.js
index f266b54d..9f5b887a 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 ScilabBoolean([false,true]);
-        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 = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
+        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 = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i);
         return new BasicBlock(this.x);
     }
     GENSIN_f.prototype.details = function GENSIN_f() {
@@ -28,7 +28,7 @@ function GENSIN_f() {
         return options;
     }
     GENSIN_f.prototype.set = function GENSIN_f() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.M = arguments[0]["M"];
@@ -49,7 +49,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([this.exprs]);
+                this.graphics.exprs = new ScilabDouble([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 eec74ca4..c5cc3a29 100644
--- a/js/Sources/GENSIN_f.pickle
+++ b/js/Sources/GENSIN_f.pickle
@@ -2,24 +2,20 @@ c__builtin__
 set
 p0
 ((lp1
-S'P'
+S'F'
 p2
-aS'F'
-p3
 aS'M'
+p3
+aS'P'
 p4
-aS'exprs'
-p5
-aS'gr_i'
-p6
 aS'graphics'
-p7
+p5
 aS'x'
-p8
+p6
 aS'model'
-p9
-atp10
-Rp11
+p7
+atp8
+Rp9
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Sources/GENSQR_f.js b/js/Sources/GENSQR_f.js
index efd0abc4..3f5cfe62 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 ScilabBoolean([false,false]);
-        this.exprs = string(this.Amplitude);
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSQR_f\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([this.exprs]),this.gr_i);
+        var exprs = string(this.Amplitude);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSQR_f\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([exprs]),gr_i);
         return new BasicBlock(this.x);
     }
     GENSQR_f.prototype.details = function GENSQR_f() {
@@ -26,9 +26,9 @@ function GENSQR_f() {
         return options;
     }
     GENSQR_f.prototype.set = function GENSQR_f() {
-        this.exprs = this.graphics.exprs;
-        if (size(this.exprs,"*")==2) {
-            this.exprs = this.exprs[2-1];
+        var exprs = this.graphics.exprs;
+        if (size(exprs,"*")==2) {
+            var exprs = exprs[2-1];
         }
         while (true) {
             var ok = true;
@@ -36,7 +36,7 @@ function GENSQR_f() {
             if (!ok) {
                 break;
             }
-            this.graphics.exprs = new ScilabDouble([this.exprs]);
+            this.graphics.exprs = new ScilabDouble([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 d57cb644..f65a822d 100644
--- a/js/Sources/GENSQR_f.pickle
+++ b/js/Sources/GENSQR_f.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'exprs'
+S'x'
 p2
-aS'gr_i'
+aS'model'
 p3
 aS'Amplitude'
 p4
 aS'graphics'
 p5
-aS'x'
-p6
-aS'model'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Sources/GEN_SQR.js b/js/Sources/GEN_SQR.js
index 9d42a6f6..ff8fd705 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;
-        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 = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(this.exprs),this.gr_i);
+        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 = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(exprs),gr_i);
         return new BasicBlock(this.x);
     }
     GEN_SQR.prototype.details = function GEN_SQR() {
@@ -65,7 +65,7 @@ function GEN_SQR() {
     GEN_SQR.prototype.set = function GEN_SQR() {
         var y = this.needcompile;
         var typ = list();
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         var Btitre = "Set GEN_SQR parameters";
         var Exprs0 = [["Amin"],["Amax"],["rule"],["F"]];
         this.Bitems = [["Minimum Value"],["Maximum Value"],["Initial Value( 1= Minimum Value 2= Maximum Value)"],["Period (sec)"]];
@@ -94,7 +94,7 @@ function GEN_SQR() {
                 var ok = tmpvar1[3];
                 if (ok) {
                     var y = max(2,this.needcompile,needcompile2);
-                    this.x.graphics.exprs = this.exprs;
+                    this.x.graphics.exprs = exprs;
                     this.x.model.rpar = sblock;
                     break;
                 }
diff --git a/js/Sources/GEN_SQR.pickle b/js/Sources/GEN_SQR.pickle
index df14bd84..63e01ea8 100644
--- a/js/Sources/GEN_SQR.pickle
+++ b/js/Sources/GEN_SQR.pickle
@@ -10,22 +10,18 @@ aS'scicos_context.Amax'
 p4
 aS'scicos_context.rule'
 p5
-aS'exprs'
-p6
-aS'gr_i'
-p7
 aS'graphics'
-p8
+p6
 aS'x'
-p9
+p7
 aS'model'
-p10
+p8
 aS'scicos_context.F'
-p11
+p9
 aS'scicos_context.Amin'
-p12
-atp13
-Rp14
+p10
+atp11
+Rp12
 .(dp0
 S'model.odstate'
 p1
diff --git a/js/Sources/Ground_g.js b/js/Sources/Ground_g.js
index 76eaf9ef..77b7d78c 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 ScilabBoolean([false,false]);
-        this.exprs = [];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground_g\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
+        var exprs = [];
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground_g\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),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 dd054cc0..4c376fca 100644
--- a/js/Sources/Ground_g.pickle
+++ b/js/Sources/Ground_g.pickle
@@ -6,14 +6,10 @@ S'x'
 p2
 aS'model'
 p3
-aS'gr_i'
-p4
-aS'exprs'
-p5
 aS'graphics'
-p6
-atp7
-Rp8
+p4
+atp5
+Rp6
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Sources/INIMPL_f.js b/js/Sources/INIMPL_f.js
index af1d8973..f0ea4798 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;
-        this.exprs = "1";
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INIMPL_f\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),this.gr_i);
+        var exprs = "1";
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INIMPL_f\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([exprs]),gr_i);
         this.x.graphics.out_implicit = ["I"];
         return new ImplicitInBlock(this.x);
     }
@@ -29,9 +29,9 @@ function INIMPL_f() {
         return options;
     }
     INIMPL_f.prototype.set = function INIMPL_f() {
-        this.exprs = this.graphics.exprs;
-        if (size(this.exprs,"*")==2) {
-            this.exprs = this.exprs[1-1];
+        var exprs = this.graphics.exprs;
+        if (size(exprs,"*")==2) {
+            var exprs = exprs[1-1];
         }
         while (true) {
             var ok = true;
@@ -48,7 +48,7 @@ function INIMPL_f() {
                     var y = needcompile;
                 }
                 this.model.ipar = new ScilabDouble([this.prt]);
-                this.graphics.exprs = new ScilabDouble([this.exprs]);
+                this.graphics.exprs = new ScilabDouble([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 fbc0cbbd..ea56a6a9 100644
--- a/js/Sources/INIMPL_f.pickle
+++ b/js/Sources/INIMPL_f.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'exprs'
+S'prt'
 p2
-aS'prt'
+aS'x'
 p3
-aS'gr_i'
+aS'model'
 p4
 aS'graphics'
 p5
-aS'x'
-p6
-aS'model'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'arg1'
 p1
diff --git a/js/Sources/IN_f.js b/js/Sources/IN_f.js
index eddd05b6..2503474d 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 ScilabBoolean([false,false]);
-        this.exprs = sci2exp(prt);
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IN_f\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),this.gr_i);
+        var exprs = sci2exp(prt);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IN_f\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([exprs]),gr_i);
         return new ExplicitInBlock(this.x);
     }
     IN_f.prototype.details = function IN_f() {
@@ -22,20 +22,20 @@ function IN_f() {
         alert("parameters cannot be modified");
     }
     IN_f.prototype.set = function IN_f() {
-        this.exprs = this.graphics.exprs;
-        if (size(this.exprs,"*")==2) {
-            this.exprs = this.exprs[1-1];
+        var exprs = this.graphics.exprs;
+        if (size(exprs,"*")==2) {
+            var exprs = exprs[1-1];
         }
-        if (size(this.exprs,"*")==1) {
-            this.exprs = [[this.exprs[1-1]],["[-1 -2]"],["-1"]];
+        if (size(exprs,"*")==1) {
+            var exprs = [[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),this.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),exprs);
             var ok = tmpvar0[0];
             var prt = tmpvar0[1];
             var otsz = tmpvar0[2];
             var ot = tmpvar0[3];
-            this.exprs = tmpvar0[4];
+            var exprs = tmpvar0[4];
             if (!ok) {
                 break;
             }
@@ -59,7 +59,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(this.exprs);
+                this.graphics.exprs = new ScilabDouble(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 9d61a54d..367948fd 100644
--- a/js/Sources/IN_f.pickle
+++ b/js/Sources/IN_f.pickle
@@ -6,14 +6,10 @@ S'x'
 p2
 aS'model'
 p3
-aS'gr_i'
-p4
-aS'exprs'
-p5
 aS'graphics'
-p6
-atp7
-Rp8
+p4
+atp5
+Rp6
 .(dp0
 S'needcompile'
 p1
diff --git a/js/Sources/Modulo_Count.js b/js/Sources/Modulo_Count.js
index 4d9ac969..b87703f3 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 ScilabBoolean([false,false]);
-        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 = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
+        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 = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i);
         return new BasicBlock(this.x);
     }
     Modulo_Count.prototype.details = function Modulo_Count() {
@@ -27,7 +27,7 @@ function Modulo_Count() {
         return options;
     }
     Modulo_Count.prototype.set = function Modulo_Count() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.ini_c = parseFloat(arguments[0]["ini_c"]);
@@ -42,7 +42,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([this.exprs]);
+                this.graphics.exprs = new ScilabDouble([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 b8a493b5..3855fda6 100644
--- a/js/Sources/Modulo_Count.pickle
+++ b/js/Sources/Modulo_Count.pickle
@@ -2,22 +2,18 @@ c__builtin__
 set
 p0
 ((lp1
-S'ini_c'
+S'x'
 p2
-aS'exprs'
+aS'model'
 p3
-aS'gr_i'
+aS'ini_c'
 p4
 aS'base'
 p5
 aS'graphics'
 p6
-aS'x'
-p7
-aS'model'
-p8
-atp9
-Rp10
+atp7
+Rp8
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Sources/PULSE_SC.js b/js/Sources/PULSE_SC.js
index a24a6696..9a07b14e 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;
-        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 = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(this.exprs),this.gr_i);
+        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 = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(exprs),gr_i);
         return new BasicBlock(this.x);
     }
     PULSE_SC.prototype.details = function PULSE_SC() {
@@ -60,7 +60,7 @@ function PULSE_SC() {
     PULSE_SC.prototype.set = function PULSE_SC() {
         var y = this.needcompile;
         var typ = list();
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         var Btitre = "Set Pulse Generator parameters";
         var Exprs0 = [["E"],["W"],["F"],["A"]];
         this.Bitems = [["Phase delay (secs):"],["Pulse Width (% of period):"],["Period (secs):"],["Amplitude:"]];
@@ -89,7 +89,7 @@ function PULSE_SC() {
                 var ok = tmpvar1[3];
                 if (ok) {
                     var y = max(2,this.needcompile,needcompile2);
-                    this.x.graphics.exprs = this.exprs;
+                    this.x.graphics.exprs = exprs;
                     this.x.model.rpar = sblock;
                     break;
                 }
diff --git a/js/Sources/PULSE_SC.pickle b/js/Sources/PULSE_SC.pickle
index 1d112dc6..bb16e667 100644
--- a/js/Sources/PULSE_SC.pickle
+++ b/js/Sources/PULSE_SC.pickle
@@ -8,24 +8,20 @@ aS'Bitems'
 p3
 aS'scicos_context.W'
 p4
-aS'exprs'
-p5
-aS'gr_i'
-p6
 aS'graphics'
-p7
+p5
 aS'x'
-p8
+p6
 aS'model'
-p9
+p7
 aS'scicos_context.A'
-p10
+p8
 aS'scicos_context.F'
-p11
+p9
 aS'scicos_context.E'
-p12
-atp13
-Rp14
+p10
+atp11
+Rp12
 .(dp0
 S'model.odstate'
 p1
diff --git a/js/Sources/RAMP.js b/js/Sources/RAMP.js
index 00427626..92b6aeaf 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 ScilabBoolean([false,true]);
-        this.exprs = [string(rpar)];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAMP\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(this.exprs),this.gr_i);
+        var exprs = [string(rpar)];
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAMP\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(exprs),gr_i);
         return new BasicBlock(this.x);
     }
     RAMP.prototype.details = function RAMP() {
@@ -31,7 +31,7 @@ function RAMP() {
         return options;
     }
     RAMP.prototype.set = function RAMP() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.slope = parseFloat(arguments[0]["slope"]);
@@ -44,7 +44,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([this.exprs]);
+                this.graphics.exprs = new ScilabDouble([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 3034ab2d..ed5f5386 100644
--- a/js/Sources/RAMP.pickle
+++ b/js/Sources/RAMP.pickle
@@ -8,18 +8,14 @@ aS'iout'
 p3
 aS'stt'
 p4
-aS'exprs'
-p5
-aS'gr_i'
-p6
 aS'graphics'
-p7
+p5
 aS'x'
-p8
+p6
 aS'model'
-p9
-atp10
-Rp11
+p7
+atp8
+Rp9
 .(dp0
 S'slope'
 p1
diff --git a/js/Sources/RAND_f.js b/js/Sources/RAND_f.js
index e67bbd98..6e841ab6 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 ScilabBoolean([false,false]);
-        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 = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
+        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 = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i);
         return new BasicBlock(this.x);
     }
     RAND_f.prototype.details = function RAND_f() {
@@ -33,12 +33,12 @@ function RAND_f() {
         return options;
     }
     RAND_f.prototype.set = function RAND_f() {
-        this.exprs = this.graphics.exprs;
-        if (size(this.exprs,"*")==5) {
-            this.exprs = this.exprs.slice(1-1,3);
+        var exprs = this.graphics.exprs;
+        if (size(exprs,"*")==5) {
+            var exprs = exprs.slice(1-1,3);
         }
-        if (size(this.exprs,"*")==3) {
-            this.exprs = [[this.exprs],[string(this.model.dstate[1-1])]];
+        if (size(exprs,"*")==3) {
+            var exprs = [[exprs],[string(this.model.dstate[1-1])]];
         }
         while (true) {
             var ok = true;
@@ -54,7 +54,7 @@ function RAND_f() {
                 throw "user error";
             } else {
                 var nout = size(this.a,"*");
-                this.graphics.exprs = new ScilabDouble(this.exprs);
+                this.graphics.exprs = new ScilabDouble(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 3f839704..b5f6d8b7 100644
--- a/js/Sources/RAND_f.pickle
+++ b/js/Sources/RAND_f.pickle
@@ -8,20 +8,16 @@ aS'b'
 p3
 aS'seed_c'
 p4
-aS'exprs'
-p5
 aS'flag'
-p6
-aS'gr_i'
-p7
+p5
 aS'graphics'
-p8
+p6
 aS'x'
-p9
+p7
 aS'model'
-p10
-atp11
-Rp12
+p8
+atp9
+Rp10
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js
index 0ac19999..d32ff342 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 ScilabBoolean([false,false]);
-        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 = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
+        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 = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i);
         return new BasicBlock(this.x);
     }
     RAND_m.prototype.details = function RAND_m() {
@@ -43,9 +43,9 @@ function RAND_m() {
         return options;
     }
     RAND_m.prototype.set = function RAND_m() {
-        this.exprs = this.graphics.exprs;
-        if (size(this.exprs,"*")==14) {
-            this.exprs[9-1] = [];
+        var exprs = this.graphics.exprs;
+        if (size(exprs,"*")==14) {
+            exprs[9-1] = [];
         }
         while (true) {
             var ok = true;
@@ -84,7 +84,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([this.exprs]);
+                        this.graphics.exprs = new ScilabDouble([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 d4f91cd6..621e5395 100644
--- a/js/Sources/RAND_m.pickle
+++ b/js/Sources/RAND_m.pickle
@@ -8,22 +8,18 @@ aS'b'
 p3
 aS'seed_c'
 p4
-aS'exprs'
-p5
 aS'flag'
-p6
-aS'gr_i'
-p7
+p5
 aS'graphics'
-p8
+p6
 aS'x'
-p9
+p7
 aS'model'
-p10
+p8
 aS'typ'
-p11
-atp12
-Rp13
+p9
+atp10
+Rp11
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/Sources/READAU_f.js b/js/Sources/READAU_f.js
index eaea76df..2a49387c 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 ScilabBoolean([false,false]);
-        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 = new standard_define(new ScilabDouble([5,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
+        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 = new standard_define(new ScilabDouble([5,2]),this.model,new ScilabDouble(exprs),gr_i);
         return new BasicBlock(this.x);
     }
     READAU_f.prototype.details = function READAU_f() {
@@ -37,14 +37,14 @@ function READAU_f() {
         return options;
     }
     READAU_f.prototype.set = function READAU_f() {
-        this.exprs = this.graphics.exprs;
+        var 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 = this.exprs[1-1];
+        var fname = exprs[1-1];
         while (true) {
             var ok = true;
             this.fname1 = parseFloat(arguments[0]["fname1"]);
@@ -83,7 +83,7 @@ function READAU_f() {
                     }
                     this.model.dstate = new ScilabDouble(dstate);
                     this.model.ipar = new ScilabDouble(ipar);
-                    this.graphics.exprs = new ScilabDouble([this.exprs]);
+                    this.graphics.exprs = new ScilabDouble([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 ccddd1bf..ffed799c 100644
--- a/js/Sources/READAU_f.pickle
+++ b/js/Sources/READAU_f.pickle
@@ -8,22 +8,18 @@ aS'fname1'
 p3
 aS'N'
 p4
-aS'exprs'
-p5
-aS'gr_i'
-p6
 aS'swap'
-p7
+p5
 aS'graphics'
-p8
+p6
 aS'x'
-p9
+p7
 aS'model'
-p10
+p8
 aS'alreadyran'
-p11
-atp12
-Rp13
+p9
+atp10
+Rp11
 .(dp0
 S'tmask'
 p1
diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js
index 1c079a7f..f7e46f6f 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 ScilabBoolean([false,false]);
-        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 = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
+        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 = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i);
         return new BasicBlock(this.x);
     }
     READC_f.prototype.details = function READC_f() {
@@ -47,15 +47,15 @@ function READC_f() {
     }
     READC_f.prototype.set = function READC_f() {
         this.model = this.x.model;
-        this.exprs = this.graphics.exprs;
+        var 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 = this.exprs[3-1];
-        var frmt = this.exprs[4-1];
+        var fname = exprs[3-1];
+        var frmt = exprs[4-1];
         while (true) {
             var ok = true;
             this.tmask1 = parseFloat(arguments[0]["tmask1"]);
@@ -128,7 +128,7 @@ function READC_f() {
                     }
                     this.model.dstate = new ScilabDouble(dstate);
                     this.model.ipar = new ScilabDouble(ipar);
-                    this.graphics.exprs = new ScilabDouble([this.exprs]);
+                    this.graphics.exprs = new ScilabDouble([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 a089a11f..44fd236c 100644
--- a/js/Sources/READC_f.pickle
+++ b/js/Sources/READC_f.pickle
@@ -14,26 +14,22 @@ aS'fname1'
 p6
 aS'N'
 p7
-aS'exprs'
-p8
-aS'gr_i'
-p9
 aS'swap'
-p10
+p8
 aS'offset'
-p11
+p9
 aS'graphics'
-p12
+p10
 aS'x'
-p13
+p11
 aS'model'
-p14
+p12
 aS'tmask1'
-p15
+p13
 aS'alreadyran'
-p16
-atp17
-Rp18
+p14
+atp15
+Rp16
 .(dp0
 S'tmask'
 p1
diff --git a/js/Sources/RFILE_f.js b/js/Sources/RFILE_f.js
index d0e2060a..e2c2e9e3 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 ScilabBoolean([false,false]);
-        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 = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
+        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 = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i);
         return new BasicBlock(this.x);
     }
     RFILE_f.prototype.details = function RFILE_f() {
@@ -39,7 +39,7 @@ function RFILE_f() {
         return options;
     }
     RFILE_f.prototype.set = function RFILE_f() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         var dstate = this.model.dstate;
         var ipar = this.model.ipar;
         var ievt = ipar[3-1];
@@ -47,10 +47,10 @@ function RFILE_f() {
         var imask = 5+ipar[1-1]+ipar[2-1];
         var tmask = ipar[imask-1];
         var lunit = dstate[3-1];
-        var fname = this.exprs[3-1];
-        var frmt = this.exprs[4-1];
-        if (size(this.exprs,"*")>5) {
-            this.exprs[6-1] = [];
+        var fname = exprs[3-1];
+        var frmt = exprs[4-1];
+        if (size(exprs,"*")>5) {
+            exprs[6-1] = [];
         }
         while (true) {
             var ok = true;
@@ -110,7 +110,7 @@ function RFILE_f() {
                     }
                     this.model.dstate = new ScilabDouble(dstate);
                     this.model.ipar = new ScilabDouble(ipar);
-                    this.graphics.exprs = new ScilabDouble([this.exprs]);
+                    this.graphics.exprs = new ScilabDouble([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 02baeec7..9e11ca6a 100644
--- a/js/Sources/RFILE_f.pickle
+++ b/js/Sources/RFILE_f.pickle
@@ -12,20 +12,16 @@ aS'fname1'
 p5
 aS'N'
 p6
-aS'exprs'
-p7
-aS'gr_i'
-p8
 aS'graphics'
-p9
+p7
 aS'x'
-p10
+p8
 aS'model'
-p11
+p9
 aS'tmask1'
-p12
-atp13
-Rp14
+p10
+atp11
+Rp12
 .(dp0
 S'tmask'
 p1
diff --git a/js/Sources/SAWTOOTH_f.js b/js/Sources/SAWTOOTH_f.js
index 3d40a764..52908988 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 ScilabBoolean([false,true]);
-        this.exprs = " ";
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAWTOOTH_f\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([this.exprs]),this.gr_i);
+        var exprs = " ";
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAWTOOTH_f\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([exprs]),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 789aac5c..2e4584ec 100644
--- a/js/Sources/SAWTOOTH_f.pickle
+++ b/js/Sources/SAWTOOTH_f.pickle
@@ -6,14 +6,10 @@ S'x'
 p2
 aS'model'
 p3
-aS'gr_i'
-p4
-aS'exprs'
-p5
 aS'graphics'
-p6
-atp7
-Rp8
+p4
+atp5
+Rp6
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Sources/STEP.js b/js/Sources/STEP.js
index d66f1c0c..d101a991 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 ScilabBoolean([false,false]);
-        this.exprs = [[string(1)],[string(rpar)]];
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
+        var exprs = [[string(1)],[string(rpar)]];
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i);
         return new BasicBlock(this.x);
     }
     STEP.prototype.details = function STEP() {
@@ -30,7 +30,7 @@ function STEP() {
         return options;
     }
     STEP.prototype.set = function STEP() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.temps = arguments[0]["temps"];
@@ -67,7 +67,7 @@ function STEP() {
                     var rpar = [[this.in1],[this.fi]];
                 }
                 this.model.rpar = new ScilabDouble(rpar);
-                this.graphics.exprs = new ScilabDouble([this.exprs]);
+                this.graphics.exprs = new ScilabDouble([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 3c8db3c5..6cfc309f 100644
--- a/js/Sources/STEP.pickle
+++ b/js/Sources/STEP.pickle
@@ -2,24 +2,20 @@ c__builtin__
 set
 p0
 ((lp1
-S'fi'
+S'graphics'
 p2
 aS'in1'
 p3
 aS'temps'
 p4
-aS'exprs'
+aS'fi'
 p5
-aS'gr_i'
-p6
-aS'graphics'
-p7
 aS'x'
-p8
+p6
 aS'model'
-p9
-atp10
-Rp11
+p7
+atp8
+Rp9
 .(dp0
 S'arg1'
 p1
diff --git a/js/Sources/STEP_FUNCTION.js b/js/Sources/STEP_FUNCTION.js
index 34c936ad..e5f0f4fc 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;
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP_FUNCTION\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP_FUNCTION\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),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 af8149d5..622150c0 100644
--- a/js/Sources/STEP_FUNCTION.pickle
+++ b/js/Sources/STEP_FUNCTION.pickle
@@ -2,20 +2,16 @@ c__builtin__
 set
 p0
 ((lp1
-S'exprs'
+S'x'
 p2
-aS'gr_i'
+aS'model'
 p3
-aS'graphics'
+aS'xxn'
 p4
-aS'x'
+aS'graphics'
 p5
-aS'model'
-p6
-aS'xxn'
-p7
-atp8
-Rp9
+atp6
+Rp7
 .(dp0
 S'lnk.ct'
 p1
diff --git a/js/Sources/SampleCLK.js b/js/Sources/SampleCLK.js
index b652d744..cedce089 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 ScilabBoolean([false,false]);
-        this.exprs = [[sci2exp(1)],[sci2exp(0)]];
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs)," ");
+        var exprs = [[sci2exp(1)],[sci2exp(0)]];
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs)," ");
         return new BasicBlock(this.x);
     }
     SampleCLK.prototype.details = function SampleCLK() {
@@ -23,7 +23,7 @@ function SampleCLK() {
         return options;
     }
     SampleCLK.prototype.set = function SampleCLK() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             var ok = true;
             this.frequ = arguments[0]["frequ"];
@@ -49,7 +49,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([this.exprs]);
+                this.graphics.exprs = new ScilabDouble([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 de51428e..b9ddae6e 100644
--- a/js/Sources/SampleCLK.pickle
+++ b/js/Sources/SampleCLK.pickle
@@ -2,22 +2,18 @@ c__builtin__
 set
 p0
 ((lp1
-S'frequ'
+S'x'
 p2
-aS'offset'
+aS'model'
 p3
-aS'exprs'
+aS'offset'
 p4
-aS'gr_i'
+aS'frequ'
 p5
 aS'graphics'
 p6
-aS'x'
-p7
-aS'model'
-p8
-atp9
-Rp10
+atp7
+Rp8
 .(dp0
 S'needcompile'
 p1
diff --git a/js/Sources/Sigbuilder.js b/js/Sources/Sigbuilder.js
index 051681b8..7c978791 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());
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Sigbuilder\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Sigbuilder\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),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 212b3c98..d052935f 100644
--- a/js/Sources/Sigbuilder.pickle
+++ b/js/Sources/Sigbuilder.pickle
@@ -4,26 +4,22 @@ p0
 ((lp1
 S'N'
 p2
-aS'exprs'
+aS'xxn'
 p3
-aS'gr_i'
-p4
 aS'graphics'
-p5
+p4
 aS'y'
-p6
+p5
 aS'x'
-p7
+p6
 aS'model'
+p7
+aS'ORDER2'
 p8
 aS'order'
 p9
-aS'ORDER2'
-p10
-aS'xxn'
-p11
-atp12
-Rp13
+atp10
+Rp11
 .(dp0
 S'Y[j-1]'
 p1
diff --git a/js/Sources/TIME_f.js b/js/Sources/TIME_f.js
index e0861d58..c2016057 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 ScilabBoolean([false,true]);
-        this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_f\",sz(1),sz(2));"]);
-        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i);
+        var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_f\",sz(1),sz(2));"]);
+        this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),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 cd43824b..e4b21f58 100644
--- a/js/Sources/TIME_f.pickle
+++ b/js/Sources/TIME_f.pickle
@@ -6,14 +6,10 @@ S'x'
 p2
 aS'model'
 p3
-aS'gr_i'
-p4
-aS'exprs'
-p5
 aS'graphics'
-p6
-atp7
-Rp8
+p4
+atp5
+Rp6
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Sources/TKSCALE.js b/js/Sources/TKSCALE.js
index 257b69fd..e0ea58b3 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 ScilabBoolean([false,false]);
-        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 = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
+        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 = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i);
         return new BasicBlock(this.x);
     }
     TKSCALE.prototype.details = function TKSCALE() {
@@ -28,13 +28,13 @@ function TKSCALE() {
         return options;
     }
     TKSCALE.prototype.set = function TKSCALE() {
-        this.exprs = this.graphics.exprs;
+        var exprs = this.graphics.exprs;
         var ok = true;
         this.a = parseFloat(arguments[0]["a"]);
         this.b = parseFloat(arguments[0]["b"]);
         this.f = parseFloat(arguments[0]["f"]);
         if (ok) {
-            this.graphics.exprs = new ScilabDouble([this.exprs]);
+            this.graphics.exprs = new ScilabDouble([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 e5bfa5a5..84b2c62c 100644
--- a/js/Sources/TKSCALE.pickle
+++ b/js/Sources/TKSCALE.pickle
@@ -8,18 +8,14 @@ aS'b'
 p3
 aS'f'
 p4
-aS'exprs'
-p5
-aS'gr_i'
-p6
 aS'graphics'
-p7
+p5
 aS'x'
-p8
+p6
 aS'model'
-p9
-atp10
-Rp11
+p7
+atp8
+Rp9
 .(dp0
 S'a'
 p1