diff options
Diffstat (limited to 'Master/texmf-dist/scripts/ketcindy/ketlib/ketpiccurrent.r')
-rwxr-xr-x | Master/texmf-dist/scripts/ketcindy/ketlib/ketpiccurrent.r | 61 |
1 files changed, 32 insertions, 29 deletions
diff --git a/Master/texmf-dist/scripts/ketcindy/ketlib/ketpiccurrent.r b/Master/texmf-dist/scripts/ketcindy/ketlib/ketpiccurrent.r index 160710e857b..b177e4245bb 100755 --- a/Master/texmf-dist/scripts/ketcindy/ketlib/ketpiccurrent.r +++ b/Master/texmf-dist/scripts/ketcindy/ketlib/ketpiccurrent.r @@ -16,10 +16,14 @@ ######################################### -ThisVersion<- "KeTpic for R v5_2_4(20181024)" +ThisVersion<- "KeTpic for R v5_2_4(20181128)" print(ThisVersion) +# 20181128 +# Objthicksurf debugged +# 20181031 +# space before # removed # 20181024 # Wireparadata debugged ( for DuL(DvL)=c(..) ) # Nohiddenpara2 debugged (for SeL=Null ) @@ -964,8 +968,8 @@ Arrowdata<- function(...) # 2013.11.13 No Intersect debugged Arrowhead<-function(...){ - ## Scaling is implemented - ## 12.01.08 Kirikomi +## Scaling is implemented +## 12.01.08 Kirikomi Eps=10^(-3) varargin<-list(...) Nargs<-length(varargin) @@ -11954,25 +11958,25 @@ Objsurf<- function(...){ #17.12.18 Objthicksurf<- function(...){ Args=list(...) Nargs=length(Args) - Sel=Args[[Nargs]]; Nargs=Nargs-1 + Sel=Args[[Nargs]]; Nargs=Nargs-1 #181128from Selsurf=substring(Sel,1,1) Selside=c("0","0","0","0") - Tmp=grep("w",Sel,fixed=TRUE) - if(length(Tmp)>0){ - Selside[1]="w" - } - Tmp=grep("e",Sel,fixed=TRUE) - if(length(Tmp)>0){ - Selside[2]="e" - } - Tmp=grep("s",Sel,fixed=TRUE) - if(length(Tmp)>0){ - Selside[3]="s" - } - Tmp=grep("n",Sel,fixed=TRUE) - if(length(Tmp)>0){ - Selside[4]="n" - } + Tmp=strsplit(Sel,"w");Tmp=Tmp[[1]] + if(length(Tmp)==2){ + Selside[[1]]=substr(Tmp[2],1,1) + } + Tmp=strsplit(Sel,"e");Tmp=Tmp[[1]] + if(length(Tmp)==2){ + Selside[[2]]=substr(Tmp[2],1,1) + } + Tmp=strsplit(Sel,"s");Tmp=Tmp[[1]] + if(length(Tmp)==2){ + Selside[[3]]=substr(Tmp[2],1,1) + } + Tmp=strsplit(Sel,"n");Tmp=Tmp[[1]] + if(length(Tmp)==2){ + Selside[[4]]=substr(Tmp[2],1,1) + } #181128to Nfth=Args[[Nargs-2]] Thick1=Args[[Nargs-1]] Thick2=Args[[Nargs]] @@ -12058,21 +12062,20 @@ Objthicksurf<- function(...){ } Dt2=Objsurf(F2,U,V,Tmp); Out=list(Dt1,Dt2); - - if(Selside[1]!="0"){ - Dt=Objrecs(Op(3,Dt1),Op(3,Dt2),Selside[1]) + if(Selside[[1]]!="0"){ + Dt=Objrecs(Op(3,Dt1),Op(3,Dt2),Selside[[1]]) Out=c(Out,list(Dt)) } - if(Selside[2]!="0"){ - Dt=Objrecs(Op(4,Dt1),Op(4,Dt2),Selside[2]) + if(Selside[[2]]!="0"){ + Dt=Objrecs(Op(4,Dt1),Op(4,Dt2),Selside[[2]]) Out=c(Out,list(Dt)) } - if(Selside[3]!="0"){ - Dt=Objrecs(Op(5,Dt1),Op(5,Dt2),Selside[3]) + if(Selside[[3]]!="0"){ + Dt=Objrecs(Op(5,Dt1),Op(5,Dt2),Selside[[3]]) Out=c(Out,list(Dt)) } - if(Selside[4]!="0"){ - Dt=Objrecs(Op(6,Dt1),Op(6,Dt2),Selside[4]) + if(Selside[[4]]!="0"){ + Dt=Objrecs(Op(6,Dt1),Op(6,Dt2),Selside[[4]]) Out=c(Out,list(Dt)) } OBJJOIN<<- Join |