handle multiple rows

18 files changed, 49 insertions, 49 deletions

diff --git a/js/Branching/CLKGOTO.js b/js/Branching/CLKGOTO.js
index e37cc707..5fe8d261 100644
--- a/js/Branching/CLKGOTO.js
+++ b/js/Branching/CLKGOTO.js
@@ -9,7 +9,7 @@ model.ipar=int(1);
 model.blocktype="d";
 model.firing=-1;
 model.dep_ut=[false,false];
-exprs=["A",sci2exp(1)];
+exprs=[["A"],[sci2exp(1)]];
 x=standard_define([2,1],model,exprs," ");
 x.graphics.id="Goto";
 }
@@ -23,7 +23,7 @@ graphics=arg1.graphics;
 model=arg1.model;
 exprs=graphics.exprs;
 while (true) {
-[ok,tag,tagvis,exprs]=scicos_getvalue("Set block parameters",["Tag","Tag Visibility (1=Local 2=Scoped 3=Global)"],list("str",-1,"vec",1),exprs);
+[ok,tag,tagvis,exprs]=scicos_getvalue("Set block parameters",[["Tag"],["Tag Visibility (1=Local 2=Scoped 3=Global)"]],list("str",-1,"vec",1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/Branching/DEMUX.js b/js/Branching/DEMUX.js
index 5c575b5a..8108e90f 100644
--- a/js/Branching/DEMUX.js
+++ b/js/Branching/DEMUX.js
@@ -37,7 +37,7 @@ ok=false;
 }
 } else {
 if (size(out,"*")<2||or(out==0)||size(out,"*")>31) {
-message(["Block must have at least 2 and at most 31 output ports","size 0 is not allowed"]);
+message([["Block must have at least 2 and at most 31 output ports"],["size 0 is not allowed"]]);
 ok=false;
 } else {
 if (min(out)<0) {
diff --git a/js/Branching/DEMUX_f.js b/js/Branching/DEMUX_f.js
index cd27acc7..62148072 100644
--- a/js/Branching/DEMUX_f.js
+++ b/js/Branching/DEMUX_f.js
@@ -37,7 +37,7 @@ ok=false;
 }
 } else {
 if (size(out,"*")<2||size(out,"*")>8||or(out==0)) {
-message(["Block must have at least 2 and at most 8 output ports","and size 0 is not allowed"]   );
+message([["Block must have at least 2 and at most 8 output ports"],["and size 0 is not allowed"]]);
 ok=false;
 } else {
 if (min(out)<0) {
diff --git a/js/Branching/ESELECT_f.js b/js/Branching/ESELECT_f.js
index d8e1b06e..3df1e630 100644
--- a/js/Branching/ESELECT_f.js
+++ b/js/Branching/ESELECT_f.js
@@ -15,7 +15,7 @@ model.dep_ut=[true,false];
 model.nmode=0;
 model.nzcross=0;
 gr_i=[];
-exprs=[string(out),string(1),string(model.nmode)];
+exprs=[[string(out)],[string(1)],[string(model.nmode)]];
 x=standard_define([4,2],model,exprs,gr_i);
 }
 ESELECT_f.prototype.details = function ESELECT_f() {
@@ -34,7 +34,7 @@ exprs[3-1]=string(0);
 }
 model=arg1.model;
 while (true) {
-[ok,out,inh,nmod,exprs]=scicos_getvalue("Set ESELECT block parameters",["number of output event ports","Inherit (1: no, 0: yes)","zero-crossing (0: no, 1: yes)"],list("vec",1,"vec",1,"vec",1),exprs);
+[ok,out,inh,nmod,exprs]=scicos_getvalue("Set ESELECT block parameters",[["number of output event ports"],["Inherit (1: no, 0: yes)"],["zero-crossing (0: no, 1: yes)"]],list("vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/Branching/GOTO.js b/js/Branching/GOTO.js
index 593e3d34..4cec350c 100644
--- a/js/Branching/GOTO.js
+++ b/js/Branching/GOTO.js
@@ -13,7 +13,7 @@ model.ipar=int(1);
 model.opar=list("A");
 model.blocktype="c";
 model.dep_ut=[false,false];
-exprs=["A",sci2exp(1)];
+exprs=[["A"],[sci2exp(1)]];
 gr_i=[];
 x=standard_define([2,1],model,exprs,gr_i);
 x.graphics.id="Goto";
@@ -28,7 +28,7 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,tag,tagvis,exprs]=scicos_getvalue("Set parameters",["Tag","Tag Visibility(1=Local 2=scoped 3= global)"],list("str",-1,"vec",1),exprs);
+[ok,tag,tagvis,exprs]=scicos_getvalue("Set parameters",[["Tag"],["Tag Visibility(1=Local 2=scoped 3= global)"]],list("str",-1,"vec",1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/Branching/GOTOMO.js b/js/Branching/GOTOMO.js
index 232251b2..4b6bf046 100644
--- a/js/Branching/GOTOMO.js
+++ b/js/Branching/GOTOMO.js
@@ -16,7 +16,7 @@ model.dep_ut=[false,false];
 mo=modelica();
 mo.model="gotomo";
 mo.inputs="p";
-exprs=["A",sci2exp(1)];
+exprs=[["A"],[sci2exp(1)]];
 gr_i=[];
 x=standard_define([2,1],model,exprs,gr_i);
 x.graphics.in_implicit=["I"];
@@ -31,7 +31,7 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,tag,tagvis,exprs]=scicos_getvalue("Set parameters",["Tag","Tag Visibility(1=Local 2=scoped 3= global)"],list("str",-1,"vec",1),exprs);
+[ok,tag,tagvis,exprs]=scicos_getvalue("Set parameters",[["Tag"],["Tag Visibility(1=Local 2=scoped 3= global)"]],list("str",-1,"vec",1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/Branching/ISELECT_f.js b/js/Branching/ISELECT_f.js
index 938f7574..81e149de 100644
--- a/js/Branching/ISELECT_f.js
+++ b/js/Branching/ISELECT_f.js
@@ -2,7 +2,7 @@
 function ISELECT_f() {
 ISELECT_f.prototype.define = function ISELECT_f() {
 z0=0;
-out=[-1,-1];
+out=[[-1],[-1]];
 nout=2;
 model=scicos_model();
 model.sim=list("selector",2);
@@ -12,7 +12,7 @@ model.evtin=ones(out);
 model.dstate=z0;
 model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=[string(nout),string(z0+1)];
+exprs=[[string(nout)],[string(z0+1)]];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 }
@@ -26,7 +26,7 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,nout,z0,exprs]=scicos_getvalue("Set parameters",["number of outputs","initial connected output"],list("vec",1,"vec",1),exprs);
+[ok,nout,z0,exprs]=scicos_getvalue("Set parameters",[["number of outputs"],["initial connected output"]],list("vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js
index 8c4c9112..e86fa950 100644
--- a/js/Branching/ISELECT_m.js
+++ b/js/Branching/ISELECT_m.js
@@ -5,8 +5,8 @@ z0=1;
 nout=2;
 model=scicos_model();
 model.sim=list("selector_m",4);
-model.out=[-1,-1];
-model.out2=[-2,-2];
+model.out=[[-1],[-1]];
+model.out2=[[-2],[-2]];
 model.outtyp=1;
 model.in1=-1;
 model.in2=-2;
@@ -20,7 +20,7 @@ model.evtin=ones(nout,1);
 model.dstate=z0;
 model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=[sci2exp(1),sci2exp(nout),sci2exp(z0)];
+exprs=[[sci2exp(1)],[sci2exp(nout)],[sci2exp(z0)]];
 gr_i=[];
 x=standard_define([3,2],model,exprs,gr_i);
 }
@@ -34,7 +34,7 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,typ,nout,z0,exprs]=scicos_getvalue("Set parameters",["Datatype(1= real double  2=Complex 3=int32 ...)","number of outputs","initial connected output"],list("vec",1,"vec",1,"vec",1),exprs);
+[ok,typ,nout,z0,exprs]=scicos_getvalue("Set parameters",[["Datatype(1= real double  2=Complex 3=int32 ...)"],["number of outputs"],["initial connected output"]],list("vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/Branching/MUX.js b/js/Branching/MUX.js
index 2fa8792f..f9e9140d 100644
--- a/js/Branching/MUX.js
+++ b/js/Branching/MUX.js
@@ -36,7 +36,7 @@ ok=false;
 }
 } else {
 if (size(in1,"*")<2||or(in1==0)||size(in1,"*")>31) {
-message(["Block must have at least two input ports","and at most 31. Size 0 is not allowed. "]);
+message([["Block must have at least two input ports"],["and at most 31. Size 0 is not allowed. "]]);
 ok=false;
 } else {
 if (min(in1)<0) {
diff --git a/js/Branching/MUX_f.js b/js/Branching/MUX_f.js
index d75e4319..535f1cfa 100644
--- a/js/Branching/MUX_f.js
+++ b/js/Branching/MUX_f.js
@@ -36,7 +36,7 @@ ok=false;
 }
 } else {
 if (size(in1,"*")<2||size(in1,"*")>8||or(in1==0)) {
-message(["Block must have at least two input ports","and at most eight, and size 0 is not allowed. "]);
+message([["Block must have at least two input ports"],["and at most eight, and size 0 is not allowed. "]]);
 ok=false;
 } else {
 if (min(in1)<0) {
diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js
index 68bdd3b3..0ef06453 100644
--- a/js/Branching/M_SWITCH.js
+++ b/js/Branching/M_SWITCH.js
@@ -1,8 +1,8 @@
 /* autogenerated from "macros/Branching/M_SWITCH.sci" */
 function M_SWITCH() {
 M_SWITCH.prototype.define = function M_SWITCH() {
-in1=[1,-1,-1];
-ipar=[1,3];
+in1=[[1],[-1],[-1]];
+ipar=[[1],[3]];
 nin=2;
 model=scicos_model();
 model.sim=list("mswitch",4);
@@ -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.5,2],model,exprs,gr_i);
 }
@@ -25,7 +25,7 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,nin,base,rule,exprs]=scicos_getvalue("Set parameters",["number of inputs","zero base indexing (0), otherwise 1","rounding rule: int (0), round (1), ceil (2), floor (3)"],list("vec",1,"vec",1,"vec",1),exprs);
+[ok,nin,base,rule,exprs]=scicos_getvalue("Set parameters",[["number of inputs"],["zero base indexing (0), otherwise 1"],["rounding rule: int (0), round (1), ceil (2), floor (3)"]],list("vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
@@ -39,20 +39,20 @@ message("base indexing must be 1 or 0");
 message("incorrect rounding rule");
 } else {
 if (nin==1) {
-in1=[1,1,-1,1];
+in1=[[1,1],[-1,1]];
 out=[1,1];
 } else {
-in1=[1,-ones(nin,1)];
-in2=[1,-2*ones(nin,1)];
+in1=[[1],[-ones(nin,1)]];
+in2=[[1],[-2*ones(nin,1)]];
 in1=[in1,in2];
 out=[-1,-2];
 }
-it=[-1,-2*ones(nin,1)];
+it=[[-1],[-2*ones(nin,1)]];
 ot=-2;
 [model,graphics,ok]=set_io(model,graphics,list(in1,it),list(out,ot),[],[]);
 if (ok) {
 graphics.exprs=exprs;
-model.ipar=[base,rule];
+model.ipar=[[base],[rule]];
 x.graphics=graphics;
 x.model=model;
 break;
diff --git a/js/Branching/NRMSOM_f.js b/js/Branching/NRMSOM_f.js
index 724fb7e0..0950b924 100644
--- a/js/Branching/NRMSOM_f.js
+++ b/js/Branching/NRMSOM_f.js
@@ -1,7 +1,7 @@
 /* autogenerated from "macros/Branching/NRMSOM_f.sci" */
 function NRMSOM_f() {
 NRMSOM_f.prototype.define = function NRMSOM_f() {
-in1=[-1,-1];
+in1=[[-1],[-1]];
 nin=2;
 model=scicos_model();
 model.sim="junk";
diff --git a/js/Branching/RELAY_f.js b/js/Branching/RELAY_f.js
index fc2fa55b..f2bf29f4 100644
--- a/js/Branching/RELAY_f.js
+++ b/js/Branching/RELAY_f.js
@@ -2,7 +2,7 @@
 function RELAY_f() {
 RELAY_f.prototype.define = function RELAY_f() {
 i0=0;
-in1=[-1,-1];
+in1=[[-1],[-1]];
 nin=2;
 model=scicos_model();
 model.sim=list("relay",2);
@@ -13,7 +13,7 @@ model.dstate=i0;
 model.blocktype="c";
 model.firing=[];
 model.dep_ut=[true,true];
-exprs=[string(nin),string(i0+1)];
+exprs=[[string(nin)],[string(i0+1)]];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 }
@@ -28,7 +28,7 @@ exprs=graphics.exprs;
 model=arg1.model;
 ipar=model.ipar;
 while (true) {
-[ok,nin,z0,exprs]=scicos_getvalue("Set parameters",["number of inputs","initial connected input"],list("vec",1,"vec",1),exprs);
+[ok,nin,z0,exprs]=scicos_getvalue("Set parameters",[["number of inputs"],["initial connected input"]],list("vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/Branching/SELECT_f.js b/js/Branching/SELECT_f.js
index 1c5e9a0d..577faf4f 100644
--- a/js/Branching/SELECT_f.js
+++ b/js/Branching/SELECT_f.js
@@ -2,7 +2,7 @@
 function SELECT_f() {
 SELECT_f.prototype.define = function SELECT_f() {
 z0=0;
-in1=[-1,-1];
+in1=[[-1],[-1]];
 nin=2;
 model=scicos_model();
 model.sim=list("selector",2);
@@ -12,7 +12,7 @@ model.evtin=ones(in1);
 model.dstate=z0;
 model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=[string(nin),string(z0+1)];
+exprs=[[string(nin)],[string(z0+1)]];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 }
@@ -26,7 +26,7 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,nin,z0,exprs]=scicos_getvalue("Set parameters",["number of inputs","initial connected input"],list("vec",1,"vec",1),exprs);
+[ok,nin,z0,exprs]=scicos_getvalue("Set parameters",[["number of inputs"],["initial connected input"]],list("vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js
index 09fa296d..eb7ee76c 100644
--- a/js/Branching/SELECT_m.js
+++ b/js/Branching/SELECT_m.js
@@ -5,8 +5,8 @@ z0=1;
 nin=2;
 model=scicos_model();
 model.sim=list("selector_m",4);
-model.in1=[-1,-1];
-model.in2=[-2,-2];
+model.in1=[[-1],[-1]];
+model.in2=[[-2],[-2]];
 model.intyp=1;
 model.out=-1;
 model.out2=-2;
@@ -20,7 +20,7 @@ model.evtin=ones(nin,1);
 model.dstate=z0;
 model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=[sci2exp(1),sci2exp(nin),sci2exp(z0)];
+exprs=[[sci2exp(1)],[sci2exp(nin)],[sci2exp(z0)]];
 gr_i=[];
 x=standard_define([3,2],model,exprs,gr_i);
 }
@@ -34,7 +34,7 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,typ,nin,z0,exprs]=scicos_getvalue("Set parameters",["Datatype(1= real double  2=Complex 3=int32 ..)","number of inputs","initial connected input"],list("vec",1,"vec",1,"vec",1),exprs);
+[ok,typ,nin,z0,exprs]=scicos_getvalue("Set parameters",[["Datatype(1= real double  2=Complex 3=int32 ..)"],["number of inputs"],["initial connected input"]],list("vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/Branching/SWITCH2.js b/js/Branching/SWITCH2.js
index adbc87f6..87107a84 100644
--- a/js/Branching/SWITCH2.js
+++ b/js/Branching/SWITCH2.js
@@ -1,7 +1,7 @@
 /* autogenerated from "macros/Branching/SWITCH2.sci" */
 function SWITCH2() {
 SWITCH2.prototype.define = function SWITCH2() {
-in1=[-1,1,-1];
+in1=[[-1],[1],[-1]];
 ipar=[0];
 nzz=1;
 rpar=0;
@@ -15,7 +15,7 @@ model.nzcross=nzz;
 model.nmode=1;
 model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=[string(ipar),string(rpar),string(nzz)];
+exprs=[[string(ipar)],[string(rpar)],[string(nzz)]];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 }
@@ -29,7 +29,7 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,rule,thra,nzz,exprs]=scicos_getvalue("Set parameters",["pass first input if: u2>=a (0), u2>a (1), u2~=a (2)","threshold a","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1),exprs);
+[ok,rule,thra,nzz,exprs]=scicos_getvalue("Set parameters",[["pass first input if: u2>=a (0), u2>a (1), u2~=a (2)"],["threshold a"],["use zero crossing: yes (1), no (0)"]],list("vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/Branching/SWITCH2_m.js b/js/Branching/SWITCH2_m.js
index 3e8266c6..9bdf4984 100644
--- a/js/Branching/SWITCH2_m.js
+++ b/js/Branching/SWITCH2_m.js
@@ -6,8 +6,8 @@ nzz=1;
 rpar=0;
 model=scicos_model();
 model.sim=list("switch2_m",4);
-model.in1=[-1,1,-1];
-model.in2=[-2,1,-2];
+model.in1=[[-1],[1],[-1]];
+model.in2=[[-2],[1],[-2]];
 model.intyp=1;
 model.out=-1;
 model.out2=-2;
@@ -18,7 +18,7 @@ model.nzcross=nzz;
 model.nmode=1;
 model.blocktype="c";
 model.dep_ut=[true,false];
-exprs=[sci2exp(1),string(ipar),string(rpar),string(nzz)];
+exprs=[[sci2exp(1)],[string(ipar)],[string(rpar)],[string(nzz)]];
 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,ot,rule,thra,nzz,exprs]=scicos_getvalue("Set parameters",["Datatype (1=real double  2=complex 3=int32 ...)","pass first input if: u2>=a (0), u2>a (1), u2~=a (2)","threshold a","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1,"vec",1),exprs);
+[ok,ot,rule,thra,nzz,exprs]=scicos_getvalue("Set parameters",[["Datatype (1=real double  2=complex 3=int32 ...)"],["pass first input if: u2>=a (0), u2>a (1), u2~=a (2)"],["threshold a"],["use zero crossing: yes (1), no (0)"]],list("vec",1,"vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/Branching/SWITCH_f.js b/js/Branching/SWITCH_f.js
index a0c99217..4f194c7e 100644
--- a/js/Branching/SWITCH_f.js
+++ b/js/Branching/SWITCH_f.js
@@ -2,7 +2,7 @@
 function SWITCH_f() {
 SWITCH_f.prototype.define = function SWITCH_f() {
 i0=0;
-in1=[-1,-1];
+in1=[[-1],[-1]];
 nin=2;
 model=scicos_model();
 model.sim=list("switchn",2);
@@ -12,7 +12,7 @@ model.ipar=i0;
 model.blocktype="c";
 model.firing=[];
 model.dep_ut=[true,true];
-exprs=[string(nin),string(i0+1)];
+exprs=[[string(nin)],[string(i0+1)]];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 }
@@ -27,7 +27,7 @@ exprs=graphics.exprs;
 model=arg1.model;
 ipar=model.ipar;
 while (true) {
-[ok,nin,z0,exprs]=scicos_getvalue("Set switch parameters",["number of inputs","connected input"],list("vec",1,"vec",1),exprs);
+[ok,nin,z0,exprs]=scicos_getvalue("Set switch parameters",[["number of inputs"],["connected input"]],list("vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }