support scicos_model call

8 files changed, 599 insertions, 16 deletions

diff --git a/js/IntegerOp/DFLIPFLOP.js b/js/IntegerOp/DFLIPFLOP.js
index 27f0aa23..a3af0686 100644
--- a/js/IntegerOp/DFLIPFLOP.js
+++ b/js/IntegerOp/DFLIPFLOP.js
@@ -1,3 +1,101 @@
-Syntax error in input LexToken(VAR,'sim',1,1916)
 /* autogenerated from "macros/IntegerOp/DFLIPFLOP.sci" */
-None
+function DFLIPFLOP() {
+DFLIPFLOP.prototype.get = function DFLIPFLOP() {
+}
+DFLIPFLOP.prototype.set = function DFLIPFLOP() {
+x=arg1;
+}
+DFLIPFLOP.prototype.define = function DFLIPFLOP() {
+scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["DFLIPFLOP"],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.objs[1-1]=scicos_block(gui="CONST_m",graphics=scicos_graphics(orig=[109.62561,263.44465],sz=[20,20],flip=true,theta=0,exprs="int8(0)",pin=[],pout=6,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("cstblk4_m",4),in1=[],in2=[],intyp=1,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8(0)),blocktype="d",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[2-1]=scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[239.98293,378.2166],sz=[60,60],flip=true,theta=0,exprs=["1","1"],pin=29,pout=[],pein=22,peout=[16,44],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in1=1,in2=1,intyp=-1,out=[],out2=[],outtyp=1,evtin=1,evtout=[1,1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[true,None],label="",nzcross=1,nmode=1,equations=list()),doc=list());
+scs_m.objs[3-1]=scicos_block(gui="LOGICAL_OP",graphics=scicos_graphics(orig=[152.88902,260.24498],sz=[60,40],flip=true,theta=0,exprs=["2","1","5","0"],pin=[11,39],pout=5,pein=[],peout=[],gr_i=[],id="",in_implicit=["E","E"],out_implicit="E"),model=scicos_model(sim=list("logicalop_i8",4),in1=[-1,-1],in2=[-2,-2],intyp=[5,5],out=-1,out2=-2,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[1,0],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[4-1]=scicos_block(gui="SAMPHOLD_m",graphics=scicos_graphics(orig=[233.72156,260.24498],sz=[40,40],flip=true,theta=0,exprs="5",pin=5,pout=33,pein=42,peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("samphold4_m",4),in1=-1,in2=-2,intyp=5,out=-1,out2=-2,outtyp=5,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[5-1]=scicos_link(xx=[221.46044,225.15013],yy=[280.24498,280.24498],id="drawlink",thick=[0,0],ct=[1,1],from=[3,1,0],to=[4,1,1]);
+scs_m.objs[6-1]=scicos_link(xx=[138.19704,140.34523],yy=[273.44465,273.49157],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[38,1,1]);
+scs_m.objs[7-1]=scicos_block(gui="LOGICAL_OP",graphics=scicos_graphics(orig=[373.24106,309.46812],sz=[60,40],flip=true,theta=0,exprs=["1","5","5","0"],pin=36,pout=13,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("logicalop_i8",4),in1=-1,in2=-2,intyp=5,out=-1,out2=-2,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[5,0],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[8-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[199.48466,398.2166],sz=[20,20],flip=true,theta=0,exprs="3",pin=[],pout=9,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=3,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[9-1]=scicos_link(xx=[219.48466,222.54128],yy=[408.2166,408.2166],id="drawlink",thick=[0,0],ct=[1,1],from=[8,1,0],to=[28,1,1]);
+scs_m.objs[10-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[104.31759,276.91165],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=11,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[11-1]=scicos_link(xx=[124.31759,144.31759],yy=[286.91165,286.91165],id="drawlink",thick=[0,0],ct=[1,1],from=[10,1,0],to=[3,1,1]);
+scs_m.objs[12-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[457.40928,320.20131],sz=[20,20],flip=true,theta=0,exprs="2",pin=13,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[13-1]=scicos_link(xx=[441.81249,457.40928],yy=[329.46812,330.20131],id="drawlink",thick=[0,0],ct=[1,1],from=[7,1,0],to=[12,1,1]);
+scs_m.objs[14-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[376.4669,270.83282],sz=[20,20],flip=true,theta=0,exprs="1",pin=37,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m_1=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title="Untitled",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="ANDLOG_f",graphics=scicos_graphics(orig=[194,133],sz=[60,60],flip=true,theta=0,exprs=[],pin=[],pout=9,pein=[4,11],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="andlog",in1=[],in2=[],intyp=1,out=1,out2=[],outtyp=1,evtin=[1,1],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m_1.objs[2-1]=scicos_block(gui="CLKIN_f",graphics=scicos_graphics(orig=[149,287],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=[],pein=[],peout=4,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=-1,dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m_1.objs[3-1]=scicos_block(gui="CLKOUT_f",graphics=scicos_graphics(orig=[450,83],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=[],pein=8,peout=[],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="output",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m_1.objs[4-1]=scicos_link(xx=[169,214,214],yy=[297,297,198.71],id="drawlink",thick=[0,0],ct=[5,-1],from=[2,1],to=[1,1]);
+scs_m_1.objs[5-1]=scicos_block(gui="CLKIN_f",graphics=scicos_graphics(orig=[141,330],sz=[20,20],flip=true,theta=0,exprs="2",pin=[],pout=[],pein=[],peout=6,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="d",firing=-1,dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m_1.objs[6-1]=scicos_link(xx=[161,234,234],yy=[340,340,275.78],id="drawlink",thick=[0,0],ct=[5,-1],from=[5,1],to=[10,1]);
+scs_m_1.objs[7-1]=scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[331,137],sz=[60,60],flip=true,theta=0,exprs=["1","1"],pin=9,pout=[],pein=12,peout=[8,0],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in1=1,in2=1,intyp=-1,out=[],out2=[],outtyp=1,evtin=1,evtout=[1,1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[true,None],label="",nzcross=1,nmode=1,equations=list()),doc=list());
+scs_m_1.objs[8-1]=scicos_link(xx=[351,351,450],yy=[131.29,93,93],id="drawlink",thick=[0,0],ct=[5,-1],from=[7,1],to=[3,1]);
+scs_m_1.objs[9-1]=scicos_link(xx=[262.57,322.43],yy=[163,167],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1],to=[7,1]);
+scs_m_1.objs[10-1]=scicos_block(gui="CLKSPLIT_f",graphics=scicos_graphics(orig=[234,275.78348],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=[],pout=[],pein=6,peout=[11,12],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="split",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[1,1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[None,None,None],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m_1.objs[11-1]=scicos_link(xx=[234,234],yy=[275.78,198.71],id="drawlink",thick=[0,0],ct=[5,-1],from=[10,1],to=[1,2]);
+scs_m_1.objs[12-1]=scicos_link(xx=[234,361,361],yy=[275.78,275.78,202.71],id="drawlink",thick=[0,0],ct=[5,-1],from=[10,2],to=[7,1]);
+scs_m.objs[15-1]=scicos_block(gui="ANDBLK",graphics=scicos_graphics(orig=[233.73039,318.74407],sz=[40,40],flip=true,theta=0,exprs=[],pin=[],pout=[],pein=[19,16],peout=17,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[1,1],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=None,dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[16-1]=scicos_link(xx=[259.98293,260.39705],yy=[372.50232,364.45835],id="drawlink",thick=[0,0],ct=[5,-1],from=[2,1,0],to=[15,2,1]);
+scs_m.objs[17-1]=scicos_link(xx=[253.73039,253.72572],yy=[313.02978,309.29537],id="drawlink",thick=[0,0],ct=[5,-1],from=[15,1,0],to=[41,1,1]);
+scs_m_1=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["EDGE_TRIGGER","./"],tol=[0.0001,0.000001,1.000e-10,100001,0,0,0],tf=30,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="EDGETRIGGER",graphics=scicos_graphics(orig=[288.58631,257.1131],sz=[60,40],flip=true,theta=0,exprs="1",pin=5,pout=3,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("edgetrig",4),in1=1,in2=[],intyp=1,out=1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=0,odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=1,nmode=0,equations=list()),doc=list());
+scs_m_1.objs[2-1]=scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[388.28869,247.1131],sz=[60,60],flip=true,theta=0,exprs=["0","0"],pin=3,pout=[],pein=[],peout=[7,0],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in1=1,in2=[],intyp=1,out=[],out2=1,outtyp=[],evtin=[],evtout=[1,1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m_1.objs[3-1]=scicos_link(xx=[357.15774,362.99107,379.71726],yy=[277.1131,277.1131,277.1131],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[2,1,1]);
+scs_m_1.objs[4-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[240.01488,267.1131],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=5,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=-1,out=-1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m_1.objs[5-1]=scicos_link(xx=[260.01488,280.01488],yy=[277.1131,277.1131],id="drawlink",thick=[0,0],ct=[1,1],from=[4,1,0],to=[1,1,1]);
+scs_m_1.objs[6-1]=scicos_block(gui="CLKOUTV_f",graphics=scicos_graphics(orig=[398.28869,181.39881],sz=[20,30],flip=true,theta=0,exprs="1",pin=[],pout=[],pein=7,peout=[],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="output",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m_1.objs[7-1]=scicos_link(xx=[408.28869,408.28869],yy=[241.39881,211.39881],id="drawlink",thick=[0,0],ct=[5,-1],from=[2,1,0],to=[6,1,1]);
+scs_m.objs[18-1]=scicos_block(gui="EDGE_TRIGGER",graphics=scicos_graphics(orig=[133.90637,385.342],sz=[60,40],flip=true,theta=0,exprs=[],pin=26,pout=[],pein=[],peout=19,gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="csuper",in1=-1,in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[19-1]=scicos_link(xx=[163.90637,163.90637,247.06372],yy=[379.62771,364.45835,364.45835],id="drawlink",thick=[0,0],ct=[5,-1],from=[18,1,0],to=[15,1,1]);
+scs_m.objs[20-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[79.594811,395.47647],sz=[20,20],flip=true,theta=0,exprs="2",pin=[],pout=23,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m_1=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["Extract_Activation","./"],tol=[0.0001,0.000001,1.000e-10,100001,0,0,0],tf=30,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="IFTHEL_f",graphics=scicos_graphics(orig=[150.65045,143.82208],sz=[60,60],flip=true,theta=0,exprs=["0","0"],pin=6,pout=[],pein=[],peout=[3,4],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in1=1,in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=[1,1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m_1.objs[2-1]=scicos_block(gui="CLKSOMV_f",graphics=scicos_graphics(orig=[169.82143,96.146231],sz=[16.666667,16.666667],flip=true,theta=0,exprs=[],pin=[],pout=[],pein=[3,4,0],peout=8,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="sum",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[1,1,1],evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=-1,dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m_1.objs[3-1]=scicos_link(xx=[170.65045,170.65045,150.04302,150.04302,169.82143],yy=[138.10779,128.235,128.235,104.47956,104.47956],id="drawlink",thick=[0,0],ct=[5,-1],from=[1,1,0],to=[2,1,1]);
+scs_m_1.objs[4-1]=scicos_link(xx=[190.65045,190.65045,178.15476],yy=[138.10779,111.55729,112.8129],id="drawlink",thick=[0,0],ct=[5,-1],from=[1,2,0],to=[2,2,1]);
+scs_m_1.objs[5-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[102.07902,163.82208],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=6,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=-1,out=-1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m_1.objs[6-1]=scicos_link(xx=[122.07902,142.07902],yy=[173.82208,173.82208],id="drawlink",thick=[0,0],ct=[1,1],from=[5,1,0],to=[1,1,1]);
+scs_m_1.objs[7-1]=scicos_block(gui="CLKOUTV_f",graphics=scicos_graphics(orig=[168.15476,38.527183],sz=[20,30],flip=true,theta=0,exprs="1",pin=[],pout=[],pein=8,peout=[],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="output",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m_1.objs[8-1]=scicos_link(xx=[178.15476,178.15476],yy=[98.527183,68.527183],id="drawlink",thick=[0,0],ct=[5,-1],from=[2,1,0],to=[7,1,1]);
+scs_m.objs[21-1]=scicos_block(gui="Extract_Activation",graphics=scicos_graphics(orig=[239.82193,456.57677],sz=[60,40],flip=true,theta=0,exprs=[],pin=31,pout=[],pein=[],peout=22,gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="csuper",in1=-1,in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[22-1]=scicos_link(xx=[269.82193,269.98293],yy=[450.86248,443.93089],id="drawlink",thick=[0,0],ct=[5,-1],from=[21,1,0],to=[2,1,1]);
+scs_m.objs[23-1]=scicos_link(xx=[99.594811,110.25582],yy=[405.47647,405.42077],id="drawlink",thick=[0,0],ct=[1,1],from=[20,1,0],to=[25,1,1]);
+scs_m.objs[24-1]=scicos_block(gui="SUM_f",graphics=scicos_graphics(orig=[200.5252,469.13173],sz=[16.666667,16.666667],flip=true,theta=0,exprs=[],pin=[27,0,30],pout=31,pein=[],peout=[],gr_i=[],id="",in_implicit=["E","E","E"],out_implicit="E"),model=scicos_model(sim=list("plusblk",2),in1=[-1,-1,-1],in2=[],intyp=1,out=-1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[25-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[110.25582,405.42077],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=23,pout=[26,27],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[26-1]=scicos_link(xx=[110.25582,114.33667,125.33494],yy=[405.42077,405.39945,405.342],id="drawlink",thick=[0,0],ct=[1,1],from=[25,1,0],to=[18,1,1]);
+scs_m.objs[27-1]=scicos_link(xx=[110.25582,110.25582,208.85853],yy=[405.42077,469.13173,469.13173],id="drawlink",thick=[0,0],ct=[1,1],from=[25,2,0],to=[24,1,1]);
+scs_m.objs[28-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[222.54128,408.2166],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=9,pout=[29,30],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[29-1]=scicos_link(xx=[222.54128,231.4115],yy=[408.2166,408.2166],id="drawlink",thick=[0,0],ct=[1,1],from=[28,1,0],to=[2,1,1]);
+scs_m.objs[30-1]=scicos_link(xx=[222.54128,222.54128,208.85853,208.85853],yy=[408.2166,453.0015,453.0015,485.7984],id="drawlink",thick=[0,0],ct=[1,1],from=[28,2,0],to=[24,3,1]);
+scs_m.objs[31-1]=scicos_link(xx=[219.57282,231.2505],yy=[477.46506,476.57677],id="drawlink",thick=[0,0],ct=[1,1],from=[24,1,0],to=[21,1,1]);
+scs_m.objs[32-1]=scicos_block(gui="SELECT_m",graphics=scicos_graphics(orig=[298.86371,253.57321],sz=[40,40],flip=true,theta=0,exprs=["5","2","1"],pin=[33,40],pout=34,pein=[43,44],peout=[],gr_i=[],id="",in_implicit=["E","E"],out_implicit="E"),model=scicos_model(sim=list("selector_m",4),in1=[-1,-1],in2=[-2,-2],intyp=[5,5],out=-1,out2=-2,outtyp=5,evtin=[1,1],evtout=[],state=[],dstate=1,odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[33-1]=scicos_link(xx=[282.29299,290.29229],yy=[280.24498,280.23987],id="drawlink",thick=[0,0],ct=[1,1],from=[4,1,0],to=[32,1,1]);
+scs_m.objs[34-1]=scicos_link(xx=[347.43514,357.57328,357.57328],yy=[273.57321,273.57321,280.83282],id="drawlink",thick=[0,0],ct=[1,1],from=[32,1,0],to=[35,1,1]);
+scs_m.objs[35-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[357.57328,280.83282],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=34,pout=[36,37],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[36-1]=scicos_link(xx=[357.57328,357.57328,364.66964],yy=[280.83282,329.46812,329.46812],id="drawlink",thick=[0,0],ct=[1,1],from=[35,1,0],to=[7,1,1]);
+scs_m.objs[37-1]=scicos_link(xx=[357.57328,376.4669],yy=[280.83282,280.83282],id="drawlink",thick=[0,0],ct=[1,1],from=[35,2,0],to=[14,1,1]);
+scs_m.objs[38-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[140.34523,273.49157],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=6,pout=[39,40],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[39-1]=scicos_link(xx=[140.34523,144.31759],yy=[273.49157,273.57832],id="drawlink",thick=[0,0],ct=[1,1],from=[38,1,0],to=[3,2,1]);
+scs_m.objs[40-1]=scicos_link(xx=[140.34523,140.34523,290.29229,290.29229],yy=[273.49157,247.70767,247.70767,266.90654],id="drawlink",thick=[0,0],ct=[1,1],from=[38,2,0],to=[32,2,1]);
+scs_m.objs[41-1]=scicos_block(gui="CLKSPLIT_f",graphics=scicos_graphics(orig=[253.72572,309.29537],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=[],pout=[],pein=17,peout=[42,43],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="split",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[1,1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[None,None,None],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[42-1]=scicos_link(xx=[253.72572,253.72156],yy=[309.29537,305.95927],id="drawlink",thick=[0,0],ct=[5,-1],from=[41,1,0],to=[4,1,1]);
+scs_m.objs[43-1]=scicos_link(xx=[253.72572,312.19705,312.19705],yy=[309.29537,309.29537,299.28749],id="drawlink",thick=[0,0],ct=[5,-1],from=[41,2,0],to=[32,1,1]);
+scs_m.objs[44-1]=scicos_link(xx=[279.98293,279.98293,325.53038,325.53038],yy=[372.50232,315.89455,315.89455,299.28749],id="drawlink",thick=[0,0],ct=[5,-1],from=[2,2,0],to=[32,2,1]);
+model=scicos_model();
+model.sim="csuper";
+model.in1=[1,1,1];
+model.in2=[1,1,1];
+model.out=[1,1];
+model.out2=[1,1];
+model.intyp=[5,1,1];
+model.outtyp=[5,5];
+model.blocktype="h";
+model.firing=None;
+model.dep_ut=[true,None];
+model.rpar=scs_m;
+gr_i=[];
+x=standard_define([2,3],model,[],gr_i);
+}
+DFLIPFLOP.prototype.details = function DFLIPFLOP() {
+}
+}
diff --git a/js/IntegerOp/DLATCH.js b/js/IntegerOp/DLATCH.js
index 9a9366b8..f0ecdbfc 100644
--- a/js/IntegerOp/DLATCH.js
+++ b/js/IntegerOp/DLATCH.js
@@ -1,3 +1,46 @@
-Syntax error in input LexToken(VAR,'sim',1,1876)
 /* autogenerated from "macros/IntegerOp/DLATCH.sci" */
-None
+function DLATCH() {
+DLATCH.prototype.get = function DLATCH() {
+}
+DLATCH.prototype.set = function DLATCH() {
+x=arg1;
+}
+DLATCH.prototype.define = function DLATCH() {
+scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["DLATCH"],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.objs[1-1]=scicos_block(gui="CONST_m",graphics=scicos_graphics(orig=[109.62561,263.44465],sz=[20,20],flip=true,theta=0,exprs="int8(0)",pin=[],pout=7,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("cstblk4_m",4),in1=[],in2=[],intyp=1,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8(0)),blocktype="d",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[2-1]=scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[233.37693,320.30536],sz=[60,60],flip=true,theta=0,exprs=["0","1"],pin=13,pout=[],pein=[],peout=[6,0],gr_i=list(["txt=[\'If in>0\';\' \';\' then    else\'];","xstringb(orig(1),orig(2),txt,sz(1),sz(2),\'fill\');"],8),id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in1=1,in2=1,intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[1,1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[true,None],label="",nzcross=1,nmode=1,equations=list()),doc=list());
+scs_m.objs[3-1]=scicos_block(gui="LOGICAL_OP",graphics=scicos_graphics(orig=[152.88902,260.24498],sz=[60,40],flip=true,theta=0,exprs=["2","1","5","0"],pin=[15,7],pout=5,pein=[],peout=[],gr_i=list("xstringb(orig(1),orig(2),[\'Logical Op \';OPER],sz(1),sz(2),\'fill\');",8),id="",in_implicit=["E","E"],out_implicit="E"),model=scicos_model(sim=list("logicalop_i8",4),in1=[-1,-1],in2=[-2,-2],intyp=[5,5],out=-1,out2=-2,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[1,0],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[4-1]=scicos_block(gui="SAMPHOLD_m",graphics=scicos_graphics(orig=[233.72156,260.24498],sz=[40,40],flip=true,theta=0,exprs="5",pin=5,pout=9,pein=6,peout=[],gr_i=list("xstringb(orig(1),orig(2),\'S/H\',sz(1),sz(2),\'fill\')",8),id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("samphold4_m",4),in1=-1,in2=-2,intyp=5,out=-1,out2=-2,outtyp=5,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[5-1]=scicos_link(xx=[221.46044,225.15013],yy=[280.24498,280.24498],id="drawlink",thick=[0,0],ct=[1,1],from=[3,1,0],to=[4,1,1]);
+scs_m.objs[6-1]=scicos_link(xx=[253.37693,253.72156],yy=[314.59108,305.95927],id="drawlink",thick=[0,0],ct=[5,-1],from=[2,1,0],to=[4,1,1]);
+scs_m.objs[7-1]=scicos_link(xx=[138.19704,144.31759],yy=[273.44465,273.57832],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[3,2,1]);
+scs_m.objs[8-1]=scicos_block(gui="LOGICAL_OP",graphics=scicos_graphics(orig=[317.46698,309.46812],sz=[60,40],flip=true,theta=0,exprs=["1","5","5","0"],pin=11,pout=17,pein=[],peout=[],gr_i=list("xstringb(orig(1),orig(2),[\'Logical Op \';OPER],sz(1),sz(2),\'fill\');",8),id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("logicalop_i8",4),in1=-1,in2=-2,intyp=5,out=-1,out2=-2,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[5,0],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[9-1]=scicos_link(xx=[282.29299,305.09603,305.09603],yy=[280.24498,280.52797,280.83282],id="drawlink",thick=[0,0],ct=[1,1],from=[4,1,0],to=[10,1,1]);
+scs_m.objs[10-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[305.09603,280.83282],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=9,pout=[11,19],pein=[],peout=[],gr_i=list([],8),id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[11-1]=scicos_link(xx=[305.09603,305.09603,308.89555],yy=[280.83282,329.46812,329.46812],id="drawlink",thick=[0,0],ct=[1,1],from=[10,1,0],to=[8,1,1]);
+scs_m.objs[12-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[184.8055,340.30536],sz=[20,20],flip=true,theta=0,exprs="2",pin=[],pout=13,pein=[],peout=[],gr_i=list(" ",8),id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[13-1]=scicos_link(xx=[204.8055,224.8055],yy=[350.30536,350.30536],id="drawlink",thick=[0,0],ct=[1,1],from=[12,1,0],to=[2,1,1]);
+scs_m.objs[14-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[104.31759,276.91165],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=15,pein=[],peout=[],gr_i=list(" ",8),id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[15-1]=scicos_link(xx=[124.31759,144.31759],yy=[286.91165,286.91165],id="drawlink",thick=[0,0],ct=[1,1],from=[14,1,0],to=[3,1,1]);
+scs_m.objs[16-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[406.03841,319.46812],sz=[20,20],flip=true,theta=0,exprs="2",pin=17,pout=[],pein=[],peout=[],gr_i=list(" ",8),id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[17-1]=scicos_link(xx=[386.03841,406.03841],yy=[329.46812,329.46812],id="drawlink",thick=[0,0],ct=[1,1],from=[8,1,0],to=[16,1,1]);
+scs_m.objs[18-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[325.09603,270.83282],sz=[20,20],flip=true,theta=0,exprs="1",pin=19,pout=[],pein=[],peout=[],gr_i=list(" ",8),id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[19-1]=scicos_link(xx=[305.09603,325.09603],yy=[280.83282,280.83282],id="drawlink",thick=[0,0],ct=[1,1],from=[10,2,0],to=[18,1,1]);
+model=scicos_model();
+model.sim="csuper";
+model.in1=[1,1];
+model.in2=[1,1];
+model.out=[1,1];
+model.out2=[1,1];
+model.intyp=[5,-1];
+model.outtyp=[5,5];
+model.blocktype="h";
+model.firing=None;
+model.dep_ut=[true,None];
+model.rpar=scs_m;
+gr_i=[];
+x=standard_define([2,3],model,[],gr_i);
+}
+DLATCH.prototype.details = function DLATCH() {
+}
+}
diff --git a/js/IntegerOp/JKFLIPFLOP.js b/js/IntegerOp/JKFLIPFLOP.js
index 77981260..250a4697 100644
--- a/js/IntegerOp/JKFLIPFLOP.js
+++ b/js/IntegerOp/JKFLIPFLOP.js
@@ -1,3 +1,94 @@
-Syntax error in input LexToken(VAR,'sim',1,3611)
 /* autogenerated from "macros/IntegerOp/JKFLIPFLOP.sci" */
-None
+function JKFLIPFLOP() {
+JKFLIPFLOP.prototype.get = function JKFLIPFLOP() {
+}
+JKFLIPFLOP.prototype.set = function JKFLIPFLOP() {
+for(i=1;i<=length(arg1.model.rpar.objs);i+=1) {
+o=arg1.model.rpar.objs(i);
+if (typeof(o)=="Block"&&o.gui=="DOLLAR_m") {
+path=i;
+break
+}
+}
+newpar=list();
+xx=arg1.model.rpar.objs(path);
+exprs=xx.graphics.exprs(1);
+model=xx.model;
+init_old=model.odstate(1);
+while (true) {
+[ok,init,exprs0]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"JKFLIPFLOP")," ",gettext("JK flip-flop")," ",gettext("The \'Initial Value\' must be 0 or 1 of type int8"),gettext("&nbsp;- Negative values are considered as int8(0)"),gettext("&nbsp;- Positive values are considered as int8(1)")," "],gettext("Initial Value"),list("vec",1),exprs);
+if (!ok) {
+break
+}
+if (init<=0) {
+init=int8(0);
+} else if (init>0) {
+init=int8(1);
+}
+if (ok) {
+xx.graphics.exprs[1-1]=exprs0;
+model.odstate[1-1]=init;
+xx.model=model;
+arg1.model.rpar.objs[path-1]=xx;
+break
+}
+}
+needcompile=0;
+if (init_old!=init) {
+newpar[size(newpar)+1-1]=1;
+needcompile=2;
+}
+x=arg1;
+y=needcompile;
+typ=newpar;
+}
+JKFLIPFLOP.prototype.define = function JKFLIPFLOP() {
+scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["JKFLIPFLOP"],tol=[0.0001,0.000001,1.000e-10,100001,0,0,0],tf=60,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.objs[1-1]=scicos_block(gui="DOLLAR_m",graphics=scicos_graphics(orig=[299.96961,261.584],sz=[40,40],flip=None,theta=0,exprs=["int8(0)","1"],pin=7,pout=5,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("dollar4_m",4),in1=1,in2=1,intyp=5,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(int8(0)),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m_1=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["EDGE_TRIGGER","./"],tol=[0.0001,0.000001,1.000e-10,100001,0,0,0],tf=30,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="EDGETRIGGER",graphics=scicos_graphics(orig=[288.58631,257.1131],sz=[60,40],flip=true,theta=0,exprs="-1",pin=5,pout=3,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("edgetrig",4),in1=1,in2=[],intyp=1,out=1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=0,odstate=list(),rpar=[],ipar=-1,opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=1,nmode=0,equations=list()),doc=list());
+scs_m_1.objs[2-1]=scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[388.28869,247.1131],sz=[60,60],flip=true,theta=0,exprs=["0","0"],pin=3,pout=[],pein=[],peout=[7,0],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in1=1,in2=[],intyp=1,out=[],out2=1,outtyp=[],evtin=[],evtout=[1,1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m_1.objs[3-1]=scicos_link(xx=[357.15774,362.99107,379.71726],yy=[277.1131,277.1131,277.1131],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[2,1,1]);
+scs_m_1.objs[4-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[240.01488,267.1131],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=5,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m_1.objs[5-1]=scicos_link(xx=[260.01488,280.01488],yy=[277.1131,277.1131],id="drawlink",thick=[0,0],ct=[1,1],from=[4,1,0],to=[1,1,1]);
+scs_m_1.objs[6-1]=scicos_block(gui="CLKOUTV_f",graphics=scicos_graphics(orig=[398.28869,181.39881],sz=[20,30],flip=true,theta=0,exprs="1",pin=[],pout=[],pein=7,peout=[],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="output",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m_1.objs[7-1]=scicos_link(xx=[408.28869,408.28869],yy=[241.39881,211.39881],id="drawlink",thick=[0,0],ct=[5,-1],from=[2,1,0],to=[6,1,1]);
+scs_m.objs[2-1]=scicos_block(gui="EDGE_TRIGGER",graphics=scicos_graphics(orig=[292.52452,323.54888],sz=[60,40],flip=true,theta=0,exprs=[],pin=14,pout=[],pein=[],peout=8,gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="csuper",in1=-1,in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[3-1]=scicos_block(gui="LOGIC",graphics=scicos_graphics(orig=[302.79613,202.52782],sz=[40,40],flip=true,theta=0,exprs=["[0;1;1;1;0;0;1;0]","0"],pin=[5,16,18],pout=4,pein=8,peout=[],gr_i=[],id="",in_implicit=["E","E","E"],out_implicit="E"),model=scicos_model(sim=list("logic",4),in1=[1,1,1],in2=[1,1,1],intyp=[5,5,5],out=1,out2=1,outtyp=5,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8([0,1,1,1,0,0,1,0])),blocktype="c",firing=None,dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[4-1]=scicos_link(xx=[351.36756,368.82793,368.82793],yy=[222.52782,222.52782,223.06473],id="drawlink",thick=[0,0],ct=[1,1],from=[3,1,0],to=[10,1,1]);
+scs_m.objs[5-1]=scicos_link(xx=[291.39818,274.18235,274.18235,294.2247],yy=[281.584,281.584,232.52782,232.52782],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[3,1,1]);
+scs_m.objs[6-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[368.82793,243.45067],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=11,pout=[7,20],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[7-1]=scicos_link(xx=[368.82793,368.82793,345.68389],yy=[243.45067,281.584,281.584],id="drawlink",thick=[0,0],ct=[1,1],from=[6,1,0],to=[1,1,1]);
+scs_m.objs[8-1]=scicos_link(xx=[322.52452,374.69743,374.69743,322.79613],yy=[317.8346,317.8346,248.24211,248.24211],id="drawlink",thick=[0,0],ct=[5,-1],from=[2,1,0],to=[3,1,1]);
+scs_m.objs[9-1]=scicos_block(gui="LOGICAL_OP",graphics=scicos_graphics(orig=[377.63217,159.25363],sz=[60,40],flip=true,theta=0,exprs=["1","5","5","0"],pin=12,pout=22,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("logicalop_i8",4),in1=-1,in2=-2,intyp=5,out=-1,out2=-2,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[5,0],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[10-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[368.82793,223.06473],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=4,pout=[11,12],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[11-1]=scicos_link(xx=[368.82793,368.82793],yy=[223.06473,243.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[10,1,0],to=[6,1,1]);
+scs_m.objs[12-1]=scicos_link(xx=[368.82793,368.82793,369.06074],yy=[223.06473,177.7867,179.25363],id="drawlink",thick=[0,0],ct=[1,1],from=[10,2,0],to=[9,1,1]);
+scs_m.objs[13-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[243.95309,333.54888],sz=[20,20],flip=true,theta=0,exprs="2",pin=[],pout=14,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[14-1]=scicos_link(xx=[263.95309,283.95309],yy=[343.54888,343.54888],id="drawlink",thick=[0,0],ct=[1,1],from=[13,1,0],to=[2,1,1]);
+scs_m.objs[15-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[254.2247,212.52782],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=16,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[16-1]=scicos_link(xx=[274.2247,294.2247],yy=[222.52782,222.52782],id="drawlink",thick=[0,0],ct=[1,1],from=[15,1,0],to=[3,2,1]);
+scs_m.objs[17-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[254.2247,202.52782],sz=[20,20],flip=true,theta=0,exprs="3",pin=[],pout=18,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=3,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[18-1]=scicos_link(xx=[274.2247,294.2247],yy=[212.52782,212.52782],id="drawlink",thick=[0,0],ct=[1,1],from=[17,1,0],to=[3,3,1]);
+scs_m.objs[19-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[388.82793,233.45067],sz=[20,20],flip=true,theta=0,exprs="1",pin=20,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[20-1]=scicos_link(xx=[368.82793,388.82793],yy=[243.45067,243.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[6,2,0],to=[19,1,1]);
+scs_m.objs[21-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[466.2036,169.25363],sz=[20,20],flip=true,theta=0,exprs="2",pin=22,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[22-1]=scicos_link(xx=[446.2036,466.2036],yy=[179.25363,179.25363],id="drawlink",thick=[0,0],ct=[1,1],from=[9,1,0],to=[21,1,1]);
+model=scicos_model();
+model.sim="csuper";
+model.in1=[1,1,1];
+model.in2=[1,1,1];
+model.out=[1,1];
+model.out2=[1,1];
+model.intyp=[5,1,5];
+model.outtyp=[5,5];
+model.blocktype="h";
+model.firing=None;
+model.dep_ut=[true,None];
+model.rpar=scs_m;
+gr_i=[];
+x=standard_define([2,3],model,[],gr_i);
+}
+JKFLIPFLOP.prototype.details = function JKFLIPFLOP() {
+}
+}
diff --git a/js/IntegerOp/SRFLIPFLOP.js b/js/IntegerOp/SRFLIPFLOP.js
index 7b903408..bf0a2ac0 100644
--- a/js/IntegerOp/SRFLIPFLOP.js
+++ b/js/IntegerOp/SRFLIPFLOP.js
@@ -1,3 +1,78 @@
-Syntax error in input LexToken(VAR,'sim',1,3593)
 /* autogenerated from "macros/IntegerOp/SRFLIPFLOP.sci" */
-None
+function SRFLIPFLOP() {
+SRFLIPFLOP.prototype.get = function SRFLIPFLOP() {
+}
+SRFLIPFLOP.prototype.set = function SRFLIPFLOP() {
+for(i=1;i<=length(arg1.model.rpar.objs);i+=1) {
+o=arg1.model.rpar.objs(i);
+if (typeof(o)=="Block"&&o.gui=="DOLLAR_m") {
+path=i;
+break
+}
+}
+newpar=list();
+xx=arg1.model.rpar.objs(path);
+exprs=xx.graphics.exprs(1);
+model=xx.model;
+init_old=model.odstate(1);
+while (true) {
+[ok,init,exprs0]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"SRFLIPFLOP")," ",gettext("SR flip-flop")," ",gettext("The \'Initial Value\' must be 0 or 1 of type int8"),gettext("&nbsp;- Negative values are considered as int8(0)"),gettext("&nbsp;- Positive values are considered as int8(1)")," "],gettext("Initial Value"),list("vec",1),exprs);
+if (!ok) {
+break
+}
+if (init<=0) {
+init=int8(0);
+} else if (init>0) {
+init=int8(1);
+}
+if (ok) {
+xx.graphics.exprs[1-1]=exprs0;
+model.odstate[1-1]=init;
+xx.model=model;
+arg1.model.rpar.objs[path-1]=xx;
+break
+}
+}
+needcompile=0;
+if (init_old!=init) {
+newpar[size(newpar)+1-1]=path;
+needcompile=2;
+}
+x=arg1;
+y=needcompile;
+typ=newpar;
+}
+SRFLIPFLOP.prototype.define = function SRFLIPFLOP() {
+scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["SRFLIPFLOP"],tol=[0.0001,0.000001,1.000e-10,100001,0,0,0],tf=60,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.objs[1-1]=scicos_block(gui="LOGIC",graphics=scicos_graphics(orig=[298.504,201.45067],sz=[40,40],flip=true,theta=0,exprs=["[0 1;1 0;1 0;1 0;0 1;0 1;0 0;0 0]","1"],pin=[4,10,12],pout=[3,8],pein=[],peout=[],gr_i=[],id="",in_implicit=["E","E","E"],out_implicit=["E","E"]),model=scicos_model(sim=list("logic",4),in1=[1,1,1],in2=[1,1,1],intyp=[5,5,5],out=[1,1],out2=[1,1],outtyp=[5,5],evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8([0,1,1,0,1,0,1,0,0,1,0,1,0,0,0,0])),blocktype="c",firing=None,dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[2-1]=scicos_block(gui="DOLLAR_m",graphics=scicos_graphics(orig=[299.23733,254.25067],sz=[40,40],flip=None,theta=0,exprs=["int8(0)","1"],pin=6,pout=4,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("dollar4_m",4),in1=1,in2=1,intyp=5,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(int8(0)),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[3-1]=scicos_link(xx=[347.07543,363.03733,363.03733],yy=[228.11733,228.11733,248.584],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[5,1,1]);
+scs_m.objs[4-1]=scicos_link(xx=[290.6659,272.104,272.104,289.93257],yy=[274.25067,274.25067,231.45067,231.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[2,1,0],to=[1,1,1]);
+scs_m.objs[5-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[363.03733,248.584],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=3,pout=[6,14],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[6-1]=scicos_link(xx=[363.03733,363.03733,344.95162],yy=[248.584,274.25067,274.25067],id="drawlink",thick=[0,0],ct=[1,1],from=[5,1,0],to=[2,1,1]);
+scs_m.objs[7-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[367.07543,204.784],sz=[20,20],flip=true,theta=0,exprs="2",pin=8,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[8-1]=scicos_link(xx=[347.07543,367.07543],yy=[214.784,214.784],id="drawlink",thick=[0,0],ct=[1,1],from=[1,2,0],to=[7,1,1]);
+scs_m.objs[9-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[249.93257,211.45067],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=10,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[10-1]=scicos_link(xx=[269.93257,289.93257],yy=[221.45067,221.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[9,1,0],to=[1,2,1]);
+scs_m.objs[11-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[249.93257,201.45067],sz=[20,20],flip=true,theta=0,exprs="2",pin=[],pout=12,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[12-1]=scicos_link(xx=[269.93257,289.93257],yy=[211.45067,211.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[11,1,0],to=[1,3,1]);
+scs_m.objs[13-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[383.03733,238.584],sz=[20,20],flip=true,theta=0,exprs="1",pin=14,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[14-1]=scicos_link(xx=[363.03733,383.03733],yy=[248.584,248.584],id="drawlink",thick=[0,0],ct=[1,1],from=[5,2,0],to=[13,1,1]);
+model=scicos_model();
+model.sim="csuper";
+model.in1=[1,1];
+model.in2=[1,1];
+model.out=[1,1];
+model.out2=[1,1];
+model.intyp=[5,5];
+model.outtyp=[5,5];
+model.blocktype="h";
+model.firing=None;
+model.dep_ut=[true,None];
+model.rpar=scs_m;
+gr_i=[];
+x=standard_define([2,3],model,[],gr_i);
+}
+SRFLIPFLOP.prototype.details = function SRFLIPFLOP() {
+}
+}
diff --git a/js/Linear/PID.js b/js/Linear/PID.js
index a7eb4e76..cf55e494 100644
--- a/js/Linear/PID.js
+++ b/js/Linear/PID.js
@@ -1,3 +1,116 @@
-Syntax error in input LexToken(VAR,'sim',1,4444)
 /* autogenerated from "macros/Linear/PID.sci" */
-None
+function PID() {
+PID.prototype.get = function PID() {
+}
+PID.prototype.set = function PID() {
+ppath=list(0,0,0);
+for(i=1;i<=length(arg1.model.rpar.objs);i+=1) {
+o=arg1.model.rpar.objs(i);
+if (typeof(o)=="Link") {
+from=arg1.model.rpar.objs(o.from(1));
+to=arg1.model.rpar.objs(o.to(1));
+if (from.gui=="GAINBLK") {
+switch (to.gui) {
+case "SUMMATION":
+ppath[1-1]=o.from(1);
+case "INTEGRAL_m":
+ppath[2-1]=o.from(1);
+case "DERIV":
+ppath[3-1]=o.from(1);
+}
+} else if (to.gui=="GAINBLK") {
+switch (from.gui) {
+case "SUMMATION":
+ppath[1-1]=o.to(1);
+case "INTEGRAL_m":
+ppath[2-1]=o.to(1);
+case "DERIV":
+ppath[3-1]=o.to(1);
+}
+}
+if (and(ppath!=list(0,0,0))) {
+break
+}
+}
+}
+newpar=list();
+xx1=arg1.model.rpar.objs(ppath[1-1]);
+exprs[1-1]=xx1.graphics.exprs(1);
+p_old=xx1.model.rpar;
+xx2=arg1.model.rpar.objs(ppath[2-1]);
+exprs[2-1]=xx2.graphics.exprs(1);
+i_old=xx2.model.rpar;
+xx3=arg1.model.rpar.objs(ppath[3-1]);
+exprs[3-1]=xx3.graphics.exprs(1);
+d_old=xx3.model.rpar;
+y=0;
+while (true) {
+[ok,p,i,d,exprs0]=scicos_getvalue("Set PID parameters",["Proportional","Integral","Derivation"],list("vec",-1,"vec",-1,"vec",-1),exprs);
+if (!ok) {
+break
+}
+if (ok) {
+xx1.graphics.exprs=exprs0(1);
+xx1.model.rpar=p;
+xx2.graphics.exprs=exprs0(2);
+xx2.model.rpar=i;
+xx3.graphics.exprs=exprs0(3);
+xx3.model.rpar=d;
+arg1.model.rpar.objs[ppath[1-1]-1]=xx1;
+arg1.model.rpar.objs[ppath[2-1]-1]=xx2;
+arg1.model.rpar.objs[ppath[3-1]-1]=xx3;
+break
+}
+}
+needcompile=0;
+if (!(p_old==p&&i_old==i&&d_old==d)) {
+newpar[size(newpar)+1-1]=ppath[1-1];
+newpar[size(newpar)+1-1]=ppath[2-1];
+newpar[size(newpar)+1-1]=ppath[3-1];
+needcompile=2;
+}
+x=arg1;
+y=max(y,needcompile);
+typ=newpar;
+}
+PID.prototype.define = function PID() {
+scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["PID"],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.objs[1-1]=scicos_block(gui="INTEGRAL_m",graphics=scicos_graphics(orig=[318.304,183.11733],sz=[40,40],flip=true,theta=0,exprs=["0","0","0","1","-1"],pin=7,pout=9,pein=[],peout=[],gr_i=[],id="1/s",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("integral_func",4),in1=1,in2=1,intyp=1,out=1,out2=1,outtyp=1,evtin=[],evtout=[],state=0,dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[None,true],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[2-1]=scicos_block(gui="SUMMATION",graphics=scicos_graphics(orig=[387.97067,172.85067],sz=[40,60],flip=true,theta=0,exprs=["1","[1;1;1]"],pin=[10,9,11],pout=19,pein=[],peout=[],gr_i=[],id="",in_implicit=["E","E","E"],out_implicit="E"),model=scicos_model(sim=list("summation",4),in1=[-1,-1,-1],in2=[-2,-2,-2],intyp=[1,1,1],out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[1,1,1],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[3-1]=scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[321.23733,235.91733],sz=[40,40],flip=true,theta=0,exprs="1",pin=17,pout=10,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[4-1]=scicos_block(gui="DERIV",graphics=scicos_graphics(orig=[319.03733,135.45067],sz=[40,40],flip=true,theta=0,exprs=[],pin=8,pout=11,pein=[],peout=[],gr_i=[],id="s",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("deriv",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="x",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[5-1]=scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[255.23733,183.11733],sz=[40,40],flip=true,theta=0,exprs="1",pin=13,pout=7,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[6-1]=scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[255.23733,135.45067],sz=[40,40],flip=true,theta=0,exprs="1",pin=14,pout=8,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[7-1]=scicos_link(xx=[303.80876,309.73257],yy=[203.11733,203.11733],id="drawlink",thick=[0,0],ct=[1,1],from=[5,1,0],to=[1,1,1]);
+scs_m.objs[8-1]=scicos_link(xx=[303.80876,310.4659],yy=[155.45067,155.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[6,1,0],to=[4,1,1]);
+scs_m.objs[9-1]=scicos_link(xx=[366.87543,379.39924],yy=[203.11733,202.85067],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[2,2,1]);
+scs_m.objs[10-1]=scicos_link(xx=[369.80876,379.39924,379.39924],yy=[255.91733,255.91733,217.85067],id="drawlink",thick=[0,0],ct=[1,1],from=[3,1,0],to=[2,1,1]);
+scs_m.objs[11-1]=scicos_link(xx=[367.60876,379.39924,379.39924],yy=[155.45067,155.45067,187.85067],id="drawlink",thick=[0,0],ct=[1,1],from=[4,1,0],to=[2,3,1]);
+scs_m.objs[12-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[234.704,203.11733],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=16,pout=[13,14],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[13-1]=scicos_link(xx=[234.704,246.6659],yy=[203.11733,203.11733],id="drawlink",thick=[0,0],ct=[1,1],from=[12,1,0],to=[5,1,1]);
+scs_m.objs[14-1]=scicos_link(xx=[234.704,234.704,246.6659],yy=[203.11733,155.45067,155.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[12,2,0],to=[6,1,1]);
+scs_m.objs[15-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[233.97067,203.11733],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=21,pout=[16,17],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[16-1]=scicos_link(xx=[233.97067,234.704],yy=[203.11733,203.11733],id="drawlink",thick=[0,0],ct=[1,1],from=[15,1,0],to=[12,1,1]);
+scs_m.objs[17-1]=scicos_link(xx=[233.97067,233.97067,312.6659],yy=[203.11733,255.91733,255.91733],id="drawlink",thick=[0,0],ct=[1,1],from=[15,2,0],to=[3,1,1]);
+scs_m.objs[18-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[456.5421,192.85067],sz=[20,20],flip=true,theta=0,exprs="1",pin=19,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[19-1]=scicos_link(xx=[436.5421,456.5421],yy=[202.85067,202.85067],id="drawlink",thick=[0,0],ct=[1,1],from=[2,1,0],to=[18,1,1]);
+scs_m.objs[20-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[193.97067,193.11733],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=21,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m.objs[21-1]=scicos_link(xx=[213.97067,233.97067],yy=[203.11733,203.11733],id="drawlink",thick=[0,0],ct=[1,1],from=[20,1,0],to=[15,1,1]);
+model=scicos_model();
+model.sim="csuper";
+model.in1=-1;
+model.in2=-2;
+model.out=-1;
+model.out2=-2;
+model.intyp=1;
+model.outtyp=1;
+model.blocktype="h";
+model.firing=None;
+model.dep_ut=[None,None];
+model.rpar=scs_m;
+gr_i=[];
+x=standard_define([2,2],model,[],gr_i);
+}
+PID.prototype.details = function PID() {
+}
+}
diff --git a/js/Misc/ENDBLK.js b/js/Misc/ENDBLK.js
index 61dcf474..91699d72 100644
--- a/js/Misc/ENDBLK.js
+++ b/js/Misc/ENDBLK.js
@@ -1,3 +1,84 @@
-Syntax error in input LexToken(VAR,'sim',1,5393)
 /* autogenerated from "macros/Misc/ENDBLK.sci" */
-None
+function ENDBLK() {
+ENDBLK.prototype.get = function ENDBLK() {
+}
+ENDBLK.prototype.set = function ENDBLK() {
+for(i=1;i<=length(arg1.model.rpar.objs);i+=1) {
+o=arg1.model.rpar.objs(i);
+if (typeof(o)=="Block"&&o.gui=="END_c") {
+ppath=list(i);
+break
+}
+}
+newpar=list();
+y=0;
+for(path in ppath) {
+np=size(path,"*");
+spath=list();
+for(k=1;k<=np;k+=1) {
+spath[$+1-1]="model";
+spath[$+1-1]="rpar";
+spath[$+1-1]="objs";
+spath[$+1-1]=path(k);
+}
+xx=arg1(spath);
+execstr("xxn="+xx.gui+"(\'set\',xx)");
+if (!isequalbitwise(xxn,xx)) {
+model=xx.model;
+model_n=xxn.model;
+if (!is_modelica_block(xx)) {
+modified=or(model.sim!=model_n.sim)||!isequal(model.state,model_n.state)||!isequal(model.dstate,model_n.dstate)||!isequal(model.odstate,model_n.odstate)||!isequal(model.rpar,model_n.rpar)||!isequal(model.ipar,model_n.ipar)||!isequal(model.opar,model_n.opar)||!isequal(model.label,model_n.label);
+if (or(model.in1!=model_n.in1)||or(model.out!=model_n.out)||or(model.in2!=model_n.in2)||or(model.out2!=model_n.out2)||or(model.outtyp!=model_n.outtyp)||or(model.intyp!=model_n.intyp)) {
+needcompile=1;
+}
+if (or(model.firing!=model_n.firing)) {
+needcompile=2;
+}
+if ((size(model.in1,"*")!=size(model_n.in1,"*"))||(size(model.out,"*")!=size(model_n.out,"*"))||(size(model.evtin,"*")!=size(model_n.evtin,"*"))) {
+needcompile=4;
+}
+if (model.sim=="input"||model.sim=="output") {
+if (model.ipar!=model_n.ipar) {
+needcompile=4;
+}
+}
+if (or(model.blocktype!=model_n.blocktype)||or(model.dep_ut!=model_n.dep_ut)) {
+needcompile=4;
+}
+if ((model.nzcross!=model_n.nzcross)||(model.nmode!=model_n.nmode)) {
+needcompile=4;
+}
+if (prod(size(model_n.sim))>1) {
+if (model_n.sim(2)>1000) {
+if (model.sim(1)!=model_n.sim(1)) {
+needcompile=4;
+}
+}
+}
+} else {
+modified=or(model_n!=model);
+eq=model.equations;
+eqn=model_n.equations;
+if (or(eq.model!=eqn.model)||or(eq.inputs!=eqn.inputs)||or(eq.outputs!=eqn.outputs)) {
+needcompile=4;
+}
+}
+arg1[spath-1]=xxn;
+newpar[size(newpar)+1-1]=path;
+y=max(y,needcompile);
+}
+}
+x=arg1;
+typ=newpar;
+}
+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=[None,None],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]);
+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=[None,None],label="",nzcross=0,nmode=0,equations=list());
+gr_i=[];
+x=standard_define([2,2],model,[],gr_i);
+}
+ENDBLK.prototype.details = function ENDBLK() {
+}
+}
diff --git a/js/Sources/FROMWSB.js b/js/Sources/FROMWSB.js
index 5175a07b..e6db9281 100644
--- a/js/Sources/FROMWSB.js
+++ b/js/Sources/FROMWSB.js
@@ -1,3 +1,86 @@
-Syntax error in input LexToken(VAR,'sim',1,5338)
 /* autogenerated from "macros/Sources/FROMWSB.sci" */
-None
+function FROMWSB() {
+FROMWSB.prototype.get = function FROMWSB() {
+}
+FROMWSB.prototype.set = function FROMWSB() {
+for(i=1;i<=length(arg1.model.rpar.objs);i+=1) {
+o=arg1.model.rpar.objs(i);
+if (typeof(o)=="Block"&&o.gui=="FROMWS_c") {
+ppath=list(i);
+break
+}
+}
+newpar=list();
+y=0;
+for(path in ppath) {
+np=size(path,"*");
+spath=list();
+for(k=1;k<=np;k+=1) {
+spath[$+1-1]="model";
+spath[$+1-1]="rpar";
+spath[$+1-1]="objs";
+spath[$+1-1]=path(k);
+}
+xx=arg1(spath);
+execstr("xxn="+xx.gui+"(\'set\',xx)");
+if (!isequalbitwise(xxn,xx)) {
+model=xx.model;
+model_n=xxn.model;
+if (!is_modelica_block(xx)) {
+modified=or(model.sim!=model_n.sim)||!isequal(model.state,model_n.state)||!isequal(model.dstate,model_n.dstate)||!isequal(model.odstate,model_n.odstate)||!isequal(model.rpar,model_n.rpar)||!isequal(model.ipar,model_n.ipar)||!isequal(model.opar,model_n.opar)||!isequal(model.label,model_n.label);
+if (or(model.in1!=model_n.in1)||or(model.out!=model_n.out)||or(model.in2!=model_n.in2)||or(model.out2!=model_n.out2)||or(model.outtyp!=model_n.outtyp)||or(model.intyp!=model_n.intyp)) {
+needcompile=1;
+}
+if (or(model.firing!=model_n.firing)) {
+needcompile=2;
+}
+if ((size(model.in1,"*")!=size(model_n.in1,"*"))||(size(model.out,"*")!=size(model_n.out,"*"))) {
+needcompile=4;
+}
+if (model.sim=="input"||model.sim=="output") {
+if (model.ipar!=model_n.ipar) {
+needcompile=4;
+}
+}
+if (or(model.blocktype!=model_n.blocktype)||or(model.dep_ut!=model_n.dep_ut)) {
+needcompile=4;
+}
+if ((model.nzcross!=model_n.nzcross)||(model.nmode!=model_n.nmode)) {
+needcompile=4;
+}
+if (prod(size(model_n.sim))>1) {
+if (model_n.sim(2)>1000) {
+if (model.sim(1)!=model_n.sim(1)) {
+needcompile=4;
+}
+}
+}
+} else {
+modified=or(model_n!=model);
+eq=model.equations;
+eqn=model_n.equations;
+if (or(eq.model!=eqn.model)||or(eq.inputs!=eqn.inputs)||or(eq.outputs!=eqn.outputs)) {
+needcompile=4;
+}
+}
+arg1[spath-1]=xxn;
+newpar[size(newpar)+1-1]=path;
+y=max(y,needcompile);
+}
+}
+x=arg1;
+typ=newpar;
+}
+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=[None,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=[None,None],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]);
+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=[None,None],label="",nzcross=0,nmode=0,equations=list());
+gr_i=[];
+x=standard_define([5,2],model,[],gr_i);
+}
+FROMWSB.prototype.details = function FROMWSB() {
+}
+}
diff --git a/js/Sources/Sigbuilder.js b/js/Sources/Sigbuilder.js
index b015fdfc..45b958a0 100644
--- a/js/Sources/Sigbuilder.js
+++ b/js/Sources/Sigbuilder.js
@@ -1,5 +1,4 @@
-Syntax error in input LexToken(VAR,'sim',1,5389)
-Syntax error in input LexToken(VAR,'N',1,10287)
+Syntax error in input LexToken(FUNCTION,'function',1,10255)
 Syntax error in input LexToken(VAR,'order',1,12980)
 Syntax error in input LexToken(VAR,'x',1,13322)
 /* autogenerated from "macros/Sources/Sigbuilder.sci" */