handle boolean differently

63 files changed, 632 insertions, 600 deletions

diff --git a/js/Misc/AUTOMAT.js b/js/Misc/AUTOMAT.js
index c6033345..11057d0f 100644
--- a/js/Misc/AUTOMAT.js
+++ b/js/Misc/AUTOMAT.js
@@ -20,7 +20,7 @@ function AUTOMAT() {
         this.model.blocktype = new ScilabString(["c"]);
         this.model.evtout = new ScilabDouble([1]);
         this.model.firing = new ScilabDouble([-1]);
-        this.model.dep_ut = new ScilabDouble([false,true]);
+        this.model.dep_ut = new ScilabBoolean([false,true]);
         this.model.ipar = new ScilabDouble(ipar);
         this.model.rpar = new ScilabDouble(rpar);
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"AUTOMAT\",sz(1),sz(2));"]);
diff --git a/js/Misc/AUTOMAT.pickle b/js/Misc/AUTOMAT.pickle
index 9e378404..71d0c4df 100644
--- a/js/Misc/AUTOMAT.pickle
+++ b/js/Misc/AUTOMAT.pickle
@@ -154,27 +154,28 @@ p48
 g6
 sS'model.dep_ut'
 p49
-g9
-sS'exprs'
+S'vector_boolean'
 p50
+sS'exprs'
+p51
 g4
 sS'gr_i'
-p51
+p52
 g9
 sS'ipar'
-p52
+p53
 g4
 sS'y'
-p53
+p54
 g9
 sS'x'
-p54
-NsS'model'
 p55
+NsS'model'
+p56
 g6
 sS'Minitial'
-p56
+p57
 g2
 sS'imax'
-p57
+p58
 Ns.
\ No newline at end of file
diff --git a/js/Misc/BACKLASH.js b/js/Misc/BACKLASH.js
index 99b36d13..b2a69f86 100644
--- a/js/Misc/BACKLASH.js
+++ b/js/Misc/BACKLASH.js
@@ -9,7 +9,7 @@ function BACKLASH() {
         this.model.rpar = new ScilabDouble([0],[1]);
         this.model.nzcross = new ScilabDouble([2]);
         this.model.blocktype = new ScilabString(["c"]);
-        this.model.dep_ut = new ScilabDouble([true,false]);
+        this.model.dep_ut = new ScilabBoolean([true,false]);
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BACKLASH\",sz(1),sz(2));"]);
         this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i);
         return new BasicBlock(this.x);
diff --git a/js/Misc/BACKLASH.pickle b/js/Misc/BACKLASH.pickle
index 8954d2a4..25747638 100644
--- a/js/Misc/BACKLASH.pickle
+++ b/js/Misc/BACKLASH.pickle
@@ -63,26 +63,27 @@ S'vector'
 p18
 sS'model.dep_ut'
 p19
-g18
-sS'model.in'
+S'vector_boolean'
 p20
+sS'model.in'
+p21
 g4
 sS'graphics'
-p21
+p22
 g8
 sS'y'
-p22
+p23
 g18
 sS'x'
-p23
-NsS'model'
 p24
+NsS'model'
+p25
 g8
 sS'rpar[1-1]'
-p25
-NsS'typ'
 p26
+NsS'typ'
+p27
 g18
 sS'rpar[2-1]'
-p27
+p28
 Ns.
\ No newline at end of file
diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js
index f6557d8a..bf1a4a1e 100644
--- a/js/Misc/BOUNCE.js
+++ b/js/Misc/BOUNCE.js
@@ -32,7 +32,7 @@ function BOUNCE() {
         this.model.ipar = new ScilabDouble(ipar);
         this.model.nzcross = new ScilabDouble([n*(n-1)/2+4*n]);
         this.model.blocktype = new ScilabString(["c"]);
-        this.model.dep_ut = new ScilabDouble([false,true]);
+        this.model.dep_ut = new ScilabBoolean([false,true]);
         this.exprs = [[strcat(sci2exp(this.rpar1))],[strcat(sci2exp(this.rpar2))],[strcat(sci2exp(this.walls))],[strcat(sci2exp(this.x))],[strcat(sci2exp(this.xd))],[strcat(sci2exp(this.y))],[strcat(sci2exp(this.yd))]];
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BOUNCE\",sz(1),sz(2));"]);
         this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i);
diff --git a/js/Misc/BOUNCE.pickle b/js/Misc/BOUNCE.pickle
index b6ea4fe5..07937336 100644
--- a/js/Misc/BOUNCE.pickle
+++ b/js/Misc/BOUNCE.pickle
@@ -118,31 +118,32 @@ p33
 g13
 sS'model.dep_ut'
 p34
-g2
-sS'n'
+S'vector_boolean'
 p35
+sS'n'
+p36
 g13
 sS'exprs'
-p36
+p37
 g7
 sS'gr_i'
-p37
+p38
 g2
 sS'ipar'
-p38
+p39
 g2
 sS'y'
-p39
+p40
 g7
 sS'x'
-p40
+p41
 g7
 sS'model'
-p41
+p42
 g4
 sS'ipar[k-1]'
-p42
-NsS'model.state'
 p43
+NsS'model.state'
+p44
 g2
 s.
\ No newline at end of file
diff --git a/js/Misc/BOUNCEXY.js b/js/Misc/BOUNCEXY.js
index 6bb0fdba..915a51de 100644
--- a/js/Misc/BOUNCEXY.js
+++ b/js/Misc/BOUNCEXY.js
@@ -29,7 +29,7 @@ function BOUNCEXY() {
         this.model.ipar = new ScilabDouble([this.win],[this.imode],[this.clrs.slice()]);
         this.model.blocktype = new ScilabString(["d"]);
         this.model.firing = new ScilabDouble([]);
-        this.model.dep_ut = new ScilabDouble([false,false]);
+        this.model.dep_ut = new ScilabBoolean([false,false]);
         this.exprs = [[strcat(sci2exp(this.clrs))],[strcat(sci2exp(this.siz))],[strcat(sci2exp(this.win))],[strcat(sci2exp(1))],[strcat(sci2exp(this.xmin))],[strcat(sci2exp(this.xmax))],[strcat(sci2exp(this.ymin))],[strcat(sci2exp(this.ymax))]];
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BOUNCEXY\",sz(1),sz(2));"]);
         this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
diff --git a/js/Misc/BOUNCEXY.pickle b/js/Misc/BOUNCEXY.pickle
index 5edd2bdd..b470aa95 100644
--- a/js/Misc/BOUNCEXY.pickle
+++ b/js/Misc/BOUNCEXY.pickle
@@ -140,25 +140,26 @@ p41
 g6
 sS'model.dep_ut'
 p42
-g14
-sS'z[6*(i-1)+6-1]'
+S'vector_boolean'
 p43
+sS'z[6*(i-1)+6-1]'
+p44
 g4
 sS'gr_i'
-p44
+p45
 g14
 sS'ipar'
-p45
+p46
 g2
 sS'y'
-p46
+p47
 g14
 sS'x'
-p47
-NsS'model'
 p48
+NsS'model'
+p49
 g6
 sS'z'
-p49
+p50
 g14
 s.
\ No newline at end of file
diff --git a/js/Misc/BPLATFORM.js b/js/Misc/BPLATFORM.js
index 16f5a301..37b101fc 100644
--- a/js/Misc/BPLATFORM.js
+++ b/js/Misc/BPLATFORM.js
@@ -15,7 +15,7 @@ function BPLATFORM() {
         this.model.dstate = new ScilabDouble([0]);
         this.model.rpar = new ScilabDouble([this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]);
         this.model.blocktype = new ScilabString(["d"]);
-        this.model.dep_ut = new ScilabDouble([false,false]);
+        this.model.dep_ut = new ScilabBoolean([false,false]);
         this.exprs = string(this.model.rpar);
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BPLATFORM\",sz(1),sz(2));"]);
         this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
diff --git a/js/Misc/BPLATFORM.pickle b/js/Misc/BPLATFORM.pickle
index 68beb7db..b9c99f67 100644
--- a/js/Misc/BPLATFORM.pickle
+++ b/js/Misc/BPLATFORM.pickle
@@ -102,22 +102,23 @@ S'string'
 p29
 sS'model.dep_ut'
 p30
-g25
-sS'exprs'
+S'vector_boolean'
 p31
+sS'exprs'
+p32
 g29
 sS'gr_i'
-p32
+p33
 g25
 sS'xmax'
-p33
+p34
 g2
 sS'y'
-p34
+p35
 g25
 sS'x'
