27 files changed, 512 insertions, 512 deletions

diff --git a/js/Sources/CLKINV_f.js b/js/Sources/CLKINV_f.js
index 3f87d7f3..a6b50a9e 100644
--- a/js/Sources/CLKINV_f.js
+++ b/js/Sources/CLKINV_f.js
@@ -1,5 +1,20 @@
 /* autogenerated from "macros/Sources/CLKINV_f.sci" */
 function CLKINV_f() {
+CLKINV_f.prototype.define = function CLKINV_f() {
+prt=1;
+model=scicos_model();
+model.sim="input";
+model.evtout=1;
+model.ipar=prt;
+model.blocktype="d";
+model.firing=-1;
+model.dep_ut=[false,false];
+exprs=string(prt);
+gr_i=[];
+x=standard_define([1,1],model,exprs,gr_i);
+}
+CLKINV_f.prototype.details = function CLKINV_f() {
+}
 CLKINV_f.prototype.get = function CLKINV_f() {
 }
 CLKINV_f.prototype.set = function CLKINV_f() {
@@ -27,19 +42,4 @@ break
 }
 }
 }
-CLKINV_f.prototype.define = function CLKINV_f() {
-prt=1;
-model=scicos_model();
-model.sim="input";
-model.evtout=1;
-model.ipar=prt;
-model.blocktype="d";
-model.firing=-1;
-model.dep_ut=[false,false];
-exprs=string(prt);
-gr_i=[];
-x=standard_define([1,1],model,exprs,gr_i);
-}
-CLKINV_f.prototype.details = function CLKINV_f() {
-}
 }
diff --git a/js/Sources/CLKIN_f.js b/js/Sources/CLKIN_f.js
index d2760304..2d898db4 100644
--- a/js/Sources/CLKIN_f.js
+++ b/js/Sources/CLKIN_f.js
@@ -1,5 +1,19 @@
 /* autogenerated from "macros/Sources/CLKIN_f.sci" */
 function CLKIN_f() {
+CLKIN_f.prototype.define = function CLKIN_f() {
+prt=1;
+model=scicos_model();
+model.sim="input";
+model.evtout=1;
+model.ipar=prt;
+model.blocktype="d";
+model.firing=-1;
+model.dep_ut=[false,false];
+exprs=string(prt);
+x=standard_define([1,1],model,exprs," ");
+}
+CLKIN_f.prototype.details = function CLKIN_f() {
+}
 CLKIN_f.prototype.get = function CLKIN_f() {
 }
 CLKIN_f.prototype.set = function CLKIN_f() {
@@ -27,18 +41,4 @@ break
 }
 }
 }
-CLKIN_f.prototype.define = function CLKIN_f() {
-prt=1;
-model=scicos_model();
-model.sim="input";
-model.evtout=1;
-model.ipar=prt;
-model.blocktype="d";
-model.firing=-1;
-model.dep_ut=[false,false];
-exprs=string(prt);
-x=standard_define([1,1],model,exprs," ");
-}
-CLKIN_f.prototype.details = function CLKIN_f() {
-}
 }
diff --git a/js/Sources/CLOCK_c.js b/js/Sources/CLOCK_c.js
index 19870a5f..66bd3151 100644
--- a/js/Sources/CLOCK_c.js
+++ b/js/Sources/CLOCK_c.js
@@ -1,5 +1,48 @@
 /* autogenerated from "macros/Sources/CLOCK_c.sci" */
 function CLOCK_c() {
+CLOCK_c.prototype.define = function CLOCK_c() {
+evtdly=EVTDLY_c("define");
+evtdly.graphics.orig=[320,232];
+evtdly.graphics.sz=[40,40];
+evtdly.graphics.flip=true;
+evtdly.graphics.exprs=["0.1","0.1"];
+evtdly.graphics.pein=6;
+evtdly.graphics.peout=3;
+evtdly.model.rpar=[0.1,0.1];
+evtdly.model.firing=0.1;
+output_port=CLKOUT_f("define");
+output_port.graphics.orig=[399,162];
+output_port.graphics.sz=[20,20];
+output_port.graphics.flip=true;
+output_port.graphics.exprs="1";
+output_port.graphics.pein=5;
+output_port.model.ipar=1;
+split=CLKSPLIT_f("define");
+split.graphics.orig=[380.71066,172];
+split.graphics.pein=3;
+split.graphics.peout=[5,6];
+gr_i=[];
+diagram=scicos_diagram();
+diagram.objs[1-1]=output_port;
+diagram.objs[2-1]=evtdly;
+diagram.objs[3-1]=scicos_link(xx=[340,340,380.71],yy=[226.29,172,172],ct=[5,-1],from=[2,1],to=[4,1]);
+diagram.objs[4-1]=split;
+diagram.objs[5-1]=scicos_link(xx=[380.71,399],yy=[172,172],ct=[5,-1],from=[4,1],to=[1,1]);
+diagram.objs[6-1]=scicos_link(xx=[380.71,380.71,340,340],yy=[172,302,302,277.71],ct=[5,-1],from=[4,2],to=[2,1]);
+x=scicos_block();
+x.gui="CLOCK_c";
+x.graphics.sz=[2,2];
+x.graphics.gr_i=gr_i;
+x.graphics.peout=0;
+x.model.sim="csuper";
+x.model.evtout=1;
+x.model.blocktype="h";
+x.model.firing=false;
+x.model.dep_ut=[false,false];
+x.model.rpar=diagram;
+}
+CLOCK_c.prototype.details = function CLOCK_c() {
+}
 CLOCK_c.prototype.get = function CLOCK_c() {
 }
 CLOCK_c.prototype.set = function CLOCK_c() {
@@ -47,47 +90,4 @@ x=arg1;
 y=needcompile;
 typ=newpar;
 }
-CLOCK_c.prototype.define = function CLOCK_c() {
-evtdly=EVTDLY_c("define");
-evtdly.graphics.orig=[320,232];
-evtdly.graphics.sz=[40,40];
-evtdly.graphics.flip=true;
-evtdly.graphics.exprs=["0.1","0.1"];
-evtdly.graphics.pein=6;
-evtdly.graphics.peout=3;
-evtdly.model.rpar=[0.1,0.1];
-evtdly.model.firing=0.1;
-output_port=CLKOUT_f("define");
-output_port.graphics.orig=[399,162];
-output_port.graphics.sz=[20,20];
-output_port.graphics.flip=true;
-output_port.graphics.exprs="1";
-output_port.graphics.pein=5;
-output_port.model.ipar=1;
-split=CLKSPLIT_f("define");
-split.graphics.orig=[380.71066,172];
-split.graphics.pein=3;
-split.graphics.peout=[5,6];
-gr_i=[];
-diagram=scicos_diagram();
-diagram.objs[1-1]=output_port;
-diagram.objs[2-1]=evtdly;
-diagram.objs[3-1]=scicos_link(xx=[340,340,380.71],yy=[226.29,172,172],ct=[5,-1],from=[2,1],to=[4,1]);
-diagram.objs[4-1]=split;
-diagram.objs[5-1]=scicos_link(xx=[380.71,399],yy=[172,172],ct=[5,-1],from=[4,1],to=[1,1]);
-diagram.objs[6-1]=scicos_link(xx=[380.71,380.71,340,340],yy=[172,302,302,277.71],ct=[5,-1],from=[4,2],to=[2,1]);
-x=scicos_block();
-x.gui="CLOCK_c";
-x.graphics.sz=[2,2];
-x.graphics.gr_i=gr_i;
-x.graphics.peout=0;
-x.model.sim="csuper";
-x.model.evtout=1;
-x.model.blocktype="h";
-x.model.firing=false;
-x.model.dep_ut=[false,false];
-x.model.rpar=diagram;
-}
-CLOCK_c.prototype.details = function CLOCK_c() {
-}
 }
