26 files changed, 488 insertions, 488 deletions

diff --git a/js/Branching/CLKFROM.js b/js/Branching/CLKFROM.js
index 5444fce6..2ab2e515 100644
--- a/js/Branching/CLKFROM.js
+++ b/js/Branching/CLKFROM.js
@@ -1,5 +1,19 @@
 /* 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";
+}
+CLKFROM.prototype.details = function CLKFROM() {
+}
 CLKFROM.prototype.get = function CLKFROM() {
 }
 CLKFROM.prototype.set = function CLKFROM() {
@@ -26,18 +40,4 @@ break
 }
 needcompile=resume(needcompile)
 }
-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";
-}
-CLKFROM.prototype.details = function CLKFROM() {
-}
 }
diff --git a/js/Branching/CLKGOTO.js b/js/Branching/CLKGOTO.js
index 6a06ade7..2059a46c 100644
--- a/js/Branching/CLKGOTO.js
+++ b/js/Branching/CLKGOTO.js
@@ -1,5 +1,20 @@
 /* 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";
+}
+CLKGOTO.prototype.details = function CLKGOTO() {
+}
 CLKGOTO.prototype.get = function CLKGOTO() {
 }
 CLKGOTO.prototype.set = function CLKGOTO() {
@@ -34,19 +49,4 @@ break
 }
 needcompile=resume(needcompile)
 }
-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";
-}
-CLKGOTO.prototype.details = function CLKGOTO() {
-}
 }
diff --git a/js/Branching/CLKGotoTagVisibility.js b/js/Branching/CLKGotoTagVisibility.js
index 8d5fd114..cdf27f4b 100644
--- a/js/Branching/CLKGotoTagVisibility.js
+++ b/js/Branching/CLKGotoTagVisibility.js
@@ -1,5 +1,25 @@
 /* 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);
+}
+CLKGotoTagVisibility.prototype.details = function CLKGotoTagVisibility() {
+}
 CLKGotoTagVisibility.prototype.get = function CLKGotoTagVisibility() {
 }
 CLKGotoTagVisibility.prototype.set = function CLKGotoTagVisibility() {
@@ -26,24 +46,4 @@ break
 }
 needcompile=resume(needcompile)
 }
-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);
-}
-CLKGotoTagVisibility.prototype.details = function CLKGotoTagVisibility() {
-}
 }
diff --git a/js/Branching/DEMUX.js b/js/Branching/DEMUX.js
index 7720e05c..909995bd 100644
--- a/js/Branching/DEMUX.js
+++ b/js/Branching/DEMUX.js
@@ -1,5 +1,21 @@
 /* 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);
+}
+DEMUX.prototype.details = function DEMUX() {
+}
 DEMUX.prototype.get = function DEMUX() {
 }
 DEMUX.prototype.set = function DEMUX() {
@@ -44,20 +60,4 @@ break
 }
 }
 }
-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);
-}
-DEMUX.prototype.details = function DEMUX() {
-}
 }
diff --git a/js/Branching/DEMUX_f.js b/js/Branching/DEMUX_f.js
index 96181162..8cd783d8 100644
--- a/js/Branching/DEMUX_f.js
+++ b/js/Branching/DEMUX_f.js
@@ -1,5 +1,21 @@
 /* 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);
+}
+DEMUX_f.prototype.details = function DEMUX_f() {
+}
 DEMUX_f.prototype.get = function DEMUX_f() {
 }
 DEMUX_f.prototype.set = function DEMUX_f() {
@@ -44,20 +60,4 @@ break
 }
 }
 }
-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);
-}
-DEMUX_f.prototype.details = function DEMUX_f() {
-}
 }
diff --git a/js/Branching/ESELECT_f.js b/js/Branching/ESELECT_f.js
index d62843f7..581b8d22 100644
--- a/js/Branching/ESELECT_f.js
+++ b/js/Branching/ESELECT_f.js
@@ -1,5 +1,25 @@
 /* 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);
+}
+ESELECT_f.prototype.details = function ESELECT_f() {
+}
 ESELECT_f.prototype.get = function ESELECT_f() {
 }
 ESELECT_f.prototype.set = function ESELECT_f() {
@@ -44,24 +64,4 @@ break
 }
 }
 }
-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);
-}
-ESELECT_f.prototype.details = function ESELECT_f() {
-}
 }
diff --git a/js/Branching/EXTRACTOR.js b/js/Branching/EXTRACTOR.js
index 02064576..cef5e902 100644
--- a/js/Branching/EXTRACTOR.js
+++ b/js/Branching/EXTRACTOR.js
@@ -1,5 +1,20 @@
 /* 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);
+}
+EXTRACTOR.prototype.details = function EXTRACTOR() {
+}
 EXTRACTOR.prototype.get = function EXTRACTOR() {
 }
 EXTRACTOR.prototype.set = function EXTRACTOR() {
@@ -24,19 +39,4 @@ break
 }
 }
 }
-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);
-}
-EXTRACTOR.prototype.details = function EXTRACTOR() {
-}
 }
diff --git a/js/Branching/FROM.js b/js/Branching/FROM.js
index 169d9763..f5cce6c9 100644
--- a/js/Branching/FROM.js
+++ b/js/Branching/FROM.js
@@ -1,5 +1,25 @@
 /* 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";
+}
+FROM.prototype.details = function FROM() {
+}
 FROM.prototype.get = function FROM() {
 }
 FROM.prototype.set = function FROM() {
@@ -26,24 +46,4 @@ break
 }
 needcompile=resume(needcompile)
 }
-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";
-}
-FROM.prototype.details = function FROM() {
-}
 }
diff --git a/js/Branching/FROMMO.js b/js/Branching/FROMMO.js
index 94b27c46..b71f56df 100644
--- a/js/Branching/FROMMO.js
+++ b/js/Branching/FROMMO.js
@@ -1,5 +1,28 @@
 /* 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"];
+}
+FROMMO.prototype.details = function FROMMO() {
+}
 FROMMO.prototype.get = function FROMMO() {
 }
 FROMMO.prototype.set = function FROMMO() {
@@ -26,27 +49,4 @@ break
 }
 needcompile=resume(needcompile)
 }
-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"];
-}
-FROMMO.prototype.details = function FROMMO() {
-}
 }
diff --git a/js/Branching/GOTO.js b/js/Branching/GOTO.js
index 6e890a94..ba4ae97f 100644
--- a/js/Branching/GOTO.js
+++ b/js/Branching/GOTO.js
@@ -1,5 +1,25 @@
 /* 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";
+}
+GOTO.prototype.details = function GOTO() {
+}
 GOTO.prototype.get = function GOTO() {
 }
 GOTO.prototype.set = function GOTO() {
@@ -33,24 +53,4 @@ break
 }
 needcompile=resume(needcompile)
 }
-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";
-}
-GOTO.prototype.details = function GOTO() {
-}
 }
diff --git a/js/Branching/GOTOMO.js b/js/Branching/GOTOMO.js
index 02db5d83..54c47717 100644
--- a/js/Branching/GOTOMO.js
+++ b/js/Branching/GOTOMO.js
@@ -1,5 +1,28 @@
 /* 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"];
+}
+GOTOMO.prototype.details = function GOTOMO() {
+}
 GOTOMO.prototype.get = function GOTOMO() {
 }
 GOTOMO.prototype.set = function GOTOMO() {
@@ -33,27 +56,4 @@ break
 }
 needcompile=resume(needcompile)
 }
-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"];
-}
-GOTOMO.prototype.details = function GOTOMO() {
-}
 }
diff --git a/js/Branching/GotoTagVisibility.js b/js/Branching/GotoTagVisibility.js
index 81ad7c6e..332818a4 100644
--- a/js/Branching/GotoTagVisibility.js
+++ b/js/Branching/GotoTagVisibility.js
@@ -1,5 +1,25 @@
 /* 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);
+}
+GotoTagVisibility.prototype.details = function GotoTagVisibility() {
+}
 GotoTagVisibility.prototype.get = function GotoTagVisibility() {
 }
 GotoTagVisibility.prototype.set = function GotoTagVisibility() {
@@ -26,24 +46,4 @@ break
 }
 needcompile=resume(needcompile)
 }
-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);
-}
-GotoTagVisibility.prototype.details = function GotoTagVisibility() {
-}
 }
diff --git a/js/Branching/GotoTagVisibilityMO.js b/js/Branching/GotoTagVisibilityMO.js
index 893c3497..3c8aca89 100644
--- a/js/Branching/GotoTagVisibilityMO.js
+++ b/js/Branching/GotoTagVisibilityMO.js
@@ -1,5 +1,25 @@
 /* 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);
+}
+GotoTagVisibilityMO.prototype.details = function GotoTagVisibilityMO() {
+}
 GotoTagVisibilityMO.prototype.get = function GotoTagVisibilityMO() {
 }
 GotoTagVisibilityMO.prototype.set = function GotoTagVisibilityMO() {
@@ -26,24 +46,4 @@ break
 }
 needcompile=resume(needcompile)
 }
-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);
-}
-GotoTagVisibilityMO.prototype.details = function GotoTagVisibilityMO() {
-}
 }
diff --git a/js/Branching/ISELECT_f.js b/js/Branching/ISELECT_f.js
index aed81d8f..b30e341d 100644
--- a/js/Branching/ISELECT_f.js
+++ b/js/Branching/ISELECT_f.js
@@ -1,5 +1,23 @@
 /* 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);
+}
+ISELECT_f.prototype.details = function ISELECT_f() {
+}
 ISELECT_f.prototype.get = function ISELECT_f() {
 }
 ISELECT_f.prototype.set = function ISELECT_f() {
@@ -26,22 +44,4 @@ break
 }
 }
 }
-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);
-}
-ISELECT_f.prototype.details = function ISELECT_f() {
-}
 }
diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js
index daa5ab8a..1ac4b7ec 100644
--- a/js/Branching/ISELECT_m.js
+++ b/js/Branching/ISELECT_m.js
@@ -1,5 +1,31 @@
 /* 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);
+}
+ISELECT_m.prototype.details = function ISELECT_m() {
+}
 ISELECT_m.prototype.get = function ISELECT_m() {
 }
 ISELECT_m.prototype.set = function ISELECT_m() {
@@ -35,30 +61,4 @@ break
 }
 }
 }
-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);
-}
-ISELECT_m.prototype.details = function ISELECT_m() {
-}
 }
diff --git a/js/Branching/MUX.js b/js/Branching/MUX.js
index 16c5a28a..42dd4c9e 100644
--- a/js/Branching/MUX.js
+++ b/js/Branching/MUX.js
@@ -1,5 +1,20 @@
 /* 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);
+}
+MUX.prototype.details = function MUX() {
+}
 MUX.prototype.get = function MUX() {
 }
 MUX.prototype.set = function MUX() {
@@ -44,19 +59,4 @@ break
 }
 }
 }
-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);
-}
-MUX.prototype.details = function MUX() {
-}
 }
diff --git a/js/Branching/MUX_f.js b/js/Branching/MUX_f.js
index 5731fec6..8697088f 100644
--- a/js/Branching/MUX_f.js
+++ b/js/Branching/MUX_f.js
@@ -1,5 +1,20 @@
 /* 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);
+}
+MUX_f.prototype.details = function MUX_f() {
+}
 MUX_f.prototype.get = function MUX_f() {
 }
 MUX_f.prototype.set = function MUX_f() {
@@ -44,19 +59,4 @@ break
 }
 }
 }
-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);
-}
-MUX_f.prototype.details = function MUX_f() {
-}
 }
diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js
index 36928974..95471573 100644
--- a/js/Branching/M_SWITCH.js
+++ b/js/Branching/M_SWITCH.js
@@ -1,5 +1,22 @@
 /* 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);
+}
+M_SWITCH.prototype.details = function M_SWITCH() {
+}
 M_SWITCH.prototype.get = function M_SWITCH() {
 }
 M_SWITCH.prototype.set = function M_SWITCH() {
@@ -43,21 +60,4 @@ break
 }
 }
 }
-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);
-}
-M_SWITCH.prototype.details = function M_SWITCH() {
-}
 }
diff --git a/js/Branching/NRMSOM_f.js b/js/Branching/NRMSOM_f.js
index 86b0fca5..43af177e 100644
--- a/js/Branching/NRMSOM_f.js
+++ b/js/Branching/NRMSOM_f.js
@@ -1,5 +1,20 @@
 /* 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);
+}
+NRMSOM_f.prototype.details = function NRMSOM_f() {
+}
 NRMSOM_f.prototype.get = function NRMSOM_f() {
 }
 NRMSOM_f.prototype.set = function NRMSOM_f() {
@@ -21,19 +36,4 @@ break
 }
 }
 }
-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);
-}
-NRMSOM_f.prototype.details = function NRMSOM_f() {
-}
 }
diff --git a/js/Branching/RELAY_f.js b/js/Branching/RELAY_f.js
index 4a2eb42c..3e730559 100644
--- a/js/Branching/RELAY_f.js
+++ b/js/Branching/RELAY_f.js
@@ -1,5 +1,24 @@
 /* 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);
+}
+RELAY_f.prototype.details = function RELAY_f() {
+}
 RELAY_f.prototype.get = function RELAY_f() {
 }
 RELAY_f.prototype.set = function RELAY_f() {
@@ -27,23 +46,4 @@ break
 }
 }
 }
-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);
-}
-RELAY_f.prototype.details = function RELAY_f() {
-}
 }
diff --git a/js/Branching/SCALAR2VECTOR.js b/js/Branching/SCALAR2VECTOR.js
index 728acbb2..38392a59 100644
--- a/js/Branching/SCALAR2VECTOR.js
+++ b/js/Branching/SCALAR2VECTOR.js
@@ -1,5 +1,19 @@
 /* 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);
+}
+SCALAR2VECTOR.prototype.details = function SCALAR2VECTOR() {
+}
 SCALAR2VECTOR.prototype.get = function SCALAR2VECTOR() {
 }
 SCALAR2VECTOR.prototype.set = function SCALAR2VECTOR() {
@@ -28,18 +42,4 @@ break
 }
 }
 }
-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);
-}
-SCALAR2VECTOR.prototype.details = function SCALAR2VECTOR() {
-}
 }
diff --git a/js/Branching/SELECT_f.js b/js/Branching/SELECT_f.js
index daa817a0..51644c21 100644
--- a/js/Branching/SELECT_f.js
+++ b/js/Branching/SELECT_f.js
@@ -1,5 +1,23 @@
 /* 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);
+}
+SELECT_f.prototype.details = function SELECT_f() {
+}
 SELECT_f.prototype.get = function SELECT_f() {
 }
 SELECT_f.prototype.set = function SELECT_f() {
@@ -26,22 +44,4 @@ break
 }
 }
 }
-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);
-}
-SELECT_f.prototype.details = function SELECT_f() {
-}
 }
diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js
index ad5b2133..f31780f0 100644
--- a/js/Branching/SELECT_m.js
+++ b/js/Branching/SELECT_m.js
@@ -1,5 +1,31 @@
 /* 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);
+}
+SELECT_m.prototype.details = function SELECT_m() {
+}
 SELECT_m.prototype.get = function SELECT_m() {
 }
 SELECT_m.prototype.set = function SELECT_m() {
@@ -35,30 +61,4 @@ break
 }
 }
 }
-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);
-}
-SELECT_m.prototype.details = function SELECT_m() {
-}
 }
diff --git a/js/Branching/SWITCH2.js b/js/Branching/SWITCH2.js
index aec3c67d..54c51d87 100644
--- a/js/Branching/SWITCH2.js
+++ b/js/Branching/SWITCH2.js
@@ -1,5 +1,26 @@
 /* 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);
+}
+SWITCH2.prototype.details = function SWITCH2() {
+}
 SWITCH2.prototype.get = function SWITCH2() {
 }
 SWITCH2.prototype.set = function SWITCH2() {
@@ -34,25 +55,4 @@ x.model=model;
 break
 }
 }
-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);
-}
-SWITCH2.prototype.details = function SWITCH2() {
-}
 }
diff --git a/js/Branching/SWITCH2_m.js b/js/Branching/SWITCH2_m.js
index d6574925..4219f56b 100644
--- a/js/Branching/SWITCH2_m.js
+++ b/js/Branching/SWITCH2_m.js
@@ -1,5 +1,29 @@
 /* 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);
+}
+SWITCH2_m.prototype.details = function SWITCH2_m() {
+}
 SWITCH2_m.prototype.get = function SWITCH2_m() {
 }
 SWITCH2_m.prototype.set = function SWITCH2_m() {
@@ -48,28 +72,4 @@ break
 }
 }
 }
-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);
-}
-SWITCH2_m.prototype.details = function SWITCH2_m() {
-}
 }
diff --git a/js/Branching/SWITCH_f.js b/js/Branching/SWITCH_f.js
index 4eb039a3..b3614cd6 100644
--- a/js/Branching/SWITCH_f.js
+++ b/js/Branching/SWITCH_f.js
@@ -1,5 +1,23 @@
 /* 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);
+}
+SWITCH_f.prototype.details = function SWITCH_f() {
+}
 SWITCH_f.prototype.get = function SWITCH_f() {
 }
 SWITCH_f.prototype.set = function SWITCH_f() {
@@ -27,22 +45,4 @@ break
 }
 }
 }
-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);
-}
-SWITCH_f.prototype.details = function SWITCH_f() {
-}
 }