summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/support/ketcindy
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-09-27 21:24:30 +0000
committerKarl Berry <karl@freefriends.org>2019-09-27 21:24:30 +0000
commit7706488325e08b8a6855e0fd9177c94da72acae6 (patch)
treefdaf77b2a5bd22d2ac09b28cb205eddf1c9f18ba /Master/texmf-dist/doc/support/ketcindy
parent58751f3663f58918a53bfa57291c4032c14b583f (diff)
ketcindy (27sep19)
git-svn-id: svn://tug.org/texlive/trunk@52190 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/support/ketcindy')
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/README2
-rwxr-xr-xMaster/texmf-dist/doc/support/ketcindy/forMac/setketcindy.command17
-rwxr-xr-xMaster/texmf-dist/doc/support/ketcindy/forWindows/setketcindyothertex.bat159
-rwxr-xr-xMaster/texmf-dist/doc/support/ketcindy/forWindows/setketcindytexlive.bat6
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/ketcindyjs/3dlist.txt169
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic1list.txt299
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic2list.txt194
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic3list.txt92
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/ketcindyjs/ignoredfun.txt5
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/ketcindyjs/makefunlist.cdybin5516 -> 5570 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/ketmanual/KeTCindyReferenceE.pdfbin2028322 -> 2035361 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/ketmanual/KeTCindyReferenceJ.pdfbin2658951 -> 2665964 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1010fourier.cdybin4971 -> 4976 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/source/ketmanual/KeTCindyReferenceE.tex177
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/source/ketmanual/KeTCindyReferenceJ.tex186
15 files changed, 909 insertions, 397 deletions
diff --git a/Master/texmf-dist/doc/support/ketcindy/README b/Master/texmf-dist/doc/support/ketcindy/README
index 3fa9e656c92..168cbe9a775 100644
--- a/Master/texmf-dist/doc/support/ketcindy/README
+++ b/Master/texmf-dist/doc/support/ketcindy/README
@@ -1,7 +1,7 @@
KeTCindy
========
-Version: 20190624.0
+Version: 20190927.0
KeTCindy combines a plugin to Cinderella with free mathematical software
(R, Maxima, ...) to produce high-quality LaTeX graphics.
diff --git a/Master/texmf-dist/doc/support/ketcindy/forMac/setketcindy.command b/Master/texmf-dist/doc/support/ketcindy/forMac/setketcindy.command
index 469553fb25f..f6c36b14438 100755
--- a/Master/texmf-dist/doc/support/ketcindy/forMac/setketcindy.command
+++ b/Master/texmf-dist/doc/support/ketcindy/forMac/setketcindy.command
@@ -1,7 +1,7 @@
#!/bin/sh
-# 20190616
+# 20190824
-# Edit and uncomment the following lines if necessary
+# Edit, uncomment the following lines and choose 4 if necessary
#texpath=/Applications/kettex/texlive
#texbinpath=${texpath}/bin/x86_64-darwin
#ketcindyscripts=${texpath}/texmf-dist/scripts/ketcindy
@@ -28,8 +28,8 @@ echo `pwd ` will be used
echo 1. "/Applications/kettex/texlive".
echo 2. "/Applications/kettex.app/texlive"
echo 3. "/Library/TeX (TeXLive)"
-echo 4. Modification of this file is finished
-read -p 'Choose path of TeX from the above (number) : ' ans
+echo 4. Other
+read -p 'Choose number from the above (number) : ' ans
if [ ${ans} = "1" ]; then
texpath=/Applications/kettex/texlive
texbinpath=${texpath}/bin/x86_64-darwin
@@ -51,6 +51,15 @@ if [ ${ans} = "3" ]; then
ketcindydoc=${texpath}/texmf-dist/doc/support/ketcindy
ketcindystyle=${texpath}/texmf-dist/tex/latex/ketcindy
fi
+if [ ${ans} = "4" ]; then
+ read -p ' Input texpath (/Library/TeX/Root) : ' texpath
+ read -p ' Input texbinpath (bin/x86_64-darwin) : ' binpath
+ texbinpath=${texpath}/${binpath}
+ read -p ' Input scriptspath (texmf-dist) : ' scriptspath
+ ketcindyscripts=${texpath}/${scriptspath}/scripts/ketcindy
+ ketcindydoc=${texpath}/${scriptspath}/doc/support/ketcindy
+ ketcindystyle=${texpath}/${scriptspath}/tex/latex/ketcindy
+fi
echo texpath=${texpath}
echo texbinpath=${texbinpath}
#read -p 'Do you really copy ketcindyscripts? (y,n): ' ans
diff --git a/Master/texmf-dist/doc/support/ketcindy/forWindows/setketcindyothertex.bat b/Master/texmf-dist/doc/support/ketcindy/forWindows/setketcindyothertex.bat
new file mode 100755
index 00000000000..4b35d0c9e8a
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/forWindows/setketcindyothertex.bat
@@ -0,0 +1,159 @@
+REM 20190904
+echo off
+
+set prgcin=C:\Program Files (x86)
+set xcp="\Windows\System32\xcopy"
+if not exist "%prgcin%\Cinderella" (
+ set prgcin=C:\Program Files
+)
+NET SESSION > NUL 2>&1
+if %ERRORLEVEL% == 0 (
+ echo Running as administator
+ set admin="y"
+) else (
+ echo Not running as administator, so will quit
+ echo Right-click and rerun as adminstrator
+ set admin="n"
+ pause
+ exit
+)
+
+set /P pathT="Path of TeX (ex) C:\texlive\2019: "
+set /P bin="Path of bin (ex) bin\win32: "
+set /P texmf="Path of scripts/doc/style (ex) texmf-dist: "
+set /P homehead="Path of home head (ex) C:\Users: "
+
+echo Path of TeX ; %pathT%
+echo bin : %bin%
+echo scripts : %texmf%\scripts\ketcindy
+echo style : %texmf%\tex\latex\ketcindy
+echo doc : %texmf%\doc\support\ketcindy
+echo Head of home : %homehead%
+set /P ans="Are the above paths OK (y/n): "
+if "%ans%" == "n" (
+ echo Edit paths
+ pause
+ exit
+)
+
+cd %~dp0
+if not exist "ketcindyfolder" (
+ cd ../ketcindyfolder
+)
+echo ketcindyfolder is
+cd
+
+if exist "%pathT%\%texmf%\scripts\ketcindy\." (
+ echo Deleting "%pathT%\%texmf%\scripts\ketcindy"
+ rd /s "%pathT%\%texmf%\scripts\ketcindy"
+)
+echo Copying ketcindy to "%pathT%\%texmf%\scripts\ketcindy"
+%xcp% /Y /Q /S /E /R "scripts\*.*" "%pathT%\%texmf%\scripts\ketcindy\"
+if exist "%pathT%\%texmf%\doc\support\ketcindy\." (
+ echo Deleting docs to "%pathT%\%texmf%\doc\support\ketcindy"
+ rd /s "%pathT%\%texmf%\doc\support\ketcindy"
+)
+echo Copying doc to "%pathT%\%texmf%\doc\support\ketcindy"
+set docsrc=doc
+%xcp% /Y /Q /S /E /R "%docsrc%\*.*" "%pathT%\%texmf%\doc\support\ketcindy\"
+if exist "%pathT%\tex\latex\ketcind\." (
+ echo Deleting "%pathT%\tex\latex\ketcindy"
+ rd /s "%pathT%\tex\latex\ketcindy"
+)
+echo Copying ketcindy styles to "%pathT%\tex\latex\ketcindy"
+set stylesrc=style
+%xcp% /Y /Q /S /E /R "%stylesrc%\*.*" "%pathT%\tex\latex\ketcindy\"
+
+rem "%pathT%%bin%\mktexlsr"
+set cindyplug=%prgcin%\Cinderella\Plugins
+echo Setting of "%cindyplug%\"
+cd "%pathT%%scripts%"
+copy /Y "ketjava\KetCindyPlugin.jar" "%cindyplug%\"
+cd "%cindyplug%"
+
+rem 20190616from
+set newfile=y
+if exist ketcindy.ini (
+ set newfile=n
+ echo Contentes of ketcindy.ini :
+ echo.
+ type ketcindy.ini
+ echo.
+ set /P remake="Do you want to remake ketindy.ini? (y/n): "
+)
+if "%newfile%"=="y" (
+ set remake=y
+)
+if "%remake%"=="y" (
+ echo ketcindy.ini will be made/remade
+) else (
+ echo "Finished"
+ pause
+ exit
+)
+rem 20190616to
+
+echo PathThead="%pathT%\%bin%\"; > ketcindy.ini
+echo Homehead="%homehead%"; >> ketcindy.ini
+echo Dirhead="%pathT%\%texmf%\scripts\ketcindy"; >> ketcindy.ini
+echo setdirectory(Dirhead); >> ketcindy.ini
+echo import("setketcindy.txt"); >> ketcindy.ini
+echo import("ketoutset.txt"); >> ketcindy.ini
+
+echo Setting of TeX, R, Maxima
+echo p=platex u=uplatex l=latex x=xelatex pd=pdflatex lu=lualatex
+set /P STR_INPUT="---- Choose TeX from above with 1st(+2nd) character :"
+if "%STR_INPUT%" == "p" (
+ set tex=platex
+)
+if "%STR_INPUT%" == "u" (
+ set tex=uplatex
+)
+if "%STR_INPUT%" == "l" (
+ set tex=latex
+)
+if "%STR_INPUT%" == "x" (
+ set tex=xelatex
+)
+if "%STR_INPUT%" == "pd" (
+ set tex=pdflatex
+)
+if "%STR_INPUT%" == "lu" (
+ set tex=lualatex
+)
+echo PathT=PathThead+"%tex%"; >> ketcindy.ini
+
+set prgSm=C:\Program Files (x86)\SumatraPDF\SumatraPDF.exe
+if not exist "%prgSm%" (
+ set prgSm=C:\Program Files\SumatraPDF\SumatraPDF.exe
+)
+echo Pathpdf="%prgSm%"; >> ketcindy.ini
+
+set /P STR_INPUT="Input version of R (ex)3.5.0 :"
+set verR=%STR_INPUT%
+set prg=C:\Program Files
+if exist "%prg%\R\R-%verR%\bin\" (
+ echo PathR="%prg%\R\R-%verR%\bin"; >> ketcindy.ini
+) else (
+ if exist "%prg% (x86)\R\R-%verR%\bin\" (
+ echo "%prg% (x86)\R\R-%verR%\bin"; >> ketcindy.ini
+ ) else (
+ echo "R-%verR% not found"
+ )
+)
+
+set /P STR_INPUT="Input version of Maxima (ex)5.39.0 :"
+set verM=%STR_INPUT%
+echo %verM%
+set prg=C:\maxima-%verM%\bin\maxima.bat
+if exist "%prg%" (
+ echo PathM="%prg%"; >> ketcindy.ini
+) else (
+ echo "Maxima-%verM% not found"
+ set prg=C:\maxima-x.xx.x\bin\maxima.bat
+ echo // PathM="%prg%"; >> ketcindy.ini
+ )
+)
+
+echo "Plugins of Cindy has been set"
+pause
diff --git a/Master/texmf-dist/doc/support/ketcindy/forWindows/setketcindytexlive.bat b/Master/texmf-dist/doc/support/ketcindy/forWindows/setketcindytexlive.bat
index 9dd1ce8c64c..e872a00b087 100755
--- a/Master/texmf-dist/doc/support/ketcindy/forWindows/setketcindytexlive.bat
+++ b/Master/texmf-dist/doc/support/ketcindy/forWindows/setketcindytexlive.bat
@@ -1,4 +1,4 @@
-REM 20190616
+REM 20190904
echo off
rem Edit the followings if necessary
@@ -26,7 +26,7 @@ if %ERRORLEVEL% == 0 (
exit
)
-set /P year="Year of TeXLive (YYYY): "
+set /P year="Year of TeXLive (ex)2019: "
echo Path of TeX ; %pathT%\%year%
echo bin : %bin%
@@ -68,7 +68,7 @@ if exist "%pathT%\%year%%style%\." (
echo Copying ketcindy styles to "%pathT%\%year%%style%"
set stylesrc=style
%xcp% /Y /Q /S /E /R "%stylesrc%\*.*" "%pathT%\%year%%style%\"
-"%pathT%\%year%%bin%\mktexlsr"
+rem "%pathT%\%year%%bin%\mktexlsr"
set cindyplug=%prgcin%\Cinderella\Plugins
echo Setting of "%cindyplug%\"
diff --git a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/3dlist.txt b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/3dlist.txt
index 340efcf9f04..d96abad8e46 100644
--- a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/3dlist.txt
+++ b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/3dlist.txt
@@ -1,84 +1,85 @@
-Ketinit3d,3d,22,50,Setwindow,Addax
-Start3d,3d,54,162,Strsplit,Toupper,Setfiles,Setwindow,Slider,Sprintf,Ptselected,Ptseg3data
-Setangle,3d,166,237,Parapt,Ptselected,Xyzcoord,Defvar,Datalist3d,Projpara,textformat,Ptseg3data
-Getangle,3d,241,259,getangle,divoptions,Strsplit,181111,Toupper,textformat
-Angleselected,3d,263,264,IsAngle
-Isangle,3d,268,268,Ptselected
-Changestyle3d,3d,272,291,Changestyle
-Dist3d,3d,295,314
-Findangle,3d,318,335
-Cancoordpara,3d,339,347
-Zparapt,3d,351,355
-Projcoordpara,3d,359,364,Parapt,Zparapt
-Parapt,3d,368,374
-Parasubpt,3d,378,384
-Parasubptlog,3d,388,393
-Mainsubpt3d,3d,397,415
-Projcurve,3d,419,469,Measuredepth
-Projpara,3d,473,542,Divoptions,Strsplit,Toupper,Projcurve,textformat,Com2nd,Getlinestyle,Texcom
-Invparaptpp,3d,546,601,textformat,Projpara,Nearestpt,Crossprod,Dotprod,Ptend,Numptcrv,Ptcrv
-Invparapt,3d,605,609,Invparaptpp
-Subgraph,3d,613,630,Measuredepth,Parasubpt,Textformat
-Spaceline,3d,634,727,Divoptions,Toupper,Projpara,Textformat,Com2nd,Getlinestyle,Texcom,Subgraph
-Spacecurve,3d,731,897,Divoptions,Toupper,tmpfn,Projpara,textformat,Com2nd,Getlinestyle,Texcom,Subgraph
-Partcrv3d,3d,901,937,parapt,partcrv,Xyzcoord,Spaceline
-Joincrvs3d(,3d,941,1036,Joincrvs3d,Divoptions,Norm,Projpara,textformat,Com2nd,Getlinestyle,Texcom,Subgraph
-Xyzax3data,3d,1040,1166,Divoptions,Strsplit,Toupper,Spaceline,Xyzaxparaname,Projpara,textformat,Com2nd,Getlinestyle,Texcom,Lightarrowdata,Letter,Parapt,Subgraph
-Xyzaxparaname,3d,1170,1212,Strsplit,Dqq,Parapt,Expr
-Datalist3d,3d,1216,1224
-Datalist2d,3d,1228,1236
-Embed,3d,1240,1328,Measuredepth,Divoptions,Assign,Projpara,textformat,Com2nd,Getlinestyle,Texcom,Subgraph
-Rotatepoint3d,3d,1332,1418,Rotate3pt,Measuredepth
-Rotatedata3d,3d,1422,1492,Divoptions,Rotatepoint3d,Flattenlist,Projpara,textformat,RSform,Textformat,Com2nd,Getlinestyle,Texcom,Subgraph
-Translatepoint3d,3d,1496,1523,Translate3pt,Measuredepth
-Translatedata3d,3d,1527,1589,Divoptions,Measuredepth,Translatepoint3d,Flattenlist,Projpara,RSform,textformat,Com2nd,Getlinestyle,Texcom,Subgraph
-Reflectpoint3d,3d,1593,1617,Reflect3pt,Crossprod,Dotprod
-Reflectdata3d,3d,1621,1686,Divoptions,Reflectpoint3d,Flattenlist,textformat,Projpara,RSform,Textformat,Com2nd,Getlinestyle,Texcom,Subgraph
-Scalepoint3d,3d,1691,1708,Scale3pt
-Scaledata3d,3d,1713,1782,Divoptions,Scalepoint3d,Flattenlist,textformat,Projpara,RSform,Textformat,Com2nd,Getlinestyle,Texcom,Subgraph
-Xyzcoord,3d,1786,1792,Mainsubpt3d
-Putoncurve3d,3d,1796,1812,PutonCurve,Nearestpt,Paramoncurve,Pointoncurve,Xyzcoord,textformat,Defvar
-Mkpointlist,3d,1816,1933,Workprocess,Finddef,Norm,Parapt,Parasubpt,Putpoint,Mainsubpt3d,Defvar,Ptselected
-Mkseg3d,3d,1937,1981,Divoptions,Finddef,Spaceline
-Ptseg3data,3d,1985,2020,Ptselected,Parapt,Parasubpt,Mainsubpt3d,Defvar,Mkpointlist,Mkseg3d
-Putonseg3d,3d,2024,2076,divoptions,Putonseg,Putpoint,Parapt,Textformat,Parasubpt,Xyzcoord,Defvar
-Putpoint3d,3d,2080,2138,Toupper,Xyzcoord,Defvar,Parapt,Putpoint,Parasubpt,Fixpoint3d
-Fixpoint3d,3d,2142,2159,Defvar,Parapt,textformat
-Letter3d,3d,2163,2183,Parapt,Letter
-Expr3d,3d,2187,2207,Parapt,Expr
-Perppt,3d,2211,2267,Putperp,Crossprod,IntersectsgpL,Dotprod,Defvar,Putpoint3d,Fixpoint3d,Drawpoint3d
-Perpplane,3d,2271,2312,findangle,Cancoordpara,Toupper,Putpoint3d,Defvar,Drawpoint3d
-Drawpoint3d,3d,2316,2332,Divoptions,Measuredepth,Parapt,Textformat,Parasubpt
-Pointdata3d,3d,2336,2345,Measuredepth,Parapt,Pointdata
-Putaxes3d,3d,2349,2360,Putpoint3d
-IntersectsgpL,3d,2364,2481,Divoptions,Strsplit,Toupper,Crossprod,Reflectpoint3d,Dotprod,Putpoint3d,Drawpoint3d,Textformat
-Bezier3d,3d,2485,2582,Measuredepth,Bezier3,Divoptions,Toupper,Assign,Spacecurve,Projpara,textformat,RSform,Getlinestyle,Com2nd,Subgraph
-Putbezier3data,3d,2586,2624,Divoptions,Putpoint3d
-Mkbezierptcrv3d,3d,2628,2648,Mkbezierptcrv3,Putbezier3data,Bezier3
-Readobj,3d,2686,2788,Divoptions,Toupper,Removespace
-Concatobj,3d,2792,2862,divoptions,Toupper,dist3d
-VertexEdgeFace,3d,2899,2862
-Vertexedgeface,3d,2904,3085,Divoptions,Strsplit,Toupper,Parapt,Putpoint3d,Defvar,Dqq,Changestyle3d,Spaceline,Textformat
-Phparadata,3d,3089,3191,Divoptions,Getlinestyle,Com2nd,Changestyle3d,Drawlinetype,Toupper
-Nohiddenseg,3d,3195,3324,Parapt,Dotprod,Cancoordpara,IntersectsgpL,Projcoordpara,Intersectcrvspp,Crossprod
-Nohiddensegs,3d,3328,3363,Nohiddenseg
-Nohiddenbyfaces,3d,3367,3516,Datalist3d,Divoptions,Strsplit,Toupper,Changestyle3d,MeasureDepth,Nohiddensegs,Spaceline
-Faceremovaldata,3d,3520,3603,Divoptions,Getlinestyle,Com2nd,Measuredepth,Changestyle3d,Drawlinetype,Toupper
-Fullformfunc,3d,3607,3689,Removespace
-Surffun,3d,3693,3709,Fullformfunc,Deffun
-Sf3data,3d,3713,3797,Surffun,Divoptions,Toupper,textformat,Spacecurve
-SfbdparadataR,3d,3801,3887,ConvertFdtoC,Divoptions,Toupper,Select,MkprecommandR,textformat,RSform,Dqq,CalcbyR,ReadOutData,Extractdata,Projpara
-Addpoints,3d,3891,3906,RSform,textformat
-CrvsfparadataR,3d,3910,4012,Changestyle,Divoptions,Toupper,RSform,Select,MkprecommandR,Addpoints,textformat,Rsform,Dqq,CalcbyR,ReadOutData,Extractdata,Projpara
-Crv3onsfparadataR,3d,4016,4116,Crvs3onfparadataR,Changestyle3d,Changestyle,Divoptions,Toupper,RSform,Select,MkprecommandR,textformat,Rsform,Dqq,Addpoints,CalcbyR,ReadOutData,Extractdata,Projpara
-Crv2onsfparadataR,3d,4120,4221,Crvs2onfparadataR,Changestyle,Divoptions,Toupper,RSform,Select,MkprecommandR,textformat,Rsform,Dqq,Addpoints,CalcbyR,ReadOutData,Extractdata,Projpara
-WireparadataR,3d,4225,4326,Divoptions,Toupper,Select,MkprecommandR,RSform,textformat,Rsform,Dqq,Addpoints,CalcbyR,ReadOutData,Extractdata,Projpara
-IntersectcrvsfR,3d,4330,4418,Intersectcrvsf,Divoptions,Toupper,RSform,textformat,Rsform,Dqq,CalcbyR,ReadOutData
-SfcutparadataR,3d,4422,4519,Strsplit,Changestyle,Divoptions,Toupper,RSform,Select,MkprecommandR,textformat,Rsform,Dqq,CalcbyR,ReadOutData,Extractdata,Projpara
-Skeletonparadata,3d,4525,4529,Skeletondatacindy
-Skeletondatacindy,3d,4533,4722,Datalist3d,Divoptions,Strsplit,Toupper,Anyselected,Flattenlist,isexists,ReadOutData,Textformat,Projcoordcurve,Makeskeletondata,Norm,Ptcrv,Invparapt,Projcurve,textformat,Changestyle3d,Getlinestyle,Com2nd,Subgraph,WriteOutData
-Makeskeletondata,3d,4726,4928,Columnlist,Intersectcrvspp,Op,column,Dotprod,Norm,Kukannozoku,Pointoncurve,Listplot
-Kukannozoku,3d,4932,4983
-Projcoordcurve,3d,4989,5003
-Divnohidhid,3d,5007,5070,Divoptions,Toupper,assign,Dotprod,Changestyle3d,Spaceline,textformat
-Beziersurf,3d,5074,5129,factorial,Deffun,Op,Bterm,Defvar
+Ketinit3d,3d,22,57,Setwindow,Addax,Slider,Sprintf
+Start3d,3d,61,170,Strsplit,Toupper,Setfiles,Setwindow,Slider,Sprintf,Ptselected,Ptseg3data
+Setangle,3d,174,245,Parapt,Ptselected,Xyzcoord,Defvar,Datalist3d,Projpara,textformat,Ptseg3data
+Getangle,3d,249,267,getangle,divoptions,Strsplit,181111,Toupper,textformat
+Angleselected,3d,271,272,IsAngle
+Isangle,3d,276,276,Ptselected
+Changestyle3d,3d,280,299,Changestyle
+Dist3d,3d,303,322
+Findangle,3d,326,343
+Cancoordpara,3d,347,355
+Zparapt,3d,359,363
+Projcoordpara,3d,367,372,Parapt,Zparapt
+Parapt,3d,376,382
+Parasubpt,3d,386,392
+Parasubptlog,3d,396,401
+Mainsubpt3d,3d,405,423
+Projcurve,3d,427,477,Measuredepth
+Projpara,3d,481,550,Divoptions,Strsplit,Toupper,Projcurve,textformat,Com2nd,Getlinestyle,Texcom
+Invparaptpp,3d,554,609,textformat,Projpara,Nearestpt,Crossprod,Dotprod,Ptend,Numptcrv,Ptcrv
+Invparapt,3d,613,617,Invparaptpp
+Subgraph,3d,621,638,Measuredepth,Parasubpt,Textformat
+Spaceline,3d,642,735,Divoptions,Toupper,Projpara,Textformat,Com2nd,Getlinestyle,Texcom,Subgraph
+Spacecurve,3d,739,905,Divoptions,Toupper,tmpfn,Projpara,textformat,Com2nd,Getlinestyle,Texcom,Subgraph
+Partcrv3d,3d,909,945,parapt,partcrv,Xyzcoord,Spaceline
+Joincrvs3d(,3d,949,1044,Joincrvs3d,Divoptions,Norm,Projpara,textformat,Com2nd,Getlinestyle,Texcom,Subgraph
+Xyzax3data,3d,1048,1174,Divoptions,Strsplit,Toupper,Spaceline,Xyzaxparaname,Projpara,textformat,Com2nd,Getlinestyle,Texcom,Lightarrowdata,Letter,Parapt,Subgraph
+Xyzaxparaname,3d,1178,1220,Strsplit,Dqq,Parapt,Expr
+Datalist3d,3d,1224,1232
+Datalist2d,3d,1236,1244
+Embed,3d,1248,1336,Measuredepth,Divoptions,Assign,Projpara,textformat,Com2nd,Getlinestyle,Texcom,Subgraph
+Rotate3pt,3d,1340,1341,Rotatepoint3d
+Rotatepoint3d,3d,1344,1429,Measuredepth
+Rotatedata3d,3d,1433,1503,Divoptions,Rotatepoint3d,Flattenlist,Projpara,textformat,RSform,Textformat,Com2nd,Getlinestyle,Texcom,Subgraph
+Translatepoint3d,3d,1507,1534,Translate3pt,Measuredepth
+Translatedata3d,3d,1538,1600,Divoptions,Measuredepth,Translatepoint3d,Flattenlist,Projpara,RSform,textformat,Com2nd,Getlinestyle,Texcom,Subgraph
+Reflectpoint3d,3d,1604,1628,Reflect3pt,Crossprod,Dotprod
+Reflectdata3d,3d,1632,1697,Divoptions,Reflectpoint3d,Flattenlist,textformat,Projpara,RSform,Textformat,Com2nd,Getlinestyle,Texcom,Subgraph
+Scalepoint3d,3d,1702,1719,Scale3pt
+Scaledata3d,3d,1724,1793,Divoptions,Scalepoint3d,Flattenlist,textformat,Projpara,RSform,Textformat,Com2nd,Getlinestyle,Texcom,Subgraph
+Xyzcoord,3d,1797,1803,Mainsubpt3d
+Putoncurve3d,3d,1807,1823,PutonCurve,Nearestpt,Paramoncurve,Pointoncurve,Xyzcoord,textformat,Defvar
+Mkpointlist,3d,1827,1944,Workprocess,Finddef,Norm,Parapt,Parasubpt,Putpoint,Mainsubpt3d,Defvar,Ptselected
+Mkseg3d,3d,1948,1992,Divoptions,Finddef,Spaceline
+Ptseg3data,3d,1996,2031,Ptselected,Parapt,Parasubpt,Mainsubpt3d,Defvar,Mkpointlist,Mkseg3d
+Putonseg3d,3d,2035,2087,divoptions,Putonseg,Putpoint,Parapt,Textformat,Parasubpt,Xyzcoord,Defvar
+Putpoint3d,3d,2091,2149,Toupper,Xyzcoord,Defvar,Parapt,Putpoint,Parasubpt,Fixpoint3d
+Fixpoint3d,3d,2153,2170,Defvar,Parapt,textformat
+Letter3d,3d,2174,2194,Parapt,Letter
+Expr3d,3d,2198,2218,Parapt,Expr
+Perppt,3d,2222,2278,Putperp,Crossprod,IntersectsgpL,Dotprod,Defvar,Putpoint3d,Fixpoint3d,Drawpoint3d
+Perpplane,3d,2282,2332,Divoptions,Toupper,findangle,Cancoordpara,Putpoint3d,Defvar,Pointdata3d
+Drawpoint3d,3d,2336,2352,Divoptions,Measuredepth,Parapt,Textformat,Parasubpt
+Pointdata3d,3d,2356,2370,Measuredepth,Parapt,Pointdata,Defvar
+Putaxes3d,3d,2374,2385,Putpoint3d
+IntersectsgpL,3d,2389,2506,Divoptions,Strsplit,Toupper,Crossprod,Reflectpoint3d,Dotprod,Putpoint3d,Drawpoint3d,Textformat
+Bezier3d,3d,2510,2607,Measuredepth,Bezier3,Divoptions,Toupper,Assign,Spacecurve,Projpara,textformat,RSform,Getlinestyle,Com2nd,Subgraph
+Putbezier3data,3d,2611,2649,Divoptions,Putpoint3d
+Mkbezierptcrv3d,3d,2653,2673,Mkbezierptcrv3,Putbezier3data,Bezier3
+Readobj,3d,2711,2813,Divoptions,Toupper,Removespace
+Concatobj,3d,2817,2887,divoptions,Toupper,dist3d
+VertexEdgeFace,3d,2924,2925,Vertexedgeface
+Vertexedgeface,3d,2929,3110,Divoptions,Strsplit,Toupper,Parapt,Putpoint3d,Defvar,Dqq,Changestyle3d,Spaceline,Textformat
+Phparadata,3d,3114,3216,Divoptions,Getlinestyle,Com2nd,Changestyle3d,Drawlinetype,Toupper
+Nohiddenseg,3d,3220,3349,Parapt,Dotprod,Cancoordpara,IntersectsgpL,Projcoordpara,Intersectcrvspp,Crossprod
+Nohiddensegs,3d,3353,3388,Nohiddenseg
+Nohiddenbyfaces,3d,3392,3541,Datalist3d,Divoptions,Strsplit,Toupper,Changestyle3d,MeasureDepth,Nohiddensegs,Spaceline
+Faceremovaldata,3d,3545,3628,Divoptions,Getlinestyle,Com2nd,Measuredepth,Changestyle3d,Drawlinetype,Toupper
+Fullformfunc,3d,3632,3714,Removespace
+Surffun,3d,3718,3734,Fullformfunc,Deffun
+Sf3data,3d,3738,3822,Surffun,Divoptions,Toupper,textformat,Spacecurve
+SfbdparadataR,3d,3826,3912,ConvertFdtoC,Divoptions,Toupper,Select,MkprecommandR,textformat,RSform,Dqq,CalcbyR,ReadOutData,Extractdata,Projpara
+Addpoints,3d,3916,3931,RSform,textformat
+CrvsfparadataR,3d,3935,4037,Changestyle,Divoptions,Toupper,RSform,Select,MkprecommandR,Addpoints,textformat,Rsform,Dqq,CalcbyR,ReadOutData,Extractdata,Projpara
+Crv3onsfparadataR,3d,4041,4141,Crvs3onfparadataR,Changestyle3d,Changestyle,Divoptions,Toupper,RSform,Select,MkprecommandR,textformat,Rsform,Dqq,Addpoints,CalcbyR,ReadOutData,Extractdata,Projpara
+Crv2onsfparadataR,3d,4145,4246,Crvs2onfparadataR,Changestyle,Divoptions,Toupper,RSform,Select,MkprecommandR,textformat,Rsform,Dqq,Addpoints,CalcbyR,ReadOutData,Extractdata,Projpara
+WireparadataR,3d,4250,4351,Divoptions,Toupper,Select,MkprecommandR,RSform,textformat,Rsform,Dqq,Addpoints,CalcbyR,ReadOutData,Extractdata,Projpara
+IntersectcrvsfR,3d,4355,4443,Intersectcrvsf,Divoptions,Toupper,RSform,textformat,Rsform,Dqq,CalcbyR,ReadOutData
+SfcutparadataR,3d,4447,4544,Strsplit,Changestyle,Divoptions,Toupper,RSform,Select,MkprecommandR,textformat,Rsform,Dqq,CalcbyR,ReadOutData,Extractdata,Projpara
+Skeletonparadata,3d,4550,4554,Skeletondatacindy
+Skeletondatacindy,3d,4558,4747,Datalist3d,Divoptions,Strsplit,Toupper,Anyselected,Flattenlist,isexists,ReadOutData,Textformat,Projcoordcurve,Makeskeletondata,Norm,Ptcrv,Invparapt,Projcurve,textformat,Changestyle3d,Getlinestyle,Com2nd,Subgraph,WriteOutData
+Makeskeletondata,3d,4751,4953,Columnlist,Intersectcrvspp,Op,column,Dotprod,Norm,Kukannozoku,Pointoncurve,Listplot
+Kukannozoku,3d,4957,5008
+Projcoordcurve,3d,5014,5028
+Divnohidhid,3d,5032,5095,Divoptions,Toupper,assign,Dotprod,Changestyle3d,Spaceline,textformat
+Beziersurf,3d,5099,5154,factorial,Deffun,Op,Bterm,Defvar
diff --git a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic1list.txt b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic1list.txt
index 20063af4614..9ed585fb1bf 100644
--- a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic1list.txt
+++ b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic1list.txt
@@ -1,149 +1,150 @@
-Ketinit,basic1,41,172,Fillstore,Cindyname,Indexall,getname,iswindows,ismacosx,Changesetting,Changework,pathsep,Setwindow
-Initglist,basic1,176,187
-Setglist,basic1,191,197
-Addglist,basic1,201,207
-Fillstore,basic1,211,244
-Fillblack,basic1,248,262,Fillstore
-Fillrestore,basic1,266,278
-Readlines,basic1,282,293,readfile2str
-Changesetting,basic1,297,312,pathsep,getname,isexists
-Cindyname,basic1,316,323,Cdyname,Getcdyname
-Setwindow,basic1,327,364,Toupper,Lcrd,Pcrd,Putpoint
-Setfiles,basic1,368,381,Dqq
-Setparent,basic1,385,397,Dqq
-Dqq,basic1,401,401,DqDq
-DqDq,basic1,404,407
-PPa,basic1,411,412
-PaO,basic1,416,428
-PaC,basic1,432,444
-PPa,basic1,448,448
-Tab2list,basic1,452,514,Divoptions,Toupper,Indexall
-Columnlist,basic1,518,521
-Dispmat,basic1,525,547
-Sep1000,basic1,551,569
-Acos,basic1,573,576
-Asin,basic1,580,583
-Atan,basic1,587,590
-Sqr,basic1,594,597
-Factorial,basic1,601,609
-Norm,basic1,613,625
-Removespace,basic1,630,655
-Indexall,basic1,659,677
-Strsplit,basic1,681,692,Indexall
-Parlevel,basic1,696,696,Bracket
-Bracket,basic1,699,721,Indexall
-Pardiagram,basic1,725,821,Divoptions,Toupper,Bracket,Listplot,Letter,Expr
-Changework,basic1,825,883,Divoptions,Strsplit,Toupper,Indexall,isexists,Dqq,makedir,pathsep,iswindows,iskcexists,setexec
-Changestyle,basic1,887,919,Divoptions,Com2nd,Getlinestyle,Texcom
-Op,basic1,923,935
-Ptselected,basic1,939,955,Isptselected
-Finddef,basic1,959,978
-Findgeoinfo,basic1,982,1007,Finddef
-Dependgeo,basic1,1011,1031,Finddef
-Workprocess,basic1,1035,1039,Drawprocess
-Drawprocess,basic1,1042,1087,Divoptions,Strsplit,Toupper,Dependgeo
-Sortpointlist,basic1,1091,1123
-Toupper,basic1,1127,1142
-Textformat,basic1,1146,1170
-Sprintf,basic1,1174,1191,Textformat
-Replaceall,basic1,1195,1205
-Assign,basic1,1209,1266,Textformat
-Measuredepth,basic1,1297,1310,Indexall
-Flattenlist,basic1,1314,1334,Measuredepth
-Divoptions,basic1,1338,1441,Strsplit,Toupper,Colorcmyk2rgb,Colorname2rgb
-Dotprod,basic1,1445,1451
-Crossprod,basic1,1455,1467
-Mvprod,basic1,1471,1489,Measuredepth
-Ptstart,basic1,1493,1498
-Ptend,basic1,1502,1507
-Numptcrv,basic1,1511,1516
-Ptcrv,basic1,1520,1525
-Invert,basic1,1529,1542,Listplot
-Paramoncrv,basic1,1546,1546,Paramoncurve
-Paramoncurve,basic1,1549,1575,Nearestpt,LLcrd
-Pointoncrv,basic1,1579,1579,Pointoncurve
-Pointoncurve,basic1,1582,1600
-Koutenseg,basic1,1604,1712
-Intersectcrvspp,basic1,1718,1861,Divoptions,Measuredepth,LLcrd,Koutenseg
-Intersectcrvs,basic1,1865,1871,Intersectcrvspp
-Intersectline,basic1,1879,1901,Dotprod,Crossprod
-Intersectseg,basic1,1905,2005,Op,Intersectline,Nearestpt
-Osplineseg,basic1,2009,2026,Dotprod,Bezier
-Intersectpartseg,basic1,2030,2132,Crossprod,Norm,Reflectpoint,Osplineseg,Intersectseg,Op,Intersectline
-Collectsameseg,basic1,2136,2178
-Intersectcurvespp,basic1,2182,2288,LLcrd,Intersectpartseg,Collectsameseg,Nearestpt
-Intersectcurves,basic1,2292,2299,Intersectcurvesop
-Nearestptcrvphy,basic1,2305,2314,Pcrd,Measuredepth,Nearestpt
-Nearestptcrv,basic1,2318,2324,Nearestpt
-Nearestpt,basic1,2328,2381,Measuredepth,Paramoncurve
-Derivative,basic1,2385,2476,Strsplit,Lineplot,Intersectcurvespp,Pointoncurve,Dotprod,Divoptions,Toupper,PaO,Pcrd,Assign
-Tangentplot,basic1,2480,2527,Divoptions,Strsplit,Toupper,Intersectcurvespp,Derivative,Lineplot
-Integrate,basic1,2531,2544,Integratefn,Integratedt
-Integratedt,basic1,2548,2580,Divoptions,Toupper,IntegrateO,Measuredepth,MeetCurve,LLcrd
-Integratefn,basic1,2584,2644,Divoptions,Toupper,Strsplit,Assign,IntegrateO,Textformat
-IntegrateO,basic1,2648,2727,Measuredepth,Meetcurve,LLcrd,Dotprod
-FindareaP,basic1,2731,2744,Lcrd
-FindareaO,basic1,2748,2769,Dist,IntegrateO
-Findarea,basic1,2773,2799,Divoptions,Strsplit,Toupper,FindareaO,FindareaP
-Findlength,basic1,2803,2815,Lcrd
-Inversefun,basic1,2819,2842,Textformat
-Com0th,basic1,2846,2850
-Com1st,basic1,2854,2859
-Com2nd,basic1,2863,2868
-Com2ndpre,basic1,2872,2876
-Texcom,basic1,2880,2887,Com2nd
-Ketcindylogo,basic1,2891,2895,Com2nd
-Drwline,basic1,2899,2902,Textformat,Com2nd
-Dashline,basic1,2907,2909,Com2nd
-Invdashline,basic1,2913,2915,Com2nd
-Dottedline,basic1,2919,2921,Com2nd
-Drawlinetype,basic1,2925,2946,Toupper,Drwline,Dashline,Invdashline,Dottedline
-Setunitlen,basic1,2950,3002
-Setmarklen,basic1,3006,3010,Com2nd,Textformat
-Setorigin,basic1,3014,3018,Com2nd,Textformat
-Fontsize,basic1,3022,3025,Com2nd
-Setpen,basic1,3029,3033,Com2nd
-Setscaling,basic1,3037,3051,Com0th,Setwindow
-Lcrd,basic1,3055,3063
-Pcrd,basic1,3067,3075
-LLcrd,basic1,3079,3088
-Doscaling,basic1,3092,3119,Lcrd,LLcrd
-Unscaling,basic1,3123,3150,Lcrd,LLcrd
-Setpt,basic1,3154,3160,Ptsize,Com2nd
-Definecolor,basic1,3164,3172,Texcom
-Setcolor,basic1,3176,3203,Colorcmyk2rgb,Com2nd
-Colorrgb2cmyk,basic1,3207,3219
-Colorcmyk2rgb,basic1,3223,3230
-Colorrgbhsv,basic1,3234,3266
-Colorhsvrgb,basic1,3270,3284
-Colorrgbhsl,basic1,3288,3324
-Colorhslrgb,basic1,3328,3349,Hue2rgb
-Hue2rgb,basic1,3353,3371
-Colorrgbhwb,basic1,3375,3381,Colorrgbhsl,Colorcode
-Colorhwbrgb,basic1,3385,3410
-Colorcode,basic1,3414,3427,Colorrgb2cmyk,Colorcmyk2rgb,Colorrgbhsv,Colorrgbhsl,Colorrgbhwb,Colorhsvrgb,Colorhslrgb,Colorhwbrgb
-Colorname2rgb,basic1,3431,3481,Colorcmyk2rgb,Assign
-Getlinestyle,basic1,3485,3551,Drwline,Dashline,Invdashline,Dottedline,Textformat,Drwpt
-Chunderscore,basic1,3555,3590,PaO
-AddGraph,basic1,3594,3694,Divoptions,Flattenlist,Pcrd,Measuredepth,PaO,Textformat,Com2nd,Getlinestyle,Texcom
-Joincrvs,basic1,3698,3794,LLcrd,Divoptions,Numptcrv,Ptstart,Ptend,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom
-Partcrv,basic1,3798,3887,Measuredepth,Divoptions,Numptcrv,Ptstart,Ptend,Joincrvs,Nearestpt,LLcrd,Pcrd,Textformat,Lcrd,Com2nd,Getlinestyle,Texcom
-Opcrvs,basic1,3891,3899,Listplot
-Pointdata,basic1,3903,4026,Strsplit,Divoptions,Toupper,Lcrd,Measuredepth,Pcrd,PaO,Texcom,Textformat,Com2nd
-Listplot,basic1,4030,4111,Divoptions,Strsplit,Toupper,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom,Lcrd
-Lineplot,basic1,4115,4198,Strsplit,Toupper,Divoptions,Lcrd,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom
-Plotdata,basic1,4202,4407,Divoptions,Strsplit,PaO,Dqq,Toupper,Assign,Norm,Measuredepth,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom
-Paramplot,basic1,4411,4583,Divoptions,Strsplit,PaO,Dqq,Toupper, differs from Scilab ,Assign,Measuredepth,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom
-Polarplot,basic1,4587,4596,Strsplit,Paramplot
-Connectseg,basic1,4600,4662,Norm
-Implicitplot,basic1,4666,4849,Divoptions,Strsplit,Toupper,Impfun,Connectseg,Measuredepth,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom
-Circledata,basic1,4853,4972,Divoptions,Strsplit,Toupper,Lcrd,Defvar,Lineplot,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom
-Framedata,basic1,4976,5028,Measuredepth,LLcrd,Divoptions,Lcrd,Listplot
-Framedata2,basic1,5032,5039,Lcrd,Framedata
-Ovaldata,basic1,5043,5113,Divoptions,Lcrd,Listplot,Circledata,Reflectdata,Joincrvs,Com2nd,Getlinestyle,Texcom,Pcrd,Textformat
-Segmark,basic1,5117,5177,Drawsegmark,Divoptions,Toupper,Circledata,Listplot
-Parabolaplot,basic1,5181,5221,Lcrd,Rotatepoint,Textformat,Plotdata,Rotatedata
-Ellipseplot,basic1,5225,5268,Lcrd,Rotatepoint,Paramplot,Rotatedata
-Hyperbolaplot,basic1,5272,5336,Divoptions,Toupper,Lcrd,Rotatepoint,Paramplot,Lineplot,Rotatedata
-Polygonplot,basic1,5340,5386,Divoptions,Strsplit,Toupper,Lcrd,Putpoint,Listplot
-Putintersect,basic1,5390,5418,Intersectcrvs,Putpoint
+Ketinit,basic1,41,178,Fillstore,Cindyname,Indexall,getname,iswindows,ismacosx,Changesetting,Changework,pathsep,Setwindow,Strictmove
+Initglist,basic1,182,185,Ketinit
+Setglist,basic1,189,195
+Addglist,basic1,199,205
+Fillstore,basic1,209,242
+Fillblack,basic1,246,260,Fillstore
+Fillrestore,basic1,264,276
+Readlines,basic1,280,291,readfile2str
+Changesetting,basic1,295,310,pathsep,getname,isexists
+Cindyname,basic1,314,321,Cdyname,Getcdyname
+Setwindow,basic1,325,362,Toupper,LLcrd,Putpoint,Ptpos,Strictmove,Pcrd
+Setfiles,basic1,366,379,Dqq
+Setparent,basic1,383,395,Dqq
+Reparse,basic1,399,409
+Dqq,basic1,413,413,DqDq
+DqDq,basic1,416,419
+PPa,basic1,423,424
+PaO,basic1,428,440
+PaC,basic1,444,456
+PPa,basic1,460,460
+Tab2list,basic1,464,526,Divoptions,Toupper,Indexall
+Columnlist,basic1,530,533
+Dispmat,basic1,537,559
+Sep1000,basic1,563,581
+Acos,basic1,585,588
+Asin,basic1,592,595
+Atan,basic1,599,602
+Sqr,basic1,606,609
+Factorial,basic1,613,621
+Norm,basic1,625,637
+Removespace,basic1,642,667
+Indexall,basic1,671,689
+Strsplit,basic1,693,704,Indexall
+Parlevel,basic1,708,708,Bracket
+Bracket,basic1,711,733,Indexall
+Pardiagram,basic1,737,833,Divoptions,Toupper,Bracket,Listplot,Letter,Expr
+Changework,basic1,837,895,Divoptions,Strsplit,Toupper,Indexall,isexists,Dqq,makedir,pathsep,iswindows,iskcexists,setexec
+Changestyle,basic1,899,931,Divoptions,Com2nd,Getlinestyle,Texcom
+Op,basic1,935,947
+Ptselected,basic1,951,967,|mouse
+Finddef,basic1,971,990
+Findgeoinfo,basic1,994,1019,Finddef
+Dependgeo,basic1,1023,1043,Finddef
+Workprocess,basic1,1047,1051,Drawprocess
+Drawprocess,basic1,1054,1099,Divoptions,Strsplit,Toupper,Dependgeo
+Sortpointlist,basic1,1103,1135
+Toupper,basic1,1139,1154
+Textformat,basic1,1158,1182
+Sprintf,basic1,1186,1203,Textformat
+Replaceall,basic1,1207,1217
+Assign,basic1,1221,1284,Textformat
+Measuredepth,basic1,1315,1328,Indexall
+Flattenlist,basic1,1332,1352,Measuredepth
+Divoptions,basic1,1356,1459,Strsplit,Toupper,Colorcmyk2rgb,Colorname2rgb
+Dotprod,basic1,1463,1469
+Crossprod,basic1,1473,1485
+Mvprod,basic1,1489,1507,Measuredepth
+Ptstart,basic1,1511,1516
+Ptend,basic1,1520,1525
+Numptcrv,basic1,1529,1534
+Ptcrv,basic1,1538,1543
+Invert,basic1,1547,1560,Listplot
+Paramoncrv,basic1,1564,1564,Paramoncurve
+Paramoncurve,basic1,1567,1593,Nearestpt,LLcrd
+Pointoncrv,basic1,1597,1597,Pointoncurve
+Pointoncurve,basic1,1600,1618
+Koutenseg,basic1,1622,1731
+Intersectcrvspp,basic1,1737,1880,Divoptions,Measuredepth,LLcrd,Koutenseg
+Intersectcrvs,basic1,1884,1890,Intersectcrvspp
+Intersectline,basic1,1898,1920,Dotprod,Crossprod
+Intersectseg,basic1,1924,2024,Op,Intersectline,Nearestpt
+Osplineseg,basic1,2028,2045,Dotprod,Bezier
+Intersectpartseg,basic1,2049,2151,Crossprod,Norm,Reflectpoint,Osplineseg,Intersectseg,Op,Intersectline
+Collectsameseg,basic1,2155,2197
+Intersectcurvespp,basic1,2201,2307,LLcrd,Intersectpartseg,Collectsameseg,Nearestpt
+Intersectcurves,basic1,2311,2318,Intersectcurvespp,190917
+Nearestptcrvphy,basic1,2324,2333,Pcrd,Measuredepth,Nearestpt
+Nearestptcrv,basic1,2337,2343,Nearestpt
+Nearestpt,basic1,2347,2400,Measuredepth,Paramoncurve
+Derivative,basic1,2404,2495,Strsplit,Lineplot,Intersectcurvespp,Pointoncurve,Dotprod,Divoptions,Toupper,PaO,Pcrd,Assign
+Tangentplot,basic1,2499,2546,Divoptions,Strsplit,Toupper,Intersectcurvespp,Derivative,Lineplot
+Integrate,basic1,2550,2563,Integratefn,Integratedt
+Integratedt,basic1,2567,2599,Divoptions,Toupper,IntegrateO,Measuredepth,MeetCurve,LLcrd
+Integratefn,basic1,2603,2663,Divoptions,Toupper,Strsplit,Assign,IntegrateO,Textformat
+IntegrateO,basic1,2667,2746,Measuredepth,Meetcurve,LLcrd,Dotprod
+FindareaP,basic1,2750,2763,Lcrd
+FindareaO,basic1,2767,2788,Dist,IntegrateO
+Findarea,basic1,2792,2818,Divoptions,Strsplit,Toupper,FindareaO,FindareaP
+Findlength,basic1,2822,2834,Lcrd
+Inversefun,basic1,2838,2861,Textformat
+Com0th,basic1,2865,2869
+Com1st,basic1,2873,2878
+Com2nd,basic1,2882,2887
+Com2ndpre,basic1,2891,2895
+Texcom,basic1,2899,2906,Com2nd
+Ketcindylogo,basic1,2910,2914,Com2nd
+Drwline,basic1,2918,2921,Textformat,Com2nd
+Dashline,basic1,2926,2928,Com2nd
+Invdashline,basic1,2932,2934,Com2nd
+Dottedline,basic1,2938,2940,Com2nd
+Drawlinetype,basic1,2944,2965,Toupper,Drwline,Dashline,Invdashline,Dottedline
+Setunitlen,basic1,2969,3021
+Setmarklen,basic1,3025,3029,Com2nd,Textformat
+Setorigin,basic1,3033,3037,Com2nd,Textformat
+Fontsize,basic1,3041,3044,Com2nd
+Setpen,basic1,3048,3052,Com2nd
+Setscaling,basic1,3056,3070,Com0th,Setwindow
+Lcrd,basic1,3074,3082
+Pcrd,basic1,3086,3094
+LLcrd,basic1,3098,3107
+Doscaling,basic1,3111,3138,Lcrd,LLcrd
+Unscaling,basic1,3142,3169,Lcrd,LLcrd
+Setpt,basic1,3173,3179,Ptsize,Com2nd
+Definecolor,basic1,3183,3191,Texcom
+Setcolor,basic1,3195,3222,Colorcmyk2rgb,Com2nd
+Colorrgb2cmyk,basic1,3226,3238
+Colorcmyk2rgb,basic1,3242,3249
+Colorrgbhsv,basic1,3253,3285
+Colorhsvrgb,basic1,3289,3303
+Colorrgbhsl,basic1,3307,3343
+Colorhslrgb,basic1,3347,3368,Hue2rgb
+Hue2rgb,basic1,3372,3390
+Colorrgbhwb,basic1,3394,3400,Colorrgbhsl,Colorcode
+Colorhwbrgb,basic1,3404,3429
+Colorcode,basic1,3433,3446,Colorrgb2cmyk,Colorcmyk2rgb,Colorrgbhsv,Colorrgbhsl,Colorrgbhwb,Colorhsvrgb,Colorhslrgb,Colorhwbrgb
+Colorname2rgb,basic1,3450,3500,Colorcmyk2rgb,Assign
+Getlinestyle,basic1,3504,3569,Toupper,Drwline,Dashline,Invdashline,Dottedline,Textformat,Drwpt
+Chunderscore,basic1,3573,3608,PaO
+AddGraph,basic1,3612,3712,Divoptions,Flattenlist,Pcrd,Measuredepth,PaO,Textformat,Com2nd,Getlinestyle,Texcom
+Joincrvs,basic1,3716,3812,LLcrd,Divoptions,Numptcrv,Ptstart,Ptend,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom
+Partcrv,basic1,3816,3905,Measuredepth,Divoptions,Numptcrv,Ptstart,Ptend,Joincrvs,Nearestpt,LLcrd,Pcrd,Textformat,Lcrd,Com2nd,Getlinestyle,Texcom
+Opcrvs,basic1,3909,3917,Listplot
+Pointdata,basic1,3921,4065,Divoptions,Strsplit,Colorcmyk2rgb,Colorname2rgb,Toupper,Lcrd,Measuredepth,Pcrd,PaO,Texcom,Textformat,Com2nd
+Listplot,basic1,4069,4150,Divoptions,Strsplit,Toupper,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom,Lcrd
+Lineplot,basic1,4154,4237,Strsplit,Toupper,Divoptions,Lcrd,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom
+Plotdata,basic1,4241,4446,Divoptions,Strsplit,PaO,Dqq,Toupper,Assign,Norm,Measuredepth,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom
+Paramplot,basic1,4450,4622,Divoptions,Strsplit,PaO,Dqq,Toupper, differs from Scilab ,Assign,Measuredepth,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom
+Polarplot,basic1,4626,4635,Strsplit,Paramplot
+Connectseg,basic1,4639,4701,Norm
+Implicitplot,basic1,4705,4888,Divoptions,Strsplit,Toupper,Impfun,Connectseg,Measuredepth,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom
+Circledata,basic1,4892,5011,Divoptions,Strsplit,Toupper,Lcrd,Defvar,Lineplot,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom
+Framedata,basic1,5015,5067,Measuredepth,LLcrd,Divoptions,Lcrd,Listplot
+Framedata2,basic1,5071,5078,Lcrd,Framedata
+Ovaldata,basic1,5082,5152,Divoptions,Lcrd,Listplot,Circledata,Reflectdata,Joincrvs,Com2nd,Getlinestyle,Texcom,Pcrd,Textformat
+Segmark,basic1,5156,5216,Drawsegmark,Divoptions,Toupper,Circledata,Listplot
+Parabolaplot,basic1,5220,5260,Lcrd,Rotatepoint,Textformat,Plotdata,Rotatedata
+Ellipseplot,basic1,5264,5307,Lcrd,Rotatepoint,Paramplot,Rotatedata
+Hyperbolaplot,basic1,5311,5375,Divoptions,Toupper,Lcrd,Rotatepoint,Paramplot,Lineplot,Rotatedata
+Polygonplot,basic1,5379,5425,Divoptions,Strsplit,Toupper,Lcrd,Putpoint,Listplot
+Putintersect,basic1,5429,5457,Intersectcrvs,Putpoint
diff --git a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic2list.txt b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic2list.txt
index 32e67feb5c2..0e6e2a577c9 100644
--- a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic2list.txt
+++ b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic2list.txt
@@ -1,97 +1,99 @@
Drwfigs,basic2,22,24,Drawfigures
-Drawfigures,basic2,28,87,Divoptions,Strsplit,Toupper,Measuredepth,Pointdata,Listplot,Dqq
-Setarrow,basic2,91,117
-Arrowheaddata,basic2,121,214,Divoptions,Strsplit,Toupper,Touppera,Measuredepth,Nearestpt,|Ptend,Ptstart,Numptcrv,Ptcrv,LLcrd,Intersectcrvspp,Pcrd
-Arrowhead,basic2,218,310,Strsplit,Toupper,Measuredepth,Pcrd,Arrowheaddata,Inwindow,Listplot,Divoptions,Dqq,Textformat,LLcrd,Com2nd,Texcom
-Arrowdata,basic2,314,428,Divoptions,Strsplit,Toupper,Pcrd,Textformat,Listplot,LLcrd,Arrowhead,Setscaling,Lcrd
-Lightarrowdata,basic2,432,547,Pcrd,Divoptions,Strsplit,Toupper,Listplot,Textformat,LLcrd,Com2nd,Texcom,Setscaling,Lcrd
-Anglemark,basic2,551,684,Divoptions,Indexall,Strsplit,Dqq,Toupper,Lcrd,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom
-Paramark,basic2,688,798,Divoptions,Indexall,Strsplit,Dqq,Toupper,Lcrd,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom
-Makebowdata,basic2,802,815,Lcrd,Rotatepoint
-Bowdata,basic2,819,990,Divoptions,Lcrd,Strsplit,Toupper,Makebowdata,Defvar,Norm,LLcrd,Dqq,Measuredepth,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom
-Bowname,basic2,994,997,Expr
-Bownamerot,basic2,1001,1015,Measuredepth,Ptend,Ptstart,Exprrot
-Deqdata,basic2,1019,1077,funP,Lcrd,funN
-Deqplot,basic2,1081,1225,Lcrd,Divoptions,Toupper,Indexall,Deqdata,Pcrd,Assign,Textformat,RSform,Com2nd,Getlinestyle,Texcom
-Enclosing,basic2,1393,1559,Enclosing2,Divoptions,isList,Lcrd,Listplot,Intersectcurvespp,Prepend,Op,Length,Partcrv,Pointoncurve,Pcrd,PaO,Textformat,Com2nd,Getlinestyle,Texcom,LLcrd
-Makehatch,basic2,1567,1669,Lineplot,Intersectseg,Norm,Listplot
-Anyselected,basic2,1673,1681
-Hatchdata,basic2,1685,1981,HatchdataR,Hatchdatacindy,Listplot,Joincrvs,Enclosing2,Divoptions,Strsplit,Toupper,Anyselected,Bracket,isexists,ReadOutData,Makehatch,Textformat,PaO,Com2nd,Getlinestyle,Texcom,WriteOutData,LLcrd
-Shadein,basic2,1985,2072,Framedata,Partcrv,Paramoncrv,Listplot,Intersectcurvespp,Pointoncrv,Joincrvs,Inwindow
-Shade,basic2,2076,2204,Divoptions,Strsplit,Toupper,Colorcmyk2rgb,Enclosing,Shadein,Listplot,Joincrvs,Pcrd,PaO,Textformat,Dqq
-Rotatepoint,basic2,2210,2220,Lcrd
-Translatepoint,basic2,2224,2234,Lcrd
-Scalepoint,basic2,2238,2248,Lcrd
-Reflectpoint,basic2,2252,2277,Lcrd
-Rotatedata,basic2,2281,2367,Divoptions,Lcrd,Strsplit,Toupper,Measuredepth,LLcrd,Pcrd,Textformat,RSform,Com2nd,Getlinestyle,Texcom
-Translatedata,basic2,2371,2449,Divoptions,Strsplit,Toupper,Lcrd,Measuredepth,LLcrd,Pcrd,RSform,Textformat,Com2nd,Getlinestyle,Texcom
-Scaledata,basic2,2453,2555,Divoptions,Lcrd,Strsplit,Toupper,Measuredepth,LLcrd,Pcrd,Textformat,RSform,Com2nd,Getlinestyle,Texcom
-Reflectdata,basic2,2559,2653,Divoptions,Strsplit,Toupper,Lcrd,Measuredepth,LLcrd,Pcrd,RSform,Textformat,Com2nd,Getlinestyle,Texcom
-Mksegments,basic2,2658,2673,Listplot
-Mkcircles,basic2,2678,2698,Strsplit,Circledata
-MakeRarg,basic2,2702,2715,RSslash,Textformat
-Htickmark,basic2,2719,2742,Listplot,Expr
-Vtickmark,basic2,2746,2767,Listplot,Expr,180710to// tmp=MakeRarg
-Vtick,basic2,2771,2781,Listplot
-Htick,basic2,2785,2797,LLcrd,Listplot
-Setax,basic2,2801,2818
-Drwxy,basic2,2822,2917,Divoptions,Strsplit,Toupper,Lightarrowdata,Listplot,Expr,Letter,Addax
-Drwpt,basic2,2921,2930,Pointdata
-Drawpoint,basic2,2933,2961,Measuredepth,Textformat,Com2nd,Setpen
-Addax,basic2,2965,2968
-Expr,basic2,2972,2987,Letter
-Letter,basic2,2991,3086,Divoptions,Removespace,Strsplit,Toupper,RSslash,Com2nd,Lcrd,Texcom,Pcrd
-Letterrot,basic2,3090,3132,Divoptions,Letter,Com2nd,Dqq,Texcom
-Exprrot,basic2,3136,3179,Divoptions,Expr,Com2nd,Dqq,Texcom
-Slider,basic2,3183,3230,Toupper,Strsplit,Indexall,Putpoint,Listplot,Putonseg
-Putpoint,basic2,3234,3245,Textformat,Pcrd
-Putpoint,basic2,3249,3260,Textformat,Pcrd
-Bezierpt,basic2,3264,3289,Lcrd
-Bezier,basic2,3293,3305,Beziercurve
-Beziercurve,basic2,3309,3386,Divoptions,Measuredepth,Lcrd,Bezierpt,Pcrd,Textformat,RSform,Com2nd,Getlinestyle,Texcom
-Putbezierdata,basic2,3390,3452,Divoptions,Putpoint,Lcrd,Letter
-Bezierstart,basic2,3456,3458
-Mkbezierptcrv,basic2,3462,3488,Readcsvsla,Measuredepth,Putbezierdata,Bezier
-Mkbeziercrv,basic2,3492,3503,Measuredepth,Bezier
-Ospline,basic2,3507,3566,Dotprod,Lcrd,Bezier
-CRspline,basic2,3570,3616,Lcrd,Reflectpoint,Bezier
-Beziersmooth,basic2,3620,3681,Bzspline,Putpoint,Lcrd,Bezier
-Beziersym,basic2,3685,3734,Bzsspline,Putpoint,Lcrd,Bezier
-Listbspline2bz,basic2,3738,3753,Lcrd
-Bspline,basic2,3757,3765,Listbspline2bz,BezierCurve
-Meetcurve,basic2,3769,3829,Measuredepth,LLcrd,Lcrd
-Putonline,basic2,3833,3853,LLcrd,Lineplot,Putonseg
-Putonseg,basic2,3857,3893,LLcrd,Divoptions,Lcrd,Putpoint,Pcrd,Textformat
-Putoncurve,basic2,3897,3926,putoncurve,Putpoint,Paramoncurve,Putonseg,Textformat,Ptend
-Crosspoint,basic2,3930,3948,MeetCurve,Putpoint
-Periodfun,basic2,3952,4085,Divoptions,Strsplit,Toupper,Plotdata,Translatedata,Setscaling,Norm,Listplot,Textformat
-Mkcstable,basic2,4089,4105,Textformat
-Fourierseries,basic2,4109,4179,Divoptions,Strsplit,Toupper,Plotdata,Assign,Listplot
-Tabledata,basic2,4183,4205,Divoptions,Toupper,Tabledatageo,Tabledatalight
-Tabledatalight,basic2,4209,4328,Divoptions,Strsplit,Toupper,Tlistplot,Changetablestyle,Addax,Setwindow
-Tabledatageo,basic2,4332,4396,Divoptions,Strsplit,Toupper,Putpoint,Tabledatalight
-Tgrid,basic2,4400,4415
-Tlistplot,basic2,4419,4448,divoptions,Toupper,Tgrid,Listplot
-Changetablestyle,basic2,4452,4540,Indexall,Changestyle,Replaceall,Tlistplot
-Findcell,basic2,4544,4570,Tgrid
-Putcell,basic2,4574,4609,Findcell,Letter
-Putcellexpr,basic2,4613,4625,Putcell
-Putrow,basic2,4629,4644,Putcellrow,Putcell
-Putrowexpr,basic2,4648,4661,Putrow
-Putcol,basic2,4665,4680,Putcellexpr,Putcell
-Putcolexpr,basic2,4684,4697,Putcellexpr,Putcol
-Setrange,basic2,4701,4707,Pcrd
-Inwindow,basic2,4711,4723
-Dashlinedata,basic2,4727,4800
-Windispg,basic2,4804,4870,Drwxy,Measuredepth,Dashlinedata,Textformat
-Extractdata,basic2,4875,4931,Divoptions,Com2nd,Getlinestyle,Texcom
-Removeout,basic2,4935,4945
-Makecmdlist,basic2,4949,4979
-Savecmdlist,basic2,4983,4989
-Quicksort,basic2,4993,5013
-Lessstr,basic2,5017,5044
-Makehelplist,basic2,5048,5092,PPa
-Helplist,basic2,5096,5150,Makehelplist
-Help,basic2,5154,5205
-Helpkey,basic2,5209,5227,Help
-Example,basic2,5231,5255
+Drawfigures,basic2,28,106,Divoptions,Strsplit,Toupper,Measuredepth,Pointdata,Listplot,Dqq
+Setarrow,basic2,110,136
+Arrowheaddata,basic2,140,233,Divoptions,Strsplit,Toupper,Touppera,Measuredepth,Nearestpt,|Ptend,Ptstart,Numptcrv,Ptcrv,LLcrd,Intersectcrvspp,Pcrd
+Arrowhead,basic2,237,329,Strsplit,Toupper,Measuredepth,Pcrd,Arrowheaddata,Inwindow,Listplot,Divoptions,Dqq,Textformat,LLcrd,Com2nd,Texcom
+Arrowdata,basic2,333,335,Lightarrowdata
+OldArrowdata,basic2,339,453,Arrowdata,Divoptions,Strsplit,Toupper,Pcrd,Textformat,Listplot,LLcrd,Arrowhead,Setscaling,Lcrd
+Lightarrowdata,basic2,457,578,Pcrd,Divoptions,Strsplit,Toupper,Listplot,Textformat,LLcrd,Indexall,Dqq,Com2nd,Texcom,Setscaling,Lcrd
+Anglemark,basic2,582,715,Divoptions,Indexall,Strsplit,Dqq,Toupper,Lcrd,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom
+Paramark,basic2,719,829,Divoptions,Indexall,Strsplit,Dqq,Toupper,Lcrd,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom
+Makebowdata,basic2,833,846,Lcrd,Rotatepoint
+Bowdata,basic2,850,1021,Divoptions,Lcrd,Strsplit,Toupper,Makebowdata,Defvar,Norm,LLcrd,Dqq,Measuredepth,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom
+Bowname,basic2,1025,1028,Expr
+Bownamerot,basic2,1032,1046,Measuredepth,Ptend,Ptstart,Exprrot
+Deqdata,basic2,1050,1108,funP,Lcrd,funN
+Deqplot,basic2,1112,1256,Lcrd,Divoptions,Toupper,Indexall,Deqdata,Pcrd,Assign,Textformat,RSform,Com2nd,Getlinestyle,Texcom
+Enclosing,basic2,1260,1423,Enclosing2,Divoptions,isList,Lcrd,Listplot,Intersectcurvespp,Prepend,Op,Length,Partcrv,Pointoncurve,Pcrd,PaO,Textformat,Com2nd,Getlinestyle,Texcom,LLcrd
+Makehatch,basic2,1429,1531,Lineplot,Intersectseg,Norm,Listplot
+Anyselected,basic2,1535,1543
+Hatchdata,basic2,1547,1843,HatchdataR,Hatchdatacindy,Listplot,Joincrvs,Enclosing2,Divoptions,Strsplit,Toupper,Anyselected,Bracket,isexists,ReadOutData,Makehatch,Textformat,PaO,Com2nd,Getlinestyle,Texcom,WriteOutData,LLcrd
+Shadein,basic2,1847,1934,Framedata,Partcrv,Paramoncrv,Listplot,Intersectcurvespp,Pointoncrv,Joincrvs,Inwindow
+Shade,basic2,1938,2066,Divoptions,Strsplit,Toupper,Colorcmyk2rgb,Enclosing,Shadein,Listplot,Joincrvs,Pcrd,PaO,Textformat,Dqq
+Rotatepoint,basic2,2072,2082,Lcrd
+Translatepoint,basic2,2086,2096,Lcrd
+Scalepoint,basic2,2100,2110,Lcrd
+Reflectpoint,basic2,2114,2139,Lcrd
+Rotatedata,basic2,2143,2229,Divoptions,Lcrd,Strsplit,Toupper,Measuredepth,LLcrd,Pcrd,Textformat,RSform,Com2nd,Getlinestyle,Texcom
+Translatedata,basic2,2233,2311,Divoptions,Strsplit,Toupper,Lcrd,Measuredepth,LLcrd,Pcrd,RSform,Textformat,Com2nd,Getlinestyle,Texcom
+Scaledata,basic2,2315,2417,Divoptions,Lcrd,Strsplit,Toupper,Measuredepth,LLcrd,Pcrd,Textformat,RSform,Com2nd,Getlinestyle,Texcom
+Reflectdata,basic2,2421,2515,Divoptions,Strsplit,Toupper,Lcrd,Measuredepth,LLcrd,Pcrd,RSform,Textformat,Com2nd,Getlinestyle,Texcom
+Mksegments,basic2,2520,2535,Listplot
+Mkcircles,basic2,2540,2560,Strsplit,Circledata
+MakeRarg,basic2,2564,2577,RSslash,Textformat
+Htickmark,basic2,2581,2604,Listplot,Expr
+Vtickmark,basic2,2608,2629,Listplot,Expr,180710to// tmp=MakeRarg
+Vtick,basic2,2633,2643,Listplot
+Htick,basic2,2647,2659,LLcrd,Listplot
+Setax,basic2,2663,2687,Divoptions
+Drwxy,basic2,2691,2797,Divoptions,Strsplit,Toupper,Lightarrowdata,Listplot,Expr,Letter,Addax
+Drwpt,basic2,2801,2810,Pointdata
+Drawpoint,basic2,2813,2841,Measuredepth,Textformat,Com2nd,Setpen
+Addax,basic2,2845,2848
+Expr,basic2,2852,2867,Letter
+Letter,basic2,2871,2972,Divoptions,Removespace,Strsplit,Toupper,RSslash,Com2nd,Lcrd,Texcom,Pcrd
+Letterrot,basic2,2976,3018,Divoptions,Letter,Com2nd,Dqq,Texcom
+Exprrot,basic2,3022,3065,Divoptions,Expr,Com2nd,Dqq,Texcom
+Ptpos,basic2,3069,3089,Textformat
+Strictmove,basic2,3093,3113,textformat,Textformat
+Slider,basic2,3117,3164,Toupper,Strsplit,Indexall,textformat,Listplot,Putonseg
+Putpoint,basic2,3168,3179,Textformat,Pcrd
+Bezierpt,basic2,3183,3208,Lcrd
+Bezier,basic2,3212,3224,Beziercurve
+Beziercurve,basic2,3228,3305,Divoptions,Measuredepth,Lcrd,Bezierpt,Pcrd,Textformat,RSform,Com2nd,Getlinestyle,Texcom
+Putbezierdata,basic2,3309,3371,Divoptions,Putpoint,Lcrd,Letter
+Bezierstart,basic2,3375,3377
+Mkbezierptcrv,basic2,3381,3407,Readcsvsla,Measuredepth,Putbezierdata,Bezier
+Mkbeziercrv,basic2,3411,3422,Measuredepth,Bezier
+Ospline,basic2,3426,3485,Dotprod,Lcrd,Bezier
+CRspline,basic2,3489,3535,Lcrd,Reflectpoint,Bezier
+Beziersmooth,basic2,3539,3600,Bzspline,Putpoint,Lcrd,Bezier
+Beziersym,basic2,3604,3653,Bzsspline,Putpoint,Lcrd,Bezier
+Listbspline2bz,basic2,3657,3672,Lcrd
+Bspline,basic2,3676,3684,Listbspline2bz,BezierCurve
+Meetcurve,basic2,3688,3748,Measuredepth,LLcrd,Lcrd
+Putonline,basic2,3752,3772,LLcrd,Lineplot,Putonseg
+Putonseg,basic2,3776,3812,LLcrd,Divoptions,Lcrd,Putpoint,Pcrd,Textformat
+Putoncurve,basic2,3816,3845,putoncurve,Putpoint,Paramoncurve,Putonseg,Textformat,Ptend
+Crosspoint,basic2,3849,3867,MeetCurve,Putpoint
+Periodfun,basic2,3871,4004,Divoptions,Strsplit,Toupper,Plotdata,Translatedata,Setscaling,Norm,Listplot,Textformat
+Mkcstable,basic2,4008,4024,Textformat
+Fourierseries,basic2,4028,4095,Divoptions,Strsplit,Toupper,Deffun,Plotdata,Assign,Listplot
+Tabledata,basic2,4099,4121,Divoptions,Toupper,Tabledatageo,Tabledatalight
+Tabledatalight,basic2,4125,4244,Divoptions,Strsplit,Toupper,Tlistplot,Changetablestyle,Addax,Setwindow
+Tabledatageo,basic2,4248,4312,Divoptions,Strsplit,Toupper,Putpoint,Tabledatalight
+Tgrid,basic2,4316,4331
+Tlistplot,basic2,4335,4364,divoptions,Toupper,Tgrid,Listplot
+Changetablestyle,basic2,4368,4456,Indexall,Changestyle,Replaceall,Tlistplot
+Findcell,basic2,4460,4486,Tgrid
+Putcell,basic2,4490,4525,Findcell,Letter
+Putcellexpr,basic2,4529,4541,Putcell
+Putrow,basic2,4545,4560,Putcellrow,Putcell
+Putrowexpr,basic2,4564,4577,Putrow
+Putcol,basic2,4581,4596,Putcellexpr,Putcell
+Putcolexpr,basic2,4600,4613,Putcellexpr,Putcol
+Setrange,basic2,4617,4623,Pcrd
+Inwindow,basic2,4627,4639
+Dashlinedata,basic2,4643,4716
+Windispg,basic2,4720,4787,Drwxy,Measuredepth,Dashlinedata,Textformat
+Extractdata,basic2,4792,4848,Divoptions,Com2nd,Getlinestyle,Texcom
+Removeout,basic2,4852,4862
+Makecmdlist,basic2,4866,4896
+Savecmdlist,basic2,4900,4906
+Quicksort,basic2,4910,4930
+Lessstr,basic2,4934,4961
+Makehelplist,basic2,4965,5009,PPa
+Helplist,basic2,5013,5067,Makehelplist
+Help,basic2,5071,5122
+Helpkey,basic2,5126,5144,Help
+Example,basic2,5148,5172
diff --git a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic3list.txt b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic3list.txt
index 9cacb8566f9..a5d8260177a 100644
--- a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic3list.txt
+++ b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic3list.txt
@@ -11,46 +11,52 @@ Rform,basic3,312,322,PaO
Defvar,basic3,326,370
IftoR,basic3,374,413,PaO,Indexall,Bracket
FortoR,basic3,417,446,PaO,Bracket
-Deffun,basic3,450,497,Bracket,Indexall,FortoR,IftoR,RSform,PaO
-WritetoRS,basic3,501,734,WritetoSci,Lcrd,Datetime,Textformat,Cindyname,RSform,PPa,iswindows,Indexall,Dqq,PaO
-Readoutdata,basic3,738,851,Divoptions,Strsplit,Toupper,Pcrd,Textformat
-Writeoutdata,basic3,855,917,Flattenlist,Measuredepth
-Makeshell,basic3,921,1021,kc,Indexall,Dqq
-Convsjiswin,basic3,1025,1049,nkfwin,nkfcpdel,isexists,pathsep
-Makebat,basic3,1053,1191,kc,iswindows,isincludefull,isexists,Indexall,Dqq
-Addpackage,basic3,1195,1213
-Usegraphics,basic3,1217,1227,Addpackage
-Viewtex,basic3,1231,1305,iswindows,Makebat,kc,Makeshell,WritetoRS
-Viewparent,basic3,1309,1327,isexists,iswindows,Makebat,Makeshell,WritetoRS,kc
-Figpdf,basic3,1331,1451,Removespace,isexists
-Slidework,basic3,1455,1474,isexists,makedir,pathsep,Changework
-Setslidemargin,basic3,1478,1481
-Setslidepage,basic3,1485,1510
-Setslidemain,basic3,1514,1538
-Setslidebody,basic3,1542,1579
-Setslidehyper,basic3,1583,1661,Divoptions,Addpackage,Indexall,Toupper
-Settitle,basic3,1665,1736,Toupper,Indexall
-Maketitle,basic3,1740,1835,iswindows,Makebat,Makeshell,kc,Cindyname,isexists,PaO
-Repeatsameslide,basic3,1839,1994,Indexall
-Presentation,basic3,1998,2663,readfile2str,isexists,Removespace,fileslist,Repeatsameslide
-Mkslides,basic3,2667,2731,Fillblack,Changework,Setdirectory,setexec,isexists,Presentation,iswindows,Makebat,Makeshell,kc,pathsep,Fillrestore
-Mkslidesummary,basic3,2735,2800,Fillblack,pathsep,ismacosx,setexec,PPa,PaO,CalcbyR,iswindows,Makebat,Makeshell,kc,Changework,Fillstore
-BBdata,basic3,2804,2947,Divoptions,Toupper,ismacosx,Dqq,iswindows,kc,Sprintf,Removespace
-Gcd,basic3,2951,2963
-Fracform,basic3,2967,2992
-Totexformpart,basic3,2996,3064,Bracket,Strsplit,Assign
-Totexform,basic3,3068,3119,Totexformpart,Assign,Indexall,Bracket
-Tocindyformpart,basic3,3123,3191,Bracket,Strsplit,Assign
-Tocindyform,basic3,3195,3242,Tocindyformpart,Indexall,Bracket
-Animepar,basic3,3246,3246,Animationparam
-Animationparam,basic3,3250,3269,seconds,stopanimation
-Copyketcindyjs,basic3,3273,3334,iswindows,Dqq,kc
-Ketjsoption,basic3,3338,3339,Setketcindyjs
-Setketcindyjs,basic3,3343,3352
-Ketcindyjsdata,basic3,3356,3394,Textformat,Dqq
-Findfun,basic3,3398,3465,Removespace,Indexall
-Extractfun,basic3,3469,3486,Indexall,Findfun
-Extractall,basic3,3495,3539
-Textedit,basic3,3543,3549
-Textedit2value,basic3,3553,3595,Toupper,Textedit,Removespace,Tocindyform,Totexform,Tomaxform,Strsplit
-Mkketcindyjs,basic3,3599,4158,Strsplit,Toupper,Colorcode,Colorname2rgb,Copyketcindyjs,isexists,Cdyname,Extractfun,Extractall,pathsep,Readlines,Removespace,Dqq,indexall,Indexof,Indexall
+Deffun,basic3,450,503,Removespace,Bracket,Indexall,FortoR,IftoR,RSform,PaO
+WritetoRS,basic3,507,740,WritetoSci,Lcrd,Datetime,Textformat,Cindyname,RSform,PPa,iswindows,Indexall,Dqq,PaO
+Readoutdata,basic3,744,857,Divoptions,Strsplit,Toupper,Pcrd,Textformat
+Writeoutdata,basic3,861,923,Flattenlist,Measuredepth
+Makeshell,basic3,927,1027,kc,Indexall,Dqq
+Convsjiswin,basic3,1031,1055,nkfwin,nkfcpdel,isexists,pathsep
+Makebat,basic3,1059,1197,kc,iswindows,isincludefull,isexists,Indexall,Dqq
+Addpackage,basic3,1201,1219
+Usegraphics,basic3,1223,1233,Addpackage
+Viewtex,basic3,1237,1311,iswindows,Makebat,kc,Makeshell,WritetoRS
+Viewparent,basic3,1315,1333,isexists,iswindows,Makebat,Makeshell,WritetoRS,kc
+Figpdf,basic3,1337,1457,Removespace,isexists
+Slidework,basic3,1461,1480,isexists,makedir,pathsep,Changework
+Setslidemargin,basic3,1484,1487
+Setslidepage,basic3,1491,1516
+Setslidemain,basic3,1520,1544
+Setslidebody,basic3,1548,1585
+Setslidehyper,basic3,1589,1667,Divoptions,Addpackage,Indexall,Toupper
+Settitle,basic3,1671,1742,Toupper,Indexall
+Maketitle,basic3,1746,1841,iswindows,Makebat,Makeshell,kc,Cindyname,isexists,PaO
+Repeatsameslide,basic3,1845,2000,Indexall
+Presentation,basic3,2004,2669,readfile2str,isexists,Removespace,fileslist,Repeatsameslide
+Mkslides,basic3,2673,2737,Fillblack,Changework,Setdirectory,setexec,isexists,Presentation,iswindows,Makebat,Makeshell,kc,pathsep,Fillrestore
+Mkslidesummary,basic3,2741,2806,Fillblack,pathsep,ismacosx,setexec,PPa,PaO,CalcbyR,iswindows,Makebat,Makeshell,kc,Changework,Fillstore
+BBdata,basic3,2810,2953,Divoptions,Toupper,ismacosx,Dqq,iswindows,kc,Sprintf,Removespace
+Gcd,basic3,2957,2969
+Fracform,basic3,2973,3010
+Totexformpart,basic3,3014,3082,Bracket,Strsplit,Assign
+Totexform,basic3,3086,3149,Totexformpart,Indexall,Bracket
+Tocindyformpart,basic3,3153,3221,Bracket,Strsplit,Assign
+Tocindyform,basic3,3225,3263,Bracket,Indexall,Tocindyformpart
+Animepar,basic3,3267,3267,Animationparam
+Animationparam,basic3,3271,3290,seconds,stopanimation
+Copyketcindyjs,basic3,3294,3355,iswindows,Dqq,kc
+Ketjsoption,basic3,3359,3360,Setketcindyjs
+Setketcindyjs,basic3,3364,3373
+Ketcindyjsbody,basic3,3377,3381
+Ketcindyjsdata,basic3,3385,3425,Textformat,Dqq,set
+Findfun,basic3,3429,3496,Removespace,Indexall
+Extractfun,basic3,3500,3517,Indexall,Findfun
+Extractall,basic3,3526,3570
+Textedit,basic3,3574,3580
+Textedit2value,basic3,3584,3626,Toupper,Textedit,Removespace,Tocindyform,Totexform,Tomaxform,Strsplit
+Parsejson,basic3,3630,3683, unicode
+Resizetextsize,basic3,3687,3711,Parsejson
+Movetojs,basic3,3715,3723
+Movetojsexe,basic3,3727,3743,Dqq,Parsejson
+Setplaybuttons,basic3,3747,3772,Movetojs
+Mkketcindyjs,basic3,3776,4448, 12px/10pt = 12px/,Toupper,Colorcode,Colorname2rgb,Copyketcindyjs,isexists,Cdyname,Extractfun,Extractall,pathsep,Readlines,Ketcindyjsdata,Movetojsexe,Resizetextsize,indexall,Indexof,Indexall,Removespace,Strsplit,Dqq
diff --git a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/ignoredfun.txt b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/ignoredfun.txt
index 5f388e67016..6aa9da7fa1c 100644
--- a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/ignoredfun.txt
+++ b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/ignoredfun.txt
@@ -18,8 +18,13 @@ Fontsize
Help
Helplist
Invdashline
+Ketcindyjsbody
Ketcindyjsdata
Ketjsoption
+Parsejson
+Resizetextsize
+Movetojs
+Movetojsexe
Mkketcindyjs
Presentation
//Putbezierdata
diff --git a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/makefunlist.cdy b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/makefunlist.cdy
index f7993fa39c5..02a555ec1f9 100644
--- a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/makefunlist.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/makefunlist.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/ketmanual/KeTCindyReferenceE.pdf b/Master/texmf-dist/doc/support/ketcindy/ketmanual/KeTCindyReferenceE.pdf
index adf119eae9b..f6924e269cc 100644
--- a/Master/texmf-dist/doc/support/ketcindy/ketmanual/KeTCindyReferenceE.pdf
+++ b/Master/texmf-dist/doc/support/ketcindy/ketmanual/KeTCindyReferenceE.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/ketmanual/KeTCindyReferenceJ.pdf b/Master/texmf-dist/doc/support/ketcindy/ketmanual/KeTCindyReferenceJ.pdf
index a24668ebcd4..b9e9d2f6b4e 100644
--- a/Master/texmf-dist/doc/support/ketcindy/ketmanual/KeTCindyReferenceJ.pdf
+++ b/Master/texmf-dist/doc/support/ketcindy/ketmanual/KeTCindyReferenceJ.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1010fourier.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1010fourier.cdy
index 124b792569e..9baa0d50399 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1010fourier.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1010fourier.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/KeTCindyReferenceE.tex b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/KeTCindyReferenceE.tex
index 1432b0ef180..aabea0a6656 100644
--- a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/KeTCindyReferenceE.tex
+++ b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/KeTCindyReferenceE.tex
@@ -3251,6 +3251,21 @@ Draw the point A near the origin.
\end{cmd}
+%-------------Reparse-------------------------------
+\begin{cmd}{Reparse}{reparse}
+\itemket{Usage}Reparse(string or list of string)
+\itemket{Description}function to return the real part after \verb|parse|
+\itemket{Remark}\verb|parse| of CindyJS has a bug to return an imaginary number in some cases.
+\itemket{Examples}\mbox{}
+
+\verb|str="(0-1)^2"; |\\
+\verb|format(parse(str),0);| // returns \verb|1+i*0| in CindyJS\\
+\verb|format(Reparse(str),0);| // returns \verb|1|\\
+
+
+
+\end{cmd}
+
%-------------Slider-------------------------------
\begin{cmd}{Slider}{slider}
\itemket{Usage}Slider("endpoint1-pt-endpoint2",endpoint1,endpoint2);\vspace{-2mm}
@@ -3358,9 +3373,9 @@ Cindyscript has a function \verb|format(value, number)|, like as Textformat.
\end{cmd}
%----------Fracform----------------------------------
\begin{cmd}{Fracform}{fracform}
-\itemket{Usage}Fracform(number,list of denominators)
+\itemket{Usage}Fracform(number,list of denominators/max number[, allowable error(5)])
\itemket{Description}returns Tex-like form of the fraction
-\itemket{Examples}\verb|Fracform(0.33,[2,3]); => fr(1,3)|
+\itemket{Examples}\verb|Fracform(0.33,[2,3]); => [fr(1,3),''err=0.00333'',1,3]|
\end{cmd}
@@ -5608,6 +5623,148 @@ Find on the screen (not in the space) intersection points (\verb|tmp_1|, \verb|t
\end{center}
\end{cmd}
+%================== KeTCindyJS ===============
+\section{KeTCindyJS}
+
+\subsection{How to create HTML}
+
+\ketcindy\ can create the HTML file from a \ketcindy\ file using CindyJS.
+
+\begin{enumerate}[(1)]
+\item Use a \ketcindy\ file with buttons of KeTJS in CindyScreen, for example, templateketcindyjs.cdy.
+\item Select from the top menu, \verb|File > Export to CindyJS|.
+\item Press button "KeTJS" for on-line mode, or "KeTJSoff" for off-line mode.
+\item Then the HTML file will be created in the same folder of the cdy file.
+\end{enumerate}
+
+\subsection{Control of code writing}
+
+\begin{itemize}
+\item \verb|no ketjs (on/off)| for not writing to HTML
+\item \verb|only ketjs (on/off)| for only writing to HTML
+\item \verb|on, off| are used for multi lines of scripts.
+\end{itemize}
+
+{\bf Example}
+\begin{verbatim}
+ str="x^2"; //no ketjs
+ //str=Textedit(0); //only ketjs
+\end{verbatim}
+
+\subsection{Commands of KeTCindyJS}
+
+%--------------Ptpos-----------------------------
+
+\begin{cmd}{Ptpos}{ptpos}
+
+\itemket{Usage}Ptpos(geometric point)
+\itemket{Description} Function to return the latest position
+\itemket{Examples} \verb|Ptpos(A)|
+
+\end{cmd}
+
+%--------------Setketcindyjs-----------------------------
+
+\begin{cmd}{Setketcindyjs}{setketcindyjs}
+
+\itemket{Usage}Setketcindyjs( list of options )
+\itemket{Description} Function to set options of KeTCindyJS.
+\itemket{Options} \mbox{}\\
+\hspace*{5mm}\Ltab{25mm}{"Scale="}Ratio of scaling (default : 1)\\
+\hspace*{5mm}\Ltab{25mm}{"Nolabel="}list of points without label. \verb|all| can be used\\
+\hspace*{5mm}\Ltab{25mm}{"Color="}Name or code of background color (default : lightgray)\\
+\hspace*{5mm}\Ltab{25mm}{"Grid="}Grid size (mm)\\
+\hspace*{5mm}\Ltab{25mm}{"Figure=y"}To set window size to that of \ketcindy\\
+\hspace*{5mm}\Ltab{25mm}{"Axes=false"}Not to display axes of Cinderella
+\itemket{Example}Setketcindyjs(["Nolabel=all","Grid=2","Color=white"]);
+\end{cmd}
+
+%--------------Ketcindyjsdata-----------------------------
+
+\begin{cmd}{Ketcindyjsdata}{ketcindyjsdata}
+
+\itemket{Usage}Ketcindyjsdata( list of name, value of variables )
+\itemket{Description} Function to write the variables into "csinit".
+\itemket{Examples} \mbox{}
+
+\verb|Mxfun("1","integrate",["x*sin(x)","x"]);// no ketjs|\\
+\verb|Ketcindyjsdata(["mx1",mx1]);|\\
+\verb|Plotdata("1",mx1,"x");|
+
+\end{cmd}
+
+%--------------Ketcindyjsbody-----------------------------
+
+\begin{cmd}{Ketcindyjsbody}{ketcindyjsbody}
+
+\itemket{Usage}Ketcindyjsbody( prependlist, appendlist)
+\itemket{Description} Function to add scripts to the first/last of body tag.
+\itemket{Examples} \mbox{}
+
+\verb|Ketcindyjsbody(["<p,f10>__Title''],[]);|\\
+\verb| => <p><font size="10">&emsp;&emsp;Title</font></p>|
+
+\end{cmd}
+
+%--------------Animationparam-----------------------------
+
+\begin{cmd}{Animationparam}{animationparam}
+
+\itemket{Usage}Animationparam(init, speed( /sec), range )
+\itemket{Description} to get parameter value of buttons for animation.
+\itemket{Examples} \verb|ss=Animationparam(0,1,[-60,60]);|
+\itemket{Buttons}\mbox{}
+
+\begin{itemize}
+\item \Ltab{15mm}{"Play"}Parameter value set to the initial value, and starts changing
+\item \Ltab{15mm}{"Stop"}Parameter value set to the initial value, and ends changing
+\end{itemize}
+
+\end{cmd}
+
+%--------------Textedit-----------------------------
+
+\begin{cmd}{Textedit}{textedit}
+
+\itemket{Usage}Texedit(number of identifier)
+\itemket{Description} Function to get a string from an input box in HTML.
+\itemket{Remark}To create the input box,
+\begin{enumerate}[(1)]
+\item Use button "Define function".
+\item Input a string into "text" and press "Evaluation".\\
+\hspace*{3mm}Rem)To create a blank box, input only "=", and add "Equal=" to Setketcindyjs.
+\item With the inspector, confirm the number of identifier and change styles.
+\end{enumerate}
+
+\itemket{Examples}Let the number of identifier be 50.\\
+\verb|str="x^2";|\\
+\verb|//str=Textedit(50); //only ketjs|\\
+\verb|Plotdata("1",str,"x");|
+
+
+\end{cmd}
+
+%--------------Movetojs-----------------------------
+
+\begin{cmd}{Movetojs}{movetojs}
+
+\itemket{Usage}Movetojs(identifier or name,position,font size )
+\itemket{Description} Function to set the position and font size of text box in HTML.
+\itemket{Example} \verb|Movetojs(50,[0,-5],15);// no ketjs|
+
+\end{cmd}
+
+%--------------Setplaybuttons-----------------------------
+
+\begin{cmd}{Setplaybuttons}{setplaybuttons}
+
+\itemket{Usage}Setplaybuttons(coord, font size [, space])
+\itemket{Description} Function to set the position of play buttons in HTML.
+\itemket{Example} \verb|Setplaybuttons([0,-5],15,[1]);// no ketjs|
+
+\end{cmd}
+
+
\newpage
%-==Appendix ========================
\section{Appendix}
@@ -5618,6 +5775,9 @@ Find on the screen (not in the space) intersection points (\verb|tmp_1|, \verb|t
%\scalebox{0.9}{\input{Fig/colortable}}
\input{Fig/colortable}
\end{center}
+
+Rem) lightgray\ [0,0,0,0.15],\ offwhite\ [0,0,0,0.3],\ cindycolor\ [0.66,0,69,0.71] have been added.
+
\newpage
%-----------Comparative chart of drawing of points---------
@@ -5638,6 +5798,7 @@ Find on the screen (not in the space) intersection points (\verb|tmp_1|, \verb|t
\hspace{20mm} $\triangle$ : use PD
\newpage
+
%-==Command List ========================
\hypertarget{functionlist}{}
\section{Command List}
@@ -5797,6 +5958,7 @@ Find on the screen (not in the space) intersection points (\verb|tmp_1|, \verb|t
\hyperlink{norml}{Norm} \> return the norm of a vector.\\
\hyperlink{opl}{Op} \> return the n-th element of a list or a string.\\
\hyperlink{ptselected}{Ptselected} \> tests whether the point is selected.\\
+\hyperlink{reparse}{Reparse} \> return the real part afger parsing.\\
\hyperlink{slider}{Slider} \> make a slider on a Euclidean view.\\
\hyperlink{sprintf}{Sprintf} \> converts a real number to a string.\\
\hyperlink{texcom}{Texcom} \> add the command in the \TeX file.\\
@@ -5894,8 +6056,15 @@ Find on the screen (not in the space) intersection points (\verb|tmp_1|, \verb|t
\hyperlink{wireparadata}{Wireparadata} \> draw the surface by wire frame data with performing hidden line processing.\\
\hyperlink{xyzax3data}{Xyzax3data} \> draw the coordinate axis.\\
\hyperlink{xyzcoord}{Xyzcoord} \> return the 3D-coordinate of the point P.\\
-\hyperlink{setangle}{Setangle} \>Set TH and FI\\
-\hyperlink{getangle}{Getangle}\>Get TH and FI\\
+{\bf KeTCindyJS} \> \\
+\hyperlink{ptpos}{Ptpos} \>Return the latest position of geometric point\\
+\hyperlink{setketcindyjs}{Setketcindyjs} \>Set options of KeTCindyJS\\
+\hyperlink{ketcindyjsdata}{Ketcindyjsdata}\>Write into csinit\\
+\hyperlink{ketcindyjsbody}{Ketcindyjsbody}\>Add scripts to the first/last of body tag\\
+\hyperlink{animationparam}{Animationparam}\>Get parmeter value of animation\\
+\hyperlink{textedit}{Textedit}\>Get string from input box of KeTCindyJS\\
+\hyperlink{movetojs}{Movetojs}\>Set position and fontsize of text box in HTML\\
+\hyperlink{setplaybuttons}{Setplaybuttons}\>Set position of play buttons in HTML\\
\end{tabbing}
\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/KeTCindyReferenceJ.tex b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/KeTCindyReferenceJ.tex
index aa8c5bd2346..4bda400879f 100644
--- a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/KeTCindyReferenceJ.tex
+++ b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/KeTCindyReferenceJ.tex
@@ -566,7 +566,7 @@ optionsは,線種・表示する文字列・解像度・出力の有無など
\item[機能]点のデータを作成する。
\item[説明]与えられた座標の点データを作成する。オプションは"Size=","Color=","Inside"。
-Inside オプションは,点の内部についての指定。ただし,Cinderellaの描画面には反映されない。
+Inside オプションは,点の内部についての指定。
0 : 白抜き
@@ -4118,6 +4118,15 @@ KeTCindyの関数の中には処理に時間がかかるものがある。その
\hspace{10mm}\includegraphics[bb=0.00 0.00 219.01 204.51,width=40mm]{Fig/ptselected02.pdf}
\vspace{\baselineskip}
+\hypertarget{reparse}{}
+\item[関数]Reparse(文字列か文字列のリスト)
+\item[機能]評価(parse)してから実部をとる(re)。
+\item[説明]CindyJSでは,実数の演算でも虚数の項が出ることがあり,その対応である。
+
+【例】\verb|str="(0-1)^2"; Reparse(str);|\\
+  注)CindyJSでformat(parse(str),0)を実行すると\verb|1-i*0|になる。
+
+\vspace{\baselineskip}
\hypertarget{slider}{}
\item[関数]Slider(名称,位置1,位置2)
\item[機能]スライダを作成する
@@ -4175,7 +4184,7 @@ KeTCindyの関数の中には処理に時間がかかるものがある。その
\hspace{10mm} \verb|Textformat(dt,4); | // 戻り値は "[ 0.1667 , 0.5 ]" \\
\hspace{10mm} \verb|format(dt,4); | // 戻り値は [ "0.1667" , "0.5" ] \\
-\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+%\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
\vspace{\baselineskip}
\hypertarget{texcom}{}
@@ -4261,12 +4270,12 @@ Cindyscriptの アンダーバーの演算子 (list\_n , str\_n) と同様。
\vspace{\baselineskip}
\hypertarget{fracform}{}
-\item[関数]Fracform(数 , 分母のリストまたは最大値)
+\item[関数]Fracform(数 , 分母のリストまたは最大値 [, 許容誤差の桁数(5)])
\item[機能]分母リストの1つを分母とする近似分数と誤差を返す。
-\item[説明]戻り値は,簡易TeX-like書式の文字列と誤差。
+\item[説明]戻り値は,簡易TeX-like書式の文字列,誤差,分子,分母。
\vspace{\baselineskip}
-【例】\verb|Fracform(0.33,[2,3]); => fr(1,3)|
+【例】\verb|Fracform(0.33,[2,3]); => [fr(1,3),''err=0.0033'',1,3]|
\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
@@ -8026,19 +8035,21 @@ Cinderellaのファイルメニューから「CindyJSに書き出す」ときの
012345678\=3433778901234567\=890090666612345\=\kill
Local \> y/n \>動作環境の設定。 \>初期値は y\\
Scale \> 実数 \> 拡大・縮小 \>初期値は 1\\
+Grid \> 実数 \> グリッドサイズ(mm)\\
Nolabel \> 点のリスト \> ラベルを表示しない点を指定する。"No"だけでも可。\\
-Color \> 色名またはコード\> 背景色の指定。初期値はCinderellaの画面の色。\\
+\hspace*{10mm}"Nolabel=all"とすると,すべての点のラベルが表示されない。\\
+Color \> 色名またはコード\> 背景色の指定。初期値はlightgray([0,0,0,0.17])\\
+Figure \> y \>書き出す範囲をNE,SWの範囲にする。\\
+Axes \> false \>CindyJSが表示している座標軸を非表示にする。 \\
\end{tabbing}
【例】すべて設定するとき,次のように記述する。
-\verb| Setketcindyjs(["Local=n","Scale=1.5","No=[A,B]","Color=[0.2,0,0,0]"]) |
+\verb| Setketcindyjs(["Local=n","Scale=1.5","No=[A,B]","Color=lightgray"]) |
\vspace{\baselineskip}
注1)Cinderellaの画面に背景の方眼が描かれているとき,「CindyJSに書き出す」で,この方眼も表示される。方眼を消したい場合は,画面下の「グリッドを描く」ツールで非表示にしておく。
-注2)「CindyJSに書き出す」で書き出すときの範囲は,ウィンドウ全体である。NE,SWの範囲ではない。2点NE,SWは\verb| Setketcindyjs(["No=[NE,SW]" | で非表示になるが,NE,SEの範囲を広くとっておき,ウィンドウサイズをこれより小さくすれば \verb|"No=[NE,SW]"| オプションを使わなくても表示されずにすむ。
-
-注3)HTMLなので,画面に説明文などを表示したい場合は,HTMLファイルを開き,下の方の \verb|<body>| と \verb|</body>| の間,\verb|<div id="CSCanvas"></div>| の前後に書けば表示される。改行などは,HTMLのタグを用いる。
+注2)HTMLなので,画面に説明文などを表示したい場合は,HTMLファイルを開き,下の方の \verb|<body>| と \verb|</body>| の間,\verb|<div id="CSCanvas"></div>| の前後に書けば表示される。改行などは,HTMLのタグを用いる。
\vspace{\baselineskip}
\hypertarget{setketcindy}{}
@@ -8067,11 +8078,151 @@ Listplot("3",[B,D]);
この場合,対角線は2本とも描かれない。
+%\begin{flushright} \hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+
+
+\vspace{\baselineskip}
+\hypertarget{setketcindy}{}
+\item[KeTJSだけで有効] only ketjs
+\item[機能] KeTJSだけに書き込む
+\item[説明] コマンドの先頭に \verb|//| につけて,行の最後に続けて書くと,その行はKeTJSだけで有効となる。
+ブロック単位で有効化するには,ブロックを \verb|only ketjs on|,\verb|only ketjs off| ではさむ。
+
+【例】KeTJSだけで入力窓を作る。
+
+\begin{verbatim}
+str="x^2";
+//str=Textedit(50); only ketjs
+Plotdata("1",str,"x");
+\end{verbatim}
+
+注)\verb|Textedit|はKeTJSで入力窓からの入力を得るコマンド
+
\begin{flushright} \hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
\end{description}
+%======KeTJSの設定============================
+
+\subsection{KeTJSのコマンド}
+
+\begin{description}
+
+\hypertarget{ptpos}{}
+\item[関数]Ptpos(幾何点)
+\item[機能]幾何点の現在(直前)座標を返す。
+\item[説明]幾何点を制御可能範囲外に移動した場合に保持されるもとの座標
+
+【例】\verb|Ptpos(A)|
+
+%\begin{flushright} \hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+
+\end{description}
+
+\begin{description}
+
+\hypertarget{ketcindyjsdata}{}
+\item[関数]Ketcindyjsdata(変数名と値のリスト)
+\item[機能]KeTJSファイルのscript "csinit"の最後にデータを書き込む
+\item[説明]Maximaの返り値などKeTJSでは得られないデータを使えるようにする。
+
+\begin{verbatim}
+【例】Mxfun("1","integrate",["x*sin(x)","x"]);// no ketjs
+   Ketcindyjsdata(["mx1",mx1]);
+   Plotdata("1",mx1,"x");
+\end{verbatim}
+
+%\begin{flushright} \hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+
+\end{description}
+
+\begin{description}
+
+\hypertarget{ketcindyjsbody}{}
+\item[関数]Ketcindyjsbody(prependlist,appendlist)
+\item[機能]KeTJSファイルのbodyの最初と最後にスクリプトを追加する。
+
+
+\begin{verbatim}
+【例】Ketcindyjsbody(["<p,f10>__Title''],[]);
+    => <p><font size="10">&emsp;&emsp;Title</font></p>
+\end{verbatim}
+
+%\begin{flushright} \hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+
+\end{description}
+
+\begin{description}
+
+\hypertarget{animationparam}{}
+\item[関数]Animationparam(初期値,速度,範囲)
+\item[機能]アニメーションボタンのパラメータ値を取得する。
+\item[例 ]ss=Animationparam(0,1,[-60,60]);
+\item[説明]\mbox{}
+
+\begin{itemize}
+\item \Ltab{15mm}{"Play"}パラメータ値が初期値にセットされ,変化が始まる。
+\item \Ltab{15mm}{"Stop"}パラメータ値が初期値にセットされ,変化が終わる。
+\item \Ltab{15mm}{速度}パラメータ値の変化速度(秒速)
+\item \Ltab{15mm}{範囲}パラメータ値が端点に達したら停止する。
+\end{itemize}
+
+
+\end{description}
+
+
+\begin{description}
+
+\hypertarget{textedit}{}
+\item[関数]Textedit(識別番号)
+\item[機能]KeTJSで入力窓に入れた文字列を取得する。
+\item[説明]KeTJSでの入力窓の作り方
+
+\begin{itemize}
+\item[(1)]CindyScreenの"f(x)"を選び,適当な初期値を入れてEvaluateを押す。\\
+ 注)"="だけを入れて,Setketcindyjsのオプションに\\
+    "Equal="\\
+  を追加すると,KeTJSの入力窓は空欄になる。
+\item[(2)]"要素を動かす"に戻り,(1)を選んでインスペクタを開く。
+\item[(3)]識別番号を確認(修正)して,フォントサイズを変える。
+
+\end{itemize}
+
+【例】識別番号を0とする。
+
+\begin{verbatim}
+str="x^2"; //no ketjs
+//str=Textedit(0); //only ketjs
+Plotdata("1",str,"x");
+\end{verbatim}
+
+\end{description}
+
+%\begin{flushright} \hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+
+\begin{description}
+
+\hypertarget{movetojs}{}
+\item[関数]Movetojs(識別番号または要素名,座標,フォントサイズ);
+\item[機能]KeTJSでテキストボタンの位置とフォントサイズを指定
+\item[例 ]Movetojs(0,[2,-4],15);
+\end{description}
+
+\begin{description}
+
+\hypertarget{setplaybuttons}{}
+\item[関数]Setplaybuttons(座標,フォントサイズ [,スペース増加量]);
+\item[機能]KeTJSでPlayなどのボタンの位置とフォントサイズを指定
+\item[例 ]Setplaybuttons([-3,-4.5],15,[1]);\\
+注)Play,Pause,Rev,Stopの識別番号が71,72,73,74であることを確認しておく。\\
+注)スペース増加量の単位はmm,リストで個々に指定することもできる。
+
+
+\begin{flushright} \hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+
+\end{description}
+
\newpage
%付録==================================
\section{付録}
@@ -8125,7 +8276,7 @@ Cinderellaで使っている用語に次のものがある。
画面ツール(下のツールバー)\\
\includegraphics[bb=0 0 6.48 5.04 , width=0.6cm]{Fig/translate-view.pdf}原点を移動する \>:画面上の任意の位置でドラッグする\\
\includegraphics[bb=0 0 6.48 5.04 , width=0.6cm]{Fig/zoom-in.pdf}矩形領域を画面サイズに拡大 \>:ドラッグしてできる矩形で領域を選択する\\
-\includegraphics[bb=0 0 6.48 5.04 , width=0.6cm]{Fig/zoom-out.pdf}画面を矩形領域サイズに縮小 \>:どっらっぐしてで切る矩形で領域を選択する\\
+\includegraphics[bb=0 0 6.48 5.04 , width=0.6cm]{Fig/zoom-out.pdf}画面を矩形領域サイズに縮小 \>:ドラッグしてで切る矩形で領域を選択する\\
\includegraphics[bb=0 0 6.48 5.04 , width=0.6cm]{Fig/snap.pdf}格子点にスナップする \>:軸と方眼を表示しスナップモードにする\\
\includegraphics[bb=0 0 6.48 5.04 , width=0.6cm]{Fig/grid-more.pdf}\includegraphics[bb=0 0 6.48 5.04 , width=0.6cm]{Fig/grid-less.pdf}グリッドを粗く / 細かくする\\
\end{tabbing}
@@ -8133,7 +8284,9 @@ Cinderellaで使っている用語に次のものがある。
\hypertarget{colorcodelist}{}
\subsection{色名とカラーコード一覧}
\vspace{\baselineskip}
-\scalebox{0.9}{\input{Fig/colortable}}
+\scalebox{0.85}{\input{Fig/colortable}}
+
+注)lightgray\ [0,0,0,0.15],\ offwhite\ [0,0,0,0.3],\ cindycolor\ [0.66,0,69,0.71]を追加
\newpage
%--------------点の作図についての比較表--------------------------------------
@@ -8306,6 +8459,7 @@ Cinderellaで使っている用語に次のものがある。
\hyperlink{op}{Op(n,list)} \> listまたは文字列から要素を抜き出す\\
\hyperlink{isptselected}{Isptselected(点名)} \>点が選択されていればtrueを返す\\
\hyperlink{isptselected}{Ptselected(点名)} \>点が選択されていればtrueを返す\\
+\hyperlink{reparse}{Reparse(文字列(リスト)}\>評価して実数化する\\
\hyperlink{slider}{Slider()}\>スライダを作る\\
\hyperlink{sprintf}{Sprintf(実数,長さ)}\>小数点以下の長さを固定した文字列に変換\\
\hyperlink{strsplit}{Strsplit(文字列,文字)}\>文字列を分解する。\\
@@ -8416,8 +8570,14 @@ Cinderellaで使っている用語に次のものがある。
\hyperlink{xyzax3data}{Xyzax3data(name,文字,文字,文字,options)}\>座標軸の表示\\
\hyperlink{xyzcoord}{Xyzcoord(P.x,P.y,Pz.y)}\>主副画面で決まる点の座標\\
【KeTJS】\\
+\hyperlink{ptpos}{Ptpos(幾何点)}\>幾何点の現在(直前)座標\\
\hyperlink{setketcindyjs}{Setketcindyjs(options)}\>KeTJSの設定\\
-
+\hyperlink{ketcindyjsdata}{Ketcindyjsdata(変数名と値のリスト)}\>script "csinit"にデータを書き込む\\
+\hyperlink{ketcindyjsbody}{Ketcindyjsbody(prependlist,appendlist)}\>bodyの最初と最後にスクリプトを追加\\
+\hyperlink{animationparam}{Animationparam(初期値,速度,範囲)}\>アニメーションボタンのパラメータ値を取得\\
+\hyperlink{textedit}{Textedit(識別番号)}\>KeTJSで入力窓に入れた文字列を取得\\
+\hyperlink{movetojs}{Movetojs(要素名,座標,フォントサイズ)}\>Textボタンの位置とフォントサイズを設定\\
+\hyperlink{setplaybuttons}{Setplaybuttons(座標,サイズ [, スペース])}\>Playなどのボタンの位置とフォントサイズを設定\\
\end{tabbing}
\end{document} \ No newline at end of file