summaryrefslogtreecommitdiff
path: root/texmf-dist/scripts
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2017-10-19 09:51:23 +0900
committerNorbert Preining <norbert@preining.info>2017-10-19 10:03:02 +0900
commitf76c72f13e0aa3ac8b22effb55820a25381998ea (patch)
tree85178b9aa6cf51f5cfac6d0a49d4b5d58704b097 /texmf-dist/scripts
parent6ef27ece53f7ee2d8b2d34467870ca889c622d4f (diff)
ketcindy update from Takato-sensei
Diffstat (limited to 'texmf-dist/scripts')
-rwxr-xr-xtexmf-dist/scripts/ketcindy/ketcindy.sh13
-rw-r--r--texmf-dist/scripts/ketcindy/ketfiles/template.cdybin4322 -> 4370 bytes
-rw-r--r--texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic1logr.txt2
-rw-r--r--texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic1r.cs16
-rw-r--r--texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic2logr.txt3
-rw-r--r--texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic2r.cs58
-rw-r--r--texmf-dist/scripts/ketcindy/ketlib/ketcindylibmvlogr.txt2
-rw-r--r--texmf-dist/scripts/ketcindy/ketlib/ketcindylibmvr.cs40
-rw-r--r--texmf-dist/scripts/ketcindy/ketoutset.txt6
-rw-r--r--texmf-dist/scripts/ketcindy/setketcindy.txt8
10 files changed, 82 insertions, 66 deletions
diff --git a/texmf-dist/scripts/ketcindy/ketcindy.sh b/texmf-dist/scripts/ketcindy/ketcindy.sh
index 49ac4d08..fe8f8155 100755
--- a/texmf-dist/scripts/ketcindy/ketcindy.sh
+++ b/texmf-dist/scripts/ketcindy/ketcindy.sh
@@ -55,6 +55,19 @@ if [ ! -r "$plugin" ] ; then
exit 1
fi
+# check whether the .jar md5sum is fine, but don't make this an error
+myjarmd=`cat "$KetCdyJar" | md5sum`
+sysjarmd=`cat "$plugin" | md5sum`
+if [ ! "$myjarmd" = "$sysjarmd" ]
+then
+ echo "The installed version of the plugin in"
+ echo " $plugin"
+ echo "differs from the version shipped in"
+ echo " $KetCdyJar"
+ echo "You might need to update the former one with the later one!"
+fi
+
+
mkdir -p ~/ketcindy
exec "$cinderella" "$TempCdy"
diff --git a/texmf-dist/scripts/ketcindy/ketfiles/template.cdy b/texmf-dist/scripts/ketcindy/ketfiles/template.cdy
index ba10738e..1165f833 100644
--- a/texmf-dist/scripts/ketcindy/ketfiles/template.cdy
+++ b/texmf-dist/scripts/ketcindy/ketfiles/template.cdy
Binary files differ
diff --git a/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic1logr.txt b/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic1logr.txt
index 11c299d1..ea83f56d 100644
--- a/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic1logr.txt
+++ b/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic1logr.txt
@@ -1,3 +1,5 @@
+// s:2017.10.14
+// Setfiles debugged
// s:2017.10.13
// Ketinit() changed (definition of Shellparent,Shellchild)
// s:2017.10.07
diff --git a/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic1r.cs b/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic1r.cs
index 07bc68fd..e6e334eb 100644
--- a/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic1r.cs
+++ b/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic1r.cs
@@ -14,7 +14,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>
//
-println("KETCindy V.3.1.0(2017.10.13)");
+println("KETCindy V.3.1.0(2017.10.14)");
println(ketjavaversion());//17.06.05
println("ketcindylibbasic1(2017.10.13) loaded");
@@ -78,12 +78,14 @@ Ketinit(sy,rangex,rangey):=(
ADDPACK=[]; // 16.05.16
ErrFlag=0;
setdirectory(Dirwork);
- if(isstring(Fhead), // 15.04.06
- Fnametex=Fhead+".tex";
- FnameR=Fhead+".r";
- FnamebodyR=Fhead+"body.r";
- Fnameout=Fhead+".txt";
- );
+ if(!isstring(Fhead), // 17.10.13from
+ Fhead=text(curkernel());
+ Fhead=replace(Fhead,".cdy","");
+ );
+ Fnametex=Fhead+".tex";
+ FnameR=Fhead+".r";
+ FnamebodyR=Fhead+"body.r";
+ Fnameout=Fhead+".txt"; // 17.10.13upto
if(!isstring(Mackc),// 16.06.07
Mackc="sh";
);
diff --git a/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic2logr.txt b/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic2logr.txt
index 289a096c..b40ce122 100644
--- a/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic2logr.txt
+++ b/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic2logr.txt
@@ -1,5 +1,8 @@
+//2017.10.14
+// Makebat,Makeshell changed(flow="tt" supported)
//2017.10.13
// Makebat,Makeshell,Mkslides debugged (Shellfile,Sehllchild removed )
+// Makeshell debugged ( Case of no "/" )
//2017.10.08
// Mkslides debugged (Sheslide=>Shellslide )
//2017.10.07
diff --git a/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic2r.cs b/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic2r.cs
index bbb7cf44..b2c9fb93 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 <http://www.gnu.org/licenses/>
//
-println("ketcindybasic2(2017.10.11) loaded");
+println("ketcindybasic2(2017.10.13) loaded");
//help:start();
@@ -3006,8 +3006,7 @@ Makeshell(texmainfile,flow):=(
);
);
);
- // check the case where no / is found
- if(flg==0,
+ if(flg==0, // 17.10.13(Norbert)
tex=PathT;
path="";
);
@@ -3019,9 +3018,7 @@ Makeshell(texmainfile,flow):=(
if(tex=="latex" % tex=="platex" % tex=="uplatex", //17.08.13
tmp=Dq+PathT+Dq+" "+texmainfile+".tex";
println(SCEOUTPUT,tmp);
- if(indexof(Shellfile,"mv")>0,
- println(SCEOUTPUT,tmp);
- );
+ if(indexof(flow,"tt")>0,println(SCEOUTPUT,tmp)); //17.10.14
tmp=replace(Dq+PathT+Dq,tex,"dvipdfmx")+" "+texmainfile+".dvi";
println(SCEOUTPUT,tmp);
tmp="rm "+texmainfile+".dvi";
@@ -3032,25 +3029,19 @@ Makeshell(texmainfile,flow):=(
println(SCEOUTPUT,tmp);
tmp="xelatex"+" "+texmainfile+".tex";
println(SCEOUTPUT,tmp);
- if(indexof(Shellfile,"mv")>0,
- println(SCEOUTPUT,tmp);
- );
+ if(indexof(flow,"tt")>0,println(SCEOUTPUT,tmp)); //17.10.14
tmp="rm "+texmainfile+".dvi";
println(SCEOUTPUT,tmp);
);
if(tex=="pdflatex" % tex=="pdftex",//16.11.22from
tmp=Dq+PathT+Dq+" "+texmainfile+".tex";
println(SCEOUTPUT,tmp);
- if(indexof(Shellfile,"mv")>0,
- println(SCEOUTPUT,tmp);
- );
+ if(indexof(flow,"tt")>0,println(SCEOUTPUT,tmp)); //17.10.14
);//16.11.22upto
if(tex=="lualatex",//16.12.16
tmp=Dq+PathT+Dq+" "+texmainfile+".tex";
println(SCEOUTPUT,tmp);
- if(indexof(Shellfile,"mv")>0,
- println(SCEOUTPUT,tmp);
- );
+ if(indexof(flow,"tt")>0,println(SCEOUTPUT,tmp)); //17.10.14
);//16.12.16
if(!isstring(Pathpdf),
tmp="preview";
@@ -3122,15 +3113,20 @@ Makebat(texmainfile,flow):=(
);
println(SCEOUTPUT,"cd "+Dq+fname+Dq);// 15.07.16
flg=0;
+ tmp=replace(PathT,"\","/");
forall(reverse(1..length(PathT)),
if(flg==0,
- if(substring(PathT,#-1,#)=="\",
+ if(substring(tmp,#-1,#)=="/",
tex=substring(PathT,#,length(PathT));
path=substring(PathT,0,#-1);
flg=1;
);
);
);
+ if(flg==0, // 17.10.13(Norbert)
+ tex=PathT;
+ path="";
+ );
if(indexof(flow,"r")>0,
tmp=Dq+PathR+"\R"+Dq+" --vanilla --slave < "+Fhead+".r";
// 17.09.14
@@ -3139,9 +3135,7 @@ Makebat(texmainfile,flow):=(
if(tex=="latex" % tex=="platex" % tex=="uplatex", //17.08.13
tmp=Dq+PathT+Dq+" "+texmainfile+".tex";
println(SCEOUTPUT,tmp);
- if(indexof(Shellfile,"mv")>0,
- println(SCEOUTPUT,tmp);
- );
+ if(indexof(flow,"tt")>0,println(SCEOUTPUT,tmp)); //17.10.14
tmp=replace(Dq+PathT+Dq,tex,"dvipdfmx")+" "+texmainfile+".dvi";
println(SCEOUTPUT,tmp);
tmp="del "+texmainfile+".dvi";
@@ -3150,27 +3144,21 @@ Makebat(texmainfile,flow):=(
if(tex=="xelatex",
tmp="set Path = %Path%;"+Dq+path+Dq;
println(SCEOUTPUT,tmp);
+ if(indexof(flow,"tt")>0,println(SCEOUTPUT,tmp)); //17.10.14
tmp="xelatex"+" "+texmainfile+".tex";
println(SCEOUTPUT,tmp);
- if(indexof(Shellfile,"mv")>0,
- println(SCEOUTPUT,tmp);
- );
tmp="del "+texmainfile+".dvi";
println(SCEOUTPUT,tmp);
);
if(tex=="pdflatex" % tex=="pdftex",//16.11.22from
tmp=Dq+PathT+Dq+" "+texmainfile+".tex";
println(SCEOUTPUT,tmp);
- if(indexof(Shellfile,"mv")>0,
- println(SCEOUTPUT,tmp);
- );
+ if(indexof(flow,"tt")>0,println(SCEOUTPUT,tmp)); //17.10.14
);//16.11.22upto
if(tex=="lualatex",//16.12.16
tmp=Dq+PathT+Dq+" "+texmainfile+".tex";
println(SCEOUTPUT,tmp);
- if(indexof(Shellfile,"mv")>0,
- println(SCEOUTPUT,tmp);
- );
+ if(indexof(flow,"tt")>0,println(SCEOUTPUT,tmp)); //17.10.14
);//16.12.16
if(!isstring(Pathpdf),
tmp=indexof(PathS,"\scilab");// 15.12.12
@@ -4714,16 +4702,14 @@ Mkslides():=(
regional(sep,parent,texparentorg,tmp,tmp1,tmp2,tmp3,tmp4,flg);
tmp4=Fhead;
Fhead="";
- if(length(Shellparent)>0, // 16.05.29
- sep="/";
- Dirwork=replace(Dirwork,"\",sep);
- parent=replace(Dirwork+Shellparent,"\",sep);// 16.05.29
+ if(!iswindows(), //17.10.13
+ Dirwork=replace(Dirwork,"\",pathsep());
+ parent=replace(Dirwork+Shellparent,"\",pathsep());
,
- sep="\";
- Dirwork=replace(Dirwork,"/",sep);
- parent=replace(Dirwork+Batparent,"/",sep);// 16.05.29
+ Dirwork=replace(Dirwork,"/",pathsep());
+ parent=replace(Dirwork+Batparent,"/",pathsep());// 16.05.29
);
- Dirwork=replace(Dirwork,sep+"fig","");
+ Dirwork=replace(Dirwork,pathsep()+"fig","");
Setdirectory(Dirwork);
if(length(Texmain)>0, // 15.08.14 from
Texparent=Texmain;
diff --git a/texmf-dist/scripts/ketcindy/ketlib/ketcindylibmvlogr.txt b/texmf-dist/scripts/ketcindy/ketlib/ketcindylibmvlogr.txt
index 674d30e2..dc3c8d58 100644
--- a/texmf-dist/scripts/ketcindy/ketlib/ketcindylibmvlogr.txt
+++ b/texmf-dist/scripts/ketcindy/ketlib/ketcindylibmvlogr.txt
@@ -1,3 +1,5 @@
+//2017.10.14
+// Mkanimation changed ("Rem=" option added)
//2017.10.13
// Ketinitmv changed (Shellfile removed)
// Parafolder debugged
diff --git a/texmf-dist/scripts/ketcindy/ketlib/ketcindylibmvr.cs b/texmf-dist/scripts/ketcindy/ketlib/ketcindylibmvr.cs
index d34f9fd8..b2905ecb 100644
--- a/texmf-dist/scripts/ketcindy/ketlib/ketcindylibmvr.cs
+++ b/texmf-dist/scripts/ketcindy/ketlib/ketcindylibmvr.cs
@@ -550,7 +550,7 @@ Setpara(pathorg,fstr,sL,options):=(
ParaFstr=fstr;
ParaSL=sL;
ParaOp=options;
- GLISTback=GLIST;
+ GLISTback=GLIST;
GCLISTback=GCLIST;
GOUTLISTback=GOUTLIST;
POUTLISTback=POUTLIST;
@@ -632,11 +632,12 @@ Parafolder(path,fstr,sLorg,optionorg):=(
);
,
if(mkr=="Y",
+ tmp1=replace(Dirwork,"\","/");//17.10.13
cmdL=[
- "setwd",[Dq+Dirwork+pathsep()+path+Dq],
+ "setwd",[Dq+tmp1+"/"+path+Dq],
"fL=as.matrix(list.files())",[],
"apply",["fL",2,"file.remove"],
- "setwd",[Dq+Dirwork+Dq],
+ "setwd",[Dq+tmp1+Dq],
];
CalcbyR("rvf",cmdL,["Cat=n","m"]);
tmp=Dirwork+pathsep()+path;
@@ -664,16 +665,16 @@ Parafolder(path,fstr,sLorg,optionorg):=(
FnameR=path+"/p"+tmp1+".r";
sfL=append(sfL,FnameR);
Fnametex=replace(FnameR,".r",".tex");
- Movieframe(sL_nn);
+ Movieframe(sL_nn); //17.10.13
if(!isexists(Dirwork,FnameR) % mkr=="Y",
if(ErrFlag!=-1,
Viewtex();
);
);
);
- tmp1=replace(Dirwork+pathsep()+path,"\","/"); //17.10.13
+ tmp1=replace(Dirwork,"\","/"); //17.10.13
cmdL=[
- "setwd",[Dq+tmp1+Dq],
+ "setwd",[Dq+tmp1+"/"+path+Dq],
"Mkallfile=function(fname){",[],
" Ctr<<- Ctr+1",[],
" cat('print(',Ctr,')\n',file='all.r',append=TRUE)",[],
@@ -698,7 +699,7 @@ Parafolder(path,fstr,sLorg,optionorg):=(
"proc.time()-t",[],
"source('all.r')",[],
"proc.time()-t",[],
- "setwd",[Dq+Dirwork+Dq]
+ "setwd",[Dq+tmp1+Dq]
];
if(ErrFlag!=-1,
if(!isexists(Dirwork,Fnametex) % mktex=="Y",
@@ -777,6 +778,7 @@ Animatefile(path,folder):=(
FRate="10";
Scale="1";
OpA="";
+ remflg=0;
forall(eqL,
tmp1=Toupper(substring(#,0,2));
tmp=indexof(#,"=");
@@ -822,13 +824,12 @@ Animatefile(path,folder):=(
println(fname+" has been generated");
);
-Mkanimation():=( // 17.10.08
- if(!isexists(Dirwork,ParaPath),
+Mkanimation():=(
+ regional(remflg,tmp,eqL,tmp1,tmp2);
+ if(!isexists(Dirwork,ParaPath), //17.10.14from
Parafolder();
);
- if(!isexists(Dirwork,"anim"+ParaPath+".tex"),
- Animatefile();
- );
+ Animatefile(); //17.10.14upto
Mkanimation("fig",ParaPath);
);
Mkanimation(folder):=Mkanimation("fig",folder);
@@ -847,8 +848,12 @@ Mkanimation(path,folder):=(
Dirwork=replace(Dirwork,pathsep()+"fig","");
Setdirectory(Dirwork);
tmp1=replace(PathT,pathsep(),"/");
- tmp=indexall(tmp1,pathsep());
- tex=substring(tmp1,tmp_(length(tmp)),length(tmp1));
+ tmp=indexall(tmp1,"/");//17.10.14from
+ if(length(tmp)>0,
+ tex=substring(tmp1,tmp_(length(tmp)),length(tmp1));
+ ,
+ tex=tmp1;
+ );//17.10.14upto
if((tex=="platex")%(tex=="uplatex"),
if(tex=="platex",article="jarticle",article="ujarticle");
,
@@ -901,18 +906,19 @@ Mkanimation(path,folder):=(
closefile(SCEOUTPUT);
if(iswindows(),
parent=replace(Dirwork+Batparent,pathsep()+"fig","");
- Makebat(Fhead,"tv");
+ Makebat(Fhead,"ttv");
kc():=(
println("kc : "+kc(parent,Dirlib,Fnametex))
);
+ kc();
,
parent=replace(Dirwork+Shellparent,pathsep()+"fig","");
- Makeshell(Fhead,"tv");
+ Makeshell(Fhead,"ttv");
kc():=(
println("kc : "+kc(parent,Mackc+Dirlib,Fnametex));
);
+ kc();
);
- kc();
Dirwork=Dirworkbkup;
Dirwork=Dirwork+pathsep()+"fig";
setdirectory(Dirwork);
diff --git a/texmf-dist/scripts/ketcindy/ketoutset.txt b/texmf-dist/scripts/ketcindy/ketoutset.txt
index 81cb65c1..6f2d739f 100644
--- a/texmf-dist/scripts/ketcindy/ketoutset.txt
+++ b/texmf-dist/scripts/ketcindy/ketoutset.txt
@@ -47,11 +47,11 @@ if(ismacosx(),
PathF="/Applications/FriCAS.app/Contents/Resources/bin/fricas";
// PathAd="Adobe Reader";
PathAd="/Applications/Adobe Acrobat Reader DC.app/Contents/MacOS/AdobeReader";
-// Mackc="sh";
- Mackc="open";
+ Mackc="sh";
+// Mackc="open";
);
if(islinux(),
- PathT="uplatex";
+ PathT="platex";
PathS="scilab";
Pathpdf="evince";
// Pathpdf="/usr/bin/xpdf";
diff --git a/texmf-dist/scripts/ketcindy/setketcindy.txt b/texmf-dist/scripts/ketcindy/setketcindy.txt
index 10792513..74080ace 100644
--- a/texmf-dist/scripts/ketcindy/setketcindy.txt
+++ b/texmf-dist/scripts/ketcindy/setketcindy.txt
@@ -1,11 +1,11 @@
-// e:2017.10.13
+// e:2017.10.14
Dirlib=ketcindydir+pathsep()+"ketlib";
Libname=Dirlib+pathsep()+"ketpic5_2_3";
LibnameS=Dirlib+pathsep()+"ketpicsciL5";
DirlibC=ketcindydir+pathsep()+"ketlibC";
-Dirwork=Dirhead;
+Dirwork=Dirhead+pathsep()+"ketwork";
tmp=Dirhead;
-println(makedir(Dirwork));
+println(makedir(Dirhead,"ketwork"));
setdirectory(Dirlib);
import("ketcindylibbasic1r.cs");
import("ketcindylibbasic2r.cs");
@@ -13,3 +13,5 @@ import("ketcindyliboutr.cs");
import("ketcindylib3dr.cs");
import("ketcindylibmvr.cs");
+setdirectory(Dirhead);
+