-p35
-NsS'model'
 p36
+NsS'model'
+p37
 g4
 s.
\ No newline at end of file
diff --git a/js/Misc/CBLOCK.js b/js/Misc/CBLOCK.js
index b7a389d6..91a8a55a 100644
--- a/js/Misc/CBLOCK.js
+++ b/js/Misc/CBLOCK.js
@@ -25,7 +25,7 @@ function CBLOCK() {
         this.model.ipar = new ScilabDouble(this.ipar);
         this.model.blocktype = new ScilabString([typ]);
         this.model.firing = new ScilabDouble(auto);
-        this.model.dep_ut = new ScilabDouble([true,false]);
+        this.model.dep_ut = new ScilabBoolean([true,false]);
         this.model.nzcross = new ScilabDouble([this.ng]);
         var label = list(transpose([funam,"n",sci2exp(in1),sci2exp(out),sci2exp(clkin),sci2exp(clkout),sci2exp(x0),sci2exp(0),sci2exp(z0),sci2exp(this.rpar),sci2exp(this.ipar),sci2exp(auto),"y","n"]),[]);
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CBLOCK\",sz(1),sz(2));"]);
@@ -147,7 +147,7 @@ function CBLOCK() {
                         this.model.rpar = new ScilabDouble(this.rpar);
                         this.model.ipar = new ScilabDouble([this.ipar]);
                         this.model.firing = new ScilabDouble([this.auto0]);
-                        this.model.dep_ut = new ScilabDouble(dep_ut);
+                        this.model.dep_ut = new ScilabBoolean(dep_ut);
                         this.model.nzcross = new ScilabDouble([this.ng]);
                         label[2-1] = tt;
                         this.x.model = this.model;
diff --git a/js/Misc/CBLOCK.pickle b/js/Misc/CBLOCK.pickle
index 0a74c6cc..d75a6b82 100644
--- a/js/Misc/CBLOCK.pickle
+++ b/js/Misc/CBLOCK.pickle
@@ -73,141 +73,142 @@ p11
 g2
 sS'model.dep_ut'
 p12
-g8
-sS'funam'
+S'vector_boolean'
 p13
-S'string'
+sS'funam'
 p14
-sS'model.dstate'
+S'string'
 p15
+sS'model.dstate'
+p16
 g8
 sS'ng'
-p16
+p17
 g2
 sS'out'
-p17
+p18
 g2
 sS'nevin'
-p18
+p19
 g2
 sS'clkin'
-p19
+p20
 g8
 sS'x.graphics'
-p20
+p21
 g5
 sS'model.nzcross'
-p21
+p22
 g2
 sS'tt'
-p22
+p23
 g2
 sS'label'
-p23
-S'list'
 p24
-sS'nx'
+S'list'
 p25
+sS'nx'
+p26
 g2
 sS'nz'
-p26
+p27
 g2
 sS'z0'
-p27
+p28
 g8
 sS'model.evtin'
-p28
+p29
 g8
 sS'model.firing'
-p29
+p30
 g8
 sS'nevout'
-p30
+p31
 g2
 sS'model.sim'
-p31
-g24
-sS'model.evtout'
 p32
+g25
+sS'model.evtout'
+p33
 g8
 sS'clkout'
-p33
+p34
 g8
 sS'auto'
-p34
+p35
 g8
 sS'label[2-1]'
-p35
+p36
 g2
 sS'in1'
-p36
+p37
 g2
 sS'model.rpar'
-p37
+p38
 g8
 sS'model.state'
-p38
+p39
 g8
 sS'model.in'
-p39
+p40
 g2
 sS'graphics'
-p40
+p41
 g5
 sS'x0'
-p41
+p42
 g8
 sS'model.ipar'
-p42
+p43
 g8
 sS'typ'
-p43
-g14
-sS'ok'
 p44
-S'boolean'
+g15
+sS'ok'
 p45
-sS'model.blocktype'
+S'boolean'
 p46
-g14
-sS'i'
+sS'model.blocktype'
 p47
+g15
+sS'i'
+p48
 g2
 sS'label[1-1]'
-p48
-NsS'x.model'
 p49
+NsS'x.model'
+p50
 g5
 sS'o'
-p50
+p51
 g2
 sS'depu'
-p51
-g45
-sS'dept'
 p52
-g45
-sS'gr_i'
+g46
+sS'dept'
 p53
+g46
+sS'gr_i'
+p54
 g8
 sS'ipar'
-p54
+p55
 g8
 sS'y'
-p55
+p56
 g8
 sS'x'
-p56
-NsS'model'
 p57
+NsS'model'
+p58
 g5
 sS'z'
-p58
+p59
 g8
 sS'nout'
-p59
+p60
 g2
 sS'dep_ut'
-p60
-g8
+p61
+g13
 s.
\ No newline at end of file
diff --git a/js/Misc/CBLOCK4.js b/js/Misc/CBLOCK4.js
index 1ad467d5..915c5299 100644
--- a/js/Misc/CBLOCK4.js
+++ b/js/Misc/CBLOCK4.js
@@ -10,7 +10,7 @@ function CBLOCK4() {
         this.model.out = new ScilabDouble([1]);
         this.model.out2 = new ScilabDouble([1]);
         this.model.outtyp = new ScilabDouble([1]);
-        this.model.dep_ut = new ScilabDouble([true,false]);
+        this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = list([[funam],["n"],[sci2exp([this.model.in,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2])],[sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]],[]);
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CBLOCK4\",sz(1),sz(2));"]);
         this.x = new standard_define(new ScilabDouble([4,2]),this.model,label,this.gr_i);
@@ -140,7 +140,7 @@ function CBLOCK4() {
                         this.model.firing = new ScilabDouble([this.auto0]);
                         this.model.nzcross = new ScilabDouble([this.nzcr]);
                         this.model.nmode = new ScilabDouble([this.nmode]);
-                        this.model.dep_ut = new ScilabDouble(dep_ut);
+                        this.model.dep_ut = new ScilabBoolean(dep_ut);
                         label[2-1] = tt;
                         this.x.model = this.model;
                         this.graphics.exprs = new ScilabDouble([label]);
diff --git a/js/Misc/CBLOCK4.pickle b/js/Misc/CBLOCK4.pickle
index 1e002ba1..68e12486 100644
--- a/js/Misc/CBLOCK4.pickle
+++ b/js/Misc/CBLOCK4.pickle
@@ -167,31 +167,32 @@ p43
 g6
 sS'model.dep_ut'
 p44
-g9
-sS'depu'
+S'vector_boolean'
 p45
+sS'depu'
+p46
 g41
 sS'dept'
-p46
+p47
 g41
 sS'gr_i'
-p47
+p48
 g9
 sS'ipar'
-p48
+p49
 g3
 sS'y'
-p49
+p50
 g9
 sS'x'
-p50
-NsS'model'
 p51
+NsS'model'
+p52
 g6
 sS'z'
-p52
-g9
-sS'dep_ut'
 p53
 g9
+sS'dep_ut'
+p54
+g45
 s.
\ No newline at end of file
diff --git a/js/Misc/CONSTRAINT2_c.js b/js/Misc/CONSTRAINT2_c.js
index a4363e39..07f4f1bc 100644
--- a/js/Misc/CONSTRAINT2_c.js
+++ b/js/Misc/CONSTRAINT2_c.js
@@ -11,7 +11,7 @@ function CONSTRAINT2_c() {
         this.model.state = new ScilabDouble([this.x0],[this.xd0]);
         this.model.ipar = new ScilabDouble(this.id);
         this.model.blocktype = new ScilabString(["c"]);
-        this.model.dep_ut = new ScilabDouble([false,true]);
+        this.model.dep_ut = new ScilabBoolean([false,true]);
         this.exprs = list(strcat(sci2exp(this.x0)),strcat(sci2exp(this.xd0)),strcat(sci2exp(this.id)));
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONSTRAINT2_c\",sz(1),sz(2));"]);
         this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i);
diff --git a/js/Misc/CONSTRAINT2_c.pickle b/js/Misc/CONSTRAINT2_c.pickle
index eaa56c2e..01f45833 100644
--- a/js/Misc/CONSTRAINT2_c.pickle
+++ b/js/Misc/CONSTRAINT2_c.pickle
@@ -81,26 +81,27 @@ S'string'
 p24
 sS'model.dep_ut'
 p25
-g6
-sS'exprs'
+S'vector_boolean'
 p26
+sS'exprs'
+p27
 g14
 sS'gr_i'
-p27
+p28
 g6
 sS'id[i-1]'
