21 files changed, 461 insertions, 461 deletions

diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js
index 972f2c4e..291891f9 100644
--- a/js/Sinks/AFFICH_m.js
+++ b/js/Sinks/AFFICH_m.js
@@ -1,5 +1,29 @@
 /* autogenerated from "macros/Sinks/AFFICH_m.sci" */
 function AFFICH_m() {
+AFFICH_m.prototype.define = function AFFICH_m() {
+font=1;
+fontsize=1;
+colr=1;
+nt=5;
+nd=1;
+in1=[1,1];
+model=scicos_model();
+model.sim=list("affich2",4);
+model.in1=in1(1,1);
+model.in2=in1(1,2);
+model.evtin=1;
+model.dstate=[-1,0,0,1,1,0,zeros(in1(1,1)*in1(1,2),1)];
+model.ipar=[font,fontsize,colr,1000,nt,nd,in1(1,1)];
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,false];
+model.label="";
+exprs=[sci2exp([model.in1,model.in2]),string(font),string(fontsize),string(colr),string(nt),string(nd),string(0)];
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+AFFICH_m.prototype.details = function AFFICH_m() {
+}
 AFFICH_m.prototype.get = function AFFICH_m() {
 }
 AFFICH_m.prototype.set = function AFFICH_m() {
@@ -53,28 +77,4 @@ break
 }
 }
 }
-AFFICH_m.prototype.define = function AFFICH_m() {
-font=1;
-fontsize=1;
-colr=1;
-nt=5;
-nd=1;
-in1=[1,1];
-model=scicos_model();
-model.sim=list("affich2",4);
-model.in1=in1(1,1);
-model.in2=in1(1,2);
-model.evtin=1;
-model.dstate=[-1,0,0,1,1,0,zeros(in1(1,1)*in1(1,2),1)];
-model.ipar=[font,fontsize,colr,1000,nt,nd,in1(1,1)];
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-model.label="";
-exprs=[sci2exp([model.in1,model.in2]),string(font),string(fontsize),string(colr),string(nt),string(nd),string(0)];
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-AFFICH_m.prototype.details = function AFFICH_m() {
-}
 }
diff --git a/js/Sinks/BARXY.js b/js/Sinks/BARXY.js
index 806afce7..5aa74b9e 100644
--- a/js/Sinks/BARXY.js
+++ b/js/Sinks/BARXY.js
@@ -1,5 +1,27 @@
 /* autogenerated from "macros/Sinks/BARXY.sci" */
 function BARXY() {
+BARXY.prototype.define = function BARXY() {
+model=scicos_model();
+xmin=-15;
+xmax=15;
+ymin=-15;
+ymax=15;
+model.sim=list("BARXY_sim",5);
+model.blocktype="d";
+model.dep_ut=[true,false];
+model.in1=[-1,-1];
+model.intyp=[1];
+model.out=[];
+model.evtin=[1];
+model.rpar=[xmin,xmax,ymin,ymax];
+model.ipar=1;
+x=standard_define([2,2],model,[],[]);
+x.graphics.in_implicit=["E","E"];
+x.graphics.out_implicit=[];
+x.graphics.exprs=["-15","15","-15","15","1"];
+}
+BARXY.prototype.details = function BARXY() {
+}
 BARXY.prototype.get = function BARXY() {
 }
 BARXY.prototype.set = function BARXY() {
@@ -37,26 +59,4 @@ break
 }
 }
 }
-BARXY.prototype.define = function BARXY() {
-model=scicos_model();
-xmin=-15;
-xmax=15;
-ymin=-15;
-ymax=15;
-model.sim=list("BARXY_sim",5);
-model.blocktype="d";
-model.dep_ut=[true,false];
-model.in1=[-1,-1];
-model.intyp=[1];
-model.out=[];
-model.evtin=[1];
-model.rpar=[xmin,xmax,ymin,ymax];
-model.ipar=1;
-x=standard_define([2,2],model,[],[]);
-x.graphics.in_implicit=["E","E"];
-x.graphics.out_implicit=[];
-x.graphics.exprs=["-15","15","-15","15","1"];
-}
-BARXY.prototype.details = function BARXY() {
-}
 }
diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js
index 4004cbcf..d01d4d71 100644
--- a/js/Sinks/CANIMXY.js
+++ b/js/Sinks/CANIMXY.js
@@ -1,5 +1,34 @@
 /* autogenerated from "macros/Sinks/CANIMXY.sci" */
 function CANIMXY() {
+CANIMXY.prototype.define = function CANIMXY() {
+win=-1;
+clrs=-4;
+N=2;
+siz=1;
+wpos=[-1,-1];
+wdim=[-1,-1];
+xmin=-15;
+xmax=15;
+ymin=-15;
+ymax=+15;
+nbr_curves=1;
+model=scicos_model();
+model.sim=list("canimxy",4);
+model.in1=[1,1];
+model.in2=[1,1];
+model.intyp=[1,1];
+model.evtin=1;
+model.rpar=[xmin,xmax,ymin,ymax];
+model.ipar=[win,1,N,clrs,siz,0,wpos.slice(),wdim.slice(),nbr_curves];
+model.blocktype="d";
+model.firing=[];
+model.dep_ut=[false,false];
+exprs=[string(nbr_curves),string(clrs),string(siz),string(win),"[]","[]",string(xmin),string(xmax),string(ymin),string(ymax),string(N)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+CANIMXY.prototype.details = function CANIMXY() {
+}
 CANIMXY.prototype.get = function CANIMXY() {
 }
 CANIMXY.prototype.set = function CANIMXY() {
@@ -68,33 +97,4 @@ break
 }
 }
 }
-CANIMXY.prototype.define = function CANIMXY() {
-win=-1;
-clrs=-4;
-N=2;
-siz=1;
-wpos=[-1,-1];
-wdim=[-1,-1];
-xmin=-15;
-xmax=15;
-ymin=-15;
-ymax=+15;
-nbr_curves=1;
-model=scicos_model();
-model.sim=list("canimxy",4);
-model.in1=[1,1];
-model.in2=[1,1];
-model.intyp=[1,1];
-model.evtin=1;
-model.rpar=[xmin,xmax,ymin,ymax];
-model.ipar=[win,1,N,clrs,siz,0,wpos.slice(),wdim.slice(),nbr_curves];
-model.blocktype="d";
-model.firing=[];
-model.dep_ut=[false,false];
-exprs=[string(nbr_curves),string(clrs),string(siz),string(win),"[]","[]",string(xmin),string(xmax),string(ymin),string(ymax),string(N)];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-CANIMXY.prototype.details = function CANIMXY() {
-}
 }
diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js
index b7310730..36b75fb4 100644
--- a/js/Sinks/CANIMXY3D.js
+++ b/js/Sinks/CANIMXY3D.js
@@ -1,5 +1,34 @@
 /* autogenerated from "macros/Sinks/CANIMXY3D.sci" */
 function CANIMXY3D() {
+CANIMXY3D.prototype.define = function CANIMXY3D() {
+win=-1;
+N=2;
+clrs=[1,2,3,4,5,6,7,13];
+siz=[1,1,1,1,1,1,1,1];
+wpos=[-1,-1];
+wdim=[-1,-1];
+param3ds=[50,280];
+vec_x=[-15,15];
+vec_y=[-15,15];
+vec_z=[-15,15];
+nbr_curves=1;
+model=scicos_model();
+model.sim=list("canimxy3d",4);
+model.in1=[1,1,1];
+model.evtin=1;
+model.in2=[1,1,1];
+model.intyp=[1,1,1];
+model.rpar=[vec_x.slice(),vec_y.slice(),vec_z.slice(),param3ds.slice()];
+model.ipar=[win,8,N,clrs.slice(),siz.slice(),8,wpos.slice(),wdim.slice(),nbr_curves];
+model.blocktype="d";
+model.firing=[];
+model.dep_ut=[false,false];
+exprs=[string(nbr_curves),strcat(string(clrs)," "),strcat(string(siz)," "),string(win),"[]","[]",strcat(string(vec_x)," "),strcat(string(vec_y)," "),strcat(string(vec_z)," "),strcat(string(param3ds)," "),string(N)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+CANIMXY3D.prototype.details = function CANIMXY3D() {
+}
 CANIMXY3D.prototype.get = function CANIMXY3D() {
 }
 CANIMXY3D.prototype.set = function CANIMXY3D() {
@@ -85,33 +114,4 @@ break
 }
 }
 }
-CANIMXY3D.prototype.define = function CANIMXY3D() {
-win=-1;
-N=2;
-clrs=[1,2,3,4,5,6,7,13];
-siz=[1,1,1,1,1,1,1,1];
-wpos=[-1,-1];
-wdim=[-1,-1];
-param3ds=[50,280];
-vec_x=[-15,15];
-vec_y=[-15,15];
-vec_z=[-15,15];
-nbr_curves=1;
-model=scicos_model();
-model.sim=list("canimxy3d",4);
-model.in1=[1,1,1];
-model.evtin=1;
-model.in2=[1,1,1];
-model.intyp=[1,1,1];
-model.rpar=[vec_x.slice(),vec_y.slice(),vec_z.slice(),param3ds.slice()];
-model.ipar=[win,8,N,clrs.slice(),siz.slice(),8,wpos.slice(),wdim.slice(),nbr_curves];
-model.blocktype="d";
-model.firing=[];
-model.dep_ut=[false,false];
-exprs=[string(nbr_curves),strcat(string(clrs)," "),strcat(string(siz)," "),string(win),"[]","[]",strcat(string(vec_x)," "),strcat(string(vec_y)," "),strcat(string(vec_z)," "),strcat(string(param3ds)," "),string(N)];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-CANIMXY3D.prototype.details = function CANIMXY3D() {
-}
 }
diff --git a/js/Sinks/CEVENTSCOPE.js b/js/Sinks/CEVENTSCOPE.js
index 84277e7b..2f8854e9 100644
--- a/js/Sinks/CEVENTSCOPE.js
+++ b/js/Sinks/CEVENTSCOPE.js
@@ -1,5 +1,25 @@
 /* autogenerated from "macros/Sinks/CEVENTSCOPE.sci" */
 function CEVENTSCOPE() {
+CEVENTSCOPE.prototype.define = function CEVENTSCOPE() {
+nclock=1;
+win=-1;
+clrs=[1,3,5,7,9,11,13,15];
+wdim=[600,400];
+wpos=[-1,-1];
+per=30;
+model=scicos_model();
+model.sim=list("cevscpe",4);
+model.evtin=1;
+model.rpar=per;
+model.ipar=[win,1,clrs[nclock-1],wpos.slice(),wdim.slice()];
+model.blocktype="d";
+model.dep_ut=[false,false];
+exprs=[sci2exp(nclock),strcat(sci2exp(clrs[nclock-1])," "),string(win),sci2exp([]),sci2exp(wdim),string(per)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+CEVENTSCOPE.prototype.details = function CEVENTSCOPE() {
+}
 CEVENTSCOPE.prototype.get = function CEVENTSCOPE() {
 }
 CEVENTSCOPE.prototype.set = function CEVENTSCOPE() {
@@ -63,24 +83,4 @@ break
 }
 }
 }
-CEVENTSCOPE.prototype.define = function CEVENTSCOPE() {
-nclock=1;
-win=-1;
-clrs=[1,3,5,7,9,11,13,15];
-wdim=[600,400];
-wpos=[-1,-1];
-per=30;
-model=scicos_model();
-model.sim=list("cevscpe",4);
-model.evtin=1;
-model.rpar=per;
-model.ipar=[win,1,clrs[nclock-1],wpos.slice(),wdim.slice()];
-model.blocktype="d";
-model.dep_ut=[false,false];
-exprs=[sci2exp(nclock),strcat(sci2exp(clrs[nclock-1])," "),string(win),sci2exp([]),sci2exp(wdim),string(per)];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-CEVENTSCOPE.prototype.details = function CEVENTSCOPE() {
-}
 }
diff --git a/js/Sinks/CFSCOPE.js b/js/Sinks/CFSCOPE.js
index 45f7fc92..d0012723 100644
--- a/js/Sinks/CFSCOPE.js
+++ b/js/Sinks/CFSCOPE.js
@@ -1,5 +1,27 @@
 /* autogenerated from "macros/Sinks/CFSCOPE.sci" */
 function CFSCOPE() {
+CFSCOPE.prototype.define = function CFSCOPE() {
+win=-1;
+wdim=[600,400];
+wpos=[-1,-1];
+clrs=[1,3,5,7,9,11,13,15];
+N=2;
+ymin=-15;
+ymax=+15;
+per=30;
+model=scicos_model();
+model.sim=list("cfscope",4);
+model.evtin=1;
+model.rpar=[0,ymin,ymax,per];
+model.ipar=[win,1,N,clrs,wpos,wdim,1,1];
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[strcat(string(clrs)," "),string(win),sci2exp([]),sci2exp(wdim),string(ymin),string(ymax),string(per),string(N),string([1])];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+CFSCOPE.prototype.details = function CFSCOPE() {
+}
 CFSCOPE.prototype.get = function CFSCOPE() {
 }
 CFSCOPE.prototype.set = function CFSCOPE() {
@@ -70,26 +92,4 @@ break
 }
 }
 }
-CFSCOPE.prototype.define = function CFSCOPE() {
-win=-1;
-wdim=[600,400];
-wpos=[-1,-1];
-clrs=[1,3,5,7,9,11,13,15];
-N=2;
-ymin=-15;
-ymax=+15;
-per=30;
-model=scicos_model();
-model.sim=list("cfscope",4);
-model.evtin=1;
-model.rpar=[0,ymin,ymax,per];
-model.ipar=[win,1,N,clrs,wpos,wdim,1,1];
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[strcat(string(clrs)," "),string(win),sci2exp([]),sci2exp(wdim),string(ymin),string(ymax),string(per),string(N),string([1])];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-CFSCOPE.prototype.details = function CFSCOPE() {
-}
 }
diff --git a/js/Sinks/CLKOUTV_f.js b/js/Sinks/CLKOUTV_f.js
index b8541da3..b58ec48f 100644
--- a/js/Sinks/CLKOUTV_f.js
+++ b/js/Sinks/CLKOUTV_f.js
@@ -1,5 +1,19 @@
 /* autogenerated from "macros/Sinks/CLKOUTV_f.sci" */
 function CLKOUTV_f() {
+CLKOUTV_f.prototype.define = function CLKOUTV_f() {
+prt=1;
+model=scicos_model();
+model.sim="output";
+model.evtin=1;
+model.ipar=prt;
+model.blocktype="d";
+model.firing=[];
+model.dep_ut=[false,false];
+exprs=string(prt);
+x=standard_define([1,1],model,exprs," ");
+}
+CLKOUTV_f.prototype.details = function CLKOUTV_f() {
+}
 CLKOUTV_f.prototype.get = function CLKOUTV_f() {
 }
 CLKOUTV_f.prototype.set = function CLKOUTV_f() {
@@ -25,18 +39,4 @@ break
 }
 }
 }
-CLKOUTV_f.prototype.define = function CLKOUTV_f() {
-prt=1;
-model=scicos_model();
-model.sim="output";
-model.evtin=1;
-model.ipar=prt;
-model.blocktype="d";
-model.firing=[];
-model.dep_ut=[false,false];
-exprs=string(prt);
-x=standard_define([1,1],model,exprs," ");
-}
-CLKOUTV_f.prototype.details = function CLKOUTV_f() {
-}
 }
diff --git a/js/Sinks/CLKOUT_f.js b/js/Sinks/CLKOUT_f.js
index 466461c3..3dd95225 100644
--- a/js/Sinks/CLKOUT_f.js
+++ b/js/Sinks/CLKOUT_f.js
@@ -1,5 +1,19 @@
 /* autogenerated from "macros/Sinks/CLKOUT_f.sci" */
 function CLKOUT_f() {
+CLKOUT_f.prototype.define = function CLKOUT_f() {
+prt=1;
+model=scicos_model();
+model.sim="output";
+model.evtin=1;
+model.ipar=prt;
+model.blocktype="d";
+model.firing=[];
+model.dep_ut=[false,false];
+exprs=string(prt);
+x=standard_define([1,1],model,exprs," ");
+}
+CLKOUT_f.prototype.details = function CLKOUT_f() {
+}
 CLKOUT_f.prototype.get = function CLKOUT_f() {
 }
 CLKOUT_f.prototype.set = function CLKOUT_f() {
@@ -27,18 +41,4 @@ break
 }
 }
 }