diff --git a/js/Sources/CLOCK_f.js b/js/Sources/CLOCK_f.js
index 2595e3a1..6ee77870 100644
--- a/js/Sources/CLOCK_f.js
+++ b/js/Sources/CLOCK_f.js
@@ -1,5 +1,48 @@
 /* autogenerated from "macros/Sources/CLOCK_f.sci" */
 function CLOCK_f() {
+CLOCK_f.prototype.define = function CLOCK_f() {
+evtdly=EVTDLY_f("define");
+evtdly.graphics.orig=[320,232];
+evtdly.graphics.sz=[40,40];
+evtdly.graphics.flip=true;
+evtdly.graphics.exprs=["0.1","0.1"];
+evtdly.graphics.pein=6;
+evtdly.graphics.peout=3;
+evtdly.model.rpar=0.1;
+evtdly.model.firing=0.1;
+output_port=CLKOUT_f("define");
+output_port.graphics.orig=[399,162];
+output_port.graphics.sz=[20,20];
+output_port.graphics.flip=true;
+output_port.graphics.exprs="1";
+output_port.graphics.pein=5;
+output_port.model.ipar=1;
+split=CLKSPLIT_f("define");
+split.graphics.orig=[380.71066,172];
+split.graphics.pein=3;
+split.graphics.peout=[5,6];
+gr_i=[];
+diagram=scicos_diagram();
+diagram.objs[1-1]=output_port;
+diagram.objs[2-1]=evtdly;
+diagram.objs[3-1]=scicos_link(xx=[340,340,380.71],yy=[226.29,172,172],ct=[5,-1],from=[2,1],to=[4,1]);
+diagram.objs[4-1]=split;
+diagram.objs[5-1]=scicos_link(xx=[380.71,399],yy=[172,172],ct=[5,-1],from=[4,1],to=[1,1]);
+diagram.objs[6-1]=scicos_link(xx=[380.71,380.71,340,340],yy=[172,302,302,277.71],ct=[5,-1],from=[4,2],to=[2,1]);
+x=scicos_block();
+x.gui="CLOCK_f";
+x.graphics.sz=[2,2];
+x.graphics.gr_i=gr_i;
+x.graphics.peout=0;
+x.model.sim="csuper";
+x.model.evtout=1;
+x.model.blocktype="h";
+x.model.firing=false;
+x.model.dep_ut=[false,false];
+x.model.rpar=diagram;
+}
+CLOCK_f.prototype.details = function CLOCK_f() {
+}
 CLOCK_f.prototype.get = function CLOCK_f() {
 }
 CLOCK_f.prototype.set = function CLOCK_f() {
@@ -47,47 +90,4 @@ x=arg1;
 y=needcompile;
 typ=newpar;
 }
-CLOCK_f.prototype.define = function CLOCK_f() {
-evtdly=EVTDLY_f("define");
-evtdly.graphics.orig=[320,232];
-evtdly.graphics.sz=[40,40];
-evtdly.graphics.flip=true;
-evtdly.graphics.exprs=["0.1","0.1"];
-evtdly.graphics.pein=6;
-evtdly.graphics.peout=3;
-evtdly.model.rpar=0.1;
-evtdly.model.firing=0.1;
-output_port=CLKOUT_f("define");
-output_port.graphics.orig=[399,162];
-output_port.graphics.sz=[20,20];
-output_port.graphics.flip=true;
-output_port.graphics.exprs="1";
-output_port.graphics.pein=5;
-output_port.model.ipar=1;
-split=CLKSPLIT_f("define");
-split.graphics.orig=[380.71066,172];
-split.graphics.pein=3;
-split.graphics.peout=[5,6];
-gr_i=[];
-diagram=scicos_diagram();
-diagram.objs[1-1]=output_port;
-diagram.objs[2-1]=evtdly;
-diagram.objs[3-1]=scicos_link(xx=[340,340,380.71],yy=[226.29,172,172],ct=[5,-1],from=[2,1],to=[4,1]);
-diagram.objs[4-1]=split;
-diagram.objs[5-1]=scicos_link(xx=[380.71,399],yy=[172,172],ct=[5,-1],from=[4,1],to=[1,1]);
-diagram.objs[6-1]=scicos_link(xx=[380.71,380.71,340,340],yy=[172,302,302,277.71],ct=[5,-1],from=[4,2],to=[2,1]);
-x=scicos_block();
-x.gui="CLOCK_f";
-x.graphics.sz=[2,2];
-x.graphics.gr_i=gr_i;
-x.graphics.peout=0;
-x.model.sim="csuper";
-x.model.evtout=1;
-x.model.blocktype="h";
-x.model.firing=false;
-x.model.dep_ut=[false,false];
-x.model.rpar=diagram;
-}
-CLOCK_f.prototype.details = function CLOCK_f() {
-}
 }