-p28
+p29
 g12
 sS'ask_again'
-p29
-S'boolean'
 p30
-sS'y'
+S'boolean'
 p31
+sS'y'
+p32
 g6
 sS'x'
-p32
-NsS'model'
 p33
+NsS'model'
+p34
 g2
 s.
\ No newline at end of file
diff --git a/js/Misc/CONSTRAINT_c.js b/js/Misc/CONSTRAINT_c.js
index 53bdf8d2..988db1e1 100644
--- a/js/Misc/CONSTRAINT_c.js
+++ b/js/Misc/CONSTRAINT_c.js
@@ -9,7 +9,7 @@ function CONSTRAINT_c() {
         this.model.ipar = new ScilabDouble([0]);
         this.model.state = new ScilabDouble(this.x0);
         this.model.blocktype = new ScilabString(["c"]);
-        this.model.dep_ut = new ScilabDouble([false,true]);
+        this.model.dep_ut = new ScilabBoolean([false,true]);
         this.exprs = "0";
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONSTRAINT_c\",sz(1),sz(2));"]);
         this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i);
diff --git a/js/Misc/CONSTRAINT_c.pickle b/js/Misc/CONSTRAINT_c.pickle
index 988e7434..6c45778f 100644
--- a/js/Misc/CONSTRAINT_c.pickle
+++ b/js/Misc/CONSTRAINT_c.pickle
@@ -40,7 +40,7 @@ sS'graphics.exprs'
 p10
 NsS'model.dep_ut'
 p11
-S'vector'
+S'vector_boolean'
 p12
 sS'N'
 p13
@@ -52,32 +52,33 @@ sS'x.model'
 p15
 NsS'gr_i'
 p16
-g12
-sS'model.state'
+S'vector'
 p17
-S'matrix'
+sS'model.state'
 p18
-sS'model.in'
+S'matrix'
 p19
+sS'model.in'
+p20
 g4
 sS'graphics'
-p20
+p21
 g8
 sS'y'
-p21
-g12
-sS'x'
 p22
-NsS'model'
+g17
+sS'x'
 p23
+NsS'model'
+p24
 g8
 sS'model.ipar'
-p24
+p25
 g4
 sS'typ'
-p25
-g12
-sS'x0'
 p26
-g18
+g17
+sS'x0'
+p27
+g19
 s.
\ No newline at end of file
diff --git a/js/Misc/DEADBAND.js b/js/Misc/DEADBAND.js
index e1a5b693..8e044e7c 100644
--- a/js/Misc/DEADBAND.js
+++ b/js/Misc/DEADBAND.js
@@ -12,7 +12,7 @@ function DEADBAND() {
         this.model.out = new ScilabDouble([1]);
         this.model.rpar = new ScilabDouble(rpar);
         this.model.blocktype = new ScilabString(["c"]);
-        this.model.dep_ut = new ScilabDouble([true,false]);
+        this.model.dep_ut = new ScilabBoolean([true,false]);
         this.exprs = [[string(this.maxp)],[string(this.minp)],[string(this.model.nmode)]];
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEADBAND\",sz(1),sz(2));"]);
         this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
diff --git a/js/Misc/DEADBAND.pickle b/js/Misc/DEADBAND.pickle
index 0326c662..ab8faf42 100644
--- a/js/Misc/DEADBAND.pickle
+++ b/js/Misc/DEADBAND.pickle
@@ -75,19 +75,20 @@ S'string'
 p22
 sS'model.dep_ut'
 p23
-g12
-sS'exprs'
+S'vector_boolean'
 p24
+sS'exprs'
+p25
 g5
 sS'gr_i'
-p25
+p26
 g12
 sS'y'
-p26
+p27
 g12
 sS'x'
-p27
-NsS'model'
 p28
+NsS'model'
+p29
 g2
 s.
\ No newline at end of file
diff --git a/js/Misc/DIFF_f.js b/js/Misc/DIFF_f.js
index cd42cc22..722f1350 100644
--- a/js/Misc/DIFF_f.js
+++ b/js/Misc/DIFF_f.js
@@ -8,7 +8,7 @@ function DIFF_f() {
         this.model.out = new ScilabDouble([1]);
         this.model.state = new ScilabDouble(this.x0);
         this.model.blocktype = new ScilabString(["c"]);
-        this.model.dep_ut = new ScilabDouble([false,true]);
+        this.model.dep_ut = new ScilabBoolean([false,true]);
         this.exprs = [[strcat(sci2exp(this.x0[1-1]))],[strcat(sci2exp(this.x0[2-1]))]];
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DIFF_f\",sz(1),sz(2));"]);
         this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
diff --git a/js/Misc/DIFF_f.pickle b/js/Misc/DIFF_f.pickle
index aa75c90b..9d7579af 100644
--- a/js/Misc/DIFF_f.pickle
+++ b/js/Misc/DIFF_f.pickle
@@ -46,37 +46,38 @@ sS'graphics.exprs'
 p12
 NsS'model.dep_ut'
 p13
-g8
-sS'exprs'
+S'vector_boolean'
 p14
-S'matrix'
+sS'exprs'
 p15
-sS'x.model'
+S'matrix'
 p16
-NsS'gr_i'
+sS'x.model'
 p17
+NsS'gr_i'
+p18
 g8
 sS'model.state'
-p18
-g15
-sS'model.in'
 p19
+g16
+sS'model.in'
+p20
 g4
 sS'graphics'
-p20
+p21
 g10
 sS'y'
-p21
+p22
 g8
 sS'x'
-p22
-NsS'model'
 p23
+NsS'model'
+p24
 g10
 sS'typ'
-p24
+p25
 g8
 sS'x0'
-p25
-g15
+p26
+g16
 s.
\ No newline at end of file
diff --git a/js/Misc/EDGETRIGGER.js b/js/Misc/EDGETRIGGER.js
index 2744411d..f0699af4 100644
--- a/js/Misc/EDGETRIGGER.js
+++ b/js/Misc/EDGETRIGGER.js
@@ -10,7 +10,7 @@ function EDGETRIGGER() {
         this.model.nzcross = new ScilabDouble([1]);
         this.model.ipar = new ScilabDouble([sign(this.edge)]);
         this.model.blocktype = new ScilabString(["c"]);
-        this.model.dep_ut = new ScilabDouble([true,false]);
+        this.model.dep_ut = new ScilabBoolean([true,false]);
         this.exprs = [string(this.edge)];
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EDGETRIGGER\",sz(1),sz(2));"]);
         this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i);
diff --git a/js/Misc/EDGETRIGGER.pickle b/js/Misc/EDGETRIGGER.pickle
index 4177781f..def535c9 100644
--- a/js/Misc/EDGETRIGGER.pickle
+++ b/js/Misc/EDGETRIGGER.pickle
@@ -43,40 +43,41 @@ sS'graphics.exprs'
 p11
 NsS'model.dep_ut'
 p12
-S'vector'
+S'vector_boolean'
 p13
 sS'gr_i'
 p14
-g13
-sS'model.nzcross'
+S'vector'
 p15
+sS'model.nzcross'
+p16
 g4
 sS'exprs'
-p16
-g13
-sS'x.model'
 p17
-NsS'edge'
+g15
+sS'x.model'
 p18
+NsS'edge'
+p19
 g4
 sS'model.in'
-p19
+p20
 g4
 sS'graphics'
-p20
+p21
 g9
 sS'y'
-p21
-g13
-sS'x'
 p22
-NsS'model'
+g15
+sS'x'
 p23
+NsS'model'
+p24
 g9
 sS'model.ipar'
-p24
+p25
 g4
 sS'typ'
-p25
-g13
+p26
+g15
 s.
\ No newline at end of file
diff --git a/js/Misc/EXPRESSION.pickle b/js/Misc/EXPRESSION.pickle
index 0e95fcb4..29756226 100644
--- a/js/Misc/EXPRESSION.pickle
+++ b/js/Misc/EXPRESSION.pickle
@@ -102,24 +102,25 @@ p31
 g19
 sS'model.dep_ut'
 p32
-g7
-sS'exprs'
+S'vector_boolean'
 p33
+sS'exprs'
+p34
 g23
 sS'gr_i'
-p34
+p35
 g7
 sS'PREVAR_scicos_context'
-p35
-NsS'ipar'
 p36
+NsS'ipar'
+p37
 g7
 sS'y'
-p37
+p38
 g7
 sS'x'
-p38
-NsS'model'
 p39
+NsS'model'
+p40
 g2
 s.
