handle multiple rows

18 files changed, 116 insertions, 116 deletions

diff --git a/js/Electrical/CCS.js b/js/Electrical/CCS.js
index 84ca9326..e971b2cd 100644
--- a/js/Electrical/CCS.js
+++ b/js/Electrical/CCS.js
@@ -9,24 +9,24 @@ Typein=[];
 Typeout=[];
 MI=[];
 MO=[];
-P=[2,50,1,0,70,98,2,0,70,2,-2,0];
-PortName=["Iin","p","n"];
+P=[[2,50,1,0],[70,98,2,0],[70,2,-2,0]];
+PortName=[["Iin"],["p"],["n"]];
 for (i=1;i<=size(P,"r");i+=1) {
 if (P(i,3)==1) {
-Typein=[Typein,"E"];
-MI=[MI,PortName(i)];
+Typein=[[Typein],["E"]];
+MI=[[MI],[PortName(i)]];
 }
 if (P(i,3)==2) {
-Typein=[Typein,"I"];
-MI=[MI,PortName(i)];
+Typein=[[Typein],["I"]];
+MI=[[MI],[PortName(i)]];
 }
 if (P(i,3)==-1) {
-Typeout=[Typeout,"E"];
-MO=[MO,PortName(i)];
+Typeout=[[Typeout],["E"]];
+MO=[[MO],[PortName(i)]];
 }
 if (P(i,3)==-2) {
-Typeout=[Typeout,"I"];
-MO=[MO,PortName(i)];
+Typeout=[[Typeout],["I"]];
+MO=[[MO],[PortName(i)]];
 }
 }
 model=scicos_model();
diff --git a/js/Electrical/CVS.js b/js/Electrical/CVS.js
index 5b862fbb..de2c5078 100644
--- a/js/Electrical/CVS.js
+++ b/js/Electrical/CVS.js
@@ -9,24 +9,24 @@ Typein=[];
 Typeout=[];
 MI=[];
 MO=[];
-P=[2,50,1,0,70,98,2,0,70,2,-2,0];
-PortName=["vin","p","n"];
+P=[[2,50,1,0],[70,98,2,0],[70,2,-2,0]];
+PortName=[["vin"],["p"],["n"]];
 for (i=1;i<=size(P,"r");i+=1) {
 if (P(i,3)==1) {
-Typein=[Typein,"E"];
-MI=[MI,PortName(i)];
+Typein=[[Typein],["E"]];
+MI=[[MI],[PortName(i)]];
 }
 if (P(i,3)==2) {
-Typein=[Typein,"I"];
-MI=[MI,PortName(i)];
+Typein=[[Typein],["I"]];
+MI=[[MI],[PortName(i)]];
 }
 if (P(i,3)==-1) {
-Typeout=[Typeout,"E"];
-MO=[MO,PortName(i)];
+Typeout=[[Typeout],["E"]];
+MO=[[MO],[PortName(i)]];
 }
 if (P(i,3)==-2) {
-Typeout=[Typeout,"I"];
-MO=[MO,PortName(i)];
+Typeout=[[Typeout],["I"]];
+MO=[[MO],[PortName(i)]];
 }
 }
 model=scicos_model();
