28 files changed, 114 insertions, 114 deletions
diff --git a/js/Misc/BACKLASH.js b/js/Misc/BACKLASH.js
index 338109ca..2e9e8457 100644
--- a/js/Misc/BACKLASH.js
+++ b/js/Misc/BACKLASH.js
@@ -1,12 +1,12 @@
 /* autogenerated from "macros/Misc/BACKLASH.sci" */
 function BACKLASH() {
 BACKLASH.prototype.define = function BACKLASH() {
-exprs=["0","1","1"];
+exprs=[["0"],["1"],["1"]];
 model=scicos_model();
 model.sim=list("backlash",4);
 model.in1=1;
 model.out=1;
-model.rpar=[0,1];
+model.rpar=[[0],[1]];
 model.nzcross=2;
 model.blocktype="c";
 model.dep_ut=[true,false];
@@ -24,7 +24,7 @@ exprs=graphics.exprs;
 model=arg1.model;
 rpar=model.rpar;
 while (true) {
-[ok,ini,gap,zcr,exprs]=scicos_getvalue("Set backlash parameters",["initial output","gap","use zero-crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),exprs);
+[ok,ini,gap,zcr,exprs]=scicos_getvalue("Set backlash parameters",[["initial output"],["gap"],["use zero-crossing (0:no, 1:yes)"]],list("vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js
index 5b4c3f8a..3127a1db 100644
--- a/js/Misc/BOUNCE.js
+++ b/js/Misc/BOUNCE.js
@@ -12,11 +12,11 @@ ipar[k-1]=j;
 k=k+1;
 }
 }
-walls=[0,5,0,5];
-x=[2,2.5];
-xd=[0,0];
-y=[3,5];
-yd=[0,0];
+walls=[[0],[5],[0],[5]];
+x=[[2],[2.5]];
+xd=[[0],[0]];
+y=[[3],[5]];
+yd=[[0],[0]];
 g=9.81;
 C=0;
 rpar1=ones(n,1);
@@ -26,14 +26,14 @@ state=transpose(state);
 model=scicos_model();
 model.sim=list("bounce_ball",4);
 model.in1=[];
-model.out=[n,n];
+model.out=[[n],[n]];
 model.state=state.slice();
-model.rpar=[rpar1,rpar2,walls,g,C];
+model.rpar=[[rpar1],[rpar2],[walls],[g],[C]];
 model.ipar=ipar;
 model.nzcross=n*(n-1)/2+4*n;
 model.blocktype="c";
 model.dep_ut=[false,true];
-exprs=[strcat(sci2exp(rpar1)),strcat(sci2exp(rpar2)),strcat(sci2exp(walls)),strcat(sci2exp(x)),strcat(sci2exp(xd)),strcat(sci2exp(y)),strcat(sci2exp(yd))];
+exprs=[[strcat(sci2exp(rpar1))],[strcat(sci2exp(rpar2))],[strcat(sci2exp(walls))],[strcat(sci2exp(x))],[strcat(sci2exp(xd))],[strcat(sci2exp(y))],[strcat(sci2exp(yd))]];
 gr_i=[];
 x=standard_define([3,2],model,exprs,gr_i);
 }
@@ -51,7 +51,7 @@ exprs[8-1]="9.81";
 exprs[9-1]="0";
 }
 while (true) {
-[ok,rpar1,rpar2,walls,xt,xd,y,yd,g,C,exprs]=scicos_getvalue(["Set Bounce Block"],["Mass","Radius","[xmin,xmax,ymin,ymax]","xpos","xdpos","ypos","ydpos","g (gravity)","C (aerodynamic coeff"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",1),exprs);
+[ok,rpar1,rpar2,walls,xt,xd,y,yd,g,C,exprs]=scicos_getvalue(["Set Bounce Block"],[["Mass"],["Radius"],["[xmin,xmax,ymin,ymax]"],["xpos"],["xdpos"],["ypos"],["ydpos"],["g (gravity)"],["C (aerodynamic coeff"]],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
@@ -72,7 +72,7 @@ walls=walls[[3,4]-1];
 if (n!=size(y,"*")||n!=size(rpar1,"*")||n!=size(rpar2,"*")||n!=size(xd,"*")||n!=size(yd,"*")) {
 message("All vectors must have equal size");
 ok=false;
-} else if (!(min([rpar1,rpar2])>0)) {
+} else if (!(min([[rpar1],[rpar2]])>0)) {
 message("Mass and radius must be >0");
 ok=false;
 }
@@ -91,7 +91,7 @@ ipar[k-1]=j;
 k=k+1;
 }
 }
-model.rpar=[rpar1,rpar2,walls,g,C];
+model.rpar=[[rpar1],[rpar2],[walls],[g],[C]];
 model.ipar=ipar;
 state=[xt,xd,y,yd];
 state=transpose(state);
diff --git a/js/Misc/BOUNCEXY.js b/js/Misc/BOUNCEXY.js
index fb0f9434..d04df248 100644
--- a/js/Misc/BOUNCEXY.js
+++ b/js/Misc/BOUNCEXY.js
@@ -3,17 +3,17 @@ function BOUNCEXY() {
 BOUNCEXY.prototype.define = function BOUNCEXY() {
 win=-1;
 imode=1;
-clrs=[1,2];
-siz=[1,1];
+clrs=[[1],[2]];
+siz=[[1],[1]];
 xmin=-5;
 xmax=5;
 ymin=0;
 ymax=15;
 model=scicos_model();
 model.sim=list("bouncexy",4);
-model.in1=[-1,-1];
-model.in2=[1,1];
-model.intyp=[1,1];
+model.in1=[[-1],[-1]];
+model.in2=[[1],[1]];
+model.intyp=[[1],[1]];
 model.evtin=1;
 z=[];
 for (i=1;i<=size(clrs,"*");i+=1) {
@@ -25,12 +25,12 @@ z[6*(i-1)+5-1]=0.000;
 z[6*(i-1)+6-1]=64.0*360.000;
 }
 model.dstate=z;
-model.rpar=[xmin,xmax,ymin,ymax];
-model.ipar=[win,imode,clrs.slice()];
+model.rpar=[[xmin],[xmax],[ymin],[ymax]];
+model.ipar=[[win],[imode],[clrs.slice()]];
 model.blocktype="d";
 model.firing=[];
 model.dep_ut=[false,false];
-exprs=[strcat(sci2exp(clrs)),strcat(sci2exp(siz)),strcat(sci2exp(win)),strcat(sci2exp(1)),strcat(sci2exp(xmin)),strcat(sci2exp(xmax)),strcat(sci2exp(ymin)),strcat(sci2exp(ymax))];
+exprs=[[strcat(sci2exp(clrs))],[strcat(sci2exp(siz))],[strcat(sci2exp(win))],[strcat(sci2exp(1))],[strcat(sci2exp(xmin))],[strcat(sci2exp(xmax))],[strcat(sci2exp(ymin))],[strcat(sci2exp(ymax))]];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 }
@@ -45,32 +45,32 @@ exprs=graphics.exprs;
 model=arg1.model;
 dstate=model.dstate;
 while (true) {
-[ok,clrs,siz,win,imode,xmin,xmax,ymin,ymax,exprs]=scicos_getvalue("Set Scope parameters",["colors","radii","window number (-1 for automatic)","animation mode (0,1)","Xmin","Xmax","Ymin","Ymax"],list("vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
+[ok,clrs,siz,win,imode,xmin,xmax,ymin,ymax,exprs]=scicos_getvalue("Set Scope parameters",[["colors"],["radii"],["window number (-1 for automatic)"],["animation mode (0,1)"],["Xmin"],["Xmax"],["Ymin"],["Ymax"]],list("vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
 mess=[];
 if (size(clrs,"*")!=size(siz,"*")) {
-mess=[mess,"colors and radii must have equal size (number of balls)"," "];
+mess=[[mess],["colors and radii must have equal size (number of balls)"],[" "]];
 ok=false;
 }
 if (win<-1) {
-mess=[mess,"Window number cannot be inferior than -1"," "];
+mess=[[mess],["Window number cannot be inferior than -1"],[" "]];
 ok=false;
 }
 if (ymin>=ymax) {
-mess=[mess,"Ymax must be greater than Ymin"," "];
+mess=[[mess],["Ymax must be greater than Ymin"],[" "]];
 ok=false;
 }
 if (xmin>=xmax) {
-mess=[mess,"Xmax must be greater than Xmin"," "];
+mess=[[mess],["Xmax must be greater than Xmin"],[" "]];
 ok=false;
 }
 if (!ok) {
 message(mess);
 } else {
-rpar=[xmin,xmax,ymin,ymax];
-ipar=[win,imode,clrs.slice()];
+rpar=[[xmin],[xmax],[ymin],[ymax]];
+ipar=[[win],[imode],[clrs.slice()]];
 z=[];
 for (i=1;i<=size(clrs,"*");i+=1) {
 z[6*(i-1)+1-1]=0;
diff --git a/js/Misc/BPLATFORM.js b/js/Misc/BPLATFORM.js
index a5994f86..803b269b 100644
--- a/js/Misc/BPLATFORM.js
+++ b/js/Misc/BPLATFORM.js
@@ -10,10 +10,10 @@ ymin=0;
 ymax=15;
 model=scicos_model();
 model.sim=list("bplatform2",5);
-model.in1=[1,1];
+model.in1=[[1],[1]];
 model.evtin=1;
 model.dstate=0;
-model.rpar=[plen,csiz,phi,xmin,xmax,ymin,ymax];
+model.rpar=[[plen],[csiz],[phi],[xmin],[xmax],[ymin],[ymax]];
 model.blocktype="d";
 model.dep_ut=[false,false];
 exprs=string(model.rpar);
@@ -31,27 +31,27 @@ exprs=graphics.exprs;
 model=arg1.model;
 dstate=model.dstate;
 while (true) {
-[ok,plen,csiz,phi,xmin,xmax,ymin,ymax,exprs]=scicos_getvalue("Set Scope parameters",["pendulum length","cart size (square side)","slope","Xmin","Xmax","Ymin","Ymax"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
+[ok,plen,csiz,phi,xmin,xmax,ymin,ymax,exprs]=scicos_getvalue("Set Scope parameters",[["pendulum length"],["cart size (square side)"],["slope"],["Xmin"],["Xmax"],["Ymin"],["Ymax"]],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
 mess=[];
 if (plen<=0||csiz<=0) {
-mess=[mess,"Pendulum length and cart size must be positive."," "];
+mess=[[mess],["Pendulum length and cart size must be positive."],[" "]];
 ok=false;
 }
 if (ymin>=ymax) {
-mess=[mess,"Ymax must be greater than Ymin"," "];
+mess=[[mess],["Ymax must be greater than Ymin"],[" "]];
 ok=false;
 }
 if (xmin>=xmax) {
-mess=[mess,"Xmax must be greater than Xmin"," "];
+mess=[[mess],["Xmax must be greater than Xmin"],[" "]];
 ok=false;
 }
 if (!ok) {
 message(mess);
 } else {
-rpar=[plen,csiz,phi,xmin,xmax,ymin,ymax];
+rpar=[[plen],[csiz],[phi],[xmin],[xmax],[ymin],[ymax]];
 model.rpar=rpar;
 graphics.exprs=exprs;
 x.graphics=graphics;
diff --git a/js/Misc/CBLOCK.js b/js/Misc/CBLOCK.js
index de8a80f0..12bbcb50 100644
--- a/js/Misc/CBLOCK.js
+++ b/js/Misc/CBLOCK.js
@@ -41,7 +41,7 @@ model=arg1.model;
 graphics=arg1.graphics;
 label=graphics.exprs;
 while (true) {
-[ok,function_name,impli,i,o,ci,co,xx,ng,z,rpar,ipar,auto0,depu,dept,lab]=scicos_getvalue("Set C-Block2 block parameters",["simulation function","is block implicit? (y,n)","input ports sizes","output ports sizes","input event ports sizes","output events ports sizes","initial continuous state","number of zero crossing surfaces","initial discrete state","Real parameters vector","Integer parameters vector","initial firing vector (<0 for no firing)","direct feedthrough (y or n)","time dependence (y or n)"],list("str",1,"str",1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",-1,"vec","sum(%6)","str",1,"str",1),label(1));
+[ok,function_name,impli,i,o,ci,co,xx,ng,z,rpar,ipar,auto0,depu,dept,lab]=scicos_getvalue("Set C-Block2 block parameters",[["simulation function"],["is block implicit? (y,n)"],["input ports sizes"],["output ports sizes"],["input event ports sizes"],["output events ports sizes"],["initial continuous state"],["number of zero crossing surfaces"],["initial discrete state"],["Real parameters vector"],["Integer parameters vector"],["initial firing vector (<0 for no firing)"],["direct feedthrough (y or n)"],["time dependence (y or n)"]],list("str",1,"str",1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",-1,"vec","sum(%6)","str",1,"str",1),label(1));
 if (!ok) {
 break;
 }
@@ -65,8 +65,8 @@ funtyp=12004;
 } else {
 funtyp=2004;
 }
-if ([ci,co]!=[]) {
-if (max([ci,co])>1) {
+if ([[ci],[co]]!=[]) {
+if (max([[ci],[co]])>1) {
 message("vector event links not supported");
 ok=false;
 }
diff --git a/js/Misc/CBLOCK4.js b/js/Misc/CBLOCK4.js
index bea5ff99..952114ed 100644
--- a/js/Misc/CBLOCK4.js
+++ b/js/Misc/CBLOCK4.js
@@ -11,7 +11,7 @@ model.out=1;
 model.out2=1;
 model.outtyp=1;
 model.dep_ut=[true,false];
-label=list([funam,"n",sci2exp([model.in1,model.in2]),sci2exp(model.intyp),sci2exp([model.out,model.out2]),sci2exp(model.outtyp),sci2exp(model.evtin),sci2exp(model.evtout),sci2exp(model.state),sci2exp(model.dstate),sci2exp(model.odstate),sci2exp(model.rpar),sci2exp(model.ipar),sci2exp(model.opar),sci2exp(model.nmode),sci2exp(model.nzcross),sci2exp(model.firing),"y","n"],[]);
+label=list([[funam],["n"],[sci2exp([model.in1,model.in2])],[sci2exp(model.intyp)],[sci2exp([model.out,model.out2])],[sci2exp(model.outtyp)],[sci2exp(model.evtin)],[sci2exp(model.evtout)],[sci2exp(model.state)],[sci2exp(model.dstate)],[sci2exp(model.odstate)],[sci2exp(model.rpar)],[sci2exp(model.ipar)],[sci2exp(model.opar)],[sci2exp(model.nmode)],[sci2exp(model.nzcross)],[sci2exp(model.firing)],["y"],["n"]],[]);
 gr_i=[];
 x=standard_define([4,2],model,label,gr_i);
 }
@@ -25,7 +25,7 @@ model=arg1.model;
 graphics=arg1.graphics;
 label=graphics.exprs;
 while (true) {
-[ok,function_name,impli,in1,it,out,ot,ci,co,xx,z,oz,rpar,ipar,opar,nmode,nzcr,auto0,depu,dept,lab]=scicos_getvalue("Set C-Block4 block parameters",["Simulation function","Is block implicit? (y,n)","Input ports sizes","Input ports type","Output port sizes","Output ports type","Input event ports sizes","Output events ports sizes","Initial continuous state","Initial discrete state","Initial object state","Real parameters vector","Integer parameters vector","Object parameters list","Number of modes","Number of zero crossings","Initial firing vector (<0 for no firing)","Direct feedthrough (y or n)","Time dependence (y or n)"],list("str",1,"str",1,"mat",[-1,2],"vec",-1,"mat",[-1,2],"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"lis",-1,"vec",-1,"vec",-1,"lis",-1,"vec",1,"vec",1,"vec","sum(%8)","str",1,"str",1),label(1));
+[ok,function_name,impli,in1,it,out,ot,ci,co,xx,z,oz,rpar,ipar,opar,nmode,nzcr,auto0,depu,dept,lab]=scicos_getvalue("Set C-Block4 block parameters",[["Simulation function"],["Is block implicit? (y,n)"],["Input ports sizes"],["Input ports type"],["Output port sizes"],["Output ports type"],["Input event ports sizes"],["Output events ports sizes"],["Initial continuous state"],["Initial discrete state"],["Initial object state"],["Real parameters vector"],["Integer parameters vector"],["Object parameters list"],["Number of modes"],["Number of zero crossings"],["Initial firing vector (<0 for no firing)"],["Direct feedthrough (y or n)"],["Time dependence (y or n)"]],list("str",1,"str",1,"mat",[-1,2],"vec",-1,"mat",[-1,2],"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"lis",-1,"vec",-1,"vec",-1,"lis",-1,"vec",1,"vec",1,"vec","sum(%8)","str",1,"str",1),label(1));
 if (!ok) {
 break;
 }
@@ -46,8 +46,8 @@ funtyp=12004;
 } else {
 funtyp=2004;
 }
-if ([ci,co]!=[]) {
-if (max([ci,co])>1) {
+if ([[ci],[co]]!=[]) {
+if (max([[ci],[co]])>1) {
 message("vector event links not supported");
 ok=false;
 }
diff --git a/js/Misc/CONSTRAINT2_c.js b/js/Misc/CONSTRAINT2_c.js
index a67461e1..cdbb42d8 100644
--- a/js/Misc/CONSTRAINT2_c.js
+++ b/js/Misc/CONSTRAINT2_c.js
@@ -7,8 +7,8 @@ id=[0];
 model=scicos_model();
 model.sim=list("constraint_c",10004);
 model.in1=1;
-model.out=[1,1];
-model.state=[x0,xd0];
+model.out=[[1],[1]];
+model.state=[[x0],[xd0]];
 model.ipar=id;
 model.blocktype="c";
 model.dep_ut=[false,true];
@@ -27,7 +27,7 @@ exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
 ask_again=false;
-[ok,x0,xd0,id,exprs]=scicos_getvalue("Set Constraint block parameters",["Initial guess values of states x","Initial guess values of derivative x\'","Id(i)=1: if x\'(i) is present in the feedback, else Id(i)=0"],list("vec",-1,"vec",-1,"vec",-1),exprs);
+[ok,x0,xd0,id,exprs]=scicos_getvalue("Set Constraint block parameters",[["Initial guess values of states x"],["Initial guess values of derivative x\'"],["Id(i)=1: if x\'(i) is present in the feedback, else Id(i)=0"]],list("vec",-1,"vec",-1,"vec",-1),exprs);
 if (!ok) {
 break;
 }
@@ -49,7 +49,7 @@ if ((!ask_again)) {
 for (i=1;i<=N;i+=1) {
 if (!((id[i-1]==0)||(id[i-1]==1))) {
 ask_again=true;
-x_message(["Id(i) must be either","0 when x\'(i) is not present in the feedback","1: when x\'(i) is present in the feedback"]);
+x_message([["Id(i) must be either"],["0 when x\'(i) is not present in the feedback"],["1: when x\'(i) is present in the feedback"]]);
 break;
 }
 if ((id[i-1]==0)) {
@@ -59,8 +59,8 @@ id[i-1]=-1;
 }
 if (!ask_again) {
 graphics.exprs=exprs;
-model.state=[x0,xd0];
-model.out=[N,N];
+model.state=[[x0],[xd0]];
+model.out=[[N],[N]];
 model.in1=N;
 model.ipar=id;
 x.graphics=graphics;
diff --git a/js/Misc/CONSTRAINT_c.js b/js/Misc/CONSTRAINT_c.js
index 16568b55..a8f723c3 100644
--- a/js/Misc/CONSTRAINT_c.js
+++ b/js/Misc/CONSTRAINT_c.js
@@ -1,7 +1,7 @@
 /* autogenerated from "macros/Misc/CONSTRAINT_c.sci" */
 function CONSTRAINT_c() {
 CONSTRAINT_c.prototype.define = function CONSTRAINT_c() {
-x0=[0,0];
+x0=[[0],[0]];
 model=scicos_model();
 model.sim=list("constraint_c",10004);
 model.in1=1;
@@ -36,7 +36,7 @@ message("number of states (constraints) must be > 0 ");
 [model,graphics,ok]=check_io(model,graphics,N,N,[],[]);
 if (ok) {
 graphics.exprs=exprs;
-model.state=[x0,zeros(N,1)];
+model.state=[[x0],[zeros(N,1)]];
 model.out=N;
 model.in1=N;
 model.ipar=-1*ones(N,1);
diff --git a/js/Misc/DEADBAND.js b/js/Misc/DEADBAND.js
index b34ee97c..1b674b92 100644
--- a/js/Misc/DEADBAND.js
+++ b/js/Misc/DEADBAND.js
@@ -3,7 +3,7 @@ function DEADBAND() {
 DEADBAND.prototype.define = function DEADBAND() {
 minp=-.5;
 maxp=.5;
-rpar=[maxp,minp];
+rpar=[[maxp],[minp]];
 model=scicos_model();
 model.sim=list("deadband",4);
 model.in1=1;
@@ -13,7 +13,7 @@ model.out=1;
 model.rpar=rpar;
 model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=[string(maxp),string(minp),string(model.nmode)];
+exprs=[[string(maxp)],[string(minp)],[string(model.nmode)]];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 }
@@ -27,14 +27,14 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,maxp,minp,zeroc,exprs]=scicos_getvalue("Set Deadband parameters",["End of dead band","Start of dead band","zero crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),exprs);
+[ok,maxp,minp,zeroc,exprs]=scicos_getvalue("Set Deadband parameters",[["End of dead band"],["Start of dead band"],["zero crossing (0:no, 1:yes)"]],list("vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
 if (maxp<=minp) {
 message("Upper limit must be > Lower limit");
 } else {
-rpar=[maxp,minp];
+rpar=[[maxp],[minp]];
 model.rpar=rpar;
 if (zeroc!=0) {
 model.nzcross=2;
diff --git a/js/Misc/DEBUG.js b/js/Misc/DEBUG.js
index 3535d543..a022bcfe 100644
--- a/js/Misc/DEBUG.js
+++ b/js/Misc/DEBUG.js
@@ -19,7 +19,7 @@ exprs=graphics.exprs;
 textmp=exprs[2-1];
 ok=true;
 while (1==1) {
-[txt]=dialog(["Enter scilab instructions for debugging."," Inputs are block and flag, output is block"],textmp);
+[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) {
@@ -33,7 +33,7 @@ scicos_debug(2);
 }
 break;
 } else {
-message(["Error in the instructions",lasterror()]);
+message([["Error in the instructions"],[lasterror()]]);
 }
 } else {
 ok=false;
diff --git a/js/Misc/DIFF_f.js b/js/Misc/DIFF_f.js
index d7cb8162..52c73a39 100644
--- a/js/Misc/DIFF_f.js
+++ b/js/Misc/DIFF_f.js
@@ -1,7 +1,7 @@
 /* autogenerated from "macros/Misc/DIFF_f.sci" */
 function DIFF_f() {
 DIFF_f.prototype.define = function DIFF_f() {
-x0=[0,0];
+x0=[[0],[0]];
 model=scicos_model();
 model.sim=list("diffblk",10001);
 model.in1=1;
@@ -9,7 +9,7 @@ model.out=1;
 model.state=x0;
 model.blocktype="c";
 model.dep_ut=[false,true];
-exprs=[strcat(sci2exp(x0[1-1])),strcat(sci2exp(x0[2-1]))];
+exprs=[[strcat(sci2exp(x0[1-1]))],[strcat(sci2exp(x0[2-1]))]];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 }
@@ -23,12 +23,12 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,x0,xd0,exprs]=scicos_getvalue("Set continuous linear system parameters",["Initial state","Initial Derivative"],list("vec",1,"vec",1),exprs);
+[ok,x0,xd0,exprs]=scicos_getvalue("Set continuous linear system parameters",[["Initial state"],["Initial Derivative"]],list("vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
 graphics.exprs=exprs;
-model.state=[x0.slice(),xd0.slice()];
+model.state=[[x0.slice()],[xd0.slice()]];
 x.graphics=graphics;
 x.model=model;
 break;
diff --git a/js/Misc/ENDBLK.js b/js/Misc/ENDBLK.js
index eb5fbc9c..a6eb57bd 100644
--- a/js/Misc/ENDBLK.js
+++ b/js/Misc/ENDBLK.js
@@ -3,7 +3,7 @@ function ENDBLK() {
 ENDBLK.prototype.define = function ENDBLK() {
 scs_m_1=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[-159.096,811.104,-121.216,617.984,1323,1008,331,284,630,480,0,7,1.4],Title="ENDBLK",tol=[0.0001,0.000001,1.000e-10,100001,0,0],tf=100000,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(true,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list()));
 scs_m_1.objs[1-1]=scicos_block(gui="END_c",graphics=scicos_graphics(orig=[272.104,249.11733],sz=[40,40],flip=true,theta=0,exprs="1.000E+08",pin=[],pout=[],pein=2,peout=2,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim=list("scicosexit",4),in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=1.000e+08,dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m_1.objs[2-1]=scicos_link(xx=[292.104,292.104,261.83733,261.83733,292.104,292.104],yy=[243.40305,234.45067,234.45067,305.584,305.584,294.83162],id="drawlink",thick=[0,0],ct=[5,-1],from=[1,1,0],to=[1,1,1]);
+scs_m_1.objs[2-1]=scicos_link(xx=[[292.104],[292.104],[261.83733],[261.83733],[292.104],[292.104]],yy=[[243.40305],[234.45067],[234.45067],[305.584],[305.584],[294.83162]],id="drawlink",thick=[0,0],ct=[5,-1],from=[1,1,0],to=[1,1,1]);
 model=scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list());
 gr_i=[];
 x=standard_define([2,2],model,[],gr_i);
diff --git a/js/Misc/HYSTHERESIS.js b/js/Misc/HYSTHERESIS.js
index 04951691..010ac369 100644
--- a/js/Misc/HYSTHERESIS.js
+++ b/js/Misc/HYSTHERESIS.js
@@ -4,7 +4,7 @@ HYSTHERESIS.prototype.define = function HYSTHERESIS() {
 in1=1;
 ipar=[0];
 nzz=2;
-rpar=[1,0,1,0];
+rpar=[[1],[0],[1],[0]];
 model=scicos_model();
 model.sim=list("hystheresis",4);
 model.in1=in1;
@@ -14,7 +14,7 @@ model.nzcross=nzz;
 model.nmode=1;
 model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=[string(rpar),string(sign(nzz))];
+exprs=[[string(rpar)],[string(sign(nzz))]];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 }
@@ -28,7 +28,7 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,high_lim,low_lim,out_high,out_low,nzz,exprs]=scicos_getvalue("Set parameters",["switch on at","switch off at","output when on","output when off","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
+[ok,high_lim,low_lim,out_high,out_low,nzz,exprs]=scicos_getvalue("Set parameters",[["switch on at"],["switch off at"],["output when on"],["output when off"],["use zero crossing: yes (1), no (0)"]],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/Misc/IMPSPLIT_f.js b/js/Misc/IMPSPLIT_f.js
index 0fe9b46a..5a43582f 100644
--- a/js/Misc/IMPSPLIT_f.js
+++ b/js/Misc/IMPSPLIT_f.js
@@ -6,7 +6,7 @@ model.sim="limpsplit";
 mo=modelica();
 mo.model="limpsplit";
 mo.inputs="n";
-mo.outputs=["n","n"];
+mo.outputs=[["n"],["n"]];
 model.equations=mo;
 model.in1=ones(size(mo.inputs,"*"),1);
 model.out=ones(size(mo.outputs,"*"),1);
diff --git a/js/Misc/LOGICAL_OP.js b/js/Misc/LOGICAL_OP.js
index b24cf6d0..b2a55c23 100644
--- a/js/Misc/LOGICAL_OP.js
+++ b/js/Misc/LOGICAL_OP.js
@@ -1,7 +1,7 @@
 /* autogenerated from "macros/Misc/LOGICAL_OP.sci" */
 function LOGICAL_OP() {
 LOGICAL_OP.prototype.define = function LOGICAL_OP() {
-in1=[-1,-1];
+in1=[[-1],[-1]];
 ipar=[0];
 nin=2;
 model=scicos_model();
@@ -11,7 +11,7 @@ model.out=-1;
 model.ipar=ipar;
 model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=[string(nin),string(ipar)];
+exprs=[[string(nin)],[string(ipar)]];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 }
@@ -25,10 +25,10 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 if (size(exprs,1)==2) {
-exprs=[exprs,sci2exp(1),sci2exp(0)];
+exprs=[[exprs],[sci2exp(1)],[sci2exp(0)]];
 }
 while (true) {
-[ok,nin,rule,Datatype,tp,exprs]=scicos_getvalue("Set parameters",["number of inputs","Operator: AND (0), OR (1), NAND (2), NOR (3), XOR (4), NOT (5)","Datatype (1=double 3=int32 ...)","Bitwise Rule(0=No 1=yes)"],list("vec",1,"vec",1,"vec",1,"vec",1),exprs);
+[ok,nin,rule,Datatype,tp,exprs]=scicos_getvalue("Set parameters",[["number of inputs"],["Operator: AND (0), OR (1), NAND (2), NOR (3), XOR (4), NOT (5)","Datatype (1=double 3=int32 ...)"],["Bitwise Rule(0=No 1=yes)"]],list("vec",1,"vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
@@ -72,7 +72,7 @@ model.sim=list("logicalop_ui8",4);
 message("Datatype is not supported");
 ok=false;
 }
-model.ipar=[rule,tp];
+model.ipar=[[rule],[tp]];
 }
 if (ok) {
 it=Datatype*ones(nin,1);
diff --git a/js/Misc/MEMORY_f.js b/js/Misc/MEMORY_f.js
index 574eb74a..9947d226 100644
--- a/js/Misc/MEMORY_f.js
+++ b/js/Misc/MEMORY_f.js
@@ -3,7 +3,7 @@ function MEMORY_f() {
 MEMORY_f.prototype.define = function MEMORY_f() {
 z=0;
 in1=1;
-exprs=[string(z),string(1)];
+exprs=[[string(z)],[string(1)]];
 model=scicos_model();
 model.sim="memo";
 model.in1=in1;
@@ -26,7 +26,7 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,a,inh,exprs]=scicos_getvalue("Set memory block parameters",["initial condition","Inherit (1: no, 0: yes)"],list("vec",-1,"vec",1),exprs);
+[ok,a,inh,exprs]=scicos_getvalue("Set memory block parameters",[["initial condition"],["Inherit (1: no, 0: yes)"]],list("vec",-1,"vec",1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/Misc/PENDULUM_ANIM.js b/js/Misc/PENDULUM_ANIM.js
index 52c47878..f709fd48 100644
--- a/js/Misc/PENDULUM_ANIM.js
+++ b/js/Misc/PENDULUM_ANIM.js
@@ -10,10 +10,10 @@ ymin=-5;
 ymax=5;
 model=scicos_model();
 model.sim=list("anim_pen",5);
-model.in1=[1,1];
+model.in1=[[1],[1]];
 model.evtin=1;
 model.dstate=0;
-model.rpar=[plen,csiz,phi,xmin,xmax,ymin,ymax];
+model.rpar=[[plen],[csiz],[phi],[xmin],[xmax],[ymin],[ymax]];
 model.blocktype="d";
 model.dep_ut=[false,false];
 exprs=string(model.rpar);
@@ -31,27 +31,27 @@ exprs=graphics.exprs;
 model=arg1.model;
 dstate=model.dstate;
 while (true) {
-[ok,plen,csiz,phi,xmin,xmax,ymin,ymax,exprs]=scicos_getvalue("Set Scope parameters",["pendulum length","cart size (square side)","slope","Xmin","Xmax","Ymin","Ymax"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
+[ok,plen,csiz,phi,xmin,xmax,ymin,ymax,exprs]=scicos_getvalue("Set Scope parameters",[["pendulum length"],["cart size (square side)"],["slope"],["Xmin"],["Xmax"],["Ymin"],["Ymax"]],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
 mess=[];
 if (plen<=0||csiz<=0) {
-mess=[mess,"Pendulum length and cart size must be positive."," "];
+mess=[[mess],["Pendulum length and cart size must be positive."],[" "]];
 ok=false;
 }
 if (ymin>=ymax) {
-mess=[mess,"Ymax must be greater than Ymin"," "];
+mess=[[mess],["Ymax must be greater than Ymin"],[" "]];
 ok=false;
 }
 if (xmin>=xmax) {
-mess=[mess,"Xmax must be greater than Xmin"," "];
+mess=[[mess],["Xmax must be greater than Xmin"],[" "]];
 ok=false;
 }
 if (!ok) {
 message(mess);
 } else {
-rpar=[plen,csiz,phi,xmin,xmax,ymin,ymax];
+rpar=[[plen],[csiz],[phi],[xmin],[xmax],[ymin],[ymax]];
 model.rpar=rpar;
 graphics.exprs=exprs;
 x.graphics=graphics;
diff --git a/js/Misc/RATELIMITER.js b/js/Misc/RATELIMITER.js
index 3493c538..8905ca01 100644
--- a/js/Misc/RATELIMITER.js
+++ b/js/Misc/RATELIMITER.js
@@ -3,7 +3,7 @@ function RATELIMITER() {
 RATELIMITER.prototype.define = function RATELIMITER() {
 minp=-1;
 maxp=1;
-rpar=[maxp,minp];
+rpar=[[maxp],[minp]];
 model=scicos_model();
 model.sim=list("ratelimiter",4);
 model.in1=1;
@@ -11,7 +11,7 @@ model.out=1;
 model.rpar=rpar;
 model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=[string(maxp),string(minp)];
+exprs=[[string(maxp)],[string(minp)]];
 gr_i=[];
 x=standard_define([3.5,2],model,exprs,gr_i);
 }
@@ -25,14 +25,14 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,maxp,minp,exprs]=scicos_getvalue("Set rate limiter parameters",["max slope","min slope"],list("vec",1,"vec",1),exprs);
+[ok,maxp,minp,exprs]=scicos_getvalue("Set rate limiter parameters",[["max slope"],["min slope"]],list("vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
 if (maxp<=minp||maxp<=0||minp>=0) {
 message("We must have max_slope> 0 > min_slope.");
 } else {
-rpar=[maxp,minp];
+rpar=[[maxp],[minp]];
 model.rpar=rpar;
 graphics.exprs=exprs;
 x.graphics=graphics;
diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js
index 522d4d60..96c00852 100644
--- a/js/Misc/RELATIONALOP.js
+++ b/js/Misc/RELATIONALOP.js
@@ -5,12 +5,12 @@ ipar=[2];
 label="&lt";
 model=scicos_model();
 model.sim=list("relationalop",4);
-model.in1=[1,1];
+model.in1=[[1],[1]];
 model.out=1;
 model.ipar=ipar;
 model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=[string(ipar),string(0)];
+exprs=[[string(ipar)],[string(0)]];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 x.graphics.style=["fontSize=13;fontStyle=1;displayedLabel="+label];
@@ -25,10 +25,10 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 if (size(exprs,1)==2) {
-exprs=[exprs,sci2exp(1)];
+exprs=[[exprs],[sci2exp(1)]];
 }
 while (true) {
-[ok,rule,zcr,Datatype,exprs]=scicos_getvalue("Set parameters",["Operator: == (0), ~= (1), < (2), <= (3), > (4), >= (5)","Use zero crossing (no: 0), (yes: 1)","Datatype (1=double 3=int32 ...)"],list("vec",1,"vec",1,"vec",1),exprs);
+[ok,rule,zcr,Datatype,exprs]=scicos_getvalue("Set parameters",[["Operator: == (0), ~= (1), < (2), <= (3), > (4), >= (5)"],["Use zero crossing (no: 0), (yes: 1)","Datatype (1=double 3=int32 ...)"]],list("vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
@@ -61,7 +61,7 @@ ok=false;
 if (ok) {
 it=Datatype*ones(1,2);
 ot=Datatype;
-in1=[-1,-2,-1,-2];
+in1=[[-1,-2],[-1,-2]];
 out=[-1,-2];
 [model,graphics,ok]=set_io(model,graphics,list(in1,it),list(out,ot),[],[]);
 }
diff --git a/js/Misc/SPLIT_f.js b/js/Misc/SPLIT_f.js
index d84b7edb..170c13f8 100644
--- a/js/Misc/SPLIT_f.js
+++ b/js/Misc/SPLIT_f.js
@@ -4,7 +4,7 @@ SPLIT_f.prototype.define = function SPLIT_f() {
 model=scicos_model();
 model.sim="lsplit";
 model.in1=-1;
-model.out=[-1,-1,-1];
+model.out=[[-1],[-1],[-1]];
 model.blocktype="c";
 model.dep_ut=[true,false];
 x=standard_define([1,1]/3,model,[],[]);
diff --git a/js/Misc/TEXT_f.js b/js/Misc/TEXT_f.js
index e02fd0bb..07e38785 100644
--- a/js/Misc/TEXT_f.js
+++ b/js/Misc/TEXT_f.js
@@ -6,8 +6,8 @@ siz=1;
 model=scicos_model();
 model.sim="text";
 model.rpar="Text";
-model.ipar=[font,siz];
-exprs=["Text",string(font),string(siz)];
+model.ipar=[[font],[siz]];
+exprs=[["Text"],[string(font)],[string(siz)]];
 graphics=scicos_graphics();
 graphics.orig=[0,0];
 graphics.sz=[2,1];
@@ -25,10 +25,10 @@ orig=graphics.orig;
 exprs=graphics.exprs;
 model=arg1.model;
 if (size(exprs,"*")==1) {
-exprs=[exprs,"3","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);
+[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;
 }
@@ -55,7 +55,7 @@ gh_winpal.font_color=default_font_color;
 sz=r.slice(3-1,4);
 graphics.sz=sz;
 x.graphics=graphics;
-ipar=[font,siz];
+ipar=[[font],[siz]];
 model.rpar=txt;
 model.ipar=ipar;
 x.model=model;
diff --git a/js/Misc/c_block.js b/js/Misc/c_block.js
index 185124a9..ae72e6d7 100644
--- a/js/Misc/c_block.js
+++ b/js/Misc/c_block.js
@@ -24,7 +24,7 @@ model.ipar=0;
 model.blocktype=typ;
 model.firing=auto;
 model.dep_ut=[true,false];
-label=list([sci2exp(in1),sci2exp(out),strcat(sci2exp(rpar)),funam],list([]));
+label=list([[sci2exp(in1)],[sci2exp(out)],[strcat(sci2exp(rpar))],[funam]],list([]));
 gr_i=[];
 x=standard_define([3,2],model,label,gr_i);
 }
@@ -38,7 +38,7 @@ model=arg1.model;
 graphics=arg1.graphics;
 label=graphics.exprs;
 while (true) {
-[ok,i,o,rpar,funam,lab]=scicos_getvalue("Set C_block parameters",["input ports sizes","output port sizes","System parameters vector","function name"],list("vec",-1,"vec",-1,"vec",-1,"str",-1),label(1));
+[ok,i,o,rpar,funam,lab]=scicos_getvalue("Set C_block parameters",[["input ports sizes"],["output port sizes"],["System parameters vector"],["function name"]],list("vec",-1,"vec",-1,"vec",-1,"str",-1),label(1));
 if (!ok) {
 break;
 }
diff --git a/js/Misc/fortran_block.js b/js/Misc/fortran_block.js
index e829d7ee..47d6a4c4 100644
--- a/js/Misc/fortran_block.js
+++ b/js/Misc/fortran_block.js
@@ -15,7 +15,7 @@ model.blocktype="c";
 model.firing=[];
 model.dep_ut=[true,false];
 funam="forty";
-label=list([sci2exp(model.in1),sci2exp(model.out),strcat(sci2exp(model.rpar)),funam],list([]));
+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);
 }
@@ -29,7 +29,7 @@ model=arg1.model;
 graphics=arg1.graphics;
 label=graphics.exprs;
 while (true) {
-[ok,i,o,rpar,funam,lab]=scicos_getvalue("Set fortran_block parameters",["input ports sizes","output port sizes","System parameters vector","function name"],list("vec",-1,"vec",-1,"vec",-1,"str",-1),label(1));
+[ok,i,o,rpar,funam,lab]=scicos_getvalue("Set fortran_block parameters",[["input ports sizes"],["output port sizes"],["System parameters vector"],["function name"]],list("vec",-1,"vec",-1,"vec",-1,"str",-1),label(1));
 if (!ok) {
 break;
 }
diff --git a/js/Misc/generic_block.js b/js/Misc/generic_block.js
index 81a7aad4..4168b876 100644
--- a/js/Misc/generic_block.js
+++ b/js/Misc/generic_block.js
@@ -16,7 +16,7 @@ model.ipar=[];
 model.blocktype="c";
 model.firing=[];
 model.dep_ut=[true,false];
-label=[function_name,sci2exp(funtyp),sci2exp(model.in1),sci2exp(model.out),sci2exp(model.evtin),sci2exp(model.evtout),sci2exp(model.state),sci2exp(model.dstate),sci2exp(model.rpar),sci2exp(model.ipar),sci2exp(model.firing),"y","n"];
+label=[[function_name],[sci2exp(funtyp)],[sci2exp(model.in1)],[sci2exp(model.out)],[sci2exp(model.evtin)],[sci2exp(model.evtout)],[sci2exp(model.state)],[sci2exp(model.dstate)],[sci2exp(model.rpar)],[sci2exp(model.ipar)],[sci2exp(model.firing)],["y"],["n"]];
 gr_i=[];
 x=standard_define([2,2],model,label,gr_i);
 }
@@ -33,7 +33,7 @@ if (size(label,"*")==14) {
 label[9-1]=[];
 }
 while (true) {
-[ok,function_name,funtyp,i,o,ci,co,xx,z,rpar,ipar,auto0,depu,dept,lab]=scicos_getvalue("Set GENERIC block parameters",["simulation function","function type (0,1,2,..)","input ports sizes","output port sizes","input event ports sizes","output events ports sizes","initial continuous state","initial discrete state","Real parameters vector","Integer parameters vector","initial firing vector (<0 for no firing)","direct feedthrough (y or n)","time dependence (y or n)"],list("str",1,"vec",1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec","sum(%6)","str",1,"str",1),label);
+[ok,function_name,funtyp,i,o,ci,co,xx,z,rpar,ipar,auto0,depu,dept,lab]=scicos_getvalue("Set GENERIC block parameters",[["simulation function"],["function type (0,1,2,..)"],["input ports sizes"],["output port sizes"],["input event ports sizes"],["output events ports sizes"],["initial continuous state"],["initial discrete state"],["Real parameters vector"],["Integer parameters vector"],["initial firing vector (<0 for no firing)"],["direct feedthrough (y or n)"],["time dependence (y or n)"]],list("str",1,"vec",1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec","sum(%6)","str",1,"str",1),label);
 if (!ok) {
 break;
 }
@@ -52,8 +52,8 @@ if (funtyp<0) {
 message("function type cannot be negative");
 ok=false;
 }
-if ([ci,co]!=[]) {
-if (max([ci,co])>1) {
+if ([[ci],[co]]!=[]) {
+if (max([[ci],[co]])>1) {
 message("vector event links not supported");
 ok=false;
 }
diff --git a/js/Misc/generic_block2.js b/js/Misc/generic_block2.js
index 91da13aa..022ca310 100644
--- a/js/Misc/generic_block2.js
+++ b/js/Misc/generic_block2.js
@@ -16,7 +16,7 @@ model.ipar=[];
 model.blocktype="c";
 model.firing=[];
 model.dep_ut=[true,false];
-label=[function_name,sci2exp(funtyp),sci2exp(model.in1),sci2exp(model.out),sci2exp(model.evtin),sci2exp(model.evtout),sci2exp(model.state),sci2exp(model.dstate),sci2exp(model.rpar),sci2exp(model.ipar),sci2exp(model.nmode),sci2exp(model.nzcross),sci2exp(model.firing),"y","n"];
+label=[[function_name],[sci2exp(funtyp)],[sci2exp(model.in1)],[sci2exp(model.out)],[sci2exp(model.evtin)],[sci2exp(model.evtout)],[sci2exp(model.state)],[sci2exp(model.dstate)],[sci2exp(model.rpar)],[sci2exp(model.ipar)],[sci2exp(model.nmode)],[sci2exp(model.nzcross)],[sci2exp(model.firing)],["y"],["n"]];
 gr_i=[];
 x=standard_define([2,2],model,label,gr_i);
 }
@@ -33,7 +33,7 @@ if (size(label,"*")==14) {
 label[9-1]=[];
 }
 while (true) {
-[ok,function_name,funtyp,i,o,ci,co,xx,z,rpar,ipar,nmode,nzcr,auto0,depu,dept,lab]=scicos_getvalue("Set GENERIC block parameters",["simulation function","function type (0,1,2,..)","input ports sizes","output port sizes","input event ports sizes","output events ports sizes","initial continuous state","initial discrete state","Real parameters vector","Integer parameters vector","number of modes","number of zero_crossings","initial firing vector (<0 for no firing)","direct feedthrough (y or n)","time dependence (y or n)"],list("str",1,"vec",1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec","sum(%6)","str",1,"str",1),label);
+[ok,function_name,funtyp,i,o,ci,co,xx,z,rpar,ipar,nmode,nzcr,auto0,depu,dept,lab]=scicos_getvalue("Set GENERIC block parameters",[["simulation function"],["function type (0,1,2,..)"],["input ports sizes"],["output port sizes"],["input event ports sizes"],["output events ports sizes"],["initial continuous state"],["initial discrete state"],["Real parameters vector"],["Integer parameters vector"],["number of modes"],["number of zero_crossings"],["initial firing vector (<0 for no firing)"],["direct feedthrough (y or n)"],["time dependence (y or n)"]],list("str",1,"vec",1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec","sum(%6)","str",1,"str",1),label);
 if (!ok) {
 break;
 }
@@ -52,8 +52,8 @@ if (funtyp<0) {
 message("function type cannot be negative");
 ok=false;
 }
-if ([ci,co]!=[]) {
-if (max([ci,co])>1) {
+if ([[ci],[co]]!=[]) {
+if (max([[ci],[co]])>1) {
 message("vector event links not supported");
 ok=false;
 }
diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js
index d5f35a3c..5896f051 100644
--- a/js/Misc/generic_block3.js
+++ b/js/Misc/generic_block3.js
@@ -12,7 +12,7 @@ model.out=1;
 model.out2=1;
 model.outtyp=1;
 model.dep_ut=[true,false];
-label=[function_name,sci2exp(funtyp),sci2exp([model.in1,model.in2]),sci2exp(model.intyp),sci2exp([model.out,model.out2]),sci2exp(model.outtyp),sci2exp(model.evtin),sci2exp(model.evtout),sci2exp(model.state),sci2exp(model.dstate),sci2exp(model.odstate),sci2exp(model.rpar),sci2exp(model.ipar),sci2exp(model.opar),sci2exp(model.nmode),sci2exp(model.nzcross),sci2exp(model.firing),"y","n"];
+label=[[function_name],[sci2exp(funtyp)],[sci2exp([model.in1,model.in2])],[sci2exp(model.intyp)],[sci2exp([model.out,model.out2]),sci2exp(model.outtyp)],[sci2exp(model.evtin)],[sci2exp(model.evtout)],[sci2exp(model.state)],[sci2exp(model.dstate)],[sci2exp(model.odstate)],[sci2exp(model.rpar)],[sci2exp(model.ipar)],[sci2exp(model.opar)],[sci2exp(model.nmode)],[sci2exp(model.nzcross)],[sci2exp(model.firing)],["y"],["n"]];
 gr_i=[];
 x=standard_define([4,2],model,label,gr_i);
 }
@@ -29,7 +29,7 @@ if (size(label,"*")==14) {
 label[9-1]=[];
 }
 while (true) {
-[ok,function_name,funtyp,in1,it,out,ot,ci,co,xx,z,oz,rpar,ipar,opar,nmode,nzcr,auto0,depu,dept,lab]=scicos_getvalue("Set GENERIC block parameters",["Simulation function","Function type (0,1,2,..)","Input ports sizes","Input ports type","Output port sizes","Output ports type","Input event ports sizes","Output events ports sizes","Initial continuous state","Initial discrete state","Initial object state","Real parameters vector","Integer parameters vector","Object parameters list","Number of modes","Number of zero crossings","Initial firing vector (<0 for no firing)","Direct feedthrough (y or n)","Time dependence (y or n)"],list("str",1,"vec",1,"mat",[-1,2],"vec",-1,"mat",[-1,2],"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"lis",-1,"vec",-1,"vec",-1,"lis",-1,"vec",1,"vec",1,"vec","sum(%8)","str",1,"str",1),label);
+[ok,function_name,funtyp,in1,it,out,ot,ci,co,xx,z,oz,rpar,ipar,opar,nmode,nzcr,auto0,depu,dept,lab]=scicos_getvalue("Set GENERIC block parameters",[["Simulation function"],["Function type (0,1,2,..)"],["Input ports sizes"],["Input ports type"],["Output port sizes"],["Output ports type"],["Input event ports sizes"],["Output events ports sizes"],["Initial continuous state"],["Initial discrete state"],["Initial object state"],["Real parameters vector"],["Integer parameters vector"],["Object parameters list"],["Number of modes"],["Number of zero crossings"],["Initial firing vector (<0 for no firing)"],["Direct feedthrough (y or n)"],["Time dependence (y or n)"]],list("str",1,"vec",1,"mat",[-1,2],"vec",-1,"mat",[-1,2],"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"lis",-1,"vec",-1,"vec",-1,"lis",-1,"vec",1,"vec",1,"vec","sum(%8)","str",1,"str",1),label);
 if (!ok) {
 break;
 }
@@ -46,8 +46,8 @@ if (funtyp<0) {
 message("function type cannot be negative");
 ok=false;
 }
-if ([ci,co]!=[]) {
-if (max([ci,co])>1) {
+if ([[ci],[co]]!=[]) {
+if (max([[ci],[co]])>1) {
 message("vector event links not supported");
 ok=false;
 }
diff --git a/js/Misc/scifunc_block.js b/js/Misc/scifunc_block.js
index c74e741d..03abd7f5 100644
--- a/js/Misc/scifunc_block.js
+++ b/js/Misc/scifunc_block.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(OPENBRACKET,'(',1,2852)
+Syntax error in input LexToken(CLOSEOPENBRACKET,')(',1,2851)
 /* autogenerated from "macros/Misc/scifunc_block.sci" */
 None
diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js
index 56d148e2..de06196c 100644
--- a/js/Misc/scifunc_block_m.js
+++ b/js/Misc/scifunc_block_m.js
@@ -29,7 +29,7 @@ model.opar=list();
 model.blocktype=typ;
 model.firing=auto;
 model.dep_ut=[true,false];
-exprs=list([sci2exp([in1,in1]),sci2exp([out,out]),sci2exp(clkin),sci2exp(clkout),strcat(sci2exp(x0)),strcat(sci2exp(z0)),strcat(sci2exp(rpar)),sci2exp(auto),sci2exp(0)],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," "));
+exprs=list([[sci2exp([in1,in1])],[sci2exp([out,out])],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(rpar))],[sci2exp(auto)],[sci2exp(0)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," "));
 gr_i=[];
 x=standard_define([4,2],model,exprs,gr_i);
 }
@@ -44,7 +44,7 @@ model=arg1.model;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 while (true) {
-[ok,i,o,ci,co,xx,z,rpar,auto0,deptime,lab]=scicos_getvalue(["Set scifunc_block parameters","only regular blocks supported"],["input ports sizes","output port sizes","input event ports sizes","output events ports sizes","initial continuous state","initial discrete state","System parameters vector","initial firing vector (<0 for no firing)","is block always active (0:no, 1:yes)"],list("mat",[-1,2],"mat",[-2,2],"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1),exprs[1-1]);
+[ok,i,o,ci,co,xx,z,rpar,auto0,deptime,lab]=scicos_getvalue([["Set scifunc_block parameters"],["only regular blocks supported"]],[["input ports sizes"],["output port sizes"],["input event ports sizes"],["output events ports sizes"],["initial continuous state"],["initial discrete state"],["System parameters vector"],["initial firing vector (<0 for no firing)"],["is block always active (0:no, 1:yes)"]],list("mat",[-1,2],"mat",[-2,2],"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1),exprs[1-1]);
 if (!ok) {
 break;
 }