\ No newline at end of file
diff --git a/js/Misc/HYSTHERESIS.js b/js/Misc/HYSTHERESIS.js
index 444eb1ef..19e73b50 100644
--- a/js/Misc/HYSTHERESIS.js
+++ b/js/Misc/HYSTHERESIS.js
@@ -13,7 +13,7 @@ function HYSTHERESIS() {
         this.model.nzcross = new ScilabDouble([this.nzz]);
         this.model.nmode = new ScilabDouble([1]);
         this.model.blocktype = new ScilabString(["c"]);
-        this.model.dep_ut = new ScilabDouble([true,false]);
+        this.model.dep_ut = new ScilabBoolean([true,false]);
         this.exprs = [[string(rpar)],[string(sign(this.nzz))]];
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"HYSTHERESIS\",sz(1),sz(2));"]);
         this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
diff --git a/js/Misc/HYSTHERESIS.pickle b/js/Misc/HYSTHERESIS.pickle
index 72fa6b0d..0fe608f8 100644
--- a/js/Misc/HYSTHERESIS.pickle
+++ b/js/Misc/HYSTHERESIS.pickle
@@ -79,22 +79,23 @@ p22
 g8
 sS'model.dep_ut'
 p23
-g11
-sS'exprs'
+S'vector_boolean'
 p24
+sS'exprs'
+p25
 g5
 sS'gr_i'
-p25
+p26
 g11
 sS'ipar'
-p26
+p27
 g11
 sS'y'
-p27
+p28
 g11
 sS'x'
-p28
-NsS'model'
 p29
+NsS'model'
+p30
 g2
 s.
\ No newline at end of file
diff --git a/js/Misc/LOGICAL_OP.js b/js/Misc/LOGICAL_OP.js
index e4b6fdb8..ce52871a 100644
--- a/js/Misc/LOGICAL_OP.js
+++ b/js/Misc/LOGICAL_OP.js
@@ -10,7 +10,7 @@ function LOGICAL_OP() {
         this.model.out = new ScilabDouble([-1]);
         this.model.ipar = new ScilabDouble(ipar);
         this.model.blocktype = new ScilabString(["c"]);
-        this.model.dep_ut = new ScilabDouble([true,false]);
+        this.model.dep_ut = new ScilabBoolean([true,false]);
         this.exprs = [[string(this.nin)],[string(ipar)]];
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGICAL_OP\",sz(1),sz(2));"]);
         this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
diff --git a/js/Misc/LOGICAL_OP.pickle b/js/Misc/LOGICAL_OP.pickle
index 07820007..98da2a59 100644
--- a/js/Misc/LOGICAL_OP.pickle
+++ b/js/Misc/LOGICAL_OP.pickle
@@ -38,7 +38,7 @@ sS'x.model'
 p6
 NsS'model.dep_ut'
 p7
-S'vector'
+S'vector_boolean'
 p8
 sS'model.out'
 p9
@@ -46,69 +46,70 @@ S'double'
 p10
 sS'out'
 p11
-g8
-sS'graphics.style'
+S'vector'
 p12
-g8
-sS'x.graphics'
+sS'graphics.style'
 p13
+g12
+sS'x.graphics'
+p14
 g2
 sS'tp'
-p14
+p15
 g10
 sS'label'
-p15
+p16
 g5
 sS'model.sim'
-p16
-S'list'
 p17
-sS'nin'
+S'list'
 p18
+sS'nin'
+p19
 g10
 sS'in1'
-p19
-S'matrix'
 p20
-sS'model.in'
+S'matrix'
 p21
-g20
-sS'graphics.exprs'
+sS'model.in'
 p22
-g20
-sS'model.ipar'
+g21
+sS'graphics.exprs'
 p23
-g8
-sS'typ'
+g21
+sS'model.ipar'
 p24
-g8
-sS'ok'
+g12
+sS'typ'
 p25
-S'boolean'
+g12
+sS'ok'
 p26
-sS'model.blocktype'
+S'boolean'
 p27
+sS'model.blocktype'
+p28
 g5
 sS'rule'
-p28
+p29
 g10
 sS'exprs'
-p29
-g20
-sS'gr_i'
 p30
-g8
-sS'ipar'
+g21
+sS'gr_i'
 p31
-g8
-sS'y'
+g12
+sS'ipar'
 p32
-g8
-sS'x'
+g12
+sS'y'
 p33
-NsS'model'
+g12
+sS'x'
 p34
+NsS'model'
+p35
 g2
 sS'ot'
-p35
+p36
 Ns.