diff --git a/js/Sources/CONST.js b/js/Sources/CONST.js
index 91f34189..6bc8ec85 100644
--- a/js/Sources/CONST.js
+++ b/js/Sources/CONST.js
@@ -1,5 +1,20 @@
 /* autogenerated from "macros/Sources/CONST.sci" */
 function CONST() {
+CONST.prototype.define = function CONST() {
+C=1;
+model=scicos_model();
+model.sim=list("cstblk4",4);
+model.in1=[];
+model.out=1;
+model.rpar=C;
+model.blocktype="d";
+model.dep_ut=[false,false];
+exprs=strcat(sci2exp(C));
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+CONST.prototype.details = function CONST() {
+}
 CONST.prototype.get = function CONST() {
 }
 CONST.prototype.set = function CONST() {
@@ -28,19 +43,4 @@ break
 }
 }
 }
-CONST.prototype.define = function CONST() {
-C=1;
-model=scicos_model();
-model.sim=list("cstblk4",4);
-model.in1=[];
-model.out=1;
-model.rpar=C;
-model.blocktype="d";
-model.dep_ut=[false,false];
-exprs=strcat(sci2exp(C));
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-CONST.prototype.details = function CONST() {
-}
 }
diff --git a/js/Sources/CONST_f.js b/js/Sources/CONST_f.js
index 2fe2b632..bba535ca 100644
--- a/js/Sources/CONST_f.js
+++ b/js/Sources/CONST_f.js
@@ -1,5 +1,20 @@
 /* autogenerated from "macros/Sources/CONST_f.sci" */
 function CONST_f() {
+CONST_f.prototype.define = function CONST_f() {
+C=1;
+model=scicos_model();
+model.sim=list("cstblk",1);
+model.in1=[];
+model.out=1;
+model.rpar=C;
+model.blocktype="d";
+model.dep_ut=[false,false];
+exprs=strcat(sci2exp(C));
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+CONST_f.prototype.details = function CONST_f() {
+}
 CONST_f.prototype.get = function CONST_f() {
 }
 CONST_f.prototype.set = function CONST_f() {
@@ -25,19 +40,4 @@ break
 }
 }
 }
-CONST_f.prototype.define = function CONST_f() {
-C=1;
-model=scicos_model();
-model.sim=list("cstblk",1);
-model.in1=[];
-model.out=1;
-model.rpar=C;
-model.blocktype="d";
-model.dep_ut=[false,false];
-exprs=strcat(sci2exp(C));
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-CONST_f.prototype.details = function CONST_f() {
-}
 }
diff --git a/js/Sources/CONST_m.js b/js/Sources/CONST_m.js
index 579e9867..627d575b 100644
--- a/js/Sources/CONST_m.js
+++ b/js/Sources/CONST_m.js
@@ -1,5 +1,23 @@
 /* autogenerated from "macros/Sources/CONST_m.sci" */
 function CONST_m() {
+CONST_m.prototype.define = function CONST_m() {
+C=[1];
+model=scicos_model();
+model.sim=list("cstblk4",4);
+model.in1=[];
+model.out=size(C,1);
+model.in2=[];
+model.out2=size(C,2);
+model.rpar=C;
+model.opar=list();
+model.blocktype="d";
+model.dep_ut=[false,false];
+exprs=sci2exp(C);
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+CONST_m.prototype.details = function CONST_m() {
+}
 CONST_m.prototype.get = function CONST_m() {
 }
 CONST_m.prototype.set = function CONST_m() {
@@ -51,22 +69,4 @@ break
 }
 }
 }
-CONST_m.prototype.define = function CONST_m() {
-C=[1];
-model=scicos_model();
-model.sim=list("cstblk4",4);
-model.in1=[];
-model.out=size(C,1);
-model.in2=[];
-model.out2=size(C,2);
-model.rpar=C;
-model.opar=list();
-model.blocktype="d";
-model.dep_ut=[false,false];
-exprs=sci2exp(C);
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-CONST_m.prototype.details = function CONST_m() {
-}
 }
diff --git a/js/Sources/CURV_f.js b/js/Sources/CURV_f.js
index 25d6c83f..cae00f0b 100644
--- a/js/Sources/CURV_f.js
+++ b/js/Sources/CURV_f.js
@@ -1,5 +1,25 @@
 /* autogenerated from "macros/Sources/CURV_f.sci" */
 function CURV_f() {
+CURV_f.prototype.define = function CURV_f() {
+xx=[0,1,2];
+yy=[-5,5,0];
+rect=[0,-5,2,5];
+axisdata=[2,10,2,10];
+ipar=[size(xx,1),axisdata.slice()];
+rpar=[xx,yy,rect.slice()];
+model=scicos_model();
+model.sim="intplt";
+model.in1=[];
+model.out=1;
+model.rpar=[xx,yy,rect.slice()];
+model.ipar=[size(xx,1),axisdata.slice()];
+model.blocktype="c";
+model.dep_ut=[false,true];
+gr_i=[];
+x=standard_define([2,2],model,[],gr_i);
+}
+CURV_f.prototype.details = function CURV_f() {
+}
 CURV_f.prototype.get = function CURV_f() {
 }
 CURV_f.prototype.set = function CURV_f() {
@@ -40,24 +60,4 @@ break
 }
 }
 }
-CURV_f.prototype.define = function CURV_f() {
-xx=[0,1,2];
-yy=[-5,5,0];
-rect=[0,-5,2,5];
-axisdata=[2,10,2,10];
-ipar=[size(xx,1),axisdata.slice()];
-rpar=[xx,yy,rect.slice()];
-model=scicos_model();
-model.sim="intplt";
-model.in1=[];
-model.out=1;
-model.rpar=[xx,yy,rect.slice()];
-model.ipar=[size(xx,1),axisdata.slice()];
-model.blocktype="c";
-model.dep_ut=[false,true];
-gr_i=[];
-x=standard_define([2,2],model,[],gr_i);
-}
-CURV_f.prototype.details = function CURV_f() {
-}
 }
diff --git a/js/Sources/Counter.js b/js/Sources/Counter.js
index d43b02cf..54e908e2 100644
--- a/js/Sources/Counter.js
+++ b/js/Sources/Counter.js
@@ -1,5 +1,24 @@
 /* autogenerated from "macros/Sources/Counter.sci" */
 function Counter() {
+Counter.prototype.define = function Counter() {
+minim=0;
+maxim=2;
+rule=1;
+model=scicos_model();
+model.sim=list("counter",4);
+model.evtin=1;
+model.out=1;
+model.out2=1;
+model.dstate=0;
+model.ipar=[rule,maxim,minim];
+model.blocktype="c";
+model.dep_ut=[false,false];
+exprs=[string(minim),string(maxim),string(rule)];
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+Counter.prototype.details = function Counter() {
+}
 Counter.prototype.get = function Counter() {
 }
 Counter.prototype.set = function Counter() {
@@ -28,23 +47,4 @@ break
 }
 }
 }
