summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibmvr.cs
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibmvr.cs')
-rwxr-xr-xMaster/texmf-dist/scripts/ketcindy/ketlib/ketcindylibmvr.cs44
1 files changed, 22 insertions, 22 deletions
diff --git a/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibmvr.cs b/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibmvr.cs
index e2d256595ef..96e79b3f532 100755
--- a/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibmvr.cs
+++ b/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibmvr.cs
@@ -14,7 +14,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>
//
-println("ketcindymv(20180615) loaded");
+println("ketcindymv(20180711) loaded");
//help:start();
@@ -24,11 +24,12 @@ Setpara(pathorg,fstr,sL,options):=
Setpara(pathorg,fstr,sL,options,optionsanim):=(
//help:Setpara("folder name","funstr","range",options,optionsanim);
//help:Setpara(folder,funstr,range,options);
-//help:Setpara(options=["m/r","Div=25"]);
+//help:Setpara(options=["Div=25"]);
//help:Setpara(options2anim1=["Frate=10","Scale=1"]);
//help:Setpara(options2anim2=["OpA=[loop,controls,buttonsize=3mm]"]);
//help:Setpara(options2anim3=["OpA=+step"]);
-//help:Setpara(options2anim4=["Mag=1600","Title=folder"]);
+//help :Setpara(options2anim4=["Mag=1600","Title=folder"]);
+//help:Setpara(options2anim4=["Title=folder"]);
regional(path,tmp,tmp1,tmp2,tmp3,eqL,ndiv,gtmp,ctmp,nn,flg);
if(length(pathorg)==0, path=Slidename,path=pathorg);//17.04.10
ParaPath=path;
@@ -66,15 +67,12 @@ Setpara(pathorg,fstr,sL,options,optionsanim):=(
COM2ndlistback=COM2ndlist;
Dirworkbkup=Dirwork; //0611from
Dirworksubbkup=Dirwork+pathsep()+ParaPath;
- Changework(Dirworksubbkup);
- Changework(Dirworkbkup);
Fheadbkup=Fhead; //0611to
gtmp=GLISTback;
tmp1=select(1..(length(gtmp)),indexof(gtmp_#,"ReadOutData")>0); //180614from
tmp2=[];tmp3=[];
if(length(tmp1)>0, //180615
nn=tmp1_(length(tmp1));
-// forall(tmp1,nn,
tmp2=append(tmp2,nn);
flg=0;
tmp=min([nn+40,length(gtmp)]);
@@ -112,9 +110,7 @@ Parafolder(fstr,sL,optionorg):=(
//help:Paraslide(para=folder:layery:pos:input,scale);
//help:Paraslide(para=folder:layery:pos:include:[width=100]);
regional(nn,tmp,tmp1,tmp2,strL,eqL,waiting,outflg,pause,
- mkr,mktex,options,sfL,dirbkup,fbkup,pfile,ctr,flg,varL);
- Changework(Dirworkbkup);
- Setfiles(Fheadbkup);
+ mkr,mktex,options,sfL,dirbkup,pfile,ctr,flg,varL,waitingR,timeC,timeR);
tmp=indexof(fstr,"(");
tmp1=substring(fstr,tmp,length(fstr));
tmp=indexof(tmp1,")");
@@ -127,7 +123,7 @@ Parafolder(fstr,sL,optionorg):=(
if(length(strL)==0,options=append(options,"m"));
mkr="A";
mktex="A";
- waiting=20;
+ waiting=30;
outflg=0;
pause=10;
forall(eqL,
@@ -153,10 +149,12 @@ Parafolder(fstr,sL,optionorg):=(
mkr="Y"; mktex="Y";
);
);
+ waitingR=min([length(sL)*waiting,120]);//180617
Changework(Dirworksubbkup);
SCEOUTPUT = openfile("all.r");
println(SCEOUTPUT,"");
closefile(SCEOUTPUT);//180608to
+ resetclock();//180617
if(outflg==1, //180606from
CommonMake=1;//180609
ctr=1;
@@ -164,21 +162,17 @@ Parafolder(fstr,sL,optionorg):=(
tmp="000000"+text(ctr);
pfile="p"+substring(tmp,length(tmp)-3,length(tmp));
Setfiles(pfile);
- Changework(Dirworksubbkup);
Movieframe(#);
- Changework(Dirworksubbkup);//180608
ctr=ctr+1;
);
CommonMake=-1;//180609
- Setfiles(fbkup);
+ Setfiles(Fheadbkup);//180617
+ timeC=seconds();//180617
); //180606to
wait(pause); //180610
-// Changework(Dirworkbkup);
sfL=[];
ctr=1;
forall(1..(length(sL)),nn,
- Changework(Dirworkbkup);//180611(2lines)
- Setfiles(Fheadbkup);
GLIST=GLISTback;
GCLIST=GCLISTback;
GOUTLIST=GOUTLISTback;
@@ -191,18 +185,17 @@ Parafolder(fstr,sL,optionorg):=(
COM2ndlist=COM2ndlistback;
tmp="000000"+text(nn);
pfile="p"+substring(tmp,length(tmp)-3,length(tmp));
- Setfiles(pfile);
Changework(Dirworksubbkup);
+ Setfiles(pfile);
sfL=append(sfL,FnameR);
if(outflg==1,
- Changework(Dirworksubbkup);//180606
- Setfiles(pfile); //180610(2lines)
wait(pause);
Movieframe(sL_nn);
Changework(Dirworksubbkup);//180606
ctr=ctr+1;
,
Movieframe(sL_nn);
+ timeC=seconds();//180617
);
CommonMake=0;//180609
Setfiles(pfile); //180608
@@ -213,8 +206,7 @@ Parafolder(fstr,sL,optionorg):=(
);
);
wait(pause); //180610
- Setfiles(fkbkup);
- Changework(Dirworksubbkup);
+ Setfiles(Fheadbkup);
GLIST=select(GLIST,indexof(#,"Projpara")==0);
tmp1=replace(Dirworksubbkup,"\\","/"); //180611
tmp1=replace(tmp1,"\","/");
@@ -250,7 +242,7 @@ Parafolder(fstr,sL,optionorg):=(
if(ErrFlag!=-1,
waiting=min([waiting,8])*length(ParaSL); //180610
if(!isexists(Dirworksubbkup,Fnametex) % mktex=="Y",
- CalcbyR("",cmdL,["Cat=n","m","Wait="+text(waiting)]);
+ CalcbyR("",cmdL,["Cat=n","m","Wait="+text(waitingR)]);
,
println("Parafolder finished");
);
@@ -258,6 +250,12 @@ Parafolder(fstr,sL,optionorg):=(
parse(after);
);
);
+ if(ErrFlag!=-1,//180617from
+ timeR=seconds()-timeC;
+ println("C and R finished");
+ println(" C : "+Sprintf(timeC,2)+" sec");
+ println(" R : "+Sprintf(timeR,2)+" sec");
+ ); //180617to
Changework(Dirworkbkup);
Setfiles(Fheadbkup);
);
@@ -304,6 +302,7 @@ Animatefile(path,folder):=(
tmp1=fileslist(tmp);
tmp1=tokenize(tmp1,",");
tmp1=select(tmp1,indexof(#,".tex")>0);
+ tmp1=sort(tmp1); //180617
texfiles=[];//180609from
forall(tmp1,
tmp=indexof(#,".");
@@ -580,6 +579,7 @@ Mkflipanime(path,folder):=(
tmp=fileslist(Dirwork+pathsep()+folder);
tmp=tokenize(tmp,",");
tmp1=select(tmp,indexof(#,".tex")>0); //180609from
+ tmp1=sort(tmp1);//180617
texfiles=[];
forall(tmp1,
tmp=indexof(#,".");