\ No newline at end of file
diff --git a/js/Misc/MBLOCK.js b/js/Misc/MBLOCK.js
index 7d9a0f0d..f245bcce 100644
--- a/js/Misc/MBLOCK.js
+++ b/js/Misc/MBLOCK.js
@@ -12,7 +12,7 @@ function MBLOCK() {
         this.exprs = tlist(["MBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(this.in1.slice()),sci2exp(this.intype.slice()),sci2exp(this.out.slice()),sci2exp(this.outtype.slice()),sci2exp(param.slice()),list(string(0.1),string(.0001)),sci2exp(this.pprop.slice()),nameF,[]);
         this.model = scicos_model();
         this.model.blocktype = new ScilabString(["c"]);
-        this.model.dep_ut = new ScilabDouble([false,true]);
+        this.model.dep_ut = new ScilabBoolean([false,true]);
         this.model.rpar = new ScilabDouble([]);
         for (i=1;i<=lstsize(paramv);i+=1) {
             this.model.rpar = new ScilabDouble([this.model.rpar],[paramv[i-1].slice()]);
diff --git a/js/Misc/MBLOCK.pickle b/js/Misc/MBLOCK.pickle
index 7ee03132..513e1e22 100644
--- a/js/Misc/MBLOCK.pickle
+++ b/js/Misc/MBLOCK.pickle
@@ -216,31 +216,32 @@ p63
 g8
 sS'model.dep_ut'
 p64
-g29
-sS'exprs.paramv'
+S'vector_boolean'
 p65
+sS'exprs.paramv'
+p66
 g13
 sS'exprs'
-p66
+p67
 g8
 sS'lab_2[$+1-1]'
-p67
+p68
 g2
 sS'r'
-p68
+p69
 g57
 sS'lab_txt'
-p69
+p70
 g2
 sS'y'
-p70
+p71
 g29
 sS'x'
-p71
-NsS'model'
 p72
+NsS'model'
+p73
 g4
 sS'tt'
-p73
+p74
 g29
 s.
\ No newline at end of file
diff --git a/js/Misc/MEMORY_f.js b/js/Misc/MEMORY_f.js
index bbf73395..6489728b 100644
--- a/js/Misc/MEMORY_f.js
+++ b/js/Misc/MEMORY_f.js
@@ -12,7 +12,7 @@ function MEMORY_f() {
         this.model.dstate = new ScilabDouble([0]);
         this.model.rpar = new ScilabDouble([z]);
         this.model.blocktype = new ScilabString(["m"]);
-        this.model.dep_ut = new ScilabDouble([false,false]);
+        this.model.dep_ut = new ScilabBoolean([false,false]);
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MEMORY_f\",sz(1),sz(2));"]);
         this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
         return new BasicBlock(this.x);
diff --git a/js/Misc/MEMORY_f.pickle b/js/Misc/MEMORY_f.pickle
index 612a9cf1..c9ccb17b 100644
--- a/js/Misc/MEMORY_f.pickle
+++ b/js/Misc/MEMORY_f.pickle
@@ -75,23 +75,24 @@ p22
 g13
 sS'model.dep_ut'
 p23
-g19
-sS'exprs'
+S'vector_boolean'
 p24
-S'matrix'
+sS'exprs'
 p25
-sS'gr_i'
+S'matrix'
 p26
+sS'gr_i'
+p27
 g19
 sS'y'
-p27
+p28
 g19
 sS'x'
-p28
-NsS'model'
 p29
+NsS'model'
+p30
 g4
 sS'z'
-p30
+p31
 g2
 s.
\ No newline at end of file
diff --git a/js/Misc/MPBLOCK.js b/js/Misc/MPBLOCK.js
index 05ec71a5..ddaca010 100644
--- a/js/Misc/MPBLOCK.js
+++ b/js/Misc/MPBLOCK.js
@@ -12,7 +12,7 @@ function MPBLOCK() {
         this.exprs = tlist(["MPBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(this.in1.slice()),sci2exp(this.intype.slice()),sci2exp(this.out.slice()),sci2exp(this.outtype.slice()),sci2exp(param.slice()),list(string(0.1),string(.0001)),sci2exp(pprop.slice()),nameF,[]);
         this.model = scicos_model();
         this.model.blocktype = new ScilabString(["c"]);
-        this.model.dep_ut = new ScilabDouble([true,true]);
+        this.model.dep_ut = new ScilabBoolean([true,true]);
         this.model.rpar = new ScilabDouble([]);
         for (i=1;i<=lstsize(paramv);i+=1) {
             this.model.rpar = new ScilabDouble([this.model.rpar],[paramv[i-1].slice()]);
diff --git a/js/Misc/MPBLOCK.pickle b/js/Misc/MPBLOCK.pickle
index dbcb3270..76b38fb4 100644
--- a/js/Misc/MPBLOCK.pickle
+++ b/js/Misc/MPBLOCK.pickle
@@ -200,31 +200,32 @@ p63
 g4
 sS'model.dep_ut'
 p64
-g30
-sS'exprs.funtxt'
+S'vector_boolean'
 p65
+sS'exprs.funtxt'
+p66
 g2
 sS'exprs'
-p66
+p67
 g4
 sS'lab_2[$+1-1]'
-p67
+p68
 g2
 sS'r'
-p68
+p69
 g57
 sS'lab_txt'
-p69
+p70
 g2
 sS'y'
-p70
+p71
 g30
 sS'x'
-p71
-NsS'model'
 p72
+NsS'model'
+p73
 g6
 sS'exprs.paramv'
-p73
+p74
 g14
 s.
\ No newline at end of file
diff --git a/js/Misc/PAL_f.js b/js/Misc/PAL_f.js
index 06317e37..8c5eca6e 100644
--- a/js/Misc/PAL_f.js
+++ b/js/Misc/PAL_f.js
@@ -9,7 +9,7 @@ function PAL_f() {
         this.model.out = new ScilabDouble([]);
         this.model.rpar = new ScilabDouble([scs]);
         this.model.blocktype = new ScilabString(["h"]);
-        this.model.dep_ut = new ScilabDouble([false,false]);
+        this.model.dep_ut = new ScilabBoolean([false,false]);
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PAL_f\",sz(1),sz(2));"]);
         this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i);
         this.x.graphics.id = scs.props.title[1-1];
diff --git a/js/Misc/PAL_f.pickle b/js/Misc/PAL_f.pickle
index cdbc9270..ab8787a8 100644
--- a/js/Misc/PAL_f.pickle
+++ b/js/Misc/PAL_f.pickle
@@ -34,7 +34,7 @@ p7
 g4
 sS'model.dep_ut'
 p8
-S'vector'
+S'vector_boolean'
 p9
 sS'scs.props.title'
 p10
@@ -44,39 +44,40 @@ p11
 g4
 sS'model.out'
 p12
-g9
-sS'gr_i'
+S'vector'
 p13
-g9
-sS'model.rpar'
+sS'gr_i'
 p14
-S'double'
+g13
+sS'model.rpar'
 p15
-sS'scs'
+S'double'
 p16
+sS'scs'
+p17
 g4
 sS'model.in'
-p17
-g9
-sS'y'
 p18
-g9
-sS'x'
+g13
+sS'y'
 p19
+g13
+sS'x'
+p20
 g4
 sS'model'
-p20
+p21
 g4
 sS'x.graphics.id'
-p21
-g15
-sS'typ'
 p22
-g9
-sS'arg1.model.rpar'
+g16
+sS'typ'
 p23
+g13
+sS'arg1.model.rpar'
+p24
 g4
 sS'arg1.graphics.id'
-p24
-g15
+p25
+g16
 s.
\ No newline at end of file
diff --git a/js/Misc/PENDULUM_ANIM.js b/js/Misc/PENDULUM_ANIM.js
index a7d700fe..940c5b0f 100644
--- a/js/Misc/PENDULUM_ANIM.js
+++ b/js/Misc/PENDULUM_ANIM.js
@@ -15,7 +15,7 @@ function PENDULUM_ANIM() {
         this.model.dstate = new ScilabDouble([0]);
         this.model.rpar = new ScilabDouble([this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]);
         this.model.blocktype = new ScilabString(["d"]);
-        this.model.dep_ut = new ScilabDouble([false,false]);
+        this.model.dep_ut = new ScilabBoolean([false,false]);
         this.exprs = string(this.model.rpar);
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PENDULUM_ANIM\",sz(1),sz(2));"]);
         this.x = new standard_define(new ScilabDouble([3,3]),this.model,this.exprs,this.gr_i);
diff --git a/js/Misc/PENDULUM_ANIM.pickle b/js/Misc/PENDULUM_ANIM.pickle
index 68beb7db..b9c99f67 100644
--- a/js/Misc/PENDULUM_ANIM.pickle
+++ b/js/Misc/PENDULUM_ANIM.pickle
@@ -102,22 +102,23 @@ S'string'
 p29
 sS'model.dep_ut'
 p30
-g25
-sS'exprs'
+S'vector_boolean'
 p31
+sS'exprs'
+p32
 g29
 sS'gr_i'
-p32
+p33
 g25
 sS'xmax'
-p33
+p34
 g2
 sS'y'
-p34
+p35
 g25
 sS'x'
-p35
-NsS'model'
 p36
+NsS'model'
+p37
 g4
 s.
\ No newline at end of file
diff --git a/js/Misc/RATELIMITER.js b/js/Misc/RATELIMITER.js
index 6e90735c..f3a168e8 100644
--- a/js/Misc/RATELIMITER.js
+++ b/js/Misc/RATELIMITER.js
@@ -10,7 +10,7 @@ function RATELIMITER() {
         this.model.out = new ScilabDouble([1]);
         this.model.rpar = new ScilabDouble(rpar);
         this.model.blocktype = new ScilabString(["c"]);
-        this.model.dep_ut = new ScilabDouble([true,false]);
+        this.model.dep_ut = new ScilabBoolean([true,false]);
         this.exprs = [[string(this.maxp)],[string(this.minp)]];
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RATELIMITER\",sz(1),sz(2));"]);
         this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,this.exprs,this.gr_i);
diff --git a/js/Misc/RATELIMITER.pickle b/js/Misc/RATELIMITER.pickle
index 4902b855..c591b933 100644
--- a/js/Misc/RATELIMITER.pickle
+++ b/js/Misc/RATELIMITER.pickle
@@ -64,22 +64,23 @@ S'vector'
 p19
 sS'model.dep_ut'
 p20
-g19
-sS'model.in'
+S'vector_boolean'
 p21
+sS'model.in'
+p22
 g4
 sS'graphics'
-p22
+p23
 g9
 sS'y'
-p23
+p24
 g19
 sS'x'
-p24
-NsS'model'
 p25
+NsS'model'
+p26
 g9
 sS'typ'
-p26
+p27
 g19
 s.
\ No newline at end of file
diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js
index f4a8c7a4..ae05feb5 100644
--- a/js/Misc/RELATIONALOP.js
+++ b/js/Misc/RELATIONALOP.js
@@ -9,7 +9,7 @@ function RELATIONALOP() {
         this.model.out = new ScilabDouble([1]);
         this.model.ipar = new ScilabDouble(ipar);
         this.model.blocktype = new ScilabString(["c"]);
-        this.model.dep_ut = new ScilabDouble([true,false]);
+        this.model.dep_ut = new ScilabBoolean([true,false]);
         this.exprs = [[string(ipar)],[string(0)]];
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RELATIONALOP\",sz(1),sz(2));"]);
         this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
diff --git a/js/Misc/RELATIONALOP.pickle b/js/Misc/RELATIONALOP.pickle
index 4757e6e6..502f8553 100644
--- a/js/Misc/RELATIONALOP.pickle
+++ b/js/Misc/RELATIONALOP.pickle
@@ -36,7 +36,7 @@ sS'x.model'
 p6
 NsS'model.dep_ut'
 p7
-S'vector'
+S'vector_boolean'
 p8
 sS'zcr'
 p9
@@ -47,72 +47,73 @@ p11
 g10
 sS'out'
 p12
-g8
-sS'graphics.style'
+S'vector'
 p13
-g8
-sS'x.graphics'
+sS'graphics.style'
 p14
+g13
+sS'x.graphics'
+p15
 g2
 sS'typ'
-p15
-g8
-sS'label'
 p16
+g13
+sS'label'
+p17
 g5
 sS'model.sim'
-p17
-S'list'
 p18
-sS'model.nmode'
+S'list'
 p19
+sS'model.nmode'
+p20
 g10
 sS'in1'
-p20
-S'matrix'
 p21
-sS'model.in'
+S'matrix'
 p22
-g21
-sS'graphics.exprs'
+sS'model.in'
 p23
-g21
-sS'x.graphics.style'
+g22
+sS'graphics.exprs'
 p24
-g8
-sS'model.ipar'
+g22
+sS'x.graphics.style'
 p25
-g8
-sS'model.nzcross'
+g13
+sS'model.ipar'
 p26
+g13
+sS'model.nzcross'
+p27
 g10
 sS'ok'
-p27
-S'boolean'
 p28
-sS'model.blocktype'
+S'boolean'
 p29
+sS'model.blocktype'
+p30
 g5
 sS'rule'
-p30
+p31
 g10
 sS'exprs'
-p31
-g21
-sS'gr_i'
 p32
-g8
-sS'ipar'
+g22
+sS'gr_i'
 p33
-g8
-sS'y'
+g13
+sS'ipar'
 p34
-g8
-sS'x'
+g13
+sS'y'
 p35
-NsS'model'
+g13
+sS'x'
 p36
+NsS'model'
+p37
 g2
 sS'ot'
-p37
+p38
 Ns.
\ No newline at end of file
diff --git a/js/Misc/SPLIT_f.js b/js/Misc/SPLIT_f.js
index 77d5ec8a..03991e57 100644
--- a/js/Misc/SPLIT_f.js
+++ b/js/Misc/SPLIT_f.js
@@ -6,7 +6,7 @@ function SPLIT_f() {
         this.model.in = new ScilabDouble([-1]);
         this.model.out = new ScilabDouble([-1],[-1],[-1]);
         this.model.blocktype = new ScilabString(["c"]);
-        this.model.dep_ut = new ScilabDouble([true,false]);
+        this.model.dep_ut = new ScilabBoolean([true,false]);
         this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],[]);
         return new BasicBlock(this.x);
     }