-CLKOUT_f.prototype.define = function CLKOUT_f() {
-prt=1;
-model=scicos_model();
-model.sim="output";
-model.evtin=1;
-model.ipar=prt;
-model.blocktype="d";
-model.firing=[];
-model.dep_ut=[false,false];
-exprs=string(prt);
-x=standard_define([1,1],model,exprs," ");
-}
-CLKOUT_f.prototype.details = function CLKOUT_f() {
-}
 }
diff --git a/js/Sinks/CMAT3D.js b/js/Sinks/CMAT3D.js
index b04ee9f5..4b06e180 100644
--- a/js/Sinks/CMAT3D.js
+++ b/js/Sinks/CMAT3D.js
@@ -1,5 +1,30 @@
 /* autogenerated from "macros/Sinks/CMAT3D.sci" */
 function CMAT3D() {
+CMAT3D.prototype.define = function CMAT3D() {
+cmin=0;
+cmax=100;
+colormap=jetcolormap(25);
+size_c=25;
+x=-1;
+y=-1;
+size_x=1;
+size_y=1;
+model=scicos_model();
+model.sim=list("cmat3d",4);
+model.in1=-1;
+model.in2=-2;
+model.intyp=1;
+model.evtin=1;
+model.ipar=[cmin,cmax,size_c,size_x,size_y];
+model.rpar=[colormap.slice(),x,y];
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[strcat(string(x)," "),strcat(string(y)," "),string("jetcolormap(25)"),string(cmin),string(cmax)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+CMAT3D.prototype.details = function CMAT3D() {
+}
 CMAT3D.prototype.get = function CMAT3D() {
 }
 CMAT3D.prototype.set = function CMAT3D() {
@@ -38,29 +63,4 @@ break
 }
 }
 }
-CMAT3D.prototype.define = function CMAT3D() {
-cmin=0;
-cmax=100;
-colormap=jetcolormap(25);
-size_c=25;
-x=-1;
-y=-1;
-size_x=1;
-size_y=1;
-model=scicos_model();
-model.sim=list("cmat3d",4);
-model.in1=-1;
-model.in2=-2;
-model.intyp=1;
-model.evtin=1;
-model.ipar=[cmin,cmax,size_c,size_x,size_y];
-model.rpar=[colormap.slice(),x,y];
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[strcat(string(x)," "),strcat(string(y)," "),string("jetcolormap(25)"),string(cmin),string(cmax)];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-CMAT3D.prototype.details = function CMAT3D() {
-}
 }
diff --git a/js/Sinks/CMATVIEW.js b/js/Sinks/CMATVIEW.js
index e9428ea8..e94dfcf9 100644
--- a/js/Sinks/CMATVIEW.js
+++ b/js/Sinks/CMATVIEW.js
@@ -1,5 +1,28 @@
 /* autogenerated from "macros/Sinks/CMATVIEW.sci" */
 function CMATVIEW() {
+CMATVIEW.prototype.define = function CMATVIEW() {
+cmin=0;
+cmax=100;
+size_c=25;
+colormap=jetcolormap(size_c);
+alpha_c=0.24;
+beta_c=1;
+model=scicos_model();
+model.sim=list("cmatview",4);
+model.in1=-1;
+model.in2=-2;
+model.intyp=1;
+model.evtin=1;
+model.ipar=[cmin,cmax,size_c];
+model.rpar=[alpha_c,beta_c,colormap.slice()];
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[string("jetcolormap(25)"),string(cmin),string(cmax)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+CMATVIEW.prototype.details = function CMATVIEW() {
+}
 CMATVIEW.prototype.get = function CMATVIEW() {
 }
 CMATVIEW.prototype.set = function CMATVIEW() {
@@ -36,27 +59,4 @@ break
 }
 }
 }
-CMATVIEW.prototype.define = function CMATVIEW() {
-cmin=0;
-cmax=100;
-size_c=25;
-colormap=jetcolormap(size_c);
-alpha_c=0.24;
-beta_c=1;
-model=scicos_model();
-model.sim=list("cmatview",4);
-model.in1=-1;
-model.in2=-2;
-model.intyp=1;
-model.evtin=1;
-model.ipar=[cmin,cmax,size_c];
-model.rpar=[alpha_c,beta_c,colormap.slice()];
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[string("jetcolormap(25)"),string(cmin),string(cmax)];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-CMATVIEW.prototype.details = function CMATVIEW() {
-}
 }
diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js
index 38f4fcd1..d112ebb5 100644
--- a/js/Sinks/CMSCOPE.js
+++ b/js/Sinks/CMSCOPE.js
@@ -1,5 +1,33 @@
 /* autogenerated from "macros/Sinks/CMSCOPE.sci" */
 function CMSCOPE() {
+CMSCOPE.prototype.define = function CMSCOPE() {
+win=-1;
+in1=[1,1];
+wdim=[-1,-1];
+wpos=[-1,-1];
+clrs=[1,3,5,7,9,11,13,15];
+N=20;
+ymin=[-1,-5];
+ymax=[1,5];
+per=[30,30];
+yy=[transpose(ymin.slice()),transpose(ymax.slice())];
+period=transpose(per.slice());
+model=scicos_model();
+model.sim=list("cmscope",4);
+model.in1=in1;
+model.in2=[1,1];
+model.intyp=[1,1];
+model.evtin=1;
+model.rpar=[0,period.slice(),yy.slice()];
+model.ipar=[win,size(in1,"*"),N,wpos.slice(),wdim.slice(),in1.slice(),clrs.slice(1-1,sum(in1))];
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[strcat(string(in1)," "),strcat(string(clrs)," "),string(win),sci2exp([]),sci2exp([]),strcat(string(ymin)," "),strcat(string(ymax)," "),strcat(string(per)," "),string(N),string(0),emptystr()];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+CMSCOPE.prototype.details = function CMSCOPE() {
+}
 CMSCOPE.prototype.get = function CMSCOPE() {
 }
 CMSCOPE.prototype.set = function CMSCOPE() {
@@ -95,32 +123,4 @@ break
 }
 }
 }
-CMSCOPE.prototype.define = function CMSCOPE() {
-win=-1;
-in1=[1,1];
-wdim=[-1,-1];
-wpos=[-1,-1];
-clrs=[1,3,5,7,9,11,13,15];
-N=20;
-ymin=[-1,-5];
-ymax=[1,5];
-per=[30,30];
-yy=[transpose(ymin.slice()),transpose(ymax.slice())];
-period=transpose(per.slice());
-model=scicos_model();
-model.sim=list("cmscope",4);
-model.in1=in1;
-model.in2=[1,1];
-model.intyp=[1,1];
-model.evtin=1;
-model.rpar=[0,period.slice(),yy.slice()];
-model.ipar=[win,size(in1,"*"),N,wpos.slice(),wdim.slice(),in1.slice(),clrs.slice(1-1,sum(in1))];
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[strcat(string(in1)," "),strcat(string(clrs)," "),string(win),sci2exp([]),sci2exp([]),strcat(string(ymin)," "),strcat(string(ymax)," "),strcat(string(per)," "),string(N),string(0),emptystr()];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-CMSCOPE.prototype.details = function CMSCOPE() {
-}
 }
diff --git a/js/Sinks/CSCOPE.js b/js/Sinks/CSCOPE.js
index 3bf3cc03..538a1115 100644
--- a/js/Sinks/CSCOPE.js
+++ b/js/Sinks/CSCOPE.js
@@ -1,5 +1,29 @@
 /* autogenerated from "macros/Sinks/CSCOPE.sci" */
 function CSCOPE() {
+CSCOPE.prototype.define = function CSCOPE() {
+win=-1;
+wdim=[600,400];
+wpos=[-1,-1];
+clrs=[1,3,5,7,9,11,13,15];
+N=20;
+ymin=-15;
+ymax=+15;
+per=30;
+model=scicos_model();
+model.sim=list("cscope",4);
+model.in1=-1;
+model.in2=1;
+model.evtin=1;
+model.rpar=[0,ymin,ymax,per];
+model.ipar=[win,1,N,clrs,wpos,wdim];
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[strcat(string(clrs)," "),string(win),sci2exp([]),sci2exp(wdim),string(ymin),string(ymax),string(per),string(N),transpose(string(0)),emptystr()];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+CSCOPE.prototype.details = function CSCOPE() {
+}
 CSCOPE.prototype.get = function CSCOPE() {
 }
 CSCOPE.prototype.set = function CSCOPE() {
@@ -68,28 +92,4 @@ break
 }
 }
 }
-CSCOPE.prototype.define = function CSCOPE() {
-win=-1;
-wdim=[600,400];
-wpos=[-1,-1];
-clrs=[1,3,5,7,9,11,13,15];
-N=20;
-ymin=-15;
-ymax=+15;
-per=30;
-model=scicos_model();
-model.sim=list("cscope",4);
-model.in1=-1;
-model.in2=1;
-model.evtin=1;
-model.rpar=[0,ymin,ymax,per];
-model.ipar=[win,1,N,clrs,wpos,wdim];
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[strcat(string(clrs)," "),string(win),sci2exp([]),sci2exp(wdim),string(ymin),string(ymax),string(per),string(N),transpose(string(0)),emptystr()];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-CSCOPE.prototype.details = function CSCOPE() {
-}
 }
diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js
index ecf168b9..0771bbcf 100644
--- a/js/Sinks/CSCOPXY.js
+++ b/js/Sinks/CSCOPXY.js
@@ -1,5 +1,33 @@
 /* autogenerated from "macros/Sinks/CSCOPXY.sci" */
 function CSCOPXY() {
+CSCOPXY.prototype.define = function CSCOPXY() {
+win=-1;
+clrs=4;
+siz=1;
+wdim=[600,400];
+wpos=[-1,-1];
+N=2;
+xmin=-15;
+xmax=15;
+ymin=-15;
+ymax=+15;
+nbr_curves=1;
+model=scicos_model();
+model.sim=list("cscopxy",4);
+model.in1=[1,1];
+model.in2=[1,1];
+model.intyp=[1,1];
+model.evtin=1;
+model.rpar=[xmin,xmax,ymin,ymax];
+model.ipar=[win,1,N,clrs,siz,1,wpos.slice(),wdim.slice(),nbr_curves];
+model.blocktype="d";
+model.dep_ut=[false,false];
+exprs=[string(nbr_curves),sci2exp(clrs),sci2exp(siz),string(win),sci2exp([]),sci2exp(wdim),string(xmin),string(xmax),string(ymin),string(ymax),string(N)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+CSCOPXY.prototype.details = function CSCOPXY() {
+}
 CSCOPXY.prototype.get = function CSCOPXY() {
 }
 CSCOPXY.prototype.set = function CSCOPXY() {
@@ -68,32 +96,4 @@ break
 }
 }
 }
-CSCOPXY.prototype.define = function CSCOPXY() {
-win=-1;
-clrs=4;
-siz=1;
-wdim=[600,400];
-wpos=[-1,-1];
-N=2;
-xmin=-15;
-xmax=15;
-ymin=-15;
-ymax=+15;
-nbr_curves=1;
-model=scicos_model();
-model.sim=list("cscopxy",4);
-model.in1=[1,1];
-model.in2=[1,1];
-model.intyp=[1,1];
-model.evtin=1;
-model.rpar=[xmin,xmax,ymin,ymax];
-model.ipar=[win,1,N,clrs,siz,1,wpos.slice(),wdim.slice(),nbr_curves];
-model.blocktype="d";
-model.dep_ut=[false,false];
-exprs=[string(nbr_curves),sci2exp(clrs),sci2exp(siz),string(win),sci2exp([]),sci2exp(wdim),string(xmin),string(xmax),string(ymin),string(ymax),string(N)];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-CSCOPXY.prototype.details = function CSCOPXY() {
-}
 }
diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js
index fec5ad0c..2a297aad 100644
--- a/js/Sinks/CSCOPXY3D.js
+++ b/js/Sinks/CSCOPXY3D.js
@@ -1,5 +1,33 @@
 /* autogenerated from "macros/Sinks/CSCOPXY3D.sci" */
 function CSCOPXY3D() {
+CSCOPXY3D.prototype.define = function CSCOPXY3D() {
+win=-1;
+clrs=[1,2,3,4,5,6,7,13];
+siz=[1,1,1,1,1,1,1,1];
+wdim=[600,400];
+wpos=[-1,-1];
+N=2;
+param3ds=[50,280];
+vec_x=[-15,15];
+vec_y=[-15,15];
+vec_z=[-15,15];
+nbr_curves=1;
+model=scicos_model();
+model.sim=list("cscopxy3d",4);
+model.in1=[1,1,1];
+model.in2=[1,1,1];
+model.intyp=[1,1,1];
+model.evtin=1;
+model.rpar=[vec_x.slice(),vec_y.slice(),vec_z.slice(),param3ds.slice()];
+model.ipar=[win,8,N,clrs.slice(),siz.slice(),8,wpos.slice(),wdim.slice(),nbr_curves];
+model.blocktype="d";
+model.dep_ut=[false,false];
+exprs=[string(nbr_curves),strcat(string(clrs)," "),strcat(string(siz)," "),string(win),sci2exp([]),sci2exp(wdim),strcat(string(vec_x)," "),strcat(string(vec_y)," "),strcat(string(vec_z)," "),strcat(string(param3ds)," "),string(N)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+CSCOPXY3D.prototype.details = function CSCOPXY3D() {
+}
 CSCOPXY3D.prototype.get = function CSCOPXY3D() {
 }
 CSCOPXY3D.prototype.set = function CSCOPXY3D() {
@@ -81,32 +109,4 @@ message(mess);
 }
 }
 }
-CSCOPXY3D.prototype.define = function CSCOPXY3D() {
-win=-1;
-clrs=[1,2,3,4,5,6,7,13];
-siz=[1,1,1,1,1,1,1,1];
-wdim=[600,400];
-wpos=[-1,-1];
-N=2;
-param3ds=[50,280];
-vec_x=[-15,15];
-vec_y=[-15,15];
-vec_z=[-15,15];
-nbr_curves=1;
-model=scicos_model();
-model.sim=list("cscopxy3d",4);
-model.in1=[1,1,1];
-model.in2=[1,1,1];
-model.intyp=[1,1,1];
-model.evtin=1;
-model.rpar=[vec_x.slice(),vec_y.slice(),vec_z.slice(),param3ds.slice()];
-model.ipar=[win,8,N,clrs.slice(),siz.slice(),8,wpos.slice(),wdim.slice(),nbr_curves];
-model.blocktype="d";
-model.dep_ut=[false,false];
-exprs=[string(nbr_curves),strcat(string(clrs)," "),strcat(string(siz)," "),string(win),sci2exp([]),sci2exp(wdim),strcat(string(vec_x)," "),strcat(string(vec_y)," "),strcat(string(vec_z)," "),strcat(string(param3ds)," "),string(N)];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-CSCOPXY3D.prototype.details = function CSCOPXY3D() {
-}
 }
diff --git a/js/Sinks/OUTIMPL_f.js b/js/Sinks/OUTIMPL_f.js
index eacd248e..7c9cdbc7 100644
--- a/js/Sinks/OUTIMPL_f.js
+++ b/js/Sinks/OUTIMPL_f.js
@@ -1,5 +1,25 @@
 /* autogenerated from "macros/Sinks/OUTIMPL_f.sci" */
 function OUTIMPL_f() {
+OUTIMPL_f.prototype.define = function OUTIMPL_f() {
+model=scicos_model();
+model.in1=[-1];
+model.in2=[1];
+prt=1;
+model.sim="outimpl";
+model.ipar=[1];
+model.blocktype="c";
+model.dep_ut=[false,false];
+mo=modelica();
+mo.model="PORT";
+mo.inputs="n";
+model.equations=mo;
+exprs="1";
+gr_i=[];
+x=standard_define([1,1],model,exprs,gr_i);
+x.graphics.in_implicit=["I"];
+}
+OUTIMPL_f.prototype.details = function OUTIMPL_f() {
+}
 OUTIMPL_f.prototype.get = function OUTIMPL_f() {
 }
 OUTIMPL_f.prototype.set = function OUTIMPL_f() {
@@ -31,24 +51,4 @@ break
 }
 }
 }
-OUTIMPL_f.prototype.define = function OUTIMPL_f() {
-model=scicos_model();
-model.in1=[-1];
-model.in2=[1];
-prt=1;
-model.sim="outimpl";
-model.ipar=[1];
-model.blocktype="c";
-model.dep_ut=[false,false];
-mo=modelica();
-mo.model="PORT";
-mo.inputs="n";
-model.equations=mo;
-exprs="1";
-gr_i=[];
-x=standard_define([1,1],model,exprs,gr_i);
-x.graphics.in_implicit=["I"];
-}
-OUTIMPL_f.prototype.details = function OUTIMPL_f() {
-}
 }
diff --git a/js/Sinks/OUT_f.js b/js/Sinks/OUT_f.js
index 6f1ad615..b45ba896 100644
--- a/js/Sinks/OUT_f.js
+++ b/js/Sinks/OUT_f.js
@@ -1,5 +1,22 @@
 /* autogenerated from "macros/Sinks/OUT_f.sci" */
 function OUT_f() {
+OUT_f.prototype.define = function OUT_f() {
+n=-1;
+prt=1;
+model=scicos_model();
+model.sim="output";
+model.in1=-1;
+model.in2=-2;
+model.intyp=-1;
+model.ipar=prt;
+model.blocktype="c";
+model.dep_ut=[false,false];
+exprs=string(prt);
+gr_i=[];
+x=standard_define([1,1],model,exprs,gr_i);
+}
+OUT_f.prototype.details = function OUT_f() {
+}
 OUT_f.prototype.get = function OUT_f() {
 }
 OUT_f.prototype.set = function OUT_f() {
@@ -27,21 +44,4 @@ break
 }
 }
 }
-OUT_f.prototype.define = function OUT_f() {
-n=-1;
-prt=1;
-model=scicos_model();
-model.sim="output";
-model.in1=-1;
-model.in2=-2;
-model.intyp=-1;
-model.ipar=prt;
-model.blocktype="c";
-model.dep_ut=[false,false];
-exprs=string(prt);
-gr_i=[];
-x=standard_define([1,1],model,exprs,gr_i);
-}
-OUT_f.prototype.details = function OUT_f() {
-}
 }
