handle multiple rows

20 files changed, 92 insertions, 92 deletions

diff --git a/js/Sources/CLKINV_f.js b/js/Sources/CLKINV_f.js
index 4df43fbc..2c1d03b7 100644
--- a/js/Sources/CLKINV_f.js
+++ b/js/Sources/CLKINV_f.js
@@ -24,7 +24,7 @@ model=arg1.model;
 exprs=graphics.exprs;
 exprs=exprs[1-1];
 while (true) {
-[ok,prt,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"CLKINV_f")," ",gettext("Event input port")," "],"Port Number",list("vec",1),exprs);
+[ok,prt,exprs]=scicos_getvalue([[msprintf(gettext("Set %s block parameters"),"CLKINV_f")],[" "],[gettext("Event input port")],[" "]],"Port Number",list("vec",1),exprs);
 prt=int(prt);
 if (!ok) {
 break;
diff --git a/js/Sources/CLOCK_c.js b/js/Sources/CLOCK_c.js
index 965065ee..95bf9650 100644
--- a/js/Sources/CLOCK_c.js
+++ b/js/Sources/CLOCK_c.js
@@ -5,10 +5,10 @@ evtdly=EVTDLY_c("define");
 evtdly.graphics.orig=[320,232];
 evtdly.graphics.sz=[40,40];
 evtdly.graphics.flip=true;
-evtdly.graphics.exprs=["0.1","0.1"];
+evtdly.graphics.exprs=[["0.1"],["0.1"]];
 evtdly.graphics.pein=6;
 evtdly.graphics.peout=3;
-evtdly.model.rpar=[0.1,0.1];
+evtdly.model.rpar=[[0.1],[0.1]];
 evtdly.model.firing=0.1;
 output_port=CLKOUT_f("define");
 output_port.graphics.orig=[399,162];
@@ -18,17 +18,17 @@ output_port.graphics.exprs="1";
 output_port.graphics.pein=5;
 output_port.model.ipar=1;
 split=CLKSPLIT_f("define");
-split.graphics.orig=[380.71066,172];
+split.graphics.orig=[[380.71066],[172]];
 split.graphics.pein=3;
-split.graphics.peout=[5,6];
+split.graphics.peout=[[5],[6]];
 gr_i=[];
 diagram=scicos_diagram();
 diagram.objs[1-1]=output_port;
 diagram.objs[2-1]=evtdly;
-diagram.objs[3-1]=scicos_link(xx=[340,340,380.71],yy=[226.29,172,172],ct=[5,-1],from=[2,1],to=[4,1]);
+diagram.objs[3-1]=scicos_link(xx=[[340],[340],[380.71]],yy=[[226.29],[172],[172]],ct=[5,-1],from=[2,1],to=[4,1]);
 diagram.objs[4-1]=split;
-diagram.objs[5-1]=scicos_link(xx=[380.71,399],yy=[172,172],ct=[5,-1],from=[4,1],to=[1,1]);
-diagram.objs[6-1]=scicos_link(xx=[380.71,380.71,340,340],yy=[172,302,302,277.71],ct=[5,-1],from=[4,2],to=[2,1]);
+diagram.objs[5-1]=scicos_link(xx=[[380.71],[399]],yy=[[172],[172]],ct=[5,-1],from=[4,1],to=[1,1]);
+diagram.objs[6-1]=scicos_link(xx=[[380.71],[380.71],[340],[340]],yy=[[172],[302],[302],[277.71]],ct=[5,-1],from=[4,2],to=[2,1]);
 x=scicos_block();
 x.gui="CLOCK_c";
 x.graphics.sz=[2,2];
@@ -61,7 +61,7 @@ t0_old=model.firing;
 dt_old=model.rpar(1);
 model_n=model;
 while (true) {
-[ok,dt,t0,exprs0]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"CLOCK_c")," ",gettext("Event clock generator")," ",gettext("  Do not start if \'Initialisation Time\' is negative")," "],[gettext("Period"),gettext("Initialisation Time")],list("vec",1,"vec",1),exprs);
+[ok,dt,t0,exprs0]=scicos_getvalue([[msprintf(gettext("Set %s block parameters"),"CLOCK_c")],[" "],[gettext("Event clock generator")],[" "],[gettext("  Do not start if \'Initialisation Time\' is negative")],[" "]],[[gettext("Period")],[gettext("Initialisation Time")]],list("vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
@@ -71,7 +71,7 @@ ok=false;
 }
 if (ok) {
 xx.graphics.exprs=exprs0;
-model.rpar=[dt,t0];
+model.rpar=[[dt],[t0]];
 model.firing=t0;
 xx.model=model;
 arg1.model.rpar.objs[path-1]=xx;
diff --git a/js/Sources/CLOCK_f.js b/js/Sources/CLOCK_f.js
index 1f93396e..39a002b3 100644
--- a/js/Sources/CLOCK_f.js
+++ b/js/Sources/CLOCK_f.js
@@ -5,7 +5,7 @@ evtdly=EVTDLY_f("define");
 evtdly.graphics.orig=[320,232];
 evtdly.graphics.sz=[40,40];
 evtdly.graphics.flip=true;
-evtdly.graphics.exprs=["0.1","0.1"];
+evtdly.graphics.exprs=[["0.1"],["0.1"]];
 evtdly.graphics.pein=6;
 evtdly.graphics.peout=3;
 evtdly.model.rpar=0.1;
@@ -18,17 +18,17 @@ output_port.graphics.exprs="1";
 output_port.graphics.pein=5;
 output_port.model.ipar=1;
 split=CLKSPLIT_f("define");
-split.graphics.orig=[380.71066,172];
+split.graphics.orig=[[380.71066],[172]];
 split.graphics.pein=3;
-split.graphics.peout=[5,6];
+split.graphics.peout=[[5],[6]];
 gr_i=[];
 diagram=scicos_diagram();
 diagram.objs[1-1]=output_port;
 diagram.objs[2-1]=evtdly;
-diagram.objs[3-1]=scicos_link(xx=[340,340,380.71],yy=[226.29,172,172],ct=[5,-1],from=[2,1],to=[4,1]);
+diagram.objs[3-1]=scicos_link(xx=[[340],[340],[380.71]],yy=[[226.29],[172],[172]],ct=[5,-1],from=[2,1],to=[4,1]);
 diagram.objs[4-1]=split;
-diagram.objs[5-1]=scicos_link(xx=[380.71,399],yy=[172,172],ct=[5,-1],from=[4,1],to=[1,1]);
-diagram.objs[6-1]=scicos_link(xx=[380.71,380.71,340,340],yy=[172,302,302,277.71],ct=[5,-1],from=[4,2],to=[2,1]);
+diagram.objs[5-1]=scicos_link(xx=[[380.71],[399]],yy=[[172],[172]],ct=[5,-1],from=[4,1],to=[1,1]);
+diagram.objs[6-1]=scicos_link(xx=[[380.71],[380.71],[340],[340]],yy=[[172],[302],[302],[277.71]],ct=[5,-1],from=[4,2],to=[2,1]);
 x=scicos_block();
 x.gui="CLOCK_f";
 x.graphics.sz=[2,2];
@@ -61,7 +61,7 @@ t0_old=model.firing;
 dt_old=model.rpar;
 model_n=model;
 while (true) {
-[ok,dt,t0,exprs0]=scicos_getvalue("Set Clock  block parameters",["Period","Init time"],list("vec",1,"vec",1),exprs);
+[ok,dt,t0,exprs0]=scicos_getvalue("Set Clock  block parameters",[["Period"],["Init time"]],list("vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/Sources/CONST_m.js b/js/Sources/CONST_m.js
index a9b5f167..2bd85408 100644
--- a/js/Sources/CONST_m.js
+++ b/js/Sources/CONST_m.js
@@ -26,7 +26,7 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,C,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"CONST_m")," ",gettext("Constant value generator")," "],gettext("Constant Value"),list("vec",-1),exprs);
+[ok,C,exprs]=scicos_getvalue([[msprintf(gettext("Set %s block parameters"),"CONST_m")],[" "],[gettext("Constant value generator")],[" "]],gettext("Constant Value"),list("vec",-1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/Sources/CURV_f.js b/js/Sources/CURV_f.js
index 1928e6ff..f95ae1c2 100644
--- a/js/Sources/CURV_f.js
+++ b/js/Sources/CURV_f.js
@@ -1,18 +1,18 @@
 /* autogenerated from "macros/Sources/CURV_f.sci" */
 function CURV_f() {
 CURV_f.prototype.define = function CURV_f() {
-xx=[0,1,2];
-yy=[-5,5,0];
+xx=[[0],[1],[2]];
+yy=[[-5],[5],[0]];
 rect=[0,-5,2,5];
-axisdata=[2,10,2,10];
-ipar=[size(xx,1),axisdata.slice()];
-rpar=[xx,yy,rect.slice()];
+axisdata=[[2],[10],[2],[10]];
+ipar=[[size(xx,1)],[axisdata.slice()]];
+rpar=[[xx],[yy],[rect.slice()]];
 model=scicos_model();
 model.sim="intplt";
 model.in1=[];
 model.out=1;
-model.rpar=[xx,yy,rect.slice()];
-model.ipar=[size(xx,1),axisdata.slice()];
+model.rpar=[[xx],[yy],[rect.slice()]];
+model.ipar=[[size(xx,1)],[axisdata.slice()]];
 model.blocktype="c";
 model.dep_ut=[false,true];
 gr_i=[];
@@ -51,9 +51,9 @@ if (ok) {
 model.sim="intplt";
 model.firing=[];
 rect=gc(1);
-model.rpar=[xx.slice(),yy.slice(),rect.slice()];
+model.rpar=[[xx.slice()],[yy.slice()],[rect.slice()]];
 axisdata=gc(2);
-model.ipar=[size(xx,"*"),axisdata.slice()];
+model.ipar=[[size(xx,"*")],[axisdata.slice()]];
 x.graphics=graphics;
 x.model=model;
 break;
diff --git a/js/Sources/Counter.js b/js/Sources/Counter.js
index a99324b4..8d918694 100644
--- a/js/Sources/Counter.js
+++ b/js/Sources/Counter.js
@@ -10,10 +10,10 @@ model.evtin=1;
 model.out=1;
 model.out2=1;
 model.dstate=0;
-model.ipar=[rule,maxim,minim];
+model.ipar=[[rule],[maxim],[minim]];
 model.blocktype="c";
 model.dep_ut=[false,false];
-exprs=[string(minim),string(maxim),string(rule)];
+exprs=[[string(minim)],[string(maxim)],[string(rule)]];
 gr_i=[];
 x=standard_define([3,2],model,exprs,gr_i);
 }
@@ -27,7 +27,7 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,minim,maxim,rule,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"Counter")," ",gettext("Integer counter generator")," "],[gettext("Minimum"),gettext("Maximum"),gettext("Rule (1:Increment, 2:Decrement)")],list("vec",1,"vec",1,"vec",1),exprs);
+[ok,minim,maxim,rule,exprs]=scicos_getvalue([[msprintf(gettext("Set %s block parameters"),"Counter")],[" "],[gettext("Integer counter generator")],[" "]],[[gettext("Minimum")],[gettext("Maximum")],[gettext("Rule (1:Increment, 2:Decrement)")]],list("vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
@@ -40,7 +40,7 @@ block_parameter_error(msprintf(gettext("Wrong value for \'Rule\' parameter: %d")
 } else {
 graphics.exprs=exprs;
 model.dstate=0;
-model.ipar=[rule,maxim,minim];
+model.ipar=[[rule],[maxim],[minim]];
 x.graphics=graphics;
 x.model=model;
 break;
diff --git a/js/Sources/FROMWSB.js b/js/Sources/FROMWSB.js
index 44e7a21d..44d6c073 100644
--- a/js/Sources/FROMWSB.js
+++ b/js/Sources/FROMWSB.js
@@ -2,10 +2,10 @@
 function FROMWSB() {
 FROMWSB.prototype.define = function FROMWSB() {
 scs_m_1=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[-159.096,811.104,-121.216,617.984,1323,1008,331,284,630,480,1426,231,1.4],Title="FROMWSB",tol=[0.0001,0.000001,1.000e-10,100001,0,0],tf=100000,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(true,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list()));
-scs_m_1.objs[1-1]=scicos_block(gui="FROMWS_c",graphics=scicos_graphics(orig=[260.37067,261.584],sz=[70,40],flip=true,theta=0,exprs=["V","1","1","0"],pin=[],pout=4,pein=2,peout=2,gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("fromws_c",4),in1=[],in2=[],intyp=1,out=-1,out2=-2,outtyp=-1,evtin=1,evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=[1,-31,1,1,0],opar=list(),blocktype="d",firing=0,dep_ut=[false,true],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m_1.objs[2-1]=scicos_link(xx=[295.37067,295.37067,233.23733,233.23733,295.37067,295.37067],yy=[255.86971,223.45067,223.45067,337.85067,337.85067,307.29829],id="drawlink",thick=[0,0],ct=[5,-1],from=[1,1,0],to=[1,1,1]);
+scs_m_1.objs[1-1]=scicos_block(gui="FROMWS_c",graphics=scicos_graphics(orig=[260.37067,261.584],sz=[70,40],flip=true,theta=0,exprs=[["V"],["1"],["1"],["0"]],pin=[],pout=4,pein=2,peout=2,gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("fromws_c",4),in1=[],in2=[],intyp=1,out=-1,out2=-2,outtyp=-1,evtin=1,evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=[[1],[-31],[1],[1],[0]],opar=list(),blocktype="d",firing=0,dep_ut=[false,true],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m_1.objs[2-1]=scicos_link(xx=[[295.37067],[295.37067],[233.23733],[233.23733],[295.37067],[295.37067]],yy=[[255.86971],[223.45067],[223.45067],[337.85067],[337.85067],[307.29829]],id="drawlink",thick=[0,0],ct=[5,-1],from=[1,1,0],to=[1,1,1]);
 scs_m_1.objs[3-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[358.9421,271.584],sz=[20,20],flip=true,theta=0,exprs="1",pin=4,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=-2,intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-scs_m_1.objs[4-1]=scicos_link(xx=[338.9421,358.9421],yy=[281.584,281.584],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[3,1,1]);
+scs_m_1.objs[4-1]=scicos_link(xx=[[338.9421],[358.9421]],yy=[[281.584],[281.584]],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[3,1,1]);
 model=scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list());
 gr_i=[];
 x=standard_define([5,2],model,[],gr_i);
diff --git a/js/Sources/FROMWS_c.js b/js/Sources/FROMWS_c.js
index 1d4942d7..0607731f 100644
--- a/js/Sources/FROMWS_c.js
+++ b/js/Sources/FROMWS_c.js
@@ -10,14 +10,14 @@ model.sim=list("fromws_c",4);
 model.out=-1;
 model.out2=-2;
 model.outtyp=-1;
-model.ipar=[length(varnam),_str2code(varnam),Method,ZC,OutEnd];
+model.ipar=[[length(varnam)],[_str2code(varnam)],[Method],[ZC],[OutEnd]];
 model.evtin=[1];
 model.evtout=[1];
 model.firing=[0];
 model.blocktype="d";
 model.dep_ut=[false,true];
 gr_i=[];
-exprs=[string(varnam),string(Method),string(ZC),string(OutEnd)];
+exprs=[[string(varnam)],[string(Method)],[string(ZC)],[string(OutEnd)]];
 x=standard_define([3.5,2],model,exprs,gr_i);
 }
 FROMWS_c.prototype.details = function FROMWS_c() {
@@ -30,7 +30,7 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,varnam,Method,ZC,OutEnd,exprs]=scicos_getvalue("Set From_Workspace block parameters",["Variable name","Interpolation Method","Enable zero crossing(0:No, 1:Yes)?","Output at end(0:Zero, 1:Hold, 2:Repeat)"],list("str",1,"vec",1,"vec",1,"vec",1),exprs);
+[ok,varnam,Method,ZC,OutEnd,exprs]=scicos_getvalue("Set From_Workspace block parameters",[["Variable name"],["Interpolation Method"],["Enable zero crossing(0:No, 1:Yes)?"],["Output at end(0:Zero, 1:Hold, 2:Repeat)"]],list("str",1,"vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
@@ -49,11 +49,11 @@ ok=false;
 r=false;
 ierr=execstr("r=validvar(varnam)","errcatch");
 if (!r) {
-message(["Invalid variable name.","Please choose another variable name."]);
+message([["Invalid variable name."],["Please choose another variable name."]]);
 ok=false;
 }
 if (ok) {
-model.ipar=[length(varnam),_str2code(varnam),Method,ZC,OutEnd];
+model.ipar=[[length(varnam)],[_str2code(varnam)],[Method],[ZC],[OutEnd]];
 [model,graphics,ok]=set_io(model,graphics,list(),list([-1,-2],-1),1,1);
 if (ok) {
 graphics.exprs=exprs;
diff --git a/js/Sources/GENSIN_f.js b/js/Sources/GENSIN_f.js
index 8a44696d..263fc9ee 100644
--- a/js/Sources/GENSIN_f.js
+++ b/js/Sources/GENSIN_f.js
@@ -1,17 +1,17 @@
 /* autogenerated from "macros/Sources/GENSIN_f.sci" */
 function GENSIN_f() {
 GENSIN_f.prototype.define = function GENSIN_f() {
-rpar=[1,1,0];
+rpar=[[1],[1],[0]];
 model=scicos_model();
 model.sim="gensin";
 model.in1=[];
 model.out=1;
 model.out2=1;
 model.outtyp=1;
-model.rpar=[1,1,0];
+model.rpar=[[1],[1],[0]];
 model.blocktype="c";
 model.dep_ut=[false,true];
-exprs=[string(rpar(1)),string(rpar(2)),string(rpar(3))];
+exprs=[[string(rpar(1))],[string(rpar(2))],[string(rpar(3))]];
 gr_i=[];
 x=standard_define([3,2],model,exprs,gr_i);
 }
@@ -25,7 +25,7 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,M,F,P,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"GENSIN_f")," ",gettext("Sine wave generator")," "],[gettext("Magnitude"),gettext("Frequency (rad/s)"),gettext("Phase (rad)")],list("vec",1,"vec",1,"vec",1),exprs);
+[ok,M,F,P,exprs]=scicos_getvalue([[msprintf(gettext("Set %s block parameters"),"GENSIN_f")],[" "],[gettext("Sine wave generator")],[" "]],[[gettext("Magnitude")],[gettext("Frequency (rad/s)")],[gettext("Phase (rad)")]],list("vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
@@ -35,7 +35,7 @@ ok=false;
 }
 if (ok) {
 [model,graphics,ok]=check_io(model,graphics,[],1,[],[]);
-model.rpar=[M,F,P];
+model.rpar=[[M],[F],[P]];
 model.out2=1;
 model.outtyp=1;
 graphics.exprs=exprs;
diff --git a/js/Sources/INIMPL_f.js b/js/Sources/INIMPL_f.js
index ebc345f8..c2f90f7f 100644
--- a/js/Sources/INIMPL_f.js
+++ b/js/Sources/INIMPL_f.js
@@ -31,7 +31,7 @@ if (size(exprs,"*")==2) {
 exprs=exprs[1-1];
 }
 while (true) {
-[ok,prt,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"INIMPL_f")," ",gettext("Implicit input port")," "],"Port Number",list("vec",1),exprs);
+[ok,prt,exprs]=scicos_getvalue([[msprintf(gettext("Set %s block parameters"),"INIMPL_f")],[" "],[gettext("Implicit input port")],[" "]],"Port Number",list("vec",1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/Sources/IN_f.js b/js/Sources/IN_f.js
index 15ce1952..30c2ea4d 100644
--- a/js/Sources/IN_f.js
+++ b/js/Sources/IN_f.js
@@ -27,10 +27,10 @@ if (size(exprs,"*")==2) {
 exprs=exprs[1-1];
 }
 if (size(exprs,"*")==1) {
-exprs=[exprs[1-1],"[-1 -2]","-1"];
+exprs=[[exprs[1-1]],["[-1 -2]"],["-1"]];
 }
 while (true) {
-[ok,prt,otsz,ot,exprs]=getvalue(_("Set Input block parameters"),[_("Port number"),_("Outport size ([-1 -2] for inherit)"),_("Outport Type (-1 for inherit)")],list("vec",1,"vec",-1,"vec",1),exprs);
+[ok,prt,otsz,ot,exprs]=getvalue(_("Set Input block parameters"),[[_("Port number")],[_("Outport size ([-1 -2] for inherit)")],[_("Outport Type (-1 for inherit)")]],list("vec",1,"vec",-1,"vec",1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/Sources/Modulo_Count.js b/js/Sources/Modulo_Count.js
index d3868690..9edd0b9d 100644
--- a/js/Sources/Modulo_Count.js
+++ b/js/Sources/Modulo_Count.js
@@ -11,7 +11,7 @@ model.dstate=ini_c;
 model.ipar=base;
 model.blocktype="c";
 model.dep_ut=[false,false];
-exprs=[string(ini_c),string(base)];
+exprs=[[string(ini_c)],[string(base)]];
 gr_i=[];
 x=standard_define([3,2],model,exprs,gr_i);
 }
@@ -25,7 +25,7 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,ini_c,base,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"Modulo_Count")," ",gettext("Modulo counter (0 to N counter)")," "],[gettext("Initial State (zero or positive number)"),gettext("Upper Limit (positive number)")],list("vec",1,"vec",1),exprs);
+[ok,ini_c,base,exprs]=scicos_getvalue([[msprintf(gettext("Set %s block parameters"),"Modulo_Count")],[" "],[gettext("Modulo counter (0 to N counter)")],[" "]],[[gettext("Initial State (zero or positive number)")],[gettext("Upper Limit (positive number)")]],list("vec",1,"vec",1),exprs);
 ini_c=int(ini_c);
 base=int(base);
 if (!ok) {
diff --git a/js/Sources/RAMP.js b/js/Sources/RAMP.js
index 11110c6e..36e051bb 100644
--- a/js/Sources/RAMP.js
+++ b/js/Sources/RAMP.js
@@ -4,7 +4,7 @@ RAMP.prototype.define = function RAMP() {
 slope=0;
 iout=0;
 stt=0;
-rpar=[slope,stt,iout];
+rpar=[[slope],[stt],[iout]];
 model=scicos_model();
 model.sim=list("ramp",4);
 model.in1=[];
@@ -28,14 +28,14 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,slope,stt,iout,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"RAMP")," ",gettext("Ramp function")," "],[gettext("Slope"),gettext("Start Time"),gettext("Initial Value")],list("vec",1,"vec",1,"vec",1),exprs);
+[ok,slope,stt,iout,exprs]=scicos_getvalue([[msprintf(gettext("Set %s block parameters"),"RAMP")],[" "],[gettext("Ramp function")],[" "]],[[gettext("Slope")],[gettext("Start Time")],[gettext("Initial Value")]],list("vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
 if (stt<0) {
 block_parameter_error(msprintf(gettext("Wrong value for \'Start Time\' parameter: %e."),stt),gettext("Null or positive integer expected."));
 } else {
-model.rpar=[slope,stt,iout];
+model.rpar=[[slope],[stt],[iout]];
 graphics.exprs=exprs;
 x.graphics=graphics;
 x.model=model;
diff --git a/js/Sources/RAND_f.js b/js/Sources/RAND_f.js
index 246d9e01..6f49228d 100644
--- a/js/Sources/RAND_f.js
+++ b/js/Sources/RAND_f.js
@@ -10,12 +10,12 @@ model=scicos_model();
 model.sim="rndblk";
 model.out=out;
 model.evtin=1;
-model.dstate=[int(rand()*(10^7-1)),0*a.slice()];
-model.rpar=[a.slice(),b.slice()];
+model.dstate=[[int(rand()*(10^7-1))],[0*a.slice()]];
+model.rpar=[[a.slice()],[b.slice()]];
 model.ipar=flag;
 model.blocktype="d";
 model.dep_ut=[false,false];
-exprs=[string(flag),sci2exp(a.slice()),sci2exp(b.slice()),string(model.dstate(1))];
+exprs=[[string(flag)],[sci2exp(a.slice())],[sci2exp(b.slice())],[string(model.dstate(1))]];
 gr_i=[];
 x=standard_define([3,2],model,exprs,gr_i);
 }
@@ -32,10 +32,10 @@ if (size(exprs,"*")==5) {
 exprs=exprs.slice(1-1,3);
 }
 if (size(exprs,"*")==3) {
-exprs=[exprs,string(model.dstate(1))];
+exprs=[[exprs],[string(model.dstate(1))]];
 }
 while (true) {
-[ok,flag,a,b,seed_c,exprs]=scicos_getvalue(["Set Random generator block parameters","flag = 0 : Uniform distribution A is min and A+B max","flag = 1 : Normal distribution A is mean and B deviation"," ","A and B must be vector with equal sizes","seed is the seed of random number generator (integer<2**31)"],["flag","A","B","seed"],list("vec",1,"vec",-1,"vec","size(%2,\'*\')","vec",1),exprs);
+[ok,flag,a,b,seed_c,exprs]=scicos_getvalue([["Set Random generator block parameters"],["flag = 0 : Uniform distribution A is min and A+B max"],["flag = 1 : Normal distribution A is mean and B deviation"],[" "],["A and B must be vector with equal sizes"],["seed is the seed of random number generator (integer<2**31)"]],[["flag"],["A"],["B"],["seed"]],list("vec",1,"vec",-1,"vec","size(%2,\'*\')","vec",1),exprs);
 if (!ok) {
 break;
 }
@@ -46,8 +46,8 @@ nout=size(a,"*");
 graphics.exprs=exprs;
 model.out=nout;
 model.ipar=flag;
-model.rpar=[a.slice(),b.slice()];
-model.dstate=[seed_c,0*a.slice()];
+model.rpar=[[a.slice()],[b.slice()]];
+model.dstate=[[seed_c],[0*a.slice()]];
 x.graphics=graphics;
 x.model=model;
 break;
diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js
index f1559e7b..1573b9f3 100644
--- a/js/Sources/RAND_m.js
+++ b/js/Sources/RAND_m.js
@@ -18,13 +18,13 @@ model.outtyp=1;
 model.evtin=1;
 model.evtout=[];
 model.state=[];
-model.dstate=[int(rand()*(10^7-1)),0*a.slice()];
+model.dstate=[[int(rand()*(10^7-1))],[0*a.slice()]];
 model.rpar=[a.slice(),b.slice()];
 model.ipar=flag;
 model.blocktype="d";
 model.firing=[];
 model.dep_ut=[false,false];
-exprs=[sci2exp(1),string(flag),sci2exp([a]),sci2exp([b]),sci2exp([model.dstate(1),int(rand()*(10^7-1))])];
+exprs=[[sci2exp(1)],[string(flag)],[sci2exp([a])],[sci2exp([b])],[sci2exp([model.dstate(1),int(rand()*(10^7-1))])]];
 gr_i=[];
 x=standard_define([3,2],model,exprs,gr_i);
 }
@@ -41,7 +41,7 @@ if (size(exprs,"*")==14) {
 exprs[9-1]=[];
 }
 while (true) {
-[ok,typ,flag,a,b,seed_c,exprs]=scicos_getvalue(["Set Random generator block parameters","flag = 0 : Uniform distribution A is min and A+B max","flag = 1 : Normal distribution A is mean and B deviation"," ","A and B must be matrix with equal sizes"],["Datatype(1=real double  2=complex)","flag","A","B","SEED"],list("vec",1,"vec",1,"mat",[-1,-2],"mat","[-1 -2]","mat",[1,2]),exprs);
+[ok,typ,flag,a,b,seed_c,exprs]=scicos_getvalue([["Set Random generator block parameters"],["flag = 0 : Uniform distribution A is min and A+B max"],["flag = 1 : Normal distribution A is mean and B deviation"],[" "],["A and B must be matrix with equal sizes"]],[["Datatype(1=real double  2=complex)"],["flag"],["A"],["B"],["SEED"]],list("vec",1,"vec",1,"mat",[-1,-2],"mat","[-1 -2]","mat",[1,2]),exprs);
 if (!ok) {
 break;
 }
@@ -51,14 +51,14 @@ message("flag must be equal to 1 or 0");
 out=size(a);
 if (typ==1) {
 function_name="rndblk_m";
-model.rpar=[real(a.slice()),real(b.slice())];
-model.dstate=[seed_c(1),0*real(a.slice())];
+model.rpar=[[real(a.slice())],[real(b.slice())]];
+model.dstate=[[seed_c(1)],[0*real(a.slice())]];
 ot=1;
 } else if (typ==2) {
 function_name="rndblkz_m";
 ot=2;
-model.rpar=[real(a.slice()),imag(a.slice()),real(b.slice()),imag(b.slice())];
-model.dstate=[seed_c.slice(),0*[real(a.slice()),imag(a.slice())]];
+model.rpar=[[real(a.slice())],[imag(a.slice())],[real(b.slice())],[imag(b.slice())]];
+model.dstate=[[seed_c.slice()],[0*[[real(a.slice())],[imag(a.slice())]]]];
 } else {
 message("Datatype is not supported");
 ok=false;
diff --git a/js/Sources/READAU_f.js b/js/Sources/READAU_f.js
index 8ad32b6a..ed891f22 100644
--- a/js/Sources/READAU_f.js
+++ b/js/Sources/READAU_f.js
@@ -16,11 +16,11 @@ model=scicos_model();
 model.sim=list("readau",2);
 model.out=nout;
 model.evtin=1;
-model.dstate=[1,1,lunit,zeros(N*M,1)];
-model.ipar=[length(fname),_str2code(frmt),ievt,N,M,swap,offset,_str2code(fname),tmask,outmask];
+model.dstate=[[1],[1],[lunit],[zeros(N*M,1)]];
+model.ipar=[[length(fname)],[_str2code(frmt)],[ievt],[N],[M],[swap],[offset],[_str2code(fname)],[tmask],[outmask]];
 model.blocktype="d";
 model.dep_ut=[false,false];
-exprs=[fname,string(N),string(swap)];
+exprs=[[fname],[string(N)],[string(swap)]];
 gr_i=[];
 x=standard_define([5,2],model,exprs,gr_i);
 }
@@ -41,7 +41,7 @@ tmask=ipar(imask);
 lunit=dstate(3);
 fname=exprs[1-1];
 while (true) {
-[ok,fname1,N,swap,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"READAU_f")," ",gettext("(Read Audio File)")," ",gettext("Read is done on a binary \'.au\' file")],[gettext("Input File Name"),gettext("Buffer size"),gettext("Swap Mode (0:No, 1:Yes)")],list("str",1,"vec",1,"vec",1),exprs);
+[ok,fname1,N,swap,exprs]=scicos_getvalue([[msprintf(gettext("Set %s block parameters"),"READAU_f")],[" "],[gettext("(Read Audio File)")],[" "],[gettext("Read is done on a binary \'.au\' file")]],[[gettext("Input File Name")],[gettext("Buffer size")],[gettext("Swap Mode (0:No, 1:Yes)")]],list("str",1,"vec",1,"vec",1),exprs);
 tmask1=[];
 outmask=1;
 frmt1="uc";
@@ -66,9 +66,9 @@ block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),
 [model,graphics,ok]=check_io(model,graphics,[],1,1,[]);
 frmt1=part(frmt1,1,3);
 if (ok) {
-ipar=[length(fname1),_str2code(frmt1),0,N,M,swap,offset,_str2code(fname1),tmask1,outmask.slice()];
+ipar=[[length(fname1)],[_str2code(frmt1)],[0],[N],[M],[swap],[offset,_str2code(fname1)],[tmask1,outmask.slice()]];
 if (prod(size(dstate))!=(N*M)+3) {
-dstate=[-1,-1,lunit,zeros(N*M,1)];
+dstate=[[-1],[-1],[lunit],[zeros(N*M,1)]];
 }
 model.dstate=dstate;
 model.ipar=ipar;
diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js
index 7455a98e..60cf42d7 100644
--- a/js/Sources/READC_f.js
+++ b/js/Sources/READC_f.js
@@ -13,18 +13,18 @@ offset=1;
 outmask=1;
 ievt=0;
 nout=size(outmask,"*");
-ipar=[length(fname),_str2code(frmt),ievt,N,M,swap,offset,_str2code(fname),tmask,outmask];
+ipar=[[length(fname)],[_str2code(frmt)],[ievt],[N],[M],[swap],[offset],[_str2code(fname)],[tmask],[outmask]];
 model=scicos_model();
 model.sim=list("readc",2);
 model.out=nout;
 model.evtin=1;
 model.evtout=[];
-model.dstate=[1,1,lunit,zeros(N*M,1)];
-model.ipar=[length(fname),_str2code(frmt),ievt,N,M,swap,offset,_str2code(fname),tmask,outmask];
+model.dstate=[[1],[1],[lunit],[zeros(N*M,1)]];
+model.ipar=[[length(fname)],[_str2code(frmt)],[ievt],[N],[M],[swap],[offset],[_str2code(fname)],[tmask],[outmask]];
 model.blocktype="d";
 model.firing=-1;
 model.dep_ut=[false,false];
-exprs=["[]",sci2exp(outmask),fname,frmt,string(M),string(N),string(offset),string(swap)];
+exprs=[["[]"],[sci2exp(outmask)],[fname],[frmt],[string(M)],[string(N)],[string(offset)],[string(swap)]];
 gr_i=[];
 x=standard_define([4,2],model,exprs,gr_i);
 }
@@ -46,7 +46,7 @@ lunit=dstate(3);
 fname=exprs[3-1];
 frmt=exprs[4-1];
 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;
 }
@@ -100,9 +100,9 @@ model.firing=-1;
 } else {
 model.firing=0;
 }
-ipar=[length(fname1),_str2code(frmt1),ievt,N,M,swap,offset,_str2code(fname1),tmask1,outmask.slice()];
+ipar=[[length(fname1)],[_str2code(frmt1)],[ievt],[N],[M],[swap],[offset],[_str2code(fname1)],[tmask1],[outmask.slice()]];
 if (prod(size(dstate))!=(N*M)+3) {
-dstate=[-1,-1,lunit,zeros(N*M,1)];
+dstate=[[-1],[-1],[lunit],[zeros(N*M,1)]];
 }
 model.dstate=dstate;
 model.ipar=ipar;
diff --git a/js/Sources/STEP.js b/js/Sources/STEP.js
index 1ad4aeff..c1b4a6be 100644
--- a/js/Sources/STEP.js
+++ b/js/Sources/STEP.js
@@ -1,7 +1,7 @@
 /* autogenerated from "macros/Sources/STEP.sci" */
 function STEP() {
 STEP.prototype.define = function STEP() {
-rpar=[0,1];
+rpar=[[0],[1]];
 model=scicos_model();
 model.sim=list("step_func",4);
 model.evtin=1;
@@ -13,7 +13,7 @@ model.firing=1;
 model.rpar=rpar;
 model.blocktype="c";
 model.dep_ut=[false,false];
-exprs=[string(1),string(rpar)];
+exprs=[[string(1)],[string(rpar)]];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 }
@@ -27,7 +27,7 @@ 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);
+[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;
 }
@@ -51,9 +51,9 @@ model.outtyp=1;
 if (ok) {
 model.firing=temps;
 if (temps==0) {
-rpar=[fi,fi];
+rpar=[[fi],[fi]];
 } else {
-rpar=[in1,fi];
+rpar=[[in1],[fi]];
 }
 model.rpar=rpar;
 graphics.exprs=exprs;
diff --git a/js/Sources/SampleCLK.js b/js/Sources/SampleCLK.js
index 8c4b04c9..b59b7e84 100644
--- a/js/Sources/SampleCLK.js
+++ b/js/Sources/SampleCLK.js
@@ -8,7 +8,7 @@ model.rpar=[1,0];
 model.blocktype="d";
 model.firing=-1;
 model.dep_ut=[false,false];
-exprs=[sci2exp(1),sci2exp(0)];
+exprs=[[sci2exp(1)],[sci2exp(0)]];
 x=standard_define([2,2],model,exprs," ");
 }
 SampleCLK.prototype.details = function SampleCLK() {
@@ -21,7 +21,7 @@ graphics=arg1.graphics;
 model=arg1.model;
 exprs=graphics.exprs;
 while (true) {
-[ok,frequ,offset,exprs]=scicos_getvalue("Set block parameters",["Sample time","Offset"],list("vec",1,"vec",1),exprs);
+[ok,frequ,offset,exprs]=scicos_getvalue("Set block parameters",[["Sample time"],["Offset"]],list("vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
@@ -34,11 +34,11 @@ message("The |Offset| must be less than the Frequency");
 ok=false;
 }
 if (ok) {
-if (or(model.rpar.slice()!=[frequ,offset])) {
+if (or(model.rpar.slice()!=[[frequ],[offset]])) {
 needcompile=4;
 y=needcompile;
 }
-model.rpar=[frequ,offset];
+model.rpar=[[frequ],[offset]];
 model.evtout=1;
 model.firing=-1;
 graphics.exprs=exprs;
diff --git a/js/Sources/TKSCALE.js b/js/Sources/TKSCALE.js
index c3ab253f..697a4293 100644
--- a/js/Sources/TKSCALE.js
+++ b/js/Sources/TKSCALE.js
@@ -8,10 +8,10 @@ model=scicos_model();
 model.sim=list("tkscaleblk",5);
 model.out=1;
 model.evtin=1;
-model.rpar=[a,b,f];
+model.rpar=[[a],[b],[f]];
 model.blocktype="d";
 model.dep_ut=[false,false];
-exprs=[sci2exp(a),sci2exp(b),sci2exp(f)];
+exprs=[[sci2exp(a)],[sci2exp(b)],[sci2exp(f)]];
 gr_i=[];
 x=standard_define([3,2],model,exprs,gr_i);
 }
@@ -24,10 +24,10 @@ x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
-[ok,a,b,f,exprs]=scicos_getvalue("Set scale block parameters",["Min value","Max value","Normalization"],list("vec",1,"vec",1,"vec",1),exprs);
+[ok,a,b,f,exprs]=scicos_getvalue("Set scale block parameters",[["Min value"],["Max value"],["Normalization"]],list("vec",1,"vec",1,"vec",1),exprs);
 if (ok) {
 graphics.exprs=exprs;
-model.rpar=[a,b,f];
+model.rpar=[[a],[b],[f]];
 x.graphics=graphics;
 x.model=model;
 }