change in1 to in

52 files changed, 458 insertions, 539 deletions

diff --git a/js/Branching/CLKFROM.js b/js/Branching/CLKFROM.js
index a43ecbc0..eee27067 100644
--- a/js/Branching/CLKFROM.js
+++ b/js/Branching/CLKFROM.js
@@ -24,9 +24,6 @@ function CLKFROM() {
     CLKFROM.prototype.set = function CLKFROM() {
         this.tag = arguments[0]["tag"]
         this.exprs = arguments[0]["exprs"]
-        this.x = arg1;
-        this.graphics = arg1.graphics;
-        this.model = arg1.model;
         this.exprs = this.graphics.exprs;
         while (true) {
             [ok,this.tag,this.exprs] = scicos_getvalue("Set block parameters","Tag",list("str",-1),this.exprs);
diff --git a/js/Branching/CLKGOTO.js b/js/Branching/CLKGOTO.js
index cc21a9a0..d6305f03 100644
--- a/js/Branching/CLKGOTO.js
+++ b/js/Branching/CLKGOTO.js
@@ -28,9 +28,6 @@ function CLKGOTO() {
         this.tag = arguments[0]["tag"]
         this.tagvis = parseFloat(arguments[0]["tagvis"])
         this.exprs = arguments[0]["exprs"]
-        this.x = arg1;
-        this.graphics = arg1.graphics;
-        this.model = arg1.model;
         this.exprs = this.graphics.exprs;
         while (true) {
             [ok,this.tag,this.tagvis,this.exprs] = scicos_getvalue("Set block parameters",["Tag","Tag Visibility (1=Local 2=Scoped 3=Global)"],list("str",-1,"vec",1),this.exprs);
diff --git a/js/Branching/CLKGotoTagVisibility.js b/js/Branching/CLKGotoTagVisibility.js
index 4ab4da7c..cc46d52d 100644
--- a/js/Branching/CLKGotoTagVisibility.js
+++ b/js/Branching/CLKGotoTagVisibility.js
@@ -3,7 +3,7 @@ function CLKGotoTagVisibility() {
     CLKGotoTagVisibility.prototype.define = function CLKGotoTagVisibility() {
         this.model = scicos_model();
         this.model.sim = new ScilabString(["clkgototagvisibility"]);
-        this.model.in1 = new ScilabDouble([]);
+        this.model.in = new ScilabDouble([]);
         this.model.in2 = new ScilabDouble([]);
         this.model.out = new ScilabDouble([]);
         this.model.out2 = new ScilabDouble([]);
@@ -31,10 +31,7 @@ function CLKGotoTagVisibility() {
     CLKGotoTagVisibility.prototype.set = function CLKGotoTagVisibility() {
         this.tag = arguments[0]["tag"]
         this.exprs = arguments[0]["exprs"]
-        this.x = arg1;
-        this.graphics = arg1.graphics;
         this.exprs = this.graphics.exprs;
-        this.model = arg1.model;
         while (true) {
             [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),this.exprs);
             if (!ok) {
diff --git a/js/Branching/CLKGotoTagVisibility.pickle b/js/Branching/CLKGotoTagVisibility.pickle
index 918f1bf7..e383d22b 100644
--- a/js/Branching/CLKGotoTagVisibility.pickle
+++ b/js/Branching/CLKGotoTagVisibility.pickle
@@ -34,33 +34,33 @@ p6
 sS'model.in2'
 p7
 g6
-sS'model.in1'
+sS'model.intyp'
 p8
-g6
-sS'x.graphics'
+S'double'
 p9
+sS'x.graphics'
+p10
 g2
 sS'model.evtin'
-p10
+p11
 g6
 sS'model.firing'
-p11
-S'boolean'
 p12
-sS'model.sim'
+S'boolean'
 p13
-S'string'
+sS'model.sim'
 p14
-sS'model.out2'
+S'string'
 p15
-g6
-sS'model.intyp'
+sS'model.out2'
 p16
-S'double'
-p17
+g6
 sS'y'
+p17
+g9
+sS'model.in'
 p18
-g17
+g6
 sS'graphics.exprs'
 p19
 NsS'typ'
@@ -72,25 +72,25 @@ S'list'
 p22
 sS'needcompile'
 p23
-g17
+g9
 sS'model.blocktype'
 p24
-g14
+g15
 sS'model.dep_ut'
 p25
 g6
 sS'exprs'
 p26
-g14
+g15
 sS'gr_i'
 p27
 g6
 sS'model.outtyp'
 p28
-g17
+g9
 sS'x'
 p29
-g17
+g9
 sS'model'
 p30
 g2
diff --git a/js/Branching/DEMUX.js b/js/Branching/DEMUX.js
index ed544002..c4866c99 100644
--- a/js/Branching/DEMUX.js
+++ b/js/Branching/DEMUX.js
@@ -4,7 +4,7 @@ function DEMUX() {
         this.out = 2;
         this.model = scicos_model();
         this.model.sim = list(new ScilabString(["multiplex"]), new ScilabDouble([4]));
-        this.model.in1 = new ScilabDouble([0]);
+        this.model.in = new ScilabDouble([0]);
         this.model.out = new ScilabDouble(-transpose([1:this.out]));
         this.model.ipar = new ScilabDouble([this.out]);
         this.model.blocktype = new ScilabString(["c"]);
@@ -27,10 +27,7 @@ function DEMUX() {
     DEMUX.prototype.set = function DEMUX() {
         this.out = parseFloat(arguments[0]["out"])
         this.exprs = arguments[0]["exprs"]
-        this.x = arg1;
-        this.graphics = arg1.graphics;
         this.exprs = this.graphics.exprs;
-        this.model = arg1.model;
         while (true) {
             [ok,this.out,this.exprs] = scicos_getvalue("Set DEMUX block parameters",["number of output ports or vector of sizes"],list("intvec",-1),this.exprs);
             if (!ok) {
diff --git a/js/Branching/DEMUX.pickle b/js/Branching/DEMUX.pickle
index a3fa5b85..c684bb7b 100644
--- a/js/Branching/DEMUX.pickle
+++ b/js/Branching/DEMUX.pickle
@@ -21,9 +21,9 @@ S'model.sim'
 p1
 S'list'
 p2
-sS'model.in1'
+sS'model.out'
 p3
-S'double'
+S'vector'
 p4
 sS'ok'
 p5
@@ -44,11 +44,11 @@ sS'graphics.exprs'
 p12
 NsS'nin'
 p13
-g4
-sS'model.out'
+S'double'
 p14
-S'vector'
+sS'model.dep_ut'
 p15
+g4
 sS'exprs'
 p16
 g8
@@ -56,32 +56,32 @@ sS'x.model'
 p17
 NsS'gr_i'
 p18
-g15
-sS'model.dep_ut'
+g4
+sS'model.in'
 p19
-g15
+g14
 sS'graphics'
 p20
 g10
 sS'y'
 p21
-g15
+g4
 sS'x'
 p22
-g4
+g14
 sS'model'
 p23
 g10
 sS'model.ipar'
 p24
-g4
+g14
 sS'typ'
 p25
-g15
+g4
 sS'model.firing'
 p26
-g15
+g4
 sS'out'
 p27
-g4
+g14
 s.
\ No newline at end of file
diff --git a/js/Branching/DEMUX_f.js b/js/Branching/DEMUX_f.js
index 94182b06..d25f36d4 100644
--- a/js/Branching/DEMUX_f.js
+++ b/js/Branching/DEMUX_f.js
@@ -4,7 +4,7 @@ function DEMUX_f() {
         this.out = 2;
         this.model = scicos_model();
         this.model.sim = list(new ScilabString(["demux"]), new ScilabDouble([1]));
-        this.model.in1 = new ScilabDouble([0]);
+        this.model.in = new ScilabDouble([0]);
         this.model.out = new ScilabDouble(-transpose([1:this.out]));
         this.model.ipar = new ScilabDouble([this.out]);
         this.model.blocktype = new ScilabString(["c"]);
@@ -27,10 +27,7 @@ function DEMUX_f() {
     DEMUX_f.prototype.set = function DEMUX_f() {
         this.out = parseFloat(arguments[0]["out"])
         this.exprs = arguments[0]["exprs"]
-        this.x = arg1;
-        this.graphics = arg1.graphics;
         this.exprs = this.graphics.exprs;
-        this.model = arg1.model;
         while (true) {
             [ok,this.out,this.exprs] = scicos_getvalue("Set DEMUX block parameters",["number of output ports or vector of sizes"],list("vec",-1),this.exprs);
             if (!ok) {
diff --git a/js/Branching/DEMUX_f.pickle b/js/Branching/DEMUX_f.pickle
index a3fa5b85..c684bb7b 100644
--- a/js/Branching/DEMUX_f.pickle
+++ b/js/Branching/DEMUX_f.pickle
@@ -21,9 +21,9 @@ S'model.sim'
 p1
 S'list'
 p2
-sS'model.in1'
+sS'model.out'
 p3
-S'double'
+S'vector'
 p4
 sS'ok'
 p5
@@ -44,11 +44,11 @@ sS'graphics.exprs'
 p12
 NsS'nin'
 p13
-g4
-sS'model.out'
+S'double'
 p14
-S'vector'
+sS'model.dep_ut'
 p15
+g4
 sS'exprs'
 p16
 g8
@@ -56,32 +56,32 @@ sS'x.model'
 p17
 NsS'gr_i'
 p18
-g15
-sS'model.dep_ut'
+g4
+sS'model.in'
 p19
-g15
+g14
 sS'graphics'
 p20
 g10
 sS'y'
 p21
-g15
+g4
 sS'x'
 p22
-g4
+g14
 sS'model'
 p23
 g10
 sS'model.ipar'
 p24
-g4
+g14
 sS'typ'
 p25
-g15
+g4
 sS'model.firing'
 p26
-g15
+g4
 sS'out'
 p27
-g4
+g14
 s.
\ No newline at end of file
diff --git a/js/Branching/ESELECT_f.js b/js/Branching/ESELECT_f.js
index 7c45d10a..60d88fe9 100644
--- a/js/Branching/ESELECT_f.js
+++ b/js/Branching/ESELECT_f.js
@@ -4,7 +4,7 @@ function ESELECT_f() {
         this.out = 2;
         this.model = scicos_model();
         this.model.sim = list(new ScilabString(["eselect"]), new ScilabDouble([-2]));
-        this.model.in1 = new ScilabDouble([1]);
+        this.model.in = new ScilabDouble([1]);
         this.model.in2 = new ScilabDouble([1]);
         this.model.intyp = new ScilabDouble([-1]);
         this.model.evtin = new ScilabDouble([1]);
@@ -35,8 +35,6 @@ function ESELECT_f() {
         this.inh = parseFloat(arguments[0]["inh"])
         this.nmod = parseFloat(arguments[0]["nmod"])
         this.exprs = arguments[0]["exprs"]
-        this.x = arg1;
-        this.graphics = arg1.graphics;
         this.exprs = this.graphics.exprs;
         if (size(this.exprs,"*")==1) {
             this.exprs[2-1] = string(1);
@@ -44,7 +42,6 @@ function ESELECT_f() {
         if (size(this.exprs,"*")==2) {
             this.exprs[3-1] = string(0);
         }
-        this.model = arg1.model;
         while (true) {
             [ok,this.out,this.inh,this.nmod,this.exprs] = scicos_getvalue("Set ESELECT block parameters",["number of output event ports","Inherit (1: no, 0: yes)","zero-crossing (0: no, 1: yes)"],list("vec",1,"vec",1,"vec",1),this.exprs);
             if (!ok) {
diff --git a/js/Branching/ESELECT_f.pickle b/js/Branching/ESELECT_f.pickle
index 9e105914..2e30dbad 100644
--- a/js/Branching/ESELECT_f.pickle
+++ b/js/Branching/ESELECT_f.pickle
@@ -30,55 +30,55 @@ p3
 g2
 sS'x.model'
 p4
-NsS'model.intyp'
+NsS'inh'
 p5
 S'double'
 p6
-sS'inh'
-p7
-g6
 sS'model.dep_ut'
-p8
+p7
 S'vector'
-p9
+p8
 sS'out'
-p10
+p9
 g6
 sS'model.in2'
-p11
+p10
 g6
-sS'model.in1'
-p12
+sS'model.intyp'
+p11
 g6
 sS'x.graphics'
-p13
+p12
 g2
 sS'typ'
-p14
-g9
+p13
+g8
 sS'model.evtin'
-p15
+p14
 g6
 sS'exprs[2-1]'
-p16
+p15
 S'string'
-p17
+p16
 sS'model.firing'
-p18
+p17
 g6
 sS'model.sim'
-p19
+p18
 S'list'
-p20
+p19
 sS'model.evtout'
-p21
+p20
 g6
 sS'model.nmode'
-p22
+p21
 g6
 sS'exprs[3-1]'
+p22
+g16
+sS'model.in'
 p23
-g17
+g6
 sS'graphics.exprs'
 p24
 NsS'model.nzcross'
@@ -86,7 +86,7 @@ p25
 g6
 sS'model.blocktype'
 p26
-g17
+g16
 sS'nmod'
 p27
 g6
@@ -96,10 +96,10 @@ S'matrix'
 p29
 sS'gr_i'
 p30
-g9
+g8
 sS'y'
 p31
-g9
+g8
 sS'x'
 p32
 g6
diff --git a/js/Branching/EXTRACTOR.js b/js/Branching/EXTRACTOR.js
index 8134914a..7dcc7136 100644
--- a/js/Branching/EXTRACTOR.js
+++ b/js/Branching/EXTRACTOR.js
@@ -4,7 +4,7 @@ function EXTRACTOR() {
         this.ind = 1;
         this.model = scicos_model();
         this.model.sim = list(new ScilabString(["extractor"]), new ScilabDouble([4]));
-        this.model.in1 = new ScilabDouble([-1]);
+        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]);
@@ -26,10 +26,7 @@ function EXTRACTOR() {
     EXTRACTOR.prototype.set = function EXTRACTOR() {
         this.ind = parseFloat(arguments[0]["ind"])
         this.exprs = arguments[0]["exprs"]
-        this.x = arg1;
-        this.graphics = arg1.graphics;
         this.exprs = this.graphics.exprs;
-        this.model = arg1.model;
         while (true) {
             [ok,this.ind,this.exprs] = scicos_getvalue("Set block parameters",["indices to extract"],list("vec",-1),this.exprs);
             if (!ok) {
diff --git a/js/Branching/EXTRACTOR.pickle b/js/Branching/EXTRACTOR.pickle
index 8e0402fe..3e7ca0b1 100644
--- a/js/Branching/EXTRACTOR.pickle
+++ b/js/Branching/EXTRACTOR.pickle
@@ -21,7 +21,7 @@ S'model.sim'
 p1
 S'list'
 p2
-sS'model.in1'
+sS'model.out'
 p3
 S'double'
 p4
@@ -40,28 +40,28 @@ sS'graphics.exprs'
 p10
 NsS'x.model'
 p11
-NsS'model.out'
+NsS'model.dep_ut'
 p12
-g4
-sS'exprs'
-p13
 S'vector'
+p13
+sS'exprs'
 p14
+g13
 sS'ind'
 p15
 g4
 sS'gr_i'
 p16
-g14
-sS'model.dep_ut'
+g13
+sS'model.in'
 p17
-g14
+g4
 sS'graphics'
 p18
 g8
 sS'y'
 p19
-g14
+g13
 sS'x'
 p20
 g4
@@ -73,5 +73,5 @@ p22
 g4
 sS'typ'
 p23
-g14
+g13
 s.
\ No newline at end of file
diff --git a/js/Branching/FROM.js b/js/Branching/FROM.js
index 9c13d8c9..01d9188f 100644
--- a/js/Branching/FROM.js
+++ b/js/Branching/FROM.js
@@ -3,7 +3,7 @@ function FROM() {
     FROM.prototype.define = function FROM() {
         this.model = scicos_model();
         this.model.sim = new ScilabString(["from"]);
-        this.model.in1 = new ScilabDouble([]);
+        this.model.in = new ScilabDouble([]);
         this.model.in2 = new ScilabDouble([]);
         this.model.intyp = new ScilabDouble([1]);
         this.model.out = new ScilabDouble([-1]);
@@ -31,10 +31,7 @@ function FROM() {
     FROM.prototype.set = function FROM() {
         this.tag = arguments[0]["tag"]
         this.exprs = arguments[0]["exprs"]
-        this.x = arg1;
-        this.graphics = arg1.graphics;
         this.exprs = this.graphics.exprs;
-        this.model = arg1.model;
         while (true) {
             [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["Tag"],list("str",-1),this.exprs);
             if (!ok) {
diff --git a/js/Branching/FROM.pickle b/js/Branching/FROM.pickle
index b1d966d0..9ddcfaaf 100644
--- a/js/Branching/FROM.pickle
+++ b/js/Branching/FROM.pickle
@@ -35,9 +35,9 @@ sS'model.in2'
 p7
 S'vector'
 p8
-sS'model.in1'
+sS'model.intyp'
 p9
-g8
+g6
 sS'x.graphics'
 p10
 g2
@@ -48,12 +48,12 @@ p12
 sS'model.out2'
 p13
 g6
-sS'model.intyp'
+sS'y'
 p14
 g6
-sS'y'
+sS'model.in'
 p15
-g6
+g8
 sS'graphics.exprs'
 p16
 NsS'model.ipar'
diff --git a/js/Branching/FROMMO.js b/js/Branching/FROMMO.js
index 207c71da..b46464b5 100644
--- a/js/Branching/FROMMO.js
+++ b/js/Branching/FROMMO.js
@@ -3,7 +3,7 @@ function FROMMO() {
     FROMMO.prototype.define = function FROMMO() {
         this.model = scicos_model();
         this.model.sim = new ScilabString(["frommo"]);
-        this.model.in1 = new ScilabDouble([]);
+        this.model.in = new ScilabDouble([]);
         this.model.in2 = new ScilabDouble([]);
         this.model.intyp = new ScilabDouble([1]);
         this.model.out = new ScilabDouble([-1]);
@@ -34,10 +34,7 @@ function FROMMO() {
     FROMMO.prototype.set = function FROMMO() {
         this.tag = arguments[0]["tag"]
         this.exprs = arguments[0]["exprs"]
-        this.x = arg1;
-        this.graphics = arg1.graphics;
         this.exprs = this.graphics.exprs;
-        this.model = arg1.model;
         while (true) {
             [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["Tag"],list("str",-1),this.exprs);
             if (!ok) {
diff --git a/js/Branching/FROMMO.pickle b/js/Branching/FROMMO.pickle
index 7b6b2992..87838f88 100644
--- a/js/Branching/FROMMO.pickle
+++ b/js/Branching/FROMMO.pickle
@@ -39,9 +39,9 @@ sS'model.in2'
 p9
 S'vector'
 p10
-sS'model.in1'
+sS'model.intyp'
 p11
-g10
+g8
 sS'x.graphics'
 p12
 g2
@@ -57,12 +57,12 @@ g8
 sS'x.graphics.out_implicit'
 p16
 g10
-sS'model.intyp'
+sS'y'
 p17
 g8
-sS'y'
+sS'model.in'
 p18
-g8
+g10
 sS'graphics.exprs'
 p19
 NsS'model.ipar'
diff --git a/js/Branching/GOTO.js b/js/Branching/GOTO.js
index 690af30a..e3ed8c22 100644
--- a/js/Branching/GOTO.js
+++ b/js/Branching/GOTO.js
@@ -3,7 +3,7 @@ function GOTO() {
     GOTO.prototype.define = function GOTO() {
         this.model = scicos_model();
         this.model.sim = new ScilabString(["goto"]);
-        this.model.in1 = new ScilabDouble([-1]);
+        this.model.in = new ScilabDouble([-1]);
         this.model.in2 = new ScilabDouble([-2]);
         this.model.intyp = new ScilabDouble([-1]);
         this.model.out = new ScilabDouble([]);
@@ -33,10 +33,7 @@ function GOTO() {
         this.tag = arguments[0]["tag"]
         this.tagvis = parseFloat(arguments[0]["tagvis"])
         this.exprs = arguments[0]["exprs"]
-        this.x = arg1;
-        this.graphics = arg1.graphics;
         this.exprs = this.graphics.exprs;
-        this.model = arg1.model;
         while (true) {
             [ok,this.tag,this.tagvis,this.exprs] = scicos_getvalue("Set parameters",["Tag","Tag Visibility(1=Local 2=scoped 3= global)"],list("str",-1,"vec",1),this.exprs);
             if (!ok) {
@@ -57,7 +54,6 @@ function GOTO() {
                 this.model.ipar = new ScilabDouble([this.tagvis]);
                 this.x.model = this.model;
                 this.x.graphics = this.graphics;
-                var arg1 = this.x;
                 break;
             }
         }
diff --git a/js/Branching/GOTO.pickle b/js/Branching/GOTO.pickle
index 3de9759d..3b5c4c09 100644
--- a/js/Branching/GOTO.pickle
+++ b/js/Branching/GOTO.pickle
@@ -39,7 +39,7 @@ p8
 sS'model.in2'
 p9
 g2
-sS'model.in1'
+sS'model.intyp'
 p10
 g2
 sS'x.graphics'
@@ -52,10 +52,10 @@ p13
 sS'model.out2'
 p14
 g8
-sS'model.intyp'
+sS'y'
 p15
 g2
-sS'y'
+sS'model.in'
 p16
 g2
 sS'graphics.exprs'
diff --git a/js/Branching/GOTOMO.js b/js/Branching/GOTOMO.js
index bb2f2c05..81c8ec38 100644
--- a/js/Branching/GOTOMO.js
+++ b/js/Branching/GOTOMO.js
@@ -3,7 +3,7 @@ function GOTOMO() {
     GOTOMO.prototype.define = function GOTOMO() {
         this.model = scicos_model();
         this.model.sim = new ScilabString(["gotomo"]);
-        this.model.in1 = new ScilabDouble([-1]);
+        this.model.in = new ScilabDouble([-1]);
         this.model.in2 = new ScilabDouble([-2]);
         this.model.intyp = new ScilabDouble([]);
         this.model.out = new ScilabDouble([]);
@@ -36,10 +36,7 @@ function GOTOMO() {
         this.tag = arguments[0]["tag"]
         this.tagvis = parseFloat(arguments[0]["tagvis"])
         this.exprs = arguments[0]["exprs"]
-        this.x = arg1;
-        this.graphics = arg1.graphics;
         this.exprs = this.graphics.exprs;
-        this.model = arg1.model;
         while (true) {
             [ok,this.tag,this.tagvis,this.exprs] = scicos_getvalue("Set parameters",["Tag","Tag Visibility(1=Local 2=scoped 3= global)"],list("str",-1,"vec",1),this.exprs);
             if (!ok) {
@@ -60,7 +57,6 @@ function GOTOMO() {
                 this.model.ipar = new ScilabDouble([this.tagvis]);
                 this.x.model = this.model;
                 this.x.graphics = this.graphics;
-                var arg1 = this.x;
                 break;
             }
         }
diff --git a/js/Branching/GOTOMO.pickle b/js/Branching/GOTOMO.pickle
index bf20ace2..6d754d8b 100644
--- a/js/Branching/GOTOMO.pickle
+++ b/js/Branching/GOTOMO.pickle
@@ -43,9 +43,9 @@ p10
 sS'model.in2'
 p11
 g2
-sS'model.in1'
+sS'model.intyp'
 p12
-g2
+g10
 sS'x.graphics'
 p13
 g5
@@ -61,10 +61,10 @@ g7
 sS'model.out2'
 p17
 g10
-sS'model.intyp'
-p18
-g10
 sS'y'
+p18
+g2
+sS'model.in'
 p19
 g2
 sS'graphics.exprs'
diff --git a/js/Branching/GotoTagVisibility.js b/js/Branching/GotoTagVisibility.js
index 1d4f0f29..f92bd228 100644
--- a/js/Branching/GotoTagVisibility.js
+++ b/js/Branching/GotoTagVisibility.js
@@ -3,7 +3,7 @@ function GotoTagVisibility() {
     GotoTagVisibility.prototype.define = function GotoTagVisibility() {
         this.model = scicos_model();
         this.model.sim = new ScilabString(["gototagvisibility"]);
-        this.model.in1 = new ScilabDouble([]);
+        this.model.in = new ScilabDouble([]);
         this.model.in2 = new ScilabDouble([]);
         this.model.out = new ScilabDouble([]);
         this.model.out2 = new ScilabDouble([]);
@@ -31,10 +31,7 @@ function GotoTagVisibility() {
     GotoTagVisibility.prototype.set = function GotoTagVisibility() {
         this.tag = arguments[0]["tag"]
         this.exprs = arguments[0]["exprs"]
-        this.x = arg1;
-        this.graphics = arg1.graphics;
         this.exprs = this.graphics.exprs;
-        this.model = arg1.model;
         while (true) {
             [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),this.exprs);
             if (!ok) {
diff --git a/js/Branching/GotoTagVisibility.pickle b/js/Branching/GotoTagVisibility.pickle
index 918f1bf7..e383d22b 100644
--- a/js/Branching/GotoTagVisibility.pickle
+++ b/js/Branching/GotoTagVisibility.pickle
@@ -34,33 +34,33 @@ p6
 sS'model.in2'
 p7
 g6
-sS'model.in1'
+sS'model.intyp'
 p8
-g6
-sS'x.graphics'
+S'double'
 p9
+sS'x.graphics'
+p10
 g2
 sS'model.evtin'
-p10
+p11
 g6
 sS'model.firing'
-p11
-S'boolean'
 p12
-sS'model.sim'
+S'boolean'
 p13
-S'string'
+sS'model.sim'
 p14
-sS'model.out2'
+S'string'
 p15
-g6
-sS'model.intyp'
+sS'model.out2'
 p16
-S'double'
-p17
+g6
 sS'y'
+p17
+g9
+sS'model.in'
 p18
-g17
+g6
 sS'graphics.exprs'
 p19
 NsS'typ'
@@ -72,25 +72,25 @@ S'list'
 p22
 sS'needcompile'
 p23
-g17
+g9
 sS'model.blocktype'
 p24
-g14
+g15
 sS'model.dep_ut'
 p25
 g6
 sS'exprs'
 p26
-g14
+g15
 sS'gr_i'
 p27
 g6
 sS'model.outtyp'
 p28
-g17
+g9
 sS'x'
 p29
-g17
+g9
 sS'model'
 p30
 g2
diff --git a/js/Branching/GotoTagVisibilityMO.js b/js/Branching/GotoTagVisibilityMO.js
index 91c817fd..6fff7ad2 100644
--- a/js/Branching/GotoTagVisibilityMO.js
+++ b/js/Branching/GotoTagVisibilityMO.js
@@ -3,7 +3,7 @@ function GotoTagVisibilityMO() {
     GotoTagVisibilityMO.prototype.define = function GotoTagVisibilityMO() {
         this.model = scicos_model();
         this.model.sim = new ScilabString(["gototagvisibilitymo"]);
-        this.model.in1 = new ScilabDouble([]);
+        this.model.in = new ScilabDouble([]);
         this.model.in2 = new ScilabDouble([]);
         this.model.out = new ScilabDouble([]);
         this.model.out2 = new ScilabDouble([]);
@@ -31,10 +31,7 @@ function GotoTagVisibilityMO() {
     GotoTagVisibilityMO.prototype.set = function GotoTagVisibilityMO() {
         this.tag = arguments[0]["tag"]
         this.exprs = arguments[0]["exprs"]
-        this.x = arg1;
-        this.graphics = arg1.graphics;
         this.exprs = this.graphics.exprs;
-        this.model = arg1.model;
         while (true) {
             [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),this.exprs);
             if (!ok) {
diff --git a/js/Branching/GotoTagVisibilityMO.pickle b/js/Branching/GotoTagVisibilityMO.pickle
index 918f1bf7..e383d22b 100644
--- a/js/Branching/GotoTagVisibilityMO.pickle
+++ b/js/Branching/GotoTagVisibilityMO.pickle
@@ -34,33 +34,33 @@ p6
 sS'model.in2'
 p7
 g6
-sS'model.in1'
+sS'model.intyp'
 p8
-g6
-sS'x.graphics'
+S'double'
 p9
+sS'x.graphics'
+p10
 g2
 sS'model.evtin'
-p10
+p11
 g6
 sS'model.firing'
-p11
-S'boolean'
 p12
-sS'model.sim'
+S'boolean'
 p13
-S'string'
+sS'model.sim'
 p14
-sS'model.out2'
+S'string'
 p15
-g6
-sS'model.intyp'
+sS'model.out2'
 p16
-S'double'
-p17
+g6
 sS'y'
+p17
+g9
+sS'model.in'
 p18
-g17
+g6
 sS'graphics.exprs'
 p19
 NsS'typ'
@@ -72,25 +72,25 @@ S'list'
 p22
 sS'needcompile'
 p23
-g17
+g9
 sS'model.blocktype'
 p24
-g14
+g15
 sS'model.dep_ut'
 p25
 g6
 sS'exprs'
 p26
-g14
+g15
 sS'gr_i'
 p27
 g6
 sS'model.outtyp'
 p28
-g17
+g9
 sS'x'
 p29
-g17
+g9
 sS'model'
 p30
 g2
diff --git a/js/Branching/ISELECT_f.js b/js/Branching/ISELECT_f.js
index 7c3992fc..89fe6233 100644
--- a/js/Branching/ISELECT_f.js
+++ b/js/Branching/ISELECT_f.js
@@ -6,7 +6,7 @@ function ISELECT_f() {
         this.nout = 2;
         this.model = scicos_model();
         this.model.sim = list(new ScilabString(["selector"]), new ScilabDouble([2]));
-        this.model.in1 = new ScilabDouble([-1]);
+        this.model.in = new ScilabDouble([-1]);
         this.model.out = new ScilabDouble(out);
         this.model.evtin = new ScilabDouble([ones(out)]);
         this.model.dstate = new ScilabDouble([this.z0]);
@@ -31,10 +31,7 @@ function ISELECT_f() {
         this.nout = parseFloat(arguments[0]["nout"])
         this.z0 = parseFloat(arguments[0]["z0"])
         this.exprs = arguments[0]["exprs"]
-        this.x = arg1;
-        this.graphics = arg1.graphics;
         this.exprs = this.graphics.exprs;
-        this.model = arg1.model;
         while (true) {
             [ok,this.nout,this.z0,this.exprs] = scicos_getvalue("Set parameters",["number of outputs","initial connected output"],list("vec",1,"vec",1),this.exprs);
             if (!ok) {
diff --git a/js/Branching/ISELECT_f.pickle b/js/Branching/ISELECT_f.pickle
index cf5ae1e1..88aca371 100644
--- a/js/Branching/ISELECT_f.pickle
+++ b/js/Branching/ISELECT_f.pickle
@@ -23,67 +23,67 @@ S'model.sim'
 p1
 S'list'
 p2
-sS'model.in1'
+sS'model.out'
 p3
-S'double'
+S'matrix'
 p4
 sS'model.dstate'
 p5
-g4
-sS'model.evtin'
+S'double'
 p6
-g4
-sS'x.graphics'
+sS'model.evtin'
 p7
-S'object'
+g6
+sS'x.graphics'
 p8
-sS'arg1'
+S'object'
 p9
-g8
-sS'graphics.exprs'
+sS'arg1'
 p10
-NsS'model.out'
+g9
+sS'graphics.exprs'
 p11
-S'matrix'
+NsS'model.dep_ut'
 p12
-sS'model.blocktype'
+S'vector'
 p13
-S'string'
+sS'model.blocktype'
 p14
-sS'exprs'
+S'string'
 p15
-g12
-sS'x.model'
+sS'exprs'
 p16
-NsS'gr_i'
+g4
+sS'x.model'
 p17
-S'vector'
+NsS'gr_i'
 p18
+g13
 sS'z0'
 p19
-g4
-sS'model.dep_ut'
+g6
+sS'model.in'
 p20
-g18
+g6
 sS'graphics'
 p21
-g8
+g9
 sS'y'
 p22
-g18
+g13
 sS'x'
 p23
-g4
+g6
 sS'model'
 p24
-g8
+g9
 sS'typ'
 p25
-g18
+g13
 sS'nout'
 p26
-g4
+g6
 sS'out'
 p27
-g12
+g4
 s.
\ No newline at end of file
diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js
index dc34ae2f..a396c439 100644
--- a/js/Branching/ISELECT_m.js
+++ b/js/Branching/ISELECT_m.js
@@ -8,7 +8,7 @@ function ISELECT_m() {
         this.model.out = new ScilabDouble([-1],[-1]);
         this.model.out2 = new ScilabDouble([-2],[-2]);
         this.model.outtyp = new ScilabDouble([1]);
-        this.model.in1 = new ScilabDouble([-1]);
+        this.model.in = new ScilabDouble([-1]);
         this.model.in2 = new ScilabDouble([-2]);
         this.model.intyp = new ScilabDouble([1]);
         this.model.evtout = new ScilabDouble([]);
@@ -41,10 +41,7 @@ function ISELECT_m() {
         this.nout = parseFloat(arguments[0]["nout"])
         this.z0 = parseFloat(arguments[0]["z0"])
         this.exprs = arguments[0]["exprs"]
-        this.x = arg1;
-        this.graphics = arg1.graphics;
         this.exprs = this.graphics.exprs;
-        this.model = arg1.model;
         while (true) {
             [ok,this.typ,this.nout,this.z0,this.exprs] = scicos_getvalue("Set parameters",["Datatype(1= real double  2=Complex 3=int32 ...)","number of outputs","initial connected output"],list("vec",1,"vec",1,"vec",1),this.exprs);
             if (!ok) {
diff --git a/js/Branching/ISELECT_m.pickle b/js/Branching/ISELECT_m.pickle
index afc20fa3..2dd402c1 100644
--- a/js/Branching/ISELECT_m.pickle
+++ b/js/Branching/ISELECT_m.pickle
@@ -38,56 +38,56 @@ S'vector'
 p7
 sS'x.model'
 p8
-NsS'model.intyp'
+NsS'model.out'
 p9
-g2
-sS'model.out'
-p10
 S'matrix'
-p11
+p10
 sS'out'
-p12
+p11
 g7
 sS'model.in2'
-p13
+p12
 g2
-sS'model.in1'
-p14
+sS'model.intyp'
+p13
 g2
 sS'x.graphics'
-p15
+p14
 g4
 sS'typ'
-p16
+p15
 g7
 sS'model.evtin'
-p17
+p16
 g2
 sS'model.firing'
-p18
+p17
 g7
 sS'model.sim'
-p19
+p18
 S'list'
-p20
+p19
 sS'model.evtout'
-p21
+p20
 g7
 sS'model.out2'
-p22
-g11
+p21
+g10
 sS'in1'
-p23
+p22
 g7
 sS'model.rpar'
-p24
+p23
 g7
 sS'model.outtyp'
-p25
+p24
 g2
 sS'model.state'
-p26
+p25
 g7
+sS'model.in'
+p26
+g2
 sS'graphics.exprs'
 p27
 NsS'model.ipar'
@@ -109,7 +109,7 @@ p34
 g7
 sS'exprs'
 p35
-g11
+g10
 sS'gr_i'
 p36
 g7
diff --git a/js/Branching/MUX.js b/js/Branching/MUX.js
index 710b3825..96a34c93 100644
--- a/js/Branching/MUX.js
+++ b/js/Branching/MUX.js
@@ -4,7 +4,7 @@ function MUX() {
         this.in1 = 2;
         this.model = scicos_model();
         this.model.sim = list(new ScilabString(["multiplex"]), new ScilabDouble([4]));
-        this.model.in1 = new ScilabDouble(-transpose([1:this.in1]));
+        this.model.in = new ScilabDouble(-transpose([1:this.in1]));
         this.model.out = new ScilabDouble([0]);
         this.model.ipar = new ScilabDouble([this.in1]);
         this.model.blocktype = new ScilabString(["c"]);
@@ -25,10 +25,7 @@ function MUX() {
     MUX.prototype.set = function MUX() {
         this.in1 = parseFloat(arguments[0]["in1"])
         this.exprs = arguments[0]["exprs"]
-        this.x = arg1;
-        this.graphics = arg1.graphics;
         this.exprs = this.graphics.exprs;
-        this.model = arg1.model;
         while (true) {
             [ok,this.in1,this.exprs] = scicos_getvalue("Set MUX block parameters","number of input ports or vector of sizes",list("intvec",-1),this.exprs);
             if (!ok) {
diff --git a/js/Branching/MUX.pickle b/js/Branching/MUX.pickle
index 68f561c9..5a8f8e63 100644
--- a/js/Branching/MUX.pickle
+++ b/js/Branching/MUX.pickle
@@ -21,9 +21,9 @@ S'model.sim'
 p1
 S'list'
 p2
-sS'model.in1'
+sS'model.out'
 p3
-S'vector'
+S'double'
 p4
 sS'ok'
 p5
@@ -44,11 +44,11 @@ sS'graphics.exprs'
 p12
 NsS'in1'
 p13
-S'double'
+g4
+sS'model.dep_ut'
 p14
-sS'model.out'
+S'vector'
 p15
-g14
 sS'exprs'
 p16
 g8
@@ -56,29 +56,29 @@ sS'x.model'
 p17
 NsS'gr_i'
 p18
-g4
-sS'model.dep_ut'
+g15
+sS'model.in'
 p19
-g4
+g15
 sS'graphics'
 p20
 g10
 sS'y'
 p21
-g4
+g15
 sS'x'
 p22
-g14
+g4
 sS'model'
 p23
 g10
 sS'model.ipar'
 p24
-g14
+g4
 sS'typ'
 p25
-g4
+g15
 sS'nout'
 p26
-g14
+g4
 s.
\ No newline at end of file
diff --git a/js/Branching/MUX_f.js b/js/Branching/MUX_f.js
index 094c051e..838956f7 100644
--- a/js/Branching/MUX_f.js
+++ b/js/Branching/MUX_f.js
@@ -4,7 +4,7 @@ function MUX_f() {
         this.in1 = 2;
         this.model = scicos_model();
         this.model.sim = list(new ScilabString(["mux"]), new ScilabDouble([1]));
-        this.model.in1 = new ScilabDouble(-transpose([1:this.in1]));
+        this.model.in = new ScilabDouble(-transpose([1:this.in1]));
         this.model.out = new ScilabDouble([0]);
         this.model.ipar = new ScilabDouble([this.in1]);
         this.model.blocktype = new ScilabString(["c"]);
@@ -25,10 +25,7 @@ function MUX_f() {
     MUX_f.prototype.set = function MUX_f() {
         this.in1 = parseFloat(arguments[0]["in1"])
         this.exprs = arguments[0]["exprs"]
-        this.x = arg1;
-        this.graphics = arg1.graphics;
         this.exprs = this.graphics.exprs;
-        this.model = arg1.model;
         while (true) {
             [ok,this.in1,this.exprs] = scicos_getvalue("Set MUX block parameters","number of input ports or vector of sizes",list("vec",-1),this.exprs);
             if (!ok) {
diff --git a/js/Branching/MUX_f.pickle b/js/Branching/MUX_f.pickle
index 68f561c9..5a8f8e63 100644
--- a/js/Branching/MUX_f.pickle
+++ b/js/Branching/MUX_f.pickle
@@ -21,9 +21,9 @@ S'model.sim'
 p1
 S'list'
 p2
-sS'model.in1'
+sS'model.out'
 p3
-S'vector'
+S'double'
 p4
 sS'ok'
 p5
@@ -44,11 +44,11 @@ sS'graphics.exprs'
 p12
 NsS'in1'
 p13
-S'double'
+g4
+sS'model.dep_ut'
 p14
-sS'model.out'
+S'vector'
 p15
-g14
 sS'exprs'
 p16
 g8
@@ -56,29 +56,29 @@ sS'x.model'
 p17
 NsS'gr_i'
 p18
-g4
-sS'model.dep_ut'
+g15
+sS'model.in'
 p19
-g4
+g15
 sS'graphics'
 p20
 g10
 sS'y'
 p21
-g4
+g15
 sS'x'
 p22
-g14
+g4
 sS'model'
 p23
 g10
 sS'model.ipar'
 p24
-g14
+g4
 sS'typ'
 p25
-g4
+g15
 sS'nout'
 p26
-g14
+g4
 s.
\ No newline at end of file
diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js
index cf144eff..3859b45f 100644
--- a/js/Branching/M_SWITCH.js
+++ b/js/Branching/M_SWITCH.js
@@ -6,7 +6,7 @@ function M_SWITCH() {
         this.nin = 2;
         this.model = scicos_model();
         this.model.sim = list(new ScilabString(["mswitch"]), new ScilabDouble([4]));
-        this.model.in1 = new ScilabDouble(in1);
+        this.model.in = new ScilabDouble(in1);
         this.model.out = new ScilabDouble([-1]);
         this.model.ipar = new ScilabDouble(ipar);
         this.model.blocktype = new ScilabString(["c"]);
@@ -32,10 +32,7 @@ function M_SWITCH() {
         this.base = parseFloat(arguments[0]["base"])
         this.rule = arguments[0]["rule"]
         this.exprs = arguments[0]["exprs"]
-        this.x = arg1;
-        this.graphics = arg1.graphics;
         this.exprs = this.graphics.exprs;
-        this.model = arg1.model;
         while (true) {
             [ok,this.nin,this.base,this.rule,this.exprs] = scicos_getvalue("Set parameters",["number of inputs","zero base indexing (0), otherwise 1","rounding rule: int (0), round (1), ceil (2), floor (3)"],list("vec",1,"vec",1,"vec",1),this.exprs);
             if (!ok) {
diff --git a/js/Branching/M_SWITCH.pickle b/js/Branching/M_SWITCH.pickle
index 6a8b359c..7abc48ad 100644
--- a/js/Branching/M_SWITCH.pickle
+++ b/js/Branching/M_SWITCH.pickle
@@ -42,28 +42,28 @@ sS'out'
 p9
 S'vector'
 p10
-sS'model.in1'
-p11
-g5
 sS'x.graphics'
-p12
+p11
 g2
 sS'model.sim'
-p13
+p12
 S'list'
-p14
+p13
 sS'nin'
-p15
+p14
 g8
 sS'in1'
-p16
+p15
 g5
 sS'in2'
-p17
+p16
 g5
 sS'base'
-p18
+p17
 g8
+sS'model.in'
+p18
+g5
 sS'graphics.exprs'
 p19
 NsS'model.ipar'
diff --git a/js/Branching/NRMSOM_f.js b/js/Branching/NRMSOM_f.js
index ea15f6b7..0f4cb761 100644
--- a/js/Branching/NRMSOM_f.js
+++ b/js/Branching/NRMSOM_f.js
@@ -5,7 +5,7 @@ function NRMSOM_f() {
         this.nin = 2;
         this.model = scicos_model();
         this.model.sim = new ScilabString(["junk"]);
-        this.model.in1 = new ScilabDouble(in1);
+        this.model.in = new ScilabDouble(in1);
         this.model.out = new ScilabDouble([-1]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = new ScilabDouble([true,false]);
@@ -26,10 +26,7 @@ function NRMSOM_f() {
     NRMSOM_f.prototype.set = function NRMSOM_f() {
         this.nin = parseFloat(arguments[0]["nin"])
         this.exprs = arguments[0]["exprs"]
-        this.x = arg1;
-        this.graphics = arg1.graphics;
         this.exprs = this.graphics.exprs;
-        this.model = arg1.model;
         while (true) {
             [ok,this.nin,this.exprs] = scicos_getvalue("Set parameters",["number of inputs"],list("vec",1),this.exprs);
             if (!ok) {
diff --git a/js/Branching/NRMSOM_f.pickle b/js/Branching/NRMSOM_f.pickle
index 27340c37..0c0604b9 100644
--- a/js/Branching/NRMSOM_f.pickle
+++ b/js/Branching/NRMSOM_f.pickle
@@ -21,57 +21,57 @@ S'model.sim'
 p1
 S'string'
 p2
-sS'model.in1'
+sS'model.out'
 p3
-S'matrix'
+S'double'
 p4
 sS'nin'
 p5
-S'double'
-p6
+g4
 sS'model.blocktype'
-p7
+p6
 g2
 sS'x.graphics'
-p8
+p7
 S'object'
-p9
+p8
 sS'arg1'
-p10
-g9
+p9
+g8
 sS'graphics.exprs'
-p11
+p10
 NsS'in1'
+p11
+S'matrix'
 p12
-g4
-sS'model.out'
+sS'model.dep_ut'
 p13
-g6
-sS'exprs'
-p14
 S'vector'
+p14
+sS'exprs'
 p15
+g14
 sS'x.model'
 p16
 NsS'gr_i'
 p17
-g15
-sS'model.dep_ut'
+g14
+sS'model.in'
 p18
-g15
+g12
 sS'graphics'
 p19
-g9
+g8
 sS'y'
 p20
-g15
+g14
 sS'x'
 p21
-g6
+g4
 sS'model'
 p22
-g9
+g8
 sS'typ'
 p23
-g15
+g14
 s.
\ No newline at end of file
diff --git a/js/Branching/RELAY_f.js b/js/Branching/RELAY_f.js
index 1745376c..8ddda3f3 100644
--- a/js/Branching/RELAY_f.js
+++ b/js/Branching/RELAY_f.js
@@ -6,7 +6,7 @@ function RELAY_f() {
         this.nin = 2;
         this.model = scicos_model();
         this.model.sim = list(new ScilabString(["relay"]), new ScilabDouble([2]));
-        this.model.in1 = new ScilabDouble(in1);
+        this.model.in = new ScilabDouble(in1);
         this.model.out = new ScilabDouble([-1]);
         this.model.evtin = new ScilabDouble([ones(in1)]);
         this.model.dstate = new ScilabDouble([i0]);
@@ -32,10 +32,7 @@ function RELAY_f() {
         this.nin = parseFloat(arguments[0]["nin"])
         this.z0 = arguments[0]["z0"]
         this.exprs = arguments[0]["exprs"]
-        this.x = arg1;
-        this.graphics = arg1.graphics;
         this.exprs = this.graphics.exprs;
-        this.model = arg1.model;
         var ipar = this.model.ipar;
         while (true) {
             [ok,this.nin,this.z0,this.exprs] = scicos_getvalue("Set parameters",["number of inputs","initial connected input"],list("vec",1,"vec",1),this.exprs);
diff --git a/js/Branching/RELAY_f.pickle b/js/Branching/RELAY_f.pickle
index 9700e89e..72cd5255 100644
--- a/js/Branching/RELAY_f.pickle
+++ b/js/Branching/RELAY_f.pickle
@@ -36,56 +36,56 @@ g4
 sS'model.out'
 p7
 g2
-sS'model.in1'
-p8
-S'matrix'
-p9
 sS'x.graphics'
-p10
+p8
 g4
 sS'model.evtin'
-p11
+p9
 g2
 sS'model.firing'
-p12
+p10
 S'vector'
-p13
+p11
 sS'model.sim'
-p14
+p12
 S'list'
-p15
+p13
 sS'nin'
-p16
+p14
 g2
 sS'i0'
-p17
+p15
 g2
 sS'in1'
+p16
+S'matrix'
+p17
+sS'model.in'
 p18
-g9
+g17
 sS'graphics.exprs'
 p19
 NsS'typ'
 p20
-g13
+g11
 sS'model.blocktype'
 p21
 S'string'
 p22
 sS'model.dep_ut'
 p23
-g13
+g11
 sS'exprs'
 p24
-g9
+g17
 sS'gr_i'
 p25
-g13
+g11
 sS'ipar'
 p26
 NsS'y'
 p27
-g13
+g11
 sS'x'
 p28
 g2
diff --git a/js/Branching/SCALAR2VECTOR.js b/js/Branching/SCALAR2VECTOR.js
index 18895dd4..90de2156 100644
--- a/js/Branching/SCALAR2VECTOR.js
+++ b/js/Branching/SCALAR2VECTOR.js
@@ -5,7 +5,7 @@ function SCALAR2VECTOR() {
         this.model = scicos_model();
         this.model.sim = list(new ScilabString(["scalar2vector"]), new ScilabDouble([4]));
         this.model.out = new ScilabDouble([this.nout]);
-        this.model.in1 = new ScilabDouble([1]);
+        this.model.in = new ScilabDouble([1]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = new ScilabDouble([true,false]);
         this.exprs = [string([this.nout])];
@@ -25,10 +25,7 @@ function SCALAR2VECTOR() {
     SCALAR2VECTOR.prototype.set = function SCALAR2VECTOR() {
         this.nout = parseFloat(arguments[0]["nout"])
         this.exprs = arguments[0]["exprs"]
-        this.x = arg1;
-        this.graphics = arg1.graphics;
         this.exprs = this.graphics.exprs;
-        this.model = arg1.model;
         while (true) {
             [ok,this.nout,this.exprs] = scicos_getvalue("Set block parameters",["size of output (-1: if don\'t know)"],list("vec",1),this.exprs);
             if (!ok) {
diff --git a/js/Branching/SCALAR2VECTOR.pickle b/js/Branching/SCALAR2VECTOR.pickle
index ed60d5ef..79885755 100644
--- a/js/Branching/SCALAR2VECTOR.pickle
+++ b/js/Branching/SCALAR2VECTOR.pickle
@@ -42,27 +42,27 @@ p11
 g10
 sS'graphics.exprs'
 p12
-NsS'model.in1'
+NsS'model.dep_ut'
 p13
-g4
-sS'model.dep_ut'
-p14
 S'vector'
-p15
+p14
 sS'exprs'
-p16
-g15
+p15
+g14
 sS'x.model'
-p17
+p16
 NsS'gr_i'
+p17
+g14
+sS'model.in'
 p18
-g15
+g4
 sS'graphics'
 p19
 g10
 sS'y'
 p20
-g15
+g14
 sS'x'
 p21
 g4
@@ -71,7 +71,7 @@ p22
 g10
 sS'typ'
 p23
-g15
+g14
 sS'nout'
 p24
 g4
diff --git a/js/Branching/SELECT_f.js b/js/Branching/SELECT_f.js
index 3f5ca888..09e4a5ce 100644
--- a/js/Branching/SELECT_f.js
+++ b/js/Branching/SELECT_f.js
@@ -6,7 +6,7 @@ function SELECT_f() {
         this.nin = 2;
         this.model = scicos_model();
         this.model.sim = list(new ScilabString(["selector"]), new ScilabDouble([2]));
-        this.model.in1 = new ScilabDouble(in1);
+        this.model.in = new ScilabDouble(in1);
         this.model.out = new ScilabDouble([-1]);
         this.model.evtin = new ScilabDouble([ones(in1)]);
         this.model.dstate = new ScilabDouble([this.z0]);
@@ -31,10 +31,7 @@ function SELECT_f() {
         this.nin = parseFloat(arguments[0]["nin"])
         this.z0 = parseFloat(arguments[0]["z0"])
         this.exprs = arguments[0]["exprs"]
-        this.x = arg1;
-        this.graphics = arg1.graphics;
         this.exprs = this.graphics.exprs;
-        this.model = arg1.model;
         while (true) {
             [ok,this.nin,this.z0,this.exprs] = scicos_getvalue("Set parameters",["number of inputs","initial connected input"],list("vec",1,"vec",1),this.exprs);
             if (!ok) {
diff --git a/js/Branching/SELECT_f.pickle b/js/Branching/SELECT_f.pickle
index 79e3c230..1de760dd 100644
--- a/js/Branching/SELECT_f.pickle
+++ b/js/Branching/SELECT_f.pickle
@@ -23,65 +23,65 @@ S'model.sim'
 p1
 S'list'
 p2
-sS'model.in1'
+sS'model.out'
 p3
-S'matrix'
+S'double'
 p4
 sS'model.dstate'
 p5
-S'double'
-p6
+g4
 sS'model.evtin'
-p7
-g6
+p6
+g4
 sS'x.graphics'
-p8
+p7
 S'object'
-p9
+p8
 sS'arg1'
-p10
-g9
+p9
+g8
 sS'graphics.exprs'
-p11
+p10
 NsS'nin'
-p12
-g6
+p11
+g4
 sS'in1'
+p12
+S'matrix'
 p13
-g4
-sS'model.out'
+sS'model.dep_ut'
 p14
-g6
-sS'exprs'
+S'vector'
 p15
-g4
-sS'x.model'
+sS'exprs'
 p16
-NsS'gr_i'
+g13
+sS'x.model'
 p17
-S'vector'
+NsS'gr_i'
 p18
+g15
 sS'z0'
 p19
-g6
-sS'model.dep_ut'
+g4
+sS'model.in'
 p20
-g18
+g13
 sS'graphics'
 p21
-g9
+g8
 sS'y'
 p22
-g18
+g15
 sS'x'
 p23
-g6
+g4
 sS'model'
 p24
-g9
+g8
 sS'typ'
 p25
-g18
+g15
 sS'model.blocktype'
 p26
 S'string'
diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js
index b8a5bd74..6d89c729 100644
--- a/js/Branching/SELECT_m.js
+++ b/js/Branching/SELECT_m.js
@@ -5,7 +5,7 @@ function SELECT_m() {
         this.nin = 2;
         this.model = scicos_model();
         this.model.sim = list(new ScilabString(["selector_m"]), new ScilabDouble([4]));
-        this.model.in1 = new ScilabDouble([-1],[-1]);
+        this.model.in = new ScilabDouble([-1],[-1]);
         this.model.in2 = new ScilabDouble([-2],[-2]);
         this.model.intyp = new ScilabDouble([1]);
         this.model.out = new ScilabDouble([-1]);
@@ -41,10 +41,7 @@ function SELECT_m() {
         this.nin = parseFloat(arguments[0]["nin"])
         this.z0 = parseFloat(arguments[0]["z0"])
         this.exprs = arguments[0]["exprs"]
-        this.x = arg1;
-        this.graphics = arg1.graphics;
         this.exprs = this.graphics.exprs;
-        this.model = arg1.model;
         while (true) {
             [ok,this.typ,this.nin,this.z0,this.exprs] = scicos_getvalue("Set parameters",["Datatype(1= real double  2=Complex 3=int32 ..)","number of inputs","initial connected input"],list("vec",1,"vec",1,"vec",1),this.exprs);
             if (!ok) {
diff --git a/js/Branching/SELECT_m.pickle b/js/Branching/SELECT_m.pickle
index c8879d34..eb420b3f 100644
--- a/js/Branching/SELECT_m.pickle
+++ b/js/Branching/SELECT_m.pickle
@@ -38,65 +38,65 @@ S'string'
 p7
 sS'x.model'
 p8
-NsS'model.intyp'
+NsS'model.out'
 p9
 g2
-sS'model.out'
-p10
-g2
 sS'out'
-p11
+p10
 S'vector'
-p12
+p11
 sS'model.in2'
-p13
+p12
 S'matrix'
+p13
+sS'model.intyp'
 p14
-sS'model.in1'
-p15
-g14
+g2
 sS'x.graphics'
-p16
+p15
 g4
 sS'typ'
-p17
-g12
+p16
+g11
 sS'model.evtin'
-p18
+p17
 g2
 sS'model.firing'
-p19
-g12
+p18
+g11
 sS'model.sim'
-p20
+p19
 S'list'
-p21
+p20
 sS'model.evtout'
-p22
-g12
+p21
+g11
 sS'nin'
-p23
+p22
 g2
 sS'model.out2'
-p24
+p23
 g2
 sS'in1'
-p25
-g12
+p24
+g11
 sS'model.rpar'
-p26
-g12
+p25
+g11
 sS'model.outtyp'
-p27
+p26
 g2
 sS'model.state'
+p27
+g11
+sS'model.in'
 p28
-g12
+g13
 sS'graphics.exprs'
 p29
 NsS'model.ipar'
 p30
-g12
+g11
 sS'z0'
 p31
 g2
@@ -109,16 +109,16 @@ p34
 g7
 sS'model.dep_ut'
 p35
-g12
+g11
 sS'exprs'
 p36
-g14
+g13
 sS'gr_i'
 p37
-g12
+g11
 sS'y'
 p38
-g12
+g11
 sS'x'
 p39
 g2
@@ -127,5 +127,5 @@ p40
 g4
 sS'ot'
 p41
-g12
+g11
 s.
\ No newline at end of file
diff --git a/js/Branching/SELF_SWITCH.js b/js/Branching/SELF_SWITCH.js
index eca2147d..ff749abe 100644
--- a/js/Branching/SELF_SWITCH.js
+++ b/js/Branching/SELF_SWITCH.js
@@ -9,7 +9,7 @@ function SELF_SWITCH() {
         this.x.graphics.pin = 0;
         this.x.graphics.pout = 0;
         this.x.model.sim = "csuper";
-        this.x.model.in1 = 1;
+        this.x.model.in = 1;
         this.x.model.out = 1;
         this.x.model.blocktype = "h";
         this.x.model.dep_ut = [false,false];
@@ -31,7 +31,6 @@ function SELF_SWITCH() {
         return options;
     }
     SELF_SWITCH.prototype.set = function SELF_SWITCH() {
-        this.x = arg1;
         this.stateOpen = this.x.model.opar[1-1];
         this.x.model.rpar = genSwitchInnerDiagram(!this.stateOpen);
         this.x.model.opar = list(!this.stateOpen);
diff --git a/js/Branching/SELF_SWITCH.pickle b/js/Branching/SELF_SWITCH.pickle
index f7d79ec6..55184003 100644
--- a/js/Branching/SELF_SWITCH.pickle
+++ b/js/Branching/SELF_SWITCH.pickle
@@ -42,89 +42,89 @@ g2
 sS'x.model.rpar'
 p11
 g4
-sS'x.model.in1'
-p12
-g4
 sS'x.model.out'
-p13
+p12
 g4
 sS'diagram.objs[3-1]'
-p14
+p13
 g2
 sS'diagram.objs[2-1]'
-p15
+p14
 g2
 sS'x.graphics.gr_i'
-p16
+p15
 g6
 sS'x.graphics.pout'
-p17
+p16
 g4
 sS'diagram.objs[3-1].graphics.pout'
-p18
+p17
 g4
 sS'x.model.blocktype'
-p19
+p18
 g9
 sS'diagram.objs[2-1].graphics.pin'
-p20
+p19
 g4
 sS'diagram.objs[7-1]'
-p21
+p20
 g4
 sS'diagram.objs[6-1]'
-p22
+p21
 g4
 sS'diagram.objs[5-1]'
-p23
+p22
 g4
 sS'x.graphics.in_implicit'
-p24
+p23
 g6
 sS'diagram.objs[3-1].model.rpar'
-p25
+p24
 g4
 sS'diagram.objs[4-1]'
-p26
+p25
 g2
 sS'x.graphics.in_style'
-p27
+p26
 g9
 sS'stateOpen'
-p28
+p27
 S'boolean'
-p29
+p28
 sS'x.graphics.out_implicit'
-p30
+p29
 g6
 sS'diagram.objs[4-1].graphics.pout'
-p31
+p30
 g4
 sS'diagram'
-p32
+p31
 g4
 sS'x.graphics.pin'
-p33
+p32
 g4
 sS'x.model.opar'
-p34
+p33
 S'list'
-p35
+p34
 sS'typ'
-p36
-g35
+p35
+g34
 sS'x.model.sim'
-p37
+p36
 g9
 sS'diagram.objs[4-1].graphics.pin'
-p38
+p37
 g6
 sS'x.graphics.style'
-p39
+p38
 g9
 sS'diagram.objs[3-1].graphics.exprs'
-p40
+p39
 g9
+sS'x.model.in'
+p40
+g4
 sS'x.gui'
 p41
 g9
diff --git a/js/Branching/SWITCH2.js b/js/Branching/SWITCH2.js
index 88f40bb9..1660f2c7 100644
--- a/js/Branching/SWITCH2.js
+++ b/js/Branching/SWITCH2.js
@@ -7,7 +7,7 @@ function SWITCH2() {
         var rpar = 0;
         this.model = scicos_model();
         this.model.sim = list(new ScilabString(["switch2"]), new ScilabDouble([4]));
-        this.model.in1 = new ScilabDouble(in1);
+        this.model.in = new ScilabDouble(in1);
         this.model.out = new ScilabDouble([-1]);
         this.model.ipar = new ScilabDouble(ipar);
         this.model.rpar = new ScilabDouble([rpar]);
@@ -36,10 +36,7 @@ function SWITCH2() {
         this.thra = arguments[0]["thra"]
         this.nzz = parseFloat(arguments[0]["nzz"])
         this.exprs = arguments[0]["exprs"]
-        this.x = arg1;
-        this.graphics = arg1.graphics;
         this.exprs = this.graphics.exprs;
-        this.model = arg1.model;
         while (true) {
             [ok,this.rule,this.thra,this.nzz,this.exprs] = scicos_getvalue("Set parameters",["pass first input if: u2>=a (0), u2>a (1), u2~=a (2)","threshold a","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1),this.exprs);
             if (!ok) {
diff --git a/js/Branching/SWITCH2.pickle b/js/Branching/SWITCH2.pickle
index 3b8a12e8..cc082b2a 100644
--- a/js/Branching/SWITCH2.pickle
+++ b/js/Branching/SWITCH2.pickle
@@ -41,29 +41,29 @@ p8
 sS'model.out'
 p9
 g5
-sS'model.in1'
-p10
-S'matrix'
-p11
 sS'x.graphics'
-p12
+p10
 g2
 sS'typ'
-p13
+p11
 g8
 sS'model.sim'
-p14
+p12
 S'list'
-p15
+p13
 sS'model.nmode'
-p16
+p14
 g5
 sS'model.rpar'
-p17
+p15
 g5
 sS'in1'
+p16
+S'matrix'
+p17
+sS'model.in'
 p18
-g11
+g17
 sS'graphics.exprs'
 p19
 NsS'model.ipar'
@@ -84,7 +84,7 @@ p25
 g5
 sS'exprs'
 p26
-g11
+g17
 sS'gr_i'
 p27
 g8
diff --git a/js/Branching/SWITCH2_m.js b/js/Branching/SWITCH2_m.js
index b7ea3784..ee598779 100644
--- a/js/Branching/SWITCH2_m.js
+++ b/js/Branching/SWITCH2_m.js
@@ -6,7 +6,7 @@ function SWITCH2_m() {
         var rpar = 0;
         this.model = scicos_model();
         this.model.sim = list(new ScilabString(["switch2_m"]), new ScilabDouble([4]));
-        this.model.in1 = new ScilabDouble([-1],[1],[-1]);
+        this.model.in = new ScilabDouble([-1],[1],[-1]);
         this.model.in2 = new ScilabDouble([-2],[1],[-2]);
         this.model.intyp = new ScilabDouble([1]);
         this.model.out = new ScilabDouble([-1]);
@@ -41,10 +41,7 @@ function SWITCH2_m() {
         this.thra = arguments[0]["thra"]
         this.nzz = parseFloat(arguments[0]["nzz"])
         this.exprs = arguments[0]["exprs"]
-        this.x = arg1;
-        this.graphics = arg1.graphics;
         this.exprs = this.graphics.exprs;
-        this.model = arg1.model;
         while (true) {
             [ok,this.ot,this.rule,this.thra,this.nzz,this.exprs] = scicos_getvalue("Set parameters",["Datatype (1=real double  2=complex 3=int32 ...)","pass first input if: u2>=a (0), u2>a (1), u2~=a (2)","threshold a","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1,"vec",1),this.exprs);
             if (!ok) {
@@ -75,7 +72,7 @@ function SWITCH2_m() {
                 it[1-1] = this.ot;
                 it[2-1] = 1;
                 it[3-1] = this.ot;
-                var in1 = [this.model.in1,this.model.in2];
+                var in1 = [this.model.in,this.model.in2];
                 var out = [this.model.out,this.model.out2];
                 var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,this.ot),[],[]);
                 this.model = tmpvar0[0];
diff --git a/js/Branching/SWITCH2_m.pickle b/js/Branching/SWITCH2_m.pickle
index 733fcd2c..3e82ebb1 100644
--- a/js/Branching/SWITCH2_m.pickle
+++ b/js/Branching/SWITCH2_m.pickle
@@ -37,61 +37,61 @@ p5
 sS'x.model'
 p6
 g2
-sS'model.intyp'
-p7
-g5
 sS'model.dep_ut'
-p8
+p7
 S'vector'
-p9
+p8
 sS'model.out'
-p10
+p9
 g5
 sS'it[3-1]'
-p11
+p10
 NsS'out'
-p12
-g9
+p11
+g8
 sS'model.in2'
-p13
+p12
 S'matrix'
+p13
+sS'model.intyp'
 p14
-sS'model.in1'
-p15
-g14
+g5
 sS'x.graphics'
-p16
+p15
 g2
 sS'it[2-1]'
-p17
+p16
 g5
 sS'typ'
-p18
-g9
+p17
+g8
 sS'model.sim'
-p19
+p18
 S'list'
-p20
+p19
 sS'model.out2'
-p21
+p20
 g5
 sS'model.nmode'
-p22
+p21
 g5
 sS'model.rpar'
-p23
+p22
 g5
 sS'in1'
-p24
-g9
+p23
+g8
 sS'model.outtyp'
-p25
+p24
 g5
+sS'model.in'
+p25
+g13
 sS'graphics.exprs'
 p26
 NsS'model.ipar'
 p27
-g9
+g8
 sS'model.nzcross'
 p28
 g5
@@ -111,16 +111,16 @@ p34
 g5
 sS'exprs'
 p35
-g14
+g13
 sS'gr_i'
 p36
-g9
+g8
 sS'ipar'
 p37
-g9
+g8
 sS'y'
 p38
-g9
+g8
 sS'x'
 p39
 g5
diff --git a/js/Branching/SWITCH_f.js b/js/Branching/SWITCH_f.js
index bf9b0bd8..e427833b 100644
--- a/js/Branching/SWITCH_f.js
+++ b/js/Branching/SWITCH_f.js
@@ -6,7 +6,7 @@ function SWITCH_f() {
         this.nin = 2;
         this.model = scicos_model();
         this.model.sim = list(new ScilabString(["switchn"]), new ScilabDouble([2]));
-        this.model.in1 = new ScilabDouble(in1);
+        this.model.in = new ScilabDouble(in1);
         this.model.out = new ScilabDouble([-1]);
         this.model.ipar = new ScilabDouble([i0]);
         this.model.blocktype = new ScilabString(["c"]);
@@ -31,10 +31,7 @@ function SWITCH_f() {
         this.nin = parseFloat(arguments[0]["nin"])
         this.z0 = arguments[0]["z0"]
         this.exprs = arguments[0]["exprs"]
-        this.x = arg1;
-        this.graphics = arg1.graphics;
         this.exprs = this.graphics.exprs;
-        this.model = arg1.model;
         var ipar = this.model.ipar;
         while (true) {
             [ok,this.nin,this.z0,this.exprs] = scicos_getvalue("Set switch parameters",["number of inputs","connected input"],list("vec",1,"vec",1),this.exprs);
diff --git a/js/Branching/SWITCH_f.pickle b/js/Branching/SWITCH_f.pickle
index 8b909059..a3d7a1eb 100644
--- a/js/Branching/SWITCH_f.pickle
+++ b/js/Branching/SWITCH_f.pickle
@@ -33,30 +33,30 @@ sS'model.out'
 p5
 S'double'
 p6
-sS'model.in1'
-p7
-S'matrix'
-p8
 sS'x.graphics'
-p9
+p7
 g2
 sS'model.firing'
-p10
+p8
 S'vector'
-p11
+p9
 sS'model.sim'
-p12
+p10
 S'list'
-p13
+p11
 sS'nin'
-p14
+p12
 g6
 sS'i0'
-p15
+p13
 g6
 sS'in1'
+p14
+S'matrix'
+p15
+sS'model.in'
 p16
-g8
+g15
 sS'graphics.exprs'
 p17
 NsS'model.ipar'
@@ -64,25 +64,25 @@ p18
 g6
 sS'typ'
 p19
-g11
+g9
 sS'model.blocktype'
 p20
 S'string'
 p21
 sS'model.dep_ut'
 p22
-g11
+g9
 sS'exprs'
 p23
-g8
+g15
 sS'gr_i'
 p24
-g11
+g9
 sS'ipar'
 p25
 NsS'y'
 p26
-g11
+g9
 sS'x'
 p27
 g6