diff --git a/js/Sinks/TOWS_c.js b/js/Sinks/TOWS_c.js
index 2dcc6b55..94f0bc81 100644
--- a/js/Sinks/TOWS_c.js
+++ b/js/Sinks/TOWS_c.js
@@ -1,5 +1,29 @@
 /* autogenerated from "macros/Sinks/TOWS_c.sci" */
 function TOWS_c() {
+TOWS_c.prototype.define = function TOWS_c() {
+nu=-1;
+nz=128;
+varnam="A";
+herit=0;
+model=scicos_model();
+model.sim=list("tows_c",4);
+model.in1=[nu];
+model.in2=-2;
+model.intyp=-1;
+model.out=[];
+model.evtin=[1];
+model.evtout=[];
+model.rpar=[];
+model.ipar=[nz,length(varnam),transpose(ascii(varnam))];
+model.blocktype="d";
+model.firing=[];
+model.dep_ut=[false,false];
+gr_i=[];
+exprs=[string(nz),string(varnam),string(herit)];
+x=standard_define([4,2],model,exprs,gr_i);
+}
+TOWS_c.prototype.details = function TOWS_c() {
+}
 TOWS_c.prototype.get = function TOWS_c() {
 }
 TOWS_c.prototype.set = function TOWS_c() {
@@ -38,28 +62,4 @@ break
 }
 }
 }