-Counter.prototype.define = function Counter() {
-minim=0;
-maxim=2;
-rule=1;
-model=scicos_model();
-model.sim=list("counter",4);
-model.evtin=1;
-model.out=1;
-model.out2=1;
-model.dstate=0;
-model.ipar=[rule,maxim,minim];
-model.blocktype="c";
-model.dep_ut=[false,false];
-exprs=[string(minim),string(maxim),string(rule)];
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-Counter.prototype.details = function Counter() {
-}
 }
diff --git a/js/Sources/FROMWSB.js b/js/Sources/FROMWSB.js
index 35cccad4..a78ad867 100644
--- a/js/Sources/FROMWSB.js
+++ b/js/Sources/FROMWSB.js
@@ -1,5 +1,17 @@
 /* autogenerated from "macros/Sources/FROMWSB.sci" */
 function FROMWSB() {
+FROMWSB.prototype.define = function FROMWSB() {
+scs_m_1=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[-159.096,811.104,-121.216,617.984,1323,1008,331,284,630,480,1426,231,1.4],Title="FROMWSB",tol=[0.0001,0.000001,1.000e-10,100001,0,0],tf=100000,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(true,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list()));
+scs_m_1.objs[1-1]=scicos_block(gui="FROMWS_c",graphics=scicos_graphics(orig=[260.37067,261.584],sz=[70,40],flip=true,theta=0,exprs=["V","1","1","0"],pin=[],pout=4,pein=2,peout=2,gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("fromws_c",4),in1=[],in2=[],intyp=1,out=-1,out2=-2,outtyp=-1,evtin=1,evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=[1,-31,1,1,0],opar=list(),blocktype="d",firing=0,dep_ut=[false,true],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m_1.objs[2-1]=scicos_link(xx=[295.37067,295.37067,233.23733,233.23733,295.37067,295.37067],yy=[255.86971,223.45067,223.45067,337.85067,337.85067,307.29829],id="drawlink",thick=[0,0],ct=[5,-1],from=[1,1,0],to=[1,1,1]);
+scs_m_1.objs[3-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[358.9421,271.584],sz=[20,20],flip=true,theta=0,exprs="1",pin=4,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=-2,intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m_1.objs[4-1]=scicos_link(xx=[338.9421,358.9421],yy=[281.584,281.584],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[3,1,1]);
+model=scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list());
+gr_i=[];
+x=standard_define([5,2],model,[],gr_i);
+}
+FROMWSB.prototype.details = function FROMWSB() {
+}
 FROMWSB.prototype.get = function FROMWSB() {
 }
 FROMWSB.prototype.set = function FROMWSB() {
@@ -71,16 +83,4 @@ y=max(y,needcompile);
 x=arg1;
 typ=newpar;
 }
-FROMWSB.prototype.define = function FROMWSB() {
-scs_m_1=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[-159.096,811.104,-121.216,617.984,1323,1008,331,284,630,480,1426,231,1.4],Title="FROMWSB",tol=[0.0001,0.000001,1.000e-10,100001,0,0],tf=100000,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(true,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list()));
-scs_m_1.objs[1-1]=scicos_block(gui="FROMWS_c",graphics=scicos_graphics(orig=[260.37067,261.584],sz=[70,40],flip=true,theta=0,exprs=["V","1","1","0"],pin=[],pout=4,pein=2,peout=2,gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("fromws_c",4),in1=[],in2=[],intyp=1,out=-1,out2=-2,outtyp=-1,evtin=1,evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=[1,-31,1,1,0],opar=list(),blocktype="d",firing=0,dep_ut=[false,true],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m_1.objs[2-1]=scicos_link(xx=[295.37067,295.37067,233.23733,233.23733,295.37067,295.37067],yy=[255.86971,223.45067,223.45067,337.85067,337.85067,307.29829],id="drawlink",thick=[0,0],ct=[5,-1],from=[1,1,0],to=[1,1,1]);
-scs_m_1.objs[3-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[358.9421,271.584],sz=[20,20],flip=true,theta=0,exprs="1",pin=4,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=-2,intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m_1.objs[4-1]=scicos_link(xx=[338.9421,358.9421],yy=[281.584,281.584],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[3,1,1]);
-model=scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list());
-gr_i=[];
-x=standard_define([5,2],model,[],gr_i);
-}
-FROMWSB.prototype.details = function FROMWSB() {
-}
 }
diff --git a/js/Sources/FROMWS_c.js b/js/Sources/FROMWS_c.js
index f8bb87af..ac393ada 100644
--- a/js/Sources/FROMWS_c.js
+++ b/js/Sources/FROMWS_c.js
@@ -1,5 +1,27 @@
 /* autogenerated from "macros/Sources/FROMWS_c.sci" */
 function FROMWS_c() {
+FROMWS_c.prototype.define = function FROMWS_c() {
+varnam="V";
+Method=1;
+ZC=1;
+OutEnd=0;
+model=scicos_model();
+model.sim=list("fromws_c",4);
+model.out=-1;
+model.out2=-2;
+model.outtyp=-1;
+model.ipar=[length(varnam),_str2code(varnam),Method,ZC,OutEnd];
+model.evtin=[1];
+model.evtout=[1];
+model.firing=[0];
+model.blocktype="d";
+model.dep_ut=[false,true];
+gr_i=[];
+exprs=[string(varnam),string(Method),string(ZC),string(OutEnd)];
+x=standard_define([3.5,2],model,exprs,gr_i);
+}
+FROMWS_c.prototype.details = function FROMWS_c() {
+}
 FROMWS_c.prototype.get = function FROMWS_c() {
 }
 FROMWS_c.prototype.set = function FROMWS_c() {
@@ -42,26 +64,4 @@ break
 }
 }
 }
-FROMWS_c.prototype.define = function FROMWS_c() {
-varnam="V";
-Method=1;
-ZC=1;
-OutEnd=0;
-model=scicos_model();
-model.sim=list("fromws_c",4);
-model.out=-1;
-model.out2=-2;
-model.outtyp=-1;
-model.ipar=[length(varnam),_str2code(varnam),Method,ZC,OutEnd];
-model.evtin=[1];
-model.evtout=[1];
-model.firing=[0];
-model.blocktype="d";
-model.dep_ut=[false,true];
-gr_i=[];
-exprs=[string(varnam),string(Method),string(ZC),string(OutEnd)];
-x=standard_define([3.5,2],model,exprs,gr_i);
-}
-FROMWS_c.prototype.details = function FROMWS_c() {
-}
 }