diff --git a/js/Misc/SPLIT_f.pickle b/js/Misc/SPLIT_f.pickle
index efab595a..56d46243 100644
--- a/js/Misc/SPLIT_f.pickle
+++ b/js/Misc/SPLIT_f.pickle
@@ -24,7 +24,7 @@ p3
 g2
 sS'model.dep_ut'
 p4
-S'vector'
+S'vector_boolean'
 p5
 sS'model.out'
 p6
@@ -36,14 +36,15 @@ S'double'
 p9
 sS'y'
 p10
-g5
-sS'x'
+S'vector'
 p11
-NsS'model'
+sS'x'
 p12
-S'object'
+NsS'model'
 p13
-sS'typ'
+S'object'
 p14
-g5
+sS'typ'
+p15
+g11
 s.
\ No newline at end of file
diff --git a/js/Misc/SUPER_f.js b/js/Misc/SUPER_f.js
index 459fa92e..42ac935d 100644
--- a/js/Misc/SUPER_f.js
+++ b/js/Misc/SUPER_f.js
@@ -17,7 +17,7 @@ function SUPER_f() {
         this.model.out = new ScilabDouble([1]);
         this.model.rpar = new ScilabDouble([scs]);
         this.model.blocktype = new ScilabString(["h"]);
-        this.model.dep_ut = new ScilabDouble([false,false]);
+        this.model.dep_ut = new ScilabBoolean([false,false]);
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUPER_f\",sz(1),sz(2));"]);
         this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i);
         return new SuperBlock(this.x);
diff --git a/js/Misc/SUPER_f.pickle b/js/Misc/SUPER_f.pickle
index 79df2b86..49d8a34f 100644
--- a/js/Misc/SUPER_f.pickle
+++ b/js/Misc/SUPER_f.pickle
@@ -72,20 +72,21 @@ p21
 g6
 sS'model.dep_ut'
 p22
-g16
-sS'out.graphics.sz'
+S'vector_boolean'
 p23
+sS'out.graphics.sz'
+p24
 g16
 sS'gr_i'
-p24
+p25
 g16
 sS'y'
-p25
+p26
 g16
 sS'x'
-p26
+p27
 g16
 sS'model'
-p27
+p28
 g2
 s.
\ No newline at end of file
diff --git a/js/Misc/c_block.js b/js/Misc/c_block.js
index b59e7773..553a7e12 100644
--- a/js/Misc/c_block.js
+++ b/js/Misc/c_block.js
@@ -23,7 +23,7 @@ function c_block() {
         this.model.ipar = new ScilabDouble([0]);
         this.model.blocktype = new ScilabString([typ]);
         this.model.firing = new ScilabDouble(auto);
-        this.model.dep_ut = new ScilabDouble([true,false]);
+        this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = list([[sci2exp(in1)],[sci2exp(out)],[strcat(sci2exp(this.rpar))],[this.funam]],list([]));
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"c_block\",sz(1),sz(2));"]);
         this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i);
diff --git a/js/Misc/c_block.pickle b/js/Misc/c_block.pickle
index 7f3ad20d..13466587 100644
--- a/js/Misc/c_block.pickle
+++ b/js/Misc/c_block.pickle
@@ -50,100 +50,101 @@ p10
 g5
 sS'model.dep_ut'
 p11
-g3
-sS'funam'
+S'vector_boolean'
 p12
-S'string'
+sS'funam'
 p13
-sS'out'
+S'string'
 p14
+sS'out'
+p15
 g9
 sS'ni'
-p15
+p16
 g9
 sS'clkin'
-p16
+p17
 g3
 sS'x.graphics'
-p17
+p18
 g5
 sS'z0'
-p18
+p19
 g3
 sS'tt'
-p19
+p20
 g3
 sS'label'
-p20
-S'list'
 p21
-sS'model.evtin'
+S'list'
 p22
+sS'model.evtin'
+p23
 g3
 sS'model.firing'
-p23
+p24
 g3
 sS'model.sim'
-p24
-g21
-sS'model.evtout'
 p25
+g22
+sS'model.evtout'
+p26
 g3
 sS'clkout'
-p26
+p27
 g3
 sS'auto'
-p27
+p28
 g3
 sS'label[2-1]'
-p28
+p29
 g3
 sS'in1'
-p29
+p30
 g9
 sS'model.rpar'
-p30
+p31
 g3
 sS'model.state'
-p31
+p32
 g3
 sS'model.in'
-p32
+p33
 g9
 sS'graphics.exprs'
-p33
-NsS'x0'
 p34
+NsS'x0'
+p35
 g3
 sS'model.ipar'
-p35
+p36
 g9
 sS'typ'
-p36
-g13
-sS'model.blocktype'
 p37
-g13
-sS'i'
+g14
+sS'model.blocktype'
 p38
+g14
+sS'i'
+p39
 g9
 sS'model.sim[1-1]'
-p39
-NsS'no'
 p40
+NsS'no'
+p41
 g9
 sS'o'
-p41
+p42
 g9
 sS'gr_i'
-p42
+p43
 g3
 sS'y'
-p43
+p44
 g3
 sS'x'
-p44
-NsS'model'
 p45
+NsS'model'
+p46
 g5
 s.
\ No newline at end of file
diff --git a/js/Misc/fortran_block.js b/js/Misc/fortran_block.js
index 967e4c44..7b7c2e6e 100644
--- a/js/Misc/fortran_block.js
+++ b/js/Misc/fortran_block.js
@@ -13,7 +13,7 @@ function fortran_block() {
         this.model.ipar = new ScilabDouble([0]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.firing = new ScilabDouble([]);
-        this.model.dep_ut = new ScilabDouble([true,false]);
+        this.model.dep_ut = new ScilabBoolean([true,false]);
         this.funam = "forty";
         var label = list([[sci2exp(this.model.in)],[sci2exp(this.model.out)],[strcat(sci2exp(this.model.rpar))],[this.funam]],list([]));
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"fortran_block\",sz(1),sz(2));"]);
diff --git a/js/Misc/fortran_block.pickle b/js/Misc/fortran_block.pickle
index ae20469d..46dede38 100644
--- a/js/Misc/fortran_block.pickle
+++ b/js/Misc/fortran_block.pickle
@@ -50,79 +50,80 @@ p10
 g5
 sS'model.dep_ut'
 p11
-g3
-sS'model.out'
+S'vector_boolean'
 p12
-S'double'
+sS'model.out'
 p13
-sS'ni'
+S'double'
 p14
-g13
-sS'x.graphics'
+sS'ni'
 p15
+g14
+sS'x.graphics'
+p16
 g5
 sS'tt'
-p16
+p17
 g3
 sS'label'
-p17
-S'list'
 p18
-sS'model.evtin'
+S'list'
 p19
+sS'model.evtin'
+p20
 g3
 sS'model.firing'
