handle multiple rows

12 files changed, 49 insertions, 49 deletions

diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js
index e562b3ab..8d8f4ac2 100644
--- a/js/NonLinear/DLRADAPT_f.js
+++ b/js/NonLinear/DLRADAPT_f.js
@@ -1,24 +1,24 @@
 /* autogenerated from "macros/NonLinear/DLRADAPT_f.sci" */
 function DLRADAPT_f() {
 DLRADAPT_f.prototype.define = function DLRADAPT_f() {
-p=[0,1];
+p=[[0],[1]];
 rn=[];
-rd=[math.complex(0.2,0.8),math.complex(0.2,-0.8),math.complex(0.3,0.7),math.complex(0.3,-0.7)];
-g=[1,1];
+rd=[[math.complex(0.2,0.8),math.complex(0.2,-0.8)],[math.complex(0.3,0.7),math.complex(0.3,-0.7)]];
+g=[[1],[1]];
 last_u=[];
-last_y=[0,0];
+last_y=[[0],[0]];
 model=scicos_model();
 model.sim="dlradp";
-model.in1=[1,1];
+model.in1=[[1],[1]];
 model.out=1;
 model.evtin=1;
-model.dstate=[last_u,last_y];
-model.rpar=[p.slice(),real(rn.slice()),imag(rn.slice()),real(rd.slice()),imag(rd.slice()),g.slice()];
-model.ipar=[0,2,2];
+model.dstate=[[last_u],[last_y]];
+model.rpar=[[p.slice()],[real(rn.slice())],[imag(rn.slice())],[real(rd.slice())],[imag(rd.slice())],[g.slice()]];
+model.ipar=[[0],[2],[2]];
 model.blocktype="d";
 model.firing=[];
 model.dep_ut=[true,false];
-exprs=[sci2exp(p),sci2exp(rn),sci2exp(rd,0),sci2exp(g),sci2exp(last_u),sci2exp(last_y)];
+exprs=[[sci2exp(p)],[sci2exp(rn)],[sci2exp(rd,0)],[sci2exp(g)],[sci2exp(last_u)],[sci2exp(last_y)]];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 }
@@ -32,7 +32,7 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,p,rn,rd,g,last_u,last_y,exprs]=scicos_getvalue("Set block parameters",["Vector of p mesh points","Numerator roots (one line for each mesh)","Denominator roots (one line for each mesh)","Vector of gain at mesh points","past inputs (Num degree values)","past outputs (Den degree values)"],list("vec",-1,"mat",[-1,-1],"mat",["size(%1,\'*\')","-1"],"vec","size(%1,\'*\')","vec","size(%2,2)","vec","size(%3,2)"),exprs);
+[ok,p,rn,rd,g,last_u,last_y,exprs]=scicos_getvalue("Set block parameters",[["Vector of p mesh points"],["Numerator roots (one line for each mesh)"],["Denominator roots (one line for each mesh)"],["Vector of gain at mesh points"],["past inputs (Num degree values)"],["past outputs (Den degree values)"]],list("vec",-1,"mat",[-1,-1],"mat",["size(%1,\'*\')","-1"],"vec","size(%1,\'*\')","vec","size(%2,2)","vec","size(%3,2)"),exprs);
 if (!ok) {
 break;
 }