diff --git a/js/Sources/GENSIN_f.js b/js/Sources/GENSIN_f.js
index c6c2cb0f..78209268 100644
--- a/js/Sources/GENSIN_f.js
+++ b/js/Sources/GENSIN_f.js
@@ -1,5 +1,22 @@
 /* autogenerated from "macros/Sources/GENSIN_f.sci" */
 function GENSIN_f() {
+GENSIN_f.prototype.define = function GENSIN_f() {
+rpar=[1,1,0];
+model=scicos_model();
+model.sim="gensin";
+model.in1=[];
+model.out=1;
+model.out2=1;
+model.outtyp=1;
+model.rpar=[1,1,0];
+model.blocktype="c";
+model.dep_ut=[false,true];
+exprs=[string(rpar(1)),string(rpar(2)),string(rpar(3))];
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+GENSIN_f.prototype.details = function GENSIN_f() {
+}
 GENSIN_f.prototype.get = function GENSIN_f() {
 }
 GENSIN_f.prototype.set = function GENSIN_f() {
@@ -28,21 +45,4 @@ break
 }
 }
 }
-GENSIN_f.prototype.define = function GENSIN_f() {
-rpar=[1,1,0];
-model=scicos_model();
-model.sim="gensin";
-model.in1=[];
-model.out=1;
-model.out2=1;
-model.outtyp=1;
-model.rpar=[1,1,0];
-model.blocktype="c";
-model.dep_ut=[false,true];
-exprs=[string(rpar(1)),string(rpar(2)),string(rpar(3))];
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-GENSIN_f.prototype.details = function GENSIN_f() {
-}
 }
diff --git a/js/Sources/GENSQR_f.js b/js/Sources/GENSQR_f.js
index 1680500e..1071e2b9 100644
--- a/js/Sources/GENSQR_f.js
+++ b/js/Sources/GENSQR_f.js
@@ -1,5 +1,22 @@
 /* autogenerated from "macros/Sources/GENSQR_f.sci" */
 function GENSQR_f() {
+GENSQR_f.prototype.define = function GENSQR_f() {
+Amplitude=1;
+model=scicos_model();
+model.sim="gensqr";
+model.out=1;
+model.out2=1;
+model.outtyp=1;
+model.evtin=1;
+model.dstate=Amplitude;
+model.blocktype="d";
+model.dep_ut=[false,false];
+exprs=string(Amplitude);
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+GENSQR_f.prototype.details = function GENSQR_f() {
+}
 GENSQR_f.prototype.get = function GENSQR_f() {
 }
 GENSQR_f.prototype.set = function GENSQR_f() {
@@ -24,21 +41,4 @@ x.model=model;
 break
 }
 }
-GENSQR_f.prototype.define = function GENSQR_f() {
-Amplitude=1;
-model=scicos_model();
-model.sim="gensqr";
-model.out=1;
-model.out2=1;
-model.outtyp=1;
-model.evtin=1;
-model.dstate=Amplitude;
-model.blocktype="d";
-model.dep_ut=[false,false];
-exprs=string(Amplitude);
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-GENSQR_f.prototype.details = function GENSQR_f() {
-}
 }
diff --git a/js/Sources/Ground_g.js b/js/Sources/Ground_g.js
index 46f8ddcf..d7bb8482 100644
--- a/js/Sources/Ground_g.js
+++ b/js/Sources/Ground_g.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/Sources/Ground_g.sci" */
 function Ground_g() {
-Ground_g.prototype.get = function Ground_g() {
-}
-Ground_g.prototype.set = function Ground_g() {
-x=arg1;
-}
 Ground_g.prototype.define = function Ground_g() {
 C=[0];
 model=scicos_model();
@@ -24,4 +19,9 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 Ground_g.prototype.details = function Ground_g() {
 }
+Ground_g.prototype.get = function Ground_g() {
+}
+Ground_g.prototype.set = function Ground_g() {
+x=arg1;
+}
 }
diff --git a/js/Sources/INIMPL_f.js b/js/Sources/INIMPL_f.js
index 80c82318..58d6da2f 100644
--- a/js/Sources/INIMPL_f.js
+++ b/js/Sources/INIMPL_f.js
@@ -1,5 +1,25 @@
 /* autogenerated from "macros/Sources/INIMPL_f.sci" */
 function INIMPL_f() {
+INIMPL_f.prototype.define = function INIMPL_f() {
+model=scicos_model();
+model.sim="inimpl";
+model.out=[-1];
+model.out2=[1];
+model.ipar=[1];
+model.dep_ut=[false,false];
+model.blocktype="c";
+mo=modelica();
+mo.model="PORT";
+mo.outputs="n";
+model.equations=mo;
+prt=1;
+exprs="1";
+gr_i=[];
+x=standard_define([1,1],model,exprs,gr_i);
+x.graphics.out_implicit=["I"];
+}
+INIMPL_f.prototype.details = function INIMPL_f() {
+}
 INIMPL_f.prototype.get = function INIMPL_f() {
 }
 INIMPL_f.prototype.set = function INIMPL_f() {
@@ -31,24 +51,4 @@ break
 }
 }
 }
-INIMPL_f.prototype.define = function INIMPL_f() {
-model=scicos_model();
-model.sim="inimpl";
-model.out=[-1];
-model.out2=[1];
-model.ipar=[1];
-model.dep_ut=[false,false];
-model.blocktype="c";
-mo=modelica();
-mo.model="PORT";
-mo.outputs="n";
-model.equations=mo;
-prt=1;
-exprs="1";
-gr_i=[];
-x=standard_define([1,1],model,exprs,gr_i);
-x.graphics.out_implicit=["I"];
-}
-INIMPL_f.prototype.details = function INIMPL_f() {
-}
 }
diff --git a/js/Sources/IN_f.js b/js/Sources/IN_f.js
index c599908a..83eddca8 100644
--- a/js/Sources/IN_f.js
+++ b/js/Sources/IN_f.js
@@ -1,5 +1,21 @@
 /* autogenerated from "macros/Sources/IN_f.sci" */
 function IN_f() {
+IN_f.prototype.define = function IN_f() {
+prt=1;
+model=scicos_model();
+model.sim="input";
+model.out=-1;
+model.out2=-2;
+model.outtyp=-1;
+model.ipar=prt;
+model.blocktype="c";
+model.dep_ut=[false,false];
+exprs=sci2exp(prt);
+gr_i=[];
+x=standard_define([1,1],model,exprs,gr_i);
+}
+IN_f.prototype.details = function IN_f() {
+}
 IN_f.prototype.get = function IN_f() {
 }
 IN_f.prototype.set = function IN_f() {
@@ -42,20 +58,4 @@ break
 }
 }
 }
