From 74673d5d829183b6a3cce8104b48e276aa2bdf11 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 9 Apr 2018 23:23:07 +0900 Subject: another ketcindy --- .../scripts/ketcindy/ketjava/KetCindyPlugin.jar | Bin 156844 -> 156502 bytes .../ketcindy/ketlib/ketcindylibbasic1logr.txt | 5 +++ .../scripts/ketcindy/ketlib/ketcindylibbasic1r.cs | 34 +++++++++------ .../ketcindy/ketlib/ketcindylibbasic2logr.txt | 5 +++ .../scripts/ketcindy/ketlib/ketcindylibbasic2r.cs | 47 ++++++++++++++++----- 5 files changed, 67 insertions(+), 24 deletions(-) (limited to 'texmf-dist/scripts') diff --git a/texmf-dist/scripts/ketcindy/ketjava/KetCindyPlugin.jar b/texmf-dist/scripts/ketcindy/ketjava/KetCindyPlugin.jar index 044a36a7..2ae7ceda 100644 Binary files a/texmf-dist/scripts/ketcindy/ketjava/KetCindyPlugin.jar and b/texmf-dist/scripts/ketcindy/ketjava/KetCindyPlugin.jar differ diff --git a/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic1logr.txt b/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic1logr.txt index 167b36e1..d815618a 100644 --- a/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic1logr.txt +++ b/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic1logr.txt @@ -1,3 +1,8 @@ +//20180408 +// Divoptions changed ( to remove null string ) +// Changework changed (nkfwin) +// Hyperbolaplot debugged +// Derivative debugged //20180405 // Ketinit changed (order of changesettiing, Dircdy) //20180402 diff --git a/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic1r.cs b/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic1r.cs index b7ba683a..f45ffee8 100644 --- a/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic1r.cs +++ b/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic1r.cs @@ -14,9 +14,9 @@ // along with this program. If not, see // -println("KETCindy V.3.2.0(20180405"); +println("KETCindy V.3.2.0(20180409)"); println(ketjavaversion());//17.06.05 -println("ketcindylibbasic1(20180402) loaded"); +println("ketcindylibbasic1(20180408) loaded"); //help:start(); @@ -108,7 +108,7 @@ Ketinit(sy,rangex,rangey):=( ); Changesetting([gethome(), gethome()+"\Desktop","C:"]); //180405 , - Changesetting([gethome(),gethome(),gethome()+"/Desktop"]); + Changesetting([gethome(),gethome()+"/Desktop"]); ); Changework(Dircdy+pathsep()+"fig"); //180329to Fnametex=Fhead+".tex"; @@ -593,6 +593,13 @@ Changework(dirorg):=( //16.10.21 closefile(SCEOUTPUT); println(setexec(Dirwork,"/kc.sh")); ); + , + if(isincludefull(Dirwork),//180408from + SCEOUTPUT = openfile("utf8.txt"); + println(SCEOUTPUT,"tmp="+Dqq(Dirwork)+";"); + closefile(SCEOUTPUT); + nkfwin("C:",Dirwork,"utf8.txt","sjis.txt");//180408to + ); ); ); ); @@ -1016,9 +1023,11 @@ Divoptions(options):=( Ltype=#; flg=1; ); - if(flg==0, - strL=append(strL,#); - opstr=opstr+","+Dq+#+Dq; + if(flg==0, + if(length(#)>0, //180408 + strL=append(strL,#); + opstr=opstr+","+Dq+#+Dq; + ); ); ); ); @@ -1450,7 +1459,6 @@ Intersectseg(seg1org,seg2org,Eps1):=( out=[-1]; , tmp=Intersectline(p1,q1-p1,p2,q2-p2); -println([1475,textformat(tmp,6)]); if(islist(tmp_1), pt=tmp_1; t=tmp_2; s=tmp_3; if((t*(t-1)0, Lineplot(nm+"asy1",[pM+[a,b],pM+[-a,-b]],["nodisp"]); Lineplot(nm+"asy2",[pM+[-a,b],pM+[a,-b]],["nodisp"]); - tmp=["ln"+nm+"asy1","ln"+nm+"asy2"]; - Rotatedata(nm+"asy",tmp,angle,append(opasy,pA)); + Rotatedata(nm+"asy1","ln"+nm+"asy1",angle,append(opasy,pA));//180408 + Rotatedata(nm+"asy2","ln"+nm+"asy2",angle,append(opasy,pA));//180408 ); ); diff --git a/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic2logr.txt b/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic2logr.txt index 3bdf66fc..6510040a 100644 --- a/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic2logr.txt +++ b/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic2logr.txt @@ -1,3 +1,8 @@ +//20180409 +// WritetoRS,Makebat changed ( "shell" used ) +//20180408 +// WritetoRS debugged ( setwd ) +// WriteoRS,Makebat changed ( use "sjis.txt") //20180405 // Makebat debugged //20180404 diff --git a/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic2r.cs b/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic2r.cs index 1b9311bd..ae40d147 100644 --- a/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic2r.cs +++ b/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic2r.cs @@ -14,7 +14,7 @@ // along with this program. If not, see // -println("ketcindybasic2(20180405) loaded"); +println("ketcindybasic2(20180409) loaded"); //help:start(); @@ -2602,8 +2602,21 @@ WritetoRS(filename,shchoice):=( , println(SCEOUTPUT,""); ); -// tmp1=replace(Dirwork,"\","/");//180403(2lines removed) -// println(SCEOUTPUT,"setwd('"+tmp1+"')"); + tmp1=replace(Dirwork,"\","/"); + if((iswindows())&(indexof(tmp1,"Users")>0), + tmp=Indexall(tmp1,"/"); + tmp2=substring(tmp1,tmp_3-1,length(tmp1)); + tmp1=substring(tmp1,0,tmp_3-1); + println(SCEOUTPUT,"Drv=shell('echo %HOMEDRIVE%',intern=TRUE)"); + println(SCEOUTPUT,"Drv=Drv[length(Drv)]"); + println(SCEOUTPUT,"Hpath=shell('echo %HOMEPATH%',intern=TRUE)"); + println(SCEOUTPUT,"Hpath=Hpath[length(Hpath)]"); + println(SCEOUTPUT,"Rest="+Dqq(tmp2)); + println(SCEOUTPUT,"Path=paste(Drv,Hpath,Rest,sep='')"); + println(SCEOUTPUT,"setwd(Path)"); + , + println(SCEOUTPUT,"setwd('"+tmp1+"')"); + );//180409to tmp=replace(Libname,"\","/"); //17.09.24from println(SCEOUTPUT,"source('"+tmp+".r')");//temporary if((indexof(PathT,"pdflatex")>0)%(indexof(PathT,"lualatex")>0), @@ -2658,7 +2671,7 @@ WritetoRS(filename,shchoice):=( tmp=text(Pnamelist); tmp=replace(tmp,"[","list("); Pnamelist=replace(tmp,"]",")"); - println(SCEOUTPUT,"PtL="+Pnamelist+";"); + println(SCEOUTPUT,"PtL="+Pnamelist); tmp=select(GCLIST,#_2==-1); GrL=apply(tmp,#_1); tmp=text(GrL); @@ -2682,10 +2695,14 @@ WritetoRS(filename,shchoice):=( println(SCEOUTPUT,""); println(SCEOUTPUT,"if(1==1){"); println(SCEOUTPUT,""); -// tmp=replace(Dirwork,"\","/"); //180403from -// tmp="Openfile('"+tmp+pathsep()+Fnametex+"','"+ULEN+"'"; - tmp="Openfile('"+Fnametex+"','"+ULEN+"'"; //180403to - tmp=tmp+",'Cdy="+text(curkernel()); //180404 + tmp1=replace(Dirwork,"\","/"); //180408to + if((iswindows())&(indexof(tmp1,"Users")>0), + println(SCEOUTPUT,"Path=paste(Path,"+Dqq("/"+Fnametex)+",sep='')"); + tmp="Openfile(Path,'"+ULEN+"'"; + , + tmp="Openfile('"+tmp1+"/"+Fnametex+"','"+ULEN+"'"; + ); + tmp=tmp+",'Cdy="+Cindyname()+".cdy"; //180404 tmp=replace(tmp,"\","\\"); println(SCEOUTPUT,tmp+"')"); forall(COM2ndlist, @@ -3114,8 +3131,16 @@ Makebat(texmainfile,flow):=( fname=substring(Dirwork,tmp,length(Dirwork)); println(SCEOUTPUT,drive); ); - tmp1=indexof(fname,"Users");//180405 - tmp2=indexof(fname,Homehead);//180403from + tmp=Dirwork;//180408form + if(iswindows(), + if((isincludefull(Dirwork))&(isexists(Dirwork,"sjis.txt")), + import("sjis.txt"); + ); + ); +// tmp=replace(tmp,"\","/"); //180408 +// println(SCEOUTPUT,"cd "+Dq+tmp+Dq); //180408 + tmp1=indexof(fname,"Users");//180409from + tmp2=indexof(fname,Homehead); if((tmp1>0)%(tmp2>0), if(tmp1>0, fname=substring(fname,tmp1+length("Users")-1,length(fname)); @@ -3126,7 +3151,7 @@ Makebat(texmainfile,flow):=( fname=substring(fname,tmp_2,length(fname)); fname="%HOMEPATH%\"+fname; );//180403to - println(SCEOUTPUT,"cd "+Dq+fname+Dq);// 150716 + println(SCEOUTPUT,"cd "+Dq+fname+Dq);//180409to flg=0; tmp=replace(PathT,"\","/"); forall(reverse(1..length(PathT)), -- cgit v1.2.3