change order of functions

249 files changed, 8087 insertions, 8087 deletions

diff --git a/combined.js b/combined.js
index 6bff9784..52763750 100644
--- a/combined.js
+++ b/combined.js
@@ -1,25 +1,5 @@
 /* autogenerated from "macros/Hydraulics/Bache.sci" */
 function Bache() {
-Bache.prototype.get = function Bache() {
-}
-Bache.prototype.set = function Bache() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,Patm,A,ze1,ze2,zs1,zs2,z0,T0,p_rho,exprs]=scicos_getvalue("Parametres de la bache",["Pression dans le ciel de la bache : Patm (Pa)","Section de la bache : A (m2)","Altitude du piquage d entrée 1: ze1 (m)","Altitude du piquage d entrée 2: ze2 (m)","Altitude du piquage de sortie 1: zs1 (m)","Altitude du piquage de sortie 2: zs2 (m)","Altitude initiale du fluide : z0 (m)","Température initiale du fluide : T0 (K)","Si >0, masse volumique imposée du fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
-if (!ok) {
-break
-}
-model.rpar=[Patm,A,ze1,ze2,zs1,zs2,z0,T0,p_rho];
-model.equations.parameters[2-1]=list(Patm,A,ze1,ze2,zs1,zs2,z0,T0,p_rho);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
-}
-}
 Bache.prototype.define = function Bache() {
 in1=2;
 out=3;
@@ -55,29 +35,29 @@ x.graphics.out_implicit=["I","I","E"];
 }
 Bache.prototype.details = function Bache() {
 }
+Bache.prototype.get = function Bache() {
 }
-/* autogenerated from "macros/Hydraulics/SourceP.sci" */
-function SourceP() {
-SourceP.prototype.get = function SourceP() {
-}
-SourceP.prototype.set = function SourceP() {
+Bache.prototype.set = function Bache() {
 x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,P0,T0,H0,option_temperature,exprs]=scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
+[ok,Patm,A,ze1,ze2,zs1,zs2,z0,T0,p_rho,exprs]=scicos_getvalue("Parametres de la bache",["Pression dans le ciel de la bache : Patm (Pa)","Section de la bache : A (m2)","Altitude du piquage d entrée 1: ze1 (m)","Altitude du piquage d entrée 2: ze2 (m)","Altitude du piquage de sortie 1: zs1 (m)","Altitude du piquage de sortie 2: zs2 (m)","Altitude initiale du fluide : z0 (m)","Température initiale du fluide : T0 (K)","Si >0, masse volumique imposée du fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
 if (!ok) {
 break
 }
-model.rpar=[P0,T0,H0,option_temperature];
-model.equations.parameters[2-1]=list(P0,T0,H0,option_temperature);
+model.rpar=[Patm,A,ze1,ze2,zs1,zs2,z0,T0,p_rho];
+model.equations.parameters[2-1]=list(Patm,A,ze1,ze2,zs1,zs2,z0,T0,p_rho);
 graphics.exprs=exprs;
 x.graphics=graphics;
 x.model=model;
 break
 }
 }
+}
+/* autogenerated from "macros/Hydraulics/SourceP.sci" */
+function SourceP() {
 SourceP.prototype.define = function SourceP() {
 model=scicos_model();
 P0=300000;
@@ -103,28 +83,29 @@ x.graphics.out_implicit=["I"];
 }
 SourceP.prototype.details = function SourceP() {
 }
+SourceP.prototype.get = function SourceP() {
 }
-/* autogenerated from "macros/Hydraulics/Flowmeter.sci" */
-function Flowmeter() {
-Flowmeter.prototype.get = function Flowmeter() {
-}
-Flowmeter.prototype.set = function Flowmeter() {
+SourceP.prototype.set = function SourceP() {
 x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
-x=arg1;
-exprs=x.graphics.exprs;
-while (false) {
-[ok,Qini,exprs]=scicos_getvalue(["Set Flowmeter block parameters:","","Qini: "],"Qini",list("vec",1),exprs);
+while (true) {
+[ok,P0,T0,H0,option_temperature,exprs]=scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
 if (!ok) {
 break
 }
-x.model.equations.parameters[2-1]=list(Qini);
-x.graphics.exprs=exprs;
+model.rpar=[P0,T0,H0,option_temperature];
+model.equations.parameters[2-1]=list(P0,T0,H0,option_temperature);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
 break
 }
 }
+}
+/* autogenerated from "macros/Hydraulics/Flowmeter.sci" */
+function Flowmeter() {
 Flowmeter.prototype.define = function Flowmeter() {
 ModelName="Flowmeter";
 PrametersValue=1;
@@ -175,29 +156,28 @@ x.graphics.out_implicit=Typeout;
 }
 Flowmeter.prototype.details = function Flowmeter() {
 }
+Flowmeter.prototype.get = function Flowmeter() {
 }
-/* autogenerated from "macros/Hydraulics/VanneReglante.sci" */
-function VanneReglante() {
-VanneReglante.prototype.get = function VanneReglante() {
-}
-VanneReglante.prototype.set = function VanneReglante() {
+Flowmeter.prototype.set = function Flowmeter() {
 x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
-while (true) {
-[ok,Cvmax,p_rho,exprs]=scicos_getvalue("Paramètres de la vanne reglante",["Cvmax","p_rho"],list("vec",-1,"vec",-1),exprs);
+x=arg1;
+exprs=x.graphics.exprs;
+while (false) {
+[ok,Qini,exprs]=scicos_getvalue(["Set Flowmeter block parameters:","","Qini: "],"Qini",list("vec",1),exprs);
 if (!ok) {
 break
 }
-model.rpar=[Cvmax,p_rho];
-model.equations.parameters[2-1]=list(Cvmax,p_rho);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
+x.model.equations.parameters[2-1]=list(Qini);
+x.graphics.exprs=exprs;
 break
 }
 }
+}
+/* autogenerated from "macros/Hydraulics/VanneReglante.sci" */
+function VanneReglante() {
 VanneReglante.prototype.define = function VanneReglante() {
 model=scicos_model();
 model.in1=[1,1];
@@ -224,29 +204,29 @@ x.graphics.out_implicit=["I"];
 }
 VanneReglante.prototype.details = function VanneReglante() {
 }
+VanneReglante.prototype.get = function VanneReglante() {
 }
-/* autogenerated from "macros/Hydraulics/PerteDP.sci" */
-function PerteDP() {
-PerteDP.prototype.get = function PerteDP() {
-}
-PerteDP.prototype.set = function PerteDP() {
+VanneReglante.prototype.set = function VanneReglante() {
 x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,L,D,lambda,z1,z2,p_rho,exprs]=scicos_getvalue("Parametres du tuyau",["Longueur du tube : L (m)","Diamètre interne du tube : D (m)","Coefficient de perte de charge-frottement(S.U) : lambda","Altitude entrée tuyauterie : z1 (m)","Altitude sortie tuyauterie : z2 (m)","Si >0, masse volumique imposée fu fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
+[ok,Cvmax,p_rho,exprs]=scicos_getvalue("Paramètres de la vanne reglante",["Cvmax","p_rho"],list("vec",-1,"vec",-1),exprs);
 if (!ok) {
 break
 }
-model.rpar=[L,D,lambda,z1,z2,p_rho];
-model.equations.parameters[2-1]=list(L,D,lambda,z1,z2,p_rho);
+model.rpar=[Cvmax,p_rho];
+model.equations.parameters[2-1]=list(Cvmax,p_rho);
 graphics.exprs=exprs;
 x.graphics=graphics;
 x.model=model;
 break
 }
 }
+}
+/* autogenerated from "macros/Hydraulics/PerteDP.sci" */
+function PerteDP() {
 PerteDP.prototype.define = function PerteDP() {
 model=scicos_model();
 model.in1=[1];
@@ -277,29 +257,29 @@ x.graphics.out_implicit=["I"];
 }
 PerteDP.prototype.details = function PerteDP() {
 }
+PerteDP.prototype.get = function PerteDP() {
 }
-/* autogenerated from "macros/Hydraulics/PuitsP.sci" */
-function PuitsP() {
-PuitsP.prototype.get = function PuitsP() {
-}
-PuitsP.prototype.set = function PuitsP() {
+PerteDP.prototype.set = function PerteDP() {
 x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,P0,T0,H0,option_temperature,exprs]=scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
+[ok,L,D,lambda,z1,z2,p_rho,exprs]=scicos_getvalue("Parametres du tuyau",["Longueur du tube : L (m)","Diamètre interne du tube : D (m)","Coefficient de perte de charge-frottement(S.U) : lambda","Altitude entrée tuyauterie : z1 (m)","Altitude sortie tuyauterie : z2 (m)","Si >0, masse volumique imposée fu fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
 if (!ok) {
 break
 }
-model.rpar=[P0,T0,H0,option_temperature];
-model.equations.parameters[2-1]=list(P0,T0,H0,option_temperature);
+model.rpar=[L,D,lambda,z1,z2,p_rho];
+model.equations.parameters[2-1]=list(L,D,lambda,z1,z2,p_rho);
 graphics.exprs=exprs;
 x.graphics=graphics;
 x.model=model;
 break
 }
 }
+}
+/* autogenerated from "macros/Hydraulics/PuitsP.sci" */
+function PuitsP() {
 PuitsP.prototype.define = function PuitsP() {
 model=scicos_model();
 P0=100000;
@@ -323,35 +303,29 @@ x.graphics.in_implicit=["I"];
 }
 PuitsP.prototype.details = function PuitsP() {
 }
+PuitsP.prototype.get = function PuitsP() {
 }
-/* autogenerated from "macros/Events/EVTDLY_c.sci" */
-function EVTDLY_c() {
-EVTDLY_c.prototype.get = function EVTDLY_c() {
-}
-EVTDLY_c.prototype.set = function EVTDLY_c() {
+PuitsP.prototype.set = function PuitsP() {
 x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,dt,ff,exprs]=scicos_getvalue(["Set Event Delay block parameters","Delay  is the delay between an input event ","       and the generated output event","Block may initially generate an output event before ","       any input event. \"Date of initial output event\"","       gives the date of this event. Set a negative value","       to disable any output event."],["Delay","Date of initial output event"],list("vec",1,"vec",1),exprs);
+[ok,P0,T0,H0,option_temperature,exprs]=scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
 if (!ok) {
 break
 }
-if (dt<=0) {
-message("Delay must be positive");
-ok=false;
-}
-if (ok) {
+model.rpar=[P0,T0,H0,option_temperature];
+model.equations.parameters[2-1]=list(P0,T0,H0,option_temperature);
 graphics.exprs=exprs;
-model.rpar=[dt,ff];
-model.firing=ff;
 x.graphics=graphics;
 x.model=model;
 break
 }
 }
 }
+/* autogenerated from "macros/Events/EVTDLY_c.sci" */
+function EVTDLY_c() {
 EVTDLY_c.prototype.define = function EVTDLY_c() {
 dt=0.1;
 ff=0.0;
@@ -369,14 +343,35 @@ x=standard_define([3,2],model,exprs,gr_i);
 }
 EVTDLY_c.prototype.details = function EVTDLY_c() {
 }
+EVTDLY_c.prototype.get = function EVTDLY_c() {
 }
-/* autogenerated from "macros/Events/CLKSPLIT_f.sci" */
-function CLKSPLIT_f() {
-CLKSPLIT_f.prototype.get = function CLKSPLIT_f() {
-}
-CLKSPLIT_f.prototype.set = function CLKSPLIT_f() {
+EVTDLY_c.prototype.set = function EVTDLY_c() {
 x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,dt,ff,exprs]=scicos_getvalue(["Set Event Delay block parameters","Delay  is the delay between an input event ","       and the generated output event","Block may initially generate an output event before ","       any input event. \"Date of initial output event\"","       gives the date of this event. Set a negative value","       to disable any output event."],["Delay","Date of initial output event"],list("vec",1,"vec",1),exprs);
+if (!ok) {
+break
+}
+if (dt<=0) {
+message("Delay must be positive");
+ok=false;
+}
+if (ok) {
+graphics.exprs=exprs;
+model.rpar=[dt,ff];
+model.firing=ff;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
+}
 }
+/* autogenerated from "macros/Events/CLKSPLIT_f.sci" */
+function CLKSPLIT_f() {
 CLKSPLIT_f.prototype.define = function CLKSPLIT_f() {
 model=scicos_model();
 model.sim="split";
@@ -389,14 +384,14 @@ x=standard_define([1,1]/3,model,[],[]);
 }
 CLKSPLIT_f.prototype.details = function CLKSPLIT_f() {
 }
+CLKSPLIT_f.prototype.get = function CLKSPLIT_f() {
 }
-/* autogenerated from "macros/Events/ANDLOG_f.sci" */
-function ANDLOG_f() {
-ANDLOG_f.prototype.get = function ANDLOG_f() {
-}
-ANDLOG_f.prototype.set = function ANDLOG_f() {
+CLKSPLIT_f.prototype.set = function CLKSPLIT_f() {
 x=arg1;
 }
+}
+/* autogenerated from "macros/Events/ANDLOG_f.sci" */
+function ANDLOG_f() {
 ANDLOG_f.prototype.define = function ANDLOG_f() {
 model=scicos_model();
 model.sim="andlog";
@@ -410,14 +405,14 @@ x=standard_define([3,3],model,[],gr_i);
 }
 ANDLOG_f.prototype.details = function ANDLOG_f() {
 }
+ANDLOG_f.prototype.get = function ANDLOG_f() {
 }
-/* autogenerated from "macros/Events/ANDBLK.sci" */
-function ANDBLK() {
-ANDBLK.prototype.get = function ANDBLK() {
-}
-ANDBLK.prototype.set = function ANDBLK() {
+ANDLOG_f.prototype.set = function ANDLOG_f() {
 x=arg1;
 }
+}
+/* autogenerated from "macros/Events/ANDBLK.sci" */
+function ANDBLK() {
 ANDBLK.prototype.define = function ANDBLK() {
 andlog=ANDLOG_f("define");
 andlog.graphics.orig=[194,133];
@@ -486,9 +481,29 @@ x.model.rpar=diagram;
 }
 ANDBLK.prototype.details = function ANDBLK() {
 }
+ANDBLK.prototype.get = function ANDBLK() {
+}
+ANDBLK.prototype.set = function ANDBLK() {
+x=arg1;
+}
 }
 /* autogenerated from "macros/Events/HALT_f.sci" */
 function HALT_f() {
+HALT_f.prototype.define = function HALT_f() {
+n=0;
+model=scicos_model();
+model.sim="hltblk";
+model.evtin=1;
+model.dstate=0;
+model.ipar=0;
+model.blocktype="d";
+model.dep_ut=[false,false];
+exprs=string(n);
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+HALT_f.prototype.details = function HALT_f() {
+}
 HALT_f.prototype.get = function HALT_f() {
 }
 HALT_f.prototype.set = function HALT_f() {
@@ -510,24 +525,28 @@ break
 }
 }
 }
-HALT_f.prototype.define = function HALT_f() {
-n=0;
+}
+/* autogenerated from "macros/Events/IFTHEL_f.sci" */
+function IFTHEL_f() {
+IFTHEL_f.prototype.define = function IFTHEL_f() {
 model=scicos_model();
-model.sim="hltblk";
+model.sim=list("ifthel",-1);
+model.in1=1;
+model.in2=1;
+model.intyp=-1;
 model.evtin=1;
-model.dstate=0;
-model.ipar=0;
-model.blocktype="d";
-model.dep_ut=[false,false];
-exprs=string(n);
+model.evtout=[1,1];
+model.blocktype="l";
+model.firing=[-1,-1];
+model.dep_ut=[true,false];
+model.nmode=1;
+model.nzcross=1;
 gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-HALT_f.prototype.details = function HALT_f() {
+exprs=[string(model.in1),string(model.nmode)];
+x=standard_define([3,3],model,exprs,gr_i);
 }
+IFTHEL_f.prototype.details = function IFTHEL_f() {
 }
-/* autogenerated from "macros/Events/IFTHEL_f.sci" */
-function IFTHEL_f() {
 IFTHEL_f.prototype.get = function IFTHEL_f() {
 }
 IFTHEL_f.prototype.set = function IFTHEL_f() {
@@ -566,33 +585,9 @@ break
 }
 }
 }
-IFTHEL_f.prototype.define = function IFTHEL_f() {
-model=scicos_model();
-model.sim=list("ifthel",-1);
-model.in1=1;
-model.in2=1;
-model.intyp=-1;
-model.evtin=1;
-model.evtout=[1,1];
-model.blocktype="l";
-model.firing=[-1,-1];
-model.dep_ut=[true,false];
-model.nmode=1;
-model.nzcross=1;
-gr_i=[];
-exprs=[string(model.in1),string(model.nmode)];
-x=standard_define([3,3],model,exprs,gr_i);
-}
-IFTHEL_f.prototype.details = function IFTHEL_f() {
-}
 }
 /* autogenerated from "macros/Events/VirtualCLK0.sci" */
 function VirtualCLK0() {
-VirtualCLK0.prototype.get = function VirtualCLK0() {
-}
-VirtualCLK0.prototype.set = function VirtualCLK0() {
-x=arg1;
-}
 VirtualCLK0.prototype.define = function VirtualCLK0() {
 model=scicos_model();
 model.sim="vrtclk0";
@@ -607,9 +602,29 @@ x=standard_define([2,2],model,exprs," ");
 }
 VirtualCLK0.prototype.details = function VirtualCLK0() {
 }
+VirtualCLK0.prototype.get = function VirtualCLK0() {
+}
+VirtualCLK0.prototype.set = function VirtualCLK0() {
+x=arg1;
+}
 }
 /* autogenerated from "macros/Events/END_c.sci" */
 function END_c() {
+END_c.prototype.define = function END_c() {
+tf=100000000;
+model=scicos_model();
+model.sim=list("scicosexit",4);
+model.evtin=1;
+model.evtout=1;
+model.firing=tf;
+model.blocktype="d";
+model.dep_ut=[false,false];
+exprs=string(tf);
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+END_c.prototype.details = function END_c() {
+}
 END_c.prototype.get = function END_c() {
 }
 END_c.prototype.set = function END_c() {
@@ -631,29 +646,9 @@ break
 }
 }
 }
-END_c.prototype.define = function END_c() {
-tf=100000000;
-model=scicos_model();
-model.sim=list("scicosexit",4);
-model.evtin=1;
-model.evtout=1;
-model.firing=tf;
-model.blocktype="d";
-model.dep_ut=[false,false];
-exprs=string(tf);
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-END_c.prototype.details = function END_c() {
-}
 }
 /* autogenerated from "macros/Events/CLKSOMV_f.sci" */
 function CLKSOMV_f() {
-CLKSOMV_f.prototype.get = function CLKSOMV_f() {
-}
-CLKSOMV_f.prototype.set = function CLKSOMV_f() {
-x=arg1;
-}
 CLKSOMV_f.prototype.define = function CLKSOMV_f() {
 model=scicos_model();
 model.sim="sum";
@@ -667,9 +662,28 @@ x=standard_define([2,2],model,[],gr_i);
 }
 CLKSOMV_f.prototype.details = function CLKSOMV_f() {
 }
+CLKSOMV_f.prototype.get = function CLKSOMV_f() {
+}
+CLKSOMV_f.prototype.set = function CLKSOMV_f() {
+x=arg1;
+}
 }
 /* autogenerated from "macros/Events/EVTGEN_f.sci" */
 function EVTGEN_f() {
+EVTGEN_f.prototype.define = function EVTGEN_f() {
+tt=0;
+model=scicos_model();
+model.sim="trash";
+model.evtout=1;
+model.blocktype="d";
+model.firing=tt;
+model.dep_ut=[false,false];
+exprs=string(tt);
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+EVTGEN_f.prototype.details = function EVTGEN_f() {
+}
 EVTGEN_f.prototype.get = function EVTGEN_f() {
 }
 EVTGEN_f.prototype.set = function EVTGEN_f() {
@@ -691,45 +705,9 @@ x.model=model;
 break
 }
 }
-EVTGEN_f.prototype.define = function EVTGEN_f() {
-tt=0;
-model=scicos_model();
-model.sim="trash";
-model.evtout=1;
-model.blocktype="d";
-model.firing=tt;
-model.dep_ut=[false,false];
-exprs=string(tt);
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-EVTGEN_f.prototype.details = function EVTGEN_f() {
-}
 }
 /* autogenerated from "macros/Events/MCLOCK_f.sci" */
 function MCLOCK_f() {
-MCLOCK_f.prototype.get = function MCLOCK_f() {
-}
-MCLOCK_f.prototype.set = function MCLOCK_f() {
-for (i=1;i<=length(arg1.model.rpar.objs);i+=1) {
-o=arg1.model.rpar.objs(i);
-if (typeof(o)=="Block"&&o.gui=="MFCLCK_f") {
-path=i;
-break
-}
-}
-newpar=list();
-spath=list("model","rpar","objs",path);
-xx=arg1(spath);
-execstr("xxn="+xx.gui+"(\'set\',xx)");
-if (or(xxn!=xx)) {
-arg1[spath-1]=xxn;
-newpar[size(newpar)+1-1]=path;
-}
-x=arg1;
-y=0;
-typ=newpar;
-}
 MCLOCK_f.prototype.define = function MCLOCK_f() {
 nn=2;
 dt=0.1;
@@ -800,9 +778,47 @@ x.graphics.peout=[0,0];
 }
 MCLOCK_f.prototype.details = function MCLOCK_f() {
 }
+MCLOCK_f.prototype.get = function MCLOCK_f() {
+}
+MCLOCK_f.prototype.set = function MCLOCK_f() {
+for (i=1;i<=length(arg1.model.rpar.objs);i+=1) {
+o=arg1.model.rpar.objs(i);
+if (typeof(o)=="Block"&&o.gui=="MFCLCK_f") {
+path=i;
+break
+}
+}
+newpar=list();
+spath=list("model","rpar","objs",path);
+xx=arg1(spath);
+execstr("xxn="+xx.gui+"(\'set\',xx)");
+if (or(xxn!=xx)) {
+arg1[spath-1]=xxn;
+newpar[size(newpar)+1-1]=path;
+}
+x=arg1;
+y=0;
+typ=newpar;
+}
 }
 /* autogenerated from "macros/Events/EVTVARDLY.sci" */
 function EVTVARDLY() {
+EVTVARDLY.prototype.define = function EVTVARDLY() {
+model=scicos_model();
+model.sim=list("evtvardly",4);
+model.in1=1;
+model.evtin=1;
+model.evtout=1;
+model.blocktype="d";
+model.firing=-1;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=string(model.firing);
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+EVTVARDLY.prototype.details = function EVTVARDLY() {
+}
 EVTVARDLY.prototype.get = function EVTVARDLY() {
 }
 EVTVARDLY.prototype.set = function EVTVARDLY() {
@@ -822,25 +838,26 @@ x.model=model;
 break
 }
 }
-EVTVARDLY.prototype.define = function EVTVARDLY() {
+}
+/* autogenerated from "macros/Events/EVTDLY_f.sci" */
+function EVTDLY_f() {
+EVTDLY_f.prototype.define = function EVTDLY_f() {
+dt=0.1;
+ff=dt;
 model=scicos_model();
-model.sim=list("evtvardly",4);
-model.in1=1;
+model.sim="evtdly";
 model.evtin=1;
 model.evtout=1;
+model.rpar=dt;
 model.blocktype="d";
-model.firing=-1;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=string(model.firing);
+model.firing=ff;
+model.dep_ut=[false,false];
+exprs=[string(dt),sci2exp(ff)];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 }
-EVTVARDLY.prototype.details = function EVTVARDLY() {
-}
+EVTDLY_f.prototype.details = function EVTDLY_f() {
 }
-/* autogenerated from "macros/Events/EVTDLY_f.sci" */
-function EVTDLY_f() {
 EVTDLY_f.prototype.get = function EVTDLY_f() {
 }
 EVTDLY_f.prototype.set = function EVTDLY_f() {
@@ -867,31 +884,9 @@ break
 }
 }
 }
-EVTDLY_f.prototype.define = function EVTDLY_f() {
-dt=0.1;
-ff=dt;
-model=scicos_model();
-model.sim="evtdly";
-model.evtin=1;
-model.evtout=1;
-model.rpar=dt;
-model.blocktype="d";
-model.firing=ff;
-model.dep_ut=[false,false];
-exprs=[string(dt),sci2exp(ff)];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-EVTDLY_f.prototype.details = function EVTDLY_f() {
-}
 }
 /* autogenerated from "macros/Events/CLKSOM_f.sci" */
 function CLKSOM_f() {
-CLKSOM_f.prototype.get = function CLKSOM_f() {
-}
-CLKSOM_f.prototype.set = function CLKSOM_f() {
-x=arg1;
-}
 CLKSOM_f.prototype.define = function CLKSOM_f() {
 model=scicos_model();
 model.sim="sum";
@@ -905,9 +900,33 @@ x=standard_define([1,1]/1.2,model,[],gr_i);
 }
 CLKSOM_f.prototype.details = function CLKSOM_f() {
 }
+CLKSOM_f.prototype.get = function CLKSOM_f() {
+}
+CLKSOM_f.prototype.set = function CLKSOM_f() {
+x=arg1;
+}
 }
 /* autogenerated from "macros/Events/MFCLCK_f.sci" */
 function MFCLCK_f() {
+MFCLCK_f.prototype.define = function MFCLCK_f() {
+nn=2;
+dt=0.1;
+model=scicos_model();
+model.sim="mfclck";
+model.evtin=1;
+model.evtout=[1,1];
+model.dstate=0;
+model.rpar=dt;
+model.ipar=nn;
+model.blocktype="d";
+model.firing=[-1,0];
+model.dep_ut=[false,false];
+exprs=[string(dt),string(nn)];
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+MFCLCK_f.prototype.details = function MFCLCK_f() {
+}
 MFCLCK_f.prototype.get = function MFCLCK_f() {
 }
 MFCLCK_f.prototype.set = function MFCLCK_f() {
@@ -927,28 +946,25 @@ x.graphics=graphics;
 x.model=model;
 }
 }
-MFCLCK_f.prototype.define = function MFCLCK_f() {
-nn=2;
-dt=0.1;
+}
+/* autogenerated from "macros/Linear/REGISTER_f.sci" */
+function REGISTER_f() {
+REGISTER_f.prototype.define = function REGISTER_f() {
+z0=zeros(10,1);
 model=scicos_model();
-model.sim="mfclck";
+model.sim="delay";
+model.in1=1;
+model.out=1;
 model.evtin=1;
-model.evtout=[1,1];
-model.dstate=0;
-model.rpar=dt;
-model.ipar=nn;
+model.dstate=z0;
 model.blocktype="d";
-model.firing=[-1,0];
 model.dep_ut=[false,false];
-exprs=[string(dt),string(nn)];
+exprs=strcat(string(z0),";");
 gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-MFCLCK_f.prototype.details = function MFCLCK_f() {
+x=standard_define([2.5,2.5],model,exprs,gr_i);
 }
+REGISTER_f.prototype.details = function REGISTER_f() {
 }
-/* autogenerated from "macros/Linear/REGISTER_f.sci" */
-function REGISTER_f() {
 REGISTER_f.prototype.get = function REGISTER_f() {
 }
 REGISTER_f.prototype.set = function REGISTER_f() {
@@ -974,25 +990,26 @@ break
 }
 }
 }
-REGISTER_f.prototype.define = function REGISTER_f() {
-z0=zeros(10,1);
+}
+/* autogenerated from "macros/Linear/SUMMATION.sci" */
+function SUMMATION() {
+SUMMATION.prototype.define = function SUMMATION() {
+sgn=[1,-1];
 model=scicos_model();
-model.sim="delay";
-model.in1=1;
-model.out=1;
-model.evtin=1;
-model.dstate=z0;
-model.blocktype="d";
-model.dep_ut=[false,false];
-exprs=strcat(string(z0),";");
+model.sim=list("summation",4);
+model.in1=[-1,-1];
+model.out=-1;
+model.in2=[-2,-2];
+model.out2=-2;
+model.ipar=sgn;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=sci2exp(sgn);
 gr_i=[];
-x=standard_define([2.5,2.5],model,exprs,gr_i);
-}
-REGISTER_f.prototype.details = function REGISTER_f() {
+x=standard_define([2,3],model,exprs,gr_i);
 }
+SUMMATION.prototype.details = function SUMMATION() {
 }
-/* autogenerated from "macros/Linear/SUMMATION.sci" */
-function SUMMATION() {
 SUMMATION.prototype.get = function SUMMATION() {
 }
 SUMMATION.prototype.set = function SUMMATION() {
@@ -1110,26 +1127,26 @@ break
 }
 }
 }
-SUMMATION.prototype.define = function SUMMATION() {
-sgn=[1,-1];
+}
+/* autogenerated from "macros/Linear/GAINBLK_f.sci" */
+function GAINBLK_f() {
+GAINBLK_f.prototype.define = function GAINBLK_f() {
+gain=1;
+in1=1;
+out=1;
 model=scicos_model();
-model.sim=list("summation",4);
-model.in1=[-1,-1];
-model.out=-1;
-model.in2=[-2,-2];
-model.out2=-2;
-model.ipar=sgn;
+model.sim="gain";
+model.in1=in1;
+model.out=out;
+model.rpar=gain;
 model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=sci2exp(sgn);
+exprs=[strcat(sci2exp(gain))];
 gr_i=[];
-x=standard_define([2,3],model,exprs,gr_i);
-}
-SUMMATION.prototype.details = function SUMMATION() {
+x=standard_define([2,2],model,exprs,gr_i);
 }
+GAINBLK_f.prototype.details = function GAINBLK_f() {
 }
-/* autogenerated from "macros/Linear/GAINBLK_f.sci" */
-function GAINBLK_f() {
 GAINBLK_f.prototype.get = function GAINBLK_f() {
 }
 GAINBLK_f.prototype.set = function GAINBLK_f() {
@@ -1157,32 +1174,9 @@ break
 }
 }
 }
-GAINBLK_f.prototype.define = function GAINBLK_f() {
-gain=1;
-in1=1;
-out=1;
-model=scicos_model();
-model.sim="gain";
-model.in1=in1;
-model.out=out;
-model.rpar=gain;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[strcat(sci2exp(gain))];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-GAINBLK_f.prototype.details = function GAINBLK_f() {
-}
 }
 /* autogenerated from "macros/Linear/SAMPHOLD.sci" */
 function SAMPHOLD() {
-SAMPHOLD.prototype.get = function SAMPHOLD() {
-}
-SAMPHOLD.prototype.set = function SAMPHOLD() {
-x=arg1;
-x.model.firing=[];
-}
 SAMPHOLD.prototype.define = function SAMPHOLD() {
 in1=-1;
 model=scicos_model();
@@ -1197,9 +1191,30 @@ x=standard_define([2,2],model," ",gr_i);
 }
 SAMPHOLD.prototype.details = function SAMPHOLD() {
 }
+SAMPHOLD.prototype.get = function SAMPHOLD() {
+}
+SAMPHOLD.prototype.set = function SAMPHOLD() {
+x=arg1;
+x.model.firing=[];
+}
 }
 /* autogenerated from "macros/Linear/BIGSOM_f.sci" */
 function BIGSOM_f() {
+BIGSOM_f.prototype.define = function BIGSOM_f() {
+sgn=[1,1];
+model=scicos_model();
+model.sim=list("sum",2);
+model.in1=[-1,-1];
+model.out=-1;
+model.rpar=sgn;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=sci2exp(sgn);
+gr_i=[];
+x=standard_define([2,3],model,exprs,gr_i);
+}
+BIGSOM_f.prototype.details = function BIGSOM_f() {
+}
 BIGSOM_f.prototype.get = function BIGSOM_f() {
 }
 BIGSOM_f.prototype.set = function BIGSOM_f() {
@@ -1223,30 +1238,9 @@ break
 }
 }
 }
-BIGSOM_f.prototype.define = function BIGSOM_f() {
-sgn=[1,1];
-model=scicos_model();
-model.sim=list("sum",2);
-model.in1=[-1,-1];
-model.out=-1;
-model.rpar=sgn;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=sci2exp(sgn);
-gr_i=[];
-x=standard_define([2,3],model,exprs,gr_i);
-}
-BIGSOM_f.prototype.details = function BIGSOM_f() {
-}
 }
 /* autogenerated from "macros/Linear/SAMPLEHOLD_f.sci" */
 function SAMPLEHOLD_f() {
-SAMPLEHOLD_f.prototype.get = function SAMPLEHOLD_f() {
-}
-SAMPLEHOLD_f.prototype.set = function SAMPLEHOLD_f() {
-x=arg1;
-x.model.firing=[];
-}
 SAMPLEHOLD_f.prototype.define = function SAMPLEHOLD_f() {
 in1=-1;
 model=scicos_model();
@@ -1261,9 +1255,30 @@ x=standard_define([2,2],model," ",gr_i);
 }
 SAMPLEHOLD_f.prototype.details = function SAMPLEHOLD_f() {
 }
+SAMPLEHOLD_f.prototype.get = function SAMPLEHOLD_f() {
+}
+SAMPLEHOLD_f.prototype.set = function SAMPLEHOLD_f() {
+x=arg1;
+x.model.firing=[];
+}
 }
 /* autogenerated from "macros/Linear/DIFF_c.sci" */
 function DIFF_c() {
+DIFF_c.prototype.define = function DIFF_c() {
+x0=[0,0];
+model=scicos_model();
+model.sim=list("diffblk_c",10004);
+model.in1=1;
+model.out=1;
+model.state=x0;
+model.blocktype="c";
+model.dep_ut=[false,true];
+exprs=[strcat(sci2exp(x0[1-1])),strcat(sci2exp(x0[2-1]))];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+DIFF_c.prototype.details = function DIFF_c() {
+}
 DIFF_c.prototype.get = function DIFF_c() {
 }
 DIFF_c.prototype.set = function DIFF_c() {
@@ -1301,24 +1316,30 @@ break
 }
 x.model.firing=[];
 }
-DIFF_c.prototype.define = function DIFF_c() {
-x0=[0,0];
+}
+/* autogenerated from "macros/Linear/DLSS_f.sci" */
+function DLSS_f() {
+DLSS_f.prototype.define = function DLSS_f() {
+x0=0;
+A=-1;
+B=1;
+C=1;
+D=0;
 model=scicos_model();
-model.sim=list("diffblk_c",10004);
+model.sim=list("dsslti",1);
 model.in1=1;
 model.out=1;
-model.state=x0;
-model.blocktype="c";
-model.dep_ut=[false,true];
-exprs=[strcat(sci2exp(x0[1-1])),strcat(sci2exp(x0[2-1]))];
+model.evtin=1;
+model.dstate=x0.slice();
+model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()];
+model.blocktype="d";
+model.dep_ut=[false,false];
+exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))];
 gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-DIFF_c.prototype.details = function DIFF_c() {
+x=standard_define([4,2],model,exprs,gr_i);
 }
+DLSS_f.prototype.details = function DLSS_f() {
 }
-/* autogenerated from "macros/Linear/DLSS_f.sci" */
-function DLSS_f() {
 DLSS_f.prototype.get = function DLSS_f() {
 }
 DLSS_f.prototype.set = function DLSS_f() {
@@ -1371,30 +1392,24 @@ break
 }
 }
 }
-DLSS_f.prototype.define = function DLSS_f() {
+}
+/* autogenerated from "macros/Linear/INTEGRAL_f.sci" */
+function INTEGRAL_f() {
+INTEGRAL_f.prototype.define = function INTEGRAL_f() {
 x0=0;
-A=-1;
-B=1;
-C=1;
-D=0;
 model=scicos_model();
-model.sim=list("dsslti",1);
+model.sim="integr";
 model.in1=1;
 model.out=1;
-model.evtin=1;
-model.dstate=x0.slice();
-model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()];
-model.blocktype="d";
-model.dep_ut=[false,false];
-exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))];
+model.state=x0;
+model.blocktype="c";
+model.dep_ut=[false,true];
+exprs=strcat(sci2exp(x0));
 gr_i=[];
-x=standard_define([4,2],model,exprs,gr_i);
-}
-DLSS_f.prototype.details = function DLSS_f() {
+x=standard_define([2,2],model,exprs,gr_i);
 }
+INTEGRAL_f.prototype.details = function INTEGRAL_f() {
 }
-/* autogenerated from "macros/Linear/INTEGRAL_f.sci" */
-function INTEGRAL_f() {
 INTEGRAL_f.prototype.get = function INTEGRAL_f() {
 }
 INTEGRAL_f.prototype.set = function INTEGRAL_f() {
@@ -1415,24 +1430,27 @@ break
 }
 x.model.firing=[];
 }
-INTEGRAL_f.prototype.define = function INTEGRAL_f() {
-x0=0;
+}
+/* autogenerated from "macros/Linear/DOLLAR_f.sci" */
+function DOLLAR_f() {
+DOLLAR_f.prototype.define = function DOLLAR_f() {
+z=0;
+inh=0;
+in1=1;
+exprs=string([z,inh]);
 model=scicos_model();
-model.sim="integr";
-model.in1=1;
-model.out=1;
-model.state=x0;
-model.blocktype="c";
-model.dep_ut=[false,true];
-exprs=strcat(sci2exp(x0));
+model.sim="dollar";
+model.in1=in1;
+model.out=in1;
+model.evtin=1-inh;
+model.dstate=z;
+model.blocktype="d";
+model.dep_ut=[false,false];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 }
-INTEGRAL_f.prototype.details = function INTEGRAL_f() {
-}
+DOLLAR_f.prototype.details = function DOLLAR_f() {
 }
-/* autogenerated from "macros/Linear/DOLLAR_f.sci" */
-function DOLLAR_f() {
 DOLLAR_f.prototype.get = function DOLLAR_f() {
 }
 DOLLAR_f.prototype.set = function DOLLAR_f() {
@@ -1467,32 +1485,9 @@ break
 }
 }
 }
-DOLLAR_f.prototype.define = function DOLLAR_f() {
-z=0;
-inh=0;
-in1=1;
-exprs=string([z,inh]);
-model=scicos_model();
-model.sim="dollar";
-model.in1=in1;
-model.out=in1;
-model.evtin=1-inh;
-model.dstate=z;
-model.blocktype="d";
-model.dep_ut=[false,false];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-DOLLAR_f.prototype.details = function DOLLAR_f() {
-}
 }
 /* autogenerated from "macros/Linear/CLINDUMMY_f.sci" */
 function CLINDUMMY_f() {
-CLINDUMMY_f.prototype.get = function CLINDUMMY_f() {
-}
-CLINDUMMY_f.prototype.set = function CLINDUMMY_f() {
-x=arg1;
-}
 CLINDUMMY_f.prototype.define = function CLINDUMMY_f() {
 x0=0;
 model=scicos_model();
@@ -1506,68 +1501,14 @@ x=standard_define([3,2],model,[],gr_i);
 }
 CLINDUMMY_f.prototype.details = function CLINDUMMY_f() {
 }
+CLINDUMMY_f.prototype.get = function CLINDUMMY_f() {
 }
-/* autogenerated from "macros/Linear/DELAY_f.sci" */
-function DELAY_f() {
-DELAY_f.prototype.get = function DELAY_f() {
-}
-DELAY_f.prototype.set = function DELAY_f() {
-ppath=list(0,0);
-for (i=1;i<=length(arg1.model.rpar.objs);i+=1) {
-o=arg1.model.rpar.objs(i);
-if (typeof(o)=="Block"&&o.gui=="REGISTER_f") {
-ppath[1-1]=i;
-}
-if (typeof(o)=="Block"&&o.gui=="EVTDLY_f") {
-ppath[2-1]=i;
-}
-if (and(ppath!=list(0,0))) {
-break
-}
-}
+CLINDUMMY_f.prototype.set = function CLINDUMMY_f() {
 x=arg1;
-newpar=list();
-register=x.model.rpar.objs(ppath[1-1]);
-evtdly=x.model.rpar.objs(ppath[2-1]);
-register_exprs=register.graphics.exprs;
-evtdly_exprs=evtdly.graphics.exprs;
-exprs=[evtdly_exprs(1),register_exprs];
-while (true) {
-[ok,dt,z0,exprs]=scicos_getvalue(["This block implements as a discretized delay","it is consist of a shift register and a clock","value of the delay is given by;","the discretization time step multiplied by the","number-1 of state of the register"],["Discretization time step","Register initial state"],list("vec",1,"vec",-1),exprs);
-if (!ok) {
-break
-}
-mess=[];
-if (prod(size(z0))<1) {
-mess=[mess,"Register length must be at least 1"," "];
-ok=false;
 }
-if (dt<=0) {
-mess=[mess,"Discretization time step must be positive"," "];
-ok=false;
-}
-if (!ok) {
-message(mess);
-} else {
-evtdly.graphics.exprs[1-1]=exprs[1-1];
-if (evtdly.model.rpar!=dt) {
-evtdly.model.rpar=dt;
-newpar[$+1-1]=ppath[2-1];
-}
-x.model.rpar.objs[ppath[2-1]-1]=evtdly;
-register.graphics.exprs=exprs[2-1];
-if (or(register.model.dstate!=z0.slice())) {
-register.model.dstate=z0.slice();
-newpar[$+1-1]=ppath[1-1];
-}
-x.model.rpar.objs[ppath[1-1]-1]=register;
-break
-}
-}
-needcompile=0;
-y=needcompile;
-typ=newpar;
 }
+/* autogenerated from "macros/Linear/DELAY_f.sci" */
+function DELAY_f() {
 DELAY_f.prototype.define = function DELAY_f() {
 evtdly=EVTDLY_f("define");
 evtdly.graphics.orig=[243,296];
@@ -1634,9 +1575,92 @@ x.graphics.out_style="";
 }
 DELAY_f.prototype.details = function DELAY_f() {
 }
+DELAY_f.prototype.get = function DELAY_f() {
+}
+DELAY_f.prototype.set = function DELAY_f() {
+ppath=list(0,0);
+for (i=1;i<=length(arg1.model.rpar.objs);i+=1) {
+o=arg1.model.rpar.objs(i);
+if (typeof(o)=="Block"&&o.gui=="REGISTER_f") {
+ppath[1-1]=i;
+}
+if (typeof(o)=="Block"&&o.gui=="EVTDLY_f") {
+ppath[2-1]=i;
+}
+if (and(ppath!=list(0,0))) {
+break
+}
+}
+x=arg1;
+newpar=list();
+register=x.model.rpar.objs(ppath[1-1]);
+evtdly=x.model.rpar.objs(ppath[2-1]);
+register_exprs=register.graphics.exprs;
+evtdly_exprs=evtdly.graphics.exprs;
+exprs=[evtdly_exprs(1),register_exprs];
+while (true) {
+[ok,dt,z0,exprs]=scicos_getvalue(["This block implements as a discretized delay","it is consist of a shift register and a clock","value of the delay is given by;","the discretization time step multiplied by the","number-1 of state of the register"],["Discretization time step","Register initial state"],list("vec",1,"vec",-1),exprs);
+if (!ok) {
+break
+}
+mess=[];
+if (prod(size(z0))<1) {
+mess=[mess,"Register length must be at least 1"," "];
+ok=false;
+}
+if (dt<=0) {
+mess=[mess,"Discretization time step must be positive"," "];
+ok=false;
+}
+if (!ok) {
+message(mess);
+} else {
+evtdly.graphics.exprs[1-1]=exprs[1-1];
+if (evtdly.model.rpar!=dt) {
+evtdly.model.rpar=dt;
+newpar[$+1-1]=ppath[2-1];
+}
+x.model.rpar.objs[ppath[2-1]-1]=evtdly;
+register.graphics.exprs=exprs[2-1];
+if (or(register.model.dstate!=z0.slice())) {
+register.model.dstate=z0.slice();
+newpar[$+1-1]=ppath[1-1];
+}
+x.model.rpar.objs[ppath[1-1]-1]=register;
+break
+}
+}
+needcompile=0;
+y=needcompile;
+typ=newpar;
+}
 }
 /* autogenerated from "macros/Linear/TCLSS_f.sci" */
 function TCLSS_f() {
+TCLSS_f.prototype.define = function TCLSS_f() {
+x0=0;
+A=0;
+B=1;
+C=1;
+D=0;
+in1=1;
+nx=size(x0,"*");
+out=1;
+model=scicos_model();
+model.sim=list("tcslti",1);
+model.in1=[in1,nx];
+model.out=out;
+model.evtin=1;
+model.state=x0;
+model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()];
+model.blocktype="c";
+model.dep_ut=[false,true];
+exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))];
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+TCLSS_f.prototype.details = function TCLSS_f() {
+}
 TCLSS_f.prototype.get = function TCLSS_f() {
 }
 TCLSS_f.prototype.set = function TCLSS_f() {
@@ -1694,38 +1718,9 @@ break
 }
 }
 }
-TCLSS_f.prototype.define = function TCLSS_f() {
-x0=0;
-A=0;
-B=1;
-C=1;
-D=0;
-in1=1;
-nx=size(x0,"*");
-out=1;
-model=scicos_model();
-model.sim=list("tcslti",1);
-model.in1=[in1,nx];
-model.out=out;
-model.evtin=1;
-model.state=x0;
-model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()];
-model.blocktype="c";
-model.dep_ut=[false,true];
-exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))];
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-TCLSS_f.prototype.details = function TCLSS_f() {
-}
 }
 /* autogenerated from "macros/Linear/DERIV.sci" */
 function DERIV() {
-DERIV.prototype.get = function DERIV() {
-}
-DERIV.prototype.set = function DERIV() {
-x=arg1;
-}
 DERIV.prototype.define = function DERIV() {
 model=scicos_model();
 model.sim=list("deriv",4);
@@ -1739,9 +1734,33 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 DERIV.prototype.details = function DERIV() {
 }
+DERIV.prototype.get = function DERIV() {
+}
+DERIV.prototype.set = function DERIV() {
+x=arg1;
+}
 }
 /* autogenerated from "macros/Linear/VARIABLE_DELAY.sci" */
 function VARIABLE_DELAY() {
+VARIABLE_DELAY.prototype.define = function VARIABLE_DELAY() {
+nin=1;
+T=1;
+init=0;
+N=1024;
+model=scicos_model();
+model.sim=list("variable_delay",4);
+model.in1=[nin,1];
+model.out=nin;
+model.rpar=[T,init];
+model.ipar=N;
+model.blocktype="d";
+model.dep_ut=[false,false];
+exprs=[string(T),string(init),string(N)];
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+VARIABLE_DELAY.prototype.details = function VARIABLE_DELAY() {
+}
 VARIABLE_DELAY.prototype.get = function VARIABLE_DELAY() {
 }
 VARIABLE_DELAY.prototype.set = function VARIABLE_DELAY() {
@@ -1776,28 +1795,25 @@ break
 }
 }
 }
-VARIABLE_DELAY.prototype.define = function VARIABLE_DELAY() {
-nin=1;
-T=1;
-init=0;
-N=1024;
+}
+/* autogenerated from "macros/Linear/REGISTER.sci" */
+function REGISTER() {
+REGISTER.prototype.define = function REGISTER() {
+z0=zeros(10,1);
 model=scicos_model();
-model.sim=list("variable_delay",4);
-model.in1=[nin,1];
-model.out=nin;
-model.rpar=[T,init];
-model.ipar=N;
+model.sim=list("delay4",4);
+model.in1=1;
+model.out=1;
+model.evtin=1;
+model.dstate=z0;
 model.blocktype="d";
 model.dep_ut=[false,false];
-exprs=[string(T),string(init),string(N)];
+exprs=strcat(string(z0),";");
 gr_i=[];
 x=standard_define([3,2],model,exprs,gr_i);
 }
-VARIABLE_DELAY.prototype.details = function VARIABLE_DELAY() {
-}
+REGISTER.prototype.details = function REGISTER() {
 }
-/* autogenerated from "macros/Linear/REGISTER.sci" */
-function REGISTER() {
 REGISTER.prototype.get = function REGISTER() {
 }
 REGISTER.prototype.set = function REGISTER() {
@@ -1860,25 +1876,28 @@ break
 }
 }
 }
-REGISTER.prototype.define = function REGISTER() {
-z0=zeros(10,1);
+}
+/* autogenerated from "macros/Linear/INTEGRAL.sci" */
+function INTEGRAL() {
+INTEGRAL.prototype.define = function INTEGRAL() {
+maxp=1;
+minp=-1;
+rpar=[];
 model=scicos_model();
-model.sim=list("delay4",4);
+model.state=0;
+model.sim=list("integral_func",4);
 model.in1=1;
 model.out=1;
-model.evtin=1;
-model.dstate=z0;
-model.blocktype="d";
-model.dep_ut=[false,false];
-exprs=strcat(string(z0),";");
+model.rpar=rpar;
+model.blocktype="c";
+model.dep_ut=[false,true];
+exprs=string([0,0,0,maxp,minp]);
 gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-REGISTER.prototype.details = function REGISTER() {
+x=standard_define([2,2],model,exprs,gr_i);
+x.graphics.id="1/s";
 }
+INTEGRAL.prototype.details = function INTEGRAL() {
 }
-/* autogenerated from "macros/Linear/INTEGRAL.sci" */
-function INTEGRAL() {
 INTEGRAL.prototype.get = function INTEGRAL() {
 }
 INTEGRAL.prototype.set = function INTEGRAL() {
@@ -1937,28 +1956,30 @@ break
 }
 }
 }
-INTEGRAL.prototype.define = function INTEGRAL() {
-maxp=1;
-minp=-1;
-rpar=[];
+}
+/* autogenerated from "macros/Linear/GAINBLK.sci" */
+function GAINBLK() {
+GAINBLK.prototype.define = function GAINBLK() {
+gain=1;
+in1=-1;
+out=-1;
+in2=-2;
+out2=-2;
 model=scicos_model();
-model.state=0;
-model.sim=list("integral_func",4);
-model.in1=1;
-model.out=1;
-model.rpar=rpar;
+model.sim=list("gainblk",4);
+model.in1=in1;
+model.out=out;
+model.in2=in2;
+model.out2=out2;
+model.rpar=gain;
 model.blocktype="c";
-model.dep_ut=[false,true];
-exprs=string([0,0,0,maxp,minp]);
+model.dep_ut=[true,false];
+exprs=[strcat(sci2exp(gain))];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
-x.graphics.id="1/s";
-}
-INTEGRAL.prototype.details = function INTEGRAL() {
 }
+GAINBLK.prototype.details = function GAINBLK() {
 }
-/* autogenerated from "macros/Linear/GAINBLK.sci" */
-function GAINBLK() {
 GAINBLK.prototype.get = function GAINBLK() {
 }
 GAINBLK.prototype.set = function GAINBLK() {
@@ -2082,30 +2103,24 @@ break
 }
 }
 }
-GAINBLK.prototype.define = function GAINBLK() {
-gain=1;
-in1=-1;
-out=-1;
-in2=-2;
-out2=-2;
+}
+/* autogenerated from "macros/Linear/SOM_f.sci" */
+function SOM_f() {
+SOM_f.prototype.define = function SOM_f() {
+sgn=[1,1,1];
 model=scicos_model();
-model.sim=list("gainblk",4);
-model.in1=in1;
-model.out=out;
-model.in2=in2;
-model.out2=out2;
-model.rpar=gain;
+model.sim=list("sum",2);
+model.in1=[-1,-1,-1];
+model.out=-1;
+model.rpar=sgn;
 model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=[strcat(sci2exp(gain))];
+exprs=[sci2exp(1),sci2exp(sgn)];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 }
-GAINBLK.prototype.details = function GAINBLK() {
-}
+SOM_f.prototype.details = function SOM_f() {
 }
-/* autogenerated from "macros/Linear/SOM_f.sci" */
-function SOM_f() {
 SOM_f.prototype.get = function SOM_f() {
 }
 SOM_f.prototype.set = function SOM_f() {
@@ -2128,24 +2143,27 @@ str=["This sum block is obsolete","parameters cannot be modified. Please replace
 str=[str,(part(labs.slice(),1,7)+exprs.slice())];
 message(str);
 }
-SOM_f.prototype.define = function SOM_f() {
-sgn=[1,1,1];
+}
+/* autogenerated from "macros/Linear/DOLLAR_m.sci" */
+function DOLLAR_m() {
+DOLLAR_m.prototype.define = function DOLLAR_m() {
+z=0;
+inh=0;
+in1=1;
+exprs=string([z,inh]);
 model=scicos_model();
-model.sim=list("sum",2);
-model.in1=[-1,-1,-1];
-model.out=-1;
-model.rpar=sgn;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[sci2exp(1),sci2exp(sgn)];
+model.sim=list("dollar4",4);
+model.in1=in1;
+model.out=in1;
+model.evtin=1-inh;
+model.dstate=z;
+model.blocktype="d";
+model.dep_ut=[false,false];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 }
-SOM_f.prototype.details = function SOM_f() {
-}
+DOLLAR_m.prototype.details = function DOLLAR_m() {
 }
-/* autogenerated from "macros/Linear/DOLLAR_m.sci" */
-function DOLLAR_m() {
 DOLLAR_m.prototype.get = function DOLLAR_m() {
 }
 DOLLAR_m.prototype.set = function DOLLAR_m() {
@@ -2215,27 +2233,31 @@ break
 }
 }
 }
-DOLLAR_m.prototype.define = function DOLLAR_m() {
-z=0;
-inh=0;
-in1=1;
-exprs=string([z,inh]);
+}
+/* autogenerated from "macros/Linear/DELAYV_f.sci" */
+function DELAYV_f() {
+DELAYV_f.prototype.define = function DELAYV_f() {
+nin=1;
+z0=zeros(11,1);
+zz0=z0.slice(1-1,$-1);
+T=1;
 model=scicos_model();
-model.sim=list("dollar4",4);
-model.in1=in1;
-model.out=in1;
-model.evtin=1-inh;
-model.dstate=z;
+model.sim=list("delayv",1);
+model.in1=[nin,1];
+model.out=nin;
+model.evtin=1;
+model.evtout=[1,1];
+model.dstate=z0;
+model.rpar=T/(size(zz0,"*"));
 model.blocktype="d";
-model.dep_ut=[false,false];
+model.firing=[0,-1];
+model.dep_ut=[true,false];
+exprs=[string(nin),strcat(string(z0.slice(1-1,$-1)),";"),string(T)];
 gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-DOLLAR_m.prototype.details = function DOLLAR_m() {
+x=standard_define([3,2],model,exprs,gr_i);
 }
+DELAYV_f.prototype.details = function DELAYV_f() {
 }
-/* autogenerated from "macros/Linear/DELAYV_f.sci" */
-function DELAYV_f() {
 DELAYV_f.prototype.get = function DELAYV_f() {
 }
 DELAYV_f.prototype.set = function DELAYV_f() {
@@ -2273,31 +2295,31 @@ break
 }
 }
 }
-DELAYV_f.prototype.define = function DELAYV_f() {
-nin=1;
-z0=zeros(11,1);
-zz0=z0.slice(1-1,$-1);
-T=1;
+}
+/* autogenerated from "macros/Linear/CLSS_f.sci" */
+function CLSS_f() {
+CLSS_f.prototype.define = function CLSS_f() {
+x0=0;
+A=-1;
+B=1;
+C=1;
+D=0;
+in1=1;
+out=1;
 model=scicos_model();
-model.sim=list("delayv",1);
-model.in1=[nin,1];
-model.out=nin;
-model.evtin=1;
-model.evtout=[1,1];
-model.dstate=z0;
-model.rpar=T/(size(zz0,"*"));
-model.blocktype="d";
-model.firing=[0,-1];
-model.dep_ut=[true,false];
-exprs=[string(nin),strcat(string(z0.slice(1-1,$-1)),";"),string(T)];
+model.sim=list("csslti",1);
+model.in1=in1;
+model.out=out;
+model.state=x0;
+model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()];
+model.blocktype="c";
+model.dep_ut=[false,true];
+exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))];
 gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-DELAYV_f.prototype.details = function DELAYV_f() {
+x=standard_define([4,2],model,exprs,gr_i);
 }
+CLSS_f.prototype.details = function CLSS_f() {
 }
-/* autogenerated from "macros/Linear/CLSS_f.sci" */
-function CLSS_f() {
 CLSS_f.prototype.get = function CLSS_f() {
 }
 CLSS_f.prototype.set = function CLSS_f() {
@@ -2350,7 +2372,10 @@ break
 }
 }
 }
-CLSS_f.prototype.define = function CLSS_f() {
+}
+/* autogenerated from "macros/Linear/CLSS.sci" */
+function CLSS() {
+CLSS.prototype.define = function CLSS() {
 x0=0;
 A=-1;
 B=1;
@@ -2359,7 +2384,7 @@ D=0;
 in1=1;
 out=1;
 model=scicos_model();
-model.sim=list("csslti",1);
+model.sim=list("csslti4",4);
 model.in1=in1;
 model.out=out;
 model.state=x0;
@@ -2370,11 +2395,8 @@ exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D
 gr_i=[];
 x=standard_define([4,2],model,exprs,gr_i);
 }
-CLSS_f.prototype.details = function CLSS_f() {
-}
+CLSS.prototype.details = function CLSS() {
 }
-/* autogenerated from "macros/Linear/CLSS.sci" */
-function CLSS() {
 CLSS.prototype.get = function CLSS() {
 }
 CLSS.prototype.set = function CLSS() {
@@ -2437,31 +2459,27 @@ break
 }
 }
 }
-CLSS.prototype.define = function CLSS() {
-x0=0;
-A=-1;
-B=1;
-C=1;
-D=0;
-in1=1;
-out=1;
+}
+/* autogenerated from "macros/Linear/SAMPHOLD_m.sci" */
+function SAMPHOLD_m() {
+SAMPHOLD_m.prototype.define = function SAMPHOLD_m() {
 model=scicos_model();
-model.sim=list("csslti4",4);
-model.in1=in1;
-model.out=out;
-model.state=x0;
-model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()];
-model.blocktype="c";
-model.dep_ut=[false,true];
-exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))];
+model.sim=list("samphold4_m",4);
+model.in1=-1;
+model.in2=-2;
+model.intyp=1;
+model.outtyp=1;
+model.out=-1;
+model.out2=-2;
+model.evtin=1;
+model.blocktype="d";
+model.dep_ut=[true,false];
+label=[sci2exp(1)];
 gr_i=[];
-x=standard_define([4,2],model,exprs,gr_i);
-}
-CLSS.prototype.details = function CLSS() {
+x=standard_define([2,2],model,label,gr_i);
 }
+SAMPHOLD_m.prototype.details = function SAMPHOLD_m() {
 }
-/* autogenerated from "macros/Linear/SAMPHOLD_m.sci" */
-function SAMPHOLD_m() {
 SAMPHOLD_m.prototype.get = function SAMPHOLD_m() {
 }
 SAMPHOLD_m.prototype.set = function SAMPHOLD_m() {
@@ -2492,27 +2510,28 @@ break
 }
 }
 }
-SAMPHOLD_m.prototype.define = function SAMPHOLD_m() {
+}
+/* autogenerated from "macros/Linear/TIME_DELAY.sci" */
+function TIME_DELAY() {
+TIME_DELAY.prototype.define = function TIME_DELAY() {
+nin=1;
+T=1;
+init=0;
+N=1024;
 model=scicos_model();
-model.sim=list("samphold4_m",4);
-model.in1=-1;
-model.in2=-2;
-model.intyp=1;
-model.outtyp=1;
-model.out=-1;
-model.out2=-2;
-model.evtin=1;
-model.blocktype="d";
-model.dep_ut=[true,false];
-label=[sci2exp(1)];
+model.sim=list("time_delay",4);
+model.in1=[nin];
+model.out=nin;
+model.rpar=[T,init];
+model.ipar=N;
+model.blocktype="x";
+model.dep_ut=[false,true];
+exprs=[string(T),string(init),string(N)];
 gr_i=[];
-x=standard_define([2,2],model,label,gr_i);
-}
-SAMPHOLD_m.prototype.details = function SAMPHOLD_m() {
+x=standard_define([3.5,2],model,exprs,gr_i);
 }
+TIME_DELAY.prototype.details = function TIME_DELAY() {
 }
-/* autogenerated from "macros/Linear/TIME_DELAY.sci" */
-function TIME_DELAY() {
 TIME_DELAY.prototype.get = function TIME_DELAY() {
 }
 TIME_DELAY.prototype.set = function TIME_DELAY() {
@@ -2548,28 +2567,30 @@ break
 }
 }
 }
-TIME_DELAY.prototype.define = function TIME_DELAY() {
-nin=1;
-T=1;
-init=0;
-N=1024;
+}
+/* autogenerated from "macros/Linear/DLSS.sci" */
+function DLSS() {
+DLSS.prototype.define = function DLSS() {
+x0=0;
+A=-1;
+B=1;
+C=1;
+D=0;
 model=scicos_model();
-model.sim=list("time_delay",4);
-model.in1=[nin];
-model.out=nin;
-model.rpar=[T,init];
-model.ipar=N;
-model.blocktype="x";
-model.dep_ut=[false,true];
-exprs=[string(T),string(init),string(N)];
+model.sim=list("dsslti4",4);
+model.in1=1;
+model.out=1;
+model.evtin=1;
+model.dstate=x0.slice();
+model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()];
+model.blocktype="d";
+model.dep_ut=[false,false];
+exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))];
 gr_i=[];
-x=standard_define([3.5,2],model,exprs,gr_i);
-}
-TIME_DELAY.prototype.details = function TIME_DELAY() {
+x=standard_define([4,2],model,exprs,gr_i);
 }
+DLSS.prototype.details = function DLSS() {
 }
-/* autogenerated from "macros/Linear/DLSS.sci" */
-function DLSS() {
 DLSS.prototype.get = function DLSS() {
 }
 DLSS.prototype.set = function DLSS() {
@@ -2632,30 +2653,29 @@ break
 }
 }
 }
-DLSS.prototype.define = function DLSS() {
-x0=0;
-A=-1;
-B=1;
-C=1;
-D=0;
+}
+/* autogenerated from "macros/Linear/INTEGRAL_m.sci" */
+function INTEGRAL_m() {
+INTEGRAL_m.prototype.define = function INTEGRAL_m() {
+maxp=1;
+minp=-1;
+rpar=[];
 model=scicos_model();
-model.sim=list("dsslti4",4);
+model.state=0;
+model.sim=list("integral_func",4);
 model.in1=1;
 model.out=1;
-model.evtin=1;
-model.dstate=x0.slice();
-model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()];
-model.blocktype="d";
-model.dep_ut=[false,false];
-exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))];
+model.in2=1;
+model.out2=1;
+model.rpar=rpar;
+model.blocktype="c";
+model.dep_ut=[false,true];
+exprs=string([0,0,0,maxp,minp]);
 gr_i=[];
-x=standard_define([4,2],model,exprs,gr_i);
-}
-DLSS.prototype.details = function DLSS() {
+x=standard_define([2,2],model,exprs,gr_i);
 }
+INTEGRAL_m.prototype.details = function INTEGRAL_m() {
 }
-/* autogenerated from "macros/Linear/INTEGRAL_m.sci" */
-function INTEGRAL_m() {
 INTEGRAL_m.prototype.get = function INTEGRAL_m() {
 }
 INTEGRAL_m.prototype.set = function INTEGRAL_m() {
@@ -2756,29 +2776,27 @@ break
 }
 }
 }
-INTEGRAL_m.prototype.define = function INTEGRAL_m() {
-maxp=1;
-minp=-1;
-rpar=[];
+}
+/* autogenerated from "macros/Linear/DOLLAR.sci" */
+function DOLLAR() {
+DOLLAR.prototype.define = function DOLLAR() {
+z=0;
+inh=0;
+in1=1;
+exprs=string([z,inh]);
 model=scicos_model();
-model.state=0;
-model.sim=list("integral_func",4);
-model.in1=1;
-model.out=1;
-model.in2=1;
-model.out2=1;
-model.rpar=rpar;
-model.blocktype="c";
-model.dep_ut=[false,true];
-exprs=string([0,0,0,maxp,minp]);
+model.sim=list("dollar4",4);
+model.in1=in1;
+model.out=in1;
+model.evtin=1-inh;
+model.dstate=z;
+model.blocktype="d";
+model.dep_ut=[false,false];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 }
-INTEGRAL_m.prototype.details = function INTEGRAL_m() {
-}
+DOLLAR.prototype.details = function DOLLAR() {
 }
-/* autogenerated from "macros/Linear/DOLLAR.sci" */
-function DOLLAR() {
 DOLLAR.prototype.get = function DOLLAR() {
 }
 DOLLAR.prototype.set = function DOLLAR() {
@@ -2848,27 +2866,33 @@ break
 }
 }
 }
-DOLLAR.prototype.define = function DOLLAR() {
-z=0;
-inh=0;
+}
+/* autogenerated from "macros/Linear/TCLSS.sci" */
+function TCLSS() {
+TCLSS.prototype.define = function TCLSS() {
+x0=0;
+A=0;
+B=1;
+C=1;
+D=0;
 in1=1;
-exprs=string([z,inh]);
+nx=size(x0,"*");
+out=1;
 model=scicos_model();
-model.sim=list("dollar4",4);
-model.in1=in1;
-model.out=in1;
-model.evtin=1-inh;
-model.dstate=z;
-model.blocktype="d";
-model.dep_ut=[false,false];
+model.sim=list("tcslti4",4);
+model.in1=[in1,nx];
+model.out=out;
+model.evtin=1;
+model.state=x0;
+model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()];
+model.blocktype="c";
+model.dep_ut=[false,true];
+exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))];
 gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-DOLLAR.prototype.details = function DOLLAR() {
+x=standard_define([3,2],model,exprs,gr_i);
 }
+TCLSS.prototype.details = function TCLSS() {
 }
-/* autogenerated from "macros/Linear/TCLSS.sci" */
-function TCLSS() {
 TCLSS.prototype.get = function TCLSS() {
 }
 TCLSS.prototype.set = function TCLSS() {
@@ -2926,38 +2950,9 @@ break
 }
 }
 }
-TCLSS.prototype.define = function TCLSS() {
-x0=0;
-A=0;
-B=1;
-C=1;
-D=0;
-in1=1;
-nx=size(x0,"*");
-out=1;
-model=scicos_model();
-model.sim=list("tcslti4",4);
-model.in1=[in1,nx];
-model.out=out;
-model.evtin=1;
-model.state=x0;
-model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()];
-model.blocktype="c";
-model.dep_ut=[false,true];
-exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))];
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-TCLSS.prototype.details = function TCLSS() {
-}
 }
 /* autogenerated from "macros/Linear/SUM_f.sci" */
 function SUM_f() {
-SUM_f.prototype.get = function SUM_f() {
-}
-SUM_f.prototype.set = function SUM_f() {
-x=arg1;
-}
 SUM_f.prototype.define = function SUM_f() {
 model=scicos_model();
 model.sim=list("plusblk",2);
@@ -2971,9 +2966,31 @@ x=standard_define([1,1],model,exprs,gr_i);
 }
 SUM_f.prototype.details = function SUM_f() {
 }
+SUM_f.prototype.get = function SUM_f() {
+}
+SUM_f.prototype.set = function SUM_f() {
+x=arg1;
+}
 }
 /* autogenerated from "macros/Linear/GAIN_f.sci" */
 function GAIN_f() {
+GAIN_f.prototype.define = function GAIN_f() {
+gain=1;
+in1=1;
+out=1;
+model=scicos_model();
+model.sim="gain";
+model.in1=1;
+model.out=1;
+model.rpar=gain;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[strcat(sci2exp(gain)),strcat(sci2exp(in1)),strcat(sci2exp(out))];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+GAIN_f.prototype.details = function GAIN_f() {
+}
 GAIN_f.prototype.get = function GAIN_f() {
 }
 GAIN_f.prototype.set = function GAIN_f() {
@@ -3001,26 +3018,49 @@ break
 }
 }
 }
-GAIN_f.prototype.define = function GAIN_f() {
-gain=1;
-in1=1;
-out=1;
+}
+/* autogenerated from "macros/Linear/PID.sci" */
+function PID() {
+PID.prototype.define = function PID() {
+scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["PID"],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.objs[1-1]=scicos_block(gui="INTEGRAL_m",graphics=scicos_graphics(orig=[318.304,183.11733],sz=[40,40],flip=true,theta=0,exprs=["0","0","0","1","-1"],pin=7,pout=9,pein=[],peout=[],gr_i=[],id="1/s",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("integral_func",4),in1=1,in2=1,intyp=1,out=1,out2=1,outtyp=1,evtin=[],evtout=[],state=0,dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[false,true],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[2-1]=scicos_block(gui="SUMMATION",graphics=scicos_graphics(orig=[387.97067,172.85067],sz=[40,60],flip=true,theta=0,exprs=["1","[1;1;1]"],pin=[10,9,11],pout=19,pein=[],peout=[],gr_i=[],id="",in_implicit=["E","E","E"],out_implicit="E"),model=scicos_model(sim=list("summation",4),in1=[-1,-1,-1],in2=[-2,-2,-2],intyp=[1,1,1],out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[1,1,1],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[3-1]=scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[321.23733,235.91733],sz=[40,40],flip=true,theta=0,exprs="1",pin=17,pout=10,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[4-1]=scicos_block(gui="DERIV",graphics=scicos_graphics(orig=[319.03733,135.45067],sz=[40,40],flip=true,theta=0,exprs=[],pin=8,pout=11,pein=[],peout=[],gr_i=[],id="s",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("deriv",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="x",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[5-1]=scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[255.23733,183.11733],sz=[40,40],flip=true,theta=0,exprs="1",pin=13,pout=7,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[6-1]=scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[255.23733,135.45067],sz=[40,40],flip=true,theta=0,exprs="1",pin=14,pout=8,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[7-1]=scicos_link(xx=[303.80876,309.73257],yy=[203.11733,203.11733],id="drawlink",thick=[0,0],ct=[1,1],from=[5,1,0],to=[1,1,1]);
+scs_m.objs[8-1]=scicos_link(xx=[303.80876,310.4659],yy=[155.45067,155.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[6,1,0],to=[4,1,1]);
+scs_m.objs[9-1]=scicos_link(xx=[366.87543,379.39924],yy=[203.11733,202.85067],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[2,2,1]);
+scs_m.objs[10-1]=scicos_link(xx=[369.80876,379.39924,379.39924],yy=[255.91733,255.91733,217.85067],id="drawlink",thick=[0,0],ct=[1,1],from=[3,1,0],to=[2,1,1]);
+scs_m.objs[11-1]=scicos_link(xx=[367.60876,379.39924,379.39924],yy=[155.45067,155.45067,187.85067],id="drawlink",thick=[0,0],ct=[1,1],from=[4,1,0],to=[2,3,1]);
+scs_m.objs[12-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[234.704,203.11733],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=16,pout=[13,14],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[13-1]=scicos_link(xx=[234.704,246.6659],yy=[203.11733,203.11733],id="drawlink",thick=[0,0],ct=[1,1],from=[12,1,0],to=[5,1,1]);
+scs_m.objs[14-1]=scicos_link(xx=[234.704,234.704,246.6659],yy=[203.11733,155.45067,155.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[12,2,0],to=[6,1,1]);
+scs_m.objs[15-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[233.97067,203.11733],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=21,pout=[16,17],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[16-1]=scicos_link(xx=[233.97067,234.704],yy=[203.11733,203.11733],id="drawlink",thick=[0,0],ct=[1,1],from=[15,1,0],to=[12,1,1]);
+scs_m.objs[17-1]=scicos_link(xx=[233.97067,233.97067,312.6659],yy=[203.11733,255.91733,255.91733],id="drawlink",thick=[0,0],ct=[1,1],from=[15,2,0],to=[3,1,1]);
+scs_m.objs[18-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[456.5421,192.85067],sz=[20,20],flip=true,theta=0,exprs="1",pin=19,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],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.objs[19-1]=scicos_link(xx=[436.5421,456.5421],yy=[202.85067,202.85067],id="drawlink",thick=[0,0],ct=[1,1],from=[2,1,0],to=[18,1,1]);
+scs_m.objs[20-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[193.97067,193.11733],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=21,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,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.objs[21-1]=scicos_link(xx=[213.97067,233.97067],yy=[203.11733,203.11733],id="drawlink",thick=[0,0],ct=[1,1],from=[20,1,0],to=[15,1,1]);
 model=scicos_model();
-model.sim="gain";
-model.in1=1;
-model.out=1;
-model.rpar=gain;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[strcat(sci2exp(gain)),strcat(sci2exp(in1)),strcat(sci2exp(out))];
+model.sim="csuper";
+model.in1=-1;
+model.in2=-2;
+model.out=-1;
+model.out2=-2;
+model.intyp=1;
+model.outtyp=1;
+model.blocktype="h";
+model.firing=false;
+model.dep_ut=[false,false];
+model.rpar=scs_m;
 gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-GAIN_f.prototype.details = function GAIN_f() {
+x=standard_define([2,2],model,[],gr_i);
 }
+PID.prototype.details = function PID() {
 }
-/* autogenerated from "macros/Linear/PID.sci" */
-function PID() {
 PID.prototype.get = function PID() {
 }
 PID.prototype.set = function PID() {
@@ -3094,49 +3134,31 @@ x=arg1;
 y=max(y,needcompile);
 typ=newpar;
 }
-PID.prototype.define = function PID() {
-scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["PID"],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.objs[1-1]=scicos_block(gui="INTEGRAL_m",graphics=scicos_graphics(orig=[318.304,183.11733],sz=[40,40],flip=true,theta=0,exprs=["0","0","0","1","-1"],pin=7,pout=9,pein=[],peout=[],gr_i=[],id="1/s",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("integral_func",4),in1=1,in2=1,intyp=1,out=1,out2=1,outtyp=1,evtin=[],evtout=[],state=0,dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[false,true],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m.objs[2-1]=scicos_block(gui="SUMMATION",graphics=scicos_graphics(orig=[387.97067,172.85067],sz=[40,60],flip=true,theta=0,exprs=["1","[1;1;1]"],pin=[10,9,11],pout=19,pein=[],peout=[],gr_i=[],id="",in_implicit=["E","E","E"],out_implicit="E"),model=scicos_model(sim=list("summation",4),in1=[-1,-1,-1],in2=[-2,-2,-2],intyp=[1,1,1],out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[1,1,1],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m.objs[3-1]=scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[321.23733,235.91733],sz=[40,40],flip=true,theta=0,exprs="1",pin=17,pout=10,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m.objs[4-1]=scicos_block(gui="DERIV",graphics=scicos_graphics(orig=[319.03733,135.45067],sz=[40,40],flip=true,theta=0,exprs=[],pin=8,pout=11,pein=[],peout=[],gr_i=[],id="s",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("deriv",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="x",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m.objs[5-1]=scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[255.23733,183.11733],sz=[40,40],flip=true,theta=0,exprs="1",pin=13,pout=7,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m.objs[6-1]=scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[255.23733,135.45067],sz=[40,40],flip=true,theta=0,exprs="1",pin=14,pout=8,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m.objs[7-1]=scicos_link(xx=[303.80876,309.73257],yy=[203.11733,203.11733],id="drawlink",thick=[0,0],ct=[1,1],from=[5,1,0],to=[1,1,1]);
-scs_m.objs[8-1]=scicos_link(xx=[303.80876,310.4659],yy=[155.45067,155.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[6,1,0],to=[4,1,1]);
-scs_m.objs[9-1]=scicos_link(xx=[366.87543,379.39924],yy=[203.11733,202.85067],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[2,2,1]);
-scs_m.objs[10-1]=scicos_link(xx=[369.80876,379.39924,379.39924],yy=[255.91733,255.91733,217.85067],id="drawlink",thick=[0,0],ct=[1,1],from=[3,1,0],to=[2,1,1]);
-scs_m.objs[11-1]=scicos_link(xx=[367.60876,379.39924,379.39924],yy=[155.45067,155.45067,187.85067],id="drawlink",thick=[0,0],ct=[1,1],from=[4,1,0],to=[2,3,1]);
-scs_m.objs[12-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[234.704,203.11733],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=16,pout=[13,14],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m.objs[13-1]=scicos_link(xx=[234.704,246.6659],yy=[203.11733,203.11733],id="drawlink",thick=[0,0],ct=[1,1],from=[12,1,0],to=[5,1,1]);
-scs_m.objs[14-1]=scicos_link(xx=[234.704,234.704,246.6659],yy=[203.11733,155.45067,155.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[12,2,0],to=[6,1,1]);
-scs_m.objs[15-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[233.97067,203.11733],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=21,pout=[16,17],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m.objs[16-1]=scicos_link(xx=[233.97067,234.704],yy=[203.11733,203.11733],id="drawlink",thick=[0,0],ct=[1,1],from=[15,1,0],to=[12,1,1]);
-scs_m.objs[17-1]=scicos_link(xx=[233.97067,233.97067,312.6659],yy=[203.11733,255.91733,255.91733],id="drawlink",thick=[0,0],ct=[1,1],from=[15,2,0],to=[3,1,1]);
-scs_m.objs[18-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[456.5421,192.85067],sz=[20,20],flip=true,theta=0,exprs="1",pin=19,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],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.objs[19-1]=scicos_link(xx=[436.5421,456.5421],yy=[202.85067,202.85067],id="drawlink",thick=[0,0],ct=[1,1],from=[2,1,0],to=[18,1,1]);
-scs_m.objs[20-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[193.97067,193.11733],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=21,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,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.objs[21-1]=scicos_link(xx=[213.97067,233.97067],yy=[203.11733,203.11733],id="drawlink",thick=[0,0],ct=[1,1],from=[20,1,0],to=[15,1,1]);
-model=scicos_model();
-model.sim="csuper";
-model.in1=-1;
-model.in2=-2;
-model.out=-1;
-model.out2=-2;
-model.intyp=1;
-model.outtyp=1;
-model.blocktype="h";
-model.firing=false;
-model.dep_ut=[false,false];
-model.rpar=scs_m;
-gr_i=[];
-x=standard_define([2,2],model,[],gr_i);
-}
-PID.prototype.details = function PID() {
-}
 }
 /* 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() {
@@ -3174,31 +3196,38 @@ break
 }
 }
 }
-BARXY.prototype.define = function BARXY() {
-model=scicos_model();
+}
+/* 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;
-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];
+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=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() {
+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() {
 }
-/* autogenerated from "macros/Sinks/CANIMXY.sci" */
-function CANIMXY() {
 CANIMXY.prototype.get = function CANIMXY() {
 }
 CANIMXY.prototype.set = function CANIMXY() {
@@ -3267,38 +3296,30 @@ break
 }
 }
 }
-CANIMXY.prototype.define = function CANIMXY() {
-win=-1;
-clrs=-4;
+}
+/* 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;
-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.sim="writef";
+model.in1=in1;
 model.evtin=1;
-model.rpar=[xmin,xmax,ymin,ymax];
-model.ipar=[win,1,N,clrs,siz,0,wpos.slice(),wdim.slice(),nbr_curves];
+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.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)];
+model.dep_ut=[true,false];
+exprs=[sci2exp(in1),fname,frmt,string(N)];
 gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-CANIMXY.prototype.details = function CANIMXY() {
+x=standard_define([3,2],model,exprs,gr_i);
 }
+WFILE_f.prototype.details = function WFILE_f() {
 }
-/* autogenerated from "macros/Sinks/WFILE_f.sci" */
-function WFILE_f() {
 WFILE_f.prototype.get = function WFILE_f() {
 }
 WFILE_f.prototype.set = function WFILE_f() {
@@ -3365,30 +3386,33 @@ break
 }
 }
 }
-WFILE_f.prototype.define = function WFILE_f() {
-in1=1;
-nin=sum(in1);
-frmt="(7(e10.3,1x))";
-fname="foo";
-lunit=0;
-N=2;
+}
+/* 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="writef";
-model.in1=in1;
+model.sim=list("cscope",4);
+model.in1=-1;
+model.in2=1;
 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.rpar=[0,ymin,ymax,per];
+model.ipar=[win,1,N,clrs,wpos,wdim];
+model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=[sci2exp(in1),fname,frmt,string(N)];
+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([3,2],model,exprs,gr_i);
-}
-WFILE_f.prototype.details = function WFILE_f() {
+x=standard_define([2,2],model,exprs,gr_i);
 }
+CSCOPE.prototype.details = function CSCOPE() {
 }
-/* autogenerated from "macros/Sinks/CSCOPE.sci" */
-function CSCOPE() {
 CSCOPE.prototype.get = function CSCOPE() {
 }
 CSCOPE.prototype.set = function CSCOPE() {
@@ -3457,33 +3481,38 @@ break
 }
 }
 }
-CSCOPE.prototype.define = function CSCOPE() {
+}
+/* autogenerated from "macros/Sinks/CANIMXY3D.sci" */
+function CANIMXY3D() {
+CANIMXY3D.prototype.define = function CANIMXY3D() {
 win=-1;
-wdim=[600,400];
+N=2;
+clrs=[1,2,3,4,5,6,7,13];
+siz=[1,1,1,1,1,1,1,1];
 wpos=[-1,-1];
-clrs=[1,3,5,7,9,11,13,15];
-N=20;
-ymin=-15;
-ymax=+15;
-per=30;
+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("cscope",4);
-model.in1=-1;
-model.in2=1;
+model.sim=list("canimxy3d",4);
+model.in1=[1,1,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()];
+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);
 }
-CSCOPE.prototype.details = function CSCOPE() {
-}
+CANIMXY3D.prototype.details = function CANIMXY3D() {
 }
-/* autogenerated from "macros/Sinks/CANIMXY3D.sci" */
-function CANIMXY3D() {
 CANIMXY3D.prototype.get = function CANIMXY3D() {
 }
 CANIMXY3D.prototype.set = function CANIMXY3D() {
@@ -3569,38 +3598,34 @@ 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;
+}
+/* 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("canimxy3d",4);
-model.in1=[1,1,1];
+model.sim=list("cmat3d",4);
+model.in1=-1;
+model.in2=-2;
+model.intyp=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)];
+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);
 }
-CANIMXY3D.prototype.details = function CANIMXY3D() {
-}
+CMAT3D.prototype.details = function CMAT3D() {
 }
-/* autogenerated from "macros/Sinks/CMAT3D.sci" */
-function CMAT3D() {
 CMAT3D.prototype.get = function CMAT3D() {
 }
 CMAT3D.prototype.set = function CMAT3D() {
@@ -3639,34 +3664,37 @@ 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;
+}
+/* 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("cmat3d",4);
-model.in1=-1;
-model.in2=-2;
-model.intyp=1;
+model.sim=list("cscopxy3d",4);
+model.in1=[1,1,1];
+model.in2=[1,1,1];
+model.intyp=[1,1,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)];
+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);
 }
-CMAT3D.prototype.details = function CMAT3D() {
-}
+CSCOPXY3D.prototype.details = function CSCOPXY3D() {
 }
-/* autogenerated from "macros/Sinks/CSCOPXY3D.sci" */
-function CSCOPXY3D() {
 CSCOPXY3D.prototype.get = function CSCOPXY3D() {
 }
 CSCOPXY3D.prototype.set = function CSCOPXY3D() {
@@ -3748,37 +3776,37 @@ message(mess);
 }
 }
 }
-CSCOPXY3D.prototype.define = function CSCOPXY3D() {
+}
+/* autogenerated from "macros/Sinks/CSCOPXY.sci" */
+function CSCOPXY() {
+CSCOPXY.prototype.define = function CSCOPXY() {
 win=-1;
-clrs=[1,2,3,4,5,6,7,13];
-siz=[1,1,1,1,1,1,1,1];
+clrs=4;
+siz=1;
 wdim=[600,400];
 wpos=[-1,-1];
 N=2;
-param3ds=[50,280];
-vec_x=[-15,15];
-vec_y=[-15,15];
-vec_z=[-15,15];
+xmin=-15;
+xmax=15;
+ymin=-15;
+ymax=+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.sim=list("cscopxy",4);
+model.in1=[1,1];
+model.in2=[1,1];
+model.intyp=[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.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),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)];
+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);
 }
-CSCOPXY3D.prototype.details = function CSCOPXY3D() {
-}
+CSCOPXY.prototype.details = function CSCOPXY() {
 }
-/* autogenerated from "macros/Sinks/CSCOPXY.sci" */
-function CSCOPXY() {
 CSCOPXY.prototype.get = function CSCOPXY() {
 }
 CSCOPXY.prototype.set = function CSCOPXY() {
@@ -3847,37 +3875,29 @@ 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;
+}
+/* autogenerated from "macros/Sinks/OUTIMPL_f.sci" */
+function OUTIMPL_f() {
+OUTIMPL_f.prototype.define = function OUTIMPL_f() {
 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.in1=[-1];
+model.in2=[1];
+prt=1;
+model.sim="outimpl";
+model.ipar=[1];
+model.blocktype="c";
 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)];
+mo=modelica();
+mo.model="PORT";
+mo.inputs="n";
+model.equations=mo;
+exprs="1";
 gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-CSCOPXY.prototype.details = function CSCOPXY() {
+x=standard_define([1,1],model,exprs,gr_i);
+x.graphics.in_implicit=["I"];
 }
+OUTIMPL_f.prototype.details = function OUTIMPL_f() {
 }
-/* autogenerated from "macros/Sinks/OUTIMPL_f.sci" */
-function OUTIMPL_f() {
 OUTIMPL_f.prototype.get = function OUTIMPL_f() {
 }
 OUTIMPL_f.prototype.set = function OUTIMPL_f() {
@@ -3909,29 +3929,23 @@ break
 }
 }
 }
-OUTIMPL_f.prototype.define = function OUTIMPL_f() {
-model=scicos_model();
-model.in1=[-1];
-model.in2=[1];
+}
+/* autogenerated from "macros/Sinks/CLKOUTV_f.sci" */
+function CLKOUTV_f() {
+CLKOUTV_f.prototype.define = function CLKOUTV_f() {
 prt=1;
-model.sim="outimpl";
-model.ipar=[1];
-model.blocktype="c";
+model=scicos_model();
+model.sim="output";
+model.evtin=1;
+model.ipar=prt;
+model.blocktype="d";
+model.firing=[];
 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() {
+exprs=string(prt);
+x=standard_define([1,1],model,exprs," ");
 }
+CLKOUTV_f.prototype.details = function CLKOUTV_f() {
 }
-/* autogenerated from "macros/Sinks/CLKOUTV_f.sci" */
-function CLKOUTV_f() {
 CLKOUTV_f.prototype.get = function CLKOUTV_f() {
 }
 CLKOUTV_f.prototype.set = function CLKOUTV_f() {
@@ -3957,23 +3971,31 @@ break
 }
 }
 }
-CLKOUTV_f.prototype.define = function CLKOUTV_f() {
-prt=1;
+}
+/* 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="output";
+model.sim=list("cfscope",4);
 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() {
+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() {
 }
-/* autogenerated from "macros/Sinks/CFSCOPE.sci" */
-function CFSCOPE() {
 CFSCOPE.prototype.get = function CFSCOPE() {
 }
 CFSCOPE.prototype.set = function CFSCOPE() {
@@ -4044,31 +4066,31 @@ break
 }
 }
 }
-CFSCOPE.prototype.define = function CFSCOPE() {
-win=-1;
-wdim=[600,400];
-wpos=[-1,-1];
-clrs=[1,3,5,7,9,11,13,15];
+}
+/* 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;
-ymin=-15;
-ymax=+15;
-per=30;
 model=scicos_model();
-model.sim=list("cfscope",4);
+model.sim=list("writeau",2);
+model.in1=in1;
 model.evtin=1;
-model.rpar=[0,ymin,ymax,per];
-model.ipar=[win,1,N,clrs,wpos,wdim,1,1];
-model.blocktype="c";
+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=[strcat(string(clrs)," "),string(win),sci2exp([]),sci2exp(wdim),string(ymin),string(ymax),string(per),string(N),string([1])];
+exprs=[string(N),string(swap)];
 gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-CFSCOPE.prototype.details = function CFSCOPE() {
+x=standard_define([4,2],model,exprs,gr_i);
 }
+WRITEAU_f.prototype.details = function WRITEAU_f() {
 }
-/* autogenerated from "macros/Sinks/WRITEAU_f.sci" */
-function WRITEAU_f() {
 WRITEAU_f.prototype.get = function WRITEAU_f() {
 }
 WRITEAU_f.prototype.set = function WRITEAU_f() {
@@ -4113,31 +4135,31 @@ break
 }
 }
 }
-WRITEAU_f.prototype.define = function WRITEAU_f() {
+}
+/* autogenerated from "macros/Sinks/WRITEC_f.sci" */
+function WRITEC_f() {
+WRITEC_f.prototype.define = function WRITEC_f() {
 in1=1;
 nin=sum(in1);
-frmt="uc ";
-fname="/dev/audio";
+frmt="c  ";
+fname="foo";
 swap=0;
 lunit=0;
 N=2;
 model=scicos_model();
-model.sim=list("writeau",2);
+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=[string(N),string(swap)];
+exprs=[sci2exp(in1),fname,frmt,string(N),string(swap)];
 gr_i=[];
 x=standard_define([4,2],model,exprs,gr_i);
 }
-WRITEAU_f.prototype.details = function WRITEAU_f() {
-}
+WRITEC_f.prototype.details = function WRITEC_f() {
 }
-/* autogenerated from "macros/Sinks/WRITEC_f.sci" */
-function WRITEC_f() {
 WRITEC_f.prototype.get = function WRITEC_f() {
 }
 WRITEC_f.prototype.set = function WRITEC_f() {
@@ -4203,31 +4225,37 @@ break
 }
 }
 }
-WRITEC_f.prototype.define = function WRITEC_f() {
-in1=1;
-nin=sum(in1);
-frmt="c  ";
-fname="foo";
-swap=0;
-lunit=0;
-N=2;
+}
+/* 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("writec",2);
+model.sim=list("cmscope",4);
 model.in1=in1;
+model.in2=[1,1];
+model.intyp=[1,1];
 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.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=[sci2exp(in1),fname,frmt,string(N),string(swap)];
+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([4,2],model,exprs,gr_i);
-}
-WRITEC_f.prototype.details = function WRITEC_f() {
+x=standard_define([2,2],model,exprs,gr_i);
 }
+CMSCOPE.prototype.details = function CMSCOPE() {
 }
-/* autogenerated from "macros/Sinks/CMSCOPE.sci" */
-function CMSCOPE() {
 CMSCOPE.prototype.get = function CMSCOPE() {
 }
 CMSCOPE.prototype.set = function CMSCOPE() {
@@ -4323,37 +4351,32 @@ 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());
+}
+/* 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("cmscope",4);
-model.in1=in1;
-model.in2=[1,1];
-model.intyp=[1,1];
+model.sim=list("cmatview",4);
+model.in1=-1;
+model.in2=-2;
+model.intyp=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.ipar=[cmin,cmax,size_c];
+model.rpar=[alpha_c,beta_c,colormap.slice()];
 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()];
+exprs=[string("jetcolormap(25)"),string(cmin),string(cmax)];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 }
-CMSCOPE.prototype.details = function CMSCOPE() {
-}
+CMATVIEW.prototype.details = function CMATVIEW() {
 }
-/* autogenerated from "macros/Sinks/CMATVIEW.sci" */
-function CMATVIEW() {
 CMATVIEW.prototype.get = function CMATVIEW() {
 }
 CMATVIEW.prototype.set = function CMATVIEW() {
@@ -4390,32 +4413,29 @@ break
 }
 }
 }
-CMATVIEW.prototype.define = function CMATVIEW() {
-cmin=0;
-cmax=100;
-size_c=25;
-colormap=jetcolormap(size_c);
-alpha_c=0.24;
-beta_c=1;
+}
+/* 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("cmatview",4);
-model.in1=-1;
-model.in2=-2;
-model.intyp=1;
+model.sim=list("cevscpe",4);
 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)];
+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);
 }
-CMATVIEW.prototype.details = function CMATVIEW() {
-}
+CEVENTSCOPE.prototype.details = function CEVENTSCOPE() {
 }
-/* autogenerated from "macros/Sinks/CEVENTSCOPE.sci" */
-function CEVENTSCOPE() {
 CEVENTSCOPE.prototype.get = function CEVENTSCOPE() {
 }
 CEVENTSCOPE.prototype.set = function CEVENTSCOPE() {
@@ -4479,34 +4499,9 @@ 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() {
-}
 }
 /* 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();
@@ -4521,9 +4516,38 @@ 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;
+}
 }
 /* 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() {
@@ -4577,33 +4601,33 @@ break
 }
 }
 }
-AFFICH_m.prototype.define = function AFFICH_m() {
-font=1;
-fontsize=1;
-colr=1;
-nt=5;
-nd=1;
-in1=[1,1];
+}
+/* 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("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.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=[true,false];
-model.label="";
-exprs=[sci2exp([model.in1,model.in2]),string(font),string(fontsize),string(colr),string(nt),string(nd),string(0)];
+model.dep_ut=[false,false];
 gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-AFFICH_m.prototype.details = function AFFICH_m() {
+exprs=[string(nz),string(varnam),string(herit)];
+x=standard_define([4,2],model,exprs,gr_i);
 }
+TOWS_c.prototype.details = function TOWS_c() {
 }
-/* autogenerated from "macros/Sinks/TOWS_c.sci" */
-function TOWS_c() {
 TOWS_c.prototype.get = function TOWS_c() {
 }
 TOWS_c.prototype.set = function TOWS_c() {
@@ -4642,33 +4666,23 @@ break
 }
 }
 }
-TOWS_c.prototype.define = function TOWS_c() {
-nu=-1;
-nz=128;
-varnam="A";
-herit=0;
+}
+/* autogenerated from "macros/Sinks/CLKOUT_f.sci" */
+function CLKOUT_f() {
+CLKOUT_f.prototype.define = function CLKOUT_f() {
+prt=1;
 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.sim="output";
+model.evtin=1;
+model.ipar=prt;
 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() {
+exprs=string(prt);
+x=standard_define([1,1],model,exprs," ");
 }
+CLKOUT_f.prototype.details = function CLKOUT_f() {
 }
-/* autogenerated from "macros/Sinks/CLKOUT_f.sci" */
-function CLKOUT_f() {
 CLKOUT_f.prototype.get = function CLKOUT_f() {
 }
 CLKOUT_f.prototype.set = function CLKOUT_f() {
@@ -4696,23 +4710,26 @@ break
 }
 }
 }
-CLKOUT_f.prototype.define = function CLKOUT_f() {
+}
+/* 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.evtin=1;
+model.in1=-1;
+model.in2=-2;
+model.intyp=-1;
 model.ipar=prt;
-model.blocktype="d";
-model.firing=[];
+model.blocktype="c";
 model.dep_ut=[false,false];
 exprs=string(prt);
-x=standard_define([1,1],model,exprs," ");
-}
-CLKOUT_f.prototype.details = function CLKOUT_f() {
+gr_i=[];
+x=standard_define([1,1],model,exprs,gr_i);
 }
+OUT_f.prototype.details = function OUT_f() {
 }
-/* autogenerated from "macros/Sinks/OUT_f.sci" */
-function OUT_f() {
 OUT_f.prototype.get = function OUT_f() {
 }
 OUT_f.prototype.set = function OUT_f() {
@@ -4740,26 +4757,27 @@ break
 }
 }
 }
-OUT_f.prototype.define = function OUT_f() {
-n=-1;
-prt=1;
+}
+/* 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="output";
-model.in1=-1;
-model.in2=-2;
-model.intyp=-1;
-model.ipar=prt;
+model.sim=list("switchn",2);
+model.in1=in1;
+model.out=-1;
+model.ipar=i0;
 model.blocktype="c";
-model.dep_ut=[false,false];
-exprs=string(prt);
+model.firing=[];
+model.dep_ut=[true,true];
+exprs=[string(nin),string(i0+1)];
 gr_i=[];
-x=standard_define([1,1],model,exprs,gr_i);
-}
-OUT_f.prototype.details = function OUT_f() {
+x=standard_define([2,2],model,exprs,gr_i);
 }
+SWITCH_f.prototype.details = function SWITCH_f() {
 }
-/* autogenerated from "macros/Branching/SWITCH_f.sci" */
-function SWITCH_f() {
 SWITCH_f.prototype.get = function SWITCH_f() {
 }
 SWITCH_f.prototype.set = function SWITCH_f() {
@@ -4787,27 +4805,29 @@ break
 }
 }
 }
-SWITCH_f.prototype.define = function SWITCH_f() {
-i0=0;
-in1=[-1,-1];
-nin=2;
+}
+/* autogenerated from "macros/Branching/FROM.sci" */
+function FROM() {
+FROM.prototype.define = function FROM() {
 model=scicos_model();
-model.sim=list("switchn",2);
-model.in1=in1;
+model.sim="from";
+model.in1=[];
+model.in2=[];
+model.intyp=1;
 model.out=-1;
-model.ipar=i0;
+model.out2=-2;
+model.outtyp=-1;
+model.ipar=[];
+model.opar=list("A");
 model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,true];
-exprs=[string(nin),string(i0+1)];
+model.dep_ut=[false,false];
+exprs=["A"];
 gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-SWITCH_f.prototype.details = function SWITCH_f() {
+x=standard_define([2,1],model,exprs,gr_i);
+x.graphics.id="From";
 }
+FROM.prototype.details = function FROM() {
 }
-/* autogenerated from "macros/Branching/FROM.sci" */
-function FROM() {
 FROM.prototype.get = function FROM() {
 }
 FROM.prototype.set = function FROM() {
@@ -4834,29 +4854,35 @@ break
 }
 needcompile=resume(needcompile)
 }
-FROM.prototype.define = function FROM() {
+}
+/* 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="from";
-model.in1=[];
-model.in2=[];
+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.out=-1;
-model.out2=-2;
-model.outtyp=-1;
+model.evtout=[];
+model.state=[];
+model.rpar=[];
 model.ipar=[];
-model.opar=list("A");
+model.firing=[];
+model.evtin=ones(nout,1);
+model.dstate=z0;
 model.blocktype="c";
-model.dep_ut=[false,false];
-exprs=["A"];
+model.dep_ut=[true,false];
+exprs=[sci2exp(1),sci2exp(nout),sci2exp(z0)];
 gr_i=[];
-x=standard_define([2,1],model,exprs,gr_i);
-x.graphics.id="From";
-}
-FROM.prototype.details = function FROM() {
+x=standard_define([3,2],model,exprs,gr_i);
 }
+ISELECT_m.prototype.details = function ISELECT_m() {
 }
-/* autogenerated from "macros/Branching/ISELECT_m.sci" */
-function ISELECT_m() {
 ISELECT_m.prototype.get = function ISELECT_m() {
 }
 ISELECT_m.prototype.set = function ISELECT_m() {
@@ -4892,35 +4918,27 @@ break
 }
 }
 }
-ISELECT_m.prototype.define = function ISELECT_m() {
-z0=1;
-nout=2;
+}
+/* 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_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.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=[sci2exp(1),sci2exp(nout),sci2exp(z0)];
+exprs=[string(nin),string(z0+1)];
 gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-ISELECT_m.prototype.details = function ISELECT_m() {
+x=standard_define([2,2],model,exprs,gr_i);
 }
+SELECT_f.prototype.details = function SELECT_f() {
 }
-/* autogenerated from "macros/Branching/SELECT_f.sci" */
-function SELECT_f() {
 SELECT_f.prototype.get = function SELECT_f() {
 }
 SELECT_f.prototype.set = function SELECT_f() {
@@ -4947,27 +4965,32 @@ break
 }
 }
 }
-SELECT_f.prototype.define = function SELECT_f() {
-z0=0;
-in1=[-1,-1];
-nin=2;
+}
+/* autogenerated from "macros/Branching/GOTOMO.sci" */
+function GOTOMO() {
+GOTOMO.prototype.define = function GOTOMO() {
 model=scicos_model();
-model.sim=list("selector",2);
-model.in1=in1;
-model.out=-1;
-model.evtin=ones(in1);
-model.dstate=z0;
+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=[true,false];
-exprs=[string(nin),string(z0+1)];
+model.dep_ut=[false,false];
+mo=modelica();
+mo.model="gotomo";
+mo.inputs="p";
+exprs=["A",sci2exp(1)];
 gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-SELECT_f.prototype.details = function SELECT_f() {
+x=standard_define([2,1],model,exprs,gr_i);
+x.graphics.in_implicit=["I"];
 }
+GOTOMO.prototype.details = function GOTOMO() {
 }
-/* autogenerated from "macros/Branching/GOTOMO.sci" */
-function GOTOMO() {
 GOTOMO.prototype.get = function GOTOMO() {
 }
 GOTOMO.prototype.set = function GOTOMO() {
@@ -5001,32 +5024,25 @@ break
 }
 needcompile=resume(needcompile)
 }
-GOTOMO.prototype.define = function GOTOMO() {
+}
+/* autogenerated from "macros/Branching/DEMUX_f.sci" */
+function DEMUX_f() {
+DEMUX_f.prototype.define = function DEMUX_f() {
+out=2;
 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.sim=list("demux",1);
+model.in1=0;
+model.out=-transpose([1:out]);
+model.ipar=out;
 model.blocktype="c";
-model.dep_ut=[false,false];
-mo=modelica();
-mo.model="gotomo";
-mo.inputs="p";
-exprs=["A",sci2exp(1)];
+model.firing=[];
+model.dep_ut=[true,false];
+exprs=string(out);
 gr_i=[];
-x=standard_define([2,1],model,exprs,gr_i);
-x.graphics.in_implicit=["I"];
-}
-GOTOMO.prototype.details = function GOTOMO() {
+x=standard_define([.5,2],model,exprs,gr_i);
 }
+DEMUX_f.prototype.details = function DEMUX_f() {
 }
-/* autogenerated from "macros/Branching/DEMUX_f.sci" */
-function DEMUX_f() {
 DEMUX_f.prototype.get = function DEMUX_f() {
 }
 DEMUX_f.prototype.set = function DEMUX_f() {
@@ -5071,25 +5087,33 @@ break
 }
 }
 }
-DEMUX_f.prototype.define = function DEMUX_f() {
-out=2;
+}
+/* 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("demux",1);
-model.in1=0;
-model.out=-transpose([1:out]);
-model.ipar=out;
+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.firing=[];
 model.dep_ut=[true,false];
-exprs=string(out);
+exprs=[sci2exp(1),string(ipar),string(rpar),string(nzz)];
 gr_i=[];
-x=standard_define([.5,2],model,exprs,gr_i);
-}
-DEMUX_f.prototype.details = function DEMUX_f() {
+x=standard_define([2,2],model,exprs,gr_i);
 }
+SWITCH2_m.prototype.details = function SWITCH2_m() {
 }
-/* autogenerated from "macros/Branching/SWITCH2_m.sci" */
-function SWITCH2_m() {
 SWITCH2_m.prototype.get = function SWITCH2_m() {
 }
 SWITCH2_m.prototype.set = function SWITCH2_m() {
@@ -5138,33 +5162,24 @@ break
 }
 }
 }
-SWITCH2_m.prototype.define = function SWITCH2_m() {
-ipar=[0];
-nzz=1;
-rpar=0;
+}
+/* autogenerated from "macros/Branching/EXTRACTOR.sci" */
+function EXTRACTOR() {
+EXTRACTOR.prototype.define = function EXTRACTOR() {
+ind=1;
 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.sim=list("extractor",4);
+model.in1=-1;
+model.out=1;
 model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=[sci2exp(1),string(ipar),string(rpar),string(nzz)];
+model.ipar=ind;
+exprs=[sci2exp(ind)];
 gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-SWITCH2_m.prototype.details = function SWITCH2_m() {
+x=standard_define([3,2],model,exprs,gr_i);
 }
+EXTRACTOR.prototype.details = function EXTRACTOR() {
 }
-/* autogenerated from "macros/Branching/EXTRACTOR.sci" */
-function EXTRACTOR() {
 EXTRACTOR.prototype.get = function EXTRACTOR() {
 }
 EXTRACTOR.prototype.set = function EXTRACTOR() {
@@ -5189,24 +5204,24 @@ 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() {
-}
 }
 /* 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() {
@@ -5241,24 +5256,24 @@ 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() {
-}
 }
 /* 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() {
@@ -5303,24 +5318,23 @@ 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() {
-}
 }
 /* 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() {
@@ -5347,23 +5361,29 @@ break
 }
 needcompile=resume(needcompile)
 }
-CLKFROM.prototype.define = function CLKFROM() {
+}
+/* autogenerated from "macros/Branching/GOTO.sci" */
+function GOTO() {
+GOTO.prototype.define = function GOTO() {
 model=scicos_model();
-model.sim="clkfrom";
-model.evtout=1;
+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="d";
-model.firing=-1;
+model.blocktype="c";
 model.dep_ut=[false,false];
-exprs="A";
-x=standard_define([2,1],model,exprs," ");
-x.graphics.id="From";
-}
-CLKFROM.prototype.details = function CLKFROM() {
+exprs=["A",sci2exp(1)];
+gr_i=[];
+x=standard_define([2,1],model,exprs,gr_i);
+x.graphics.id="Goto";
 }
+GOTO.prototype.details = function GOTO() {
 }
-/* autogenerated from "macros/Branching/GOTO.sci" */
-function GOTO() {
 GOTO.prototype.get = function GOTO() {
 }
 GOTO.prototype.set = function GOTO() {
@@ -5397,29 +5417,23 @@ break
 }
 needcompile=resume(needcompile)
 }
-GOTO.prototype.define = function GOTO() {
+}
+/* autogenerated from "macros/Branching/SCALAR2VECTOR.sci" */
+function SCALAR2VECTOR() {
+SCALAR2VECTOR.prototype.define = function SCALAR2VECTOR() {
+nout=-1;
 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.sim=list("scalar2vector",4);
+model.out=nout;
+model.in1=1;
 model.blocktype="c";
-model.dep_ut=[false,false];
-exprs=["A",sci2exp(1)];
+model.dep_ut=[true,false];
+exprs=[string([nout])];
 gr_i=[];
-x=standard_define([2,1],model,exprs,gr_i);
-x.graphics.id="Goto";
-}
-GOTO.prototype.details = function GOTO() {
+x=standard_define([3,2],model,exprs,gr_i);
 }
+SCALAR2VECTOR.prototype.details = function SCALAR2VECTOR() {
 }
-/* autogenerated from "macros/Branching/SCALAR2VECTOR.sci" */
-function SCALAR2VECTOR() {
 SCALAR2VECTOR.prototype.get = function SCALAR2VECTOR() {
 }
 SCALAR2VECTOR.prototype.set = function SCALAR2VECTOR() {
@@ -5448,23 +5462,30 @@ break
 }
 }
 }
-SCALAR2VECTOR.prototype.define = function SCALAR2VECTOR() {
-nout=-1;
+}
+/* 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("scalar2vector",4);
-model.out=nout;
-model.in1=1;
+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([nout])];
+exprs=[string(ipar),string(rpar),string(nzz)];
 gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-SCALAR2VECTOR.prototype.details = function SCALAR2VECTOR() {
+x=standard_define([2,2],model,exprs,gr_i);
 }
+SWITCH2.prototype.details = function SWITCH2() {
 }
-/* autogenerated from "macros/Branching/SWITCH2.sci" */
-function SWITCH2() {
 SWITCH2.prototype.get = function SWITCH2() {
 }
 SWITCH2.prototype.set = function SWITCH2() {
@@ -5499,30 +5520,24 @@ x.model=model;
 break
 }
 }
-SWITCH2.prototype.define = function SWITCH2() {
-in1=[-1,1,-1];
-ipar=[0];
-nzz=1;
-rpar=0;
+}
+/* autogenerated from "macros/Branching/MUX.sci" */
+function MUX() {
+MUX.prototype.define = function MUX() {
+in1=2;
 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.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(ipar),string(rpar),string(nzz)];
+exprs=string(in1);
 gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-SWITCH2.prototype.details = function SWITCH2() {
+x=standard_define([.5,2],model,exprs,gr_i);
 }
+MUX.prototype.details = function MUX() {
 }
-/* autogenerated from "macros/Branching/MUX.sci" */
-function MUX() {
 MUX.prototype.get = function MUX() {
 }
 MUX.prototype.set = function MUX() {
@@ -5567,24 +5582,29 @@ break
 }
 }
 }
-MUX.prototype.define = function MUX() {
-in1=2;
+}
+/* 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("multiplex",4);
-model.in1=-transpose([1:in1]);
-model.out=0;
-model.ipar=in1;
-model.blocktype="c";
+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];
-exprs=string(in1);
+model.nmode=0;
+model.nzcross=0;
 gr_i=[];
-x=standard_define([.5,2],model,exprs,gr_i);
-}
-MUX.prototype.details = function MUX() {
+exprs=[string(out),string(1),string(model.nmode)];
+x=standard_define([4,2],model,exprs,gr_i);
 }
+ESELECT_f.prototype.details = function ESELECT_f() {
 }
-/* autogenerated from "macros/Branching/ESELECT_f.sci" */
-function ESELECT_f() {
 ESELECT_f.prototype.get = function ESELECT_f() {
 }
 ESELECT_f.prototype.set = function ESELECT_f() {
@@ -5629,55 +5649,9 @@ 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() {
-}
 }
 /* autogenerated from "macros/Branching/GotoTagVisibilityMO.sci" */
 function GotoTagVisibilityMO() {
-GotoTagVisibilityMO.prototype.get = function GotoTagVisibilityMO() {
-}
-GotoTagVisibilityMO.prototype.set = function GotoTagVisibilityMO() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,tag,exprs]=scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),exprs);
-if (!ok) {
-break
-}
-if (ok) {
-if (model.opar!=list(tag)) {
-needcompile=4;
-y=needcompile;
-}
-graphics.exprs=exprs;
-model.opar=list(tag);
-x.graphics=graphics;
-x.model=model;
-break
-}
-}
-needcompile=resume(needcompile)
-}
 GotoTagVisibilityMO.prototype.define = function GotoTagVisibilityMO() {
 model=scicos_model();
 model.sim="gototagvisibilitymo";
@@ -5698,35 +5672,35 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 GotoTagVisibilityMO.prototype.details = function GotoTagVisibilityMO() {
 }
+GotoTagVisibilityMO.prototype.get = function GotoTagVisibilityMO() {
 }
-/* autogenerated from "macros/Branching/ISELECT_f.sci" */
-function ISELECT_f() {
-ISELECT_f.prototype.get = function ISELECT_f() {
-}
-ISELECT_f.prototype.set = function ISELECT_f() {
+GotoTagVisibilityMO.prototype.set = function GotoTagVisibilityMO() {
 x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,nout,z0,exprs]=scicos_getvalue("Set parameters",["number of outputs","initial connected output"],list("vec",1,"vec",1),exprs);
+[ok,tag,exprs]=scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),exprs);
 if (!ok) {
 break
 }
-if (z0>nout||z0<=0) {
-message("initial connected input is not a valid input port number");
-} else {
-[model,graphics,ok]=check_io(model,graphics,-1,-ones(nout,1),ones(nout,1),[]);
 if (ok) {
+if (model.opar!=list(tag)) {
+needcompile=4;
+y=needcompile;
+}
 graphics.exprs=exprs;
-model.dstate=z0-1;
+model.opar=list(tag);
 x.graphics=graphics;
 x.model=model;
 break
 }
 }
+needcompile=resume(needcompile)
 }
 }
+/* autogenerated from "macros/Branching/ISELECT_f.sci" */
+function ISELECT_f() {
 ISELECT_f.prototype.define = function ISELECT_f() {
 z0=0;
 out=[-1,-1];
@@ -5745,36 +5719,25 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 ISELECT_f.prototype.details = function ISELECT_f() {
 }
+ISELECT_f.prototype.get = function ISELECT_f() {
 }
-/* autogenerated from "macros/Branching/SELECT_m.sci" */
-function SELECT_m() {
-SELECT_m.prototype.get = function SELECT_m() {
-}
-SELECT_m.prototype.set = function SELECT_m() {
+ISELECT_f.prototype.set = function ISELECT_f() {
 x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,typ,nin,z0,exprs]=scicos_getvalue("Set parameters",["Datatype(1= real double  2=Complex 3=int32 ..)","number of inputs","initial connected input"],list("vec",1,"vec",1,"vec",1),exprs);
+[ok,nout,z0,exprs]=scicos_getvalue("Set parameters",["number of outputs","initial connected output"],list("vec",1,"vec",1),exprs);
 if (!ok) {
 break
 }
-if (z0>nin||z0<=0) {
+if (z0>nout||z0<=0) {
 message("initial connected input is not a valid input port number");
-} else if (((typ<1)||(typ>8))&&(typ!=-1)) {
-message("Datatype is not supported");
-ok=false;
 } else {
-it=typ*ones(1,nin);
-ot=typ;
-if (ok) {
-in1=[-ones(nin,1),-2*ones(nin,1)];
-out=[-1,-2];
-[model,graphics,ok]=set_io(model,graphics,list(in1,it),list(out,ot),ones(nin,1),[]);
+[model,graphics,ok]=check_io(model,graphics,-1,-ones(nout,1),ones(nout,1),[]);
 if (ok) {
 graphics.exprs=exprs;
-model.dstate=z0;
+model.dstate=z0-1;
 x.graphics=graphics;
 x.model=model;
 break
@@ -5783,6 +5746,8 @@ break
 }
 }
 }
+/* autogenerated from "macros/Branching/SELECT_m.sci" */
+function SELECT_m() {
 SELECT_m.prototype.define = function SELECT_m() {
 z0=1;
 nin=2;
@@ -5809,35 +5774,44 @@ x=standard_define([3,2],model,exprs,gr_i);
 }
 SELECT_m.prototype.details = function SELECT_m() {
 }
+SELECT_m.prototype.get = function SELECT_m() {
 }
-/* autogenerated from "macros/Branching/CLKGotoTagVisibility.sci" */
-function CLKGotoTagVisibility() {
-CLKGotoTagVisibility.prototype.get = function CLKGotoTagVisibility() {
-}
-CLKGotoTagVisibility.prototype.set = function CLKGotoTagVisibility() {
+SELECT_m.prototype.set = function SELECT_m() {
 x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,tag,exprs]=scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),exprs);
+[ok,typ,nin,z0,exprs]=scicos_getvalue("Set parameters",["Datatype(1= real double  2=Complex 3=int32 ..)","number of inputs","initial connected input"],list("vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break
 }
+if (z0>nin||z0<=0) {
+message("initial connected input is not a valid input port number");
+} else if (((typ<1)||(typ>8))&&(typ!=-1)) {
+message("Datatype is not supported");
+ok=false;
+} else {
+it=typ*ones(1,nin);
+ot=typ;
+if (ok) {
+in1=[-ones(nin,1),-2*ones(nin,1)];
+out=[-1,-2];
+[model,graphics,ok]=set_io(model,graphics,list(in1,it),list(out,ot),ones(nin,1),[]);
 if (ok) {
-if (model.opar!=list(tag)) {
-needcompile=4;
-y=needcompile;
-}
 graphics.exprs=exprs;
-model.opar=list(tag);
+model.dstate=z0;
 x.graphics=graphics;
 x.model=model;
 break
 }
 }
-needcompile=resume(needcompile)
 }
+}
+}
+}
+/* autogenerated from "macros/Branching/CLKGotoTagVisibility.sci" */
+function CLKGotoTagVisibility() {
 CLKGotoTagVisibility.prototype.define = function CLKGotoTagVisibility() {
 model=scicos_model();
 model.sim="clkgototagvisibility";
@@ -5858,52 +5832,35 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 CLKGotoTagVisibility.prototype.details = function CLKGotoTagVisibility() {
 }
+CLKGotoTagVisibility.prototype.get = function CLKGotoTagVisibility() {
 }
-/* autogenerated from "macros/Branching/M_SWITCH.sci" */
-function M_SWITCH() {
-M_SWITCH.prototype.get = function M_SWITCH() {
-}
-M_SWITCH.prototype.set = function M_SWITCH() {
+CLKGotoTagVisibility.prototype.set = function CLKGotoTagVisibility() {
 x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,nin,base,rule,exprs]=scicos_getvalue("Set parameters",["number of inputs","zero base indexing (0), otherwise 1","rounding rule: int (0), round (1), ceil (2), floor (3)"],list("vec",1,"vec",1,"vec",1),exprs);
+[ok,tag,exprs]=scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),exprs);
 if (!ok) {
 break
 }
-nin=int(nin);
-base=int(base);
-if (nin<1) {
-message("Number of inputs must be >=1 ");
-} else if (!((base==1)||(base==0))) {
-message("base indexing must be 1 or 0");
-} else if (!((rule==1)||(rule==0)||(rule==2)||(rule==3))) {
-message("incorrect rounding rule");
-} else {
-if (nin==1) {
-in1=[1,1,-1,1];
-out=[1,1];
-} else {
-in1=[1,-ones(nin,1)];
-in2=[1,-2*ones(nin,1)];
-in1=[in1,in2];
-out=[-1,-2];
-}
-it=[-1,-2*ones(nin,1)];
-ot=-2;
-[model,graphics,ok]=set_io(model,graphics,list(in1,it),list(out,ot),[],[]);
 if (ok) {
+if (model.opar!=list(tag)) {
+needcompile=4;
+y=needcompile;
+}
 graphics.exprs=exprs;
-model.ipar=[base,rule];
+model.opar=list(tag);
 x.graphics=graphics;
 x.model=model;
 break
 }
 }
+needcompile=resume(needcompile)
 }
 }
+/* autogenerated from "macros/Branching/M_SWITCH.sci" */
+function M_SWITCH() {
 M_SWITCH.prototype.define = function M_SWITCH() {
 in1=[1,-1,-1];
 ipar=[1,3];
@@ -5921,35 +5878,52 @@ x=standard_define([2.5,2],model,exprs,gr_i);
 }
 M_SWITCH.prototype.details = function M_SWITCH() {
 }
+M_SWITCH.prototype.get = function M_SWITCH() {
 }
-/* autogenerated from "macros/Branching/FROMMO.sci" */
-function FROMMO() {
-FROMMO.prototype.get = function FROMMO() {
-}
-FROMMO.prototype.set = function FROMMO() {
+M_SWITCH.prototype.set = function M_SWITCH() {
 x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,tag,exprs]=scicos_getvalue("Set parameters",["Tag"],list("str",-1),exprs);
+[ok,nin,base,rule,exprs]=scicos_getvalue("Set parameters",["number of inputs","zero base indexing (0), otherwise 1","rounding rule: int (0), round (1), ceil (2), floor (3)"],list("vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break
 }
-if (ok) {
-if (model.opar!=list(tag)) {
-needcompile=4;
-y=needcompile;
+nin=int(nin);
+base=int(base);
+if (nin<1) {
+message("Number of inputs must be >=1 ");
+} else if (!((base==1)||(base==0))) {
+message("base indexing must be 1 or 0");
+} else if (!((rule==1)||(rule==0)||(rule==2)||(rule==3))) {
+message("incorrect rounding rule");
+} else {
+if (nin==1) {
+in1=[1,1,-1,1];
+out=[1,1];
+} else {
+in1=[1,-ones(nin,1)];
+in2=[1,-2*ones(nin,1)];
+in1=[in1,in2];
+out=[-1,-2];
 }
+it=[-1,-2*ones(nin,1)];
+ot=-2;
+[model,graphics,ok]=set_io(model,graphics,list(in1,it),list(out,ot),[],[]);
+if (ok) {
 graphics.exprs=exprs;
-model.opar=list(tag);
-x.model=model;
+model.ipar=[base,rule];
 x.graphics=graphics;
+x.model=model;
 break
 }
 }
-needcompile=resume(needcompile)
 }
+}
+}
+/* autogenerated from "macros/Branching/FROMMO.sci" */
+function FROMMO() {
 FROMMO.prototype.define = function FROMMO() {
 model=scicos_model();
 model.sim="frommo";
@@ -5973,18 +5947,15 @@ x.graphics.out_implicit=["I"];
 }
 FROMMO.prototype.details = function FROMMO() {
 }
+FROMMO.prototype.get = function FROMMO() {
 }
-/* autogenerated from "macros/Branching/GotoTagVisibility.sci" */
-function GotoTagVisibility() {
-GotoTagVisibility.prototype.get = function GotoTagVisibility() {
-}
-GotoTagVisibility.prototype.set = function GotoTagVisibility() {
+FROMMO.prototype.set = function FROMMO() {
 x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,tag,exprs]=scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),exprs);
+[ok,tag,exprs]=scicos_getvalue("Set parameters",["Tag"],list("str",-1),exprs);
 if (!ok) {
 break
 }
@@ -5995,13 +5966,16 @@ y=needcompile;
 }
 graphics.exprs=exprs;
 model.opar=list(tag);
-x.graphics=graphics;
 x.model=model;
+x.graphics=graphics;
 break
 }
 }
 needcompile=resume(needcompile)
 }
+}
+/* autogenerated from "macros/Branching/GotoTagVisibility.sci" */
+function GotoTagVisibility() {
 GotoTagVisibility.prototype.define = function GotoTagVisibility() {
 model=scicos_model();
 model.sim="gototagvisibility";
@@ -6022,9 +5996,51 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 GotoTagVisibility.prototype.details = function GotoTagVisibility() {
 }
+GotoTagVisibility.prototype.get = function GotoTagVisibility() {
+}
+GotoTagVisibility.prototype.set = function GotoTagVisibility() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,tag,exprs]=scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),exprs);
+if (!ok) {
+break
+}
+if (ok) {
+if (model.opar!=list(tag)) {
+needcompile=4;
+y=needcompile;
+}
+graphics.exprs=exprs;
+model.opar=list(tag);
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
+needcompile=resume(needcompile)
+}
 }
 /* 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() {
@@ -6069,25 +6085,28 @@ break
 }
 }
 }
-DEMUX.prototype.define = function DEMUX() {
-out=2;
+}
+/* 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("multiplex",4);
-model.in1=0;
-model.out=-transpose([1:out]);
-model.ipar=out;
+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,false];
-exprs=string(out);
+model.dep_ut=[true,true];
+exprs=[string(nin),string(i0+1)];
 gr_i=[];
-x=standard_define([.5,2],model,exprs,gr_i);
-}
-DEMUX.prototype.details = function DEMUX() {
+x=standard_define([2,2],model,exprs,gr_i);
 }
+RELAY_f.prototype.details = function RELAY_f() {
 }
-/* autogenerated from "macros/Branching/RELAY_f.sci" */
-function RELAY_f() {
 RELAY_f.prototype.get = function RELAY_f() {
 }
 RELAY_f.prototype.set = function RELAY_f() {
@@ -6115,28 +6134,24 @@ break
 }
 }
 }
-RELAY_f.prototype.define = function RELAY_f() {
-i0=0;
+}
+/* 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=list("relay",2);
+model.sim="junk";
 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)];
+model.dep_ut=[true,false];
+exprs=[string(nin)];
 gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-RELAY_f.prototype.details = function RELAY_f() {
+x=standard_define([.2,2],model,exprs,gr_i);
 }
+NRMSOM_f.prototype.details = function NRMSOM_f() {
 }
-/* autogenerated from "macros/Branching/NRMSOM_f.sci" */
-function NRMSOM_f() {
 NRMSOM_f.prototype.get = function NRMSOM_f() {
 }
 NRMSOM_f.prototype.set = function NRMSOM_f() {
@@ -6158,24 +6173,29 @@ break
 }
 }
 }
-NRMSOM_f.prototype.define = function NRMSOM_f() {
-in1=[-1,-1];
-nin=2;
+}
+/* autogenerated from "macros/Sources/INIMPL_f.sci" */
+function INIMPL_f() {
+INIMPL_f.prototype.define = function INIMPL_f() {
 model=scicos_model();
-model.sim="junk";
-model.in1=in1;
-model.out=-1;
+model.sim="inimpl";
+model.out=[-1];
+model.out2=[1];
+model.ipar=[1];
+model.dep_ut=[false,false];
 model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[string(nin)];
+mo=modelica();
+mo.model="PORT";
+mo.outputs="n";
+model.equations=mo;
+prt=1;
+exprs="1";
 gr_i=[];
-x=standard_define([.2,2],model,exprs,gr_i);
-}
-NRMSOM_f.prototype.details = function NRMSOM_f() {
+x=standard_define([1,1],model,exprs,gr_i);
+x.graphics.out_implicit=["I"];
 }
+INIMPL_f.prototype.details = function INIMPL_f() {
 }
-/* autogenerated from "macros/Sources/INIMPL_f.sci" */
-function INIMPL_f() {
 INIMPL_f.prototype.get = function INIMPL_f() {
 }
 INIMPL_f.prototype.set = function INIMPL_f() {
@@ -6207,29 +6227,39 @@ break
 }
 }
 }
-INIMPL_f.prototype.define = function INIMPL_f() {
+}
+/* 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="inimpl";
-model.out=[-1];
-model.out2=[1];
-model.ipar=[1];
+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];
-model.blocktype="c";
-mo=modelica();
-mo.model="PORT";
-mo.outputs="n";
-model.equations=mo;
-prt=1;
-exprs="1";
+exprs=[sci2exp(1),string(flag),sci2exp([a]),sci2exp([b]),sci2exp([model.dstate(1),int(rand()*(10^7-1))])];
 gr_i=[];
-x=standard_define([1,1],model,exprs,gr_i);
-x.graphics.out_implicit=["I"];
-}
-INIMPL_f.prototype.details = function INIMPL_f() {
+x=standard_define([3,2],model,exprs,gr_i);
 }
+RAND_m.prototype.details = function RAND_m() {
 }
-/* autogenerated from "macros/Sources/RAND_m.sci" */
-function RAND_m() {
 RAND_m.prototype.get = function RAND_m() {
 }
 RAND_m.prototype.set = function RAND_m() {
@@ -6277,39 +6307,26 @@ break
 }
 }
 }
-RAND_m.prototype.define = function RAND_m() {
-a=0;
-b=1;
-dt=0;
-flag=0;
-function_name="rndblk_m";
-funtyp=4;
+}
+/* autogenerated from "macros/Sources/GENSQR_f.sci" */
+function GENSQR_f() {
+GENSQR_f.prototype.define = function GENSQR_f() {
+Amplitude=1;
 model=scicos_model();
-model.sim=list(function_name,funtyp);
-model.in1=[];
-model.in2=[];
-model.intyp=[];
+model.sim="gensqr";
 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.dstate=Amplitude;
 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))])];
+exprs=string(Amplitude);
 gr_i=[];
 x=standard_define([3,2],model,exprs,gr_i);
 }
-RAND_m.prototype.details = function RAND_m() {
-}
+GENSQR_f.prototype.details = function GENSQR_f() {
 }
-/* autogenerated from "macros/Sources/GENSQR_f.sci" */
-function GENSQR_f() {
 GENSQR_f.prototype.get = function GENSQR_f() {
 }
 GENSQR_f.prototype.set = function GENSQR_f() {
@@ -6334,26 +6351,25 @@ x.model=model;
 break
 }
 }
-GENSQR_f.prototype.define = function GENSQR_f() {
-Amplitude=1;
+}
+/* autogenerated from "macros/Sources/IN_f.sci" */
+function IN_f() {
+IN_f.prototype.define = function IN_f() {
+prt=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.sim="input";
+model.out=-1;
+model.out2=-2;
+model.outtyp=-1;
+model.ipar=prt;
+model.blocktype="c";
 model.dep_ut=[false,false];
-exprs=string(Amplitude);
+exprs=sci2exp(prt);
 gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-GENSQR_f.prototype.details = function GENSQR_f() {
+x=standard_define([1,1],model,exprs,gr_i);
 }
+IN_f.prototype.details = function IN_f() {
 }
-/* autogenerated from "macros/Sources/IN_f.sci" */
-function IN_f() {
 IN_f.prototype.get = function IN_f() {
 }
 IN_f.prototype.set = function IN_f() {
@@ -6396,25 +6412,26 @@ break
 }
 }
 }
-IN_f.prototype.define = function IN_f() {
-prt=1;
+}
+/* autogenerated from "macros/Sources/TKSCALE.sci" */
+function TKSCALE() {
+TKSCALE.prototype.define = function TKSCALE() {
+a=-10;
+b=10;
+f=1;
 model=scicos_model();
-model.sim="input";
-model.out=-1;
-model.out2=-2;
-model.outtyp=-1;
-model.ipar=prt;
-model.blocktype="c";
+model.sim=list("tkscaleblk",5);
+model.out=1;
+model.evtin=1;
+model.rpar=[a,b,f];
+model.blocktype="d";
 model.dep_ut=[false,false];
-exprs=sci2exp(prt);
+exprs=[sci2exp(a),sci2exp(b),sci2exp(f)];
 gr_i=[];
-x=standard_define([1,1],model,exprs,gr_i);
-}
-IN_f.prototype.details = function IN_f() {
+x=standard_define([3,2],model,exprs,gr_i);
 }
+TKSCALE.prototype.details = function TKSCALE() {
 }
-/* autogenerated from "macros/Sources/TKSCALE.sci" */
-function TKSCALE() {
 TKSCALE.prototype.get = function TKSCALE() {
 }
 TKSCALE.prototype.set = function TKSCALE() {
@@ -6430,26 +6447,28 @@ x.graphics=graphics;
 x.model=model;
 }
 }
-TKSCALE.prototype.define = function TKSCALE() {
-a=-10;
-b=10;
-f=1;
+}
+/* autogenerated from "macros/Sources/STEP.sci" */
+function STEP() {
+STEP.prototype.define = function STEP() {
+rpar=[0,1];
 model=scicos_model();
-model.sim=list("tkscaleblk",5);
-model.out=1;
+model.sim=list("step_func",4);
 model.evtin=1;
-model.rpar=[a,b,f];
-model.blocktype="d";
+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=[sci2exp(a),sci2exp(b),sci2exp(f)];
+exprs=[string(1),string(rpar)];
 gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-TKSCALE.prototype.details = function TKSCALE() {
+x=standard_define([2,2],model,exprs,gr_i);
 }
+STEP.prototype.details = function STEP() {
 }
-/* autogenerated from "macros/Sources/STEP.sci" */
-function STEP() {
 STEP.prototype.get = function STEP() {
 }
 STEP.prototype.set = function STEP() {
@@ -6494,28 +6513,29 @@ break
 }
 }
 }
-STEP.prototype.define = function STEP() {
-rpar=[0,1];
+}
+/* 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=list("step_func",4);
-model.evtin=1;
-model.evtout=1;
+model.sim="intplt";
+model.in1=[];
 model.out=1;
-model.out2=1;
-model.outtyp=1;
-model.firing=1;
-model.rpar=rpar;
+model.rpar=[xx,yy,rect.slice()];
+model.ipar=[size(xx,1),axisdata.slice()];
 model.blocktype="c";
-model.dep_ut=[false,false];
-exprs=[string(1),string(rpar)];
+model.dep_ut=[false,true];
 gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-STEP.prototype.details = function STEP() {
+x=standard_define([2,2],model,[],gr_i);
 }
+CURV_f.prototype.details = function CURV_f() {
 }
-/* autogenerated from "macros/Sources/CURV_f.sci" */
-function CURV_f() {
 CURV_f.prototype.get = function CURV_f() {
 }
 CURV_f.prototype.set = function CURV_f() {
@@ -6556,29 +6576,29 @@ 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()];
+}
+/* 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="intplt";
+model.sim=list("ramp",4);
 model.in1=[];
 model.out=1;
-model.rpar=[xx,yy,rect.slice()];
-model.ipar=[size(xx,1),axisdata.slice()];
+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,[],gr_i);
-}
-CURV_f.prototype.details = function CURV_f() {
+x=standard_define([2,2],model,exprs,gr_i);
 }
+RAMP.prototype.details = function RAMP() {
 }
-/* autogenerated from "macros/Sources/RAMP.sci" */
-function RAMP() {
 RAMP.prototype.get = function RAMP() {
 }
 RAMP.prototype.set = function RAMP() {
@@ -6602,29 +6622,52 @@ 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() {
-}
 }
 /* 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() {
@@ -6672,52 +6715,24 @@ 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() {
-}
 }
 /* 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() {
@@ -6743,29 +6758,9 @@ 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() {
-}
 }
 /* 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();
@@ -6785,9 +6780,33 @@ 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;
+}
 }
 /* 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() {
@@ -6816,28 +6835,31 @@ break
 }
 }
 }
-Counter.prototype.define = function Counter() {
-minim=0;
-maxim=2;
-rule=1;
+}
+/* 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("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)];
+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=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-Counter.prototype.details = function Counter() {
+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() {
 }
-/* autogenerated from "macros/Sources/FROMWS_c.sci" */
-function FROMWS_c() {
 FROMWS_c.prototype.get = function FROMWS_c() {
 }
 FROMWS_c.prototype.set = function FROMWS_c() {
@@ -6880,36 +6902,9 @@ 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() {
-}
 }
 /* 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";
@@ -6924,9 +6919,35 @@ 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;
+}
 }
 /* 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() {
@@ -6960,30 +6981,35 @@ break
 }
 }
 }
-RAND_f.prototype.define = function RAND_f() {
-a=0;
-b=1;
-dt=0;
-out=1;
-flag=0;
+}
+/* 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="rndblk";
-model.out=out;
+model.sim=list("readau",2);
+model.out=nout;
 model.evtin=1;
-model.dstate=[int(rand()*(10^7-1)),0*a.slice()];
-model.rpar=[a.slice(),b.slice()];
-model.ipar=flag;
+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=[string(flag),sci2exp(a.slice()),sci2exp(b.slice()),string(model.dstate(1))];
+exprs=[fname,string(N),string(swap)];
 gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-RAND_f.prototype.details = function RAND_f() {
+x=standard_define([5,2],model,exprs,gr_i);
 }
+READAU_f.prototype.details = function READAU_f() {
 }
-/* autogenerated from "macros/Sources/READAU_f.sci" */
-function READAU_f() {
 READAU_f.prototype.get = function READAU_f() {
 }
 READAU_f.prototype.set = function READAU_f() {
@@ -7038,35 +7064,23 @@ 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,"*");
+}
+/* autogenerated from "macros/Sources/CLKIN_f.sci" */
+function CLKIN_f() {
+CLKIN_f.prototype.define = function CLKIN_f() {
+prt=1;
 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.sim="input";
+model.evtout=1;
+model.ipar=prt;
 model.blocktype="d";
+model.firing=-1;
 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() {
+exprs=string(prt);
+x=standard_define([1,1],model,exprs," ");
 }
+CLKIN_f.prototype.details = function CLKIN_f() {
 }
-/* autogenerated from "macros/Sources/CLKIN_f.sci" */
-function CLKIN_f() {
 CLKIN_f.prototype.get = function CLKIN_f() {
 }
 CLKIN_f.prototype.set = function CLKIN_f() {
@@ -7094,28 +7108,9 @@ 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() {
-}
 }
 /* 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";
@@ -7127,9 +7122,27 @@ 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;
+}
 }
 /* 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() {
@@ -7166,22 +7179,39 @@ break
 }
 needcompile=resume(needcompile)
 }
-SampleCLK.prototype.define = function SampleCLK() {
+}
+/* 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="sampleclk";
-model.evtout=1;
-model.rpar=[1,0];
+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(1),sci2exp(0)];
-x=standard_define([2,2],model,exprs," ");
-}
-SampleCLK.prototype.details = function SampleCLK() {
+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() {
 }
-/* autogenerated from "macros/Sources/READC_f.sci" */
-function READC_f() {
 READC_f.prototype.get = function READC_f() {
 }
 READC_f.prototype.set = function READC_f() {
@@ -7266,39 +7296,52 @@ 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() {
-}
 }
 /* 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() {
@@ -7346,52 +7389,24 @@ 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() {
-}
 }
 /* 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() {
@@ -7420,24 +7435,26 @@ break
 }
 }
 }
-CONST.prototype.define = function CONST() {
-C=1;
+}
+/* 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("cstblk4",4);
-model.in1=[];
+model.sim=list("modulo_count",4);
+model.evtin=1;
 model.out=1;
-model.rpar=C;
-model.blocktype="d";
+model.dstate=ini_c;
+model.ipar=base;
+model.blocktype="c";
 model.dep_ut=[false,false];
-exprs=strcat(sci2exp(C));
+exprs=[string(ini_c),string(base)];
 gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-CONST.prototype.details = function CONST() {
+x=standard_define([3,2],model,exprs,gr_i);
 }
+Modulo_Count.prototype.details = function Modulo_Count() {
 }
-/* autogenerated from "macros/Sources/Modulo_Count.sci" */
-function Modulo_Count() {
 Modulo_Count.prototype.get = function Modulo_Count() {
 }
 Modulo_Count.prototype.set = function Modulo_Count() {
@@ -7466,26 +7483,27 @@ break
 }
 }
 }
-Modulo_Count.prototype.define = function Modulo_Count() {
-ini_c=0;
-base=3;
+}
+/* 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("modulo_count",4);
-model.evtin=1;
-model.out=1;
-model.dstate=ini_c;
-model.ipar=base;
-model.blocktype="c";
+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=[string(ini_c),string(base)];
+exprs=sci2exp(C);
 gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-Modulo_Count.prototype.details = function Modulo_Count() {
+x=standard_define([2,2],model,exprs,gr_i);
 }
+CONST_m.prototype.details = function CONST_m() {
 }
-/* autogenerated from "macros/Sources/CONST_m.sci" */
-function CONST_m() {
 CONST_m.prototype.get = function CONST_m() {
 }
 CONST_m.prototype.set = function CONST_m() {
@@ -7537,27 +7555,24 @@ break
 }
 }
 }
-CONST_m.prototype.define = function CONST_m() {
-C=[1];
+}
+/* autogenerated from "macros/Sources/CLKINV_f.sci" */
+function CLKINV_f() {
+CLKINV_f.prototype.define = function CLKINV_f() {
+prt=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.sim="input";
+model.evtout=1;
+model.ipar=prt;
 model.blocktype="d";
+model.firing=-1;
 model.dep_ut=[false,false];
-exprs=sci2exp(C);
+exprs=string(prt);
 gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-CONST_m.prototype.details = function CONST_m() {
+x=standard_define([1,1],model,exprs,gr_i);
 }
+CLKINV_f.prototype.details = function CLKINV_f() {
 }
-/* autogenerated from "macros/Sources/CLKINV_f.sci" */
-function CLKINV_f() {
 CLKINV_f.prototype.get = function CLKINV_f() {
 }
 CLKINV_f.prototype.set = function CLKINV_f() {
@@ -7585,24 +7600,21 @@ 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() {
-}
 }
 /* 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() {
@@ -7674,21 +7686,26 @@ 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() {
-}
 }
 /* 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() {
@@ -7717,26 +7734,24 @@ break
 }
 }
 }
-GENSIN_f.prototype.define = function GENSIN_f() {
-rpar=[1,1,0];
+}
+/* autogenerated from "macros/MatrixOp/MATMUL.sci" */
+function MATMUL() {
+MATMUL.prototype.define = function MATMUL() {
 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))];
+model.sim=list("matmul_m",4);
+model.in1=[-1,-2];
+model.in2=[-2,-3];
+model.out=-1;
+model.out2=-3;
+model.dep_ut=[true,false];
+model.ipar=1;
+label=[sci2exp(model.ipar)];
 gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-GENSIN_f.prototype.details = function GENSIN_f() {
+x=standard_define([3,2],model,label,gr_i);
 }
+MATMUL.prototype.details = function MATMUL() {
 }
-/* autogenerated from "macros/MatrixOp/MATMUL.sci" */
-function MATMUL() {
 MATMUL.prototype.get = function MATMUL() {
 }
 MATMUL.prototype.set = function MATMUL() {
@@ -7870,24 +7885,35 @@ break
 }
 }
 }
-MATMUL.prototype.define = function MATMUL() {
+}
+/* autogenerated from "macros/MatrixOp/MATMAGPHI.sci" */
+function MATMAGPHI() {
+MATMAGPHI.prototype.define = function MATMAGPHI() {
 model=scicos_model();
-model.sim=list("matmul_m",4);
-model.in1=[-1,-2];
-model.in2=[-2,-3];
-model.out=-1;
-model.out2=-3;
+function_name="matz_abs";
+funtyp=4;
+model.sim=list(function_name,funtyp);
+model.in1=-1;
+model.in2=-2;
+model.intyp=2;
+model.out=[-1,-1];
+model.out2=[-2,-2];
+model.outtyp=[1,1];
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[];
+model.blocktype="c";
+model.firing=[];
 model.dep_ut=[true,false];
-model.ipar=1;
-label=[sci2exp(model.ipar)];
+label=[sci2exp(1)];
 gr_i=[];
 x=standard_define([3,2],model,label,gr_i);
 }
-MATMUL.prototype.details = function MATMUL() {
-}
+MATMAGPHI.prototype.details = function MATMAGPHI() {
 }
-/* autogenerated from "macros/MatrixOp/MATMAGPHI.sci" */
-function MATMAGPHI() {
 MATMAGPHI.prototype.get = function MATMAGPHI() {
 }
 MATMAGPHI.prototype.set = function MATMAGPHI() {
@@ -7934,35 +7960,25 @@ break
 }
 }
 }
-MATMAGPHI.prototype.define = function MATMAGPHI() {
+}
+/* autogenerated from "macros/MatrixOp/SQRT.sci" */
+function SQRT() {
+SQRT.prototype.define = function SQRT() {
 model=scicos_model();
-function_name="matz_abs";
-funtyp=4;
-model.sim=list(function_name,funtyp);
+model.sim=list("mat_sqrt",4);
 model.in1=-1;
 model.in2=-2;
-model.intyp=2;
-model.out=[-1,-1];
-model.out2=[-2,-2];
-model.outtyp=[1,1];
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[];
-model.blocktype="c";
-model.firing=[];
+model.intyp=1;
+model.outtyp=1;
+model.out=-1;
+model.out2=-2;
 model.dep_ut=[true,false];
 label=[sci2exp(1)];
 gr_i=[];
-x=standard_define([3,2],model,label,gr_i);
-}
-MATMAGPHI.prototype.details = function MATMAGPHI() {
+x=standard_define([2,2],model,label,gr_i);
 }
+SQRT.prototype.details = function SQRT() {
 }
-/* autogenerated from "macros/MatrixOp/SQRT.sci" */
-function SQRT() {
 SQRT.prototype.get = function SQRT() {
 }
 SQRT.prototype.set = function SQRT() {
@@ -8000,25 +8016,35 @@ break
 }
 }
 }
-SQRT.prototype.define = function SQRT() {
+}
+/* autogenerated from "macros/MatrixOp/MATEXPM.sci" */
+function MATEXPM() {
+MATEXPM.prototype.define = function MATEXPM() {
 model=scicos_model();
-model.sim=list("mat_sqrt",4);
+function_name="mat_expm";
+funtyp=4;
+model.sim=list(function_name,funtyp);
 model.in1=-1;
-model.in2=-2;
+model.in2=-1;
 model.intyp=1;
-model.outtyp=1;
 model.out=-1;
-model.out2=-2;
+model.out2=-1;
+model.outtyp=1;
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[];
+model.blocktype="c";
+model.firing=[];
 model.dep_ut=[true,false];
 label=[sci2exp(1)];
 gr_i=[];
 x=standard_define([2,2],model,label,gr_i);
 }
-SQRT.prototype.details = function SQRT() {
-}
+MATEXPM.prototype.details = function MATEXPM() {
 }
-/* autogenerated from "macros/MatrixOp/MATEXPM.sci" */
-function MATEXPM() {
 MATEXPM.prototype.get = function MATEXPM() {
 }
 MATEXPM.prototype.set = function MATEXPM() {
@@ -8061,15 +8087,18 @@ break
 }
 }
 }
-MATEXPM.prototype.define = function MATEXPM() {
+}
+/* autogenerated from "macros/MatrixOp/MATPINV.sci" */
+function MATPINV() {
+MATPINV.prototype.define = function MATPINV() {
 model=scicos_model();
-function_name="mat_expm";
+function_name="mat_pinv";
 funtyp=4;
 model.sim=list(function_name,funtyp);
 model.in1=-1;
-model.in2=-1;
+model.in2=-2;
 model.intyp=1;
-model.out=-1;
+model.out=-2;
 model.out2=-1;
 model.outtyp=1;
 model.evtin=[];
@@ -8085,11 +8114,8 @@ label=[sci2exp(1)];
 gr_i=[];
 x=standard_define([2,2],model,label,gr_i);
 }
-MATEXPM.prototype.details = function MATEXPM() {
-}
+MATPINV.prototype.details = function MATPINV() {
 }
-/* autogenerated from "macros/MatrixOp/MATPINV.sci" */
-function MATPINV() {
 MATPINV.prototype.get = function MATPINV() {
 }
 MATPINV.prototype.set = function MATPINV() {
@@ -8132,15 +8158,18 @@ break
 }
 }
 }
-MATPINV.prototype.define = function MATPINV() {
+}
+/* autogenerated from "macros/MatrixOp/MATDIAG.sci" */
+function MATDIAG() {
+MATDIAG.prototype.define = function MATDIAG() {
 model=scicos_model();
-function_name="mat_pinv";
+function_name="mat_diag";
 funtyp=4;
 model.sim=list(function_name,funtyp);
 model.in1=-1;
-model.in2=-2;
+model.in2=1;
 model.intyp=1;
-model.out=-2;
+model.out=-1;
 model.out2=-1;
 model.outtyp=1;
 model.evtin=[];
@@ -8156,11 +8185,8 @@ label=[sci2exp(1)];
 gr_i=[];
 x=standard_define([2,2],model,label,gr_i);
 }
-MATPINV.prototype.details = function MATPINV() {
-}
+MATDIAG.prototype.details = function MATDIAG() {
 }
-/* autogenerated from "macros/MatrixOp/MATDIAG.sci" */
-function MATDIAG() {
 MATDIAG.prototype.get = function MATDIAG() {
 }
 MATDIAG.prototype.set = function MATDIAG() {
@@ -8203,17 +8229,20 @@ break
 }
 }
 }
-MATDIAG.prototype.define = function MATDIAG() {
+}
+/* autogenerated from "macros/MatrixOp/MATZCONJ.sci" */
+function MATZCONJ() {
+MATZCONJ.prototype.define = function MATZCONJ() {
 model=scicos_model();
-function_name="mat_diag";
+function_name="matz_conj";
 funtyp=4;
 model.sim=list(function_name,funtyp);
 model.in1=-1;
-model.in2=1;
-model.intyp=1;
+model.in2=-2;
+model.intyp=2;
 model.out=-1;
-model.out2=-1;
-model.outtyp=1;
+model.out2=-2;
+model.outtyp=2;
 model.evtin=[];
 model.evtout=[];
 model.state=[];
@@ -8223,31 +8252,31 @@ model.ipar=[];
 model.blocktype="c";
 model.firing=[];
 model.dep_ut=[true,false];
-label=[sci2exp(1)];
+label=[];
 gr_i=[];
 x=standard_define([2,2],model,label,gr_i);
 }
-MATDIAG.prototype.details = function MATDIAG() {
-}
+MATZCONJ.prototype.details = function MATZCONJ() {
 }
-/* autogenerated from "macros/MatrixOp/MATZCONJ.sci" */
-function MATZCONJ() {
 MATZCONJ.prototype.get = function MATZCONJ() {
 }
 MATZCONJ.prototype.set = function MATZCONJ() {
 x=arg1;
 }
-MATZCONJ.prototype.define = function MATZCONJ() {
+}
+/* autogenerated from "macros/MatrixOp/MATINV.sci" */
+function MATINV() {
+MATINV.prototype.define = function MATINV() {
 model=scicos_model();
-function_name="matz_conj";
+function_name="mat_inv";
 funtyp=4;
 model.sim=list(function_name,funtyp);
 model.in1=-1;
-model.in2=-2;
-model.intyp=2;
+model.in2=-1;
+model.intyp=1;
 model.out=-1;
-model.out2=-2;
-model.outtyp=2;
+model.out2=-1;
+model.outtyp=1;
 model.evtin=[];
 model.evtout=[];
 model.state=[];
@@ -8257,15 +8286,12 @@ model.ipar=[];
 model.blocktype="c";
 model.firing=[];
 model.dep_ut=[true,false];
-label=[];
+label=[sci2exp(1)];
 gr_i=[];
 x=standard_define([2,2],model,label,gr_i);
 }
-MATZCONJ.prototype.details = function MATZCONJ() {
-}
+MATINV.prototype.details = function MATINV() {
 }
-/* autogenerated from "macros/MatrixOp/MATINV.sci" */
-function MATINV() {
 MATINV.prototype.get = function MATINV() {
 }
 MATINV.prototype.set = function MATINV() {
@@ -8308,17 +8334,20 @@ break
 }
 }
 }
-MATINV.prototype.define = function MATINV() {
+}
+/* autogenerated from "macros/MatrixOp/MATLU.sci" */
+function MATLU() {
+MATLU.prototype.define = function MATLU() {
 model=scicos_model();
-function_name="mat_inv";
+function_name="mat_lu";
 funtyp=4;
 model.sim=list(function_name,funtyp);
 model.in1=-1;
 model.in2=-1;
 model.intyp=1;
-model.out=-1;
-model.out2=-1;
-model.outtyp=1;
+model.out=[-1,-1];
+model.out2=[-1,-1];
+model.outtyp=[1,1];
 model.evtin=[];
 model.evtout=[];
 model.state=[];
@@ -8328,15 +8357,12 @@ model.ipar=[];
 model.blocktype="c";
 model.firing=[];
 model.dep_ut=[true,false];
-label=[sci2exp(1)];
+label=sci2exp(1);
 gr_i=[];
 x=standard_define([2,2],model,label,gr_i);
 }
-MATINV.prototype.details = function MATINV() {
-}
+MATLU.prototype.details = function MATLU() {
 }
-/* autogenerated from "macros/MatrixOp/MATLU.sci" */
-function MATLU() {
 MATLU.prototype.get = function MATLU() {
 }
 MATLU.prototype.set = function MATLU() {
@@ -8377,17 +8403,20 @@ break
 }
 }
 }
-MATLU.prototype.define = function MATLU() {
+}
+/* autogenerated from "macros/MatrixOp/MATSUM.sci" */
+function MATSUM() {
+MATSUM.prototype.define = function MATSUM() {
 model=scicos_model();
-function_name="mat_lu";
+function_name="mat_sum";
 funtyp=4;
 model.sim=list(function_name,funtyp);
 model.in1=-1;
-model.in2=-1;
+model.in2=-2;
 model.intyp=1;
-model.out=[-1,-1];
-model.out2=[-1,-1];
-model.outtyp=[1,1];
+model.out=1;
+model.out2=1;
+model.outtyp=1;
 model.evtin=[];
 model.evtout=[];
 model.state=[];
@@ -8397,15 +8426,12 @@ model.ipar=[];
 model.blocktype="c";
 model.firing=[];
 model.dep_ut=[true,false];
-label=sci2exp(1);
+label=[sci2exp(1),sci2exp(0)];
 gr_i=[];
-x=standard_define([2,2],model,label,gr_i);
-}
-MATLU.prototype.details = function MATLU() {
+x=standard_define([3,2],model,label,gr_i);
 }
+MATSUM.prototype.details = function MATSUM() {
 }
-/* autogenerated from "macros/MatrixOp/MATSUM.sci" */
-function MATSUM() {
 MATSUM.prototype.get = function MATSUM() {
 }
 MATSUM.prototype.set = function MATSUM() {
@@ -8473,16 +8499,19 @@ break
 }
 }
 }
-MATSUM.prototype.define = function MATSUM() {
+}
+/* autogenerated from "macros/MatrixOp/MATBKSL.sci" */
+function MATBKSL() {
+MATBKSL.prototype.define = function MATBKSL() {
 model=scicos_model();
-function_name="mat_sum";
+function_name="mat_bksl";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in1=-1;
-model.in2=-2;
-model.intyp=1;
-model.out=1;
-model.out2=1;
+model.in1=[-1,-1];
+model.in2=[-2,-3];
+model.intyp=[1,1];
+model.out=-2;
+model.out2=-3;
 model.outtyp=1;
 model.evtin=[];
 model.evtout=[];
@@ -8493,15 +8522,12 @@ model.ipar=[];
 model.blocktype="c";
 model.firing=[];
 model.dep_ut=[true,false];
-label=[sci2exp(1),sci2exp(0)];
+label=[sci2exp(1)];
 gr_i=[];
-x=standard_define([3,2],model,label,gr_i);
-}
-MATSUM.prototype.details = function MATSUM() {
+x=standard_define([2,2],model,label,gr_i);
 }
+MATBKSL.prototype.details = function MATBKSL() {
 }
-/* autogenerated from "macros/MatrixOp/MATBKSL.sci" */
-function MATBKSL() {
 MATBKSL.prototype.get = function MATBKSL() {
 }
 MATBKSL.prototype.set = function MATBKSL() {
@@ -8544,16 +8570,19 @@ break
 }
 }
 }
-MATBKSL.prototype.define = function MATBKSL() {
+}
+/* autogenerated from "macros/MatrixOp/MATRESH.sci" */
+function MATRESH() {
+MATRESH.prototype.define = function MATRESH() {
 model=scicos_model();
-function_name="mat_bksl";
+function_name="mat_reshape";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in1=[-1,-1];
-model.in2=[-2,-3];
-model.intyp=[1,1];
-model.out=-2;
-model.out2=-3;
+model.in1=-1;
+model.in2=-2;
+model.intyp=1;
+model.out=-1;
+model.out2=-2;
 model.outtyp=1;
 model.evtin=[];
 model.evtout=[];
@@ -8564,15 +8593,12 @@ model.ipar=[];
 model.blocktype="c";
 model.firing=[];
 model.dep_ut=[true,false];
-label=[sci2exp(1)];
+label=[sci2exp(1),sci2exp([1,1]),sci2exp([1,1])];
 gr_i=[];
-x=standard_define([2,2],model,label,gr_i);
-}
-MATBKSL.prototype.details = function MATBKSL() {
+x=standard_define([3,2],model,label,gr_i);
 }
+MATRESH.prototype.details = function MATRESH() {
 }
-/* autogenerated from "macros/MatrixOp/MATRESH.sci" */
-function MATRESH() {
 MATRESH.prototype.get = function MATRESH() {
 }
 MATRESH.prototype.set = function MATRESH() {
@@ -8640,17 +8666,21 @@ break
 }
 needcompile=resume(needcompile)
 }
-MATRESH.prototype.define = function MATRESH() {
+}
+/* autogenerated from "macros/MatrixOp/MATCATV.sci" */
+function MATCATV() {
+MATCATV.prototype.define = function MATCATV() {
+l1=[2,2];
 model=scicos_model();
-function_name="mat_reshape";
+function_name="mat_catv";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in1=-1;
-model.in2=-2;
-model.intyp=1;
-model.out=-1;
-model.out2=-2;
-model.outtyp=1;
+model.in2=[-1,-1];
+model.in1=[-2,-3];
+model.intyp=[-1,-1];
+model.out=0;
+model.out2=-1;
+model.outtyp=-1;
 model.evtin=[];
 model.evtout=[];
 model.state=[];
@@ -8660,15 +8690,12 @@ model.ipar=[];
 model.blocktype="c";
 model.firing=[];
 model.dep_ut=[true,false];
-label=[sci2exp(1),sci2exp([1,1]),sci2exp([1,1])];
+label=[sci2exp(2)];
 gr_i=[];
-x=standard_define([3,2],model,label,gr_i);
-}
-MATRESH.prototype.details = function MATRESH() {
+x=standard_define([2,3],model,label,gr_i);
 }
+MATCATV.prototype.details = function MATCATV() {
 }
-/* autogenerated from "macros/MatrixOp/MATCATV.sci" */
-function MATCATV() {
 MATCATV.prototype.get = function MATCATV() {
 }
 MATCATV.prototype.set = function MATCATV() {
@@ -8701,36 +8728,23 @@ break
 }
 }
 }
-MATCATV.prototype.define = function MATCATV() {
-l1=[2,2];
+}
+/* autogenerated from "macros/MatrixOp/MATTRAN.sci" */
+function MATTRAN() {
+MATTRAN.prototype.define = function MATTRAN() {
 model=scicos_model();
-function_name="mat_catv";
-funtyp=4;
-model.sim=list(function_name,funtyp);
-model.in2=[-1,-1];
-model.in1=[-2,-3];
-model.intyp=[-1,-1];
-model.out=0;
+model.sim=list("mattran_m",4);
+model.in1=-1;
+model.in2=-2;
+model.out=-2;
 model.out2=-1;
-model.outtyp=-1;
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[];
-model.blocktype="c";
-model.firing=[];
 model.dep_ut=[true,false];
-label=[sci2exp(2)];
+label=[sci2exp(1)];
 gr_i=[];
-x=standard_define([2,3],model,label,gr_i);
-}
-MATCATV.prototype.details = function MATCATV() {
+x=standard_define([3,2],model,label,gr_i);
 }
+MATTRAN.prototype.details = function MATTRAN() {
 }
-/* autogenerated from "macros/MatrixOp/MATTRAN.sci" */
-function MATTRAN() {
 MATTRAN.prototype.get = function MATTRAN() {
 }
 MATTRAN.prototype.set = function MATTRAN() {
@@ -8777,23 +8791,35 @@ break
 }
 }
 }
-MATTRAN.prototype.define = function MATTRAN() {
+}
+/* autogenerated from "macros/MatrixOp/RICC.sci" */
+function RICC() {
+RICC.prototype.define = function RICC() {
 model=scicos_model();
-model.sim=list("mattran_m",4);
-model.in1=-1;
-model.in2=-2;
-model.out=-2;
+function_name="ricc_m";
+funtyp=4;
+model.sim=list(function_name,funtyp);
+model.in1=[-1,-1,-1];
+model.in2=[-1,-1,-1];
+model.intyp=[1,1,1];
+model.out=-1;
 model.out2=-1;
+model.outtyp=1;
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[1,1];
+model.blocktype="c";
+model.firing=[];
 model.dep_ut=[true,false];
-label=[sci2exp(1)];
+label=[sci2exp(1),sci2exp(1)];
 gr_i=[];
-x=standard_define([3,2],model,label,gr_i);
-}
-MATTRAN.prototype.details = function MATTRAN() {
+x=standard_define([2,2],model,label,gr_i);
 }
+RICC.prototype.details = function RICC() {
 }
-/* autogenerated from "macros/MatrixOp/RICC.sci" */
-function RICC() {
 RICC.prototype.get = function RICC() {
 }
 RICC.prototype.set = function RICC() {
@@ -8825,35 +8851,35 @@ break
 }
 }
 }
-RICC.prototype.define = function RICC() {
+}
+/* autogenerated from "macros/MatrixOp/MATZREIM.sci" */
+function MATZREIM() {
+MATZREIM.prototype.define = function MATZREIM() {
 model=scicos_model();
-function_name="ricc_m";
+function_name="matz_reim";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in1=[-1,-1,-1];
-model.in2=[-1,-1,-1];
-model.intyp=[1,1,1];
-model.out=-1;
-model.out2=-1;
-model.outtyp=1;
+model.in1=-1;
+model.in2=-2;
+model.intyp=2;
+model.out=[-1,-1];
+model.out2=[-2,-2];
+model.outtyp=[1,1];
 model.evtin=[];
 model.evtout=[];
 model.state=[];
 model.dstate=[];
 model.rpar=[];
-model.ipar=[1,1];
+model.ipar=[];
 model.blocktype="c";
 model.firing=[];
 model.dep_ut=[true,false];
-label=[sci2exp(1),sci2exp(1)];
+label=sci2exp(1);
 gr_i=[];
-x=standard_define([2,2],model,label,gr_i);
-}
-RICC.prototype.details = function RICC() {
+x=standard_define([3,2],model,label,gr_i);
 }
+MATZREIM.prototype.details = function MATZREIM() {
 }
-/* autogenerated from "macros/MatrixOp/MATZREIM.sci" */
-function MATZREIM() {
 MATZREIM.prototype.get = function MATZREIM() {
 }
 MATZREIM.prototype.set = function MATZREIM() {
@@ -8900,17 +8926,20 @@ break
 }
 }
 }
-MATZREIM.prototype.define = function MATZREIM() {
+}
+/* autogenerated from "macros/MatrixOp/MATCATH.sci" */
+function MATCATH() {
+MATCATH.prototype.define = function MATCATH() {
 model=scicos_model();
-function_name="matz_reim";
+function_name="mat_cath";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in1=-1;
-model.in2=-2;
-model.intyp=2;
-model.out=[-1,-1];
-model.out2=[-2,-2];
-model.outtyp=[1,1];
+model.in1=[-1,-1];
+model.in2=[-2,-3];
+model.intyp=[1,1];
+model.out=-1;
+model.out2=0;
+model.outtyp=-1;
 model.evtin=[];
 model.evtout=[];
 model.state=[];
@@ -8920,15 +8949,12 @@ model.ipar=[];
 model.blocktype="c";
 model.firing=[];
 model.dep_ut=[true,false];
-label=sci2exp(1);
+label=[sci2exp(2)];
 gr_i=[];
-x=standard_define([3,2],model,label,gr_i);
-}
-MATZREIM.prototype.details = function MATZREIM() {
+x=standard_define([2,3],model,label,gr_i);
 }
+MATCATH.prototype.details = function MATCATH() {
 }
-/* autogenerated from "macros/MatrixOp/MATCATH.sci" */
-function MATCATH() {
 MATCATH.prototype.get = function MATCATH() {
 }
 MATCATH.prototype.set = function MATCATH() {
@@ -8961,17 +8987,20 @@ break
 }
 }
 }
-MATCATH.prototype.define = function MATCATH() {
+}
+/* autogenerated from "macros/MatrixOp/MATSING.sci" */
+function MATSING() {
+MATSING.prototype.define = function MATSING() {
 model=scicos_model();
-function_name="mat_cath";
+function_name="mat_sing";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in1=[-1,-1];
-model.in2=[-2,-3];
-model.intyp=[1,1];
+model.in1=-1;
+model.in2=-2;
+model.intyp=1;
 model.out=-1;
-model.out2=0;
-model.outtyp=-1;
+model.out2=1;
+model.outtyp=1;
 model.evtin=[];
 model.evtout=[];
 model.state=[];
@@ -8981,15 +9010,12 @@ model.ipar=[];
 model.blocktype="c";
 model.firing=[];
 model.dep_ut=[true,false];
-label=[sci2exp(2)];
+label=[sci2exp(1),sci2exp(1)];
 gr_i=[];
-x=standard_define([2,3],model,label,gr_i);
-}
-MATCATH.prototype.details = function MATCATH() {
+x=standard_define([2,2],model,label,gr_i);
 }
+MATSING.prototype.details = function MATSING() {
 }
-/* autogenerated from "macros/MatrixOp/MATSING.sci" */
-function MATSING() {
 MATSING.prototype.get = function MATSING() {
 }
 MATSING.prototype.set = function MATSING() {
@@ -9056,15 +9082,18 @@ break
 }
 }
 }
-MATSING.prototype.define = function MATSING() {
+}
+/* autogenerated from "macros/MatrixOp/MATDET.sci" */
+function MATDET() {
+MATDET.prototype.define = function MATDET() {
 model=scicos_model();
-function_name="mat_sing";
+function_name="mat_det";
 funtyp=4;
 model.sim=list(function_name,funtyp);
 model.in1=-1;
-model.in2=-2;
+model.in2=-1;
 model.intyp=1;
-model.out=-1;
+model.out=1;
 model.out2=1;
 model.outtyp=1;
 model.evtin=[];
@@ -9076,15 +9105,12 @@ model.ipar=[];
 model.blocktype="c";
 model.firing=[];
 model.dep_ut=[true,false];
-label=[sci2exp(1),sci2exp(1)];
+label=[sci2exp(1)];
 gr_i=[];
 x=standard_define([2,2],model,label,gr_i);
 }
-MATSING.prototype.details = function MATSING() {
-}
+MATDET.prototype.details = function MATDET() {
 }
-/* autogenerated from "macros/MatrixOp/MATDET.sci" */
-function MATDET() {
 MATDET.prototype.get = function MATDET() {
 }
 MATDET.prototype.set = function MATDET() {
@@ -9127,35 +9153,35 @@ break
 }
 }
 }
-MATDET.prototype.define = function MATDET() {
+}
+/* autogenerated from "macros/MatrixOp/SUBMAT.sci" */
+function SUBMAT() {
+SUBMAT.prototype.define = function SUBMAT() {
 model=scicos_model();
-function_name="mat_det";
+function_name="submat";
 funtyp=4;
 model.sim=list(function_name,funtyp);
 model.in1=-1;
-model.in2=-1;
+model.in2=-2;
 model.intyp=1;
-model.out=1;
-model.out2=1;
+model.out=-1;
+model.out2=-2;
 model.outtyp=1;
 model.evtin=[];
 model.evtout=[];
 model.state=[];
 model.dstate=[];
 model.rpar=[];
-model.ipar=[];
+model.ipar=[1,1,1,1];
 model.blocktype="c";
 model.firing=[];
 model.dep_ut=[true,false];
-label=[sci2exp(1)];
+label=[sci2exp(1),sci2exp(1),sci2exp(1),sci2exp(1),sci2exp(1)];
 gr_i=[];
-x=standard_define([2,2],model,label,gr_i);
-}
-MATDET.prototype.details = function MATDET() {
+x=standard_define([2.5,2],model,label,gr_i);
 }
+SUBMAT.prototype.details = function SUBMAT() {
 }
-/* autogenerated from "macros/MatrixOp/SUBMAT.sci" */
-function SUBMAT() {
 SUBMAT.prototype.get = function SUBMAT() {
 }
 SUBMAT.prototype.set = function SUBMAT() {
@@ -9219,35 +9245,35 @@ break
 }
 }
 }
-SUBMAT.prototype.define = function SUBMAT() {
+}
+/* autogenerated from "macros/MatrixOp/ROOTCOEF.sci" */
+function ROOTCOEF() {
+ROOTCOEF.prototype.define = function ROOTCOEF() {
 model=scicos_model();
-function_name="submat";
+function_name="root_coef";
 funtyp=4;
 model.sim=list(function_name,funtyp);
 model.in1=-1;
-model.in2=-2;
+model.in2=1;
 model.intyp=1;
-model.out=-1;
-model.out2=-2;
+model.out=-2;
+model.out2=1;
 model.outtyp=1;
 model.evtin=[];
 model.evtout=[];
 model.state=[];
 model.dstate=[];
 model.rpar=[];
-model.ipar=[1,1,1,1];
+model.ipar=[];
 model.blocktype="c";
 model.firing=[];
 model.dep_ut=[true,false];
-label=[sci2exp(1),sci2exp(1),sci2exp(1),sci2exp(1),sci2exp(1)];
+label=[sci2exp(1),sci2exp(1)];
 gr_i=[];
-x=standard_define([2.5,2],model,label,gr_i);
-}
-SUBMAT.prototype.details = function SUBMAT() {
+x=standard_define([3,2],model,label,gr_i);
 }
+ROOTCOEF.prototype.details = function ROOTCOEF() {
 }
-/* autogenerated from "macros/MatrixOp/ROOTCOEF.sci" */
-function ROOTCOEF() {
 ROOTCOEF.prototype.get = function ROOTCOEF() {
 }
 ROOTCOEF.prototype.set = function ROOTCOEF() {
@@ -9290,15 +9316,18 @@ break
 }
 }
 }
-ROOTCOEF.prototype.define = function ROOTCOEF() {
+}
+/* autogenerated from "macros/MatrixOp/EXTRACT.sci" */
+function EXTRACT() {
+EXTRACT.prototype.define = function EXTRACT() {
 model=scicos_model();
-function_name="root_coef";
+function_name="extract";
 funtyp=4;
 model.sim=list(function_name,funtyp);
 model.in1=-1;
-model.in2=1;
+model.in2=-2;
 model.intyp=1;
-model.out=-2;
+model.out=1;
 model.out2=1;
 model.outtyp=1;
 model.evtin=[];
@@ -9306,19 +9335,16 @@ model.evtout=[];
 model.state=[];
 model.dstate=[];
 model.rpar=[];
-model.ipar=[];
+model.ipar=[1,1,1,1];
 model.blocktype="c";
 model.firing=[];
 model.dep_ut=[true,false];
-label=[sci2exp(1),sci2exp(1)];
+label=[sci2exp(1),sci2exp([1]),sci2exp([1])];
 gr_i=[];
 x=standard_define([3,2],model,label,gr_i);
 }
-ROOTCOEF.prototype.details = function ROOTCOEF() {
-}
+EXTRACT.prototype.details = function EXTRACT() {
 }
-/* autogenerated from "macros/MatrixOp/EXTRACT.sci" */
-function EXTRACT() {
 EXTRACT.prototype.get = function EXTRACT() {
 }
 EXTRACT.prototype.set = function EXTRACT() {
@@ -9382,35 +9408,35 @@ break
 }
 }
 }
-EXTRACT.prototype.define = function EXTRACT() {
+}
+/* autogenerated from "macros/MatrixOp/MATEIG.sci" */
+function MATEIG() {
+MATEIG.prototype.define = function MATEIG() {
 model=scicos_model();
-function_name="extract";
+function_name="mat_vps";
 funtyp=4;
 model.sim=list(function_name,funtyp);
 model.in1=-1;
-model.in2=-2;
+model.in2=-1;
 model.intyp=1;
-model.out=1;
+model.out=-1;
 model.out2=1;
-model.outtyp=1;
+model.outtyp=2;
 model.evtin=[];
 model.evtout=[];
 model.state=[];
 model.dstate=[];
 model.rpar=[];
-model.ipar=[1,1,1,1];
+model.ipar=[];
 model.blocktype="c";
 model.firing=[];
 model.dep_ut=[true,false];
-label=[sci2exp(1),sci2exp([1]),sci2exp([1])];
+label=[sci2exp(1),sci2exp(1)];
 gr_i=[];
-x=standard_define([3,2],model,label,gr_i);
-}
-EXTRACT.prototype.details = function EXTRACT() {
+x=standard_define([2,2],model,label,gr_i);
 }
+MATEIG.prototype.details = function MATEIG() {
 }
-/* autogenerated from "macros/MatrixOp/MATEIG.sci" */
-function MATEIG() {
 MATEIG.prototype.get = function MATEIG() {
 }
 MATEIG.prototype.set = function MATEIG() {
@@ -9474,17 +9500,20 @@ break
 }
 }
 }
-MATEIG.prototype.define = function MATEIG() {
+}
+/* autogenerated from "macros/MatrixOp/CUMSUM.sci" */
+function CUMSUM() {
+CUMSUM.prototype.define = function CUMSUM() {
 model=scicos_model();
-function_name="mat_vps";
+function_name="cumsum_m";
 funtyp=4;
 model.sim=list(function_name,funtyp);
 model.in1=-1;
-model.in2=-1;
+model.in2=-2;
 model.intyp=1;
 model.out=-1;
-model.out2=1;
-model.outtyp=2;
+model.out2=-2;
+model.outtyp=1;
 model.evtin=[];
 model.evtout=[];
 model.state=[];
@@ -9494,15 +9523,12 @@ model.ipar=[];
 model.blocktype="c";
 model.firing=[];
 model.dep_ut=[true,false];
-label=[sci2exp(1),sci2exp(1)];
+label=[sci2exp(1),sci2exp(0)];
 gr_i=[];
-x=standard_define([2,2],model,label,gr_i);
-}
-MATEIG.prototype.details = function MATEIG() {
+x=standard_define([3,2],model,label,gr_i);
 }
+CUMSUM.prototype.details = function CUMSUM() {
 }
-/* autogenerated from "macros/MatrixOp/CUMSUM.sci" */
-function CUMSUM() {
 CUMSUM.prototype.get = function CUMSUM() {
 }
 CUMSUM.prototype.set = function CUMSUM() {
@@ -9568,14 +9594,17 @@ break
 }
 }
 }
-CUMSUM.prototype.define = function CUMSUM() {
+}
+/* autogenerated from "macros/MatrixOp/MATDIV.sci" */
+function MATDIV() {
+MATDIV.prototype.define = function MATDIV() {
 model=scicos_model();
-function_name="cumsum_m";
+function_name="mat_div";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in1=-1;
-model.in2=-2;
-model.intyp=1;
+model.in1=[-1,-2];
+model.in2=[-3,-3];
+model.intyp=[1,1];
 model.out=-1;
 model.out2=-2;
 model.outtyp=1;
@@ -9588,15 +9617,12 @@ model.ipar=[];
 model.blocktype="c";
 model.firing=[];
 model.dep_ut=[true,false];
-label=[sci2exp(1),sci2exp(0)];
+label=[sci2exp(1)];
 gr_i=[];
-x=standard_define([3,2],model,label,gr_i);
-}
-CUMSUM.prototype.details = function CUMSUM() {
+x=standard_define([2,2],model,label,gr_i);
 }
+MATDIV.prototype.details = function MATDIV() {
 }
-/* autogenerated from "macros/MatrixOp/MATDIV.sci" */
-function MATDIV() {
 MATDIV.prototype.get = function MATDIV() {
 }
 MATDIV.prototype.set = function MATDIV() {
@@ -9639,14 +9665,17 @@ break
 }
 }
 }
-MATDIV.prototype.define = function MATDIV() {
+}
+/* autogenerated from "macros/MatrixOp/EXTTRI.sci" */
+function EXTTRI() {
+EXTTRI.prototype.define = function EXTTRI() {
 model=scicos_model();
-function_name="mat_div";
+function_name="extrilz";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in1=[-1,-2];
-model.in2=[-3,-3];
-model.intyp=[1,1];
+model.in1=-1;
+model.in2=-2;
+model.intyp=1;
 model.out=-1;
 model.out2=-2;
 model.outtyp=1;
@@ -9659,15 +9688,12 @@ model.ipar=[];
 model.blocktype="c";
 model.firing=[];
 model.dep_ut=[true,false];
-label=[sci2exp(1)];
+label=[sci2exp(1),sci2exp(1)];
 gr_i=[];
-x=standard_define([2,2],model,label,gr_i);
-}
-MATDIV.prototype.details = function MATDIV() {
+x=standard_define([3,2],model,label,gr_i);
 }
+EXTTRI.prototype.details = function EXTTRI() {
 }
-/* autogenerated from "macros/MatrixOp/EXTTRI.sci" */
-function EXTTRI() {
 EXTTRI.prototype.get = function EXTTRI() {
 }
 EXTTRI.prototype.set = function EXTTRI() {
@@ -9730,41 +9756,9 @@ break
 }
 }
 }
-EXTTRI.prototype.define = function EXTTRI() {
-model=scicos_model();
-function_name="extrilz";
-funtyp=4;
-model.sim=list(function_name,funtyp);
-model.in1=-1;
-model.in2=-2;
-model.intyp=1;
-model.out=-1;
-model.out2=-2;
-model.outtyp=1;
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[];
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-label=[sci2exp(1),sci2exp(1)];
-gr_i=[];
-x=standard_define([3,2],model,label,gr_i);
-}
-EXTTRI.prototype.details = function EXTTRI() {
-}
 }
 /* autogenerated from "macros/Threshold/NEGTOPOS_f.sci" */
 function NEGTOPOS_f() {
-NEGTOPOS_f.prototype.get = function NEGTOPOS_f() {
-}
-NEGTOPOS_f.prototype.set = function NEGTOPOS_f() {
-x=arg1;
-x.model.firing=-1;
-}
 NEGTOPOS_f.prototype.define = function NEGTOPOS_f() {
 model=scicos_model();
 model.sim=list("zcross",1);
@@ -9780,9 +9774,33 @@ x=standard_define([2,2],model,[],gr_i);
 }
 NEGTOPOS_f.prototype.details = function NEGTOPOS_f() {
 }
+NEGTOPOS_f.prototype.get = function NEGTOPOS_f() {
+}
+NEGTOPOS_f.prototype.set = function NEGTOPOS_f() {
+x=arg1;
+x.model.firing=-1;
+}
 }
 /* autogenerated from "macros/Threshold/ZCROSS_f.sci" */
 function ZCROSS_f() {
+ZCROSS_f.prototype.define = function ZCROSS_f() {
+rpar=[-1,-1,0,0];
+in1=1;
+model=scicos_model();
+model.sim=list("zcross",1);
+model.in1=in1;
+model.nzcross=in1;
+model.evtout=1;
+model.rpar=[-1,-1,0,0];
+model.blocktype="z";
+model.firing=-1;
+model.dep_ut=[true,false];
+exprs=strcat(sci2exp(in1));
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+ZCROSS_f.prototype.details = function ZCROSS_f() {
+}
 ZCROSS_f.prototype.get = function ZCROSS_f() {
 }
 ZCROSS_f.prototype.set = function ZCROSS_f() {
@@ -9814,33 +9832,9 @@ break
 }
 }
 }
-ZCROSS_f.prototype.define = function ZCROSS_f() {
-rpar=[-1,-1,0,0];
-in1=1;
-model=scicos_model();
-model.sim=list("zcross",1);
-model.in1=in1;
-model.nzcross=in1;
-model.evtout=1;
-model.rpar=[-1,-1,0,0];
-model.blocktype="z";
-model.firing=-1;
-model.dep_ut=[true,false];
-exprs=strcat(sci2exp(in1));
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-ZCROSS_f.prototype.details = function ZCROSS_f() {
-}
 }
 /* autogenerated from "macros/Threshold/POSTONEG_f.sci" */
 function POSTONEG_f() {
-POSTONEG_f.prototype.get = function POSTONEG_f() {
-}
-POSTONEG_f.prototype.set = function POSTONEG_f() {
-x=arg1;
-x.model.firing=[-1];
-}
 POSTONEG_f.prototype.define = function POSTONEG_f() {
 rpar=[-1,-1,-1,0];
 model=scicos_model();
@@ -9857,14 +9851,15 @@ x=standard_define([2,2],model,[],gr_i);
 }
 POSTONEG_f.prototype.details = function POSTONEG_f() {
 }
+POSTONEG_f.prototype.get = function POSTONEG_f() {
 }
-/* autogenerated from "macros/Electrical/PotentialSensor.sci" */
-function PotentialSensor() {
-PotentialSensor.prototype.get = function PotentialSensor() {
-}
-PotentialSensor.prototype.set = function PotentialSensor() {
+POSTONEG_f.prototype.set = function POSTONEG_f() {
 x=arg1;
+x.model.firing=[-1];
 }
+}
+/* autogenerated from "macros/Electrical/PotentialSensor.sci" */
+function PotentialSensor() {
 PotentialSensor.prototype.define = function PotentialSensor() {
 model=scicos_model();
 model.in1=[1];
@@ -9885,29 +9880,14 @@ x.graphics.out_implicit=["E"];
 }
 PotentialSensor.prototype.details = function PotentialSensor() {
 }
+PotentialSensor.prototype.get = function PotentialSensor() {
 }
-/* autogenerated from "macros/Electrical/SineVoltage.sci" */
-function SineVoltage() {
-SineVoltage.prototype.get = function SineVoltage() {
-}
-SineVoltage.prototype.set = function SineVoltage() {
+PotentialSensor.prototype.set = function PotentialSensor() {
 x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,V,ph,frq,offset,start,exprs]=scicos_getvalue("Set voltage source parameter",["Amplitude (Volt)","phase (rad)","Frequency (Hz)","Voltageoffset (V)","Timeoffset (s)"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
-if (!ok) {
-break
-}
-model.rpar=[V,ph,frq,offset,start];
-model.equations.parameters[2-1]=list(V,ph,frq,offset,start);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
 }
 }
+/* autogenerated from "macros/Electrical/SineVoltage.sci" */
+function SineVoltage() {
 SineVoltage.prototype.define = function SineVoltage() {
 model=scicos_model();
 model.in1=[1];
@@ -9935,18 +9915,29 @@ x.graphics.out_implicit=["I"];
 }
 SineVoltage.prototype.details = function SineVoltage() {
 }
+SineVoltage.prototype.get = function SineVoltage() {
 }
-/* autogenerated from "macros/Electrical/CCS.sci" */
-function CCS() {
-CCS.prototype.get = function CCS() {
-}
-CCS.prototype.set = function CCS() {
+SineVoltage.prototype.set = function SineVoltage() {
 x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
-x=arg1;
+while (true) {
+[ok,V,ph,frq,offset,start,exprs]=scicos_getvalue("Set voltage source parameter",["Amplitude (Volt)","phase (rad)","Frequency (Hz)","Voltageoffset (V)","Timeoffset (s)"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
+if (!ok) {
+break
 }
+model.rpar=[V,ph,frq,offset,start];
+model.equations.parameters[2-1]=list(V,ph,frq,offset,start);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
+}
+/* autogenerated from "macros/Electrical/CCS.sci" */
+function CCS() {
 CCS.prototype.define = function CCS() {
 ModelName="CCS";
 PrametersValue=[];
@@ -9997,28 +9988,18 @@ x.graphics.out_implicit=Typeout;
 }
 CCS.prototype.details = function CCS() {
 }
+CCS.prototype.get = function CCS() {
 }
-/* autogenerated from "macros/Electrical/PMOS.sci" */
-function PMOS() {
-PMOS.prototype.get = function PMOS() {
-}
-PMOS.prototype.set = function PMOS() {
+CCS.prototype.set = function CCS() {
 x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
-while (true) {
-[ok,W,L,Beta,Vt,K2,K5,dW,dL,RDS,exprs]=scicos_getvalue("Set PMOS Transistor parameters",["Width [m]","Length [m]","Transconductance parameter [A/(V*V)]","Zero bias threshold voltage [V]","Bulk threshold parameter","Reduction of pinch-off region","Narrowing of channel [m]","Shortening of channel [m]","Drain-Source-Resistance [Ohm]"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
-if (!ok) {
-break
-}
-model.equations.parameters[2-1]=list(W,L,Beta,Vt,K2,K5,dW,dL,RDS);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
+x=arg1;
 }
 }
+/* autogenerated from "macros/Electrical/PMOS.sci" */
+function PMOS() {
 PMOS.prototype.define = function PMOS() {
 model=scicos_model();
 W=50.0e-6;
@@ -10049,29 +10030,28 @@ x.graphics.out_implicit=["I","I","I"];
 }
 PMOS.prototype.details = function PMOS() {
 }
+PMOS.prototype.get = function PMOS() {
 }
-/* autogenerated from "macros/Electrical/Inductor.sci" */
-function Inductor() {
-Inductor.prototype.get = function Inductor() {
-}
-Inductor.prototype.set = function Inductor() {
+PMOS.prototype.set = function PMOS() {
 x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,L,exprs]=scicos_getvalue("Set Inductor block parameter","L (H)",list("vec",1),exprs);
+[ok,W,L,Beta,Vt,K2,K5,dW,dL,RDS,exprs]=scicos_getvalue("Set PMOS Transistor parameters",["Width [m]","Length [m]","Transconductance parameter [A/(V*V)]","Zero bias threshold voltage [V]","Bulk threshold parameter","Reduction of pinch-off region","Narrowing of channel [m]","Shortening of channel [m]","Drain-Source-Resistance [Ohm]"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
 if (!ok) {
 break
 }
-model.rpar=L;
-model.equations.parameters[2-1]=list(L);
+model.equations.parameters[2-1]=list(W,L,Beta,Vt,K2,K5,dW,dL,RDS);
 graphics.exprs=exprs;
 x.graphics=graphics;
 x.model=model;
 break
 }
 }
+}
+/* autogenerated from "macros/Electrical/Inductor.sci" */
+function Inductor() {
 Inductor.prototype.define = function Inductor() {
 model=scicos_model();
 model.in1=[1];
@@ -10095,29 +10075,29 @@ x.graphics.out_implicit=["I"];
 }
 Inductor.prototype.details = function Inductor() {
 }
+Inductor.prototype.get = function Inductor() {
 }
-/* autogenerated from "macros/Electrical/Diode.sci" */
-function Diode() {
-Diode.prototype.get = function Diode() {
-}
-Diode.prototype.set = function Diode() {
+Inductor.prototype.set = function Inductor() {
 x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,Ids,Vt,Maxexp,R,exprs]=scicos_getvalue("Set Diode block parameter",["Saturation cuurent (A)","Voltage equivalent to temperature (Volt)","Max exponent for linear continuation","R (ohm)"],list("vec",1,"vec",1,"vec",1,"vec",1),exprs);
+[ok,L,exprs]=scicos_getvalue("Set Inductor block parameter","L (H)",list("vec",1),exprs);
 if (!ok) {
 break
 }
-model.rpar=[Ids,Vt,Maxexp,R];
-model.equations.parameters=list(["Ids","Vt","Maxexp","R"],list(Ids,Vt,Maxexp,R));
+model.rpar=L;
+model.equations.parameters[2-1]=list(L);
 graphics.exprs=exprs;
 x.graphics=graphics;
 x.model=model;
 break
 }
 }
+}
+/* autogenerated from "macros/Electrical/Diode.sci" */
+function Diode() {
 Diode.prototype.define = function Diode() {
 Ids=1.e-6;
 Vt=0.04;
@@ -10144,28 +10124,29 @@ x.graphics.out_implicit=["I"];
 }
 Diode.prototype.details = function Diode() {
 }
+Diode.prototype.get = function Diode() {
 }
-/* autogenerated from "macros/Electrical/IdealTransformer.sci" */
-function IdealTransformer() {
-IdealTransformer.prototype.get = function IdealTransformer() {
-}
-IdealTransformer.prototype.set = function IdealTransformer() {
+Diode.prototype.set = function Diode() {
 x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
-x=arg1;
-exprs=x.graphics.exprs;
 while (true) {
-[ok,N,exprs]=scicos_getvalue(["Set Transformer block parameters:","","N:"+" Turn ratio (N1/N2)"],["N"],list("vec",1),exprs);
+[ok,Ids,Vt,Maxexp,R,exprs]=scicos_getvalue("Set Diode block parameter",["Saturation cuurent (A)","Voltage equivalent to temperature (Volt)","Max exponent for linear continuation","R (ohm)"],list("vec",1,"vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break
 }
-x.model.equations.parameters[2-1]=list(N);
-x.graphics.exprs=exprs;
+model.rpar=[Ids,Vt,Maxexp,R];
+model.equations.parameters=list(["Ids","Vt","Maxexp","R"],list(Ids,Vt,Maxexp,R));
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
 break
 }
 }
+}
+/* autogenerated from "macros/Electrical/IdealTransformer.sci" */
+function IdealTransformer() {
 IdealTransformer.prototype.define = function IdealTransformer() {
 ModelName="IdealTransformer";
 PrametersValue=[1];
@@ -10216,14 +10197,28 @@ x.graphics.out_implicit=Typeout;
 }
 IdealTransformer.prototype.details = function IdealTransformer() {
 }
+IdealTransformer.prototype.get = function IdealTransformer() {
 }
-/* autogenerated from "macros/Electrical/Ground.sci" */
-function Ground() {
-Ground.prototype.get = function Ground() {
-}
-Ground.prototype.set = function Ground() {
+IdealTransformer.prototype.set = function IdealTransformer() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
 x=arg1;
+exprs=x.graphics.exprs;
+while (true) {
+[ok,N,exprs]=scicos_getvalue(["Set Transformer block parameters:","","N:"+" Turn ratio (N1/N2)"],["N"],list("vec",1),exprs);
+if (!ok) {
+break
+}
+x.model.equations.parameters[2-1]=list(N);
+x.graphics.exprs=exprs;
+break
+}
 }
+}
+/* autogenerated from "macros/Electrical/Ground.sci" */
+function Ground() {
 Ground.prototype.define = function Ground() {
 model=scicos_model();
 model.in1=[1];
@@ -10243,18 +10238,14 @@ x.graphics.out_implicit=["I"];
 }
 Ground.prototype.details = function Ground() {
 }
+Ground.prototype.get = function Ground() {
 }
-/* autogenerated from "macros/Electrical/CVS.sci" */
-function CVS() {
-CVS.prototype.get = function CVS() {
-}
-CVS.prototype.set = function CVS() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
+Ground.prototype.set = function Ground() {
 x=arg1;
 }
+}
+/* autogenerated from "macros/Electrical/CVS.sci" */
+function CVS() {
 CVS.prototype.define = function CVS() {
 ModelName="CVS";
 PrametersValue=[];
@@ -10305,29 +10296,18 @@ x.graphics.out_implicit=Typeout;
 }
 CVS.prototype.details = function CVS() {
 }
+CVS.prototype.get = function CVS() {
 }
-/* autogenerated from "macros/Electrical/Resistor.sci" */
-function Resistor() {
-Resistor.prototype.get = function Resistor() {
-}
-Resistor.prototype.set = function Resistor() {
+CVS.prototype.set = function CVS() {
 x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
-while (true) {
-[ok,R,exprs]=scicos_getvalue("Set Resistor block parameter","R (ohm)",list("vec",1),exprs);
-if (!ok) {
-break
-}
-model.rpar=R;
-model.equations.parameters[2-1]=list(R);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
+x=arg1;
 }
 }
+/* autogenerated from "macros/Electrical/Resistor.sci" */
+function Resistor() {
 Resistor.prototype.define = function Resistor() {
 model=scicos_model();
 R=0.01;
@@ -10351,28 +10331,29 @@ x.graphics.out_implicit=["I"];
 }
 Resistor.prototype.details = function Resistor() {
 }
+Resistor.prototype.get = function Resistor() {
 }
-/* autogenerated from "macros/Electrical/PNP.sci" */
-function PNP() {
-PNP.prototype.get = function PNP() {
-}
-PNP.prototype.set = function PNP() {
+Resistor.prototype.set = function Resistor() {
 x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
-x=arg1;
-exprs=x.graphics.exprs;
 while (true) {
-[ok,Bf,Br,Is,Vak,Tauf,Taur,Ccs,Cje,Cjc,Phie,Me,Phic,Mc,Gbc,Gbe,Vt,EMinMax,exprs]=scicos_getvalue(["Set PNP block parameters:",""],["Bf  : Forward beta","Br  : Reverse beta","Is  : Transport saturation current","Vak : Early voltage (inverse), 1/Volt","Tauf: Ideal forward transit time","Taur: Ideal reverse transit time","Ccs : Collector-substrat(ground) cap.","Cje : Base-emitter zero bias depletion cap.","Cjc : Base-coll. zero bias depletion cap.","Phie: Base-emitter diffusion voltage","Me  : Base-emitter gradation exponent","Phic: Base-collector diffusion voltage","Mc  : Base-collector gradation exponent","Gbc : Base-collector conductance","Gbe : Base-emitter conductance","Vt  : Voltage equivalent of temperature","EMinMax: if x > EMinMax, the exp(x) function is linearized"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
+[ok,R,exprs]=scicos_getvalue("Set Resistor block parameter","R (ohm)",list("vec",1),exprs);
 if (!ok) {
 break
 }
-x.model.equations.parameters[2-1]=list(Bf,Br,Is,Vak,Tauf,Taur,Ccs,Cje,Cjc,Phie,Me,Phic,Mc,Gbc,Gbe,Vt,EMinMax);
-x.graphics.exprs=exprs;
+model.rpar=R;
+model.equations.parameters[2-1]=list(R);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
 break
 }
 }
+}
+/* autogenerated from "macros/Electrical/PNP.sci" */
+function PNP() {
 PNP.prototype.define = function PNP() {
 ModelName="PNP";
 PrametersValue=[50,0.1,0,0.02,1.200e-10,5.000e-09,1.000e-12,4.000e-13,5.000e-13,0.8,0.4,0.8,0.333,1.000e-15,1.000e-15,0.02585,40];
@@ -10423,12 +10404,9 @@ x.graphics.out_implicit=Typeout;
 }
 PNP.prototype.details = function PNP() {
 }
+PNP.prototype.get = function PNP() {
 }
-/* autogenerated from "macros/Electrical/NPN.sci" */
-function NPN() {
-NPN.prototype.get = function NPN() {
-}
-NPN.prototype.set = function NPN() {
+PNP.prototype.set = function PNP() {
 x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
@@ -10436,7 +10414,7 @@ model=arg1.model;
 x=arg1;
 exprs=x.graphics.exprs;
 while (true) {
-[ok,Bf,Br,Is,Vak,Tauf,Taur,Ccs,Cje,Cjc,Phie,Me,Phic,Mc,Gbc,Gbe,Vt,EMinMax,exprs]=scicos_getvalue(["Set NPN block parameters:",""],["Bf  : Forward beta","Br  : Reverse beta","Is  : Transport saturation current","Vak : Early voltage (inverse), 1/Volt","Tauf: Ideal forward transit time","Taur: Ideal reverse transit time","Ccs : Collector-substrat(ground) cap.","Cje : Base-emitter zero bias depletion cap.","Cjc : Base-coll. zero bias depletion cap.","Phie: Base-emitter diffusion voltage","Me  : Base-emitter gradation exponent","Phic: Base-collector diffusion voltage","Mc  : Base-collector gradation exponent","Gbc : Base-collector conductance","Gbe : Base-emitter conductance","Vt  : Voltage equivalent of temperature","EMinmax: if x > EMinMax, the exp(x) is linearized"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
+[ok,Bf,Br,Is,Vak,Tauf,Taur,Ccs,Cje,Cjc,Phie,Me,Phic,Mc,Gbc,Gbe,Vt,EMinMax,exprs]=scicos_getvalue(["Set PNP block parameters:",""],["Bf  : Forward beta","Br  : Reverse beta","Is  : Transport saturation current","Vak : Early voltage (inverse), 1/Volt","Tauf: Ideal forward transit time","Taur: Ideal reverse transit time","Ccs : Collector-substrat(ground) cap.","Cje : Base-emitter zero bias depletion cap.","Cjc : Base-coll. zero bias depletion cap.","Phie: Base-emitter diffusion voltage","Me  : Base-emitter gradation exponent","Phic: Base-collector diffusion voltage","Mc  : Base-collector gradation exponent","Gbc : Base-collector conductance","Gbe : Base-emitter conductance","Vt  : Voltage equivalent of temperature","EMinMax: if x > EMinMax, the exp(x) function is linearized"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break
 }
@@ -10445,6 +10423,9 @@ x.graphics.exprs=exprs;
 break
 }
 }
+}
+/* autogenerated from "macros/Electrical/NPN.sci" */
+function NPN() {
 NPN.prototype.define = function NPN() {
 ModelName="NPN";
 PrametersValue=[50,0.1,0,0.02,1.200e-10,5.000e-09,1.000e-12,4.000e-13,5.000e-13,0.8,0.4,0.8,0.333,1.000e-15,1.000e-15,0.02585,40];
@@ -10495,14 +10476,28 @@ x.graphics.out_implicit=Typeout;
 }
 NPN.prototype.details = function NPN() {
 }
+NPN.prototype.get = function NPN() {
 }
-/* autogenerated from "macros/Electrical/CurrentSensor.sci" */
-function CurrentSensor() {
-CurrentSensor.prototype.get = function CurrentSensor() {
-}
-CurrentSensor.prototype.set = function CurrentSensor() {
+NPN.prototype.set = function NPN() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
 x=arg1;
+exprs=x.graphics.exprs;
+while (true) {
+[ok,Bf,Br,Is,Vak,Tauf,Taur,Ccs,Cje,Cjc,Phie,Me,Phic,Mc,Gbc,Gbe,Vt,EMinMax,exprs]=scicos_getvalue(["Set NPN block parameters:",""],["Bf  : Forward beta","Br  : Reverse beta","Is  : Transport saturation current","Vak : Early voltage (inverse), 1/Volt","Tauf: Ideal forward transit time","Taur: Ideal reverse transit time","Ccs : Collector-substrat(ground) cap.","Cje : Base-emitter zero bias depletion cap.","Cjc : Base-coll. zero bias depletion cap.","Phie: Base-emitter diffusion voltage","Me  : Base-emitter gradation exponent","Phic: Base-collector diffusion voltage","Mc  : Base-collector gradation exponent","Gbc : Base-collector conductance","Gbe : Base-emitter conductance","Vt  : Voltage equivalent of temperature","EMinmax: if x > EMinMax, the exp(x) is linearized"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
+if (!ok) {
+break
+}
+x.model.equations.parameters[2-1]=list(Bf,Br,Is,Vak,Tauf,Taur,Ccs,Cje,Cjc,Phie,Me,Phic,Mc,Gbc,Gbe,Vt,EMinMax);
+x.graphics.exprs=exprs;
+break
+}
 }
+}
+/* autogenerated from "macros/Electrical/CurrentSensor.sci" */
+function CurrentSensor() {
 CurrentSensor.prototype.define = function CurrentSensor() {
 model=scicos_model();
 model.in1=1;
@@ -10523,29 +10518,14 @@ x.graphics.out_implicit=["I","E"];
 }
 CurrentSensor.prototype.details = function CurrentSensor() {
 }
+CurrentSensor.prototype.get = function CurrentSensor() {
 }
-/* autogenerated from "macros/Electrical/ConstantVoltage.sci" */
-function ConstantVoltage() {
-ConstantVoltage.prototype.get = function ConstantVoltage() {
-}
-ConstantVoltage.prototype.set = function ConstantVoltage() {
+CurrentSensor.prototype.set = function CurrentSensor() {
 x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,V,exprs]=scicos_getvalue("Set ConstantVoltage block parameter","V (volt)",list("vec",1),exprs);
-if (!ok) {
-break
-}
-model.rpar=V;
-model.equations.parameters[2-1]=list(V);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
 }
 }
+/* autogenerated from "macros/Electrical/ConstantVoltage.sci" */
+function ConstantVoltage() {
 ConstantVoltage.prototype.define = function ConstantVoltage() {
 V=0.01;
 model=scicos_model();
@@ -10569,29 +10549,29 @@ x.graphics.out_implicit=["I"];
 }
 ConstantVoltage.prototype.details = function ConstantVoltage() {
 }
+ConstantVoltage.prototype.get = function ConstantVoltage() {
 }
-/* autogenerated from "macros/Electrical/VVsourceAC.sci" */
-function VVsourceAC() {
-VVsourceAC.prototype.get = function VVsourceAC() {
-}
-VVsourceAC.prototype.set = function VVsourceAC() {
+ConstantVoltage.prototype.set = function ConstantVoltage() {
 x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,FR,exprs]=scicos_getvalue("Set voltage source parameter",["Frequency (Hz)"],list("vec",-1),exprs);
+[ok,V,exprs]=scicos_getvalue("Set ConstantVoltage block parameter","V (volt)",list("vec",1),exprs);
 if (!ok) {
 break
 }
-model.rpar=[FR];
-model.equations.parameters[2-1]=list(FR);
+model.rpar=V;
+model.equations.parameters[2-1]=list(V);
 graphics.exprs=exprs;
 x.graphics=graphics;
 x.model=model;
 break
 }
 }
+}
+/* autogenerated from "macros/Electrical/VVsourceAC.sci" */
+function VVsourceAC() {
 VVsourceAC.prototype.define = function VVsourceAC() {
 model=scicos_model();
 model.in1=[1,1];
@@ -10616,14 +10596,29 @@ x.graphics.out_implicit=["I"];
 }
 VVsourceAC.prototype.details = function VVsourceAC() {
 }
+VVsourceAC.prototype.get = function VVsourceAC() {
 }
-/* autogenerated from "macros/Electrical/VoltageSensor.sci" */
-function VoltageSensor() {
-VoltageSensor.prototype.get = function VoltageSensor() {
-}
-VoltageSensor.prototype.set = function VoltageSensor() {
+VVsourceAC.prototype.set = function VVsourceAC() {
 x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,FR,exprs]=scicos_getvalue("Set voltage source parameter",["Frequency (Hz)"],list("vec",-1),exprs);
+if (!ok) {
+break
 }
+model.rpar=[FR];
+model.equations.parameters[2-1]=list(FR);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
+}
+/* autogenerated from "macros/Electrical/VoltageSensor.sci" */
+function VoltageSensor() {
 VoltageSensor.prototype.define = function VoltageSensor() {
 model=scicos_model();
 model.in1=1;
@@ -10644,14 +10639,14 @@ x.graphics.out_implicit=["I","E"];
 }
 VoltageSensor.prototype.details = function VoltageSensor() {
 }
+VoltageSensor.prototype.get = function VoltageSensor() {
 }
-/* autogenerated from "macros/Electrical/VariableResistor.sci" */
-function VariableResistor() {
-VariableResistor.prototype.get = function VariableResistor() {
-}
-VariableResistor.prototype.set = function VariableResistor() {
+VoltageSensor.prototype.set = function VoltageSensor() {
 x=arg1;
 }
+}
+/* autogenerated from "macros/Electrical/VariableResistor.sci" */
+function VariableResistor() {
 VariableResistor.prototype.define = function VariableResistor() {
 model=scicos_model();
 model.sim="VariableResistor";
@@ -10672,28 +10667,14 @@ x.graphics.out_implicit=["I"];
 }
 VariableResistor.prototype.details = function VariableResistor() {
 }
+VariableResistor.prototype.get = function VariableResistor() {
 }
-/* autogenerated from "macros/Electrical/Switch.sci" */
-function Switch() {
-Switch.prototype.get = function Switch() {
-}
-Switch.prototype.set = function Switch() {
+VariableResistor.prototype.set = function VariableResistor() {
 x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,Ron,Roff,exprs]=scicos_getvalue("Set non-ideal electrical switch parameters",["Resistance in On state (Ohm)","Resistance in Off state (Ohm)"],list("vec",1,"vec",1),exprs);
-if (!ok) {
-break
-}
-model.equations.parameters[2-1]=list(Ron,Roff);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
 }
 }
+/* autogenerated from "macros/Electrical/Switch.sci" */
+function Switch() {
 Switch.prototype.define = function Switch() {
 model=scicos_model();
 Ron=0.01;
@@ -10720,14 +10701,28 @@ x.graphics.out_implicit=["I"];
 }
 Switch.prototype.details = function Switch() {
 }
+Switch.prototype.get = function Switch() {
 }
-/* autogenerated from "macros/Electrical/MOTOR.sci" */
-function MOTOR() {
-MOTOR.prototype.get = function MOTOR() {
-}
-MOTOR.prototype.set = function MOTOR() {
+Switch.prototype.set = function Switch() {
 x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,Ron,Roff,exprs]=scicos_getvalue("Set non-ideal electrical switch parameters",["Resistance in On state (Ohm)","Resistance in Off state (Ohm)"],list("vec",1,"vec",1),exprs);
+if (!ok) {
+break
+}
+model.equations.parameters[2-1]=list(Ron,Roff);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
 }
+}
+/* autogenerated from "macros/Electrical/MOTOR.sci" */
+function MOTOR() {
 MOTOR.prototype.define = function MOTOR() {
 model=scicos_model();
 model.out=[1,1];
@@ -10743,28 +10738,14 @@ x.graphics.in_implicit=["I"];
 }
 MOTOR.prototype.details = function MOTOR() {
 }
+MOTOR.prototype.get = function MOTOR() {
 }
-/* autogenerated from "macros/Electrical/NMOS.sci" */
-function NMOS() {
-NMOS.prototype.get = function NMOS() {
-}
-NMOS.prototype.set = function NMOS() {
+MOTOR.prototype.set = function MOTOR() {
 x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,W,L,Beta,Vt,K2,K5,dW,dL,RDS,exprs]=scicos_getvalue("Set NMOS Transistor block parameters",["Width [m]","Length [m]","Transconductance parameter [A/(V*V)]","Zero bias threshold voltage [V]","Bulk threshold parameter","Reduction of pinch-off region","Narrowing of channel [m]","Shortening of channel [m]","Drain-Source-Resistance [Ohm]"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
-if (!ok) {
-break
-}
-model.equations.parameters[2-1]=list(W,L,Beta,Vt,K2,K5,dW,dL,RDS);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
 }
 }
+/* autogenerated from "macros/Electrical/NMOS.sci" */
+function NMOS() {
 NMOS.prototype.define = function NMOS() {
 model=scicos_model();
 W=20.e-6;
@@ -10795,29 +10776,28 @@ x.graphics.out_implicit=["I","I","I"];
 }
 NMOS.prototype.details = function NMOS() {
 }
+NMOS.prototype.get = function NMOS() {
 }
-/* autogenerated from "macros/Electrical/VsourceAC.sci" */
-function VsourceAC() {
-VsourceAC.prototype.get = function VsourceAC() {
-}
-VsourceAC.prototype.set = function VsourceAC() {
+NMOS.prototype.set = function NMOS() {
 x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,VA,FR,exprs]=scicos_getvalue("Set voltage source parameter",["Amplitude (Volt)","Frequency (Hz)"],list("vec",-1,"vec",-1),exprs);
+[ok,W,L,Beta,Vt,K2,K5,dW,dL,RDS,exprs]=scicos_getvalue("Set NMOS Transistor block parameters",["Width [m]","Length [m]","Transconductance parameter [A/(V*V)]","Zero bias threshold voltage [V]","Bulk threshold parameter","Reduction of pinch-off region","Narrowing of channel [m]","Shortening of channel [m]","Drain-Source-Resistance [Ohm]"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
 if (!ok) {
 break
 }
-model.rpar=[VA,FR];
-model.equations.parameters[2-1]=list(VA,FR);
+model.equations.parameters[2-1]=list(W,L,Beta,Vt,K2,K5,dW,dL,RDS);
 graphics.exprs=exprs;
 x.graphics=graphics;
 x.model=model;
 break
 }
 }
+}
+/* autogenerated from "macros/Electrical/VsourceAC.sci" */
+function VsourceAC() {
 VsourceAC.prototype.define = function VsourceAC() {
 model=scicos_model();
 model.in1=[1];
@@ -10842,28 +10822,29 @@ x.graphics.out_implicit=["I"];
 }
 VsourceAC.prototype.details = function VsourceAC() {
 }
+VsourceAC.prototype.get = function VsourceAC() {
 }
-/* autogenerated from "macros/Electrical/OpAmp.sci" */
-function OpAmp() {
-OpAmp.prototype.get = function OpAmp() {
-}
-OpAmp.prototype.set = function OpAmp() {
+VsourceAC.prototype.set = function VsourceAC() {
 x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
-while (false) {
-[ok,OLGain,SatH,SatL,exprs]=scicos_getvalue("Set the Operational Amplifier parameters",["Open Loop Gain","Positive saturation voltage","Negative saturation voltage"],list("vec",1,"vec",1,"vec",1),exprs);
+while (true) {
+[ok,VA,FR,exprs]=scicos_getvalue("Set voltage source parameter",["Amplitude (Volt)","Frequency (Hz)"],list("vec",-1,"vec",-1),exprs);
 if (!ok) {
 break
 }
-model.equations.parameters[2-1]=list(OLGain,SatH,SatL);
+model.rpar=[VA,FR];
+model.equations.parameters[2-1]=list(VA,FR);
 graphics.exprs=exprs;
 x.graphics=graphics;
 x.model=model;
 break
 }
 }
+}
+/* autogenerated from "macros/Electrical/OpAmp.sci" */
+function OpAmp() {
 OpAmp.prototype.define = function OpAmp() {
 S=[];
 Z=[];
@@ -10888,29 +10869,28 @@ x.graphics.out_implicit=["I"];
 }
 OpAmp.prototype.details = function OpAmp() {
 }
+OpAmp.prototype.get = function OpAmp() {
 }
-/* autogenerated from "macros/Electrical/Capacitor.sci" */
-function Capacitor() {
-Capacitor.prototype.get = function Capacitor() {
-}
-Capacitor.prototype.set = function Capacitor() {
+OpAmp.prototype.set = function OpAmp() {
 x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
-while (true) {
-[ok,C,v,exprs]=scicos_getvalue("Set Capacitor block parameter",["C (F)","Initial Voltage"],list("vec",1,"vec",1),exprs);
+while (false) {
+[ok,OLGain,SatH,SatL,exprs]=scicos_getvalue("Set the Operational Amplifier parameters",["Open Loop Gain","Positive saturation voltage","Negative saturation voltage"],list("vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break
 }
-model.rpar=C;
-model.equations.parameters[2-1]=list(C,v);
+model.equations.parameters[2-1]=list(OLGain,SatH,SatL);
 graphics.exprs=exprs;
 x.graphics=graphics;
 x.model=model;
 break
 }
 }
+}
+/* autogenerated from "macros/Electrical/Capacitor.sci" */
+function Capacitor() {
 Capacitor.prototype.define = function Capacitor() {
 model=scicos_model();
 C=0.01;
@@ -10935,28 +10915,29 @@ x.graphics.out_implicit=["I"];
 }
 Capacitor.prototype.details = function Capacitor() {
 }
+Capacitor.prototype.get = function Capacitor() {
 }
-/* autogenerated from "macros/Electrical/Gyrator.sci" */
-function Gyrator() {
-Gyrator.prototype.get = function Gyrator() {
-}
-Gyrator.prototype.set = function Gyrator() {
+Capacitor.prototype.set = function Capacitor() {
 x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
-x=arg1;
-exprs=x.graphics.exprs;
 while (true) {
-[ok,G1,G2,exprs]=scicos_getvalue(["Set Gyrator block parameters:","","G1: Gyration conductance","G2: Gyration conductance"],["G1","G2"],list("vec",1,"vec",1),exprs);
+[ok,C,v,exprs]=scicos_getvalue("Set Capacitor block parameter",["C (F)","Initial Voltage"],list("vec",1,"vec",1),exprs);
 if (!ok) {
 break
 }
-x.model.equations.parameters[2-1]=list(G1,G2);
-x.graphics.exprs=exprs;
+model.rpar=C;
+model.equations.parameters[2-1]=list(C,v);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
 break
 }
 }
+}
+/* autogenerated from "macros/Electrical/Gyrator.sci" */
+function Gyrator() {
 Gyrator.prototype.define = function Gyrator() {
 ModelName="Gyrator";
 PrametersValue=[1,1];
@@ -11007,9 +10988,47 @@ x.graphics.out_implicit=Typeout;
 }
 Gyrator.prototype.details = function Gyrator() {
 }
+Gyrator.prototype.get = function Gyrator() {
+}
+Gyrator.prototype.set = function Gyrator() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+x=arg1;
+exprs=x.graphics.exprs;
+while (true) {
+[ok,G1,G2,exprs]=scicos_getvalue(["Set Gyrator block parameters:","","G1: Gyration conductance","G2: Gyration conductance"],["G1","G2"],list("vec",1,"vec",1),exprs);
+if (!ok) {
+break
+}
+x.model.equations.parameters[2-1]=list(G1,G2);
+x.graphics.exprs=exprs;
+break
+}
+}
 }
 /* autogenerated from "macros/Misc/DEADBAND.sci" */
 function DEADBAND() {
+DEADBAND.prototype.define = function DEADBAND() {
+minp=-.5;
+maxp=.5;
+rpar=[maxp,minp];
+model=scicos_model();
+model.sim=list("deadband",4);
+model.in1=1;
+model.nzcross=2;
+model.nmode=1;
+model.out=1;
+model.rpar=rpar;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[string(maxp),string(minp),string(model.nmode)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+DEADBAND.prototype.details = function DEADBAND() {
+}
 DEADBAND.prototype.get = function DEADBAND() {
 }
 DEADBAND.prototype.set = function DEADBAND() {
@@ -11041,33 +11060,9 @@ break
 }
 }
 }
-DEADBAND.prototype.define = function DEADBAND() {
-minp=-.5;
-maxp=.5;
-rpar=[maxp,minp];
-model=scicos_model();
-model.sim=list("deadband",4);
-model.in1=1;
-model.nzcross=2;
-model.nmode=1;
-model.out=1;
-model.rpar=rpar;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[string(maxp),string(minp),string(model.nmode)];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-DEADBAND.prototype.details = function DEADBAND() {
-}
 }
 /* autogenerated from "macros/Misc/SUPER_f.sci" */
 function SUPER_f() {
-SUPER_f.prototype.get = function SUPER_f() {
-}
-SUPER_f.prototype.set = function SUPER_f() {
-xcos(arg1.model.rpar);
-}
 SUPER_f.prototype.define = function SUPER_f() {
 scs=scicos_diagram();
 scs.props.title="Super Block";
@@ -11091,9 +11086,35 @@ x=standard_define([2,2],model,[],gr_i);
 }
 SUPER_f.prototype.details = function SUPER_f() {
 }
+SUPER_f.prototype.get = function SUPER_f() {
+}
+SUPER_f.prototype.set = function SUPER_f() {
+xcos(arg1.model.rpar);
+}
 }
 /* autogenerated from "macros/Misc/fortran_block.sci" */
 function fortran_block() {
+fortran_block.prototype.define = function fortran_block() {
+model=scicos_model();
+model.sim=list(" ",1001);
+model.in1=1;
+model.out=1;
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=0;
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,false];
+funam="forty";
+label=list([sci2exp(model.in1),sci2exp(model.out),strcat(sci2exp(model.rpar)),funam],list([]));
+gr_i=[];
+x=standard_define([4,2],model,label,gr_i);
+}
+fortran_block.prototype.details = function fortran_block() {
+}
 fortran_block.prototype.get = function fortran_block() {
 }
 fortran_block.prototype.set = function fortran_block() {
@@ -11135,30 +11156,24 @@ break
 }
 }
 }
-fortran_block.prototype.define = function fortran_block() {
+}
+/* autogenerated from "macros/Misc/DIFF_f.sci" */
+function DIFF_f() {
+DIFF_f.prototype.define = function DIFF_f() {
+x0=[0,0];
 model=scicos_model();
-model.sim=list(" ",1001);
+model.sim=list("diffblk",10001);
 model.in1=1;
 model.out=1;
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=0;
+model.state=x0;
 model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-funam="forty";
-label=list([sci2exp(model.in1),sci2exp(model.out),strcat(sci2exp(model.rpar)),funam],list([]));
+model.dep_ut=[false,true];
+exprs=[strcat(sci2exp(x0[1-1])),strcat(sci2exp(x0[2-1]))];
 gr_i=[];
-x=standard_define([4,2],model,label,gr_i);
-}
-fortran_block.prototype.details = function fortran_block() {
+x=standard_define([2,2],model,exprs,gr_i);
 }
+DIFF_f.prototype.details = function DIFF_f() {
 }
-/* autogenerated from "macros/Misc/DIFF_f.sci" */
-function DIFF_f() {
 DIFF_f.prototype.get = function DIFF_f() {
 }
 DIFF_f.prototype.set = function DIFF_f() {
@@ -11179,24 +11194,48 @@ break
 }
 x.model.firing=[];
 }
-DIFF_f.prototype.define = function DIFF_f() {
-x0=[0,0];
+}
+/* autogenerated from "macros/Misc/BOUNCE.sci" */
+function BOUNCE() {
+BOUNCE.prototype.define = function BOUNCE() {
+n=2;
+k=1;
+ipar=[];
+for (i=1;i<=n;i+=1) {
+for (j=i+1;j<=n;j+=1) {
+ipar[k-1]=i;
+k=k+1;
+ipar[k-1]=j;
+k=k+1;
+}
+}
+walls=[0,5,0,5];
+x=[2,2.5];
+xd=[0,0];
+y=[3,5];
+yd=[0,0];
+g=9.81;
+C=0;
+rpar1=ones(n,1);
+rpar2=rpar1;
+state=[x,xd,y,yd];
+state=transpose(state);
 model=scicos_model();
-model.sim=list("diffblk",10001);
-model.in1=1;
-model.out=1;
-model.state=x0;
+model.sim=list("bounce_ball",4);
+model.in1=[];
+model.out=[n,n];
+model.state=state.slice();
+model.rpar=[rpar1,rpar2,walls,g,C];
+model.ipar=ipar;
+model.nzcross=n*(n-1)/2+4*n;
 model.blocktype="c";
 model.dep_ut=[false,true];
-exprs=[strcat(sci2exp(x0[1-1])),strcat(sci2exp(x0[2-1]))];
+exprs=[strcat(sci2exp(rpar1)),strcat(sci2exp(rpar2)),strcat(sci2exp(walls)),strcat(sci2exp(x)),strcat(sci2exp(xd)),strcat(sci2exp(y)),strcat(sci2exp(yd))];
 gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-DIFF_f.prototype.details = function DIFF_f() {
+x=standard_define([3,2],model,exprs,gr_i);
 }
+BOUNCE.prototype.details = function BOUNCE() {
 }
-/* autogenerated from "macros/Misc/BOUNCE.sci" */
-function BOUNCE() {
 BOUNCE.prototype.get = function BOUNCE() {
 }
 BOUNCE.prototype.set = function BOUNCE() {
@@ -11262,48 +11301,44 @@ break
 }
 }
 }
-BOUNCE.prototype.define = function BOUNCE() {
-n=2;
-k=1;
-ipar=[];
-for (i=1;i<=n;i+=1) {
-for (j=i+1;j<=n;j+=1) {
-ipar[k-1]=i;
-k=k+1;
-ipar[k-1]=j;
-k=k+1;
-}
 }
-walls=[0,5,0,5];
-x=[2,2.5];
-xd=[0,0];
-y=[3,5];
-yd=[0,0];
-g=9.81;
-C=0;
-rpar1=ones(n,1);
-rpar2=rpar1;
-state=[x,xd,y,yd];
-state=transpose(state);
+/* autogenerated from "macros/Misc/scifunc_block_m.sci" */
+function scifunc_block_m() {
+scifunc_block_m.prototype.define = function scifunc_block_m() {
+in1=1;
+out=1;
+clkin=[];
+clkout=[];
+x0=[];
+z0=[];
+typ="c";
+auto=[];
+rpar=[];
+it=1;
 model=scicos_model();
-model.sim=list("bounce_ball",4);
-model.in1=[];
-model.out=[n,n];
-model.state=state.slice();
-model.rpar=[rpar1,rpar2,walls,g,C];
-model.ipar=ipar;
-model.nzcross=n*(n-1)/2+4*n;
-model.blocktype="c";
-model.dep_ut=[false,true];
-exprs=[strcat(sci2exp(rpar1)),strcat(sci2exp(rpar2)),strcat(sci2exp(walls)),strcat(sci2exp(x)),strcat(sci2exp(xd)),strcat(sci2exp(y)),strcat(sci2exp(yd))];
+model.sim=list("scifunc",3);
+model.in1=in1;
+model.in2=in1;
+model.intyp=it;
+model.out=out;
+model.out2=out;
+model.outtyp=it;
+model.evtin=clkin;
+model.evtout=clkout;
+model.state=x0;
+model.dstate=z0;
+model.rpar=rpar;
+model.ipar=0;
+model.opar=list();
+model.blocktype=typ;
+model.firing=auto;
+model.dep_ut=[true,false];
+exprs=list([sci2exp([in1,in1]),sci2exp([out,out]),sci2exp(clkin),sci2exp(clkout),strcat(sci2exp(x0)),strcat(sci2exp(z0)),strcat(sci2exp(rpar)),sci2exp(auto),sci2exp(0)],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," "));
 gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-BOUNCE.prototype.details = function BOUNCE() {
+x=standard_define([4,2],model,exprs,gr_i);
 }
+scifunc_block_m.prototype.details = function scifunc_block_m() {
 }
-/* autogenerated from "macros/Misc/scifunc_block_m.sci" */
-function scifunc_block_m() {
 scifunc_block_m.prototype.get = function scifunc_block_m() {
 }
 scifunc_block_m.prototype.set = function scifunc_block_m() {
@@ -11360,7 +11395,10 @@ break
 }
 needcompile=resume(needcompile)
 }
-scifunc_block_m.prototype.define = function scifunc_block_m() {
+}
+/* autogenerated from "macros/Misc/c_block.sci" */
+function c_block() {
+c_block.prototype.define = function c_block() {
 in1=1;
 out=1;
 clkin=[];
@@ -11370,34 +11408,26 @@ z0=[];
 typ="c";
 auto=[];
 rpar=[];
-it=1;
+funam="toto";
 model=scicos_model();
-model.sim=list("scifunc",3);
+model.sim=list(" ",2001);
 model.in1=in1;
-model.in2=in1;
-model.intyp=it;
 model.out=out;
-model.out2=out;
-model.outtyp=it;
 model.evtin=clkin;
 model.evtout=clkout;
 model.state=x0;
 model.dstate=z0;
 model.rpar=rpar;
 model.ipar=0;
-model.opar=list();
 model.blocktype=typ;
 model.firing=auto;
 model.dep_ut=[true,false];
-exprs=list([sci2exp([in1,in1]),sci2exp([out,out]),sci2exp(clkin),sci2exp(clkout),strcat(sci2exp(x0)),strcat(sci2exp(z0)),strcat(sci2exp(rpar)),sci2exp(auto),sci2exp(0)],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," "));
+label=list([sci2exp(in1),sci2exp(out),strcat(sci2exp(rpar)),funam],list([]));
 gr_i=[];
-x=standard_define([4,2],model,exprs,gr_i);
-}
-scifunc_block_m.prototype.details = function scifunc_block_m() {
+x=standard_define([3,2],model,label,gr_i);
 }
+c_block.prototype.details = function c_block() {
 }
-/* autogenerated from "macros/Misc/c_block.sci" */
-function c_block() {
 c_block.prototype.get = function c_block() {
 }
 c_block.prototype.set = function c_block() {
@@ -11439,39 +11469,27 @@ break
 }
 }
 }
-c_block.prototype.define = function c_block() {
-in1=1;
-out=1;
-clkin=[];
-clkout=[];
-x0=[];
-z0=[];
-typ="c";
-auto=[];
-rpar=[];
-funam="toto";
+}
+/* autogenerated from "macros/Misc/CONSTRAINT2_c.sci" */
+function CONSTRAINT2_c() {
+CONSTRAINT2_c.prototype.define = function CONSTRAINT2_c() {
+x0=[0];
+xd0=[0];
+id=[0];
 model=scicos_model();
-model.sim=list(" ",2001);
-model.in1=in1;
-model.out=out;
-model.evtin=clkin;
-model.evtout=clkout;
-model.state=x0;
-model.dstate=z0;
-model.rpar=rpar;
-model.ipar=0;
-model.blocktype=typ;
-model.firing=auto;
-model.dep_ut=[true,false];
-label=list([sci2exp(in1),sci2exp(out),strcat(sci2exp(rpar)),funam],list([]));
+model.sim=list("constraint_c",10004);
+model.in1=1;
+model.out=[1,1];
+model.state=[x0,xd0];
+model.ipar=id;
+model.blocktype="c";
+model.dep_ut=[false,true];
+exprs=list(strcat(sci2exp(x0)),strcat(sci2exp(xd0)),strcat(sci2exp(id)));
 gr_i=[];
-x=standard_define([3,2],model,label,gr_i);
-}
-c_block.prototype.details = function c_block() {
+x=standard_define([3,2],model,exprs,gr_i);
 }
+CONSTRAINT2_c.prototype.details = function CONSTRAINT2_c() {
 }
-/* autogenerated from "macros/Misc/CONSTRAINT2_c.sci" */
-function CONSTRAINT2_c() {
 CONSTRAINT2_c.prototype.get = function CONSTRAINT2_c() {
 }
 CONSTRAINT2_c.prototype.set = function CONSTRAINT2_c() {
@@ -11523,27 +11541,31 @@ break
 }
 }
 }
-CONSTRAINT2_c.prototype.define = function CONSTRAINT2_c() {
-x0=[0];
-xd0=[0];
-id=[0];
+}
+/* autogenerated from "macros/Misc/generic_block.sci" */
+function generic_block() {
+generic_block.prototype.define = function generic_block() {
 model=scicos_model();
-model.sim=list("constraint_c",10004);
+function_name="sinblk";
+funtyp=1;
+model.sim=list(function_name,funtyp);
 model.in1=1;
-model.out=[1,1];
-model.state=[x0,xd0];
-model.ipar=id;
+model.out=1;
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[];
 model.blocktype="c";
-model.dep_ut=[false,true];
-exprs=list(strcat(sci2exp(x0)),strcat(sci2exp(xd0)),strcat(sci2exp(id)));
+model.firing=[];
+model.dep_ut=[true,false];
+label=[function_name,sci2exp(funtyp),sci2exp(model.in1),sci2exp(model.out),sci2exp(model.evtin),sci2exp(model.evtout),sci2exp(model.state),sci2exp(model.dstate),sci2exp(model.rpar),sci2exp(model.ipar),sci2exp(model.firing),"y","n"];
 gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-CONSTRAINT2_c.prototype.details = function CONSTRAINT2_c() {
+x=standard_define([2,2],model,label,gr_i);
 }
+generic_block.prototype.details = function generic_block() {
 }
-/* autogenerated from "macros/Misc/generic_block.sci" */
-function generic_block() {
 generic_block.prototype.get = function generic_block() {
 }
 generic_block.prototype.set = function generic_block() {
@@ -11616,31 +11638,26 @@ break
 }
 needcompile=resume(needcompile)
 }
-generic_block.prototype.define = function generic_block() {
+}
+/* autogenerated from "macros/Misc/RATELIMITER.sci" */
+function RATELIMITER() {
+RATELIMITER.prototype.define = function RATELIMITER() {
+minp=-1;
+maxp=1;
+rpar=[maxp,minp];
 model=scicos_model();
-function_name="sinblk";
-funtyp=1;
-model.sim=list(function_name,funtyp);
+model.sim=list("ratelimiter",4);
 model.in1=1;
 model.out=1;
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[];
+model.rpar=rpar;
 model.blocktype="c";
-model.firing=[];
 model.dep_ut=[true,false];
-label=[function_name,sci2exp(funtyp),sci2exp(model.in1),sci2exp(model.out),sci2exp(model.evtin),sci2exp(model.evtout),sci2exp(model.state),sci2exp(model.dstate),sci2exp(model.rpar),sci2exp(model.ipar),sci2exp(model.firing),"y","n"];
+exprs=[string(maxp),string(minp)];
 gr_i=[];
-x=standard_define([2,2],model,label,gr_i);
-}
-generic_block.prototype.details = function generic_block() {
+x=standard_define([3.5,2],model,exprs,gr_i);
 }
+RATELIMITER.prototype.details = function RATELIMITER() {
 }
-/* autogenerated from "macros/Misc/RATELIMITER.sci" */
-function RATELIMITER() {
 RATELIMITER.prototype.get = function RATELIMITER() {
 }
 RATELIMITER.prototype.set = function RATELIMITER() {
@@ -11665,26 +11682,19 @@ break
 }
 }
 }
-RATELIMITER.prototype.define = function RATELIMITER() {
-minp=-1;
-maxp=1;
-rpar=[maxp,minp];
+}
+/* autogenerated from "macros/Misc/DEBUG.sci" */
+function DEBUG() {
+DEBUG.prototype.define = function DEBUG() {
 model=scicos_model();
-model.sim=list("ratelimiter",4);
-model.in1=1;
-model.out=1;
-model.rpar=rpar;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[string(maxp),string(minp)];
+model.sim=list("%debug_scicos",99);
+model.blocktype="d";
+exprs=list("","xcos_debug_gui(flag,block);");
 gr_i=[];
-x=standard_define([3.5,2],model,exprs,gr_i);
-}
-RATELIMITER.prototype.details = function RATELIMITER() {
+x=standard_define([8,2],model,exprs,gr_i);
 }
+DEBUG.prototype.details = function DEBUG() {
 }
-/* autogenerated from "macros/Misc/DEBUG.sci" */
-function DEBUG() {
 DEBUG.prototype.get = function DEBUG() {
 }
 DEBUG.prototype.set = function DEBUG() {
@@ -11720,19 +11730,26 @@ graphics.exprs=exprs;
 x.graphics=graphics;
 }
 }
-DEBUG.prototype.define = function DEBUG() {
+}
+/* autogenerated from "macros/Misc/RELATIONALOP.sci" */
+function RELATIONALOP() {
+RELATIONALOP.prototype.define = function RELATIONALOP() {
+ipar=[2];
+label="&lt";
 model=scicos_model();
-model.sim=list("%debug_scicos",99);
-model.blocktype="d";
-exprs=list("","xcos_debug_gui(flag,block);");
+model.sim=list("relationalop",4);
+model.in1=[1,1];
+model.out=1;
+model.ipar=ipar;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[string(ipar),string(0)];
 gr_i=[];
-x=standard_define([8,2],model,exprs,gr_i);
-}
-DEBUG.prototype.details = function DEBUG() {
+x=standard_define([2,2],model,exprs,gr_i);
+x.graphics.style=["fontSize=13;fontStyle=1;displayedLabel="+label];
 }
+RELATIONALOP.prototype.details = function RELATIONALOP() {
 }
-/* autogenerated from "macros/Misc/RELATIONALOP.sci" */
-function RELATIONALOP() {
 RELATIONALOP.prototype.get = function RELATIONALOP() {
 }
 RELATIONALOP.prototype.set = function RELATIONALOP() {
@@ -11806,26 +11823,25 @@ break
 }
 }
 }
-RELATIONALOP.prototype.define = function RELATIONALOP() {
-ipar=[2];
-label="&lt";
+}
+/* autogenerated from "macros/Misc/CONSTRAINT_c.sci" */
+function CONSTRAINT_c() {
+CONSTRAINT_c.prototype.define = function CONSTRAINT_c() {
+x0=[0,0];
 model=scicos_model();
-model.sim=list("relationalop",4);
-model.in1=[1,1];
+model.sim=list("constraint_c",10004);
+model.in1=1;
 model.out=1;
-model.ipar=ipar;
+model.ipar=0;
+model.state=x0;
 model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[string(ipar),string(0)];
+model.dep_ut=[false,true];
+exprs="0";
 gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-x.graphics.style=["fontSize=13;fontStyle=1;displayedLabel="+label];
-}
-RELATIONALOP.prototype.details = function RELATIONALOP() {
+x=standard_define([3,2],model,exprs,gr_i);
 }
+CONSTRAINT_c.prototype.details = function CONSTRAINT_c() {
 }
-/* autogenerated from "macros/Misc/CONSTRAINT_c.sci" */
-function CONSTRAINT_c() {
 CONSTRAINT_c.prototype.get = function CONSTRAINT_c() {
 }
 CONSTRAINT_c.prototype.set = function CONSTRAINT_c() {
@@ -11857,30 +11873,9 @@ break
 }
 }
 }
-CONSTRAINT_c.prototype.define = function CONSTRAINT_c() {
-x0=[0,0];
-model=scicos_model();
-model.sim=list("constraint_c",10004);
-model.in1=1;
-model.out=1;
-model.ipar=0;
-model.state=x0;
-model.blocktype="c";
-model.dep_ut=[false,true];
-exprs="0";
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-CONSTRAINT_c.prototype.details = function CONSTRAINT_c() {
-}
 }
 /* autogenerated from "macros/Misc/IMPSPLIT_f.sci" */
 function IMPSPLIT_f() {
-IMPSPLIT_f.prototype.get = function IMPSPLIT_f() {
-}
-IMPSPLIT_f.prototype.set = function IMPSPLIT_f() {
-x=arg1;
-}
 IMPSPLIT_f.prototype.define = function IMPSPLIT_f() {
 model=scicos_model();
 model.sim="limpsplit";
@@ -11897,9 +11892,36 @@ x.graphics.out_implicit=["I","I"];
 }
 IMPSPLIT_f.prototype.details = function IMPSPLIT_f() {
 }
+IMPSPLIT_f.prototype.get = function IMPSPLIT_f() {
+}
+IMPSPLIT_f.prototype.set = function IMPSPLIT_f() {
+x=arg1;
+}
 }
 /* autogenerated from "macros/Misc/generic_block2.sci" */
 function generic_block2() {
+generic_block2.prototype.define = function generic_block2() {
+model=scicos_model();
+function_name="sinblk";
+funtyp=1;
+model.sim=list(function_name,funtyp);
+model.in1=1;
+model.out=1;
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[];
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,false];
+label=[function_name,sci2exp(funtyp),sci2exp(model.in1),sci2exp(model.out),sci2exp(model.evtin),sci2exp(model.evtout),sci2exp(model.state),sci2exp(model.dstate),sci2exp(model.rpar),sci2exp(model.ipar),sci2exp(model.nmode),sci2exp(model.nzcross),sci2exp(model.firing),"y","n"];
+gr_i=[];
+x=standard_define([2,2],model,label,gr_i);
+}
+generic_block2.prototype.details = function generic_block2() {
+}
 generic_block2.prototype.get = function generic_block2() {
 }
 generic_block2.prototype.set = function generic_block2() {
@@ -11974,31 +11996,27 @@ break
 }
 needcompile=resume(needcompile)
 }
-generic_block2.prototype.define = function generic_block2() {
+}
+/* autogenerated from "macros/Misc/generic_block3.sci" */
+function generic_block3() {
+generic_block3.prototype.define = function generic_block3() {
 model=scicos_model();
 function_name="sinblk";
-funtyp=1;
+funtyp=4;
 model.sim=list(function_name,funtyp);
 model.in1=1;
+model.in2=1;
+model.intyp=1;
 model.out=1;
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[];
-model.blocktype="c";
-model.firing=[];
+model.out2=1;
+model.outtyp=1;
 model.dep_ut=[true,false];
-label=[function_name,sci2exp(funtyp),sci2exp(model.in1),sci2exp(model.out),sci2exp(model.evtin),sci2exp(model.evtout),sci2exp(model.state),sci2exp(model.dstate),sci2exp(model.rpar),sci2exp(model.ipar),sci2exp(model.nmode),sci2exp(model.nzcross),sci2exp(model.firing),"y","n"];
+label=[function_name,sci2exp(funtyp),sci2exp([model.in1,model.in2]),sci2exp(model.intyp),sci2exp([model.out,model.out2]),sci2exp(model.outtyp),sci2exp(model.evtin),sci2exp(model.evtout),sci2exp(model.state),sci2exp(model.dstate),sci2exp(model.odstate),sci2exp(model.rpar),sci2exp(model.ipar),sci2exp(model.opar),sci2exp(model.nmode),sci2exp(model.nzcross),sci2exp(model.firing),"y","n"];
 gr_i=[];
-x=standard_define([2,2],model,label,gr_i);
-}
-generic_block2.prototype.details = function generic_block2() {
+x=standard_define([4,2],model,label,gr_i);
 }
+generic_block3.prototype.details = function generic_block3() {
 }
-/* autogenerated from "macros/Misc/generic_block3.sci" */
-function generic_block3() {
 generic_block3.prototype.get = function generic_block3() {
 }
 generic_block3.prototype.set = function generic_block3() {
@@ -12081,41 +12099,40 @@ break
 }
 needcompile=resume(needcompile)
 }
-generic_block3.prototype.define = function generic_block3() {
-model=scicos_model();
-function_name="sinblk";
-funtyp=4;
-model.sim=list(function_name,funtyp);
-model.in1=1;
-model.in2=1;
-model.intyp=1;
-model.out=1;
-model.out2=1;
-model.outtyp=1;
-model.dep_ut=[true,false];
-label=[function_name,sci2exp(funtyp),sci2exp([model.in1,model.in2]),sci2exp(model.intyp),sci2exp([model.out,model.out2]),sci2exp(model.outtyp),sci2exp(model.evtin),sci2exp(model.evtout),sci2exp(model.state),sci2exp(model.dstate),sci2exp(model.odstate),sci2exp(model.rpar),sci2exp(model.ipar),sci2exp(model.opar),sci2exp(model.nmode),sci2exp(model.nzcross),sci2exp(model.firing),"y","n"];
-gr_i=[];
-x=standard_define([4,2],model,label,gr_i);
-}
-generic_block3.prototype.details = function generic_block3() {
-}
 }
 /* autogenerated from "macros/Misc/DEBUG_SCICOS.sci" */
 function DEBUG_SCICOS() {
+DEBUG_SCICOS.prototype.define = function DEBUG_SCICOS() {
+x=DEBUG("define");
+}
+DEBUG_SCICOS.prototype.details = function DEBUG_SCICOS() {
+}
 DEBUG_SCICOS.prototype.get = function DEBUG_SCICOS() {
 }
 DEBUG_SCICOS.prototype.set = function DEBUG_SCICOS() {
 arg1.gui="DEBUG";
 [x,y,typ]=DEBUG("set",arg1);
 }
-DEBUG_SCICOS.prototype.define = function DEBUG_SCICOS() {
-x=DEBUG("define");
-}
-DEBUG_SCICOS.prototype.details = function DEBUG_SCICOS() {
-}
 }
 /* autogenerated from "macros/Misc/EDGETRIGGER.sci" */
 function EDGETRIGGER() {
+EDGETRIGGER.prototype.define = function EDGETRIGGER() {
+edge=1;
+model=scicos_model();
+model.sim=list("edgetrig",4);
+model.in1=1;
+model.out=1;
+model.dstate=0;
+model.nzcross=1;
+model.ipar=sign(edge);
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[string(edge)];
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+EDGETRIGGER.prototype.details = function EDGETRIGGER() {
+}
 EDGETRIGGER.prototype.get = function EDGETRIGGER() {
 }
 EDGETRIGGER.prototype.set = function EDGETRIGGER() {
@@ -12135,26 +12152,25 @@ x.model=model;
 break
 }
 }
-EDGETRIGGER.prototype.define = function EDGETRIGGER() {
-edge=1;
-model=scicos_model();
-model.sim=list("edgetrig",4);
-model.in1=1;
-model.out=1;
-model.dstate=0;
-model.nzcross=1;
-model.ipar=sign(edge);
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[string(edge)];
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-EDGETRIGGER.prototype.details = function EDGETRIGGER() {
-}
 }
 /* autogenerated from "macros/Misc/TEXT_f.sci" */
 function TEXT_f() {
+TEXT_f.prototype.define = function TEXT_f() {
+font=2;
+siz=1;
+model=scicos_model();
+model.sim="text";
+model.rpar="Text";
+model.ipar=[font,siz];
+exprs=["Text",string(font),string(siz)];
+graphics=scicos_graphics();
+graphics.orig=[0,0];
+graphics.sz=[2,1];
+graphics.exprs=exprs;
+x=mlist(["Text","graphics","model","void","gui"],graphics,model," ","TEXT_f");
+}
+TEXT_f.prototype.details = function TEXT_f() {
+}
 TEXT_f.prototype.get = function TEXT_f() {
 }
 TEXT_f.prototype.set = function TEXT_f() {
@@ -12202,25 +12218,29 @@ break
 }
 }
 }
-TEXT_f.prototype.define = function TEXT_f() {
-font=2;
-siz=1;
-model=scicos_model();
-model.sim="text";
-model.rpar="Text";
-model.ipar=[font,siz];
-exprs=["Text",string(font),string(siz)];
-graphics=scicos_graphics();
-graphics.orig=[0,0];
-graphics.sz=[2,1];
-graphics.exprs=exprs;
-x=mlist(["Text","graphics","model","void","gui"],graphics,model," ","TEXT_f");
-}
-TEXT_f.prototype.details = function TEXT_f() {
-}
 }
 /* autogenerated from "macros/Misc/HYSTHERESIS.sci" */
 function HYSTHERESIS() {
+HYSTHERESIS.prototype.define = function HYSTHERESIS() {
+in1=1;
+ipar=[0];
+nzz=2;
+rpar=[1,0,1,0];
+model=scicos_model();
+model.sim=list("hystheresis",4);
+model.in1=in1;
+model.out=1;
+model.rpar=rpar;
+model.nzcross=nzz;
+model.nmode=1;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[string(rpar),string(sign(nzz))];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+HYSTHERESIS.prototype.details = function HYSTHERESIS() {
+}
 HYSTHERESIS.prototype.get = function HYSTHERESIS() {
 }
 HYSTHERESIS.prototype.set = function HYSTHERESIS() {
@@ -12248,29 +12268,42 @@ break
 }
 }
 }
-HYSTHERESIS.prototype.define = function HYSTHERESIS() {
+}
+/* autogenerated from "macros/Misc/CBLOCK.sci" */
+function CBLOCK() {
+CBLOCK.prototype.define = function CBLOCK() {
 in1=1;
-ipar=[0];
-nzz=2;
-rpar=[1,0,1,0];
+out=1;
+clkin=[];
+clkout=[];
+x0=[];
+z0=[];
+typ="c";
+auto=[];
+rpar=[];
+ipar=[];
+funam="toto";
+ng=0;
 model=scicos_model();
-model.sim=list("hystheresis",4);
+model.sim=list(" ",2004);
 model.in1=in1;
-model.out=1;
+model.out=out;
+model.evtin=clkin;
+model.evtout=clkout;
+model.state=x0;
+model.dstate=z0;
 model.rpar=rpar;
-model.nzcross=nzz;
-model.nmode=1;
-model.blocktype="c";
+model.ipar=ipar;
+model.blocktype=typ;
+model.firing=auto;
 model.dep_ut=[true,false];
-exprs=[string(rpar),string(sign(nzz))];
+model.nzcross=ng;
+label=list(transpose([funam,"n",sci2exp(in1),sci2exp(out),sci2exp(clkin),sci2exp(clkout),sci2exp(x0),sci2exp(0),sci2exp(z0),sci2exp(rpar),sci2exp(ipar),sci2exp(auto),"y","n"]),[]);
 gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-HYSTHERESIS.prototype.details = function HYSTHERESIS() {
+x=standard_define([4,2],model,label,gr_i);
 }
+CBLOCK.prototype.details = function CBLOCK() {
 }
-/* autogenerated from "macros/Misc/CBLOCK.sci" */
-function CBLOCK() {
 CBLOCK.prototype.get = function CBLOCK() {
 }
 CBLOCK.prototype.set = function CBLOCK() {
@@ -12363,42 +12396,26 @@ break
 }
 }
 }
-CBLOCK.prototype.define = function CBLOCK() {
-in1=1;
-out=1;
-clkin=[];
-clkout=[];
-x0=[];
-z0=[];
-typ="c";
-auto=[];
-rpar=[];
-ipar=[];
+}
+/* autogenerated from "macros/Misc/CBLOCK4.sci" */
+function CBLOCK4() {
+CBLOCK4.prototype.define = function CBLOCK4() {
 funam="toto";
-ng=0;
 model=scicos_model();
 model.sim=list(" ",2004);
-model.in1=in1;
-model.out=out;
-model.evtin=clkin;
-model.evtout=clkout;
-model.state=x0;
-model.dstate=z0;
-model.rpar=rpar;
-model.ipar=ipar;
-model.blocktype=typ;
-model.firing=auto;
+model.in1=1;
+model.in2=1;
+model.intyp=1;
+model.out=1;
+model.out2=1;
+model.outtyp=1;
 model.dep_ut=[true,false];
-model.nzcross=ng;
-label=list(transpose([funam,"n",sci2exp(in1),sci2exp(out),sci2exp(clkin),sci2exp(clkout),sci2exp(x0),sci2exp(0),sci2exp(z0),sci2exp(rpar),sci2exp(ipar),sci2exp(auto),"y","n"]),[]);
+label=list([funam,"n",sci2exp([model.in1,model.in2]),sci2exp(model.intyp),sci2exp([model.out,model.out2]),sci2exp(model.outtyp),sci2exp(model.evtin),sci2exp(model.evtout),sci2exp(model.state),sci2exp(model.dstate),sci2exp(model.odstate),sci2exp(model.rpar),sci2exp(model.ipar),sci2exp(model.opar),sci2exp(model.nmode),sci2exp(model.nzcross),sci2exp(model.firing),"y","n"],[]);
 gr_i=[];
 x=standard_define([4,2],model,label,gr_i);
 }
-CBLOCK.prototype.details = function CBLOCK() {
-}
+CBLOCK4.prototype.details = function CBLOCK4() {
 }
-/* autogenerated from "macros/Misc/CBLOCK4.sci" */
-function CBLOCK4() {
 CBLOCK4.prototype.get = function CBLOCK4() {
 }
 CBLOCK4.prototype.set = function CBLOCK4() {
@@ -12489,26 +12506,45 @@ break
 }
 }
 }
-CBLOCK4.prototype.define = function CBLOCK4() {
-funam="toto";
+}
+/* autogenerated from "macros/Misc/BOUNCEXY.sci" */
+function BOUNCEXY() {
+BOUNCEXY.prototype.define = function BOUNCEXY() {
+win=-1;
+imode=1;
+clrs=[1,2];
+siz=[1,1];
+xmin=-5;
+xmax=5;
+ymin=0;
+ymax=15;
 model=scicos_model();
-model.sim=list(" ",2004);
-model.in1=1;
-model.in2=1;
-model.intyp=1;
-model.out=1;
-model.out2=1;
-model.outtyp=1;
-model.dep_ut=[true,false];
-label=list([funam,"n",sci2exp([model.in1,model.in2]),sci2exp(model.intyp),sci2exp([model.out,model.out2]),sci2exp(model.outtyp),sci2exp(model.evtin),sci2exp(model.evtout),sci2exp(model.state),sci2exp(model.dstate),sci2exp(model.odstate),sci2exp(model.rpar),sci2exp(model.ipar),sci2exp(model.opar),sci2exp(model.nmode),sci2exp(model.nzcross),sci2exp(model.firing),"y","n"],[]);
-gr_i=[];
-x=standard_define([4,2],model,label,gr_i);
+model.sim=list("bouncexy",4);
+model.in1=[-1,-1];
+model.in2=[1,1];
+model.intyp=[1,1];
+model.evtin=1;
+z=[];
+for (i=1;i<=size(clrs,"*");i+=1) {
+z[6*(i-1)+1-1]=0;
+z[6*(i-1)+2-1]=0;
+z[6*(i-1)+3-1]=2*siz(i);
+z[6*(i-1)+4-1]=2*siz(i);
+z[6*(i-1)+5-1]=0.000;
+z[6*(i-1)+6-1]=64.0*360.000;
 }
-CBLOCK4.prototype.details = function CBLOCK4() {
+model.dstate=z;
+model.rpar=[xmin,xmax,ymin,ymax];
+model.ipar=[win,imode,clrs.slice()];
+model.blocktype="d";
+model.firing=[];
+model.dep_ut=[false,false];
+exprs=[strcat(sci2exp(clrs)),strcat(sci2exp(siz)),strcat(sci2exp(win)),strcat(sci2exp(1)),strcat(sci2exp(xmin)),strcat(sci2exp(xmax)),strcat(sci2exp(ymin)),strcat(sci2exp(ymax))];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
 }
+BOUNCEXY.prototype.details = function BOUNCEXY() {
 }
-/* autogenerated from "macros/Misc/BOUNCEXY.sci" */
-function BOUNCEXY() {
 BOUNCEXY.prototype.get = function BOUNCEXY() {
 }
 BOUNCEXY.prototype.set = function BOUNCEXY() {
@@ -12563,45 +12599,24 @@ break
 }
 }
 }
-BOUNCEXY.prototype.define = function BOUNCEXY() {
-win=-1;
-imode=1;
-clrs=[1,2];
-siz=[1,1];
-xmin=-5;
-xmax=5;
-ymin=0;
-ymax=15;
-model=scicos_model();
-model.sim=list("bouncexy",4);
-model.in1=[-1,-1];
-model.in2=[1,1];
-model.intyp=[1,1];
-model.evtin=1;
-z=[];
-for (i=1;i<=size(clrs,"*");i+=1) {
-z[6*(i-1)+1-1]=0;
-z[6*(i-1)+2-1]=0;
-z[6*(i-1)+3-1]=2*siz(i);
-z[6*(i-1)+4-1]=2*siz(i);
-z[6*(i-1)+5-1]=0.000;
-z[6*(i-1)+6-1]=64.0*360.000;
 }
-model.dstate=z;
-model.rpar=[xmin,xmax,ymin,ymax];
-model.ipar=[win,imode,clrs.slice()];
-model.blocktype="d";
-model.firing=[];
-model.dep_ut=[false,false];
-exprs=[strcat(sci2exp(clrs)),strcat(sci2exp(siz)),strcat(sci2exp(win)),strcat(sci2exp(1)),strcat(sci2exp(xmin)),strcat(sci2exp(xmax)),strcat(sci2exp(ymin)),strcat(sci2exp(ymax))];
+/* autogenerated from "macros/Misc/BACKLASH.sci" */
+function BACKLASH() {
+BACKLASH.prototype.define = function BACKLASH() {
+exprs=["0","1","1"];
+model=scicos_model();
+model.sim=list("backlash",4);
+model.in1=1;
+model.out=1;
+model.rpar=[0,1];
+model.nzcross=2;
+model.blocktype="c";
+model.dep_ut=[true,false];
 gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-BOUNCEXY.prototype.details = function BOUNCEXY() {
+x=standard_define([3,2],model,exprs,gr_i);
 }
+BACKLASH.prototype.details = function BACKLASH() {
 }
-/* autogenerated from "macros/Misc/BACKLASH.sci" */
-function BACKLASH() {
 BACKLASH.prototype.get = function BACKLASH() {
 }
 BACKLASH.prototype.set = function BACKLASH() {
@@ -12631,24 +12646,31 @@ break
 }
 }
 }
-BACKLASH.prototype.define = function BACKLASH() {
-exprs=["0","1","1"];
+}
+/* autogenerated from "macros/Misc/BPLATFORM.sci" */
+function BPLATFORM() {
+BPLATFORM.prototype.define = function BPLATFORM() {
+plen=2;
+csiz=2;
+phi=0;
+xmin=-5;
+xmax=5;
+ymin=0;
+ymax=15;
 model=scicos_model();
-model.sim=list("backlash",4);
-model.in1=1;
-model.out=1;
-model.rpar=[0,1];
-model.nzcross=2;
-model.blocktype="c";
-model.dep_ut=[true,false];
+model.sim=list("bplatform2",5);
+model.in1=[1,1];
+model.evtin=1;
+model.dstate=0;
+model.rpar=[plen,csiz,phi,xmin,xmax,ymin,ymax];
+model.blocktype="d";
+model.dep_ut=[false,false];
+exprs=string(model.rpar);
 gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-BACKLASH.prototype.details = function BACKLASH() {
+x=standard_define([2,2],model,exprs,gr_i);
 }
+BPLATFORM.prototype.details = function BPLATFORM() {
 }
-/* autogenerated from "macros/Misc/BPLATFORM.sci" */
-function BPLATFORM() {
 BPLATFORM.prototype.get = function BPLATFORM() {
 }
 BPLATFORM.prototype.set = function BPLATFORM() {
@@ -12687,31 +12709,22 @@ break
 }
 }
 }
-BPLATFORM.prototype.define = function BPLATFORM() {
-plen=2;
-csiz=2;
-phi=0;
-xmin=-5;
-xmax=5;
-ymin=0;
-ymax=15;
+}
+/* autogenerated from "macros/Misc/func_block.sci" */
+function func_block() {
+func_block.prototype.define = function func_block() {
 model=scicos_model();
-model.sim=list("bplatform2",5);
-model.in1=[1,1];
-model.evtin=1;
-model.dstate=0;
-model.rpar=[plen,csiz,phi,xmin,xmax,ymin,ymax];
-model.blocktype="d";
-model.dep_ut=[false,false];
-exprs=string(model.rpar);
+model.sim=" ";
+model.in1=1;
+model.out=1;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs="v=sin(u);y=u*v";
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 }
-BPLATFORM.prototype.details = function BPLATFORM() {
-}
+func_block.prototype.details = function func_block() {
 }
-/* autogenerated from "macros/Misc/func_block.sci" */
-function func_block() {
 func_block.prototype.get = function func_block() {
 }
 func_block.prototype.set = function func_block() {
@@ -12728,27 +12741,9 @@ x.model=model;
 x.graphics=graphics;
 }
 }
-func_block.prototype.define = function func_block() {
-model=scicos_model();
-model.sim=" ";
-model.in1=1;
-model.out=1;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs="v=sin(u);y=u*v";
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-func_block.prototype.details = function func_block() {
-}
 }
 /* autogenerated from "macros/Misc/SPLIT_f.sci" */
 function SPLIT_f() {
-SPLIT_f.prototype.get = function SPLIT_f() {
-}
-SPLIT_f.prototype.set = function SPLIT_f() {
-x=arg1;
-}
 SPLIT_f.prototype.define = function SPLIT_f() {
 model=scicos_model();
 model.sim="lsplit";
@@ -12760,9 +12755,36 @@ x=standard_define([1,1]/3,model,[],[]);
 }
 SPLIT_f.prototype.details = function SPLIT_f() {
 }
+SPLIT_f.prototype.get = function SPLIT_f() {
+}
+SPLIT_f.prototype.set = function SPLIT_f() {
+x=arg1;
+}
 }
 /* autogenerated from "macros/Misc/PENDULUM_ANIM.sci" */
 function PENDULUM_ANIM() {
+PENDULUM_ANIM.prototype.define = function PENDULUM_ANIM() {
+plen=2;
+csiz=2;
+phi=0;
+xmin=-5;
+xmax=5;
+ymin=-5;
+ymax=5;
+model=scicos_model();
+model.sim=list("anim_pen",5);
+model.in1=[1,1];
+model.evtin=1;
+model.dstate=0;
+model.rpar=[plen,csiz,phi,xmin,xmax,ymin,ymax];
+model.blocktype="d";
+model.dep_ut=[false,false];
+exprs=string(model.rpar);
+gr_i=[];
+x=standard_define([3,3],model,exprs,gr_i);
+}
+PENDULUM_ANIM.prototype.details = function PENDULUM_ANIM() {
+}
 PENDULUM_ANIM.prototype.get = function PENDULUM_ANIM() {
 }
 PENDULUM_ANIM.prototype.set = function PENDULUM_ANIM() {
@@ -12801,31 +12823,26 @@ break
 }
 }
 }
-PENDULUM_ANIM.prototype.define = function PENDULUM_ANIM() {
-plen=2;
-csiz=2;
-phi=0;
-xmin=-5;
-xmax=5;
-ymin=-5;
-ymax=5;
+}
+/* autogenerated from "macros/Misc/LOGICAL_OP.sci" */
+function LOGICAL_OP() {
+LOGICAL_OP.prototype.define = function LOGICAL_OP() {
+in1=[-1,-1];
+ipar=[0];
+nin=2;
 model=scicos_model();
-model.sim=list("anim_pen",5);
-model.in1=[1,1];
-model.evtin=1;
-model.dstate=0;
-model.rpar=[plen,csiz,phi,xmin,xmax,ymin,ymax];
-model.blocktype="d";
-model.dep_ut=[false,false];
-exprs=string(model.rpar);
+model.sim=list("logicalop",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([3,3],model,exprs,gr_i);
-}
-PENDULUM_ANIM.prototype.details = function PENDULUM_ANIM() {
+x=standard_define([2,2],model,exprs,gr_i);
 }
+LOGICAL_OP.prototype.details = function LOGICAL_OP() {
 }
-/* autogenerated from "macros/Misc/LOGICAL_OP.sci" */
-function LOGICAL_OP() {
 LOGICAL_OP.prototype.get = function LOGICAL_OP() {
 }
 LOGICAL_OP.prototype.set = function LOGICAL_OP() {
@@ -12918,26 +12935,27 @@ break
 }
 }
 }
-LOGICAL_OP.prototype.define = function LOGICAL_OP() {
-in1=[-1,-1];
-ipar=[0];
-nin=2;
+}
+/* autogenerated from "macros/Misc/MEMORY_f.sci" */
+function MEMORY_f() {
+MEMORY_f.prototype.define = function MEMORY_f() {
+z=0;
+in1=1;
+exprs=[string(z),string(1)];
 model=scicos_model();
-model.sim=list("logicalop",4);
+model.sim="memo";
 model.in1=in1;
-model.out=-1;
-model.ipar=ipar;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[string(nin),string(ipar)];
+model.out=in1;
+model.evtin=1;
+model.dstate=0;
+model.rpar=z;
+model.blocktype="m";
+model.dep_ut=[false,false];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 }
-LOGICAL_OP.prototype.details = function LOGICAL_OP() {
-}
+MEMORY_f.prototype.details = function MEMORY_f() {
 }
-/* autogenerated from "macros/Misc/MEMORY_f.sci" */
-function MEMORY_f() {
 MEMORY_f.prototype.get = function MEMORY_f() {
 }
 MEMORY_f.prototype.set = function MEMORY_f() {
@@ -12973,27 +12991,19 @@ break
 }
 }
 }
-MEMORY_f.prototype.define = function MEMORY_f() {
-z=0;
-in1=1;
-exprs=[string(z),string(1)];
-model=scicos_model();
-model.sim="memo";
-model.in1=in1;
-model.out=in1;
-model.evtin=1;
-model.dstate=0;
-model.rpar=z;
-model.blocktype="m";
-model.dep_ut=[false,false];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-MEMORY_f.prototype.details = function MEMORY_f() {
-}
 }
 /* autogenerated from "macros/Misc/ENDBLK.sci" */
 function ENDBLK() {
+ENDBLK.prototype.define = function ENDBLK() {
+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,0,7,1.4],Title="ENDBLK",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="END_c",graphics=scicos_graphics(orig=[272.104,249.11733],sz=[40,40],flip=true,theta=0,exprs="1.000E+08",pin=[],pout=[],pein=2,peout=2,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim=list("scicosexit",4),in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=1.000e+08,dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m_1.objs[2-1]=scicos_link(xx=[292.104,292.104,261.83733,261.83733,292.104,292.104],yy=[243.40305,234.45067,234.45067,305.584,305.584,294.83162],id="drawlink",thick=[0,0],ct=[5,-1],from=[1,1,0],to=[1,1,1]);
+model=scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=[],out2=[],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([2,2],model,[],gr_i);
+}
+ENDBLK.prototype.details = function ENDBLK() {
+}
 ENDBLK.prototype.get = function ENDBLK() {
 }
 ENDBLK.prototype.set = function ENDBLK() {
@@ -13065,19 +13075,29 @@ y=max(y,needcompile);
 x=arg1;
 typ=newpar;
 }
-ENDBLK.prototype.define = function ENDBLK() {
-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,0,7,1.4],Title="ENDBLK",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="END_c",graphics=scicos_graphics(orig=[272.104,249.11733],sz=[40,40],flip=true,theta=0,exprs="1.000E+08",pin=[],pout=[],pein=2,peout=2,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim=list("scicosexit",4),in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=1.000e+08,dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m_1.objs[2-1]=scicos_link(xx=[292.104,292.104,261.83733,261.83733,292.104,292.104],yy=[243.40305,234.45067,234.45067,305.584,305.584,294.83162],id="drawlink",thick=[0,0],ct=[5,-1],from=[1,1,0],to=[1,1,1]);
-model=scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=[],out2=[],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([2,2],model,[],gr_i);
-}
-ENDBLK.prototype.details = function ENDBLK() {
-}
 }
 /* autogenerated from "macros/IntegerOp/INTMUL.sci" */
 function INTMUL() {
+INTMUL.prototype.define = function INTMUL() {
+sgn=0;
+model=scicos_model();
+model.sim=list("matmul_i32",4);
+model.in1=[-1,-2];
+model.out=-1;
+model.in2=[-2,-3];
+model.out2=-3;
+model.intyp=[3,3];
+model.outtyp=3;
+model.rpar=[];
+model.ipar=sgn;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[sci2exp(3),sci2exp(0)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+INTMUL.prototype.details = function INTMUL() {
+}
 INTMUL.prototype.get = function INTMUL() {
 }
 INTMUL.prototype.set = function INTMUL() {
@@ -13161,29 +13181,29 @@ break
 }
 }
 }
-INTMUL.prototype.define = function INTMUL() {
-sgn=0;
+}
+/* autogenerated from "macros/IntegerOp/CONVERT.sci" */
+function CONVERT() {
+CONVERT.prototype.define = function CONVERT() {
+sgn=2;
 model=scicos_model();
-model.sim=list("matmul_i32",4);
-model.in1=[-1,-2];
+model.sim=list("convert",4);
+model.in1=-1;
 model.out=-1;
-model.in2=[-2,-3];
-model.out2=-3;
-model.intyp=[3,3];
+model.in2=-2;
+model.out2=-2;
+model.intyp=1;
 model.outtyp=3;
 model.rpar=[];
 model.ipar=sgn;
 model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=[sci2exp(3),sci2exp(0)];
+exprs=[sci2exp(1),sci2exp(3),sci2exp(0)];
 gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-INTMUL.prototype.details = function INTMUL() {
+x=standard_define([3,2],model,exprs,gr_i);
 }
+CONVERT.prototype.details = function CONVERT() {
 }
-/* autogenerated from "macros/IntegerOp/CONVERT.sci" */
-function CONVERT() {
 CONVERT.prototype.get = function CONVERT() {
 }
 CONVERT.prototype.set = function CONVERT() {
@@ -13531,29 +13551,42 @@ break
 }
 }
 }
-CONVERT.prototype.define = function CONVERT() {
-sgn=2;
+}
+/* autogenerated from "macros/IntegerOp/SRFLIPFLOP.sci" */
+function SRFLIPFLOP() {
+SRFLIPFLOP.prototype.define = function SRFLIPFLOP() {
+scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["SRFLIPFLOP"],tol=[0.0001,0.000001,1.000e-10,100001,0,0,0],tf=60,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.objs[1-1]=scicos_block(gui="LOGIC",graphics=scicos_graphics(orig=[298.504,201.45067],sz=[40,40],flip=true,theta=0,exprs=["[0 1;1 0;1 0;1 0;0 1;0 1;0 0;0 0]","1"],pin=[4,10,12],pout=[3,8],pein=[],peout=[],gr_i=[],id="",in_implicit=["E","E","E"],out_implicit=["E","E"]),model=scicos_model(sim=list("logic",4),in1=[1,1,1],in2=[1,1,1],intyp=[5,5,5],out=[1,1],out2=[1,1],outtyp=[5,5],evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8([0,1,1,0,1,0,1,0,0,1,0,1,0,0,0,0])),blocktype="c",firing=false,dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[2-1]=scicos_block(gui="DOLLAR_m",graphics=scicos_graphics(orig=[299.23733,254.25067],sz=[40,40],flip=false,theta=0,exprs=["int8(0)","1"],pin=6,pout=4,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("dollar4_m",4),in1=1,in2=1,intyp=5,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(int8(0)),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[3-1]=scicos_link(xx=[347.07543,363.03733,363.03733],yy=[228.11733,228.11733,248.584],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[5,1,1]);
+scs_m.objs[4-1]=scicos_link(xx=[290.6659,272.104,272.104,289.93257],yy=[274.25067,274.25067,231.45067,231.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[2,1,0],to=[1,1,1]);
+scs_m.objs[5-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[363.03733,248.584],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=3,pout=[6,14],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[6-1]=scicos_link(xx=[363.03733,363.03733,344.95162],yy=[248.584,274.25067,274.25067],id="drawlink",thick=[0,0],ct=[1,1],from=[5,1,0],to=[2,1,1]);
+scs_m.objs[7-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[367.07543,204.784],sz=[20,20],flip=true,theta=0,exprs="2",pin=8,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[8-1]=scicos_link(xx=[347.07543,367.07543],yy=[214.784,214.784],id="drawlink",thick=[0,0],ct=[1,1],from=[1,2,0],to=[7,1,1]);
+scs_m.objs[9-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[249.93257,211.45067],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=10,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,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.objs[10-1]=scicos_link(xx=[269.93257,289.93257],yy=[221.45067,221.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[9,1,0],to=[1,2,1]);
+scs_m.objs[11-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[249.93257,201.45067],sz=[20,20],flip=true,theta=0,exprs="2",pin=[],pout=12,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[12-1]=scicos_link(xx=[269.93257,289.93257],yy=[211.45067,211.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[11,1,0],to=[1,3,1]);
+scs_m.objs[13-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[383.03733,238.584],sz=[20,20],flip=true,theta=0,exprs="1",pin=14,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],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.objs[14-1]=scicos_link(xx=[363.03733,383.03733],yy=[248.584,248.584],id="drawlink",thick=[0,0],ct=[1,1],from=[5,2,0],to=[13,1,1]);
 model=scicos_model();
-model.sim=list("convert",4);
-model.in1=-1;
-model.out=-1;
-model.in2=-2;
-model.out2=-2;
-model.intyp=1;
-model.outtyp=3;
-model.rpar=[];
-model.ipar=sgn;
-model.blocktype="c";
+model.sim="csuper";
+model.in1=[1,1];
+model.in2=[1,1];
+model.out=[1,1];
+model.out2=[1,1];
+model.intyp=[5,5];
+model.outtyp=[5,5];
+model.blocktype="h";
+model.firing=false;
 model.dep_ut=[true,false];
-exprs=[sci2exp(1),sci2exp(3),sci2exp(0)];
+model.rpar=scs_m;
 gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-CONVERT.prototype.details = function CONVERT() {
+x=standard_define([2,3],model,[],gr_i);
 }
+SRFLIPFLOP.prototype.details = function SRFLIPFLOP() {
 }
-/* autogenerated from "macros/IntegerOp/SRFLIPFLOP.sci" */
-function SRFLIPFLOP() {
 SRFLIPFLOP.prototype.get = function SRFLIPFLOP() {
 }
 SRFLIPFLOP.prototype.set = function SRFLIPFLOP() {
@@ -13596,42 +13629,27 @@ x=arg1;
 y=needcompile;
 typ=newpar;
 }
-SRFLIPFLOP.prototype.define = function SRFLIPFLOP() {
-scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["SRFLIPFLOP"],tol=[0.0001,0.000001,1.000e-10,100001,0,0,0],tf=60,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.objs[1-1]=scicos_block(gui="LOGIC",graphics=scicos_graphics(orig=[298.504,201.45067],sz=[40,40],flip=true,theta=0,exprs=["[0 1;1 0;1 0;1 0;0 1;0 1;0 0;0 0]","1"],pin=[4,10,12],pout=[3,8],pein=[],peout=[],gr_i=[],id="",in_implicit=["E","E","E"],out_implicit=["E","E"]),model=scicos_model(sim=list("logic",4),in1=[1,1,1],in2=[1,1,1],intyp=[5,5,5],out=[1,1],out2=[1,1],outtyp=[5,5],evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8([0,1,1,0,1,0,1,0,0,1,0,1,0,0,0,0])),blocktype="c",firing=false,dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m.objs[2-1]=scicos_block(gui="DOLLAR_m",graphics=scicos_graphics(orig=[299.23733,254.25067],sz=[40,40],flip=false,theta=0,exprs=["int8(0)","1"],pin=6,pout=4,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("dollar4_m",4),in1=1,in2=1,intyp=5,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(int8(0)),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m.objs[3-1]=scicos_link(xx=[347.07543,363.03733,363.03733],yy=[228.11733,228.11733,248.584],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[5,1,1]);
-scs_m.objs[4-1]=scicos_link(xx=[290.6659,272.104,272.104,289.93257],yy=[274.25067,274.25067,231.45067,231.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[2,1,0],to=[1,1,1]);
-scs_m.objs[5-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[363.03733,248.584],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=3,pout=[6,14],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m.objs[6-1]=scicos_link(xx=[363.03733,363.03733,344.95162],yy=[248.584,274.25067,274.25067],id="drawlink",thick=[0,0],ct=[1,1],from=[5,1,0],to=[2,1,1]);
-scs_m.objs[7-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[367.07543,204.784],sz=[20,20],flip=true,theta=0,exprs="2",pin=8,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m.objs[8-1]=scicos_link(xx=[347.07543,367.07543],yy=[214.784,214.784],id="drawlink",thick=[0,0],ct=[1,1],from=[1,2,0],to=[7,1,1]);
-scs_m.objs[9-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[249.93257,211.45067],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=10,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,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.objs[10-1]=scicos_link(xx=[269.93257,289.93257],yy=[221.45067,221.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[9,1,0],to=[1,2,1]);
-scs_m.objs[11-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[249.93257,201.45067],sz=[20,20],flip=true,theta=0,exprs="2",pin=[],pout=12,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m.objs[12-1]=scicos_link(xx=[269.93257,289.93257],yy=[211.45067,211.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[11,1,0],to=[1,3,1]);
-scs_m.objs[13-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[383.03733,238.584],sz=[20,20],flip=true,theta=0,exprs="1",pin=14,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],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.objs[14-1]=scicos_link(xx=[363.03733,383.03733],yy=[248.584,248.584],id="drawlink",thick=[0,0],ct=[1,1],from=[5,2,0],to=[13,1,1]);
+}
+/* autogenerated from "macros/IntegerOp/BITSET.sci" */
+function BITSET() {
+BITSET.prototype.define = function BITSET() {
 model=scicos_model();
-model.sim="csuper";
-model.in1=[1,1];
-model.in2=[1,1];
-model.out=[1,1];
-model.out2=[1,1];
-model.intyp=[5,5];
-model.outtyp=[5,5];
-model.blocktype="h";
-model.firing=false;
+model.sim=list("bit_set_32",4);
+model.in1=1;
+model.in2=1;
+model.out=1;
+model.out2=1;
+model.intyp=3;
+model.outtyp=3;
+model.opar=list(uint32(0));
+model.blocktype="c";
 model.dep_ut=[true,false];
-model.rpar=scs_m;
+exprs=[sci2exp(3),sci2exp(0)];
 gr_i=[];
-x=standard_define([2,3],model,[],gr_i);
-}
-SRFLIPFLOP.prototype.details = function SRFLIPFLOP() {
+x=standard_define([4,2],model,exprs,gr_i);
 }
+BITSET.prototype.details = function BITSET() {
 }
-/* autogenerated from "macros/IntegerOp/BITSET.sci" */
-function BITSET() {
 BITSET.prototype.get = function BITSET() {
 }
 BITSET.prototype.set = function BITSET() {
@@ -13695,69 +13713,9 @@ break
 }
 }
 }
-BITSET.prototype.define = function BITSET() {
-model=scicos_model();
-model.sim=list("bit_set_32",4);
-model.in1=1;
-model.in2=1;
-model.out=1;
-model.out2=1;
-model.intyp=3;
-model.outtyp=3;
-model.opar=list(uint32(0));
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[sci2exp(3),sci2exp(0)];
-gr_i=[];
-x=standard_define([4,2],model,exprs,gr_i);
-}
-BITSET.prototype.details = function BITSET() {
-}
 }
 /* autogenerated from "macros/IntegerOp/JKFLIPFLOP.sci" */
 function JKFLIPFLOP() {
-JKFLIPFLOP.prototype.get = function JKFLIPFLOP() {
-}
-JKFLIPFLOP.prototype.set = function JKFLIPFLOP() {
-for (i=1;i<=length(arg1.model.rpar.objs);i+=1) {
-o=arg1.model.rpar.objs(i);
-if (typeof(o)=="Block"&&o.gui=="DOLLAR_m") {
-path=i;
-break
-}
-}
-newpar=list();
-xx=arg1.model.rpar.objs(path);
-exprs=xx.graphics.exprs(1);
-model=xx.model;
-init_old=model.odstate(1);
-while (true) {
-[ok,init,exprs0]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"JKFLIPFLOP")," ",gettext("JK flip-flop")," ",gettext("The \'Initial Value\' must be 0 or 1 of type int8"),gettext("&nbsp;- Negative values are considered as int8(0)"),gettext("&nbsp;- Positive values are considered as int8(1)")," "],gettext("Initial Value"),list("vec",1),exprs);
-if (!ok) {
-break
-}
-if (init<=0) {
-init=int8(0);
-} else if (init>0) {
-init=int8(1);
-}
-if (ok) {
-xx.graphics.exprs[1-1]=exprs0;
-model.odstate[1-1]=init;
-xx.model=model;
-arg1.model.rpar.objs[path-1]=xx;
-break
-}
-}
-needcompile=0;
-if (init_old!=init) {
-newpar[size(newpar)+1-1]=1;
-needcompile=2;
-}
-x=arg1;
-y=needcompile;
-typ=newpar;
-}
 JKFLIPFLOP.prototype.define = function JKFLIPFLOP() {
 scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["JKFLIPFLOP"],tol=[0.0001,0.000001,1.000e-10,100001,0,0,0],tf=60,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.objs[1-1]=scicos_block(gui="DOLLAR_m",graphics=scicos_graphics(orig=[299.96961,261.584],sz=[40,40],flip=false,theta=0,exprs=["int8(0)","1"],pin=7,pout=5,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("dollar4_m",4),in1=1,in2=1,intyp=5,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(int8(0)),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
@@ -13807,14 +13765,51 @@ x=standard_define([2,3],model,[],gr_i);
 }
 JKFLIPFLOP.prototype.details = function JKFLIPFLOP() {
 }
+JKFLIPFLOP.prototype.get = function JKFLIPFLOP() {
 }
-/* autogenerated from "macros/IntegerOp/DLATCH.sci" */
-function DLATCH() {
-DLATCH.prototype.get = function DLATCH() {
+JKFLIPFLOP.prototype.set = function JKFLIPFLOP() {
+for (i=1;i<=length(arg1.model.rpar.objs);i+=1) {
+o=arg1.model.rpar.objs(i);
+if (typeof(o)=="Block"&&o.gui=="DOLLAR_m") {
+path=i;
+break
+}
+}
+newpar=list();
+xx=arg1.model.rpar.objs(path);
+exprs=xx.graphics.exprs(1);
+model=xx.model;
+init_old=model.odstate(1);
+while (true) {
+[ok,init,exprs0]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"JKFLIPFLOP")," ",gettext("JK flip-flop")," ",gettext("The \'Initial Value\' must be 0 or 1 of type int8"),gettext("&nbsp;- Negative values are considered as int8(0)"),gettext("&nbsp;- Positive values are considered as int8(1)")," "],gettext("Initial Value"),list("vec",1),exprs);
+if (!ok) {
+break
+}
+if (init<=0) {
+init=int8(0);
+} else if (init>0) {
+init=int8(1);
+}
+if (ok) {
+xx.graphics.exprs[1-1]=exprs0;
+model.odstate[1-1]=init;
+xx.model=model;
+arg1.model.rpar.objs[path-1]=xx;
+break
+}
+}
+needcompile=0;
+if (init_old!=init) {
+newpar[size(newpar)+1-1]=1;
+needcompile=2;
 }
-DLATCH.prototype.set = function DLATCH() {
 x=arg1;
+y=needcompile;
+typ=newpar;
 }
+}
+/* autogenerated from "macros/IntegerOp/DLATCH.sci" */
+function DLATCH() {
 DLATCH.prototype.define = function DLATCH() {
 scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["DLATCH"],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.objs[1-1]=scicos_block(gui="CONST_m",graphics=scicos_graphics(orig=[109.62561,263.44465],sz=[20,20],flip=true,theta=0,exprs="int8(0)",pin=[],pout=7,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("cstblk4_m",4),in1=[],in2=[],intyp=1,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8(0)),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
@@ -13853,9 +13848,32 @@ x=standard_define([2,3],model,[],gr_i);
 }
 DLATCH.prototype.details = function DLATCH() {
 }
+DLATCH.prototype.get = function DLATCH() {
+}
+DLATCH.prototype.set = function DLATCH() {
+x=arg1;
+}
 }
 /* autogenerated from "macros/IntegerOp/BITCLEAR.sci" */
 function BITCLEAR() {
+BITCLEAR.prototype.define = function BITCLEAR() {
+model=scicos_model();
+model.sim=list("bit_clear_32",4);
+model.in1=1;
+model.in2=1;
+model.out=1;
+model.out2=1;
+model.intyp=3;
+model.outtyp=3;
+model.opar=list(int32(0));
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[sci2exp(3),sci2exp(0)];
+gr_i=[];
+x=standard_define([4,2],model,exprs,gr_i);
+}
+BITCLEAR.prototype.details = function BITCLEAR() {
+}
 BITCLEAR.prototype.get = function BITCLEAR() {
 }
 BITCLEAR.prototype.set = function BITCLEAR() {
@@ -13921,27 +13939,28 @@ break
 }
 }
 }
-BITCLEAR.prototype.define = function BITCLEAR() {
+}
+/* autogenerated from "macros/IntegerOp/EXTRACTBITS.sci" */
+function EXTRACTBITS() {
+EXTRACTBITS.prototype.define = function EXTRACTBITS() {
+numb=[];
 model=scicos_model();
-model.sim=list("bit_clear_32",4);
+model.sim=list("extract_bit_32_UH0",4);
 model.in1=1;
 model.in2=1;
 model.out=1;
 model.out2=1;
 model.intyp=3;
 model.outtyp=3;
-model.opar=list(int32(0));
+model.ipar=[0,numb];
 model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=[sci2exp(3),sci2exp(0)];
+exprs=[sci2exp(3),sci2exp(1),sci2exp(0),sci2exp(0)];
 gr_i=[];
 x=standard_define([4,2],model,exprs,gr_i);
 }
-BITCLEAR.prototype.details = function BITCLEAR() {
-}
+EXTRACTBITS.prototype.details = function EXTRACTBITS() {
 }
-/* autogenerated from "macros/IntegerOp/EXTRACTBITS.sci" */
-function EXTRACTBITS() {
 EXTRACTBITS.prototype.get = function EXTRACTBITS() {
 }
 EXTRACTBITS.prototype.set = function EXTRACTBITS() {
@@ -14149,28 +14168,30 @@ break
 }
 }
 }
-EXTRACTBITS.prototype.define = function EXTRACTBITS() {
-numb=[];
+}
+/* autogenerated from "macros/IntegerOp/SHIFT.sci" */
+function SHIFT() {
+SHIFT.prototype.define = function SHIFT() {
+sgn=[0,0];
+OPER=0;
 model=scicos_model();
-model.sim=list("extract_bit_32_UH0",4);
-model.in1=1;
-model.in2=1;
-model.out=1;
-model.out2=1;
+model.sim=list("shift_32_LA",4);
+model.in1=-1;
+model.out=-1;
+model.in2=-2;
+model.out2=-2;
 model.intyp=3;
 model.outtyp=3;
-model.ipar=[0,numb];
+model.rpar=[];
+model.ipar=sgn;
 model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=[sci2exp(3),sci2exp(1),sci2exp(0),sci2exp(0)];
+exprs=[sci2exp(3),sci2exp(0),sci2exp(0)];
 gr_i=[];
-x=standard_define([4,2],model,exprs,gr_i);
-}
-EXTRACTBITS.prototype.details = function EXTRACTBITS() {
+x=standard_define([3,2],model,exprs,gr_i);
 }
+SHIFT.prototype.details = function SHIFT() {
 }
-/* autogenerated from "macros/IntegerOp/SHIFT.sci" */
-function SHIFT() {
 SHIFT.prototype.get = function SHIFT() {
 }
 SHIFT.prototype.set = function SHIFT() {
@@ -14268,35 +14289,9 @@ break
 }
 }
 }
-SHIFT.prototype.define = function SHIFT() {
-sgn=[0,0];
-OPER=0;
-model=scicos_model();
-model.sim=list("shift_32_LA",4);
-model.in1=-1;
-model.out=-1;
-model.in2=-2;
-model.out2=-2;
-model.intyp=3;
-model.outtyp=3;
-model.rpar=[];
-model.ipar=sgn;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[sci2exp(3),sci2exp(0),sci2exp(0)];
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-SHIFT.prototype.details = function SHIFT() {
-}
 }
 /* autogenerated from "macros/IntegerOp/DFLIPFLOP.sci" */
 function DFLIPFLOP() {
-DFLIPFLOP.prototype.get = function DFLIPFLOP() {
-}
-DFLIPFLOP.prototype.set = function DFLIPFLOP() {
-x=arg1;
-}
 DFLIPFLOP.prototype.define = function DFLIPFLOP() {
 scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["DFLIPFLOP"],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.objs[1-1]=scicos_block(gui="CONST_m",graphics=scicos_graphics(orig=[109.62561,263.44465],sz=[20,20],flip=true,theta=0,exprs="int8(0)",pin=[],pout=6,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("cstblk4_m",4),in1=[],in2=[],intyp=1,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8(0)),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
@@ -14390,9 +14385,35 @@ x=standard_define([2,3],model,[],gr_i);
 }
 DFLIPFLOP.prototype.details = function DFLIPFLOP() {
 }
+DFLIPFLOP.prototype.get = function DFLIPFLOP() {
+}
+DFLIPFLOP.prototype.set = function DFLIPFLOP() {
+x=arg1;
+}
 }
 /* autogenerated from "macros/IntegerOp/LOGIC.sci" */
 function LOGIC() {
+LOGIC.prototype.define = function LOGIC() {
+mat=[0,0,0,1];
+model=scicos_model();
+model.sim=list("logic",4);
+model.in1=[1,1];
+model.in2=[1,1];
+model.out=1;
+model.out2=1;
+model.evtin=1;
+model.intyp=[5,5];
+model.outtyp=5;
+model.opar=list(int8(mat));
+model.blocktype="c";
+model.firing=false;
+model.dep_ut=[true,false];
+exprs=[sci2exp(mat),sci2exp(0)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+LOGIC.prototype.details = function LOGIC() {
+}
 LOGIC.prototype.get = function LOGIC() {
 }
 LOGIC.prototype.set = function LOGIC() {
@@ -14435,30 +14456,27 @@ break
 }
 }
 }
-LOGIC.prototype.define = function LOGIC() {
-mat=[0,0,0,1];
+}
+/* autogenerated from "macros/NonLinear/INTRP2BLK_f.sci" */
+function INTRP2BLK_f() {
+INTRP2BLK_f.prototype.define = function INTRP2BLK_f() {
+a=[0,1];
+b=[0,1];
+c=[0,1,1,2];
 model=scicos_model();
-model.sim=list("logic",4);
+model.sim=list("intrp2",1);
 model.in1=[1,1];
-model.in2=[1,1];
 model.out=1;
-model.out2=1;
-model.evtin=1;
-model.intyp=[5,5];
-model.outtyp=5;
-model.opar=list(int8(mat));
+model.rpar=[a,b,c.slice()];
+model.ipar=[2,2];
 model.blocktype="c";
-model.firing=false;
 model.dep_ut=[true,false];
-exprs=[sci2exp(mat),sci2exp(0)];
+exprs=[strcat(sci2exp(a)),strcat(sci2exp(b)),strcat(sci2exp(c,0))];
 gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-LOGIC.prototype.details = function LOGIC() {
+x=standard_define([3,2],model,exprs,gr_i);
 }
+INTRP2BLK_f.prototype.details = function INTRP2BLK_f() {
 }
-/* autogenerated from "macros/NonLinear/INTRP2BLK_f.sci" */
-function INTRP2BLK_f() {
 INTRP2BLK_f.prototype.get = function INTRP2BLK_f() {
 }
 INTRP2BLK_f.prototype.set = function INTRP2BLK_f() {
@@ -14487,27 +14505,24 @@ break
 }
 }
 }
-INTRP2BLK_f.prototype.define = function INTRP2BLK_f() {
-a=[0,1];
-b=[0,1];
-c=[0,1,1,2];
+}
+/* autogenerated from "macros/NonLinear/PRODUCT.sci" */
+function PRODUCT() {
+PRODUCT.prototype.define = function PRODUCT() {
+sgn=[1,-1];
 model=scicos_model();
-model.sim=list("intrp2",1);
-model.in1=[1,1];
-model.out=1;
-model.rpar=[a,b,c.slice()];
-model.ipar=[2,2];
+model.sim=list("product",4);
+model.in1=[-1,-1];
+model.out=-1;
+model.ipar=sgn;
 model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=[strcat(sci2exp(a)),strcat(sci2exp(b)),strcat(sci2exp(c,0))];
+exprs=sci2exp(sgn);
 gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-INTRP2BLK_f.prototype.details = function INTRP2BLK_f() {
+x=standard_define([2,3],model,exprs,gr_i);
 }
+PRODUCT.prototype.details = function PRODUCT() {
 }
-/* autogenerated from "macros/NonLinear/PRODUCT.sci" */
-function PRODUCT() {
 PRODUCT.prototype.get = function PRODUCT() {
 }
 PRODUCT.prototype.set = function PRODUCT() {
@@ -14555,29 +14570,9 @@ break
 }
 }
 }
-PRODUCT.prototype.define = function PRODUCT() {
-sgn=[1,-1];
-model=scicos_model();
-model.sim=list("product",4);
-model.in1=[-1,-1];
-model.out=-1;
-model.ipar=sgn;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=sci2exp(sgn);
-gr_i=[];
-x=standard_define([2,3],model,exprs,gr_i);
-}
-PRODUCT.prototype.details = function PRODUCT() {
-}
 }
 /* autogenerated from "macros/NonLinear/COSBLK_f.sci" */
 function COSBLK_f() {
-COSBLK_f.prototype.get = function COSBLK_f() {
-}
-COSBLK_f.prototype.set = function COSBLK_f() {
-x=arg1;
-}
 COSBLK_f.prototype.define = function COSBLK_f() {
 in1=1;
 model=scicos_model();
@@ -14591,9 +14586,30 @@ x=standard_define([2,2],model,[],gr_i);
 }
 COSBLK_f.prototype.details = function COSBLK_f() {
 }
+COSBLK_f.prototype.get = function COSBLK_f() {
+}
+COSBLK_f.prototype.set = function COSBLK_f() {
+x=arg1;
+}
 }
 /* autogenerated from "macros/NonLinear/SIGNUM.sci" */
 function SIGNUM() {
+SIGNUM.prototype.define = function SIGNUM() {
+nu=-1;
+model=scicos_model();
+model.sim=list("signum",4);
+model.in1=nu;
+model.out=nu;
+model.nzcross=nu;
+model.nmode=nu;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[string([1])];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+SIGNUM.prototype.details = function SIGNUM() {
+}
 SIGNUM.prototype.get = function SIGNUM() {
 }
 SIGNUM.prototype.set = function SIGNUM() {
@@ -14621,30 +14637,9 @@ break
 }
 }
 }
-SIGNUM.prototype.define = function SIGNUM() {
-nu=-1;
-model=scicos_model();
-model.sim=list("signum",4);
-model.in1=nu;
-model.out=nu;
-model.nzcross=nu;
-model.nmode=nu;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[string([1])];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-SIGNUM.prototype.details = function SIGNUM() {
-}
 }
 /* autogenerated from "macros/NonLinear/SINBLK_f.sci" */
 function SINBLK_f() {
-SINBLK_f.prototype.get = function SINBLK_f() {
-}
-SINBLK_f.prototype.set = function SINBLK_f() {
-x=arg1;
-}
 SINBLK_f.prototype.define = function SINBLK_f() {
 model=scicos_model();
 model.sim="sinblk";
@@ -14658,9 +14653,33 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 SINBLK_f.prototype.details = function SINBLK_f() {
 }
+SINBLK_f.prototype.get = function SINBLK_f() {
+}
+SINBLK_f.prototype.set = function SINBLK_f() {
+x=arg1;
+}
 }
 /* autogenerated from "macros/NonLinear/SAT_f.sci" */
 function SAT_f() {
+SAT_f.prototype.define = function SAT_f() {
+minp=-1;
+maxp=1;
+slope=1;
+rpar=[minp,maxp,slope];
+model=scicos_model();
+model.sim=list("lusat",1);
+model.in1=1;
+model.nzcross=2;
+model.out=1;
+model.rpar=[minp,maxp,slope];
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[string(minp),string(maxp),string(slope)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+SAT_f.prototype.details = function SAT_f() {
+}
 SAT_f.prototype.get = function SAT_f() {
 }
 SAT_f.prototype.set = function SAT_f() {
@@ -14688,28 +14707,22 @@ break
 }
 }
 }
-SAT_f.prototype.define = function SAT_f() {
-minp=-1;
-maxp=1;
-slope=1;
-rpar=[minp,maxp,slope];
+}
+/* autogenerated from "macros/NonLinear/LOOKUP_f.sci" */
+function LOOKUP_f() {
+LOOKUP_f.prototype.define = function LOOKUP_f() {
 model=scicos_model();
-model.sim=list("lusat",1);
+model.sim="lookup";
 model.in1=1;
-model.nzcross=2;
 model.out=1;
-model.rpar=[minp,maxp,slope];
+model.rpar=[-2,-1,1,2,-1,1,-1,1];
 model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=[string(minp),string(maxp),string(slope)];
 gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-SAT_f.prototype.details = function SAT_f() {
+x=standard_define([2,2],model,[],gr_i);
 }
+LOOKUP_f.prototype.details = function LOOKUP_f() {
 }
-/* autogenerated from "macros/NonLinear/LOOKUP_f.sci" */
-function LOOKUP_f() {
 LOOKUP_f.prototype.get = function LOOKUP_f() {
 }
 LOOKUP_f.prototype.set = function LOOKUP_f() {
@@ -14744,22 +14757,25 @@ break
 }
 }
 }
-LOOKUP_f.prototype.define = function LOOKUP_f() {
+}
+/* autogenerated from "macros/NonLinear/INTRPLBLK_f.sci" */
+function INTRPLBLK_f() {
+INTRPLBLK_f.prototype.define = function INTRPLBLK_f() {
+a=[0,1];
+b=[0,1];
 model=scicos_model();
-model.sim="lookup";
+model.sim="intrpl";
 model.in1=1;
 model.out=1;
-model.rpar=[-2,-1,1,2,-1,1,-1,1];
+model.rpar=[a,b];
 model.blocktype="c";
 model.dep_ut=[true,false];
+exprs=[strcat(sci2exp(a)),strcat(sci2exp(b))];
 gr_i=[];
-x=standard_define([2,2],model,[],gr_i);
-}
-LOOKUP_f.prototype.details = function LOOKUP_f() {
+x=standard_define([2,2],model,exprs,gr_i);
 }
+INTRPLBLK_f.prototype.details = function INTRPLBLK_f() {
 }
-/* autogenerated from "macros/NonLinear/INTRPLBLK_f.sci" */
-function INTRPLBLK_f() {
 INTRPLBLK_f.prototype.get = function INTRPLBLK_f() {
 }
 INTRPLBLK_f.prototype.set = function INTRPLBLK_f() {
@@ -14787,30 +14803,9 @@ break
 }
 }
 }
-INTRPLBLK_f.prototype.define = function INTRPLBLK_f() {
-a=[0,1];
-b=[0,1];
-model=scicos_model();
-model.sim="intrpl";
-model.in1=1;
-model.out=1;
-model.rpar=[a,b];
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[strcat(sci2exp(a)),strcat(sci2exp(b))];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-INTRPLBLK_f.prototype.details = function INTRPLBLK_f() {
-}
 }
 /* autogenerated from "macros/NonLinear/PROD_f.sci" */
 function PROD_f() {
-PROD_f.prototype.get = function PROD_f() {
-}
-PROD_f.prototype.set = function PROD_f() {
-x=arg1;
-}
 PROD_f.prototype.define = function PROD_f() {
 model=scicos_model();
 model.sim=list("prod",2);
@@ -14822,9 +14817,38 @@ x=standard_define([1,1],model,[],[]);
 }
 PROD_f.prototype.details = function PROD_f() {
 }
+PROD_f.prototype.get = function PROD_f() {
+}
+PROD_f.prototype.set = function PROD_f() {
+x=arg1;
+}
 }
 /* autogenerated from "macros/NonLinear/DLRADAPT_f.sci" */
 function DLRADAPT_f() {
+DLRADAPT_f.prototype.define = function DLRADAPT_f() {
+p=[0,1];
+rn=[];
+rd=[math.complex(0.2,0.8),math.complex(0.2,-0.8),math.complex(0.3,0.7),math.complex(0.3,-0.7)];
+g=[1,1];
+last_u=[];
+last_y=[0,0];
+model=scicos_model();
+model.sim="dlradp";
+model.in1=[1,1];
+model.out=1;
+model.evtin=1;
+model.dstate=[last_u,last_y];
+model.rpar=[p.slice(),real(rn.slice()),imag(rn.slice()),real(rd.slice()),imag(rd.slice()),g.slice()];
+model.ipar=[0,2,2];
+model.blocktype="d";
+model.firing=[];
+model.dep_ut=[true,false];
+exprs=[sci2exp(p),sci2exp(rn),sci2exp(rd,0),sci2exp(g),sci2exp(last_u),sci2exp(last_y)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+DLRADAPT_f.prototype.details = function DLRADAPT_f() {
+}
 DLRADAPT_f.prototype.get = function DLRADAPT_f() {
 }
 DLRADAPT_f.prototype.set = function DLRADAPT_f() {
@@ -14856,33 +14880,26 @@ break
 }
 }
 }
-DLRADAPT_f.prototype.define = function DLRADAPT_f() {
-p=[0,1];
-rn=[];
-rd=[math.complex(0.2,0.8),math.complex(0.2,-0.8),math.complex(0.3,0.7),math.complex(0.3,-0.7)];
-g=[1,1];
-last_u=[];
-last_y=[0,0];
+}
+/* autogenerated from "macros/NonLinear/QUANT_f.sci" */
+function QUANT_f() {
+QUANT_f.prototype.define = function QUANT_f() {
+pas=0.1;
+meth=1;
 model=scicos_model();
-model.sim="dlradp";
-model.in1=[1,1];
-model.out=1;
-model.evtin=1;
-model.dstate=[last_u,last_y];
-model.rpar=[p.slice(),real(rn.slice()),imag(rn.slice()),real(rd.slice()),imag(rd.slice()),g.slice()];
-model.ipar=[0,2,2];
-model.blocktype="d";
-model.firing=[];
+model.sim="qzrnd";
+model.in1=-1;
+model.out=-1;
+model.rpar=pas;
+model.ipar=meth;
+model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=[sci2exp(p),sci2exp(rn),sci2exp(rd,0),sci2exp(g),sci2exp(last_u),sci2exp(last_y)];
+exprs=[string(pas),string(meth)];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 }
-DLRADAPT_f.prototype.details = function DLRADAPT_f() {
-}
+QUANT_f.prototype.details = function QUANT_f() {
 }
-/* autogenerated from "macros/NonLinear/QUANT_f.sci" */
-function QUANT_f() {
 QUANT_f.prototype.get = function QUANT_f() {
 }
 QUANT_f.prototype.set = function QUANT_f() {
@@ -14918,26 +14935,25 @@ break
 }
 }
 }
-QUANT_f.prototype.define = function QUANT_f() {
-pas=0.1;
-meth=1;
+}
+/* autogenerated from "macros/NonLinear/LOGBLK_f.sci" */
+function LOGBLK_f() {
+LOGBLK_f.prototype.define = function LOGBLK_f() {
+in1=1;
+a=math.E;
 model=scicos_model();
-model.sim="qzrnd";
+model.sim="logblk";
 model.in1=-1;
 model.out=-1;
-model.rpar=pas;
-model.ipar=meth;
+model.rpar=a;
 model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=[string(pas),string(meth)];
+exprs="%e";
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 }
-QUANT_f.prototype.details = function QUANT_f() {
-}
+LOGBLK_f.prototype.details = function LOGBLK_f() {
 }
-/* autogenerated from "macros/NonLinear/LOGBLK_f.sci" */
-function LOGBLK_f() {
 LOGBLK_f.prototype.get = function LOGBLK_f() {
 }
 LOGBLK_f.prototype.set = function LOGBLK_f() {
@@ -14966,30 +14982,9 @@ break
 }
 }
 }
-LOGBLK_f.prototype.define = function LOGBLK_f() {
-in1=1;
-a=math.E;
-model=scicos_model();
-model.sim="logblk";
-model.in1=-1;
-model.out=-1;
-model.rpar=a;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs="%e";
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-LOGBLK_f.prototype.details = function LOGBLK_f() {
-}
 }
 /* autogenerated from "macros/NonLinear/MAX_f.sci" */
 function MAX_f() {
-MAX_f.prototype.get = function MAX_f() {
-}
-MAX_f.prototype.set = function MAX_f() {
-x=arg1;
-}
 MAX_f.prototype.define = function MAX_f() {
 in1=-1;
 model=scicos_model();
@@ -15005,14 +15000,14 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 MAX_f.prototype.details = function MAX_f() {
 }
+MAX_f.prototype.get = function MAX_f() {
 }
-/* autogenerated from "macros/NonLinear/INVBLK.sci" */
-function INVBLK() {
-INVBLK.prototype.get = function INVBLK() {
-}
-INVBLK.prototype.set = function INVBLK() {
+MAX_f.prototype.set = function MAX_f() {
 x=arg1;
 }
+}
+/* autogenerated from "macros/NonLinear/INVBLK.sci" */
+function INVBLK() {
 INVBLK.prototype.define = function INVBLK() {
 in1=-1;
 model=scicos_model();
@@ -15027,9 +15022,34 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 INVBLK.prototype.details = function INVBLK() {
 }
+INVBLK.prototype.get = function INVBLK() {
+}
+INVBLK.prototype.set = function INVBLK() {
+x=arg1;
+}
 }
 /* autogenerated from "macros/NonLinear/EXPBLK_m.sci" */
 function EXPBLK_m() {
+EXPBLK_m.prototype.define = function EXPBLK_m() {
+in1=1;
+a=math.E;
+model=scicos_model();
+model.sim=list("expblk_m",4);
+model.in1=-1;
+model.in2=-2;
+model.out=-1;
+model.out2=-2;
+model.intyp=1;
+model.outtyp=1;
+model.rpar=a;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=["%e"];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+EXPBLK_m.prototype.details = function EXPBLK_m() {
+}
 EXPBLK_m.prototype.get = function EXPBLK_m() {
 }
 EXPBLK_m.prototype.set = function EXPBLK_m() {
@@ -15056,29 +15076,25 @@ break
 }
 }
 }
-EXPBLK_m.prototype.define = function EXPBLK_m() {
-in1=1;
-a=math.E;
+}
+/* autogenerated from "macros/NonLinear/ABS_VALUE.sci" */
+function ABS_VALUE() {
+ABS_VALUE.prototype.define = function ABS_VALUE() {
+nu=-1;
 model=scicos_model();
-model.sim=list("expblk_m",4);
-model.in1=-1;
-model.in2=-2;
-model.out=-1;
-model.out2=-2;
-model.intyp=1;
-model.outtyp=1;
-model.rpar=a;
+model.sim=list("absolute_value",4);
+model.in1=nu;
+model.out=nu;
+model.nzcross=nu;
+model.nmode=nu;
 model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=["%e"];
+exprs=[string([1])];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 }
-EXPBLK_m.prototype.details = function EXPBLK_m() {
-}
+ABS_VALUE.prototype.details = function ABS_VALUE() {
 }
-/* autogenerated from "macros/NonLinear/ABS_VALUE.sci" */
-function ABS_VALUE() {
 ABS_VALUE.prototype.get = function ABS_VALUE() {
 }
 ABS_VALUE.prototype.set = function ABS_VALUE() {
@@ -15106,30 +15122,9 @@ break
 }
 }
 }
-ABS_VALUE.prototype.define = function ABS_VALUE() {
-nu=-1;
-model=scicos_model();
-model.sim=list("absolute_value",4);
-model.in1=nu;
-model.out=nu;
-model.nzcross=nu;
-model.nmode=nu;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[string([1])];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-ABS_VALUE.prototype.details = function ABS_VALUE() {
-}
 }
 /* autogenerated from "macros/NonLinear/MIN_f.sci" */
 function MIN_f() {
-MIN_f.prototype.get = function MIN_f() {
-}
-MIN_f.prototype.set = function MIN_f() {
-x=arg1;
-}
 MIN_f.prototype.define = function MIN_f() {
 in1=-1;
 model=scicos_model();
@@ -15145,9 +15140,33 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 MIN_f.prototype.details = function MIN_f() {
 }
+MIN_f.prototype.get = function MIN_f() {
+}
+MIN_f.prototype.set = function MIN_f() {
+x=arg1;
+}
 }
 /* autogenerated from "macros/NonLinear/SATURATION.sci" */
 function SATURATION() {
+SATURATION.prototype.define = function SATURATION() {
+minp=-1;
+maxp=1;
+rpar=[maxp,minp];
+model=scicos_model();
+model.sim=list("satur",4);
+model.in1=1;
+model.nzcross=2;
+model.nmode=1;
+model.out=1;
+model.rpar=rpar;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[string(maxp),string(minp),string(model.nmode)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+SATURATION.prototype.details = function SATURATION() {
+}
 SATURATION.prototype.get = function SATURATION() {
 }
 SATURATION.prototype.set = function SATURATION() {
@@ -15179,34 +15198,9 @@ break
 }
 }
 }
-SATURATION.prototype.define = function SATURATION() {
-minp=-1;
-maxp=1;
-rpar=[maxp,minp];
-model=scicos_model();
-model.sim=list("satur",4);
-model.in1=1;
-model.nzcross=2;
-model.nmode=1;
-model.out=1;
-model.rpar=rpar;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[string(maxp),string(minp),string(model.nmode)];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-SATURATION.prototype.details = function SATURATION() {
-}
 }
 /* autogenerated from "macros/NonLinear/TANBLK_f.sci" */
 function TANBLK_f() {
-TANBLK_f.prototype.get = function TANBLK_f() {
-}
-TANBLK_f.prototype.set = function TANBLK_f() {
-x=arg1;
-x.model.firing=[];
-}
 TANBLK_f.prototype.define = function TANBLK_f() {
 in1=-1;
 model=scicos_model();
@@ -15221,14 +15215,15 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 TANBLK_f.prototype.details = function TANBLK_f() {
 }
+TANBLK_f.prototype.get = function TANBLK_f() {
 }
-/* autogenerated from "macros/NonLinear/FSV_f.sci" */
-function FSV_f() {
-FSV_f.prototype.get = function FSV_f() {
-}
-FSV_f.prototype.set = function FSV_f() {
+TANBLK_f.prototype.set = function TANBLK_f() {
 x=arg1;
+x.model.firing=[];
+}
 }
+/* autogenerated from "macros/NonLinear/FSV_f.sci" */
+function FSV_f() {
 FSV_f.prototype.define = function FSV_f() {
 in1=1;
 model=scicos_model();
@@ -15243,9 +15238,30 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 FSV_f.prototype.details = function FSV_f() {
 }
+FSV_f.prototype.get = function FSV_f() {
+}
+FSV_f.prototype.set = function FSV_f() {
+x=arg1;
+}
 }
 /* autogenerated from "macros/NonLinear/EXPBLK_f.sci" */
 function EXPBLK_f() {
+EXPBLK_f.prototype.define = function EXPBLK_f() {
+in1=1;
+a=math.E;
+model=scicos_model();
+model.sim="expblk";
+model.in1=-1;
+model.out=-1;
+model.rpar=a;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=["%e"];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+EXPBLK_f.prototype.details = function EXPBLK_f() {
+}
 EXPBLK_f.prototype.get = function EXPBLK_f() {
 }
 EXPBLK_f.prototype.set = function EXPBLK_f() {
@@ -15272,45 +15288,45 @@ break
 }
 }
 }
-EXPBLK_f.prototype.define = function EXPBLK_f() {
-in1=1;
-a=math.E;
+}
+/* autogenerated from "macros/NonLinear/ABSBLK_f.sci" */
+function ABSBLK_f() {
+ABSBLK_f.prototype.define = function ABSBLK_f() {
 model=scicos_model();
-model.sim="expblk";
+model.sim=list("absblk",1);
 model.in1=-1;
 model.out=-1;
-model.rpar=a;
 model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=["%e"];
 gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-EXPBLK_f.prototype.details = function EXPBLK_f() {
+x=standard_define([2,2],model,[],gr_i);
 }
+ABSBLK_f.prototype.details = function ABSBLK_f() {
 }
-/* autogenerated from "macros/NonLinear/ABSBLK_f.sci" */
-function ABSBLK_f() {
 ABSBLK_f.prototype.get = function ABSBLK_f() {
 }
 ABSBLK_f.prototype.set = function ABSBLK_f() {
 x=arg1;
 }
-ABSBLK_f.prototype.define = function ABSBLK_f() {
+}
+/* autogenerated from "macros/NonLinear/POWBLK_f.sci" */
+function POWBLK_f() {
+POWBLK_f.prototype.define = function POWBLK_f() {
+in1=1;
+a=1.5;
 model=scicos_model();
-model.sim=list("absblk",1);
+model.sim="powblk";
 model.in1=-1;
 model.out=-1;
+model.rpar=a;
 model.blocktype="c";
 model.dep_ut=[true,false];
+exprs=string(a);
 gr_i=[];
-x=standard_define([2,2],model,[],gr_i);
-}
-ABSBLK_f.prototype.details = function ABSBLK_f() {
+x=standard_define([2,2],model,exprs,gr_i);
 }
+POWBLK_f.prototype.details = function POWBLK_f() {
 }
-/* autogenerated from "macros/NonLinear/POWBLK_f.sci" */
-function POWBLK_f() {
 POWBLK_f.prototype.get = function POWBLK_f() {
 }
 POWBLK_f.prototype.set = function POWBLK_f() {
@@ -15340,25 +15356,24 @@ x.model=model;
 break
 }
 }
-POWBLK_f.prototype.define = function POWBLK_f() {
-in1=1;
-a=1.5;
+}
+/* autogenerated from "macros/NonLinear/MAXMIN.sci" */
+function MAXMIN() {
+MAXMIN.prototype.define = function MAXMIN() {
 model=scicos_model();
-model.sim="powblk";
+model.sim=list("minmax",4);
+model.out=1;
 model.in1=-1;
-model.out=-1;
-model.rpar=a;
 model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=string(a);
+model.ipar=0;
+exprs=[string(transpose([2,1,1]))];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
+x.graphics.style="MAXMIN;displayedLabel=MAX";
 }
-POWBLK_f.prototype.details = function POWBLK_f() {
-}
+MAXMIN.prototype.details = function MAXMIN() {
 }
-/* autogenerated from "macros/NonLinear/MAXMIN.sci" */
-function MAXMIN() {
 MAXMIN.prototype.get = function MAXMIN() {
 }
 MAXMIN.prototype.set = function MAXMIN() {
@@ -15409,29 +15424,9 @@ break
 }
 }
 }
-MAXMIN.prototype.define = function MAXMIN() {
-model=scicos_model();
-model.sim=list("minmax",4);
-model.out=1;
-model.in1=-1;
-model.blocktype="c";
-model.dep_ut=[true,false];
-model.ipar=0;
-exprs=[string(transpose([2,1,1]))];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-x.graphics.style="MAXMIN;displayedLabel=MAX";
-}
-MAXMIN.prototype.details = function MAXMIN() {
-}
 }
 /* autogenerated from "macros/NonLinear/INVBLK_f.sci" */
 function INVBLK_f() {
-INVBLK_f.prototype.get = function INVBLK_f() {
-}
-INVBLK_f.prototype.set = function INVBLK_f() {
-x=arg1;
-}
 INVBLK_f.prototype.define = function INVBLK_f() {
 in1=-1;
 model=scicos_model();
@@ -15446,6 +15441,11 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 INVBLK_f.prototype.details = function INVBLK_f() {
 }
+INVBLK_f.prototype.get = function INVBLK_f() {
+}
+INVBLK_f.prototype.set = function INVBLK_f() {
+x=arg1;
+}
 }
 
 /* made from 247/274 files */
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() {
-}
 }
diff --git a/js/Electrical/CCS.js b/js/Electrical/CCS.js
index b8417224..84ca9326 100644
--- a/js/Electrical/CCS.js
+++ b/js/Electrical/CCS.js
@@ -1,14 +1,5 @@
 /* autogenerated from "macros/Electrical/CCS.sci" */
 function CCS() {
-CCS.prototype.get = function CCS() {
-}
-CCS.prototype.set = function CCS() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-x=arg1;
-}
 CCS.prototype.define = function CCS() {
 ModelName="CCS";
 PrametersValue=[];
@@ -59,4 +50,13 @@ x.graphics.out_implicit=Typeout;
 }
 CCS.prototype.details = function CCS() {
 }
+CCS.prototype.get = function CCS() {
+}
+CCS.prototype.set = function CCS() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+x=arg1;
+}
 }
diff --git a/js/Electrical/CVS.js b/js/Electrical/CVS.js
index 39ebf54d..5b862fbb 100644
--- a/js/Electrical/CVS.js
+++ b/js/Electrical/CVS.js
@@ -1,14 +1,5 @@
 /* autogenerated from "macros/Electrical/CVS.sci" */
 function CVS() {
-CVS.prototype.get = function CVS() {
-}
-CVS.prototype.set = function CVS() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-x=arg1;
-}
 CVS.prototype.define = function CVS() {
 ModelName="CVS";
 PrametersValue=[];
@@ -59,4 +50,13 @@ x.graphics.out_implicit=Typeout;
 }
 CVS.prototype.details = function CVS() {
 }
+CVS.prototype.get = function CVS() {
+}
+CVS.prototype.set = function CVS() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+x=arg1;
+}
 }
diff --git a/js/Electrical/Capacitor.js b/js/Electrical/Capacitor.js
index cf40e97c..0e69d23b 100644
--- a/js/Electrical/Capacitor.js
+++ b/js/Electrical/Capacitor.js
@@ -1,25 +1,5 @@
 /* autogenerated from "macros/Electrical/Capacitor.sci" */
 function Capacitor() {
-Capacitor.prototype.get = function Capacitor() {
-}
-Capacitor.prototype.set = function Capacitor() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,C,v,exprs]=scicos_getvalue("Set Capacitor block parameter",["C (F)","Initial Voltage"],list("vec",1,"vec",1),exprs);
-if (!ok) {
-break
-}
-model.rpar=C;
-model.equations.parameters[2-1]=list(C,v);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
-}
-}
 Capacitor.prototype.define = function Capacitor() {
 model=scicos_model();
 C=0.01;
@@ -44,4 +24,24 @@ x.graphics.out_implicit=["I"];
 }
 Capacitor.prototype.details = function Capacitor() {
 }
+Capacitor.prototype.get = function Capacitor() {
+}
+Capacitor.prototype.set = function Capacitor() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,C,v,exprs]=scicos_getvalue("Set Capacitor block parameter",["C (F)","Initial Voltage"],list("vec",1,"vec",1),exprs);
+if (!ok) {
+break
+}
+model.rpar=C;
+model.equations.parameters[2-1]=list(C,v);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
 }
diff --git a/js/Electrical/ConstantVoltage.js b/js/Electrical/ConstantVoltage.js
index 9bec7626..f0eef731 100644
--- a/js/Electrical/ConstantVoltage.js
+++ b/js/Electrical/ConstantVoltage.js
@@ -1,25 +1,5 @@
 /* autogenerated from "macros/Electrical/ConstantVoltage.sci" */
 function ConstantVoltage() {
-ConstantVoltage.prototype.get = function ConstantVoltage() {
-}
-ConstantVoltage.prototype.set = function ConstantVoltage() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,V,exprs]=scicos_getvalue("Set ConstantVoltage block parameter","V (volt)",list("vec",1),exprs);
-if (!ok) {
-break
-}
-model.rpar=V;
-model.equations.parameters[2-1]=list(V);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
-}
-}
 ConstantVoltage.prototype.define = function ConstantVoltage() {
 V=0.01;
 model=scicos_model();
@@ -43,4 +23,24 @@ x.graphics.out_implicit=["I"];
 }
 ConstantVoltage.prototype.details = function ConstantVoltage() {
 }
+ConstantVoltage.prototype.get = function ConstantVoltage() {
+}
+ConstantVoltage.prototype.set = function ConstantVoltage() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,V,exprs]=scicos_getvalue("Set ConstantVoltage block parameter","V (volt)",list("vec",1),exprs);
+if (!ok) {
+break
+}
+model.rpar=V;
+model.equations.parameters[2-1]=list(V);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
 }
diff --git a/js/Electrical/CurrentSensor.js b/js/Electrical/CurrentSensor.js
index ac6ea132..f79a353f 100644
--- a/js/Electrical/CurrentSensor.js
+++ b/js/Electrical/CurrentSensor.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/Electrical/CurrentSensor.sci" */
 function CurrentSensor() {
-CurrentSensor.prototype.get = function CurrentSensor() {
-}
-CurrentSensor.prototype.set = function CurrentSensor() {
-x=arg1;
-}
 CurrentSensor.prototype.define = function CurrentSensor() {
 model=scicos_model();
 model.in1=1;
@@ -25,4 +20,9 @@ x.graphics.out_implicit=["I","E"];
 }
 CurrentSensor.prototype.details = function CurrentSensor() {
 }
+CurrentSensor.prototype.get = function CurrentSensor() {
+}
+CurrentSensor.prototype.set = function CurrentSensor() {
+x=arg1;
+}
 }
diff --git a/js/Electrical/Diode.js b/js/Electrical/Diode.js
index bb024526..1af6fead 100644
--- a/js/Electrical/Diode.js
+++ b/js/Electrical/Diode.js
@@ -1,25 +1,5 @@
 /* autogenerated from "macros/Electrical/Diode.sci" */
 function Diode() {
-Diode.prototype.get = function Diode() {
-}
-Diode.prototype.set = function Diode() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,Ids,Vt,Maxexp,R,exprs]=scicos_getvalue("Set Diode block parameter",["Saturation cuurent (A)","Voltage equivalent to temperature (Volt)","Max exponent for linear continuation","R (ohm)"],list("vec",1,"vec",1,"vec",1,"vec",1),exprs);
-if (!ok) {
-break
-}
-model.rpar=[Ids,Vt,Maxexp,R];
-model.equations.parameters=list(["Ids","Vt","Maxexp","R"],list(Ids,Vt,Maxexp,R));
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
-}
-}
 Diode.prototype.define = function Diode() {
 Ids=1.e-6;
 Vt=0.04;
@@ -46,4 +26,24 @@ x.graphics.out_implicit=["I"];
 }
 Diode.prototype.details = function Diode() {
 }
+Diode.prototype.get = function Diode() {
+}
+Diode.prototype.set = function Diode() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,Ids,Vt,Maxexp,R,exprs]=scicos_getvalue("Set Diode block parameter",["Saturation cuurent (A)","Voltage equivalent to temperature (Volt)","Max exponent for linear continuation","R (ohm)"],list("vec",1,"vec",1,"vec",1,"vec",1),exprs);
+if (!ok) {
+break
+}
+model.rpar=[Ids,Vt,Maxexp,R];
+model.equations.parameters=list(["Ids","Vt","Maxexp","R"],list(Ids,Vt,Maxexp,R));
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
 }
diff --git a/js/Electrical/Ground.js b/js/Electrical/Ground.js
index 04d30bda..bde01b03 100644
--- a/js/Electrical/Ground.js
+++ b/js/Electrical/Ground.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/Electrical/Ground.sci" */
 function Ground() {
-Ground.prototype.get = function Ground() {
-}
-Ground.prototype.set = function Ground() {
-x=arg1;
-}
 Ground.prototype.define = function Ground() {
 model=scicos_model();
 model.in1=[1];
@@ -24,4 +19,9 @@ x.graphics.out_implicit=["I"];
 }
 Ground.prototype.details = function Ground() {
 }
+Ground.prototype.get = function Ground() {
+}
+Ground.prototype.set = function Ground() {
+x=arg1;
+}
 }
diff --git a/js/Electrical/Gyrator.js b/js/Electrical/Gyrator.js
index f7890c6d..7d246e9f 100644
--- a/js/Electrical/Gyrator.js
+++ b/js/Electrical/Gyrator.js
@@ -1,24 +1,5 @@
 /* autogenerated from "macros/Electrical/Gyrator.sci" */
 function Gyrator() {
-Gyrator.prototype.get = function Gyrator() {
-}
-Gyrator.prototype.set = function Gyrator() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-x=arg1;
-exprs=x.graphics.exprs;
-while (true) {
-[ok,G1,G2,exprs]=scicos_getvalue(["Set Gyrator block parameters:","","G1: Gyration conductance","G2: Gyration conductance"],["G1","G2"],list("vec",1,"vec",1),exprs);
-if (!ok) {
-break
-}
-x.model.equations.parameters[2-1]=list(G1,G2);
-x.graphics.exprs=exprs;
-break
-}
-}
 Gyrator.prototype.define = function Gyrator() {
 ModelName="Gyrator";
 PrametersValue=[1,1];
@@ -69,4 +50,23 @@ x.graphics.out_implicit=Typeout;
 }
 Gyrator.prototype.details = function Gyrator() {
 }
+Gyrator.prototype.get = function Gyrator() {
+}
+Gyrator.prototype.set = function Gyrator() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+x=arg1;
+exprs=x.graphics.exprs;
+while (true) {
+[ok,G1,G2,exprs]=scicos_getvalue(["Set Gyrator block parameters:","","G1: Gyration conductance","G2: Gyration conductance"],["G1","G2"],list("vec",1,"vec",1),exprs);
+if (!ok) {
+break
+}
+x.model.equations.parameters[2-1]=list(G1,G2);
+x.graphics.exprs=exprs;
+break
+}
+}
 }
diff --git a/js/Electrical/IdealTransformer.js b/js/Electrical/IdealTransformer.js
index 3d99588b..75889fc2 100644
--- a/js/Electrical/IdealTransformer.js
+++ b/js/Electrical/IdealTransformer.js
@@ -1,24 +1,5 @@
 /* autogenerated from "macros/Electrical/IdealTransformer.sci" */
 function IdealTransformer() {
-IdealTransformer.prototype.get = function IdealTransformer() {
-}
-IdealTransformer.prototype.set = function IdealTransformer() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-x=arg1;
-exprs=x.graphics.exprs;
-while (true) {
-[ok,N,exprs]=scicos_getvalue(["Set Transformer block parameters:","","N:"+" Turn ratio (N1/N2)"],["N"],list("vec",1),exprs);
-if (!ok) {
-break
-}
-x.model.equations.parameters[2-1]=list(N);
-x.graphics.exprs=exprs;
-break
-}
-}
 IdealTransformer.prototype.define = function IdealTransformer() {
 ModelName="IdealTransformer";
 PrametersValue=[1];
@@ -69,4 +50,23 @@ x.graphics.out_implicit=Typeout;
 }
 IdealTransformer.prototype.details = function IdealTransformer() {
 }
+IdealTransformer.prototype.get = function IdealTransformer() {
+}
+IdealTransformer.prototype.set = function IdealTransformer() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+x=arg1;
+exprs=x.graphics.exprs;
+while (true) {
+[ok,N,exprs]=scicos_getvalue(["Set Transformer block parameters:","","N:"+" Turn ratio (N1/N2)"],["N"],list("vec",1),exprs);
+if (!ok) {
+break
+}
+x.model.equations.parameters[2-1]=list(N);
+x.graphics.exprs=exprs;
+break
+}
+}
 }
diff --git a/js/Electrical/Inductor.js b/js/Electrical/Inductor.js
index a928c4c9..1c64a032 100644
--- a/js/Electrical/Inductor.js
+++ b/js/Electrical/Inductor.js
@@ -1,25 +1,5 @@
 /* autogenerated from "macros/Electrical/Inductor.sci" */
 function Inductor() {
-Inductor.prototype.get = function Inductor() {
-}
-Inductor.prototype.set = function Inductor() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,L,exprs]=scicos_getvalue("Set Inductor block parameter","L (H)",list("vec",1),exprs);
-if (!ok) {
-break
-}
-model.rpar=L;
-model.equations.parameters[2-1]=list(L);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
-}
-}
 Inductor.prototype.define = function Inductor() {
 model=scicos_model();
 model.in1=[1];
@@ -43,4 +23,24 @@ x.graphics.out_implicit=["I"];
 }
 Inductor.prototype.details = function Inductor() {
 }
+Inductor.prototype.get = function Inductor() {
+}
+Inductor.prototype.set = function Inductor() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,L,exprs]=scicos_getvalue("Set Inductor block parameter","L (H)",list("vec",1),exprs);
+if (!ok) {
+break
+}
+model.rpar=L;
+model.equations.parameters[2-1]=list(L);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
 }
diff --git a/js/Electrical/MOTOR.js b/js/Electrical/MOTOR.js
index 794262aa..7ffefd65 100644
--- a/js/Electrical/MOTOR.js
+++ b/js/Electrical/MOTOR.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/Electrical/MOTOR.sci" */
 function MOTOR() {
-MOTOR.prototype.get = function MOTOR() {
-}
-MOTOR.prototype.set = function MOTOR() {
-x=arg1;
-}
 MOTOR.prototype.define = function MOTOR() {
 model=scicos_model();
 model.out=[1,1];
@@ -20,4 +15,9 @@ x.graphics.in_implicit=["I"];
 }
 MOTOR.prototype.details = function MOTOR() {
 }
+MOTOR.prototype.get = function MOTOR() {
+}
+MOTOR.prototype.set = function MOTOR() {
+x=arg1;
+}
 }
diff --git a/js/Electrical/NMOS.js b/js/Electrical/NMOS.js
index 636cc9d6..f70287c6 100644
--- a/js/Electrical/NMOS.js
+++ b/js/Electrical/NMOS.js
@@ -1,24 +1,5 @@
 /* autogenerated from "macros/Electrical/NMOS.sci" */
 function NMOS() {
-NMOS.prototype.get = function NMOS() {
-}
-NMOS.prototype.set = function NMOS() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,W,L,Beta,Vt,K2,K5,dW,dL,RDS,exprs]=scicos_getvalue("Set NMOS Transistor block parameters",["Width [m]","Length [m]","Transconductance parameter [A/(V*V)]","Zero bias threshold voltage [V]","Bulk threshold parameter","Reduction of pinch-off region","Narrowing of channel [m]","Shortening of channel [m]","Drain-Source-Resistance [Ohm]"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
-if (!ok) {
-break
-}
-model.equations.parameters[2-1]=list(W,L,Beta,Vt,K2,K5,dW,dL,RDS);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
-}
-}
 NMOS.prototype.define = function NMOS() {
 model=scicos_model();
 W=20.e-6;
@@ -49,4 +30,23 @@ x.graphics.out_implicit=["I","I","I"];
 }
 NMOS.prototype.details = function NMOS() {
 }
+NMOS.prototype.get = function NMOS() {
+}
+NMOS.prototype.set = function NMOS() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,W,L,Beta,Vt,K2,K5,dW,dL,RDS,exprs]=scicos_getvalue("Set NMOS Transistor block parameters",["Width [m]","Length [m]","Transconductance parameter [A/(V*V)]","Zero bias threshold voltage [V]","Bulk threshold parameter","Reduction of pinch-off region","Narrowing of channel [m]","Shortening of channel [m]","Drain-Source-Resistance [Ohm]"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
+if (!ok) {
+break
+}
+model.equations.parameters[2-1]=list(W,L,Beta,Vt,K2,K5,dW,dL,RDS);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
 }
diff --git a/js/Electrical/NPN.js b/js/Electrical/NPN.js
index a7598f46..83ad250d 100644
--- a/js/Electrical/NPN.js
+++ b/js/Electrical/NPN.js
@@ -1,24 +1,5 @@
 /* autogenerated from "macros/Electrical/NPN.sci" */
 function NPN() {
-NPN.prototype.get = function NPN() {
-}
-NPN.prototype.set = function NPN() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-x=arg1;
-exprs=x.graphics.exprs;
-while (true) {
-[ok,Bf,Br,Is,Vak,Tauf,Taur,Ccs,Cje,Cjc,Phie,Me,Phic,Mc,Gbc,Gbe,Vt,EMinMax,exprs]=scicos_getvalue(["Set NPN block parameters:",""],["Bf  : Forward beta","Br  : Reverse beta","Is  : Transport saturation current","Vak : Early voltage (inverse), 1/Volt","Tauf: Ideal forward transit time","Taur: Ideal reverse transit time","Ccs : Collector-substrat(ground) cap.","Cje : Base-emitter zero bias depletion cap.","Cjc : Base-coll. zero bias depletion cap.","Phie: Base-emitter diffusion voltage","Me  : Base-emitter gradation exponent","Phic: Base-collector diffusion voltage","Mc  : Base-collector gradation exponent","Gbc : Base-collector conductance","Gbe : Base-emitter conductance","Vt  : Voltage equivalent of temperature","EMinmax: if x > EMinMax, the exp(x) is linearized"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
-if (!ok) {
-break
-}
-x.model.equations.parameters[2-1]=list(Bf,Br,Is,Vak,Tauf,Taur,Ccs,Cje,Cjc,Phie,Me,Phic,Mc,Gbc,Gbe,Vt,EMinMax);
-x.graphics.exprs=exprs;
-break
-}
-}
 NPN.prototype.define = function NPN() {
 ModelName="NPN";
 PrametersValue=[50,0.1,0,0.02,1.200e-10,5.000e-09,1.000e-12,4.000e-13,5.000e-13,0.8,0.4,0.8,0.333,1.000e-15,1.000e-15,0.02585,40];
@@ -69,4 +50,23 @@ x.graphics.out_implicit=Typeout;
 }
 NPN.prototype.details = function NPN() {
 }
+NPN.prototype.get = function NPN() {
+}
+NPN.prototype.set = function NPN() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+x=arg1;
+exprs=x.graphics.exprs;
+while (true) {
+[ok,Bf,Br,Is,Vak,Tauf,Taur,Ccs,Cje,Cjc,Phie,Me,Phic,Mc,Gbc,Gbe,Vt,EMinMax,exprs]=scicos_getvalue(["Set NPN block parameters:",""],["Bf  : Forward beta","Br  : Reverse beta","Is  : Transport saturation current","Vak : Early voltage (inverse), 1/Volt","Tauf: Ideal forward transit time","Taur: Ideal reverse transit time","Ccs : Collector-substrat(ground) cap.","Cje : Base-emitter zero bias depletion cap.","Cjc : Base-coll. zero bias depletion cap.","Phie: Base-emitter diffusion voltage","Me  : Base-emitter gradation exponent","Phic: Base-collector diffusion voltage","Mc  : Base-collector gradation exponent","Gbc : Base-collector conductance","Gbe : Base-emitter conductance","Vt  : Voltage equivalent of temperature","EMinmax: if x > EMinMax, the exp(x) is linearized"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
+if (!ok) {
+break
+}
+x.model.equations.parameters[2-1]=list(Bf,Br,Is,Vak,Tauf,Taur,Ccs,Cje,Cjc,Phie,Me,Phic,Mc,Gbc,Gbe,Vt,EMinMax);
+x.graphics.exprs=exprs;
+break
+}
+}
 }
diff --git a/js/Electrical/OpAmp.js b/js/Electrical/OpAmp.js
index 4ec8f9dd..09334c4a 100644
--- a/js/Electrical/OpAmp.js
+++ b/js/Electrical/OpAmp.js
@@ -1,24 +1,5 @@
 /* autogenerated from "macros/Electrical/OpAmp.sci" */
 function OpAmp() {
-OpAmp.prototype.get = function OpAmp() {
-}
-OpAmp.prototype.set = function OpAmp() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (false) {
-[ok,OLGain,SatH,SatL,exprs]=scicos_getvalue("Set the Operational Amplifier parameters",["Open Loop Gain","Positive saturation voltage","Negative saturation voltage"],list("vec",1,"vec",1,"vec",1),exprs);
-if (!ok) {
-break
-}
-model.equations.parameters[2-1]=list(OLGain,SatH,SatL);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
-}
-}
 OpAmp.prototype.define = function OpAmp() {
 S=[];
 Z=[];
@@ -43,4 +24,23 @@ x.graphics.out_implicit=["I"];
 }
 OpAmp.prototype.details = function OpAmp() {
 }
+OpAmp.prototype.get = function OpAmp() {
+}
+OpAmp.prototype.set = function OpAmp() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (false) {
+[ok,OLGain,SatH,SatL,exprs]=scicos_getvalue("Set the Operational Amplifier parameters",["Open Loop Gain","Positive saturation voltage","Negative saturation voltage"],list("vec",1,"vec",1,"vec",1),exprs);
+if (!ok) {
+break
+}
+model.equations.parameters[2-1]=list(OLGain,SatH,SatL);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
 }
diff --git a/js/Electrical/PMOS.js b/js/Electrical/PMOS.js
index 6ebcb4c0..7fcd2b27 100644
--- a/js/Electrical/PMOS.js
+++ b/js/Electrical/PMOS.js
@@ -1,24 +1,5 @@
 /* autogenerated from "macros/Electrical/PMOS.sci" */
 function PMOS() {
-PMOS.prototype.get = function PMOS() {
-}
-PMOS.prototype.set = function PMOS() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,W,L,Beta,Vt,K2,K5,dW,dL,RDS,exprs]=scicos_getvalue("Set PMOS Transistor parameters",["Width [m]","Length [m]","Transconductance parameter [A/(V*V)]","Zero bias threshold voltage [V]","Bulk threshold parameter","Reduction of pinch-off region","Narrowing of channel [m]","Shortening of channel [m]","Drain-Source-Resistance [Ohm]"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
-if (!ok) {
-break
-}
-model.equations.parameters[2-1]=list(W,L,Beta,Vt,K2,K5,dW,dL,RDS);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
-}
-}
 PMOS.prototype.define = function PMOS() {
 model=scicos_model();
 W=50.0e-6;
@@ -49,4 +30,23 @@ x.graphics.out_implicit=["I","I","I"];
 }
 PMOS.prototype.details = function PMOS() {
 }
+PMOS.prototype.get = function PMOS() {
+}
+PMOS.prototype.set = function PMOS() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,W,L,Beta,Vt,K2,K5,dW,dL,RDS,exprs]=scicos_getvalue("Set PMOS Transistor parameters",["Width [m]","Length [m]","Transconductance parameter [A/(V*V)]","Zero bias threshold voltage [V]","Bulk threshold parameter","Reduction of pinch-off region","Narrowing of channel [m]","Shortening of channel [m]","Drain-Source-Resistance [Ohm]"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
+if (!ok) {
+break
+}
+model.equations.parameters[2-1]=list(W,L,Beta,Vt,K2,K5,dW,dL,RDS);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
 }
diff --git a/js/Electrical/PNP.js b/js/Electrical/PNP.js
index cf26f0e7..5d75504e 100644
--- a/js/Electrical/PNP.js
+++ b/js/Electrical/PNP.js
@@ -1,24 +1,5 @@
 /* autogenerated from "macros/Electrical/PNP.sci" */
 function PNP() {
-PNP.prototype.get = function PNP() {
-}
-PNP.prototype.set = function PNP() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-x=arg1;
-exprs=x.graphics.exprs;
-while (true) {
-[ok,Bf,Br,Is,Vak,Tauf,Taur,Ccs,Cje,Cjc,Phie,Me,Phic,Mc,Gbc,Gbe,Vt,EMinMax,exprs]=scicos_getvalue(["Set PNP block parameters:",""],["Bf  : Forward beta","Br  : Reverse beta","Is  : Transport saturation current","Vak : Early voltage (inverse), 1/Volt","Tauf: Ideal forward transit time","Taur: Ideal reverse transit time","Ccs : Collector-substrat(ground) cap.","Cje : Base-emitter zero bias depletion cap.","Cjc : Base-coll. zero bias depletion cap.","Phie: Base-emitter diffusion voltage","Me  : Base-emitter gradation exponent","Phic: Base-collector diffusion voltage","Mc  : Base-collector gradation exponent","Gbc : Base-collector conductance","Gbe : Base-emitter conductance","Vt  : Voltage equivalent of temperature","EMinMax: if x > EMinMax, the exp(x) function is linearized"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
-if (!ok) {
-break
-}
-x.model.equations.parameters[2-1]=list(Bf,Br,Is,Vak,Tauf,Taur,Ccs,Cje,Cjc,Phie,Me,Phic,Mc,Gbc,Gbe,Vt,EMinMax);
-x.graphics.exprs=exprs;
-break
-}
-}
 PNP.prototype.define = function PNP() {
 ModelName="PNP";
 PrametersValue=[50,0.1,0,0.02,1.200e-10,5.000e-09,1.000e-12,4.000e-13,5.000e-13,0.8,0.4,0.8,0.333,1.000e-15,1.000e-15,0.02585,40];
@@ -69,4 +50,23 @@ x.graphics.out_implicit=Typeout;
 }
 PNP.prototype.details = function PNP() {
 }
+PNP.prototype.get = function PNP() {
+}
+PNP.prototype.set = function PNP() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+x=arg1;
+exprs=x.graphics.exprs;
+while (true) {
+[ok,Bf,Br,Is,Vak,Tauf,Taur,Ccs,Cje,Cjc,Phie,Me,Phic,Mc,Gbc,Gbe,Vt,EMinMax,exprs]=scicos_getvalue(["Set PNP block parameters:",""],["Bf  : Forward beta","Br  : Reverse beta","Is  : Transport saturation current","Vak : Early voltage (inverse), 1/Volt","Tauf: Ideal forward transit time","Taur: Ideal reverse transit time","Ccs : Collector-substrat(ground) cap.","Cje : Base-emitter zero bias depletion cap.","Cjc : Base-coll. zero bias depletion cap.","Phie: Base-emitter diffusion voltage","Me  : Base-emitter gradation exponent","Phic: Base-collector diffusion voltage","Mc  : Base-collector gradation exponent","Gbc : Base-collector conductance","Gbe : Base-emitter conductance","Vt  : Voltage equivalent of temperature","EMinMax: if x > EMinMax, the exp(x) function is linearized"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
+if (!ok) {
+break
+}
+x.model.equations.parameters[2-1]=list(Bf,Br,Is,Vak,Tauf,Taur,Ccs,Cje,Cjc,Phie,Me,Phic,Mc,Gbc,Gbe,Vt,EMinMax);
+x.graphics.exprs=exprs;
+break
+}
+}
 }
diff --git a/js/Electrical/PotentialSensor.js b/js/Electrical/PotentialSensor.js
index 2676d657..b0cbe948 100644
--- a/js/Electrical/PotentialSensor.js
+++ b/js/Electrical/PotentialSensor.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/Electrical/PotentialSensor.sci" */
 function PotentialSensor() {
-PotentialSensor.prototype.get = function PotentialSensor() {
-}
-PotentialSensor.prototype.set = function PotentialSensor() {
-x=arg1;
-}
 PotentialSensor.prototype.define = function PotentialSensor() {
 model=scicos_model();
 model.in1=[1];
@@ -25,4 +20,9 @@ x.graphics.out_implicit=["E"];
 }
 PotentialSensor.prototype.details = function PotentialSensor() {
 }
+PotentialSensor.prototype.get = function PotentialSensor() {
+}
+PotentialSensor.prototype.set = function PotentialSensor() {
+x=arg1;
+}
 }
diff --git a/js/Electrical/Resistor.js b/js/Electrical/Resistor.js
index 402732ca..ab9bd491 100644
--- a/js/Electrical/Resistor.js
+++ b/js/Electrical/Resistor.js
@@ -1,25 +1,5 @@
 /* autogenerated from "macros/Electrical/Resistor.sci" */
 function Resistor() {
-Resistor.prototype.get = function Resistor() {
-}
-Resistor.prototype.set = function Resistor() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,R,exprs]=scicos_getvalue("Set Resistor block parameter","R (ohm)",list("vec",1),exprs);
-if (!ok) {
-break
-}
-model.rpar=R;
-model.equations.parameters[2-1]=list(R);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
-}
-}
 Resistor.prototype.define = function Resistor() {
 model=scicos_model();
 R=0.01;
@@ -43,4 +23,24 @@ x.graphics.out_implicit=["I"];
 }
 Resistor.prototype.details = function Resistor() {
 }
+Resistor.prototype.get = function Resistor() {
+}
+Resistor.prototype.set = function Resistor() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,R,exprs]=scicos_getvalue("Set Resistor block parameter","R (ohm)",list("vec",1),exprs);
+if (!ok) {
+break
+}
+model.rpar=R;
+model.equations.parameters[2-1]=list(R);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
 }
diff --git a/js/Electrical/SineVoltage.js b/js/Electrical/SineVoltage.js
index 539c503e..bab918cd 100644
--- a/js/Electrical/SineVoltage.js
+++ b/js/Electrical/SineVoltage.js
@@ -1,25 +1,5 @@
 /* autogenerated from "macros/Electrical/SineVoltage.sci" */
 function SineVoltage() {
-SineVoltage.prototype.get = function SineVoltage() {
-}
-SineVoltage.prototype.set = function SineVoltage() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,V,ph,frq,offset,start,exprs]=scicos_getvalue("Set voltage source parameter",["Amplitude (Volt)","phase (rad)","Frequency (Hz)","Voltageoffset (V)","Timeoffset (s)"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
-if (!ok) {
-break
-}
-model.rpar=[V,ph,frq,offset,start];
-model.equations.parameters[2-1]=list(V,ph,frq,offset,start);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
-}
-}
 SineVoltage.prototype.define = function SineVoltage() {
 model=scicos_model();
 model.in1=[1];
@@ -47,4 +27,24 @@ x.graphics.out_implicit=["I"];
 }
 SineVoltage.prototype.details = function SineVoltage() {
 }
+SineVoltage.prototype.get = function SineVoltage() {
+}
+SineVoltage.prototype.set = function SineVoltage() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,V,ph,frq,offset,start,exprs]=scicos_getvalue("Set voltage source parameter",["Amplitude (Volt)","phase (rad)","Frequency (Hz)","Voltageoffset (V)","Timeoffset (s)"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
+if (!ok) {
+break
+}
+model.rpar=[V,ph,frq,offset,start];
+model.equations.parameters[2-1]=list(V,ph,frq,offset,start);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
 }
diff --git a/js/Electrical/Switch.js b/js/Electrical/Switch.js
index 221c795f..250033f5 100644
--- a/js/Electrical/Switch.js
+++ b/js/Electrical/Switch.js
@@ -1,24 +1,5 @@
 /* autogenerated from "macros/Electrical/Switch.sci" */
 function Switch() {
-Switch.prototype.get = function Switch() {
-}
-Switch.prototype.set = function Switch() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,Ron,Roff,exprs]=scicos_getvalue("Set non-ideal electrical switch parameters",["Resistance in On state (Ohm)","Resistance in Off state (Ohm)"],list("vec",1,"vec",1),exprs);
-if (!ok) {
-break
-}
-model.equations.parameters[2-1]=list(Ron,Roff);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
-}
-}
 Switch.prototype.define = function Switch() {
 model=scicos_model();
 Ron=0.01;
@@ -45,4 +26,23 @@ x.graphics.out_implicit=["I"];
 }
 Switch.prototype.details = function Switch() {
 }
+Switch.prototype.get = function Switch() {
+}
+Switch.prototype.set = function Switch() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,Ron,Roff,exprs]=scicos_getvalue("Set non-ideal electrical switch parameters",["Resistance in On state (Ohm)","Resistance in Off state (Ohm)"],list("vec",1,"vec",1),exprs);
+if (!ok) {
+break
+}
+model.equations.parameters[2-1]=list(Ron,Roff);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
 }
diff --git a/js/Electrical/VVsourceAC.js b/js/Electrical/VVsourceAC.js
index 24cc91d2..fe630ff6 100644
--- a/js/Electrical/VVsourceAC.js
+++ b/js/Electrical/VVsourceAC.js
@@ -1,25 +1,5 @@
 /* autogenerated from "macros/Electrical/VVsourceAC.sci" */
 function VVsourceAC() {
-VVsourceAC.prototype.get = function VVsourceAC() {
-}
-VVsourceAC.prototype.set = function VVsourceAC() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,FR,exprs]=scicos_getvalue("Set voltage source parameter",["Frequency (Hz)"],list("vec",-1),exprs);
-if (!ok) {
-break
-}
-model.rpar=[FR];
-model.equations.parameters[2-1]=list(FR);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
-}
-}
 VVsourceAC.prototype.define = function VVsourceAC() {
 model=scicos_model();
 model.in1=[1,1];
@@ -44,4 +24,24 @@ x.graphics.out_implicit=["I"];
 }
 VVsourceAC.prototype.details = function VVsourceAC() {
 }
+VVsourceAC.prototype.get = function VVsourceAC() {
+}
+VVsourceAC.prototype.set = function VVsourceAC() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,FR,exprs]=scicos_getvalue("Set voltage source parameter",["Frequency (Hz)"],list("vec",-1),exprs);
+if (!ok) {
+break
+}
+model.rpar=[FR];
+model.equations.parameters[2-1]=list(FR);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
 }
diff --git a/js/Electrical/VariableResistor.js b/js/Electrical/VariableResistor.js
index 3648ec5b..fafa9ec2 100644
--- a/js/Electrical/VariableResistor.js
+++ b/js/Electrical/VariableResistor.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/Electrical/VariableResistor.sci" */
 function VariableResistor() {
-VariableResistor.prototype.get = function VariableResistor() {
-}
-VariableResistor.prototype.set = function VariableResistor() {
-x=arg1;
-}
 VariableResistor.prototype.define = function VariableResistor() {
 model=scicos_model();
 model.sim="VariableResistor";
@@ -25,4 +20,9 @@ x.graphics.out_implicit=["I"];
 }
 VariableResistor.prototype.details = function VariableResistor() {
 }
+VariableResistor.prototype.get = function VariableResistor() {
+}
+VariableResistor.prototype.set = function VariableResistor() {
+x=arg1;
+}
 }
diff --git a/js/Electrical/VoltageSensor.js b/js/Electrical/VoltageSensor.js
index 314386cf..8119bdf3 100644
--- a/js/Electrical/VoltageSensor.js
+++ b/js/Electrical/VoltageSensor.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/Electrical/VoltageSensor.sci" */
 function VoltageSensor() {
-VoltageSensor.prototype.get = function VoltageSensor() {
-}
-VoltageSensor.prototype.set = function VoltageSensor() {
-x=arg1;
-}
 VoltageSensor.prototype.define = function VoltageSensor() {
 model=scicos_model();
 model.in1=1;
@@ -25,4 +20,9 @@ x.graphics.out_implicit=["I","E"];
 }
 VoltageSensor.prototype.details = function VoltageSensor() {
 }
+VoltageSensor.prototype.get = function VoltageSensor() {
+}
+VoltageSensor.prototype.set = function VoltageSensor() {
+x=arg1;
+}
 }
diff --git a/js/Electrical/VsourceAC.js b/js/Electrical/VsourceAC.js
index 3fb38abf..5cdfa82b 100644
--- a/js/Electrical/VsourceAC.js
+++ b/js/Electrical/VsourceAC.js
@@ -1,25 +1,5 @@
 /* autogenerated from "macros/Electrical/VsourceAC.sci" */
 function VsourceAC() {
-VsourceAC.prototype.get = function VsourceAC() {
-}
-VsourceAC.prototype.set = function VsourceAC() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,VA,FR,exprs]=scicos_getvalue("Set voltage source parameter",["Amplitude (Volt)","Frequency (Hz)"],list("vec",-1,"vec",-1),exprs);
-if (!ok) {
-break
-}
-model.rpar=[VA,FR];
-model.equations.parameters[2-1]=list(VA,FR);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
-}
-}
 VsourceAC.prototype.define = function VsourceAC() {
 model=scicos_model();
 model.in1=[1];
@@ -44,4 +24,24 @@ x.graphics.out_implicit=["I"];
 }
 VsourceAC.prototype.details = function VsourceAC() {
 }
+VsourceAC.prototype.get = function VsourceAC() {
+}
+VsourceAC.prototype.set = function VsourceAC() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,VA,FR,exprs]=scicos_getvalue("Set voltage source parameter",["Amplitude (Volt)","Frequency (Hz)"],list("vec",-1,"vec",-1),exprs);
+if (!ok) {
+break
+}
+model.rpar=[VA,FR];
+model.equations.parameters[2-1]=list(VA,FR);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
 }
diff --git a/js/Events/ANDBLK.js b/js/Events/ANDBLK.js
index 8fba581e..d108957d 100644
--- a/js/Events/ANDBLK.js
+++ b/js/Events/ANDBLK.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/Events/ANDBLK.sci" */
 function ANDBLK() {
-ANDBLK.prototype.get = function ANDBLK() {
-}
-ANDBLK.prototype.set = function ANDBLK() {
-x=arg1;
-}
 ANDBLK.prototype.define = function ANDBLK() {
 andlog=ANDLOG_f("define");
 andlog.graphics.orig=[194,133];
@@ -73,4 +68,9 @@ x.model.rpar=diagram;
 }
 ANDBLK.prototype.details = function ANDBLK() {
 }
+ANDBLK.prototype.get = function ANDBLK() {
+}
+ANDBLK.prototype.set = function ANDBLK() {
+x=arg1;
+}
 }
diff --git a/js/Events/ANDLOG_f.js b/js/Events/ANDLOG_f.js
index f98df291..794a1429 100644
--- a/js/Events/ANDLOG_f.js
+++ b/js/Events/ANDLOG_f.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/Events/ANDLOG_f.sci" */
 function ANDLOG_f() {
-ANDLOG_f.prototype.get = function ANDLOG_f() {
-}
-ANDLOG_f.prototype.set = function ANDLOG_f() {
-x=arg1;
-}
 ANDLOG_f.prototype.define = function ANDLOG_f() {
 model=scicos_model();
 model.sim="andlog";
@@ -18,4 +13,9 @@ x=standard_define([3,3],model,[],gr_i);
 }
 ANDLOG_f.prototype.details = function ANDLOG_f() {
 }
+ANDLOG_f.prototype.get = function ANDLOG_f() {
+}
+ANDLOG_f.prototype.set = function ANDLOG_f() {
+x=arg1;
+}
 }
diff --git a/js/Events/CLKSOMV_f.js b/js/Events/CLKSOMV_f.js
index 551ffe41..28969964 100644
--- a/js/Events/CLKSOMV_f.js
+++ b/js/Events/CLKSOMV_f.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/Events/CLKSOMV_f.sci" */
 function CLKSOMV_f() {
-CLKSOMV_f.prototype.get = function CLKSOMV_f() {
-}
-CLKSOMV_f.prototype.set = function CLKSOMV_f() {
-x=arg1;
-}
 CLKSOMV_f.prototype.define = function CLKSOMV_f() {
 model=scicos_model();
 model.sim="sum";
@@ -18,4 +13,9 @@ x=standard_define([2,2],model,[],gr_i);
 }
 CLKSOMV_f.prototype.details = function CLKSOMV_f() {
 }
+CLKSOMV_f.prototype.get = function CLKSOMV_f() {
+}
+CLKSOMV_f.prototype.set = function CLKSOMV_f() {
+x=arg1;
+}
 }
diff --git a/js/Events/CLKSOM_f.js b/js/Events/CLKSOM_f.js
index 6cd50908..5723652b 100644
--- a/js/Events/CLKSOM_f.js
+++ b/js/Events/CLKSOM_f.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/Events/CLKSOM_f.sci" */
 function CLKSOM_f() {
-CLKSOM_f.prototype.get = function CLKSOM_f() {
-}
-CLKSOM_f.prototype.set = function CLKSOM_f() {
-x=arg1;
-}
 CLKSOM_f.prototype.define = function CLKSOM_f() {
 model=scicos_model();
 model.sim="sum";
@@ -18,4 +13,9 @@ x=standard_define([1,1]/1.2,model,[],gr_i);
 }
 CLKSOM_f.prototype.details = function CLKSOM_f() {
 }
+CLKSOM_f.prototype.get = function CLKSOM_f() {
+}
+CLKSOM_f.prototype.set = function CLKSOM_f() {
+x=arg1;
+}
 }
diff --git a/js/Events/CLKSPLIT_f.js b/js/Events/CLKSPLIT_f.js
index 4281057d..aed0654a 100644
--- a/js/Events/CLKSPLIT_f.js
+++ b/js/Events/CLKSPLIT_f.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/Events/CLKSPLIT_f.sci" */
 function CLKSPLIT_f() {
-CLKSPLIT_f.prototype.get = function CLKSPLIT_f() {
-}
-CLKSPLIT_f.prototype.set = function CLKSPLIT_f() {
-x=arg1;
-}
 CLKSPLIT_f.prototype.define = function CLKSPLIT_f() {
 model=scicos_model();
 model.sim="split";
@@ -17,4 +12,9 @@ x=standard_define([1,1]/3,model,[],[]);
 }
 CLKSPLIT_f.prototype.details = function CLKSPLIT_f() {
 }
+CLKSPLIT_f.prototype.get = function CLKSPLIT_f() {
+}
+CLKSPLIT_f.prototype.set = function CLKSPLIT_f() {
+x=arg1;
+}
 }
diff --git a/js/Events/END_c.js b/js/Events/END_c.js
index 8dda488a..d1b50cb9 100644
--- a/js/Events/END_c.js
+++ b/js/Events/END_c.js
@@ -1,5 +1,20 @@
 /* autogenerated from "macros/Events/END_c.sci" */
 function END_c() {
+END_c.prototype.define = function END_c() {
+tf=100000000;
+model=scicos_model();
+model.sim=list("scicosexit",4);
+model.evtin=1;
+model.evtout=1;
+model.firing=tf;
+model.blocktype="d";
+model.dep_ut=[false,false];
+exprs=string(tf);
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+END_c.prototype.details = function END_c() {
+}
 END_c.prototype.get = function END_c() {
 }
 END_c.prototype.set = function END_c() {
@@ -21,19 +36,4 @@ break
 }
 }
 }
-END_c.prototype.define = function END_c() {
-tf=100000000;
-model=scicos_model();
-model.sim=list("scicosexit",4);
-model.evtin=1;
-model.evtout=1;
-model.firing=tf;
-model.blocktype="d";
-model.dep_ut=[false,false];
-exprs=string(tf);
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-END_c.prototype.details = function END_c() {
-}
 }
diff --git a/js/Events/EVTDLY_c.js b/js/Events/EVTDLY_c.js
index a993fef0..ba1658ed 100644
--- a/js/Events/EVTDLY_c.js
+++ b/js/Events/EVTDLY_c.js
@@ -1,5 +1,22 @@
 /* autogenerated from "macros/Events/EVTDLY_c.sci" */
 function EVTDLY_c() {
+EVTDLY_c.prototype.define = function EVTDLY_c() {
+dt=0.1;
+ff=0.0;
+model=scicos_model();
+model.sim=list("evtdly4",4);
+model.evtin=1;
+model.evtout=1;
+model.rpar=[dt,ff];
+model.blocktype="d";
+model.firing=ff;
+model.dep_ut=[false,false];
+exprs=[string(dt),sci2exp(ff)];
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+EVTDLY_c.prototype.details = function EVTDLY_c() {
+}
 EVTDLY_c.prototype.get = function EVTDLY_c() {
 }
 EVTDLY_c.prototype.set = function EVTDLY_c() {
@@ -26,21 +43,4 @@ break
 }
 }
 }
-EVTDLY_c.prototype.define = function EVTDLY_c() {
-dt=0.1;
-ff=0.0;
-model=scicos_model();
-model.sim=list("evtdly4",4);
-model.evtin=1;
-model.evtout=1;
-model.rpar=[dt,ff];
-model.blocktype="d";
-model.firing=ff;
-model.dep_ut=[false,false];
-exprs=[string(dt),sci2exp(ff)];
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-EVTDLY_c.prototype.details = function EVTDLY_c() {
-}
 }
diff --git a/js/Events/EVTDLY_f.js b/js/Events/EVTDLY_f.js
index c6d9af25..b038922c 100644
--- a/js/Events/EVTDLY_f.js
+++ b/js/Events/EVTDLY_f.js
@@ -1,5 +1,22 @@
 /* autogenerated from "macros/Events/EVTDLY_f.sci" */
 function EVTDLY_f() {
+EVTDLY_f.prototype.define = function EVTDLY_f() {
+dt=0.1;
+ff=dt;
+model=scicos_model();
+model.sim="evtdly";
+model.evtin=1;
+model.evtout=1;
+model.rpar=dt;
+model.blocktype="d";
+model.firing=ff;
+model.dep_ut=[false,false];
+exprs=[string(dt),sci2exp(ff)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+EVTDLY_f.prototype.details = function EVTDLY_f() {
+}
 EVTDLY_f.prototype.get = function EVTDLY_f() {
 }
 EVTDLY_f.prototype.set = function EVTDLY_f() {
@@ -26,21 +43,4 @@ break
 }
 }
 }
-EVTDLY_f.prototype.define = function EVTDLY_f() {
-dt=0.1;
-ff=dt;
-model=scicos_model();
-model.sim="evtdly";
-model.evtin=1;
-model.evtout=1;
-model.rpar=dt;
-model.blocktype="d";
-model.firing=ff;
-model.dep_ut=[false,false];
-exprs=[string(dt),sci2exp(ff)];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-EVTDLY_f.prototype.details = function EVTDLY_f() {
-}
 }
diff --git a/js/Events/EVTGEN_f.js b/js/Events/EVTGEN_f.js
index 7d185057..09706b26 100644
--- a/js/Events/EVTGEN_f.js
+++ b/js/Events/EVTGEN_f.js
@@ -1,5 +1,19 @@
 /* autogenerated from "macros/Events/EVTGEN_f.sci" */
 function EVTGEN_f() {
+EVTGEN_f.prototype.define = function EVTGEN_f() {
+tt=0;
+model=scicos_model();
+model.sim="trash";
+model.evtout=1;
+model.blocktype="d";
+model.firing=tt;
+model.dep_ut=[false,false];
+exprs=string(tt);
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+EVTGEN_f.prototype.details = function EVTGEN_f() {
+}
 EVTGEN_f.prototype.get = function EVTGEN_f() {
 }
 EVTGEN_f.prototype.set = function EVTGEN_f() {
@@ -21,18 +35,4 @@ x.model=model;
 break
 }
 }
-EVTGEN_f.prototype.define = function EVTGEN_f() {
-tt=0;
-model=scicos_model();
-model.sim="trash";
-model.evtout=1;
-model.blocktype="d";
-model.firing=tt;
-model.dep_ut=[false,false];
-exprs=string(tt);
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-EVTGEN_f.prototype.details = function EVTGEN_f() {
-}
 }
diff --git a/js/Events/EVTVARDLY.js b/js/Events/EVTVARDLY.js
index cc17041a..029ac0fe 100644
--- a/js/Events/EVTVARDLY.js
+++ b/js/Events/EVTVARDLY.js
@@ -1,5 +1,21 @@
 /* autogenerated from "macros/Events/EVTVARDLY.sci" */
 function EVTVARDLY() {
+EVTVARDLY.prototype.define = function EVTVARDLY() {
+model=scicos_model();
+model.sim=list("evtvardly",4);
+model.in1=1;
+model.evtin=1;
+model.evtout=1;
+model.blocktype="d";
+model.firing=-1;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=string(model.firing);
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+EVTVARDLY.prototype.details = function EVTVARDLY() {
+}
 EVTVARDLY.prototype.get = function EVTVARDLY() {
 }
 EVTVARDLY.prototype.set = function EVTVARDLY() {
@@ -19,20 +35,4 @@ x.model=model;
 break
 }
 }
-EVTVARDLY.prototype.define = function EVTVARDLY() {
-model=scicos_model();
-model.sim=list("evtvardly",4);
-model.in1=1;
-model.evtin=1;
-model.evtout=1;
-model.blocktype="d";
-model.firing=-1;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=string(model.firing);
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-EVTVARDLY.prototype.details = function EVTVARDLY() {
-}
 }
diff --git a/js/Events/HALT_f.js b/js/Events/HALT_f.js
index 988f2cdc..9714c7ba 100644
--- a/js/Events/HALT_f.js
+++ b/js/Events/HALT_f.js
@@ -1,5 +1,20 @@
 /* autogenerated from "macros/Events/HALT_f.sci" */
 function HALT_f() {
+HALT_f.prototype.define = function HALT_f() {
+n=0;
+model=scicos_model();
+model.sim="hltblk";
+model.evtin=1;
+model.dstate=0;
+model.ipar=0;
+model.blocktype="d";
+model.dep_ut=[false,false];
+exprs=string(n);
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+HALT_f.prototype.details = function HALT_f() {
+}
 HALT_f.prototype.get = function HALT_f() {
 }
 HALT_f.prototype.set = function HALT_f() {
@@ -21,19 +36,4 @@ break
 }
 }
 }
-HALT_f.prototype.define = function HALT_f() {
-n=0;
-model=scicos_model();
-model.sim="hltblk";
-model.evtin=1;
-model.dstate=0;
-model.ipar=0;
-model.blocktype="d";
-model.dep_ut=[false,false];
-exprs=string(n);
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-HALT_f.prototype.details = function HALT_f() {
-}
 }
diff --git a/js/Events/IFTHEL_f.js b/js/Events/IFTHEL_f.js
index 4e44c01f..8a893b91 100644
--- a/js/Events/IFTHEL_f.js
+++ b/js/Events/IFTHEL_f.js
@@ -1,5 +1,24 @@
 /* autogenerated from "macros/Events/IFTHEL_f.sci" */
 function IFTHEL_f() {
+IFTHEL_f.prototype.define = function IFTHEL_f() {
+model=scicos_model();
+model.sim=list("ifthel",-1);
+model.in1=1;
+model.in2=1;
+model.intyp=-1;
+model.evtin=1;
+model.evtout=[1,1];
+model.blocktype="l";
+model.firing=[-1,-1];
+model.dep_ut=[true,false];
+model.nmode=1;
+model.nzcross=1;
+gr_i=[];
+exprs=[string(model.in1),string(model.nmode)];
+x=standard_define([3,3],model,exprs,gr_i);
+}
+IFTHEL_f.prototype.details = function IFTHEL_f() {
+}
 IFTHEL_f.prototype.get = function IFTHEL_f() {
 }
 IFTHEL_f.prototype.set = function IFTHEL_f() {
@@ -38,23 +57,4 @@ break
 }
 }
 }
-IFTHEL_f.prototype.define = function IFTHEL_f() {
-model=scicos_model();
-model.sim=list("ifthel",-1);
-model.in1=1;
-model.in2=1;
-model.intyp=-1;
-model.evtin=1;
-model.evtout=[1,1];
-model.blocktype="l";
-model.firing=[-1,-1];
-model.dep_ut=[true,false];
-model.nmode=1;
-model.nzcross=1;
-gr_i=[];
-exprs=[string(model.in1),string(model.nmode)];
-x=standard_define([3,3],model,exprs,gr_i);
-}
-IFTHEL_f.prototype.details = function IFTHEL_f() {
-}
 }
diff --git a/js/Events/MCLOCK_f.js b/js/Events/MCLOCK_f.js
index f28cd0bb..44ac10e1 100644
--- a/js/Events/MCLOCK_f.js
+++ b/js/Events/MCLOCK_f.js
@@ -1,27 +1,5 @@
 /* autogenerated from "macros/Events/MCLOCK_f.sci" */
 function MCLOCK_f() {
-MCLOCK_f.prototype.get = function MCLOCK_f() {
-}
-MCLOCK_f.prototype.set = function MCLOCK_f() {
-for (i=1;i<=length(arg1.model.rpar.objs);i+=1) {
-o=arg1.model.rpar.objs(i);
-if (typeof(o)=="Block"&&o.gui=="MFCLCK_f") {
-path=i;
-break
-}
-}
-newpar=list();
-spath=list("model","rpar","objs",path);
-xx=arg1(spath);
-execstr("xxn="+xx.gui+"(\'set\',xx)");
-if (or(xxn!=xx)) {
-arg1[spath-1]=xxn;
-newpar[size(newpar)+1-1]=path;
-}
-x=arg1;
-y=0;
-typ=newpar;
-}
 MCLOCK_f.prototype.define = function MCLOCK_f() {
 nn=2;
 dt=0.1;
@@ -92,4 +70,26 @@ x.graphics.peout=[0,0];
 }
 MCLOCK_f.prototype.details = function MCLOCK_f() {
 }
+MCLOCK_f.prototype.get = function MCLOCK_f() {
+}
+MCLOCK_f.prototype.set = function MCLOCK_f() {
+for (i=1;i<=length(arg1.model.rpar.objs);i+=1) {
+o=arg1.model.rpar.objs(i);
+if (typeof(o)=="Block"&&o.gui=="MFCLCK_f") {
+path=i;
+break
+}
+}
+newpar=list();
+spath=list("model","rpar","objs",path);
+xx=arg1(spath);
+execstr("xxn="+xx.gui+"(\'set\',xx)");
+if (or(xxn!=xx)) {
+arg1[spath-1]=xxn;
+newpar[size(newpar)+1-1]=path;
+}
+x=arg1;
+y=0;
+typ=newpar;
+}
 }
diff --git a/js/Events/MFCLCK_f.js b/js/Events/MFCLCK_f.js
index fdc2d25e..df4ea9e9 100644
--- a/js/Events/MFCLCK_f.js
+++ b/js/Events/MFCLCK_f.js
@@ -1,24 +1,5 @@
 /* autogenerated from "macros/Events/MFCLCK_f.sci" */
 function MFCLCK_f() {
-MFCLCK_f.prototype.get = function MFCLCK_f() {
-}
-MFCLCK_f.prototype.set = function MFCLCK_f() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-[ok,dt,nn,exprs]=scicos_getvalue("Set Multifrequency clock parameters",["basic period (1/f)","multiply by (n)"],list("vec",1,"vec",1),exprs);
-if (ok) {
-model.ipar=nn;
-model.rpar=dt;
-hh=model.firing;
-hh[2-1]=0;
-model.firing=hh;
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-}
-}
 MFCLCK_f.prototype.define = function MFCLCK_f() {
 nn=2;
 dt=0.1;
@@ -38,4 +19,23 @@ x=standard_define([3,2],model,exprs,gr_i);
 }
 MFCLCK_f.prototype.details = function MFCLCK_f() {
 }
+MFCLCK_f.prototype.get = function MFCLCK_f() {
+}
+MFCLCK_f.prototype.set = function MFCLCK_f() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+[ok,dt,nn,exprs]=scicos_getvalue("Set Multifrequency clock parameters",["basic period (1/f)","multiply by (n)"],list("vec",1,"vec",1),exprs);
+if (ok) {
+model.ipar=nn;
+model.rpar=dt;
+hh=model.firing;
+hh[2-1]=0;
+model.firing=hh;
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+}
+}
 }
diff --git a/js/Events/VirtualCLK0.js b/js/Events/VirtualCLK0.js
index 22122bc2..55e6e0e0 100644
--- a/js/Events/VirtualCLK0.js
+++ b/js/Events/VirtualCLK0.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/Events/VirtualCLK0.sci" */
 function VirtualCLK0() {
-VirtualCLK0.prototype.get = function VirtualCLK0() {
-}
-VirtualCLK0.prototype.set = function VirtualCLK0() {
-x=arg1;
-}
 VirtualCLK0.prototype.define = function VirtualCLK0() {
 model=scicos_model();
 model.sim="vrtclk0";
@@ -19,4 +14,9 @@ x=standard_define([2,2],model,exprs," ");
 }
 VirtualCLK0.prototype.details = function VirtualCLK0() {
 }
+VirtualCLK0.prototype.get = function VirtualCLK0() {
+}
+VirtualCLK0.prototype.set = function VirtualCLK0() {
+x=arg1;
+}
 }
diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js
index da1506e2..3114935f 100644
--- a/js/Hydraulics/Bache.js
+++ b/js/Hydraulics/Bache.js
@@ -1,25 +1,5 @@
 /* autogenerated from "macros/Hydraulics/Bache.sci" */
 function Bache() {
-Bache.prototype.get = function Bache() {
-}
-Bache.prototype.set = function Bache() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,Patm,A,ze1,ze2,zs1,zs2,z0,T0,p_rho,exprs]=scicos_getvalue("Parametres de la bache",["Pression dans le ciel de la bache : Patm (Pa)","Section de la bache : A (m2)","Altitude du piquage d entrée 1: ze1 (m)","Altitude du piquage d entrée 2: ze2 (m)","Altitude du piquage de sortie 1: zs1 (m)","Altitude du piquage de sortie 2: zs2 (m)","Altitude initiale du fluide : z0 (m)","Température initiale du fluide : T0 (K)","Si >0, masse volumique imposée du fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
-if (!ok) {
-break
-}
-model.rpar=[Patm,A,ze1,ze2,zs1,zs2,z0,T0,p_rho];
-model.equations.parameters[2-1]=list(Patm,A,ze1,ze2,zs1,zs2,z0,T0,p_rho);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
-}
-}
 Bache.prototype.define = function Bache() {
 in1=2;
 out=3;
@@ -55,4 +35,24 @@ x.graphics.out_implicit=["I","I","E"];
 }
 Bache.prototype.details = function Bache() {
 }
+Bache.prototype.get = function Bache() {
+}
+Bache.prototype.set = function Bache() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,Patm,A,ze1,ze2,zs1,zs2,z0,T0,p_rho,exprs]=scicos_getvalue("Parametres de la bache",["Pression dans le ciel de la bache : Patm (Pa)","Section de la bache : A (m2)","Altitude du piquage d entrée 1: ze1 (m)","Altitude du piquage d entrée 2: ze2 (m)","Altitude du piquage de sortie 1: zs1 (m)","Altitude du piquage de sortie 2: zs2 (m)","Altitude initiale du fluide : z0 (m)","Température initiale du fluide : T0 (K)","Si >0, masse volumique imposée du fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
+if (!ok) {
+break
+}
+model.rpar=[Patm,A,ze1,ze2,zs1,zs2,z0,T0,p_rho];
+model.equations.parameters[2-1]=list(Patm,A,ze1,ze2,zs1,zs2,z0,T0,p_rho);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
 }
diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js
index 0af6226d..61f91774 100644
--- a/js/Hydraulics/Flowmeter.js
+++ b/js/Hydraulics/Flowmeter.js
@@ -1,24 +1,5 @@
 /* autogenerated from "macros/Hydraulics/Flowmeter.sci" */
 function Flowmeter() {
-Flowmeter.prototype.get = function Flowmeter() {
-}
-Flowmeter.prototype.set = function Flowmeter() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-x=arg1;
-exprs=x.graphics.exprs;
-while (false) {
-[ok,Qini,exprs]=scicos_getvalue(["Set Flowmeter block parameters:","","Qini: "],"Qini",list("vec",1),exprs);
-if (!ok) {
-break
-}
-x.model.equations.parameters[2-1]=list(Qini);
-x.graphics.exprs=exprs;
-break
-}
-}
 Flowmeter.prototype.define = function Flowmeter() {
 ModelName="Flowmeter";
 PrametersValue=1;
@@ -69,4 +50,23 @@ x.graphics.out_implicit=Typeout;
 }
 Flowmeter.prototype.details = function Flowmeter() {
 }
+Flowmeter.prototype.get = function Flowmeter() {
+}
+Flowmeter.prototype.set = function Flowmeter() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+x=arg1;
+exprs=x.graphics.exprs;
+while (false) {
+[ok,Qini,exprs]=scicos_getvalue(["Set Flowmeter block parameters:","","Qini: "],"Qini",list("vec",1),exprs);
+if (!ok) {
+break
+}
+x.model.equations.parameters[2-1]=list(Qini);
+x.graphics.exprs=exprs;
+break
+}
+}
 }
diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js
index 9d1c12b5..fad593fe 100644
--- a/js/Hydraulics/PerteDP.js
+++ b/js/Hydraulics/PerteDP.js
@@ -1,25 +1,5 @@
 /* autogenerated from "macros/Hydraulics/PerteDP.sci" */
 function PerteDP() {
-PerteDP.prototype.get = function PerteDP() {
-}
-PerteDP.prototype.set = function PerteDP() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,L,D,lambda,z1,z2,p_rho,exprs]=scicos_getvalue("Parametres du tuyau",["Longueur du tube : L (m)","Diamètre interne du tube : D (m)","Coefficient de perte de charge-frottement(S.U) : lambda","Altitude entrée tuyauterie : z1 (m)","Altitude sortie tuyauterie : z2 (m)","Si >0, masse volumique imposée fu fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
-if (!ok) {
-break
-}
-model.rpar=[L,D,lambda,z1,z2,p_rho];
-model.equations.parameters[2-1]=list(L,D,lambda,z1,z2,p_rho);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
-}
-}
 PerteDP.prototype.define = function PerteDP() {
 model=scicos_model();
 model.in1=[1];
@@ -50,4 +30,24 @@ x.graphics.out_implicit=["I"];
 }
 PerteDP.prototype.details = function PerteDP() {
 }
+PerteDP.prototype.get = function PerteDP() {
+}
+PerteDP.prototype.set = function PerteDP() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,L,D,lambda,z1,z2,p_rho,exprs]=scicos_getvalue("Parametres du tuyau",["Longueur du tube : L (m)","Diamètre interne du tube : D (m)","Coefficient de perte de charge-frottement(S.U) : lambda","Altitude entrée tuyauterie : z1 (m)","Altitude sortie tuyauterie : z2 (m)","Si >0, masse volumique imposée fu fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
+if (!ok) {
+break
+}
+model.rpar=[L,D,lambda,z1,z2,p_rho];
+model.equations.parameters[2-1]=list(L,D,lambda,z1,z2,p_rho);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
 }
diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js
index af19b6bd..f2739743 100644
--- a/js/Hydraulics/PuitsP.js
+++ b/js/Hydraulics/PuitsP.js
@@ -1,25 +1,5 @@
 /* autogenerated from "macros/Hydraulics/PuitsP.sci" */
 function PuitsP() {
-PuitsP.prototype.get = function PuitsP() {
-}
-PuitsP.prototype.set = function PuitsP() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,P0,T0,H0,option_temperature,exprs]=scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
-if (!ok) {
-break
-}
-model.rpar=[P0,T0,H0,option_temperature];
-model.equations.parameters[2-1]=list(P0,T0,H0,option_temperature);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
-}
-}
 PuitsP.prototype.define = function PuitsP() {
 model=scicos_model();
 P0=100000;
@@ -43,4 +23,24 @@ x.graphics.in_implicit=["I"];
 }
 PuitsP.prototype.details = function PuitsP() {
 }
+PuitsP.prototype.get = function PuitsP() {
+}
+PuitsP.prototype.set = function PuitsP() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,P0,T0,H0,option_temperature,exprs]=scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
+if (!ok) {
+break
+}
+model.rpar=[P0,T0,H0,option_temperature];
+model.equations.parameters[2-1]=list(P0,T0,H0,option_temperature);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
 }
diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js
index 882d3183..34997c0a 100644
--- a/js/Hydraulics/SourceP.js
+++ b/js/Hydraulics/SourceP.js
@@ -1,25 +1,5 @@
 /* autogenerated from "macros/Hydraulics/SourceP.sci" */
 function SourceP() {
-SourceP.prototype.get = function SourceP() {
-}
-SourceP.prototype.set = function SourceP() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,P0,T0,H0,option_temperature,exprs]=scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
-if (!ok) {
-break
-}
-model.rpar=[P0,T0,H0,option_temperature];
-model.equations.parameters[2-1]=list(P0,T0,H0,option_temperature);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
-}
-}
 SourceP.prototype.define = function SourceP() {
 model=scicos_model();
 P0=300000;
@@ -45,4 +25,24 @@ x.graphics.out_implicit=["I"];
 }
 SourceP.prototype.details = function SourceP() {
 }
+SourceP.prototype.get = function SourceP() {
+}
+SourceP.prototype.set = function SourceP() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,P0,T0,H0,option_temperature,exprs]=scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
+if (!ok) {
+break
+}
+model.rpar=[P0,T0,H0,option_temperature];
+model.equations.parameters[2-1]=list(P0,T0,H0,option_temperature);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
 }
diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js
index 4ce72db6..411ceca0 100644
--- a/js/Hydraulics/VanneReglante.js
+++ b/js/Hydraulics/VanneReglante.js
@@ -1,25 +1,5 @@
 /* autogenerated from "macros/Hydraulics/VanneReglante.sci" */
 function VanneReglante() {
-VanneReglante.prototype.get = function VanneReglante() {
-}
-VanneReglante.prototype.set = function VanneReglante() {
-x=arg1;
-graphics=arg1.graphics;
-exprs=graphics.exprs;
-model=arg1.model;
-while (true) {
-[ok,Cvmax,p_rho,exprs]=scicos_getvalue("Paramètres de la vanne reglante",["Cvmax","p_rho"],list("vec",-1,"vec",-1),exprs);
-if (!ok) {
-break
-}
-model.rpar=[Cvmax,p_rho];
-model.equations.parameters[2-1]=list(Cvmax,p_rho);
-graphics.exprs=exprs;
-x.graphics=graphics;
-x.model=model;
-break
-}
-}
 VanneReglante.prototype.define = function VanneReglante() {
 model=scicos_model();
 model.in1=[1,1];
@@ -46,4 +26,24 @@ x.graphics.out_implicit=["I"];
 }
 VanneReglante.prototype.details = function VanneReglante() {
 }
+VanneReglante.prototype.get = function VanneReglante() {
+}
+VanneReglante.prototype.set = function VanneReglante() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,Cvmax,p_rho,exprs]=scicos_getvalue("Paramètres de la vanne reglante",["Cvmax","p_rho"],list("vec",-1,"vec",-1),exprs);
+if (!ok) {
+break
+}
+model.rpar=[Cvmax,p_rho];
+model.equations.parameters[2-1]=list(Cvmax,p_rho);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
 }
diff --git a/js/IntegerOp/BITCLEAR.js b/js/IntegerOp/BITCLEAR.js
index 72cb52e1..8190422e 100644
--- a/js/IntegerOp/BITCLEAR.js
+++ b/js/IntegerOp/BITCLEAR.js
@@ -1,5 +1,23 @@
 /* autogenerated from "macros/IntegerOp/BITCLEAR.sci" */
 function BITCLEAR() {
+BITCLEAR.prototype.define = function BITCLEAR() {
+model=scicos_model();
+model.sim=list("bit_clear_32",4);
+model.in1=1;
+model.in2=1;
+model.out=1;
+model.out2=1;
+model.intyp=3;
+model.outtyp=3;
+model.opar=list(int32(0));
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[sci2exp(3),sci2exp(0)];
+gr_i=[];
+x=standard_define([4,2],model,exprs,gr_i);
+}
+BITCLEAR.prototype.details = function BITCLEAR() {
+}
 BITCLEAR.prototype.get = function BITCLEAR() {
 }
 BITCLEAR.prototype.set = function BITCLEAR() {
@@ -65,22 +83,4 @@ break
 }
 }
 }
-BITCLEAR.prototype.define = function BITCLEAR() {
-model=scicos_model();
-model.sim=list("bit_clear_32",4);
-model.in1=1;
-model.in2=1;
-model.out=1;
-model.out2=1;
-model.intyp=3;
-model.outtyp=3;
-model.opar=list(int32(0));
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[sci2exp(3),sci2exp(0)];
-gr_i=[];
-x=standard_define([4,2],model,exprs,gr_i);
-}
-BITCLEAR.prototype.details = function BITCLEAR() {
-}
 }
diff --git a/js/IntegerOp/BITSET.js b/js/IntegerOp/BITSET.js
index 0093f90e..58e2ad4d 100644
--- a/js/IntegerOp/BITSET.js
+++ b/js/IntegerOp/BITSET.js
@@ -1,5 +1,23 @@
 /* autogenerated from "macros/IntegerOp/BITSET.sci" */
 function BITSET() {
+BITSET.prototype.define = function BITSET() {
+model=scicos_model();
+model.sim=list("bit_set_32",4);
+model.in1=1;
+model.in2=1;
+model.out=1;
+model.out2=1;
+model.intyp=3;
+model.outtyp=3;
+model.opar=list(uint32(0));
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[sci2exp(3),sci2exp(0)];
+gr_i=[];
+x=standard_define([4,2],model,exprs,gr_i);
+}
+BITSET.prototype.details = function BITSET() {
+}
 BITSET.prototype.get = function BITSET() {
 }
 BITSET.prototype.set = function BITSET() {
@@ -63,22 +81,4 @@ break
 }
 }
 }
-BITSET.prototype.define = function BITSET() {
-model=scicos_model();
-model.sim=list("bit_set_32",4);
-model.in1=1;
-model.in2=1;
-model.out=1;
-model.out2=1;
-model.intyp=3;
-model.outtyp=3;
-model.opar=list(uint32(0));
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[sci2exp(3),sci2exp(0)];
-gr_i=[];
-x=standard_define([4,2],model,exprs,gr_i);
-}
-BITSET.prototype.details = function BITSET() {
-}
 }
diff --git a/js/IntegerOp/CONVERT.js b/js/IntegerOp/CONVERT.js
index 38711c97..9faa0876 100644
--- a/js/IntegerOp/CONVERT.js
+++ b/js/IntegerOp/CONVERT.js
@@ -1,5 +1,25 @@
 /* autogenerated from "macros/IntegerOp/CONVERT.sci" */
 function CONVERT() {
+CONVERT.prototype.define = function CONVERT() {
+sgn=2;
+model=scicos_model();
+model.sim=list("convert",4);
+model.in1=-1;
+model.out=-1;
+model.in2=-2;
+model.out2=-2;
+model.intyp=1;
+model.outtyp=3;
+model.rpar=[];
+model.ipar=sgn;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[sci2exp(1),sci2exp(3),sci2exp(0)];
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+CONVERT.prototype.details = function CONVERT() {
+}
 CONVERT.prototype.get = function CONVERT() {
 }
 CONVERT.prototype.set = function CONVERT() {
@@ -347,24 +367,4 @@ break
 }
 }
 }
-CONVERT.prototype.define = function CONVERT() {
-sgn=2;
-model=scicos_model();
-model.sim=list("convert",4);
-model.in1=-1;
-model.out=-1;
-model.in2=-2;
-model.out2=-2;
-model.intyp=1;
-model.outtyp=3;
-model.rpar=[];
-model.ipar=sgn;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[sci2exp(1),sci2exp(3),sci2exp(0)];
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-CONVERT.prototype.details = function CONVERT() {
-}
 }
diff --git a/js/IntegerOp/DFLIPFLOP.js b/js/IntegerOp/DFLIPFLOP.js
index d4b11eb5..4fc05802 100644
--- a/js/IntegerOp/DFLIPFLOP.js
+++ b/js/IntegerOp/DFLIPFLOP.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/IntegerOp/DFLIPFLOP.sci" */
 function DFLIPFLOP() {
-DFLIPFLOP.prototype.get = function DFLIPFLOP() {
-}
-DFLIPFLOP.prototype.set = function DFLIPFLOP() {
-x=arg1;
-}
 DFLIPFLOP.prototype.define = function DFLIPFLOP() {
 scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["DFLIPFLOP"],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.objs[1-1]=scicos_block(gui="CONST_m",graphics=scicos_graphics(orig=[109.62561,263.44465],sz=[20,20],flip=true,theta=0,exprs="int8(0)",pin=[],pout=6,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("cstblk4_m",4),in1=[],in2=[],intyp=1,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8(0)),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
@@ -98,4 +93,9 @@ x=standard_define([2,3],model,[],gr_i);
 }
 DFLIPFLOP.prototype.details = function DFLIPFLOP() {
 }
+DFLIPFLOP.prototype.get = function DFLIPFLOP() {
+}
+DFLIPFLOP.prototype.set = function DFLIPFLOP() {
+x=arg1;
+}
 }
diff --git a/js/IntegerOp/DLATCH.js b/js/IntegerOp/DLATCH.js
index 54ada8ae..deea0a7f 100644
--- a/js/IntegerOp/DLATCH.js
+++ b/js/IntegerOp/DLATCH.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/IntegerOp/DLATCH.sci" */
 function DLATCH() {
-DLATCH.prototype.get = function DLATCH() {
-}
-DLATCH.prototype.set = function DLATCH() {
-x=arg1;
-}
 DLATCH.prototype.define = function DLATCH() {
 scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["DLATCH"],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.objs[1-1]=scicos_block(gui="CONST_m",graphics=scicos_graphics(orig=[109.62561,263.44465],sz=[20,20],flip=true,theta=0,exprs="int8(0)",pin=[],pout=7,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("cstblk4_m",4),in1=[],in2=[],intyp=1,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8(0)),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
@@ -43,4 +38,9 @@ x=standard_define([2,3],model,[],gr_i);
 }
 DLATCH.prototype.details = function DLATCH() {
 }
+DLATCH.prototype.get = function DLATCH() {
+}
+DLATCH.prototype.set = function DLATCH() {
+x=arg1;
+}
 }
diff --git a/js/IntegerOp/EXTRACTBITS.js b/js/IntegerOp/EXTRACTBITS.js
index 35b709c3..54ed45e7 100644
--- a/js/IntegerOp/EXTRACTBITS.js
+++ b/js/IntegerOp/EXTRACTBITS.js
@@ -1,5 +1,24 @@
 /* autogenerated from "macros/IntegerOp/EXTRACTBITS.sci" */
 function EXTRACTBITS() {
+EXTRACTBITS.prototype.define = function EXTRACTBITS() {
+numb=[];
+model=scicos_model();
+model.sim=list("extract_bit_32_UH0",4);
+model.in1=1;
+model.in2=1;
+model.out=1;
+model.out2=1;
+model.intyp=3;
+model.outtyp=3;
+model.ipar=[0,numb];
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[sci2exp(3),sci2exp(1),sci2exp(0),sci2exp(0)];
+gr_i=[];
+x=standard_define([4,2],model,exprs,gr_i);
+}
+EXTRACTBITS.prototype.details = function EXTRACTBITS() {
+}
 EXTRACTBITS.prototype.get = function EXTRACTBITS() {
 }
 EXTRACTBITS.prototype.set = function EXTRACTBITS() {
@@ -207,23 +226,4 @@ break
 }
 }
 }
-EXTRACTBITS.prototype.define = function EXTRACTBITS() {
-numb=[];
-model=scicos_model();
-model.sim=list("extract_bit_32_UH0",4);
-model.in1=1;
-model.in2=1;
-model.out=1;
-model.out2=1;
-model.intyp=3;
-model.outtyp=3;
-model.ipar=[0,numb];
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[sci2exp(3),sci2exp(1),sci2exp(0),sci2exp(0)];
-gr_i=[];
-x=standard_define([4,2],model,exprs,gr_i);
-}
-EXTRACTBITS.prototype.details = function EXTRACTBITS() {
-}
 }
diff --git a/js/IntegerOp/INTMUL.js b/js/IntegerOp/INTMUL.js
index 23ebfbae..cf1c0b4b 100644
--- a/js/IntegerOp/INTMUL.js
+++ b/js/IntegerOp/INTMUL.js
@@ -1,5 +1,25 @@
 /* autogenerated from "macros/IntegerOp/INTMUL.sci" */
 function INTMUL() {
+INTMUL.prototype.define = function INTMUL() {
+sgn=0;
+model=scicos_model();
+model.sim=list("matmul_i32",4);
+model.in1=[-1,-2];
+model.out=-1;
+model.in2=[-2,-3];
+model.out2=-3;
+model.intyp=[3,3];
+model.outtyp=3;
+model.rpar=[];
+model.ipar=sgn;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[sci2exp(3),sci2exp(0)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+INTMUL.prototype.details = function INTMUL() {
+}
 INTMUL.prototype.get = function INTMUL() {
 }
 INTMUL.prototype.set = function INTMUL() {
@@ -83,24 +103,4 @@ break
 }
 }
 }
-INTMUL.prototype.define = function INTMUL() {
-sgn=0;
-model=scicos_model();
-model.sim=list("matmul_i32",4);
-model.in1=[-1,-2];
-model.out=-1;
-model.in2=[-2,-3];
-model.out2=-3;
-model.intyp=[3,3];
-model.outtyp=3;
-model.rpar=[];
-model.ipar=sgn;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[sci2exp(3),sci2exp(0)];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-INTMUL.prototype.details = function INTMUL() {
-}
 }
diff --git a/js/IntegerOp/JKFLIPFLOP.js b/js/IntegerOp/JKFLIPFLOP.js
index 311198a0..6e27be91 100644
--- a/js/IntegerOp/JKFLIPFLOP.js
+++ b/js/IntegerOp/JKFLIPFLOP.js
@@ -1,47 +1,5 @@
 /* autogenerated from "macros/IntegerOp/JKFLIPFLOP.sci" */
 function JKFLIPFLOP() {
-JKFLIPFLOP.prototype.get = function JKFLIPFLOP() {
-}
-JKFLIPFLOP.prototype.set = function JKFLIPFLOP() {
-for (i=1;i<=length(arg1.model.rpar.objs);i+=1) {
-o=arg1.model.rpar.objs(i);
-if (typeof(o)=="Block"&&o.gui=="DOLLAR_m") {
-path=i;
-break
-}
-}
-newpar=list();
-xx=arg1.model.rpar.objs(path);
-exprs=xx.graphics.exprs(1);
-model=xx.model;
-init_old=model.odstate(1);
-while (true) {
-[ok,init,exprs0]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"JKFLIPFLOP")," ",gettext("JK flip-flop")," ",gettext("The \'Initial Value\' must be 0 or 1 of type int8"),gettext("&nbsp;- Negative values are considered as int8(0)"),gettext("&nbsp;- Positive values are considered as int8(1)")," "],gettext("Initial Value"),list("vec",1),exprs);
-if (!ok) {
-break
-}
-if (init<=0) {
-init=int8(0);
-} else if (init>0) {
-init=int8(1);
-}
-if (ok) {
-xx.graphics.exprs[1-1]=exprs0;
-model.odstate[1-1]=init;
-xx.model=model;
-arg1.model.rpar.objs[path-1]=xx;
-break
-}
-}
-needcompile=0;
-if (init_old!=init) {
-newpar[size(newpar)+1-1]=1;
-needcompile=2;
-}
-x=arg1;
-y=needcompile;
-typ=newpar;
-}
 JKFLIPFLOP.prototype.define = function JKFLIPFLOP() {
 scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["JKFLIPFLOP"],tol=[0.0001,0.000001,1.000e-10,100001,0,0,0],tf=60,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.objs[1-1]=scicos_block(gui="DOLLAR_m",graphics=scicos_graphics(orig=[299.96961,261.584],sz=[40,40],flip=false,theta=0,exprs=["int8(0)","1"],pin=7,pout=5,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("dollar4_m",4),in1=1,in2=1,intyp=5,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(int8(0)),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
@@ -91,4 +49,46 @@ x=standard_define([2,3],model,[],gr_i);
 }
 JKFLIPFLOP.prototype.details = function JKFLIPFLOP() {
 }
+JKFLIPFLOP.prototype.get = function JKFLIPFLOP() {
+}
+JKFLIPFLOP.prototype.set = function JKFLIPFLOP() {
+for (i=1;i<=length(arg1.model.rpar.objs);i+=1) {
+o=arg1.model.rpar.objs(i);
+if (typeof(o)=="Block"&&o.gui=="DOLLAR_m") {
+path=i;
+break
+}
+}
+newpar=list();
+xx=arg1.model.rpar.objs(path);
+exprs=xx.graphics.exprs(1);
+model=xx.model;
+init_old=model.odstate(1);
+while (true) {
+[ok,init,exprs0]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"JKFLIPFLOP")," ",gettext("JK flip-flop")," ",gettext("The \'Initial Value\' must be 0 or 1 of type int8"),gettext("&nbsp;- Negative values are considered as int8(0)"),gettext("&nbsp;- Positive values are considered as int8(1)")," "],gettext("Initial Value"),list("vec",1),exprs);
+if (!ok) {
+break
+}
+if (init<=0) {
+init=int8(0);
+} else if (init>0) {
+init=int8(1);
+}
+if (ok) {
+xx.graphics.exprs[1-1]=exprs0;
+model.odstate[1-1]=init;
+xx.model=model;
+arg1.model.rpar.objs[path-1]=xx;
+break
+}
+}
+needcompile=0;
+if (init_old!=init) {
+newpar[size(newpar)+1-1]=1;
+needcompile=2;
+}
+x=arg1;
+y=needcompile;
+typ=newpar;
+}
 }
diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js
index d75902f8..a94c7b2a 100644
--- a/js/IntegerOp/LOGIC.js
+++ b/js/IntegerOp/LOGIC.js
@@ -1,5 +1,26 @@
 /* autogenerated from "macros/IntegerOp/LOGIC.sci" */
 function LOGIC() {
+LOGIC.prototype.define = function LOGIC() {
+mat=[0,0,0,1];
+model=scicos_model();
+model.sim=list("logic",4);
+model.in1=[1,1];
+model.in2=[1,1];
+model.out=1;
+model.out2=1;
+model.evtin=1;
+model.intyp=[5,5];
+model.outtyp=5;
+model.opar=list(int8(mat));
+model.blocktype="c";
+model.firing=false;
+model.dep_ut=[true,false];
+exprs=[sci2exp(mat),sci2exp(0)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+LOGIC.prototype.details = function LOGIC() {
+}
 LOGIC.prototype.get = function LOGIC() {
 }
 LOGIC.prototype.set = function LOGIC() {
@@ -42,25 +63,4 @@ break
 }
 }
 }
-LOGIC.prototype.define = function LOGIC() {
-mat=[0,0,0,1];
-model=scicos_model();
-model.sim=list("logic",4);
-model.in1=[1,1];
-model.in2=[1,1];
-model.out=1;
-model.out2=1;
-model.evtin=1;
-model.intyp=[5,5];
-model.outtyp=5;
-model.opar=list(int8(mat));
-model.blocktype="c";
-model.firing=false;
-model.dep_ut=[true,false];
-exprs=[sci2exp(mat),sci2exp(0)];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-LOGIC.prototype.details = function LOGIC() {
-}
 }
diff --git a/js/IntegerOp/SHIFT.js b/js/IntegerOp/SHIFT.js
index 3500c007..48bc9d66 100644
--- a/js/IntegerOp/SHIFT.js
+++ b/js/IntegerOp/SHIFT.js
@@ -1,5 +1,26 @@
 /* autogenerated from "macros/IntegerOp/SHIFT.sci" */
 function SHIFT() {
+SHIFT.prototype.define = function SHIFT() {
+sgn=[0,0];
+OPER=0;
+model=scicos_model();
+model.sim=list("shift_32_LA",4);
+model.in1=-1;
+model.out=-1;
+model.in2=-2;
+model.out2=-2;
+model.intyp=3;
+model.outtyp=3;
+model.rpar=[];
+model.ipar=sgn;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[sci2exp(3),sci2exp(0),sci2exp(0)];
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+SHIFT.prototype.details = function SHIFT() {
+}
 SHIFT.prototype.get = function SHIFT() {
 }
 SHIFT.prototype.set = function SHIFT() {
@@ -97,25 +118,4 @@ break
 }
 }
 }
-SHIFT.prototype.define = function SHIFT() {
-sgn=[0,0];
-OPER=0;
-model=scicos_model();
-model.sim=list("shift_32_LA",4);
-model.in1=-1;
-model.out=-1;
-model.in2=-2;
-model.out2=-2;
-model.intyp=3;
-model.outtyp=3;
-model.rpar=[];
-model.ipar=sgn;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[sci2exp(3),sci2exp(0),sci2exp(0)];
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-SHIFT.prototype.details = function SHIFT() {
-}
 }
diff --git a/js/IntegerOp/SRFLIPFLOP.js b/js/IntegerOp/SRFLIPFLOP.js
index e258f3e9..0fd8afb0 100644
--- a/js/IntegerOp/SRFLIPFLOP.js
+++ b/js/IntegerOp/SRFLIPFLOP.js
@@ -1,5 +1,38 @@
 /* autogenerated from "macros/IntegerOp/SRFLIPFLOP.sci" */
 function SRFLIPFLOP() {
+SRFLIPFLOP.prototype.define = function SRFLIPFLOP() {
+scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["SRFLIPFLOP"],tol=[0.0001,0.000001,1.000e-10,100001,0,0,0],tf=60,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.objs[1-1]=scicos_block(gui="LOGIC",graphics=scicos_graphics(orig=[298.504,201.45067],sz=[40,40],flip=true,theta=0,exprs=["[0 1;1 0;1 0;1 0;0 1;0 1;0 0;0 0]","1"],pin=[4,10,12],pout=[3,8],pein=[],peout=[],gr_i=[],id="",in_implicit=["E","E","E"],out_implicit=["E","E"]),model=scicos_model(sim=list("logic",4),in1=[1,1,1],in2=[1,1,1],intyp=[5,5,5],out=[1,1],out2=[1,1],outtyp=[5,5],evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8([0,1,1,0,1,0,1,0,0,1,0,1,0,0,0,0])),blocktype="c",firing=false,dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[2-1]=scicos_block(gui="DOLLAR_m",graphics=scicos_graphics(orig=[299.23733,254.25067],sz=[40,40],flip=false,theta=0,exprs=["int8(0)","1"],pin=6,pout=4,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("dollar4_m",4),in1=1,in2=1,intyp=5,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(int8(0)),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[3-1]=scicos_link(xx=[347.07543,363.03733,363.03733],yy=[228.11733,228.11733,248.584],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[5,1,1]);
+scs_m.objs[4-1]=scicos_link(xx=[290.6659,272.104,272.104,289.93257],yy=[274.25067,274.25067,231.45067,231.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[2,1,0],to=[1,1,1]);
+scs_m.objs[5-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[363.03733,248.584],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=3,pout=[6,14],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[6-1]=scicos_link(xx=[363.03733,363.03733,344.95162],yy=[248.584,274.25067,274.25067],id="drawlink",thick=[0,0],ct=[1,1],from=[5,1,0],to=[2,1,1]);
+scs_m.objs[7-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[367.07543,204.784],sz=[20,20],flip=true,theta=0,exprs="2",pin=8,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[8-1]=scicos_link(xx=[347.07543,367.07543],yy=[214.784,214.784],id="drawlink",thick=[0,0],ct=[1,1],from=[1,2,0],to=[7,1,1]);
+scs_m.objs[9-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[249.93257,211.45067],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=10,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,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.objs[10-1]=scicos_link(xx=[269.93257,289.93257],yy=[221.45067,221.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[9,1,0],to=[1,2,1]);
+scs_m.objs[11-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[249.93257,201.45067],sz=[20,20],flip=true,theta=0,exprs="2",pin=[],pout=12,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[12-1]=scicos_link(xx=[269.93257,289.93257],yy=[211.45067,211.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[11,1,0],to=[1,3,1]);
+scs_m.objs[13-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[383.03733,238.584],sz=[20,20],flip=true,theta=0,exprs="1",pin=14,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],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.objs[14-1]=scicos_link(xx=[363.03733,383.03733],yy=[248.584,248.584],id="drawlink",thick=[0,0],ct=[1,1],from=[5,2,0],to=[13,1,1]);
+model=scicos_model();
+model.sim="csuper";
+model.in1=[1,1];
+model.in2=[1,1];
+model.out=[1,1];
+model.out2=[1,1];
+model.intyp=[5,5];
+model.outtyp=[5,5];
+model.blocktype="h";
+model.firing=false;
+model.dep_ut=[true,false];
+model.rpar=scs_m;
+gr_i=[];
+x=standard_define([2,3],model,[],gr_i);
+}
+SRFLIPFLOP.prototype.details = function SRFLIPFLOP() {
+}
 SRFLIPFLOP.prototype.get = function SRFLIPFLOP() {
 }
 SRFLIPFLOP.prototype.set = function SRFLIPFLOP() {
@@ -42,37 +75,4 @@ x=arg1;
 y=needcompile;
 typ=newpar;
 }
-SRFLIPFLOP.prototype.define = function SRFLIPFLOP() {
-scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["SRFLIPFLOP"],tol=[0.0001,0.000001,1.000e-10,100001,0,0,0],tf=60,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.objs[1-1]=scicos_block(gui="LOGIC",graphics=scicos_graphics(orig=[298.504,201.45067],sz=[40,40],flip=true,theta=0,exprs=["[0 1;1 0;1 0;1 0;0 1;0 1;0 0;0 0]","1"],pin=[4,10,12],pout=[3,8],pein=[],peout=[],gr_i=[],id="",in_implicit=["E","E","E"],out_implicit=["E","E"]),model=scicos_model(sim=list("logic",4),in1=[1,1,1],in2=[1,1,1],intyp=[5,5,5],out=[1,1],out2=[1,1],outtyp=[5,5],evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8([0,1,1,0,1,0,1,0,0,1,0,1,0,0,0,0])),blocktype="c",firing=false,dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m.objs[2-1]=scicos_block(gui="DOLLAR_m",graphics=scicos_graphics(orig=[299.23733,254.25067],sz=[40,40],flip=false,theta=0,exprs=["int8(0)","1"],pin=6,pout=4,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("dollar4_m",4),in1=1,in2=1,intyp=5,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(int8(0)),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m.objs[3-1]=scicos_link(xx=[347.07543,363.03733,363.03733],yy=[228.11733,228.11733,248.584],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[5,1,1]);
-scs_m.objs[4-1]=scicos_link(xx=[290.6659,272.104,272.104,289.93257],yy=[274.25067,274.25067,231.45067,231.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[2,1,0],to=[1,1,1]);
-scs_m.objs[5-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[363.03733,248.584],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=3,pout=[6,14],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m.objs[6-1]=scicos_link(xx=[363.03733,363.03733,344.95162],yy=[248.584,274.25067,274.25067],id="drawlink",thick=[0,0],ct=[1,1],from=[5,1,0],to=[2,1,1]);
-scs_m.objs[7-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[367.07543,204.784],sz=[20,20],flip=true,theta=0,exprs="2",pin=8,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m.objs[8-1]=scicos_link(xx=[347.07543,367.07543],yy=[214.784,214.784],id="drawlink",thick=[0,0],ct=[1,1],from=[1,2,0],to=[7,1,1]);
-scs_m.objs[9-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[249.93257,211.45067],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=10,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,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.objs[10-1]=scicos_link(xx=[269.93257,289.93257],yy=[221.45067,221.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[9,1,0],to=[1,2,1]);
-scs_m.objs[11-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[249.93257,201.45067],sz=[20,20],flip=true,theta=0,exprs="2",pin=[],pout=12,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m.objs[12-1]=scicos_link(xx=[269.93257,289.93257],yy=[211.45067,211.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[11,1,0],to=[1,3,1]);
-scs_m.objs[13-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[383.03733,238.584],sz=[20,20],flip=true,theta=0,exprs="1",pin=14,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],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.objs[14-1]=scicos_link(xx=[363.03733,383.03733],yy=[248.584,248.584],id="drawlink",thick=[0,0],ct=[1,1],from=[5,2,0],to=[13,1,1]);
-model=scicos_model();
-model.sim="csuper";
-model.in1=[1,1];
-model.in2=[1,1];
-model.out=[1,1];
-model.out2=[1,1];
-model.intyp=[5,5];
-model.outtyp=[5,5];
-model.blocktype="h";
-model.firing=false;
-model.dep_ut=[true,false];
-model.rpar=scs_m;
-gr_i=[];
-x=standard_define([2,3],model,[],gr_i);
-}
-SRFLIPFLOP.prototype.details = function SRFLIPFLOP() {
-}
 }
diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js
index 5fae8670..3ae036bd 100644
--- a/js/Linear/BIGSOM_f.js
+++ b/js/Linear/BIGSOM_f.js
@@ -1,5 +1,20 @@
 /* autogenerated from "macros/Linear/BIGSOM_f.sci" */
 function BIGSOM_f() {
+BIGSOM_f.prototype.define = function BIGSOM_f() {
+sgn=[1,1];
+model=scicos_model();
+model.sim=list("sum",2);
+model.in1=[-1,-1];
+model.out=-1;
+model.rpar=sgn;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=sci2exp(sgn);
+gr_i=[];
+x=standard_define([2,3],model,exprs,gr_i);
+}
+BIGSOM_f.prototype.details = function BIGSOM_f() {
+}
 BIGSOM_f.prototype.get = function BIGSOM_f() {
 }
 BIGSOM_f.prototype.set = function BIGSOM_f() {
@@ -23,19 +38,4 @@ break
 }
 }
 }
-BIGSOM_f.prototype.define = function BIGSOM_f() {
-sgn=[1,1];
-model=scicos_model();
-model.sim=list("sum",2);
-model.in1=[-1,-1];
-model.out=-1;
-model.rpar=sgn;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=sci2exp(sgn);
-gr_i=[];
-x=standard_define([2,3],model,exprs,gr_i);
-}
-BIGSOM_f.prototype.details = function BIGSOM_f() {
-}
 }
diff --git a/js/Linear/CLINDUMMY_f.js b/js/Linear/CLINDUMMY_f.js
index 742ce52d..c72b5713 100644
--- a/js/Linear/CLINDUMMY_f.js
+++ b/js/Linear/CLINDUMMY_f.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/Linear/CLINDUMMY_f.sci" */
 function CLINDUMMY_f() {
-CLINDUMMY_f.prototype.get = function CLINDUMMY_f() {
-}
-CLINDUMMY_f.prototype.set = function CLINDUMMY_f() {
-x=arg1;
-}
 CLINDUMMY_f.prototype.define = function CLINDUMMY_f() {
 x0=0;
 model=scicos_model();
@@ -18,4 +13,9 @@ x=standard_define([3,2],model,[],gr_i);
 }
 CLINDUMMY_f.prototype.details = function CLINDUMMY_f() {
 }
+CLINDUMMY_f.prototype.get = function CLINDUMMY_f() {
+}
+CLINDUMMY_f.prototype.set = function CLINDUMMY_f() {
+x=arg1;
+}
 }
diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js
index f726b890..83e919c0 100644
--- a/js/Linear/CLSS.js
+++ b/js/Linear/CLSS.js
@@ -1,5 +1,27 @@
 /* autogenerated from "macros/Linear/CLSS.sci" */
 function CLSS() {
+CLSS.prototype.define = function CLSS() {
+x0=0;
+A=-1;
+B=1;
+C=1;
+D=0;
+in1=1;
+out=1;
+model=scicos_model();
+model.sim=list("csslti4",4);
+model.in1=in1;
+model.out=out;
+model.state=x0;
+model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()];
+model.blocktype="c";
+model.dep_ut=[false,true];
+exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))];
+gr_i=[];
+x=standard_define([4,2],model,exprs,gr_i);
+}
+CLSS.prototype.details = function CLSS() {
+}
 CLSS.prototype.get = function CLSS() {
 }
 CLSS.prototype.set = function CLSS() {
@@ -62,26 +84,4 @@ break
 }
 }
 }
-CLSS.prototype.define = function CLSS() {
-x0=0;
-A=-1;
-B=1;
-C=1;
-D=0;
-in1=1;
-out=1;
-model=scicos_model();
-model.sim=list("csslti4",4);
-model.in1=in1;
-model.out=out;
-model.state=x0;
-model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()];
-model.blocktype="c";
-model.dep_ut=[false,true];
-exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))];
-gr_i=[];
-x=standard_define([4,2],model,exprs,gr_i);
-}
-CLSS.prototype.details = function CLSS() {
-}
 }
diff --git a/js/Linear/CLSS_f.js b/js/Linear/CLSS_f.js
index 380497e0..7327f301 100644
--- a/js/Linear/CLSS_f.js
+++ b/js/Linear/CLSS_f.js
@@ -1,5 +1,27 @@
 /* autogenerated from "macros/Linear/CLSS_f.sci" */
 function CLSS_f() {
+CLSS_f.prototype.define = function CLSS_f() {
+x0=0;
+A=-1;
+B=1;
+C=1;
+D=0;
+in1=1;
+out=1;
+model=scicos_model();
+model.sim=list("csslti",1);
+model.in1=in1;
+model.out=out;
+model.state=x0;
+model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()];
+model.blocktype="c";
+model.dep_ut=[false,true];
+exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))];
+gr_i=[];
+x=standard_define([4,2],model,exprs,gr_i);
+}
+CLSS_f.prototype.details = function CLSS_f() {
+}
 CLSS_f.prototype.get = function CLSS_f() {
 }
 CLSS_f.prototype.set = function CLSS_f() {
@@ -52,26 +74,4 @@ break
 }
 }
 }
-CLSS_f.prototype.define = function CLSS_f() {
-x0=0;
-A=-1;
-B=1;
-C=1;
-D=0;
-in1=1;
-out=1;
-model=scicos_model();
-model.sim=list("csslti",1);
-model.in1=in1;
-model.out=out;
-model.state=x0;
-model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()];
-model.blocktype="c";
-model.dep_ut=[false,true];
-exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))];
-gr_i=[];
-x=standard_define([4,2],model,exprs,gr_i);
-}
-CLSS_f.prototype.details = function CLSS_f() {
-}
 }
diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js
index 4ff3177c..5b5aa629 100644
--- a/js/Linear/DELAYV_f.js
+++ b/js/Linear/DELAYV_f.js
@@ -1,5 +1,27 @@
 /* autogenerated from "macros/Linear/DELAYV_f.sci" */
 function DELAYV_f() {
+DELAYV_f.prototype.define = function DELAYV_f() {
+nin=1;
+z0=zeros(11,1);
+zz0=z0.slice(1-1,$-1);
+T=1;
+model=scicos_model();
+model.sim=list("delayv",1);
+model.in1=[nin,1];
+model.out=nin;
+model.evtin=1;
+model.evtout=[1,1];
+model.dstate=z0;
+model.rpar=T/(size(zz0,"*"));
+model.blocktype="d";
+model.firing=[0,-1];
+model.dep_ut=[true,false];
+exprs=[string(nin),strcat(string(z0.slice(1-1,$-1)),";"),string(T)];
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+DELAYV_f.prototype.details = function DELAYV_f() {
+}
 DELAYV_f.prototype.get = function DELAYV_f() {
 }
 DELAYV_f.prototype.set = function DELAYV_f() {
@@ -37,26 +59,4 @@ break
 }
 }
 }
-DELAYV_f.prototype.define = function DELAYV_f() {
-nin=1;
-z0=zeros(11,1);
-zz0=z0.slice(1-1,$-1);
-T=1;
-model=scicos_model();
-model.sim=list("delayv",1);
-model.in1=[nin,1];
-model.out=nin;
-model.evtin=1;
-model.evtout=[1,1];
-model.dstate=z0;
-model.rpar=T/(size(zz0,"*"));
-model.blocktype="d";
-model.firing=[0,-1];
-model.dep_ut=[true,false];
-exprs=[string(nin),strcat(string(z0.slice(1-1,$-1)),";"),string(T)];
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-DELAYV_f.prototype.details = function DELAYV_f() {
-}
 }
diff --git a/js/Linear/DELAY_f.js b/js/Linear/DELAY_f.js
index 5de31493..8840226c 100644
--- a/js/Linear/DELAY_f.js
+++ b/js/Linear/DELAY_f.js
@@ -1,64 +1,5 @@
 /* autogenerated from "macros/Linear/DELAY_f.sci" */
 function DELAY_f() {
-DELAY_f.prototype.get = function DELAY_f() {
-}
-DELAY_f.prototype.set = function DELAY_f() {
-ppath=list(0,0);
-for (i=1;i<=length(arg1.model.rpar.objs);i+=1) {
-o=arg1.model.rpar.objs(i);
-if (typeof(o)=="Block"&&o.gui=="REGISTER_f") {
-ppath[1-1]=i;
-}
-if (typeof(o)=="Block"&&o.gui=="EVTDLY_f") {
-ppath[2-1]=i;
-}
-if (and(ppath!=list(0,0))) {
-break
-}
-}
-x=arg1;
-newpar=list();
-register=x.model.rpar.objs(ppath[1-1]);
-evtdly=x.model.rpar.objs(ppath[2-1]);
-register_exprs=register.graphics.exprs;
-evtdly_exprs=evtdly.graphics.exprs;
-exprs=[evtdly_exprs(1),register_exprs];
-while (true) {
-[ok,dt,z0,exprs]=scicos_getvalue(["This block implements as a discretized delay","it is consist of a shift register and a clock","value of the delay is given by;","the discretization time step multiplied by the","number-1 of state of the register"],["Discretization time step","Register initial state"],list("vec",1,"vec",-1),exprs);
-if (!ok) {
-break
-}
-mess=[];
-if (prod(size(z0))<1) {
-mess=[mess,"Register length must be at least 1"," "];
-ok=false;
-}
-if (dt<=0) {
-mess=[mess,"Discretization time step must be positive"," "];
-ok=false;
-}
-if (!ok) {
-message(mess);
-} else {
-evtdly.graphics.exprs[1-1]=exprs[1-1];
-if (evtdly.model.rpar!=dt) {
-evtdly.model.rpar=dt;
-newpar[$+1-1]=ppath[2-1];
-}
-x.model.rpar.objs[ppath[2-1]-1]=evtdly;
-register.graphics.exprs=exprs[2-1];
-if (or(register.model.dstate!=z0.slice())) {
-register.model.dstate=z0.slice();
-newpar[$+1-1]=ppath[1-1];
-}
-x.model.rpar.objs[ppath[1-1]-1]=register;
-break
-}
-}
-needcompile=0;
-y=needcompile;
-typ=newpar;
-}
 DELAY_f.prototype.define = function DELAY_f() {
 evtdly=EVTDLY_f("define");
 evtdly.graphics.orig=[243,296];
@@ -125,4 +66,63 @@ x.graphics.out_style="";
 }
 DELAY_f.prototype.details = function DELAY_f() {
 }
+DELAY_f.prototype.get = function DELAY_f() {
+}
+DELAY_f.prototype.set = function DELAY_f() {
+ppath=list(0,0);
+for (i=1;i<=length(arg1.model.rpar.objs);i+=1) {
+o=arg1.model.rpar.objs(i);
+if (typeof(o)=="Block"&&o.gui=="REGISTER_f") {
+ppath[1-1]=i;
+}
+if (typeof(o)=="Block"&&o.gui=="EVTDLY_f") {
+ppath[2-1]=i;
+}
+if (and(ppath!=list(0,0))) {
+break
+}
+}
+x=arg1;
+newpar=list();
+register=x.model.rpar.objs(ppath[1-1]);
+evtdly=x.model.rpar.objs(ppath[2-1]);
+register_exprs=register.graphics.exprs;
+evtdly_exprs=evtdly.graphics.exprs;
+exprs=[evtdly_exprs(1),register_exprs];
+while (true) {
+[ok,dt,z0,exprs]=scicos_getvalue(["This block implements as a discretized delay","it is consist of a shift register and a clock","value of the delay is given by;","the discretization time step multiplied by the","number-1 of state of the register"],["Discretization time step","Register initial state"],list("vec",1,"vec",-1),exprs);
+if (!ok) {
+break
+}
+mess=[];
+if (prod(size(z0))<1) {
+mess=[mess,"Register length must be at least 1"," "];
+ok=false;
+}
+if (dt<=0) {
+mess=[mess,"Discretization time step must be positive"," "];
+ok=false;
+}
+if (!ok) {
+message(mess);
+} else {
+evtdly.graphics.exprs[1-1]=exprs[1-1];
+if (evtdly.model.rpar!=dt) {
+evtdly.model.rpar=dt;
+newpar[$+1-1]=ppath[2-1];
+}
+x.model.rpar.objs[ppath[2-1]-1]=evtdly;
+register.graphics.exprs=exprs[2-1];
+if (or(register.model.dstate!=z0.slice())) {
+register.model.dstate=z0.slice();
+newpar[$+1-1]=ppath[1-1];
+}
+x.model.rpar.objs[ppath[1-1]-1]=register;
+break
+}
+}
+needcompile=0;
+y=needcompile;
+typ=newpar;
+}
 }
diff --git a/js/Linear/DERIV.js b/js/Linear/DERIV.js
index 7cb03905..6ba258e6 100644
--- a/js/Linear/DERIV.js
+++ b/js/Linear/DERIV.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/Linear/DERIV.sci" */
 function DERIV() {
-DERIV.prototype.get = function DERIV() {
-}
-DERIV.prototype.set = function DERIV() {
-x=arg1;
-}
 DERIV.prototype.define = function DERIV() {
 model=scicos_model();
 model.sim=list("deriv",4);
@@ -18,4 +13,9 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 DERIV.prototype.details = function DERIV() {
 }
+DERIV.prototype.get = function DERIV() {
+}
+DERIV.prototype.set = function DERIV() {
+x=arg1;
+}
 }
diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js
index bb7cb98a..44b2403c 100644
--- a/js/Linear/DIFF_c.js
+++ b/js/Linear/DIFF_c.js
@@ -1,5 +1,20 @@
 /* autogenerated from "macros/Linear/DIFF_c.sci" */
 function DIFF_c() {
+DIFF_c.prototype.define = function DIFF_c() {
+x0=[0,0];
+model=scicos_model();
+model.sim=list("diffblk_c",10004);
+model.in1=1;
+model.out=1;
+model.state=x0;
+model.blocktype="c";
+model.dep_ut=[false,true];
+exprs=[strcat(sci2exp(x0[1-1])),strcat(sci2exp(x0[2-1]))];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+DIFF_c.prototype.details = function DIFF_c() {
+}
 DIFF_c.prototype.get = function DIFF_c() {
 }
 DIFF_c.prototype.set = function DIFF_c() {
@@ -37,19 +52,4 @@ break
 }
 x.model.firing=[];
 }
-DIFF_c.prototype.define = function DIFF_c() {
-x0=[0,0];
-model=scicos_model();
-model.sim=list("diffblk_c",10004);
-model.in1=1;
-model.out=1;
-model.state=x0;
-model.blocktype="c";
-model.dep_ut=[false,true];
-exprs=[strcat(sci2exp(x0[1-1])),strcat(sci2exp(x0[2-1]))];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-DIFF_c.prototype.details = function DIFF_c() {
-}
 }
diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js
index 931a89be..86d01b39 100644
--- a/js/Linear/DLSS.js
+++ b/js/Linear/DLSS.js
@@ -1,5 +1,26 @@
 /* autogenerated from "macros/Linear/DLSS.sci" */
 function DLSS() {
+DLSS.prototype.define = function DLSS() {
+x0=0;
+A=-1;
+B=1;
+C=1;
+D=0;
+model=scicos_model();
+model.sim=list("dsslti4",4);
+model.in1=1;
+model.out=1;
+model.evtin=1;
+model.dstate=x0.slice();
+model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()];
+model.blocktype="d";
+model.dep_ut=[false,false];
+exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))];
+gr_i=[];
+x=standard_define([4,2],model,exprs,gr_i);
+}
+DLSS.prototype.details = function DLSS() {
+}
 DLSS.prototype.get = function DLSS() {
 }
 DLSS.prototype.set = function DLSS() {
@@ -62,25 +83,4 @@ break
 }
 }
 }
-DLSS.prototype.define = function DLSS() {
-x0=0;
-A=-1;
-B=1;
-C=1;
-D=0;
-model=scicos_model();
-model.sim=list("dsslti4",4);
-model.in1=1;
-model.out=1;
-model.evtin=1;
-model.dstate=x0.slice();
-model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()];
-model.blocktype="d";
-model.dep_ut=[false,false];
-exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))];
-gr_i=[];
-x=standard_define([4,2],model,exprs,gr_i);
-}
-DLSS.prototype.details = function DLSS() {
-}
 }
diff --git a/js/Linear/DLSS_f.js b/js/Linear/DLSS_f.js
index 55c89860..4a938f82 100644
--- a/js/Linear/DLSS_f.js
+++ b/js/Linear/DLSS_f.js
@@ -1,5 +1,26 @@
 /* autogenerated from "macros/Linear/DLSS_f.sci" */
 function DLSS_f() {
+DLSS_f.prototype.define = function DLSS_f() {
+x0=0;
+A=-1;
+B=1;
+C=1;
+D=0;
+model=scicos_model();
+model.sim=list("dsslti",1);
+model.in1=1;
+model.out=1;
+model.evtin=1;
+model.dstate=x0.slice();
+model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()];
+model.blocktype="d";
+model.dep_ut=[false,false];
+exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))];
+gr_i=[];
+x=standard_define([4,2],model,exprs,gr_i);
+}
+DLSS_f.prototype.details = function DLSS_f() {
+}
 DLSS_f.prototype.get = function DLSS_f() {
 }
 DLSS_f.prototype.set = function DLSS_f() {
@@ -52,25 +73,4 @@ break
 }
 }
 }
-DLSS_f.prototype.define = function DLSS_f() {
-x0=0;
-A=-1;
-B=1;
-C=1;
-D=0;
-model=scicos_model();
-model.sim=list("dsslti",1);
-model.in1=1;
-model.out=1;
-model.evtin=1;
-model.dstate=x0.slice();
-model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()];
-model.blocktype="d";
-model.dep_ut=[false,false];
-exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))];
-gr_i=[];
-x=standard_define([4,2],model,exprs,gr_i);
-}
-DLSS_f.prototype.details = function DLSS_f() {
-}
 }
diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js
index d1598dae..0606a81a 100644
--- a/js/Linear/DOLLAR.js
+++ b/js/Linear/DOLLAR.js
@@ -1,5 +1,23 @@
 /* autogenerated from "macros/Linear/DOLLAR.sci" */
 function DOLLAR() {
+DOLLAR.prototype.define = function DOLLAR() {
+z=0;
+inh=0;
+in1=1;
+exprs=string([z,inh]);
+model=scicos_model();
+model.sim=list("dollar4",4);
+model.in1=in1;
+model.out=in1;
+model.evtin=1-inh;
+model.dstate=z;
+model.blocktype="d";
+model.dep_ut=[false,false];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+DOLLAR.prototype.details = function DOLLAR() {
+}
 DOLLAR.prototype.get = function DOLLAR() {
 }
 DOLLAR.prototype.set = function DOLLAR() {
@@ -69,22 +87,4 @@ break
 }
 }
 }
-DOLLAR.prototype.define = function DOLLAR() {
-z=0;
-inh=0;
-in1=1;
-exprs=string([z,inh]);
-model=scicos_model();
-model.sim=list("dollar4",4);
-model.in1=in1;
-model.out=in1;
-model.evtin=1-inh;
-model.dstate=z;
-model.blocktype="d";
-model.dep_ut=[false,false];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-DOLLAR.prototype.details = function DOLLAR() {
-}
 }
diff --git a/js/Linear/DOLLAR_f.js b/js/Linear/DOLLAR_f.js
index d42706da..c8b43d21 100644
--- a/js/Linear/DOLLAR_f.js
+++ b/js/Linear/DOLLAR_f.js
@@ -1,5 +1,23 @@
 /* autogenerated from "macros/Linear/DOLLAR_f.sci" */
 function DOLLAR_f() {
+DOLLAR_f.prototype.define = function DOLLAR_f() {
+z=0;
+inh=0;
+in1=1;
+exprs=string([z,inh]);
+model=scicos_model();
+model.sim="dollar";
+model.in1=in1;
+model.out=in1;
+model.evtin=1-inh;
+model.dstate=z;
+model.blocktype="d";
+model.dep_ut=[false,false];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+DOLLAR_f.prototype.details = function DOLLAR_f() {
+}
 DOLLAR_f.prototype.get = function DOLLAR_f() {
 }
 DOLLAR_f.prototype.set = function DOLLAR_f() {
@@ -34,22 +52,4 @@ break
 }
 }
 }
-DOLLAR_f.prototype.define = function DOLLAR_f() {
-z=0;
-inh=0;
-in1=1;
-exprs=string([z,inh]);
-model=scicos_model();
-model.sim="dollar";
-model.in1=in1;
-model.out=in1;
-model.evtin=1-inh;
-model.dstate=z;
-model.blocktype="d";
-model.dep_ut=[false,false];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-DOLLAR_f.prototype.details = function DOLLAR_f() {
-}
 }
diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js
index af8ad200..4fc5bfdc 100644
--- a/js/Linear/DOLLAR_m.js
+++ b/js/Linear/DOLLAR_m.js
@@ -1,5 +1,23 @@
 /* autogenerated from "macros/Linear/DOLLAR_m.sci" */
 function DOLLAR_m() {
+DOLLAR_m.prototype.define = function DOLLAR_m() {
+z=0;
+inh=0;
+in1=1;
+exprs=string([z,inh]);
+model=scicos_model();
+model.sim=list("dollar4",4);
+model.in1=in1;
+model.out=in1;
+model.evtin=1-inh;
+model.dstate=z;
+model.blocktype="d";
+model.dep_ut=[false,false];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+DOLLAR_m.prototype.details = function DOLLAR_m() {
+}
 DOLLAR_m.prototype.get = function DOLLAR_m() {
 }
 DOLLAR_m.prototype.set = function DOLLAR_m() {
@@ -69,22 +87,4 @@ break
 }
 }
 }
-DOLLAR_m.prototype.define = function DOLLAR_m() {
-z=0;
-inh=0;
-in1=1;
-exprs=string([z,inh]);
-model=scicos_model();
-model.sim=list("dollar4",4);
-model.in1=in1;
-model.out=in1;
-model.evtin=1-inh;
-model.dstate=z;
-model.blocktype="d";
-model.dep_ut=[false,false];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-DOLLAR_m.prototype.details = function DOLLAR_m() {
-}
 }
diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js
index cc7f207a..91aa29f8 100644
--- a/js/Linear/GAINBLK.js
+++ b/js/Linear/GAINBLK.js
@@ -1,5 +1,26 @@
 /* autogenerated from "macros/Linear/GAINBLK.sci" */
 function GAINBLK() {
+GAINBLK.prototype.define = function GAINBLK() {
+gain=1;
+in1=-1;
+out=-1;
+in2=-2;
+out2=-2;
+model=scicos_model();
+model.sim=list("gainblk",4);
+model.in1=in1;
+model.out=out;
+model.in2=in2;
+model.out2=out2;
+model.rpar=gain;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[strcat(sci2exp(gain))];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+GAINBLK.prototype.details = function GAINBLK() {
+}
 GAINBLK.prototype.get = function GAINBLK() {
 }
 GAINBLK.prototype.set = function GAINBLK() {
@@ -123,25 +144,4 @@ break
 }
 }
 }
-GAINBLK.prototype.define = function GAINBLK() {
-gain=1;
-in1=-1;
-out=-1;
-in2=-2;
-out2=-2;
-model=scicos_model();
-model.sim=list("gainblk",4);
-model.in1=in1;
-model.out=out;
-model.in2=in2;
-model.out2=out2;
-model.rpar=gain;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[strcat(sci2exp(gain))];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-GAINBLK.prototype.details = function GAINBLK() {
-}
 }
diff --git a/js/Linear/GAINBLK_f.js b/js/Linear/GAINBLK_f.js
index 642b8f1d..fcaeb6bd 100644
--- a/js/Linear/GAINBLK_f.js
+++ b/js/Linear/GAINBLK_f.js
@@ -1,5 +1,22 @@
 /* autogenerated from "macros/Linear/GAINBLK_f.sci" */
 function GAINBLK_f() {
+GAINBLK_f.prototype.define = function GAINBLK_f() {
+gain=1;
+in1=1;
+out=1;
+model=scicos_model();
+model.sim="gain";
+model.in1=in1;
+model.out=out;
+model.rpar=gain;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[strcat(sci2exp(gain))];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+GAINBLK_f.prototype.details = function GAINBLK_f() {
+}
 GAINBLK_f.prototype.get = function GAINBLK_f() {
 }
 GAINBLK_f.prototype.set = function GAINBLK_f() {
@@ -27,21 +44,4 @@ break
 }
 }
 }
-GAINBLK_f.prototype.define = function GAINBLK_f() {
-gain=1;
-in1=1;
-out=1;
-model=scicos_model();
-model.sim="gain";
-model.in1=in1;
-model.out=out;
-model.rpar=gain;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[strcat(sci2exp(gain))];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-GAINBLK_f.prototype.details = function GAINBLK_f() {
-}
 }
diff --git a/js/Linear/GAIN_f.js b/js/Linear/GAIN_f.js
index 3515345d..f9ccb8d3 100644
--- a/js/Linear/GAIN_f.js
+++ b/js/Linear/GAIN_f.js
@@ -1,5 +1,22 @@
 /* autogenerated from "macros/Linear/GAIN_f.sci" */
 function GAIN_f() {
+GAIN_f.prototype.define = function GAIN_f() {
+gain=1;
+in1=1;
+out=1;
+model=scicos_model();
+model.sim="gain";
+model.in1=1;
+model.out=1;
+model.rpar=gain;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[strcat(sci2exp(gain)),strcat(sci2exp(in1)),strcat(sci2exp(out))];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+GAIN_f.prototype.details = function GAIN_f() {
+}
 GAIN_f.prototype.get = function GAIN_f() {
 }
 GAIN_f.prototype.set = function GAIN_f() {
@@ -27,21 +44,4 @@ break
 }
 }
 }
-GAIN_f.prototype.define = function GAIN_f() {
-gain=1;
-in1=1;
-out=1;
-model=scicos_model();
-model.sim="gain";
-model.in1=1;
-model.out=1;
-model.rpar=gain;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[strcat(sci2exp(gain)),strcat(sci2exp(in1)),strcat(sci2exp(out))];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-GAIN_f.prototype.details = function GAIN_f() {
-}
 }
diff --git a/js/Linear/INTEGRAL.js b/js/Linear/INTEGRAL.js
index e1edd2fa..36c20ca9 100644
--- a/js/Linear/INTEGRAL.js
+++ b/js/Linear/INTEGRAL.js
@@ -1,5 +1,24 @@
 /* autogenerated from "macros/Linear/INTEGRAL.sci" */
 function INTEGRAL() {
+INTEGRAL.prototype.define = function INTEGRAL() {
+maxp=1;
+minp=-1;
+rpar=[];
+model=scicos_model();
+model.state=0;
+model.sim=list("integral_func",4);
+model.in1=1;
+model.out=1;
+model.rpar=rpar;
+model.blocktype="c";
+model.dep_ut=[false,true];
+exprs=string([0,0,0,maxp,minp]);
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+x.graphics.id="1/s";
+}
+INTEGRAL.prototype.details = function INTEGRAL() {
+}
 INTEGRAL.prototype.get = function INTEGRAL() {
 }
 INTEGRAL.prototype.set = function INTEGRAL() {
@@ -58,23 +77,4 @@ break
 }
 }
 }
-INTEGRAL.prototype.define = function INTEGRAL() {
-maxp=1;
-minp=-1;
-rpar=[];
-model=scicos_model();
-model.state=0;
-model.sim=list("integral_func",4);
-model.in1=1;
-model.out=1;
-model.rpar=rpar;
-model.blocktype="c";
-model.dep_ut=[false,true];
-exprs=string([0,0,0,maxp,minp]);
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-x.graphics.id="1/s";
-}
-INTEGRAL.prototype.details = function INTEGRAL() {
-}
 }
diff --git a/js/Linear/INTEGRAL_f.js b/js/Linear/INTEGRAL_f.js
index cf19d39d..a887ff21 100644
--- a/js/Linear/INTEGRAL_f.js
+++ b/js/Linear/INTEGRAL_f.js
@@ -1,5 +1,20 @@
 /* autogenerated from "macros/Linear/INTEGRAL_f.sci" */
 function INTEGRAL_f() {
+INTEGRAL_f.prototype.define = function INTEGRAL_f() {
+x0=0;
+model=scicos_model();
+model.sim="integr";
+model.in1=1;
+model.out=1;
+model.state=x0;
+model.blocktype="c";
+model.dep_ut=[false,true];
+exprs=strcat(sci2exp(x0));
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+INTEGRAL_f.prototype.details = function INTEGRAL_f() {
+}
 INTEGRAL_f.prototype.get = function INTEGRAL_f() {
 }
 INTEGRAL_f.prototype.set = function INTEGRAL_f() {
@@ -20,19 +35,4 @@ break
 }
 x.model.firing=[];
 }
-INTEGRAL_f.prototype.define = function INTEGRAL_f() {
-x0=0;
-model=scicos_model();
-model.sim="integr";
-model.in1=1;
-model.out=1;
-model.state=x0;
-model.blocktype="c";
-model.dep_ut=[false,true];
-exprs=strcat(sci2exp(x0));
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-INTEGRAL_f.prototype.details = function INTEGRAL_f() {
-}
 }
diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js
index 8bf50dee..d6832af8 100644
--- a/js/Linear/INTEGRAL_m.js
+++ b/js/Linear/INTEGRAL_m.js
@@ -1,5 +1,25 @@
 /* autogenerated from "macros/Linear/INTEGRAL_m.sci" */
 function INTEGRAL_m() {
+INTEGRAL_m.prototype.define = function INTEGRAL_m() {
+maxp=1;
+minp=-1;
+rpar=[];
+model=scicos_model();
+model.state=0;
+model.sim=list("integral_func",4);
+model.in1=1;
+model.out=1;
+model.in2=1;
+model.out2=1;
+model.rpar=rpar;
+model.blocktype="c";
+model.dep_ut=[false,true];
+exprs=string([0,0,0,maxp,minp]);
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+INTEGRAL_m.prototype.details = function INTEGRAL_m() {
+}
 INTEGRAL_m.prototype.get = function INTEGRAL_m() {
 }
 INTEGRAL_m.prototype.set = function INTEGRAL_m() {
@@ -100,24 +120,4 @@ break
 }
 }
 }
-INTEGRAL_m.prototype.define = function INTEGRAL_m() {
-maxp=1;
-minp=-1;
-rpar=[];
-model=scicos_model();
-model.state=0;
-model.sim=list("integral_func",4);
-model.in1=1;
-model.out=1;
-model.in2=1;
-model.out2=1;
-model.rpar=rpar;
-model.blocktype="c";
-model.dep_ut=[false,true];
-exprs=string([0,0,0,maxp,minp]);
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-INTEGRAL_m.prototype.details = function INTEGRAL_m() {
-}
 }
diff --git a/js/Linear/PID.js b/js/Linear/PID.js
index bed7cf4d..1c7e2748 100644
--- a/js/Linear/PID.js
+++ b/js/Linear/PID.js
@@ -1,5 +1,45 @@
 /* autogenerated from "macros/Linear/PID.sci" */
 function PID() {
+PID.prototype.define = function PID() {
+scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["PID"],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.objs[1-1]=scicos_block(gui="INTEGRAL_m",graphics=scicos_graphics(orig=[318.304,183.11733],sz=[40,40],flip=true,theta=0,exprs=["0","0","0","1","-1"],pin=7,pout=9,pein=[],peout=[],gr_i=[],id="1/s",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("integral_func",4),in1=1,in2=1,intyp=1,out=1,out2=1,outtyp=1,evtin=[],evtout=[],state=0,dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[false,true],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[2-1]=scicos_block(gui="SUMMATION",graphics=scicos_graphics(orig=[387.97067,172.85067],sz=[40,60],flip=true,theta=0,exprs=["1","[1;1;1]"],pin=[10,9,11],pout=19,pein=[],peout=[],gr_i=[],id="",in_implicit=["E","E","E"],out_implicit="E"),model=scicos_model(sim=list("summation",4),in1=[-1,-1,-1],in2=[-2,-2,-2],intyp=[1,1,1],out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[1,1,1],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[3-1]=scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[321.23733,235.91733],sz=[40,40],flip=true,theta=0,exprs="1",pin=17,pout=10,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[4-1]=scicos_block(gui="DERIV",graphics=scicos_graphics(orig=[319.03733,135.45067],sz=[40,40],flip=true,theta=0,exprs=[],pin=8,pout=11,pein=[],peout=[],gr_i=[],id="s",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("deriv",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="x",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[5-1]=scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[255.23733,183.11733],sz=[40,40],flip=true,theta=0,exprs="1",pin=13,pout=7,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[6-1]=scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[255.23733,135.45067],sz=[40,40],flip=true,theta=0,exprs="1",pin=14,pout=8,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[7-1]=scicos_link(xx=[303.80876,309.73257],yy=[203.11733,203.11733],id="drawlink",thick=[0,0],ct=[1,1],from=[5,1,0],to=[1,1,1]);
+scs_m.objs[8-1]=scicos_link(xx=[303.80876,310.4659],yy=[155.45067,155.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[6,1,0],to=[4,1,1]);
+scs_m.objs[9-1]=scicos_link(xx=[366.87543,379.39924],yy=[203.11733,202.85067],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[2,2,1]);
+scs_m.objs[10-1]=scicos_link(xx=[369.80876,379.39924,379.39924],yy=[255.91733,255.91733,217.85067],id="drawlink",thick=[0,0],ct=[1,1],from=[3,1,0],to=[2,1,1]);
+scs_m.objs[11-1]=scicos_link(xx=[367.60876,379.39924,379.39924],yy=[155.45067,155.45067,187.85067],id="drawlink",thick=[0,0],ct=[1,1],from=[4,1,0],to=[2,3,1]);
+scs_m.objs[12-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[234.704,203.11733],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=16,pout=[13,14],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[13-1]=scicos_link(xx=[234.704,246.6659],yy=[203.11733,203.11733],id="drawlink",thick=[0,0],ct=[1,1],from=[12,1,0],to=[5,1,1]);
+scs_m.objs[14-1]=scicos_link(xx=[234.704,234.704,246.6659],yy=[203.11733,155.45067,155.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[12,2,0],to=[6,1,1]);
+scs_m.objs[15-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[233.97067,203.11733],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=21,pout=[16,17],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[16-1]=scicos_link(xx=[233.97067,234.704],yy=[203.11733,203.11733],id="drawlink",thick=[0,0],ct=[1,1],from=[15,1,0],to=[12,1,1]);
+scs_m.objs[17-1]=scicos_link(xx=[233.97067,233.97067,312.6659],yy=[203.11733,255.91733,255.91733],id="drawlink",thick=[0,0],ct=[1,1],from=[15,2,0],to=[3,1,1]);
+scs_m.objs[18-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[456.5421,192.85067],sz=[20,20],flip=true,theta=0,exprs="1",pin=19,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],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.objs[19-1]=scicos_link(xx=[436.5421,456.5421],yy=[202.85067,202.85067],id="drawlink",thick=[0,0],ct=[1,1],from=[2,1,0],to=[18,1,1]);
+scs_m.objs[20-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[193.97067,193.11733],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=21,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,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.objs[21-1]=scicos_link(xx=[213.97067,233.97067],yy=[203.11733,203.11733],id="drawlink",thick=[0,0],ct=[1,1],from=[20,1,0],to=[15,1,1]);
+model=scicos_model();
+model.sim="csuper";
+model.in1=-1;
+model.in2=-2;
+model.out=-1;
+model.out2=-2;
+model.intyp=1;
+model.outtyp=1;
+model.blocktype="h";
+model.firing=false;
+model.dep_ut=[false,false];
+model.rpar=scs_m;
+gr_i=[];
+x=standard_define([2,2],model,[],gr_i);
+}
+PID.prototype.details = function PID() {
+}
 PID.prototype.get = function PID() {
 }
 PID.prototype.set = function PID() {
@@ -73,44 +113,4 @@ x=arg1;
 y=max(y,needcompile);
 typ=newpar;
 }
-PID.prototype.define = function PID() {
-scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["PID"],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.objs[1-1]=scicos_block(gui="INTEGRAL_m",graphics=scicos_graphics(orig=[318.304,183.11733],sz=[40,40],flip=true,theta=0,exprs=["0","0","0","1","-1"],pin=7,pout=9,pein=[],peout=[],gr_i=[],id="1/s",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("integral_func",4),in1=1,in2=1,intyp=1,out=1,out2=1,outtyp=1,evtin=[],evtout=[],state=0,dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[false,true],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m.objs[2-1]=scicos_block(gui="SUMMATION",graphics=scicos_graphics(orig=[387.97067,172.85067],sz=[40,60],flip=true,theta=0,exprs=["1","[1;1;1]"],pin=[10,9,11],pout=19,pein=[],peout=[],gr_i=[],id="",in_implicit=["E","E","E"],out_implicit="E"),model=scicos_model(sim=list("summation",4),in1=[-1,-1,-1],in2=[-2,-2,-2],intyp=[1,1,1],out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[1,1,1],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m.objs[3-1]=scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[321.23733,235.91733],sz=[40,40],flip=true,theta=0,exprs="1",pin=17,pout=10,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m.objs[4-1]=scicos_block(gui="DERIV",graphics=scicos_graphics(orig=[319.03733,135.45067],sz=[40,40],flip=true,theta=0,exprs=[],pin=8,pout=11,pein=[],peout=[],gr_i=[],id="s",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("deriv",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="x",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m.objs[5-1]=scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[255.23733,183.11733],sz=[40,40],flip=true,theta=0,exprs="1",pin=13,pout=7,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m.objs[6-1]=scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[255.23733,135.45067],sz=[40,40],flip=true,theta=0,exprs="1",pin=14,pout=8,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m.objs[7-1]=scicos_link(xx=[303.80876,309.73257],yy=[203.11733,203.11733],id="drawlink",thick=[0,0],ct=[1,1],from=[5,1,0],to=[1,1,1]);
-scs_m.objs[8-1]=scicos_link(xx=[303.80876,310.4659],yy=[155.45067,155.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[6,1,0],to=[4,1,1]);
-scs_m.objs[9-1]=scicos_link(xx=[366.87543,379.39924],yy=[203.11733,202.85067],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[2,2,1]);
-scs_m.objs[10-1]=scicos_link(xx=[369.80876,379.39924,379.39924],yy=[255.91733,255.91733,217.85067],id="drawlink",thick=[0,0],ct=[1,1],from=[3,1,0],to=[2,1,1]);
-scs_m.objs[11-1]=scicos_link(xx=[367.60876,379.39924,379.39924],yy=[155.45067,155.45067,187.85067],id="drawlink",thick=[0,0],ct=[1,1],from=[4,1,0],to=[2,3,1]);
-scs_m.objs[12-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[234.704,203.11733],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=16,pout=[13,14],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m.objs[13-1]=scicos_link(xx=[234.704,246.6659],yy=[203.11733,203.11733],id="drawlink",thick=[0,0],ct=[1,1],from=[12,1,0],to=[5,1,1]);
-scs_m.objs[14-1]=scicos_link(xx=[234.704,234.704,246.6659],yy=[203.11733,155.45067,155.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[12,2,0],to=[6,1,1]);
-scs_m.objs[15-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[233.97067,203.11733],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=21,pout=[16,17],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m.objs[16-1]=scicos_link(xx=[233.97067,234.704],yy=[203.11733,203.11733],id="drawlink",thick=[0,0],ct=[1,1],from=[15,1,0],to=[12,1,1]);
-scs_m.objs[17-1]=scicos_link(xx=[233.97067,233.97067,312.6659],yy=[203.11733,255.91733,255.91733],id="drawlink",thick=[0,0],ct=[1,1],from=[15,2,0],to=[3,1,1]);
-scs_m.objs[18-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[456.5421,192.85067],sz=[20,20],flip=true,theta=0,exprs="1",pin=19,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],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.objs[19-1]=scicos_link(xx=[436.5421,456.5421],yy=[202.85067,202.85067],id="drawlink",thick=[0,0],ct=[1,1],from=[2,1,0],to=[18,1,1]);
-scs_m.objs[20-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[193.97067,193.11733],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=21,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,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.objs[21-1]=scicos_link(xx=[213.97067,233.97067],yy=[203.11733,203.11733],id="drawlink",thick=[0,0],ct=[1,1],from=[20,1,0],to=[15,1,1]);
-model=scicos_model();
-model.sim="csuper";
-model.in1=-1;
-model.in2=-2;
-model.out=-1;
-model.out2=-2;
-model.intyp=1;
-model.outtyp=1;
-model.blocktype="h";
-model.firing=false;
-model.dep_ut=[false,false];
-model.rpar=scs_m;
-gr_i=[];
-x=standard_define([2,2],model,[],gr_i);
-}
-PID.prototype.details = function PID() {
-}
 }
diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js
index 966dfb60..b116b37e 100644
--- a/js/Linear/REGISTER.js
+++ b/js/Linear/REGISTER.js
@@ -1,5 +1,21 @@
 /* autogenerated from "macros/Linear/REGISTER.sci" */
 function REGISTER() {
+REGISTER.prototype.define = function REGISTER() {
+z0=zeros(10,1);
+model=scicos_model();
+model.sim=list("delay4",4);
+model.in1=1;
+model.out=1;
+model.evtin=1;
+model.dstate=z0;
+model.blocktype="d";
+model.dep_ut=[false,false];
+exprs=strcat(string(z0),";");
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+REGISTER.prototype.details = function REGISTER() {
+}
 REGISTER.prototype.get = function REGISTER() {
 }
 REGISTER.prototype.set = function REGISTER() {
@@ -62,20 +78,4 @@ break
 }
 }
 }
-REGISTER.prototype.define = function REGISTER() {
-z0=zeros(10,1);
-model=scicos_model();
-model.sim=list("delay4",4);
-model.in1=1;
-model.out=1;
-model.evtin=1;
-model.dstate=z0;
-model.blocktype="d";
-model.dep_ut=[false,false];
-exprs=strcat(string(z0),";");
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-REGISTER.prototype.details = function REGISTER() {
-}
 }
diff --git a/js/Linear/REGISTER_f.js b/js/Linear/REGISTER_f.js
index 5148ec31..53cde263 100644
--- a/js/Linear/REGISTER_f.js
+++ b/js/Linear/REGISTER_f.js
@@ -1,5 +1,21 @@
 /* autogenerated from "macros/Linear/REGISTER_f.sci" */
 function REGISTER_f() {
+REGISTER_f.prototype.define = function REGISTER_f() {
+z0=zeros(10,1);
+model=scicos_model();
+model.sim="delay";
+model.in1=1;
+model.out=1;
+model.evtin=1;
+model.dstate=z0;
+model.blocktype="d";
+model.dep_ut=[false,false];
+exprs=strcat(string(z0),";");
+gr_i=[];
+x=standard_define([2.5,2.5],model,exprs,gr_i);
+}
+REGISTER_f.prototype.details = function REGISTER_f() {
+}
 REGISTER_f.prototype.get = function REGISTER_f() {
 }
 REGISTER_f.prototype.set = function REGISTER_f() {
@@ -25,20 +41,4 @@ break
 }
 }
 }
-REGISTER_f.prototype.define = function REGISTER_f() {
-z0=zeros(10,1);
-model=scicos_model();
-model.sim="delay";
-model.in1=1;
-model.out=1;
-model.evtin=1;
-model.dstate=z0;
-model.blocktype="d";
-model.dep_ut=[false,false];
-exprs=strcat(string(z0),";");
-gr_i=[];
-x=standard_define([2.5,2.5],model,exprs,gr_i);
-}
-REGISTER_f.prototype.details = function REGISTER_f() {
-}
 }
diff --git a/js/Linear/SAMPHOLD.js b/js/Linear/SAMPHOLD.js
index f284d7e4..ef4e4595 100644
--- a/js/Linear/SAMPHOLD.js
+++ b/js/Linear/SAMPHOLD.js
@@ -1,11 +1,5 @@
 /* autogenerated from "macros/Linear/SAMPHOLD.sci" */
 function SAMPHOLD() {
-SAMPHOLD.prototype.get = function SAMPHOLD() {
-}
-SAMPHOLD.prototype.set = function SAMPHOLD() {
-x=arg1;
-x.model.firing=[];
-}
 SAMPHOLD.prototype.define = function SAMPHOLD() {
 in1=-1;
 model=scicos_model();
@@ -20,4 +14,10 @@ x=standard_define([2,2],model," ",gr_i);
 }
 SAMPHOLD.prototype.details = function SAMPHOLD() {
 }
+SAMPHOLD.prototype.get = function SAMPHOLD() {
+}
+SAMPHOLD.prototype.set = function SAMPHOLD() {
+x=arg1;
+x.model.firing=[];
+}
 }
diff --git a/js/Linear/SAMPHOLD_m.js b/js/Linear/SAMPHOLD_m.js
index 869130bd..39cfca2b 100644
--- a/js/Linear/SAMPHOLD_m.js
+++ b/js/Linear/SAMPHOLD_m.js
@@ -1,5 +1,23 @@
 /* autogenerated from "macros/Linear/SAMPHOLD_m.sci" */
 function SAMPHOLD_m() {
+SAMPHOLD_m.prototype.define = function SAMPHOLD_m() {
+model=scicos_model();
+model.sim=list("samphold4_m",4);
+model.in1=-1;
+model.in2=-2;
+model.intyp=1;
+model.outtyp=1;
+model.out=-1;
+model.out2=-2;
+model.evtin=1;
+model.blocktype="d";
+model.dep_ut=[true,false];
+label=[sci2exp(1)];
+gr_i=[];
+x=standard_define([2,2],model,label,gr_i);
+}
+SAMPHOLD_m.prototype.details = function SAMPHOLD_m() {
+}
 SAMPHOLD_m.prototype.get = function SAMPHOLD_m() {
 }
 SAMPHOLD_m.prototype.set = function SAMPHOLD_m() {
@@ -30,22 +48,4 @@ break
 }
 }
 }
-SAMPHOLD_m.prototype.define = function SAMPHOLD_m() {
-model=scicos_model();
-model.sim=list("samphold4_m",4);
-model.in1=-1;
-model.in2=-2;
-model.intyp=1;
-model.outtyp=1;
-model.out=-1;
-model.out2=-2;
-model.evtin=1;
-model.blocktype="d";
-model.dep_ut=[true,false];
-label=[sci2exp(1)];
-gr_i=[];
-x=standard_define([2,2],model,label,gr_i);
-}
-SAMPHOLD_m.prototype.details = function SAMPHOLD_m() {
-}
 }
diff --git a/js/Linear/SAMPLEHOLD_f.js b/js/Linear/SAMPLEHOLD_f.js
index 6492650e..bfc5e184 100644
--- a/js/Linear/SAMPLEHOLD_f.js
+++ b/js/Linear/SAMPLEHOLD_f.js
@@ -1,11 +1,5 @@
 /* autogenerated from "macros/Linear/SAMPLEHOLD_f.sci" */
 function SAMPLEHOLD_f() {
-SAMPLEHOLD_f.prototype.get = function SAMPLEHOLD_f() {
-}
-SAMPLEHOLD_f.prototype.set = function SAMPLEHOLD_f() {
-x=arg1;
-x.model.firing=[];
-}
 SAMPLEHOLD_f.prototype.define = function SAMPLEHOLD_f() {
 in1=-1;
 model=scicos_model();
@@ -20,4 +14,10 @@ x=standard_define([2,2],model," ",gr_i);
 }
 SAMPLEHOLD_f.prototype.details = function SAMPLEHOLD_f() {
 }
+SAMPLEHOLD_f.prototype.get = function SAMPLEHOLD_f() {
+}
+SAMPLEHOLD_f.prototype.set = function SAMPLEHOLD_f() {
+x=arg1;
+x.model.firing=[];
+}
 }
diff --git a/js/Linear/SOM_f.js b/js/Linear/SOM_f.js
index 5f1a028d..57198085 100644
--- a/js/Linear/SOM_f.js
+++ b/js/Linear/SOM_f.js
@@ -1,5 +1,20 @@
 /* autogenerated from "macros/Linear/SOM_f.sci" */
 function SOM_f() {
+SOM_f.prototype.define = function SOM_f() {
+sgn=[1,1,1];
+model=scicos_model();
+model.sim=list("sum",2);
+model.in1=[-1,-1,-1];
+model.out=-1;
+model.rpar=sgn;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[sci2exp(1),sci2exp(sgn)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+SOM_f.prototype.details = function SOM_f() {
+}
 SOM_f.prototype.get = function SOM_f() {
 }
 SOM_f.prototype.set = function SOM_f() {
@@ -22,19 +37,4 @@ str=["This sum block is obsolete","parameters cannot be modified. Please replace
 str=[str,(part(labs.slice(),1,7)+exprs.slice())];
 message(str);
 }
-SOM_f.prototype.define = function SOM_f() {
-sgn=[1,1,1];
-model=scicos_model();
-model.sim=list("sum",2);
-model.in1=[-1,-1,-1];
-model.out=-1;
-model.rpar=sgn;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[sci2exp(1),sci2exp(sgn)];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-SOM_f.prototype.details = function SOM_f() {
-}
 }
diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js
index 6374fc1e..11c383e3 100644
--- a/js/Linear/SUMMATION.js
+++ b/js/Linear/SUMMATION.js
@@ -1,5 +1,22 @@
 /* autogenerated from "macros/Linear/SUMMATION.sci" */
 function SUMMATION() {
+SUMMATION.prototype.define = function SUMMATION() {
+sgn=[1,-1];
+model=scicos_model();
+model.sim=list("summation",4);
+model.in1=[-1,-1];
+model.out=-1;
+model.in2=[-2,-2];
+model.out2=-2;
+model.ipar=sgn;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=sci2exp(sgn);
+gr_i=[];
+x=standard_define([2,3],model,exprs,gr_i);
+}
+SUMMATION.prototype.details = function SUMMATION() {
+}
 SUMMATION.prototype.get = function SUMMATION() {
 }
 SUMMATION.prototype.set = function SUMMATION() {
@@ -117,21 +134,4 @@ break
 }
 }
 }
-SUMMATION.prototype.define = function SUMMATION() {
-sgn=[1,-1];
-model=scicos_model();
-model.sim=list("summation",4);
-model.in1=[-1,-1];
-model.out=-1;
-model.in2=[-2,-2];
-model.out2=-2;
-model.ipar=sgn;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=sci2exp(sgn);
-gr_i=[];
-x=standard_define([2,3],model,exprs,gr_i);
-}
-SUMMATION.prototype.details = function SUMMATION() {
-}
 }
diff --git a/js/Linear/SUM_f.js b/js/Linear/SUM_f.js
index 7ad7c78e..087295b7 100644
--- a/js/Linear/SUM_f.js
+++ b/js/Linear/SUM_f.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/Linear/SUM_f.sci" */
 function SUM_f() {
-SUM_f.prototype.get = function SUM_f() {
-}
-SUM_f.prototype.set = function SUM_f() {
-x=arg1;
-}
 SUM_f.prototype.define = function SUM_f() {
 model=scicos_model();
 model.sim=list("plusblk",2);
@@ -18,4 +13,9 @@ x=standard_define([1,1],model,exprs,gr_i);
 }
 SUM_f.prototype.details = function SUM_f() {
 }
+SUM_f.prototype.get = function SUM_f() {
+}
+SUM_f.prototype.set = function SUM_f() {
+x=arg1;
+}
 }
diff --git a/js/Linear/TCLSS.js b/js/Linear/TCLSS.js
index 6c79aeb7..18727be9 100644
--- a/js/Linear/TCLSS.js
+++ b/js/Linear/TCLSS.js
@@ -1,5 +1,29 @@
 /* autogenerated from "macros/Linear/TCLSS.sci" */
 function TCLSS() {
+TCLSS.prototype.define = function TCLSS() {
+x0=0;
+A=0;
+B=1;
+C=1;
+D=0;
+in1=1;
+nx=size(x0,"*");
+out=1;
+model=scicos_model();
+model.sim=list("tcslti4",4);
+model.in1=[in1,nx];
+model.out=out;
+model.evtin=1;
+model.state=x0;
+model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()];
+model.blocktype="c";
+model.dep_ut=[false,true];
+exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))];
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+TCLSS.prototype.details = function TCLSS() {
+}
 TCLSS.prototype.get = function TCLSS() {
 }
 TCLSS.prototype.set = function TCLSS() {
@@ -57,28 +81,4 @@ break
 }
 }
 }
-TCLSS.prototype.define = function TCLSS() {
-x0=0;
-A=0;
-B=1;
-C=1;
-D=0;
-in1=1;
-nx=size(x0,"*");
-out=1;
-model=scicos_model();
-model.sim=list("tcslti4",4);
-model.in1=[in1,nx];
-model.out=out;
-model.evtin=1;
-model.state=x0;
-model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()];
-model.blocktype="c";
-model.dep_ut=[false,true];
-exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))];
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-TCLSS.prototype.details = function TCLSS() {
-}
 }
diff --git a/js/Linear/TCLSS_f.js b/js/Linear/TCLSS_f.js
index 22935fe6..f98490df 100644
--- a/js/Linear/TCLSS_f.js
+++ b/js/Linear/TCLSS_f.js
@@ -1,5 +1,29 @@
 /* autogenerated from "macros/Linear/TCLSS_f.sci" */
 function TCLSS_f() {
+TCLSS_f.prototype.define = function TCLSS_f() {
+x0=0;
+A=0;
+B=1;
+C=1;
+D=0;
+in1=1;
+nx=size(x0,"*");
+out=1;
+model=scicos_model();
+model.sim=list("tcslti",1);
+model.in1=[in1,nx];
+model.out=out;
+model.evtin=1;
+model.state=x0;
+model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()];
+model.blocktype="c";
+model.dep_ut=[false,true];
+exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))];
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+TCLSS_f.prototype.details = function TCLSS_f() {
+}
 TCLSS_f.prototype.get = function TCLSS_f() {
 }
 TCLSS_f.prototype.set = function TCLSS_f() {
@@ -57,28 +81,4 @@ break
 }
 }
 }
-TCLSS_f.prototype.define = function TCLSS_f() {
-x0=0;
-A=0;
-B=1;
-C=1;
-D=0;
-in1=1;
-nx=size(x0,"*");
-out=1;
-model=scicos_model();
-model.sim=list("tcslti",1);
-model.in1=[in1,nx];
-model.out=out;
-model.evtin=1;
-model.state=x0;
-model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()];
-model.blocktype="c";
-model.dep_ut=[false,true];
-exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))];
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-TCLSS_f.prototype.details = function TCLSS_f() {
-}
 }
diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js
index 37f09d25..da7fe84b 100644
--- a/js/Linear/TIME_DELAY.js
+++ b/js/Linear/TIME_DELAY.js
@@ -1,5 +1,24 @@
 /* autogenerated from "macros/Linear/TIME_DELAY.sci" */
 function TIME_DELAY() {
+TIME_DELAY.prototype.define = function TIME_DELAY() {
+nin=1;
+T=1;
+init=0;
+N=1024;
+model=scicos_model();
+model.sim=list("time_delay",4);
+model.in1=[nin];
+model.out=nin;
+model.rpar=[T,init];
+model.ipar=N;
+model.blocktype="x";
+model.dep_ut=[false,true];
+exprs=[string(T),string(init),string(N)];
+gr_i=[];
+x=standard_define([3.5,2],model,exprs,gr_i);
+}
+TIME_DELAY.prototype.details = function TIME_DELAY() {
+}
 TIME_DELAY.prototype.get = function TIME_DELAY() {
 }
 TIME_DELAY.prototype.set = function TIME_DELAY() {
@@ -35,23 +54,4 @@ break
 }
 }
 }
-TIME_DELAY.prototype.define = function TIME_DELAY() {
-nin=1;
-T=1;
-init=0;
-N=1024;
-model=scicos_model();
-model.sim=list("time_delay",4);
-model.in1=[nin];
-model.out=nin;
-model.rpar=[T,init];
-model.ipar=N;
-model.blocktype="x";
-model.dep_ut=[false,true];
-exprs=[string(T),string(init),string(N)];
-gr_i=[];
-x=standard_define([3.5,2],model,exprs,gr_i);
-}
-TIME_DELAY.prototype.details = function TIME_DELAY() {
-}
 }
diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js
index 32cf250d..49139bf0 100644
--- a/js/Linear/VARIABLE_DELAY.js
+++ b/js/Linear/VARIABLE_DELAY.js
@@ -1,5 +1,24 @@
 /* autogenerated from "macros/Linear/VARIABLE_DELAY.sci" */
 function VARIABLE_DELAY() {
+VARIABLE_DELAY.prototype.define = function VARIABLE_DELAY() {
+nin=1;
+T=1;
+init=0;
+N=1024;
+model=scicos_model();
+model.sim=list("variable_delay",4);
+model.in1=[nin,1];
+model.out=nin;
+model.rpar=[T,init];
+model.ipar=N;
+model.blocktype="d";
+model.dep_ut=[false,false];
+exprs=[string(T),string(init),string(N)];
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+VARIABLE_DELAY.prototype.details = function VARIABLE_DELAY() {
+}
 VARIABLE_DELAY.prototype.get = function VARIABLE_DELAY() {
 }
 VARIABLE_DELAY.prototype.set = function VARIABLE_DELAY() {
@@ -34,23 +53,4 @@ break
 }
 }
 }
-VARIABLE_DELAY.prototype.define = function VARIABLE_DELAY() {
-nin=1;
-T=1;
-init=0;
-N=1024;
-model=scicos_model();
-model.sim=list("variable_delay",4);
-model.in1=[nin,1];
-model.out=nin;
-model.rpar=[T,init];
-model.ipar=N;
-model.blocktype="d";
-model.dep_ut=[false,false];
-exprs=[string(T),string(init),string(N)];
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-VARIABLE_DELAY.prototype.details = function VARIABLE_DELAY() {
-}
 }
diff --git a/js/MatrixOp/CUMSUM.js b/js/MatrixOp/CUMSUM.js
index d7bfd393..5d518b16 100644
--- a/js/MatrixOp/CUMSUM.js
+++ b/js/MatrixOp/CUMSUM.js
@@ -1,5 +1,31 @@
 /* autogenerated from "macros/MatrixOp/CUMSUM.sci" */
 function CUMSUM() {
+CUMSUM.prototype.define = function CUMSUM() {
+model=scicos_model();
+function_name="cumsum_m";
+funtyp=4;
+model.sim=list(function_name,funtyp);
+model.in1=-1;
+model.in2=-2;
+model.intyp=1;
+model.out=-1;
+model.out2=-2;
+model.outtyp=1;
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[];
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,false];
+label=[sci2exp(1),sci2exp(0)];
+gr_i=[];
+x=standard_define([3,2],model,label,gr_i);
+}
+CUMSUM.prototype.details = function CUMSUM() {
+}
 CUMSUM.prototype.get = function CUMSUM() {
 }
 CUMSUM.prototype.set = function CUMSUM() {
@@ -65,30 +91,4 @@ break
 }
 }
 }
-CUMSUM.prototype.define = function CUMSUM() {
-model=scicos_model();
-function_name="cumsum_m";
-funtyp=4;
-model.sim=list(function_name,funtyp);
-model.in1=-1;
-model.in2=-2;
-model.intyp=1;
-model.out=-1;
-model.out2=-2;
-model.outtyp=1;
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[];
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-label=[sci2exp(1),sci2exp(0)];
-gr_i=[];
-x=standard_define([3,2],model,label,gr_i);
-}
-CUMSUM.prototype.details = function CUMSUM() {
-}
 }
diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js
index 31fa8a3c..37158417 100644
--- a/js/MatrixOp/EXTRACT.js
+++ b/js/MatrixOp/EXTRACT.js
@@ -1,5 +1,31 @@
 /* autogenerated from "macros/MatrixOp/EXTRACT.sci" */
 function EXTRACT() {
+EXTRACT.prototype.define = function EXTRACT() {
+model=scicos_model();
+function_name="extract";
+funtyp=4;
+model.sim=list(function_name,funtyp);
+model.in1=-1;
+model.in2=-2;
+model.intyp=1;
+model.out=1;
+model.out2=1;
+model.outtyp=1;
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[1,1,1,1];
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,false];
+label=[sci2exp(1),sci2exp([1]),sci2exp([1])];
+gr_i=[];
+x=standard_define([3,2],model,label,gr_i);
+}
+EXTRACT.prototype.details = function EXTRACT() {
+}
 EXTRACT.prototype.get = function EXTRACT() {
 }
 EXTRACT.prototype.set = function EXTRACT() {
@@ -63,30 +89,4 @@ break
 }
 }
 }
-EXTRACT.prototype.define = function EXTRACT() {
-model=scicos_model();
-function_name="extract";
-funtyp=4;
-model.sim=list(function_name,funtyp);
-model.in1=-1;
-model.in2=-2;
-model.intyp=1;
-model.out=1;
-model.out2=1;
-model.outtyp=1;
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[1,1,1,1];
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-label=[sci2exp(1),sci2exp([1]),sci2exp([1])];
-gr_i=[];
-x=standard_define([3,2],model,label,gr_i);
-}
-EXTRACT.prototype.details = function EXTRACT() {
-}
 }
diff --git a/js/MatrixOp/EXTTRI.js b/js/MatrixOp/EXTTRI.js
index 3678eda5..54480b90 100644
--- a/js/MatrixOp/EXTTRI.js
+++ b/js/MatrixOp/EXTTRI.js
@@ -1,5 +1,31 @@
 /* autogenerated from "macros/MatrixOp/EXTTRI.sci" */
 function EXTTRI() {
+EXTTRI.prototype.define = function EXTTRI() {
+model=scicos_model();
+function_name="extrilz";
+funtyp=4;
+model.sim=list(function_name,funtyp);
+model.in1=-1;
+model.in2=-2;
+model.intyp=1;
+model.out=-1;
+model.out2=-2;
+model.outtyp=1;
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[];
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,false];
+label=[sci2exp(1),sci2exp(1)];
+gr_i=[];
+x=standard_define([3,2],model,label,gr_i);
+}
+EXTTRI.prototype.details = function EXTTRI() {
+}
 EXTTRI.prototype.get = function EXTTRI() {
 }
 EXTTRI.prototype.set = function EXTTRI() {
@@ -62,30 +88,4 @@ break
 }
 }
 }
-EXTTRI.prototype.define = function EXTTRI() {
-model=scicos_model();
-function_name="extrilz";
-funtyp=4;
-model.sim=list(function_name,funtyp);
-model.in1=-1;
-model.in2=-2;
-model.intyp=1;
-model.out=-1;
-model.out2=-2;
-model.outtyp=1;
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[];
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-label=[sci2exp(1),sci2exp(1)];
-gr_i=[];
-x=standard_define([3,2],model,label,gr_i);
-}
-EXTTRI.prototype.details = function EXTTRI() {
-}
 }
diff --git a/js/MatrixOp/MATBKSL.js b/js/MatrixOp/MATBKSL.js
index d98ef69e..c5946d7a 100644
--- a/js/MatrixOp/MATBKSL.js
+++ b/js/MatrixOp/MATBKSL.js
@@ -1,5 +1,31 @@
 /* autogenerated from "macros/MatrixOp/MATBKSL.sci" */
 function MATBKSL() {
+MATBKSL.prototype.define = function MATBKSL() {
+model=scicos_model();
+function_name="mat_bksl";
+funtyp=4;
+model.sim=list(function_name,funtyp);
+model.in1=[-1,-1];
+model.in2=[-2,-3];
+model.intyp=[1,1];
+model.out=-2;
+model.out2=-3;
+model.outtyp=1;
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[];
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,false];
+label=[sci2exp(1)];
+gr_i=[];
+x=standard_define([2,2],model,label,gr_i);
+}
+MATBKSL.prototype.details = function MATBKSL() {
+}
 MATBKSL.prototype.get = function MATBKSL() {
 }
 MATBKSL.prototype.set = function MATBKSL() {
@@ -42,30 +68,4 @@ break
 }
 }
 }
-MATBKSL.prototype.define = function MATBKSL() {
-model=scicos_model();
-function_name="mat_bksl";
-funtyp=4;
-model.sim=list(function_name,funtyp);
-model.in1=[-1,-1];
-model.in2=[-2,-3];
-model.intyp=[1,1];
-model.out=-2;
-model.out2=-3;
-model.outtyp=1;
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[];
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-label=[sci2exp(1)];
-gr_i=[];
-x=standard_define([2,2],model,label,gr_i);
-}
-MATBKSL.prototype.details = function MATBKSL() {
-}
 }
diff --git a/js/MatrixOp/MATCATH.js b/js/MatrixOp/MATCATH.js
index 62f80c64..5fbebc9e 100644
--- a/js/MatrixOp/MATCATH.js
+++ b/js/MatrixOp/MATCATH.js
@@ -1,5 +1,31 @@
 /* autogenerated from "macros/MatrixOp/MATCATH.sci" */
 function MATCATH() {
+MATCATH.prototype.define = function MATCATH() {
+model=scicos_model();
+function_name="mat_cath";
+funtyp=4;
+model.sim=list(function_name,funtyp);
+model.in1=[-1,-1];
+model.in2=[-2,-3];
+model.intyp=[1,1];
+model.out=-1;
+model.out2=0;
+model.outtyp=-1;
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[];
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,false];
+label=[sci2exp(2)];
+gr_i=[];
+x=standard_define([2,3],model,label,gr_i);
+}
+MATCATH.prototype.details = function MATCATH() {
+}
 MATCATH.prototype.get = function MATCATH() {
 }
 MATCATH.prototype.set = function MATCATH() {
@@ -32,30 +58,4 @@ break
 }
 }
 }
-MATCATH.prototype.define = function MATCATH() {
-model=scicos_model();
-function_name="mat_cath";
-funtyp=4;
-model.sim=list(function_name,funtyp);
-model.in1=[-1,-1];
-model.in2=[-2,-3];
-model.intyp=[1,1];
-model.out=-1;
-model.out2=0;
-model.outtyp=-1;
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[];
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-label=[sci2exp(2)];
-gr_i=[];
-x=standard_define([2,3],model,label,gr_i);
-}
-MATCATH.prototype.details = function MATCATH() {
-}
 }
diff --git a/js/MatrixOp/MATCATV.js b/js/MatrixOp/MATCATV.js
index 0f581386..e075408d 100644
--- a/js/MatrixOp/MATCATV.js
+++ b/js/MatrixOp/MATCATV.js
@@ -1,5 +1,32 @@
 /* autogenerated from "macros/MatrixOp/MATCATV.sci" */
 function MATCATV() {
+MATCATV.prototype.define = function MATCATV() {
+l1=[2,2];
+model=scicos_model();
+function_name="mat_catv";
+funtyp=4;
+model.sim=list(function_name,funtyp);
+model.in2=[-1,-1];
+model.in1=[-2,-3];
+model.intyp=[-1,-1];
+model.out=0;
+model.out2=-1;
+model.outtyp=-1;
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[];
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,false];
+label=[sci2exp(2)];
+gr_i=[];
+x=standard_define([2,3],model,label,gr_i);
+}
+MATCATV.prototype.details = function MATCATV() {
+}
 MATCATV.prototype.get = function MATCATV() {
 }
 MATCATV.prototype.set = function MATCATV() {
@@ -32,31 +59,4 @@ break
 }
 }
 }
-MATCATV.prototype.define = function MATCATV() {
-l1=[2,2];
-model=scicos_model();
-function_name="mat_catv";
-funtyp=4;
-model.sim=list(function_name,funtyp);
-model.in2=[-1,-1];
-model.in1=[-2,-3];
-model.intyp=[-1,-1];
-model.out=0;
-model.out2=-1;
-model.outtyp=-1;
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[];
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-label=[sci2exp(2)];
-gr_i=[];
-x=standard_define([2,3],model,label,gr_i);
-}
-MATCATV.prototype.details = function MATCATV() {
-}
 }
diff --git a/js/MatrixOp/MATDET.js b/js/MatrixOp/MATDET.js
index d175ed9d..17c1124d 100644
--- a/js/MatrixOp/MATDET.js
+++ b/js/MatrixOp/MATDET.js
@@ -1,5 +1,31 @@
 /* autogenerated from "macros/MatrixOp/MATDET.sci" */
 function MATDET() {
+MATDET.prototype.define = function MATDET() {
+model=scicos_model();
+function_name="mat_det";
+funtyp=4;
+model.sim=list(function_name,funtyp);
+model.in1=-1;
+model.in2=-1;
+model.intyp=1;
+model.out=1;
+model.out2=1;
+model.outtyp=1;
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[];
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,false];
+label=[sci2exp(1)];
+gr_i=[];
+x=standard_define([2,2],model,label,gr_i);
+}
+MATDET.prototype.details = function MATDET() {
+}
 MATDET.prototype.get = function MATDET() {
 }
 MATDET.prototype.set = function MATDET() {
@@ -42,30 +68,4 @@ break
 }
 }
 }
-MATDET.prototype.define = function MATDET() {
-model=scicos_model();
-function_name="mat_det";
-funtyp=4;
-model.sim=list(function_name,funtyp);
-model.in1=-1;
-model.in2=-1;
-model.intyp=1;
-model.out=1;
-model.out2=1;
-model.outtyp=1;
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[];
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-label=[sci2exp(1)];
-gr_i=[];
-x=standard_define([2,2],model,label,gr_i);
-}
-MATDET.prototype.details = function MATDET() {
-}
 }
diff --git a/js/MatrixOp/MATDIAG.js b/js/MatrixOp/MATDIAG.js
index 0607d5ce..687ef6f8 100644
--- a/js/MatrixOp/MATDIAG.js
+++ b/js/MatrixOp/MATDIAG.js
@@ -1,5 +1,31 @@
 /* autogenerated from "macros/MatrixOp/MATDIAG.sci" */
 function MATDIAG() {
+MATDIAG.prototype.define = function MATDIAG() {
+model=scicos_model();
+function_name="mat_diag";
+funtyp=4;
+model.sim=list(function_name,funtyp);
+model.in1=-1;
+model.in2=1;
+model.intyp=1;
+model.out=-1;
+model.out2=-1;
+model.outtyp=1;
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[];
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,false];
+label=[sci2exp(1)];
+gr_i=[];
+x=standard_define([2,2],model,label,gr_i);
+}
+MATDIAG.prototype.details = function MATDIAG() {
+}
 MATDIAG.prototype.get = function MATDIAG() {
 }
 MATDIAG.prototype.set = function MATDIAG() {
@@ -42,30 +68,4 @@ break
 }
 }
 }
-MATDIAG.prototype.define = function MATDIAG() {
-model=scicos_model();
-function_name="mat_diag";
-funtyp=4;
-model.sim=list(function_name,funtyp);
-model.in1=-1;
-model.in2=1;
-model.intyp=1;
-model.out=-1;
-model.out2=-1;
-model.outtyp=1;
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[];
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-label=[sci2exp(1)];
-gr_i=[];
-x=standard_define([2,2],model,label,gr_i);
-}
-MATDIAG.prototype.details = function MATDIAG() {
-}
 }
diff --git a/js/MatrixOp/MATDIV.js b/js/MatrixOp/MATDIV.js
index 03cbcf4f..70fec126 100644
--- a/js/MatrixOp/MATDIV.js
+++ b/js/MatrixOp/MATDIV.js
@@ -1,5 +1,31 @@
 /* autogenerated from "macros/MatrixOp/MATDIV.sci" */
 function MATDIV() {
+MATDIV.prototype.define = function MATDIV() {
+model=scicos_model();
+function_name="mat_div";
+funtyp=4;
+model.sim=list(function_name,funtyp);
+model.in1=[-1,-2];
+model.in2=[-3,-3];
+model.intyp=[1,1];
+model.out=-1;
+model.out2=-2;
+model.outtyp=1;
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[];
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,false];
+label=[sci2exp(1)];
+gr_i=[];
+x=standard_define([2,2],model,label,gr_i);
+}
+MATDIV.prototype.details = function MATDIV() {
+}
 MATDIV.prototype.get = function MATDIV() {
 }
 MATDIV.prototype.set = function MATDIV() {
@@ -42,30 +68,4 @@ break
 }
 }
 }
-MATDIV.prototype.define = function MATDIV() {
-model=scicos_model();
-function_name="mat_div";
-funtyp=4;
-model.sim=list(function_name,funtyp);
-model.in1=[-1,-2];
-model.in2=[-3,-3];
-model.intyp=[1,1];
-model.out=-1;
-model.out2=-2;
-model.outtyp=1;
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[];
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-label=[sci2exp(1)];
-gr_i=[];
-x=standard_define([2,2],model,label,gr_i);
-}
-MATDIV.prototype.details = function MATDIV() {
-}
 }
diff --git a/js/MatrixOp/MATEIG.js b/js/MatrixOp/MATEIG.js
index 1cc90f01..1d11c810 100644
--- a/js/MatrixOp/MATEIG.js
+++ b/js/MatrixOp/MATEIG.js
@@ -1,5 +1,31 @@
 /* autogenerated from "macros/MatrixOp/MATEIG.sci" */
 function MATEIG() {
+MATEIG.prototype.define = function MATEIG() {
+model=scicos_model();
+function_name="mat_vps";
+funtyp=4;
+model.sim=list(function_name,funtyp);
+model.in1=-1;
+model.in2=-1;
+model.intyp=1;
+model.out=-1;
+model.out2=1;
+model.outtyp=2;
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[];
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,false];
+label=[sci2exp(1),sci2exp(1)];
+gr_i=[];
+x=standard_define([2,2],model,label,gr_i);
+}
+MATEIG.prototype.details = function MATEIG() {
+}
 MATEIG.prototype.get = function MATEIG() {
 }
 MATEIG.prototype.set = function MATEIG() {
@@ -63,30 +89,4 @@ break
 }
 }
 }
-MATEIG.prototype.define = function MATEIG() {
-model=scicos_model();
-function_name="mat_vps";
-funtyp=4;
-model.sim=list(function_name,funtyp);
-model.in1=-1;
-model.in2=-1;
-model.intyp=1;
-model.out=-1;
-model.out2=1;
-model.outtyp=2;
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[];
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-label=[sci2exp(1),sci2exp(1)];
-gr_i=[];
-x=standard_define([2,2],model,label,gr_i);
-}
-MATEIG.prototype.details = function MATEIG() {
-}
 }
diff --git a/js/MatrixOp/MATEXPM.js b/js/MatrixOp/MATEXPM.js
index da0311a1..dcaa47d0 100644
--- a/js/MatrixOp/MATEXPM.js
+++ b/js/MatrixOp/MATEXPM.js
@@ -1,5 +1,31 @@
 /* autogenerated from "macros/MatrixOp/MATEXPM.sci" */
 function MATEXPM() {
+MATEXPM.prototype.define = function MATEXPM() {
+model=scicos_model();
+function_name="mat_expm";
+funtyp=4;
+model.sim=list(function_name,funtyp);
+model.in1=-1;
+model.in2=-1;
+model.intyp=1;
+model.out=-1;
+model.out2=-1;
+model.outtyp=1;
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[];
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,false];
+label=[sci2exp(1)];
+gr_i=[];
+x=standard_define([2,2],model,label,gr_i);
+}
+MATEXPM.prototype.details = function MATEXPM() {
+}
 MATEXPM.prototype.get = function MATEXPM() {
 }
 MATEXPM.prototype.set = function MATEXPM() {
@@ -42,30 +68,4 @@ break
 }
 }
 }
-MATEXPM.prototype.define = function MATEXPM() {
-model=scicos_model();
-function_name="mat_expm";
-funtyp=4;
-model.sim=list(function_name,funtyp);
-model.in1=-1;
-model.in2=-1;
-model.intyp=1;
-model.out=-1;
-model.out2=-1;
-model.outtyp=1;
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[];
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-label=[sci2exp(1)];
-gr_i=[];
-x=standard_define([2,2],model,label,gr_i);
-}
-MATEXPM.prototype.details = function MATEXPM() {
-}
 }
diff --git a/js/MatrixOp/MATINV.js b/js/MatrixOp/MATINV.js
index f1e35efd..47933715 100644
--- a/js/MatrixOp/MATINV.js
+++ b/js/MatrixOp/MATINV.js
@@ -1,5 +1,31 @@
 /* autogenerated from "macros/MatrixOp/MATINV.sci" */
 function MATINV() {
+MATINV.prototype.define = function MATINV() {
+model=scicos_model();
+function_name="mat_inv";
+funtyp=4;
+model.sim=list(function_name,funtyp);
+model.in1=-1;
+model.in2=-1;
+model.intyp=1;
+model.out=-1;
+model.out2=-1;
+model.outtyp=1;
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[];
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,false];
+label=[sci2exp(1)];
+gr_i=[];
+x=standard_define([2,2],model,label,gr_i);
+}
+MATINV.prototype.details = function MATINV() {
+}
 MATINV.prototype.get = function MATINV() {
 }
 MATINV.prototype.set = function MATINV() {
@@ -42,30 +68,4 @@ break
 }
 }
 }
-MATINV.prototype.define = function MATINV() {
-model=scicos_model();
-function_name="mat_inv";
-funtyp=4;
-model.sim=list(function_name,funtyp);
-model.in1=-1;
-model.in2=-1;
-model.intyp=1;
-model.out=-1;
-model.out2=-1;
-model.outtyp=1;
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[];
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-label=[sci2exp(1)];
-gr_i=[];
-x=standard_define([2,2],model,label,gr_i);
-}
-MATINV.prototype.details = function MATINV() {
-}
 }
diff --git a/js/MatrixOp/MATLU.js b/js/MatrixOp/MATLU.js
index b5550760..58d254c6 100644
--- a/js/MatrixOp/MATLU.js
+++ b/js/MatrixOp/MATLU.js
@@ -1,5 +1,31 @@
 /* autogenerated from "macros/MatrixOp/MATLU.sci" */
 function MATLU() {
+MATLU.prototype.define = function MATLU() {
+model=scicos_model();
+function_name="mat_lu";
+funtyp=4;
+model.sim=list(function_name,funtyp);
+model.in1=-1;
+model.in2=-1;
+model.intyp=1;
+model.out=[-1,-1];
+model.out2=[-1,-1];
+model.outtyp=[1,1];
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[];
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,false];
+label=sci2exp(1);
+gr_i=[];
+x=standard_define([2,2],model,label,gr_i);
+}
+MATLU.prototype.details = function MATLU() {
+}
 MATLU.prototype.get = function MATLU() {
 }
 MATLU.prototype.set = function MATLU() {
@@ -40,30 +66,4 @@ break
 }
 }
 }
-MATLU.prototype.define = function MATLU() {
-model=scicos_model();
-function_name="mat_lu";
-funtyp=4;
-model.sim=list(function_name,funtyp);
-model.in1=-1;
-model.in2=-1;
-model.intyp=1;
-model.out=[-1,-1];
-model.out2=[-1,-1];
-model.outtyp=[1,1];
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[];
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-label=sci2exp(1);
-gr_i=[];
-x=standard_define([2,2],model,label,gr_i);
-}
-MATLU.prototype.details = function MATLU() {
-}
 }
diff --git a/js/MatrixOp/MATMAGPHI.js b/js/MatrixOp/MATMAGPHI.js
index efa28feb..0ac8dcdf 100644
--- a/js/MatrixOp/MATMAGPHI.js
+++ b/js/MatrixOp/MATMAGPHI.js
@@ -1,5 +1,31 @@
 /* autogenerated from "macros/MatrixOp/MATMAGPHI.sci" */
 function MATMAGPHI() {
+MATMAGPHI.prototype.define = function MATMAGPHI() {
+model=scicos_model();
+function_name="matz_abs";
+funtyp=4;
+model.sim=list(function_name,funtyp);
+model.in1=-1;
+model.in2=-2;
+model.intyp=2;
+model.out=[-1,-1];
+model.out2=[-2,-2];
+model.outtyp=[1,1];
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[];
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,false];
+label=[sci2exp(1)];
+gr_i=[];
+x=standard_define([3,2],model,label,gr_i);
+}
+MATMAGPHI.prototype.details = function MATMAGPHI() {
+}
 MATMAGPHI.prototype.get = function MATMAGPHI() {
 }
 MATMAGPHI.prototype.set = function MATMAGPHI() {
@@ -46,30 +72,4 @@ break
 }
 }
 }
-MATMAGPHI.prototype.define = function MATMAGPHI() {
-model=scicos_model();
-function_name="matz_abs";
-funtyp=4;
-model.sim=list(function_name,funtyp);
-model.in1=-1;
-model.in2=-2;
-model.intyp=2;
-model.out=[-1,-1];
-model.out2=[-2,-2];
-model.outtyp=[1,1];
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[];
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-label=[sci2exp(1)];
-gr_i=[];
-x=standard_define([3,2],model,label,gr_i);
-}
-MATMAGPHI.prototype.details = function MATMAGPHI() {
-}
 }
diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js
index f38e0dd5..7f30bd80 100644
--- a/js/MatrixOp/MATMUL.js
+++ b/js/MatrixOp/MATMUL.js
@@ -1,5 +1,20 @@
 /* autogenerated from "macros/MatrixOp/MATMUL.sci" */
 function MATMUL() {
+MATMUL.prototype.define = function MATMUL() {
+model=scicos_model();
+model.sim=list("matmul_m",4);
+model.in1=[-1,-2];
+model.in2=[-2,-3];
+model.out=-1;
+model.out2=-3;
+model.dep_ut=[true,false];
+model.ipar=1;
+label=[sci2exp(model.ipar)];
+gr_i=[];
+x=standard_define([3,2],model,label,gr_i);
+}
+MATMUL.prototype.details = function MATMUL() {
+}
 MATMUL.prototype.get = function MATMUL() {
 }
 MATMUL.prototype.set = function MATMUL() {
@@ -133,19 +148,4 @@ break
 }
 }
 }
-MATMUL.prototype.define = function MATMUL() {
-model=scicos_model();
-model.sim=list("matmul_m",4);
-model.in1=[-1,-2];
-model.in2=[-2,-3];
-model.out=-1;
-model.out2=-3;
-model.dep_ut=[true,false];
-model.ipar=1;
-label=[sci2exp(model.ipar)];
-gr_i=[];
-x=standard_define([3,2],model,label,gr_i);
-}
-MATMUL.prototype.details = function MATMUL() {
-}
 }
diff --git a/js/MatrixOp/MATPINV.js b/js/MatrixOp/MATPINV.js
index 14df007b..d596209a 100644
--- a/js/MatrixOp/MATPINV.js
+++ b/js/MatrixOp/MATPINV.js
@@ -1,5 +1,31 @@
 /* autogenerated from "macros/MatrixOp/MATPINV.sci" */
 function MATPINV() {
+MATPINV.prototype.define = function MATPINV() {
+model=scicos_model();
+function_name="mat_pinv";
+funtyp=4;
+model.sim=list(function_name,funtyp);
+model.in1=-1;
+model.in2=-2;
+model.intyp=1;
+model.out=-2;
+model.out2=-1;
+model.outtyp=1;
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[];
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,false];
+label=[sci2exp(1)];
+gr_i=[];
+x=standard_define([2,2],model,label,gr_i);
+}
+MATPINV.prototype.details = function MATPINV() {
+}
 MATPINV.prototype.get = function MATPINV() {
 }
 MATPINV.prototype.set = function MATPINV() {
@@ -42,30 +68,4 @@ break
 }
 }
 }
-MATPINV.prototype.define = function MATPINV() {
-model=scicos_model();
-function_name="mat_pinv";
-funtyp=4;
-model.sim=list(function_name,funtyp);
-model.in1=-1;
-model.in2=-2;
-model.intyp=1;
-model.out=-2;
-model.out2=-1;
-model.outtyp=1;
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[];
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-label=[sci2exp(1)];
-gr_i=[];
-x=standard_define([2,2],model,label,gr_i);
-}
-MATPINV.prototype.details = function MATPINV() {
-}
 }
diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js
index 77fb5bbb..f07eec11 100644
--- a/js/MatrixOp/MATRESH.js
+++ b/js/MatrixOp/MATRESH.js
@@ -1,5 +1,31 @@
 /* autogenerated from "macros/MatrixOp/MATRESH.sci" */
 function MATRESH() {
+MATRESH.prototype.define = function MATRESH() {
+model=scicos_model();
+function_name="mat_reshape";
+funtyp=4;
+model.sim=list(function_name,funtyp);
+model.in1=-1;
+model.in2=-2;
+model.intyp=1;
+model.out=-1;
+model.out2=-2;
+model.outtyp=1;
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[];
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,false];
+label=[sci2exp(1),sci2exp([1,1]),sci2exp([1,1])];
+gr_i=[];
+x=standard_define([3,2],model,label,gr_i);
+}
+MATRESH.prototype.details = function MATRESH() {
+}
 MATRESH.prototype.get = function MATRESH() {
 }
 MATRESH.prototype.set = function MATRESH() {
@@ -67,30 +93,4 @@ break
 }
 needcompile=resume(needcompile)
 }
-MATRESH.prototype.define = function MATRESH() {
-model=scicos_model();
-function_name="mat_reshape";
-funtyp=4;
-model.sim=list(function_name,funtyp);
-model.in1=-1;
-model.in2=-2;
-model.intyp=1;
-model.out=-1;
-model.out2=-2;
-model.outtyp=1;
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[];
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-label=[sci2exp(1),sci2exp([1,1]),sci2exp([1,1])];
-gr_i=[];
-x=standard_define([3,2],model,label,gr_i);
-}
-MATRESH.prototype.details = function MATRESH() {
-}
 }
diff --git a/js/MatrixOp/MATSING.js b/js/MatrixOp/MATSING.js
index f03be1a8..57972327 100644
--- a/js/MatrixOp/MATSING.js
+++ b/js/MatrixOp/MATSING.js
@@ -1,5 +1,31 @@
 /* autogenerated from "macros/MatrixOp/MATSING.sci" */
 function MATSING() {
+MATSING.prototype.define = function MATSING() {
+model=scicos_model();
+function_name="mat_sing";
+funtyp=4;
+model.sim=list(function_name,funtyp);
+model.in1=-1;
+model.in2=-2;
+model.intyp=1;
+model.out=-1;
+model.out2=1;
+model.outtyp=1;
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[];
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,false];
+label=[sci2exp(1),sci2exp(1)];
+gr_i=[];
+x=standard_define([2,2],model,label,gr_i);
+}
+MATSING.prototype.details = function MATSING() {
+}
 MATSING.prototype.get = function MATSING() {
 }
 MATSING.prototype.set = function MATSING() {
@@ -66,30 +92,4 @@ break
 }
 }
 }
-MATSING.prototype.define = function MATSING() {
-model=scicos_model();
-function_name="mat_sing";
-funtyp=4;
-model.sim=list(function_name,funtyp);
-model.in1=-1;
-model.in2=-2;
-model.intyp=1;
-model.out=-1;
-model.out2=1;
-model.outtyp=1;
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[];
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-label=[sci2exp(1),sci2exp(1)];
-gr_i=[];
-x=standard_define([2,2],model,label,gr_i);
-}
-MATSING.prototype.details = function MATSING() {
-}
 }
diff --git a/js/MatrixOp/MATSUM.js b/js/MatrixOp/MATSUM.js
index 357c4669..919e8769 100644
--- a/js/MatrixOp/MATSUM.js
+++ b/js/MatrixOp/MATSUM.js
@@ -1,5 +1,31 @@
 /* autogenerated from "macros/MatrixOp/MATSUM.sci" */
 function MATSUM() {
+MATSUM.prototype.define = function MATSUM() {
+model=scicos_model();
+function_name="mat_sum";
+funtyp=4;
+model.sim=list(function_name,funtyp);
+model.in1=-1;
+model.in2=-2;
+model.intyp=1;
+model.out=1;
+model.out2=1;
+model.outtyp=1;
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[];
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,false];
+label=[sci2exp(1),sci2exp(0)];
+gr_i=[];
+x=standard_define([3,2],model,label,gr_i);
+}
+MATSUM.prototype.details = function MATSUM() {
+}
 MATSUM.prototype.get = function MATSUM() {
 }
 MATSUM.prototype.set = function MATSUM() {
@@ -67,30 +93,4 @@ break
 }
 }
 }
-MATSUM.prototype.define = function MATSUM() {
-model=scicos_model();
-function_name="mat_sum";
-funtyp=4;
-model.sim=list(function_name,funtyp);
-model.in1=-1;
-model.in2=-2;
-model.intyp=1;
-model.out=1;
-model.out2=1;
-model.outtyp=1;
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[];
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-label=[sci2exp(1),sci2exp(0)];
-gr_i=[];
-x=standard_define([3,2],model,label,gr_i);
-}
-MATSUM.prototype.details = function MATSUM() {
-}
 }
diff --git a/js/MatrixOp/MATTRAN.js b/js/MatrixOp/MATTRAN.js
index eb4c876a..b4457d51 100644
--- a/js/MatrixOp/MATTRAN.js
+++ b/js/MatrixOp/MATTRAN.js
@@ -1,5 +1,19 @@
 /* autogenerated from "macros/MatrixOp/MATTRAN.sci" */
 function MATTRAN() {
+MATTRAN.prototype.define = function MATTRAN() {
+model=scicos_model();
+model.sim=list("mattran_m",4);
+model.in1=-1;
+model.in2=-2;
+model.out=-2;
+model.out2=-1;
+model.dep_ut=[true,false];
+label=[sci2exp(1)];
+gr_i=[];
+x=standard_define([3,2],model,label,gr_i);
+}
+MATTRAN.prototype.details = function MATTRAN() {
+}
 MATTRAN.prototype.get = function MATTRAN() {
 }
 MATTRAN.prototype.set = function MATTRAN() {
@@ -46,18 +60,4 @@ break
 }
 }
 }
-MATTRAN.prototype.define = function MATTRAN() {
-model=scicos_model();
-model.sim=list("mattran_m",4);
-model.in1=-1;
-model.in2=-2;
-model.out=-2;
-model.out2=-1;
-model.dep_ut=[true,false];
-label=[sci2exp(1)];
-gr_i=[];
-x=standard_define([3,2],model,label,gr_i);
-}
-MATTRAN.prototype.details = function MATTRAN() {
-}
 }
diff --git a/js/MatrixOp/MATZCONJ.js b/js/MatrixOp/MATZCONJ.js
index fa566a17..48845cdb 100644
--- a/js/MatrixOp/MATZCONJ.js
+++ b/js/MatrixOp/MATZCONJ.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/MatrixOp/MATZCONJ.sci" */
 function MATZCONJ() {
-MATZCONJ.prototype.get = function MATZCONJ() {
-}
-MATZCONJ.prototype.set = function MATZCONJ() {
-x=arg1;
-}
 MATZCONJ.prototype.define = function MATZCONJ() {
 model=scicos_model();
 function_name="matz_conj";
@@ -31,4 +26,9 @@ x=standard_define([2,2],model,label,gr_i);
 }
 MATZCONJ.prototype.details = function MATZCONJ() {
 }
+MATZCONJ.prototype.get = function MATZCONJ() {
+}
+MATZCONJ.prototype.set = function MATZCONJ() {
+x=arg1;
+}
 }
diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js
index 2d346af2..9734aa00 100644
--- a/js/MatrixOp/MATZREIM.js
+++ b/js/MatrixOp/MATZREIM.js
@@ -1,5 +1,31 @@
 /* autogenerated from "macros/MatrixOp/MATZREIM.sci" */
 function MATZREIM() {
+MATZREIM.prototype.define = function MATZREIM() {
+model=scicos_model();
+function_name="matz_reim";
+funtyp=4;
+model.sim=list(function_name,funtyp);
+model.in1=-1;
+model.in2=-2;
+model.intyp=2;
+model.out=[-1,-1];
+model.out2=[-2,-2];
+model.outtyp=[1,1];
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[];
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,false];
+label=sci2exp(1);
+gr_i=[];
+x=standard_define([3,2],model,label,gr_i);
+}
+MATZREIM.prototype.details = function MATZREIM() {
+}
 MATZREIM.prototype.get = function MATZREIM() {
 }
 MATZREIM.prototype.set = function MATZREIM() {
@@ -46,30 +72,4 @@ break
 }
 }
 }
-MATZREIM.prototype.define = function MATZREIM() {
-model=scicos_model();
-function_name="matz_reim";
-funtyp=4;
-model.sim=list(function_name,funtyp);
-model.in1=-1;
-model.in2=-2;
-model.intyp=2;
-model.out=[-1,-1];
-model.out2=[-2,-2];
-model.outtyp=[1,1];
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[];
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-label=sci2exp(1);
-gr_i=[];
-x=standard_define([3,2],model,label,gr_i);
-}
-MATZREIM.prototype.details = function MATZREIM() {
-}
 }
diff --git a/js/MatrixOp/RICC.js b/js/MatrixOp/RICC.js
index c8497b9a..56fc1a57 100644
--- a/js/MatrixOp/RICC.js
+++ b/js/MatrixOp/RICC.js
@@ -1,5 +1,31 @@
 /* autogenerated from "macros/MatrixOp/RICC.sci" */
 function RICC() {
+RICC.prototype.define = function RICC() {
+model=scicos_model();
+function_name="ricc_m";
+funtyp=4;
+model.sim=list(function_name,funtyp);
+model.in1=[-1,-1,-1];
+model.in2=[-1,-1,-1];
+model.intyp=[1,1,1];
+model.out=-1;
+model.out2=-1;
+model.outtyp=1;
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[1,1];
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,false];
+label=[sci2exp(1),sci2exp(1)];
+gr_i=[];
+x=standard_define([2,2],model,label,gr_i);
+}
+RICC.prototype.details = function RICC() {
+}
 RICC.prototype.get = function RICC() {
 }
 RICC.prototype.set = function RICC() {
@@ -31,30 +57,4 @@ break
 }
 }
 }
-RICC.prototype.define = function RICC() {
-model=scicos_model();
-function_name="ricc_m";
-funtyp=4;
-model.sim=list(function_name,funtyp);
-model.in1=[-1,-1,-1];
-model.in2=[-1,-1,-1];
-model.intyp=[1,1,1];
-model.out=-1;
-model.out2=-1;
-model.outtyp=1;
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[1,1];
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-label=[sci2exp(1),sci2exp(1)];
-gr_i=[];
-x=standard_define([2,2],model,label,gr_i);
-}
-RICC.prototype.details = function RICC() {
-}
 }
diff --git a/js/MatrixOp/ROOTCOEF.js b/js/MatrixOp/ROOTCOEF.js
index 94701457..b25a97f8 100644
--- a/js/MatrixOp/ROOTCOEF.js
+++ b/js/MatrixOp/ROOTCOEF.js
@@ -1,5 +1,31 @@
 /* autogenerated from "macros/MatrixOp/ROOTCOEF.sci" */
 function ROOTCOEF() {
+ROOTCOEF.prototype.define = function ROOTCOEF() {
+model=scicos_model();
+function_name="root_coef";
+funtyp=4;
+model.sim=list(function_name,funtyp);
+model.in1=-1;
+model.in2=1;
+model.intyp=1;
+model.out=-2;
+model.out2=1;
+model.outtyp=1;
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[];
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,false];
+label=[sci2exp(1),sci2exp(1)];
+gr_i=[];
+x=standard_define([3,2],model,label,gr_i);
+}
+ROOTCOEF.prototype.details = function ROOTCOEF() {
+}
 ROOTCOEF.prototype.get = function ROOTCOEF() {
 }
 ROOTCOEF.prototype.set = function ROOTCOEF() {
@@ -42,30 +68,4 @@ break
 }
 }
 }
-ROOTCOEF.prototype.define = function ROOTCOEF() {
-model=scicos_model();
-function_name="root_coef";
-funtyp=4;
-model.sim=list(function_name,funtyp);
-model.in1=-1;
-model.in2=1;
-model.intyp=1;
-model.out=-2;
-model.out2=1;
-model.outtyp=1;
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[];
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-label=[sci2exp(1),sci2exp(1)];
-gr_i=[];
-x=standard_define([3,2],model,label,gr_i);
-}
-ROOTCOEF.prototype.details = function ROOTCOEF() {
-}
 }
diff --git a/js/MatrixOp/SQRT.js b/js/MatrixOp/SQRT.js
index d5308162..d16311e6 100644
--- a/js/MatrixOp/SQRT.js
+++ b/js/MatrixOp/SQRT.js
@@ -1,5 +1,21 @@
 /* autogenerated from "macros/MatrixOp/SQRT.sci" */
 function SQRT() {
+SQRT.prototype.define = function SQRT() {
+model=scicos_model();
+model.sim=list("mat_sqrt",4);
+model.in1=-1;
+model.in2=-2;
+model.intyp=1;
+model.outtyp=1;
+model.out=-1;
+model.out2=-2;
+model.dep_ut=[true,false];
+label=[sci2exp(1)];
+gr_i=[];
+x=standard_define([2,2],model,label,gr_i);
+}
+SQRT.prototype.details = function SQRT() {
+}
 SQRT.prototype.get = function SQRT() {
 }
 SQRT.prototype.set = function SQRT() {
@@ -37,20 +53,4 @@ break
 }
 }
 }
-SQRT.prototype.define = function SQRT() {
-model=scicos_model();
-model.sim=list("mat_sqrt",4);
-model.in1=-1;
-model.in2=-2;
-model.intyp=1;
-model.outtyp=1;
-model.out=-1;
-model.out2=-2;
-model.dep_ut=[true,false];
-label=[sci2exp(1)];
-gr_i=[];
-x=standard_define([2,2],model,label,gr_i);
-}
-SQRT.prototype.details = function SQRT() {
-}
 }
diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js
index 76be0254..4c31f6cb 100644
--- a/js/MatrixOp/SUBMAT.js
+++ b/js/MatrixOp/SUBMAT.js
@@ -1,5 +1,31 @@
 /* autogenerated from "macros/MatrixOp/SUBMAT.sci" */
 function SUBMAT() {
+SUBMAT.prototype.define = function SUBMAT() {
+model=scicos_model();
+function_name="submat";
+funtyp=4;
+model.sim=list(function_name,funtyp);
+model.in1=-1;
+model.in2=-2;
+model.intyp=1;
+model.out=-1;
+model.out2=-2;
+model.outtyp=1;
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[1,1,1,1];
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,false];
+label=[sci2exp(1),sci2exp(1),sci2exp(1),sci2exp(1),sci2exp(1)];
+gr_i=[];
+x=standard_define([2.5,2],model,label,gr_i);
+}
+SUBMAT.prototype.details = function SUBMAT() {
+}
 SUBMAT.prototype.get = function SUBMAT() {
 }
 SUBMAT.prototype.set = function SUBMAT() {
@@ -63,30 +89,4 @@ break
 }
 }
 }
-SUBMAT.prototype.define = function SUBMAT() {
-model=scicos_model();
-function_name="submat";
-funtyp=4;
-model.sim=list(function_name,funtyp);
-model.in1=-1;
-model.in2=-2;
-model.intyp=1;
-model.out=-1;
-model.out2=-2;
-model.outtyp=1;
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[1,1,1,1];
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-label=[sci2exp(1),sci2exp(1),sci2exp(1),sci2exp(1),sci2exp(1)];
-gr_i=[];
-x=standard_define([2.5,2],model,label,gr_i);
-}
-SUBMAT.prototype.details = function SUBMAT() {
-}
 }
diff --git a/js/Misc/BACKLASH.js b/js/Misc/BACKLASH.js
index cc86f0e4..fe9aac19 100644
--- a/js/Misc/BACKLASH.js
+++ b/js/Misc/BACKLASH.js
@@ -1,5 +1,20 @@
 /* autogenerated from "macros/Misc/BACKLASH.sci" */
 function BACKLASH() {
+BACKLASH.prototype.define = function BACKLASH() {
+exprs=["0","1","1"];
+model=scicos_model();
+model.sim=list("backlash",4);
+model.in1=1;
+model.out=1;
+model.rpar=[0,1];
+model.nzcross=2;
+model.blocktype="c";
+model.dep_ut=[true,false];
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+BACKLASH.prototype.details = function BACKLASH() {
+}
 BACKLASH.prototype.get = function BACKLASH() {
 }
 BACKLASH.prototype.set = function BACKLASH() {
@@ -29,19 +44,4 @@ break
 }
 }
 }
-BACKLASH.prototype.define = function BACKLASH() {
-exprs=["0","1","1"];
-model=scicos_model();
-model.sim=list("backlash",4);
-model.in1=1;
-model.out=1;
-model.rpar=[0,1];
-model.nzcross=2;
-model.blocktype="c";
-model.dep_ut=[true,false];
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-BACKLASH.prototype.details = function BACKLASH() {
-}
 }
diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js
index 10d40f76..73eaf0ab 100644
--- a/js/Misc/BOUNCE.js
+++ b/js/Misc/BOUNCE.js
@@ -1,5 +1,44 @@
 /* autogenerated from "macros/Misc/BOUNCE.sci" */
 function BOUNCE() {
+BOUNCE.prototype.define = function BOUNCE() {
+n=2;
+k=1;
+ipar=[];
+for (i=1;i<=n;i+=1) {
+for (j=i+1;j<=n;j+=1) {
+ipar[k-1]=i;
+k=k+1;
+ipar[k-1]=j;
+k=k+1;
+}
+}
+walls=[0,5,0,5];
+x=[2,2.5];
+xd=[0,0];
+y=[3,5];
+yd=[0,0];
+g=9.81;
+C=0;
+rpar1=ones(n,1);
+rpar2=rpar1;
+state=[x,xd,y,yd];
+state=transpose(state);
+model=scicos_model();
+model.sim=list("bounce_ball",4);
+model.in1=[];
+model.out=[n,n];
+model.state=state.slice();
+model.rpar=[rpar1,rpar2,walls,g,C];
+model.ipar=ipar;
+model.nzcross=n*(n-1)/2+4*n;
+model.blocktype="c";
+model.dep_ut=[false,true];
+exprs=[strcat(sci2exp(rpar1)),strcat(sci2exp(rpar2)),strcat(sci2exp(walls)),strcat(sci2exp(x)),strcat(sci2exp(xd)),strcat(sci2exp(y)),strcat(sci2exp(yd))];
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+BOUNCE.prototype.details = function BOUNCE() {
+}
 BOUNCE.prototype.get = function BOUNCE() {
 }
 BOUNCE.prototype.set = function BOUNCE() {
@@ -65,43 +104,4 @@ break
 }
 }
 }
-BOUNCE.prototype.define = function BOUNCE() {
-n=2;
-k=1;
-ipar=[];
-for (i=1;i<=n;i+=1) {
-for (j=i+1;j<=n;j+=1) {
-ipar[k-1]=i;
-k=k+1;
-ipar[k-1]=j;
-k=k+1;
-}
-}
-walls=[0,5,0,5];
-x=[2,2.5];
-xd=[0,0];
-y=[3,5];
-yd=[0,0];
-g=9.81;
-C=0;
-rpar1=ones(n,1);
-rpar2=rpar1;
-state=[x,xd,y,yd];
-state=transpose(state);
-model=scicos_model();
-model.sim=list("bounce_ball",4);
-model.in1=[];
-model.out=[n,n];
-model.state=state.slice();
-model.rpar=[rpar1,rpar2,walls,g,C];
-model.ipar=ipar;
-model.nzcross=n*(n-1)/2+4*n;
-model.blocktype="c";
-model.dep_ut=[false,true];
-exprs=[strcat(sci2exp(rpar1)),strcat(sci2exp(rpar2)),strcat(sci2exp(walls)),strcat(sci2exp(x)),strcat(sci2exp(xd)),strcat(sci2exp(y)),strcat(sci2exp(yd))];
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-BOUNCE.prototype.details = function BOUNCE() {
-}
 }
diff --git a/js/Misc/BOUNCEXY.js b/js/Misc/BOUNCEXY.js
index eb75117d..c7564cca 100644
--- a/js/Misc/BOUNCEXY.js
+++ b/js/Misc/BOUNCEXY.js
@@ -1,5 +1,41 @@
 /* autogenerated from "macros/Misc/BOUNCEXY.sci" */
 function BOUNCEXY() {
+BOUNCEXY.prototype.define = function BOUNCEXY() {
+win=-1;
+imode=1;
+clrs=[1,2];
+siz=[1,1];
+xmin=-5;
+xmax=5;
+ymin=0;
+ymax=15;
+model=scicos_model();
+model.sim=list("bouncexy",4);
+model.in1=[-1,-1];
+model.in2=[1,1];
+model.intyp=[1,1];
+model.evtin=1;
+z=[];
+for (i=1;i<=size(clrs,"*");i+=1) {
+z[6*(i-1)+1-1]=0;
+z[6*(i-1)+2-1]=0;
+z[6*(i-1)+3-1]=2*siz(i);
+z[6*(i-1)+4-1]=2*siz(i);
+z[6*(i-1)+5-1]=0.000;
+z[6*(i-1)+6-1]=64.0*360.000;
+}
+model.dstate=z;
+model.rpar=[xmin,xmax,ymin,ymax];
+model.ipar=[win,imode,clrs.slice()];
+model.blocktype="d";
+model.firing=[];
+model.dep_ut=[false,false];
+exprs=[strcat(sci2exp(clrs)),strcat(sci2exp(siz)),strcat(sci2exp(win)),strcat(sci2exp(1)),strcat(sci2exp(xmin)),strcat(sci2exp(xmax)),strcat(sci2exp(ymin)),strcat(sci2exp(ymax))];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+BOUNCEXY.prototype.details = function BOUNCEXY() {
+}
 BOUNCEXY.prototype.get = function BOUNCEXY() {
 }
 BOUNCEXY.prototype.set = function BOUNCEXY() {
@@ -54,40 +90,4 @@ break
 }
 }
 }
-BOUNCEXY.prototype.define = function BOUNCEXY() {
-win=-1;
-imode=1;
-clrs=[1,2];
-siz=[1,1];
-xmin=-5;
-xmax=5;
-ymin=0;
-ymax=15;
-model=scicos_model();
-model.sim=list("bouncexy",4);
-model.in1=[-1,-1];
-model.in2=[1,1];
-model.intyp=[1,1];
-model.evtin=1;
-z=[];
-for (i=1;i<=size(clrs,"*");i+=1) {
-z[6*(i-1)+1-1]=0;
-z[6*(i-1)+2-1]=0;
-z[6*(i-1)+3-1]=2*siz(i);
-z[6*(i-1)+4-1]=2*siz(i);
-z[6*(i-1)+5-1]=0.000;
-z[6*(i-1)+6-1]=64.0*360.000;
-}
-model.dstate=z;
-model.rpar=[xmin,xmax,ymin,ymax];
-model.ipar=[win,imode,clrs.slice()];
-model.blocktype="d";
-model.firing=[];
-model.dep_ut=[false,false];
-exprs=[strcat(sci2exp(clrs)),strcat(sci2exp(siz)),strcat(sci2exp(win)),strcat(sci2exp(1)),strcat(sci2exp(xmin)),strcat(sci2exp(xmax)),strcat(sci2exp(ymin)),strcat(sci2exp(ymax))];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-BOUNCEXY.prototype.details = function BOUNCEXY() {
-}
 }
diff --git a/js/Misc/BPLATFORM.js b/js/Misc/BPLATFORM.js
index 5e23a15e..95d25191 100644
--- a/js/Misc/BPLATFORM.js
+++ b/js/Misc/BPLATFORM.js
@@ -1,5 +1,27 @@
 /* autogenerated from "macros/Misc/BPLATFORM.sci" */
 function BPLATFORM() {
+BPLATFORM.prototype.define = function BPLATFORM() {
+plen=2;
+csiz=2;
+phi=0;
+xmin=-5;
+xmax=5;
+ymin=0;
+ymax=15;
+model=scicos_model();
+model.sim=list("bplatform2",5);
+model.in1=[1,1];
+model.evtin=1;
+model.dstate=0;
+model.rpar=[plen,csiz,phi,xmin,xmax,ymin,ymax];
+model.blocktype="d";
+model.dep_ut=[false,false];
+exprs=string(model.rpar);
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+BPLATFORM.prototype.details = function BPLATFORM() {
+}
 BPLATFORM.prototype.get = function BPLATFORM() {
 }
 BPLATFORM.prototype.set = function BPLATFORM() {
@@ -38,26 +60,4 @@ break
 }
 }
 }
-BPLATFORM.prototype.define = function BPLATFORM() {
-plen=2;
-csiz=2;
-phi=0;
-xmin=-5;
-xmax=5;
-ymin=0;
-ymax=15;
-model=scicos_model();
-model.sim=list("bplatform2",5);
-model.in1=[1,1];
-model.evtin=1;
-model.dstate=0;
-model.rpar=[plen,csiz,phi,xmin,xmax,ymin,ymax];
-model.blocktype="d";
-model.dep_ut=[false,false];
-exprs=string(model.rpar);
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-BPLATFORM.prototype.details = function BPLATFORM() {
-}
 }
diff --git a/js/Misc/CBLOCK.js b/js/Misc/CBLOCK.js
index 6a56633e..1b37ce68 100644
--- a/js/Misc/CBLOCK.js
+++ b/js/Misc/CBLOCK.js
@@ -1,5 +1,38 @@
 /* autogenerated from "macros/Misc/CBLOCK.sci" */
 function CBLOCK() {
+CBLOCK.prototype.define = function CBLOCK() {
+in1=1;
+out=1;
+clkin=[];
+clkout=[];
+x0=[];
+z0=[];
+typ="c";
+auto=[];
+rpar=[];
+ipar=[];
+funam="toto";
+ng=0;
+model=scicos_model();
+model.sim=list(" ",2004);
+model.in1=in1;
+model.out=out;
+model.evtin=clkin;
+model.evtout=clkout;
+model.state=x0;
+model.dstate=z0;
+model.rpar=rpar;
+model.ipar=ipar;
+model.blocktype=typ;
+model.firing=auto;
+model.dep_ut=[true,false];
+model.nzcross=ng;
+label=list(transpose([funam,"n",sci2exp(in1),sci2exp(out),sci2exp(clkin),sci2exp(clkout),sci2exp(x0),sci2exp(0),sci2exp(z0),sci2exp(rpar),sci2exp(ipar),sci2exp(auto),"y","n"]),[]);
+gr_i=[];
+x=standard_define([4,2],model,label,gr_i);
+}
+CBLOCK.prototype.details = function CBLOCK() {
+}
 CBLOCK.prototype.get = function CBLOCK() {
 }
 CBLOCK.prototype.set = function CBLOCK() {
@@ -92,37 +125,4 @@ break
 }
 }
 }
-CBLOCK.prototype.define = function CBLOCK() {
-in1=1;
-out=1;
-clkin=[];
-clkout=[];
-x0=[];
-z0=[];
-typ="c";
-auto=[];
-rpar=[];
-ipar=[];
-funam="toto";
-ng=0;
-model=scicos_model();
-model.sim=list(" ",2004);
-model.in1=in1;
-model.out=out;
-model.evtin=clkin;
-model.evtout=clkout;
-model.state=x0;
-model.dstate=z0;
-model.rpar=rpar;
-model.ipar=ipar;
-model.blocktype=typ;
-model.firing=auto;
-model.dep_ut=[true,false];
-model.nzcross=ng;
-label=list(transpose([funam,"n",sci2exp(in1),sci2exp(out),sci2exp(clkin),sci2exp(clkout),sci2exp(x0),sci2exp(0),sci2exp(z0),sci2exp(rpar),sci2exp(ipar),sci2exp(auto),"y","n"]),[]);
-gr_i=[];
-x=standard_define([4,2],model,label,gr_i);
-}
-CBLOCK.prototype.details = function CBLOCK() {
-}
 }
diff --git a/js/Misc/CBLOCK4.js b/js/Misc/CBLOCK4.js
index 19dc040c..a17f3e18 100644
--- a/js/Misc/CBLOCK4.js
+++ b/js/Misc/CBLOCK4.js
@@ -1,5 +1,22 @@
 /* autogenerated from "macros/Misc/CBLOCK4.sci" */
 function CBLOCK4() {
+CBLOCK4.prototype.define = function CBLOCK4() {
+funam="toto";
+model=scicos_model();
+model.sim=list(" ",2004);
+model.in1=1;
+model.in2=1;
+model.intyp=1;
+model.out=1;
+model.out2=1;
+model.outtyp=1;
+model.dep_ut=[true,false];
+label=list([funam,"n",sci2exp([model.in1,model.in2]),sci2exp(model.intyp),sci2exp([model.out,model.out2]),sci2exp(model.outtyp),sci2exp(model.evtin),sci2exp(model.evtout),sci2exp(model.state),sci2exp(model.dstate),sci2exp(model.odstate),sci2exp(model.rpar),sci2exp(model.ipar),sci2exp(model.opar),sci2exp(model.nmode),sci2exp(model.nzcross),sci2exp(model.firing),"y","n"],[]);
+gr_i=[];
+x=standard_define([4,2],model,label,gr_i);
+}
+CBLOCK4.prototype.details = function CBLOCK4() {
+}
 CBLOCK4.prototype.get = function CBLOCK4() {
 }
 CBLOCK4.prototype.set = function CBLOCK4() {
@@ -90,21 +107,4 @@ break
 }
 }
 }
-CBLOCK4.prototype.define = function CBLOCK4() {
-funam="toto";
-model=scicos_model();
-model.sim=list(" ",2004);
-model.in1=1;
-model.in2=1;
-model.intyp=1;
-model.out=1;
-model.out2=1;
-model.outtyp=1;
-model.dep_ut=[true,false];
-label=list([funam,"n",sci2exp([model.in1,model.in2]),sci2exp(model.intyp),sci2exp([model.out,model.out2]),sci2exp(model.outtyp),sci2exp(model.evtin),sci2exp(model.evtout),sci2exp(model.state),sci2exp(model.dstate),sci2exp(model.odstate),sci2exp(model.rpar),sci2exp(model.ipar),sci2exp(model.opar),sci2exp(model.nmode),sci2exp(model.nzcross),sci2exp(model.firing),"y","n"],[]);
-gr_i=[];
-x=standard_define([4,2],model,label,gr_i);
-}
-CBLOCK4.prototype.details = function CBLOCK4() {
-}
 }
diff --git a/js/Misc/CONSTRAINT2_c.js b/js/Misc/CONSTRAINT2_c.js
index 1b46dd38..a01c102f 100644
--- a/js/Misc/CONSTRAINT2_c.js
+++ b/js/Misc/CONSTRAINT2_c.js
@@ -1,5 +1,23 @@
 /* autogenerated from "macros/Misc/CONSTRAINT2_c.sci" */
 function CONSTRAINT2_c() {
+CONSTRAINT2_c.prototype.define = function CONSTRAINT2_c() {
+x0=[0];
+xd0=[0];
+id=[0];
+model=scicos_model();
+model.sim=list("constraint_c",10004);
+model.in1=1;
+model.out=[1,1];
+model.state=[x0,xd0];
+model.ipar=id;
+model.blocktype="c";
+model.dep_ut=[false,true];
+exprs=list(strcat(sci2exp(x0)),strcat(sci2exp(xd0)),strcat(sci2exp(id)));
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+CONSTRAINT2_c.prototype.details = function CONSTRAINT2_c() {
+}
 CONSTRAINT2_c.prototype.get = function CONSTRAINT2_c() {
 }
 CONSTRAINT2_c.prototype.set = function CONSTRAINT2_c() {
@@ -51,22 +69,4 @@ break
 }
 }
 }
-CONSTRAINT2_c.prototype.define = function CONSTRAINT2_c() {
-x0=[0];
-xd0=[0];
-id=[0];
-model=scicos_model();
-model.sim=list("constraint_c",10004);
-model.in1=1;
-model.out=[1,1];
-model.state=[x0,xd0];
-model.ipar=id;
-model.blocktype="c";
-model.dep_ut=[false,true];
-exprs=list(strcat(sci2exp(x0)),strcat(sci2exp(xd0)),strcat(sci2exp(id)));
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-CONSTRAINT2_c.prototype.details = function CONSTRAINT2_c() {
-}
 }
diff --git a/js/Misc/CONSTRAINT_c.js b/js/Misc/CONSTRAINT_c.js
index 23580014..1b2d953c 100644
--- a/js/Misc/CONSTRAINT_c.js
+++ b/js/Misc/CONSTRAINT_c.js
@@ -1,5 +1,21 @@
 /* autogenerated from "macros/Misc/CONSTRAINT_c.sci" */
 function CONSTRAINT_c() {
+CONSTRAINT_c.prototype.define = function CONSTRAINT_c() {
+x0=[0,0];
+model=scicos_model();
+model.sim=list("constraint_c",10004);
+model.in1=1;
+model.out=1;
+model.ipar=0;
+model.state=x0;
+model.blocktype="c";
+model.dep_ut=[false,true];
+exprs="0";
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+CONSTRAINT_c.prototype.details = function CONSTRAINT_c() {
+}
 CONSTRAINT_c.prototype.get = function CONSTRAINT_c() {
 }
 CONSTRAINT_c.prototype.set = function CONSTRAINT_c() {
@@ -31,20 +47,4 @@ break
 }
 }
 }
-CONSTRAINT_c.prototype.define = function CONSTRAINT_c() {
-x0=[0,0];
-model=scicos_model();
-model.sim=list("constraint_c",10004);
-model.in1=1;
-model.out=1;
-model.ipar=0;
-model.state=x0;
-model.blocktype="c";
-model.dep_ut=[false,true];
-exprs="0";
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-CONSTRAINT_c.prototype.details = function CONSTRAINT_c() {
-}
 }
diff --git a/js/Misc/DEADBAND.js b/js/Misc/DEADBAND.js
index 9b68f603..ee23b752 100644
--- a/js/Misc/DEADBAND.js
+++ b/js/Misc/DEADBAND.js
@@ -1,5 +1,24 @@
 /* autogenerated from "macros/Misc/DEADBAND.sci" */
 function DEADBAND() {
+DEADBAND.prototype.define = function DEADBAND() {
+minp=-.5;
+maxp=.5;
+rpar=[maxp,minp];
+model=scicos_model();
+model.sim=list("deadband",4);
+model.in1=1;
+model.nzcross=2;
+model.nmode=1;
+model.out=1;
+model.rpar=rpar;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[string(maxp),string(minp),string(model.nmode)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+DEADBAND.prototype.details = function DEADBAND() {
+}
 DEADBAND.prototype.get = function DEADBAND() {
 }
 DEADBAND.prototype.set = function DEADBAND() {
@@ -31,23 +50,4 @@ break
 }
 }
 }
-DEADBAND.prototype.define = function DEADBAND() {
-minp=-.5;
-maxp=.5;
-rpar=[maxp,minp];
-model=scicos_model();
-model.sim=list("deadband",4);
-model.in1=1;
-model.nzcross=2;
-model.nmode=1;
-model.out=1;
-model.rpar=rpar;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[string(maxp),string(minp),string(model.nmode)];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-DEADBAND.prototype.details = function DEADBAND() {
-}
 }
diff --git a/js/Misc/DEBUG.js b/js/Misc/DEBUG.js
index 98e7e2e2..5e84861b 100644
--- a/js/Misc/DEBUG.js
+++ b/js/Misc/DEBUG.js
@@ -1,5 +1,15 @@
 /* autogenerated from "macros/Misc/DEBUG.sci" */
 function DEBUG() {
+DEBUG.prototype.define = function DEBUG() {
+model=scicos_model();
+model.sim=list("%debug_scicos",99);
+model.blocktype="d";
+exprs=list("","xcos_debug_gui(flag,block);");
+gr_i=[];
+x=standard_define([8,2],model,exprs,gr_i);
+}
+DEBUG.prototype.details = function DEBUG() {
+}
 DEBUG.prototype.get = function DEBUG() {
 }
 DEBUG.prototype.set = function DEBUG() {
@@ -35,14 +45,4 @@ graphics.exprs=exprs;
 x.graphics=graphics;
 }
 }
-DEBUG.prototype.define = function DEBUG() {
-model=scicos_model();
-model.sim=list("%debug_scicos",99);
-model.blocktype="d";
-exprs=list("","xcos_debug_gui(flag,block);");
-gr_i=[];
-x=standard_define([8,2],model,exprs,gr_i);
-}
-DEBUG.prototype.details = function DEBUG() {
-}
 }
diff --git a/js/Misc/DEBUG_SCICOS.js b/js/Misc/DEBUG_SCICOS.js
index 6222caba..201b2e74 100644
--- a/js/Misc/DEBUG_SCICOS.js
+++ b/js/Misc/DEBUG_SCICOS.js
@@ -1,14 +1,14 @@
 /* autogenerated from "macros/Misc/DEBUG_SCICOS.sci" */
 function DEBUG_SCICOS() {
+DEBUG_SCICOS.prototype.define = function DEBUG_SCICOS() {
+x=DEBUG("define");
+}
+DEBUG_SCICOS.prototype.details = function DEBUG_SCICOS() {
+}
 DEBUG_SCICOS.prototype.get = function DEBUG_SCICOS() {
 }
 DEBUG_SCICOS.prototype.set = function DEBUG_SCICOS() {
 arg1.gui="DEBUG";
 [x,y,typ]=DEBUG("set",arg1);
 }
-DEBUG_SCICOS.prototype.define = function DEBUG_SCICOS() {
-x=DEBUG("define");
-}
-DEBUG_SCICOS.prototype.details = function DEBUG_SCICOS() {
-}
 }
diff --git a/js/Misc/DIFF_f.js b/js/Misc/DIFF_f.js
index 796b3fa3..e83d63f9 100644
--- a/js/Misc/DIFF_f.js
+++ b/js/Misc/DIFF_f.js
@@ -1,5 +1,20 @@
 /* autogenerated from "macros/Misc/DIFF_f.sci" */
 function DIFF_f() {
+DIFF_f.prototype.define = function DIFF_f() {
+x0=[0,0];
+model=scicos_model();
+model.sim=list("diffblk",10001);
+model.in1=1;
+model.out=1;
+model.state=x0;
+model.blocktype="c";
+model.dep_ut=[false,true];
+exprs=[strcat(sci2exp(x0[1-1])),strcat(sci2exp(x0[2-1]))];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+DIFF_f.prototype.details = function DIFF_f() {
+}
 DIFF_f.prototype.get = function DIFF_f() {
 }
 DIFF_f.prototype.set = function DIFF_f() {
@@ -20,19 +35,4 @@ break
 }
 x.model.firing=[];
 }
-DIFF_f.prototype.define = function DIFF_f() {
-x0=[0,0];
-model=scicos_model();
-model.sim=list("diffblk",10001);
-model.in1=1;
-model.out=1;
-model.state=x0;
-model.blocktype="c";
-model.dep_ut=[false,true];
-exprs=[strcat(sci2exp(x0[1-1])),strcat(sci2exp(x0[2-1]))];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-DIFF_f.prototype.details = function DIFF_f() {
-}
 }
diff --git a/js/Misc/EDGETRIGGER.js b/js/Misc/EDGETRIGGER.js
index 223e53aa..49715350 100644
--- a/js/Misc/EDGETRIGGER.js
+++ b/js/Misc/EDGETRIGGER.js
@@ -1,5 +1,22 @@
 /* autogenerated from "macros/Misc/EDGETRIGGER.sci" */
 function EDGETRIGGER() {
+EDGETRIGGER.prototype.define = function EDGETRIGGER() {
+edge=1;
+model=scicos_model();
+model.sim=list("edgetrig",4);
+model.in1=1;
+model.out=1;
+model.dstate=0;
+model.nzcross=1;
+model.ipar=sign(edge);
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[string(edge)];
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+EDGETRIGGER.prototype.details = function EDGETRIGGER() {
+}
 EDGETRIGGER.prototype.get = function EDGETRIGGER() {
 }
 EDGETRIGGER.prototype.set = function EDGETRIGGER() {
@@ -19,21 +36,4 @@ x.model=model;
 break
 }
 }
-EDGETRIGGER.prototype.define = function EDGETRIGGER() {
-edge=1;
-model=scicos_model();
-model.sim=list("edgetrig",4);
-model.in1=1;
-model.out=1;
-model.dstate=0;
-model.nzcross=1;
-model.ipar=sign(edge);
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[string(edge)];
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-EDGETRIGGER.prototype.details = function EDGETRIGGER() {
-}
 }
diff --git a/js/Misc/ENDBLK.js b/js/Misc/ENDBLK.js
index 550739a2..aad616ec 100644
--- a/js/Misc/ENDBLK.js
+++ b/js/Misc/ENDBLK.js
@@ -1,5 +1,15 @@
 /* autogenerated from "macros/Misc/ENDBLK.sci" */
 function ENDBLK() {
+ENDBLK.prototype.define = function ENDBLK() {
+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,0,7,1.4],Title="ENDBLK",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="END_c",graphics=scicos_graphics(orig=[272.104,249.11733],sz=[40,40],flip=true,theta=0,exprs="1.000E+08",pin=[],pout=[],pein=2,peout=2,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim=list("scicosexit",4),in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=1.000e+08,dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m_1.objs[2-1]=scicos_link(xx=[292.104,292.104,261.83733,261.83733,292.104,292.104],yy=[243.40305,234.45067,234.45067,305.584,305.584,294.83162],id="drawlink",thick=[0,0],ct=[5,-1],from=[1,1,0],to=[1,1,1]);
+model=scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=[],out2=[],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([2,2],model,[],gr_i);
+}
+ENDBLK.prototype.details = function ENDBLK() {
+}
 ENDBLK.prototype.get = function ENDBLK() {
 }
 ENDBLK.prototype.set = function ENDBLK() {
@@ -71,14 +81,4 @@ y=max(y,needcompile);
 x=arg1;
 typ=newpar;
 }
-ENDBLK.prototype.define = function ENDBLK() {
-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,0,7,1.4],Title="ENDBLK",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="END_c",graphics=scicos_graphics(orig=[272.104,249.11733],sz=[40,40],flip=true,theta=0,exprs="1.000E+08",pin=[],pout=[],pein=2,peout=2,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim=list("scicosexit",4),in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=1.000e+08,dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m_1.objs[2-1]=scicos_link(xx=[292.104,292.104,261.83733,261.83733,292.104,292.104],yy=[243.40305,234.45067,234.45067,305.584,305.584,294.83162],id="drawlink",thick=[0,0],ct=[5,-1],from=[1,1,0],to=[1,1,1]);
-model=scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=[],out2=[],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([2,2],model,[],gr_i);
-}
-ENDBLK.prototype.details = function ENDBLK() {
-}
 }
diff --git a/js/Misc/HYSTHERESIS.js b/js/Misc/HYSTHERESIS.js
index 140c8f6e..6965253e 100644
--- a/js/Misc/HYSTHERESIS.js
+++ b/js/Misc/HYSTHERESIS.js
@@ -1,5 +1,25 @@
 /* autogenerated from "macros/Misc/HYSTHERESIS.sci" */
 function HYSTHERESIS() {
+HYSTHERESIS.prototype.define = function HYSTHERESIS() {
+in1=1;
+ipar=[0];
+nzz=2;
+rpar=[1,0,1,0];
+model=scicos_model();
+model.sim=list("hystheresis",4);
+model.in1=in1;
+model.out=1;
+model.rpar=rpar;
+model.nzcross=nzz;
+model.nmode=1;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[string(rpar),string(sign(nzz))];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+HYSTHERESIS.prototype.details = function HYSTHERESIS() {
+}
 HYSTHERESIS.prototype.get = function HYSTHERESIS() {
 }
 HYSTHERESIS.prototype.set = function HYSTHERESIS() {
@@ -27,24 +47,4 @@ break
 }
 }
 }
-HYSTHERESIS.prototype.define = function HYSTHERESIS() {
-in1=1;
-ipar=[0];
-nzz=2;
-rpar=[1,0,1,0];
-model=scicos_model();
-model.sim=list("hystheresis",4);
-model.in1=in1;
-model.out=1;
-model.rpar=rpar;
-model.nzcross=nzz;
-model.nmode=1;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[string(rpar),string(sign(nzz))];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-HYSTHERESIS.prototype.details = function HYSTHERESIS() {
-}
 }
diff --git a/js/Misc/IMPSPLIT_f.js b/js/Misc/IMPSPLIT_f.js
index d2be3dd2..0fe9b46a 100644
--- a/js/Misc/IMPSPLIT_f.js
+++ b/js/Misc/IMPSPLIT_f.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/Misc/IMPSPLIT_f.sci" */
 function IMPSPLIT_f() {
-IMPSPLIT_f.prototype.get = function IMPSPLIT_f() {
-}
-IMPSPLIT_f.prototype.set = function IMPSPLIT_f() {
-x=arg1;
-}
 IMPSPLIT_f.prototype.define = function IMPSPLIT_f() {
 model=scicos_model();
 model.sim="limpsplit";
@@ -21,4 +16,9 @@ x.graphics.out_implicit=["I","I"];
 }
 IMPSPLIT_f.prototype.details = function IMPSPLIT_f() {
 }
+IMPSPLIT_f.prototype.get = function IMPSPLIT_f() {
+}
+IMPSPLIT_f.prototype.set = function IMPSPLIT_f() {
+x=arg1;
+}
 }
diff --git a/js/Misc/LOGICAL_OP.js b/js/Misc/LOGICAL_OP.js
index 86829951..ea8e5ccd 100644
--- a/js/Misc/LOGICAL_OP.js
+++ b/js/Misc/LOGICAL_OP.js
@@ -1,5 +1,22 @@
 /* autogenerated from "macros/Misc/LOGICAL_OP.sci" */
 function LOGICAL_OP() {
+LOGICAL_OP.prototype.define = function LOGICAL_OP() {
+in1=[-1,-1];
+ipar=[0];
+nin=2;
+model=scicos_model();
+model.sim=list("logicalop",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,2],model,exprs,gr_i);
+}
+LOGICAL_OP.prototype.details = function LOGICAL_OP() {
+}
 LOGICAL_OP.prototype.get = function LOGICAL_OP() {
 }
 LOGICAL_OP.prototype.set = function LOGICAL_OP() {
@@ -92,21 +109,4 @@ break
 }
 }
 }
-LOGICAL_OP.prototype.define = function LOGICAL_OP() {
-in1=[-1,-1];
-ipar=[0];
-nin=2;
-model=scicos_model();
-model.sim=list("logicalop",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,2],model,exprs,gr_i);
-}
-LOGICAL_OP.prototype.details = function LOGICAL_OP() {
-}
 }
diff --git a/js/Misc/MEMORY_f.js b/js/Misc/MEMORY_f.js
index dffdebb9..eaae0695 100644
--- a/js/Misc/MEMORY_f.js
+++ b/js/Misc/MEMORY_f.js
@@ -1,5 +1,23 @@
 /* autogenerated from "macros/Misc/MEMORY_f.sci" */
 function MEMORY_f() {
+MEMORY_f.prototype.define = function MEMORY_f() {
+z=0;
+in1=1;
+exprs=[string(z),string(1)];
+model=scicos_model();
+model.sim="memo";
+model.in1=in1;
+model.out=in1;
+model.evtin=1;
+model.dstate=0;
+model.rpar=z;
+model.blocktype="m";
+model.dep_ut=[false,false];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+MEMORY_f.prototype.details = function MEMORY_f() {
+}
 MEMORY_f.prototype.get = function MEMORY_f() {
 }
 MEMORY_f.prototype.set = function MEMORY_f() {
@@ -35,22 +53,4 @@ break
 }
 }
 }
-MEMORY_f.prototype.define = function MEMORY_f() {
-z=0;
-in1=1;
-exprs=[string(z),string(1)];
-model=scicos_model();
-model.sim="memo";
-model.in1=in1;
-model.out=in1;
-model.evtin=1;
-model.dstate=0;
-model.rpar=z;
-model.blocktype="m";
-model.dep_ut=[false,false];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-MEMORY_f.prototype.details = function MEMORY_f() {
-}
 }
diff --git a/js/Misc/PENDULUM_ANIM.js b/js/Misc/PENDULUM_ANIM.js
index 88c623fe..0c426fa7 100644
--- a/js/Misc/PENDULUM_ANIM.js
+++ b/js/Misc/PENDULUM_ANIM.js
@@ -1,5 +1,27 @@
 /* autogenerated from "macros/Misc/PENDULUM_ANIM.sci" */
 function PENDULUM_ANIM() {
+PENDULUM_ANIM.prototype.define = function PENDULUM_ANIM() {
+plen=2;
+csiz=2;
+phi=0;
+xmin=-5;
+xmax=5;
+ymin=-5;
+ymax=5;
+model=scicos_model();
+model.sim=list("anim_pen",5);
+model.in1=[1,1];
+model.evtin=1;
+model.dstate=0;
+model.rpar=[plen,csiz,phi,xmin,xmax,ymin,ymax];
+model.blocktype="d";
+model.dep_ut=[false,false];
+exprs=string(model.rpar);
+gr_i=[];
+x=standard_define([3,3],model,exprs,gr_i);
+}
+PENDULUM_ANIM.prototype.details = function PENDULUM_ANIM() {
+}
 PENDULUM_ANIM.prototype.get = function PENDULUM_ANIM() {
 }
 PENDULUM_ANIM.prototype.set = function PENDULUM_ANIM() {
@@ -38,26 +60,4 @@ break
 }
 }
 }
-PENDULUM_ANIM.prototype.define = function PENDULUM_ANIM() {
-plen=2;
-csiz=2;
-phi=0;
-xmin=-5;
-xmax=5;
-ymin=-5;
-ymax=5;
-model=scicos_model();
-model.sim=list("anim_pen",5);
-model.in1=[1,1];
-model.evtin=1;
-model.dstate=0;
-model.rpar=[plen,csiz,phi,xmin,xmax,ymin,ymax];
-model.blocktype="d";
-model.dep_ut=[false,false];
-exprs=string(model.rpar);
-gr_i=[];
-x=standard_define([3,3],model,exprs,gr_i);
-}
-PENDULUM_ANIM.prototype.details = function PENDULUM_ANIM() {
-}
 }
diff --git a/js/Misc/RATELIMITER.js b/js/Misc/RATELIMITER.js
index c515e370..8e9ac55e 100644
--- a/js/Misc/RATELIMITER.js
+++ b/js/Misc/RATELIMITER.js
@@ -1,5 +1,22 @@
 /* autogenerated from "macros/Misc/RATELIMITER.sci" */
 function RATELIMITER() {
+RATELIMITER.prototype.define = function RATELIMITER() {
+minp=-1;
+maxp=1;
+rpar=[maxp,minp];
+model=scicos_model();
+model.sim=list("ratelimiter",4);
+model.in1=1;
+model.out=1;
+model.rpar=rpar;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[string(maxp),string(minp)];
+gr_i=[];
+x=standard_define([3.5,2],model,exprs,gr_i);
+}
+RATELIMITER.prototype.details = function RATELIMITER() {
+}
 RATELIMITER.prototype.get = function RATELIMITER() {
 }
 RATELIMITER.prototype.set = function RATELIMITER() {
@@ -24,21 +41,4 @@ break
 }
 }
 }
-RATELIMITER.prototype.define = function RATELIMITER() {
-minp=-1;
-maxp=1;
-rpar=[maxp,minp];
-model=scicos_model();
-model.sim=list("ratelimiter",4);
-model.in1=1;
-model.out=1;
-model.rpar=rpar;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[string(maxp),string(minp)];
-gr_i=[];
-x=standard_define([3.5,2],model,exprs,gr_i);
-}
-RATELIMITER.prototype.details = function RATELIMITER() {
-}
 }
diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js
index 596fe660..4713a36e 100644
--- a/js/Misc/RELATIONALOP.js
+++ b/js/Misc/RELATIONALOP.js
@@ -1,5 +1,22 @@
 /* autogenerated from "macros/Misc/RELATIONALOP.sci" */
 function RELATIONALOP() {
+RELATIONALOP.prototype.define = function RELATIONALOP() {
+ipar=[2];
+label="&lt";
+model=scicos_model();
+model.sim=list("relationalop",4);
+model.in1=[1,1];
+model.out=1;
+model.ipar=ipar;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[string(ipar),string(0)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+x.graphics.style=["fontSize=13;fontStyle=1;displayedLabel="+label];
+}
+RELATIONALOP.prototype.details = function RELATIONALOP() {
+}
 RELATIONALOP.prototype.get = function RELATIONALOP() {
 }
 RELATIONALOP.prototype.set = function RELATIONALOP() {
@@ -73,21 +90,4 @@ break
 }
 }
 }
-RELATIONALOP.prototype.define = function RELATIONALOP() {
-ipar=[2];
-label="&lt";
-model=scicos_model();
-model.sim=list("relationalop",4);
-model.in1=[1,1];
-model.out=1;
-model.ipar=ipar;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[string(ipar),string(0)];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-x.graphics.style=["fontSize=13;fontStyle=1;displayedLabel="+label];
-}
-RELATIONALOP.prototype.details = function RELATIONALOP() {
-}
 }
diff --git a/js/Misc/SPLIT_f.js b/js/Misc/SPLIT_f.js
index adc0bf19..d84b7edb 100644
--- a/js/Misc/SPLIT_f.js
+++ b/js/Misc/SPLIT_f.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/Misc/SPLIT_f.sci" */
 function SPLIT_f() {
-SPLIT_f.prototype.get = function SPLIT_f() {
-}
-SPLIT_f.prototype.set = function SPLIT_f() {
-x=arg1;
-}
 SPLIT_f.prototype.define = function SPLIT_f() {
 model=scicos_model();
 model.sim="lsplit";
@@ -16,4 +11,9 @@ x=standard_define([1,1]/3,model,[],[]);
 }
 SPLIT_f.prototype.details = function SPLIT_f() {
 }
+SPLIT_f.prototype.get = function SPLIT_f() {
+}
+SPLIT_f.prototype.set = function SPLIT_f() {
+x=arg1;
+}
 }
diff --git a/js/Misc/SUPER_f.js b/js/Misc/SUPER_f.js
index 7ae3e3b7..35d9c0c8 100644
--- a/js/Misc/SUPER_f.js
+++ b/js/Misc/SUPER_f.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/Misc/SUPER_f.sci" */
 function SUPER_f() {
-SUPER_f.prototype.get = function SUPER_f() {
-}
-SUPER_f.prototype.set = function SUPER_f() {
-xcos(arg1.model.rpar);
-}
 SUPER_f.prototype.define = function SUPER_f() {
 scs=scicos_diagram();
 scs.props.title="Super Block";
@@ -28,4 +23,9 @@ x=standard_define([2,2],model,[],gr_i);
 }
 SUPER_f.prototype.details = function SUPER_f() {
 }
+SUPER_f.prototype.get = function SUPER_f() {
+}
+SUPER_f.prototype.set = function SUPER_f() {
+xcos(arg1.model.rpar);
+}
 }
diff --git a/js/Misc/TEXT_f.js b/js/Misc/TEXT_f.js
index cb8f9ed0..8307b47d 100644
--- a/js/Misc/TEXT_f.js
+++ b/js/Misc/TEXT_f.js
@@ -1,5 +1,21 @@
 /* autogenerated from "macros/Misc/TEXT_f.sci" */
 function TEXT_f() {
+TEXT_f.prototype.define = function TEXT_f() {
+font=2;
+siz=1;
+model=scicos_model();
+model.sim="text";
+model.rpar="Text";
+model.ipar=[font,siz];
+exprs=["Text",string(font),string(siz)];
+graphics=scicos_graphics();
+graphics.orig=[0,0];
+graphics.sz=[2,1];
+graphics.exprs=exprs;
+x=mlist(["Text","graphics","model","void","gui"],graphics,model," ","TEXT_f");
+}
+TEXT_f.prototype.details = function TEXT_f() {
+}
 TEXT_f.prototype.get = function TEXT_f() {
 }
 TEXT_f.prototype.set = function TEXT_f() {
@@ -47,20 +63,4 @@ break
 }
 }
 }
-TEXT_f.prototype.define = function TEXT_f() {
-font=2;
-siz=1;
-model=scicos_model();
-model.sim="text";
-model.rpar="Text";
-model.ipar=[font,siz];
-exprs=["Text",string(font),string(siz)];
-graphics=scicos_graphics();
-graphics.orig=[0,0];
-graphics.sz=[2,1];
-graphics.exprs=exprs;
-x=mlist(["Text","graphics","model","void","gui"],graphics,model," ","TEXT_f");
-}
-TEXT_f.prototype.details = function TEXT_f() {
-}
 }
diff --git a/js/Misc/c_block.js b/js/Misc/c_block.js
index f43cf4e7..6ef0bb71 100644
--- a/js/Misc/c_block.js
+++ b/js/Misc/c_block.js
@@ -1,5 +1,35 @@
 /* autogenerated from "macros/Misc/c_block.sci" */
 function c_block() {
+c_block.prototype.define = function c_block() {
+in1=1;
+out=1;
+clkin=[];
+clkout=[];
+x0=[];
+z0=[];
+typ="c";
+auto=[];
+rpar=[];
+funam="toto";
+model=scicos_model();
+model.sim=list(" ",2001);
+model.in1=in1;
+model.out=out;
+model.evtin=clkin;
+model.evtout=clkout;
+model.state=x0;
+model.dstate=z0;
+model.rpar=rpar;
+model.ipar=0;
+model.blocktype=typ;
+model.firing=auto;
+model.dep_ut=[true,false];
+label=list([sci2exp(in1),sci2exp(out),strcat(sci2exp(rpar)),funam],list([]));
+gr_i=[];
+x=standard_define([3,2],model,label,gr_i);
+}
+c_block.prototype.details = function c_block() {
+}
 c_block.prototype.get = function c_block() {
 }
 c_block.prototype.set = function c_block() {
@@ -41,34 +71,4 @@ break
 }
 }
 }
-c_block.prototype.define = function c_block() {
-in1=1;
-out=1;
-clkin=[];
-clkout=[];
-x0=[];
-z0=[];
-typ="c";
-auto=[];
-rpar=[];
-funam="toto";
-model=scicos_model();
-model.sim=list(" ",2001);
-model.in1=in1;
-model.out=out;
-model.evtin=clkin;
-model.evtout=clkout;
-model.state=x0;
-model.dstate=z0;
-model.rpar=rpar;
-model.ipar=0;
-model.blocktype=typ;
-model.firing=auto;
-model.dep_ut=[true,false];
-label=list([sci2exp(in1),sci2exp(out),strcat(sci2exp(rpar)),funam],list([]));
-gr_i=[];
-x=standard_define([3,2],model,label,gr_i);
-}
-c_block.prototype.details = function c_block() {
-}
 }
diff --git a/js/Misc/fortran_block.js b/js/Misc/fortran_block.js
index 0343cfff..ab5bc64c 100644
--- a/js/Misc/fortran_block.js
+++ b/js/Misc/fortran_block.js
@@ -1,5 +1,26 @@
 /* autogenerated from "macros/Misc/fortran_block.sci" */
 function fortran_block() {
+fortran_block.prototype.define = function fortran_block() {
+model=scicos_model();
+model.sim=list(" ",1001);
+model.in1=1;
+model.out=1;
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=0;
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,false];
+funam="forty";
+label=list([sci2exp(model.in1),sci2exp(model.out),strcat(sci2exp(model.rpar)),funam],list([]));
+gr_i=[];
+x=standard_define([4,2],model,label,gr_i);
+}
+fortran_block.prototype.details = function fortran_block() {
+}
 fortran_block.prototype.get = function fortran_block() {
 }
 fortran_block.prototype.set = function fortran_block() {
@@ -41,25 +62,4 @@ break
 }
 }
 }
-fortran_block.prototype.define = function fortran_block() {
-model=scicos_model();
-model.sim=list(" ",1001);
-model.in1=1;
-model.out=1;
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=0;
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-funam="forty";
-label=list([sci2exp(model.in1),sci2exp(model.out),strcat(sci2exp(model.rpar)),funam],list([]));
-gr_i=[];
-x=standard_define([4,2],model,label,gr_i);
-}
-fortran_block.prototype.details = function fortran_block() {
-}
 }
diff --git a/js/Misc/func_block.js b/js/Misc/func_block.js
index ba6b62aa..147b231c 100644
--- a/js/Misc/func_block.js
+++ b/js/Misc/func_block.js
@@ -1,5 +1,18 @@
 /* autogenerated from "macros/Misc/func_block.sci" */
 function func_block() {
+func_block.prototype.define = function func_block() {
+model=scicos_model();
+model.sim=" ";
+model.in1=1;
+model.out=1;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs="v=sin(u);y=u*v";
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+func_block.prototype.details = function func_block() {
+}
 func_block.prototype.get = function func_block() {
 }
 func_block.prototype.set = function func_block() {
@@ -16,17 +29,4 @@ x.model=model;
 x.graphics=graphics;
 }
 }
-func_block.prototype.define = function func_block() {
-model=scicos_model();
-model.sim=" ";
-model.in1=1;
-model.out=1;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs="v=sin(u);y=u*v";
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-func_block.prototype.details = function func_block() {
-}
 }
diff --git a/js/Misc/generic_block.js b/js/Misc/generic_block.js
index 3d58f215..5b420771 100644
--- a/js/Misc/generic_block.js
+++ b/js/Misc/generic_block.js
@@ -1,5 +1,27 @@
 /* autogenerated from "macros/Misc/generic_block.sci" */
 function generic_block() {
+generic_block.prototype.define = function generic_block() {
+model=scicos_model();
+function_name="sinblk";
+funtyp=1;
+model.sim=list(function_name,funtyp);
+model.in1=1;
+model.out=1;
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[];
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,false];
+label=[function_name,sci2exp(funtyp),sci2exp(model.in1),sci2exp(model.out),sci2exp(model.evtin),sci2exp(model.evtout),sci2exp(model.state),sci2exp(model.dstate),sci2exp(model.rpar),sci2exp(model.ipar),sci2exp(model.firing),"y","n"];
+gr_i=[];
+x=standard_define([2,2],model,label,gr_i);
+}
+generic_block.prototype.details = function generic_block() {
+}
 generic_block.prototype.get = function generic_block() {
 }
 generic_block.prototype.set = function generic_block() {
@@ -72,26 +94,4 @@ break
 }
 needcompile=resume(needcompile)
 }
-generic_block.prototype.define = function generic_block() {
-model=scicos_model();
-function_name="sinblk";
-funtyp=1;
-model.sim=list(function_name,funtyp);
-model.in1=1;
-model.out=1;
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[];
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-label=[function_name,sci2exp(funtyp),sci2exp(model.in1),sci2exp(model.out),sci2exp(model.evtin),sci2exp(model.evtout),sci2exp(model.state),sci2exp(model.dstate),sci2exp(model.rpar),sci2exp(model.ipar),sci2exp(model.firing),"y","n"];
-gr_i=[];
-x=standard_define([2,2],model,label,gr_i);
-}
-generic_block.prototype.details = function generic_block() {
-}
 }
diff --git a/js/Misc/generic_block2.js b/js/Misc/generic_block2.js
index 56220a66..9d67e1cc 100644
--- a/js/Misc/generic_block2.js
+++ b/js/Misc/generic_block2.js
@@ -1,5 +1,27 @@
 /* autogenerated from "macros/Misc/generic_block2.sci" */
 function generic_block2() {
+generic_block2.prototype.define = function generic_block2() {
+model=scicos_model();
+function_name="sinblk";
+funtyp=1;
+model.sim=list(function_name,funtyp);
+model.in1=1;
+model.out=1;
+model.evtin=[];
+model.evtout=[];
+model.state=[];
+model.dstate=[];
+model.rpar=[];
+model.ipar=[];
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,false];
+label=[function_name,sci2exp(funtyp),sci2exp(model.in1),sci2exp(model.out),sci2exp(model.evtin),sci2exp(model.evtout),sci2exp(model.state),sci2exp(model.dstate),sci2exp(model.rpar),sci2exp(model.ipar),sci2exp(model.nmode),sci2exp(model.nzcross),sci2exp(model.firing),"y","n"];
+gr_i=[];
+x=standard_define([2,2],model,label,gr_i);
+}
+generic_block2.prototype.details = function generic_block2() {
+}
 generic_block2.prototype.get = function generic_block2() {
 }
 generic_block2.prototype.set = function generic_block2() {
@@ -74,26 +96,4 @@ break
 }
 needcompile=resume(needcompile)
 }
-generic_block2.prototype.define = function generic_block2() {
-model=scicos_model();
-function_name="sinblk";
-funtyp=1;
-model.sim=list(function_name,funtyp);
-model.in1=1;
-model.out=1;
-model.evtin=[];
-model.evtout=[];
-model.state=[];
-model.dstate=[];
-model.rpar=[];
-model.ipar=[];
-model.blocktype="c";
-model.firing=[];
-model.dep_ut=[true,false];
-label=[function_name,sci2exp(funtyp),sci2exp(model.in1),sci2exp(model.out),sci2exp(model.evtin),sci2exp(model.evtout),sci2exp(model.state),sci2exp(model.dstate),sci2exp(model.rpar),sci2exp(model.ipar),sci2exp(model.nmode),sci2exp(model.nzcross),sci2exp(model.firing),"y","n"];
-gr_i=[];
-x=standard_define([2,2],model,label,gr_i);
-}
-generic_block2.prototype.details = function generic_block2() {
-}
 }
diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js
index 7d71fb21..2a2b71dd 100644
--- a/js/Misc/generic_block3.js
+++ b/js/Misc/generic_block3.js
@@ -1,5 +1,23 @@
 /* autogenerated from "macros/Misc/generic_block3.sci" */
 function generic_block3() {
+generic_block3.prototype.define = function generic_block3() {
+model=scicos_model();
+function_name="sinblk";
+funtyp=4;
+model.sim=list(function_name,funtyp);
+model.in1=1;
+model.in2=1;
+model.intyp=1;
+model.out=1;
+model.out2=1;
+model.outtyp=1;
+model.dep_ut=[true,false];
+label=[function_name,sci2exp(funtyp),sci2exp([model.in1,model.in2]),sci2exp(model.intyp),sci2exp([model.out,model.out2]),sci2exp(model.outtyp),sci2exp(model.evtin),sci2exp(model.evtout),sci2exp(model.state),sci2exp(model.dstate),sci2exp(model.odstate),sci2exp(model.rpar),sci2exp(model.ipar),sci2exp(model.opar),sci2exp(model.nmode),sci2exp(model.nzcross),sci2exp(model.firing),"y","n"];
+gr_i=[];
+x=standard_define([4,2],model,label,gr_i);
+}
+generic_block3.prototype.details = function generic_block3() {
+}
 generic_block3.prototype.get = function generic_block3() {
 }
 generic_block3.prototype.set = function generic_block3() {
@@ -82,22 +100,4 @@ break
 }
 needcompile=resume(needcompile)
 }
-generic_block3.prototype.define = function generic_block3() {
-model=scicos_model();
-function_name="sinblk";
-funtyp=4;
-model.sim=list(function_name,funtyp);
-model.in1=1;
-model.in2=1;
-model.intyp=1;
-model.out=1;
-model.out2=1;
-model.outtyp=1;
-model.dep_ut=[true,false];
-label=[function_name,sci2exp(funtyp),sci2exp([model.in1,model.in2]),sci2exp(model.intyp),sci2exp([model.out,model.out2]),sci2exp(model.outtyp),sci2exp(model.evtin),sci2exp(model.evtout),sci2exp(model.state),sci2exp(model.dstate),sci2exp(model.odstate),sci2exp(model.rpar),sci2exp(model.ipar),sci2exp(model.opar),sci2exp(model.nmode),sci2exp(model.nzcross),sci2exp(model.firing),"y","n"];
-gr_i=[];
-x=standard_define([4,2],model,label,gr_i);
-}
-generic_block3.prototype.details = function generic_block3() {
-}
 }
diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js
index 37a0799a..99918658 100644
--- a/js/Misc/scifunc_block_m.js
+++ b/js/Misc/scifunc_block_m.js
@@ -1,5 +1,40 @@
 /* autogenerated from "macros/Misc/scifunc_block_m.sci" */
 function scifunc_block_m() {
+scifunc_block_m.prototype.define = function scifunc_block_m() {
+in1=1;
+out=1;
+clkin=[];
+clkout=[];
+x0=[];
+z0=[];
+typ="c";
+auto=[];
+rpar=[];
+it=1;
+model=scicos_model();
+model.sim=list("scifunc",3);
+model.in1=in1;
+model.in2=in1;
+model.intyp=it;
+model.out=out;
+model.out2=out;
+model.outtyp=it;
+model.evtin=clkin;
+model.evtout=clkout;
+model.state=x0;
+model.dstate=z0;
+model.rpar=rpar;
+model.ipar=0;
+model.opar=list();
+model.blocktype=typ;
+model.firing=auto;
+model.dep_ut=[true,false];
+exprs=list([sci2exp([in1,in1]),sci2exp([out,out]),sci2exp(clkin),sci2exp(clkout),strcat(sci2exp(x0)),strcat(sci2exp(z0)),strcat(sci2exp(rpar)),sci2exp(auto),sci2exp(0)],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," "));
+gr_i=[];
+x=standard_define([4,2],model,exprs,gr_i);
+}
+scifunc_block_m.prototype.details = function scifunc_block_m() {
+}
 scifunc_block_m.prototype.get = function scifunc_block_m() {
 }
 scifunc_block_m.prototype.set = function scifunc_block_m() {
@@ -56,39 +91,4 @@ break
 }
 needcompile=resume(needcompile)
 }
-scifunc_block_m.prototype.define = function scifunc_block_m() {
-in1=1;
-out=1;
-clkin=[];
-clkout=[];
-x0=[];
-z0=[];
-typ="c";
-auto=[];
-rpar=[];
-it=1;
-model=scicos_model();
-model.sim=list("scifunc",3);
-model.in1=in1;
-model.in2=in1;
-model.intyp=it;
-model.out=out;
-model.out2=out;
-model.outtyp=it;
-model.evtin=clkin;
-model.evtout=clkout;
-model.state=x0;
-model.dstate=z0;
-model.rpar=rpar;
-model.ipar=0;
-model.opar=list();
-model.blocktype=typ;
-model.firing=auto;
-model.dep_ut=[true,false];
-exprs=list([sci2exp([in1,in1]),sci2exp([out,out]),sci2exp(clkin),sci2exp(clkout),strcat(sci2exp(x0)),strcat(sci2exp(z0)),strcat(sci2exp(rpar)),sci2exp(auto),sci2exp(0)],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," "));
-gr_i=[];
-x=standard_define([4,2],model,exprs,gr_i);
-}
-scifunc_block_m.prototype.details = function scifunc_block_m() {
-}
 }
diff --git a/js/NonLinear/ABSBLK_f.js b/js/NonLinear/ABSBLK_f.js
index dcc94175..45e702ff 100644
--- a/js/NonLinear/ABSBLK_f.js
+++ b/js/NonLinear/ABSBLK_f.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/NonLinear/ABSBLK_f.sci" */
 function ABSBLK_f() {
-ABSBLK_f.prototype.get = function ABSBLK_f() {
-}
-ABSBLK_f.prototype.set = function ABSBLK_f() {
-x=arg1;
-}
 ABSBLK_f.prototype.define = function ABSBLK_f() {
 model=scicos_model();
 model.sim=list("absblk",1);
@@ -17,4 +12,9 @@ x=standard_define([2,2],model,[],gr_i);
 }
 ABSBLK_f.prototype.details = function ABSBLK_f() {
 }
+ABSBLK_f.prototype.get = function ABSBLK_f() {
+}
+ABSBLK_f.prototype.set = function ABSBLK_f() {
+x=arg1;
+}
 }
diff --git a/js/NonLinear/ABS_VALUE.js b/js/NonLinear/ABS_VALUE.js
index 29ad5d6c..8bfc9623 100644
--- a/js/NonLinear/ABS_VALUE.js
+++ b/js/NonLinear/ABS_VALUE.js
@@ -1,5 +1,21 @@
 /* autogenerated from "macros/NonLinear/ABS_VALUE.sci" */
 function ABS_VALUE() {
+ABS_VALUE.prototype.define = function ABS_VALUE() {
+nu=-1;
+model=scicos_model();
+model.sim=list("absolute_value",4);
+model.in1=nu;
+model.out=nu;
+model.nzcross=nu;
+model.nmode=nu;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[string([1])];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+ABS_VALUE.prototype.details = function ABS_VALUE() {
+}
 ABS_VALUE.prototype.get = function ABS_VALUE() {
 }
 ABS_VALUE.prototype.set = function ABS_VALUE() {
@@ -27,20 +43,4 @@ break
 }
 }
 }
-ABS_VALUE.prototype.define = function ABS_VALUE() {
-nu=-1;
-model=scicos_model();
-model.sim=list("absolute_value",4);
-model.in1=nu;
-model.out=nu;
-model.nzcross=nu;
-model.nmode=nu;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[string([1])];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-ABS_VALUE.prototype.details = function ABS_VALUE() {
-}
 }
diff --git a/js/NonLinear/COSBLK_f.js b/js/NonLinear/COSBLK_f.js
index ec2b1ca8..3ec4e559 100644
--- a/js/NonLinear/COSBLK_f.js
+++ b/js/NonLinear/COSBLK_f.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/NonLinear/COSBLK_f.sci" */
 function COSBLK_f() {
-COSBLK_f.prototype.get = function COSBLK_f() {
-}
-COSBLK_f.prototype.set = function COSBLK_f() {
-x=arg1;
-}
 COSBLK_f.prototype.define = function COSBLK_f() {
 in1=1;
 model=scicos_model();
@@ -18,4 +13,9 @@ x=standard_define([2,2],model,[],gr_i);
 }
 COSBLK_f.prototype.details = function COSBLK_f() {
 }
+COSBLK_f.prototype.get = function COSBLK_f() {
+}
+COSBLK_f.prototype.set = function COSBLK_f() {
+x=arg1;
+}
 }
diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js
index a60cfc0a..057c0c84 100644
--- a/js/NonLinear/DLRADAPT_f.js
+++ b/js/NonLinear/DLRADAPT_f.js
@@ -1,5 +1,29 @@
 /* autogenerated from "macros/NonLinear/DLRADAPT_f.sci" */
 function DLRADAPT_f() {
+DLRADAPT_f.prototype.define = function DLRADAPT_f() {
+p=[0,1];
+rn=[];
+rd=[math.complex(0.2,0.8),math.complex(0.2,-0.8),math.complex(0.3,0.7),math.complex(0.3,-0.7)];
+g=[1,1];
+last_u=[];
+last_y=[0,0];
+model=scicos_model();
+model.sim="dlradp";
+model.in1=[1,1];
+model.out=1;
+model.evtin=1;
+model.dstate=[last_u,last_y];
+model.rpar=[p.slice(),real(rn.slice()),imag(rn.slice()),real(rd.slice()),imag(rd.slice()),g.slice()];
+model.ipar=[0,2,2];
+model.blocktype="d";
+model.firing=[];
+model.dep_ut=[true,false];
+exprs=[sci2exp(p),sci2exp(rn),sci2exp(rd,0),sci2exp(g),sci2exp(last_u),sci2exp(last_y)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+DLRADAPT_f.prototype.details = function DLRADAPT_f() {
+}
 DLRADAPT_f.prototype.get = function DLRADAPT_f() {
 }
 DLRADAPT_f.prototype.set = function DLRADAPT_f() {
@@ -31,28 +55,4 @@ break
 }
 }
 }
-DLRADAPT_f.prototype.define = function DLRADAPT_f() {
-p=[0,1];
-rn=[];
-rd=[math.complex(0.2,0.8),math.complex(0.2,-0.8),math.complex(0.3,0.7),math.complex(0.3,-0.7)];
-g=[1,1];
-last_u=[];
-last_y=[0,0];
-model=scicos_model();
-model.sim="dlradp";
-model.in1=[1,1];
-model.out=1;
-model.evtin=1;
-model.dstate=[last_u,last_y];
-model.rpar=[p.slice(),real(rn.slice()),imag(rn.slice()),real(rd.slice()),imag(rd.slice()),g.slice()];
-model.ipar=[0,2,2];
-model.blocktype="d";
-model.firing=[];
-model.dep_ut=[true,false];
-exprs=[sci2exp(p),sci2exp(rn),sci2exp(rd,0),sci2exp(g),sci2exp(last_u),sci2exp(last_y)];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-DLRADAPT_f.prototype.details = function DLRADAPT_f() {
-}
 }
diff --git a/js/NonLinear/EXPBLK_f.js b/js/NonLinear/EXPBLK_f.js
index dcb5acd5..749eedbb 100644
--- a/js/NonLinear/EXPBLK_f.js
+++ b/js/NonLinear/EXPBLK_f.js
@@ -1,5 +1,21 @@
 /* autogenerated from "macros/NonLinear/EXPBLK_f.sci" */
 function EXPBLK_f() {
+EXPBLK_f.prototype.define = function EXPBLK_f() {
+in1=1;
+a=math.E;
+model=scicos_model();
+model.sim="expblk";
+model.in1=-1;
+model.out=-1;
+model.rpar=a;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=["%e"];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+EXPBLK_f.prototype.details = function EXPBLK_f() {
+}
 EXPBLK_f.prototype.get = function EXPBLK_f() {
 }
 EXPBLK_f.prototype.set = function EXPBLK_f() {
@@ -26,20 +42,4 @@ break
 }
 }
 }
-EXPBLK_f.prototype.define = function EXPBLK_f() {
-in1=1;
-a=math.E;
-model=scicos_model();
-model.sim="expblk";
-model.in1=-1;
-model.out=-1;
-model.rpar=a;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=["%e"];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-EXPBLK_f.prototype.details = function EXPBLK_f() {
-}
 }
diff --git a/js/NonLinear/EXPBLK_m.js b/js/NonLinear/EXPBLK_m.js
index c46e07b8..04c4b463 100644
--- a/js/NonLinear/EXPBLK_m.js
+++ b/js/NonLinear/EXPBLK_m.js
@@ -1,5 +1,25 @@
 /* autogenerated from "macros/NonLinear/EXPBLK_m.sci" */
 function EXPBLK_m() {
+EXPBLK_m.prototype.define = function EXPBLK_m() {
+in1=1;
+a=math.E;
+model=scicos_model();
+model.sim=list("expblk_m",4);
+model.in1=-1;
+model.in2=-2;
+model.out=-1;
+model.out2=-2;
+model.intyp=1;
+model.outtyp=1;
+model.rpar=a;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=["%e"];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+EXPBLK_m.prototype.details = function EXPBLK_m() {
+}
 EXPBLK_m.prototype.get = function EXPBLK_m() {
 }
 EXPBLK_m.prototype.set = function EXPBLK_m() {
@@ -26,24 +46,4 @@ break
 }
 }
 }
-EXPBLK_m.prototype.define = function EXPBLK_m() {
-in1=1;
-a=math.E;
-model=scicos_model();
-model.sim=list("expblk_m",4);
-model.in1=-1;
-model.in2=-2;
-model.out=-1;
-model.out2=-2;
-model.intyp=1;
-model.outtyp=1;
-model.rpar=a;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=["%e"];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-EXPBLK_m.prototype.details = function EXPBLK_m() {
-}
 }
diff --git a/js/NonLinear/FSV_f.js b/js/NonLinear/FSV_f.js
index 84dc35d6..afe7dc7f 100644
--- a/js/NonLinear/FSV_f.js
+++ b/js/NonLinear/FSV_f.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/NonLinear/FSV_f.sci" */
 function FSV_f() {
-FSV_f.prototype.get = function FSV_f() {
-}
-FSV_f.prototype.set = function FSV_f() {
-x=arg1;
-}
 FSV_f.prototype.define = function FSV_f() {
 in1=1;
 model=scicos_model();
@@ -19,4 +14,9 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 FSV_f.prototype.details = function FSV_f() {
 }
+FSV_f.prototype.get = function FSV_f() {
+}
+FSV_f.prototype.set = function FSV_f() {
+x=arg1;
+}
 }
diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js
index f37934d5..c4ea614f 100644
--- a/js/NonLinear/INTRP2BLK_f.js
+++ b/js/NonLinear/INTRP2BLK_f.js
@@ -1,5 +1,23 @@
 /* autogenerated from "macros/NonLinear/INTRP2BLK_f.sci" */
 function INTRP2BLK_f() {
+INTRP2BLK_f.prototype.define = function INTRP2BLK_f() {
+a=[0,1];
+b=[0,1];
+c=[0,1,1,2];
+model=scicos_model();
+model.sim=list("intrp2",1);
+model.in1=[1,1];
+model.out=1;
+model.rpar=[a,b,c.slice()];
+model.ipar=[2,2];
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[strcat(sci2exp(a)),strcat(sci2exp(b)),strcat(sci2exp(c,0))];
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+INTRP2BLK_f.prototype.details = function INTRP2BLK_f() {
+}
 INTRP2BLK_f.prototype.get = function INTRP2BLK_f() {
 }
 INTRP2BLK_f.prototype.set = function INTRP2BLK_f() {
@@ -28,22 +46,4 @@ break
 }
 }
 }
-INTRP2BLK_f.prototype.define = function INTRP2BLK_f() {
-a=[0,1];
-b=[0,1];
-c=[0,1,1,2];
-model=scicos_model();
-model.sim=list("intrp2",1);
-model.in1=[1,1];
-model.out=1;
-model.rpar=[a,b,c.slice()];
-model.ipar=[2,2];
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[strcat(sci2exp(a)),strcat(sci2exp(b)),strcat(sci2exp(c,0))];
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-INTRP2BLK_f.prototype.details = function INTRP2BLK_f() {
-}
 }
diff --git a/js/NonLinear/INTRPLBLK_f.js b/js/NonLinear/INTRPLBLK_f.js
index 9d766fc0..778a7750 100644
--- a/js/NonLinear/INTRPLBLK_f.js
+++ b/js/NonLinear/INTRPLBLK_f.js
@@ -1,5 +1,21 @@
 /* autogenerated from "macros/NonLinear/INTRPLBLK_f.sci" */
 function INTRPLBLK_f() {
+INTRPLBLK_f.prototype.define = function INTRPLBLK_f() {
+a=[0,1];
+b=[0,1];
+model=scicos_model();
+model.sim="intrpl";
+model.in1=1;
+model.out=1;
+model.rpar=[a,b];
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[strcat(sci2exp(a)),strcat(sci2exp(b))];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+INTRPLBLK_f.prototype.details = function INTRPLBLK_f() {
+}
 INTRPLBLK_f.prototype.get = function INTRPLBLK_f() {
 }
 INTRPLBLK_f.prototype.set = function INTRPLBLK_f() {
@@ -27,20 +43,4 @@ break
 }
 }
 }
-INTRPLBLK_f.prototype.define = function INTRPLBLK_f() {
-a=[0,1];
-b=[0,1];
-model=scicos_model();
-model.sim="intrpl";
-model.in1=1;
-model.out=1;
-model.rpar=[a,b];
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[strcat(sci2exp(a)),strcat(sci2exp(b))];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-INTRPLBLK_f.prototype.details = function INTRPLBLK_f() {
-}
 }
diff --git a/js/NonLinear/INVBLK.js b/js/NonLinear/INVBLK.js
index 9bddbbba..f8cd77f8 100644
--- a/js/NonLinear/INVBLK.js
+++ b/js/NonLinear/INVBLK.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/NonLinear/INVBLK.sci" */
 function INVBLK() {
-INVBLK.prototype.get = function INVBLK() {
-}
-INVBLK.prototype.set = function INVBLK() {
-x=arg1;
-}
 INVBLK.prototype.define = function INVBLK() {
 in1=-1;
 model=scicos_model();
@@ -19,4 +14,9 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 INVBLK.prototype.details = function INVBLK() {
 }
+INVBLK.prototype.get = function INVBLK() {
+}
+INVBLK.prototype.set = function INVBLK() {
+x=arg1;
+}
 }
diff --git a/js/NonLinear/INVBLK_f.js b/js/NonLinear/INVBLK_f.js
index e0f55c5a..448e087e 100644
--- a/js/NonLinear/INVBLK_f.js
+++ b/js/NonLinear/INVBLK_f.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/NonLinear/INVBLK_f.sci" */
 function INVBLK_f() {
-INVBLK_f.prototype.get = function INVBLK_f() {
-}
-INVBLK_f.prototype.set = function INVBLK_f() {
-x=arg1;
-}
 INVBLK_f.prototype.define = function INVBLK_f() {
 in1=-1;
 model=scicos_model();
@@ -19,4 +14,9 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 INVBLK_f.prototype.details = function INVBLK_f() {
 }
+INVBLK_f.prototype.get = function INVBLK_f() {
+}
+INVBLK_f.prototype.set = function INVBLK_f() {
+x=arg1;
+}
 }
diff --git a/js/NonLinear/LOGBLK_f.js b/js/NonLinear/LOGBLK_f.js
index ce6a47d2..0beef08f 100644
--- a/js/NonLinear/LOGBLK_f.js
+++ b/js/NonLinear/LOGBLK_f.js
@@ -1,5 +1,21 @@
 /* autogenerated from "macros/NonLinear/LOGBLK_f.sci" */
 function LOGBLK_f() {
+LOGBLK_f.prototype.define = function LOGBLK_f() {
+in1=1;
+a=math.E;
+model=scicos_model();
+model.sim="logblk";
+model.in1=-1;
+model.out=-1;
+model.rpar=a;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs="%e";
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+LOGBLK_f.prototype.details = function LOGBLK_f() {
+}
 LOGBLK_f.prototype.get = function LOGBLK_f() {
 }
 LOGBLK_f.prototype.set = function LOGBLK_f() {
@@ -28,20 +44,4 @@ break
 }
 }
 }
-LOGBLK_f.prototype.define = function LOGBLK_f() {
-in1=1;
-a=math.E;
-model=scicos_model();
-model.sim="logblk";
-model.in1=-1;
-model.out=-1;
-model.rpar=a;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs="%e";
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-LOGBLK_f.prototype.details = function LOGBLK_f() {
-}
 }
diff --git a/js/NonLinear/LOOKUP_f.js b/js/NonLinear/LOOKUP_f.js
index 86816ddc..7fe2bc8a 100644
--- a/js/NonLinear/LOOKUP_f.js
+++ b/js/NonLinear/LOOKUP_f.js
@@ -1,5 +1,18 @@
 /* autogenerated from "macros/NonLinear/LOOKUP_f.sci" */
 function LOOKUP_f() {
+LOOKUP_f.prototype.define = function LOOKUP_f() {
+model=scicos_model();
+model.sim="lookup";
+model.in1=1;
+model.out=1;
+model.rpar=[-2,-1,1,2,-1,1,-1,1];
+model.blocktype="c";
+model.dep_ut=[true,false];
+gr_i=[];
+x=standard_define([2,2],model,[],gr_i);
+}
+LOOKUP_f.prototype.details = function LOOKUP_f() {
+}
 LOOKUP_f.prototype.get = function LOOKUP_f() {
 }
 LOOKUP_f.prototype.set = function LOOKUP_f() {
@@ -34,17 +47,4 @@ break
 }
 }
 }
-LOOKUP_f.prototype.define = function LOOKUP_f() {
-model=scicos_model();
-model.sim="lookup";
-model.in1=1;
-model.out=1;
-model.rpar=[-2,-1,1,2,-1,1,-1,1];
-model.blocktype="c";
-model.dep_ut=[true,false];
-gr_i=[];
-x=standard_define([2,2],model,[],gr_i);
-}
-LOOKUP_f.prototype.details = function LOOKUP_f() {
-}
 }
diff --git a/js/NonLinear/MAXMIN.js b/js/NonLinear/MAXMIN.js
index aea7b9e6..d63f92fc 100644
--- a/js/NonLinear/MAXMIN.js
+++ b/js/NonLinear/MAXMIN.js
@@ -1,5 +1,20 @@
 /* autogenerated from "macros/NonLinear/MAXMIN.sci" */
 function MAXMIN() {
+MAXMIN.prototype.define = function MAXMIN() {
+model=scicos_model();
+model.sim=list("minmax",4);
+model.out=1;
+model.in1=-1;
+model.blocktype="c";
+model.dep_ut=[true,false];
+model.ipar=0;
+exprs=[string(transpose([2,1,1]))];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+x.graphics.style="MAXMIN;displayedLabel=MAX";
+}
+MAXMIN.prototype.details = function MAXMIN() {
+}
 MAXMIN.prototype.get = function MAXMIN() {
 }
 MAXMIN.prototype.set = function MAXMIN() {
@@ -50,19 +65,4 @@ break
 }
 }
 }
-MAXMIN.prototype.define = function MAXMIN() {
-model=scicos_model();
-model.sim=list("minmax",4);
-model.out=1;
-model.in1=-1;
-model.blocktype="c";
-model.dep_ut=[true,false];
-model.ipar=0;
-exprs=[string(transpose([2,1,1]))];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-x.graphics.style="MAXMIN;displayedLabel=MAX";
-}
-MAXMIN.prototype.details = function MAXMIN() {
-}
 }
diff --git a/js/NonLinear/MAX_f.js b/js/NonLinear/MAX_f.js
index f774e2a5..fe056aeb 100644
--- a/js/NonLinear/MAX_f.js
+++ b/js/NonLinear/MAX_f.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/NonLinear/MAX_f.sci" */
 function MAX_f() {
-MAX_f.prototype.get = function MAX_f() {
-}
-MAX_f.prototype.set = function MAX_f() {
-x=arg1;
-}
 MAX_f.prototype.define = function MAX_f() {
 in1=-1;
 model=scicos_model();
@@ -20,4 +15,9 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 MAX_f.prototype.details = function MAX_f() {
 }
+MAX_f.prototype.get = function MAX_f() {
+}
+MAX_f.prototype.set = function MAX_f() {
+x=arg1;
+}
 }
diff --git a/js/NonLinear/MIN_f.js b/js/NonLinear/MIN_f.js
index d25fa771..cddd8668 100644
--- a/js/NonLinear/MIN_f.js
+++ b/js/NonLinear/MIN_f.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/NonLinear/MIN_f.sci" */
 function MIN_f() {
-MIN_f.prototype.get = function MIN_f() {
-}
-MIN_f.prototype.set = function MIN_f() {
-x=arg1;
-}
 MIN_f.prototype.define = function MIN_f() {
 in1=-1;
 model=scicos_model();
@@ -20,4 +15,9 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 MIN_f.prototype.details = function MIN_f() {
 }
+MIN_f.prototype.get = function MIN_f() {
+}
+MIN_f.prototype.set = function MIN_f() {
+x=arg1;
+}
 }
diff --git a/js/NonLinear/POWBLK_f.js b/js/NonLinear/POWBLK_f.js
index 939decb4..b06b150e 100644
--- a/js/NonLinear/POWBLK_f.js
+++ b/js/NonLinear/POWBLK_f.js
@@ -1,5 +1,21 @@
 /* autogenerated from "macros/NonLinear/POWBLK_f.sci" */
 function POWBLK_f() {
+POWBLK_f.prototype.define = function POWBLK_f() {
+in1=1;
+a=1.5;
+model=scicos_model();
+model.sim="powblk";
+model.in1=-1;
+model.out=-1;
+model.rpar=a;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=string(a);
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+POWBLK_f.prototype.details = function POWBLK_f() {
+}
 POWBLK_f.prototype.get = function POWBLK_f() {
 }
 POWBLK_f.prototype.set = function POWBLK_f() {
@@ -29,20 +45,4 @@ x.model=model;
 break
 }
 }
-POWBLK_f.prototype.define = function POWBLK_f() {
-in1=1;
-a=1.5;
-model=scicos_model();
-model.sim="powblk";
-model.in1=-1;
-model.out=-1;
-model.rpar=a;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=string(a);
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-POWBLK_f.prototype.details = function POWBLK_f() {
-}
 }
diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js
index 6e03bfb9..4f9b4538 100644
--- a/js/NonLinear/PRODUCT.js
+++ b/js/NonLinear/PRODUCT.js
@@ -1,5 +1,20 @@
 /* autogenerated from "macros/NonLinear/PRODUCT.sci" */
 function PRODUCT() {
+PRODUCT.prototype.define = function PRODUCT() {
+sgn=[1,-1];
+model=scicos_model();
+model.sim=list("product",4);
+model.in1=[-1,-1];
+model.out=-1;
+model.ipar=sgn;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=sci2exp(sgn);
+gr_i=[];
+x=standard_define([2,3],model,exprs,gr_i);
+}
+PRODUCT.prototype.details = function PRODUCT() {
+}
 PRODUCT.prototype.get = function PRODUCT() {
 }
 PRODUCT.prototype.set = function PRODUCT() {
@@ -47,19 +62,4 @@ break
 }
 }
 }
-PRODUCT.prototype.define = function PRODUCT() {
-sgn=[1,-1];
-model=scicos_model();
-model.sim=list("product",4);
-model.in1=[-1,-1];
-model.out=-1;
-model.ipar=sgn;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=sci2exp(sgn);
-gr_i=[];
-x=standard_define([2,3],model,exprs,gr_i);
-}
-PRODUCT.prototype.details = function PRODUCT() {
-}
 }
diff --git a/js/NonLinear/PROD_f.js b/js/NonLinear/PROD_f.js
index fadb14e9..609799fb 100644
--- a/js/NonLinear/PROD_f.js
+++ b/js/NonLinear/PROD_f.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/NonLinear/PROD_f.sci" */
 function PROD_f() {
-PROD_f.prototype.get = function PROD_f() {
-}
-PROD_f.prototype.set = function PROD_f() {
-x=arg1;
-}
 PROD_f.prototype.define = function PROD_f() {
 model=scicos_model();
 model.sim=list("prod",2);
@@ -16,4 +11,9 @@ x=standard_define([1,1],model,[],[]);
 }
 PROD_f.prototype.details = function PROD_f() {
 }
+PROD_f.prototype.get = function PROD_f() {
+}
+PROD_f.prototype.set = function PROD_f() {
+x=arg1;
+}
 }
diff --git a/js/NonLinear/QUANT_f.js b/js/NonLinear/QUANT_f.js
index e7c99640..89be5a6c 100644
--- a/js/NonLinear/QUANT_f.js
+++ b/js/NonLinear/QUANT_f.js
@@ -1,5 +1,22 @@
 /* autogenerated from "macros/NonLinear/QUANT_f.sci" */
 function QUANT_f() {
+QUANT_f.prototype.define = function QUANT_f() {
+pas=0.1;
+meth=1;
+model=scicos_model();
+model.sim="qzrnd";
+model.in1=-1;
+model.out=-1;
+model.rpar=pas;
+model.ipar=meth;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[string(pas),string(meth)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+QUANT_f.prototype.details = function QUANT_f() {
+}
 QUANT_f.prototype.get = function QUANT_f() {
 }
 QUANT_f.prototype.set = function QUANT_f() {
@@ -35,21 +52,4 @@ break
 }
 }
 }
-QUANT_f.prototype.define = function QUANT_f() {
-pas=0.1;
-meth=1;
-model=scicos_model();
-model.sim="qzrnd";
-model.in1=-1;
-model.out=-1;
-model.rpar=pas;
-model.ipar=meth;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[string(pas),string(meth)];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-QUANT_f.prototype.details = function QUANT_f() {
-}
 }
diff --git a/js/NonLinear/SATURATION.js b/js/NonLinear/SATURATION.js
index 19c2390a..ca72873f 100644
--- a/js/NonLinear/SATURATION.js
+++ b/js/NonLinear/SATURATION.js
@@ -1,5 +1,24 @@
 /* autogenerated from "macros/NonLinear/SATURATION.sci" */
 function SATURATION() {
+SATURATION.prototype.define = function SATURATION() {
+minp=-1;
+maxp=1;
+rpar=[maxp,minp];
+model=scicos_model();
+model.sim=list("satur",4);
+model.in1=1;
+model.nzcross=2;
+model.nmode=1;
+model.out=1;
+model.rpar=rpar;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[string(maxp),string(minp),string(model.nmode)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+SATURATION.prototype.details = function SATURATION() {
+}
 SATURATION.prototype.get = function SATURATION() {
 }
 SATURATION.prototype.set = function SATURATION() {
@@ -31,23 +50,4 @@ break
 }
 }
 }
-SATURATION.prototype.define = function SATURATION() {
-minp=-1;
-maxp=1;
-rpar=[maxp,minp];
-model=scicos_model();
-model.sim=list("satur",4);
-model.in1=1;
-model.nzcross=2;
-model.nmode=1;
-model.out=1;
-model.rpar=rpar;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[string(maxp),string(minp),string(model.nmode)];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-SATURATION.prototype.details = function SATURATION() {
-}
 }
diff --git a/js/NonLinear/SAT_f.js b/js/NonLinear/SAT_f.js
index fe8ead9c..418fedee 100644
--- a/js/NonLinear/SAT_f.js
+++ b/js/NonLinear/SAT_f.js
@@ -1,5 +1,24 @@
 /* autogenerated from "macros/NonLinear/SAT_f.sci" */
 function SAT_f() {
+SAT_f.prototype.define = function SAT_f() {
+minp=-1;
+maxp=1;
+slope=1;
+rpar=[minp,maxp,slope];
+model=scicos_model();
+model.sim=list("lusat",1);
+model.in1=1;
+model.nzcross=2;
+model.out=1;
+model.rpar=[minp,maxp,slope];
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[string(minp),string(maxp),string(slope)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+SAT_f.prototype.details = function SAT_f() {
+}
 SAT_f.prototype.get = function SAT_f() {
 }
 SAT_f.prototype.set = function SAT_f() {
@@ -27,23 +46,4 @@ break
 }
 }
 }
-SAT_f.prototype.define = function SAT_f() {
-minp=-1;
-maxp=1;
-slope=1;
-rpar=[minp,maxp,slope];
-model=scicos_model();
-model.sim=list("lusat",1);
-model.in1=1;
-model.nzcross=2;
-model.out=1;
-model.rpar=[minp,maxp,slope];
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[string(minp),string(maxp),string(slope)];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-SAT_f.prototype.details = function SAT_f() {
-}
 }
diff --git a/js/NonLinear/SIGNUM.js b/js/NonLinear/SIGNUM.js
index 4fab41aa..6fc8359c 100644
--- a/js/NonLinear/SIGNUM.js
+++ b/js/NonLinear/SIGNUM.js
@@ -1,5 +1,21 @@
 /* autogenerated from "macros/NonLinear/SIGNUM.sci" */
 function SIGNUM() {
+SIGNUM.prototype.define = function SIGNUM() {
+nu=-1;
+model=scicos_model();
+model.sim=list("signum",4);
+model.in1=nu;
+model.out=nu;
+model.nzcross=nu;
+model.nmode=nu;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[string([1])];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+SIGNUM.prototype.details = function SIGNUM() {
+}
 SIGNUM.prototype.get = function SIGNUM() {
 }
 SIGNUM.prototype.set = function SIGNUM() {
@@ -27,20 +43,4 @@ break
 }
 }
 }
-SIGNUM.prototype.define = function SIGNUM() {
-nu=-1;
-model=scicos_model();
-model.sim=list("signum",4);
-model.in1=nu;
-model.out=nu;
-model.nzcross=nu;
-model.nmode=nu;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[string([1])];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-SIGNUM.prototype.details = function SIGNUM() {
-}
 }
diff --git a/js/NonLinear/SINBLK_f.js b/js/NonLinear/SINBLK_f.js
index 5a3f206a..e8d272a8 100644
--- a/js/NonLinear/SINBLK_f.js
+++ b/js/NonLinear/SINBLK_f.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/NonLinear/SINBLK_f.sci" */
 function SINBLK_f() {
-SINBLK_f.prototype.get = function SINBLK_f() {
-}
-SINBLK_f.prototype.set = function SINBLK_f() {
-x=arg1;
-}
 SINBLK_f.prototype.define = function SINBLK_f() {
 model=scicos_model();
 model.sim="sinblk";
@@ -18,4 +13,9 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 SINBLK_f.prototype.details = function SINBLK_f() {
 }
+SINBLK_f.prototype.get = function SINBLK_f() {
+}
+SINBLK_f.prototype.set = function SINBLK_f() {
+x=arg1;
+}
 }
diff --git a/js/NonLinear/TANBLK_f.js b/js/NonLinear/TANBLK_f.js
index 4ea8dede..dc7ec656 100644
--- a/js/NonLinear/TANBLK_f.js
+++ b/js/NonLinear/TANBLK_f.js
@@ -1,11 +1,5 @@
 /* autogenerated from "macros/NonLinear/TANBLK_f.sci" */
 function TANBLK_f() {
-TANBLK_f.prototype.get = function TANBLK_f() {
-}
-TANBLK_f.prototype.set = function TANBLK_f() {
-x=arg1;
-x.model.firing=[];
-}
 TANBLK_f.prototype.define = function TANBLK_f() {
 in1=-1;
 model=scicos_model();
@@ -20,4 +14,10 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 TANBLK_f.prototype.details = function TANBLK_f() {
 }
+TANBLK_f.prototype.get = function TANBLK_f() {
+}
+TANBLK_f.prototype.set = function TANBLK_f() {
+x=arg1;
+x.model.firing=[];
+}
 }
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() {
-}
 }
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;
+}
+}
 }
diff --git a/js/Threshold/NEGTOPOS_f.js b/js/Threshold/NEGTOPOS_f.js
index 5dfff00c..a5a2db6e 100644
--- a/js/Threshold/NEGTOPOS_f.js
+++ b/js/Threshold/NEGTOPOS_f.js
@@ -1,11 +1,5 @@
 /* autogenerated from "macros/Threshold/NEGTOPOS_f.sci" */
 function NEGTOPOS_f() {
-NEGTOPOS_f.prototype.get = function NEGTOPOS_f() {
-}
-NEGTOPOS_f.prototype.set = function NEGTOPOS_f() {
-x=arg1;
-x.model.firing=-1;
-}
 NEGTOPOS_f.prototype.define = function NEGTOPOS_f() {
 model=scicos_model();
 model.sim=list("zcross",1);
@@ -21,4 +15,10 @@ x=standard_define([2,2],model,[],gr_i);
 }
 NEGTOPOS_f.prototype.details = function NEGTOPOS_f() {
 }
+NEGTOPOS_f.prototype.get = function NEGTOPOS_f() {
+}
+NEGTOPOS_f.prototype.set = function NEGTOPOS_f() {
+x=arg1;
+x.model.firing=-1;
+}
 }
diff --git a/js/Threshold/POSTONEG_f.js b/js/Threshold/POSTONEG_f.js
index df078ba0..d2688c00 100644
--- a/js/Threshold/POSTONEG_f.js
+++ b/js/Threshold/POSTONEG_f.js
@@ -1,11 +1,5 @@
 /* autogenerated from "macros/Threshold/POSTONEG_f.sci" */
 function POSTONEG_f() {
-POSTONEG_f.prototype.get = function POSTONEG_f() {
-}
-POSTONEG_f.prototype.set = function POSTONEG_f() {
-x=arg1;
-x.model.firing=[-1];
-}
 POSTONEG_f.prototype.define = function POSTONEG_f() {
 rpar=[-1,-1,-1,0];
 model=scicos_model();
@@ -22,4 +16,10 @@ x=standard_define([2,2],model,[],gr_i);
 }
 POSTONEG_f.prototype.details = function POSTONEG_f() {
 }
+POSTONEG_f.prototype.get = function POSTONEG_f() {
+}
+POSTONEG_f.prototype.set = function POSTONEG_f() {
+x=arg1;
+x.model.firing=[-1];
+}
 }
diff --git a/js/Threshold/ZCROSS_f.js b/js/Threshold/ZCROSS_f.js
index 32f2b440..3cc17199 100644
--- a/js/Threshold/ZCROSS_f.js
+++ b/js/Threshold/ZCROSS_f.js
@@ -1,5 +1,23 @@
 /* autogenerated from "macros/Threshold/ZCROSS_f.sci" */
 function ZCROSS_f() {
+ZCROSS_f.prototype.define = function ZCROSS_f() {
+rpar=[-1,-1,0,0];
+in1=1;
+model=scicos_model();
+model.sim=list("zcross",1);
+model.in1=in1;
+model.nzcross=in1;
+model.evtout=1;
+model.rpar=[-1,-1,0,0];
+model.blocktype="z";
+model.firing=-1;
+model.dep_ut=[true,false];
+exprs=strcat(sci2exp(in1));
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+ZCROSS_f.prototype.details = function ZCROSS_f() {
+}
 ZCROSS_f.prototype.get = function ZCROSS_f() {
 }
 ZCROSS_f.prototype.set = function ZCROSS_f() {
@@ -31,22 +49,4 @@ break
 }
 }
 }
-ZCROSS_f.prototype.define = function ZCROSS_f() {
-rpar=[-1,-1,0,0];
-in1=1;
-model=scicos_model();
-model.sim=list("zcross",1);
-model.in1=in1;
-model.nzcross=in1;
-model.evtout=1;
-model.rpar=[-1,-1,0,0];
-model.blocktype="z";
-model.firing=-1;
-model.dep_ut=[true,false];
-exprs=strcat(sci2exp(in1));
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-ZCROSS_f.prototype.details = function ZCROSS_f() {
-}
 }
diff --git a/sci2jsyacc.py b/sci2jsyacc.py
index 25c4e4e5..2090fc23 100755
--- a/sci2jsyacc.py
+++ b/sci2jsyacc.py
@@ -35,15 +35,15 @@ def p_functionblock_function_statementblock_endfunction(p):
     'functionblock : EOL FUNCTION lterm ASSIGNMENT VAR OPENBRACKET JOB COMMA VAR COMMA VAR CLOSEBRACKET EOL statementblock ENDFUNCTION EOL'
     fname = str(p[5])
     p[0] = ('function %s() {\n' +
-            '%s.prototype.get = function %s() {\n%s}\n' +
-            '%s.prototype.set = function %s() {\n%s}\n' +
             '%s.prototype.define = function %s() {\n%s}\n' +
             '%s.prototype.details = function %s() {\n%s}\n' +
+            '%s.prototype.get = function %s() {\n%s}\n' +
+            '%s.prototype.set = function %s() {\n%s}\n' +
             '}') % (fname,
-                    fname, fname, (JOB_BLOCKS['"get"'] if '"get"' in JOB_BLOCKS else ''),
-                    fname, fname, (JOB_BLOCKS['"set"'] if '"set"' in JOB_BLOCKS else ''),
                     fname, fname, (JOB_BLOCKS['"define"'] if '"define"' in JOB_BLOCKS else ''),
                     fname, fname, (JOB_BLOCKS['"details"'] if '"details"' in JOB_BLOCKS else ''),
+                    fname, fname, (JOB_BLOCKS['"get"'] if '"get"' in JOB_BLOCKS else ''),
+                    fname, fname, (JOB_BLOCKS['"set"'] if '"set"' in JOB_BLOCKS else ''),
                    )