diff --git a/js/Electrical/Capacitor.js b/js/Electrical/Capacitor.js
index 3e23f8b1..775bd0fe 100644
--- a/js/Electrical/Capacitor.js
+++ b/js/Electrical/Capacitor.js
@@ -4,7 +4,7 @@ Capacitor.prototype.define = function Capacitor() {
 model=scicos_model();
 C=0.01;
 v=0;
-model.rpar=[C,v];
+model.rpar=[[C],[v]];
 model.sim="Capacitor";
 model.blocktype="c";
 model.dep_ut=[true,false];
@@ -16,7 +16,7 @@ mo.parameters=list(["C","v"],list(C,v),[0,1]);
 model.equations=mo;
 model.in1=ones(size(mo.inputs,"*"),1);
 model.out=ones(size(mo.outputs,"*"),1);
-exprs=string([C,v]);
+exprs=string([[C],[v]]);
 gr_i=[];
 x=standard_define([2,1.1],model,exprs,list(gr_i,0));
 x.graphics.in_implicit=["I"];
@@ -32,7 +32,7 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,C,v,exprs]=scicos_getvalue("Set Capacitor block parameter",["C (F)","Initial Voltage"],list("vec",1,"vec",1),exprs);
+[ok,C,v,exprs]=scicos_getvalue("Set Capacitor block parameter",[["C (F)"],["Initial Voltage"]],list("vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/Electrical/CurrentSensor.js b/js/Electrical/CurrentSensor.js
index f79a353f..83e2e4ba 100644
--- a/js/Electrical/CurrentSensor.js
+++ b/js/Electrical/CurrentSensor.js
@@ -3,20 +3,20 @@ function CurrentSensor() {
 CurrentSensor.prototype.define = function CurrentSensor() {
 model=scicos_model();
 model.in1=1;
-model.out=[1,1];
+model.out=[[1],[1]];
 model.sim="CurrentSensor";
 model.blocktype="c";
 model.dep_ut=[true,false];
 mo=modelica();
 mo.model="CurrentSensor";
 mo.inputs="p";
-mo.outputs=["n","i"];
+mo.outputs=[["n"],["i"]];
 model.equations=mo;
 exprs=[];
 gr_i=[];
 x=standard_define([2,2],model,exprs,list(gr_i,0));
 x.graphics.in_implicit=["I"];
-x.graphics.out_implicit=["I","E"];
+x.graphics.out_implicit=[["I"],["E"]];
 }
 CurrentSensor.prototype.details = function CurrentSensor() {
 }
diff --git a/js/Electrical/Diode.js b/js/Electrical/Diode.js
index dd73689d..8e7f6ea4 100644
--- a/js/Electrical/Diode.js
+++ b/js/Electrical/Diode.js
@@ -6,7 +6,7 @@ Vt=0.04;
 Maxexp=15;
 R=1.e8;
 model=scicos_model();
-model.rpar=[Ids,Vt,Maxexp,R];
+model.rpar=[[Ids],[Vt],[Maxexp],[R]];
 model.in1=1;
 model.out=1;
 model.sim="Diode";
@@ -18,7 +18,7 @@ mo.inputs="p";
 mo.outputs="n";
 mo.parameters=list(["Ids","Vt","Maxexp","R"],list(Ids,Vt,Maxexp,R));
 model.equations=mo;
-exprs=string([Ids,Vt,Maxexp,R]);
+exprs=string([[Ids],[Vt],[Maxexp],[R]]);
 gr_i=[];
 x=standard_define([2,1],model,exprs,list(gr_i,0));
 x.graphics.in_implicit=["I"];
@@ -34,11 +34,11 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,Ids,Vt,Maxexp,R,exprs]=scicos_getvalue("Set Diode block parameter",["Saturation cuurent (A)","Voltage equivalent to temperature (Volt)","Max exponent for linear continuation","R (ohm)"],list("vec",1,"vec",1,"vec",1,"vec",1),exprs);
+[ok,Ids,Vt,Maxexp,R,exprs]=scicos_getvalue("Set Diode block parameter",[["Saturation cuurent (A)"],["Voltage equivalent to temperature (Volt)"],["Max exponent for linear continuation"],["R (ohm)"]],list("vec",1,"vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
-model.rpar=[Ids,Vt,Maxexp,R];
+model.rpar=[[Ids],[Vt],[Maxexp],[R]];
 model.equations.parameters=list(["Ids","Vt","Maxexp","R"],list(Ids,Vt,Maxexp,R));
 graphics.exprs=exprs;
 x.graphics=graphics;
diff --git a/js/Electrical/Gyrator.js b/js/Electrical/Gyrator.js
index 9e7f3ddb..45b037fd 100644
--- a/js/Electrical/Gyrator.js
+++ b/js/Electrical/Gyrator.js
@@ -2,31 +2,31 @@
 function Gyrator() {
 Gyrator.prototype.define = function Gyrator() {
 ModelName="Gyrator";
-PrametersValue=[1,1];
-ParametersName=["G1","G2"];
+PrametersValue=[[1],[1]];
+ParametersName=[["G1"],["G2"]];
 model=scicos_model();
 Typein=[];
 Typeout=[];
 MI=[];
 MO=[];
-P=[2.5,90,2,0,2.5,10,2,0,97.5,90,-2,0,97.5,10,-2,0];
-PortName=["p1","n1","p2","n2"];
+P=[[2.5,90,2,0],[2.5,10,2,0],[97.5,90,-2,0],[97.5,10,-2,0]];
+PortName=[["p1"],["n1"],["p2"],["n2"]];
 for (i=1;i<=size(P,"r");i+=1) {
 if (P(i,3)==1) {
-Typein=[Typein,"E"];
-MI=[MI,PortName(i)];
+Typein=[[Typein],["E"]];
+MI=[[MI],[PortName(i)]];
 }
 if (P(i,3)==2) {
-Typein=[Typein,"I"];
-MI=[MI,PortName(i)];
+Typein=[[Typein],["I"]];
+MI=[[MI],[PortName(i)]];
 }
 if (P(i,3)==-1) {
-Typeout=[Typeout,"E"];
-MO=[MO,PortName(i)];
+Typeout=[[Typeout],["E"]];
+MO=[[MO],[PortName(i)]];
 }
 if (P(i,3)==-2) {
-Typeout=[Typeout,"I"];
-MO=[MO,PortName(i)];
+Typeout=[[Typeout],["I"]];
+MO=[[MO],[PortName(i)]];
 }
 }
 model=scicos_model();
@@ -36,7 +36,7 @@ mo.inputs=MI;
 mo.outputs=MO;
 model.rpar=PrametersValue;
 mo.parameters=list(ParametersName,PrametersValue,zeros(ParametersName));
-exprs=["1","1"];
+exprs=[["1"],["1"]];
 gr_i=[];
 model.blocktype="c";
 model.dep_ut=[false,true];
@@ -60,7 +60,7 @@ model=arg1.model;
 x=arg1;
 exprs=x.graphics.exprs;
 while (true) {
-[ok,G1,G2,exprs]=scicos_getvalue(["Set Gyrator block parameters:","","G1: Gyration conductance","G2: Gyration conductance"],["G1","G2"],list("vec",1,"vec",1),exprs);
+[ok,G1,G2,exprs]=scicos_getvalue([["Set Gyrator block parameters:"],[""],["G1: Gyration conductance"],["G2: Gyration conductance"]],[["G1"],["G2"]],list("vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/Electrical/IdealTransformer.js b/js/Electrical/IdealTransformer.js
index 6d63b96f..9682b5df 100644
--- a/js/Electrical/IdealTransformer.js
+++ b/js/Electrical/IdealTransformer.js
@@ -9,24 +9,24 @@ Typein=[];
 Typeout=[];
 MI=[];
 MO=[];
-P=[2.5,90,2,0,2.5,10,2,0,97.5,90,-2,0,97.5,10,-2,0];
-PortName=["p1","n1","p2","n2"];
+P=[[2.5,90,2,0],[2.5,10,2,0],[97.5,90,-2,0],[97.5,10,-2,0]];
+PortName=[["p1"],["n1"],["p2"],["n2"]];
 for (i=1;i<=size(P,"r");i+=1) {
 if (P(i,3)==1) {
-Typein=[Typein,"E"];
-MI=[MI,PortName(i)];
+Typein=[[Typein],["E"]];
+MI=[[MI],[PortName(i)]];
 }
 if (P(i,3)==2) {
-Typein=[Typein,"I"];
-MI=[MI,PortName(i)];
+Typein=[[Typein],["I"]];
+MI=[[MI],[PortName(i)]];
 }
 if (P(i,3)==-1) {
-Typeout=[Typeout,"E"];
-MO=[MO,PortName(i)];
+Typeout=[[Typeout],["E"]];
+MO=[[MO],[PortName(i)]];
 }
 if (P(i,3)==-2) {
-Typeout=[Typeout,"I"];
-MO=[MO,PortName(i)];
+Typeout=[[Typeout],["I"]];
+MO=[[MO],[PortName(i)]];
 }
 }
 model=scicos_model();
@@ -60,7 +60,7 @@ model=arg1.model;
 x=arg1;
 exprs=x.graphics.exprs;
 while (true) {
-[ok,N,exprs]=scicos_getvalue(["Set Transformer block parameters:","","N:"+" Turn ratio (N1/N2)"],["N"],list("vec",1),exprs);
+[ok,N,exprs]=scicos_getvalue([["Set Transformer block parameters:"],[""],["N:"+" Turn ratio (N1/N2)"]],["N"],list("vec",1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/Electrical/MOTOR.js b/js/Electrical/MOTOR.js
index 7ffefd65..9302de75 100644
--- a/js/Electrical/MOTOR.js
+++ b/js/Electrical/MOTOR.js
@@ -2,7 +2,7 @@
 function MOTOR() {
 MOTOR.prototype.define = function MOTOR() {
 model=scicos_model();
-model.out=[1,1];
+model.out=[[1],[1]];
 model.in1=[1];
 model.sim="motor";
 model.blocktype="c";
@@ -10,7 +10,7 @@ model.dep_ut=[true,false];
 gr_i=[];
 exprs="";
 x=standard_define([2,2],model,exprs,gr_i);
-x.graphics.out_implicit=["I","I"];
+x.graphics.out_implicit=[["I"],["I"]];
 x.graphics.in_implicit=["I"];
 }
 MOTOR.prototype.details = function MOTOR() {
diff --git a/js/Electrical/NMOS.js b/js/Electrical/NMOS.js
index ce995a8d..0d2b3585 100644
--- a/js/Electrical/NMOS.js
+++ b/js/Electrical/NMOS.js
@@ -16,17 +16,17 @@ model.blocktype="c";
 model.dep_ut=[true,false];
 mo=modelica();
 mo.model="NMOS";
-mo.outputs=["D","B","S"];
+mo.outputs=[["D"],["B"],["S"]];
 mo.inputs="G";
-mo.parameters=list(["W","L","Beta","Vt","K2","K5","dW","dL","RDS"],[W,L,Beta,Vt,K2,K5,dW,dL,RDS]);
+mo.parameters=list([["W"],["L"],["Beta"],["Vt"],["K2"],["K5"],["dW"],["dL"],["RDS"]],[[W],[L],[Beta],[Vt],[K2],[K5],[dW],[dL],[RDS]]);
 model.equations=mo;
 model.in1=ones(size(mo.inputs,"*"),1);
 model.out=ones(size(mo.outputs,"*"),1);
-exprs=[string(W),string(L),string(Beta),string(Vt),string(K2),string(K5),string(dW),string(dL),string(RDS)];
+exprs=[[string(W)],[string(L)],[string(Beta)],[string(Vt)],[string(K2)],[string(K5)],[string(dW)],[string(dL)],[string(RDS)]];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 x.graphics.in_implicit=["I"];
-x.graphics.out_implicit=["I","I","I"];
+x.graphics.out_implicit=[["I"],["I"],["I"]];
 }
 NMOS.prototype.details = function NMOS() {
 }
@@ -38,7 +38,7 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,W,L,Beta,Vt,K2,K5,dW,dL,RDS,exprs]=scicos_getvalue("Set NMOS Transistor block parameters",["Width [m]","Length [m]","Transconductance parameter [A/(V*V)]","Zero bias threshold voltage [V]","Bulk threshold parameter","Reduction of pinch-off region","Narrowing of channel [m]","Shortening of channel [m]","Drain-Source-Resistance [Ohm]"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
+[ok,W,L,Beta,Vt,K2,K5,dW,dL,RDS,exprs]=scicos_getvalue("Set NMOS Transistor block parameters",[["Width [m]"],["Length [m]"],["Transconductance parameter [A/(V*V)]"],["Zero bias threshold voltage [V]"],["Bulk threshold parameter"],["Reduction of pinch-off region"],["Narrowing of channel [m]"],["Shortening of channel [m]"],["Drain-Source-Resistance [Ohm]"]],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/Electrical/NPN.js b/js/Electrical/NPN.js
index 33a7aad7..812d8e6f 100644
--- a/js/Electrical/NPN.js
+++ b/js/Electrical/NPN.js
@@ -2,31 +2,31 @@
 function NPN() {
 NPN.prototype.define = function NPN() {
 ModelName="NPN";
-PrametersValue=[50,0.1,0,0.02,1.200e-10,5.000e-09,1.000e-12,4.000e-13,5.000e-13,0.8,0.4,0.8,0.333,1.000e-15,1.000e-15,0.02585,40];
-ParametersName=["Bf","Br","Is","Vak","Tauf","Taur","Ccs","Cje","Cjc","Phie","Me","Phic","Mc","Gbc","Gbe","Vt","EMinMax"];
+PrametersValue=[[50],[0.1],[0],[0.02],[1.200e-10],[5.000e-09],[1.000e-12],[4.000e-13],[5.000e-13],[0.8],[0.4],[0.8],[0.333],[1.000e-15],[1.000e-15],[0.02585],[40]];
+ParametersName=[["Bf"],["Br"],["Is"],["Vak"],["Tauf"],["Taur"],["Ccs"],["Cje"],["Cjc"],["Phie"],["Me"],["Phic"],["Mc"],["Gbc"],["Gbe"],["Vt"],["EMinMax"]];
 model=scicos_model();
 Typein=[];
 Typeout=[];
 MI=[];
 MO=[];
-P=[100,90,-2,0,0,50,2,0,100,10,-2,0];
-PortName=["C","B","E"];
+P=[[100,90,-2,0],[0,50,2,0],[100,10,-2,0]];
+PortName=[["C"],["B"],["E"]];
 for (i=1;i<=size(P,"r");i+=1) {
 if (P(i,3)==1) {
-Typein=[Typein,"E"];
-MI=[MI,PortName(i)];
+Typein=[[Typein],["E"]];
+MI=[[MI],[PortName(i)]];
 }
 if (P(i,3)==2) {
-Typein=[Typein,"I"];
-MI=[MI,PortName(i)];
+Typein=[[Typein],["I"]];
+MI=[[MI],[PortName(i)]];
 }
 if (P(i,3)==-1) {
-Typeout=[Typeout,"E"];
-MO=[MO,PortName(i)];
+Typeout=[[Typeout],["E"]];
+MO=[[MO],[PortName(i)]];
 }
 if (P(i,3)==-2) {
-Typeout=[Typeout,"I"];
-MO=[MO,PortName(i)];
+Typeout=[[Typeout],["I"]];
+MO=[[MO],[PortName(i)]];
 }
 }
 model=scicos_model();
@@ -36,7 +36,7 @@ mo.inputs=MI;
 mo.outputs=MO;
 model.rpar=PrametersValue;
 mo.parameters=list(ParametersName,PrametersValue,zeros(ParametersName));
-exprs=["50","0.1","1.e-16","0.02","0.12e-9","5e-9","1e-12","0.4e-12","0.5e-12","0.8","0.4","0.8","0.333","1e-15","1e-15","0.02585","40"];
+exprs=[["50"],["0.1"],["1.e-16"],["0.02"],["0.12e-9"],["5e-9"],["1e-12"],["0.4e-12"],["0.5e-12"],["0.8"],["0.4"],["0.8"],["0.333"],["1e-15"],["1e-15"],["0.02585"],["40"]];
 gr_i=[];
 model.blocktype="c";
 model.dep_ut=[false,true];
@@ -60,7 +60,7 @@ model=arg1.model;
 x=arg1;
 exprs=x.graphics.exprs;
 while (true) {
-[ok,Bf,Br,Is,Vak,Tauf,Taur,Ccs,Cje,Cjc,Phie,Me,Phic,Mc,Gbc,Gbe,Vt,EMinMax,exprs]=scicos_getvalue(["Set NPN block parameters:",""],["Bf  : Forward beta","Br  : Reverse beta","Is  : Transport saturation current","Vak : Early voltage (inverse), 1/Volt","Tauf: Ideal forward transit time","Taur: Ideal reverse transit time","Ccs : Collector-substrat(ground) cap.","Cje : Base-emitter zero bias depletion cap.","Cjc : Base-coll. zero bias depletion cap.","Phie: Base-emitter diffusion voltage","Me  : Base-emitter gradation exponent","Phic: Base-collector diffusion voltage","Mc  : Base-collector gradation exponent","Gbc : Base-collector conductance","Gbe : Base-emitter conductance","Vt  : Voltage equivalent of temperature","EMinmax: if x > EMinMax, the exp(x) is linearized"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
+[ok,Bf,Br,Is,Vak,Tauf,Taur,Ccs,Cje,Cjc,Phie,Me,Phic,Mc,Gbc,Gbe,Vt,EMinMax,exprs]=scicos_getvalue([["Set NPN block parameters:"],[""]],[["Bf  : Forward beta"],["Br  : Reverse beta"],["Is  : Transport saturation current"],["Vak : Early voltage (inverse), 1/Volt"],["Tauf: Ideal forward transit time"],["Taur: Ideal reverse transit time"],["Ccs : Collector-substrat(ground) cap."],["Cje : Base-emitter zero bias depletion cap."],["Cjc : Base-coll. zero bias depletion cap."],["Phie: Base-emitter diffusion voltage"],["Me  : Base-emitter gradation exponent"],["Phic: Base-collector diffusion voltage"],["Mc  : Base-collector gradation exponent"],["Gbc : Base-collector conductance"],["Gbe : Base-emitter conductance"],["Vt  : Voltage equivalent of temperature"],["EMinmax: if x > EMinMax, the exp(x) is linearized"]],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/Electrical/OpAmp.js b/js/Electrical/OpAmp.js
index d4396040..0dabe285 100644
--- a/js/Electrical/OpAmp.js
+++ b/js/Electrical/OpAmp.js
@@ -9,7 +9,7 @@ model.blocktype="c";
 model.dep_ut=[true,false];
 mo=modelica();
 mo.model=model.sim;
-mo.inputs=["in_p","in_n"];
+mo.inputs=[["in_p"],["in_n"]];
 mo.outputs=["out"];
 mo.parameters=list(S,Z);
 model.equations=mo;
@@ -19,7 +19,7 @@ model.rpar=Z;
 exprs=string(Z);
 gr_i=[];
 x=standard_define([3,5],model,exprs,gr_i);
-x.graphics.in_implicit=["I","I"];
+x.graphics.in_implicit=[["I"],["I"]];
 x.graphics.out_implicit=["I"];
 }
 OpAmp.prototype.details = function OpAmp() {
@@ -32,7 +32,7 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (false) {
-[ok,OLGain,SatH,SatL,exprs]=scicos_getvalue("Set the Operational Amplifier parameters",["Open Loop Gain","Positive saturation voltage","Negative saturation voltage"],list("vec",1,"vec",1,"vec",1),exprs);
+[ok,OLGain,SatH,SatL,exprs]=scicos_getvalue("Set the Operational Amplifier parameters",[["Open Loop Gain"],["Positive saturation voltage"],["Negative saturation voltage"]],list("vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/Electrical/PMOS.js b/js/Electrical/PMOS.js
index a34157b8..cb152d79 100644
--- a/js/Electrical/PMOS.js
+++ b/js/Electrical/PMOS.js
@@ -16,17 +16,17 @@ model.blocktype="c";
 model.dep_ut=[true,false];
 mo=modelica();
 mo.model="PMOS";
-mo.outputs=["D","B","S"];
+mo.outputs=[["D"],["B"],["S"]];
 mo.inputs="G";
-mo.parameters=list(["W","L","Beta","Vt","K2","K5","dW","dL","RDS"],[W,L,Beta,Vt,K2,K5,dW,dL,RDS]);
+mo.parameters=list([["W"],["L"],["Beta"],["Vt"],["K2"],["K5"],["dW"],["dL"],["RDS"]],[[W],[L],[Beta],[Vt],[K2],[K5],[dW],[dL],[RDS]]);
 model.equations=mo;
 model.in1=ones(size(mo.inputs,"*"),1);
 model.out=ones(size(mo.outputs,"*"),1);
-exprs=[string(W),string(L),string(Beta),string(Vt),string(K2),string(K5),string(dW),string(dL),string(RDS)];
+exprs=[[string(W)],[string(L)],[string(Beta)],[string(Vt)],[string(K2)],[string(K5)],[string(dW)],[string(dL)],[string(RDS)]];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 x.graphics.in_implicit=["I"];
-x.graphics.out_implicit=["I","I","I"];
+x.graphics.out_implicit=[["I"],["I"],["I"]];
 }
 PMOS.prototype.details = function PMOS() {
 }
@@ -38,7 +38,7 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,W,L,Beta,Vt,K2,K5,dW,dL,RDS,exprs]=scicos_getvalue("Set PMOS Transistor parameters",["Width [m]","Length [m]","Transconductance parameter [A/(V*V)]","Zero bias threshold voltage [V]","Bulk threshold parameter","Reduction of pinch-off region","Narrowing of channel [m]","Shortening of channel [m]","Drain-Source-Resistance [Ohm]"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
+[ok,W,L,Beta,Vt,K2,K5,dW,dL,RDS,exprs]=scicos_getvalue("Set PMOS Transistor parameters",[["Width [m]"],["Length [m]"],["Transconductance parameter [A/(V*V)]"],["Zero bias threshold voltage [V]"],["Bulk threshold parameter"],["Reduction of pinch-off region"],["Narrowing of channel [m]"],["Shortening of channel [m]"],["Drain-Source-Resistance [Ohm]"]],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/Electrical/PNP.js b/js/Electrical/PNP.js
index e6cc470a..58a7978c 100644
--- a/js/Electrical/PNP.js
+++ b/js/Electrical/PNP.js
@@ -2,31 +2,31 @@
 function PNP() {
 PNP.prototype.define = function PNP() {
 ModelName="PNP";
-PrametersValue=[50,0.1,0,0.02,1.200e-10,5.000e-09,1.000e-12,4.000e-13,5.000e-13,0.8,0.4,0.8,0.333,1.000e-15,1.000e-15,0.02585,40];
-ParametersName=["Bf","Br","Is","Vak","Tauf","Taur","Ccs","Cje","Cjc","Phie","Me","Phic","Mc","Gbc","Gbe","Vt","EMinMax"];
+PrametersValue=[[50],[0.1],[0],[0.02],[1.200e-10],[5.000e-09],[1.000e-12],[4.000e-13],[5.000e-13],[0.8],[0.4],[0.8],[0.333],[1.000e-15],[1.000e-15],[0.02585],[40]];
+ParametersName=[["Bf"],["Br"],["Is"],["Vak"],["Tauf"],["Taur"],["Ccs"],["Cje"],["Cjc"],["Phie"],["Me"],["Phic"],["Mc"],["Gbc"],["Gbe"],["Vt"],["EMinMax"]];
 model=scicos_model();
 Typein=[];
 Typeout=[];
 MI=[];
 MO=[];
-P=[100,90,-2,0,0,50,2,0,100,10,-2,0];
-PortName=["C","B","E"];
+P=[[100,90,-2,0],[0,50,2,0],[100,10,-2,0]];
+PortName=[["C"],["B"],["E"]];
 for (i=1;i<=size(P,"r");i+=1) {
 if (P(i,3)==1) {
-Typein=[Typein,"E"];
-MI=[MI,PortName(i)];
+Typein=[[Typein],["E"]];
+MI=[[MI],[PortName(i)]];
 }
 if (P(i,3)==2) {
-Typein=[Typein,"I"];
-MI=[MI,PortName(i)];
+Typein=[[Typein],["I"]];
+MI=[[MI],[PortName(i)]];
 }
 if (P(i,3)==-1) {
-Typeout=[Typeout,"E"];
-MO=[MO,PortName(i)];
+Typeout=[[Typeout],["E"]];
+MO=[[MO],[PortName(i)]];
 }
 if (P(i,3)==-2) {
-Typeout=[Typeout,"I"];
-MO=[MO,PortName(i)];
+Typeout=[[Typeout],["I"]];
+MO=[[MO],[PortName(i)]];
 }
 }
 model=scicos_model();
@@ -36,7 +36,7 @@ mo.inputs=MI;
 mo.outputs=MO;
 model.rpar=PrametersValue;
 mo.parameters=list(ParametersName,PrametersValue,zeros(ParametersName));
-exprs=["50","0.1","1.e-16","0.02","0.12e-9","5e-9","1e-12","0.4e-12","0.5e-12","0.8","0.4","0.8","0.333","1e-15","1e-15","0.02585","40"];
+exprs=[["50"],["0.1"],["1.e-16"],["0.02"],["0.12e-9"],["5e-9"],["1e-12"],["0.4e-12"],["0.5e-12"],["0.8"],["0.4"],["0.8"],["0.333"],["1e-15"],["1e-15"],["0.02585"],["40"]];
 gr_i=[];
 model.blocktype="c";
 model.dep_ut=[false,true];
@@ -60,7 +60,7 @@ model=arg1.model;
 x=arg1;
 exprs=x.graphics.exprs;
 while (true) {
-[ok,Bf,Br,Is,Vak,Tauf,Taur,Ccs,Cje,Cjc,Phie,Me,Phic,Mc,Gbc,Gbe,Vt,EMinMax,exprs]=scicos_getvalue(["Set PNP block parameters:",""],["Bf  : Forward beta","Br  : Reverse beta","Is  : Transport saturation current","Vak : Early voltage (inverse), 1/Volt","Tauf: Ideal forward transit time","Taur: Ideal reverse transit time","Ccs : Collector-substrat(ground) cap.","Cje : Base-emitter zero bias depletion cap.","Cjc : Base-coll. zero bias depletion cap.","Phie: Base-emitter diffusion voltage","Me  : Base-emitter gradation exponent","Phic: Base-collector diffusion voltage","Mc  : Base-collector gradation exponent","Gbc : Base-collector conductance","Gbe : Base-emitter conductance","Vt  : Voltage equivalent of temperature","EMinMax: if x > EMinMax, the exp(x) function is linearized"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
+[ok,Bf,Br,Is,Vak,Tauf,Taur,Ccs,Cje,Cjc,Phie,Me,Phic,Mc,Gbc,Gbe,Vt,EMinMax,exprs]=scicos_getvalue([["Set PNP block parameters:"],[""]],[["Bf  : Forward beta"],["Br  : Reverse beta"],["Is  : Transport saturation current"],["Vak : Early voltage (inverse), 1/Volt"],["Tauf: Ideal forward transit time"],["Taur: Ideal reverse transit time"],["Ccs : Collector-substrat(ground) cap."],["Cje : Base-emitter zero bias depletion cap."],["Cjc : Base-coll. zero bias depletion cap."],["Phie: Base-emitter diffusion voltage"],["Me  : Base-emitter gradation exponent"],["Phic: Base-collector diffusion voltage"],["Mc  : Base-collector gradation exponent"],["Gbc : Base-collector conductance"],["Gbe : Base-emitter conductance"],["Vt  : Voltage equivalent of temperature"],["EMinMax: if x > EMinMax, the exp(x) function is linearized"]],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/Electrical/SineVoltage.js b/js/Electrical/SineVoltage.js
index 69eac4c9..d25df493 100644
--- a/js/Electrical/SineVoltage.js
+++ b/js/Electrical/SineVoltage.js
@@ -9,7 +9,7 @@ ph=0;
 frq=1;
 offset=0;
 start=0;
-model.rpar=[V,ph,frq,offset,start];
+model.rpar=[[V],[ph],[frq],[offset],[start]];
 model.sim="SineVoltage";
 model.blocktype="c";
 model.dep_ut=[true,false];
@@ -17,9 +17,9 @@ mo=modelica();
 mo.model="SineVoltage";
 mo.inputs="p";
 mo.outputs="n";
-mo.parameters=list(["V","phase","freqHz","offset","startTime"],list(V,ph,frq,offset,start));
+mo.parameters=list([["V"],["phase"],["freqHz"],["offset"],["startTime"]],list(V,ph,frq,offset,start));
 model.equations=mo;
-exprs=[string(V),string(ph),string(frq),string(offset),string(start)];
+exprs=[[string(V)],[string(ph)],[string(frq)],[string(offset)],[string(start)]];
 gr_i=[];
 x=standard_define([2,2],model,exprs,gr_i);
 x.graphics.in_implicit=["I"];
@@ -35,11 +35,11 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,V,ph,frq,offset,start,exprs]=scicos_getvalue("Set voltage source parameter",["Amplitude (Volt)","phase (rad)","Frequency (Hz)","Voltageoffset (V)","Timeoffset (s)"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
+[ok,V,ph,frq,offset,start,exprs]=scicos_getvalue("Set voltage source parameter",[["Amplitude (Volt)"],["phase (rad)"],["Frequency (Hz)"],["Voltageoffset (V)"],["Timeoffset (s)"]],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
-model.rpar=[V,ph,frq,offset,start];
+model.rpar=[[V],[ph],[frq],[offset],[start]];
 model.equations.parameters[2-1]=list(V,ph,frq,offset,start);
 graphics.exprs=exprs;
 x.graphics=graphics;
diff --git a/js/Electrical/Switch.js b/js/Electrical/Switch.js
index 2f59eb1b..bcb3ab7a 100644
--- a/js/Electrical/Switch.js
+++ b/js/Electrical/Switch.js
@@ -4,14 +4,14 @@ Switch.prototype.define = function Switch() {
 model=scicos_model();
 Ron=0.01;
 Roff=1e5;
-S=["Ron","Roff"];
+S=[["Ron"],["Roff"]];
 Z=eval(S);
 model.sim="Switch";
 model.blocktype="c";
 model.dep_ut=[true,false];
 mo=modelica();
 mo.model=model.sim;
-mo.inputs=["p","inp"];
+mo.inputs=[["p"],["inp"]];
 mo.outputs="n";
 mo.parameters=list(S,Z);
 model.equations=mo;
@@ -21,7 +21,7 @@ model.rpar=Z;
 exprs=string(Z);
 gr_i=[];
 x=standard_define([2,2],model,exprs,list(gr_i,0));
-x.graphics.in_implicit=["I","E"];
+x.graphics.in_implicit=[["I"],["E"]];
 x.graphics.out_implicit=["I"];
 }
 Switch.prototype.details = function Switch() {
@@ -34,7 +34,7 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,Ron,Roff,exprs]=scicos_getvalue("Set non-ideal electrical switch parameters",["Resistance in On state (Ohm)","Resistance in Off state (Ohm)"],list("vec",1,"vec",1),exprs);
+[ok,Ron,Roff,exprs]=scicos_getvalue("Set non-ideal electrical switch parameters",[["Resistance in On state (Ohm)"],["Resistance in Off state (Ohm)"]],list("vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/Electrical/VVsourceAC.js b/js/Electrical/VVsourceAC.js
index 975f0d27..78e04caa 100644
--- a/js/Electrical/VVsourceAC.js
+++ b/js/Electrical/VVsourceAC.js
@@ -2,7 +2,7 @@
 function VVsourceAC() {
 VVsourceAC.prototype.define = function VVsourceAC() {
 model=scicos_model();
-model.in1=[1,1];
+model.in1=[[1],[1]];
 model.out=[1];
 VA=220;
 FR=50;
diff --git a/js/Electrical/VoltageSensor.js b/js/Electrical/VoltageSensor.js
index 8119bdf3..a016ca91 100644
--- a/js/Electrical/VoltageSensor.js
+++ b/js/Electrical/VoltageSensor.js
@@ -3,20 +3,20 @@ function VoltageSensor() {
 VoltageSensor.prototype.define = function VoltageSensor() {
 model=scicos_model();
 model.in1=1;
-model.out=[1,1];
+model.out=[[1],[1]];
 model.sim="VoltageSensor";
 model.blocktype="c";
 model.dep_ut=[true,false];
 mo=modelica();
 mo.model="VoltageSensor";
 mo.inputs="p";
-mo.outputs=["n","v"];
+mo.outputs=[["n"],["v"]];
 model.equations=mo;
 exprs=[];
 gr_i=[];
 x=standard_define([2,2],model,exprs,list(gr_i,0));
 x.graphics.in_implicit=["I"];
-x.graphics.out_implicit=["I","E"];
+x.graphics.out_implicit=[["I"],["E"]];
 }
 VoltageSensor.prototype.details = function VoltageSensor() {
 }
diff --git a/js/Electrical/VsourceAC.js b/js/Electrical/VsourceAC.js
index ff1dad5b..7281c7e5 100644
--- a/js/Electrical/VsourceAC.js
+++ b/js/Electrical/VsourceAC.js
@@ -6,7 +6,7 @@ model.in1=[1];
 model.out=[1];
 VA=220;
 FR=50;
-model.rpar=[VA,FR];
+model.rpar=[[VA],[FR]];
 model.sim="VsourceAC";
 model.blocktype="c";
 model.dep_ut=[true,false];
@@ -14,9 +14,9 @@ mo=modelica();
 mo.model="VsourceAC";
 mo.inputs="p";
 mo.outputs="n";
-mo.parameters=list(["VA","f"],list(VA,FR));
+mo.parameters=list([["VA"],["f"]],list(VA,FR));
 model.equations=mo;
-exprs=[string(VA),string(FR)];
+exprs=[[string(VA)],[string(FR)]];
 gr_i=[];
 x=standard_define([2,2],model,exprs,list(gr_i,0));
 x.graphics.in_implicit=["I"];
@@ -32,11 +32,11 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,VA,FR,exprs]=scicos_getvalue("Set voltage source parameter",["Amplitude (Volt)","Frequency (Hz)"],list("vec",-1,"vec",-1),exprs);
+[ok,VA,FR,exprs]=scicos_getvalue("Set voltage source parameter",[["Amplitude (Volt)"],["Frequency (Hz)"]],list("vec",-1,"vec",-1),exprs);
 if (!ok) {
 break;
 }
-model.rpar=[VA,FR];
+model.rpar=[[VA],[FR]];
 model.equations.parameters[2-1]=list(VA,FR);
 graphics.exprs=exprs;
 x.graphics=graphics;