-TOWS_c.prototype.define = function TOWS_c() {
-nu=-1;
-nz=128;
-varnam="A";
-herit=0;
-model=scicos_model();
-model.sim=list("tows_c",4);
-model.in1=[nu];
-model.in2=-2;
-model.intyp=-1;
-model.out=[];
-model.evtin=[1];
-model.evtout=[];
-model.rpar=[];
-model.ipar=[nz,length(varnam),transpose(ascii(varnam))];
-model.blocktype="d";
-model.firing=[];
-model.dep_ut=[false,false];
-gr_i=[];
-exprs=[string(nz),string(varnam),string(herit)];
-x=standard_define([4,2],model,exprs,gr_i);
-}
-TOWS_c.prototype.details = function TOWS_c() {
-}
 }
diff --git a/js/Sinks/TRASH_f.js b/js/Sinks/TRASH_f.js
index 1ab5bc39..a67aaa64 100644
--- a/js/Sinks/TRASH_f.js
+++ b/js/Sinks/TRASH_f.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/Sinks/TRASH_f.sci" */
 function TRASH_f() {
-TRASH_f.prototype.get = function TRASH_f() {
-}
-TRASH_f.prototype.set = function TRASH_f() {
-x=arg1;
-}
 TRASH_f.prototype.define = function TRASH_f() {
 in1=-1;
 model=scicos_model();
@@ -19,4 +14,9 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 TRASH_f.prototype.details = function TRASH_f() {
 }
+TRASH_f.prototype.get = function TRASH_f() {
+}
+TRASH_f.prototype.set = function TRASH_f() {
+x=arg1;
+}
 }
diff --git a/js/Sinks/WFILE_f.js b/js/Sinks/WFILE_f.js
index 520bea5f..b0cc9c15 100644
--- a/js/Sinks/WFILE_f.js
+++ b/js/Sinks/WFILE_f.js
@@ -1,5 +1,26 @@
 /* autogenerated from "macros/Sinks/WFILE_f.sci" */
 function WFILE_f() {
+WFILE_f.prototype.define = function WFILE_f() {
+in1=1;
+nin=sum(in1);
+frmt="(7(e10.3,1x))";
+fname="foo";
+lunit=0;
+N=2;
+model=scicos_model();
+model.sim="writef";
+model.in1=in1;
+model.evtin=1;
+model.dstate=[-1,lunit,zeros((nin+1)*N,1)];
+model.ipar=[length(fname),length(frmt),0,N,_str2code(fname),_str2code(frmt)];
+model.blocktype="d";
+model.dep_ut=[true,false];
+exprs=[sci2exp(in1),fname,frmt,string(N)];
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+WFILE_f.prototype.details = function WFILE_f() {
+}
 WFILE_f.prototype.get = function WFILE_f() {
 }
 WFILE_f.prototype.set = function WFILE_f() {
@@ -66,25 +87,4 @@ break
 }
 }
 }
-WFILE_f.prototype.define = function WFILE_f() {
-in1=1;
-nin=sum(in1);
-frmt="(7(e10.3,1x))";
-fname="foo";
-lunit=0;
-N=2;
-model=scicos_model();
-model.sim="writef";
-model.in1=in1;
-model.evtin=1;
-model.dstate=[-1,lunit,zeros((nin+1)*N,1)];
-model.ipar=[length(fname),length(frmt),0,N,_str2code(fname),_str2code(frmt)];
-model.blocktype="d";
-model.dep_ut=[true,false];
-exprs=[sci2exp(in1),fname,frmt,string(N)];
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-WFILE_f.prototype.details = function WFILE_f() {
-}
 }
diff --git a/js/Sinks/WRITEAU_f.js b/js/Sinks/WRITEAU_f.js
index 114709dd..a7a82fa3 100644
--- a/js/Sinks/WRITEAU_f.js
+++ b/js/Sinks/WRITEAU_f.js
@@ -1,5 +1,27 @@
 /* autogenerated from "macros/Sinks/WRITEAU_f.sci" */
 function WRITEAU_f() {
+WRITEAU_f.prototype.define = function WRITEAU_f() {
+in1=1;
+nin=sum(in1);
+frmt="uc ";
+fname="/dev/audio";
+swap=0;
+lunit=0;
+N=2;
+model=scicos_model();
+model.sim=list("writeau",2);
+model.in1=in1;
+model.evtin=1;
+model.dstate=[-1,lunit,zeros((nin+1)*N,1)];
+model.ipar=[length(fname),_str2code(frmt),N,swap,_str2code(fname)];
+model.blocktype="d";
+model.dep_ut=[true,false];
+exprs=[string(N),string(swap)];
+gr_i=[];
+x=standard_define([4,2],model,exprs,gr_i);
+}
+WRITEAU_f.prototype.details = function WRITEAU_f() {
+}
 WRITEAU_f.prototype.get = function WRITEAU_f() {
 }
 WRITEAU_f.prototype.set = function WRITEAU_f() {
@@ -44,26 +66,4 @@ break
 }
 }
 }
