1 files changed, 26 insertions, 15 deletions
diff --git a/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindyliboutr.cs b/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindyliboutr.cs
index 354cedc324e..c5fbf3a999d 100644
--- a/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindyliboutr.cs
+++ b/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindyliboutr.cs
@@ -14,7 +14,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>
 //
 
-println("ketcindylibout(20190127 loaded");
+println("ketcindylibout[20190301] loaded");
 
 //help:start();
 
@@ -772,7 +772,7 @@ CalcbyR(name,Arg1,Arg2):=(
 );
 CalcbyR(name,path,cmd,optionorg):=(
 //help:CalcbyR(name,cmd);
-//help:CalcbyR(options=["m/r","Wait=2","Out=y/n","Pre=PVOFG"]);
+//help:CalcbyR(options=["m/r","Wait=2","Out=y/n","Pre=PVFG"]);
 //help:CalcbyR(options2=["Pre=!G" ]);
   regional(options,tmp,tmp1,tmp2,tmp3,realL,strL,eqL,
        cat,dig,prestr,flg,wflg,file,nc,arg,cmdR,cmdlist,wfile,waiting);
@@ -795,8 +795,9 @@ CalcbyR(name,path,cmd,optionorg):=(
     );
   ); //181130to
   wfile="";
-  prestr="PVOFG"; //180508
+  prestr="VF"; //180508,190224
   waiting=30; //180608
+  nopoint="n"; //190222
   forall(eqL,
     tmp=Strsplit(#,"=");
     tmp1=Toupper(substring(tmp_1,0,1));
@@ -1105,7 +1106,7 @@ CalcbyR(name,path,cmd,optionorg):=(
 Rfun(name,fun,argL):=Rfun(name,fun,argL,[]);//16.10.22
 Rfun(name,fun,argL,optionorg):=(
 //help:Rfun("1","rnorm",[10]);
-//help:Rfun(options=["Disp=y"]);
+//help:Rfun(options=["Disp=y(n)","Pre="]);
   regional(nm,options,eqL,disp,cmdL,
      tmp,tmp1,tmp2);
   nm="R"+name;
@@ -1285,7 +1286,13 @@ Readcsv(pathorg,file,optionorg):=(
 );
 // New readcsv [181125] 
 Readcsv(file):=Readcsv(Dirwork,file);
-Readcsv(path,file):=Readcsv(path,file,[]);
+Readcsv(Arg1,Arg2):=(  //190301from
+  if(islist(Arg2),
+    Readcsv(Dirwork,Arg1,Arg2);
+  ,
+    Readcsv(path,file,[]);
+  );
+); //190301from
 Readcsv(path,file,options):=(
 //help:Readcsv("ex.csv");
 //help:Readcsv(directory,"ex.csv");
@@ -1303,7 +1310,9 @@ Readcsv(path,file,options):=(
   if(Toupper(head)=="Y",
     from=2;
   ); //190125to
-  dt=readfile2str(path,file);
+  tmp=file;
+  if(indexof(tmp,".csv")==0,tmp=tmp+".csv"); //190301
+  dt=readfile2str(path,tmp);
   dt=tokenize(dt,"/LF/");
   end=length(dt);
   if(dt_(length(dt))=="",
@@ -1751,9 +1760,11 @@ Histplot(nm,dataorg,optionorg):=(
     tmp=Strsplit(#,"=");
     tmp1=Toupper(substring(tmp_1,0,1));
     if(tmp1=="B",
-      if(substring(tmp_2,0,1)=="[",
-        tmp1="c("+substring(tmp_2,1,length(tmp_2)-1)+")"; //181104
-      );
+      if(substring(tmp_2,0,1)=="[", // 190226from
+        tmp1=RSform(tmp_2);
+      ,
+        tmp1=tmp_2;
+      );// 190226to
       breaks="breaks="+tmp1;
       options=remove(options,[#]);
     );
@@ -4122,8 +4133,8 @@ Mkobjplatecmd(nm,pdorg,optionorg):=( // 16.06.18
   regional(pd,options,cmd,out,thick1,thick2,nn,pdn,
      reL,vtx,face,nv,npttmp,tmp1,tmp2,tmp3,tmp4);
   pd=pdorg;
-  if(MeasureDepth(pd)==1,pd=[pd]);
-  if(MeasureDepth(pd)==2,pd=[pd]);//16.10.04from
+  if(Measuredepth(pd)==1,pd=[pd]);
+  if(Measuredepth(pd)==2,pd=[pd]);//16.10.04from
   forall(1..length(pd),nn, // 16.06.19from
     pdn=pd_nn;
     vtx=pdn_1;
@@ -4229,8 +4240,8 @@ Mkobjcrvcmd(nm,pstorg,options):=(
   out=[];
   tmp1=parse(pst);
   flg=0;  // 16.04.23from
-  if(MeasureDepth(tmp1)==2,flg=1);
-  if(MeasureDepth(tmp1)==0,
+  if(Measuredepth(tmp1)==2,flg=1);
+  if(Measuredepth(tmp1)==0,
     if(islist(tmp1),flg=1);
   );
   if(flg==1,  // 16.04.23until
@@ -5167,7 +5178,7 @@ WritedataC(fnameorg,dataorg):=(
   regional(tmp,fname,data,kk,nn,pt);
   data=dataorg;
   if(isstring(data),data=parse(data));
-  if(MeasureDepth(data)==1,data=[data]);
+  if(Measuredepth(data)==1,data=[data]);
   fname=fnameorg;
   if(indexof(fname,".")==0, fname=fname+".txt");
   SCEOUTPUT=openfile(fname);
@@ -6448,7 +6459,7 @@ Sfcutparadatacdy(nm,cutfun,fd,options):=(
   Implicitplot("sfc"+nm,tmp,fd_5,fd_6,["Msg=n","nodisp"]);
   out3=[]; out2=[];
   tmp1=parse("impsfc"+nm);
-  if(MeasureDepth(tmp1)==1,tmp1=[tmp1]);
+  if(Measuredepth(tmp1)==1,tmp1=[tmp1]);
   forall(1..(length(tmp1)),jj,
     pL=tmp1_jj;
     tmp2=[];