replace in with in1

197 files changed, 1013 insertions, 246 deletions

diff --git a/js/Branching/CLKGotoTagVisibility.js b/js/Branching/CLKGotoTagVisibility.js
index 87acfbf7..b92fc17a 100644
--- a/js/Branching/CLKGotoTagVisibility.js
+++ b/js/Branching/CLKGotoTagVisibility.js
@@ -29,7 +29,7 @@ needcompile=resume(needcompile)
 CLKGotoTagVisibility.prototype.define = function CLKGotoTagVisibility() {
 model=scicos_model();
 model.sim="clkgototagvisibility";
-model.in=[];
+model.in1=[];
 model.in2=[];
 model.out=[];
 model.out2=[];
diff --git a/js/Branching/ESELECT_f.js b/js/Branching/ESELECT_f.js
index 04639136..33d1799b 100644
--- a/js/Branching/ESELECT_f.js
+++ b/js/Branching/ESELECT_f.js
@@ -48,7 +48,7 @@ ESELECT_f.prototype.define = function ESELECT_f() {
 out=2;
 model=scicos_model();
 model.sim=list("eselect",-2);
-model.in=1;
+model.in1=1;
 model.in2=1;
 model.intyp=-1;
 model.evtin=1;
diff --git a/js/Branching/EXTRACTOR.js b/js/Branching/EXTRACTOR.js
index da00552f..30dfdac8 100644
--- a/js/Branching/EXTRACTOR.js
+++ b/js/Branching/EXTRACTOR.js
@@ -28,7 +28,7 @@ EXTRACTOR.prototype.define = function EXTRACTOR() {
 ind=1;
 model=scicos_model();
 model.sim=list("extractor",4);
-model.in=-1;
+model.in1=-1;
 model.out=1;
 model.blocktype="c";
 model.dep_ut=[true,None];
diff --git a/js/Branching/FROM.js b/js/Branching/FROM.js
index 6596f751..1d30488e 100644
--- a/js/Branching/FROM.js
+++ b/js/Branching/FROM.js
@@ -29,7 +29,7 @@ needcompile=resume(needcompile)
 FROM.prototype.define = function FROM() {
 model=scicos_model();
 model.sim="from";
-model.in=[];
+model.in1=[];
 model.in2=[];
 model.intyp=1;
 model.out=-1;
diff --git a/js/Branching/FROMMO.js b/js/Branching/FROMMO.js
index 81914673..4d05df90 100644
--- a/js/Branching/FROMMO.js
+++ b/js/Branching/FROMMO.js
@@ -29,7 +29,7 @@ needcompile=resume(needcompile)
 FROMMO.prototype.define = function FROMMO() {
 model=scicos_model();
 model.sim="frommo";
-model.in=[];
+model.in1=[];
 model.in2=[];
 model.intyp=1;
 model.out=-1;
diff --git a/js/Branching/GOTO.js b/js/Branching/GOTO.js
index 59694dfd..46623668 100644
--- a/js/Branching/GOTO.js
+++ b/js/Branching/GOTO.js
@@ -36,7 +36,7 @@ needcompile=resume(needcompile)
 GOTO.prototype.define = function GOTO() {
 model=scicos_model();
 model.sim="goto";
-model.in=-1;
+model.in1=-1;
 model.in2=-2;
 model.intyp=-1;
 model.out=[];
diff --git a/js/Branching/GOTOMO.js b/js/Branching/GOTOMO.js
index 866e5b2e..2b0f59bb 100644
--- a/js/Branching/GOTOMO.js
+++ b/js/Branching/GOTOMO.js
@@ -36,7 +36,7 @@ needcompile=resume(needcompile)
 GOTOMO.prototype.define = function GOTOMO() {
 model=scicos_model();
 model.sim="gotomo";
-model.in=-1;
+model.in1=-1;
 model.in2=-2;
 model.intyp=[];
 model.out=[];
diff --git a/js/Branching/GotoTagVisibility.js b/js/Branching/GotoTagVisibility.js
index bfd91c18..67e57ee9 100644
--- a/js/Branching/GotoTagVisibility.js
+++ b/js/Branching/GotoTagVisibility.js
@@ -29,7 +29,7 @@ needcompile=resume(needcompile)
 GotoTagVisibility.prototype.define = function GotoTagVisibility() {
 model=scicos_model();
 model.sim="gototagvisibility";
-model.in=[];
+model.in1=[];
 model.in2=[];
 model.out=[];
 model.out2=[];
diff --git a/js/Branching/GotoTagVisibilityMO.js b/js/Branching/GotoTagVisibilityMO.js
index 45e0a286..a6ba4fd4 100644
--- a/js/Branching/GotoTagVisibilityMO.js
+++ b/js/Branching/GotoTagVisibilityMO.js
@@ -29,7 +29,7 @@ needcompile=resume(needcompile)
 GotoTagVisibilityMO.prototype.define = function GotoTagVisibilityMO() {
 model=scicos_model();
 model.sim="gototagvisibilitymo";
-model.in=[];
+model.in1=[];
 model.in2=[];
 model.out=[];
 model.out2=[];
diff --git a/js/Branching/ISELECT_f.js b/js/Branching/ISELECT_f.js
index 60321a06..b8b47b51 100644
--- a/js/Branching/ISELECT_f.js
+++ b/js/Branching/ISELECT_f.js
@@ -32,7 +32,7 @@ out=[-1,-1];
 nout=2;
 model=scicos_model();
 model.sim=list("selector",2);
-model.in=-1;
+model.in1=-1;
 model.out=out;
 model.evtin=ones(out);
 model.dstate=z0;
diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js
index 745401ac..6a2a2d6e 100644
--- a/js/Branching/ISELECT_m.js
+++ b/js/Branching/ISELECT_m.js
@@ -43,7 +43,7 @@ model.sim=list("selector_m",4);
 model.out=[-1,-1];
 model.out2=[-2,-2];
 model.outtyp=1;
-model.in=-1;
+model.in1=-1;
 model.in2=-2;
 model.intyp=1;
 model.evtout=[];
diff --git a/js/Branching/MUX.js b/js/Branching/MUX.js
index 32335170..44b17cf3 100644
--- a/js/Branching/MUX.js
+++ b/js/Branching/MUX.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(IN,'in',1,1077)
+Syntax error in input LexToken(COLON,':',1,1548)
 /* autogenerated from "macros/Branching/MUX.sci" */
 None
diff --git a/js/Branching/MUX_f.js b/js/Branching/MUX_f.js
index 5a37f434..79353be5 100644
--- a/js/Branching/MUX_f.js
+++ b/js/Branching/MUX_f.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(IN,'in',1,1079)
+Syntax error in input LexToken(COLON,':',1,1549)
 /* autogenerated from "macros/Branching/MUX_f.sci" */
 None
diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js
index dc7ac82f..6d129024 100644
--- a/js/Branching/M_SWITCH.js
+++ b/js/Branching/M_SWITCH.js
@@ -49,7 +49,7 @@ ipar=[1,3];
 nin=2;
 model=scicos_model();
 model.sim=list("mswitch",4);
-model.in=in1;
+model.in1=in1;
 model.out=-1;
 model.ipar=ipar;
 model.blocktype="c";
diff --git a/js/Branching/NRMSOM_f.js b/js/Branching/NRMSOM_f.js
index e5545443..f5ddf6c1 100644
--- a/js/Branching/NRMSOM_f.js
+++ b/js/Branching/NRMSOM_f.js
@@ -26,7 +26,7 @@ in1=[-1,-1];
 nin=2;
 model=scicos_model();
 model.sim="junk";
-model.in=in1;
+model.in1=in1;
 model.out=-1;
 model.blocktype="c";
 model.dep_ut=[true,None];
diff --git a/js/Branching/RELAY_f.js b/js/Branching/RELAY_f.js
index 8c1d4f3c..4a2eb42c 100644
--- a/js/Branching/RELAY_f.js
+++ b/js/Branching/RELAY_f.js
@@ -33,7 +33,7 @@ in1=[-1,-1];
 nin=2;
 model=scicos_model();
 model.sim=list("relay",2);
-model.in=in1;
+model.in1=in1;
 model.out=-1;
 model.evtin=ones(in1);
 model.dstate=i0;
diff --git a/js/Branching/SCALAR2VECTOR.js b/js/Branching/SCALAR2VECTOR.js
index e2b718d8..c4d421d9 100644
--- a/js/Branching/SCALAR2VECTOR.js
+++ b/js/Branching/SCALAR2VECTOR.js
@@ -33,7 +33,7 @@ nout=-1;
 model=scicos_model();
 model.sim=list("scalar2vector",4);
 model.out=nout;
-model.in=1;
+model.in1=1;
 model.blocktype="c";
 model.dep_ut=[true,None];
 exprs=[string([nout])];
diff --git a/js/Branching/SELECT_f.js b/js/Branching/SELECT_f.js
index ad0616c1..7e1ffccb 100644
--- a/js/Branching/SELECT_f.js
+++ b/js/Branching/SELECT_f.js
@@ -32,7 +32,7 @@ in1=[-1,-1];
 nin=2;
 model=scicos_model();
 model.sim=list("selector",2);
-model.in=in1;
+model.in1=in1;
 model.out=-1;
 model.evtin=ones(in1);
 model.dstate=z0;
diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js
index d580454a..0506ed35 100644
--- a/js/Branching/SELECT_m.js
+++ b/js/Branching/SELECT_m.js
@@ -40,7 +40,7 @@ z0=1;
 nin=2;
 model=scicos_model();
 model.sim=list("selector_m",4);
-model.in=[-1,-1];
+model.in1=[-1,-1];
 model.in2=[-2,-2];
 model.intyp=1;
 model.out=-1;
diff --git a/js/Branching/SWITCH2.js b/js/Branching/SWITCH2.js
index 674f8ab6..c959e941 100644
--- a/js/Branching/SWITCH2.js
+++ b/js/Branching/SWITCH2.js
@@ -41,7 +41,7 @@ nzz=1;
 rpar=0;
 model=scicos_model();
 model.sim=list("switch2",4);
-model.in=in1;
+model.in1=in1;
 model.out=-1;
 model.ipar=ipar;
 model.rpar=rpar;
diff --git a/js/Branching/SWITCH2_m.js b/js/Branching/SWITCH2_m.js
index de9b99b5..56adcfd6 100644
--- a/js/Branching/SWITCH2_m.js
+++ b/js/Branching/SWITCH2_m.js
@@ -37,7 +37,7 @@ if (ok) {
 it[1-1]=ot;
 it[2-1]=1;
 it[3-1]=ot;
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
 out=[model.out,model.out2];
 [model,graphics,ok]=set_io(model,graphics,list(in1,it),list(out,ot),[],[]);
 }
@@ -54,7 +54,7 @@ nzz=1;
 rpar=0;
 model=scicos_model();
 model.sim=list("switch2_m",4);
-model.in=[-1,1,-1];
+model.in1=[-1,1,-1];
 model.in2=[-2,1,-2];
 model.intyp=1;
 model.out=-1;
diff --git a/js/Branching/SWITCH_f.js b/js/Branching/SWITCH_f.js
index b2833318..4eb039a3 100644
--- a/js/Branching/SWITCH_f.js
+++ b/js/Branching/SWITCH_f.js
@@ -33,7 +33,7 @@ in1=[-1,-1];
 nin=2;
 model=scicos_model();
 model.sim=list("switchn",2);
-model.in=in1;
+model.in1=in1;
 model.out=-1;
 model.ipar=i0;
 model.blocktype="c";
diff --git a/js/Electrical/CCS.js b/js/Electrical/CCS.js
index f96289bf..7b6c8f8a 100644
--- a/js/Electrical/CCS.js
+++ b/js/Electrical/CCS.js
@@ -51,7 +51,7 @@ model.blocktype="c";
 model.dep_ut=[None,true];
 mo.model=ModelName;
 model.equations=mo;
-model.in=ones(size(MI,"*"),1);
+model.in1=ones(size(MI,"*"),1);
 model.out=ones(size(MO,"*"),1);
 x=standard_define([2.1,3],model,exprs,list(gr_i,0));
 x.graphics.in_implicit=Typein;
diff --git a/js/Electrical/CVS.js b/js/Electrical/CVS.js
index 20c65e8e..fafe0170 100644
--- a/js/Electrical/CVS.js
+++ b/js/Electrical/CVS.js
@@ -51,7 +51,7 @@ model.blocktype="c";
 model.dep_ut=[None,true];
 mo.model=ModelName;
 model.equations=mo;
-model.in=ones(size(MI,"*"),1);
+model.in1=ones(size(MI,"*"),1);
 model.out=ones(size(MO,"*"),1);
 x=standard_define([2.1,3],model,exprs,list(gr_i,0));
 x.graphics.in_implicit=Typein;
diff --git a/js/Electrical/Capacitor.js b/js/Electrical/Capacitor.js
index 0f32994e..dd90810a 100644
--- a/js/Electrical/Capacitor.js
+++ b/js/Electrical/Capacitor.js
@@ -34,7 +34,7 @@ mo.inputs="p";
 mo.outputs="n";
 mo.parameters=list(["C","v"],list(C,v),[0,1]);
 model.equations=mo;
-model.in=ones(size(mo.inputs,"*"),1);
+model.in1=ones(size(mo.inputs,"*"),1);
 model.out=ones(size(mo.outputs,"*"),1);
 exprs=string([C,v]);
 gr_i=[];
diff --git a/js/Electrical/ConstantVoltage.js b/js/Electrical/ConstantVoltage.js
index 81c487b5..f5382cec 100644
--- a/js/Electrical/ConstantVoltage.js
+++ b/js/Electrical/ConstantVoltage.js
@@ -24,7 +24,7 @@ ConstantVoltage.prototype.define = function ConstantVoltage() {
 V=0.01;
 model=scicos_model();
 model.rpar=V;
-model.in=1;
+model.in1=1;
 model.out=1;
 model.sim="ConstantVoltage";
 model.blocktype="c";
diff --git a/js/Electrical/CurrentSensor.js b/js/Electrical/CurrentSensor.js
index ac8063d1..8d21b7fc 100644
--- a/js/Electrical/CurrentSensor.js
+++ b/js/Electrical/CurrentSensor.js
@@ -7,7 +7,7 @@ x=arg1;
 }
 CurrentSensor.prototype.define = function CurrentSensor() {
 model=scicos_model();
-model.in=1;
+model.in1=1;
 model.out=[1,1];
 model.sim="CurrentSensor";
 model.blocktype="c";
diff --git a/js/Electrical/Diode.js b/js/Electrical/Diode.js
index 56672e8d..fe93a706 100644
--- a/js/Electrical/Diode.js
+++ b/js/Electrical/Diode.js
@@ -27,7 +27,7 @@ Maxexp=15;
 R=1.e8;
 model=scicos_model();
 model.rpar=[Ids,Vt,Maxexp,R];
-model.in=1;
+model.in1=1;
 model.out=1;
 model.sim="Diode";
 model.blocktype="c";
diff --git a/js/Electrical/Ground.js b/js/Electrical/Ground.js
index e8f0c338..e0c3d1c7 100644
--- a/js/Electrical/Ground.js
+++ b/js/Electrical/Ground.js
@@ -7,7 +7,7 @@ x=arg1;
 }
 Ground.prototype.define = function Ground() {
 model=scicos_model();
-model.in=[1];
+model.in1=[1];
 model.out=[];
 model.sim="Ground";
 model.blocktype="c";
diff --git a/js/Electrical/Gyrator.js b/js/Electrical/Gyrator.js
index 942a9ac5..bd401713 100644
--- a/js/Electrical/Gyrator.js
+++ b/js/Electrical/Gyrator.js
@@ -61,7 +61,7 @@ model.blocktype="c";
 model.dep_ut=[None,true];
 mo.model=ModelName;
 model.equations=mo;
-model.in=ones(size(MI,"*"),1);
+model.in1=ones(size(MI,"*"),1);
 model.out=ones(size(MO,"*"),1);
 x=standard_define([2,2],model,exprs,list(gr_i,0));
 x.graphics.in_implicit=Typein;
diff --git a/js/Electrical/IdealTransformer.js b/js/Electrical/IdealTransformer.js
index f92463f7..9f127ca9 100644
--- a/js/Electrical/IdealTransformer.js
+++ b/js/Electrical/IdealTransformer.js
@@ -61,7 +61,7 @@ model.blocktype="c";
 model.dep_ut=[None,true];
 mo.model=ModelName;
 model.equations=mo;
-model.in=ones(size(MI,"*"),1);
+model.in1=ones(size(MI,"*"),1);
 model.out=ones(size(MO,"*"),1);
 x=standard_define([2,2],model,exprs,list(gr_i,0));
 x.graphics.in_implicit=Typein;
diff --git a/js/Electrical/MOTOR.js b/js/Electrical/MOTOR.js
index f5f29a3f..c8e0ae1c 100644
--- a/js/Electrical/MOTOR.js
+++ b/js/Electrical/MOTOR.js
@@ -8,7 +8,7 @@ x=arg1;
 MOTOR.prototype.define = function MOTOR() {
 model=scicos_model();
 model.out=[1,1];
-model.in=[1];
+model.in1=[1];
 model.sim="motor";
 model.blocktype="c";
 model.dep_ut=[true,None];
diff --git a/js/Electrical/NMOS.js b/js/Electrical/NMOS.js
index dad1e53a..5a260d3c 100644
--- a/js/Electrical/NMOS.js
+++ b/js/Electrical/NMOS.js
@@ -39,7 +39,7 @@ mo.outputs=["D","B","S"];
 mo.inputs="G";
 mo.parameters=list(["W","L","Beta","Vt","K2","K5","dW","dL","RDS"],[W,L,Beta,Vt,K2,K5,dW,dL,RDS]);
 model.equations=mo;
-model.in=ones(size(mo.inputs,"*"),1);
+model.in1=ones(size(mo.inputs,"*"),1);
 model.out=ones(size(mo.outputs,"*"),1);
 exprs=[string(W),string(L),string(Beta),string(Vt),string(K2),string(K5),string(dW),string(dL),string(RDS)];
 gr_i=[];
diff --git a/js/Electrical/OpAmp.js b/js/Electrical/OpAmp.js
index 375ed583..7f9ae819 100644
--- a/js/Electrical/OpAmp.js
+++ b/js/Electrical/OpAmp.js
@@ -32,7 +32,7 @@ mo.inputs=["in_p","in_n"];
 mo.outputs=["out"];
 mo.parameters=list(S,Z);
 model.equations=mo;
-model.in=ones(size(mo.inputs,"*"),1);
+model.in1=ones(size(mo.inputs,"*"),1);
 model.out=ones(size(mo.outputs,"*"),1);
 model.rpar=Z;
 exprs=string(Z);
diff --git a/js/Electrical/PMOS.js b/js/Electrical/PMOS.js
index 7353f0aa..935faf35 100644
--- a/js/Electrical/PMOS.js
+++ b/js/Electrical/PMOS.js
@@ -39,7 +39,7 @@ mo.outputs=["D","B","S"];
 mo.inputs="G";
 mo.parameters=list(["W","L","Beta","Vt","K2","K5","dW","dL","RDS"],[W,L,Beta,Vt,K2,K5,dW,dL,RDS]);
 model.equations=mo;
-model.in=ones(size(mo.inputs,"*"),1);
+model.in1=ones(size(mo.inputs,"*"),1);
 model.out=ones(size(mo.outputs,"*"),1);
 exprs=[string(W),string(L),string(Beta),string(Vt),string(K2),string(K5),string(dW),string(dL),string(RDS)];
 gr_i=[];
diff --git a/js/Electrical/PotentialSensor.js b/js/Electrical/PotentialSensor.js
index 72c1d085..4e6158e6 100644
--- a/js/Electrical/PotentialSensor.js
+++ b/js/Electrical/PotentialSensor.js
@@ -7,7 +7,7 @@ x=arg1;
 }
 PotentialSensor.prototype.define = function PotentialSensor() {
 model=scicos_model();
-model.in=[1];
+model.in1=[1];
 model.out=[1];
 model.rpar=[];
 model.sim="PotentialSensor";
diff --git a/js/Electrical/Resistor.js b/js/Electrical/Resistor.js
index d2f297d8..b796d2fc 100644
--- a/js/Electrical/Resistor.js
+++ b/js/Electrical/Resistor.js
@@ -33,7 +33,7 @@ mo.inputs="p";
 mo.outputs="n";
 mo.parameters=list("R",list(R));
 model.equations=mo;
-model.in=ones(size(mo.inputs,"*"),1);
+model.in1=ones(size(mo.inputs,"*"),1);
 model.out=ones(size(mo.outputs,"*"),1);
 exprs=string(R);
 gr_i=[];
diff --git a/js/Electrical/SineVoltage.js b/js/Electrical/SineVoltage.js
index a2584b97..b98414de 100644
--- a/js/Electrical/SineVoltage.js
+++ b/js/Electrical/SineVoltage.js
@@ -22,7 +22,7 @@ break
 }
 SineVoltage.prototype.define = function SineVoltage() {
 model=scicos_model();
-model.in=[1];
+model.in1=[1];
 model.out=[1];
 V=1;
 ph=0;
diff --git a/js/Electrical/Switch.js b/js/Electrical/Switch.js
index aeda600f..b3f769f8 100644
--- a/js/Electrical/Switch.js
+++ b/js/Electrical/Switch.js
@@ -34,7 +34,7 @@ mo.inputs=["p","inp"];
 mo.outputs="n";
 mo.parameters=list(S,Z);
 model.equations=mo;
-model.in=ones(size(mo.inputs,"*"),1);
+model.in1=ones(size(mo.inputs,"*"),1);
 model.out=ones(size(mo.outputs,"*"),1);
 model.rpar=Z;
 exprs=string(Z);
diff --git a/js/Electrical/VVsourceAC.js b/js/Electrical/VVsourceAC.js
index a383f6fa..eb46d55f 100644
--- a/js/Electrical/VVsourceAC.js
+++ b/js/Electrical/VVsourceAC.js
@@ -22,7 +22,7 @@ break
 }
 VVsourceAC.prototype.define = function VVsourceAC() {
 model=scicos_model();
-model.in=[1,1];
+model.in1=[1,1];
 model.out=[1];
 VA=220;
 FR=50;
diff --git a/js/Electrical/VariableResistor.js b/js/Electrical/VariableResistor.js
index b692ac66..962caa62 100644
--- a/js/Electrical/VariableResistor.js
+++ b/js/Electrical/VariableResistor.js
@@ -15,7 +15,7 @@ mo.model="VariableResistor";
 mo.inputs=["p","R"];
 mo.outputs="n";
 model.equations=mo;
-model.in=ones(size(mo.inputs,"*"),1);
+model.in1=ones(size(mo.inputs,"*"),1);
 model.out=ones(size(mo.outputs,"*"),1);
 exprs=[];
 gr_i=[];
diff --git a/js/Electrical/VoltageSensor.js b/js/Electrical/VoltageSensor.js
index 6889a7e7..a50dac25 100644
--- a/js/Electrical/VoltageSensor.js
+++ b/js/Electrical/VoltageSensor.js
@@ -7,7 +7,7 @@ x=arg1;
 }
 VoltageSensor.prototype.define = function VoltageSensor() {
 model=scicos_model();
-model.in=1;
+model.in1=1;
 model.out=[1,1];
 model.sim="VoltageSensor";
 model.blocktype="c";
diff --git a/js/Electrical/VsourceAC.js b/js/Electrical/VsourceAC.js
index fbe379c9..e3b8b8c4 100644
--- a/js/Electrical/VsourceAC.js
+++ b/js/Electrical/VsourceAC.js
@@ -22,7 +22,7 @@ break
 }
 VsourceAC.prototype.define = function VsourceAC() {
 model=scicos_model();
-model.in=[1];
+model.in1=[1];
 model.out=[1];
 VA=220;
 FR=50;
diff --git a/js/Events/ANDBLK.js b/js/Events/ANDBLK.js
index 4610122a..380a7d3e 100644
--- a/js/Events/ANDBLK.js
+++ b/js/Events/ANDBLK.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,2397)
+Syntax error in input LexToken(ASSIGNMENT,'=',1,2555)
 /* autogenerated from "macros/Events/ANDBLK.sci" */
 None
diff --git a/js/Events/EVTVARDLY.js b/js/Events/EVTVARDLY.js
index f1791717..428c04d8 100644
--- a/js/Events/EVTVARDLY.js
+++ b/js/Events/EVTVARDLY.js
@@ -22,7 +22,7 @@ break
 EVTVARDLY.prototype.define = function EVTVARDLY() {
 model=scicos_model();
 model.sim=list("evtvardly",4);
-model.in=1;
+model.in1=1;
 model.evtin=1;
 model.evtout=1;
 model.blocktype="d";
diff --git a/js/Events/IFTHEL_f.js b/js/Events/IFTHEL_f.js
index b08b21b1..402b8d77 100644
--- a/js/Events/IFTHEL_f.js
+++ b/js/Events/IFTHEL_f.js
@@ -41,7 +41,7 @@ break
 IFTHEL_f.prototype.define = function IFTHEL_f() {
 model=scicos_model();
 model.sim=list("ifthel",-1);
-model.in=1;
+model.in1=1;
 model.in2=1;
 model.intyp=-1;
 model.evtin=1;
@@ -52,7 +52,7 @@ model.dep_ut=[true,None];
 model.nmode=1;
 model.nzcross=1;
 gr_i=[];
-exprs=[string(model.in),string(model.nmode)];
+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 3b0d134a..a455e0e7 100644
--- a/js/Events/MCLOCK_f.js
+++ b/js/Events/MCLOCK_f.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,3191)
+Syntax error in input LexToken(ASSIGNMENT,'=',1,3309)
 /* autogenerated from "macros/Events/MCLOCK_f.sci" */
 None
diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js
index ab99cf36..2481eab0 100644
--- a/js/Hydraulics/Flowmeter.js
+++ b/js/Hydraulics/Flowmeter.js
@@ -61,7 +61,7 @@ model.blocktype="c";
 model.dep_ut=[None,true];
 mo.model=ModelName;
 model.equations=mo;
-model.in=ones(size(MI,"*"),1);
+model.in1=ones(size(MI,"*"),1);
 model.out=ones(size(MO,"*"),1);
 x=standard_define([2,2],model,exprs,list(gr_i,0));
 x.graphics.in_implicit=Typein;
diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js
index 7a65f6fd..ac6a1eb7 100644
--- a/js/Hydraulics/PerteDP.js
+++ b/js/Hydraulics/PerteDP.js
@@ -22,7 +22,7 @@ break
 }
 PerteDP.prototype.define = function PerteDP() {
 model=scicos_model();
-model.in=[1];
+model.in1=[1];
 model.out=[1];
 L=10;
 D=0.2;
@@ -40,7 +40,7 @@ mo.inputs="C1";
 mo.outputs="C2";
 mo.parameters=list(["L","D","lambda","z1","z2","p_rho"],[L,D,lambda,z1,z2,p_rho]);
 model.equations=mo;
-model.in=ones(size(mo.inputs,"*"),1);
+model.in1=ones(size(mo.inputs,"*"),1);
 model.out=ones(size(mo.outputs,"*"),1);
 exprs=[string(L),string(D),string(lambda),string(z1),string(z2),string(p_rho)];
 gr_i=[];
diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js
index af031dee..30c6bc5c 100644
--- a/js/Hydraulics/PuitsP.js
+++ b/js/Hydraulics/PuitsP.js
@@ -35,7 +35,7 @@ mo.model="Puits";
 mo.inputs=["C"];
 mo.parameters=list(["P0","T0","H0","option_temperature"],[P0,T0,H0,option_temperature]);
 model.equations=mo;
-model.in=ones(size(mo.inputs,"*"),1);
+model.in1=ones(size(mo.inputs,"*"),1);
 exprs=[string(P0),string(T0),string(H0),string(option_temperature)];
 gr_i=[];
 x=standard_define([2.5,2],model,exprs,list(gr_i,0));
diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js
index 6d0dfaaa..0dcf58c4 100644
--- a/js/Hydraulics/SourceP.js
+++ b/js/Hydraulics/SourceP.js
@@ -36,7 +36,7 @@ mo.inputs=[];
 mo.outputs=["C"];
 mo.parameters=list(["P0","T0","H0","option_temperature"],[P0,T0,H0,option_temperature]);
 model.equations=mo;
-model.in=ones(size(mo.inputs,"*"),1);
+model.in1=ones(size(mo.inputs,"*"),1);
 model.out=ones(size(mo.outputs,"*"),1);
 exprs=[string(P0),string(T0),string(H0),string(option_temperature)];
 gr_i=[];
diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js
index 030932df..cc7b1f9c 100644
--- a/js/Hydraulics/VanneReglante.js
+++ b/js/Hydraulics/VanneReglante.js
@@ -22,7 +22,7 @@ break
 }
 VanneReglante.prototype.define = function VanneReglante() {
 model=scicos_model();
-model.in=[1,1];
+model.in1=[1,1];
 model.out=[1];
 Cvmax=8005.42;
 p_rho=0;
@@ -36,7 +36,7 @@ mo.inputs=["C1","Ouv"];
 mo.outputs="C2";
 mo.parameters=list(["Cvmax","p_rho"],[Cvmax,p_rho]);
 model.equations=mo;
-model.in=ones(size(mo.inputs,"*"),1);
+model.in1=ones(size(mo.inputs,"*"),1);
 model.out=ones(size(mo.outputs,"*"),1);
 exprs=[string(Cvmax),string(p_rho)];
 gr_i=[];
diff --git a/js/IntegerOp/BITCLEAR.js b/js/IntegerOp/BITCLEAR.js
index dc944e1c..b6df40d7 100644
--- a/js/IntegerOp/BITCLEAR.js
+++ b/js/IntegerOp/BITCLEAR.js
@@ -12,7 +12,7 @@ while (true) {
 if (!ok) {
 break
 }
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
 if (floor(bit)!=bit) {
 block_parameter_error(msprintf(gettext("Wrong type for \'%s\' parameter: %5.1f."),gettext("Index of Bit"),bit),gettext("Must be integer."));
 ok=None;
@@ -68,7 +68,7 @@ break
 BITCLEAR.prototype.define = function BITCLEAR() {
 model=scicos_model();
 model.sim=list("bit_clear_32",4);
-model.in=1;
+model.in1=1;
 model.in2=1;
 model.out=1;
 model.out2=1;
diff --git a/js/IntegerOp/BITSET.js b/js/IntegerOp/BITSET.js
index 75523ebe..75932e1c 100644
--- a/js/IntegerOp/BITSET.js
+++ b/js/IntegerOp/BITSET.js
@@ -12,7 +12,7 @@ while (true) {
 if (!ok) {
 break
 }
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
 if (floor(bit)!=bit) {
 block_parameter_error(msprintf(gettext("Wrong type for \'%s\' parameter: %5.1f."),gettext("Index of Bit"),bit),gettext("Must be integer."));
 ok=None;
@@ -66,7 +66,7 @@ break
 BITSET.prototype.define = function BITSET() {
 model=scicos_model();
 model.sim=list("bit_set_32",4);
-model.in=1;
+model.in1=1;
 model.in2=1;
 model.out=1;
 model.out2=1;
diff --git a/js/IntegerOp/CONVERT.js b/js/IntegerOp/CONVERT.js
index e1c752e1..efd20a83 100644
--- a/js/IntegerOp/CONVERT.js
+++ b/js/IntegerOp/CONVERT.js
@@ -334,7 +334,7 @@ model.ipar=37;
 }
 }
 }
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
 out=[model.out,model.out2];
 if (ok) {
 [model,graphics,ok]=set_io(model,graphics,list(in1,it),list(out,ot),[],[]);
@@ -351,7 +351,7 @@ CONVERT.prototype.define = function CONVERT() {
 sgn=2;
 model=scicos_model();
 model.sim=list("convert",4);
-model.in=-1;
+model.in1=-1;
 model.out=-1;
 model.in2=-2;
 model.out2=-2;
diff --git a/js/IntegerOp/DFLIPFLOP.js b/js/IntegerOp/DFLIPFLOP.js
index 4b4790b1..272a2524 100644
--- a/js/IntegerOp/DFLIPFLOP.js
+++ b/js/IntegerOp/DFLIPFLOP.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,1019)
+Syntax error in input LexToken(ASSIGNMENT,'=',1,1052)
 /* autogenerated from "macros/IntegerOp/DFLIPFLOP.sci" */
 None
diff --git a/js/IntegerOp/DLATCH.js b/js/IntegerOp/DLATCH.js
index f7077d23..07de8670 100644
--- a/js/IntegerOp/DLATCH.js
+++ b/js/IntegerOp/DLATCH.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,982)
+Syntax error in input LexToken(ASSIGNMENT,'=',1,1015)
 /* autogenerated from "macros/IntegerOp/DLATCH.sci" */
 None
diff --git a/js/IntegerOp/INTMUL.js b/js/IntegerOp/INTMUL.js
index 788ecfff..cb401856 100644
--- a/js/IntegerOp/INTMUL.js
+++ b/js/IntegerOp/INTMUL.js
@@ -8,14 +8,14 @@ graphics=arg1.graphics;
 model=arg1.model;
 exprs=graphics.exprs;
 while (true) {
-[ok,Datatype,np,exprs]=scicos_getvalue( [msprintf(gettext("Set %s block parameters"),"INTMUL")," ",gettext("Integer matrix multiplication")," "],[msprintf(gettext("Data Type %s"),"(3:int32, 4:int16, 5:int8, ...)"),gettext("Do on Overflow (0:Nothing, 1:Saturate, 2:Error)")],list("vec",1,"vec",1),exprs);
+[ok,Datatype,np,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"INTMUL")," ",gettext("Integer matrix multiplication")," "],[msprintf(gettext("Data Type %s"),"(3:int32, 4:int16, 5:int8, ...)"),gettext("Do on Overflow (0:Nothing, 1:Saturate, 2:Error)")],list("vec",1,"vec",1),exprs);
 if (!ok) {
 break
 }
 it=Datatype*ones(1,2);
 ot=Datatype;
 if ((np!=0&&np!=1&&np!=2)) {
-block_parameter_error(msprintf( gettext("Wrong value for \'%s\' parameter: %d."),gettext("Do on Overflow"),np),msprintf( gettext("Must be in the interval %s."),"[0, 2]"));
+block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Do on Overflow"),np),msprintf(gettext("Must be in the interval %s."),"[0, 2]"));
 ok=None;
 } else if (Datatype==3) {
 if (np==0) {
@@ -69,7 +69,7 @@ model.sim=list("matmul_ui8e",4);
 block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Data Type"),ot),msprintf(gettext("Must be in the interval %s."),"[3, 8]"));
 ok=None;
 }
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
 out=[model.out,model.out2];
 if (ok) {
 [model,graphics,ok]=set_io(model,graphics,list(in1,it),list(out,ot),[],[]);
@@ -87,7 +87,7 @@ INTMUL.prototype.define = function INTMUL() {
 sgn=0;
 model=scicos_model();
 model.sim=list("matmul_i32",4);
-model.in=[-1,-2];
+model.in1=[-1,-2];
 model.out=-1;
 model.in2=[-2,-3];
 model.out2=-3;
diff --git a/js/IntegerOp/JKFLIPFLOP.js b/js/IntegerOp/JKFLIPFLOP.js
index bb35a7f9..28932383 100644
--- a/js/IntegerOp/JKFLIPFLOP.js
+++ b/js/IntegerOp/JKFLIPFLOP.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,2710)
+Syntax error in input LexToken(ASSIGNMENT,'=',1,2743)
 /* autogenerated from "macros/IntegerOp/JKFLIPFLOP.sci" */
 None
diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js
index b767d12c..88c2d598 100644
--- a/js/IntegerOp/LOGIC.js
+++ b/js/IntegerOp/LOGIC.js
@@ -46,7 +46,7 @@ LOGIC.prototype.define = function LOGIC() {
 mat=[0,0,0,1];
 model=scicos_model();
 model.sim=list("logic",4);
-model.in=[1,1];
+model.in1=[1,1];
 model.in2=[1,1];
 model.out=1;
 model.out2=1;
diff --git a/js/IntegerOp/SRFLIPFLOP.js b/js/IntegerOp/SRFLIPFLOP.js
index 373b9846..35535c0d 100644
--- a/js/IntegerOp/SRFLIPFLOP.js
+++ b/js/IntegerOp/SRFLIPFLOP.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,2641)
+Syntax error in input LexToken(ASSIGNMENT,'=',1,2674)
 /* autogenerated from "macros/IntegerOp/SRFLIPFLOP.sci" */
 None
diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js
index 6d03b9a4..8ecf506c 100644
--- a/js/Linear/BIGSOM_f.js
+++ b/js/Linear/BIGSOM_f.js
@@ -27,7 +27,7 @@ BIGSOM_f.prototype.define = function BIGSOM_f() {
 sgn=[1,1];
 model=scicos_model();
 model.sim=list("sum",2);
-model.in=[-1,-1];
+model.in1=[-1,-1];
 model.out=-1;
 model.rpar=sgn;
 model.blocktype="c";
diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js
index 636ab9a0..8479afa7 100644
--- a/js/Linear/DELAYV_f.js
+++ b/js/Linear/DELAYV_f.js
@@ -7,7 +7,7 @@ x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
-nin=model.in(1);
+nin=model.in1(1);
 z0=model.dstate;
 zz0=z0.slice(1-1,$-1);
 told=z0($);
@@ -44,7 +44,7 @@ zz0=z0.slice(1-1,$-1);
 T=1;
 model=scicos_model();
 model.sim=list("delayv",1);
-model.in=[nin,1];
+model.in1=[nin,1];
 model.out=nin;
 model.evtin=1;
 model.evtout=[1,1];
diff --git a/js/Linear/DELAY_f.js b/js/Linear/DELAY_f.js
index 34a179e7..969de821 100644
--- a/js/Linear/DELAY_f.js
+++ b/js/Linear/DELAY_f.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,4890)
+Syntax error in input LexToken(ASSIGNMENT,'=',1,5081)
 /* autogenerated from "macros/Linear/DELAY_f.sci" */
 None
diff --git a/js/Linear/DERIV.js b/js/Linear/DERIV.js
index 7adc33b3..13107bf8 100644
--- a/js/Linear/DERIV.js
+++ b/js/Linear/DERIV.js
@@ -8,7 +8,7 @@ x=arg1;
 DERIV.prototype.define = function DERIV() {
 model=scicos_model();
 model.sim=list("deriv",4);
-model.in=-1;
+model.in1=-1;
 model.out=-1;
 model.blocktype="x";
 model.dep_ut=[true,None];
diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js
index c3ea5c21..3f2877af 100644
--- a/js/Linear/DIFF_c.js
+++ b/js/Linear/DIFF_c.js
@@ -29,7 +29,7 @@ if (!ask_again) {
 graphics.exprs=exprs;
 model.state=[x0,xd0];
 model.out=[N];
-model.in=N;
+model.in1=N;
 x.graphics=graphics;
 x.model=model;
 break
@@ -41,7 +41,7 @@ DIFF_c.prototype.define = function DIFF_c() {
 x0=[0,0];
 model=scicos_model();
 model.sim=list("diffblk_c",10004);
-model.in=1;
+model.in1=1;
 model.out=1;
 model.state=x0;
 model.blocktype="c";
diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js
index 8625f8e1..bf5ca2b8 100644
--- a/js/Linear/DOLLAR.js
+++ b/js/Linear/DOLLAR.js
@@ -76,7 +76,7 @@ in1=1;
 exprs=string([z,inh]);
 model=scicos_model();
 model.sim=list("dollar4",4);
-model.in=in1;
+model.in1=in1;
 model.out=in1;
 model.evtin=1-inh;
 model.dstate=z;
diff --git a/js/Linear/DOLLAR_f.js b/js/Linear/DOLLAR_f.js
index 893131f1..18b2a5d9 100644
--- a/js/Linear/DOLLAR_f.js
+++ b/js/Linear/DOLLAR_f.js
@@ -26,7 +26,7 @@ if (ok) {
 if (ok) {
 graphics.exprs=exprs;
 model.dstate=a;
-model.in=in1;
+model.in1=in1;
 model.out=out;
 x.graphics=graphics;
 x.model=model;
@@ -41,7 +41,7 @@ in1=1;
 exprs=string([z,inh]);
 model=scicos_model();
 model.sim="dollar";
-model.in=in1;
+model.in1=in1;
 model.out=in1;
 model.evtin=1-inh;
 model.dstate=z;
diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js
index 5f9397f6..fa3c85c7 100644
--- a/js/Linear/DOLLAR_m.js
+++ b/js/Linear/DOLLAR_m.js
@@ -76,7 +76,7 @@ in1=1;
 exprs=string([z,inh]);
 model=scicos_model();
 model.sim=list("dollar4",4);
-model.in=in1;
+model.in1=in1;
 model.out=in1;
 model.evtin=1-inh;
 model.dstate=z;
diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js
index d78df918..5901ff74 100644
--- a/js/Linear/GAINBLK.js
+++ b/js/Linear/GAINBLK.js
@@ -1,3 +1,147 @@
-Syntax error in input LexToken(IN,'in',1,5659)
 /* autogenerated from "macros/Linear/GAINBLK.sci" */
-None
+function GAINBLK() {
+GAINBLK.prototype.get = function GAINBLK() {
+}
+GAINBLK.prototype.set = function GAINBLK() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+if (size(exprs,"*")==1) {
+exprs=[exprs,sci2exp(0)];
+}
+while (true) {
+[ok,gain,over,exprs]=scicos_getvalue("Set gain block parameters",["Gain","Do On Overflow(0=Nothing 1=Saturate 2=Error)"],list("mat",[-1,-1],"vec",1),exprs);
+if (!ok) {
+break
+}
+if (gain==[]) {
+message("Gain must have at least one element");
+} else {
+if (typeof(gain)=="constant") {
+if (isreal(gain)) {
+it=1;
+ot=1;
+model.sim=list("gainblk",4);
+model.rpar=gain.slice();
+model.opar=list();
+} else {
+message("type is not supported");
+ok=None;
+}
+} else {
+if ((over==0)) {
+if ((typeof(gain)=="int32")) {
+ot=3;
+model.sim=list("gainblk_i32n",4);
+} else if ((typeof(gain)=="int16")) {
+ot=4;
+model.sim=list("gainblk_i16n",4);
+} else if ((typeof(gain)=="int8")) {
+ot=5;
+model.sim=list("gainblk_i8n",4);
+} else if ((typeof(gain)=="uint32")) {
+ot=6;
+model.sim=list("gainblk_ui32n",4);
+} else if ((typeof(gain)=="uint16")) {
+ot=7;
+model.sim=list("gainblk_ui16n",4);
+} else if ((typeof(gain)=="uint8")) {
+ot=8;
+model.sim=list("gainblk_ui8n",4);
+} else {
+message("type is not supported.");
+ok=None;
+}
+} else if ((over==1)) {
+if ((typeof(gain)=="int32")) {
+ot=3;
+model.sim=list("gainblk_i32s",4);
+} else if ((typeof(gain)=="int16")) {
+ot=4;
+model.sim=list("gainblk_i16s",4);
+} else if ((typeof(gain)=="int8")) {
+ot=5;
+model.sim=list("gainblk_i8s",4);
+} else if ((typeof(gain)=="uint32")) {
+ot=6;
+model.sim=list("gainblk_ui32s",4);
+} else if ((typeof(gain)=="uint16")) {
+ot=7;
+model.sim=list("gainblk_ui16s",4);
+} else if ((typeof(gain)=="uint8")) {
+ot=8;
+model.sim=list("gainblk_ui8s",4);
+} else {
+message("type is not supported.");
+ok=None;
+}
+} else if ((over==2)) {
+if ((typeof(gain)=="int32")) {
+ot=3;
+model.sim=list("gainblk_i32e",4);
+} else if ((typeof(gain)=="int16")) {
+ot=4;
+model.sim=list("gainblk_i16e",4);
+} else if ((typeof(gain)=="int8")) {
+ot=5;
+model.sim=list("gainblk_i8e",4);
+} else if ((typeof(gain)=="uint32")) {
+ot=6;
+model.sim=list("gainblk_ui32e",4);
+} else if ((typeof(gain)=="uint16")) {
+ot=7;
+model.sim=list("gainblk_ui16e",4);
+} else if ((typeof(gain)=="uint8")) {
+ot=8;
+model.sim=list("gainblk_ui8e",4);
+} else {
+message("type is not an integer.");
+ok=None;
+}
+} else {
+message("Do on Overflow must be 0,1,2");
+ok=None;
+}
+model.rpar=[];
+model.opar=list(gain.slice());
+}
+if (ok) {
+[out,in1]=size(gain);
+if (out*in1!=1) {
+[model,graphics,ok]=set_io(model,graphics,list([in1,-1],ot),list([out,-1],ot),[],[]);
+} else {
+[model,graphics,ok]=set_io(model,graphics,list([-1,-2],ot),list([-1,-2],ot),[],[]);
+}
+}
+if (ok) {
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+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,None];
+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 a1fffa2b..fc9d6680 100644
--- a/js/Linear/GAINBLK_f.js
+++ b/js/Linear/GAINBLK_f.js
@@ -1,3 +1,47 @@
-Syntax error in input LexToken(IN,'in',1,1386)
 /* autogenerated from "macros/Linear/GAINBLK_f.sci" */
-None
+function GAINBLK_f() {
+GAINBLK_f.prototype.get = function GAINBLK_f() {
+}
+GAINBLK_f.prototype.set = function GAINBLK_f() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,gain,exprs]=scicos_getvalue("Set gain block parameters",["Gain"],list("mat",[-1,-1]),exprs(1));
+if (!ok) {
+break
+}
+if (gain==[]) {
+message("Gain must have at least one element");
+} else {
+[out,in1]=size(gain);
+[model,graphics,ok]=check_io(model,graphics,in1,out,[],[]);
+if (ok) {
+graphics.exprs=exprs;
+model.rpar=gain.slice();
+x.graphics=graphics;
+x.model=model;
+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,None];
+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 bea1b63f..dc7c38b5 100644
--- a/js/Linear/GAIN_f.js
+++ b/js/Linear/GAIN_f.js
@@ -1,3 +1,47 @@
-Syntax error in input LexToken(IN,'in',1,1383)
 /* autogenerated from "macros/Linear/GAIN_f.sci" */
-None
+function GAIN_f() {
+GAIN_f.prototype.get = function GAIN_f() {
+}
+GAIN_f.prototype.set = function GAIN_f() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,gain,exprs]=scicos_getvalue("Set gain block parameters",["Gain"],list("mat",[-1,-1]),exprs(1));
+if (!ok) {
+break
+}
+if (gain==[]) {
+message("Gain must have at least one element");
+} else {
+[out,in1]=size(gain);
+[model,graphics,ok]=check_io(model,graphics,in1,out,[],[]);
+if (ok) {
+graphics.exprs=exprs;
+model.rpar=gain.slice();
+x.graphics=graphics;
+x.model=model;
+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,None];
+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 d539e1cd..55039721 100644
--- a/js/Linear/INTEGRAL.js
+++ b/js/Linear/INTEGRAL.js
@@ -65,7 +65,7 @@ rpar=[];
 model=scicos_model();
 model.state=0;
 model.sim=list("integral_func",4);
-model.in=1;
+model.in1=1;
 model.out=1;
 model.rpar=rpar;
 model.blocktype="c";
diff --git a/js/Linear/INTEGRAL_f.js b/js/Linear/INTEGRAL_f.js
index 6d4f293e..b2c23f69 100644
--- a/js/Linear/INTEGRAL_f.js
+++ b/js/Linear/INTEGRAL_f.js
@@ -24,7 +24,7 @@ INTEGRAL_f.prototype.define = function INTEGRAL_f() {
 x0=0;
 model=scicos_model();
 model.sim="integr";
-model.in=1;
+model.in1=1;
 model.out=1;
 model.state=x0;
 model.blocktype="c";
diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js
index e2d2c6b1..52e65658 100644
--- a/js/Linear/INTEGRAL_m.js
+++ b/js/Linear/INTEGRAL_m.js
@@ -107,7 +107,7 @@ rpar=[];
 model=scicos_model();
 model.state=0;
 model.sim=list("integral_func",4);
-model.in=1;
+model.in1=1;
 model.out=1;
 model.in2=1;
 model.out2=1;
diff --git a/js/Linear/PID.js b/js/Linear/PID.js
index 4cf7b56a..1bfd2245 100644
--- a/js/Linear/PID.js
+++ b/js/Linear/PID.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,3536)
+Syntax error in input LexToken(ASSIGNMENT,'=',1,3569)
 /* autogenerated from "macros/Linear/PID.sci" */
 None
diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js
index 32215b8b..7f2f02cb 100644
--- a/js/Linear/REGISTER.js
+++ b/js/Linear/REGISTER.js
@@ -66,7 +66,7 @@ REGISTER.prototype.define = function REGISTER() {
 z0=zeros(10,1);
 model=scicos_model();
 model.sim=list("delay4",4);
-model.in=1;
+model.in1=1;
 model.out=1;
 model.evtin=1;
 model.dstate=z0;
diff --git a/js/Linear/REGISTER_f.js b/js/Linear/REGISTER_f.js
index 0f16c6fa..825260ed 100644
--- a/js/Linear/REGISTER_f.js
+++ b/js/Linear/REGISTER_f.js
@@ -29,7 +29,7 @@ REGISTER_f.prototype.define = function REGISTER_f() {
 z0=zeros(10,1);
 model=scicos_model();
 model.sim="delay";
-model.in=1;
+model.in1=1;
 model.out=1;
 model.evtin=1;
 model.dstate=z0;
diff --git a/js/Linear/SAMPHOLD.js b/js/Linear/SAMPHOLD.js
index 35aadbe8..d7be3438 100644
--- a/js/Linear/SAMPHOLD.js
+++ b/js/Linear/SAMPHOLD.js
@@ -10,7 +10,7 @@ SAMPHOLD.prototype.define = function SAMPHOLD() {
 in1=-1;
 model=scicos_model();
 model.sim=list("samphold4",4);
-model.in=-1;
+model.in1=-1;
 model.out=-1;
 model.evtin=1;
 model.blocktype="d";
diff --git a/js/Linear/SAMPHOLD_m.js b/js/Linear/SAMPHOLD_m.js
index 4a8ce1b2..9f491a3e 100644
--- a/js/Linear/SAMPHOLD_m.js
+++ b/js/Linear/SAMPHOLD_m.js
@@ -18,7 +18,7 @@ message("Datatype is not supported");
 ok=None;
 }
 if (ok) {
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
 [model,graphics,ok]=set_io(model,graphics,list(in1,it),list(in1,it),1,[]);
 if (ok) {
 graphics.exprs=exprs;
@@ -33,7 +33,7 @@ break
 SAMPHOLD_m.prototype.define = function SAMPHOLD_m() {
 model=scicos_model();
 model.sim=list("samphold4_m",4);
-model.in=-1;
+model.in1=-1;
 model.in2=-2;
 model.intyp=1;
 model.outtyp=1;
diff --git a/js/Linear/SAMPLEHOLD_f.js b/js/Linear/SAMPLEHOLD_f.js
index 87bfd226..c3e83bd3 100644
--- a/js/Linear/SAMPLEHOLD_f.js
+++ b/js/Linear/SAMPLEHOLD_f.js
@@ -10,7 +10,7 @@ SAMPLEHOLD_f.prototype.define = function SAMPLEHOLD_f() {
 in1=-1;
 model=scicos_model();
 model.sim="samphold";
-model.in=-1;
+model.in1=-1;
 model.out=-1;
 model.evtin=1;
 model.blocktype="d";
diff --git a/js/Linear/SOM_f.js b/js/Linear/SOM_f.js
index fd3684e5..df747276 100644
--- a/js/Linear/SOM_f.js
+++ b/js/Linear/SOM_f.js
@@ -26,7 +26,7 @@ SOM_f.prototype.define = function SOM_f() {
 sgn=[1,1,1];
 model=scicos_model();
 model.sim=list("sum",2);
-model.in=[-1,-1,-1];
+model.in1=[-1,-1,-1];
 model.out=-1;
 model.rpar=sgn;
 model.blocktype="c";
diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js
index 0c15982e..1accf905 100644
--- a/js/Linear/SUMMATION.js
+++ b/js/Linear/SUMMATION.js
@@ -121,7 +121,7 @@ SUMMATION.prototype.define = function SUMMATION() {
 sgn=[1,-1];
 model=scicos_model();
 model.sim=list("summation",4);
-model.in=[-1,-1];
+model.in1=[-1,-1];
 model.out=-1;
 model.in2=[-2,-2];
 model.out2=-2;
diff --git a/js/Linear/SUM_f.js b/js/Linear/SUM_f.js
index 24f1303f..4aa657a5 100644
--- a/js/Linear/SUM_f.js
+++ b/js/Linear/SUM_f.js
@@ -8,7 +8,7 @@ x=arg1;
 SUM_f.prototype.define = function SUM_f() {
 model=scicos_model();
 model.sim=list("plusblk",2);
-model.in=[-1,-1,-1];
+model.in1=[-1,-1,-1];
 model.out=-1;
 model.blocktype="c";
 model.dep_ut=[true,None];
diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js
index d4c5e8cd..eac5285d 100644
--- a/js/Linear/TIME_DELAY.js
+++ b/js/Linear/TIME_DELAY.js
@@ -7,7 +7,7 @@ x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
-nin=model.in(1);
+nin=model.in1(1);
 while (true) {
 [ok,T,init,N,exprs]=scicos_getvalue("Set delay parameters",["Delay","initial input","Buffer size"],list("vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
@@ -42,7 +42,7 @@ init=0;
 N=1024;
 model=scicos_model();
 model.sim=list("time_delay",4);
-model.in=[nin];
+model.in1=[nin];
 model.out=nin;
 model.rpar=[T,init];
 model.ipar=N;
diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js
index a57831d6..380a890c 100644
--- a/js/Linear/VARIABLE_DELAY.js
+++ b/js/Linear/VARIABLE_DELAY.js
@@ -7,7 +7,7 @@ x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
-nin=model.in(1);
+nin=model.in1(1);
 while (true) {
 [ok,T,init,N,exprs]=scicos_getvalue("Set delay parameters",["Max delay","initial input","Buffer size"],list("vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
@@ -41,7 +41,7 @@ init=0;
 N=1024;
 model=scicos_model();
 model.sim=list("variable_delay",4);
-model.in=[nin,1];
+model.in1=[nin,1];
 model.out=nin;
 model.rpar=[T,init];
 model.ipar=N;
diff --git a/js/MatrixOp/CUMSUM.js b/js/MatrixOp/CUMSUM.js
index 0b111b2f..be176108 100644
--- a/js/MatrixOp/CUMSUM.js
+++ b/js/MatrixOp/CUMSUM.js
@@ -49,7 +49,7 @@ ot=2;
 message("Datatype is not supported");
 ok=None;
 }
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
 out=[model.out,model.out2];
 funtyp=4;
 if (ok) {
@@ -70,7 +70,7 @@ model=scicos_model();
 function_name="cumsum_m";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
 model.in2=-2;
 model.intyp=1;
 model.out=-1;
diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js
index 5189f49a..685ee370 100644
--- a/js/MatrixOp/EXTRACT.js
+++ b/js/MatrixOp/EXTRACT.js
@@ -48,7 +48,7 @@ ok=None;
 }
 }
 model.ipar=[a,b,ma,mb];
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
 out=[ma,mb];
 funtyp=4;
 if (ok) {
@@ -68,7 +68,7 @@ model=scicos_model();
 function_name="extract";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
 model.in2=-2;
 model.intyp=1;
 model.out=1;
diff --git a/js/MatrixOp/EXTTRI.js b/js/MatrixOp/EXTTRI.js
index bcba10de..091a673f 100644
--- a/js/MatrixOp/EXTTRI.js
+++ b/js/MatrixOp/EXTTRI.js
@@ -46,7 +46,7 @@ ot=2;
 message("Datatype is not supported");
 ok=None;
 }
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
 out=[model.out,model.out2];
 funtyp=4;
 if (ok) {
@@ -67,7 +67,7 @@ model=scicos_model();
 function_name="extrilz";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
 model.in2=-2;
 model.intyp=1;
 model.out=-1;
diff --git a/js/MatrixOp/MATBKSL.js b/js/MatrixOp/MATBKSL.js
index e9e4f4a7..10032568 100644
--- a/js/MatrixOp/MATBKSL.js
+++ b/js/MatrixOp/MATBKSL.js
@@ -27,7 +27,7 @@ it=[2,2];
 message("Datatype is not supported");
 ok=None;
 }
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
 out=[model.out,model.out2];
 funtyp=4;
 if (ok) {
@@ -47,7 +47,7 @@ model=scicos_model();
 function_name="mat_bksl";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in=[-1,-1];
+model.in1=[-1,-1];
 model.in2=[-2,-3];
 model.intyp=[1,1];
 model.out=-2;
diff --git a/js/MatrixOp/MATDET.js b/js/MatrixOp/MATDET.js
index a27c586b..cf408e8e 100644
--- a/js/MatrixOp/MATDET.js
+++ b/js/MatrixOp/MATDET.js
@@ -27,7 +27,7 @@ it=2;
 message("Datatype is not supported");
 ok=None;
 }
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
 out=[model.out,model.out2];
 funtyp=4;
 if (ok) {
@@ -47,7 +47,7 @@ model=scicos_model();
 function_name="mat_det";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
 model.in2=-1;
 model.intyp=1;
 model.out=1;
diff --git a/js/MatrixOp/MATDIAG.js b/js/MatrixOp/MATDIAG.js
index 8e4755b4..0c6db943 100644
--- a/js/MatrixOp/MATDIAG.js
+++ b/js/MatrixOp/MATDIAG.js
@@ -27,7 +27,7 @@ it=2;
 message("Datatype is not supported");
 ok=None;
 }
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
 out=[model.out,model.out2];
 funtyp=4;
 if (ok) {
@@ -47,7 +47,7 @@ model=scicos_model();
 function_name="mat_diag";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
 model.in2=1;
 model.intyp=1;
 model.out=-1;
diff --git a/js/MatrixOp/MATDIV.js b/js/MatrixOp/MATDIV.js
index 9a7fcec4..927537fd 100644
--- a/js/MatrixOp/MATDIV.js
+++ b/js/MatrixOp/MATDIV.js
@@ -27,7 +27,7 @@ it=[2,2];
 message("Datatype is not supported");
 ok=None;
 }
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
 out=[model.out,model.out2];
 funtyp=4;
 if (ok) {
@@ -47,7 +47,7 @@ model=scicos_model();
 function_name="mat_div";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in=[-1,-2];
+model.in1=[-1,-2];
 model.in2=[-3,-3];
 model.intyp=[1,1];
 model.out=-1;
diff --git a/js/MatrixOp/MATEIG.js b/js/MatrixOp/MATEIG.js
index 6f87ebc6..64df3fd7 100644
--- a/js/MatrixOp/MATEIG.js
+++ b/js/MatrixOp/MATEIG.js
@@ -68,7 +68,7 @@ model=scicos_model();
 function_name="mat_vps";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
 model.in2=-1;
 model.intyp=1;
 model.out=-1;
diff --git a/js/MatrixOp/MATEXPM.js b/js/MatrixOp/MATEXPM.js
index 3a9b117f..07ca0bc8 100644
--- a/js/MatrixOp/MATEXPM.js
+++ b/js/MatrixOp/MATEXPM.js
@@ -27,7 +27,7 @@ it=2;
 message("Datatype is not supported");
 ok=None;
 }
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
 out=[model.out,model.out2];
 funtyp=4;
 if (ok) {
@@ -47,7 +47,7 @@ model=scicos_model();
 function_name="mat_expm";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
 model.in2=-1;
 model.intyp=1;
 model.out=-1;
diff --git a/js/MatrixOp/MATINV.js b/js/MatrixOp/MATINV.js
index 04fc617c..3d5e26ab 100644
--- a/js/MatrixOp/MATINV.js
+++ b/js/MatrixOp/MATINV.js
@@ -27,7 +27,7 @@ it=2;
 message("Datatype is not supported");
 ok=None;
 }
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
 out=[model.out,model.out2];
 funtyp=4;
 if (ok) {
@@ -47,7 +47,7 @@ model=scicos_model();
 function_name="mat_inv";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
 model.in2=-1;
 model.intyp=1;
 model.out=-1;
diff --git a/js/MatrixOp/MATLU.js b/js/MatrixOp/MATLU.js
index fa4425bc..9587bbfa 100644
--- a/js/MatrixOp/MATLU.js
+++ b/js/MatrixOp/MATLU.js
@@ -28,7 +28,7 @@ message("Datatype is not supported");
 ok=None;
 }
 if (ok) {
-[model,graphics,ok]=set_io(model,graphics,list([model.in,model.in2],it),list([model.out,model.out2],ot),[],[]);
+[model,graphics,ok]=set_io(model,graphics,list([model.in1,model.in2],it),list([model.out,model.out2],ot),[],[]);
 }
 if (ok) {
 funtyp=4;
@@ -45,7 +45,7 @@ model=scicos_model();
 function_name="mat_lu";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
 model.in2=-1;
 model.intyp=1;
 model.out=[-1,-1];
diff --git a/js/MatrixOp/MATMAGPHI.js b/js/MatrixOp/MATMAGPHI.js
index ee8c394a..cf01de2b 100644
--- a/js/MatrixOp/MATMAGPHI.js
+++ b/js/MatrixOp/MATMAGPHI.js
@@ -51,7 +51,7 @@ model=scicos_model();
 function_name="matz_abs";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
 model.in2=-2;
 model.intyp=2;
 model.out=[-1,-1];
diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js
index 4b3cc4d0..62fb14df 100644
--- a/js/MatrixOp/MATMUL.js
+++ b/js/MatrixOp/MATMUL.js
@@ -136,7 +136,7 @@ break
 MATMUL.prototype.define = function MATMUL() {
 model=scicos_model();
 model.sim=list("matmul_m",4);
-model.in=[-1,-2];
+model.in1=[-1,-2];
 model.in2=[-2,-3];
 model.out=-1;
 model.out2=-3;
diff --git a/js/MatrixOp/MATPINV.js b/js/MatrixOp/MATPINV.js
index 29e54589..aeeefd53 100644
--- a/js/MatrixOp/MATPINV.js
+++ b/js/MatrixOp/MATPINV.js
@@ -27,7 +27,7 @@ it=2;
 message("Datatype is not supported");
 ok=None;
 }
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
 out=[model.out,model.out2];
 funtyp=4;
 if (ok) {
@@ -47,7 +47,7 @@ model=scicos_model();
 function_name="mat_pinv";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
 model.in2=-2;
 model.intyp=1;
 model.out=-2;
diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js
index ea7fc79d..3cdf2c00 100644
--- a/js/MatrixOp/MATRESH.js
+++ b/js/MatrixOp/MATRESH.js
@@ -72,7 +72,7 @@ model=scicos_model();
 function_name="mat_reshape";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
 model.in2=-2;
 model.intyp=1;
 model.out=-1;
diff --git a/js/MatrixOp/MATSING.js b/js/MatrixOp/MATSING.js
index 789a1349..af7ed201 100644
--- a/js/MatrixOp/MATSING.js
+++ b/js/MatrixOp/MATSING.js
@@ -71,7 +71,7 @@ model=scicos_model();
 function_name="mat_sing";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
 model.in2=-2;
 model.intyp=1;
 model.out=-1;
diff --git a/js/MatrixOp/MATSUM.js b/js/MatrixOp/MATSUM.js
index c85eb356..58522aa3 100644
--- a/js/MatrixOp/MATSUM.js
+++ b/js/MatrixOp/MATSUM.js
@@ -52,7 +52,7 @@ ot=2;
 message("Datatype is not supported");
 ok=None;
 }
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
 funtyp=4;
 if (ok) {
 [model,graphics,ok]=set_io(model,graphics,list(in1,it),list(out,ot),[],[]);
@@ -72,7 +72,7 @@ model=scicos_model();
 function_name="mat_sum";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
 model.in2=-2;
 model.intyp=1;
 model.out=1;
diff --git a/js/MatrixOp/MATTRAN.js b/js/MatrixOp/MATTRAN.js
index 893d48f8..dec912fc 100644
--- a/js/MatrixOp/MATTRAN.js
+++ b/js/MatrixOp/MATTRAN.js
@@ -31,7 +31,7 @@ it=2;
 message("Datatype is not supported");
 ok=None;
 }
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
 out=[model.out,model.out2];
 funtyp=4;
 if (ok) {
@@ -49,7 +49,7 @@ break
 MATTRAN.prototype.define = function MATTRAN() {
 model=scicos_model();
 model.sim=list("mattran_m",4);
-model.in=-1;
+model.in1=-1;
 model.in2=-2;
 model.out=-2;
 model.out2=-1;
diff --git a/js/MatrixOp/MATZCONJ.js b/js/MatrixOp/MATZCONJ.js
index d08f2f5e..8186c3dc 100644
--- a/js/MatrixOp/MATZCONJ.js
+++ b/js/MatrixOp/MATZCONJ.js
@@ -10,7 +10,7 @@ model=scicos_model();
 function_name="matz_conj";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
 model.in2=-2;
 model.intyp=2;
 model.out=-1;
diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js
index ba3a7deb..8ec90ce8 100644
--- a/js/MatrixOp/MATZREIM.js
+++ b/js/MatrixOp/MATZREIM.js
@@ -51,7 +51,7 @@ model=scicos_model();
 function_name="matz_reim";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
 model.in2=-2;
 model.intyp=2;
 model.out=[-1,-1];
diff --git a/js/MatrixOp/RICC.js b/js/MatrixOp/RICC.js
index 876389ca..243b407b 100644
--- a/js/MatrixOp/RICC.js
+++ b/js/MatrixOp/RICC.js
@@ -15,7 +15,7 @@ while (true) {
 if (!ok) {
 break
 }
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
 out=[model.out,model.out2];
 it=[1,1,1];
 ot=1;
@@ -36,7 +36,7 @@ model=scicos_model();
 function_name="ricc_m";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in=[-1,-1,-1];
+model.in1=[-1,-1,-1];
 model.in2=[-1,-1,-1];
 model.intyp=[1,1,1];
 model.out=-1;
diff --git a/js/MatrixOp/ROOTCOEF.js b/js/MatrixOp/ROOTCOEF.js
index 7f24dee9..9487ba00 100644
--- a/js/MatrixOp/ROOTCOEF.js
+++ b/js/MatrixOp/ROOTCOEF.js
@@ -47,7 +47,7 @@ model=scicos_model();
 function_name="root_coef";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
 model.in2=1;
 model.intyp=1;
 model.out=-2;
diff --git a/js/MatrixOp/SQRT.js b/js/MatrixOp/SQRT.js
index 19ee1bbc..d63b0385 100644
--- a/js/MatrixOp/SQRT.js
+++ b/js/MatrixOp/SQRT.js
@@ -22,7 +22,7 @@ ok=None;
 }
 it=typ;
 ot=typ;
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
 out=[model.out,model.out2];
 funtyp=4;
 if (ok) {
@@ -40,7 +40,7 @@ break
 SQRT.prototype.define = function SQRT() {
 model=scicos_model();
 model.sim=list("mat_sqrt",4);
-model.in=-1;
+model.in1=-1;
 model.in2=-2;
 model.intyp=1;
 model.outtyp=1;
diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js
index de8fdf66..31b92337 100644
--- a/js/MatrixOp/SUBMAT.js
+++ b/js/MatrixOp/SUBMAT.js
@@ -68,7 +68,7 @@ model=scicos_model();
 function_name="submat";
 funtyp=4;
 model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
 model.in2=-2;
 model.intyp=1;
 model.out=-1;
diff --git a/js/Misc/BACKLASH.js b/js/Misc/BACKLASH.js
index a854b837..8dc9a676 100644
--- a/js/Misc/BACKLASH.js
+++ b/js/Misc/BACKLASH.js
@@ -33,7 +33,7 @@ BACKLASH.prototype.define = function BACKLASH() {
 exprs=["0","1","1"];
 model=scicos_model();
 model.sim=list("backlash",4);
-model.in=1;
+model.in1=1;
 model.out=1;
 model.rpar=[0,1];
 model.nzcross=2;
diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js
index b1cf7c07..5328a819 100644
--- a/js/Misc/BOUNCE.js
+++ b/js/Misc/BOUNCE.js
@@ -90,7 +90,7 @@ state=[x,xd,y,yd];
 state=transpose(state);
 model=scicos_model();
 model.sim=list("bounce_ball",4);
-model.in=[];
+model.in1=[];
 model.out=[n,n];
 model.state=state.slice();
 model.rpar=[rpar1,rpar2,walls,g,C];
diff --git a/js/Misc/BOUNCEXY.js b/js/Misc/BOUNCEXY.js
index 2ac6ccce..cee2800f 100644
--- a/js/Misc/BOUNCEXY.js
+++ b/js/Misc/BOUNCEXY.js
@@ -65,7 +65,7 @@ ymin=0;
 ymax=15;
 model=scicos_model();
 model.sim=list("bouncexy",4);
-model.in=[-1,-1];
+model.in1=[-1,-1];
 model.in2=[1,1];
 model.intyp=[1,1];
 model.evtin=1;
diff --git a/js/Misc/BPLATFORM.js b/js/Misc/BPLATFORM.js
index 83112a82..6dfa1a0b 100644
--- a/js/Misc/BPLATFORM.js
+++ b/js/Misc/BPLATFORM.js
@@ -48,7 +48,7 @@ ymin=0;
 ymax=15;
 model=scicos_model();
 model.sim=list("bplatform2",5);
-model.in=[1,1];
+model.in1=[1,1];
 model.evtin=1;
 model.dstate=0;
 model.rpar=[plen,csiz,phi,xmin,xmax,ymin,ymax];
diff --git a/js/Misc/CBLOCK4.js b/js/Misc/CBLOCK4.js
index d0c659de..56c3e022 100644
--- a/js/Misc/CBLOCK4.js
+++ b/js/Misc/CBLOCK4.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(IN,'in',1,1132)
+Syntax error in input LexToken(CLOSEBRACKET,')',1,2684)
 /* autogenerated from "macros/Misc/CBLOCK4.sci" */
 None
diff --git a/js/Misc/CONSTRAINT2_c.js b/js/Misc/CONSTRAINT2_c.js
index ee58ef12..1fcf1056 100644
--- a/js/Misc/CONSTRAINT2_c.js
+++ b/js/Misc/CONSTRAINT2_c.js
@@ -43,7 +43,7 @@ if (!ask_again) {
 graphics.exprs=exprs;
 model.state=[x0,xd0];
 model.out=[N,N];
-model.in=N;
+model.in1=N;
 model.ipar=id;
 x.graphics=graphics;
 x.model=model;
@@ -57,7 +57,7 @@ xd0=[0];
 id=[0];
 model=scicos_model();
 model.sim=list("constraint_c",10004);
-model.in=1;
+model.in1=1;
 model.out=[1,1];
 model.state=[x0,xd0];
 model.ipar=id;
diff --git a/js/Misc/CONSTRAINT_c.js b/js/Misc/CONSTRAINT_c.js
index de4018a8..2cef945f 100644
--- a/js/Misc/CONSTRAINT_c.js
+++ b/js/Misc/CONSTRAINT_c.js
@@ -22,7 +22,7 @@ if (ok) {
 graphics.exprs=exprs;
 model.state=[x0,zeros(N,1)];
 model.out=N;
-model.in=N;
+model.in1=N;
 model.ipar=-1*ones(N,1);
 x.graphics=graphics;
 x.model=model;
@@ -35,7 +35,7 @@ CONSTRAINT_c.prototype.define = function CONSTRAINT_c() {
 x0=[0,0];
 model=scicos_model();
 model.sim=list("constraint_c",10004);
-model.in=1;
+model.in1=1;
 model.out=1;
 model.ipar=0;
 model.state=x0;
diff --git a/js/Misc/DEADBAND.js b/js/Misc/DEADBAND.js
index 8ffdab65..a116b1eb 100644
--- a/js/Misc/DEADBAND.js
+++ b/js/Misc/DEADBAND.js
@@ -37,7 +37,7 @@ maxp=.5;
 rpar=[maxp,minp];
 model=scicos_model();
 model.sim=list("deadband",4);
-model.in=1;
+model.in1=1;
 model.nzcross=2;
 model.nmode=1;
 model.out=1;
diff --git a/js/Misc/DEBUG.js b/js/Misc/DEBUG.js
index 854cebc1..8f37e923 100644
--- a/js/Misc/DEBUG.js
+++ b/js/Misc/DEBUG.js
@@ -1,3 +1,48 @@
-Syntax error in input LexToken(SCICOS_DEBUG,'scicos_debug',1,1617)
 /* autogenerated from "macros/Misc/DEBUG.sci" */
-None
+function DEBUG() {
+DEBUG.prototype.get = function DEBUG() {
+}
+DEBUG.prototype.set = function DEBUG() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+textmp=exprs(2);
+ok=true;
+while (1==1) {
+[txt]=dialog(["Enter scilab instructions for debugging."," Inputs are block and flag, output is block"],textmp);
+if (txt!=[]) {
+tt=["block=debug_scicos(block,flag)"];
+if (execstr("deff(tt,txt)","errcatch")==0) {
+warnMode=warning("query");
+warning("off");
+save(TMPDIR+"/debug_scicos",debug_scicos);
+warning(warnMode);
+exprs[2-1]=txt;
+if ((scicos_debug()!=2&&scicos_debug()!=3)) {
+scicos_debug(2);
+}
+break
+} else {
+message(["Error in the instructions",lasterror()]);
+}
+} else {
+ok=None;
+break
+}
+}
+if (ok) {
+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/DIFF_f.js b/js/Misc/DIFF_f.js
index d513f4c5..0301949e 100644
--- a/js/Misc/DIFF_f.js
+++ b/js/Misc/DIFF_f.js
@@ -24,7 +24,7 @@ DIFF_f.prototype.define = function DIFF_f() {
 x0=[0,0];
 model=scicos_model();
 model.sim=list("diffblk",10001);
-model.in=1;
+model.in1=1;
 model.out=1;
 model.state=x0;
 model.blocktype="c";
diff --git a/js/Misc/EDGETRIGGER.js b/js/Misc/EDGETRIGGER.js
index e8099884..616a2fee 100644
--- a/js/Misc/EDGETRIGGER.js
+++ b/js/Misc/EDGETRIGGER.js
@@ -23,7 +23,7 @@ EDGETRIGGER.prototype.define = function EDGETRIGGER() {
 edge=1;
 model=scicos_model();
 model.sim=list("edgetrig",4);
-model.in=1;
+model.in1=1;
 model.out=1;
 model.dstate=0;
 model.nzcross=1;
diff --git a/js/Misc/EDGE_TRIGGER.js b/js/Misc/EDGE_TRIGGER.js
index 6a6b8b74..3127a38b 100644
--- a/js/Misc/EDGE_TRIGGER.js
+++ b/js/Misc/EDGE_TRIGGER.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,4093)
+Syntax error in input LexToken(CLEAR,'clear',1,6437)
 /* autogenerated from "macros/Misc/EDGE_TRIGGER.sci" */
 None
diff --git a/js/Misc/ENDBLK.js b/js/Misc/ENDBLK.js
index d7729b20..68a6186e 100644
--- a/js/Misc/ENDBLK.js
+++ b/js/Misc/ENDBLK.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,4455)
+Syntax error in input LexToken(ASSIGNMENT,'=',1,4488)
 /* autogenerated from "macros/Misc/ENDBLK.sci" */
 None
diff --git a/js/Misc/Extract_Activation.js b/js/Misc/Extract_Activation.js
index f1683776..995b19e4 100644
--- a/js/Misc/Extract_Activation.js
+++ b/js/Misc/Extract_Activation.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,1007)
+Syntax error in input LexToken(CLEAR,'clear',1,3539)
 /* autogenerated from "macros/Misc/Extract_Activation.sci" */
 None
diff --git a/js/Misc/IMPSPLIT_f.js b/js/Misc/IMPSPLIT_f.js
index 70135a50..d2be3dd2 100644
--- a/js/Misc/IMPSPLIT_f.js
+++ b/js/Misc/IMPSPLIT_f.js
@@ -13,7 +13,7 @@ mo.model="limpsplit";
 mo.inputs="n";
 mo.outputs=["n","n"];
 model.equations=mo;
-model.in=ones(size(mo.inputs,"*"),1);
+model.in1=ones(size(mo.inputs,"*"),1);
 model.out=ones(size(mo.outputs,"*"),1);
 x=standard_define([1,1]/3,model,[],[]);
 x.graphics.in_implicit=["I"];
diff --git a/js/Misc/MEMORY_f.js b/js/Misc/MEMORY_f.js
index c1a6e3c0..d03347a1 100644
--- a/js/Misc/MEMORY_f.js
+++ b/js/Misc/MEMORY_f.js
@@ -27,7 +27,7 @@ in1=out;
 if (ok) {
 graphics.exprs=exprs;
 model.rpar=a;
-model.in=in1;
+model.in1=in1;
 model.out=out;
 x.graphics=graphics;
 x.model=model;
@@ -41,7 +41,7 @@ in1=1;
 exprs=[string(z),string(1)];
 model=scicos_model();
 model.sim="memo";
-model.in=in1;
+model.in1=in1;
 model.out=in1;
 model.evtin=1;
 model.dstate=0;
diff --git a/js/Misc/PENDULUM_ANIM.js b/js/Misc/PENDULUM_ANIM.js
index 068b9edb..5074d0c3 100644
--- a/js/Misc/PENDULUM_ANIM.js
+++ b/js/Misc/PENDULUM_ANIM.js
@@ -48,7 +48,7 @@ ymin=-5;
 ymax=5;
 model=scicos_model();
 model.sim=list("anim_pen",5);
-model.in=[1,1];
+model.in1=[1,1];
 model.evtin=1;
 model.dstate=0;
 model.rpar=[plen,csiz,phi,xmin,xmax,ymin,ymax];
diff --git a/js/Misc/RATELIMITER.js b/js/Misc/RATELIMITER.js
index 777258ad..8bbbe562 100644
--- a/js/Misc/RATELIMITER.js
+++ b/js/Misc/RATELIMITER.js
@@ -30,7 +30,7 @@ maxp=1;
 rpar=[maxp,minp];
 model=scicos_model();
 model.sim=list("ratelimiter",4);
-model.in=1;
+model.in1=1;
 model.out=1;
 model.rpar=rpar;
 model.blocktype="c";
diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js
index 33d0d152..bb6b8848 100644
--- a/js/Misc/RELATIONALOP.js
+++ b/js/Misc/RELATIONALOP.js
@@ -78,7 +78,7 @@ ipar=[2];
 label="&lt";
 model=scicos_model();
 model.sim=list("relationalop",4);
-model.in=[1,1];
+model.in1=[1,1];
 model.out=1;
 model.ipar=ipar;
 model.blocktype="c";
diff --git a/js/Misc/SPLIT_f.js b/js/Misc/SPLIT_f.js
index cc3c2277..6d826381 100644
--- a/js/Misc/SPLIT_f.js
+++ b/js/Misc/SPLIT_f.js
@@ -8,7 +8,7 @@ x=arg1;
 SPLIT_f.prototype.define = function SPLIT_f() {
 model=scicos_model();
 model.sim="lsplit";
-model.in=-1;
+model.in1=-1;
 model.out=[-1,-1,-1];
 model.blocktype="c";
 model.dep_ut=[true,None];
diff --git a/js/Misc/SUPER_f.js b/js/Misc/SUPER_f.js
index 19aa3cfb..af391b2c 100644
--- a/js/Misc/SUPER_f.js
+++ b/js/Misc/SUPER_f.js
@@ -1,3 +1,31 @@
-Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,1198)
 /* autogenerated from "macros/Misc/SUPER_f.sci" */
-None
+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";
+in1=IN_f("define");
+in1.graphics.orig=[40,40];
+in1.graphics.sz=[20,20];
+out=OUT_f("define");
+out.graphics.orig=[240,40];
+out.graphics.sz=[20,20];
+scs.objs[1-1]=in1;
+scs.objs[2-1]=out;
+model=scicos_model();
+model.sim="super";
+model.in1=1;
+model.out=1;
+model.rpar=scs;
+model.blocktype="h";
+model.dep_ut=[None,None];
+gr_i=[];
+x=standard_define([2,2],model,[],gr_i);
+}
+SUPER_f.prototype.details = function SUPER_f() {
+}
+}
diff --git a/js/Misc/TEXT_f.js b/js/Misc/TEXT_f.js
index 08e0e85f..d997af37 100644
--- a/js/Misc/TEXT_f.js
+++ b/js/Misc/TEXT_f.js
@@ -1,3 +1,66 @@
-Syntax error in input LexToken(SCICOS_GRAPHICS,'scicos_graphics',1,3437)
 /* autogenerated from "macros/Misc/TEXT_f.sci" */
-None
+function TEXT_f() {
+TEXT_f.prototype.get = function TEXT_f() {
+}
+TEXT_f.prototype.set = function TEXT_f() {
+x=arg1;
+graphics=arg1.graphics;
+orig=graphics.orig;
+exprs=graphics.exprs;
+model=arg1.model;
+if (size(exprs,"*")==1) {
+exprs=[exprs,"3","1"];
+}
+while (true) {
+[ok,txt,font,siz,exprs]=scicos_getvalue("Set Text block parameters",["Text","Font number","Font size"],list("str",-1,"vec",1,"vec",1),exprs);
+if (!ok) {
+break
+}
+if (font<=0||font>6) {
+message("Font number must be greater than 0 and less than 7");
+ok=None;
+}
+if (siz<0) {
+message("Font size must be positive");
+ok=None;
+}
+if (ok) {
+graphics.exprs=exprs;
+gh_winpal=gca();
+default_font_style=gh_winpal.font_style;
+default_font_size=gh_winpal.font_size;
+default_font_color=gh_winpal.font_color;
+gh_winpal.font_style=font;
+gh_winpal.font_size=siz;
+r=xstringl(0,0,exprs(1),evstr(exprs(2)),evstr(exprs(3)));
+gh_winpal.font_style=default_font_style;
+gh_winpal.font_size=default_font_size;
+gh_winpal.font_color=default_font_color;
+sz=r.slice(3-1,4);
+graphics.sz=sz;
+x.graphics=graphics;
+ipar=[font,siz];
+model.rpar=txt;
+model.ipar=ipar;
+x.model=model;
+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 f3fe984e..9585e456 100644
--- a/js/Misc/c_block.js
+++ b/js/Misc/c_block.js
@@ -22,7 +22,7 @@ ni=size(i,1);
 o=int(o.slice());
 no=size(o,1);
 tt=label[2-1];
-if (model.sim(1)!=funam||size(model.in,"*")!=size(i,"*")||size(model.out,"*")!=size(o,"*")) {
+if (model.sim(1)!=funam||size(model.in1,"*")!=size(i,"*")||size(model.out,"*")!=size(o,"*")) {
 tt=[];
 }
 [ok,tt]=CFORTR(funam,tt,i,o);
@@ -54,7 +54,7 @@ rpar=[];
 funam="toto";
 model=scicos_model();
 model.sim=list(" ",2001);
-model.in=in1;
+model.in1=in1;
 model.out=out;
 model.evtin=clkin;
 model.evtout=clkout;
diff --git a/js/Misc/fortran_block.js b/js/Misc/fortran_block.js
index 4bc445c8..f1d7374f 100644
--- a/js/Misc/fortran_block.js
+++ b/js/Misc/fortran_block.js
@@ -22,7 +22,7 @@ ni=size(i,1);
 o=int(o.slice());
 no=size(o,1);
 tt=label[2-1];
-if (model.sim(1)!=funam||size(model.in,"*")!=size(i,"*")||size(model.out,"*")!=size(o,"*")) {
+if (model.sim(1)!=funam||size(model.in1,"*")!=size(i,"*")||size(model.out,"*")!=size(o,"*")) {
 tt=[];
 }
 [ok,tt]=FORTR(funam,tt,i,o);
@@ -44,7 +44,7 @@ break
 fortran_block.prototype.define = function fortran_block() {
 model=scicos_model();
 model.sim=list(" ",1001);
-model.in=1;
+model.in1=1;
 model.out=1;
 model.evtin=[];
 model.evtout=[];
@@ -56,7 +56,7 @@ model.blocktype="c";
 model.firing=[];
 model.dep_ut=[true,None];
 funam="forty";
-label=list([sci2exp(model.in),sci2exp(model.out),strcat(sci2exp(model.rpar)),funam],list([]));
+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);
 }
diff --git a/js/Misc/func_block.js b/js/Misc/func_block.js
index 44e846e3..38fad25e 100644
--- a/js/Misc/func_block.js
+++ b/js/Misc/func_block.js
@@ -19,7 +19,7 @@ x.graphics=graphics;
 func_block.prototype.define = function func_block() {
 model=scicos_model();
 model.sim=" ";
-model.in=1;
+model.in1=1;
 model.out=1;
 model.blocktype="c";
 model.dep_ut=[true,None];
diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js
index f1cad651..3d9a5ef7 100644
--- a/js/Misc/generic_block3.js
+++ b/js/Misc/generic_block3.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(IN,'in',1,1203)
+Syntax error in input LexToken(CLOSEBRACKET,')',1,3302)
 /* autogenerated from "macros/Misc/generic_block3.sci" */
 None
diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js
index 7f7d543e..0c0c8f3c 100644
--- a/js/Misc/scifunc_block_m.js
+++ b/js/Misc/scifunc_block_m.js
@@ -69,7 +69,7 @@ rpar=[];
 it=1;
 model=scicos_model();
 model.sim=list("scifunc",3);
-model.in=in1;
+model.in1=in1;
 model.in2=in1;
 model.intyp=it;
 model.out=out;
diff --git a/js/NonLinear/ABSBLK_f.js b/js/NonLinear/ABSBLK_f.js
index 41967e67..55753cc7 100644
--- a/js/NonLinear/ABSBLK_f.js
+++ b/js/NonLinear/ABSBLK_f.js
@@ -8,7 +8,7 @@ x=arg1;
 ABSBLK_f.prototype.define = function ABSBLK_f() {
 model=scicos_model();
 model.sim=list("absblk",1);
-model.in=-1;
+model.in1=-1;
 model.out=-1;
 model.blocktype="c";
 model.dep_ut=[true,None];
diff --git a/js/NonLinear/ABS_VALUE.js b/js/NonLinear/ABS_VALUE.js
index 4d086a3b..d44676b9 100644
--- a/js/NonLinear/ABS_VALUE.js
+++ b/js/NonLinear/ABS_VALUE.js
@@ -31,7 +31,7 @@ ABS_VALUE.prototype.define = function ABS_VALUE() {
 nu=-1;
 model=scicos_model();
 model.sim=list("absolute_value",4);
-model.in=nu;
+model.in1=nu;
 model.out=nu;
 model.nzcross=nu;
 model.nmode=nu;
diff --git a/js/NonLinear/COSBLK_f.js b/js/NonLinear/COSBLK_f.js
index 11161316..28037303 100644
--- a/js/NonLinear/COSBLK_f.js
+++ b/js/NonLinear/COSBLK_f.js
@@ -9,7 +9,7 @@ COSBLK_f.prototype.define = function COSBLK_f() {
 in1=1;
 model=scicos_model();
 model.sim="cosblk";
-model.in=-1;
+model.in1=-1;
 model.out=-1;
 model.blocktype="c";
 model.dep_ut=[true,None];
diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js
index 7eb57e9d..44569967 100644
--- a/js/NonLinear/DLRADAPT_f.js
+++ b/js/NonLinear/DLRADAPT_f.js
@@ -40,7 +40,7 @@ last_u=[];
 last_y=[0,0];
 model=scicos_model();
 model.sim="dlradp";
-model.in=[1,1];
+model.in1=[1,1];
 model.out=1;
 model.evtin=1;
 model.dstate=[last_u,last_y];
diff --git a/js/NonLinear/EXPBLK_f.js b/js/NonLinear/EXPBLK_f.js
index 4952f704..7fff28bd 100644
--- a/js/NonLinear/EXPBLK_f.js
+++ b/js/NonLinear/EXPBLK_f.js
@@ -31,7 +31,7 @@ in1=1;
 a=math.E;
 model=scicos_model();
 model.sim="expblk";
-model.in=-1;
+model.in1=-1;
 model.out=-1;
 model.rpar=a;
 model.blocktype="c";
diff --git a/js/NonLinear/EXPBLK_m.js b/js/NonLinear/EXPBLK_m.js
index 531ca3fb..9554f84f 100644
--- a/js/NonLinear/EXPBLK_m.js
+++ b/js/NonLinear/EXPBLK_m.js
@@ -31,7 +31,7 @@ in1=1;
 a=math.E;
 model=scicos_model();
 model.sim=list("expblk_m",4);
-model.in=-1;
+model.in1=-1;
 model.in2=-2;
 model.out=-1;
 model.out2=-2;
diff --git a/js/NonLinear/FSV_f.js b/js/NonLinear/FSV_f.js
index 8c915a0b..d1bbe59a 100644
--- a/js/NonLinear/FSV_f.js
+++ b/js/NonLinear/FSV_f.js
@@ -9,7 +9,7 @@ FSV_f.prototype.define = function FSV_f() {
 in1=1;
 model=scicos_model();
 model.sim=list("fsv",1);
-model.in=in1;
+model.in1=in1;
 model.out=in1;
 model.blocktype="c";
 model.dep_ut=[true,None];
diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js
index d12a5553..8a814864 100644
--- a/js/NonLinear/INTRP2BLK_f.js
+++ b/js/NonLinear/INTRP2BLK_f.js
@@ -34,7 +34,7 @@ b=[0,1];
 c=[0,1,1,2];
 model=scicos_model();
 model.sim=list("intrp2",1);
-model.in=[1,1];
+model.in1=[1,1];
 model.out=1;
 model.rpar=[a,b,c.slice()];
 model.ipar=[2,2];
diff --git a/js/NonLinear/INTRPLBLK_f.js b/js/NonLinear/INTRPLBLK_f.js
index 95fb3d04..07f6dbc7 100644
--- a/js/NonLinear/INTRPLBLK_f.js
+++ b/js/NonLinear/INTRPLBLK_f.js
@@ -32,7 +32,7 @@ a=[0,1];
 b=[0,1];
 model=scicos_model();
 model.sim="intrpl";
-model.in=1;
+model.in1=1;
 model.out=1;
 model.rpar=[a,b];
 model.blocktype="c";
diff --git a/js/NonLinear/INVBLK.js b/js/NonLinear/INVBLK.js
index 1d00c379..0ef6f9ab 100644
--- a/js/NonLinear/INVBLK.js
+++ b/js/NonLinear/INVBLK.js
@@ -9,7 +9,7 @@ INVBLK.prototype.define = function INVBLK() {
 in1=-1;
 model=scicos_model();
 model.sim=list("invblk4",4);
-model.in=in1;
+model.in1=in1;
 model.out=in1;
 model.blocktype="c";
 model.dep_ut=[true,None];
diff --git a/js/NonLinear/INVBLK_f.js b/js/NonLinear/INVBLK_f.js
index bce72c0a..12047939 100644
--- a/js/NonLinear/INVBLK_f.js
+++ b/js/NonLinear/INVBLK_f.js
@@ -9,7 +9,7 @@ INVBLK_f.prototype.define = function INVBLK_f() {
 in1=-1;
 model=scicos_model();
 model.sim="invblk";
-model.in=in1;
+model.in1=in1;
 model.out=in1;
 model.blocktype="c";
 model.dep_ut=[true,None];
diff --git a/js/NonLinear/LOGBLK_f.js b/js/NonLinear/LOGBLK_f.js
index 26210f1e..a0e28e4c 100644
--- a/js/NonLinear/LOGBLK_f.js
+++ b/js/NonLinear/LOGBLK_f.js
@@ -33,7 +33,7 @@ in1=1;
 a=math.E;
 model=scicos_model();
 model.sim="logblk";
-model.in=-1;
+model.in1=-1;
 model.out=-1;
 model.rpar=a;
 model.blocktype="c";
diff --git a/js/NonLinear/LOOKUP_f.js b/js/NonLinear/LOOKUP_f.js
index d1910362..06e69196 100644
--- a/js/NonLinear/LOOKUP_f.js
+++ b/js/NonLinear/LOOKUP_f.js
@@ -37,7 +37,7 @@ break
 LOOKUP_f.prototype.define = function LOOKUP_f() {
 model=scicos_model();
 model.sim="lookup";
-model.in=1;
+model.in1=1;
 model.out=1;
 model.rpar=[-2,-1,1,2,-1,1,-1,1];
 model.blocktype="c";
diff --git a/js/NonLinear/MAX_f.js b/js/NonLinear/MAX_f.js
index 717352c4..7e3ebb7f 100644
--- a/js/NonLinear/MAX_f.js
+++ b/js/NonLinear/MAX_f.js
@@ -9,7 +9,7 @@ MAX_f.prototype.define = function MAX_f() {
 in1=-1;
 model=scicos_model();
 model.sim="maxblk";
-model.in=in1;
+model.in1=in1;
 model.out=1;
 model.dstate=[0,0];
 model.blocktype="c";
diff --git a/js/NonLinear/MIN_f.js b/js/NonLinear/MIN_f.js
index 8845661f..fc234b78 100644
--- a/js/NonLinear/MIN_f.js
+++ b/js/NonLinear/MIN_f.js
@@ -9,7 +9,7 @@ MIN_f.prototype.define = function MIN_f() {
 in1=-1;
 model=scicos_model();
 model.sim="minblk";
-model.in=in1;
+model.in1=in1;
 model.out=1;
 model.dstate=[0,0];
 model.blocktype="c";
diff --git a/js/NonLinear/POWBLK_f.js b/js/NonLinear/POWBLK_f.js
index b578ebc7..d8aeabe3 100644
--- a/js/NonLinear/POWBLK_f.js
+++ b/js/NonLinear/POWBLK_f.js
@@ -34,7 +34,7 @@ in1=1;
 a=1.5;
 model=scicos_model();
 model.sim="powblk";
-model.in=-1;
+model.in1=-1;
 model.out=-1;
 model.rpar=a;
 model.blocktype="c";
diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js
index 3eb21afb..4cfb8dc2 100644
--- a/js/NonLinear/PRODUCT.js
+++ b/js/NonLinear/PRODUCT.js
@@ -51,7 +51,7 @@ PRODUCT.prototype.define = function PRODUCT() {
 sgn=[1,-1];
 model=scicos_model();
 model.sim=list("product",4);
-model.in=[-1,-1];
+model.in1=[-1,-1];
 model.out=-1;
 model.ipar=sgn;
 model.blocktype="c";
diff --git a/js/NonLinear/PROD_f.js b/js/NonLinear/PROD_f.js
index 11a79475..9382d703 100644
--- a/js/NonLinear/PROD_f.js
+++ b/js/NonLinear/PROD_f.js
@@ -8,7 +8,7 @@ x=arg1;
 PROD_f.prototype.define = function PROD_f() {
 model=scicos_model();
 model.sim=list("prod",2);
-model.in=[-1,-1];
+model.in1=[-1,-1];
 model.out=-1;
 model.blocktype="c";
 model.dep_ut=[true,None];
diff --git a/js/NonLinear/QUANT_f.js b/js/NonLinear/QUANT_f.js
index 6f7afca6..38c6061a 100644
--- a/js/NonLinear/QUANT_f.js
+++ b/js/NonLinear/QUANT_f.js
@@ -40,7 +40,7 @@ pas=0.1;
 meth=1;
 model=scicos_model();
 model.sim="qzrnd";
-model.in=-1;
+model.in1=-1;
 model.out=-1;
 model.rpar=pas;
 model.ipar=meth;
diff --git a/js/NonLinear/SATURATION.js b/js/NonLinear/SATURATION.js
index a9b29bed..9379d579 100644
--- a/js/NonLinear/SATURATION.js
+++ b/js/NonLinear/SATURATION.js
@@ -37,7 +37,7 @@ maxp=1;
 rpar=[maxp,minp];
 model=scicos_model();
 model.sim=list("satur",4);
-model.in=1;
+model.in1=1;
 model.nzcross=2;
 model.nmode=1;
 model.out=1;
diff --git a/js/NonLinear/SAT_f.js b/js/NonLinear/SAT_f.js
index d8dea01d..ba22108c 100644
--- a/js/NonLinear/SAT_f.js
+++ b/js/NonLinear/SAT_f.js
@@ -34,7 +34,7 @@ slope=1;
 rpar=[minp,maxp,slope];
 model=scicos_model();
 model.sim=list("lusat",1);
-model.in=1;
+model.in1=1;
 model.nzcross=2;
 model.out=1;
 model.rpar=[minp,maxp,slope];
diff --git a/js/NonLinear/SIGNUM.js b/js/NonLinear/SIGNUM.js
index 50d39dca..a4c5056b 100644
--- a/js/NonLinear/SIGNUM.js
+++ b/js/NonLinear/SIGNUM.js
@@ -31,7 +31,7 @@ SIGNUM.prototype.define = function SIGNUM() {
 nu=-1;
 model=scicos_model();
 model.sim=list("signum",4);
-model.in=nu;
+model.in1=nu;
 model.out=nu;
 model.nzcross=nu;
 model.nmode=nu;
diff --git a/js/NonLinear/SINBLK_f.js b/js/NonLinear/SINBLK_f.js
index 7cd82cf5..6f500ffa 100644
--- a/js/NonLinear/SINBLK_f.js
+++ b/js/NonLinear/SINBLK_f.js
@@ -8,7 +8,7 @@ x=arg1;
 SINBLK_f.prototype.define = function SINBLK_f() {
 model=scicos_model();
 model.sim="sinblk";
-model.in=-1;
+model.in1=-1;
 model.out=-1;
 model.blocktype="c";
 model.dep_ut=[true,None];
diff --git a/js/NonLinear/TANBLK_f.js b/js/NonLinear/TANBLK_f.js
index 8140e55a..21ded3b4 100644
--- a/js/NonLinear/TANBLK_f.js
+++ b/js/NonLinear/TANBLK_f.js
@@ -10,7 +10,7 @@ TANBLK_f.prototype.define = function TANBLK_f() {
 in1=-1;
 model=scicos_model();
 model.sim="tanblk";
-model.in=in1;
+model.in1=in1;
 model.out=in1;
 model.blocktype="c";
 model.dep_ut=[true,None];
diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js
index 3d8b1e11..acab657e 100644
--- a/js/Sinks/AFFICH_m.js
+++ b/js/Sinks/AFFICH_m.js
@@ -1,3 +1,80 @@
-Syntax error in input LexToken(IN,'in',1,1295)
 /* autogenerated from "macros/Sinks/AFFICH_m.sci" */
-None
+function AFFICH_m() {
+AFFICH_m.prototype.get = function AFFICH_m() {
+}
+AFFICH_m.prototype.set = function AFFICH_m() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,in1,font,fontsize,colr,nt,nd,herit,exprs]=scicos_getvalue("Set  parameters",["Input Size","Font number","Font size","Color","Total number of digits","Number of rational part digits","Block inherits (1) or not (0)"],list("mat",[1,2],"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
+if (!ok) {
+break
+}
+mess=[];
+if (font<=0) {
+mess=[mess,"Font number must be positive"," "];
+ok=None;
+}
+if (fontsize<=0) {
+mess=[mess,"Font size must be positive"," "];
+ok=None;
+}
+if (nt<=3) {
+mess=[mess,"Total number of digits must be greater than 3"," "];
+ok=None;
+}
+if (nd<0) {
+mess=[mess,"Number of rational part digits must be ","greater or equal 0"," "];
+ok=None;
+}
+if (!ok) {
+message(["Some specified values are inconsistent:"," ",mess]);
+}
+if (!or(herit==[0,1])) {
+mess=[mess,"Accept inherited values are 0 and 1"," "];
+ok=None;
+}
+if (!ok) {
+message(["Some specified values are inconsistent:"," ",mess]);
+}
+if (ok) {
+[model,graphics,ok]=set_io(model,graphics,list(in1,1),list(),ones(1-herit,1),[]);
+}
+if (ok) {
+model.ipar=[font,fontsize,colr,nt,nd,in1(1,1)];
+model.dstate=[-1,0,0,1,1,0,zeros(in1(1,1)*in1(1,2),1)];
+model.evtin=ones(1-herit,1);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+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,None];
+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 c66f402c..6e8f6e5e 100644
--- a/js/Sinks/BARXY.js
+++ b/js/Sinks/BARXY.js
@@ -46,7 +46,7 @@ ymax=15;
 model.sim=list("BARXY_sim",5);
 model.blocktype="d";
 model.dep_ut=[true,None];
-model.in=[-1,-1];
+model.in1=[-1,-1];
 model.intyp=[1];
 model.out=[];
 model.evtin=[1];
diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js
index a7c4918b..f74f7a51 100644
--- a/js/Sinks/CANIMXY.js
+++ b/js/Sinks/CANIMXY.js
@@ -82,7 +82,7 @@ ymax=+15;
 nbr_curves=1;
 model=scicos_model();
 model.sim=list("canimxy",4);
-model.in=[1,1];
+model.in1=[1,1];
 model.in2=[1,1];
 model.intyp=[1,1];
 model.evtin=1;
diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js
index 76ecf4c4..870ee544 100644
--- a/js/Sinks/CANIMXY3D.js
+++ b/js/Sinks/CANIMXY3D.js
@@ -99,7 +99,7 @@ vec_z=[-15,15];
 nbr_curves=1;
 model=scicos_model();
 model.sim=list("canimxy3d",4);
-model.in=[1,1,1];
+model.in1=[1,1,1];
 model.evtin=1;
 model.in2=[1,1,1];
 model.intyp=[1,1,1];
diff --git a/js/Sinks/CMAT3D.js b/js/Sinks/CMAT3D.js
index 8fd38b10..0d0d3501 100644
--- a/js/Sinks/CMAT3D.js
+++ b/js/Sinks/CMAT3D.js
@@ -49,7 +49,7 @@ size_x=1;
 size_y=1;
 model=scicos_model();
 model.sim=list("cmat3d",4);
-model.in=-1;
+model.in1=-1;
 model.in2=-2;
 model.intyp=1;
 model.evtin=1;
diff --git a/js/Sinks/CMATVIEW.js b/js/Sinks/CMATVIEW.js
index a8940952..21a69763 100644
--- a/js/Sinks/CMATVIEW.js
+++ b/js/Sinks/CMATVIEW.js
@@ -45,7 +45,7 @@ alpha_c=0.24;
 beta_c=1;
 model=scicos_model();
 model.sim=list("cmatview",4);
-model.in=-1;
+model.in1=-1;
 model.in2=-2;
 model.intyp=1;
 model.evtin=1;
diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js
index 77ce9ca4..55f1405d 100644
--- a/js/Sinks/CMSCOPE.js
+++ b/js/Sinks/CMSCOPE.js
@@ -1,3 +1,126 @@
-Syntax error in input LexToken(IN,'in',1,1125)
 /* autogenerated from "macros/Sinks/CMSCOPE.sci" */
-None
+function CMSCOPE() {
+CMSCOPE.prototype.get = function CMSCOPE() {
+}
+CMSCOPE.prototype.set = function CMSCOPE() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,in1,clrs,win,wpos,wdim,ymin,ymax,per,N,heritance,nom,exprs]=scicos_getvalue("Set Scope parameters",["Input ports sizes","Drawing colors (>0) or mark (<0)","Output window number (-1 for automatic)","Output window position","Output window sizes","Ymin vector","Ymax vector","Refresh period","Buffer size","Accept herited events 0/1","Name of Scope (label&Id)"],list("vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec","size(%1,\'*\')","vec","size(%1,\'*\')","vec","size(%1,\'*\')","vec",1,"vec",1,"str",1),exprs);
+if (!ok) {
+break
+}
+mess=[];
+if (size(in1,"*")<=0) {
+mess=[mess,"Block must have at least one input port"," "];
+ok=None;
+}
+if (min(in1)<=0) {
+mess=[mess,"Port sizes must be positive"," "];
+ok=None;
+}
+if (size(clrs,"*")<sum(in1)) {
+mess=[mess,"Not enough colors defined (at least "+string(sum(in1))+")"," "];
+ok=None;
+}
+if (size(wpos,"*")!=0&&size(wpos,"*")!=2) {
+mess=[mess,"Window position must be [] or a 2 vector"," "];
+ok=None;
+}
+if (size(wdim,"*")!=0&&size(wdim,"*")!=2) {
+mess=[mess,"Window dim must be [] or a 2 vector"," "];
+ok=None;
+}
+if (win<-1) {
+mess=[mess,"Window number can\'t be  < -1"," "];
+ok=None;
+}
+if (size(per,"*")!=size(ymin,"*")) {
+mess=[mess,"Size of Refresh Period must equal size of Ymin/Ymax vector"," "];
+ok=None;
+}
+for(i=1;i<=size(per,"*");i+=1) {
+if ((per(i)<=0)) {
+mess=[mess,"Refresh Period must be positive"," "];
+ok=None;
+}
+}
+if (N<2) {
+mess=[mess,"Buffer size must be at least 2"," "];
+ok=None;
+}
+if (or(ymin>=ymax)) {
+mess=[mess,"Ymax must be greater than Ymin"," "];
+ok=None;
+}
+if (!or(heritance==[0,1])) {
+mess=[mess,"Accept herited events must be 0 or 1"," "];
+ok=None;
+}
+if (!ok) {
+message(["Some specified values are inconsistent:"," ",mess]);
+}
+if (ok) {
+in1=in1.slice();
+a=size(in1,1);
+in2=ones(a,1);
+[model,graphics,ok]=set_io(model,graphics,list([in1,in2],ones(a,1)),list(),ones(1-heritance,1),[]);
+}
+if (ok) {
+if (wpos==[]) {
+wpos=[-1,-1];
+}
+if (wdim==[]) {
+wdim=[-1,-1];
+}
+if (ok) {
+period=transpose(per.slice());
+yy=[transpose(ymin.slice()),transpose(ymax.slice())];
+rpar=[0,period.slice(),yy.slice()];
+clrs=clrs.slice(1-1,sum(in1));
+ipar=[win,size(in1,"*"),N,wpos.slice(),wdim.slice(),in1.slice(),clrs.slice(),heritance];
+model.evtin=ones(1-heritance,1);
+model.dstate=[];
+model.rpar=rpar;
+model.ipar=ipar;
+model.label=nom;
+graphics.id=nom;
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+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,None];
+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 8c15def6..05f09246 100644
--- a/js/Sinks/CSCOPE.js
+++ b/js/Sinks/CSCOPE.js
@@ -79,7 +79,7 @@ ymax=+15;
 per=30;
 model=scicos_model();
 model.sim=list("cscope",4);
-model.in=-1;
+model.in1=-1;
 model.in2=1;
 model.evtin=1;
 model.rpar=[0,ymin,ymax,per];
diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js
index bad9fe27..c252f25e 100644
--- a/js/Sinks/CSCOPXY.js
+++ b/js/Sinks/CSCOPXY.js
@@ -82,7 +82,7 @@ ymax=+15;
 nbr_curves=1;
 model=scicos_model();
 model.sim=list("cscopxy",4);
-model.in=[1,1];
+model.in1=[1,1];
 model.in2=[1,1];
 model.intyp=[1,1];
 model.evtin=1;
diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js
index 3f70274d..33c32b3b 100644
--- a/js/Sinks/CSCOPXY3D.js
+++ b/js/Sinks/CSCOPXY3D.js
@@ -95,7 +95,7 @@ vec_z=[-15,15];
 nbr_curves=1;
 model=scicos_model();
 model.sim=list("cscopxy3d",4);
-model.in=[1,1,1];
+model.in1=[1,1,1];
 model.in2=[1,1,1];
 model.intyp=[1,1,1];
 model.evtin=1;
diff --git a/js/Sinks/OUTIMPL_f.js b/js/Sinks/OUTIMPL_f.js
index a0782193..3f2a583a 100644
--- a/js/Sinks/OUTIMPL_f.js
+++ b/js/Sinks/OUTIMPL_f.js
@@ -33,7 +33,7 @@ break
 }
 OUTIMPL_f.prototype.define = function OUTIMPL_f() {
 model=scicos_model();
-model.in=[-1];
+model.in1=[-1];
 model.in2=[1];
 prt=1;
 model.sim="outimpl";
diff --git a/js/Sinks/OUT_f.js b/js/Sinks/OUT_f.js
index 06b5bc45..464dc045 100644
--- a/js/Sinks/OUT_f.js
+++ b/js/Sinks/OUT_f.js
@@ -32,7 +32,7 @@ n=-1;
 prt=1;
 model=scicos_model();
 model.sim="output";
-model.in=-1;
+model.in1=-1;
 model.in2=-2;
 model.intyp=-1;
 model.ipar=prt;
diff --git a/js/Sinks/TOWS_c.js b/js/Sinks/TOWS_c.js
index 51e6a537..e6bd549a 100644
--- a/js/Sinks/TOWS_c.js
+++ b/js/Sinks/TOWS_c.js
@@ -45,7 +45,7 @@ varnam="A";
 herit=0;
 model=scicos_model();
 model.sim=list("tows_c",4);
-model.in=[nu];
+model.in1=[nu];
 model.in2=-2;
 model.intyp=-1;
 model.out=[];
diff --git a/js/Sinks/TRASH_f.js b/js/Sinks/TRASH_f.js
index b148db59..3b950c21 100644
--- a/js/Sinks/TRASH_f.js
+++ b/js/Sinks/TRASH_f.js
@@ -9,7 +9,7 @@ TRASH_f.prototype.define = function TRASH_f() {
 in1=-1;
 model=scicos_model();
 model.sim="trash";
-model.in=in1;
+model.in1=in1;
 model.evtin=1;
 model.blocktype="d";
 model.dep_ut=[None,None];
diff --git a/js/Sinks/WFILE_f.js b/js/Sinks/WFILE_f.js
index e18a8eb2..686e8e7e 100644
--- a/js/Sinks/WFILE_f.js
+++ b/js/Sinks/WFILE_f.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(IN,'in',1,1569)
+Syntax error in input LexToken(CLOSEBRACKET,')',1,3595)
 /* autogenerated from "macros/Sinks/WFILE_f.sci" */
 None
diff --git a/js/Sinks/WRITEAU_f.js b/js/Sinks/WRITEAU_f.js
index 175f7336..e3045356 100644
--- a/js/Sinks/WRITEAU_f.js
+++ b/js/Sinks/WRITEAU_f.js
@@ -34,7 +34,7 @@ ipar=[length(fname1),_str2code(frmt1),N,swap,_str2code(fname1)];
 if (prod(size(dstate))!=(nin+1)*N+2) {
 dstate=[-1,lunit,zeros((nin+1)*N,1)];
 }
-model.in=1;
+model.in1=1;
 model.dstate=dstate;
 model.ipar=ipar;
 graphics.exprs=exprs;
@@ -54,7 +54,7 @@ lunit=0;
 N=2;
 model=scicos_model();
 model.sim=list("writeau",2);
-model.in=in1;
+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)];
diff --git a/js/Sinks/WRITEC_f.js b/js/Sinks/WRITEC_f.js
index ae525585..5dcb16d6 100644
--- a/js/Sinks/WRITEC_f.js
+++ b/js/Sinks/WRITEC_f.js
@@ -1,3 +1,90 @@
-Syntax error in input LexToken(IN,'in',1,1280)
 /* autogenerated from "macros/Sinks/WRITEC_f.sci" */
-None
+function WRITEC_f() {
+WRITEC_f.prototype.get = function WRITEC_f() {
+}
+WRITEC_f.prototype.set = function WRITEC_f() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+ipar=model.ipar;
+dstate=model.dstate;
+lunit=dstate(2);
+fname=exprs(2);
+frmt=exprs(3);
+while (true) {
+[ok,in1,fname1,frmt1,N,swap,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"WRITEC_f")," ",gettext("Write to C binary file")],[gettext("Input Size"),gettext("Output File Name"),gettext("Output Format"),gettext("Buffer Size"),gettext("Swap Mode (0:No, 1:Yes)")],list("vec",1,"str",1,"str",1,"vec",1,"vec",1),exprs);
+if (!ok) {
+break
+}
+in1=int(in1);
+nin=in1;
+fname1=pathconvert(stripblanks(fname1),None,true);
+frmt1=stripblanks(frmt1);
+fmts=["s","l","d","f","c","us","ul","uc","ull","uls","ubl","ubs","dl","fl","ll","sl","db","fb","lb","sb"];
+if (and(frmt1!=fmts)) {
+block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %s."),gettext("Input Format"),frmt1),gettext("Valid formats are: "+strcat(fmts,", ")));
+ok=None;
+} else if (alreadyran&&fname1!=fname) {
+block_parameter_error(msprintf(gettext("You cannot modify \'%s\' when running"),gettext("Input Format")),gettext("End current simulation first."));
+ok=None;
+} else if (alreadyran&&N!=ipar(5)) {
+block_parameter_error(msprintf(gettext("You cannot modify \'Buffer Size\' when running."),gettext("Buffer Size")),gettext("End current simulation first"));
+ok=None;
+} else if (fname1=="") {
+block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter."),gettext("Output File Name")),gettext("You must provide a filename."));
+} else if (fileparts(fname1)!="") {
+[pa,fn,ex]=fileparts(fname1);
+if (!isdir(pa)) {
+block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter."),gettext("Output File Name")),msprintf(gettext("Directory \'%s\' does not exist"),pa));
+ok=None;
+}
+} else if (N<1) {
+block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Buffer Size"),N),gettext("Strictly positive integer expected."));
+ok=None;
+} else if (in1<=0) {
+block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Input Size"),in1),gettext("Strictly positive integer expected."));
+ok=None;
+} else if (swap!=0&&swap!=1) {
+block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Swap Mode"),swap),msprintf(gettext("Must be in the interval %s."),"[0, 1]"));
+ok=None;
+}
+frmt1=part(frmt1,1,3);
+if (ok) {
+ipar=[length(fname1),_str2code(frmt1),N,swap,_str2code(fname1)];
+if (prod(size(dstate))!=(nin+1)*N+2) {
+dstate=[-1,lunit,zeros((nin+1)*N,1)];
+}
+model.in1=nin;
+model.dstate=dstate;
+model.ipar=ipar;
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+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,None];
+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/CLOCK_c.js b/js/Sources/CLOCK_c.js
index 005b09ec..35194d67 100644
--- a/js/Sources/CLOCK_c.js
+++ b/js/Sources/CLOCK_c.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,3500)
+Syntax error in input LexToken(ASSIGNMENT,'=',1,3623)
 /* autogenerated from "macros/Sources/CLOCK_c.sci" */
 None
diff --git a/js/Sources/CLOCK_f.js b/js/Sources/CLOCK_f.js
index 50e27e9a..dad9782a 100644
--- a/js/Sources/CLOCK_f.js
+++ b/js/Sources/CLOCK_f.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,3161)
+Syntax error in input LexToken(ASSIGNMENT,'=',1,3284)
 /* autogenerated from "macros/Sources/CLOCK_f.sci" */
 None
diff --git a/js/Sources/CONST.js b/js/Sources/CONST.js
index 4b322a6b..6da9a9b0 100644
--- a/js/Sources/CONST.js
+++ b/js/Sources/CONST.js
@@ -32,7 +32,7 @@ CONST.prototype.define = function CONST() {
 C=1;
 model=scicos_model();
 model.sim=list("cstblk4",4);
-model.in=[];
+model.in1=[];
 model.out=1;
 model.rpar=C;
 model.blocktype="d";
diff --git a/js/Sources/CONST_f.js b/js/Sources/CONST_f.js
index 82b2f343..eb78ecdc 100644
--- a/js/Sources/CONST_f.js
+++ b/js/Sources/CONST_f.js
@@ -29,7 +29,7 @@ CONST_f.prototype.define = function CONST_f() {
 C=1;
 model=scicos_model();
 model.sim=list("cstblk",1);
-model.in=[];
+model.in1=[];
 model.out=1;
 model.rpar=C;
 model.blocktype="d";
diff --git a/js/Sources/CONST_m.js b/js/Sources/CONST_m.js
index a2e8ceb1..09a70e53 100644
--- a/js/Sources/CONST_m.js
+++ b/js/Sources/CONST_m.js
@@ -55,7 +55,7 @@ CONST_m.prototype.define = function CONST_m() {
 C=[1];
 model=scicos_model();
 model.sim=list("cstblk4",4);
-model.in=[];
+model.in1=[];
 model.out=size(C,1);
 model.in2=[];
 model.out2=size(C,2);
diff --git a/js/Sources/CURV_f.js b/js/Sources/CURV_f.js
index e148d3a1..77e041f8 100644
--- a/js/Sources/CURV_f.js
+++ b/js/Sources/CURV_f.js
@@ -49,7 +49,7 @@ ipar=[size(xx,1),axisdata.slice()];
 rpar=[xx,yy,rect.slice()];
 model=scicos_model();
 model.sim="intplt";
-model.in=[];
+model.in1=[];
 model.out=1;
 model.rpar=[xx,yy,rect.slice()];
 model.ipar=[size(xx,1),axisdata.slice()];
diff --git a/js/Sources/FROMWSB.js b/js/Sources/FROMWSB.js
index 9c4ee168..01e5121d 100644
--- a/js/Sources/FROMWSB.js
+++ b/js/Sources/FROMWSB.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,4385)
+Syntax error in input LexToken(ASSIGNMENT,'=',1,4418)
 /* autogenerated from "macros/Sources/FROMWSB.sci" */
 None
diff --git a/js/Sources/GENSIN_f.js b/js/Sources/GENSIN_f.js
index c08a7a9a..237f62f4 100644
--- a/js/Sources/GENSIN_f.js
+++ b/js/Sources/GENSIN_f.js
@@ -32,7 +32,7 @@ GENSIN_f.prototype.define = function GENSIN_f() {
 rpar=[1,1,0];
 model=scicos_model();
 model.sim="gensin";
-model.in=[];
+model.in1=[];
 model.out=1;
 model.out2=1;
 model.outtyp=1;
diff --git a/js/Sources/Ground_g.js b/js/Sources/Ground_g.js
index fbe7c45c..59447522 100644
--- a/js/Sources/Ground_g.js
+++ b/js/Sources/Ground_g.js
@@ -9,7 +9,7 @@ Ground_g.prototype.define = function Ground_g() {
 C=[0];
 model=scicos_model();
 model.sim=list("cstblk4_m",4);
-model.in=[];
+model.in1=[];
 model.out=1;
 model.in2=[];
 model.out2=1;
diff --git a/js/Sources/RAMP.js b/js/Sources/RAMP.js
index bdafc643..f21eeeff 100644
--- a/js/Sources/RAMP.js
+++ b/js/Sources/RAMP.js
@@ -30,7 +30,7 @@ stt=0;
 rpar=[slope,stt,iout];
 model=scicos_model();
 model.sim=list("ramp",4);
-model.in=[];
+model.in1=[];
 model.out=1;
 model.rpar=rpar;
 model.blocktype="c";
diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js
index 4a6515bf..1ee2aa76 100644
--- a/js/Sources/RAND_m.js
+++ b/js/Sources/RAND_m.js
@@ -56,7 +56,7 @@ function_name="rndblk_m";
 funtyp=4;
 model=scicos_model();
 model.sim=list(function_name,funtyp);
-model.in=[];
+model.in1=[];
 model.in2=[];
 model.intyp=[];
 model.out=1;
diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js
index eafac6be..aeff85c7 100644
--- a/js/Sources/READC_f.js
+++ b/js/Sources/READC_f.js
@@ -16,7 +16,7 @@ lunit=dstate(3);
 fname=exprs(3);
 frmt=exprs(4);
 while (true) {
-[ok,tmask1,outmask,fname1,frmt1,M,N,offset,swap,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"READC_f" )," ",gettext("Read from C binary file")],[gettext("Time Record Selection"),gettext("Outputs Record Selection"),gettext("Input File Name"),gettext("Input Format"),gettext("Record Size"),gettext("Buffer Size"),gettext("Initial Record Index"),gettext("Swap Mode (0:No, 1:Yes)")],list("vec",-1,"vec",-1,"str",1,"str",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
+[ok,tmask1,outmask,fname1,frmt1,M,N,offset,swap,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"READC_f")," ",gettext("Read from C binary file")],[gettext("Time Record Selection"),gettext("Outputs Record Selection"),gettext("Input File Name"),gettext("Input Format"),gettext("Record Size"),gettext("Buffer Size"),gettext("Initial Record Index"),gettext("Swap Mode (0:No, 1:Yes)")],list("vec",-1,"vec",-1,"str",1,"str",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break
 }
diff --git a/js/Sources/STEP.js b/js/Sources/STEP.js
index 23bf9d84..8ffd10e8 100644
--- a/js/Sources/STEP.js
+++ b/js/Sources/STEP.js
@@ -1,3 +1,66 @@
-Syntax error in input LexToken(IN,'in',1,1163)
 /* autogenerated from "macros/Sources/STEP.sci" */
-None
+function STEP() {
+STEP.prototype.get = function STEP() {
+}
+STEP.prototype.set = function STEP() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,temps,in1,fi,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"STEP_FUNCTION")," ",gettext("Step Function")," "],[gettext("Step Time"),gettext("Initial Value"),gettext("Final Value")],list("vec",1,"vec",-1,"vec",-1),exprs);
+if (!ok) {
+break
+}
+in1=in1.slice();
+fi=fi.slice();
+if (size(in1,"*")!=size(fi,"*")) {
+if (size(in1,"*")==1) {
+in1=in1*ones(fi);
+} else if (size(fi,"*")==1) {
+fi=fi*ones(in1);
+} else {
+block_parameter_error(msprintf(gettext("\'Initial Value\' and \'Final Value\': incompatible sizes: %d and %d."),size(in1,"*"),size(fi,"*")),gettext("Same sizes expected."));
+ok=None;
+}
+}
+if (ok) {
+model.out2=1;
+model.outtyp=1;
+[model,graphics,ok]=check_io(model,graphics,[],size(fi,"*"),1,1);
+}
+if (ok) {
+model.firing=temps;
+if (temps==0) {
+rpar=[fi,fi];
+} else {
+rpar=[in1,fi];
+}
+model.rpar=rpar;
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+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=[None,None];
+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/STEP_FUNCTION.js b/js/Sources/STEP_FUNCTION.js
index 2e0d3006..0e366bdf 100644
--- a/js/Sources/STEP_FUNCTION.js
+++ b/js/Sources/STEP_FUNCTION.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,4227)
+Syntax error in input LexToken(CLEAR,'clear',1,5508)
 /* autogenerated from "macros/Sources/STEP_FUNCTION.sci" */
 None
diff --git a/js/Sources/Sigbuilder.js b/js/Sources/Sigbuilder.js
index 1f9d70dd..ff42b340 100644
--- a/js/Sources/Sigbuilder.js
+++ b/js/Sources/Sigbuilder.js
@@ -1,4 +1,4 @@
-Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,4459)
+Syntax error in input LexToken(ASSIGNMENT,'=',1,4492)
 Syntax error in input LexToken(VAR,'N',1,10287)
 Syntax error in input LexToken(VAR,'order',1,12980)
 Syntax error in input LexToken(VAR,'x',1,13322)
diff --git a/js/Threshold/GENERAL_f.js b/js/Threshold/GENERAL_f.js
index b776332b..cf90a0d9 100644
--- a/js/Threshold/GENERAL_f.js
+++ b/js/Threshold/GENERAL_f.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(IN,'in',1,1171)
+Syntax error in input LexToken(COMMA,',',1,1848)
 /* autogenerated from "macros/Threshold/GENERAL_f.sci" */
 None
diff --git a/js/Threshold/NEGTOPOS_f.js b/js/Threshold/NEGTOPOS_f.js
index 10e9f4b2..0b6349b8 100644
--- a/js/Threshold/NEGTOPOS_f.js
+++ b/js/Threshold/NEGTOPOS_f.js
@@ -10,7 +10,7 @@ NEGTOPOS_f.prototype.define = function NEGTOPOS_f() {
 model=scicos_model();
 model.sim=list("zcross",1);
 model.nzcross=1;
-model.in=1;
+model.in1=1;
 model.evtout=1;
 model.rpar=[-1,-1,0,-1];
 model.blocktype="z";
diff --git a/js/Threshold/POSTONEG_f.js b/js/Threshold/POSTONEG_f.js
index a542bb0e..2826dc8b 100644
--- a/js/Threshold/POSTONEG_f.js
+++ b/js/Threshold/POSTONEG_f.js
@@ -11,7 +11,7 @@ rpar=[-1,-1,-1,0];
 model=scicos_model();
 model.sim=list("zcross",1);
 model.nzcross=1;
-model.in=1;
+model.in1=1;
 model.evtout=1;
 model.rpar=[-1,-1,-1,0];
 model.blocktype="z";
diff --git a/js/Threshold/ZCROSS_f.js b/js/Threshold/ZCROSS_f.js
index a4de2594..f84335bf 100644
--- a/js/Threshold/ZCROSS_f.js
+++ b/js/Threshold/ZCROSS_f.js
@@ -1,3 +1,52 @@
-Syntax error in input LexToken(IN,'in',1,1082)
 /* autogenerated from "macros/Threshold/ZCROSS_f.sci" */
-None
+function ZCROSS_f() {
+ZCROSS_f.prototype.get = function ZCROSS_f() {
+}
+ZCROSS_f.prototype.set = function ZCROSS_f() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,in1,exprs]=scicos_getvalue(["Set Zero-Crossing parameters","All surfaces must cross together"],"Input size",list("vec",1),exprs);
+if (!ok) {
+break
+}
+in1=int(in1);
+if (in1<=0) {
+message("Block must have at least one input");
+} else {
+kk=0;
+for(jj=1;jj<=in1;jj+=1) {
+kk=kk+2^(in1+jj-1);
+}
+model.rpar=[-ones(kk,1),zeros(2^(2*in1)-kk,1)];
+graphics.exprs=exprs;
+model.in1=in1;
+model.nzcross=in1;
+model.firing=-1;
+x.graphics=graphics;
+x.model=model;
+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,None];
+exprs=strcat(sci2exp(in1));
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+ZCROSS_f.prototype.details = function ZCROSS_f() {
+}
+}