-WRITEAU_f.prototype.define = function WRITEAU_f() {
-in1=1;
-nin=sum(in1);
-frmt="uc ";
-fname="/dev/audio";
-swap=0;
-lunit=0;
-N=2;
-model=scicos_model();
-model.sim=list("writeau",2);
-model.in1=in1;
-model.evtin=1;
-model.dstate=[-1,lunit,zeros((nin+1)*N,1)];
-model.ipar=[length(fname),_str2code(frmt),N,swap,_str2code(fname)];
-model.blocktype="d";
-model.dep_ut=[true,false];
-exprs=[string(N),string(swap)];
-gr_i=[];
-x=standard_define([4,2],model,exprs,gr_i);
-}
-WRITEAU_f.prototype.details = function WRITEAU_f() {
-}
 }
diff --git a/js/Sinks/WRITEC_f.js b/js/Sinks/WRITEC_f.js
index 7383c7a7..c010e234 100644
--- a/js/Sinks/WRITEC_f.js
+++ b/js/Sinks/WRITEC_f.js
@@ -1,5 +1,27 @@
 /* autogenerated from "macros/Sinks/WRITEC_f.sci" */
 function WRITEC_f() {
+WRITEC_f.prototype.define = function WRITEC_f() {
+in1=1;
+nin=sum(in1);
+frmt="c  ";
+fname="foo";
+swap=0;
+lunit=0;
+N=2;
+model=scicos_model();
+model.sim=list("writec",2);
+model.in1=in1;
+model.evtin=1;
+model.dstate=[-1,lunit,zeros((nin+1)*N,1)];
+model.ipar=[length(fname),_str2code(frmt),N,swap,_str2code(fname)];
+model.blocktype="d";
+model.dep_ut=[true,false];
+exprs=[sci2exp(in1),fname,frmt,string(N),string(swap)];
+gr_i=[];
+x=standard_define([4,2],model,exprs,gr_i);
+}
+WRITEC_f.prototype.details = function WRITEC_f() {
+}
 WRITEC_f.prototype.get = function WRITEC_f() {
 }
 WRITEC_f.prototype.set = function WRITEC_f() {
@@ -65,26 +87,4 @@ break
 }
 }
 }
-WRITEC_f.prototype.define = function WRITEC_f() {
-in1=1;
-nin=sum(in1);
-frmt="c  ";
-fname="foo";
-swap=0;
-lunit=0;
-N=2;
-model=scicos_model();
-model.sim=list("writec",2);
-model.in1=in1;
-model.evtin=1;
-model.dstate=[-1,lunit,zeros((nin+1)*N,1)];
-model.ipar=[length(fname),_str2code(frmt),N,swap,_str2code(fname)];
-model.blocktype="d";
-model.dep_ut=[true,false];
-exprs=[sci2exp(in1),fname,frmt,string(N),string(swap)];
-gr_i=[];
-x=standard_define([4,2],model,exprs,gr_i);
-}
-WRITEC_f.prototype.details = function WRITEC_f() {
-}
 }