-p20
+p21
 g3
 sS'model.sim'
-p21
-g18
-sS'model.evtout'
 p22
+g19
+sS'model.evtout'
+p23
 g3
 sS'label[2-1]'
-p23
+p24
 g3
 sS'model.rpar'
-p24
+p25
 g3
 sS'model.state'
-p25
+p26
 g3
 sS'model.in'
-p26
-g13
-sS'graphics.exprs'
 p27
-NsS'model.ipar'
+g14
+sS'graphics.exprs'
 p28
-g13
-sS'typ'
+NsS'model.ipar'
 p29
+g14
+sS'typ'
+p30
 g3
 sS'model.blocktype'
-p30
+p31
 g9
 sS'i'
-p31
-g13
-sS'model.sim[1-1]'
 p32
-NsS'no'
+g14
+sS'model.sim[1-1]'
 p33
-g13
-sS'o'
+NsS'no'
 p34
-g13
-sS'gr_i'
+g14
+sS'o'
 p35
+g14
+sS'gr_i'
+p36
 g3
 sS'y'
-p36
+p37
 g3
 sS'x'
-p37
-NsS'model'
 p38
+NsS'model'
+p39
 g5
 s.
\ No newline at end of file
diff --git a/js/Misc/func_block.js b/js/Misc/func_block.js
index 2f3e5b02..54bc297f 100644
--- a/js/Misc/func_block.js
+++ b/js/Misc/func_block.js
@@ -6,7 +6,7 @@ function func_block() {
         this.model.in = new ScilabDouble([1]);
         this.model.out = new ScilabDouble([1]);
         this.model.blocktype = new ScilabString(["c"]);
-        this.model.dep_ut = new ScilabDouble([true,false]);
+        this.model.dep_ut = new ScilabBoolean([true,false]);
         this.exprs = "v=sin(u);y=u*v";
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"func_block\",sz(1),sz(2));"]);
         this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
diff --git a/js/Misc/func_block.pickle b/js/Misc/func_block.pickle
index e1643722..319aa2a4 100644
--- a/js/Misc/func_block.pickle
+++ b/js/Misc/func_block.pickle
@@ -37,7 +37,7 @@ sS'graphics.exprs'
 p9
 NsS'model.dep_ut'
 p10
-S'vector'
+S'vector_boolean'
 p11
 sS'exprs'
 p12
@@ -46,23 +46,24 @@ sS'x.model'
 p13
 NsS'gr_i'
 p14
-g11
-sS'model.in'
+S'vector'
 p15
+sS'model.in'
+p16
 g4
 sS'graphics'
-p16
+p17
 g7
 sS'y'
-p17
-g11
-sS'x'
 p18
+g15
+sS'x'
+p19
 g7
 sS'model'
-p19
+p20
 g7
 sS'typ'
-p20
-g11
+p21
+g15
 s.
\ No newline at end of file
diff --git a/js/Misc/generic_block.js b/js/Misc/generic_block.js
index 0fdb51e9..e6e9b94d 100644
--- a/js/Misc/generic_block.js
+++ b/js/Misc/generic_block.js
@@ -15,7 +15,7 @@ function generic_block() {
         this.model.ipar = new ScilabDouble([]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.firing = new ScilabDouble([]);
-        this.model.dep_ut = new ScilabDouble([true,false]);
+        this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.firing)],["y"],["n"]];
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block\",sz(1),sz(2));"]);
         this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i);
@@ -116,7 +116,7 @@ function generic_block() {
                 this.model.rpar = new ScilabDouble(this.rpar);
                 this.model.ipar = new ScilabDouble([this.ipar]);
                 this.model.firing = new ScilabDouble([this.auto0]);
-                this.model.dep_ut = new ScilabDouble(dep_ut);
+                this.model.dep_ut = new ScilabBoolean(dep_ut);
                 this.graphics.exprs = new ScilabDouble([label]);
                 break;
             }
diff --git a/js/Misc/generic_block.pickle b/js/Misc/generic_block.pickle
index 849d6c9d..513f1e77 100644
--- a/js/Misc/generic_block.pickle
+++ b/js/Misc/generic_block.pickle
@@ -68,101 +68,102 @@ p10
 g2
 sS'model.dep_ut'
 p11
-g8
-sS'model.out'
+S'vector_boolean'
 p12
+sS'model.out'
+p13
 g2
 sS'model.dstate'
-p13
+p14
 g8
 sS'label'
-p14
-S'matrix'
 p15
-sS'model.evtin'
+S'matrix'
 p16
+sS'model.evtin'
+p17
 g8
 sS'model.firing'
-p17
+p18
 g8
 sS'function_name'
-p18
-S'string'
 p19
-sS'model.sim'
+S'string'
 p20
-S'list'
+sS'model.sim'
 p21
-sS'model.evtout'
+S'list'
 p22
+sS'model.evtout'
+p23
 g8
 sS'arg1.graphics'
-p23
+p24
 g5
 sS'model.rpar'
-p24
+p25
 g8
 sS'model.state'
-p25
+p26
 g8
 sS'model.in'
-p26
+p27
 g2
 sS'graphics'
-p27
+p28
 g5
 sS'model.ipar'
-p28
+p29
 g8
 sS'typ'
-p29
+p30
 g8
 sS'needcompile'
-p30
+p31
 g2
 sS'arg1.model'
-p31
-NsS'label[9-1]'
 p32
+NsS'label[9-1]'
+p33
 g8
 sS'ok'
-p33
-S'boolean'
 p34
-sS'model.blocktype'
+S'boolean'
 p35
-g19
-sS'i'
+sS'model.blocktype'
 p36
+g20
+sS'i'
+p37
 g2
 sS'o'
-p37
+p38
 g2
 sS'depu'
-p38
-g34
-sS'dept'
 p39
-g34
-sS'gr_i'
+g35
+sS'dept'
 p40
+g35
+sS'gr_i'
+p41
 g8
 sS'ipar'
-p41
+p42
 g2
 sS'y'
-p42
+p43
 g8
 sS'x'
-p43
+p44
 g5
 sS'model'
-p44
+p45
 g5
 sS'z'
-p45
-g8
-sS'dep_ut'
 p46
 g8
+sS'dep_ut'
+p47
+g12
 s.
\ No newline at end of file
diff --git a/js/Misc/generic_block2.js b/js/Misc/generic_block2.js
index 2c6a2465..4803ee3b 100644
--- a/js/Misc/generic_block2.js
+++ b/js/Misc/generic_block2.js
@@ -15,7 +15,7 @@ function generic_block2() {
         this.model.ipar = new ScilabDouble([]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.firing = new ScilabDouble([]);
-        this.model.dep_ut = new ScilabDouble([true,false]);
+        this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]];
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block2\",sz(1),sz(2));"]);
         this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i);
@@ -122,7 +122,7 @@ function generic_block2() {
                 this.model.firing = new ScilabDouble([this.auto0]);
                 this.model.nzcross = new ScilabDouble([this.nzcr]);
                 this.model.nmode = new ScilabDouble([this.nmode]);
-                this.model.dep_ut = new ScilabDouble(dep_ut);
+                this.model.dep_ut = new ScilabBoolean(dep_ut);
                 this.graphics.exprs = new ScilabDouble([label]);
                 break;
             }
diff --git a/js/Misc/generic_block2.pickle b/js/Misc/generic_block2.pickle
index 319e7b7a..bb97a8e9 100644
--- a/js/Misc/generic_block2.pickle
+++ b/js/Misc/generic_block2.pickle
@@ -72,105 +72,106 @@ p10
 g2
 sS'model.dep_ut'
 p11
-g8
-sS'model.out'
+S'vector_boolean'
 p12
+sS'model.out'
+p13
 g2
 sS'model.dstate'
-p13
+p14
 g8
 sS'model.nzcross'
-p14
-NsS'label'
 p15
-S'matrix'
+NsS'label'
 p16
-sS'model.evtin'
+S'matrix'
 p17
+sS'model.evtin'
+p18
 g8
 sS'model.firing'
-p18
+p19
 g8
 sS'function_name'
-p19
-S'string'
 p20
-sS'model.sim'
+S'string'
 p21
-S'list'
+sS'model.sim'
 p22
-sS'model.evtout'
+S'list'
 p23
+sS'model.evtout'
+p24
 g8
 sS'arg1.graphics'
-p24
+p25
 g5
 sS'model.nmode'
-p25
-NsS'model.rpar'
 p26
+NsS'model.rpar'
+p27
 g8
 sS'model.state'