-IN_f.prototype.define = function IN_f() {
-prt=1;
-model=scicos_model();
-model.sim="input";
-model.out=-1;
-model.out2=-2;
-model.outtyp=-1;
-model.ipar=prt;
-model.blocktype="c";
-model.dep_ut=[false,false];
-exprs=sci2exp(prt);
-gr_i=[];
-x=standard_define([1,1],model,exprs,gr_i);
-}
-IN_f.prototype.details = function IN_f() {
-}
 }
diff --git a/js/Sources/Modulo_Count.js b/js/Sources/Modulo_Count.js
index 87f89d5b..80d30c6f 100644
--- a/js/Sources/Modulo_Count.js
+++ b/js/Sources/Modulo_Count.js
@@ -1,5 +1,22 @@
 /* autogenerated from "macros/Sources/Modulo_Count.sci" */
 function Modulo_Count() {
+Modulo_Count.prototype.define = function Modulo_Count() {
+ini_c=0;
+base=3;
+model=scicos_model();
+model.sim=list("modulo_count",4);
+model.evtin=1;
+model.out=1;
+model.dstate=ini_c;
+model.ipar=base;
+model.blocktype="c";
+model.dep_ut=[false,false];
+exprs=[string(ini_c),string(base)];
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+Modulo_Count.prototype.details = function Modulo_Count() {
+}
 Modulo_Count.prototype.get = function Modulo_Count() {
 }
 Modulo_Count.prototype.set = function Modulo_Count() {
@@ -28,21 +45,4 @@ break
 }
 }
 }
-Modulo_Count.prototype.define = function Modulo_Count() {
-ini_c=0;
-base=3;
-model=scicos_model();
-model.sim=list("modulo_count",4);
-model.evtin=1;
-model.out=1;
-model.dstate=ini_c;
-model.ipar=base;
-model.blocktype="c";
-model.dep_ut=[false,false];
-exprs=[string(ini_c),string(base)];
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-Modulo_Count.prototype.details = function Modulo_Count() {
-}
 }
diff --git a/js/Sources/RAMP.js b/js/Sources/RAMP.js
index ead3978c..0e5bc370 100644
--- a/js/Sources/RAMP.js
+++ b/js/Sources/RAMP.js
@@ -1,5 +1,25 @@
 /* autogenerated from "macros/Sources/RAMP.sci" */
 function RAMP() {
+RAMP.prototype.define = function RAMP() {
+slope=0;
+iout=0;
+stt=0;
+rpar=[slope,stt,iout];
+model=scicos_model();
+model.sim=list("ramp",4);
+model.in1=[];
+model.out=1;
+model.rpar=rpar;
+model.blocktype="c";
+model.nmode=1;
+model.nzcross=1;
+model.dep_ut=[false,true];
+exprs=[string(rpar)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+RAMP.prototype.details = function RAMP() {
+}
 RAMP.prototype.get = function RAMP() {
 }
 RAMP.prototype.set = function RAMP() {
@@ -23,24 +43,4 @@ break
 }
 }
 }
-RAMP.prototype.define = function RAMP() {
-slope=0;
-iout=0;
-stt=0;
-rpar=[slope,stt,iout];
-model=scicos_model();
-model.sim=list("ramp",4);
-model.in1=[];
-model.out=1;
-model.rpar=rpar;
-model.blocktype="c";
-model.nmode=1;
-model.nzcross=1;
-model.dep_ut=[false,true];
-exprs=[string(rpar)];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-RAMP.prototype.details = function RAMP() {
-}
 }
diff --git a/js/Sources/RAND_f.js b/js/Sources/RAND_f.js
index 539e7568..ae6bf23b 100644
--- a/js/Sources/RAND_f.js
+++ b/js/Sources/RAND_f.js
@@ -1,5 +1,26 @@
 /* autogenerated from "macros/Sources/RAND_f.sci" */
 function RAND_f() {
+RAND_f.prototype.define = function RAND_f() {
+a=0;
+b=1;
+dt=0;
+out=1;
+flag=0;
+model=scicos_model();
+model.sim="rndblk";
+model.out=out;
+model.evtin=1;
+model.dstate=[int(rand()*(10^7-1)),0*a.slice()];
+model.rpar=[a.slice(),b.slice()];
+model.ipar=flag;
+model.blocktype="d";
+model.dep_ut=[false,false];
+exprs=[string(flag),sci2exp(a.slice()),sci2exp(b.slice()),string(model.dstate(1))];
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+RAND_f.prototype.details = function RAND_f() {
+}
 RAND_f.prototype.get = function RAND_f() {
 }
 RAND_f.prototype.set = function RAND_f() {
@@ -33,25 +54,4 @@ break
 }
 }
 }
-RAND_f.prototype.define = function RAND_f() {
-a=0;
-b=1;
-dt=0;
-out=1;
-flag=0;
-model=scicos_model();
-model.sim="rndblk";
-model.out=out;
-model.evtin=1;
-model.dstate=[int(rand()*(10^7-1)),0*a.slice()];
-model.rpar=[a.slice(),b.slice()];
-model.ipar=flag;
-model.blocktype="d";
-model.dep_ut=[false,false];
-exprs=[string(flag),sci2exp(a.slice()),sci2exp(b.slice()),string(model.dstate(1))];
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-RAND_f.prototype.details = function RAND_f() {
-}
 }
diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js
index d70d54f9..039aedcf 100644
--- a/js/Sources/RAND_m.js
+++ b/js/Sources/RAND_m.js
@@ -1,5 +1,35 @@
 /* autogenerated from "macros/Sources/RAND_m.sci" */
 function RAND_m() {
+RAND_m.prototype.define = function RAND_m() {
+a=0;
+b=1;
+dt=0;
+flag=0;
+function_name="rndblk_m";
+funtyp=4;
+model=scicos_model();
+model.sim=list(function_name,funtyp);
+model.in1=[];
+model.in2=[];
+model.intyp=[];
+model.out=1;
+model.out2=1;
+model.outtyp=1;
+model.evtin=1;
+model.evtout=[];
+model.state=[];
+model.dstate=[int(rand()*(10^7-1)),0*a.slice()];
+model.rpar=[a.slice(),b.slice()];
+model.ipar=flag;
+model.blocktype="d";
+model.firing=[];
+model.dep_ut=[false,false];
+exprs=[sci2exp(1),string(flag),sci2exp([a]),sci2exp([b]),sci2exp([model.dstate(1),int(rand()*(10^7-1))])];
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+RAND_m.prototype.details = function RAND_m() {
+}
 RAND_m.prototype.get = function RAND_m() {
 }
 RAND_m.prototype.set = function RAND_m() {
@@ -47,34 +77,4 @@ break
 }
 }
 }
-RAND_m.prototype.define = function RAND_m() {
-a=0;
-b=1;
-dt=0;
-flag=0;
-function_name="rndblk_m";
-funtyp=4;
-model=scicos_model();
-model.sim=list(function_name,funtyp);
-model.in1=[];
-model.in2=[];
-model.intyp=[];
-model.out=1;
-model.out2=1;
-model.outtyp=1;
-model.evtin=1;
-model.evtout=[];
-model.state=[];
-model.dstate=[int(rand()*(10^7-1)),0*a.slice()];
-model.rpar=[a.slice(),b.slice()];
-model.ipar=flag;
-model.blocktype="d";
-model.firing=[];
-model.dep_ut=[false,false];
-exprs=[sci2exp(1),string(flag),sci2exp([a]),sci2exp([b]),sci2exp([model.dstate(1),int(rand()*(10^7-1))])];
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-RAND_m.prototype.details = function RAND_m() {
-}
 }
diff --git a/js/Sources/READAU_f.js b/js/Sources/READAU_f.js
index a6e792c9..a0171f15 100644
--- a/js/Sources/READAU_f.js
+++ b/js/Sources/READAU_f.js
@@ -1,5 +1,31 @@
 /* autogenerated from "macros/Sources/READAU_f.sci" */
 function READAU_f() {
+READAU_f.prototype.define = function READAU_f() {
+frmt="uc ";
+fname="test.au";
+lunit=0;
+N=20;
+M=1;
+tmask=[];
+swap=0;
+offset=1;
+outmask=1;
+ievt=0;
+nout=size(outmask,"*");
+model=scicos_model();
+model.sim=list("readau",2);
+model.out=nout;
+model.evtin=1;
+model.dstate=[1,1,lunit,zeros(N*M,1)];
+model.ipar=[length(fname),_str2code(frmt),ievt,N,M,swap,offset,_str2code(fname),tmask,outmask];
+model.blocktype="d";
+model.dep_ut=[false,false];
+exprs=[fname,string(N),string(swap)];
+gr_i=[];
+x=standard_define([5,2],model,exprs,gr_i);
+}
+READAU_f.prototype.details = function READAU_f() {
+}
 READAU_f.prototype.get = function READAU_f() {
 }
 READAU_f.prototype.set = function READAU_f() {
@@ -54,30 +80,4 @@ break
 }
 }
 }
