26 files changed, 911 insertions, 911 deletions

diff --git a/js/Branching/CLKFROM.js b/js/Branching/CLKFROM.js
index c115234a..3f33b7be 100644
--- a/js/Branching/CLKFROM.js
+++ b/js/Branching/CLKFROM.js
@@ -1,41 +1,41 @@
 /* autogenerated from "macros/Branching/CLKFROM.sci" */
 function CLKFROM() {
     CLKFROM.prototype.define = function CLKFROM() {
-model=scicos_model();
-model.sim="clkfrom";
-model.evtout=1;
-model.opar=list("A");
-model.blocktype="d";
-model.firing=-1;
-model.dep_ut=[false,false];
-exprs="A";
-x=standard_define([2,1],model,exprs," ");
-x.graphics.id="From";
+        model = scicos_model();
+        model.sim = "clkfrom";
+        model.evtout = 1;
+        model.opar = list("A");
+        model.blocktype = "d";
+        model.firing = -1;
+        model.dep_ut = [false,false];
+        exprs = "A";
+        x = standard_define([2,1],model,exprs," ");
+        x.graphics.id = "From";
     }
     CLKFROM.prototype.details = function CLKFROM() {
     }
     CLKFROM.prototype.get = function CLKFROM() {
     }
     CLKFROM.prototype.set = function CLKFROM() {
-x=arg1;
-graphics=arg1.graphics;
-model=arg1.model;
-exprs=graphics.exprs;
-while (true) {
-[ok,tag,exprs]=scicos_getvalue("Set block parameters","Tag",list("str",-1),exprs);
-if (!ok) {
+        x = arg1;
+        graphics = arg1.graphics;
+        model = arg1.model;
+        exprs = graphics.exprs;
+        while (true) {
+        [ok,tag,exprs] = scicos_getvalue("Set block parameters","Tag",list("str",-1),exprs);
+        if (!ok) {
 break;
 }
-if (model.opar!=list(tag)) {
-needcompile=4;
-y=needcompile;
+        if (model.opar!=list(tag)) {
+        needcompile = 4;
+        y = needcompile;
 }
-model.opar=list(tag);
-model.evtout=1;
-model.firing=-1;
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
+        model.opar = list(tag);
+        model.evtout = 1;
+        model.firing = -1;
+        graphics.exprs = exprs;
+        x.graphics = graphics;
+        x.model = model;
 break;
 }
 needcompile=resume(needcompile)
diff --git a/js/Branching/CLKGOTO.js b/js/Branching/CLKGOTO.js
index 5abf8a5c..e3698ab9 100644
--- a/js/Branching/CLKGOTO.js
+++ b/js/Branching/CLKGOTO.js
@@ -1,49 +1,49 @@
 /* autogenerated from "macros/Branching/CLKGOTO.sci" */
 function CLKGOTO() {
     CLKGOTO.prototype.define = function CLKGOTO() {
-model=scicos_model();
-model.sim="clkgoto";
-model.evtin=1;
-model.opar=list("A");
-model.ipar=int(1);
-model.blocktype="d";
-model.firing=-1;
-model.dep_ut=[false,false];
-exprs=[["A"],[sci2exp(1)]];
-x=standard_define([2,1],model,exprs," ");
-x.graphics.id="Goto";
+        model = scicos_model();
+        model.sim = "clkgoto";
+        model.evtin = 1;
+        model.opar = list("A");
+        model.ipar = int(1);
+        model.blocktype = "d";
+        model.firing = -1;
+        model.dep_ut = [false,false];
+        exprs = [["A"],[sci2exp(1)]];
+        x = standard_define([2,1],model,exprs," ");
+        x.graphics.id = "Goto";
     }
     CLKGOTO.prototype.details = function CLKGOTO() {
     }
     CLKGOTO.prototype.get = function CLKGOTO() {
     }
     CLKGOTO.prototype.set = function CLKGOTO() {
-x=arg1;
-graphics=arg1.graphics;
-model=arg1.model;
-exprs=graphics.exprs;
-while (true) {
-[ok,tag,tagvis,exprs]=scicos_getvalue("Set block parameters",[["Tag"],["Tag Visibility (1=Local 2=Scoped 3=Global)"]],list("str",-1,"vec",1),exprs);
-if (!ok) {
+        x = arg1;
+        graphics = arg1.graphics;
+        model = arg1.model;
+        exprs = graphics.exprs;
+        while (true) {
+        [ok,tag,tagvis,exprs] = scicos_getvalue("Set block parameters",[["Tag"],["Tag Visibility (1=Local 2=Scoped 3=Global)"]],list("str",-1,"vec",1),exprs);
+        if (!ok) {
 break;
 }
-if (((tagvis<1)||(tagvis>3))) {
+        if (((tagvis<1)||(tagvis>3))) {
 message("Tag Visibility must be between 1 and 3");
-ok=false;
+        ok = false;
 }
-tagvis=int(tagvis);
-if (ok) {
-if (((model.opar!=list(tag))||(model.ipar!=tagvis))) {
-needcompile=4;
-y=needcompile;
+        tagvis = int(tagvis);
+        if (ok) {
+        if (((model.opar!=list(tag))||(model.ipar!=tagvis))) {
+        needcompile = 4;
+        y = needcompile;
 }
-model.opar=list(tag);
-model.ipar=tagvis;
-model.evtin=1;
-model.firing=-1;
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
+        model.opar = list(tag);
+        model.ipar = tagvis;
+        model.evtin = 1;
+        model.firing = -1;
+        graphics.exprs = exprs;
+        x.graphics = graphics;
+        x.model = model;
 break;
 }
 }
diff --git a/js/Branching/CLKGotoTagVisibility.js b/js/Branching/CLKGotoTagVisibility.js
index d8522b53..44d58cc1 100644
--- a/js/Branching/CLKGotoTagVisibility.js
+++ b/js/Branching/CLKGotoTagVisibility.js
@@ -1,46 +1,46 @@
 /* autogenerated from "macros/Branching/CLKGotoTagVisibility.sci" */
 function CLKGotoTagVisibility() {
     CLKGotoTagVisibility.prototype.define = function CLKGotoTagVisibility() {
-model=scicos_model();
-model.sim="clkgototagvisibility";
-model.in1=[];
-model.in2=[];
-model.out=[];
-model.out2=[];
-model.evtin=[];
-model.intyp=1;
-model.outtyp=1;
-model.opar=list("A");
-model.blocktype="c";
-model.firing=false;
-model.dep_ut=[false,false];
-exprs="A";
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
+        model = scicos_model();
+        model.sim = "clkgototagvisibility";
+        model.in1 = [];
+        model.in2 = [];
+        model.out = [];
+        model.out2 = [];
+        model.evtin = [];
+        model.intyp = 1;
+        model.outtyp = 1;
+        model.opar = list("A");
+        model.blocktype = "c";
+        model.firing = false;
+        model.dep_ut = [false,false];
+        exprs = "A";
+        gr_i = [];
+        x = standard_define([2,2],model,exprs,gr_i);
     }
     CLKGotoTagVisibility.prototype.details = function CLKGotoTagVisibility() {
     }
     CLKGotoTagVisibility.prototype.get = function CLKGotoTagVisibility() {
     }
     CLKGotoTagVisibility.prototype.set = function CLKGotoTagVisibility() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,tag,exprs]=scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),exprs);
-if (!ok) {
+        x = arg1;
+        graphics = arg1.graphics;
+        exprs = graphics.exprs;
+        model = arg1.model;
+        while (true) {
+        [ok,tag,exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),exprs);
+        if (!ok) {
 break;
 }
-if (ok) {
-if (model.opar!=list(tag)) {
-needcompile=4;
-y=needcompile;
+        if (ok) {
+        if (model.opar!=list(tag)) {
+        needcompile = 4;
+        y = needcompile;
 }
-graphics.exprs=exprs;
-model.opar=list(tag);
-x.graphics=graphics;
-x.model=model;
+        graphics.exprs = exprs;
+        model.opar = list(tag);
+        x.graphics = graphics;
+        x.model = model;
 break;
 }
 }
diff --git a/js/Branching/DEMUX.js b/js/Branching/DEMUX.js
index 227bde07..22d11572 100644
--- a/js/Branching/DEMUX.js
+++ b/js/Branching/DEMUX.js
@@ -1,61 +1,61 @@
 /* autogenerated from "macros/Branching/DEMUX.sci" */
 function DEMUX() {
     DEMUX.prototype.define = function DEMUX() {
-out=2;
-model=scicos_model();
-model.sim=list("multiplex",4);
-model.in1=0;
-model.out=-transpose([1:out]);
-model.ipar=out;
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-exprs=string(out);
-gr_i=[];
-x=standard_define([.5,2],model,exprs,gr_i);
+        out = 2;
+        model = scicos_model();
+        model.sim = list("multiplex",4);
+        model.in1 = 0;
+        model.out = -transpose([1:out]);
+        model.ipar = out;
+        model.blocktype = "c";
+        model.firing = [];
+        model.dep_ut = [true,false];
+        exprs = string(out);
+        gr_i = [];
+        x = standard_define([.5,2],model,exprs,gr_i);
     }
     DEMUX.prototype.details = function DEMUX() {
     }
     DEMUX.prototype.get = function DEMUX() {
     }
     DEMUX.prototype.set = function DEMUX() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,out,exprs]=scicos_getvalue("Set DEMUX block parameters",["number of output ports or vector of sizes"],list("intvec",-1),exprs);
-if (!ok) {
+        x = arg1;
+        graphics = arg1.graphics;
+        exprs = graphics.exprs;
+        model = arg1.model;
+        while (true) {
+        [ok,out,exprs] = scicos_getvalue("Set DEMUX block parameters",["number of output ports or vector of sizes"],list("intvec",-1),exprs);
+        if (!ok) {
 break;
 }
-if (size(out,"*")==1) {
-if (out<2||out>31) {
+        if (size(out,"*")==1) {
+        if (out<2||out>31) {
 message("Block must have at least 2 and at most 31 output ports");
-ok=false;
-} else {
-[model,graphics,ok]=check_io(model,graphics,0,-transpose([1:out]),[],[]);
+        ok = false;
+        } else {
+        [model,graphics,ok] = check_io(model,graphics,0,-transpose([1:out]),[],[]);
 }
-} else {
-if (size(out,"*")<2||or(out==0)||size(out,"*")>31) {
+        } else {
+        if (size(out,"*")<2||or(out==0)||size(out,"*")>31) {
 message([["Block must have at least 2 and at most 31 output ports"],["size 0 is not allowed"]]);
-ok=false;
-} else {
-if (min(out)<0) {
-nin=0;
-} else {
-nin=sum(out);
+        ok = false;
+        } else {
+        if (min(out)<0) {
+        nin = 0;
+        } else {
+        nin = sum(out);
 }
-[model,graphics,ok]=check_io(model,graphics,nin,out.slice(),[],[]);
-if (ok) {
-out=size(out,"*");
+        [model,graphics,ok] = check_io(model,graphics,nin,out.slice(),[],[]);
+        if (ok) {
+        out = size(out,"*");
 }
 }
 }
-if (ok) {
-graphics.exprs=exprs;
-model.ipar=out;
-x.graphics=graphics;
-x.model=model;
+        if (ok) {
+        graphics.exprs = exprs;
+        model.ipar = out;
+        x.graphics = graphics;
+        x.model = model;
 break;
 }
 }
diff --git a/js/Branching/DEMUX_f.js b/js/Branching/DEMUX_f.js
index a104993b..8d9cb7eb 100644
--- a/js/Branching/DEMUX_f.js
+++ b/js/Branching/DEMUX_f.js
@@ -1,61 +1,61 @@
 /* autogenerated from "macros/Branching/DEMUX_f.sci" */
 function DEMUX_f() {
     DEMUX_f.prototype.define = function DEMUX_f() {
-out=2;
-model=scicos_model();
-model.sim=list("demux",1);
-model.in1=0;
-model.out=-transpose([1:out]);
-model.ipar=out;
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-exprs=string(out);
-gr_i=[];
-x=standard_define([.5,2],model,exprs,gr_i);
+        out = 2;
+        model = scicos_model();
+        model.sim = list("demux",1);
+        model.in1 = 0;
+        model.out = -transpose([1:out]);
+        model.ipar = out;
+        model.blocktype = "c";
+        model.firing = [];
+        model.dep_ut = [true,false];
+        exprs = string(out);
+        gr_i = [];
+        x = standard_define([.5,2],model,exprs,gr_i);
     }
     DEMUX_f.prototype.details = function DEMUX_f() {
     }
     DEMUX_f.prototype.get = function DEMUX_f() {
     }
     DEMUX_f.prototype.set = function DEMUX_f() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,out,exprs]=scicos_getvalue("Set DEMUX block parameters",["number of output ports or vector of sizes"],list("vec",-1),exprs);
-if (!ok) {
+        x = arg1;
+        graphics = arg1.graphics;
+        exprs = graphics.exprs;
+        model = arg1.model;
+        while (true) {
+        [ok,out,exprs] = scicos_getvalue("Set DEMUX block parameters",["number of output ports or vector of sizes"],list("vec",-1),exprs);
+        if (!ok) {
 break;
 }
-if (size(out,"*")==1) {
-if (out<2||out>8) {
+        if (size(out,"*")==1) {
+        if (out<2||out>8) {
 message("Block must have at least 2 and at most 8 output ports");
-ok=false;
-} else {
-[model,graphics,ok]=check_io(model,graphics,0,-transpose([1:out]),[],[]);
+        ok = false;
+        } else {
+        [model,graphics,ok] = check_io(model,graphics,0,-transpose([1:out]),[],[]);
 }
-} else {
-if (size(out,"*")<2||size(out,"*")>8||or(out==0)) {
+        } else {
+        if (size(out,"*")<2||size(out,"*")>8||or(out==0)) {
 message([["Block must have at least 2 and at most 8 output ports"],["and size 0 is not allowed"]]);
-ok=false;
-} else {
-if (min(out)<0) {
-nin=0;
-} else {
-nin=sum(out);
+        ok = false;
+        } else {
+        if (min(out)<0) {
+        nin = 0;
+        } else {
+        nin = sum(out);
 }
-[model,graphics,ok]=check_io(model,graphics,nin,out.slice(),[],[]);
-if (ok) {
-out=size(out,"*");
+        [model,graphics,ok] = check_io(model,graphics,nin,out.slice(),[],[]);
+        if (ok) {
+        out = size(out,"*");
 }
 }
 }
-if (ok) {
-graphics.exprs=exprs;
-model.ipar=out;
-x.graphics=graphics;
-x.model=model;
+        if (ok) {
+        graphics.exprs = exprs;
+        model.ipar = out;
+        x.graphics = graphics;
+        x.model = model;
 break;
 }
 }
diff --git a/js/Branching/ESELECT_f.js b/js/Branching/ESELECT_f.js
index 85efc4d4..663b7638 100644
--- a/js/Branching/ESELECT_f.js
+++ b/js/Branching/ESELECT_f.js
@@ -1,64 +1,64 @@
 /* autogenerated from "macros/Branching/ESELECT_f.sci" */
 function ESELECT_f() {
     ESELECT_f.prototype.define = function ESELECT_f() {
-out=2;
-model=scicos_model();
-model.sim=list("eselect",-2);
-model.in1=1;
-model.in2=1;
-model.intyp=-1;
-model.evtin=1;
-model.evtout=ones(out,1);
-model.blocktype="l";
-model.firing=-ones(out,1);
-model.dep_ut=[true,false];
-model.nmode=0;
-model.nzcross=0;
-gr_i=[];
-exprs=[[string(out)],[string(1)],[string(model.nmode)]];
-x=standard_define([4,2],model,exprs,gr_i);
+        out = 2;
+        model = scicos_model();
+        model.sim = list("eselect",-2);
+        model.in1 = 1;
+        model.in2 = 1;
+        model.intyp = -1;
+        model.evtin = 1;
+        model.evtout = ones(out,1);
+        model.blocktype = "l";
+        model.firing = -ones(out,1);
+        model.dep_ut = [true,false];
+        model.nmode = 0;
+        model.nzcross = 0;
+        gr_i = [];
+        exprs = [[string(out)],[string(1)],[string(model.nmode)]];
+        x = standard_define([4,2],model,exprs,gr_i);
     }
     ESELECT_f.prototype.details = function ESELECT_f() {
     }
     ESELECT_f.prototype.get = function ESELECT_f() {
     }
     ESELECT_f.prototype.set = function ESELECT_f() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-if (size(exprs,"*")==1) {
-exprs[2-1]=string(1);
+        x = arg1;
+        graphics = arg1.graphics;
+        exprs = graphics.exprs;
+        if (size(exprs,"*")==1) {
+        exprs[2-1] = string(1);
 }
-if (size(exprs,"*")==2) {
-exprs[3-1]=string(0);
+        if (size(exprs,"*")==2) {
+        exprs[3-1] = string(0);
 }
-model=arg1.model;
-while (true) {
-[ok,out,inh,nmod,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),exprs);
-if (!ok) {
+        model = arg1.model;
+        while (true) {
+        [ok,out,inh,nmod,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),exprs);
+        if (!ok) {
 break;
 }
-if (nmod!=0) {
-nmod=1;
+        if (nmod!=0) {
+        nmod = 1;
 }
-if (inh==0) {
-inh=[];
-} else {
-inh=1;
+        if (inh==0) {
+        inh = [];
+        } else {
+        inh = 1;
 }
-out=int(out);
-if (out<2) {
+        out = int(out);
+        if (out<2) {
 message("Block must have at least two output ports");
-} else {
-[model,graphics,ok]=check_io(model,graphics,1,[],inh,[ones(out,1)]);
-if (ok) {
-graphics.exprs=exprs;
-model.evtout=ones(out,1);
-model.firing=-ones(out,1);
-x.graphics=graphics;
-model.nmode=nmod;
-model.nzcross=nmod;
-x.model=model;
+        } else {
+        [model,graphics,ok] = check_io(model,graphics,1,[],inh,[ones(out,1)]);
+        if (ok) {
+        graphics.exprs = exprs;
+        model.evtout = ones(out,1);
+        model.firing = -ones(out,1);
+        x.graphics = graphics;
+        model.nmode = nmod;
+        model.nzcross = nmod;
+        x.model = model;
 break;
 }
 }
diff --git a/js/Branching/EXTRACTOR.js b/js/Branching/EXTRACTOR.js
index 7a1ee136..c904bda2 100644
--- a/js/Branching/EXTRACTOR.js
+++ b/js/Branching/EXTRACTOR.js
@@ -1,40 +1,40 @@
 /* autogenerated from "macros/Branching/EXTRACTOR.sci" */
 function EXTRACTOR() {
     EXTRACTOR.prototype.define = function EXTRACTOR() {
-ind=1;
-model=scicos_model();
-model.sim=list("extractor",4);
-model.in1=-1;
-model.out=1;
-model.blocktype="c";
-model.dep_ut=[true,false];
-model.ipar=ind;
-exprs=[sci2exp(ind)];
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
+        ind = 1;
+        model = scicos_model();
+        model.sim = list("extractor",4);
+        model.in1 = -1;
+        model.out = 1;
+        model.blocktype = "c";
+        model.dep_ut = [true,false];
+        model.ipar = ind;
+        exprs = [sci2exp(ind)];
+        gr_i = [];
+        x = standard_define([3,2],model,exprs,gr_i);
     }
     EXTRACTOR.prototype.details = function EXTRACTOR() {
     }
     EXTRACTOR.prototype.get = function EXTRACTOR() {
     }
     EXTRACTOR.prototype.set = function EXTRACTOR() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,ind,exprs]=scicos_getvalue("Set block parameters",["indices to extract"],list("vec",-1),exprs);
-if (!ok) {
+        x = arg1;
+        graphics = arg1.graphics;
+        exprs = graphics.exprs;
+        model = arg1.model;
+        while (true) {
+        [ok,ind,exprs] = scicos_getvalue("Set block parameters",["indices to extract"],list("vec",-1),exprs);
+        if (!ok) {
 break;
 }
-ind=int(ind);
-ind=ind.slice();
-[model,graphics,ok]=check_io(model,graphics,[-1],size(ind,1),[],[]);
-if (ok) {
-model.ipar=ind;
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
+        ind = int(ind);
+        ind = ind.slice();
+        [model,graphics,ok] = check_io(model,graphics,[-1],size(ind,1),[],[]);
+        if (ok) {
+        model.ipar = ind;
+        graphics.exprs = exprs;
+        x.graphics = graphics;
+        x.model = model;
 break;
 }
 }
diff --git a/js/Branching/FROM.js b/js/Branching/FROM.js
index 765a40b6..3317192f 100644
--- a/js/Branching/FROM.js
+++ b/js/Branching/FROM.js
@@ -1,46 +1,46 @@
 /* autogenerated from "macros/Branching/FROM.sci" */
 function FROM() {
     FROM.prototype.define = function FROM() {
-model=scicos_model();
-model.sim="from";
-model.in1=[];
-model.in2=[];
-model.intyp=1;
-model.out=-1;
-model.out2=-2;
-model.outtyp=-1;
-model.ipar=[];
-model.opar=list("A");
-model.blocktype="c";
-model.dep_ut=[false,false];
-exprs=["A"];
-gr_i=[];
-x=standard_define([2,1],model,exprs,gr_i);
-x.graphics.id="From";
+        model = scicos_model();
+        model.sim = "from";
+        model.in1 = [];
+        model.in2 = [];
+        model.intyp = 1;
+        model.out = -1;
+        model.out2 = -2;
+        model.outtyp = -1;
+        model.ipar = [];
+        model.opar = list("A");
+        model.blocktype = "c";
+        model.dep_ut = [false,false];
+        exprs = ["A"];
+        gr_i = [];
+        x = standard_define([2,1],model,exprs,gr_i);
+        x.graphics.id = "From";
     }
     FROM.prototype.details = function FROM() {
     }
     FROM.prototype.get = function FROM() {
     }
     FROM.prototype.set = function FROM() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,tag,exprs]=scicos_getvalue("Set parameters",["Tag"],list("str",-1),exprs);
-if (!ok) {
+        x = arg1;
+        graphics = arg1.graphics;
+        exprs = graphics.exprs;
+        model = arg1.model;
+        while (true) {
+        [ok,tag,exprs] = scicos_getvalue("Set parameters",["Tag"],list("str",-1),exprs);
+        if (!ok) {
 break;
 }
-if (ok) {
-if (model.opar!=list(tag)) {
-needcompile=4;
-y=needcompile;
+        if (ok) {
+        if (model.opar!=list(tag)) {
+        needcompile = 4;
+        y = needcompile;
 }
-graphics.exprs=exprs;
-model.opar=list(tag);
-x.model=model;
-x.graphics=graphics;
+        graphics.exprs = exprs;
+        model.opar = list(tag);
+        x.model = model;
+        x.graphics = graphics;
 break;
 }
 }
diff --git a/js/Branching/FROMMO.js b/js/Branching/FROMMO.js
index 76243bce..c026068b 100644
--- a/js/Branching/FROMMO.js
+++ b/js/Branching/FROMMO.js
@@ -1,49 +1,49 @@
 /* autogenerated from "macros/Branching/FROMMO.sci" */
 function FROMMO() {
     FROMMO.prototype.define = function FROMMO() {
-model=scicos_model();
-model.sim="frommo";
-model.in1=[];
-model.in2=[];
-model.intyp=1;
-model.out=-1;
-model.out2=-2;
-model.outtyp=-1;
-model.ipar=[];
-model.opar=list("A");
-model.blocktype="c";
-model.dep_ut=[false,false];
-mo=modelica();
-mo.model="frommo";
-mo.outputs="n";
-exprs=["A"];
-gr_i=[];
-x=standard_define([2,1],model,exprs,gr_i);
-x.graphics.out_implicit=["I"];
+        model = scicos_model();
+        model.sim = "frommo";
+        model.in1 = [];
+        model.in2 = [];
+        model.intyp = 1;
+        model.out = -1;
+        model.out2 = -2;
+        model.outtyp = -1;
+        model.ipar = [];
+        model.opar = list("A");
+        model.blocktype = "c";
+        model.dep_ut = [false,false];
+        mo = modelica();
+        mo.model = "frommo";
+        mo.outputs = "n";
+        exprs = ["A"];
+        gr_i = [];
+        x = standard_define([2,1],model,exprs,gr_i);
+        x.graphics.out_implicit = ["I"];
     }
     FROMMO.prototype.details = function FROMMO() {
     }
     FROMMO.prototype.get = function FROMMO() {
     }
     FROMMO.prototype.set = function FROMMO() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,tag,exprs]=scicos_getvalue("Set parameters",["Tag"],list("str",-1),exprs);
-if (!ok) {
+        x = arg1;
+        graphics = arg1.graphics;
+        exprs = graphics.exprs;
+        model = arg1.model;
+        while (true) {
+        [ok,tag,exprs] = scicos_getvalue("Set parameters",["Tag"],list("str",-1),exprs);
+        if (!ok) {
 break;
 }
-if (ok) {
-if (model.opar!=list(tag)) {
-needcompile=4;
-y=needcompile;
+        if (ok) {
+        if (model.opar!=list(tag)) {
+        needcompile = 4;
+        y = needcompile;
 }
-graphics.exprs=exprs;
-model.opar=list(tag);
-x.model=model;
-x.graphics=graphics;
+        graphics.exprs = exprs;
+        model.opar = list(tag);
+        x.model = model;
+        x.graphics = graphics;
 break;
 }
 }
diff --git a/js/Branching/GOTO.js b/js/Branching/GOTO.js
index 5c8b2ec8..ec23ad47 100644
--- a/js/Branching/GOTO.js
+++ b/js/Branching/GOTO.js
@@ -1,53 +1,53 @@
 /* autogenerated from "macros/Branching/GOTO.sci" */
 function GOTO() {
     GOTO.prototype.define = function GOTO() {
-model=scicos_model();
-model.sim="goto";
-model.in1=-1;
-model.in2=-2;
-model.intyp=-1;
-model.out=[];
-model.out2=[];
-model.outtyp=1;
-model.ipar=int(1);
-model.opar=list("A");
-model.blocktype="c";
-model.dep_ut=[false,false];
-exprs=[["A"],[sci2exp(1)]];
-gr_i=[];
-x=standard_define([2,1],model,exprs,gr_i);
-x.graphics.id="Goto";
+        model = scicos_model();
+        model.sim = "goto";
+        model.in1 = -1;
+        model.in2 = -2;
+        model.intyp = -1;
+        model.out = [];
+        model.out2 = [];
+        model.outtyp = 1;
+        model.ipar = int(1);
+        model.opar = list("A");
+        model.blocktype = "c";
+        model.dep_ut = [false,false];
+        exprs = [["A"],[sci2exp(1)]];
+        gr_i = [];
+        x = standard_define([2,1],model,exprs,gr_i);
+        x.graphics.id = "Goto";
     }
     GOTO.prototype.details = function GOTO() {
     }
     GOTO.prototype.get = function GOTO() {
     }
     GOTO.prototype.set = function GOTO() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,tag,tagvis,exprs]=scicos_getvalue("Set parameters",[["Tag"],["Tag Visibility(1=Local 2=scoped 3= global)"]],list("str",-1,"vec",1),exprs);
-if (!ok) {
+        x = arg1;
+        graphics = arg1.graphics;
+        exprs = graphics.exprs;
+        model = arg1.model;
+        while (true) {
+        [ok,tag,tagvis,exprs] = scicos_getvalue("Set parameters",[["Tag"],["Tag Visibility(1=Local 2=scoped 3= global)"]],list("str",-1,"vec",1),exprs);
+        if (!ok) {
 break;
 }
-tagvis=int(tagvis);
-if (((tagvis<1)||(tagvis>3))) {
+        tagvis = int(tagvis);
+        if (((tagvis<1)||(tagvis>3))) {
 message("Tag Visibility must be between 1 and 3");
-ok=false;
+        ok = false;
 }
-if (ok) {
-if (((model.ipar!=tagvis)||(model.opar!=list(tag)))) {
-needcompile=4;
-y=needcompile;
+        if (ok) {
+        if (((model.ipar!=tagvis)||(model.opar!=list(tag)))) {
+        needcompile = 4;
+        y = needcompile;
 }
-graphics.exprs=exprs;
-model.opar=list(tag);
-model.ipar=tagvis;
-x.model=model;
-x.graphics=graphics;
-arg1=x;
+        graphics.exprs = exprs;
+        model.opar = list(tag);
+        model.ipar = tagvis;
+        x.model = model;
+        x.graphics = graphics;
+        arg1 = x;
 break;
 }
 }
diff --git a/js/Branching/GOTOMO.js b/js/Branching/GOTOMO.js
index 3776d224..8ab01276 100644
--- a/js/Branching/GOTOMO.js
+++ b/js/Branching/GOTOMO.js
@@ -1,56 +1,56 @@
 /* autogenerated from "macros/Branching/GOTOMO.sci" */
 function GOTOMO() {
     GOTOMO.prototype.define = function GOTOMO() {
-model=scicos_model();
-model.sim="gotomo";
-model.in1=-1;
-model.in2=-2;
-model.intyp=[];
-model.out=[];
-model.out2=[];
-model.outtyp=1;
-model.ipar=int(1);
-model.opar=list("A");
-model.blocktype="c";
-model.dep_ut=[false,false];
-mo=modelica();
-mo.model="gotomo";
-mo.inputs="p";
-exprs=[["A"],[sci2exp(1)]];
-gr_i=[];
-x=standard_define([2,1],model,exprs,gr_i);
-x.graphics.in_implicit=["I"];
+        model = scicos_model();
+        model.sim = "gotomo";
+        model.in1 = -1;
+        model.in2 = -2;
+        model.intyp = [];
+        model.out = [];
+        model.out2 = [];
+        model.outtyp = 1;
+        model.ipar = int(1);
+        model.opar = list("A");
+        model.blocktype = "c";
+        model.dep_ut = [false,false];
+        mo = modelica();
+        mo.model = "gotomo";
+        mo.inputs = "p";
+        exprs = [["A"],[sci2exp(1)]];
+        gr_i = [];
+        x = standard_define([2,1],model,exprs,gr_i);
+        x.graphics.in_implicit = ["I"];
     }
     GOTOMO.prototype.details = function GOTOMO() {
     }
     GOTOMO.prototype.get = function GOTOMO() {
     }
     GOTOMO.prototype.set = function GOTOMO() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,tag,tagvis,exprs]=scicos_getvalue("Set parameters",[["Tag"],["Tag Visibility(1=Local 2=scoped 3= global)"]],list("str",-1,"vec",1),exprs);
-if (!ok) {
+        x = arg1;
+        graphics = arg1.graphics;
+        exprs = graphics.exprs;
+        model = arg1.model;
+        while (true) {
+        [ok,tag,tagvis,exprs] = scicos_getvalue("Set parameters",[["Tag"],["Tag Visibility(1=Local 2=scoped 3= global)"]],list("str",-1,"vec",1),exprs);
+        if (!ok) {
 break;
 }
-tagvis=int(tagvis);
-if (((tagvis<1)||(tagvis>3))) {
+        tagvis = int(tagvis);
+        if (((tagvis<1)||(tagvis>3))) {
 message("Tag Visibility must be between 1 and 3");
-ok=false;
+        ok = false;
 }
-if (ok) {
-if (((model.ipar!=tagvis)||(model.opar!=list(tag)))) {
-needcompile=4;
-y=needcompile;
+        if (ok) {
+        if (((model.ipar!=tagvis)||(model.opar!=list(tag)))) {
+        needcompile = 4;
+        y = needcompile;
 }
-graphics.exprs=exprs;
-model.opar=list(tag);
-model.ipar=tagvis;
-x.model=model;
-x.graphics=graphics;
-arg1=x;
+        graphics.exprs = exprs;
+        model.opar = list(tag);
+        model.ipar = tagvis;
+        x.model = model;
+        x.graphics = graphics;
+        arg1 = x;
 break;
 }
 }
diff --git a/js/Branching/GotoTagVisibility.js b/js/Branching/GotoTagVisibility.js
index f81b8c1f..445dc9a9 100644
--- a/js/Branching/GotoTagVisibility.js
+++ b/js/Branching/GotoTagVisibility.js
@@ -1,46 +1,46 @@
 /* autogenerated from "macros/Branching/GotoTagVisibility.sci" */
 function GotoTagVisibility() {
     GotoTagVisibility.prototype.define = function GotoTagVisibility() {
-model=scicos_model();
-model.sim="gototagvisibility";
-model.in1=[];
-model.in2=[];
-model.out=[];
-model.out2=[];
-model.evtin=[];
-model.intyp=1;
-model.outtyp=1;
-model.opar=list("A");
-model.blocktype="c";
-model.firing=false;
-model.dep_ut=[false,false];
-exprs="A";
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
+        model = scicos_model();
+        model.sim = "gototagvisibility";
+        model.in1 = [];
+        model.in2 = [];
+        model.out = [];
+        model.out2 = [];
+        model.evtin = [];
+        model.intyp = 1;
+        model.outtyp = 1;
+        model.opar = list("A");
+        model.blocktype = "c";
+        model.firing = false;
+        model.dep_ut = [false,false];
+        exprs = "A";
+        gr_i = [];
+        x = standard_define([2,2],model,exprs,gr_i);
     }
     GotoTagVisibility.prototype.details = function GotoTagVisibility() {
     }
     GotoTagVisibility.prototype.get = function GotoTagVisibility() {
     }
     GotoTagVisibility.prototype.set = function GotoTagVisibility() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,tag,exprs]=scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),exprs);
-if (!ok) {
+        x = arg1;
+        graphics = arg1.graphics;
+        exprs = graphics.exprs;
+        model = arg1.model;
+        while (true) {
+        [ok,tag,exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),exprs);
+        if (!ok) {
 break;
 }
-if (ok) {
-if (model.opar!=list(tag)) {
-needcompile=4;
-y=needcompile;
+        if (ok) {
+        if (model.opar!=list(tag)) {
+        needcompile = 4;
+        y = needcompile;
 }
-graphics.exprs=exprs;
-model.opar=list(tag);
-x.graphics=graphics;
-x.model=model;
+        graphics.exprs = exprs;
+        model.opar = list(tag);
+        x.graphics = graphics;
+        x.model = model;
 break;
 }
 }
diff --git a/js/Branching/GotoTagVisibilityMO.js b/js/Branching/GotoTagVisibilityMO.js
index 39795841..dce96fa2 100644
--- a/js/Branching/GotoTagVisibilityMO.js
+++ b/js/Branching/GotoTagVisibilityMO.js
@@ -1,46 +1,46 @@
 /* autogenerated from "macros/Branching/GotoTagVisibilityMO.sci" */
 function GotoTagVisibilityMO() {
     GotoTagVisibilityMO.prototype.define = function GotoTagVisibilityMO() {
-model=scicos_model();
-model.sim="gototagvisibilitymo";
-model.in1=[];
-model.in2=[];
-model.out=[];
-model.out2=[];
-model.evtin=[];
-model.intyp=1;
-model.outtyp=1;
-model.opar=list("A");
-model.blocktype="c";
-model.firing=false;
-model.dep_ut=[false,false];
-exprs="A";
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
+        model = scicos_model();
+        model.sim = "gototagvisibilitymo";
+        model.in1 = [];
+        model.in2 = [];
+        model.out = [];
+        model.out2 = [];
+        model.evtin = [];
+        model.intyp = 1;
+        model.outtyp = 1;
+        model.opar = list("A");
+        model.blocktype = "c";
+        model.firing = false;
+        model.dep_ut = [false,false];
+        exprs = "A";
+        gr_i = [];
+        x = standard_define([2,2],model,exprs,gr_i);
     }
     GotoTagVisibilityMO.prototype.details = function GotoTagVisibilityMO() {
     }
     GotoTagVisibilityMO.prototype.get = function GotoTagVisibilityMO() {
     }
     GotoTagVisibilityMO.prototype.set = function GotoTagVisibilityMO() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,tag,exprs]=scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),exprs);
-if (!ok) {
+        x = arg1;
+        graphics = arg1.graphics;
+        exprs = graphics.exprs;
+        model = arg1.model;
+        while (true) {
+        [ok,tag,exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),exprs);
+        if (!ok) {
 break;
 }
-if (ok) {
-if (model.opar!=list(tag)) {
-needcompile=4;
-y=needcompile;
+        if (ok) {
+        if (model.opar!=list(tag)) {
+        needcompile = 4;
+        y = needcompile;
 }
-graphics.exprs=exprs;
-model.opar=list(tag);
-x.graphics=graphics;
-x.model=model;
+        graphics.exprs = exprs;
+        model.opar = list(tag);
+        x.graphics = graphics;
+        x.model = model;
 break;
 }
 }
diff --git a/js/Branching/ISELECT_f.js b/js/Branching/ISELECT_f.js
index 49100737..e991df37 100644
--- a/js/Branching/ISELECT_f.js
+++ b/js/Branching/ISELECT_f.js
@@ -1,44 +1,44 @@
 /* autogenerated from "macros/Branching/ISELECT_f.sci" */
 function ISELECT_f() {
     ISELECT_f.prototype.define = function ISELECT_f() {
-z0=0;
-out=[[-1],[-1]];
-nout=2;
-model=scicos_model();
-model.sim=list("selector",2);
-model.in1=-1;
-model.out=out;
-model.evtin=ones(out);
-model.dstate=z0;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[[string(nout)],[string(z0+1)]];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
+        z0 = 0;
+        out = [[-1],[-1]];
+        nout = 2;
+        model = scicos_model();
+        model.sim = list("selector",2);
+        model.in1 = -1;
+        model.out = out;
+        model.evtin = ones(out);
+        model.dstate = z0;
+        model.blocktype = "c";
+        model.dep_ut = [true,false];
+        exprs = [[string(nout)],[string(z0+1)]];
+        gr_i = [];
+        x = standard_define([2,2],model,exprs,gr_i);
     }
     ISELECT_f.prototype.details = function ISELECT_f() {
     }
     ISELECT_f.prototype.get = function ISELECT_f() {
     }
     ISELECT_f.prototype.set = function ISELECT_f() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,nout,z0,exprs]=scicos_getvalue("Set parameters",[["number of outputs"],["initial connected output"]],list("vec",1,"vec",1),exprs);
-if (!ok) {
+        x = arg1;
+        graphics = arg1.graphics;
+        exprs = graphics.exprs;
+        model = arg1.model;
+        while (true) {
+        [ok,nout,z0,exprs] = scicos_getvalue("Set parameters",[["number of outputs"],["initial connected output"]],list("vec",1,"vec",1),exprs);
+        if (!ok) {
 break;
 }
-if (z0>nout||z0<=0) {
+        if (z0>nout||z0<=0) {
 message("initial connected input is not a valid input port number");
-} else {
-[model,graphics,ok]=check_io(model,graphics,-1,-ones(nout,1),ones(nout,1),[]);
-if (ok) {
-graphics.exprs=exprs;
-model.dstate=z0-1;
-x.graphics=graphics;
-x.model=model;
+        } else {
+        [model,graphics,ok] = check_io(model,graphics,-1,-ones(nout,1),ones(nout,1),[]);
+        if (ok) {
+        graphics.exprs = exprs;
+        model.dstate = z0-1;
+        x.graphics = graphics;
+        x.model = model;
 break;
 }
 }
diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js
index 0169a200..bf117d9b 100644
--- a/js/Branching/ISELECT_m.js
+++ b/js/Branching/ISELECT_m.js
@@ -1,60 +1,60 @@
 /* autogenerated from "macros/Branching/ISELECT_m.sci" */
 function ISELECT_m() {
     ISELECT_m.prototype.define = function ISELECT_m() {
-z0=1;
-nout=2;
-model=scicos_model();
-model.sim=list("selector_m",4);
-model.out=[[-1],[-1]];
-model.out2=[[-2],[-2]];
-model.outtyp=1;
-model.in1=-1;
-model.in2=-2;
-model.intyp=1;
-model.evtout=[];
-model.state=[];
-model.rpar=[];
-model.ipar=[];
-model.firing=[];
-model.evtin=ones(nout,1);
-model.dstate=z0;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[[sci2exp(1)],[sci2exp(nout)],[sci2exp(z0)]];
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
+        z0 = 1;
+        nout = 2;
+        model = scicos_model();
+        model.sim = list("selector_m",4);
+        model.out = [[-1],[-1]];
+        model.out2 = [[-2],[-2]];
+        model.outtyp = 1;
+        model.in1 = -1;
+        model.in2 = -2;
+        model.intyp = 1;
+        model.evtout = [];
+        model.state = [];
+        model.rpar = [];
+        model.ipar = [];
+        model.firing = [];
+        model.evtin = ones(nout,1);
+        model.dstate = z0;
+        model.blocktype = "c";
+        model.dep_ut = [true,false];
+        exprs = [[sci2exp(1)],[sci2exp(nout)],[sci2exp(z0)]];
+        gr_i = [];
+        x = standard_define([3,2],model,exprs,gr_i);
     }
     ISELECT_m.prototype.details = function ISELECT_m() {
     }
     ISELECT_m.prototype.get = function ISELECT_m() {
     }
     ISELECT_m.prototype.set = function ISELECT_m() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,typ,nout,z0,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),exprs);
-if (!ok) {
+        x = arg1;
+        graphics = arg1.graphics;
+        exprs = graphics.exprs;
+        model = arg1.model;
+        while (true) {
+        [ok,typ,nout,z0,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),exprs);
+        if (!ok) {
 break;
 }
-if (z0>nout||z0<=0) {
+        if (z0>nout||z0<=0) {
 message("initial connected input is not a valid input port number");
-} else if (((typ<1)||(typ>8))) {
+        } else if (((typ<1)||(typ>8))) {
 message("Datatype is not supported");
-ok=false;
-} else {
-it=typ;
-ot=typ*ones(1,nout);
-if (ok) {
-out=[-ones(nout,1),-2*ones(nout,1)];
-in1=[-1,-2];
-[model,graphics,ok]=set_io(model,graphics,list(in1,it),list(out,ot),ones(nout,1),[]);
-if (ok) {
-graphics.exprs=exprs;
-model.dstate=z0;
-x.graphics=graphics;
-x.model=model;
+        ok = false;
+        } else {
+        it = typ;
+        ot = typ*ones(1,nout);
+        if (ok) {
+        out = [-ones(nout,1),-2*ones(nout,1)];
+        in1 = [-1,-2];
+        [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),ones(nout,1),[]);
+        if (ok) {
+        graphics.exprs = exprs;
+        model.dstate = z0;
+        x.graphics = graphics;
+        x.model = model;
 break;
 }
 }
diff --git a/js/Branching/MUX.js b/js/Branching/MUX.js
index bbf0324e..1c6c4f75 100644
--- a/js/Branching/MUX.js
+++ b/js/Branching/MUX.js
@@ -1,60 +1,60 @@
 /* autogenerated from "macros/Branching/MUX.sci" */
 function MUX() {
     MUX.prototype.define = function MUX() {
-in1=2;
-model=scicos_model();
-model.sim=list("multiplex",4);
-model.in1=-transpose([1:in1]);
-model.out=0;
-model.ipar=in1;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=string(in1);
-gr_i=[];
-x=standard_define([.5,2],model,exprs,gr_i);
+        in1 = 2;
+        model = scicos_model();
+        model.sim = list("multiplex",4);
+        model.in1 = -transpose([1:in1]);
+        model.out = 0;
+        model.ipar = in1;
+        model.blocktype = "c";
+        model.dep_ut = [true,false];
+        exprs = string(in1);
+        gr_i = [];
+        x = standard_define([.5,2],model,exprs,gr_i);
     }
     MUX.prototype.details = function MUX() {
     }
     MUX.prototype.get = function MUX() {
     }
     MUX.prototype.set = function MUX() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,in1,exprs]=scicos_getvalue("Set MUX block parameters","number of input ports or vector of sizes",list("intvec",-1),exprs);
-if (!ok) {
+        x = arg1;
+        graphics = arg1.graphics;
+        exprs = graphics.exprs;
+        model = arg1.model;
+        while (true) {
+        [ok,in1,exprs] = scicos_getvalue("Set MUX block parameters","number of input ports or vector of sizes",list("intvec",-1),exprs);
+        if (!ok) {
 break;
 }
-if (size(in1,"*")==1) {
-if (in1<2||in1>31) {
+        if (size(in1,"*")==1) {
+        if (in1<2||in1>31) {
 message("Block must have at least two input ports and at most 31");
-ok=false;
-} else {
-[model,graphics,ok]=check_io(model,graphics,-transpose([1:in1]),0,[],[]);
+        ok = false;
+        } else {
+        [model,graphics,ok] = check_io(model,graphics,-transpose([1:in1]),0,[],[]);
 }
-} else {
-if (size(in1,"*")<2||or(in1==0)||size(in1,"*")>31) {
+        } else {
+        if (size(in1,"*")<2||or(in1==0)||size(in1,"*")>31) {
 message([["Block must have at least two input ports"],["and at most 31. Size 0 is not allowed. "]]);
-ok=false;
-} else {
-if (min(in1)<0) {
-nout=0;
-} else {
-nout=sum(in1);
+        ok = false;
+        } else {
+        if (min(in1)<0) {
+        nout = 0;
+        } else {
+        nout = sum(in1);
 }
-[model,graphics,ok]=check_io(model,graphics,in1.slice(),nout,[],[]);
-if (ok) {
-in1=size(in1,"*");
+        [model,graphics,ok] = check_io(model,graphics,in1.slice(),nout,[],[]);
+        if (ok) {
+        in1 = size(in1,"*");
 }
 }
 }
-if (ok) {
-graphics.exprs=exprs;
-model.ipar=in1;
-x.graphics=graphics;
-x.model=model;
+        if (ok) {
+        graphics.exprs = exprs;
+        model.ipar = in1;
+        x.graphics = graphics;
+        x.model = model;
 break;
 }
 }
diff --git a/js/Branching/MUX_f.js b/js/Branching/MUX_f.js
index 2f6037ce..0bc7f2f7 100644
--- a/js/Branching/MUX_f.js
+++ b/js/Branching/MUX_f.js
@@ -1,60 +1,60 @@
 /* autogenerated from "macros/Branching/MUX_f.sci" */
 function MUX_f() {
     MUX_f.prototype.define = function MUX_f() {
-in1=2;
-model=scicos_model();
-model.sim=list("mux",1);
-model.in1=-transpose([1:in1]);
-model.out=0;
-model.ipar=in1;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=string(in1);
-gr_i=[];
-x=standard_define([0.5,2],model,exprs,gr_i);
+        in1 = 2;
+        model = scicos_model();
+        model.sim = list("mux",1);
+        model.in1 = -transpose([1:in1]);
+        model.out = 0;
+        model.ipar = in1;
+        model.blocktype = "c";
+        model.dep_ut = [true,false];
+        exprs = string(in1);
+        gr_i = [];
+        x = standard_define([0.5,2],model,exprs,gr_i);
     }
     MUX_f.prototype.details = function MUX_f() {
     }
     MUX_f.prototype.get = function MUX_f() {
     }
     MUX_f.prototype.set = function MUX_f() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,in1,exprs]=scicos_getvalue("Set MUX block parameters","number of input ports or vector of sizes",list("vec",-1),exprs);
-if (!ok) {
+        x = arg1;
+        graphics = arg1.graphics;
+        exprs = graphics.exprs;
+        model = arg1.model;
+        while (true) {
+        [ok,in1,exprs] = scicos_getvalue("Set MUX block parameters","number of input ports or vector of sizes",list("vec",-1),exprs);
+        if (!ok) {
 break;
 }
-if (size(in1,"*")==1) {
-if (in1<2||in1>8) {
+        if (size(in1,"*")==1) {
+        if (in1<2||in1>8) {
 message("Block must have at least two input ports and at most eight");
-ok=false;
-} else {
-[model,graphics,ok]=check_io(model,graphics,-transpose([1:in1]),0,[],[]);
+        ok = false;
+        } else {
+        [model,graphics,ok] = check_io(model,graphics,-transpose([1:in1]),0,[],[]);
 }
-} else {
-if (size(in1,"*")<2||size(in1,"*")>8||or(in1==0)) {
+        } else {
+        if (size(in1,"*")<2||size(in1,"*")>8||or(in1==0)) {
 message([["Block must have at least two input ports"],["and at most eight, and size 0 is not allowed. "]]);
-ok=false;
-} else {
-if (min(in1)<0) {
-nout=0;
-} else {
-nout=sum(in1);
+        ok = false;
+        } else {
+        if (min(in1)<0) {
+        nout = 0;
+        } else {
+        nout = sum(in1);
 }
-[model,graphics,ok]=check_io(model,graphics,in1.slice(),nout,[],[]);
-if (ok) {
-in1=size(in1,"*");
+        [model,graphics,ok] = check_io(model,graphics,in1.slice(),nout,[],[]);
+        if (ok) {
+        in1 = size(in1,"*");
 }
 }
 }
-if (ok) {
-graphics.exprs=exprs;
-model.ipar=in1;
-x.graphics=graphics;
-x.model=model;
+        if (ok) {
+        graphics.exprs = exprs;
+        model.ipar = in1;
+        x.graphics = graphics;
+        x.model = model;
 break;
 }
 }
diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js
index f9c44e75..724ea1f0 100644
--- a/js/Branching/M_SWITCH.js
+++ b/js/Branching/M_SWITCH.js
@@ -1,60 +1,60 @@
 /* autogenerated from "macros/Branching/M_SWITCH.sci" */
 function M_SWITCH() {
     M_SWITCH.prototype.define = function M_SWITCH() {
-in1=[[1],[-1],[-1]];
-ipar=[[1],[3]];
-nin=2;
-model=scicos_model();
-model.sim=list("mswitch",4);
-model.in1=in1;
-model.out=-1;
-model.ipar=ipar;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[[string(nin)],[string(ipar)]];
-gr_i=[];
-x=standard_define([2.5,2],model,exprs,gr_i);
+        in1 = [[1],[-1],[-1]];
+        ipar = [[1],[3]];
+        nin = 2;
+        model = scicos_model();
+        model.sim = list("mswitch",4);
+        model.in1 = in1;
+        model.out = -1;
+        model.ipar = ipar;
+        model.blocktype = "c";
+        model.dep_ut = [true,false];
+        exprs = [[string(nin)],[string(ipar)]];
+        gr_i = [];
+        x = standard_define([2.5,2],model,exprs,gr_i);
     }
     M_SWITCH.prototype.details = function M_SWITCH() {
     }
     M_SWITCH.prototype.get = function M_SWITCH() {
     }
     M_SWITCH.prototype.set = function M_SWITCH() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,nin,base,rule,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),exprs);
-if (!ok) {
+        x = arg1;
+        graphics = arg1.graphics;
+        exprs = graphics.exprs;
+        model = arg1.model;
+        while (true) {
+        [ok,nin,base,rule,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),exprs);
+        if (!ok) {
 break;
 }
-nin=int(nin);
-base=int(base);
-if (nin<1) {
+        nin = int(nin);
+        base = int(base);
+        if (nin<1) {
 message("Number of inputs must be >=1 ");
-} else if (!((base==1)||(base==0))) {
+        } else if (!((base==1)||(base==0))) {
 message("base indexing must be 1 or 0");
-} else if (!((rule==1)||(rule==0)||(rule==2)||(rule==3))) {
+        } else if (!((rule==1)||(rule==0)||(rule==2)||(rule==3))) {
 message("incorrect rounding rule");
-} else {
-if (nin==1) {
-in1=[[1,1],[-1,1]];
-out=[1,1];
-} else {
-in1=[[1],[-ones(nin,1)]];
-in2=[[1],[-2*ones(nin,1)]];
-in1=[in1,in2];
-out=[-1,-2];
+        } else {
+        if (nin==1) {
+        in1 = [[1,1],[-1,1]];
+        out = [1,1];
+        } else {
+        in1 = [[1],[-ones(nin,1)]];
+        in2 = [[1],[-2*ones(nin,1)]];
+        in1 = [in1,in2];
+        out = [-1,-2];
 }
-it=[[-1],[-2*ones(nin,1)]];
-ot=-2;
-[model,graphics,ok]=set_io(model,graphics,list(in1,it),list(out,ot),[],[]);
-if (ok) {
-graphics.exprs=exprs;
-model.ipar=[[base],[rule]];
-x.graphics=graphics;
-x.model=model;
+        it = [[-1],[-2*ones(nin,1)]];
+        ot = -2;
+        [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]);
+        if (ok) {
+        graphics.exprs = exprs;
+        model.ipar = [[base],[rule]];
+        x.graphics = graphics;
+        x.model = model;
 break;
 }
 }
diff --git a/js/Branching/NRMSOM_f.js b/js/Branching/NRMSOM_f.js
index dbeb1f4c..f9fd7ffc 100644
--- a/js/Branching/NRMSOM_f.js
+++ b/js/Branching/NRMSOM_f.js
@@ -1,37 +1,37 @@
 /* autogenerated from "macros/Branching/NRMSOM_f.sci" */
 function NRMSOM_f() {
     NRMSOM_f.prototype.define = function NRMSOM_f() {
-in1=[[-1],[-1]];
-nin=2;
-model=scicos_model();
-model.sim="junk";
-model.in1=in1;
-model.out=-1;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[string(nin)];
-gr_i=[];
-x=standard_define([.2,2],model,exprs,gr_i);
+        in1 = [[-1],[-1]];
+        nin = 2;
+        model = scicos_model();
+        model.sim = "junk";
+        model.in1 = in1;
+        model.out = -1;
+        model.blocktype = "c";
+        model.dep_ut = [true,false];
+        exprs = [string(nin)];
+        gr_i = [];
+        x = standard_define([.2,2],model,exprs,gr_i);
     }
     NRMSOM_f.prototype.details = function NRMSOM_f() {
     }
     NRMSOM_f.prototype.get = function NRMSOM_f() {
     }
     NRMSOM_f.prototype.set = function NRMSOM_f() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,nin,exprs]=scicos_getvalue("Set parameters",["number of inputs"],list("vec",1),exprs);
-if (!ok) {
+        x = arg1;
+        graphics = arg1.graphics;
+        exprs = graphics.exprs;
+        model = arg1.model;
+        while (true) {
+        [ok,nin,exprs] = scicos_getvalue("Set parameters",["number of inputs"],list("vec",1),exprs);
+        if (!ok) {
 break;
 }
-[model,graphics,ok]=check_io(model,graphics,-ones(nin,1),-1,[],[]);
-if (ok) {
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
+        [model,graphics,ok] = check_io(model,graphics,-ones(nin,1),-1,[],[]);
+        if (ok) {
+        graphics.exprs = exprs;
+        x.graphics = graphics;
+        x.model = model;
 break;
 }
 }
diff --git a/js/Branching/RELAY_f.js b/js/Branching/RELAY_f.js
index 14d629dd..ca190330 100644
--- a/js/Branching/RELAY_f.js
+++ b/js/Branching/RELAY_f.js
@@ -1,46 +1,46 @@
 /* autogenerated from "macros/Branching/RELAY_f.sci" */
 function RELAY_f() {
     RELAY_f.prototype.define = function RELAY_f() {
-i0=0;
-in1=[[-1],[-1]];
-nin=2;
-model=scicos_model();
-model.sim=list("relay",2);
-model.in1=in1;
-model.out=-1;
-model.evtin=ones(in1);
-model.dstate=i0;
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,true];
-exprs=[[string(nin)],[string(i0+1)]];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
+        i0 = 0;
+        in1 = [[-1],[-1]];
+        nin = 2;
+        model = scicos_model();
+        model.sim = list("relay",2);
+        model.in1 = in1;
+        model.out = -1;
+        model.evtin = ones(in1);
+        model.dstate = i0;
+        model.blocktype = "c";
+        model.firing = [];
+        model.dep_ut = [true,true];
+        exprs = [[string(nin)],[string(i0+1)]];
+        gr_i = [];
+        x = standard_define([2,2],model,exprs,gr_i);
     }
     RELAY_f.prototype.details = function RELAY_f() {
     }
     RELAY_f.prototype.get = function RELAY_f() {
     }
     RELAY_f.prototype.set = function RELAY_f() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-ipar=model.ipar;
-while (true) {
-[ok,nin,z0,exprs]=scicos_getvalue("Set parameters",[["number of inputs"],["initial connected input"]],list("vec",1,"vec",1),exprs);
-if (!ok) {
+        x = arg1;
+        graphics = arg1.graphics;
+        exprs = graphics.exprs;
+        model = arg1.model;
+        ipar = model.ipar;
+        while (true) {
+        [ok,nin,z0,exprs] = scicos_getvalue("Set parameters",[["number of inputs"],["initial connected input"]],list("vec",1,"vec",1),exprs);
+        if (!ok) {
 break;
 }
-if (z0>nin||z0<=0) {
+        if (z0>nin||z0<=0) {
 message("initial connected input is not a valid input port number");
-} else {
-[model,graphics,ok]=check_io(model,graphics,-ones(nin,1),-1,ones(nin,1),[]);
-if (ok) {
-graphics.exprs=exprs;
-model.dstate=z0-1;
-x.graphics=graphics;
-x.model=model;
+        } else {
+        [model,graphics,ok] = check_io(model,graphics,-ones(nin,1),-1,ones(nin,1),[]);
+        if (ok) {
+        graphics.exprs = exprs;
+        model.dstate = z0-1;
+        x.graphics = graphics;
+        x.model = model;
 break;
 }
 }
diff --git a/js/Branching/SCALAR2VECTOR.js b/js/Branching/SCALAR2VECTOR.js
index e7b20750..867ef489 100644
--- a/js/Branching/SCALAR2VECTOR.js
+++ b/js/Branching/SCALAR2VECTOR.js
@@ -1,43 +1,43 @@
 /* autogenerated from "macros/Branching/SCALAR2VECTOR.sci" */
 function SCALAR2VECTOR() {
     SCALAR2VECTOR.prototype.define = function SCALAR2VECTOR() {
-nout=-1;
-model=scicos_model();
-model.sim=list("scalar2vector",4);
-model.out=nout;
-model.in1=1;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[string([nout])];
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
+        nout = -1;
+        model = scicos_model();
+        model.sim = list("scalar2vector",4);
+        model.out = nout;
+        model.in1 = 1;
+        model.blocktype = "c";
+        model.dep_ut = [true,false];
+        exprs = [string([nout])];
+        gr_i = [];
+        x = standard_define([3,2],model,exprs,gr_i);
     }
     SCALAR2VECTOR.prototype.details = function SCALAR2VECTOR() {
     }
     SCALAR2VECTOR.prototype.get = function SCALAR2VECTOR() {
     }
     SCALAR2VECTOR.prototype.set = function SCALAR2VECTOR() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,nout,exprs]=scicos_getvalue("Set block parameters",["size of output (-1: if don\'t know)"],list("vec",1),exprs);
-if (!ok) {
+        x = arg1;
+        graphics = arg1.graphics;
+        exprs = graphics.exprs;
+        model = arg1.model;
+        while (true) {
+        [ok,nout,exprs] = scicos_getvalue("Set block parameters",["size of output (-1: if don\'t know)"],list("vec",1),exprs);
+        if (!ok) {
 break;
 }
-nout=int(nout);
-if ((nout!=-1&&(nout<=0))) {
+        nout = int(nout);
+        if ((nout!=-1&&(nout<=0))) {
 message("size of output must be -1 or >0");
-ok=false;
+        ok = false;
 }
-if (ok) {
-[model,graphics,ok]=check_io(model,graphics,[1],nout,[],[]);
+        if (ok) {
+        [model,graphics,ok] = check_io(model,graphics,[1],nout,[],[]);
 }
-if (ok) {
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
+        if (ok) {
+        graphics.exprs = exprs;
+        x.graphics = graphics;
+        x.model = model;
 break;
 }
 }
diff --git a/js/Branching/SELECT_f.js b/js/Branching/SELECT_f.js
index e9d95076..31515a65 100644
--- a/js/Branching/SELECT_f.js
+++ b/js/Branching/SELECT_f.js
@@ -1,44 +1,44 @@
 /* autogenerated from "macros/Branching/SELECT_f.sci" */
 function SELECT_f() {
     SELECT_f.prototype.define = function SELECT_f() {
-z0=0;
-in1=[[-1],[-1]];
-nin=2;
-model=scicos_model();
-model.sim=list("selector",2);
-model.in1=in1;
-model.out=-1;
-model.evtin=ones(in1);
-model.dstate=z0;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[[string(nin)],[string(z0+1)]];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
+        z0 = 0;
+        in1 = [[-1],[-1]];
+        nin = 2;
+        model = scicos_model();
+        model.sim = list("selector",2);
+        model.in1 = in1;
+        model.out = -1;
+        model.evtin = ones(in1);
+        model.dstate = z0;
+        model.blocktype = "c";
+        model.dep_ut = [true,false];
+        exprs = [[string(nin)],[string(z0+1)]];
+        gr_i = [];
+        x = standard_define([2,2],model,exprs,gr_i);
     }
     SELECT_f.prototype.details = function SELECT_f() {
     }
     SELECT_f.prototype.get = function SELECT_f() {
     }
     SELECT_f.prototype.set = function SELECT_f() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,nin,z0,exprs]=scicos_getvalue("Set parameters",[["number of inputs"],["initial connected input"]],list("vec",1,"vec",1),exprs);
-if (!ok) {
+        x = arg1;
+        graphics = arg1.graphics;
+        exprs = graphics.exprs;
+        model = arg1.model;
+        while (true) {
+        [ok,nin,z0,exprs] = scicos_getvalue("Set parameters",[["number of inputs"],["initial connected input"]],list("vec",1,"vec",1),exprs);
+        if (!ok) {
 break;
 }
-if (z0>nin||z0<=0) {
+        if (z0>nin||z0<=0) {
 message("initial connected input is not a valid input port number");
-} else {
-[model,graphics,ok]=check_io(model,graphics,-ones(nin,1),-1,ones(nin,1),[]);
-if (ok) {
-graphics.exprs=exprs;
-model.dstate=z0-1;
-x.graphics=graphics;
-x.model=model;
+        } else {
+        [model,graphics,ok] = check_io(model,graphics,-ones(nin,1),-1,ones(nin,1),[]);
+        if (ok) {
+        graphics.exprs = exprs;
+        model.dstate = z0-1;
+        x.graphics = graphics;
+        x.model = model;
 break;
 }
 }
diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js
index e06aed6b..90fb26c3 100644
--- a/js/Branching/SELECT_m.js
+++ b/js/Branching/SELECT_m.js
@@ -1,60 +1,60 @@
 /* autogenerated from "macros/Branching/SELECT_m.sci" */
 function SELECT_m() {
     SELECT_m.prototype.define = function SELECT_m() {
-z0=1;
-nin=2;
-model=scicos_model();
-model.sim=list("selector_m",4);
-model.in1=[[-1],[-1]];
-model.in2=[[-2],[-2]];
-model.intyp=1;
-model.out=-1;
-model.out2=-2;
-model.outtyp=1;
-model.evtout=[];
-model.state=[];
-model.rpar=[];
-model.ipar=[];
-model.firing=[];
-model.evtin=ones(nin,1);
-model.dstate=z0;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[[sci2exp(1)],[sci2exp(nin)],[sci2exp(z0)]];
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
+        z0 = 1;
+        nin = 2;
+        model = scicos_model();
+        model.sim = list("selector_m",4);
+        model.in1 = [[-1],[-1]];
+        model.in2 = [[-2],[-2]];
+        model.intyp = 1;
+        model.out = -1;
+        model.out2 = -2;
+        model.outtyp = 1;
+        model.evtout = [];
+        model.state = [];
+        model.rpar = [];
+        model.ipar = [];
+        model.firing = [];
+        model.evtin = ones(nin,1);
+        model.dstate = z0;
+        model.blocktype = "c";
+        model.dep_ut = [true,false];
+        exprs = [[sci2exp(1)],[sci2exp(nin)],[sci2exp(z0)]];
+        gr_i = [];
+        x = standard_define([3,2],model,exprs,gr_i);
     }
     SELECT_m.prototype.details = function SELECT_m() {
     }
     SELECT_m.prototype.get = function SELECT_m() {
     }
     SELECT_m.prototype.set = function SELECT_m() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,typ,nin,z0,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),exprs);
-if (!ok) {
+        x = arg1;
+        graphics = arg1.graphics;
+        exprs = graphics.exprs;
+        model = arg1.model;
+        while (true) {
+        [ok,typ,nin,z0,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),exprs);
+        if (!ok) {
 break;
 }
-if (z0>nin||z0<=0) {
+        if (z0>nin||z0<=0) {
 message("initial connected input is not a valid input port number");
-} else if (((typ<1)||(typ>8))&&(typ!=-1)) {
+        } else if (((typ<1)||(typ>8))&&(typ!=-1)) {
 message("Datatype is not supported");
-ok=false;
-} else {
-it=typ*ones(1,nin);
-ot=typ;
-if (ok) {
-in1=[-ones(nin,1),-2*ones(nin,1)];
-out=[-1,-2];
-[model,graphics,ok]=set_io(model,graphics,list(in1,it),list(out,ot),ones(nin,1),[]);
-if (ok) {
-graphics.exprs=exprs;
-model.dstate=z0;
-x.graphics=graphics;
-x.model=model;
+        ok = false;
+        } else {
+        it = typ*ones(1,nin);
+        ot = typ;
+        if (ok) {
+        in1 = [-ones(nin,1),-2*ones(nin,1)];
+        out = [-1,-2];
+        [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),ones(nin,1),[]);
+        if (ok) {
+        graphics.exprs = exprs;
+        model.dstate = z0;
+        x.graphics = graphics;
+        x.model = model;
 break;
 }
 }
diff --git a/js/Branching/SWITCH2.js b/js/Branching/SWITCH2.js
index ff1c7f1b..7d9d8d50 100644
--- a/js/Branching/SWITCH2.js
+++ b/js/Branching/SWITCH2.js
@@ -1,57 +1,57 @@
 /* autogenerated from "macros/Branching/SWITCH2.sci" */
 function SWITCH2() {
     SWITCH2.prototype.define = function SWITCH2() {
-in1=[[-1],[1],[-1]];
-ipar=[0];
-nzz=1;
-rpar=0;
-model=scicos_model();
-model.sim=list("switch2",4);
-model.in1=in1;
-model.out=-1;
-model.ipar=ipar;
-model.rpar=rpar;
-model.nzcross=nzz;
-model.nmode=1;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[[string(ipar)],[string(rpar)],[string(nzz)]];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
+        in1 = [[-1],[1],[-1]];
+        ipar = [0];
+        nzz = 1;
+        rpar = 0;
+        model = scicos_model();
+        model.sim = list("switch2",4);
+        model.in1 = in1;
+        model.out = -1;
+        model.ipar = ipar;
+        model.rpar = rpar;
+        model.nzcross = nzz;
+        model.nmode = 1;
+        model.blocktype = "c";
+        model.dep_ut = [true,false];
+        exprs = [[string(ipar)],[string(rpar)],[string(nzz)]];
+        gr_i = [];
+        x = standard_define([2,2],model,exprs,gr_i);
     }
     SWITCH2.prototype.details = function SWITCH2() {
     }
     SWITCH2.prototype.get = function SWITCH2() {
     }
     SWITCH2.prototype.set = function SWITCH2() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,rule,thra,nzz,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),exprs);
-if (!ok) {
+        x = arg1;
+        graphics = arg1.graphics;
+        exprs = graphics.exprs;
+        model = arg1.model;
+        while (true) {
+        [ok,rule,thra,nzz,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),exprs);
+        if (!ok) {
 break;
 }
-rule=int(rule);
-if ((rule<0)) {
-rule=0;
+        rule = int(rule);
+        if ((rule<0)) {
+        rule = 0;
 }
-if ((rule>2)) {
-rule=2;
+        if ((rule>2)) {
+        rule = 2;
 }
-graphics.exprs=exprs;
-model.ipar=rule;
-model.rpar=thra;
-if (nzz!=0) {
-model.nmode=1;
-model.nzcross=1;
-} else {
-model.nmode=0;
-model.nzcross=0;
+        graphics.exprs = exprs;
+        model.ipar = rule;
+        model.rpar = thra;
+        if (nzz!=0) {
+        model.nmode = 1;
+        model.nzcross = 1;
+        } else {
+        model.nmode = 0;
+        model.nzcross = 0;
 }
-x.graphics=graphics;
-x.model=model;
+        x.graphics = graphics;
+        x.model = model;
 break;
 }
     }
diff --git a/js/Branching/SWITCH2_m.js b/js/Branching/SWITCH2_m.js
index ad24aa83..de8df531 100644
--- a/js/Branching/SWITCH2_m.js
+++ b/js/Branching/SWITCH2_m.js
@@ -1,73 +1,73 @@
 /* autogenerated from "macros/Branching/SWITCH2_m.sci" */
 function SWITCH2_m() {
     SWITCH2_m.prototype.define = function SWITCH2_m() {
-ipar=[0];
-nzz=1;
-rpar=0;
-model=scicos_model();
-model.sim=list("switch2_m",4);
-model.in1=[[-1],[1],[-1]];
-model.in2=[[-2],[1],[-2]];
-model.intyp=1;
-model.out=-1;
-model.out2=-2;
-model.outtyp=1;
-model.ipar=ipar;
-model.rpar=rpar;
-model.nzcross=nzz;
-model.nmode=1;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[[sci2exp(1)],[string(ipar)],[string(rpar)],[string(nzz)]];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
+        ipar = [0];
+        nzz = 1;
+        rpar = 0;
+        model = scicos_model();
+        model.sim = list("switch2_m",4);
+        model.in1 = [[-1],[1],[-1]];
+        model.in2 = [[-2],[1],[-2]];
+        model.intyp = 1;
+        model.out = -1;
+        model.out2 = -2;
+        model.outtyp = 1;
+        model.ipar = ipar;
+        model.rpar = rpar;
+        model.nzcross = nzz;
+        model.nmode = 1;
+        model.blocktype = "c";
+        model.dep_ut = [true,false];
+        exprs = [[sci2exp(1)],[string(ipar)],[string(rpar)],[string(nzz)]];
+        gr_i = [];
+        x = standard_define([2,2],model,exprs,gr_i);
     }
     SWITCH2_m.prototype.details = function SWITCH2_m() {
     }
     SWITCH2_m.prototype.get = function SWITCH2_m() {
     }
     SWITCH2_m.prototype.set = function SWITCH2_m() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,ot,rule,thra,nzz,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),exprs);
-if (!ok) {
+        x = arg1;
+        graphics = arg1.graphics;
+        exprs = graphics.exprs;
+        model = arg1.model;
+        while (true) {
+        [ok,ot,rule,thra,nzz,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),exprs);
+        if (!ok) {
 break;
 }
-rule=int(rule);
-if ((rule<0)) {
-rule=0;
+        rule = int(rule);
+        if ((rule<0)) {
+        rule = 0;
 }
-if ((rule>2)) {
-rule=2;
+        if ((rule>2)) {
+        rule = 2;
 }
-graphics.exprs=exprs;
-model.ipar=rule;
-model.rpar=thra;
-if (nzz!=0) {
-model.nmode=1;
-model.nzcross=1;
-} else {
-model.nmode=0;
-model.nzcross=0;
+        graphics.exprs = exprs;
+        model.ipar = rule;
+        model.rpar = thra;
+        if (nzz!=0) {
+        model.nmode = 1;
+        model.nzcross = 1;
+        } else {
+        model.nmode = 0;
+        model.nzcross = 0;
 }
-if (((ot<1)||(ot>8))&&(ot!=-1)) {
+        if (((ot<1)||(ot>8))&&(ot!=-1)) {
 message("Datatype is not supported");
-ok=false;
+        ok = false;
 }
-if (ok) {
-it[1-1]=ot;
-it[2-1]=1;
-it[3-1]=ot;
-in1=[model.in1,model.in2];
-out=[model.out,model.out2];
-[model,graphics,ok]=set_io(model,graphics,list(in1,it),list(out,ot),[],[]);
+        if (ok) {
+        it[1-1] = ot;
+        it[2-1] = 1;
+        it[3-1] = ot;
+        in1 = [model.in1,model.in2];
+        out = [model.out,model.out2];
+        [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]);
 }
-if (ok) {
-x.graphics=graphics;
-x.model=model;
+        if (ok) {
+        x.graphics = graphics;
+        x.model = model;
 break;
 }
 }
diff --git a/js/Branching/SWITCH_f.js b/js/Branching/SWITCH_f.js
index 02d8f0b1..87b1b6e8 100644
--- a/js/Branching/SWITCH_f.js
+++ b/js/Branching/SWITCH_f.js
@@ -1,45 +1,45 @@
 /* autogenerated from "macros/Branching/SWITCH_f.sci" */
 function SWITCH_f() {
     SWITCH_f.prototype.define = function SWITCH_f() {
-i0=0;
-in1=[[-1],[-1]];
-nin=2;
-model=scicos_model();
-model.sim=list("switchn",2);
-model.in1=in1;
-model.out=-1;
-model.ipar=i0;
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,true];
-exprs=[[string(nin)],[string(i0+1)]];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
+        i0 = 0;
+        in1 = [[-1],[-1]];
+        nin = 2;
+        model = scicos_model();
+        model.sim = list("switchn",2);
+        model.in1 = in1;
+        model.out = -1;
+        model.ipar = i0;
+        model.blocktype = "c";
+        model.firing = [];
+        model.dep_ut = [true,true];
+        exprs = [[string(nin)],[string(i0+1)]];
+        gr_i = [];
+        x = standard_define([2,2],model,exprs,gr_i);
     }
     SWITCH_f.prototype.details = function SWITCH_f() {
     }
     SWITCH_f.prototype.get = function SWITCH_f() {
     }
     SWITCH_f.prototype.set = function SWITCH_f() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-ipar=model.ipar;
-while (true) {
-[ok,nin,z0,exprs]=scicos_getvalue("Set switch parameters",[["number of inputs"],["connected input"]],list("vec",1,"vec",1),exprs);
-if (!ok) {
+        x = arg1;
+        graphics = arg1.graphics;
+        exprs = graphics.exprs;
+        model = arg1.model;
+        ipar = model.ipar;
+        while (true) {
+        [ok,nin,z0,exprs] = scicos_getvalue("Set switch parameters",[["number of inputs"],["connected input"]],list("vec",1,"vec",1),exprs);
+        if (!ok) {
 break;
 }
-if (z0>nin||z0<=0) {
+        if (z0>nin||z0<=0) {
 message("initial connected input is not a valid input port number");
-} else {
-[model,graphics,ok]=check_io(model,graphics,-ones(nin,1),-1,[],[]);
-if (ok) {
-graphics.exprs=exprs;
-model.ipar=z0-1;
-x.graphics=graphics;
-x.model=model;
+        } else {
+        [model,graphics,ok] = check_io(model,graphics,-ones(nin,1),-1,[],[]);
+        if (ok) {
+        graphics.exprs = exprs;
+        model.ipar = z0-1;
+        x.graphics = graphics;
+        x.model = model;
 break;
 }
 }