@@ -43,9 +43,9 @@ message("Transfer must be strictly proper");
 } else if (size(rn,1)!=0&&size(rn,1)!=size(p,"*")) {
 message("Numerator roots matrix row size\'s is incorrect");
 } else {
-rpar=[p.slice(),real(rn.slice()),imag(rn.slice()),real(rd.slice()),imag(rd.slice()),g.slice()];
-ipar=[m,n,npt];
-model.dstate=[last_u.slice(),last_y.slice()];
+rpar=[[p.slice()],[real(rn.slice())],[imag(rn.slice())],[real(rd.slice())],[imag(rd.slice())],[g.slice()]];
+ipar=[[m],[n],[npt]];
+model.dstate=[[last_u.slice()],[last_y.slice()]];
 model.rpar=rpar;
 model.ipar=ipar;
 graphics.exprs=exprs;
diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js
index 0096ef52..768f9119 100644
--- a/js/NonLinear/INTRP2BLK_f.js
+++ b/js/NonLinear/INTRP2BLK_f.js
@@ -1,18 +1,18 @@
 /* autogenerated from "macros/NonLinear/INTRP2BLK_f.sci" */
 function INTRP2BLK_f() {
 INTRP2BLK_f.prototype.define = function INTRP2BLK_f() {
-a=[0,1];
-b=[0,1];
-c=[0,1,1,2];
+a=[[0],[1]];
+b=[[0],[1]];
+c=[[0,1],[1,2]];
 model=scicos_model();
 model.sim=list("intrp2",1);
-model.in1=[1,1];
+model.in1=[[1],[1]];
 model.out=1;
-model.rpar=[a,b,c.slice()];
-model.ipar=[2,2];
+model.rpar=[[a],[b],[c.slice()]];
+model.ipar=[[2],[2]];
 model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=[strcat(sci2exp(a)),strcat(sci2exp(b)),strcat(sci2exp(c,0))];
+exprs=[[strcat(sci2exp(a))],[strcat(sci2exp(b))],[strcat(sci2exp(c,0))]];
 gr_i=[];
 x=standard_define([3,2],model,exprs,gr_i);
 }
@@ -26,7 +26,7 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,a,b,c,exprs]=scicos_getvalue("Set Interpolation block parameters",["X coord.","Y coord.","Z values"],list("vec",-1,"vec",-1,"mat",[-1,-1]),exprs);
+[ok,a,b,c,exprs]=scicos_getvalue("Set Interpolation block parameters",[["X coord."],["Y coord."],["Z values"]],list("vec",-1,"vec",-1,"mat",[-1,-1]),exprs);
 if (!ok) {
 break;
 }
@@ -37,8 +37,8 @@ message("X and Y must be strictly increasing");
 } else {
 if (ok) {
 graphics.exprs=exprs;
-model.rpar=[a.slice(),b.slice(),c.slice()];
-model.ipar=[size(a,"*"),size(b,"*")];
+model.rpar=[[a.slice()],[b.slice()],[c.slice()]];
+model.ipar=[[size(a,"*")],[size(b,"*")]];
 x.graphics=graphics;
 x.model=model;
 break;
diff --git a/js/NonLinear/INTRPLBLK_f.js b/js/NonLinear/INTRPLBLK_f.js
index 15660af6..a002dd0f 100644
--- a/js/NonLinear/INTRPLBLK_f.js
+++ b/js/NonLinear/INTRPLBLK_f.js
@@ -1,16 +1,16 @@
 /* autogenerated from "macros/NonLinear/INTRPLBLK_f.sci" */
 function INTRPLBLK_f() {
 INTRPLBLK_f.prototype.define = function INTRPLBLK_f() {
-a=[0,1];
-b=[0,1];
+a=[[0],[1]];
+b=[[0],[1]];
 model=scicos_model();
 model.sim="intrpl";
 model.in1=1;
 model.out=1;
-model.rpar=[a,b];
+model.rpar=[[a],[b]];
 model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=[strcat(sci2exp(a)),strcat(sci2exp(b))];
+exprs=[[strcat(sci2exp(a))],[strcat(sci2exp(b))]];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 }
@@ -24,7 +24,7 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,a,b,exprs]=scicos_getvalue("Set Interpolation block parameters",["X coord.","Y coord."],list("vec",-1,"vec",-1),exprs);
+[ok,a,b,exprs]=scicos_getvalue("Set Interpolation block parameters",[["X coord."],["Y coord."]],list("vec",-1,"vec",-1),exprs);
 if (!ok) {
 break;
 }
@@ -35,7 +35,7 @@ message("X must be strictly increasing");
 } else {
 if (ok) {
 graphics.exprs=exprs;
-model.rpar=[a.slice(),b.slice()];
+model.rpar=[[a.slice()],[b.slice()]];
 x.graphics=graphics;
 x.model=model;
 break;
diff --git a/js/NonLinear/LOOKUP_f.js b/js/NonLinear/LOOKUP_f.js
index 42d6e2b5..685d6450 100644
--- a/js/NonLinear/LOOKUP_f.js
+++ b/js/NonLinear/LOOKUP_f.js
@@ -5,7 +5,7 @@ model=scicos_model();
 model.sim="lookup";
 model.in1=1;
 model.out=1;
-model.rpar=[-2,-1,1,2,-1,1,-1,1];
+model.rpar=[[-2],[-1],[1],[2],[-1],[1],[-1],[1]];
 model.blocktype="c";
 model.dep_ut=[true,false];
 gr_i=[];
@@ -40,7 +40,7 @@ message("You have not defined a function");
 ok=false;
 }
 if (ok) {
-model.rpar=[xx.slice(),yy.slice()];
+model.rpar=[[xx.slice()],[yy.slice()]];
 x.graphics=graphics;
 x.model=model;
 break;
diff --git a/js/NonLinear/MAXMIN.js b/js/NonLinear/MAXMIN.js
index 1a58b4ac..301afa58 100644
--- a/js/NonLinear/MAXMIN.js
+++ b/js/NonLinear/MAXMIN.js
@@ -23,7 +23,7 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,mm,nin,zcr,exprs]=scicos_getvalue("Set Max/Min block parameters",["Min (1) or Max (2) ","Number of input vectors (1 or 2)","zero-crossing (1: yes, 0;no)"],list("vec",1,"vec",1,"vec",1),exprs);
+[ok,mm,nin,zcr,exprs]=scicos_getvalue("Set Max/Min block parameters",[["Min (1) or Max (2) "],["Number of input vectors (1 or 2)"],["zero-crossing (1: yes, 0;no)"]],list("vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/NonLinear/MAX_f.js b/js/NonLinear/MAX_f.js
index fe056aeb..076f0dac 100644
--- a/js/NonLinear/MAX_f.js
+++ b/js/NonLinear/MAX_f.js
@@ -6,7 +6,7 @@ model=scicos_model();
 model.sim="maxblk";
 model.in1=in1;
 model.out=1;
-model.dstate=[0,0];
+model.dstate=[[0],[0]];
 model.blocktype="c";
 model.dep_ut=[true,false];
 exprs=" ";
diff --git a/js/NonLinear/MIN_f.js b/js/NonLinear/MIN_f.js
index cddd8668..208dd248 100644
--- a/js/NonLinear/MIN_f.js
+++ b/js/NonLinear/MIN_f.js
@@ -6,7 +6,7 @@ model=scicos_model();
 model.sim="minblk";
 model.in1=in1;
 model.out=1;
-model.dstate=[0,0];
+model.dstate=[[0],[0]];
 model.blocktype="c";
 model.dep_ut=[true,false];
 exprs=sci2exp(in1);
diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js
index 2b0b4a60..c1e5cc0b 100644
--- a/js/NonLinear/PRODUCT.js
+++ b/js/NonLinear/PRODUCT.js
@@ -1,10 +1,10 @@
 /* autogenerated from "macros/NonLinear/PRODUCT.sci" */
 function PRODUCT() {
 PRODUCT.prototype.define = function PRODUCT() {
-sgn=[1,-1];
+sgn=[[1],[-1]];
 model=scicos_model();
 model.sim=list("product",4);
-model.in1=[-1,-1];
+model.in1=[[-1],[-1]];
 model.out=-1;
 model.ipar=sgn;
 model.blocktype="c";
@@ -23,7 +23,7 @@ graphics=arg1.graphics;
 model=arg1.model;
 exprs=graphics.exprs;
 while (true) {
-[ok,sgn,exprs]=scicos_getvalue(["         Set multiplication block parameters","(multiplication is set with + 1, division with -1)",""],"Number of inputs or sign vector",list("vec",-1),exprs);
+[ok,sgn,exprs]=scicos_getvalue([["         Set multiplication block parameters"],["(multiplication is set with + 1, division with -1)"],[""]],"Number of inputs or sign vector",list("vec",-1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/NonLinear/PROD_f.js b/js/NonLinear/PROD_f.js
index 609799fb..94493621 100644
--- a/js/NonLinear/PROD_f.js
+++ b/js/NonLinear/PROD_f.js
@@ -3,7 +3,7 @@ function PROD_f() {
 PROD_f.prototype.define = function PROD_f() {
 model=scicos_model();
 model.sim=list("prod",2);
-model.in1=[-1,-1];
+model.in1=[[-1],[-1]];
 model.out=-1;
 model.blocktype="c";
 model.dep_ut=[true,false];
diff --git a/js/NonLinear/QUANT_f.js b/js/NonLinear/QUANT_f.js
index 397ebc71..aad962ee 100644
--- a/js/NonLinear/QUANT_f.js
+++ b/js/NonLinear/QUANT_f.js
@@ -11,7 +11,7 @@ model.rpar=pas;
 model.ipar=meth;
 model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=[string(pas),string(meth)];
+exprs=[[string(pas)],[string(meth)]];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 }
@@ -25,7 +25,7 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,pas,meth,exprs]=scicos_getvalue("Set parameters",["Step","Quantization Type (1-4)"],list("vec",1,"vec",1),exprs);
+[ok,pas,meth,exprs]=scicos_getvalue("Set parameters",[["Step"],["Quantization Type (1-4)"]],list("vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/NonLinear/SATURATION.js b/js/NonLinear/SATURATION.js
index 42378033..8d21a953 100644
--- a/js/NonLinear/SATURATION.js
+++ b/js/NonLinear/SATURATION.js
@@ -3,7 +3,7 @@ function SATURATION() {
 SATURATION.prototype.define = function SATURATION() {
 minp=-1;
 maxp=1;
-rpar=[maxp,minp];
+rpar=[[maxp],[minp]];
 model=scicos_model();
 model.sim=list("satur",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 Saturation parameters",["Upper limit","Lower limit","zero crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),exprs);
+[ok,maxp,minp,zeroc,exprs]=scicos_getvalue("Set Saturation parameters",[["Upper limit"],["Lower limit"],["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/NonLinear/SAT_f.js b/js/NonLinear/SAT_f.js
index 7a1c05eb..ab87ba59 100644
--- a/js/NonLinear/SAT_f.js
+++ b/js/NonLinear/SAT_f.js
@@ -4,16 +4,16 @@ SAT_f.prototype.define = function SAT_f() {
 minp=-1;
 maxp=1;
 slope=1;
-rpar=[minp,maxp,slope];
+rpar=[[minp],[maxp],[slope]];
 model=scicos_model();
 model.sim=list("lusat",1);
 model.in1=1;
 model.nzcross=2;
 model.out=1;
-model.rpar=[minp,maxp,slope];
+model.rpar=[[minp],[maxp],[slope]];
 model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=[string(minp),string(maxp),string(slope)];
+exprs=[[string(minp)],[string(maxp)],[string(slope)]];
 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,minp,maxp,pente,exprs]=scicos_getvalue("Set Saturation parameters",["Min","Max","Slope"],list("vec",1,"vec",1,"vec",1),exprs);
+[ok,minp,maxp,pente,exprs]=scicos_getvalue("Set Saturation parameters",[["Min"],["Max"],["Slope"]],list("vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
@@ -36,7 +36,7 @@ message("Max must be strictly positive");
 } else if (pente<=0) {
 message("Slope must be strictly positive");
 } else {
-rpar=[minp/pente,maxp/pente,pente];
+rpar=[[minp/pente],[maxp/pente],[pente]];
 model.rpar=rpar;
 model.firing=[];
 graphics.exprs=exprs;