-READAU_f.prototype.define = function READAU_f() {
-frmt="uc ";
-fname="test.au";
-lunit=0;
-N=20;
-M=1;
-tmask=[];
-swap=0;
-offset=1;
-outmask=1;
-ievt=0;
-nout=size(outmask,"*");
-model=scicos_model();
-model.sim=list("readau",2);
-model.out=nout;
-model.evtin=1;
-model.dstate=[1,1,lunit,zeros(N*M,1)];
-model.ipar=[length(fname),_str2code(frmt),ievt,N,M,swap,offset,_str2code(fname),tmask,outmask];
-model.blocktype="d";
-model.dep_ut=[false,false];
-exprs=[fname,string(N),string(swap)];
-gr_i=[];
-x=standard_define([5,2],model,exprs,gr_i);
-}
-READAU_f.prototype.details = function READAU_f() {
-}
 }
diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js
index a3e6dad6..fb30dabc 100644
--- a/js/Sources/READC_f.js
+++ b/js/Sources/READC_f.js
@@ -1,5 +1,35 @@
 /* autogenerated from "macros/Sources/READC_f.sci" */
 function READC_f() {
+READC_f.prototype.define = function READC_f() {
+frmt="d  ";
+fname="foo";
+lunit=0;
+N=20;
+M=1;
+rpar=[];
+tmask=0;
+swap=0;
+offset=1;
+outmask=1;
+ievt=0;
+nout=size(outmask,"*");
+ipar=[length(fname),_str2code(frmt),ievt,N,M,swap,offset,_str2code(fname),tmask,outmask];
+model=scicos_model();
+model.sim=list("readc",2);
+model.out=nout;
+model.evtin=1;
+model.evtout=[];
+model.dstate=[1,1,lunit,zeros(N*M,1)];
+model.ipar=[length(fname),_str2code(frmt),ievt,N,M,swap,offset,_str2code(fname),tmask,outmask];
+model.blocktype="d";
+model.firing=-1;
+model.dep_ut=[false,false];
+exprs=["[]",sci2exp(outmask),fname,frmt,string(M),string(N),string(offset),string(swap)];
+gr_i=[];
+x=standard_define([4,2],model,exprs,gr_i);
+}
+READC_f.prototype.details = function READC_f() {
+}
 READC_f.prototype.get = function READC_f() {
 }
 READC_f.prototype.set = function READC_f() {
@@ -84,34 +114,4 @@ break
 }
 }
 }
-READC_f.prototype.define = function READC_f() {
-frmt="d  ";
-fname="foo";
-lunit=0;
-N=20;
-M=1;
-rpar=[];
-tmask=0;
-swap=0;
-offset=1;
-outmask=1;
-ievt=0;
-nout=size(outmask,"*");
-ipar=[length(fname),_str2code(frmt),ievt,N,M,swap,offset,_str2code(fname),tmask,outmask];
-model=scicos_model();
-model.sim=list("readc",2);
-model.out=nout;
-model.evtin=1;
-model.evtout=[];
-model.dstate=[1,1,lunit,zeros(N*M,1)];
-model.ipar=[length(fname),_str2code(frmt),ievt,N,M,swap,offset,_str2code(fname),tmask,outmask];
-model.blocktype="d";
-model.firing=-1;
-model.dep_ut=[false,false];
-exprs=["[]",sci2exp(outmask),fname,frmt,string(M),string(N),string(offset),string(swap)];
-gr_i=[];
-x=standard_define([4,2],model,exprs,gr_i);
-}
-READC_f.prototype.details = function READC_f() {
-}
 }