-p27
+p28
 g8
 sS'model.in'
-p28
+p29
 g2
 sS'graphics'
-p29
+p30
 g5
 sS'model.ipar'
-p30
+p31
 g8
 sS'typ'
-p31
+p32
 g8
 sS'needcompile'
-p32
+p33
 g2
 sS'arg1.model'
-p33
-NsS'label[9-1]'
 p34
+NsS'label[9-1]'
+p35
 g8
 sS'ok'
-p35
-S'boolean'
 p36
-sS'model.blocktype'
+S'boolean'
 p37
-g20
-sS'i'
+sS'model.blocktype'
 p38
+g21
+sS'i'
+p39
 g2
 sS'o'
-p39
+p40
 g2
 sS'depu'
-p40
-g36
-sS'dept'
 p41
-g36
-sS'gr_i'
+g37
+sS'dept'
 p42
+g37
+sS'gr_i'
+p43
 g8
 sS'ipar'
-p43
+p44
 g2
 sS'y'
-p44
+p45
 g8
 sS'x'
-p45
+p46
 g5
 sS'model'
-p46
+p47
 g5
 sS'z'
-p47
-g8
-sS'dep_ut'
 p48
 g8
+sS'dep_ut'
+p49
+g12
 s.
\ No newline at end of file
diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js
index 7069e702..ce288c44 100644
--- a/js/Misc/generic_block3.js
+++ b/js/Misc/generic_block3.js
@@ -11,7 +11,7 @@ function generic_block3() {
         this.model.out = new ScilabDouble([1]);
         this.model.out2 = new ScilabDouble([1]);
         this.model.outtyp = new ScilabDouble([1]);
-        this.model.dep_ut = new ScilabDouble([true,false]);
+        this.model.dep_ut = new ScilabBoolean([true,false]);
         var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp([this.model.in,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2]),sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]];
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block3\",sz(1),sz(2));"]);
         this.x = new standard_define(new ScilabDouble([4,2]),this.model,label,this.gr_i);
@@ -134,7 +134,7 @@ function generic_block3() {
                 this.model.firing = new ScilabDouble([this.auto0]);
                 this.model.nzcross = new ScilabDouble([this.nzcr]);
                 this.model.nmode = new ScilabDouble([this.nmode]);
-                this.model.dep_ut = new ScilabDouble(dep_ut);
+                this.model.dep_ut = new ScilabBoolean(dep_ut);
                 this.graphics.exprs = new ScilabDouble([label]);
                 break;
             }
diff --git a/js/Misc/generic_block3.pickle b/js/Misc/generic_block3.pickle
index c5385ec3..fd3f0643 100644
--- a/js/Misc/generic_block3.pickle
+++ b/js/Misc/generic_block3.pickle
@@ -155,32 +155,33 @@ S'boolean'
 p39
 sS'model.dep_ut'
 p40
-g9
-sS'depu'
+S'vector_boolean'
 p41
+sS'depu'
+p42
 g39
 sS'dept'
-p42
+p43
 g39
 sS'gr_i'
-p43
+p44
 g9
 sS'ipar'
-p44
+p45
 g3
 sS'y'
-p45
+p46
 g9
 sS'x'
-p46
+p47
 g6
 sS'model'
-p47
+p48
 g6
 sS'z'
-p48
-g9
-sS'dep_ut'
 p49
 g9
+sS'dep_ut'
+p50
+g41
 s.
\ No newline at end of file
diff --git a/js/Misc/scifunc_block.js b/js/Misc/scifunc_block.js
index 78a820fb..f3d4ae44 100644
--- a/js/Misc/scifunc_block.js
+++ b/js/Misc/scifunc_block.js
@@ -23,7 +23,7 @@ function scifunc_block() {
         this.model.opar = list();
         this.model.blocktype = new ScilabString([typ]);
         this.model.firing = new ScilabDouble(auto);
-        this.model.dep_ut = new ScilabDouble([true,false]);
+        this.model.dep_ut = new ScilabBoolean([true,false]);
         this.exprs = list([[sci2exp(in1)],[sci2exp(out)],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(this.rpar))],[sci2exp(auto)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," "));
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"scifunc_block\",sz(1),sz(2));"]);
         this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
diff --git a/js/Misc/scifunc_block.pickle b/js/Misc/scifunc_block.pickle
index a978a296..a210afd7 100644
--- a/js/Misc/scifunc_block.pickle
+++ b/js/Misc/scifunc_block.pickle
@@ -60,125 +60,126 @@ p10
 g9
 sS'model.dep_ut'
 p11
-g9
-sS'model.out'
+S'vector_boolean'
 p12
+sS'model.out'
+p13
 g3
 sS'model.dstate'
-p13
+p14
 g9
 sS'out'
-p14
+p15
 g3
 sS'ni'
-p15
+p16
 g3
 sS'model.ipar'
-p16
+p17
 g3
 sS'clkin'
-p17
+p18
 g9
 sS'dep_ut[2-1]'
-p18
-S'boolean'
 p19
-sS'no'
+S'boolean'
 p20
+sS'no'
+p21
 g3
 sS'z0'
-p21
+p22
 g9
 sS'auto'
-p22
+p23
 g9
 sS'model.evtin'
-p23
+p24
 g9
 sS'exprs[2-1]'
-p24
-NsS'model.firing'
 p25
+NsS'model.firing'
+p26
 g9
 sS'model.sim'
-p26
-S'list'
 p27
-sS'model.evtout'
+S'list'
 p28
+sS'model.evtout'
+p29
 g9
 sS'clkout'
-p29
+p30
 g9
 sS'exprs[1-1][9-1]'
-p30
-S'string'
 p31
-sS'in1'
+S'string'
 p32
+sS'in1'
+p33
 g3
 sS'model.rpar'
-p33
+p34
 g9
 sS'nci'
-p34
+p35
 g3
 sS'model.state'
-p35
+p36
 g9
 sS'model.in'
-p36
+p37
 g3
 sS'nco'
-p37
+p38
 g3
 sS'x0'
-p38
+p39
 g9
 sS'nrp'
-p39
+p40
 g3
 sS'typ'
-p40
-g31
-sS'model.opar'
 p41
-g27
-sS'needcompile'
+g32
+sS'model.opar'
 p42
+g28
+sS'needcompile'
+p43
 g3
 sS'model.blocktype'
-p43
-g31
-sS'i'
 p44
+g32
+sS'i'
+p45
 g3
 sS'x.graphics'
-p45
+p46
 g6
 sS'x.model'
-p46
+p47
 g6
 sS'o'
-p47
+p48
 g3
 sS'exprs'
-p48
-g27
-sS'gr_i'
 p49
+g28
+sS'gr_i'
+p50
 g9
 sS'graphics.exprs'
-p50
-NsS'y'
 p51
+NsS'y'
+p52
 g9
 sS'x'
-p52
-NsS'model'
 p53
+NsS'model'
+p54
 g6
 sS'z'
-p54
+p55
 g9
 s.
\ No newline at end of file
diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js
index 81aa97da..1933c3b0 100644
--- a/js/Misc/scifunc_block_m.js
+++ b/js/Misc/scifunc_block_m.js
@@ -28,7 +28,7 @@ function scifunc_block_m() {
         this.model.opar = list();
         this.model.blocktype = new ScilabString([typ]);
         this.model.firing = new ScilabDouble(auto);
-        this.model.dep_ut = new ScilabDouble([true,false]);
+        this.model.dep_ut = new ScilabBoolean([true,false]);
         this.exprs = list([[sci2exp([in1,in1])],[sci2exp([out,out])],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(this.rpar))],[sci2exp(auto)],[sci2exp(0)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," "));
         this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"scifunc_block_m\",sz(1),sz(2));"]);
         this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i);
diff --git a/js/Misc/scifunc_block_m.pickle b/js/Misc/scifunc_block_m.pickle
index 4d8da05c..fcb53d49 100644
--- a/js/Misc/scifunc_block_m.pickle
+++ b/js/Misc/scifunc_block_m.pickle
@@ -170,24 +170,25 @@ p49
 g6
 sS'model.dep_ut'
 p50
-g10
-sS'exprs'
+S'vector_boolean'
 p51
+sS'exprs'
+p52
 g27
 sS'gr_i'
-p52
+p53
 g10
 sS'graphics.exprs'
-p53
-NsS'y'
 p54
+NsS'y'
+p55
 g10
 sS'x'
-p55
-NsS'model'
 p56
+NsS'model'
+p57
 g6
 sS'ot'
-p57
+p58
 g3
 s.
\ No newline at end of file