1 files changed, 16 insertions, 10 deletions
diff --git a/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylib3dr.cs b/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylib3dr.cs
index 7f378e9cd87..e4e59151022 100644
--- a/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylib3dr.cs
+++ b/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylib3dr.cs
@@ -14,7 +14,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>
 //
 
-println("ketcindylib3d(20181218) loaded");
+println("ketcindylib3d(20190128) loaded");
 
 //help:start();
 
@@ -625,7 +625,7 @@ Subgraph(name3,opcindy):=( //181029
   );
   tmp=name+"="+Textformat(sub2d,5);
   parse(tmp);
-  GCLIST=append(GCLIST,[name,0,opcindy]);
+  GCLIST=append(GCLIST,[name,[0,1],opcindy]); //190127
   sub2d;
 );
 ////%Subgraph end////
@@ -1189,6 +1189,7 @@ Xyzaxparaname(Xrange,Yrange,Zrange,options):=(
 );
 ////%Xyzax3paraname end////
 
+////%Datalist3d start////
 Datalist3d():=(
 //help:Datalist3d();
   regional(out,tmp,tmp2,tmp3);
@@ -1198,7 +1199,9 @@ Datalist3d():=(
   tmp3=apply(tmp2,replace(#,"2d","3d"));
   out=tmp3;
 );
+////%Datalist3d end////
 
+////%Datalist2d start////
 Datalist2d():=(
 //help:Datalist2d();
   regional(out,tmp,tmp2,tmp3);
@@ -1208,7 +1211,9 @@ Datalist2d():=(
 //  tmp3=apply(tmp2,replace(#,"2d","3d"));
   out=tmp2;
 );
+////%Datalist2d end////
 
+////%Embed start////
 Embed(nm,Pd2str,funstr,varstr):=
     Embed(nm,Pd2str,funstr,varstr,[]);
 Embed(nm,Pd2str,funstr,varstr,options):=(
@@ -1298,6 +1303,7 @@ Embed(nm,Pd2str,funstr,varstr,options):=(
   );
   Out;
 );
+////%Embed end////
 
 ////%Rotatepoint3d start////
 Rotate3pt(point,w1,w2):=Rotatepoint3d(point,w1,w2,[0,0,0]);
@@ -2422,18 +2428,15 @@ IntersectsgpL(name,sgstr,pLstr,optionsorg):=(
     tmp2=(ss>-Eps)&(ss<1+Eps)&(tt>-Eps)&(tt<1+Eps)&(ss+tt<1+Eps);//181029
     out=[pR,tmp1,tmp2,tseg,ss,tt]; //181027to
     tmp=ptflg_2;
-    tmp1=(tmp1)%(substring(tmp,0,1)=="e"); //181025from
+    tmp1=(tmp1)%(substring(tmp,0,1)=="i"); //190114
     tmp2=(tmp2)%(substring(tmp,1,2)=="e");
     if(tmp1&tmp2&(scrflg=="Y"), //181031
       if(ptflg_1=="P", //181025
-        Putpoint3d([name,pR]);
-        Fixpoint3d([name,pR]);
+        Putpoint3d([name,pR],"fix");
+//        Fixpoint3d([name,pR]); //190114
       ,
         Drawpoint3d(pR,options);
       ); 
-//      println("    pt"+name+" data:"+format(out,5));
-    ,
-//      println("pt"+name+" data:"+format(out,5));
     );
   ,
     println("   "+sgstr+" and "+pLstr+" may be parallel");//181025to
@@ -2933,7 +2936,8 @@ VertexEdgeFace(nm,vfnLorg,optionorg):=(
         parse(tmp);
         Defvar(vname+"2d",parse(vname+"2d"));
         if(dispflg==1, //181106
-          drawtext(parse(vname+"2d"),vname);
+          drawtext(parse(vname+"2d"),vname,size->8); //190128
+          draw(parse(vname+"2d"),pointsize->3,color->[0,1,0]); //190128
         );
       ); //180905to
     );
@@ -3385,7 +3389,7 @@ Nohiddenbyfaces(nm,segstr,faceL,vtxL,optionorg,optionsh):=(
     tmp=replace(seg,"3d","2d");
     tmp1=select(GCLIST,#_1==tmp);
     tmp1=tmp1_1;
-    if(tmp1_2==0,
+    if(tmp1_2_1==0, //190127
       tmp2=append(tmp2,seg);
     );
   );
@@ -3564,6 +3568,7 @@ Faceremovaldata(nm,vfdata,crvdata,options):=(
 );
 ////%Faceremovaldata end////
 
+////%Fullformfunc start////
 Fullformfunc(FdL):=(
   regional(Out,nn,ii,Jrg,flg,Urg,Vrg,kk,Uname,
      Zf,Xname,Xf,Yname,Yf,tmp,tmp1,tmp2);
@@ -3647,6 +3652,7 @@ Fullformfunc(FdL):=(
   tmp=[DrwS,BdyL];
   Out=concat(Out,tmp);
 );
+////%Fullformfunc end////
 
 Surffun(nm,Fd):=(
   regional(name,coord,var1,var2,rng1,rng2,bdy,tmp,tmp1,tmp2);