diff --git a/js/Sources/SAWTOOTH_f.js b/js/Sources/SAWTOOTH_f.js
index 5292e5b9..cae82edb 100644
--- a/js/Sources/SAWTOOTH_f.js
+++ b/js/Sources/SAWTOOTH_f.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/Sources/SAWTOOTH_f.sci" */
 function SAWTOOTH_f() {
-SAWTOOTH_f.prototype.get = function SAWTOOTH_f() {
-}
-SAWTOOTH_f.prototype.set = function SAWTOOTH_f() {
-x=arg1;
-}
 SAWTOOTH_f.prototype.define = function SAWTOOTH_f() {
 model=scicos_model();
 model.sim="sawtth";
@@ -19,4 +14,9 @@ x=standard_define([3,2],model,exprs,gr_i);
 }
 SAWTOOTH_f.prototype.details = function SAWTOOTH_f() {
 }
+SAWTOOTH_f.prototype.get = function SAWTOOTH_f() {
+}
+SAWTOOTH_f.prototype.set = function SAWTOOTH_f() {
+x=arg1;
+}
 }
diff --git a/js/Sources/STEP.js b/js/Sources/STEP.js
index 0841a09d..c3c6533d 100644
--- a/js/Sources/STEP.js
+++ b/js/Sources/STEP.js
@@ -1,5 +1,24 @@
 /* autogenerated from "macros/Sources/STEP.sci" */
 function STEP() {
+STEP.prototype.define = function STEP() {
+rpar=[0,1];
+model=scicos_model();
+model.sim=list("step_func",4);
+model.evtin=1;
+model.evtout=1;
+model.out=1;
+model.out2=1;
+model.outtyp=1;
+model.firing=1;
+model.rpar=rpar;
+model.blocktype="c";
+model.dep_ut=[false,false];
+exprs=[string(1),string(rpar)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+STEP.prototype.details = function STEP() {
+}
 STEP.prototype.get = function STEP() {
 }
 STEP.prototype.set = function STEP() {
@@ -44,23 +63,4 @@ break
 }
 }
 }
-STEP.prototype.define = function STEP() {
-rpar=[0,1];
-model=scicos_model();
-model.sim=list("step_func",4);
-model.evtin=1;
-model.evtout=1;
-model.out=1;
-model.out2=1;
-model.outtyp=1;
-model.firing=1;
-model.rpar=rpar;
-model.blocktype="c";
-model.dep_ut=[false,false];
-exprs=[string(1),string(rpar)];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-STEP.prototype.details = function STEP() {
-}
 }
diff --git a/js/Sources/SampleCLK.js b/js/Sources/SampleCLK.js
index 20211f16..a11e1d34 100644
--- a/js/Sources/SampleCLK.js
+++ b/js/Sources/SampleCLK.js
@@ -1,5 +1,18 @@
 /* autogenerated from "macros/Sources/SampleCLK.sci" */
 function SampleCLK() {
+SampleCLK.prototype.define = function SampleCLK() {
+model=scicos_model();
+model.sim="sampleclk";
+model.evtout=1;
+model.rpar=[1,0];
+model.blocktype="d";
+model.firing=-1;
+model.dep_ut=[false,false];
+exprs=[sci2exp(1),sci2exp(0)];
+x=standard_define([2,2],model,exprs," ");
+}
+SampleCLK.prototype.details = function SampleCLK() {
+}
 SampleCLK.prototype.get = function SampleCLK() {
 }
 SampleCLK.prototype.set = function SampleCLK() {
@@ -36,17 +49,4 @@ break
 }
 needcompile=resume(needcompile)
 }
-SampleCLK.prototype.define = function SampleCLK() {
-model=scicos_model();
-model.sim="sampleclk";
-model.evtout=1;
-model.rpar=[1,0];
-model.blocktype="d";
-model.firing=-1;
-model.dep_ut=[false,false];
-exprs=[sci2exp(1),sci2exp(0)];
-x=standard_define([2,2],model,exprs," ");
-}
-SampleCLK.prototype.details = function SampleCLK() {
-}
 }
diff --git a/js/Sources/TIME_f.js b/js/Sources/TIME_f.js
index 8df57a71..6e10cdda 100644
--- a/js/Sources/TIME_f.js
+++ b/js/Sources/TIME_f.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/Sources/TIME_f.sci" */
 function TIME_f() {
-TIME_f.prototype.get = function TIME_f() {
-}
-TIME_f.prototype.set = function TIME_f() {
-x=arg1;
-}
 TIME_f.prototype.define = function TIME_f() {
 model=scicos_model();
 model.sim="timblk";
@@ -16,4 +11,9 @@ x=standard_define([2,2],model,[],gr_i);
 }
 TIME_f.prototype.details = function TIME_f() {
 }
+TIME_f.prototype.get = function TIME_f() {
+}
+TIME_f.prototype.set = function TIME_f() {
+x=arg1;
+}
 }
diff --git a/js/Sources/TKSCALE.js b/js/Sources/TKSCALE.js
index f0c6fdab..c3ab253f 100644
--- a/js/Sources/TKSCALE.js
+++ b/js/Sources/TKSCALE.js
@@ -1,20 +1,5 @@
 /* autogenerated from "macros/Sources/TKSCALE.sci" */
 function TKSCALE() {
-TKSCALE.prototype.get = function TKSCALE() {
-}
-TKSCALE.prototype.set = function TKSCALE() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-[ok,a,b,f,exprs]=scicos_getvalue("Set scale block parameters",["Min value","Max value","Normalization"],list("vec",1,"vec",1,"vec",1),exprs);
-if (ok) {
-graphics.exprs=exprs;
-model.rpar=[a,b,f];
-x.graphics=graphics;
-x.model=model;
-}
-}
 TKSCALE.prototype.define = function TKSCALE() {
 a=-10;
 b=10;
@@ -32,4 +17,19 @@ x=standard_define([3,2],model,exprs,gr_i);
 }
 TKSCALE.prototype.details = function TKSCALE() {
 }
+TKSCALE.prototype.get = function TKSCALE() {
+}
+TKSCALE.prototype.set = function TKSCALE() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+[ok,a,b,f,exprs]=scicos_getvalue("Set scale block parameters",["Min value","Max value","Normalization"],list("vec",1,"vec",1,"vec",1),exprs);
+if (ok) {
+graphics.exprs=exprs;
+model.rpar=[a,b,f];
+x.graphics=graphics;
+x.model=model;
+}
+}
 }