summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/support
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-06-24 21:05:25 +0000
committerKarl Berry <karl@freefriends.org>2019-06-24 21:05:25 +0000
commit6df3fe57362cbe88636ba77df481c3329fcdd66f (patch)
tree4193e5de76d13069a1cf83f6aea42386f9a7f271 /Master/texmf-dist/doc/support
parent210b1a78e3075d3c7a5aefa3aac2683de9281af8 (diff)
ketcindy (24jun19)
git-svn-id: svn://tug.org/texlive/trunk@51444 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/support')
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/README2
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/forLinux/ReadmeLinuxE.pdfbin20183 -> 20509 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/forLinux/ReadmeLinuxJ.pdfbin51971 -> 52816 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/forLinux/setketcindy.sh70
-rwxr-xr-xMaster/texmf-dist/doc/support/ketcindy/forLinux/setwork.sh44
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/forMac/ReadmeMacE.pdfbin22038 -> 22033 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/forMac/ReadmeMacJ.pdfbin73305 -> 75084 bytes
-rwxr-xr-xMaster/texmf-dist/doc/support/ketcindy/forMac/setketcindy.command70
-rwxr-xr-xMaster/texmf-dist/doc/support/ketcindy/forMac/setwork.command82
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/forWindows/ReadmeWinE.pdfbin22741 -> 22672 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/forWindows/ReadmeWinJ.pdfbin71474 -> 73060 bytes
-rwxr-xr-xMaster/texmf-dist/doc/support/ketcindy/forWindows/setketcindykettex.bat (renamed from Master/texmf-dist/doc/support/ketcindy/forWindows/setketcindy.bat)81
-rwxr-xr-xMaster/texmf-dist/doc/support/ketcindy/forWindows/setketcindytexlive.bat81
-rwxr-xr-xMaster/texmf-dist/doc/support/ketcindy/forWindows/setketcindyw32J.bat89
-rwxr-xr-xMaster/texmf-dist/doc/support/ketcindy/forWindows/setwork.bat84
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/ketcindyjs/3dlist.txt167
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic1list.txt313
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic2list.txt216
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic3list.txt56
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/ketcindyjs/commonused.txt401
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/ketcindyjs/ignoredfun.txt41
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/ketcindyjs/makefunlist.cdybin5467 -> 5516 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/ketmanual/KeTCindyReferenceE.pdfbin1965981 -> 2028322 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/ketmanual/KeTCindyReferenceJ.pdfbin2712743 -> 2658951 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0101figure.cdybin4592 -> 4880 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0101figurepdf.cdybin4701 -> 4730 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0102figure2.cdybin5276 -> 5957 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0103polygon.cdybin4753 -> 4767 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0104shade.cdybin5514 -> 6189 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0105vector.cdybin4908 -> 5607 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0106bowdotfill.cdybin5588 -> 6270 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0106bowhatch.cdybin5643 -> 6326 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0107hyperbolahatch.cdybin4239 -> 4929 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0108cycloid.cdybin4206 -> 4930 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0109epitrochoid.cdybin4345 -> 5020 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0110hypotrochoid.cdybin4487 -> 5164 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0201basic.cdybin4240 -> 4265 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0202graph1.cdybin4475 -> 4997 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0203graph2.cdybin4429 -> 5137 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0204graph3.cdybin4748 -> 5035 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0205coniccurve.cdybin4241 -> 5171 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0206defexp.cdybin5152 -> 5135 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0207envelope.cdybin4455 -> 4707 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0208intersecthatch.cdybin3919 -> 4672 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0209diffeq.cdybin4027 -> 4832 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0210diffeq2.cdybin5722 -> 5175 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0212implicit.cdybin3984 -> 4669 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0213implicithatch.cdybin4008 -> 5331 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0214inputvalue.cdybin0 -> 5710 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0215quacurve.cdybin0 -> 9243 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0301table.cdybin3977 -> 3976 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0302table2.cdybin4001 -> 4611 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0302table2line.cdybin3991 -> 3934 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0303gridpaper.cdybin0 -> 5083 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0303gridpaper1.cdybin0 -> 4083 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0303gridpaperlog.cdybin0 -> 5204 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0303gridpaperloglog.cdybin0 -> 6135 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0303papersquared.cdybin4079 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0304graphforincanddec.cdybin4174 -> 4181 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0304multitables.cdybin0 -> 4057 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0305twotables.cdybin0 -> 3959 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0306tenkey.cdybin0 -> 6922 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0401bezierbasic.cdybin6403 -> 7102 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0402bezier2.cdybin5938 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0402ospline.cdybin0 -> 4891 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0403osplinecrspline.cdybin0 -> 4622 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0404heart.cdybin83639 -> 84471 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0405dogwalk.cdybin72368 -> 73052 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0406mtfuji.cdybin9418 -> 12644 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/DownloadPolyhedrons_objE.txt (renamed from Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/DLofPolyhedrons_objE.txt)0
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/DownloadPolyhedrons_objJ.txt (renamed from Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/DLofPolyhedrons_objJ.txt)0
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0501basic.cdybin5850 -> 5997 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0501plane.cdybin8199 -> 8196 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0502spacecurve.cdybin5282 -> 5747 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0503perp.cdybin6010 -> 6028 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0504embed.cdybin6055 -> 6109 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0507polyhedron.cdybin6580 -> 6637 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0508concatobj.cdybin4309 -> 4298 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0509cubiccut.cdybin10900 -> 6258 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0510cubiccut2.cdybin8443 -> 8450 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0511tetra.cdybin6715 -> 6963 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0601cycloid.cdybin5083 -> 5556 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0602diffeq.cdybin5693 -> 5598 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0603envelope.cdybin4945 -> 5440 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0604diffeq2.cdybin5152 -> 5781 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0605cycloid2.cdybin5383 -> 5825 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0606epitrochoid.cdybin5499 -> 5848 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0607hypotrochoid.cdybin5491 -> 5843 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0608ellipsefocus.cdybin0 -> 7037 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0609hyperbolafocus.cdybin0 -> 7171 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0610parabolafocus.cdybin0 -> 6975 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0611generalangle.cdybin0 -> 5417 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0801plotR.cdybin3943 -> 4922 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0802plotR2.cdybin5249 -> 5109 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0803boxplot.cdybin4138 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0803plotdiscR.cdybin0 -> 4925 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0804boxplot.cdybin0 -> 4787 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0804histplot.cdybin4220 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0805histplot.cdybin0 -> 4881 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0805random.cdybin3804 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0806dataframe.cdybin3932 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0806random.cdybin0 -> 3786 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0807dataframe.cdybin0 -> 3840 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0807timecount.cdybin3924 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0808ttest.cdybin3916 -> 3938 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1000list.cdybin3817 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1001basic.cdybin4046 -> 4701 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1001factorial.cdybin0 -> 4834 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1002equation.cdybin3875 -> 4529 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1003trig.cdybin3909 -> 4569 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1004calcby.cdybin4093 -> 4751 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1005diffint.cdybin3848 -> 4508 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1005intplot.cdybin0 -> 4865 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1006calculus.cdybin3932 -> 4616 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1007linalg.cdybin4144 -> 4805 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1008idtable.cdybin4227 -> 4888 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1009diffeq.cdybin4102 -> 4778 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1010fourier.cdybin4620 -> 4971 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1010fourier2.cdybin4945 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1010fourier3.cdybin4742 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1011matrixop.cdybin3867 -> 5640 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1011matrixop2.cdybin5111 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1012for.cdybin0 -> 4562 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1012fourierpw.cdybin4827 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1012odefor.cdybin0 -> 5103 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1013for.cdybin3904 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1013incdec.cdybin0 -> 5214 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1014incdec2.cdybin4438 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1014primenumber.cdybin0 -> 4615 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1015primenumber.cdybin3956 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/howtouseketcindyjsE.txt (renamed from Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/howtouseketcindyjsE.txt)0
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/howtouseketcindyjsJ.txt (renamed from Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/howtouseketcindyjsJ.txt)0
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1601basic.cdybin0 -> 3904 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1602diffeq2.cdybin0 -> 4861 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1603gamow.cdybin0 -> 4995 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1604putoncurve.cdybin0 -> 4948 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1605triangle.cdybin0 -> 4032 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1606morley.cdy (renamed from Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/s1606morley.cdy)bin4870 -> 4885 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1607inputbox.cdybin0 -> 4469 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1608texcalc.cdybin0 -> 5255 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1609trigratio.cdybin0 -> 5730 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/s1601basic.cdybin3919 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/s1602diffeq2.cdybin5473 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/s1603gamow.cdybin4965 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/s1604putoncurve.cdybin4940 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/s1605triangle.cdybin4001 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/drawfigures1.tex748
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/tablesample1.tex54
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/source/ketmanual/KeTCindyReferenceE.tex165
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/source/ketmanual/KeTCindyReferenceJ.tex882
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeLinuxE.tex4
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeLinuxJ.tex9
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeMacE.tex17
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeMacJ.tex12
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeWinE.tex15
-rw-r--r--Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeWinJ.tex14
156 files changed, 2302 insertions, 1415 deletions
diff --git a/Master/texmf-dist/doc/support/ketcindy/README b/Master/texmf-dist/doc/support/ketcindy/README
index 920b02ab19b..3fa9e656c92 100644
--- a/Master/texmf-dist/doc/support/ketcindy/README
+++ b/Master/texmf-dist/doc/support/ketcindy/README
@@ -1,7 +1,7 @@
KeTCindy
========
-Version: 20190320.0
+Version: 20190624.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/forLinux/ReadmeLinuxE.pdf b/Master/texmf-dist/doc/support/ketcindy/forLinux/ReadmeLinuxE.pdf
index 833008329da..d5a0c04e7f4 100644
--- a/Master/texmf-dist/doc/support/ketcindy/forLinux/ReadmeLinuxE.pdf
+++ b/Master/texmf-dist/doc/support/ketcindy/forLinux/ReadmeLinuxE.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/forLinux/ReadmeLinuxJ.pdf b/Master/texmf-dist/doc/support/ketcindy/forLinux/ReadmeLinuxJ.pdf
index d862929646c..88698bc8bda 100644
--- a/Master/texmf-dist/doc/support/ketcindy/forLinux/ReadmeLinuxJ.pdf
+++ b/Master/texmf-dist/doc/support/ketcindy/forLinux/ReadmeLinuxJ.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/forLinux/setketcindy.sh b/Master/texmf-dist/doc/support/ketcindy/forLinux/setketcindy.sh
index a7f42a76713..79cc1e491da 100644
--- a/Master/texmf-dist/doc/support/ketcindy/forLinux/setketcindy.sh
+++ b/Master/texmf-dist/doc/support/ketcindy/forLinux/setketcindy.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# 20180310
+# 20180616
# Edit and uncomment the following lines if necessary
texpath=/usr/share/texlive
@@ -60,19 +60,65 @@ else
fi
cd ${cindyplug}
if [ -e KetCindyPlugin.jar ]; then
- sudo rm ${cindyplug}/KetCindyPlugin.jar
-fi
-if [ -e ketcindy.ini ]; then
- sudo rm ${cindyplug}/ketcindy.ini
+ sudo rm KetCindyPlugin.jar
fi
cd ${ketcindyscripts}
cp -p ketjava/KetCindyPlugin.jar ${cindyplug}
-echo "PathThead=\"${texbinpath}/\";" > ${cindyplug}/ketcindy.ini
-echo "Dirhead=\"${ketcindyscripts}\";" >> ${cindyplug}/ketcindy.ini
-echo "Homehead=\"${homehead}\";" >> ${cindyplug}/ketcindy.ini
-echo "setdirectory(Dirhead);" >> ${cindyplug}/ketcindy.ini
-echo "import(\"setketcindy.txt\");" >> ${cindyplug}/ketcindy.ini
-echo "import(\"ketoutset.txt\");" >> ${cindyplug}/ketcindy.ini
-echo "KetCindyPlugin and others copied to Cinderella"
+echo "KetCindyPlugin.jar copied to Cinderella"
+
+# 20190616from
+cd ${cindyplug}
+remake="y"
+if [ -e ketcindy.ini ]; then
+ echo "Contentes of ketcindy.ini : "
+ echo ""
+ cat ketcindy.ini
+ echo ""
+ read -p 'Do you want to remake ketcindy.ini? (y/n) : ' remake
+fi
+if [ ${remake} = "y" ]; then
+ echo "ketcindy.ini will be made"
+else
+ echo "finished"
+ sleep 1
+ exit 0
+fi
+# 20190616to
+
+if [ -e ketcindy.ini ]; then
+ sudo rm ketcindy.ini
+fi
+echo "PathThead=\"${texbinpath}/\";" > ketcindy.ini
+echo "Dirhead=\"${ketcindyscripts}\";" >> ketcindy.ini
+echo "Homehead=\"${homehead}\";" >> ketcindy.ini
+echo "setdirectory(Dirhead);" >> ketcindy.ini
+echo "import(\"setketcindy.txt\");" >> ketcindy.ini
+echo "import(\"ketoutset.txt\");" >> ketcindy.ini
+
+echo "Choose TeX with the 1st(+2nd) character"
+read -p 'p=platex, u=uplatex, l=latex, x=xelatex, pd=pdflatex, lu=lualatex:' tex
+if [ ${tex} = "p" ]; then
+ tex="platex"
+fi
+if [ ${tex} = "u" ]; then
+ tex="uplatex"
+fi
+if [ ${tex} = "l" ]; then
+ tex="latex"
+fi
+if [ ${tex} = "x" ]; then
+ tex="xelatex"
+fi
+if [ ${tex} = "pd" ]; then
+ tex="pdflatex"
+fi
+if [ ${tex} = "lu" ]; then
+ tex="lualatex"
+fi
+echo "PathT=PathThead+\"${tex}\";" >> ketcindy.ini
+echo "Pathpdf=\"${pathpdf}\";" >> ketcindy.ini
+echo "Mackc=\"bash\";" >> ketcindy.ini
+
+echo "ketcindy.ini generated(updated)"
sleep 1
exit 0
diff --git a/Master/texmf-dist/doc/support/ketcindy/forLinux/setwork.sh b/Master/texmf-dist/doc/support/ketcindy/forLinux/setwork.sh
index 9dd91b533c3..276da924eb2 100755
--- a/Master/texmf-dist/doc/support/ketcindy/forLinux/setwork.sh
+++ b/Master/texmf-dist/doc/support/ketcindy/forLinux/setwork.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# 20190223
+# 20190614
# Edit and uncomment the following line if necessary
pathpdf=evince
@@ -20,44 +20,18 @@ else
echo Workfolder has been generated as ${dist}
echo "This folder can be moved to any place" ##180913
fi
+read -p 'Language (j/e) : ' lang
cd doc/ketmanual
-read -p 'Choose platex(p),uplatex(u),latex(l),xelatex(x),pdflatex(pd),lualatex(lu):' tex
-if [ ${tex} = "p" ]; then
- tex="platex"
- cp -p KeTCindyReferenceJ.pdf ${dist}
- cp -p KeTCindyGuideJ.pdf ${dist}
- cp -p KeTPicStyleJ.pdf ${dist}
-fi
-if [ ${tex} = "u" ]; then
- tex="uplatex"
- cp -p KeTCindyReferenceJ.pdf ${dist}
- cp -p KeTCindyGuideJ.pdf ${dist}
- cp -p KeTPicStyleJ.pdf ${dist}
-fi
-if [ ${tex} = "l" ]; then
- tex="latex"
+if [ ${lang} = "e" ]; then
cp -p KeTCindyReferenceE.pdf ${dist}
cp -p KeTCindyGuideE.pdf ${dist}
- cp -p KeTPicStyleE.pdf ${dist}
-fi
-if [ ${tex} = "x" ]; then
- tex="xelatex"
- cp -p KeTCindyReferenceE.pdf ${dist}
- cp -p KeTCindyGuideE.pdf ${dist}
- cp -p KeTPicStyleE.pdf ${dist}
-fi
-if [ ${tex} = "pd" ]; then
- tex="pdflatex"
- cp -p KeTCindyReferenceE.pdf ${dist}
- cp -p KeTCindyGuideE.pdf ${dist}
- cp -p KeTPicStyleE.pdf ${dist}
-fi
-if [ ${tex} = "lu" ]; then
- tex="lualatex"
- cp -p KeTCindyReferenceE.pdf ${dist}
- cp -p KeTCindyGuideE.pdf ${dist}
- cp -p KeTPicStyleE.pdf ${dist}
+ cp -p KeTpicStyleE.pdf ${dist}
+else
+ cp -p KeTCindyReferenceJ.pdf ${dist}
+ cp -p KeTCindyGuideJ.pdf ${dist}
+ cp -p KeTpicStyleJ.pdf ${dist}
fi
+
echo generating ${home}/${changesetting}
echo // Re-setting PathT,PathR,Pathpdf,PathM,PathAd >${home}${changesetting}
echo "PathT=PathThead+\"${tex}\";" >>${home}${changesetting}
diff --git a/Master/texmf-dist/doc/support/ketcindy/forMac/ReadmeMacE.pdf b/Master/texmf-dist/doc/support/ketcindy/forMac/ReadmeMacE.pdf
index 7c5d7188785..52c5a551998 100644
--- a/Master/texmf-dist/doc/support/ketcindy/forMac/ReadmeMacE.pdf
+++ b/Master/texmf-dist/doc/support/ketcindy/forMac/ReadmeMacE.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/forMac/ReadmeMacJ.pdf b/Master/texmf-dist/doc/support/ketcindy/forMac/ReadmeMacJ.pdf
index af7810ee309..a2079e6e4b6 100644
--- a/Master/texmf-dist/doc/support/ketcindy/forMac/ReadmeMacJ.pdf
+++ b/Master/texmf-dist/doc/support/ketcindy/forMac/ReadmeMacJ.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/forMac/setketcindy.command b/Master/texmf-dist/doc/support/ketcindy/forMac/setketcindy.command
index 174300cf88d..469553fb25f 100755
--- a/Master/texmf-dist/doc/support/ketcindy/forMac/setketcindy.command
+++ b/Master/texmf-dist/doc/support/ketcindy/forMac/setketcindy.command
@@ -1,5 +1,5 @@
#!/bin/sh
-# 20181207
+# 20190616
# Edit and uncomment the following lines if necessary
#texpath=/Applications/kettex/texlive
@@ -82,12 +82,66 @@ fi
cd ${ketcindyscripts}
cp -p ketjava/KetCindyPlugin.jar ${cindyplug}
-echo "PathThead=\"${texbinpath}/\";" > ${cindyplug}/ketcindy.ini
-echo "Dirhead=\"${ketcindyscripts}\";" >> ${cindyplug}/ketcindy.ini
-echo "Homehead=\"${homehead}\";" >> ${cindyplug}/ketcindy.ini
-echo "setdirectory(Dirhead);" >> ${cindyplug}/ketcindy.ini
-echo "import(\"setketcindy.txt\");" >> ${cindyplug}/ketcindy.ini
-echo "import(\"ketoutset.txt\");" >> ${cindyplug}/ketcindy.ini
-echo "KetCindyPlugin and others copied to Cinderella"
+
+# 20190616from
+cd ${cindyplug}
+remake="y"
+if [ -e ketcindy.ini ]; then
+ echo "Contentes of ketcindy.ini : "
+ echo ""
+ cat ketcindy.ini
+ echo ""
+ read -p 'Do you want to remake ketcindy.ini? (y/n) : ' remake
+fi
+if [ ${remake} = "y" ]; then
+ echo "ketcindy.ini will be made"
+else
+ echo "finished"
+ sleep 1
+ exit 0
+fi
+# 20190616to
+
+echo "PathThead=\"${texbinpath}/\";" > ketcindy.ini
+echo "Dirhead=\"${ketcindyscripts}\";" >> ketcindy.ini
+echo "Homehead=\"${homehead}\";" >> ketcindy.ini
+echo "setdirectory(Dirhead);" >> ketcindy.ini
+echo "import(\"setketcindy.txt\");" >> ketcindy.ini
+echo "import(\"ketoutset.txt\");" >> ketcindy.ini
+
+echo "Choose TeX with the 1st(+2nd) character"
+read -p 'p=platex, u=uplatex, l=latex, x=xelatex, pd=pdflatex, lu=lualatex:' tex
+if [ ${tex} = "p" ]; then
+ tex="platex"
+fi
+if [ ${tex} = "u" ]; then
+ tex="uplatex"
+fi
+if [ ${tex} = "l" ]; then
+ tex="latex"
+fi
+if [ ${tex} = "x" ]; then
+ tex="xelatex"
+fi
+if [ ${tex} = "pd" ]; then
+ tex="pdflatex"
+fi
+if [ ${tex} = "lu" ]; then
+ tex="lualatex"
+fi
+echo "PathT=PathThead+\"${tex}\";" >> ketcindy.ini
+echo "Pathpdf=\"preview\";" >> ketcindy.ini
+
+pathM="/Applications/Maxima.app/Contents/Resources/maxima.sh"
+pathMn="/Applications/Maxima.app/Contents/Resources/opt/bin/maxima"
+find -f ${pathM}
+if [ $? -gt 0 ]; then
+ echo "PathM=\"${pathMn}\";" >> ketcindy.ini
+else
+ echo "PathM=\"${pathM}\";" >> ketcindy.ini
+fi
+echo "Mackc=\"open\";" >> ketcindy.ini
+
+echo "ketcindy.ini generated(updated)"
sleep 1
exit 0 \ No newline at end of file
diff --git a/Master/texmf-dist/doc/support/ketcindy/forMac/setwork.command b/Master/texmf-dist/doc/support/ketcindy/forMac/setwork.command
index b664316cda6..674c4237166 100755
--- a/Master/texmf-dist/doc/support/ketcindy/forMac/setwork.command
+++ b/Master/texmf-dist/doc/support/ketcindy/forMac/setwork.command
@@ -1,9 +1,5 @@
#!/bin/sh
-# 20190217
-# 190217from
-pathM="/Applications/Maxima.app/Contents/Resources/maxima.sh"
-pathMn="/Applications/Maxima.app/Contents/Resources/opt/bin/maxima"
-# 109217to
+# 20190614
cd `dirname $0`
if [ -e ../ketcindyfolder ]; then
cd ../ketcindyfolder
@@ -11,7 +7,8 @@ fi
echo Files will be copied from
echo " "`pwd`/work
changesetting=/.ketcindy.conf #181017
-dist=~/ketcindy #180913
+home=~
+dist=${home}/ketcindy #180913
cp -r -p work/ ${dist}/
if [ $? -gt 0 ]; then
echo Error:$?
@@ -20,66 +17,27 @@ else
echo Workfolder has been generated as ${dist}
echo " "This folder can be moved to any place ##180913
fi
-echo "Choose TeX with the 1st(+2nd) character"
-read -p 'p=platex, u=uplatex, l=latex, x=xelatex, pd=pdflatex, lu=lualatex:' tex
-if [ ${tex} = "p" ]; then
- tex="platex"
- cd doc/ketmanual
- cp -p KeTCindyReferenceJ.pdf ${dist}
- cp -p KeTCindyGuideJ.pdf ${dist}
- cp -p KeTpicStyleJ.pdf ${dist}
-fi
-if [ ${tex} = "u" ]; then
- tex="uplatex"
- cd doc/ketmanual
- cp -p KeTCindyReferenceJ.pdf ${dist}
- cp -p KeTCindyGuideJ.pdf ${dist}
- cp -p KeTpicStyleJ.pdf ${dist}
-fi
-if [ ${tex} = "l" ]; then
- tex="latex"
- cd doc/ketmanual
- cp -p KeTCindyReferenceE.pdf ${dist}
- cp -p KeTCindyGuideE.pdf ${dist}
- cp -p KeTpicStyleE.pdf ${dist}
-fi
-if [ ${tex} = "x" ]; then
- tex="xelatex"
- cd ketmanual
- cp -p KeTCindyReferenceE.pdf ${dist}
- cp -p KeTCindyGuideE.pdf ${dist}
- cp -p KeTpicStyleE.pdf ${dist}
-fi
-if [ ${tex} = "pd" ]; then
- tex="pdflatex"
- cd doc/ketmanual
- cp -p KeTCindyReferenceE.pdf ${dist}
- cp -p KeTCindyGuideE.pdf ${dist}
- cp -p KeTpicStyleE.pdf ${dist}
-fi
-if [ ${tex} = "lu" ]; then
- tex="lualatex"
- cd doc/ketmanual
+read -p 'Language (j/e) : ' lang
+cd doc/ketmanual
+if [ ${lang} = "e" ]; then
cp -p KeTCindyReferenceE.pdf ${dist}
cp -p KeTCindyGuideE.pdf ${dist}
cp -p KeTpicStyleE.pdf ${dist}
-fi
-dist=~ #180913
-echo generating ${dist}/${changesetting}
-echo // Re-setting PathT,PathR,Pathpdf,PathM,PathAd,Mackc >${dist}${changesetting}
-echo "PathT=PathThead+\"${tex}\";" >>${dist}${changesetting}
-read -p 'Choose pdfviewer from preview(p),skim(s): ' ans
-if [ ${ans} = "s" ]; then
- echo "Pathpdf=\"skim\";" >> ${dist}${changesetting}
else
- echo "Pathpdf=\"preview\";" >> ${dist}${changesetting}
-fi
-# 190217from
-find -f ${pathM}
-if [ $? -gt 0 ]; then
- echo "PathM=\"${pathMn}\";" >> ${dist}${changesetting}
+ cp -p KeTCindyReferenceJ.pdf ${dist}
+ cp -p KeTCindyGuideJ.pdf ${dist}
+ cp -p KeTpicStyleJ.pdf ${dist}
fi
-# 190217to
-echo "Mackc=\"open\";" >>${dist}${changesetting}
+
+echo Generating ${home}/${changesetting}
+echo // Re-setting PathT,PathR,Pathpdf,PathM,PathAd,Mackc >${home}${changesetting}
+echo "// PathT=PathThead+\"platex\";" >>${home}${changesetting}
+echo "// Pathpdf=\"skim\";" >> ${home}${changesetting}
+pathM="/Applications/Maxima.app/Contents/Resources/maxima.sh"
+pathMn="/Applications/Maxima.app/Contents/Resources/opt/bin/maxima"
+echo "// PathM=\"${pathM}\";" >> ${home}${changesetting}
+echo "// PathM=\"${pathMn}\";" >> ${home}${changesetting}
+echo "// Mackc=\"open\";" >>${home}${changesetting}
+
sleep 1
exit 0 \ No newline at end of file
diff --git a/Master/texmf-dist/doc/support/ketcindy/forWindows/ReadmeWinE.pdf b/Master/texmf-dist/doc/support/ketcindy/forWindows/ReadmeWinE.pdf
index 92eac65ecb0..29fadf12df0 100644
--- a/Master/texmf-dist/doc/support/ketcindy/forWindows/ReadmeWinE.pdf
+++ b/Master/texmf-dist/doc/support/ketcindy/forWindows/ReadmeWinE.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/forWindows/ReadmeWinJ.pdf b/Master/texmf-dist/doc/support/ketcindy/forWindows/ReadmeWinJ.pdf
index 6697753dce0..261ebf0a724 100644
--- a/Master/texmf-dist/doc/support/ketcindy/forWindows/ReadmeWinJ.pdf
+++ b/Master/texmf-dist/doc/support/ketcindy/forWindows/ReadmeWinJ.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/forWindows/setketcindy.bat b/Master/texmf-dist/doc/support/ketcindy/forWindows/setketcindykettex.bat
index d4bec341469..e00927639d8 100755
--- a/Master/texmf-dist/doc/support/ketcindy/forWindows/setketcindy.bat
+++ b/Master/texmf-dist/doc/support/ketcindy/forWindows/setketcindykettex.bat
@@ -1,4 +1,4 @@
-REM 20181207
+REM 20190616
echo off
rem Edit the followings if necessary
@@ -72,11 +72,90 @@ 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%%scripts%"; >> 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 5e8039cba81..9dd1ce8c64c 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 20181222
+REM 20190616
echo off
rem Edit the followings if necessary
@@ -75,11 +75,90 @@ echo Setting of "%cindyplug%\"
cd "%pathT%\%year%%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%\%year%%bin%\"; > ketcindy.ini
echo Homehead="%homehead%"; >> ketcindy.ini
echo Dirhead="%pathT%\%year%%scripts%"; >> 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/setketcindyw32J.bat b/Master/texmf-dist/doc/support/ketcindy/forWindows/setketcindyw32J.bat
index f385abcc0a3..719ae186e2b 100755
--- a/Master/texmf-dist/doc/support/ketcindy/forWindows/setketcindyw32J.bat
+++ b/Master/texmf-dist/doc/support/ketcindy/forWindows/setketcindyw32J.bat
@@ -1,4 +1,4 @@
-REM 20181222
+REM 20190616
echo off
rem Edit the followings if necessary
@@ -63,14 +63,6 @@ if exist "%pathT%%style%\." (
rd /s "%pathT%%style%"
)
-rem For kettexbasic 181222
-set scriptsold=\share\texmf-dist\tex\platex\ketcindy
-if exist "%pathT%%scriptsold%\." (
- echo Deleting "%pathT%%scriptsold%"
- rd /s "%pathT%%scriptsold%"
-)
-rem For kettexbasic end
-
echo Copying ketcindy styles to "%pathT%%style%"
set stylesrc=style
%xcp% /Y /Q /S /E /R "%stylesrc%\*.*" "%pathT%%style%\"
@@ -81,11 +73,90 @@ 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%%scripts%"; >> 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/setwork.bat b/Master/texmf-dist/doc/support/ketcindy/forWindows/setwork.bat
index 9ea13564669..d920e31c039 100755
--- a/Master/texmf-dist/doc/support/ketcindy/forWindows/setwork.bat
+++ b/Master/texmf-dist/doc/support/ketcindy/forWindows/setwork.bat
@@ -1,4 +1,4 @@
-REM 20181212
+REM 20190413
echo off
REM Edit the followings if necessary.
@@ -23,77 +23,25 @@ if exist "%dist%\." (
%xcp% /Y /Q /S /E /R "work\*.*" "%dist%\"
echo Workfolder has been generated as %dist%
echo This folder can be moved to any place
-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
- copy /Y "doc\ketmanual\KeTCindyReferenceJ.pdf" "%dist%\"
- copy /Y "doc\ketmanual\KeTCindyGuideJ.pdf" "%dist%\"
- copy /Y "doc\ketmanual\KeTpicStyleJ.pdf" "%dist%\"
-)
-if "%STR_INPUT%" == "u" (
- set tex=uplatex
- copy /Y "doc\ketmanual\KeTCindyReferenceJ.pdf" "%dist%\"
- copy /Y "doc\ketmanual\KeTCindyGuideJ.pdf" "%dist%\"
- copy /Y "doc\ketmanual\KeTpicStyleJ.pdf" "%dist%\"
-)
-if "%STR_INPUT%" == "l" (
- set tex=latex
- copy /Y "doc\ketmanual\KeTCindyReferenceE.pdf" "%dist%\"
- copy /Y "doc\ketmanual\KeTCindyGuideE.pdf" "%dist%\"
- copy /Y "doc\ketmanual\KeTpicStyleE.pdf" "%dist%\"
-)
-if "%STR_INPUT%" == "x" (
- set tex=xelatex
- copy /Y "doc\ketmanual\KeTCindyReferenceE.pdf" "%dist%\"
- copy /Y "doc\ketmanual\KeTCindyGuideE.pdf" "%dist%\"
- copy /Y "doc\ketmanual\KeTpicStyleE.pdf" "%dist%\"
-)
-if "%STR_INPUT%" == "pd" (
- set tex=pdflatex
- copy /Y "doc\ketmanual\KeTCindyReferenceE.pdf" "%dist%\"
- copy /Y "doc\ketmanual\KeTCindyGuideE.pdf" "%dist%\"
- copy /Y "doc\ketmanual\KeTpicStyleE.pdf" "%dist%\"
-)
-if "%STR_INPUT%" == "lu" (
- set tex=lualatex
+
+set /P STR_INPUT="Language (j/e) :"
+if("%STR_INPUT%" == "e" (
copy /Y "doc\ketmanual\KeTCindyReferenceE.pdf" "%dist%\"
copy /Y "doc\ketmanual\KeTCindyGuideE.pdf" "%dist%\"
copy /Y "doc\ketmanual\KeTpicStyleE.pdf" "%dist%\"
+) else (
+ copy /Y "doc\ketmanual\KeTCindyReferenceJ.pdf" "%dist%\"
+ copy /Y "doc\ketmanual\KeTCindyGuideJ.pdf" "%dist%\"
+ copy /Y "doc\ketmanual\KeTpicStyleJ.pdf" "%dist%\"
)
+
set dist=%HOMEPATH%
-echo generating %dist%\%changesetting%
-echo // Re-setting PathT,Pathpdf,PathAd > "%dist%%change%"
-echo PathT=PathThead+"%tex%"; >> "%dist%%change%"
-set prgSm=C:\Program Files (x86)\SumatraPDF\SumatraPDF.exe
-if not exist "%prgSm%" (
- set prgSm=C:\Program Files\SumatraPDF\SumatraPDF.exe
-)
-echo Pathpdf="%prgSm%"; >> "%dist%%change%"
-set /P STR_INPUT="Input version of R (ex)%verR% :"
-if not "%STR_INPUT:~0,1%" == "d" (
- set verR=%STR_INPUT%
-)
set prg=C:\Program Files
-if exist "%prg%\R\R-%verR%\bin\" (
- echo PathR="%prg%\R\R-%verR%\bin"; >> "%dist%%change%"
-) else (
- if exist "%prg% (x86)\R\R-%verR%\bin\" (
- echo "%prg% (x86)\R\R-%verR%\bin"; >> "%dist%%change%"
- ) else (
- echo "R-%verR% not found"
- )
-)
-set /P STR_INPUT="Input version of Maxima (ex)%verM% :"
-if not "%STR_INPUT:~0,1%" == "d" (
- set verM=%STR_INPUT%
-)
-echo %verM%
-set prg=C:\maxima-%verM%\bin\maxima.bat
-if exist "%prg%" (
- echo PathM="%prg%"; >> "%dist%%change%"
-) else (
- echo "Maxima-%verM% not found"
- )
-)
+echo generating %dist%\%changesetting%
+echo // Re-setting PathT,Pathpdf,PathAd > "%dist%%change%"
+echo //PathT=PathThead+"uplatex"; >> "%dist%%change%"
+echo //Pathpdf="%prg%\SumatraPDF\SumatraPDF.exe"; >> "%dist%%change%"
+echo //PathR="%prg%\R\R-xxxx\bin"; >> "%dist%%change%"
+echo //PathM="C:\maxima-x.xx.x\bin\maxima.bat"; >> "%dist%%change%"
+
pause
diff --git a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/3dlist.txt b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/3dlist.txt
index 417623d8882..340efcf9f04 100644
--- a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/3dlist.txt
+++ b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/3dlist.txt
@@ -1,83 +1,84 @@
-Ketinit3d,3d,22,81,Setwindow,Listplot,PutonCurve,Sprintf,Setangle,Addax
-Start3d,3d,85,164,Setfiles,Setwindow,Slider,Sprintf,Setangle,Ptseg3data
-Setangle,3d,168,239,Parapt,Xyzcoord,Defvar,Datalist3d,Projpara,textformat,Ptseg3data
-Getangle,3d,243,261,getangle,divoptions,Strsplit,181111,Toupper,textformat
-Angleselected,3d,265,266,IsAngle
-Isangle,3d,270,270
-Changestyle3d,3d,274,293,Changestyle
-Dist3d,3d,297,316
-Findangle,3d,320,337
-Cancoordpara,3d,341,349
-Zparapt,3d,353,357
-Projcoordpara,3d,361,366,Parapt,Zparapt
-Parapt,3d,370,376
-Parasubpt,3d,380,386
-Parasubptlog,3d,390,395
-Mainsubpt3d,3d,399,417
-ProjCurve,3d,421,471,Measuredepth
-Projpara,3d,475,544,Divoptions,Strsplit,Toupper,Projcurve,textformat,Com2nd,Setcolor,GetLinestyle,Texcom
-InvparaptPp,3d,548,603,textformat,Projpara,Nearestpt,Crossprod,Dotprod,Ptend,Numptcrv,Ptcrv
-Invparapt,3d,607,611,InvparaptPp
-Subgraph,3d,615,632,Measuredepth,Parasubpt,Textformat
-Spaceline,3d,636,728,Divoptions,Toupper,textformat,Projpara,Com2nd,Setcolor,GetLinestyle,Texcom,Subgraph
-Spacecurve,3d,732,898,Divoptions,Toupper,tmpfn,textformat,Assign,Projpara,Com2nd,Setcolor,GetLinestyle,Texcom,Subgraph
-Partcrv3d,3d,902,938,parapt,partcrv,Xyzcoord,Spaceline
-Joincrvs3d(,3d,942,1037,Joincrvs3d,Divoptions,Norm,textformat,Joincrvs,Projpara,Com2nd,Setcolor,GetLinestyle,Texcom,Subgraph
-Xyzax3data,3d,1041,1145,Divoptions,Toupper,Xyzaxparaname,textformat,Projpara,Com2nd,Setcolor,GetLinestyle,Texcom,Arrowhead,Letter,Parapt,Subgraph
-Xyzax3paraname,3d,1149,1191,Xyzaxparaname,Strsplit,Dqq,Parapt,Expr
-Datalist3d,3d,1195,1203
-Datalist2d,3d,1207,1215
-Embed,3d,1219,1307,Measuredepth,Divoptions,Assign,textformat,list,Projpara,Com2nd,Setcolor,GetLinestyle,Texcom,Subgraph
-Rotatepoint3d,3d,1311,1397,Rotate3pt,Measuredepth
-Rotatedata3d,3d,1401,1471,Divoptions,Rotatepoint3d,Flattenlist,textformat,RSform,Rotate3data,Textformat,Projpara,Com2nd,Setcolor,GetLinestyle,Texcom,Subgraph
-Translatepoint3d,3d,1475,1502,Translate3pt,Measuredepth
-Translatedata3d,3d,1506,1568,Divoptions,Measuredepth,Translatepoint3d,Flattenlist,RSform,Translate3data,textformat,Projpara,Com2nd,Setcolor,GetLinestyle,Texcom,Subgraph
-Reflectpoint3d,3d,1572,1596,Reflect3pt,Crossprod,Dotprod
-Reflectdata3d,3d,1600,1665,Divoptions,Reflectpoint3d,Flattenlist,textformat,Reflect3data,RSform,Textformat,Projpara,Com2nd,Setcolor,GetLinestyle,Texcom,Subgraph
-Scalepoint3d,3d,1670,1687,Scale3pt
-Scaledata3d,3d,1692,1761,Divoptions,Scalepoint3d,Flattenlist,textformat,RSform,Scale3data,Textformat,Projpara,Com2nd,Setcolor,GetLinestyle,Texcom,Subgraph
-Xyzcoord,3d,1765,1771,Mainsubpt3d
-PutonCurve3d,3d,1775,1791,PutonCurve,Nearestpt,Paramoncurve,PointonCurve,Xyzcoord,textformat,Defvar
-Mkpointlist,3d,1795,1912,Workprocess,Finddef,Norm,Parapt,Parasubpt,Putpoint,Mainsubpt3d,Defvar
-Mkseg3d,3d,1916,1958,list,Divoptions,Finddef,Spaceline
-Ptseg3data,3d,1962,1996,Parapt,Textformat,Parasubpt,Mainsubpt3d,Defvar,Mkpointlist,Mkseg3d
-Putonseg3d,3d,2000,2052,divoptions,Putonseg,Putpoint,Parapt,Norm,Textformat,Parasubpt,Xyzcoord,Defvar
-Putpoint3d,3d,2056,2114,Toupper,Xyzcoord,Defvar,Parapt,Putpoint,Parasubpt,Fixpoint3d
-Fixpoint3d,3d,2118,2135,Defvar,Parapt,textformat
-Letter3d,3d,2139,2159,Parapt,Letter
-Expr3d,3d,2163,2183,Parapt,Expr
-Perppt,3d,2187,2243,Putperp,Crossprod,IntersectsgpL,Dotprod,Defvar,Putpoint3d,Fixpoint3d,Drawpoint3d
-Perpplane,3d,2247,2288,findangle,Cancoordpara,Toupper,Putpoint3d,Defvar,Drawpoint3d
-Drawpoint3d,3d,2292,2308,Divoptions,Measuredepth,Parapt,Textformat,Parasubpt
-Pointdata3d,3d,2312,2321,Measuredepth,Parapt,Pointdata
-Putaxes3d,3d,2325,2336,Putpoint3d
-IntersectsgpL,3d,2340,2452,Divoptions,Strsplit,Toupper,Crossprod,Reflectpoint3d,Dotprod,Putpoint3d,Drawpoint3d
-Bezier3d,3d,2456,2553,Measuredepth,Bezier3,Divoptions,Toupper,Bezierpt,Assign,Spacecurve,textformat,RSform,Bezier,Projpara,GetLinestyle,Com2nd,Setcolor,Subgraph
-Putbezier3data,3d,2557,2595,Divoptions,Putpoint3d
-Mkbezierptcrv3d,3d,2599,2619,Mkbezierptcrv3,Putbezier3data,Bezier3
-Readobj,3d,2657,2759,Divoptions,Toupper,Removespace
-Concatobj,3d,2763,2833,divoptions,Toupper,dist3d
-VertexEdgeFace,3d,2870,3041,Divoptions,Strsplit,Toupper,Putpoint3d,Parapt,Defvar,Changestyle3d,Spaceline,list
-Phparadata,3d,3045,3147,Divoptions,list,PhHiddenData,Projpara,GetLinestyle,Com2nd,Setcolor,Changestyle3d,Drawlinetype,Toupper
-Nohiddenseg,3d,3151,3280,Parapt,Dotprod,Cancoordpara,IntersectsgpL,Projcoordpara,IntersectcrvsPp,Crossprod
-Nohiddensegs,3d,3284,3321,Nohiddenseg
-Nohiddenbyfaces,3d,3325,3495,Datalist3d,Changestyle3d,Flattenlist,Divoptions,Strsplit,Toupper,Nohiddensegs,Spaceline
-Faceremovaldata,3d,3499,3582,Divoptions,list,PhHiddenData,Projpara,GetLinestyle,Com2nd,Setcolor,Measuredepth,Changestyle3d,Drawlinetype,Toupper
-Fullformfunc,3d,3586,3668,Removespace
-Surffun,3d,3672,3688,Fullformfunc,Deffun
-Sf3data,3d,3692,3776,Surffun,Divoptions,Toupper,textformat,Spacecurve
-SfbdparadataR,3d,3780,3866,ConvertFdtoC,Divoptions,Toupper,Select,MkprecommandR,textformat,RSform,Dqq,CalcbyR,ReadOutData,Extractdata,Projpara
-Addpoints,3d,3870,3885,list,RSform,textformat
-CrvsfparadataR,3d,3889,3991,Changestyle,Divoptions,Toupper,RSform,Select,MkprecommandR,Addpoints,textformat,Rsform,Dqq,CalcbyR,ReadOutData,Extractdata,Projpara
-Crv3onsfparadataR,3d,3995,4095,Crvs3onfparadataR,Changestyle3d,Changestyle,Divoptions,Toupper,RSform,Select,MkprecommandR,textformat,Rsform,Dqq,Addpoints,CalcbyR,ReadOutData,Extractdata,Projpara
-Crv2onsfparadataR,3d,4099,4200,Crvs2onfparadataR,Changestyle,Divoptions,Toupper,RSform,Select,MkprecommandR,textformat,Rsform,Dqq,Addpoints,CalcbyR,ReadOutData,Extractdata,Projpara
-WireparadataR,3d,4204,4305,Divoptions,Toupper,Select,MkprecommandR,RSform,textformat,Rsform,Dqq,Addpoints,CalcbyR,ReadOutData,Extractdata,Projpara
-IntersectcrvsfR,3d,4309,4397,Divoptions,Toupper,RSform,textformat,Rsform,Dqq,Intersectcrvsf,c,for,Looprange,Appendrow,CalcbyR,ReadOutData
-SfcutparadataR,3d,4401,4498,Strsplit,Changestyle,Divoptions,Toupper,RSform,Select,MkprecommandR,textformat,Rsform,Dqq,CalcbyR,ReadOutData,Extractdata,Projpara
-Skeletonparadata,3d,4502,4506,Skeletondatacindy
-Skeletonparadata,3d,4711,4898,Datalist3d,Skeletondatacindy,Divoptions,Strsplit,Toupper,Anyselected,Flattenlist,isexists,Textformat,ProjcoordCurve,Makeskeletondata,Norm,Ptcrv,Invparapt,textformat,Projcurve,Changestyle3d,list,Skeletonpara3data,Projpara,ReadOutData,GetLinestyle,Com2nd,Setcolor,Subgraph,WriteOutData
-Makeskeletondata,3d,4902,5103,Columnlist,IntersectcrvsPp,Op,column,Dotprod,Norm,Kukannozoku,PointonCurve,Listplot
-Kukannozoku,3d,5107,5158
-ProjcoordCurve,3d,5164,5178
-Divnohidhid,3d,5182,5245,Divoptions,Toupper,assign,Dotprod,Changestyle3d,Spaceline,textformat
-Beziersurf,3d,5249,5304,factorial,Comb,Deffun,Op,Bterm,Defvar,Ball
+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
diff --git a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic1list.txt b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic1list.txt
index efbab6fcf3a..20063af4614 100644
--- a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic1list.txt
+++ b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic1list.txt
@@ -1,164 +1,149 @@
-Ketinit,basic1,41,170,Fillstore,Cindyname,Indexall,getname,iswindows,ismacosx,Changesetting,Changework,pathsep,Setwindow
-Fillstore,basic1,174,204
-Fillblack,basic1,208,222,Fillstore
-Fillrestore,basic1,226,238
-Readlines,basic1,242,253,readfile2str
-Changesetting,basic1,257,272,pathsep,getname,isexists
-Cindyname,basic1,276,283,Cdyname,Getcdyname
-Setwindow,basic1,287,324,Toupper,Lcrd,Pcrd,Putpoint
-Setfiles,basic1,328,341,Dqq
-Setparent,basic1,345,357,Dqq
-Dqq,basic1,361,361,DqDq
-DqDq,basic1,364,367
-PPa,basic1,371,372
-PaO,basic1,376,388
-PaC,basic1,392,404
-PPa,basic1,408,408
-Tab2list,basic1,412,474,Divoptions,Toupper,Indexall
-Columnlist,basic1,478,481
-Dispmat,basic1,485,507
-Sep1000,basic1,511,529
-Acos,basic1,533,536
-Asin,basic1,540,543
-Atan,basic1,547,550
-Sqr,basic1,554,557
-Factorial,basic1,561,569
-Norm,basic1,573,585
-Removespace,basic1,590,615
-Indexall,basic1,619,637
-Strsplit,basic1,641,652,Indexall
-Parlevel,basic1,656,656,Bracket
-Bracket,basic1,659,681,Indexall
-Pardiagram,basic1,685,781,Divoptions,Toupper,Bracket,Listplot,Letter,Expr
-Changework,basic1,785,843,Divoptions,Strsplit,Toupper,Indexall,isexists,Dqq,makedir,pathsep,iswindows,iskcexists,setexec
-Changestyle,basic1,847,879,Divoptions,Com2nd,Setcolor,GetLinestyle,Texcom
-Op,basic1,883,895
-Ptselected,basic1,899,913,Isptselected
-Finddef,basic1,917,936
-Findgeoinfo,basic1,940,965,Finddef
-Dependgeo,basic1,969,989,Finddef
-Workprocess,basic1,993,997,Drawprocess
-Drawprocess,basic1,1000,1045,Divoptions,Strsplit,Toupper,Dependgeo
-Sortpointlist,basic1,1049,1081
-Toupper,basic1,1085,1100
-Textformat,basic1,1104,1128
-Sprintf,basic1,1132,1149,Textformat
-Assign,basic1,1153,1210,Textformat
-Measuredepth,basic1,1214,1239
-Flattenlist,basic1,1243,1263,Measuredepth
-Divoptions,basic1,1267,1370,Strsplit,Toupper,Colorcmyk2rgb,Colorname2rgb
-Dotprod,basic1,1374,1380
-Crossprod,basic1,1384,1396
-Mvprod,basic1,1400,1418,Measuredepth
-Ptstart,basic1,1422,1427
-Ptend,basic1,1431,1436
-Numptcrv,basic1,1440,1445
-Ptcrv,basic1,1449,1454
-Invert,basic1,1458,1471,Listplot
-Paramoncrv,basic1,1475,1475,Paramoncurve
-Paramoncurve,basic1,1478,1504,Nearestpt,LLcrd
-Pointoncrv,basic1,1508,1508,Pointoncurve
-Pointoncurve,basic1,1511,1529
-Koutenseg,basic1,1533,1641
-IntersectcrvsPp,basic1,1647,1790,Divoptions,Measuredepth,LLcrd,Koutenseg
-Intersectcrvs,basic1,1794,1800,IntersectcrvsPp
-Intersectline,basic1,1808,1830,Dotprod,Crossprod
-Intersectseg,basic1,1834,1934,Op,Intersectline,Nearestpt
-Osplineseg,basic1,1938,1955,Dotprod,Bezier
-Intersectpartseg,basic1,1959,2061,Crossprod,Norm,Reflectpoint,Osplineseg,Intersectseg,Op,Intersectline
-Collectsameseg,basic1,2065,2107
-IntersectcurvesPp,basic1,2111,2217,LLcrd,Intersectpartseg,Collectsameseg,Nearestpt
-Intersectcurves,basic1,2221,2228,IntersectcurvesPp
-NearestptcrvPhy,basic1,2234,2243,Pcrd,Measuredepth,Nearestpt
-Nearestptcrv,basic1,2247,2253,Nearestpt
-Nearestpt,basic1,2257,2310,Measuredepth,Paramoncurve
-Derivative,basic1,2314,2405,Strsplit,Lineplot,IntersectcurvesPp,Pointoncurve,Dotprod,Divoptions,Toupper,PaO,Pcrd,Assign
-Tangentplot,basic1,2409,2456,Divoptions,Strsplit,Toupper,IntersectcurvesPp,Derivative,Lineplot
-Integrate,basic1,2460,2473,Integratefn,Integratedt
-Integratedt,basic1,2477,2509,Divoptions,Toupper,IntegrateO,Measuredepth,MeetCurve,LLcrd
-Integratefn,basic1,2513,2573,Divoptions,Toupper,Strsplit,Assign,IntegrateO,Textformat
-IntegrateO,basic1,2577,2656,Measuredepth,MeetCurve,LLcrd,Dotprod
-FindareaP,basic1,2660,2673,Lcrd
-FindareaO,basic1,2677,2698,Dist,IntegrateO
-Findarea,basic1,2702,2728,Divoptions,Strsplit,Toupper,FindareaO,FindareaP
-Findlength,basic1,2732,2744,Lcrd
-Inversefun,basic1,2748,2771,Textformat
-Com0th,basic1,2775,2779
-Com1st,basic1,2783,2788
-Com2nd,basic1,2792,2797
-Com2ndpre,basic1,2801,2805
-Texcom,basic1,2809,2816,Com2nd
-Ketcindylogo,basic1,2820,2824,Com2nd,Texcom
-Drwline,basic1,2828,2831,Textformat,Com2nd
-Dashline,basic1,2836,2838,Com2nd
-Invdashline,basic1,2842,2844,Com2nd
-Dottedline,basic1,2848,2850,Com2nd
-SetEnglish,basic1,2854,2857,Com0th,setlanguage
-Drawlinetype,basic1,2861,2882,Toupper,Drwline,Dashline,Invdashline,Dottedline
-Setunitlen,basic1,2886,2938
-Setmarklen,basic1,2942,2946,Com2nd,Textformat
-Setorigin,basic1,2950,2954,Com2nd,Textformat
-Fontsize,basic1,2958,2961,Com2nd
-Setpen,basic1,2965,2969,Com2nd
-Setscaling,basic1,2973,2987,Com0th,Setwindow
-Lcrd,basic1,2991,2999
-Pcrd,basic1,3003,3011
-LLcrd,basic1,3015,3024
-Doscaling,basic1,3028,3055,Lcrd,LLcrd
-Unscaling,basic1,3059,3086,Lcrd,LLcrd
-Setpt,basic1,3090,3096,Ptsize,Com2nd
-Definecolor,basic1,3100,3108,Texcom
-Setcolor,basic1,3112,3139,Texcom,Colorcmyk2rgb,Com2nd
-Colorrgb2cmyk,basic1,3143,3155
-Colorcmyk2rgb,basic1,3159,3166
-Colorrgbhsv,basic1,3170,3202
-Colorhsvrgb,basic1,3206,3220
-Colorrgbhsl,basic1,3224,3260
-Colorhslrgb,basic1,3264,3285,Hue2rgb
-Hue2rgb,basic1,3289,3307
-Colorrgbhwb,basic1,3311,3317,Colorrgbhsl,Colorcode
-Colorhwbrgb,basic1,3321,3346
-Colorcode,basic1,3350,3363,Colorrgb2cmyk,Colorcmyk2rgb,Colorrgbhsv,Colorrgbhsl,Colorrgbhwb,Colorhsvrgb,Colorhslrgb,Colorhwbrgb
-Colorname2rgb,basic1,3367,3415,Colorcmyk2rgb
-GetLinestyle,basic1,3419,3485,Drwline,Dashline,Invdashline,Dottedline,Textformat,Drwpt
-Chunderscore,basic1,3489,3524,PaO
-AddGraph,basic1,3528,3628,Divoptions,Flattenlist,Pcrd,Measuredepth,PaO,Listplot,Pointdata,Textformat,Com2nd,Setcolor,GetLinestyle,Texcom
-Joincrvs,basic1,3632,3728,LLcrd,Divoptions,Numptcrv,Ptstart,Ptend,Pcrd,Textformat,Com2nd,Setcolor,GetLinestyle,Texcom
-Partcrv,basic1,3732,3821,Measuredepth,Divoptions,Numptcrv,Ptstart,Ptend,Joincrvs,Nearestpt,LLcrd,Pcrd,Textformat,Lcrd,Com2nd,Setcolor,GetLinestyle,Texcom
-Opcrvs,basic1,3825,3833,Listplot
-Pointdata,basic1,3837,3963,Divoptions,Strsplit,Colorcmyk2rgb,Colorname2rgb,Toupper,Measuredepth,Pcrd,Setcolor,PaO,Texcom,Setpen,Textformat,Com2nd,Setpt
-Listplot,basic1,3967,4048,Divoptions,Strsplit,Toupper,Pcrd,Textformat,Com2nd,Setcolor,GetLinestyle,Texcom,Lcrd
-Lineplot,basic1,4052,4135,Strsplit,Toupper,Divoptions,Lcrd,Pcrd,Textformat,Com2nd,Setcolor,GetLinestyle,Texcom
-Plotdata,basic1,4139,4340,Divoptions,Strsplit,PaO,Dqq,Toupper,Assign,Norm,Measuredepth,Pcrd,Textformat,Com2nd,Setcolor,GetLinestyle,Texcom
-Paramplot,basic1,4344,4515,Divoptions,Strsplit,PaO,Dqq,Toupper, differs from Scilab ,Assign,Measuredepth,Pcrd,Textformat,Com2nd,Setcolor,GetLinestyle,Texcom
-Polarplot,basic1,4519,4528,Strsplit,Paramplot
-Connectseg,basic1,4532,4594,Norm
-Implicitplot,basic1,4598,4735,Divoptions,Strsplit,Toupper,Impfun,Connectseg,Measuredepth,Pcrd,Textformat,Com2nd,Setcolor,GetLinestyle,Texcom
-Circledata,basic1,4739,4855,Divoptions,Strsplit,Toupper,Lcrd,Defvar,Pcrd,Textformat,Lineplot,Com2nd,Setcolor,GetLinestyle,Texcom
-Framedata,basic1,4859,4984,Measuredepth,LLcrd,Toupper,Framedata2,Lcrd,Divoptions,Pcrd,Textformat,Com2nd,Setcolor,GetLinestyle,Texcom
-Framedata2,basic1,4988,4995,Lcrd,Framedata
-Ovaldata,basic1,4999,5069,Divoptions,Lcrd,Listplot,Circledata,Reflectdata,Joincrvs,Com2nd,Setcolor,GetLinestyle,Texcom,Pcrd,Textformat
-Segmark,basic1,5073,5133,Drawsegmark,Divoptions,Toupper,Circledata,Listplot
-Parabolaplot,basic1,5137,5177,Lcrd,Rotatepoint,Textformat,Plotdata,Rotatedata
-Ellipseplot,basic1,5181,5224,Lcrd,Rotatepoint,Paramplot,Rotatedata
-Hyperbolaplot,basic1,5228,5292,Divoptions,Toupper,Lcrd,Rotatepoint,Paramplot,Lineplot,Rotatedata
-Polygonplot,basic1,5296,5342,Divoptions,Strsplit,Toupper,Lcrd,Putpoint,Listplot
-Putintersect,basic1,5346,5374,Intersectcrvs,Putpoint
-Setarrow,basic1,5378,5404
-Arrowheaddata,basic1,5409,5502,Divoptions,Strsplit,Toupper,Touppera,Measuredepth,Nearestpt,|Ptend,Ptstart,Numptcrv,Ptcrv,LLcrd,IntersectcrvsPp,Pcrd
-Arrowhead,basic1,5506,5598,Strsplit,Toupper,Measuredepth,Pcrd,Arrowheaddata,Inwindow,Listplot,Divoptions,Dqq,Textformat,LLcrd,Setcolor,Com2nd,Texcom
-Arrowdata,basic1,5602,5705,Divoptions,Strsplit,Toupper,Pcrd,Textformat,Listplot,LLcrd,Arrowhead,Lcrd
-Anglemark,basic1,5709,5823,Divoptions,Strsplit,Letter,Expr,Toupper,Lcrd,Defvar,Pcrd,Textformat,Com2nd,Setcolor,GetLinestyle,Texcom
-Paramark,basic1,5827,5913,Divoptions,Letter,Expr,Lcrd,Defvar,Pcrd,Textformat,Com2nd,Setcolor,GetLinestyle,Texcom
-MakeBowdata,basic1,5917,5930,Lcrd,Rotatepoint
-Bowdata,basic1,5934,6106,Divoptions,Lcrd,Strsplit,Letterrot,Letter,Exprrot,Expr,Toupper,MakeBowdata,Defvar,Norm,LLcrd,Measuredepth,Pcrd,Textformat,Com2nd,Setcolor,GetLinestyle,Texcom
-Bowname,basic1,6110,6113,Expr
-Bownamerot,basic1,6117,6131,Measuredepth,Ptend,Ptstart,Exprrot
-Deqdata,basic1,6135,6193,funP,Lcrd,funN
-Deqplot,basic1,6197,6341,Lcrd,Divoptions,Toupper,Indexall,Deqdata,Pcrd,Assign,Textformat,RSform,Com2nd,Setcolor,GetLinestyle,Texcom
-Enclosing,basic1,6509,6675,Divoptions,isList,Lcrd,Listplot,IntersectcurvesPp,Prepend,Op,Length,Partcrv,Pointoncurve,Pcrd,Enclosing2,PaO,Textformat,Com2nd,Setcolor,GetLinestyle,Texcom,LLcrd
-Makehatch,basic1,6683,6785,Lineplot,Intersectseg,Norm,Listplot
-Anyselected,basic1,6789,6797
-Hatchdata,basic1,6801,7097,HatchdataR,Hatchdatacindy,Listplot,Joincrvs,Enclosing2,Divoptions,Strsplit,Toupper,Anyselected,Bracket,isexists,Makehatch,Textformat,PaO,ReadOutData,Com2nd,Setcolor,GetLinestyle,Texcom,WriteOutData,LLcrd
-Shadein,basic1,7101,7188,Framedata,Partcrv,Paramoncrv,Listplot,IntersectcurvesPp,Pointoncrv,Joincrvs,Inwindow
-Shade,basic1,7192,7320,Divoptions,Strsplit,Toupper,Colorcmyk2rgb,Enclosing,Shadein,Joincrvs,Pcrd,PaO,Listplot,Textformat,Texcom,Dqq,Setcolor
+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
diff --git a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic2list.txt b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic2list.txt
index 8a676d6c07f..32e67feb5c2 100644
--- a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic2list.txt
+++ b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic2list.txt
@@ -1,119 +1,97 @@
-Dispchoice,basic2,22,27
-Datetime,basic2,31,42,getdatetime
-Rotatepoint,basic2,46,56,Lcrd
-Translatepoint,basic2,60,70,Lcrd
-Scalepoint,basic2,74,84,Lcrd
-Reflectpoint,basic2,88,113,Lcrd
-Rotatedata,basic2,117,190,Divoptions,Lcrd,Measuredepth,LLcrd,Pcrd,Textformat,RSform,Com2nd,Setcolor,GetLinestyle,Texcom
-Translatedata,basic2,194,259,Divoptions,Lcrd,Measuredepth,LLcrd,Pcrd,RSform,Textformat,Com2nd,Setcolor,GetLinestyle,Texcom
-Scaledata,basic2,263,352,Divoptions,Lcrd,Measuredepth,LLcrd,Pcrd,Textformat,RSform,Com2nd,Setcolor,GetLinestyle,Texcom
-Reflectdata,basic2,356,437,Divoptions,Lcrd,Measuredepth,LLcrd,Pcrd,RSform,Textformat,Com2nd,Setcolor,GetLinestyle,Texcom
-Mksegments,basic2,442,457,Listplot
-Mkcircles,basic2,462,482,Strsplit,Circledata
-MakeRarg,basic2,486,499,RSslash,Textformat
-Htickmark,basic2,503,526,Listplot,Expr
-Vtickmark,basic2,530,551,Listplot,Expr,180710to// tmp=MakeRarg
-Vtick,basic2,555,565,Listplot
-Htick,basic2,569,581,LLcrd,Listplot
-Setax,basic2,585,602
-Drwxy,basic2,606,699,Divoptions,Strsplit,Toupper,Arrowdata,Listplot,Expr,Letter,Addax
-Drwpt,basic2,703,712,Pointdata
-Drawpoint,basic2,715,743,Measuredepth,Textformat,Com2nd,Drwpt,Setpen
-Addax,basic2,747,750
-Expr,basic2,754,768,Letter
-Letter,basic2,772,867,Divoptions,Removespace,Strsplit,Toupper,RSslash,Setcolor,Com2nd,Lcrd,Texcom,Pcrd
-Letterrot,basic2,871,913,Divoptions,Letter,Setcolor,Com2nd,Dqq,Texcom
-Exprrot,basic2,917,960,Divoptions,Expr,Setcolor,Com2nd,Dqq,Texcom
-Slider,basic2,964,1011,Toupper,Strsplit,Indexall,Putpoint,Listplot,Putonseg
-Putpoint,basic2,1015,1026,Textformat,Pcrd
-Putpoint,basic2,1030,1041,Textformat,Pcrd
-Bezierpt,basic2,1045,1070,Lcrd
-Bezier,basic2,1074,1086,BezierCurve
-BezierCurve,basic2,1089,1166,Divoptions,Measuredepth,Lcrd,Bezierpt,Pcrd,Textformat,RSform,Bezier,Com2nd,Setcolor,GetLinestyle,Texcom
-Readcsvsla,basic2,1170,1218,Readplotdigdata,Divoptions,Translatedata
-Putbezierdata,basic2,1222,1284,Divoptions,Putpoint,Lcrd,Letter
-Bezierstart,basic2,1288,1290
-Mkbezierptcrv,basic2,1294,1320,Readcsvsla,Measuredepth,Putbezierdata,Bezier
-Mkbeziercrv,basic2,1324,1335,Measuredepth,Bezier
-Writebezier,basic2,1339,1381,Bezier,PaO,WriteOutData
-Readbezier,basic2,1385,1437,Divoptions,Toupper,ReadOutData,Measuredepth,Putpoint,Bezier
-Ospline,basic2,1441,1500,Dotprod,Lcrd,Bezier
-CRspline,basic2,1504,1550,Lcrd,Reflectpoint,Bezier
-Beziersmooth,basic2,1554,1615,Bzspline,Putpoint,Lcrd,Bezier
-Beziersym,basic2,1619,1668,Bzsspline,Lcrd,Putpoint,Bezier
-Listbspline2bz,basic2,1672,1687,Lcrd
-Bspline,basic2,1691,1699,Listbspline2bz,BezierCurve
-MeetCurve,basic2,1703,1763,Measuredepth,LLcrd,Lcrd
-Putonline,basic2,1767,1787,LLcrd,Lineplot,Putonseg
-Putonseg,basic2,1791,1827,LLcrd,Divoptions,Lcrd,Putpoint,Pcrd,Textformat
-Putoncurve,basic2,1831,1860,putoncurve,Putpoint,Paramoncurve,Putonseg,Textformat,Ptend
-CrossPoint,basic2,1864,1882,MeetCurve,Putpoint
-Periodfun,basic2,1886,1972,Toupper,Op,Plotdata,Textformat,Translatedata,Listplot
-Fourierseries,basic2,1976,2001,Assign,Plotdata
-Tabledatalight,basic2,2005,2086,Divoptions,Toupper,Tlistplot,Tsegrmv,Addax,Setwindow
-Tabledata,basic2,2090,2220,Divoptions,Toupper,Putpoint,Tgrid,Tlistplot,Tsegrmv,Addax,Setwindow
-Tseginfo,basic2,2224,2244
-Tsegrmv,basic2,2248,2290,Tseginfo,Changestyle,Tlistplot
-Tgrid,basic2,2294,2308
-Tlistplot,basic2,2312,2341,divoptions,Toupper,Tgrid,Listplot
-ChangeTablestyle,basic2,2345,2398,Indexall,Changestyle,Tlistplot
-Findcell,basic2,2402,2428,Tgrid
-Putcell,basic2,2432,2467,Findcell,Letter
-Putcellexpr,basic2,2471,2483,Putcell
-Putrow,basic2,2487,2502,Putcellrow,Putcell
-Putrowexpr,basic2,2506,2519,Putrow
-PutcoL,basic2,2523,2538,Putcellexpr,Putcell
-PutcoLexpr,basic2,2542,2555,Putcellexpr,PutcoL
-Setrange,basic2,2559,2565,Pcrd
-RSform,basic2,2569,2603,PaO,Bracket,PPa
-RSslash,basic2,2607,2612
-Rform,basic2,2616,2626,PaO
-Defvar,basic2,2630,2674
-IftoR,basic2,2678,2717,PaO,Indexall,Bracket
-FortoR,basic2,2721,2750,PaO,Bracket
-Deffun,basic2,2754,2801,Bracket,Indexall,FortoR,IftoR,RSform,PaO
-Inwindow,basic2,2805,2817
-Dashlinedata,basic2,2821,2894
-Windispg,basic2,2898,2961,Drwxy,Measuredepth,Dashlinedata,Textformat
-WritetoRS,basic2,2965,3198,WritetoSci,Lcrd,c,Assignadd,Datetime,source,Setwindow,Textformat,Openfile,Cindyname,RSform,PPa,iswindows,Indexall,Dqq,PaO
-Extractdata,basic2,3202,3258,Divoptions,ReadOutData,Com2nd,Setcolor,GetLinestyle,Texcom
-RemoveOut,basic2,3262,3272
-ReadOutData,basic2,3276,3389,Divoptions,Strsplit,Toupper,Pcrd,Textformat
-WriteOutData,basic2,3393,3455,Flattenlist,Measuredepth
-Makeshell,basic2,3459,3562,kc
-Convsjiswin,basic2,3566,3590,nkfwin,nkfcpdel,isexists,pathsep
-Makebat,basic2,3594,3734,kc,iswindows,isincludefull,isexists,Indexall
-Addpackage,basic2,3738,3756
-Usegraphics,basic2,3760,3770,Addpackage
-Viewtex,basic2,3774,3847,iswindows,Makebat,kc,Makeshell,WritetoRS
-Viewparent,basic2,3851,3869,isexists,iswindows,Makebat,Makeshell,WritetoRS,kc
-Makecmdlist,basic2,3873,3903
-Savecmdlist,basic2,3907,3913
-Quicksort,basic2,3917,3937
-Lessstr,basic2,3941,3968
-Figpdf,basic2,3972,4089,Removespace,isexists
-Makehelplist,basic2,4093,4137,PPa
-Helplist,basic2,4141,4195,Makehelplist
-Help,basic2,4199,4250
-Helpkey,basic2,4254,4272,Help
-Slidework,basic2,4276,4295,isexists,makedir,pathsep,Changework
-Setslidemargin,basic2,4299,4302
-Setslidepage,basic2,4306,4331
-Setslidemain,basic2,4335,4359
-Setslidebody,basic2,4363,4400
-Setslidehyper,basic2,4404,4482,Divoptions,Addpackage,Indexall,Toupper
-Settitle,basic2,4486,4557,Toupper,Indexall
-Maketitle,basic2,4561,4656,iswindows,Makebat,Makeshell,kc,Cindyname,isexists,PaO
-Repeatsameslide,basic2,4660,4815,Indexall
-Presentation,basic2,4819,5484,readfile2str,isexists,Removespace,fileslist,Repeatsameslide
-Mkslides,basic2,5488,5552,Fillblack,Changework,Setdirectory,setexec,isexists,Presentation,iswindows,Makebat,Makeshell,kc,pathsep,Fillrestore
-Mkslidesummary,basic2,5556,5621,Fillblack,pathsep,ismacosx,setexec,PPa,PaO,CalcbyR,iswindows,Makebat,Makeshell,kc,Changework,Fillstore
-Example,basic2,5625,5649
-BBdata,basic2,5653,5796,Divoptions,Toupper,ismacosx,iswindows,kc,Sprintf,Removespace
-Findfun,basic2,5800,5863,Removespace,Indexall
-Extractfun,basic2,5867,5884,Indexall,Findfun
-Extractall,basic2,5893,5920
-Copyketcindyjs,basic2,5924,5985,iswindows,Dqq,kc
-Ketjsoption,basic2,5989,5990,Setketcindyjs
-Setketcindyjs,basic2,5994,6011,Divoptions
-Mkketcindyjs,basic2,6015,6431,Strsplit,Toupper,Copyketcindyjs,isexists,Extractfun,Extractall,pathsep,Readlines,Removespace,Dqq,Indexof,Indexall,rgb
+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
diff --git a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic3list.txt b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic3list.txt
new file mode 100644
index 00000000000..9cacb8566f9
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic3list.txt
@@ -0,0 +1,56 @@
+Tenkeybrd,basic3,22,54,Strsplit,Toupper,Framedata2,Shade,Tabledata,Addax
+Keyaction,basic3,58,83
+Dispchoice,basic3,87,92
+Datetime,basic3,96,107,getdatetime
+Readcsvsla,basic3,111,159,Readplotdigdata,Divoptions,Translatedata
+Writebezier,basic3,163,205,PaO,WriteOutData
+Readbezier,basic3,209,261,Divoptions,Toupper,Readoutdata,Measuredepth,Putpoint,Bezier
+RSform,basic3,265,299,PaO,Bracket,PPa
+RSslash,basic3,303,308
+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
diff --git a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/commonused.txt b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/commonused.txt
deleted file mode 100644
index 81fbf2609e1..00000000000
--- a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/commonused.txt
+++ /dev/null
@@ -1,401 +0,0 @@
-Ketinit():=Ketinit("fig",1,[-5,5],[-5,5]); //181001
-Ketinit(Arg):=(//181001from
- if(isstring(Arg),
- Ketinit(Arg,1,[-5,5],[-5,5]);
- ,
- Ketinit("fig",Arg,[-5,5],[-5,5]);
- );
-);
-Ketinit(work,sy,rangex,rangey):=(//181001to
- regional(pt,tmp,tmp1,tmp2,letterc,boxc,shadowc,mboxc);
- PenThickInit=8;
- ULEN="1cm";
- MEMORI=0.05;//18.01.15from
- MEMORIInit=MEMORI;
- MEMORINow=MEMORI;
- MARKLEN=0.05;
- MARKLENInit=MARKLEN; //180504
- MARKLENNow= MARKLEN;
- GENTEN=[0,0];//18.01.15until
- KETPICLAYER=20;
- MilliIn=1/2.54*1000;
- PenThick=round(MilliIn*0.02);
- PenThickInit=PenThick;
- TenSizeInit=0.02;
- TenSize=TenSizeInit;
- YaSize=1; YaAngle=18; YaPosition=1;
- YaCut=0; YasenStyle="dr,1"; Yajiristyle="tf";
- KETPICCOUNT=1;
- KCOLOR=[0,0,0];
- GLIST=[];
- GCLIST=[];
- GOUTLIST=[];
- POUTLIST=[];
- VLIST=[];
- FUNLIST=[];
- LETTERlist=[];
- COM0thlist=[];
- COM1stlist=[];
- COM2ndlist=[];
- ADDAXES="1";
- AXSTYLE=["l","x","e","y","n","O","sw","","",""]; //181216
- AXCOUNT=1; //181215
- SHADECTR=1; //190222
- LFmark=unicode("000a");
- CRmark=unicode("000d");//16.12.13
- Dq=unicode("0022");
- CommonMake=0;//180610
- WaitUnit=10;
- CONTINUED=0;
- OutComList=[];
- OutFileLIst=[]; // 15.10.22
- FigPdfList=[]; // 16.04.08
- Fillstore(); //181212
- ADDPACK=[]; // 16.05.16
- GPACK="tpic"; //180817
- ErrFlag=0;
- KETJSOP=[]; //190129
- ArrowlineNumber=1; // 15.01.05
- ArrowheadNumber=1;
- BezierNumber=1; //15.01.03
- SCALEX=1;
- SCALEY=sy;
- XMIN=rangex_1/SCALEX;
- XMAX=rangex_2/SCALEX;
- YMIN=rangey_1/SCALEY;
- YMAX=rangey_2/SCALEY;
- Setwindow("Msg=n"); // 16.05.31
-);
-Fillstore():=(
- regional(tmp,tmp1,out,dtL,txtL,clrL,txt,clr,nn,jj);
- dtL=[ //181209from
- ["Figure",[1,0.29,0.29]],["Parent",[1,1,0]],
- ["ParaF",[0,1,1]],["Flip",[0,0,1]],["Anime",[0.51,0.95,1]],
- ["Title",[0,1,0]],["Slide",[0.47,0,0.72]],["Digest",[1,0.74,0.47]],
- ["KeTJS",[0,1,1]],["KeTJSoff",[0,1,1]],
- ["Objview",[0,1,0]]
- ];
- txtL=apply(dtL,#_1);
- clrL=apply(dtL,#_2);
- tmp1=allelements();
- tmp1=select(tmp1,indexof(#.name,"Text")>0);
- out=[];
- forall(1..(length(tmp1)),nn,
- tmp=tmp1_nn;
- txt=tmp.text;
- tmp=select(1..(length(txtL)),txtL_#==txt);
- if(length(tmp)>0,
- jj=tmp_1;
- clr=clrL_jj;
- tmp=tmp1_nn;
- tmp.fillcolor=clr;
- ,
- tmp=tmp1_nn;
- clr=tmp.fillcolor;
- );
- out=append(out,[tmp.name,clr,tmp.text]);
- ); //181209to
- out;
-);
-Setwindow():=Setwindow("Msg=yes");
-Setwindow(str):=(
- regional(tmp,tmp1,tmp2,msg);
- msg="y";
- tmp=indexof(str,"="); // 16.02.10
- tmp1=Toupper(substring(str,tmp,tmp+1));
- if(tmp1=="N",msg="n");
- if((ispoint(SW) & ispoint(NE)),
- tmp1=Lcrd(SW);
- tmp2=Lcrd(NE);
- XMIN=tmp1_1; XMAX=tmp2_1;
- YMIN=tmp1_2; YMAX=tmp2_2;
- ,
- Putpoint("SW",Pcrd([XMIN,YMIN]));
- Putpoint("NE", Pcrd([XMAX,YMAX]));
- );
- if(msg=="y",
- println("Setwindow(["+XMIN+","+XMAX+"],["+YMIN+","+YMAX+"])");
- );
- layer(KETPICLAYER);
- autoclearlayer(KETPICLAYER,true);
- drawpoly([Pcrd([XMIN,YMIN]), Pcrd([XMAX,YMIN]),
- Pcrd([XMAX,YMAX]),Pcrd([XMIN,YMAX])],color->[1,1,1]);
-);
-Setwindow(xrange,yrange):=(
- XMIN=xrange_1;
- XMAX=xrange_2;
- YMIN=yrange_1;
- YMAX=yrange_2;
- Putpoint("SW",[XMIN,YMIN]);//181016
- Putpoint("NE",[XMAX,YMAX]);//181016
-);
-Textformat(value,dig):=(
- regional(vv,tmp,tmp1);
- if(islist(value),
- tmp1="[";
- forall(value,
- tmp1=tmp1+Textformat(#,dig)+",";
- );
- if(length(tmp1)>1, //18.01.29from
- tmp1=substring(tmp1,0,length(tmp1)-1);
- );
- tmp1=tmp1+"]"; //18.01.29until
- ,
- if(ispoint(value) % isstring(value),
- if(isstring(value),tmp1=Dq+value+Dq,tmp1=text(value)); // 15.10.02
- ,
- tmp1=format(value,dig);
- );
- );
- tmp1;
-);
-Measuredepth(list):=(
- regional(tmp,tmp1,Depth,Flg);
- Flg=0;
- Depth=0;
- if(length(list)>0, //180501
- if(ispoint(list),
- Depth=0;
- Flg=1;
- ,
- tmp1=select(1..(length(list)),length(list_#)>0);//17.05.21from
- tmp=list_(tmp1_1);//17.05.21until
- );
- repeat(4,
- if(Flg==0,
- if(islist(tmp),
- tmp=tmp_1;
- Depth=Depth+1;
- ,
- if(ispoint(tmp),Depth=Depth+1);
- Flg=1;
- );
- );
- );
- );//180501
- Depth;
-);
-Drwxy():=Drwxy(0,[]); //190103from
-Drwxy(Arg):=(
- if(islist(Arg),Drwxy(0,Arg); Drwxy(Arg,[]));
-);
-Drwxy(add):=Drwxy(add,[]);
-Drwxy(add,optionsorg):=( //190103to
- regional(options,color,eqL,strL,org,xrng,yrng,ax,st,nn,size,
- linesty,colorax,colorla,tmp,tmp1,tmp2);
- options=optionsorg;
- tmp=Divoptions(options);
- color=tmp_(length(tmp)-2);
- eqL=tmp_5;
- org=GENTEN;
- xrng=[XMIN,XMAX]; //190103
- yrng=[YMIN,YMAX]; //190103
- ax=AXSTYLE;
- linesty=ax_8;
- if(isstring(ax_9),colorax=ax_9,colorax=text(ax_9));
- if(length(colorax)>0,
- colorax="Color="+colorax;
- );
- if(isstring(ax_10),colorla=ax_10,colorla=text(ax_10));
- if(length(colorla)>0, //181217from
- colorla="Color="+colorla;
- ,
- if(length(colorax)>0,
- colorla=colorax;
- );
- ); //181217to
- forall(eqL,
- tmp=Strsplit(#,"=");
- tmp1=Toupper(substring(tmp_1,0,1));
- if(tmp1=="O", //190103from
- org=parse(tmp_2);
- options=remove(options,[#]);
- ); //190103to
- if(tmp1=="X",
- xrng=parse(tmp_2);
- options=remove(options,[#]);
- );
- if(tmp1=="Y",
- yrng=parse(tmp_2);
- options=remove(options,[#]);
- );
- if(tmp1=="A",
- tmp2=tokenize(tmp_2,",");
- st=1; nn=1;
- if(isreal(tmp2_1),
- st=2;
- nn=tmp2_1;
- );
- forall(st..(length(tmp2)),
- tmp=tmp2_#;
- if(length(tmp)>0,ax_nn=tmp);
- nn=nn+1;
- );
- options=remove(options,[#]);
- );
- );
- options=append(options,linesty); //181216
- if(substring(ax_1,0,1)=="a",
- strL=select(options,isstring(#)); //181216
- tmp=select(strL,contains(["dr","da","do","id"],substring(#,0,2)));
- if(length(tmp)==0,options=append(options,YasenStyle));
- tmp=substring(ax_1,1,length(ax_1)); //181216[2lines]
- if(length(tmp)>0,size=parse(tmp),size=YaSize);
- tmp1=concat(options,[size,YaAngle,YaPosition,YaCut,colorax]);//181216
- tmp=[[xrng_1,org_2],[xrng_2,org_2]];
- Arrowdata("axx"+text(AXCOUNT),tmp,tmp1);
- tmp=[[org_1,yrng_1],[org_1,yrng_2]];
- Arrowdata("axy"+text(AXCOUNT),tmp,tmp1);
- ,
- tmp=[[xrng_1,org_2],[xrng_2,org_2]];
- tmp1=append(options,colorax);//181216
- Listplot("axx"+text(AXCOUNT),tmp,tmp1);
- tmp=[[org_1,yrng_1],[org_1,yrng_2]];
- Listplot("axy"+text(AXCOUNT),tmp,tmp1);
- );
- AXCOUNT=AXCOUNT+1;
- Expr([[xrng_2,org_2],ax_3,ax_2],[colorla]);//181216[3lines]
- Expr([[org_1,yrng_2],ax_5,ax_4],[colorla]);
- Letter([org,ax_7,ax_6],[colorla]);
- if(add==0, //190103
- Addax(0);
- );
-);
-Dashlinedata(dataorg,sen,gap,ptn):=(
- regional(data,eps,dtall,len,lenlist,ii,lenall,kari,
- naga,tobi,nsen,seglist,segunit,hajime,owari,jj,
- flg,tt,ptL,out,tmp,tmp1,tmp2);
- eps=10.0^(-6);
- if(isstring(dataorg),data=parse(dataorg),data=dataorg);
- dtall=length(data);
- out=[];
- len=0; lenlist=[0];
- forall(2..dtall,ii,
- len=len+|data_ii-data_(ii-1)|;
- lenlist=append(lenlist,len);
- );
- lenall=lenlist_dtall;
- if(lenall>0,
- kari=(sen+gap)*0.1;naga=sen*0.1;tobi=gap*0.1;
- if(|data_1-data_dtall|<eps,
- nsen=max([re(ceil(lenall/kari)),3]);
- segunit=lenall/nsen;
- naga=segunit*sen/(sen+gap);
- tobi=segunit*gap/(sen+gap);
- seglist=apply(0..(nsen-1),#*segunit);
- ,
- if(ptn==0,
- nsen=max([re(ceil((lenall+tobi)/kari)),3]);
- segunit=lenall*(sen+gap)/(nsen*sen+(nsen-1)*gap);
- naga=segunit*sen/(sen+gap);
- tobi=segunit*gap/(sen+gap);
- seglist=apply(0..(nsen-1),#*segunit);
- ,
- nsen=max([re(ceil((lenall+naga)/kari)),3]);
- segunit=lenall*(sen+gap)/((nsen-1)*sen+nsen*gap);
- naga=segunit*sen/(sen+gap);
- tobi=segunit*gap/(sen+gap);
- seglist=apply(0..(nsen-2),tobi+#*segunit);
- );
- );
- hajime=1;owari=1;
- forall(1..(length(seglist)),ii,
- len=seglist_ii;
- flg=0;
- forall(owari..dtall,jj,
- if(flg==0,
- if(len<lenlist_jj-eps,
- flg=jj;
- );
- );
- );
- if(flg>0,hajime=flg-1);
- flg=0;
- forall(hajime..dtall,jj,
- if(flg==0,
- if(len+naga<lenlist_jj-eps,
- flg=jj;
- );
- );
- );
- if(flg>0,owari=flg-1);
- tt=len-lenlist_hajime;
- tt=tt/(lenlist_(hajime+1)-lenlist_hajime);
- tmp=data_hajime+tt*(data_(hajime+1)-data_hajime);
- ptL=[tmp];
- forall((hajime+1)..owari,jj,
- ptL=append(ptL,data_jj);
- );
- tt=(len+naga-lenlist_owari);
- tt=tt/(lenlist_(owari+1)-lenlist_owari);
- tmp=data_owari+tt*(data_(owari+1)-data_owari);
- ptL=append(ptL,tmp);
- out=append(out,ptL);
- );
- );
- out;
-);
-Windispg():=(
- if(ADDAXES=="1", //181215from
- Drwxy();
- ADDAXES="0";
- ); //181215to
- Windispg(GCLIST); //190125
-);
-Windispg(gcLorg):=( //190125
- regional(gcL,Nj,Nk,Dt,Vj,tmp,tmp1,tmp2,tmp3,tmp4,opcindy);
- gcL=gcLorg; //190125from
- if(length(gcL)>0,
- if(!islist(gcL_1),gcL=[gcL]);
- ); //190125to
- gsave();
- layer(KETPIClayer);
- forall(gcL,Nj,
- if(isstring(Nj_1),Dt=parse(Nj_1),Dt=Nj_1); // 11.17
- if(islist(Dt) & length(Dt)>0, // 12.19,12.22
- tmp=Measuredepth(Dt);
- if(tmp==1,Dt=[Dt]);
- opcindy=Nj_3;
- tmp=Nj_2; //190119from
- if(!islist(tmp),tmp=[tmp,""]); //190123
- if(tmp_1<0,tmp1=0,tmp1=tmp_1); //190119from
- if(tmp1<10,
- forall(Dt,Nk,
- if(length(Nk)>1,
- tmp3="";
- if(indexof(opcindy,"color")==0, //190122from
- tmp3=tmp3+",linecolor->"+KCOLOR;
- );
- tmp3=tmp3+opcindy;
- if(tmp1==0, //190126from
- if((length(tmp_2)>0)&(indexof(opcindy,"size")==0),
- tmp3=tmp3+",size->"+tmp_2;
- ); //190124to
- tmp="connect("+Textformat(Nk,5)+tmp3+");";//190125
- parse(tmp);
- ,
- if(tmp1==1,
- tmp4=Dashlinedata(Nk,2.5,2.5,0);
- forall(tmp4,
- tmp="connect("+Textformat(#,5)+tmp3+");";
- parse(tmp);
- );
- ,
- tmp3=",dashtype->"+text(tmp1)+tmp3;
- forall(1..(length(Nk)-1),
- tmp="draw("+Textformat([Nk_#,Nk_(#+1)],5)+tmp3+");";
- parse(tmp);
- );
- );
- );
- ,
- tmp="draw("+text(Nk_1)+opcindy+");"; // 14.12.31
- parse(tmp);
- ); //190126to
- );
- );
- );
- );
- grestore();
- layer(0);
-);
diff --git a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/ignoredfun.txt b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/ignoredfun.txt
index d8dedb061c6..5f388e67016 100644
--- a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/ignoredfun.txt
+++ b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/ignoredfun.txt
@@ -1,3 +1,4 @@
+Anyselected
Changesetting
Changework
Cindyname
@@ -6,33 +7,51 @@ Com1st
Com2nd
Com2ndpre
Copyketcindyjs
-Dashline
Definecolor
+//Defvar
Dottedline
Drwline
Example
+Figpdf
+Fillstore
Fontsize
Help
Helplist
Invdashline
+Ketcindyjsdata
Ketjsoption
Mkketcindyjs
Presentation
-Putbezierdata
-Putpoint
+//Putbezierdata
+//Putpoint
Readcsvsla
RSform
RSslash
+Setfiles
Setketcindyjs
+Setparent
Setslidebody
Setslidehyper
Texcom
-Ketinit
-Windispg
-Fillstore
-Setwindow
-Drwxy
-Measuredepth
-Dashlinedata
-Textformat
+//Datalist3d
+//Ptseg3data
+Subgraph
+//Setangle
+//Mainsubpt3d
+//Parasubpt
+//Mkpointlist
+//Workprocess
+//Drawprocess
+//Dependgeo
+//Finddef
+//Mkseg3d
+
+//Ketinit
+//Windispg
+//Fillstore
+//Setwindow
+//Drwxy
+//Measuredepth
+//Dashlinedata
+//Textformat
diff --git a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/makefunlist.cdy b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/makefunlist.cdy
index 91cee476e8d..f7993fa39c5 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 67db48d35a8..adf119eae9b 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 3782f2cc229..a24668ebcd4 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/s01figure/s0101figure.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0101figure.cdy
index 0142cbbc30c..34416c01195 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0101figure.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0101figure.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0101figurepdf.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0101figurepdf.cdy
index eca8ddeb5d4..f0f502e1863 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0101figurepdf.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0101figurepdf.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0102figure2.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0102figure2.cdy
index 9bc551492a3..acfca15fed2 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0102figure2.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0102figure2.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0103polygon.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0103polygon.cdy
index 3d34ec1c61d..8326d296901 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0103polygon.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0103polygon.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0104shade.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0104shade.cdy
index 0f86cb5024c..7d5cded487f 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0104shade.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0104shade.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0105vector.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0105vector.cdy
index f62f3cfb2b0..e7ac5ea8f89 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0105vector.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0105vector.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0106bowdotfill.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0106bowdotfill.cdy
index 25563346696..e04f43efdf0 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0106bowdotfill.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0106bowdotfill.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0106bowhatch.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0106bowhatch.cdy
index 5f3f0287a96..c671fb83623 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0106bowhatch.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0106bowhatch.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0107hyperbolahatch.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0107hyperbolahatch.cdy
index d42fdeb4fe8..1311dd90249 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0107hyperbolahatch.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0107hyperbolahatch.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0108cycloid.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0108cycloid.cdy
index 7ef79152ee2..0a20515ff89 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0108cycloid.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0108cycloid.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0109epitrochoid.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0109epitrochoid.cdy
index 163dee4322b..8bcf3f23d0c 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0109epitrochoid.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0109epitrochoid.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0110hypotrochoid.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0110hypotrochoid.cdy
index 8ae4d4254dd..b9e5ea7cd56 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0110hypotrochoid.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s01figure/s0110hypotrochoid.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0201basic.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0201basic.cdy
index a5ee74f1851..cde716542e9 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0201basic.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0201basic.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0202graph1.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0202graph1.cdy
index a2abeff1ffc..e911d834fa5 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0202graph1.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0202graph1.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0203graph2.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0203graph2.cdy
index a05118f5ab4..d7c4067c4cd 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0203graph2.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0203graph2.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0204graph3.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0204graph3.cdy
index 7777b1d2585..68df43a92ba 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0204graph3.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0204graph3.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0205coniccurve.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0205coniccurve.cdy
index 6943cc1d5aa..4278b2b8d0b 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0205coniccurve.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0205coniccurve.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0206defexp.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0206defexp.cdy
index 60a13631ce8..e8768083490 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0206defexp.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0206defexp.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0207envelope.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0207envelope.cdy
index e3b9f28ab56..abb4f493fd3 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0207envelope.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0207envelope.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0208intersecthatch.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0208intersecthatch.cdy
index c16881d617d..608aa8bebfa 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0208intersecthatch.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0208intersecthatch.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0209diffeq.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0209diffeq.cdy
index 2580db8eef6..12012bcb5f8 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0209diffeq.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0209diffeq.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0210diffeq2.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0210diffeq2.cdy
index 804e0e3f1b4..a1c3742e86f 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0210diffeq2.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0210diffeq2.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0212implicit.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0212implicit.cdy
index 8bf51f4b7b1..baa7d616ac5 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0212implicit.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0212implicit.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0213implicithatch.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0213implicithatch.cdy
index 20ebd6cc667..99c89d7bf9c 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0213implicithatch.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0213implicithatch.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0214inputvalue.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0214inputvalue.cdy
new file mode 100644
index 00000000000..3f14ee0499c
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0214inputvalue.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0215quacurve.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0215quacurve.cdy
new file mode 100644
index 00000000000..6c73f3ee564
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s02graph/s0215quacurve.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0301table.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0301table.cdy
index 29627ce4353..858334b9e4f 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0301table.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0301table.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0302table2.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0302table2.cdy
index 5e71c30147a..d2db2b56d12 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0302table2.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0302table2.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0302table2line.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0302table2line.cdy
index eac153cf1d7..64af43ef94b 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0302table2line.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0302table2line.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0303gridpaper.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0303gridpaper.cdy
new file mode 100644
index 00000000000..7e7d2c580f2
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0303gridpaper.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0303gridpaper1.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0303gridpaper1.cdy
new file mode 100644
index 00000000000..7d48ef55012
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0303gridpaper1.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0303gridpaperlog.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0303gridpaperlog.cdy
new file mode 100644
index 00000000000..69c4125eb29
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0303gridpaperlog.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0303gridpaperloglog.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0303gridpaperloglog.cdy
new file mode 100644
index 00000000000..75198a715cd
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0303gridpaperloglog.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0303papersquared.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0303papersquared.cdy
deleted file mode 100644
index 68a4752f772..00000000000
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0303papersquared.cdy
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0304graphforincanddec.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0304graphforincanddec.cdy
index 07a3a6bffb3..4a32eb4d111 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0304graphforincanddec.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0304graphforincanddec.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0304multitables.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0304multitables.cdy
new file mode 100644
index 00000000000..03b61b2fa28
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0304multitables.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0305twotables.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0305twotables.cdy
new file mode 100644
index 00000000000..3539bea4dbd
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0305twotables.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0306tenkey.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0306tenkey.cdy
new file mode 100644
index 00000000000..00e735df69b
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s03table/s0306tenkey.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0401bezierbasic.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0401bezierbasic.cdy
index 8b6fd2c5665..7e57eca0830 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0401bezierbasic.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0401bezierbasic.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0402bezier2.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0402bezier2.cdy
deleted file mode 100644
index 16add469d62..00000000000
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0402bezier2.cdy
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0402ospline.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0402ospline.cdy
new file mode 100644
index 00000000000..7ea5d4bea11
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0402ospline.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0403osplinecrspline.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0403osplinecrspline.cdy
new file mode 100644
index 00000000000..4239f32969c
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0403osplinecrspline.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0404heart.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0404heart.cdy
index f240769af6d..c54c2db0e45 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0404heart.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0404heart.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0405dogwalk.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0405dogwalk.cdy
index 30cb4d37053..22ff6f32857 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0405dogwalk.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0405dogwalk.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0406mtfuji.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0406mtfuji.cdy
index ddbbe896265..c4a8a71108b 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0406mtfuji.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s04bezier/s0406mtfuji.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/DLofPolyhedrons_objE.txt b/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/DownloadPolyhedrons_objE.txt
index 45e4e21f255..45e4e21f255 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/DLofPolyhedrons_objE.txt
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/DownloadPolyhedrons_objE.txt
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/DLofPolyhedrons_objJ.txt b/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/DownloadPolyhedrons_objJ.txt
index 7ae77d1046f..7ae77d1046f 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/DLofPolyhedrons_objJ.txt
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/DownloadPolyhedrons_objJ.txt
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0501basic.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0501basic.cdy
index c985d4afd02..0740de5396f 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0501basic.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0501basic.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0501plane.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0501plane.cdy
index ffddcb9e7f3..d95310883e1 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0501plane.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0501plane.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0502spacecurve.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0502spacecurve.cdy
index fe7177eb839..e2b4e4c8e4d 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0502spacecurve.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0502spacecurve.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0503perp.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0503perp.cdy
index 0a715038998..c901787203c 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0503perp.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0503perp.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0504embed.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0504embed.cdy
index d265f58d2d8..ccd43bf4c27 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0504embed.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0504embed.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0507polyhedron.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0507polyhedron.cdy
index 85df6b35cd9..ae8d089493f 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0507polyhedron.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0507polyhedron.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0508concatobj.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0508concatobj.cdy
index 1ffcf8f0e10..658f07658fe 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0508concatobj.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0508concatobj.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0509cubiccut.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0509cubiccut.cdy
index f4cfae93a83..9430f951c5a 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0509cubiccut.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0509cubiccut.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0510cubiccut2.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0510cubiccut2.cdy
index 61bfb33ab30..1785b134cdd 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0510cubiccut2.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0510cubiccut2.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0511tetra.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0511tetra.cdy
index 3c836311544..51b228bb188 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0511tetra.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s05spacefigure/s0511tetra.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0601cycloid.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0601cycloid.cdy
index 37bc71a29a2..3bf9cecd830 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0601cycloid.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0601cycloid.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0602diffeq.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0602diffeq.cdy
index bd8bb17841a..152cce4d6d6 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0602diffeq.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0602diffeq.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0603envelope.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0603envelope.cdy
index d5c8689b5af..6b70a771217 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0603envelope.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0603envelope.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0604diffeq2.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0604diffeq2.cdy
index 30f5dacf0a1..3d899205a13 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0604diffeq2.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0604diffeq2.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0605cycloid2.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0605cycloid2.cdy
index 98b9baaf391..853c236c417 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0605cycloid2.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0605cycloid2.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0606epitrochoid.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0606epitrochoid.cdy
index 2e819ba6f62..2de0c90fcd0 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0606epitrochoid.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0606epitrochoid.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0607hypotrochoid.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0607hypotrochoid.cdy
index 839f079d58d..1e20d6dade5 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0607hypotrochoid.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0607hypotrochoid.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0608ellipsefocus.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0608ellipsefocus.cdy
new file mode 100644
index 00000000000..5d75d5096c2
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0608ellipsefocus.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0609hyperbolafocus.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0609hyperbolafocus.cdy
new file mode 100644
index 00000000000..db6d484baa3
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0609hyperbolafocus.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0610parabolafocus.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0610parabolafocus.cdy
new file mode 100644
index 00000000000..685344d4115
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0610parabolafocus.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0611generalangle.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0611generalangle.cdy
new file mode 100644
index 00000000000..0180b8d44a9
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s06animation/s0611generalangle.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0801plotR.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0801plotR.cdy
index 58d04783f9d..265663ee1fb 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0801plotR.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0801plotR.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0802plotR2.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0802plotR2.cdy
index 17ad97d581c..af93176f552 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0802plotR2.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0802plotR2.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0803boxplot.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0803boxplot.cdy
deleted file mode 100644
index 8d1c0b6021e..00000000000
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0803boxplot.cdy
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0803plotdiscR.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0803plotdiscR.cdy
new file mode 100644
index 00000000000..ab1e2cad28c
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0803plotdiscR.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0804boxplot.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0804boxplot.cdy
new file mode 100644
index 00000000000..0b7a5eb3b92
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0804boxplot.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0804histplot.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0804histplot.cdy
deleted file mode 100644
index 29512325f7a..00000000000
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0804histplot.cdy
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0805histplot.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0805histplot.cdy
new file mode 100644
index 00000000000..560c8517368
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0805histplot.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0805random.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0805random.cdy
deleted file mode 100644
index b632741c2e1..00000000000
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0805random.cdy
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0806dataframe.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0806dataframe.cdy
deleted file mode 100644
index 781d3b2f3bc..00000000000
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0806dataframe.cdy
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0806random.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0806random.cdy
new file mode 100644
index 00000000000..a5491d88e27
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0806random.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0807dataframe.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0807dataframe.cdy
new file mode 100644
index 00000000000..beef8e15ab8
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0807dataframe.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0807timecount.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0807timecount.cdy
deleted file mode 100644
index 7150e79e9cc..00000000000
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0807timecount.cdy
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0808ttest.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0808ttest.cdy
index 26e2be1a1a7..00f6f0ff1c5 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0808ttest.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s08R/s0808ttest.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1000list.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1000list.cdy
deleted file mode 100644
index 6b08e8eda1b..00000000000
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1000list.cdy
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1001basic.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1001basic.cdy
index 13114909afd..40a147200ab 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1001basic.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1001basic.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1001factorial.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1001factorial.cdy
new file mode 100644
index 00000000000..2e4e80ac826
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1001factorial.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1002equation.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1002equation.cdy
index b37809ae5cd..e675811908d 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1002equation.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1002equation.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1003trig.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1003trig.cdy
index 9c84f2b91c3..be719ecd771 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1003trig.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1003trig.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1004calcby.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1004calcby.cdy
index a511ac4189f..9cab7b26467 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1004calcby.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1004calcby.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1005diffint.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1005diffint.cdy
index 8b0cf864837..3a028e88796 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1005diffint.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1005diffint.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1005intplot.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1005intplot.cdy
new file mode 100644
index 00000000000..1e99676e46e
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1005intplot.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1006calculus.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1006calculus.cdy
index e65411a82e7..bb5ff4e3ced 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1006calculus.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1006calculus.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1007linalg.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1007linalg.cdy
index 3a1cd25f7ee..0f13189ab5b 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1007linalg.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1007linalg.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1008idtable.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1008idtable.cdy
index de3c42616e4..b8e1948fdf4 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1008idtable.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1008idtable.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1009diffeq.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1009diffeq.cdy
index 62a2393c63c..aad6e96599a 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1009diffeq.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1009diffeq.cdy
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 ea45f29fbf0..124b792569e 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/samples/s10maxima/s1010fourier2.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1010fourier2.cdy
deleted file mode 100644
index fee1e309d3d..00000000000
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1010fourier2.cdy
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1010fourier3.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1010fourier3.cdy
deleted file mode 100644
index 16b1cfd2836..00000000000
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1010fourier3.cdy
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1011matrixop.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1011matrixop.cdy
index ae6eaeb6e94..725b187102d 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1011matrixop.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1011matrixop.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1011matrixop2.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1011matrixop2.cdy
deleted file mode 100644
index 21389c5f86a..00000000000
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1011matrixop2.cdy
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1012for.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1012for.cdy
new file mode 100644
index 00000000000..233fa6371b1
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1012for.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1012fourierpw.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1012fourierpw.cdy
deleted file mode 100644
index 3774287f6ed..00000000000
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1012fourierpw.cdy
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1012odefor.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1012odefor.cdy
new file mode 100644
index 00000000000..036677a4272
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1012odefor.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1013for.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1013for.cdy
deleted file mode 100644
index cdedb9bc760..00000000000
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1013for.cdy
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1013incdec.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1013incdec.cdy
new file mode 100644
index 00000000000..454e45d8d5c
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1013incdec.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1014incdec2.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1014incdec2.cdy
deleted file mode 100644
index 00af4e892ef..00000000000
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1014incdec2.cdy
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1014primenumber.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1014primenumber.cdy
new file mode 100644
index 00000000000..5adc840c28b
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1014primenumber.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1015primenumber.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1015primenumber.cdy
deleted file mode 100644
index 54aa2697c52..00000000000
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s10maxima/s1015primenumber.cdy
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/howtouseketcindyjsE.txt b/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/howtouseketcindyjsE.txt
index 05c14c1af19..05c14c1af19 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/howtouseketcindyjsE.txt
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/howtouseketcindyjsE.txt
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/howtouseketcindyjsJ.txt b/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/howtouseketcindyjsJ.txt
index 2dde5c6fa11..2dde5c6fa11 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/howtouseketcindyjsJ.txt
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/howtouseketcindyjsJ.txt
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1601basic.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1601basic.cdy
new file mode 100644
index 00000000000..527b7bc3926
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1601basic.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1602diffeq2.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1602diffeq2.cdy
new file mode 100644
index 00000000000..0c75637b4d6
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1602diffeq2.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1603gamow.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1603gamow.cdy
new file mode 100644
index 00000000000..5d7ee38cf37
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1603gamow.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1604putoncurve.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1604putoncurve.cdy
new file mode 100644
index 00000000000..9564ca7995f
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1604putoncurve.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1605triangle.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1605triangle.cdy
new file mode 100644
index 00000000000..5279a0b3c3c
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1605triangle.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/s1606morley.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1606morley.cdy
index 2f668cca82f..36d5d27c3a3 100644
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/s1606morley.cdy
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1606morley.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1607inputbox.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1607inputbox.cdy
new file mode 100644
index 00000000000..77be31c3d07
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1607inputbox.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1608texcalc.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1608texcalc.cdy
new file mode 100644
index 00000000000..eca4763b699
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1608texcalc.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1609trigratio.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1609trigratio.cdy
new file mode 100644
index 00000000000..11afb67d79a
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/samples/s16ketJSmisc/s1609trigratio.cdy
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/s1601basic.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/s1601basic.cdy
deleted file mode 100644
index 1d0956a9e12..00000000000
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/s1601basic.cdy
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/s1602diffeq2.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/s1602diffeq2.cdy
deleted file mode 100644
index fefad10c46c..00000000000
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/s1602diffeq2.cdy
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/s1603gamow.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/s1603gamow.cdy
deleted file mode 100644
index 56d96cb958f..00000000000
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/s1603gamow.cdy
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/s1604putoncurve.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/s1604putoncurve.cdy
deleted file mode 100644
index 1f02e44829c..00000000000
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/s1604putoncurve.cdy
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/s1605triangle.cdy b/Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/s1605triangle.cdy
deleted file mode 100644
index 540823d1b8e..00000000000
--- a/Master/texmf-dist/doc/support/ketcindy/samples/s16ketcindyJS/s1605triangle.cdy
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/drawfigures1.tex b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/drawfigures1.tex
new file mode 100644
index 00000000000..5371fa27dd5
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/drawfigures1.tex
@@ -0,0 +1,748 @@
+%%% /Users/takatoosetsuo/Dropbox/kettoday/0426drawfigures/fig/example1.tex
+%%% Generator=example1.cdy
+{\unitlength=1cm%
+\begin{picture}%
+(10,4)(-2,-1)%
+\special{pn 8}%
+%
+\special{pa 394 -394}\special{pa 391 -443}\special{pa 381 -492}\special{pa 366 -539}%
+\special{pa 345 -583}\special{pa 319 -625}\special{pa 287 -663}\special{pa 251 -697}%
+\special{pa 211 -726}\special{pa 168 -750}\special{pa 122 -768}\special{pa 74 -780}%
+\special{pa 25 -787}\special{pa -25 -787}\special{pa -74 -780}\special{pa -122 -768}%
+\special{pa -168 -750}\special{pa -211 -726}\special{pa -251 -697}\special{pa -287 -663}%
+\special{pa -319 -625}\special{pa -345 -583}\special{pa -366 -539}\special{pa -381 -492}%
+\special{pa -391 -443}\special{pa -394 -394}\special{pa -391 -344}\special{pa -381 -296}%
+\special{pa -366 -249}\special{pa -345 -204}\special{pa -319 -162}\special{pa -287 -124}%
+\special{pa -251 -90}\special{pa -211 -61}\special{pa -168 -37}\special{pa -122 -19}%
+\special{pa -74 -7}\special{pa -25 -1}\special{pa 25 -1}\special{pa 74 -7}%
+\special{pa 122 -19}\special{pa 168 -37}\special{pa 211 -61}\special{pa 251 -90}%
+\special{pa 287 -124}\special{pa 319 -162}\special{pa 345 -204}\special{pa 366 -249}%
+\special{pa 381 -296}\special{pa 391 -344}\special{pa 394 -394}%
+\special{fp}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 11 -11}\special{pa 5 -15}\special{pa -2 -16}\special{pa -8 -13}\special{pa -13 -8}\special{pa -16 -2}\special{pa -15 5}\special{pa -11 11}\special{pa -5 15}\special{pa 2 16}\special{pa 8 13}\special{pa 13 8}\special{pa 16 2}\special{pa 15 -5}\special{pa 11 -11}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 11 -11}\special{pa 5 -15}\special{pa -2 -16}\special{pa -8 -13}\special{pa -13 -8}\special{pa -16 -2}\special{pa -15 5}\special{pa -11 11}\special{pa -5 15}\special{pa 2 16}\special{pa 8 13}\special{pa 13 8}\special{pa 16 2}\special{pa 15 -5}\special{pa 11 -11}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 463 -317}\special{pa 470 -366}\special{pa 470 -415}\special{pa 465 -464}%
+\special{pa 453 -512}\special{pa 435 -559}\special{pa 411 -602}\special{pa 383 -642}%
+\special{pa 349 -679}\special{pa 311 -710}\special{pa 270 -737}\special{pa 225 -759}%
+\special{pa 178 -774}\special{pa 130 -784}\special{pa 80 -787}\special{pa 31 -785}%
+\special{pa -18 -776}\special{pa -65 -761}\special{pa -110 -740}\special{pa -152 -714}%
+\special{pa -190 -683}\special{pa -224 -647}\special{pa -253 -607}\special{pa -278 -564}%
+\special{pa -296 -518}\special{pa -309 -471}\special{pa -315 -422}\special{pa -316 -372}%
+\special{pa -310 -323}\special{pa -298 -275}\special{pa -280 -229}\special{pa -257 -185}%
+\special{pa -228 -145}\special{pa -194 -109}\special{pa -157 -77}\special{pa -115 -50}%
+\special{pa -70 -29}\special{pa -24 -13}\special{pa 25 -4}\special{pa 74 -0}%
+\special{pa 124 -3}\special{pa 172 -12}\special{pa 219 -27}\special{pa 264 -47}%
+\special{pa 306 -73}\special{pa 345 -105}\special{pa 379 -140}\special{pa 408 -180}%
+\special{pa 432 -223}\special{pa 451 -269}\special{pa 463 -317}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 12 -19}\special{pa 6 -22}\special{pa -1 -23}\special{pa -8 -21}\special{pa -13 -16}\special{pa -15 -9}\special{pa -14 -2}\special{pa -11 4}\special{pa -5 7}\special{pa 2 8}\special{pa 9 6}\special{pa 14 1}\special{pa 16 -6}\special{pa 15 -13}\special{pa 12 -19}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 12 -19}\special{pa 6 -22}\special{pa -1 -23}\special{pa -8 -21}\special{pa -13 -16}\special{pa -15 -9}\special{pa -14 -2}\special{pa -11 4}\special{pa -5 7}\special{pa 2 8}\special{pa 9 6}\special{pa 14 1}\special{pa 16 -6}\special{pa 15 -13}\special{pa 12 -19}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 518 -243}\special{pa 534 -290}\special{pa 544 -338}\special{pa 548 -388}%
+\special{pa 546 -437}\special{pa 537 -486}\special{pa 523 -533}\special{pa 503 -578}%
+\special{pa 477 -620}\special{pa 446 -659}\special{pa 410 -693}\special{pa 371 -723}%
+\special{pa 328 -747}\special{pa 282 -766}\special{pa 234 -779}\special{pa 185 -786}%
+\special{pa 136 -787}\special{pa 87 -782}\special{pa 39 -770}\special{pa -7 -753}%
+\special{pa -51 -729}\special{pa -92 -701}\special{pa -128 -668}\special{pa -160 -630}%
+\special{pa -187 -589}\special{pa -209 -544}\special{pa -225 -498}\special{pa -235 -449}%
+\special{pa -239 -400}\special{pa -237 -350}\special{pa -228 -302}\special{pa -214 -255}%
+\special{pa -193 -209}\special{pa -168 -167}\special{pa -137 -129}\special{pa -101 -94}%
+\special{pa -62 -65}\special{pa -19 -40}\special{pa 27 -21}\special{pa 75 -8}%
+\special{pa 124 -1}\special{pa 173 -0}\special{pa 222 -6}\special{pa 270 -17}%
+\special{pa 317 -35}\special{pa 360 -58}\special{pa 401 -86}\special{pa 437 -120}%
+\special{pa 469 -157}\special{pa 497 -199}\special{pa 518 -243}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 15 -41}\special{pa 9 -45}\special{pa 2 -46}\special{pa -4 -43}\special{pa -9 -38}\special{pa -12 -32}\special{pa -11 -25}\special{pa -7 -19}\special{pa -1 -15}\special{pa 6 -14}\special{pa 12 -17}\special{pa 17 -22}\special{pa 20 -28}\special{pa 19 -35}\special{pa 15 -41}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 15 -41}\special{pa 9 -45}\special{pa 2 -46}\special{pa -4 -43}\special{pa -9 -38}\special{pa -12 -32}\special{pa -11 -25}\special{pa -7 -19}\special{pa -1 -15}\special{pa 6 -14}\special{pa 12 -17}\special{pa 17 -22}\special{pa 20 -28}\special{pa 19 -35}\special{pa 15 -41}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 559 -175}\special{pa 584 -218}\special{pa 603 -263}\special{pa 617 -311}%
+\special{pa 624 -360}\special{pa 625 -409}\special{pa 620 -458}\special{pa 609 -507}%
+\special{pa 592 -553}\special{pa 569 -597}\special{pa 541 -637}\special{pa 508 -674}%
+\special{pa 471 -707}\special{pa 430 -734}\special{pa 385 -756}\special{pa 339 -773}%
+\special{pa 290 -783}\special{pa 241 -787}\special{pa 192 -785}\special{pa 143 -777}%
+\special{pa 96 -763}\special{pa 50 -743}\special{pa 8 -718}\special{pa -31 -687}%
+\special{pa -65 -652}\special{pa -95 -612}\special{pa -120 -570}\special{pa -140 -524}%
+\special{pa -153 -477}\special{pa -160 -428}\special{pa -161 -378}\special{pa -156 -329}%
+\special{pa -145 -281}\special{pa -128 -235}\special{pa -105 -191}\special{pa -77 -150}%
+\special{pa -44 -113}\special{pa -7 -81}\special{pa 34 -53}\special{pa 78 -31}%
+\special{pa 125 -15}\special{pa 173 -4}\special{pa 223 -0}\special{pa 272 -2}%
+\special{pa 321 -10}\special{pa 368 -24}\special{pa 413 -44}\special{pa 456 -70}%
+\special{pa 495 -100}\special{pa 529 -136}\special{pa 559 -175}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 24 -77}\special{pa 18 -81}\special{pa 11 -82}\special{pa 5 -80}\special{pa 0 -75}\special{pa -2 -68}\special{pa -2 -61}\special{pa 2 -55}\special{pa 8 -51}\special{pa 15 -51}\special{pa 22 -53}\special{pa 27 -58}\special{pa 29 -65}\special{pa 28 -72}\special{pa 24 -77}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 24 -77}\special{pa 18 -81}\special{pa 11 -82}\special{pa 5 -80}\special{pa 0 -75}\special{pa -2 -68}\special{pa -2 -61}\special{pa 2 -55}\special{pa 8 -51}\special{pa 15 -51}\special{pa 22 -53}\special{pa 27 -58}\special{pa 29 -65}\special{pa 28 -72}\special{pa 24 -77}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 588 -115}\special{pa 620 -152}\special{pa 648 -193}\special{pa 671 -237}%
+\special{pa 687 -284}\special{pa 698 -332}\special{pa 703 -381}\special{pa 701 -431}%
+\special{pa 693 -480}\special{pa 680 -527}\special{pa 660 -572}\special{pa 635 -615}%
+\special{pa 605 -654}\special{pa 570 -689}\special{pa 531 -719}\special{pa 488 -744}%
+\special{pa 443 -764}\special{pa 395 -778}\special{pa 346 -786}\special{pa 297 -787}%
+\special{pa 248 -783}\special{pa 199 -772}\special{pa 153 -755}\special{pa 109 -733}%
+\special{pa 68 -705}\special{pa 31 -672}\special{pa -2 -635}\special{pa -30 -594}%
+\special{pa -52 -550}\special{pa -69 -504}\special{pa -80 -455}\special{pa -84 -406}%
+\special{pa -83 -357}\special{pa -75 -308}\special{pa -61 -260}\special{pa -42 -215}%
+\special{pa -16 -172}\special{pa 14 -133}\special{pa 49 -98}\special{pa 88 -68}%
+\special{pa 130 -43}\special{pa 176 -23}\special{pa 223 -9}\special{pa 272 -2}%
+\special{pa 322 -0}\special{pa 371 -5}\special{pa 419 -16}\special{pa 466 -32}%
+\special{pa 510 -55}\special{pa 551 -83}\special{pa 588 -115}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 42 -126}\special{pa 36 -130}\special{pa 29 -131}\special{pa 22 -129}\special{pa 17 -124}\special{pa 15 -117}\special{pa 16 -110}\special{pa 20 -104}\special{pa 26 -100}\special{pa 33 -100}\special{pa 39 -102}\special{pa 44 -107}\special{pa 46 -114}\special{pa 46 -121}\special{pa 42 -126}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 42 -126}\special{pa 36 -130}\special{pa 29 -131}\special{pa 22 -129}\special{pa 17 -124}\special{pa 15 -117}\special{pa 16 -110}\special{pa 20 -104}\special{pa 26 -100}\special{pa 33 -100}\special{pa 39 -102}\special{pa 44 -107}\special{pa 46 -114}\special{pa 46 -121}\special{pa 42 -126}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 605 -66}\special{pa 645 -96}\special{pa 680 -131}\special{pa 710 -170}%
+\special{pa 736 -212}\special{pa 756 -257}\special{pa 770 -305}\special{pa 778 -354}%
+\special{pa 780 -403}\special{pa 776 -452}\special{pa 765 -501}\special{pa 749 -547}%
+\special{pa 727 -591}\special{pa 699 -633}\special{pa 667 -670}\special{pa 630 -703}%
+\special{pa 590 -731}\special{pa 546 -754}\special{pa 499 -771}\special{pa 451 -782}%
+\special{pa 402 -787}\special{pa 353 -786}\special{pa 304 -779}\special{pa 256 -765}%
+\special{pa 211 -746}\special{pa 168 -721}\special{pa 128 -691}\special{pa 93 -656}%
+\special{pa 63 -618}\special{pa 37 -575}\special{pa 17 -530}\special{pa 3 -483}%
+\special{pa -5 -434}\special{pa -7 -384}\special{pa -3 -335}\special{pa 8 -287}%
+\special{pa 24 -240}\special{pa 46 -196}\special{pa 74 -155}\special{pa 106 -118}%
+\special{pa 143 -85}\special{pa 183 -56}\special{pa 227 -34}\special{pa 274 -17}%
+\special{pa 322 -5}\special{pa 371 -0}\special{pa 420 -1}\special{pa 469 -9}%
+\special{pa 517 -22}\special{pa 562 -42}\special{pa 605 -66}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 70 -186}\special{pa 64 -190}\special{pa 57 -191}\special{pa 51 -188}\special{pa 46 -183}\special{pa 44 -177}\special{pa 44 -170}\special{pa 48 -164}\special{pa 54 -160}\special{pa 61 -159}\special{pa 68 -162}\special{pa 72 -167}\special{pa 75 -173}\special{pa 74 -180}\special{pa 70 -186}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 70 -186}\special{pa 64 -190}\special{pa 57 -191}\special{pa 51 -188}\special{pa 46 -183}\special{pa 44 -177}\special{pa 44 -170}\special{pa 48 -164}\special{pa 54 -160}\special{pa 61 -159}\special{pa 68 -162}\special{pa 72 -167}\special{pa 75 -173}\special{pa 74 -180}\special{pa 70 -186}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 614 -30}\special{pa 659 -52}\special{pa 700 -79}\special{pa 738 -111}%
+\special{pa 771 -148}\special{pa 800 -188}\special{pa 823 -232}\special{pa 840 -278}%
+\special{pa 852 -326}\special{pa 857 -375}\special{pa 856 -425}\special{pa 849 -474}%
+\special{pa 836 -521}\special{pa 817 -567}\special{pa 793 -610}\special{pa 763 -649}%
+\special{pa 729 -685}\special{pa 690 -716}\special{pa 648 -742}\special{pa 603 -762}%
+\special{pa 556 -777}\special{pa 507 -785}\special{pa 458 -787}\special{pa 408 -783}%
+\special{pa 360 -773}\special{pa 313 -757}\special{pa 269 -736}\special{pa 227 -709}%
+\special{pa 190 -676}\special{pa 157 -640}\special{pa 128 -599}\special{pa 105 -556}%
+\special{pa 88 -509}\special{pa 76 -461}\special{pa 71 -412}\special{pa 71 -363}%
+\special{pa 78 -314}\special{pa 91 -266}\special{pa 110 -220}\special{pa 135 -178}%
+\special{pa 164 -138}\special{pa 199 -103}\special{pa 237 -72}\special{pa 280 -46}%
+\special{pa 325 -25}\special{pa 372 -11}\special{pa 421 -2}\special{pa 470 -0}%
+\special{pa 519 -4}\special{pa 568 -14}\special{pa 614 -30}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 111 -254}\special{pa 105 -258}\special{pa 98 -259}\special{pa 92 -256}\special{pa 87 -251}\special{pa 84 -245}\special{pa 85 -238}\special{pa 89 -232}\special{pa 95 -228}\special{pa 102 -227}\special{pa 108 -230}\special{pa 113 -235}\special{pa 116 -241}\special{pa 115 -248}\special{pa 111 -254}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 111 -254}\special{pa 105 -258}\special{pa 98 -259}\special{pa 92 -256}\special{pa 87 -251}\special{pa 84 -245}\special{pa 85 -238}\special{pa 89 -232}\special{pa 95 -228}\special{pa 102 -227}\special{pa 108 -230}\special{pa 113 -235}\special{pa 116 -241}\special{pa 115 -248}\special{pa 111 -254}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 618 -8}\special{pa 666 -20}\special{pa 712 -39}\special{pa 755 -63}%
+\special{pa 794 -92}\special{pa 830 -126}\special{pa 861 -165}\special{pa 888 -207}%
+\special{pa 908 -252}\special{pa 923 -299}\special{pa 932 -347}\special{pa 935 -397}%
+\special{pa 931 -446}\special{pa 922 -495}\special{pa 906 -542}\special{pa 885 -586}%
+\special{pa 858 -628}\special{pa 826 -665}\special{pa 790 -699}\special{pa 749 -728}%
+\special{pa 706 -751}\special{pa 660 -769}\special{pa 612 -781}\special{pa 563 -787}%
+\special{pa 513 -786}\special{pa 464 -780}\special{pa 417 -767}\special{pa 371 -749}%
+\special{pa 328 -724}\special{pa 288 -695}\special{pa 252 -661}\special{pa 221 -623}%
+\special{pa 195 -581}\special{pa 174 -536}\special{pa 159 -489}\special{pa 150 -440}%
+\special{pa 147 -391}\special{pa 151 -341}\special{pa 161 -293}\special{pa 176 -246}%
+\special{pa 198 -201}\special{pa 224 -160}\special{pa 256 -122}\special{pa 293 -88}%
+\special{pa 333 -60}\special{pa 376 -36}\special{pa 422 -18}\special{pa 470 -6}%
+\special{pa 519 -1}\special{pa 569 -1}\special{pa 618 -8}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 166 -328}\special{pa 160 -332}\special{pa 153 -333}\special{pa 147 -330}\special{pa 142 -325}\special{pa 139 -319}\special{pa 140 -312}\special{pa 144 -306}\special{pa 150 -302}\special{pa 157 -301}\special{pa 163 -304}\special{pa 168 -309}\special{pa 171 -315}\special{pa 170 -322}\special{pa 166 -328}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 166 -328}\special{pa 160 -332}\special{pa 153 -333}\special{pa 147 -330}\special{pa 142 -325}\special{pa 139 -319}\special{pa 140 -312}\special{pa 144 -306}\special{pa 150 -302}\special{pa 157 -301}\special{pa 163 -304}\special{pa 168 -309}\special{pa 171 -315}\special{pa 170 -322}\special{pa 166 -328}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 618 -0}\special{pa 668 -3}\special{pa 716 -12}\special{pa 763 -28}%
+\special{pa 808 -49}\special{pa 850 -75}\special{pa 888 -107}\special{pa 922 -143}%
+\special{pa 951 -183}\special{pa 975 -226}\special{pa 993 -272}\special{pa 1005 -320}%
+\special{pa 1011 -369}\special{pa 1011 -418}\special{pa 1005 -467}\special{pa 993 -515}%
+\special{pa 975 -561}\special{pa 951 -605}\special{pa 922 -645}\special{pa 888 -681}%
+\special{pa 850 -712}\special{pa 808 -739}\special{pa 763 -760}\special{pa 716 -775}%
+\special{pa 668 -784}\special{pa 618 -787}\special{pa 569 -784}\special{pa 521 -775}%
+\special{pa 473 -760}\special{pa 429 -739}\special{pa 387 -712}\special{pa 349 -681}%
+\special{pa 315 -645}\special{pa 286 -605}\special{pa 262 -561}\special{pa 244 -515}%
+\special{pa 232 -467}\special{pa 226 -418}\special{pa 226 -369}\special{pa 232 -320}%
+\special{pa 244 -272}\special{pa 262 -226}\special{pa 286 -183}\special{pa 315 -143}%
+\special{pa 349 -107}\special{pa 387 -75}\special{pa 429 -49}\special{pa 473 -28}%
+\special{pa 521 -12}\special{pa 569 -3}\special{pa 618 -0}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 236 -405}\special{pa 230 -409}\special{pa 223 -409}\special{pa 216 -407}\special{pa 211 -402}\special{pa 209 -395}\special{pa 210 -388}\special{pa 214 -383}\special{pa 220 -379}\special{pa 226 -378}\special{pa 233 -380}\special{pa 238 -385}\special{pa 240 -392}\special{pa 240 -399}\special{pa 236 -405}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 236 -405}\special{pa 230 -409}\special{pa 223 -409}\special{pa 216 -407}\special{pa 211 -402}\special{pa 209 -395}\special{pa 210 -388}\special{pa 214 -383}\special{pa 220 -379}\special{pa 226 -378}\special{pa 233 -380}\special{pa 238 -385}\special{pa 240 -392}\special{pa 240 -399}\special{pa 236 -405}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 619 -8}\special{pa 668 -1}\special{pa 717 -1}\special{pa 766 -6}%
+\special{pa 814 -18}\special{pa 861 -36}\special{pa 904 -60}\special{pa 944 -88}%
+\special{pa 981 -122}\special{pa 1012 -160}\special{pa 1039 -201}\special{pa 1061 -246}%
+\special{pa 1076 -293}\special{pa 1086 -341}\special{pa 1089 -391}\special{pa 1087 -440}%
+\special{pa 1078 -489}\special{pa 1063 -536}\special{pa 1042 -581}\special{pa 1016 -623}%
+\special{pa 985 -661}\special{pa 949 -695}\special{pa 909 -724}\special{pa 866 -749}%
+\special{pa 820 -767}\special{pa 773 -780}\special{pa 724 -786}\special{pa 674 -787}%
+\special{pa 625 -781}\special{pa 577 -769}\special{pa 531 -751}\special{pa 487 -728}%
+\special{pa 447 -699}\special{pa 411 -665}\special{pa 379 -628}\special{pa 352 -586}%
+\special{pa 331 -542}\special{pa 315 -495}\special{pa 306 -446}\special{pa 302 -397}%
+\special{pa 305 -347}\special{pa 314 -299}\special{pa 329 -252}\special{pa 349 -207}%
+\special{pa 375 -165}\special{pa 407 -126}\special{pa 442 -92}\special{pa 482 -63}%
+\special{pa 525 -39}\special{pa 571 -20}\special{pa 619 -8}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 321 -482}\special{pa 315 -485}\special{pa 308 -486}\special{pa 301 -484}\special{pa 296 -479}\special{pa 294 -472}\special{pa 295 -465}\special{pa 298 -459}\special{pa 304 -456}\special{pa 311 -455}\special{pa 318 -457}\special{pa 323 -462}\special{pa 325 -469}\special{pa 324 -476}\special{pa 321 -482}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 321 -482}\special{pa 315 -485}\special{pa 308 -486}\special{pa 301 -484}\special{pa 296 -479}\special{pa 294 -472}\special{pa 295 -465}\special{pa 298 -459}\special{pa 304 -456}\special{pa 311 -455}\special{pa 318 -457}\special{pa 323 -462}\special{pa 325 -469}\special{pa 324 -476}\special{pa 321 -482}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 622 -30}\special{pa 669 -14}\special{pa 718 -4}\special{pa 767 -0}%
+\special{pa 816 -2}\special{pa 865 -11}\special{pa 912 -25}\special{pa 957 -46}%
+\special{pa 999 -72}\special{pa 1038 -103}\special{pa 1072 -138}\special{pa 1102 -178}%
+\special{pa 1127 -220}\special{pa 1146 -266}\special{pa 1159 -314}\special{pa 1166 -363}%
+\special{pa 1166 -412}\special{pa 1161 -461}\special{pa 1149 -509}\special{pa 1132 -556}%
+\special{pa 1109 -599}\special{pa 1080 -640}\special{pa 1047 -676}\special{pa 1009 -709}%
+\special{pa 968 -736}\special{pa 924 -757}\special{pa 877 -773}\special{pa 829 -783}%
+\special{pa 779 -787}\special{pa 730 -785}\special{pa 681 -777}\special{pa 634 -762}%
+\special{pa 589 -742}\special{pa 547 -716}\special{pa 508 -685}\special{pa 474 -649}%
+\special{pa 444 -610}\special{pa 419 -567}\special{pa 401 -521}\special{pa 388 -474}%
+\special{pa 381 -425}\special{pa 380 -375}\special{pa 385 -326}\special{pa 397 -278}%
+\special{pa 414 -232}\special{pa 437 -188}\special{pa 466 -148}\special{pa 499 -111}%
+\special{pa 537 -79}\special{pa 578 -52}\special{pa 622 -30}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 420 -555}\special{pa 415 -559}\special{pa 408 -560}\special{pa 401 -558}\special{pa 396 -553}\special{pa 394 -546}\special{pa 394 -539}\special{pa 398 -533}\special{pa 404 -529}\special{pa 411 -529}\special{pa 418 -531}\special{pa 423 -536}\special{pa 425 -543}\special{pa 424 -550}\special{pa 420 -555}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 420 -555}\special{pa 415 -559}\special{pa 408 -560}\special{pa 401 -558}\special{pa 396 -553}\special{pa 394 -546}\special{pa 394 -539}\special{pa 398 -533}\special{pa 404 -529}\special{pa 411 -529}\special{pa 418 -531}\special{pa 423 -536}\special{pa 425 -543}\special{pa 424 -550}\special{pa 420 -555}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 632 -66}\special{pa 674 -42}\special{pa 720 -22}\special{pa 767 -9}%
+\special{pa 816 -1}\special{pa 866 -0}\special{pa 915 -5}\special{pa 963 -17}%
+\special{pa 1010 -34}\special{pa 1053 -56}\special{pa 1094 -85}\special{pa 1131 -118}%
+\special{pa 1163 -155}\special{pa 1191 -196}\special{pa 1213 -240}\special{pa 1229 -287}%
+\special{pa 1240 -335}\special{pa 1244 -384}\special{pa 1242 -434}\special{pa 1234 -483}%
+\special{pa 1220 -530}\special{pa 1200 -575}\special{pa 1174 -618}\special{pa 1144 -656}%
+\special{pa 1108 -691}\special{pa 1069 -721}\special{pa 1026 -746}\special{pa 981 -765}%
+\special{pa 933 -779}\special{pa 884 -786}\special{pa 835 -787}\special{pa 786 -782}%
+\special{pa 738 -771}\special{pa 691 -754}\special{pa 647 -731}\special{pa 607 -703}%
+\special{pa 570 -670}\special{pa 537 -633}\special{pa 510 -591}\special{pa 488 -547}%
+\special{pa 471 -501}\special{pa 461 -452}\special{pa 457 -403}\special{pa 459 -354}%
+\special{pa 467 -305}\special{pa 481 -257}\special{pa 501 -212}\special{pa 526 -170}%
+\special{pa 557 -131}\special{pa 592 -96}\special{pa 632 -66}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 534 -624}\special{pa 528 -627}\special{pa 521 -628}\special{pa 515 -626}\special{pa 510 -621}\special{pa 507 -614}\special{pa 508 -607}\special{pa 512 -601}\special{pa 518 -598}\special{pa 525 -597}\special{pa 531 -599}\special{pa 536 -604}\special{pa 539 -611}\special{pa 538 -618}\special{pa 534 -624}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 534 -624}\special{pa 528 -627}\special{pa 521 -628}\special{pa 515 -626}\special{pa 510 -621}\special{pa 507 -614}\special{pa 508 -607}\special{pa 512 -601}\special{pa 518 -598}\special{pa 525 -597}\special{pa 531 -599}\special{pa 536 -604}\special{pa 539 -611}\special{pa 538 -618}\special{pa 534 -624}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 649 -115}\special{pa 686 -83}\special{pa 727 -55}\special{pa 771 -32}%
+\special{pa 818 -16}\special{pa 866 -5}\special{pa 915 -0}\special{pa 965 -2}%
+\special{pa 1014 -9}\special{pa 1061 -23}\special{pa 1106 -43}\special{pa 1149 -68}%
+\special{pa 1188 -98}\special{pa 1223 -133}\special{pa 1253 -172}\special{pa 1278 -215}%
+\special{pa 1298 -260}\special{pa 1312 -308}\special{pa 1320 -357}\special{pa 1321 -406}%
+\special{pa 1316 -455}\special{pa 1306 -504}\special{pa 1289 -550}\special{pa 1267 -594}%
+\special{pa 1239 -635}\special{pa 1206 -672}\special{pa 1169 -705}\special{pa 1128 -733}%
+\special{pa 1084 -755}\special{pa 1037 -772}\special{pa 989 -783}\special{pa 940 -787}%
+\special{pa 891 -786}\special{pa 842 -778}\special{pa 794 -764}\special{pa 749 -744}%
+\special{pa 706 -719}\special{pa 667 -689}\special{pa 632 -654}\special{pa 602 -615}%
+\special{pa 577 -572}\special{pa 557 -527}\special{pa 543 -480}\special{pa 536 -431}%
+\special{pa 534 -381}\special{pa 539 -332}\special{pa 550 -284}\special{pa 566 -237}%
+\special{pa 589 -193}\special{pa 617 -152}\special{pa 649 -115}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 660 -683}\special{pa 654 -687}\special{pa 647 -688}\special{pa 641 -685}\special{pa 636 -680}\special{pa 634 -674}\special{pa 634 -667}\special{pa 638 -661}\special{pa 644 -657}\special{pa 651 -656}\special{pa 658 -659}\special{pa 663 -664}\special{pa 665 -670}\special{pa 664 -677}\special{pa 660 -683}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 660 -683}\special{pa 654 -687}\special{pa 647 -688}\special{pa 641 -685}\special{pa 636 -680}\special{pa 634 -674}\special{pa 634 -667}\special{pa 638 -661}\special{pa 644 -657}\special{pa 651 -656}\special{pa 658 -659}\special{pa 663 -664}\special{pa 665 -670}\special{pa 664 -677}\special{pa 660 -683}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 678 -175}\special{pa 708 -136}\special{pa 742 -100}\special{pa 781 -70}%
+\special{pa 823 -44}\special{pa 869 -24}\special{pa 916 -10}\special{pa 965 -2}%
+\special{pa 1014 -0}\special{pa 1063 -4}\special{pa 1112 -15}\special{pa 1158 -31}%
+\special{pa 1203 -53}\special{pa 1244 -81}\special{pa 1281 -113}\special{pa 1314 -150}%
+\special{pa 1342 -191}\special{pa 1365 -235}\special{pa 1382 -281}\special{pa 1393 -329}%
+\special{pa 1398 -378}\special{pa 1397 -428}\special{pa 1390 -477}\special{pa 1376 -524}%
+\special{pa 1357 -570}\special{pa 1332 -612}\special{pa 1302 -652}\special{pa 1268 -687}%
+\special{pa 1229 -718}\special{pa 1186 -743}\special{pa 1141 -763}\special{pa 1094 -777}%
+\special{pa 1045 -785}\special{pa 996 -787}\special{pa 946 -783}\special{pa 898 -773}%
+\special{pa 851 -756}\special{pa 807 -734}\special{pa 766 -707}\special{pa 729 -674}%
+\special{pa 696 -637}\special{pa 668 -597}\special{pa 645 -553}\special{pa 628 -507}%
+\special{pa 617 -458}\special{pa 612 -409}\special{pa 613 -360}\special{pa 620 -311}%
+\special{pa 633 -263}\special{pa 653 -218}\special{pa 678 -175}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 797 -732}\special{pa 791 -736}\special{pa 784 -737}\special{pa 778 -734}\special{pa 773 -729}\special{pa 771 -723}\special{pa 771 -716}\special{pa 775 -710}\special{pa 781 -706}\special{pa 788 -705}\special{pa 795 -708}\special{pa 800 -713}\special{pa 802 -719}\special{pa 801 -726}\special{pa 797 -732}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 797 -732}\special{pa 791 -736}\special{pa 784 -737}\special{pa 778 -734}\special{pa 773 -729}\special{pa 771 -723}\special{pa 771 -716}\special{pa 775 -710}\special{pa 781 -706}\special{pa 788 -705}\special{pa 795 -708}\special{pa 800 -713}\special{pa 802 -719}\special{pa 801 -726}\special{pa 797 -732}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 719 -243}\special{pa 740 -199}\special{pa 767 -157}\special{pa 800 -120}%
+\special{pa 836 -86}\special{pa 877 -58}\special{pa 920 -35}\special{pa 966 -17}%
+\special{pa 1015 -6}\special{pa 1064 -0}\special{pa 1113 -1}\special{pa 1162 -8}%
+\special{pa 1210 -21}\special{pa 1255 -40}\special{pa 1298 -65}\special{pa 1338 -94}%
+\special{pa 1373 -129}\special{pa 1404 -167}\special{pa 1430 -209}\special{pa 1451 -255}%
+\special{pa 1465 -302}\special{pa 1474 -350}\special{pa 1476 -400}\special{pa 1472 -449}%
+\special{pa 1462 -498}\special{pa 1446 -544}\special{pa 1424 -589}\special{pa 1397 -630}%
+\special{pa 1365 -668}\special{pa 1328 -701}\special{pa 1288 -729}\special{pa 1244 -753}%
+\special{pa 1198 -770}\special{pa 1150 -782}\special{pa 1101 -787}\special{pa 1051 -786}%
+\special{pa 1002 -779}\special{pa 955 -766}\special{pa 909 -747}\special{pa 866 -723}%
+\special{pa 827 -693}\special{pa 791 -659}\special{pa 760 -620}\special{pa 734 -578}%
+\special{pa 714 -533}\special{pa 699 -486}\special{pa 691 -437}\special{pa 689 -388}%
+\special{pa 692 -338}\special{pa 702 -290}\special{pa 719 -243}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 943 -769}\special{pa 937 -772}\special{pa 930 -773}\special{pa 923 -771}\special{pa 918 -766}\special{pa 916 -759}\special{pa 917 -752}\special{pa 920 -746}\special{pa 926 -743}\special{pa 933 -742}\special{pa 940 -744}\special{pa 945 -749}\special{pa 947 -756}\special{pa 946 -763}\special{pa 943 -769}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 943 -769}\special{pa 937 -772}\special{pa 930 -773}\special{pa 923 -771}\special{pa 918 -766}\special{pa 916 -759}\special{pa 917 -752}\special{pa 920 -746}\special{pa 926 -743}\special{pa 933 -742}\special{pa 940 -744}\special{pa 945 -749}\special{pa 947 -756}\special{pa 946 -763}\special{pa 943 -769}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 773 -317}\special{pa 786 -269}\special{pa 805 -223}\special{pa 829 -180}%
+\special{pa 858 -140}\special{pa 892 -105}\special{pa 931 -73}\special{pa 973 -47}%
+\special{pa 1017 -27}\special{pa 1065 -12}\special{pa 1113 -3}\special{pa 1163 -0}%
+\special{pa 1212 -4}\special{pa 1260 -13}\special{pa 1307 -29}\special{pa 1352 -50}%
+\special{pa 1393 -77}\special{pa 1431 -109}\special{pa 1465 -145}\special{pa 1494 -185}%
+\special{pa 1517 -229}\special{pa 1535 -275}\special{pa 1547 -323}\special{pa 1553 -372}%
+\special{pa 1552 -422}\special{pa 1546 -471}\special{pa 1533 -518}\special{pa 1514 -564}%
+\special{pa 1490 -607}\special{pa 1461 -647}\special{pa 1427 -683}\special{pa 1388 -714}%
+\special{pa 1346 -740}\special{pa 1302 -761}\special{pa 1254 -776}\special{pa 1206 -785}%
+\special{pa 1156 -787}\special{pa 1107 -784}\special{pa 1059 -774}\special{pa 1012 -759}%
+\special{pa 967 -737}\special{pa 926 -710}\special{pa 888 -679}\special{pa 854 -642}%
+\special{pa 825 -602}\special{pa 802 -559}\special{pa 784 -512}\special{pa 772 -464}%
+\special{pa 766 -415}\special{pa 767 -366}\special{pa 773 -317}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 1094 -791}\special{pa 1088 -795}\special{pa 1081 -795}\special{pa 1074 -793}\special{pa 1069 -788}\special{pa 1067 -782}\special{pa 1068 -775}\special{pa 1072 -769}\special{pa 1078 -765}\special{pa 1084 -764}\special{pa 1091 -767}\special{pa 1096 -771}\special{pa 1098 -778}\special{pa 1098 -785}\special{pa 1094 -791}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 1094 -791}\special{pa 1088 -795}\special{pa 1081 -795}\special{pa 1074 -793}\special{pa 1069 -788}\special{pa 1067 -782}\special{pa 1068 -775}\special{pa 1072 -769}\special{pa 1078 -765}\special{pa 1084 -764}\special{pa 1091 -767}\special{pa 1096 -771}\special{pa 1098 -778}\special{pa 1098 -785}\special{pa 1094 -791}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 843 -394}\special{pa 846 -344}\special{pa 856 -296}\special{pa 871 -249}%
+\special{pa 892 -204}\special{pa 918 -162}\special{pa 950 -124}\special{pa 986 -90}%
+\special{pa 1026 -61}\special{pa 1069 -37}\special{pa 1115 -19}\special{pa 1163 -7}%
+\special{pa 1212 -1}\special{pa 1262 -1}\special{pa 1311 -7}\special{pa 1359 -19}%
+\special{pa 1404 -37}\special{pa 1448 -61}\special{pa 1488 -90}\special{pa 1524 -124}%
+\special{pa 1555 -162}\special{pa 1582 -204}\special{pa 1603 -249}\special{pa 1618 -296}%
+\special{pa 1627 -344}\special{pa 1631 -394}\special{pa 1627 -443}\special{pa 1618 -492}%
+\special{pa 1603 -539}\special{pa 1582 -583}\special{pa 1555 -625}\special{pa 1524 -663}%
+\special{pa 1488 -697}\special{pa 1448 -726}\special{pa 1404 -750}\special{pa 1359 -768}%
+\special{pa 1311 -780}\special{pa 1262 -787}\special{pa 1212 -787}\special{pa 1163 -780}%
+\special{pa 1115 -768}\special{pa 1069 -750}\special{pa 1026 -726}\special{pa 986 -697}%
+\special{pa 950 -663}\special{pa 918 -625}\special{pa 892 -583}\special{pa 871 -539}%
+\special{pa 856 -492}\special{pa 846 -443}\special{pa 843 -394}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 1248 -799}\special{pa 1242 -802}\special{pa 1235 -803}\special{pa 1228 -801}\special{pa 1224 -796}\special{pa 1221 -789}\special{pa 1222 -782}\special{pa 1226 -776}\special{pa 1232 -773}\special{pa 1239 -772}\special{pa 1245 -774}\special{pa 1250 -779}\special{pa 1252 -786}\special{pa 1252 -793}\special{pa 1248 -799}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 1248 -799}\special{pa 1242 -802}\special{pa 1235 -803}\special{pa 1228 -801}\special{pa 1224 -796}\special{pa 1221 -789}\special{pa 1222 -782}\special{pa 1226 -776}\special{pa 1232 -773}\special{pa 1239 -772}\special{pa 1245 -774}\special{pa 1250 -779}\special{pa 1252 -786}\special{pa 1252 -793}\special{pa 1248 -799}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 928 -471}\special{pa 921 -422}\special{pa 921 -372}\special{pa 927 -323}%
+\special{pa 939 -275}\special{pa 957 -229}\special{pa 980 -185}\special{pa 1009 -145}%
+\special{pa 1042 -109}\special{pa 1080 -77}\special{pa 1122 -50}\special{pa 1166 -29}%
+\special{pa 1213 -13}\special{pa 1262 -4}\special{pa 1311 -0}\special{pa 1360 -3}%
+\special{pa 1409 -12}\special{pa 1456 -27}\special{pa 1501 -47}\special{pa 1543 -73}%
+\special{pa 1581 -105}\special{pa 1616 -140}\special{pa 1645 -180}\special{pa 1669 -223}%
+\special{pa 1688 -269}\special{pa 1700 -317}\special{pa 1707 -366}\special{pa 1707 -415}%
+\special{pa 1701 -464}\special{pa 1690 -512}\special{pa 1672 -559}\special{pa 1648 -602}%
+\special{pa 1619 -642}\special{pa 1586 -679}\special{pa 1548 -710}\special{pa 1507 -737}%
+\special{pa 1462 -759}\special{pa 1415 -774}\special{pa 1367 -784}\special{pa 1317 -787}%
+\special{pa 1268 -785}\special{pa 1219 -776}\special{pa 1172 -761}\special{pa 1127 -740}%
+\special{pa 1085 -714}\special{pa 1047 -683}\special{pa 1013 -647}\special{pa 983 -607}%
+\special{pa 959 -564}\special{pa 941 -518}\special{pa 928 -471}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 1402 -791}\special{pa 1396 -795}\special{pa 1389 -795}\special{pa 1383 -793}\special{pa 1378 -788}\special{pa 1375 -782}\special{pa 1376 -775}\special{pa 1380 -769}\special{pa 1386 -765}\special{pa 1393 -764}\special{pa 1399 -767}\special{pa 1404 -771}\special{pa 1407 -778}\special{pa 1406 -785}\special{pa 1402 -791}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 1402 -791}\special{pa 1396 -795}\special{pa 1389 -795}\special{pa 1383 -793}\special{pa 1378 -788}\special{pa 1375 -782}\special{pa 1376 -775}\special{pa 1380 -769}\special{pa 1386 -765}\special{pa 1393 -764}\special{pa 1399 -767}\special{pa 1404 -771}\special{pa 1407 -778}\special{pa 1406 -785}\special{pa 1402 -791}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 1028 -544}\special{pa 1012 -498}\special{pa 1002 -449}\special{pa 998 -400}%
+\special{pa 1000 -350}\special{pa 1009 -302}\special{pa 1023 -255}\special{pa 1044 -209}%
+\special{pa 1069 -167}\special{pa 1100 -129}\special{pa 1136 -94}\special{pa 1175 -65}%
+\special{pa 1218 -40}\special{pa 1264 -21}\special{pa 1312 -8}\special{pa 1361 -1}%
+\special{pa 1410 -0}\special{pa 1459 -6}\special{pa 1507 -17}\special{pa 1553 -35}%
+\special{pa 1597 -58}\special{pa 1638 -86}\special{pa 1674 -120}\special{pa 1706 -157}%
+\special{pa 1733 -199}\special{pa 1755 -243}\special{pa 1771 -290}\special{pa 1781 -338}%
+\special{pa 1785 -388}\special{pa 1783 -437}\special{pa 1774 -486}\special{pa 1760 -533}%
+\special{pa 1739 -578}\special{pa 1714 -620}\special{pa 1683 -659}\special{pa 1647 -693}%
+\special{pa 1608 -723}\special{pa 1565 -747}\special{pa 1519 -766}\special{pa 1471 -779}%
+\special{pa 1422 -786}\special{pa 1373 -787}\special{pa 1324 -782}\special{pa 1276 -770}%
+\special{pa 1229 -753}\special{pa 1186 -729}\special{pa 1145 -701}\special{pa 1109 -668}%
+\special{pa 1077 -630}\special{pa 1049 -589}\special{pa 1028 -544}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 1553 -769}\special{pa 1547 -772}\special{pa 1540 -773}\special{pa 1534 -771}\special{pa 1529 -766}\special{pa 1526 -759}\special{pa 1527 -752}\special{pa 1531 -746}\special{pa 1537 -743}\special{pa 1544 -742}\special{pa 1550 -744}\special{pa 1555 -749}\special{pa 1558 -756}\special{pa 1557 -763}\special{pa 1553 -769}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 1553 -769}\special{pa 1547 -772}\special{pa 1540 -773}\special{pa 1534 -771}\special{pa 1529 -766}\special{pa 1526 -759}\special{pa 1527 -752}\special{pa 1531 -746}\special{pa 1537 -743}\special{pa 1544 -742}\special{pa 1550 -744}\special{pa 1555 -749}\special{pa 1558 -756}\special{pa 1557 -763}\special{pa 1553 -769}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 1141 -612}\special{pa 1117 -570}\special{pa 1097 -524}\special{pa 1084 -477}%
+\special{pa 1077 -428}\special{pa 1075 -378}\special{pa 1080 -329}\special{pa 1092 -281}%
+\special{pa 1109 -235}\special{pa 1131 -191}\special{pa 1160 -150}\special{pa 1193 -113}%
+\special{pa 1230 -81}\special{pa 1271 -53}\special{pa 1315 -31}\special{pa 1362 -15}%
+\special{pa 1410 -4}\special{pa 1459 -0}\special{pa 1509 -2}\special{pa 1558 -10}%
+\special{pa 1605 -24}\special{pa 1650 -44}\special{pa 1693 -70}\special{pa 1731 -100}%
+\special{pa 1766 -136}\special{pa 1796 -175}\special{pa 1821 -218}\special{pa 1840 -263}%
+\special{pa 1854 -311}\special{pa 1861 -360}\special{pa 1862 -409}\special{pa 1857 -458}%
+\special{pa 1846 -507}\special{pa 1829 -553}\special{pa 1806 -597}\special{pa 1778 -637}%
+\special{pa 1745 -674}\special{pa 1708 -707}\special{pa 1667 -734}\special{pa 1622 -756}%
+\special{pa 1576 -773}\special{pa 1527 -783}\special{pa 1478 -787}\special{pa 1429 -785}%
+\special{pa 1380 -777}\special{pa 1332 -763}\special{pa 1287 -743}\special{pa 1245 -718}%
+\special{pa 1206 -687}\special{pa 1171 -652}\special{pa 1141 -612}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 1699 -732}\special{pa 1693 -736}\special{pa 1686 -737}\special{pa 1679 -734}\special{pa 1674 -729}\special{pa 1672 -723}\special{pa 1673 -716}\special{pa 1676 -710}\special{pa 1682 -706}\special{pa 1689 -705}\special{pa 1696 -708}\special{pa 1701 -713}\special{pa 1703 -719}\special{pa 1702 -726}\special{pa 1699 -732}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 1699 -732}\special{pa 1693 -736}\special{pa 1686 -737}\special{pa 1679 -734}\special{pa 1674 -729}\special{pa 1672 -723}\special{pa 1673 -716}\special{pa 1676 -710}\special{pa 1682 -706}\special{pa 1689 -705}\special{pa 1696 -708}\special{pa 1701 -713}\special{pa 1703 -719}\special{pa 1702 -726}\special{pa 1699 -732}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 1268 -672}\special{pa 1235 -635}\special{pa 1207 -594}\special{pa 1185 -550}%
+\special{pa 1168 -504}\special{pa 1157 -455}\special{pa 1153 -406}\special{pa 1154 -357}%
+\special{pa 1162 -308}\special{pa 1176 -260}\special{pa 1195 -215}\special{pa 1220 -172}%
+\special{pa 1251 -133}\special{pa 1286 -98}\special{pa 1325 -68}\special{pa 1367 -43}%
+\special{pa 1413 -23}\special{pa 1460 -9}\special{pa 1509 -2}\special{pa 1558 -0}%
+\special{pa 1608 -5}\special{pa 1656 -16}\special{pa 1702 -32}\special{pa 1746 -55}%
+\special{pa 1787 -83}\special{pa 1824 -115}\special{pa 1857 -152}\special{pa 1885 -193}%
+\special{pa 1907 -237}\special{pa 1924 -284}\special{pa 1935 -332}\special{pa 1940 -381}%
+\special{pa 1938 -431}\special{pa 1930 -480}\special{pa 1916 -527}\special{pa 1897 -572}%
+\special{pa 1872 -615}\special{pa 1841 -654}\special{pa 1806 -689}\special{pa 1767 -719}%
+\special{pa 1725 -744}\special{pa 1679 -764}\special{pa 1632 -778}\special{pa 1583 -786}%
+\special{pa 1534 -787}\special{pa 1484 -783}\special{pa 1436 -772}\special{pa 1390 -755}%
+\special{pa 1346 -733}\special{pa 1305 -705}\special{pa 1268 -672}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 1836 -683}\special{pa 1830 -687}\special{pa 1823 -688}\special{pa 1816 -685}\special{pa 1811 -680}\special{pa 1809 -674}\special{pa 1810 -667}\special{pa 1813 -661}\special{pa 1819 -657}\special{pa 1826 -656}\special{pa 1833 -659}\special{pa 1838 -664}\special{pa 1840 -670}\special{pa 1839 -677}\special{pa 1836 -683}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 1836 -683}\special{pa 1830 -687}\special{pa 1823 -688}\special{pa 1816 -685}\special{pa 1811 -680}\special{pa 1809 -674}\special{pa 1810 -667}\special{pa 1813 -661}\special{pa 1819 -657}\special{pa 1826 -656}\special{pa 1833 -659}\special{pa 1838 -664}\special{pa 1840 -670}\special{pa 1839 -677}\special{pa 1836 -683}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 1405 -721}\special{pa 1365 -691}\special{pa 1330 -656}\special{pa 1299 -618}%
+\special{pa 1274 -575}\special{pa 1254 -530}\special{pa 1240 -483}\special{pa 1232 -434}%
+\special{pa 1230 -384}\special{pa 1234 -335}\special{pa 1244 -287}\special{pa 1261 -240}%
+\special{pa 1283 -196}\special{pa 1310 -155}\special{pa 1343 -118}\special{pa 1380 -85}%
+\special{pa 1420 -56}\special{pa 1464 -34}\special{pa 1511 -17}\special{pa 1559 -5}%
+\special{pa 1608 -0}\special{pa 1657 -1}\special{pa 1706 -9}\special{pa 1754 -22}%
+\special{pa 1799 -42}\special{pa 1842 -66}\special{pa 1881 -96}\special{pa 1917 -131}%
+\special{pa 1947 -170}\special{pa 1973 -212}\special{pa 1993 -257}\special{pa 2007 -305}%
+\special{pa 2015 -354}\special{pa 2017 -403}\special{pa 2013 -452}\special{pa 2002 -501}%
+\special{pa 1986 -547}\special{pa 1964 -591}\special{pa 1936 -633}\special{pa 1904 -670}%
+\special{pa 1867 -703}\special{pa 1826 -731}\special{pa 1783 -754}\special{pa 1736 -771}%
+\special{pa 1688 -782}\special{pa 1639 -787}\special{pa 1589 -786}\special{pa 1540 -779}%
+\special{pa 1493 -765}\special{pa 1447 -746}\special{pa 1405 -721}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 1962 -624}\special{pa 1956 -627}\special{pa 1949 -628}\special{pa 1942 -626}\special{pa 1937 -621}\special{pa 1935 -614}\special{pa 1936 -607}\special{pa 1940 -601}\special{pa 1946 -598}\special{pa 1952 -597}\special{pa 1959 -599}\special{pa 1964 -604}\special{pa 1966 -611}\special{pa 1966 -618}\special{pa 1962 -624}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 1962 -624}\special{pa 1956 -627}\special{pa 1949 -628}\special{pa 1942 -626}\special{pa 1937 -621}\special{pa 1935 -614}\special{pa 1936 -607}\special{pa 1940 -601}\special{pa 1946 -598}\special{pa 1952 -597}\special{pa 1959 -599}\special{pa 1964 -604}\special{pa 1966 -611}\special{pa 1966 -618}\special{pa 1962 -624}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 1550 -757}\special{pa 1506 -736}\special{pa 1464 -709}\special{pa 1427 -676}%
+\special{pa 1393 -640}\special{pa 1365 -599}\special{pa 1342 -556}\special{pa 1324 -509}%
+\special{pa 1313 -461}\special{pa 1307 -412}\special{pa 1308 -363}\special{pa 1315 -314}%
+\special{pa 1328 -266}\special{pa 1347 -220}\special{pa 1372 -178}\special{pa 1401 -138}%
+\special{pa 1436 -103}\special{pa 1474 -72}\special{pa 1516 -46}\special{pa 1562 -25}%
+\special{pa 1609 -11}\special{pa 1657 -2}\special{pa 1707 -0}\special{pa 1756 -4}%
+\special{pa 1805 -14}\special{pa 1851 -30}\special{pa 1896 -52}\special{pa 1937 -79}%
+\special{pa 1975 -111}\special{pa 2008 -148}\special{pa 2036 -188}\special{pa 2059 -232}%
+\special{pa 2077 -278}\special{pa 2089 -326}\special{pa 2094 -375}\special{pa 2093 -425}%
+\special{pa 2086 -474}\special{pa 2073 -521}\special{pa 2054 -567}\special{pa 2030 -610}%
+\special{pa 2000 -649}\special{pa 1966 -685}\special{pa 1927 -716}\special{pa 1885 -742}%
+\special{pa 1840 -762}\special{pa 1793 -777}\special{pa 1744 -785}\special{pa 1694 -787}%
+\special{pa 1645 -783}\special{pa 1597 -773}\special{pa 1550 -757}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 2076 -555}\special{pa 2070 -559}\special{pa 2063 -560}\special{pa 2056 -558}\special{pa 2051 -553}\special{pa 2049 -546}\special{pa 2050 -539}\special{pa 2053 -533}\special{pa 2059 -529}\special{pa 2066 -529}\special{pa 2073 -531}\special{pa 2078 -536}\special{pa 2080 -543}\special{pa 2079 -550}\special{pa 2076 -555}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 2076 -555}\special{pa 2070 -559}\special{pa 2063 -560}\special{pa 2056 -558}\special{pa 2051 -553}\special{pa 2049 -546}\special{pa 2050 -539}\special{pa 2053 -533}\special{pa 2059 -529}\special{pa 2066 -529}\special{pa 2073 -531}\special{pa 2078 -536}\special{pa 2080 -543}\special{pa 2079 -550}\special{pa 2076 -555}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 1701 -780}\special{pa 1653 -767}\special{pa 1608 -749}\special{pa 1564 -724}%
+\special{pa 1525 -695}\special{pa 1489 -661}\special{pa 1458 -623}\special{pa 1431 -581}%
+\special{pa 1411 -536}\special{pa 1396 -489}\special{pa 1387 -440}\special{pa 1384 -391}%
+\special{pa 1388 -341}\special{pa 1397 -293}\special{pa 1413 -246}\special{pa 1434 -201}%
+\special{pa 1461 -160}\special{pa 1493 -122}\special{pa 1529 -88}\special{pa 1570 -60}%
+\special{pa 1613 -36}\special{pa 1659 -18}\special{pa 1707 -6}\special{pa 1756 -1}%
+\special{pa 1806 -1}\special{pa 1855 -8}\special{pa 1903 -20}\special{pa 1948 -39}%
+\special{pa 1992 -63}\special{pa 2031 -92}\special{pa 2067 -126}\special{pa 2098 -165}%
+\special{pa 2124 -207}\special{pa 2145 -252}\special{pa 2160 -299}\special{pa 2169 -347}%
+\special{pa 2172 -397}\special{pa 2168 -446}\special{pa 2159 -495}\special{pa 2143 -542}%
+\special{pa 2121 -586}\special{pa 2095 -628}\special{pa 2063 -665}\special{pa 2027 -699}%
+\special{pa 1986 -728}\special{pa 1943 -751}\special{pa 1897 -769}\special{pa 1849 -781}%
+\special{pa 1800 -787}\special{pa 1750 -786}\special{pa 1701 -780}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 2175 -482}\special{pa 2169 -485}\special{pa 2162 -486}\special{pa 2156 -484}\special{pa 2151 -479}\special{pa 2148 -472}\special{pa 2149 -465}\special{pa 2153 -459}\special{pa 2159 -456}\special{pa 2166 -455}\special{pa 2172 -457}\special{pa 2177 -462}\special{pa 2180 -469}\special{pa 2179 -476}\special{pa 2175 -482}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 2175 -482}\special{pa 2169 -485}\special{pa 2162 -486}\special{pa 2156 -484}\special{pa 2151 -479}\special{pa 2148 -472}\special{pa 2149 -465}\special{pa 2153 -459}\special{pa 2159 -456}\special{pa 2166 -455}\special{pa 2172 -457}\special{pa 2177 -462}\special{pa 2180 -469}\special{pa 2179 -476}\special{pa 2175 -482}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 1855 -787}\special{pa 1806 -784}\special{pa 1757 -775}\special{pa 1710 -760}%
+\special{pa 1666 -739}\special{pa 1624 -712}\special{pa 1586 -681}\special{pa 1552 -645}%
+\special{pa 1523 -605}\special{pa 1499 -561}\special{pa 1481 -515}\special{pa 1469 -467}%
+\special{pa 1462 -418}\special{pa 1462 -369}\special{pa 1469 -320}\special{pa 1481 -272}%
+\special{pa 1499 -226}\special{pa 1523 -183}\special{pa 1552 -143}\special{pa 1586 -107}%
+\special{pa 1624 -75}\special{pa 1666 -49}\special{pa 1710 -28}\special{pa 1757 -12}%
+\special{pa 1806 -3}\special{pa 1855 -0}\special{pa 1905 -3}\special{pa 1953 -12}%
+\special{pa 2000 -28}\special{pa 2045 -49}\special{pa 2087 -75}\special{pa 2125 -107}%
+\special{pa 2159 -143}\special{pa 2188 -183}\special{pa 2212 -226}\special{pa 2230 -272}%
+\special{pa 2242 -320}\special{pa 2248 -369}\special{pa 2248 -418}\special{pa 2242 -467}%
+\special{pa 2230 -515}\special{pa 2212 -561}\special{pa 2188 -605}\special{pa 2159 -645}%
+\special{pa 2125 -681}\special{pa 2087 -712}\special{pa 2045 -739}\special{pa 2000 -760}%
+\special{pa 1953 -775}\special{pa 1905 -784}\special{pa 1855 -787}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 2260 -405}\special{pa 2254 -409}\special{pa 2247 -409}\special{pa 2241 -407}\special{pa 2236 -402}\special{pa 2233 -395}\special{pa 2234 -388}\special{pa 2238 -383}\special{pa 2244 -379}\special{pa 2251 -378}\special{pa 2257 -380}\special{pa 2262 -385}\special{pa 2265 -392}\special{pa 2264 -399}\special{pa 2260 -405}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 2260 -405}\special{pa 2254 -409}\special{pa 2247 -409}\special{pa 2241 -407}\special{pa 2236 -402}\special{pa 2233 -395}\special{pa 2234 -388}\special{pa 2238 -383}\special{pa 2244 -379}\special{pa 2251 -378}\special{pa 2257 -380}\special{pa 2262 -385}\special{pa 2265 -392}\special{pa 2264 -399}\special{pa 2260 -405}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 2009 -780}\special{pa 1960 -786}\special{pa 1911 -787}\special{pa 1862 -781}%
+\special{pa 1814 -769}\special{pa 1768 -751}\special{pa 1724 -728}\special{pa 1684 -699}%
+\special{pa 1648 -665}\special{pa 1616 -628}\special{pa 1589 -586}\special{pa 1568 -542}%
+\special{pa 1552 -495}\special{pa 1542 -446}\special{pa 1539 -397}\special{pa 1542 -347}%
+\special{pa 1550 -299}\special{pa 1565 -252}\special{pa 1586 -207}\special{pa 1612 -165}%
+\special{pa 1643 -126}\special{pa 1679 -92}\special{pa 1719 -63}\special{pa 1762 -39}%
+\special{pa 1808 -20}\special{pa 1856 -8}\special{pa 1905 -1}\special{pa 1954 -1}%
+\special{pa 2003 -6}\special{pa 2051 -18}\special{pa 2097 -36}\special{pa 2141 -60}%
+\special{pa 2181 -88}\special{pa 2217 -122}\special{pa 2249 -160}\special{pa 2276 -201}%
+\special{pa 2297 -246}\special{pa 2313 -293}\special{pa 2323 -341}\special{pa 2326 -391}%
+\special{pa 2324 -440}\special{pa 2315 -489}\special{pa 2300 -536}\special{pa 2279 -581}%
+\special{pa 2253 -623}\special{pa 2222 -661}\special{pa 2186 -695}\special{pa 2146 -724}%
+\special{pa 2103 -749}\special{pa 2057 -767}\special{pa 2009 -780}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 2330 -328}\special{pa 2324 -332}\special{pa 2317 -333}\special{pa 2310 -330}\special{pa 2305 -325}\special{pa 2303 -319}\special{pa 2304 -312}\special{pa 2308 -306}\special{pa 2314 -302}\special{pa 2320 -301}\special{pa 2327 -304}\special{pa 2332 -309}\special{pa 2334 -315}\special{pa 2334 -322}\special{pa 2330 -328}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 2330 -328}\special{pa 2324 -332}\special{pa 2317 -333}\special{pa 2310 -330}\special{pa 2305 -325}\special{pa 2303 -319}\special{pa 2304 -312}\special{pa 2308 -306}\special{pa 2314 -302}\special{pa 2320 -301}\special{pa 2327 -304}\special{pa 2332 -309}\special{pa 2334 -315}\special{pa 2334 -322}\special{pa 2330 -328}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 2161 -757}\special{pa 2114 -773}\special{pa 2065 -783}\special{pa 2016 -787}%
+\special{pa 1967 -785}\special{pa 1918 -777}\special{pa 1871 -762}\special{pa 1826 -742}%
+\special{pa 1783 -716}\special{pa 1745 -685}\special{pa 1711 -649}\special{pa 1681 -610}%
+\special{pa 1656 -567}\special{pa 1637 -521}\special{pa 1624 -474}\special{pa 1617 -425}%
+\special{pa 1617 -375}\special{pa 1622 -326}\special{pa 1634 -278}\special{pa 1651 -232}%
+\special{pa 1674 -188}\special{pa 1703 -148}\special{pa 1736 -111}\special{pa 1773 -79}%
+\special{pa 1815 -52}\special{pa 1859 -30}\special{pa 1906 -14}\special{pa 1954 -4}%
+\special{pa 2004 -0}\special{pa 2053 -2}\special{pa 2102 -11}\special{pa 2149 -25}%
+\special{pa 2194 -46}\special{pa 2236 -72}\special{pa 2275 -103}\special{pa 2309 -138}%
+\special{pa 2339 -178}\special{pa 2363 -220}\special{pa 2382 -266}\special{pa 2395 -314}%
+\special{pa 2402 -363}\special{pa 2403 -412}\special{pa 2398 -461}\special{pa 2386 -509}%
+\special{pa 2369 -556}\special{pa 2346 -599}\special{pa 2317 -640}\special{pa 2284 -676}%
+\special{pa 2246 -709}\special{pa 2205 -736}\special{pa 2161 -757}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 2385 -254}\special{pa 2379 -258}\special{pa 2372 -259}\special{pa 2365 -256}\special{pa 2360 -251}\special{pa 2358 -245}\special{pa 2359 -238}\special{pa 2362 -232}\special{pa 2368 -228}\special{pa 2375 -227}\special{pa 2382 -230}\special{pa 2387 -235}\special{pa 2389 -241}\special{pa 2388 -248}\special{pa 2385 -254}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 2385 -254}\special{pa 2379 -258}\special{pa 2372 -259}\special{pa 2365 -256}\special{pa 2360 -251}\special{pa 2358 -245}\special{pa 2359 -238}\special{pa 2362 -232}\special{pa 2368 -228}\special{pa 2375 -227}\special{pa 2382 -230}\special{pa 2387 -235}\special{pa 2389 -241}\special{pa 2388 -248}\special{pa 2385 -254}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 2306 -721}\special{pa 2263 -746}\special{pa 2218 -765}\special{pa 2170 -779}%
+\special{pa 2121 -786}\special{pa 2072 -787}\special{pa 2023 -782}\special{pa 1974 -771}%
+\special{pa 1928 -754}\special{pa 1884 -731}\special{pa 1843 -703}\special{pa 1807 -670}%
+\special{pa 1774 -633}\special{pa 1747 -591}\special{pa 1725 -547}\special{pa 1708 -501}%
+\special{pa 1698 -452}\special{pa 1694 -403}\special{pa 1696 -354}\special{pa 1704 -305}%
+\special{pa 1718 -257}\special{pa 1738 -212}\special{pa 1763 -170}\special{pa 1794 -131}%
+\special{pa 1829 -96}\special{pa 1868 -66}\special{pa 1911 -42}\special{pa 1957 -22}%
+\special{pa 2004 -9}\special{pa 2053 -1}\special{pa 2103 -0}\special{pa 2152 -5}%
+\special{pa 2200 -17}\special{pa 2246 -34}\special{pa 2290 -56}\special{pa 2331 -85}%
+\special{pa 2368 -118}\special{pa 2400 -155}\special{pa 2428 -196}\special{pa 2450 -240}%
+\special{pa 2466 -287}\special{pa 2477 -335}\special{pa 2481 -384}\special{pa 2479 -434}%
+\special{pa 2471 -483}\special{pa 2457 -530}\special{pa 2437 -575}\special{pa 2411 -618}%
+\special{pa 2380 -656}\special{pa 2345 -691}\special{pa 2306 -721}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 2426 -186}\special{pa 2420 -190}\special{pa 2413 -191}\special{pa 2406 -188}\special{pa 2401 -183}\special{pa 2399 -177}\special{pa 2400 -170}\special{pa 2403 -164}\special{pa 2409 -160}\special{pa 2416 -159}\special{pa 2423 -162}\special{pa 2428 -167}\special{pa 2430 -173}\special{pa 2429 -180}\special{pa 2426 -186}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 2426 -186}\special{pa 2420 -190}\special{pa 2413 -191}\special{pa 2406 -188}\special{pa 2401 -183}\special{pa 2399 -177}\special{pa 2400 -170}\special{pa 2403 -164}\special{pa 2409 -160}\special{pa 2416 -159}\special{pa 2423 -162}\special{pa 2428 -167}\special{pa 2430 -173}\special{pa 2429 -180}\special{pa 2426 -186}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 2443 -672}\special{pa 2406 -705}\special{pa 2365 -733}\special{pa 2321 -755}%
+\special{pa 2274 -772}\special{pa 2226 -783}\special{pa 2177 -787}\special{pa 2127 -786}%
+\special{pa 2079 -778}\special{pa 2031 -764}\special{pa 1986 -744}\special{pa 1943 -719}%
+\special{pa 1904 -689}\special{pa 1869 -654}\special{pa 1839 -615}\special{pa 1814 -572}%
+\special{pa 1794 -527}\special{pa 1780 -480}\special{pa 1773 -431}\special{pa 1771 -381}%
+\special{pa 1776 -332}\special{pa 1786 -284}\special{pa 1803 -237}\special{pa 1826 -193}%
+\special{pa 1853 -152}\special{pa 1886 -115}\special{pa 1923 -83}\special{pa 1964 -55}%
+\special{pa 2008 -32}\special{pa 2055 -16}\special{pa 2103 -5}\special{pa 2152 -0}%
+\special{pa 2202 -2}\special{pa 2250 -9}\special{pa 2298 -23}\special{pa 2343 -43}%
+\special{pa 2386 -68}\special{pa 2425 -98}\special{pa 2460 -133}\special{pa 2490 -172}%
+\special{pa 2515 -215}\special{pa 2535 -260}\special{pa 2549 -308}\special{pa 2556 -357}%
+\special{pa 2558 -406}\special{pa 2553 -455}\special{pa 2543 -504}\special{pa 2526 -550}%
+\special{pa 2503 -594}\special{pa 2476 -635}\special{pa 2443 -672}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 2454 -126}\special{pa 2448 -130}\special{pa 2441 -131}\special{pa 2434 -129}\special{pa 2430 -124}\special{pa 2427 -117}\special{pa 2428 -110}\special{pa 2432 -104}\special{pa 2438 -100}\special{pa 2445 -100}\special{pa 2451 -102}\special{pa 2456 -107}\special{pa 2459 -114}\special{pa 2458 -121}\special{pa 2454 -126}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 2454 -126}\special{pa 2448 -130}\special{pa 2441 -131}\special{pa 2434 -129}\special{pa 2430 -124}\special{pa 2427 -117}\special{pa 2428 -110}\special{pa 2432 -104}\special{pa 2438 -100}\special{pa 2445 -100}\special{pa 2451 -102}\special{pa 2456 -107}\special{pa 2459 -114}\special{pa 2458 -121}\special{pa 2454 -126}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 2569 -612}\special{pa 2539 -652}\special{pa 2504 -687}\special{pa 2466 -718}%
+\special{pa 2423 -743}\special{pa 2378 -763}\special{pa 2331 -777}\special{pa 2282 -785}%
+\special{pa 2233 -787}\special{pa 2183 -783}\special{pa 2135 -773}\special{pa 2088 -756}%
+\special{pa 2044 -734}\special{pa 2003 -707}\special{pa 1966 -674}\special{pa 1933 -637}%
+\special{pa 1904 -597}\special{pa 1882 -553}\special{pa 1865 -507}\special{pa 1853 -458}%
+\special{pa 1848 -409}\special{pa 1850 -360}\special{pa 1857 -311}\special{pa 1870 -263}%
+\special{pa 1890 -218}\special{pa 1914 -175}\special{pa 1944 -136}\special{pa 1979 -100}%
+\special{pa 2018 -70}\special{pa 2060 -44}\special{pa 2106 -24}\special{pa 2153 -10}%
+\special{pa 2202 -2}\special{pa 2251 -0}\special{pa 2300 -4}\special{pa 2349 -15}%
+\special{pa 2395 -31}\special{pa 2440 -53}\special{pa 2481 -81}\special{pa 2518 -113}%
+\special{pa 2551 -150}\special{pa 2579 -191}\special{pa 2602 -235}\special{pa 2619 -281}%
+\special{pa 2630 -329}\special{pa 2635 -378}\special{pa 2634 -428}\special{pa 2627 -477}%
+\special{pa 2613 -524}\special{pa 2594 -570}\special{pa 2569 -612}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 2472 -77}\special{pa 2466 -81}\special{pa 2459 -82}\special{pa 2452 -80}\special{pa 2447 -75}\special{pa 2445 -68}\special{pa 2446 -61}\special{pa 2449 -55}\special{pa 2455 -51}\special{pa 2462 -51}\special{pa 2469 -53}\special{pa 2474 -58}\special{pa 2476 -65}\special{pa 2475 -72}\special{pa 2472 -77}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 2472 -77}\special{pa 2466 -81}\special{pa 2459 -82}\special{pa 2452 -80}\special{pa 2447 -75}\special{pa 2445 -68}\special{pa 2446 -61}\special{pa 2449 -55}\special{pa 2455 -51}\special{pa 2462 -51}\special{pa 2469 -53}\special{pa 2474 -58}\special{pa 2476 -65}\special{pa 2475 -72}\special{pa 2472 -77}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 2683 -544}\special{pa 2661 -589}\special{pa 2634 -630}\special{pa 2602 -668}%
+\special{pa 2565 -701}\special{pa 2525 -729}\special{pa 2481 -753}\special{pa 2435 -770}%
+\special{pa 2387 -782}\special{pa 2338 -787}\special{pa 2288 -786}\special{pa 2239 -779}%
+\special{pa 2192 -766}\special{pa 2146 -747}\special{pa 2103 -723}\special{pa 2063 -693}%
+\special{pa 2028 -659}\special{pa 1997 -620}\special{pa 1971 -578}\special{pa 1951 -533}%
+\special{pa 1936 -486}\special{pa 1928 -437}\special{pa 1925 -388}\special{pa 1929 -338}%
+\special{pa 1939 -290}\special{pa 1955 -243}\special{pa 1977 -199}\special{pa 2004 -157}%
+\special{pa 2036 -120}\special{pa 2073 -86}\special{pa 2113 -58}\special{pa 2157 -35}%
+\special{pa 2203 -17}\special{pa 2251 -6}\special{pa 2301 -0}\special{pa 2350 -1}%
+\special{pa 2399 -8}\special{pa 2447 -21}\special{pa 2492 -40}\special{pa 2535 -65}%
+\special{pa 2575 -94}\special{pa 2610 -129}\special{pa 2641 -167}\special{pa 2667 -209}%
+\special{pa 2687 -255}\special{pa 2702 -302}\special{pa 2710 -350}\special{pa 2713 -400}%
+\special{pa 2709 -449}\special{pa 2699 -498}\special{pa 2683 -544}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 2481 -41}\special{pa 2475 -45}\special{pa 2468 -46}\special{pa 2461 -43}\special{pa 2456 -38}\special{pa 2454 -32}\special{pa 2455 -25}\special{pa 2459 -19}\special{pa 2465 -15}\special{pa 2472 -14}\special{pa 2478 -17}\special{pa 2483 -22}\special{pa 2485 -28}\special{pa 2485 -35}\special{pa 2481 -41}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 2481 -41}\special{pa 2475 -45}\special{pa 2468 -46}\special{pa 2461 -43}\special{pa 2456 -38}\special{pa 2454 -32}\special{pa 2455 -25}\special{pa 2459 -19}\special{pa 2465 -15}\special{pa 2472 -14}\special{pa 2478 -17}\special{pa 2483 -22}\special{pa 2485 -28}\special{pa 2485 -35}\special{pa 2481 -41}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 2783 -471}\special{pa 2770 -518}\special{pa 2751 -564}\special{pa 2727 -607}%
+\special{pa 2698 -647}\special{pa 2664 -683}\special{pa 2625 -714}\special{pa 2583 -740}%
+\special{pa 2538 -761}\special{pa 2491 -776}\special{pa 2443 -785}\special{pa 2393 -787}%
+\special{pa 2344 -784}\special{pa 2295 -774}\special{pa 2249 -759}\special{pa 2204 -737}%
+\special{pa 2162 -710}\special{pa 2125 -679}\special{pa 2091 -642}\special{pa 2062 -602}%
+\special{pa 2039 -559}\special{pa 2021 -512}\special{pa 2009 -464}\special{pa 2003 -415}%
+\special{pa 2004 -366}\special{pa 2010 -317}\special{pa 2023 -269}\special{pa 2041 -223}%
+\special{pa 2066 -180}\special{pa 2095 -140}\special{pa 2129 -105}\special{pa 2167 -73}%
+\special{pa 2209 -47}\special{pa 2254 -27}\special{pa 2301 -12}\special{pa 2350 -3}%
+\special{pa 2399 -0}\special{pa 2449 -4}\special{pa 2497 -13}\special{pa 2544 -29}%
+\special{pa 2589 -50}\special{pa 2630 -77}\special{pa 2668 -109}\special{pa 2702 -145}%
+\special{pa 2730 -185}\special{pa 2754 -229}\special{pa 2772 -275}\special{pa 2784 -323}%
+\special{pa 2790 -372}\special{pa 2789 -422}\special{pa 2783 -471}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 2484 -19}\special{pa 2478 -22}\special{pa 2471 -23}\special{pa 2465 -21}\special{pa 2460 -16}\special{pa 2458 -9}\special{pa 2458 -2}\special{pa 2462 4}\special{pa 2468 7}\special{pa 2475 8}\special{pa 2482 6}\special{pa 2487 1}\special{pa 2489 -6}\special{pa 2488 -13}\special{pa 2484 -19}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 2484 -19}\special{pa 2478 -22}\special{pa 2471 -23}\special{pa 2465 -21}\special{pa 2460 -16}\special{pa 2458 -9}\special{pa 2458 -2}\special{pa 2462 4}\special{pa 2468 7}\special{pa 2475 8}\special{pa 2482 6}\special{pa 2487 1}\special{pa 2489 -6}\special{pa 2488 -13}\special{pa 2484 -19}\special{fp}%
+}%
+\special{pn 2}%
+\special{pa 2867 -394}\special{pa 2864 -443}\special{pa 2855 -492}\special{pa 2840 -539}%
+\special{pa 2819 -583}\special{pa 2792 -625}\special{pa 2761 -663}\special{pa 2725 -697}%
+\special{pa 2685 -726}\special{pa 2641 -750}\special{pa 2595 -768}\special{pa 2547 -780}%
+\special{pa 2498 -787}\special{pa 2449 -787}\special{pa 2400 -780}\special{pa 2352 -768}%
+\special{pa 2306 -750}\special{pa 2263 -726}\special{pa 2223 -697}\special{pa 2187 -663}%
+\special{pa 2155 -625}\special{pa 2129 -583}\special{pa 2108 -539}\special{pa 2092 -492}%
+\special{pa 2083 -443}\special{pa 2080 -394}\special{pa 2083 -344}\special{pa 2092 -296}%
+\special{pa 2108 -249}\special{pa 2129 -204}\special{pa 2155 -162}\special{pa 2187 -124}%
+\special{pa 2223 -90}\special{pa 2263 -61}\special{pa 2306 -37}\special{pa 2352 -19}%
+\special{pa 2400 -7}\special{pa 2449 -1}\special{pa 2498 -1}\special{pa 2547 -7}%
+\special{pa 2595 -19}\special{pa 2641 -37}\special{pa 2685 -61}\special{pa 2725 -90}%
+\special{pa 2761 -124}\special{pa 2792 -162}\special{pa 2819 -204}\special{pa 2840 -249}%
+\special{pa 2855 -296}\special{pa 2864 -344}\special{pa 2867 -394}%
+\special{fp}%
+\special{pn 8}%
+{%
+\color[rgb]{1,0,0}%
+{\special{pn 0}\color[rgb]{1,0,0}%
+\special{pa 2485 -11}\special{pa 2479 -15}\special{pa 2472 -16}\special{pa 2465 -13}\special{pa 2460 -8}\special{pa 2458 -2}\special{pa 2459 5}\special{pa 2463 11}\special{pa 2468 15}\special{pa 2475 16}\special{pa 2482 13}\special{pa 2487 8}\special{pa 2489 2}\special{pa 2489 -5}\special{pa 2485 -11}\special{sh}\special{fp}}%
+\special{pn 4}\special{pa 2485 -11}\special{pa 2479 -15}\special{pa 2472 -16}\special{pa 2465 -13}\special{pa 2460 -8}\special{pa 2458 -2}\special{pa 2459 5}\special{pa 2463 11}\special{pa 2468 15}\special{pa 2475 16}\special{pa 2482 13}\special{pa 2487 8}\special{pa 2489 2}\special{pa 2489 -5}\special{pa 2485 -11}\special{fp}%
+}%
+\special{pa -787 -0}\special{pa 3150 -0}%
+\special{fp}%
+\special{pa 0 394}\special{pa 0 -1181}%
+\special{fp}%
+\settowidth{\Width}{$x$}\setlength{\Width}{0\Width}%
+\settoheight{\Height}{$x$}\settodepth{\Depth}{$x$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}%
+\put(8.0500000,0.0000000){\hspace*{\Width}\raisebox{\Height}{$x$}}%
+%
+\settowidth{\Width}{$y$}\setlength{\Width}{-0.5\Width}%
+\settoheight{\Height}{$y$}\settodepth{\Depth}{$y$}\setlength{\Height}{\Depth}%
+\put(0.0000000,3.0500000){\hspace*{\Width}\raisebox{\Height}{$y$}}%
+%
+\settowidth{\Width}{O}\setlength{\Width}{-1\Width}%
+\settoheight{\Height}{O}\settodepth{\Depth}{O}\setlength{\Height}{-\Height}%
+\put(-0.0500000,-0.0500000){\hspace*{\Width}\raisebox{\Height}{O}}%
+%
+\end{picture}}% \ No newline at end of file
diff --git a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/tablesample1.tex b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/tablesample1.tex
index f192c3303c9..3771067862e 100644
--- a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/tablesample1.tex
+++ b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/tablesample1.tex
@@ -1,5 +1,5 @@
-%%% /Users/Hannya/Desktop/KeTCindy/fig/tablesample1.tex
-%%% Generator=template1.cdy
+%%% /Users/takatoosetsuo/Dropbox/kettoday/0511ReuleauxTriangle/fig/tablesample1.tex
+%%% Generator=tablesample1.cdy
{\unitlength=1cm%
\begin{picture}%
(12,6)(0,0)%
@@ -31,6 +31,40 @@
\special{pn 8}%
\special{pa 0 -1969}\special{pa 4724 -1969}%
\special{fp}%
+\special{pa 0 -1969}\special{pa 4724 -1969}%
+\special{fp}%
+\special{pa 0 -1575}\special{pa 39 -1575}\special{fp}\special{pa 78 -1575}\special{pa 117 -1575}\special{fp}%
+\special{pa 156 -1575}\special{pa 195 -1575}\special{fp}\special{pa 234 -1575}\special{pa 273 -1575}\special{fp}%
+\special{pa 312 -1575}\special{pa 351 -1575}\special{fp}\special{pa 390 -1575}\special{pa 429 -1575}\special{fp}%
+\special{pa 469 -1575}\special{pa 508 -1575}\special{fp}\special{pa 547 -1575}\special{pa 586 -1575}\special{fp}%
+\special{pa 625 -1575}\special{pa 664 -1575}\special{fp}\special{pa 703 -1575}\special{pa 742 -1575}\special{fp}%
+\special{pa 781 -1575}\special{pa 820 -1575}\special{fp}\special{pa 859 -1575}\special{pa 898 -1575}\special{fp}%
+\special{pa 937 -1575}\special{pa 976 -1575}\special{fp}\special{pa 1015 -1575}\special{pa 1054 -1575}\special{fp}%
+\special{pa 1093 -1575}\special{pa 1132 -1575}\special{fp}\special{pa 1171 -1575}\special{pa 1210 -1575}\special{fp}%
+\special{pa 1249 -1575}\special{pa 1288 -1575}\special{fp}\special{pa 1328 -1575}\special{pa 1367 -1575}\special{fp}%
+\special{pa 1406 -1575}\special{pa 1445 -1575}\special{fp}\special{pa 1484 -1575}\special{pa 1523 -1575}\special{fp}%
+\special{pa 1562 -1575}\special{pa 1601 -1575}\special{fp}\special{pa 1640 -1575}\special{pa 1679 -1575}\special{fp}%
+\special{pa 1718 -1575}\special{pa 1757 -1575}\special{fp}\special{pa 1796 -1575}\special{pa 1835 -1575}\special{fp}%
+\special{pa 1874 -1575}\special{pa 1913 -1575}\special{fp}\special{pa 1952 -1575}\special{pa 1991 -1575}\special{fp}%
+\special{pa 2030 -1575}\special{pa 2069 -1575}\special{fp}\special{pa 2108 -1575}\special{pa 2147 -1575}\special{fp}%
+\special{pa 2187 -1575}\special{pa 2226 -1575}\special{fp}\special{pa 2265 -1575}\special{pa 2304 -1575}\special{fp}%
+\special{pa 2343 -1575}\special{pa 2382 -1575}\special{fp}\special{pa 2421 -1575}\special{pa 2460 -1575}\special{fp}%
+\special{pa 2499 -1575}\special{pa 2538 -1575}\special{fp}\special{pa 2577 -1575}\special{pa 2616 -1575}\special{fp}%
+\special{pa 2655 -1575}\special{pa 2694 -1575}\special{fp}\special{pa 2733 -1575}\special{pa 2772 -1575}\special{fp}%
+\special{pa 2811 -1575}\special{pa 2850 -1575}\special{fp}\special{pa 2889 -1575}\special{pa 2928 -1575}\special{fp}%
+\special{pa 2967 -1575}\special{pa 3006 -1575}\special{fp}\special{pa 3045 -1575}\special{pa 3085 -1575}\special{fp}%
+\special{pa 3124 -1575}\special{pa 3163 -1575}\special{fp}\special{pa 3202 -1575}\special{pa 3241 -1575}\special{fp}%
+\special{pa 3280 -1575}\special{pa 3319 -1575}\special{fp}\special{pa 3358 -1575}\special{pa 3397 -1575}\special{fp}%
+\special{pa 3436 -1575}\special{pa 3475 -1575}\special{fp}\special{pa 3514 -1575}\special{pa 3553 -1575}\special{fp}%
+\special{pa 3592 -1575}\special{pa 3631 -1575}\special{fp}\special{pa 3670 -1575}\special{pa 3709 -1575}\special{fp}%
+\special{pa 3748 -1575}\special{pa 3787 -1575}\special{fp}\special{pa 3826 -1575}\special{pa 3865 -1575}\special{fp}%
+\special{pa 3904 -1575}\special{pa 3944 -1575}\special{fp}\special{pa 3983 -1575}\special{pa 4022 -1575}\special{fp}%
+\special{pa 4061 -1575}\special{pa 4100 -1575}\special{fp}\special{pa 4139 -1575}\special{pa 4178 -1575}\special{fp}%
+\special{pa 4217 -1575}\special{pa 4256 -1575}\special{fp}\special{pa 4295 -1575}\special{pa 4334 -1575}\special{fp}%
+\special{pa 4373 -1575}\special{pa 4412 -1575}\special{fp}\special{pa 4451 -1575}\special{pa 4490 -1575}\special{fp}%
+\special{pa 4529 -1575}\special{pa 4568 -1575}\special{fp}\special{pa 4607 -1575}\special{pa 4646 -1575}\special{fp}%
+\special{pa 4685 -1575}\special{pa 4724 -1575}\special{fp}%
+%
\special{pa 0 -1575}\special{pa 39 -1575}\special{fp}\special{pa 78 -1575}\special{pa 117 -1575}\special{fp}%
\special{pa 156 -1575}\special{pa 195 -1575}\special{fp}\special{pa 234 -1575}\special{pa 273 -1575}\special{fp}%
\special{pa 312 -1575}\special{pa 351 -1575}\special{fp}\special{pa 390 -1575}\special{pa 429 -1575}\special{fp}%
@@ -77,6 +111,8 @@
\special{pa 1236 -709}\special{pa 1260 -764}\special{pa 1283 -822}\special{pa 1307 -883}%
\special{pa 1331 -947}\special{pa 1354 -1013}\special{pa 1378 -1083}%
\special{fp}%
+\special{pa 197 -394}\special{pa 1378 -394}%
+\special{fp}%
\special{pa 1772 -1280}\special{pa 1795 -1210}\special{pa 1819 -1143}\special{pa 1843 -1080}%
\special{pa 1866 -1019}\special{pa 1890 -961}\special{pa 1913 -905}\special{pa 1937 -853}%
\special{pa 1961 -803}\special{pa 1984 -757}\special{pa 2008 -713}\special{pa 2031 -671}%
@@ -91,6 +127,8 @@
\special{pa 2811 -905}\special{pa 2835 -961}\special{pa 2858 -1019}\special{pa 2882 -1080}%
\special{pa 2906 -1143}\special{pa 2929 -1210}\special{pa 2953 -1280}%
\special{fp}%
+\special{pa 1772 -394}\special{pa 2953 -394}%
+\special{fp}%
\special{pa 3346 -1476}\special{pa 3370 -1407}\special{pa 3394 -1340}\special{pa 3417 -1277}%
\special{pa 3441 -1216}\special{pa 3465 -1157}\special{pa 3488 -1102}\special{pa 3512 -1050}%
\special{pa 3535 -1000}\special{pa 3559 -953}\special{pa 3583 -909}\special{pa 3606 -868}%
@@ -105,11 +143,7 @@
\special{pa 4386 -1102}\special{pa 4409 -1157}\special{pa 4433 -1216}\special{pa 4457 -1277}%
\special{pa 4480 -1340}\special{pa 4504 -1407}\special{pa 4528 -1476}%
\special{fp}%
-\special{pa 197 -591}\special{pa 1378 -591}%
-\special{fp}%
-\special{pa 1772 -591}\special{pa 2953 -591}%
-\special{fp}%
-\special{pa 3346 -591}\special{pa 4528 -591}%
+\special{pa 3346 -394}\special{pa 4528 -394}%
\special{fp}%
\settowidth{\Width}{$D>0$}\setlength{\Width}{-0.5\Width}%
\settoheight{\Height}{$D>0$}\settodepth{\Depth}{$D>0$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}%
@@ -123,9 +157,9 @@
\settoheight{\Height}{$D<0$}\settodepth{\Depth}{$D<0$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}%
\put(10.0000000,5.5000000){\hspace*{\Width}\raisebox{\Height}{$D<0$}}%
%
-\settowidth{\Width}{2 点ã§äº¤ã‚ã‚‹}\setlength{\Width}{-0.5\Width}%
-\settoheight{\Height}{2 点ã§äº¤ã‚ã‚‹}\settodepth{\Depth}{2 点ã§äº¤ã‚ã‚‹}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}%
-\put(2.0000000,4.5000000){\hspace*{\Width}\raisebox{\Height}{2 点ã§äº¤ã‚ã‚‹}}%
+\settowidth{\Width}{2点ã§äº¤ã‚ã‚‹}\setlength{\Width}{-0.5\Width}%
+\settoheight{\Height}{2点ã§äº¤ã‚ã‚‹}\settodepth{\Depth}{2点ã§äº¤ã‚ã‚‹}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}%
+\put(2.0000000,4.5000000){\hspace*{\Width}\raisebox{\Height}{2点ã§äº¤ã‚ã‚‹}}%
%
\settowidth{\Width}{接ã™ã‚‹}\setlength{\Width}{-0.5\Width}%
\settoheight{\Height}{接ã™ã‚‹}\settodepth{\Depth}{接ã™ã‚‹}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}%
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 f2fece34741..1432b0ef180 100644
--- a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/KeTCindyReferenceE.tex
+++ b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/KeTCindyReferenceE.tex
@@ -66,6 +66,22 @@
This function should be written at the first line on Draw slot page. In case of space figure (KeTCindy's 3D-mode), write it in the initialization slot page \verb|ketlib|.
\end{cmd}
+%----------Initglist,Setglist,Addglist----------------------------------
+\begin{cmd}{Initglist}{initglist}
+\itemket{Usage}Initglist(), Setglist(), Addglist()
+\itemket{Description}Add the list generated in \verb|"ketlib"| slot to that of \verb|"ketlib"| slot.
+\itemket{Examples}\mbox{}
+
+\begin{verbatim}
+ Initglist(); // in ketlib slot
+ Implicitplot(''1'',fun,rng);
+ Setglist();
+
+ Ketinit(); // in figures slot
+ Addglist();
+\end{verbatim}
+\end{cmd}
+
%-----------Setfiles---------------------------------
\begin{cmd}{Setfiles}{setfiles}
\itemket{Usage}Setfiles(filename)
@@ -1213,7 +1229,7 @@ Extra options is :\\
\itemket{Usage}Circledata(name, list, options)
\itemket{Description}Draw a circle or polygon.
\itemket{Details}
-The list consists of the central point and some point on the circle.
+The list consists of the central point and some point on the circle or the radius.
It is also permitted that three points on the circle are given in the list.
The name can be omitted when the central point and a point on the circle
are given with the names of their geometric components.\\
@@ -1228,8 +1244,8 @@ When this number is small, the corresponding polygon is drawn.
The circle with center \verb|[0,0]| or A and radius 2 ( draw A by drawing tool)
-\verb| Circledata("1",[[0,0],[2,0]]);|\\
-\verb| Circledata("1",[A,A+[2,0]]);|\\
+\verb| Circledata("1",[[0,0],[2,0]]);|(or \verb|[[0,0],2]|)\\
+\verb| Circledata("1",[A,A+[2,0]]);|(or \verb|[A,2]|)\\
The circle with center A and radius AB
@@ -1968,30 +1984,36 @@ and keep them from being drawn on \TeX\ final output.
\end{cmd}
-%--------AddGraph ------------------------------------
-\begin{cmd}{AddGraph}{addgraph}
+%--------Drawfigures ------------------------------------
+\begin{cmd}{Drawfigures}{drawfigures}
-\itemket{Usage}AddGraph(name,List of PD,options)
-\itemket{Description}Manipulate more than one PD all together.
-\itemket{Remark} PD name should be passed as a character string, for example, pass "cr1"' for PD name cr1.
+\itemket{Usage}Drawfigures(or Drwfigs)(name,List of PDs,List of Options)
+\itemket{Description}Manipulate a plural number of PDs together.
+\itemket{Remark} List of Options should corrensponds to that of PDs.
%\itemket{Details}
\itemket{Examples}\mbox{}
After manipulating PDs of a circle and a point on the circle by AddGraph, you can translate or rotate them together.\\
-\verb|Setpt(3); |\\
-\verb|Circledata("1",[[0,1],[0,0]]); |\\
-\verb|Pointdata("1",[0,0]); |\\
-\verb|AddGraph("1",["[pt1]","cr1"],["nodisp"]); |\\
-\verb|nn=32; |\\
-\verb|forall(1..nn, |\\
-\verb| t=2*pi/nn*#; |\\
-\verb| Rotatedata(text(#),"ad1",-t,[[0,1],"nodisp"]); |\\
-\verb| Translatedata(text(#),"rt"+text(#),[t,0],["dr,0.3"]); |\\
-\verb|); |
+\begin{verbatim}
+opcr=["dr"];
+oppt=["Size=2","Color=red"];
+Circledata("1",[[0,1],[0,0]],opcr);
+Pointdata("1",[0,0],oppt);
+ad1=["cr1","pt1"];
+dt=2*pi/32;
+opcr=["dr,0.3"];
+nn=32;
+forall(1..nn,
+ t=dt*#;
+ Rotatedata(2,ad1,-t,[[0,1],"nodisp"]);
+ Translatedata(2,"rt2",[t,0],["nodisp"]);
+ Drawfigures(text(#),["tr2_1","tr2_2"],[opcr,oppt]);
+);
+\end{verbatim}
\begin{center}
- \input{Fig/addgraph}
+ \input{Fig/drawfigures1}
\end{center}
\end{cmd}
@@ -2705,11 +2727,15 @@ The written data is as follows.
%------------Tabledata--------------------------------
\begin{cmd}{Tabledata}{tabledata}
-\itemket{Usage}Tabledata("",a list of widths, a list of height,a list of removals,[options]);
+\itemket{Usage}Tabledata(a list of widths, a list of height,a list of removals,[options]);
\item[Descritption]Table function to draw rules of a table.
\itemket{Details}
The lower left is the origin.\\
-The options are "Rng=y/n"(if "n", command setwindow is not executed) and as usual.\\
+The options are\\
+\hspace*{10mm}''Setwindow=y/n''\ if "n", command setwindow is not executed.\\
+\hspace*{10mm}''Move=point''\ The lower left changes to the point.\\
+\hspace*{10mm}''Geo=n/y''\ if ''y'', geometric points are created.\\
+\hspace*{10mm}integer\ decides to put names par each interval.\\
The unit of length is 1/10 of the grid of Euclidean view. The default is 1mm.\\
Control points are put on the row and column. The names are r0,r1,... and c0,c1,....\\
The points are movable.
@@ -2718,39 +2744,27 @@ The points are movable.
\verb|xL=[20,20,20,20];|\\
\verb|yL=[10,10,10,10,10];|\\
-\verb|Tabledata("",xL,yL,[]);|
+\verb|Tabledata(xL,yL,["Geo=y"]);|
\begin{center}
\includegraphics[bb=0.00 0.00 403.52 249.51,height=30mm]{Fig/table01.pdf}\hspace{10mm}\input{Fig/table02}
\end{center}
\verb|Rmv=["r1c0c1","c3r0r1","c3r3r5","r4c2c4"];|\\
-\verb|Tabledata("",xL,yL,Rmv);|
+\verb|Tabledata(xL,yL,Rmv);|
\begin{center}
\includegraphics[bb=0.00 0.00 392.02 251.51, height=36mm]{Fig/table03.pdf}
\end{center}
\end{cmd}
-%--------------Tabledatalight------------------------------
-\begin{cmd}{Tabledatalight}{tabledatalight}
-\itemket{Usage}Tabledata("",a list of widths, a list of height,a list of removals,[options]);
-\itemket{Description}Table function to make a table without geometric points.
-\itemket{Details}interval option decides to put names par each interval.
-\itemket{Examples}\mbox{}
-
-\verb|xL=[20,20,20,20];|\\
-\verb|yL=[10,10,10,10,10];|\\
-\verb|Tabledatalight("",xL,yL,[],[2]);|\\
-\end{cmd}
-
%--------Changetablestyle------------------------------------
\begin{cmd}{Changetablestyle}{changetablestyle}
\itemket{Usage}ChangeTablestyle(a list of Rules, [changed style]);
\itemket{Description}Table function to change line styles of rules.
\itemket{Examples}\mbox{}
-\verb|Tabledatalight("",[10,20,10,20],[10,10,10],[]);|\\
+\verb|Tabledata([10,20,10,20],[10,10,10],[]);|\\
\verb|ChangeTablestyle(["r1c0c4"],["da"]);|\\
\verb|ChangeTablestyle(["r2c0c2","c1r0r3"],["nodisp"]);|
@@ -2770,13 +2784,13 @@ The result is a list of center, half of width, half of height.
\itemket{Examples}\mbox{}
-\verb|Tabledatalight("",[10,20,10,20],[10,10,10],[]);|\\
+\verb|Tabledata([10,20,10,20],[10,10,10],[]);|\\
\verb|tmp=Findcell("c2r0","c3r1");| The return is [[3.5,2.5],0.5,0.5].\\
\verb|tmp=Findcell("c0r1","c2r3");| The return is [[1.5,1],1.5,1] .
\end{cmd}
%------------Putcell--------------------------------
-\begin{cmd}{Putcell}{putcell}
+\begin{cmd}{Putcell, Putcellexpr}{putcell}
\itemket{Usage}Putcell(grid name of upper left, grid name of lower right, postion, a string);
\itemket{Description}Table function to put a string at the cell.
\itemket{Details}
@@ -2788,7 +2802,7 @@ Minute movements can be added.
\verb|xL=apply(1..5,20);|\\
\verb|yL=apply(1..2,20);|\\
\verb|rL=["c2r2r3","c5r2r3"];|\\
-\verb|Tabledatalight("",xL,yL,rL);|\\
+\verb|Tabledata(xL,yL,rL);|\\
\verb|Putcell("c0r0","c1r1","c","A");|\\
\verb|Putcell("c1r0","c3r1","l2","B");|\\
\verb|Putcell("c0r1","c2r2","rt","C");|\\
@@ -2799,9 +2813,9 @@ Minute movements can be added.
\end{center}
\end{cmd}
-%----------PutcoL----------------------------------
-\begin{cmd}{PutcoL}{putcoL}
-\itemket{Usage}PutcoL (column number, position, a list of strings);
+%----------Putcol----------------------------------
+\begin{cmd}{Putcol}{putcol}
+\itemket{Usage}Putcol (column number, position, a list of strings);
\itemket{Description}Table function to put strings to a column.
\itemket{Details}
The position is as \verb|Putcell|.\\
@@ -2810,9 +2824,9 @@ Null string is available.
\itemket{Reference} \hyperlink{putrow}{Putrow}.
\end{cmd}
-%--------------PutcoLexpr------------------------------
-\begin{cmd}{PutcoLexpr}{putcoLexpr}
-\itemket{Usage}PutcoLexpr (column number, position, a list of mathematical expressions);
+%--------------Putcolexpr------------------------------
+\begin{cmd}{Putcolexpr}{putcolexpr}
+\itemket{Usage}Putcolexpr (column number, position, a list of mathematical expressions);
\itemket{Description}Table function to put strings to a column.
\itemket{Reference} \hyperlink{putrowexpr}{Putrowexpr}.
\end{cmd}
@@ -2821,7 +2835,7 @@ Null string is available.
\begin{cmd}{Putrow}{putrow}
\itemket{Usage}Putrow (row number, position, a list of strings);
\itemket{Description}Table function to put strings to a row.
-\itemket{Reference} \hyperlink{putcoL}{PutcoL}.
+\itemket{Reference} \hyperlink{putcol}{Putcol}.
\end{cmd}
%--------------Putrowexpr------------------------------
@@ -2830,11 +2844,13 @@ Null string is available.
\itemket{Description}Table function to put strings to a row.
\itemket{Examples}
-In PutcoLexpr (), Putrowexpr (), formulas and general \TeX sentences can be entered.
+In Putcolexpr (), Putrowexpr (), formulas and general \TeX sentences can be entered.
-\verb|Tabledata("",5,3,100,45,["c1r1r2","r1c2c3","r2c2c3"]);|\\
-\verb|PutcoL(3,"c",["A","B","C"]);|\\
-\verb|PutcoLexpr(4,"l",["x^2","y=\sqrt{x^3}"]);|\\
+\verb|xL=apply(1..5,20);|\\
+\verb|xL=apply(1..3,15);|\\
+\verb|Tabledata(xL,yL,["c1r1r2","r1c2c3","r2c2c3"]);|\\
+\verb|Putcol(3,"c",["A","B","C"]);|\\
+\verb|Putcolexpr(4,"l",["x^2","y=\sqrt{x^3}"]);|\\
\verb|Putrow(1,"c",[1,"two"]);|\\
\verb|Putrowexpr(3,"c",["","\frac{\pi}{2}","","","\sum{x^2}"]);|\\
@@ -3331,7 +3347,40 @@ Cindyscript has a function \verb|format(value, number)|, like as Textformat.
%\verb|Windispg();|
\end{cmd}
+%----------Windispg----------------------------------
+\begin{cmd}{Windispg}{windispg}
+\itemket{Usage}Windispg();
+\itemket{Description}Generic function to display all graphs on Euclidean view.
+\itemket{Remark}This command must be put on the final line.
+%\itemket{Examples}\mbox{}
+
+%\verb|Windispg();|
+\end{cmd}
+%----------Fracform----------------------------------
+\begin{cmd}{Fracform}{fracform}
+\itemket{Usage}Fracform(number,list of denominators)
+\itemket{Description}returns Tex-like form of the fraction
+\itemket{Examples}\verb|Fracform(0.33,[2,3]); => fr(1,3)|
+
+\end{cmd}
+
+%----------Totexform----------------------------------
+\begin{cmd}{Totexform}{totexform}
+\itemket{Usage}Totexform(Tex-like form)
+\itemket{Description}returns TeX form
+\itemket{Examples}\verb|Totexform(fr(1,3)); => frac{1}{3}|
+
+\end{cmd}
+
+%----------Totexform----------------------------------
+\begin{cmd}{Tocindyform}{tocindyform}
+\itemket{Usage}Tocindyform(Tex-like form)
+\itemket{Description}returns Cindy form
+\itemket{Examples}\verb|Tocindyform(fr(1,3)); => (1)/(3)|
+\end{cmd}
+
\newpage
+
%==== Calling Other Softwares =========
\section{Calling Other Softwares}
\subsection{R}
@@ -4033,7 +4082,7 @@ When we make the animation, comment out \verb|//mf(C.x);| and click the Anime bu
The animation is continued for 5 seconds with the following options.\\
\verb| Setpara("middle","mf(t)","t=[0,4*pi]",["Div=30"],["Frate=6"]);|\\
-A smooth-looking animation is achieved with the options: \verb|["Div=150"],["Frage=30"]|.
+A smooth-looking animation is achieved with the options: \verb|["Div=150"],["Frate=30"]|.
\end{cmd}
\newpage
@@ -5607,6 +5656,7 @@ Find on the screen (not in the space) intersection points (\verb|tmp_1|, \verb|t
\hyperlink{drwxy}{Drwxy} \> draw axis in the \TeX\ figure.\\
\hyperlink{fontsize}{Fontsize} \> define the font size in the \TeX\ figure.\\
\hyperlink{ketinit}{Ketinit} \> initialize \ketcindy.\\
+\hyperlink{initglist}{Initglist} \> add the list in ketlib slot to that of figures slot.\\
\hyperlink{ptsize}{Ptsize} \> set the size of points.\\
\hyperlink{setarrow}{Setarrow} \> set the style of arrow.\\
\hyperlink{setax}{Setax} \> set the style of axis.\\
@@ -5624,7 +5674,7 @@ Find on the screen (not in the space) intersection points (\verb|tmp_1|, \verb|t
\hyperlink{usegraphics}{Usegraphics} \> change to pict2e.\\
{\bf Drawing} \> \\
-\hyperlink{addgraph}{AddGraph} \> manipulate more than one PD all together.\\
+\hyperlink{drawfigures}{Drawfigures} \> manipulate a plural number of PDs together.\\
\hyperlink{anglemark}{Anglemark} \> draw an angle mark.\\
\hyperlink{setarrow}{Setarrowdata} \> set styles of arrows.\\
\hyperlink{arrowdata}{Arrowdata} \> draw an arrow line between two points.\\
@@ -5720,12 +5770,12 @@ Find on the screen (not in the space) intersection points (\verb|tmp_1|, \verb|t
\hyperlink{changetablestyle}{Changetablestyle} \> change line styles of rules.\\
\hyperlink{findcell}{Findcell} \> return the information of a cell.\\
\hyperlink{putcell}{Putcell} \> put a string at the cell.\\
-\hyperlink{putcoL}{PutcoL} \> put strings to a column.\\
-\hyperlink{putcoLexpr}{PutcoLexpr} \> put strings to a column.\\
+\hyperlink{putcell}{Putcellexpr} \> put a math expression at the cell.\\
+\hyperlink{putcol}{Putcol} \> put strings to a column.\\
+\hyperlink{putcolexpr}{Putcolexpr} \> put math expressions to a column.\\
\hyperlink{putrow}{Putrow} \> put strings to a row.\\
-\hyperlink{putrowexpr}{Putrowexpr} \> put strings to a row.\\
+\hyperlink{putrowexpr}{Putrowexpr} \> put math expressions to a row.\\
\hyperlink{tabledata}{Tabledata} \> draw rules of a table.\\
-\hyperlink{tabledatalight}{Tabledatalight} \> make a table without geometric points.\\
\hyperlink{tgrid}{Tgrid} \> return the coordinates of the grid name.\\
\hyperlink{tlistplot}{Tlistplot} \> connect two lattice points by line segments.\\
@@ -5753,6 +5803,9 @@ Find on the screen (not in the space) intersection points (\verb|tmp_1|, \verb|t
\hyperlink{textformat}{Textformat} \> converts a real number to a string.\\
\hyperlink{toupper}{Toupper} \> return the upper case letters of a string.\\
\hyperlink{windispg}{Windispg} \> display all graphs on Euclidean view.\\
+\hyperlink{fracform}{Fracform} \>return TeX-like form of the fraction.\\
+\hyperlink{totexform}{Totexform} \> return TeX form.\\
+\hyperlink{tocindyform}{Tocindyform} \> return Cindy form.\\
{\bf R} \> \\
\hyperlink{boxplot}{Boxplot} \> draw boxplots.\\
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 26e1fdb5f63..aa8c5bd2346 100644
--- a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/KeTCindyReferenceJ.tex
+++ b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/KeTCindyReferenceJ.tex
@@ -36,21 +36,23 @@
\hypertarget{ketinit}{}
\item[関数]Ketinit(options)
\item[機能]\ketcindy ã‚’åˆæœŸåŒ–ã™ã‚‹ã€‚å¹³é¢å›³å½¢ã§ã¯Drawスロットã«ï¼Œç©ºé–“図形ã§ã¯Initialization スロットã®å†’é ­ã«è¨˜è¿°ã™ã‚‹å¿…è¦ãŒã‚る。
-\item[説明]option 作業サブフォルダ,縦方å‘ã®å€çŽ‡ã¨æ画領域を設定ã™ã‚‹ã€‚\\
-\phantom{option }通常ã¯ä¸è¦ã§ï¼Œ\verb|Ketinit()| ã ã‘ã§ã‚ˆã„。\\
+\item[説明]option 作業サブフォルダ\\%,縦方å‘ã®å€çŽ‡ã¨æ画領域を設定ã™ã‚‹ã€‚\\
+\phantom{option }通常ã¯ä¸è¦ã§ï¼Œ\verb|Ketinit()| ã ã‘ã§ã‚ˆã„。
-ã€ä¾‹ã€‘
-
-\verb|Ketinit()| :サブフォルダ\verb|"fig"|,å€çŽ‡ï¼‘,æ画領域 $-5 \leq x \leq 5 , -5 \leq y \leq 5$
-
-\verb|Ketinit("")| : サブフォルダã¯cindyファイルã¨åŒã˜
-
-\verb|Ketinit(2)| : å€çŽ‡2,æ画領域 $-5 \leq x \leq 5 , -5 \leq y \leq 5$
+\vspace{\baselineskip}
+\hypertarget{Initglist}{}
+\item[関数]Initglist(), Setglist(), Addglist()
+\item[機能]ketlibスロットã§ä½œã‚‰ã‚Œã‚‹æ画データをæ画リストã«è¿½åŠ ã™ã‚‹ã€‚
+\item[説明]Implicitplot,Hatchdataãªã©å®Ÿè¡Œæ™‚é–“ã®ã‹ã‹ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã‚’figuresスロットã«ãŠãã¨ï¼Œãã®éƒ½åº¦å®Ÿè¡Œã•ã‚Œã¦ã—ã¾ã†ã€‚ãれをé¿ã‘ã‚‹ãŸã‚ketlibスロットã«ãŠã„ãŸã¨ãã«ç”¨ã„る。
-\verb|Ketinit(2,[-2,3],[-2,4])| : å€çŽ‡2,æ画領域 $-2 \leq x \leq 3 , -2 \leq y \leq 4$
+\begin{verbatim}
+ Initglist(); // ketlibスロットã§
+ Implicitplot(''1'',fun,rng);
+ Setglist();
-\vspace{\baselineskip}
-æ画領域(TeXã«å‡ºåŠ›ã™ã‚‹é ˜åŸŸ)ã¯åˆ¶å¾¡ç‚¹SW(左下)ã¨NE(å³ä¸Šï¼‰ã‚’対角ã¨ã™ã‚‹çŸ©å½¢é ˜åŸŸã€‚æ画領域を指定ã™ã‚‹ã¨ï¼Œåˆ¶å¾¡ç‚¹ãŒãªã‘ã‚Œã°ãã®ä½ç½®ã«ä½œã‚Šï¼Œã™ã§ã«å­˜åœ¨ã™ã‚‹å ´åˆã¯ä½•ã‚‚ã—ãªã„。作æˆã•ã‚ŒãŸåˆ¶å¾¡ç‚¹ã¯ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦æ画領域を変更ã™ã‚‹ã“ã¨ãŒã§ãる。å€çŽ‡ã¯ï¼ŒSetscaling(å€çŽ‡)を実行ã™ã‚‹ã®ã¨åŒã˜ã€‚ãŸã ã—,Cinderellaã§ä½œå›³ã—ãŸå¹¾ä½•è¦ç´ ã«å¯¾ã—ã¦ã¯ç„¡åŠ¹ã€‚(\hyperlink{setscaling}{Setscaling()}ã®é …å‚ç…§)
+ Ketinit(); // figuresスロットã§
+ Addglist();
+\end{verbatim}
\vspace{\baselineskip}
\hypertarget{setfiles}{}
@@ -341,7 +343,7 @@ Deffun("f(x)",["regional y","if(x>1,y=1,if(x>-1,y=x,y=-1))","y"]);
\item[関数]Fontsize(記å·)
\item[機能]フォントサイズを設定ã™ã‚‹
\item[説明]次㫠Fontsize() を実行ã™ã‚‹ã¾ã§æœ‰åŠ¹\\
-記å·ã¯ï¼Œ"t" , "ss" , "f", "s" , "n" , "la","La", "LA", "h" , "H"\\
+記å·ã¯ï¼Œ"t" , "ss" , "f", "s" , "n" , "la","La", "LA", "h" , "H"
ã€ä¾‹ã€‘作図ツールã®ã€Œç‚¹ã‚’加ãˆã‚‹ã€ã§ï¼ŒA〜Gã®ç‚¹ã‚’ã¨ã£ã¦ãŠã。å°ã•ã„æ–¹ã‹ã‚‰ã„ãã¤ã‹è¡¨ç¤ºã™ã‚‹ã€‚
\begin{verbatim}
@@ -382,6 +384,9 @@ Pointdata("4",D,["Size=4"]);
\end{verbatim}
%\hspace{10mm}\input{Fig/pointsize}
+
+\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+
\hypertarget{setarrow}{}
\item[関数]Setarrow(size,angle,position,cut,segstyle)
\item[機能]矢線ã®å½¢çŠ¶ã®è¨­å®šã‚’ã™ã‚‹ã€‚
@@ -466,8 +471,6 @@ Listplot([A,B]);
Listplot("1",[[0,0],[2,2]]);
\end{verbatim}
-\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
-
\vspace{\baselineskip}
\hypertarget{setunitlen}{}
\item[関数]Setunitlen(文字列)
@@ -479,8 +482,8 @@ Listplot("1",[[0,0],[2,2]]);
\vspace{\baselineskip}
\hypertarget{setwindow}{}
-\item[関数]Setwindow()
-\item[機能]出力ã™ã‚‹æ画領域を設定ã™ã‚‹
+\item[関数]Setwindow(xã®ç¯„囲, yã®ç¯„囲)
+\item[機能]出力ã™ã‚‹æ画領域を設定ã™ã‚‹ã€‚
\item[説明]出力ã™ã‚‹æ画領域ã¯ï¼Œé€šå¸¸ã¯2点SWã¨NEを対角ã¨ã™ã‚‹çŸ©å½¢é ˜åŸŸã§ã‚る。
ã“ã®2点をドラッグã™ã‚‹ã“ã¨ã«ã‚ˆã‚Šãƒ“ジュアルã«æ画領域を決ã‚られる。
@@ -489,11 +492,17 @@ Listplot("1",[[0,0],[2,2]]);
ã¾ãŸï¼Œè¡¨ã‚’作æˆã—ãŸã¨ãã¯ï¼Œè¡¨ã®ç¯„囲ãŒå‡ºåŠ›ç¯„囲ã¨ã—ã¦å„ªå…ˆã•ã‚Œã‚‹ï¼ˆTabledata()を実行ã—ãŸã¨ã)ã®ã§ï¼Œè¡¨å¤–ã«å›³ã‚’æã„ãŸå ´åˆã¯ï¼Œæœ€å¾Œã«ã“ã®é–¢æ•°ã§å‡ºåŠ›ç¯„囲を指定ã—ã¦æ›¸ã出ã™ã€‚
+\vspace{\baselineskip}
+ã€ä¾‹ã€‘\verb|Setwindow([-5,5],[-1,3]);|
+
+\vspace{\baselineskip}
+\hspace{10mm}\includegraphics[bb=0.00 0.00 415.02 199.01,width=6cm]{Fig/setwindow.pdf}
+
\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
\end{description}
-\newpage
+%\newpage
%ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ æç”» ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼
\subsection{æç”»}
\subsubsection{書å¼ã¨ã‚ªãƒ—ション}
@@ -709,7 +718,7 @@ Pointdata("1",[P,Q,R],["size=4"]);
\vspace{\baselineskip}
\hypertarget{putoncurve}{}
-\item[関数]PutonCurve(点ã®åå‰, プロットデータ, options)
+\item[関数]Putoncurve(点ã®åå‰, プロットデータ, options)
\item[機能]曲線上ã«ç‚¹ã‚’ä¹—ã›ã‚‹ã€‚
\item[説明]点ãŒå­˜åœ¨ã—ãªã„å ´åˆã¯æ–°ãŸã«ä½œã‚‹ã€‚ã™ã§ã«ãã®ç‚¹ãŒå­˜åœ¨ã™ã‚‹å ´åˆã¯ï¼Œãã®ç‚¹ã®$x$座標を使ã†ã€‚åˆæœŸå€¤ã®$x$座標㮠åˆæœŸè¨­å®šã¯ 0。
@@ -719,28 +728,28 @@ optionsã¯ï¼Œ$x$座標ã®ç¯„囲をリストã§ä¸Žãˆã‚‹ã€‚
ã€ä¾‹ã€‘アステロイド上ã®å‹•ç‚¹P ã‚’ã¨ã‚‹ã€‚
\begin{verbatim}
Paramplot("1","[2*cos(t)^3,2*sin(t)^3]","t=[0,2*pi]");
-PutonCurve("P","gp1",[-1,1]);
+Putoncurve("P","gp1",[-1,1]);
\end{verbatim}
点PãŒã‚¢ã‚¹ãƒ†ãƒ­ã‚¤ãƒ‰ä¸Šã«ã§ã,ã“ã®ç‚¹ã¯ãƒ‰ãƒ©ãƒƒã‚°ã™ã‚‹ã¨ã‚¢ã‚¹ãƒ†ãƒ­ã‚¤ãƒ‰ä¸Šã‚’ $-1 \leq x\leq 1$ ã®ç¯„囲ã§å‹•ã‹ã™ã“ã¨ãŒã§ãる。ãŸã ã—,-1,1ã®ä»˜è¿‘ã¯y座標ã®åˆ¤æ–­ã®é–¢ä¿‚ã§ã´ã£ãŸã‚Šã¯ã„ã‹ãªã„。
- \begin{center} \input{Fig/putoncurve.tex} \end{center}
+ \begin{center} \scalebox{0.9}{\input{Fig/putoncurve.tex}} \end{center}
-%\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
-\vspace{\baselineskip}
+%\vspace{\baselineskip}
\hypertarget{putonline}{}
-\item[関数]PutonLine(点å , 座標1 ,座標2 )
+\item[関数]Putonline(点å , 座標1 ,座標2 )
\item[機能]直線上ã«ç‚¹ã‚’作る
\item[説明]座標1,座標2を通る直線上ã«ç‚¹åã®ç‚¹ã‚’作る。ã§ããŸç‚¹ã¯ç›´ç·šã«å¯¾ã—ã¦ã‚¤ãƒ³ã‚·ãƒ‡ãƒ³ãƒˆã¨ãªã‚‹ã€‚
\vspace{\baselineskip}
ã€ä¾‹ã€‘点A,\ Bを通る直線上ã«ç‚¹Pã‚’ã¨ã‚‹ã€‚
-\verb|PutonLine("P",A,B);|
+\verb|Putonline("P",A,B);|
\vspace{\baselineskip}
\hypertarget{putonseg}{}
-\item[関数]PutonSeg(点å , 座標1 ,座標2 )
+\item[関数]Putonseg(点å , 座標1 ,座標2 )
\item[機能]線分上ã«ç‚¹ã‚’作る
\item[説明]座標1,座標2を端点ã¨ã™ã‚‹ç·šåˆ†ä¸Šã«ç‚¹åã®ç‚¹ã‚’作る。ã§ããŸç‚¹ã¯ç·šåˆ†ã«å¯¾ã—ã¦ã‚¤ãƒ³ã‚·ãƒ‡ãƒ³ãƒˆã¨ãªã‚‹ã€‚指定ã—ãŸç‚¹ãŒã™ã§ã«å­˜åœ¨ã™ã‚‹å ´åˆã¯å‹•ã‹ã•ãªã„。
@@ -749,13 +758,11 @@ PutonCurve("P","gp1",[-1,1]);
線分AB上ã«ç‚¹Cã‚’ã¨ã‚‹ã€‚
- \verb|PutonSeg("C",A,B);|
+ \verb|Putonseg("C",A,B);|
点(-1,0),(2,2)を通る線分上ã«ç‚¹Cã‚’ã¨ã‚‹ã€‚
- \verb|PutonSeg("C",[[-1,0],[2,2]]);|
-
-\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+ \verb|Putonseg("C",[[-1,0],[2,2]]);|
\vspace{\baselineskip}
\hypertarget{reflectpoint}{}
@@ -1248,7 +1255,8 @@ ptiã¯ï¼Œå„頂点ã«å¯¾å¿œã™ã‚‹è¤‡ç´ æ•°ã®ãƒªã‚¹ãƒˆï¼ŒptãŒå„頂点ã®åº§æ¨™
\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
\end{description}
-\newpage
+%\newpage
+
% ====== 曲線 ==============
\subsubsection{曲線}
\begin{description}
@@ -1271,7 +1279,7 @@ ptiã¯ï¼Œå„頂点ã«å¯¾å¿œã™ã‚‹è¤‡ç´ æ•°ã®ãƒªã‚¹ãƒˆï¼ŒptãŒå„頂点ã®åº§æ¨™
2次ベジェ曲線
-Bezier("1",[A,B],[C]);
+\verb|Bezier("1",[A,B],[C]);|
\vspace{20mm}
@@ -1281,7 +1289,7 @@ Bezier("1",[A,B],[C]);
3次ベジェ曲線
-Bezier("2",[A,B],[C,D]);
+\verb|Bezier("2",[A,B],[C,D]);|
\vspace{20mm}
@@ -1302,13 +1310,14 @@ Bezier("2",[A,B],[C,D]);
%D,B,E を1直線上ã«ã¨ã‚‹ã¨ï¼Œæ»‘らã‹ã«ã¤ãªãŒã‚‹
節点を増やã™ã€‚2次ã¨3次。
-Bezier("3",[A,B,C],[[D],[E,F]]);
+\verb|Bezier("3",[A,B,C],[[D],[E,F]]);|
\vspace{20mm}
-å…¨ã¦åŒã˜æ¬¡æ•°ã®å ´åˆï¼Œæ¬¡ã®ã‚ˆã†ã«ã—ã¦ã‚‚よã„.
+å…¨ã¦åŒã˜æ¬¡æ•°ã®å ´åˆï¼Œæ¬¡ã®ã‚ˆã†ã«ã—ã¦ã‚‚よã„。
+\newpage
-Bezier("4", [A,B,C,D], [E,F,G,H,K,L] );
+\verb|Bezier("4",[A,B,C,D],[E,F,G,H,K,L] ); |
\begin{layer}{150}{0}
\putnotese{20}{2}{\input{Fig/checkbe7}}
@@ -1318,17 +1327,17 @@ Bezier("4", [A,B,C,D], [E,F,G,H,K,L] );
オプションã®ä¾‹
-Bezier("5",[A,B,C],[[D],[E,F]],["Num=3"]);
+\verb|Bezier("5",[A,B,C],[[D],[E,F]],["Num=3"]);|
\hspace{20mm}\input{Fig/checkbe5}
-Bezier("6",[A,B,C],[[D],[E,F]],["Num=40","da"]);
+\verb|Bezier("6",[A,B,C],[[D],[E,F]],["Num=40","da"]);|
\hspace{20mm}\input{Fig/checkbe6}
Numを(ベクトルã¨ã—ã¦ï¼‰åŒºé–“ã”ã¨ã«ä¸Žãˆã‚‹ã“ã¨ã‚‚ã§ãる。
-Bezier("1", [A,B,C,D], [E,F,G,H,K,L] , [ "Num=[2,3,4]"]);
+\verb|Bezier("1",[A,B,C,D],[E,F,G,H,K,L],["Num=[2,3,4]"]);|
\hspace{10mm} \input{Fig/checkbe8}
@@ -1344,22 +1353,22 @@ Bezier("1", [A,B,C,D], [E,F,G,H,K,L] , [ "Num=[2,3,4]"]);
\vspace{\baselineskip}
ã€ä¾‹ã€‘
+\verb|Beziersmooth("1",[A,B,C,D]);|
+
\begin{layer}{150}{0}
-\putnotese{70}{25}{bz1}
-\putnotese{40}{-5}{ \input{Fig/checksm1}}
+\putnotese{70}{35}{bz1}
+\putnotese{40}{5}{ \input{Fig/checksm1}}
\end{layer}
-Beziersmooth("1",[A,B,C,D]);
-
-\vspace{20mm}
+\vspace{40mm}
ãã®å¾Œï¼Œç¯€ç‚¹ã‚„制御点を動ã‹ã—ã¦ï¼ŒæããŸã„ã‚‚ã®ã«ã™ã‚‹ã€‚ãŸã ã—,C2p 㯠C1q 㨠B を通る直線上ã—ã‹å‹•ã‘ãªã„。C3p 㯠C2q 㨠C を通る直線上ã—ã‹å‹•ã‘ãªã„。
\begin{layer}{150}{0}
-\putnotese{70}{35}{bz1}
-\putnotese{40}{10}{ \input{Fig/checksm2}}
+\putnotese{70}{30}{bz1}
+\putnotese{40}{05}{ \input{Fig/checksm2}}
\end{layer}
-\vspace{40mm}
+\vspace{35mm}
\vspace{\baselineskip}
\hypertarget{beziersym}{}
@@ -1368,23 +1377,30 @@ Beziersmooth("1",[A,B,C,D]);
\item[説明]節点をã¯ã•ã‚€åˆ¶å¾¡ç‚¹ã¯ç¯€ç‚¹ã«é–¢ã—対称(片方ã¯è¡¨ç¤ºã•ã‚Œãšï¼Œå‹•ã‹ã›ãªã„)。
制御点ã¯è‡ªå‹•çš„ã«é…ç½®ã•ã‚Œã‚‹ã€‚ãã®å¾Œï¼Œç¯€ç‚¹ã‚„制御点を動ã‹ã—ã¦æããŸã„ã‚‚ã®ã«ã™ã‚‹ã€‚
+\vspace{\baselineskip}
ã€ä¾‹ã€‘
\begin{layer}{150}{0}
-\putnotese{70}{20}{bz1}
-\putnotese{40}{10}{ \input{Fig/checksy1}}
-\putnotese{0}{5}{Beziersym("1",[A,B,C,D]);}
-\putnotese{0}{15}{C2p 㨠C3p ã¯è¡¨ç¤ºã•ã‚Œãªã„}
+\putnotese{70}{27}{bz1}
+\putnotese{40}{00}{ \input{Fig/checksy1}}
+%\putnotese{0}{0}{Beziersym("1",[A,B,C,D]);}
+%\putnotese{0}{15}{C2p 㨠C3p ã¯è¡¨ç¤ºã•ã‚Œãªã„}
\end{layer}
-\vspace{50mm}
+\verb|Beziersym("1",[A,B,C,D]);|
+
+C2p 㨠C3p ã¯è¡¨ç¤ºã•ã‚Œãªã„
+
+\vspace{25mm}
ãã®å¾Œï¼Œç¯€ç‚¹ã‚„制御点を動ã‹ã—ã¦ï¼ŒæããŸã„ã‚‚ã®ã«ã™ã‚‹ã€‚
C2p 㨠C3p ã¯è¡¨ç¤ºã•ã‚Œãšï¼Œå‹•ã‹ã›ãªã„。
+
\begin{center} \input{Fig/checksy2} \end{center}
-\vspace{\baselineskip}
+\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+%\vspace{\baselineskip}
\hypertarget{mkbeziercrv}{}
\item[関数]Mkbeziercrv(åå‰, [節点リスト,制御点リスト] ã®ãƒªã‚¹ãƒˆ,options )
\item[機能]複数ã®ãƒ™ã‚¸ã‚§æ›²ç·šã‚’æã
@@ -1395,9 +1411,8 @@ C2p 㨠C3p ã¯è¡¨ç¤ºã•ã‚Œãšï¼Œå‹•ã‹ã›ãªã„。
\verb|Mkbeziercrv("5",[[[A,B,C],[[D],[E,F]]],[[G,H,K,L],[[M],[N,O],[P]]]]);|
- \input{Fig/checkmc1}
+ \scalebox{0.95}{\input{Fig/checkmc1}}
-%\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
\vspace{\baselineskip}
\hypertarget{mkbezierptcrv}{}
\item[関数]Mkbezierptcrv(節点リストptlist,[オプション] )
@@ -1410,42 +1425,41 @@ C2p 㨠C3p ã¯è¡¨ç¤ºã•ã‚Œãšï¼Œå‹•ã‹ã›ãªã„。
オプション
-"Deg=...â€æ¬¡æ•°æŒ‡å®šãŒã§ãる。( åˆæœŸè¨­å®šã¯3次)
+\verb|"Deg=..."| 次数指定ãŒã§ãる。(åˆæœŸè¨­å®šã¯3次)
-"Num=..."å„区間ã®åŒºé–“数(分点数ー1)を指定ã§ãる。( åˆæœŸè¨­å®šã¯10)
+\verb|"Num=..."| å„区間ã®åŒºé–“数(分点数$-1$)を指定ã§ãる。(åˆæœŸè¨­å®šã¯10)
-\vspace{5mm}
+\vspace{\baselineskip}
ã€ä¾‹ã€‘
\begin{layer}{150}{0}
-\putnotese{50}{15}{bzA}
-\putnotese{50}{-5}{ \input{Fig/checkb8}}
+\putnotese{70}{25}{bzA}
+\putnotese{40}{-5}{ \input{Fig/checkb8}}
\end{layer}
\verb|Mkbezierptcrv([A,B,C]);|
-\vspace{25mm}
+\vspace{23mm}
+
+ãã®å¾Œï¼Œç¯€ç‚¹ã‚„制御点を動ã‹ã—ã¦ï¼Œ\par
+æããŸã„ã‚‚ã®ã«ã™ã‚‹ã€‚
\begin{layer}{150}{0}
-\putnotese{50}{15}{bzA}
-\putnotese{60}{-10}{ \input{Fig/checkb11}}
+\putnotese{70}{25}{bzA}
+\putnotese{55}{-15}{ \input{Fig/checkb11}}
\end{layer}
-ãã®å¾Œï¼Œç¯€ç‚¹ã‚„制御点を動ã‹ã—ã¦ï¼Œ
-
-æããŸã„ã‚‚ã®ã«ã™ã‚‹ã€‚
-
-\vspace{30mm}
+\vspace{35mm}
\begin{layer}{150}{0}
-\putnotese{80}{25}{bzA}
-\putnotese{50}{-5}{\input{Fig/checkb9}}
+\putnotese{70}{28}{bzA}
+\putnotese{50}{-3}{\input{Fig/checkb9}}
\end{layer}
\verb|Mkbezierptcrv([A,B,C],["Deg=2"]);|
-Deg=2 ã¨ã™ã‚‹ã¨2次ã«ãªã‚‹ã€‚
+\verb|Deg=2| ã¨ã™ã‚‹ã¨2次ã«ãªã‚‹ã€‚
制御点ã¯å„区間ã«ï¼‘個ãšã¤ã§ãる。
@@ -1501,10 +1515,13 @@ Deg=2 ã¨ã™ã‚‹ã¨2次ã«ãªã‚‹ã€‚
\verb|size ->n|:ç”»é¢ä¸Šã§ã®ç·šã®å¤ªã•ã‚’指定ã™ã‚‹ã€‚
+\vspace{\baselineskip}
ã€ä¾‹ã€‘\verb|CRspline("1",[A,B,C,D]);|
\hspace{20mm} \input{Fig/checkCR}
+%\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+
\vspace{\baselineskip}
\hypertarget{ospline}{}
\item[関数]Ospline(åå‰ï¼Œåˆ¶å¾¡ç‚¹ãƒªã‚¹ãƒˆï¼Œ[オプション] )
@@ -1526,7 +1543,7 @@ Deg=2 ã¨ã™ã‚‹ã¨2次ã«ãªã‚‹ã€‚
\hypertarget{circledata}{}
\item[関数]Circledata(name,リスト,options)
\item[機能]円ã¾ãŸã¯å¤šè§’形をæã。
-\item[説明]中心ã®ç‚¹ã¨ï¼Œå††å‘¨ä¸Šã®1点,ã¾ãŸã¯3点をリストã§ä¸Žãˆã¦å††ã‚’æã。
+\item[説明]中心ã®ç‚¹ã¨ï¼Œå††å‘¨ä¸Šã®1点(ã‹åŠå¾„),ã¾ãŸã¯3点をリストã§ä¸Žãˆã¦å††ã‚’æã。
中心ã¨å††å‘¨ä¸Šã®ç‚¹ã‚’,座標ã§ã¯ãªã幾何è¦ç´ åã§æŒ‡å®šã™ã‚‹å ´åˆã¯ name ã¯çœç•¥å¯ã€‚
@@ -1542,13 +1559,17 @@ optionsã¯ä»¥ä¸‹ã®ã‚‚ã®ã‚’リストã§ä¸Žãˆã‚‹ã€‚çœç•¥ã—ãŸå ´åˆã¯å®Ÿç·šã
ã€ä¾‹ã€‘ã„ã‚ã„ã‚ãªå††ã‚’æã。\\
\>原点中心,åŠå¾„2ã®å††\> \verb|Circledata("1",[[0,0],[2,0]]);|\\
+ \hspace{50mm}(\verb|[[0,0],2]|ã§ã‚‚よã„)\\
\>A中心,åŠå¾„ABã®å††\> \verb|Circledata([A,B]);|\\
\>A中心,åŠå¾„2ã®å††\> \verb|Circledata("1",[A,A+[2,0]]);|\\
+ \hspace{50mm}(\verb|[A,2]|ã§ã‚‚よã„)\\
\>3点A,B,Cを通る円\> \verb|Circledata([A,B,C]);|\\
\>下図左より,オプション㫠"dr,2" , "da" , "do" ã‚’ã¤ã‘ãŸå ´åˆã€‚
\end{tabbing}
\hspace{10mm} \input{Fig/circledata1}
-\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+\vspace{\baselineskip}
+
+%\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
\verb|Circledata([A,B,C]);| ã§ï¼Œ3点A,B,Cを通る円をæã„ãŸã¨ã,ã§ããŸå††ã®ä¸­å¿ƒã¯ \verb|Pointdata("1",[crABCcenter]);| ã§ä½œå›³ã§ãる。
@@ -1604,6 +1625,8 @@ Circledata("2",[A,B],["Num=6"]);
\item[機能]ã™ã¹ã¦ã®å¹¾ä½•å††ã®PD を作æˆ
\item[説明]Cinderellaã®ã€Œå††ã‚’加ãˆã‚‹ã€ãƒ„ール(3種類ã„ãšã‚Œã§ã‚‚)ã§æã„ãŸã™ã¹ã¦ã®å††ã‚’ãã®ã¾ã¾ãƒ—ロットデータã¨ã™ã‚‹ã€‚ãŸã¨ãˆã°ï¼Œä¸­å¿ƒA,円周上ã®ç‚¹ã‚’Bã¨ã—ãŸå††ã‚’作るã¨ï¼Œãƒ—ロットデータcrABãŒä½œæˆã•ã‚Œã‚‹ã€‚ãã®å¾Œï¼Œã‚¤ãƒ³ã‚¹ãƒšã‚¯ã‚¿ã§ç‚¹Bã®è­˜åˆ¥åを変更(ãŸã¨ãˆã°Qã«ï¼‰ã™ã‚‹ã¨ï¼Œãƒ—ロットデータåも変更ã•ã‚Œã‚‹ã€‚円ã¯ã™ã§ã«æã‹ã‚Œã¦ã„ã¦ã‚‚よã„。
+\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+
\vspace{\baselineskip}
\hypertarget{ellipseplot}{}
\item[関数]Ellipseplot(name,点リスト ,定義域, options)
@@ -1637,6 +1660,7 @@ Circledata("2",[A,B],["Num=6"]);
「点を加ãˆã‚‹ã€ãƒ„ールを用ã„ã¦ï¼ŒæŽ¥ç·šï¼Œæ³•ç·šä¸Šã«é©å½“ã«ç‚¹ã‚’å–る。(D,Eã¨ãªã£ãŸã¨ã™ã‚‹)
次ã®ã‚¹ã‚¯ãƒªãƒ—トを書ã„ã¦å®Ÿè¡Œã™ã‚‹ã¨ï¼Œæ¥•å††ã«é–¢ã—ã¦å…¥å°„角ã¨å射角ãŒç­‰ã—ããªã‚‹ã‚ˆã†ã«å…‰ãŒåå°„ã™ã‚‹æ§˜å­ã‚’図ã«ã™ã‚‹ã“ã¨ãŒã§ãる。
+\newpage
\vspace{\baselineskip}
\begin{layer}{150}{0}
@@ -1867,8 +1891,9 @@ Pointdata(text(s+3),[s+1,s],["Inside=0","Size=3"]);
);
\end{verbatim}
-\hspace{40mm}\input{Fig/plotdata5}
-ãªãŠï¼Œã“ã“ã§ï¼ŒPointdata() ã®name ã‚’ text(s+3) ã¨ã—ã¦ã„ã‚‹ã®ã¯ï¼Œs㌠-2 ã‹ã‚‰å§‹ã¾ã‚‹ã®ã§ï¼Œname ã¯1ã‹ã‚‰å§‹ã¾ã‚‹ã‚ˆã†ã«ã™ã‚‹ãŸã‚ã§ã‚る。name ã«è² ã®æ•°ã¯ä½¿ãˆãªã„ã®ã§ã€‚
+\hspace{45mm}\input{Fig/plotdata5}
+
+ãªãŠï¼Œã“ã“ã§ï¼ŒPointdata() ã®name ã‚’ \verb|text(s+3)| ã¨ã—ã¦ã„ã‚‹ã®ã¯ï¼Œs ㌠$-2$ ã‹ã‚‰å§‹ã¾ã‚‹ã®ã§ï¼Œè² ã®æ•°ãŒä½¿ãˆãªã„ name ã‚’ $1$ ã‹ã‚‰å§‹ã¾ã‚‹ã‚ˆã†ã«ã™ã‚‹ãŸã‚ã§ã‚る。
\vspace{\baselineskip}
関数ã«æ–‡å­—ä¿‚æ•°ãŒã¤ã„ã¦ãŠã‚Šï¼Œæ–‡å­—ä¿‚æ•°ã®å€¤ã‚’変化ã•ã›ãªãŒã‚‰ã‚°ãƒ©ãƒ•ã‚’æãã«ã¯ï¼ŒAssign を使ã†ã‹ï¼ŒDefvar ã§å¤‰æ•°ã‚’定義ã™ã‚‹ã€‚
@@ -1995,7 +2020,7 @@ Paramplot("4","[2*cos(t)+10,sin(t)]","t=[0,2*pi]",["do"]);
\vspace{\baselineskip}
ã€ä¾‹ã€‘カージオイド曲線をæã。
-\hspace{20mm}\verb|Polarplot("1","2*(1+cos(t))","t=[0,2*pi]",["Num=200"]);|
+\hspace{10mm}\verb|Polarplot("1","2*(1+cos(t))","t=[0,2*pi]",["Num=200"]);|
\vspace{\baselineskip}
\begin{center}\scalebox{0.7}{\input{Fig/cardioid1}}\end{center}
@@ -2114,7 +2139,7 @@ text(L.x*(log(L.x)-1)-G.x*(log(G.x)-1)) ]);
\vspace{\baselineskip}
\begin{center} \input{Fig/intlog}\end{center}
-\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+%\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
\vspace{\baselineskip}
\hypertarget{exprrot}{}
@@ -2138,6 +2163,8 @@ Exprrot(C,B-A,"\frac{2}{3}");
\vspace{\baselineskip}
\hspace{10mm}\includegraphics[bb=0.00 0.00 181.01 131.01,width=4cm]{Fig/exprrot.pdf} \hspace{10mm} \input{Fig/exprrot}
+\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+
\vspace{\baselineskip}
\hypertarget{letter}{}\item[関数]Letter([ä½ç½®, æ–¹å‘, 文字列],option)
\item[機能]文字列を表示ã™ã‚‹
@@ -2300,7 +2327,7 @@ optionsã¯ï¼Œ[曲ãŒã‚Š , 空白サイズ, 文字, 線種]
\vspace{\baselineskip}
\begin{layer}{150}{0}
-\putnotese{85}{5}{ \input{Fig/bowdata}}
+\putnotese{85}{0}{ \input{Fig/bowdata}}
\end{layer}
ã€ä¾‹ã€‘三角形ABCã®å„辺ã«å¼“形マークをã¤ã‘記å·ã‚’入れる。
@@ -2424,41 +2451,73 @@ Framedata("1",[A,B],["corner"]);
Rulerscale(A,["r",0,5,1],["f",1,"d1",3,"d2"]);
\end{verbatim}
\begin{center}\scalebox{0.9}{ \input{Fig/ruler}} \end{center}
-\vspace{\baselineskip}
-%\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+%\vspace{\baselineskip}
+\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
\end{description}
-\newpage
+%\newpage
+
%ï¼ï¼ãƒ—ロットデータã®æ“作ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼
\subsection{プロットデータã®æ“作}
\begin{description}
-\hypertarget{addgraph}{}
-\item[関数]AddGraph(name ,プロットデータã®ãƒªã‚¹ãƒˆ,option)
-\item[機能]複数ã®ãƒ—ロットデータをã¾ã¨ã‚ã‚‹
-\item[説明]複数ã®ãƒ—ロットデータをã¾ã¨ã‚ã¦æ‰±ã†ã€‚ãŸã¨ãˆã°ï¼Œå††ã¨ï¼Œå††å‘¨ä¸Šã®ç‚¹ã®2ã¤ã®ãƒ—ロットデータをã¾ã¨ã‚ã¦æ‰±ãˆã°ï¼Œå¹³è¡Œç§»å‹•ã‚„回転ã§ï¼Œãれらã®ãƒ—ロットデータをã¾ã¨ã‚ã¦å¹³è¡Œç§»å‹•ã‚„回転ãŒã§ãる。Joincrvs()ã§ã¯ï¼Œãƒ—ロットデータをã¤ãªã’ã¦ï¼‘ã¤ã®ãƒ—ロットデータã«ã™ã‚‹ãŒï¼ŒAddGraph()ã§ã¯ï¼Œãã‚Œãžã‚Œã®ãƒ—ロットデータã‹ã‚‰ãªã‚‹ãƒªã‚¹ãƒˆï¼ˆãƒªã‚¹ãƒˆã®ãƒªã‚¹ãƒˆï¼‰ã«ã™ã‚‹ã€‚(プロットデータã¯åº§æ¨™ã®ãƒªã‚¹ãƒˆã§ã‚る)
+\hypertarget{drawfigures}{}
+\item[関数]Drawfigures(or Drwfigs)(name ,データリスト,オプションリスト)
+\item[機能]複数ã®ãƒ—ロットデータã®ã‚¹ã‚¿ã‚¤ãƒ«ï¼ˆã‚ªãƒ—ション)をリストã§ä¸Žãˆã¦æç”»ã™ã‚‹
+\item[説明]複数ã®ãƒ—ロットデータをã¾ã¨ã‚ã¦æ‰±ã†ã€‚ãŸã¨ãˆã°ï¼Œå††ã¨ï¼Œå††å‘¨ä¸Šã®ç‚¹ã®2ã¤ã®ãƒ—ロットデータをã¾ã¨ã‚ã¦æ‰±ãˆã°ï¼Œå¹³è¡Œç§»å‹•ã‚„回転ã§ï¼Œãれらã®ãƒ—ロットデータをã¾ã¨ã‚ã¦å¹³è¡Œç§»å‹•ã‚„回転ãŒã§ãる。%Joincrvs()ã§ã¯ï¼Œãƒ—ロットデータをã¤ãªã’ã¦ï¼‘ã¤ã®ãƒ—ロットデータã«ã™ã‚‹ãŒï¼ŒAddgraph()ã§ã¯ï¼Œãã‚Œãžã‚Œã®ãƒ—ロットデータã‹ã‚‰ãªã‚‹ãƒªã‚¹ãƒˆï¼ˆãƒªã‚¹ãƒˆã®ãƒªã‚¹ãƒˆï¼‰ã«ã™ã‚‹ã€‚(プロットデータã¯åº§æ¨™ã®ãƒªã‚¹ãƒˆã§ã‚る)
-引数ã«ã¯ï¼Œãƒ—ロットデータåを文字列化ã—ã¦æ¸¡ã™ã€‚ãŸã¨ãˆã°ï¼Œå††ã®ãƒ—ロットデータ㌠cr1 ã®ã¨ã,"cr1" ã¨ã™ã‚‹ã€‚
+%引数ã«ã¯ï¼Œãƒ—ロットデータåを文字列化ã—ã¦æ¸¡ã™ã€‚ãŸã¨ãˆã°ï¼Œå††ã®ãƒ—ロットデータ㌠cr1 ã®ã¨ã,"cr1" ã¨ã™ã‚‹ã€‚
\vspace{\baselineskip}
ã€ä¾‹ã€‘サイクロイドã®å›³ã‚’æã。
\begin{verbatim}
-Setpt(3);
-Circledata("1",[[0,1],[0,0]]);
-Pointdata("1",[0,0]);
-AddGraph("1",["[pt1]","cr1"],["nodisp"]);
+opcr=["dr"];
+oppt=["Size=2","Color=red"];
+Circledata("1",[[0,1],[0,0]],opcr);
+Pointdata("1",[0,0],oppt);
+ad1=["cr1","pt1"];
+dt=2*pi/32;
+opcr=["dr,0.3"];
nn=32;
forall(1..nn,
-t=2*pi/nn*#;
-Rotatedata(text(#),"ad1",-t,[[0,1],"nodisp"]);
-Translatedata(text(#),"rt"+text(#),[t,0],["dr,0.3"]);
+ t=dt*#;
+ Rotatedata(2,ad1,-t,[[0,1],"nodisp"]);
+ Translatedata(2,"rt2",[t,0],["nodisp"]);
+ Drawfigures(text(#),["tr2_1","tr2_2"],[opcr,oppt]);
);
\end{verbatim}
\vspace{\baselineskip}
-\hspace{20mm} \input{Fig/addgraph}
+\hspace{20mm} \input{Fig/drawfigures1}
-ã“ã“ã§ï¼ŒAddGraph()ã®å¼•æ•°ã«ä¸Žãˆã‚‹ãƒ—ロットデータã®ãƒªã‚¹ãƒˆã§ï¼Œç‚¹ã®ãƒ—ロットデータ pt1 ã‚’"[pt1]" ã¨ã—ã¦ã„ã‚‹ã“ã¨ã«æ³¨æ„。円ã®ãƒ—ロットデータãŒï¼Œç‚¹ã®åº§æ¨™ã®ãƒªã‚¹ãƒˆã§ã‚ã‚‹ã®ã«å¯¾ã—,点ã®ãƒ—ロットデータã¯ä¸€ã¤ã®åº§æ¨™ã ã‘ãªã®ã§ï¼Œã“ã®ã‚ˆã†ã«ã—ã¦ãƒªã‚¹ãƒˆåŒ–ã—ã¦æ¸¡ã™ã€‚
+最åˆã«ï¼Œã¾ã¨ã‚ã¦å¹³è¡Œç§»å‹•ã‚„回転をã™ã‚‹ãƒ‡ãƒ¼ã‚¿ã‚’リスト化ã—ã¦ãŠã。ã¾ãŸï¼Œå„データã®ã‚ªãƒ—ションをリストã¨ã—ã¦ä¸Žãˆã¦ã„ã‚‹ã“ã¨ã«æ³¨æ„。ã“ã†ã™ã‚‹ã“ã¨ã§ï¼Œã‚µã‚¤ã‚ºã‚„色ãªã©ã®ã‚¹ã‚¿ã‚¤ãƒ«ã‚’å…ƒã®ã‚¹ã‚¿ã‚¤ãƒ«ã«åˆã‚ã›ã‚‹ã“ã¨ãŒã§ãる。
+
+%\hypertarget{addgraph}{}
+%\item[関数]Addgraph(name ,プロットデータã®ãƒªã‚¹ãƒˆ,option)
+%\item[機能]複数ã®ãƒ—ロットデータをã¾ã¨ã‚ã‚‹
+%\item[説明]複数ã®ãƒ—ロットデータをã¾ã¨ã‚ã¦æ‰±ã†ã€‚ãŸã¨ãˆã°ï¼Œå††ã¨ï¼Œå††å‘¨ä¸Šã®ç‚¹ã®2ã¤ã®ãƒ—ロットデータをã¾ã¨ã‚ã¦æ‰±ãˆã°ï¼Œå¹³è¡Œç§»å‹•ã‚„回転ã§ï¼Œãれらã®ãƒ—ロットデータをã¾ã¨ã‚ã¦å¹³è¡Œç§»å‹•ã‚„回転ãŒã§ãる。Joincrvs()ã§ã¯ï¼Œãƒ—ロットデータをã¤ãªã’ã¦ï¼‘ã¤ã®ãƒ—ロットデータã«ã™ã‚‹ãŒï¼ŒAddgraph()ã§ã¯ï¼Œãã‚Œãžã‚Œã®ãƒ—ロットデータã‹ã‚‰ãªã‚‹ãƒªã‚¹ãƒˆï¼ˆãƒªã‚¹ãƒˆã®ãƒªã‚¹ãƒˆï¼‰ã«ã™ã‚‹ã€‚(プロットデータã¯åº§æ¨™ã®ãƒªã‚¹ãƒˆã§ã‚る)
+%
+%引数ã«ã¯ï¼Œãƒ—ロットデータåを文字列化ã—ã¦æ¸¡ã™ã€‚ãŸã¨ãˆã°ï¼Œå††ã®ãƒ—ロットデータ㌠cr1 ã®ã¨ã,"cr1" ã¨ã™ã‚‹ã€‚
+%
+%\vspace{\baselineskip}
+%ã€ä¾‹ã€‘サイクロイドã®å›³ã‚’æã。
+%\begin{verbatim}
+%Setpt(3);
+%Circledata("1",[[0,1],[0,0]]);
+%Pointdata("1",[0,0]);
+%Addgraph("1",["[pt1]","cr1"],["nodisp"]);
+%nn=32;
+%forall(1..nn,
+%t=2*pi/nn*#;
+%Rotatedata(text(#),"ad1",-t,[[0,1],"nodisp"]);
+%Translatedata(text(#),"rt"+text(#),[t,0],["dr,0.3"]);
+%);
+%\end{verbatim}
+%
+%\vspace{\baselineskip}
+%\hspace{20mm} \input{Fig/addgraph}
+%
+%ã“ã“ã§ï¼ŒAddgraph()ã®å¼•æ•°ã«ä¸Žãˆã‚‹ãƒ—ロットデータã®ãƒªã‚¹ãƒˆã§ï¼Œç‚¹ã®ãƒ—ロットデータ pt1 ã‚’"[pt1]" ã¨ã—ã¦ã„ã‚‹ã“ã¨ã«æ³¨æ„。円ã®ãƒ—ロットデータãŒï¼Œç‚¹ã®åº§æ¨™ã®ãƒªã‚¹ãƒˆã§ã‚ã‚‹ã®ã«å¯¾ã—,点ã®ãƒ—ロットデータã¯ä¸€ã¤ã®åº§æ¨™ã ã‘ãªã®ã§ï¼Œã“ã®ã‚ˆã†ã«ã—ã¦ãƒªã‚¹ãƒˆåŒ–ã—ã¦æ¸¡ã™ã€‚
\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
@@ -2552,10 +2611,12 @@ Partcrv("2",tmp_2,tmp_1,"gr1",["dr,2"]);
\end{verbatim}
\vspace{\baselineskip}
+\vspace{\baselineskip}
+\vspace{\baselineskip}
-\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+%\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
-%\vspace{\baselineskip}
+\vspace{\baselineskip}
\hypertarget{enclosing}{}
\item[関数]Enclosing(name , PDリスト , [開始ä½ç½®, 交点計算ã®è¨±å®¹é™ç•Œ1, 2])
\item[機能]複数ã®æ›²ç·šã‹ã‚‰é–‰æ›²ç·šã‚’作る。
@@ -2708,7 +2769,7 @@ Circledata([A,B],["da"]);
\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
-%\vspace{\baselineskip}
+\vspace{\baselineskip}
\hypertarget{dotfilldata}{}
\item[関数]Dotfilldata(name , æ–¹å‘リスト , プロットデータ , options)
\item[機能]領域を点ã§æ•·ãè©°ã‚る。
@@ -2721,6 +2782,12 @@ Circledata([A,B],["da"]);
Partcrv() 㨠Enclosing() ã§é–‰æ›²ç·šã‚’作ã£ã¦ç‚¹ã‚’æ•·ãè©°ã‚る。
+
+%\begin{center}\scalebox{0.9}{\input{Fig/dotfill}} \end{center}
+\begin{layer}{150}{0}
+\putnotese{85}{-3}{\scalebox{0.9}{ \input{Fig/dotfill}}}
+\end{layer}
+
\begin{verbatim}
r=3;
p0=r*[cos(pi/2),sin(pi/2)];
@@ -2737,9 +2804,6 @@ Enclosing("2",["sg3","part2","Invert(sg2)"],[[0,0]]);
Dotfilldata("1",["i"],[["en1"]]);
Dotfilldata("2",["i"],[["en2"]],[0.1]);
\end{verbatim}
-\begin{layer}{150}{0}
-\putnotese{80}{-60}{\scalebox{0.9}{ \input{Fig/dotfill}}}
-\end{layer}
\vspace{\baselineskip}
\hypertarget{shade}{}
@@ -2752,7 +2816,13 @@ Dotfilldata("2",["i"],[["en2"]],[0.1]);
optionã® Color ã¯ï¼ŒCinderellaã®ç”»é¢ä¸Šã§ã®æ画色をリストã§ä¸Žãˆã‚‹ã€‚濃ã•ã‚’指定ã—ãŸã„å ´åˆã¯è‰²åã‚„RGBã§ã¯ãªãCMYKã«ã™ã‚‹ã€‚
-optionsã«ã¯ï¼Œä»–ã«ï¼Œã€ŒEnclosingを使ã†ã‹ï¼ˆ''Enc=y/n'')ã€ï¼ŒEnclosingã®ã¨ãã®é–‹å§‹ç‚¹ï¼Œæ画色 ãŒã‚る。
+optionsã«ã¯ï¼Œä»–ã«ï¼Œæ¬¡ã®ã‚‚ã®ãŒã‚る。
+
+・Enclosingを使ã†ã‹ã©ã†ã‹ï¼š''Enc=y/n''(åˆæœŸå€¤ã¯ y)
+
+・Enclosingã®ã¨ãã®é–‹å§‹ç‚¹ï¼Œæ画色
+
+・æ画領域ã®ãƒˆãƒªãƒŸãƒ³ã‚°ï¼šTrim=y/n (åˆæœŸå€¤ã¯ n )
複数ã®Shadeを使ã†ã¨ãã¯ï¼Œåå‰ã‚’ã¤ã‘る。
@@ -2789,7 +2859,20 @@ Shade(["gr2","Invert(gr1)"],[[-1.5,1],"Color=[1,0,0]","alpha->0.4"]);
\vspace{\baselineskip}
\begin{center}\scalebox{0.9}{\input{Fig/shade01}} \end{center}
-%\vspace{\baselineskip}
+\vspace{\baselineskip}
+ã€ä¾‹ã€‘æ画領域(NE,SWã®çŸ©å½¢é ˜åŸŸï¼‰ã‹ã‚‰ã¯ã¿å‡ºã—ãŸéƒ¨åˆ†ã¯è¡¨ç¤ºã—ãªã„よã†ã«ã™ã‚‹ã€‚
+
+\begin{verbatim}
+Plotdata("1","x^2","x");
+Partcrv("1",[-1,1],[3,9],"gr1");
+Listplot("1",[[3,9],[-1,1]]);
+Joincrvs("1",["sg1","part1"]);
+Shade(["join1"],["Color=[0,0,0.2,0]","Trim=y"]);
+\end{verbatim}
+
+SW,NE ã‚’å‹•ã‹ã—ã¦ã¿ã‚‹ã¨ï¼Œç™½æž å†…ã ã‘ãŒè‰²å¡—ã‚Šã•ã‚Œã‚‹ã€‚
+
+\vspace{\baselineskip}
ã€ä¾‹ã€‘åŒå¿ƒå††ã‚’リング状ã«å¡—る。
下図å³ã®ã‚ˆã†ã«ï¼ŒåŒå¿ƒå††ã‚’リング状ã«å¡—ã‚‹ãŒï¼Œå††2ã¤ã ã‘ã§ã¯é–‰æ›²ç·šã¯ã§ããªã„。ãã“ã§ï¼Œå·¦å›³ã®ã‚ˆã†ã«ï¼Œå††ã®æã始ã‚を線分ã§çµã‚“ã§é–‰æ›²ç·šã‚’作る。ã“ã®ã¨ã,å‘ãを考ãˆã¦ï¼ŒJoincrvsã§çµã¶ã‚ˆã†ã«ï¼Œ''Enc=n''ã‚’ã¤ã‘る。線分ã¯éžè¡¨ç¤ºã«ã—ãŸã„ã®ã§ï¼Œ\verb|"nodisp"|オプションをã¤ã‘ã¦ãŠã。ãªãŠï¼Œç‚¹Aã‚’é©å½“ãªä½ç½®ã«ä½œå›³ã—ã¦ãŠã。
@@ -2806,7 +2889,7 @@ Shade(["cr1","sg1","Invert(cr2)","Invert(sg1)"],["Enc=n","Color=green"]);
ãã®ä»–,\hyperlink{joincrvs}{Joincrvs() ã®ä¾‹}ã‚‚å‚ç…§ã®ã“ã¨
-\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+%\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
\vspace{\baselineskip}
\hypertarget{reflectdata}{}
@@ -2833,6 +2916,7 @@ Reflectdata("1","crAB",[C]);
Reflectdata("2","crAB",[[-1,2]],["dr,2"]);
Reflectdata("3","crAB",[D,E],["da"]);
\end{verbatim}
+
\vspace{\baselineskip}
\begin{center} \input{Fig/reflectdata} \end{center}
@@ -2881,17 +2965,18 @@ Reflectdata("3","crAB",[D,E],["da"]);
Cを中心ã«$x$軸方å‘ã«3,$y$軸方å‘ã«2拡大ã—,実線ã§å¤ªãæã。
-原点中心ã«ãƒ™ã‚¯ãƒˆãƒ«$\overrightarrow{OD} $ã ã‘拡大ã—,破線ã§æã。
+原点中心ã«ãƒ™ã‚¯ãƒˆãƒ«$\overrightarrow{\mathrm{OD}} $ã ã‘拡大ã—,破線ã§æã。
\begin{verbatim}
Circledata([A,B]);
Scaledata("1","crAB",3,2,[[0,0]]);
Scaledata("2","crAB",3,2,[C,"dr,2"]);
Scaledata("3","crAB",[D.x,D.y],[[0,0],"da"]);
\end{verbatim}
- \begin{center} \input{Fig/scaledata} \end{center}
-\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+\vspace{0mm}
+ \begin{center} \input{Fig/scaledata} \end{center}
+%\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
\vspace{\baselineskip}
\hypertarget{translatedata}{}
@@ -2903,12 +2988,11 @@ Scaledata("3","crAB",[D.x,D.y],[[0,0],"da"]);
ã€ä¾‹ã€‘点A,B,C,Dを作図ツールã§ã¨ã£ã¦ãŠã。
\verb|Circledata([A,B]);| ã§ã§ãる円(crAB)を
+ $x$軸方å‘ã«2,$y$軸方å‘ã«3ã ã‘平行移動ã—ã¦å®Ÿç·šã§æã。
+
+ベクトル$\overrightarrow{\mathrm{OC}} $ã ã‘平行移動ã—,実線ã§å¤ªãæã。
- x軸方å‘ã«2,y軸方å‘ã«3ã ã‘平行移動ã—ã¦å®Ÿç·šã§æã。
-
-ベクトル$\overrightarrow{OC} $ã ã‘平行移動ã—,実線ã§å¤ªãæã。
-
-ベクトル$\overrightarrow{OD} $ã ã‘平行移動ã—,破線ã§æã。
+ベクトル$\overrightarrow{\mathrm{OD}} $ã ã‘平行移動ã—,破線ã§æã。
\begin{verbatim}
Circledata([A,B]);
@@ -2916,13 +3000,13 @@ Translatedata("1","crAB",[2,3]);
Translatedata("2","crAB",C,["dr,2"]);
Translatedata("3","crAB",D,["da"]);
\end{verbatim}
-\vspace{\baselineskip}
-\begin{center} \input{Fig/translatedata} \end{center}
+\vspace{0mm}
+\begin{center} \input{Fig/translatedata} \end{center}
-\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+%\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
-\vspace{\baselineskip}
+%\vspace{\baselineskip}
\hypertarget{intersectcrvs}{}
\item[関数]Intersectcrvs(プロットデータ1, プロットデータ2)
\item[機能]2曲線ã®äº¤ç‚¹ãƒªã‚¹ãƒˆã‚’å–å¾—ã™ã‚‹ã€‚
@@ -2976,7 +3060,7 @@ p1=[[-1,1],[2,4]]
p2=[[[-1,1],17.68,1],[[2,4],42.66,1]]
\end{verbatim}
ã¨è¡¨ç¤ºã•ã‚Œã‚‹ã€‚
-\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+%\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
\vspace{\baselineskip}
\hypertarget{nearestpt}{}
@@ -3022,7 +3106,7 @@ Letter([A,"n2w","A",B,"s2e","B",(A+B)/2,"e",text(plist_5)]);
点Aã¯(3,0)ã«ï¼Œç‚¹Bã¯é©å½“ãªä½ç½®ã«ä½œå›³ã—ã¦ãŠã,次ã®ã‚¹ã‚¯ãƒªãƒ—トを実行ã™ã‚‹ã¨ç‚¹BãŒæ±‚ã‚る点ã¨ãªã‚‹ã€‚
\begin{layer}{150}{0}
-\putnotese{80}{0}{ \input{Fig/Nearestpt1}}
+\putnotese{80}{0}{\scalebox{1.0}{\input{Fig/Nearestpt1}}}
\end{layer}
\begin{verbatim}
@@ -3034,11 +3118,13 @@ Pointdata("1",[A,B]);
Letter([A,"ne","A",B,"nw","B"]);
\end{verbatim}
+\vspace{\baselineskip}
+\vspace{\baselineskip}
注)第1引数ã¯åº§æ¨™ãªã®ã§ï¼Œ\verb|A| ã§ã¯ãªã \verb|A.xy| ã¨ã—ãªã‘ã‚Œã°ãªã‚‰ãªã„。
\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
-\vspace{\baselineskip}
+%\vspace{\baselineskip}
\hypertarget{numptcrv}{}
\item[関数]Numptcrv (プロットデータ)
\item[機能]プロットデータã®å€‹æ•°ã‚’è¿”ã™
@@ -3128,7 +3214,7 @@ Letter([tmp,"nw","A",[2,0],"se","P",[-2,0],"sw","Q"]);
ã€ä¾‹ã€‘楕円上ã®ç‚¹ã§åˆ†å‰²ã™ã‚‹ã€‚ã‚ã‹ã‚‰ã˜ã‚å¿…è¦ãªç‚¹ã‚’作図ã—ã¦ãŠã。
\begin{layer}{150}{0}
-\putnotese{70}{10}{ \input{Fig/ptcrv}}
+\putnotese{70}{05}{ \input{Fig/ptcrv}}
\end{layer}
\begin{verbatim}
Circledata([O,P],["do","Num=100","notex"]);
@@ -3164,7 +3250,6 @@ Letter([A,"w2","A",B,"e2","B"]);
\vspace{\baselineskip}
\begin{center} \input{Fig/ptstart} \end{center}
-\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
\vspace{\baselineskip}
\hypertarget{readoutdata}{}
\item[関数]ReadOutData(ファイルå)
@@ -3231,6 +3316,8 @@ dt1=data_1;
ã¨ã™ã‚‹ã€‚
+\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+
\hypertarget{readlines}{}
\item[関数]Readlines(path,filename,option)
\item[機能]テキストファイルを1è¡Œãšã¤èª­ã‚€ã€‚
@@ -3269,7 +3356,6 @@ start//
[[0.87631,-0.48175],[0.92978,-0.36812],・・,[1,0]]//
end////
\end{verbatim}
-\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
\vspace{\baselineskip}
\hypertarget{extractdata}{}
@@ -3282,6 +3368,8 @@ Extractdata("gr1",["da"]);
\end{verbatim}
\end{description}
+\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+
%\newpage
% ======== 計算 =======================
\subsection{計算}
@@ -3327,7 +3415,7 @@ Letter([A,"ne","A"]);
ã¾ãŸï¼Œæ›²ç·šã®æŽ¥ç·šã«ã¤ã„ã¦ã¯ï¼Œ\hyperlink{tangentplot}{Tangentplot}ã‚‚å‚ç…§ã•ã‚ŒãŸã„。
-%\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
\vspace{\baselineskip}
\hypertarget{integrate}{}
@@ -3376,7 +3464,7 @@ println(Integrate("gr1",[0,3]));
\end{description}
-\newpage
+%\newpage
%==========値ã®å–å¾—ã¨å…¥å‡ºåŠ›=========================
\subsection{値ã®å–å¾—ã¨å…¥å‡ºåŠ›}
@@ -3412,6 +3500,7 @@ optionã¯ï¼Œå¹…ã¾ãŸã¯é«˜ã•ã®æŒ‡å®šã€‚
\vspace{\baselineskip}
\includegraphics[bb=0.00 0.00 562.03 124.01,width=10cm]{Fig/bbdata.pdf}
+\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
\vspace{\baselineskip}
\hypertarget{cindyname}{}
@@ -3485,45 +3574,37 @@ println(Sprintf(len,6));
\begin{description}
\hypertarget{tabledata}{}
-\item[関数]Tabledata(name , 縦横データ, 除外線 , options)
+\item[関数]Tabledata(横データ,縦データ, 除外線 , options)
\item[機能]表ã®æž ã‚’作æˆã—,表ã®ãƒ‡ãƒ¼ã‚¿list ã‚’è¿”ã™
\item[説明]Cinderellaã®æç”»é¢ä¸Šã«å·¦ä¸‹ã‚’原点ã¨ã™ã‚‹è¡¨ã‚’作æˆã™ã‚‹ã€‚
-ä»–ã®é–¢æ•°ã¨ã®å¼•æ•°ã®æ•´åˆæ€§ï¼Œ\ketpic ã®ã‚³ãƒžãƒ³ãƒ‰ã¨ã®æ•´åˆæ€§ãªã©ã‹ã‚‰ï¼Œå…ˆé ­ã«nameã®å¼•æ•°ã‚’ã¤ã‘ã‚‹ãŒï¼Œå®Ÿéš›ã«ã¯ã‚ã¾ã‚Šåˆ©ç”¨ã—ãªã„ã®ã§ï¼Œç©ºæ–‡å­—""ã§ã‚‚よã„。
-
除外線ãŒãªã„å ´åˆã¯ç©ºãƒªã‚¹ãƒˆã‚’指定ã™ã‚‹ã€‚(必須)
-optionsã¯ç·šç¨®ã¨"notex"ãªã©ï¼ŒãŠã‚ˆã³ "Rng=n"。
-
-"Rng=n" ã‚’ã¤ã‘ã‚‹ã¨ï¼ŒNE,SWã«ã‚ˆã‚‹å‡ºåŠ›é ˜åŸŸæŒ‡å®šãŒæœ‰åŠ¹ã«ãªã‚Šï¼ŒNE,SWをドラッグã—ã¦å‡ºåŠ›é ˜åŸŸã‚’変更ã§ãる。(åˆæœŸçŠ¶æ…‹ã¯ï¼Œè¡¨ã®å³ä¸Šã¨å·¦ä¸‹ï¼‰ã¤ã‘ãªã„å ´åˆã¯ï¼Œè¡¨ã®éƒ¨åˆ†ã ã‘ãŒå‡ºåŠ›ã•ã‚Œã‚‹ã€‚
-
-縦横データã«ã¯ï¼Œæ¬¡ã®2通りã®æ›¸å¼ãŒã‚る。ã„ãšã‚Œã‚‚åŒã˜è¡¨ã‚’作æˆã™ã‚‹ã€‚
+optionsã®ã†ã¡ï¼ŒTabledataã«ç‰¹æœ‰ãªã‚‚ã®ã¯\\
+\hspace*{3zw}ラベルã®ã‚¹ã‚­ãƒƒãƒ—幅,''Setwindow=n'',''Geo=n'',''Move=[0,0]''\\
+ã§ã‚る。
-\vspace{\baselineskip}
-(1) 横ã®ã‚»ãƒ«æ•° , 縦ã®ã‚»ãƒ«æ•° , 表ã®æ¨ªå¹… , 表ã®ç¸¦å¹…を指定ã™ã‚‹ã€‚除外線ãªã—。
+"Setwindow=n" ã‚’ã¤ã‘ã‚‹ã¨ï¼ŒNE,SWã«ã‚ˆã‚‹å‡ºåŠ›é ˜åŸŸæŒ‡å®šãŒæœ‰åŠ¹ã«ãªã‚Šï¼ŒNE,SWをドラッグã—ã¦å‡ºåŠ›é ˜åŸŸã‚’変更ã§ãる。(åˆæœŸçŠ¶æ…‹ã¯ï¼Œè¡¨ã®å³ä¸Šã¨å·¦ä¸‹ï¼‰ã¤ã‘ãªã„å ´åˆã¯ï¼Œè¡¨ã®éƒ¨åˆ†ã ã‘ãŒå‡ºåŠ›ã•ã‚Œã‚‹ã€‚
-\begin{verbatim}
-Tabledata("",4,5,80,50,[]);
-\end{verbatim}
+縦横データã¯ï¼Œæ¬¡ã®ã‚ˆã†ã«ï¼Œé–“éš”ã®å¹…ã§ä¸Žãˆã‚‹ã€‚ãŸã ã—,幅ã¯Cinderellaã®æç”»é¢ã®0.1ã‚’å˜ä½ã¨ã™ã‚‹ã€‚
-(2) 横ã¨ç¸¦ã®å¹…を指定ã—ãŸãƒªã‚¹ãƒˆã‚’使ã†
\begin{verbatim}
Yoko=[20,20,20,20];
Tate=[10,10,10,10,10];
-Tabledata("",Yoko,Tate,[]);
+Tabledata(Yoko,Tate,[]);
\end{verbatim}
-å¹…ã¯Cinderellaã®æç”»é¢ã®0.1ã‚’å˜ä½ã¨ã™ã‚‹ã€‚
-作æˆã•ã‚ŒãŸè¡¨ã«ã¯ï¼Œè¡Œï¼Œåˆ—ã®åˆ¶å¾¡ç‚¹ãŒã¤ã。画é¢ä¸Šã§ã¯ï¼Œæ¨ªç½«ç·šã®ç•ªå· r0,r1,・・・縦罫線ã®ç•ªå· c0,c1,・・・ã¨è¦‹ã‚‹ã“ã¨ã‚‚ã§ãる。ã¾ãŸï¼Œç¸¦å¹…,横幅ãŒæ•°å­—ã§ç¤ºã•ã‚Œã‚‹ã€‚ãŸã ã—,ã“れらã¯\TeX ã«ã¯å‡ºåŠ›ã•ã‚Œãªã„。
+
+"Geo=y"ã¨ã™ã‚‹ã¨ï¼Œä½œæˆã•ã‚ŒãŸè¡¨ã«ã¯ï¼Œè¡Œï¼Œåˆ—ã®åˆ¶å¾¡ç‚¹ãŒã¤ã。画é¢ä¸Šã§ã¯ï¼Œæ¨ªç½«ç·šã®ç•ªå· r0,r1,・・・縦罫線ã®ç•ªå· c0,c1,・・・ã¨è¦‹ã‚‹ã“ã¨ã‚‚ã§ãる。ã¾ãŸï¼Œç¸¦å¹…,横幅ãŒæ•°å­—ã§ç¤ºã•ã‚Œã‚‹ã€‚ãŸã ã—,ã“れらã¯\TeX ã«ã¯å‡ºåŠ›ã•ã‚Œãªã„。
ã¾ãŸï¼Œä½œè¡¨ã¯Cinderellaã®æç”»é¢ä¸Šã§ã¯åº§æ¨™å¹³é¢ä¸Šã«ç½®ã‹ã‚Œã‚‹ãŒï¼Œ\TeX ã¸ã®å‡ºåŠ›ã¯åº§æ¨™å¹³é¢ä¸Šã«ã¯ç½®ã‹ãªã„ã“ã¨ãŒå¤šã„ã®ã§ï¼Œåº§æ¨™è»¸ã¯éžè¡¨ç¤ºã¨ã—ã¦ã„る。
\hspace{25mm} æç”»é¢ \hspace{45mm} TeX
-\hspace{5mm}\includegraphics[bb=0 0 403.52 249.51 , width=5cm]{Fig/table01.pdf} \hspace{10mm}\input{Fig/table02}
+\hspace{5mm}\includegraphics[bb=0 0 403.52 249.51 , width=5cm]{Fig/table01.pdf} \hspace{10mm}\input{Fig/table02} \\
-表ã®ã‚µã‚¤ã‚ºãƒ»è¡Œå¹…・列幅ã¯ï¼Œä½œæˆå¾Œã«ãã‚Œãžã‚Œã®åˆ¶å¾¡ç‚¹ã‚’ドラッグã™ã‚‹ã“ã¨ã«ã‚ˆã‚Šä»»æ„ã«å¤‰ãˆã‚‹ã“ã¨ãŒã§ãる。
+"Geo=y"ã®å ´åˆã¯ï¼Œè¡¨ã®ã‚µã‚¤ã‚ºãƒ»è¡Œå¹…・列幅ã¯ï¼Œä½œæˆå¾Œã«ãã‚Œãžã‚Œã®åˆ¶å¾¡ç‚¹ã‚’ドラッグã™ã‚‹ã“ã¨ã«ã‚ˆã‚Šä»»æ„ã«å¤‰ãˆã‚‹ã“ã¨ãŒã§ãる。
\vspace{\baselineskip}
除外線ã¯ï¼Œé™¤å¤–ã™ã‚‹ã‚»ãƒ«ã®ç½«ç·šã‚’,rã¨c ã§ä½ç½®æŒ‡å®šã™ã‚‹ã€‚
@@ -3534,11 +3615,18 @@ Tabledata("",Yoko,Tate,[]);
ã¨ã™ã‚‹ã€‚
+ラベルã®ã‚¹ã‚­ãƒƒãƒ—値ã¯ï¼Œã„ãã¤ãŠãã«ãƒ©ãƒ™ãƒ«ã‚’ã¤ã‘ã‚‹ã‹ã®è¨­å®šã§ã‚る。0ã¨ã™ã‚‹ã¨ãƒ©ãƒ™ãƒ«ãŒè¡¨ç¤ºã•ã‚Œãªã„。ãŸã ã—,ラベルã¯Cinderellaã®ç”»é¢ä¸Šã ã‘ã®å•é¡Œã€‚
+
+\vspace{\baselineskip}"Move=点ã®åº§æ¨™"ã¨ã™ã‚‹ã¨ï¼ŒæŒ‡å®šã•ã‚ŒãŸç‚¹ãŒå·¦ä¸‹ã«ãªã‚‹ã‚ˆã†ã«å¹³è¡Œç§»å‹•ã•ã‚Œã‚‹ã€‚
+
+
\vspace{\baselineskip}
ã€ä¾‹ã€‘4ã¤ã®ç½«ç·šã‚’éžè¡¨ç¤ºã«ã™ã‚‹
\begin{verbatim}
Rmv=["r1c0c1","c3r0r1","c3r3r5","r4c2c4"];
-Tabledata("",4,5,80,50,Rmv);
+Yoko=[20,20,20,20];
+Tate=[10,10,10,10,10];
+Tabledata(Yoko,Tate,Rmv);
\end{verbatim}
ã§ï¼Œæ¬¡ã®è¡¨ãŒã§ãる。
@@ -3549,58 +3637,54 @@ Tabledata("",4,5,80,50,Rmv);
\vspace{\baselineskip}
<補足>
-Tabledata()関数ã¯ï¼Œåˆ¶å¾¡ç‚¹r0,r1,・・・,c0,c1,・・・ãŒãªã‘ã‚Œã°æ–°ã—ã作り,ã™ã§ã«å­˜åœ¨ã™ã‚‹å ´åˆã¯ãã®ã¾ã¾ã¨ã™ã‚‹ã€‚ã—ãŸãŒã£ã¦ï¼Œä¸€åº¦è¡¨ã‚’作æˆã—ãŸã®ã¡ï¼Œè¡Œæ•°ãƒ»åˆ—数を修正ã—ã¦ä½œã‚Šç›´ã™å ´åˆã¯ï¼Œä¸€åº¦æ—¢å­˜ã®ç‚¹ã‚’消去ã™ã‚‹å¿…è¦ãŒã‚る。ãã®ãŸã‚ã«ã¯ï¼Œã€Œã™ã¹ã¦ã®ç‚¹ã‚’é¸æŠžã™ã‚‹ã€ãƒ„ールをクリックã—ã¦ç‚¹ã‚’消去ã™ã‚‹ã®ãŒã‚ˆã„。クリックã™ã‚‹ã¨ï¼Œæ¶ˆåŽ»å¾Œã™ãã«æ–°è¦ä½œæˆã•ã‚Œã‚‹ã€‚(誤ã£ã¦ã€Œã™ã¹ã¦ã®è¦ç´ ã‚’é¸æŠžã™ã‚‹ã€ã‚’é¸ã°ãªã„ã“ã¨)
+"Geo=y"ã®å ´åˆï¼Œåˆ¶å¾¡ç‚¹r0,r1,・・・,c0,c1,・・・ãŒãªã‘ã‚Œã°æ–°ã—ã作り,ã™ã§ã«å­˜åœ¨ã™ã‚‹å ´åˆã¯ãã®ã¾ã¾ã¨ã™ã‚‹ã€‚ã—ãŸãŒã£ã¦ï¼Œä¸€åº¦è¡¨ã‚’作æˆã—ãŸã®ã¡ï¼Œè¡Œæ•°ãƒ»åˆ—数を修正ã—ã¦ä½œã‚Šç›´ã™å ´åˆã¯ï¼Œä¸€åº¦æ—¢å­˜ã®ç‚¹ã‚’消去ã™ã‚‹å¿…è¦ãŒã‚る。ãã®ãŸã‚ã«ã¯ï¼Œã€Œã™ã¹ã¦ã®ç‚¹ã‚’é¸æŠžã™ã‚‹ã€ãƒ„ールをクリックã—ã¦ç‚¹ã‚’消去ã™ã‚‹ã®ãŒã‚ˆã„。クリックã™ã‚‹ã¨ï¼Œæ¶ˆåŽ»å¾Œã™ãã«æ–°è¦ä½œæˆã•ã‚Œã‚‹ã€‚(誤ã£ã¦ã€Œã™ã¹ã¦ã®è¦ç´ ã‚’é¸æŠžã™ã‚‹ã€ã‚’é¸ã°ãªã„ã“ã¨)
ä»–ã®ç‚¹ãŒæç”»ã•ã‚Œã¦ã„ã‚‹å ´åˆã¯ï¼Œè¡¨ã®éƒ¨åˆ†ã ã‘ドラッグã§é¸æŠžã™ã‚‹ã‹ï¼Œè¡¨ç¤ºãƒ¡ãƒ‹ãƒ¥ãƒ¼ã®ã€Œå¼ã«ã‚ˆã‚‹è¡¨ç¤ºã€ã§ä¸€è¦§è¡¨ã‚’出ã—ã¦ï¼Œåˆ¶å¾¡ç‚¹ã‚’é¸æŠžã—ã¦æ¶ˆåŽ»ã™ã‚‹ã€‚
-\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
-
\vspace{\baselineskip}
-\hypertarget{tabledatalight}{}
-\item[関数]Tabledatalight(name , 縦横データ, 除外線 , options)
-\item[機能]幾何点をæŒãŸãªã„表ã®æž ã‚’作æˆã—,表ã®ãƒ‡ãƒ¼ã‚¿list ã‚’è¿”ã™
-\item[説明]Tabledata()ãŒCinderellaã®å¹¾ä½•ç‚¹ã‚’生æˆã™ã‚‹ã®ã«å¯¾ã—,Tabledatalight()ã¯å¹¾ä½•ç‚¹ã‚’生æˆã—ãªã„。
-
-幾何点を作æˆã—ãªã„メリットã¯ï¼Œã‚¹ã‚¯ãƒªãƒ—トã ã‘ã§å…¨ä½“ã®ç¸¦æ¨ªå¹…を変更ã§ãã‚‹ã“ã¨ã€‚デメリットã¯ã‚¤ãƒ³ã‚¿ãƒ©ã‚¯ãƒ†ã‚£ãƒ–ãªå¾®èª¿æ•´ãŒã§ããªã„ã“ã¨ã€‚
-
-optionã¨ã—ã¦ï¼Œãƒ©ãƒ™ãƒ«ã®ã‚¹ã‚­ãƒƒãƒ—値(スキップã™ã‚‹ã¨ã“ã‚ã¯è¡¨ç¤ºã•ã‚Œãªã„)を指定ã™ã‚‹ã“ã¨ãŒã§ãる。ãŸã ã—,ラベルã¯Cinderellaã®ç”»é¢ä¸Šã ã‘ã®å•é¡Œã€‚
+"Geo=n"(デフォルト)ã®å ´åˆï¼Œå¹¾ä½•ç‚¹ã‚’生æˆã—ãªã„。幾何点を作æˆã—ãªã„メリットã¯ï¼Œã‚¹ã‚¯ãƒªãƒ—トã ã‘ã§å…¨ä½“ã®ç¸¦æ¨ªå¹…を変更ã§ãã‚‹ã“ã¨ã€‚デメリットã¯ã‚¤ãƒ³ã‚¿ãƒ©ã‚¯ãƒ†ã‚£ãƒ–ãªå¾®èª¿æ•´ãŒã§ããªã„ã“ã¨ã€‚
\vspace{\baselineskip}
ã€ä¾‹ã€‘1ã¤ãŠãã«ã‚¹ã‚­ãƒƒãƒ—ã—ã¦ï¼Œr1,r3,c1,c2 ã‚’éžè¡¨ç¤ºã¨ã™ã‚‹ã€‚
\begin{verbatim}
Yoko=[20,20,20,20];
Tate=[10,10,10,10,10];
-Tabledatalight("",Yoko,Tate,[],[2]);
+Tabledatalight(Yoko,Tate,[],[2]);
\end{verbatim}
\vspace{\baselineskip}
\hypertarget{changetablestyle}{}
-\item[関数]ChangeTablestyle(罫線リスト, 変更オプション)
+\item[関数]Changetablestyle(罫線リスト, 変更オプション)
\item[機能]Table ã®ç½«ç·šã®æ画オプションを変更
\item[説明]罫線ã®éƒ¨åˆ†çš„ã«æŒ‡å®šã—ã¦æ画オプションを変更ã§ãる。
\vspace{\baselineskip}
ã€ä¾‹ã€‘
-\verb|Tabledatalight("",[10,20,10,20],[10,10,10],[]);|\\
-\verb|ChangeTablestyle(["r1c0c4"],["da"]);|\\
-\verb|ChangeTablestyle(["r2c0c2","c1r0r3"],["nodisp"]);|
+\verb|Tabledatalight([10,20,10,20],[10,10,10],[]);|\\
+\verb|Changetablestyle(["r1c0c4"],["da"]);|\\
+\verb|Changetablestyle(["r2c0c2","c1r0r3"],["nodisp"]);|
\vspace{\baselineskip}
\hspace{20mm}\includegraphics[bb=0.00 0.00 324.00 174.00,width=50mm]{Fig/changetable.pdf}
\vspace{\baselineskip}
+複数ã®è¡¨ã‚’æãã“ã¨ã‚‚ã§ãる。
+
+\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+
+\vspace{\baselineskip}
\hypertarget{findcell}{}
\item[関数]Findcell(列番å·, 行番å·)
\item[機能]セルã®æƒ…å ±list(中心,横幅ï¼2,縦幅ï¼2)を返ã™
\item[説明]列番å·ï¼Œè¡Œç•ªå·ã¯å·¦ä¸Šã®ã‚»ãƒ«ã‚’1列1行ã¨ã—ã¦æ•°ãˆã‚‹ã€‚
\vspace{\baselineskip}
-ã€ä¾‹ã€‘\verb|Tabledata(4,5,80,50,[]);|
+ã€ä¾‹ã€‘\verb|Tabledata(Tate,Yoko,[]);|
-\verb|println(Findcell(tb,2,1));|
+\verb|println(Findcell(2,1));|
-ã¨ã™ã‚‹ã¨ï¼Œ2列1行ã®ã‚»ãƒ«ã®ä¸­å¿ƒã®åº§æ¨™ã¨æ¨ªå¹…ã®åŠåˆ†ï¼Œç¸¦å¹…ã®åŠåˆ†ã®å€¤ãŒãƒªã‚¹ãƒˆã¨ã—ã¦ã‚³ãƒ³ã‚½ãƒ¼ãƒ«ã«è¡¨ç¤ºã•ã‚Œã‚‹ã€‚çµæžœã¯ [[3,4.5],1,0.5]
+ã¨ã™ã‚‹ã¨ï¼Œ2列1行ã®ã‚»ãƒ«ã®ä¸­å¿ƒã®åº§æ¨™ã¨æ¨ªå¹…ã®åŠåˆ†ï¼Œç¸¦å¹…ã®åŠåˆ†ã®å€¤ãŒãƒªã‚¹ãƒˆã¨ã—ã¦ã‚³ãƒ³ã‚½ãƒ¼ãƒ«ã«è¡¨ç¤ºã•ã‚Œã‚‹ã€‚
\vspace{\baselineskip}
\hypertarget{putcell}{}
@@ -3612,7 +3696,9 @@ Tabledatalight("",Yoko,Tate,[],[2]);
ä½ç½®ã®ä¾‹ã‚’以下ã«ç¤ºã™ã€‚
\begin{verbatim}
-Tabledata("",5,2,100,40,["c1r1r2","c4r1r2"]);
+yoko=[20,20,20,20,20];
+tate=[20,20];
+Tabledata(yoko,tate,["c1r1r2","c4r1r2"]);
Putcell(1,1,"c","A");
Putcell(2,1,"r","B");
Putcell(3,1,"l","C");
@@ -3625,13 +3711,13 @@ Putcell("c3r1","c5r2","rt","H");
\vspace{\baselineskip}
\begin{center} \input{Fig/putcell} \end{center}
-※r0,c0,・・ã¯ç”»é¢ã«è¡¨ç¤ºã•ã‚Œã‚‹ç•ªå·
+※数å¼ã®å ´åˆã¯ï¼Œ{\bf Putcellexpr} を用ã„る。
\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
\vspace{\baselineskip}
\hypertarget{putcol}{}
-\item[関数]PutcoL (列番å·, 文字ä½ç½®ï¼Œæ–‡å­—列リスト)
+\item[関数]Putcol (列番å·, 文字ä½ç½®ï¼Œæ–‡å­—列リスト)
\item[機能]1列ã«é †ã«æ–‡å­—を書ã入れる
\item[説明]列番å·ã§æŒ‡å®šã—ãŸåˆ—ã«ï¼Œç¬¬ï¼‘è¡Œã‹ã‚‰é †ã«æ–‡å­—列リストã®æ–‡å­—を書ã入れる\\
æ•°ã®å ´åˆã¯ãƒ€ãƒ–ルクォートã§ããらãªãã¦ã‚‚よã„。
@@ -3640,7 +3726,7 @@ Putcell("c3r1","c5r2","rt","H");
\vspace{\baselineskip}
\hypertarget{putcolexpr}{}
-\item[関数]PutcoLexpr (列番å·, 文字ä½ç½®ï¼Œæ–‡å­—列リスト)
+\item[関数]Putcolexpr (列番å·, 文字ä½ç½®ï¼Œæ–‡å­—列リスト)
\item[機能]1列ã«é †ã«æ–‡å­—を書ã入れる
\item[説明]文字列ã«\TeX 書å¼ã‚’使ã†ã“ã¨ãŒã§ãã‚‹
@@ -3659,9 +3745,11 @@ Putcell("c3r1","c5r2","rt","H");
文字を入れる例を示ã™ã€‚
\begin{verbatim}
-Tabledata("",5,3,100,45,["c1r1r2","r1c2c3","r2c2c3"]);
-PutcoL(3,"c",["A","B","C"]);
-PutcoLexpr(4,"l",["x^2","y=\sqrt{x^3}"]);
+Tate=[20,20,20,20,20];
+Yoko=[15,15,15];
+Tabledata(Tate,Yoko,["c1r1r2","r1c2c3","r2c2c3"]);
+Putcol(3,"c",["A","B","C"]);
+Putcolexpr(4,"l",["x^2","y=\sqrt{x^3}"]);
Putrow(1,"c",[1,"二"]);
Putrowexpr(3,"c",["","\frac{\pi}{2}","","","\sum{x^2}"]);
\end{verbatim}
@@ -3672,7 +3760,7 @@ Putrowexpr(3,"c",["","\frac{\pi}{2}","","","\sum{x^2}"]);
グラフや文を入れãŸè¡¨ã®ä½œæˆä¾‹
-PutcoLexpr(),Putrowexpr() ã§ã¯ï¼Œæ•°å¼ã ã‘ã§ãªã,一般ã®\TeX ã®æ–‡ã‚’入れるã“ã¨ãŒã§ãる。
+Putcolexpr(),Putrowexpr() ã§ã¯ï¼Œæ•°å¼ã ã‘ã§ãªã,一般ã®\TeX ã®æ–‡ã‚’入れるã“ã¨ãŒã§ãる。
ã¾ãŸï¼Œã‚°ãƒ©ãƒ•ã®ä½ç½®ã‚’é©å½“ã«åˆã‚ã›ã¦æç”»ã™ã‚‹ã“ã¨ã«ã‚ˆã‚Šï¼Œè¡¨ã®ã‚»ãƒ«ã®ä¸­ã«ã‚°ãƒ©ãƒ•ã‚’入れるã“ã¨ãŒã§ãる。
\vspace{\baselineskip}
@@ -3686,9 +3774,11 @@ x軸をæããŸã‚ã®ç‚¹A〜Fã¯ä½œå›³ãƒ„ールã§ã¨ã£ã¦ãŠã。
\vspace{\baselineskip}
\begin{verbatim}
-Tabledata("",3,3,120,60,[],["dr,2"]);
-ChangeTablestyle(["r1c0c3"],["dr"]);
-ChangeTablestyle(["r2c0c3"],["da"]);
+Tate=[40,40,40];
+Yoko=[20,20,20];
+Tabledata(Tate,Yoko,[],["dr,2"]);
+Changetablestyle(["r1c0c3"],["dr"]);
+Changetablestyle(["r2c0c3"],["da"]);
Plotdata("1","(x-2)^2+0.5","x=[0.5,3.5]");
Plotdata("2","(x-6)^2+1","x=[4.5,7.5]");
Plotdata("3","(x-10)^2+1.5","x=[8.5,11.5]");
@@ -3712,7 +3802,7 @@ Tate=[6,6,10,6,10,6,40];
Yoko=[30,6,6,6];
Rmv=["c1r0r1","c2r0r1","c3r0r1","c4r0r1","c5r0r1", "r1c6c7",
"r2c6c7","r3c6c7"];
-Tabledata("",Tate,Yoko,Rmv,["dr"])
+Tabledata(Tate,Yoko,Rmv,["dr"])
Tlistplot("23d",["c1r2","c2r3"]);
Tlistplot("23u",["c1r3","c2r2"]);
Putrowexpr(2,"c",["x",0,"\cdots","\tfrac{1}{4}","\cdots",4]);
@@ -3737,7 +3827,9 @@ Expr(Ptend(tr1),"nw-2","y=x-\sqrt{x}");
\vspace{\baselineskip}
ã€ä¾‹ã€‘凹凸をå«ã‚ãŸå¢—減表
\begin{verbatim}
-Tabledata("",8,4,80,40,[]);
+Tate=apply(1..8,20);
+Yoko=[apply(1..4,10);
+Tabledata(Tate,Yoko,[]);
Putrowexpr(1,c,["x","\cdots","-1","\cdots","0","\cdots","1","\cdots"]);
Putrowexpr(2,c,["y`","+","+","+","0","-","-","-"]);
Putrowexpr(3,c,["y``","+","0","-","-","-","0","+"]);
@@ -4047,8 +4139,6 @@ KeTCindyã®é–¢æ•°ã®ä¸­ã«ã¯å‡¦ç†ã«æ™‚é–“ãŒã‹ã‹ã‚‹ã‚‚ã®ãŒã‚る。ãã®
\hspace{15mm}
\includegraphics[bb=0.00 0.00 445.02 193.01,height=35mm]{Fig/slider.pdf}
-\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
-
\vspace{\baselineskip}
\hypertarget{sprintf}{}
\item[関数]Sprintf(実数,é•·ã•)
@@ -4062,7 +4152,7 @@ KeTCindyã®é–¢æ•°ã®ä¸­ã«ã¯å‡¦ç†ã«æ™‚é–“ãŒã‹ã‹ã‚‹ã‚‚ã®ãŒã‚る。ãã®
Sprintf(pi,7) 㯠3.1415927 ã‚’è¿”ã™
-注)pi 㯠Cindyscriptã®äºˆç´„変数ã§ï¼Œå††å‘¨çŽ‡ã‚’表ã™ã€‚\vspace{\baselineskip}
+注)pi 㯠Cindyscriptã®äºˆç´„変数ã§ï¼Œå††å‘¨çŽ‡ã‚’表ã™ã€‚%\vspace{\baselineskip}
\vspace{\baselineskip}
\hypertarget{textformat}{}
@@ -4085,6 +4175,8 @@ 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}
+
\vspace{\baselineskip}
\hypertarget{texcom}{}
\item[関数]Texcom(\TeX コード)
@@ -4167,6 +4259,33 @@ Cindyscript㮠アンダーãƒãƒ¼ã®æ¼”ç®—å­ (list\_n , str\_n) ã¨åŒæ§˜ã€‚
\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+\vspace{\baselineskip}
+\hypertarget{fracform}{}
+\item[関数]Fracform(æ•° , 分æ¯ã®ãƒªã‚¹ãƒˆã¾ãŸã¯æœ€å¤§å€¤)
+\item[機能]分æ¯ãƒªã‚¹ãƒˆã®1ã¤ã‚’分æ¯ã¨ã™ã‚‹è¿‘似分数ã¨èª¤å·®ã‚’è¿”ã™ã€‚
+\item[説明]戻り値ã¯ï¼Œç°¡æ˜“TeX-like書å¼ã®æ–‡å­—列ã¨èª¤å·®ã€‚
+
+\vspace{\baselineskip}
+ã€ä¾‹ã€‘\verb|Fracform(0.33,[2,3]); => fr(1,3)|
+
+\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+
+\vspace{\baselineskip}
+\hypertarget{totexform}{}
+\item[関数]Totexform(簡易TeX-like書å¼)
+\item[機能]TeX書å¼ã®æ–‡å­—列を返ã™ã€‚
+
+\vspace{\baselineskip}
+ã€ä¾‹ã€‘\verb|Totexform(fr(1,3)); => frac{1}{3}|
+
+\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+
+\vspace{\baselineskip}
+\hypertarget{tocindyform}{}
+\item[関数]Tocindyform(簡易TeX-like書å¼)
+\item[機能]Cindy書å¼ã®æ–‡å­—列を返ã™ã€‚
+
+\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
\end{description}
\newpage
@@ -4388,7 +4507,7 @@ PlotdataR(“2â€, â€pnorm(x,5,2)â€, â€x=[0,10]â€);
点A,Bã¯Cinderellaã®ä½œå›³ãƒ„ールã§ä½œå›³ã—ã¦ãŠã,点Aをグラフ上ã®ãŠã‚ˆãã®ä½ç½®ã«ç½®ã„ã¦ã‹ã‚‰å®Ÿè¡Œã™ã‚‹ã€‚
\begin{verbatim}
PlotdataR("1","dnorm(x)","x=[-5,5]");
-PutonCurve("A","grR1",[-3,3]);
+Putoncurve("A","grR1",[-3,3]);
Putpoint("B",[A.x,0]);
Listplot("1",[A,B]);
\end{verbatim}
@@ -4501,7 +4620,10 @@ Rulerscale([0,0],["r",0,7,1],["r",1,7,1]);
\begin{center} \input{Fig/scatter} \end{center}
\end{description}
-\newpage
+
+\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+\vspace{\baselineskip}
+%\newpage
%Maximaã¨ã®é€£æº==================================
\subsection{Maximaã¨ã®é€£æº}
@@ -4509,9 +4631,9 @@ Maximaã¯æ•°å¼å‡¦ç†ã‚½ãƒ•ãƒˆã§ï¼Œ\ketcindy ã«ãŠã„ã¦ã¯å¾®ç©åˆ†ã®è¨ˆç®—ã
\ketcindy ã§ã¯ï¼Œkc.bat/shã«ã‚ˆã£ã¦ã‚³ãƒžãƒ³ãƒ‰ã‚’Maximaã«æ¸¡ã—,çµæžœã‚’テキストファイルã§å—ã‘å–る。ã“ã®ã¨ã,Maximaã¨ã®ã‚„ã‚Šã¨ã‚Šã§ï¼Œæ¬¡ã®ã‚ˆã†ãªãƒ•ã‚¡ã‚¤ãƒ«ãŒä½œæ¥­ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«ä½œæˆã•ã‚Œã‚‹ã€‚
-æ‹¡å¼µå­ max :Maxima用ã®ãƒ•ã‚¡ã‚¤ãƒ«
+æ‹¡å¼µå­ max :Maximaã«æ¸¡ã™ã‚³ãƒžãƒ³ãƒ‰ã‚’記述ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«
-æ‹¡å¼µå­ txt:データファイル
+æ‹¡å¼µå­ txt:MaximaãŒå‡ºåŠ›ã—ãŸãƒ‡ãƒ¼ã‚¿ãƒ•ã‚¡ã‚¤ãƒ«
ã“ã®ãƒ‡ãƒ¼ã‚¿ã®ã‚„ã‚Šå–ã‚Šã«é–¢ã™ã‚‹æ¬¡ã®ã‚ªãƒ—ションãŒã‚る。
@@ -4532,39 +4654,39 @@ ii) データファイルãŒæ—¢ã«ã‚ã‚Œã°ãれを読ã¿è¾¼ã‚€
\hypertarget{calcbyM}{}
\item[関数]CalcbyM(name,コマンド,option)
\item[機能]Maximaã®ã‚¹ã‚¯ãƒªãƒ—トを実行ã™ã‚‹
-\item[説明]第2引数ã¯Maximaã§å®Ÿè¡Œã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã€‚
+\item[説明]第2引数ã¯Maximaã§å®Ÿè¡Œã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã‚’記述ã—ãŸã‚¹ã‚¯ãƒªãƒ—ト。
-コマンドã¨å¼•æ•°ãƒªã‚¹ãƒˆã®ç¹°ã‚Šè¿”ã—ã‹ã‚‰ãªã‚‹ãƒªã‚¹ãƒˆï¼ˆä¾‹ãˆã°cmdL)を作ã£ã¦ï¼Œä¸€åº¦ã«å®Ÿè¡Œã™ã‚‹ã€‚
+コマンドã¨å¼•æ•°ãƒªã‚¹ãƒˆã®ç¹°ã‚Šè¿”ã—ã‹ã‚‰ãªã‚‹ã‚¹ã‚¯ãƒªãƒ—トをリストã¨ã—ã¦ä½œã‚Šï¼Œä¸€åº¦ã«å®Ÿè¡Œã™ã‚‹ã€‚
-戻り値ã¯ãªã„。(未定義値)çµæžœã¯ï¼Œã‚³ãƒžãƒ³ãƒ‰ãƒªã‚¹ãƒˆã®æœ€å¾Œã«è¨˜è¿°ã—ãŸå¤‰æ•°ï¼ˆå¼•æ•°ã¯ç©ºãƒªã‚¹ãƒˆï¼‰ã®å€¤ãŒname ã§æŒ‡å®šã•ã‚ŒãŸå¤‰æ•°ã«ä»£å…¥ã•ã‚Œã‚‹ã€‚複数ã®çµæžœã‚’戻ã™ã¨ãã¯ï¼Œ:: ã§åŒºåˆ‡ã£ã¦è¨˜è¿°ã™ã‚‹ã¨ãƒªã‚¹ãƒˆã«ã—ã¦ä»£å…¥ã•ã‚Œã‚‹ã€‚
+戻り値ã¯ãªã„(未定義値)。実行çµæžœã¯ï¼Œã‚³ãƒžãƒ³ãƒ‰ãƒªã‚¹ãƒˆã®æœ€å¾Œã«è¨˜è¿°ã—ãŸå¤‰æ•°ï¼ˆå¼•æ•°ã¯ç©ºãƒªã‚¹ãƒˆï¼‰ã®å€¤ãŒï¼Œname ã§æŒ‡å®šã•ã‚ŒãŸå¤‰æ•°ã«ä»£å…¥ã•ã‚Œã‚‹ã€‚複数ã®çµæžœã‚’戻ã™ã¨ãã¯ï¼Œ:: ã§åŒºåˆ‡ã£ã¦è¨˜è¿°ã™ã‚‹ã¨ãƒªã‚¹ãƒˆã«ã—ã¦nameã«ä»£å…¥ã•ã‚Œã‚‹ã€‚
\vspace{\baselineskip}
-ã€ä¾‹ã€‘$\sin x$ ã¨ãã®å°Žé–¢æ•°ã‚’表示ã™ã‚‹ã€‚çµæžœã¯ 変数 fdf ã« f ã¨df ã®ãƒªã‚¹ãƒˆãŒä»£å…¥ã•ã‚Œã‚‹ã€‚
+ã€ä¾‹ã€‘$\sin x$ ã¨ãã®å°Žé–¢æ•°ã‚’表示ã™ã‚‹ã€‚
\begin{verbatim}
cmdL=[
-"f:sin(x)", [],
-"df:diff",["sin(x)","x"],
-"f::df",[]
+ "f:sin(x)", [],
+ "df:diff",["sin(x)","x"],
+ "f::df",[]
];
CalcbyM("fdf",cmdL);
println(fdf);
\end{verbatim}
\vspace{\baselineskip}
-実行ã™ã‚‹ã¨ï¼Œã‚³ãƒ³ã‚½ãƒ¼ãƒ«ã«ï¼Œ[sin(x),cos(x)]ã¨è¡¨ç¤ºã•ã‚Œã‚‹ã€‚
+実行ã™ã‚‹ã¨ï¼Œçµæžœã® f ã¨df ã®ãƒªã‚¹ãƒˆãŒå¤‰æ•° fdf ã«ä»£å…¥ã•ã‚Œï¼Œã‚³ãƒ³ã‚½ãƒ¼ãƒ«ã«ï¼Œ\verb|[sin(x),cos(x)]| ã¨è¡¨ç¤ºã•ã‚Œã‚‹ã€‚
\vspace{\baselineskip}
ã€ä¾‹ã€‘2æ¬¡æ–¹ç¨‹å¼ $x^2-x-4=0$ã®è§£ã‚’求ã‚る。
\begin{verbatim}
cmdL=[
-"ans:solve",["x^2-x-4","x"],
-"ans",[]
+ "ans:solve",["x^2-x-4","x"],
+ "ans",[]
];
CalcbyM("ans",cmdL);
println("ans="+ans);
\end{verbatim}
コンソールã«ã¯
-ans=[x = -(sqrt(17)-1)/2,x = (sqrt(17)+1)/2]
+\verb|ans=[x = -(sqrt(17)-1)/2,x = (sqrt(17)+1)/2] |
ãŒè¡¨ç¤ºã•ã‚Œã‚‹ã€‚
@@ -4574,15 +4696,14 @@ ans=[x = -(sqrt(17)-1)/2,x = (sqrt(17)+1)/2]
\vspace{\baselineskip}
$f(x)=\dfrac{e^x+e^{-x}}{2}$ ã®ï¼Œ$x=a$ã«ãŠã‘る接線ã®æ–¹ç¨‹å¼ã‚’作る。
-Maximaã§ãã®å‡¦ç†ã‚’è¡Œã†ã‚³ãƒžãƒ³ãƒ‰ã‚’定義ã—,CalcbyMã§å®Ÿè¡Œã™ã‚‹ã€‚
\begin{verbatim}
fx="(exp(x)+exp(-x))/2";
cmdL=[
-"df:diff",[fx,"x"],
-"c:ev",["df","x=a"],
-"b:ev",[fx,"x=a"],
-"eq:c*(x-a)+b",[],
-"eq",[]
+ "df:diff",[fx,"x"],
+ "c:ev",["df","x=a"],
+ "b:ev",[fx,"x=a"],
+ "eq:c*(x-a)+b",[],
+ "eq",[]
];
CalcbyM("tn1",cmdL);
println(tn1);
@@ -4596,7 +4717,7 @@ println(tn1);
\begin{verbatim}
tn1=Assign(tn1,["%e^a","exp(a)","%e^-a","exp(-a)"]);
Plotdata("1",fx,"x");
-PutonCurve("A","gr1");
+Putoncurve("A","gr1");
tmp=Assign(tn1,["a",A.x]);
plotdata("2",tmp,"x",["Num=2"]);
\end{verbatim}
@@ -4611,7 +4732,7 @@ plotdata("2",tmp,"x",["Num=2"]);
{\bf 応用例2:パラメトリックã®å ´åˆã®æŽ¥ç·š}
\vspace{\baselineskip}
-媒介変数ã®å€¤ã‚’決ã‚ã‚‹ãŸã‚ã«ï¼Œç‚¹Aã‚’Cinderellaã®æç”»é¢ã®x軸上ã«ã¨ã£ã¦ãŠã,ãã®$x$座標を媒介変数$t$ã®å€¤ã¨ã™ã‚‹ã€‚スライダを作ã£ã¦ã‚‚よã„。
+媒介変数ã®å€¤ã‚’決ã‚ã‚‹ãŸã‚ã«ï¼Œç‚¹Aã‚’Cinderellaã®æç”»é¢ã®x軸上ã«ã¨ã£ã¦ãŠã,ãã®$x$座標を媒介変数$t$ã®å€¤ã¨ã™ã‚‹ã€‚スライダを作ã£ã¦ã‚‚よã„。\\
\begin{layer}{150}{0}
\putnotese{60}{10}{ \input{Fig/maxfun02}}
@@ -4619,11 +4740,11 @@ plotdata("2",tmp,"x",["Num=2"]);
\begin{verbatim}
fn="3*cos(t)^2*[cos(t),sin(t)]";
cmdL=[
-"f:",[fn],
-"df:diff",["f","t"],
-"df:trigsimp",["df"],
-"tn:f+s*df",[],
-"tn",[]
+ "f:",[fn],
+ "df:diff",["f","t"],
+ "df:trigsimp",["df"],
+ "tn:f+s*df",[],
+ "tn",[]
];
CalcbyM("tn2",cmdL);
Paramplot("1",fn,"t=[0,2*pi]",["Num=100"]);
@@ -4641,8 +4762,8 @@ $\displaystyle \int _{-1} ^2 (-x^3+3x+2)dx$ ã®å€¤ã‚’求ã‚る。çµæžœã¯ val ã
\begin{verbatim}
cmdL=[
-"val:integrate",["-x^3+3*x+2,x,-1,2"],
-"val",[]
+ "val:integrate",["-x^3+3*x+2,x,-1,2"],
+ "val",[]
];
CalcbyM("val",cmdL);
Mxtex("1",val);
@@ -4653,10 +4774,17 @@ Expr([[2,2],"e","S="+tx1]);
\vspace{\baselineskip}
\hypertarget{mxbatch}{}
\item[関数]Mxbatch(ファイルå)
-\item[機能]Maximaã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’実行ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã‚’作る
-\item[説明]ketcindy/ketlib/maximaL ã«ã‚るファイルを実行ã™ã‚‹ãŸã‚ã®ï¼ŒCalcbyM用ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’作æˆã™ã‚‹ã€‚
+\item[機能]Maximaã®ãƒ©ã‚¤ãƒ–ラリを使ã†ãƒãƒƒãƒãƒ•ã‚¡ã‚¤ãƒ«ã‚’作æˆ
+\item[説明]ketcindy/ketlib/maximaL ã«ã‚るライブラリを用ã„るコマンドã§ãƒãƒƒãƒãƒ•ã‚¡ã‚¤ãƒ«ã‚’作æˆã™ã‚‹ã€‚
+
+ketcindy/ketlib/maximaL ã«ã¯ï¼Œfourier\_sec.max , matoperation.max , poincare.mac ã®3ã¤ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚り,関数を定義ã—ãŸãƒ©ã‚¤ãƒ–ラリãŒå…¥ã£ã¦ã„る。ãã‚Œãžã‚Œæ¬¡ã®ã‚ˆã†ãªå†…容ã§ã‚る。å„ファイルをテキストエディタã§é–‹ã„ã¦å‚ç…§ã•ã‚ŒãŸã„。
+
+fourier\_sec.max :フーリエ級数ã®è¨ˆç®—ã‚’è¡Œã†ã€‚
+
+matoperation.max : 行列ã®è¨ˆç®—ã‚’è¡Œã†ã€‚
+
+poincare : ãƒãƒŸãƒ«ãƒˆãƒ‹ã‚¢ãƒ³ã‚·ã‚¹ãƒ†ãƒ ã«é–¢ã™ã‚‹è¨ˆç®—ã‚’è¡Œã†ã€‚
-ketcindy/ketlib/maximaL ã«ã¯ï¼Œfourier\_sec.max , matoperation.max , poincare.mac ã®3ã¤ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒå…¥ã£ã¦ã„る。ãŸã¨ãˆã°ï¼Œãƒ•ãƒ¼ãƒªã‚¨ç´šæ•°ã‚’扱ã†ã¨ãã«ã¯ï¼Œfourier\_sec.max を使用ã™ã‚‹ã€‚
\vspace{\baselineskip}
ã€ä¾‹ã€‘\verb|cmd=Mxbatch("fourier_sec")|
@@ -4680,9 +4808,9 @@ per=tmp_2;
Htickmark([1,"n","1",2,"n","2",3,"nw","3"]);
Htickmark([-1,"-1",-2,"-2",-3,"-3"]);
cmdL=Concat(Mxbatch("fourier_sec"),[
-"Ffun(x):="+fun,[],
-"c:fourier_sec_coeff",["Ffun(x)","x"],
-"c[1]::c[2]::c[3]",[]
+ "Ffun(x):="+fun,[],
+ "c:fourier_sec_coeff",["Ffun(x)","x"],
+ "c[1]::c[2]::c[3]",[]
]);
CalcbyM("ans",cmdL,[]);
nterm=round(4*(C.x-A.x));
@@ -4691,66 +4819,78 @@ Mxtex("2",ans_3);
Expr([[-5,-2],"e","s_n="+tx2,[4,-2],"e","n="+text(nterm)]);
\end{verbatim}
-\hspace{20mm}\input{Fig/mxbatch}
+\hspace{10mm}\input{Fig/mxbatch}
%\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
-\vspace{\baselineskip}
+\vspace{15mm}
\hypertarget{mxfun}{}
\item[関数]Mxfun(name,å¼ï¼Œãƒªã‚¹ãƒˆï¼Œoption)
\item[機能]Maximaã®é–¢æ•°ã‚’実行ã™ã‚‹
\item[説明]第2引数ã®ã€Œå¼ã€ã¯Maximaã®é–¢æ•°å。第3引数ã®ãƒªã‚¹ãƒˆã¯é–¢æ•°ã«æ¸¡ã™å¼•æ•°ã®ãƒªã‚¹ãƒˆã€‚
戻り値ã¯ï¼Œç¬¬ï¼‘引数ã®å¼ã«ï¼‘ã¤ã§ã‚‚文字ãŒã‚ã‚‹ã¨æ–‡å­—列ã¨ãªã‚‹ã€‚ã™ã¹ã¦æ•°å­—(+,-, . ã‚’å«ã‚€ï¼‰ã®å ´åˆã¯
-16æ¡ä»¥ä¸‹ã§ã‚ã‚Œã°æ•°ï¼Œãれ以上ã®å ´åˆã¯æ–‡å­—列ã¨ãªã‚‹ã€‚ã¾ãŸï¼Œæˆ»ã‚Šå€¤ã¯ï¼Œå¤‰æ•° mxname ã«ã‚‚代入ã•ã‚Œã‚‹ã€‚
+16æ¡ä»¥ä¸‹ã§ã‚ã‚Œã°æ•°ï¼Œãれ以上ã®å ´åˆã¯æ–‡å­—列ã¨ãªã‚‹ã€‚ã¾ãŸï¼Œæˆ»ã‚Šå€¤ã¯ï¼Œå¤‰æ•° mx+name ã«ã‚‚代入ã•ã‚Œã‚‹ã€‚
オプション㫠"Disp=no" ã‚’ã¤ã‘ã‚‹ã¨ï¼Œçµæžœã‚’コンソールã«è¡¨ç¤ºã—ãªã„。
\vspace{\baselineskip}
ã€ä¾‹ã€‘$10!$を求ã‚る。
-\verb|Mxfun("1","10!",[]);|
+\verb| Mxfun("1","10!",[]);|
-を実行ã™ã‚‹ã¨ï¼Œã‚³ãƒ³ã‚½ãƒ¼ãƒ«ã«mx1 is 362880 ã¨è¡¨ç¤ºã•ã‚Œã‚‹ã€‚ã“ã®å€¤ã¯å¤‰æ•° mx1 ã«ä»£å…¥ã•ã‚Œã¦ã„ã‚‹ã®ã§ï¼Œ
+を実行ã™ã‚‹ã¨ï¼Œã‚³ãƒ³ã‚½ãƒ¼ãƒ«ã«mx1 is 3628800 ã¨è¡¨ç¤ºã•ã‚Œã‚‹ã€‚ã“ã®å€¤ã¯å¤‰æ•° mx1 ã«ä»£å…¥ã•ã‚Œã¦ã„ã‚‹ã®ã§ï¼Œ
-\verb|drawtext([0,1],mx1);|
+\verb| Letter([[0,1],"e",mx1]);|
-ã¨ã™ã‚Œã°Cinderellaã®æç”»é¢ä¸Šã«è¡¨ç¤ºã•ã‚Œã‚‹ã€‚mx1ã®ã‹ã‚ã‚Šã«ï¼Œæˆ»ã‚Šå€¤ã‚’変数ã«ä»£å…¥ã—ã¦ä½¿ã†ã“ã¨ã‚‚ã§ãる。
+ã¨ã™ã‚Œã°Cinderellaã®æç”»é¢ä¸Šã«è¡¨ç¤ºã•ã‚Œã‚‹ã€‚mx1ã§ã¯ãªã,戻り値を変数ã«ä»£å…¥ã—ã¦ä½¿ã†ã“ã¨ã‚‚ã§ãる。
\begin{verbatim}
fact10=Mxfun("1","10!",[]);
-drawtext([0,1],fact10);
+Letter([[0,1],"e",fact10]);
\end{verbatim}
\vspace{\baselineskip}
-ã€ä¾‹ã€‘$f(x)=\sin x$ を微分ã™ã‚‹
+ã€ä¾‹ã€‘文字列ã®é€£çµ
-\verb|Mxfun("1", "diff",["sin(x)","x"])|
+文字列を引数ã¨ã™ã‚‹å ´åˆï¼Œä¾‹ãˆã°ï¼ŒMaximaã®æ–‡å­—列を連çµã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰concatã§ã¯ï¼Œ
-ã¨ã™ã‚‹ã¨
+\verb| concat("a","b")|
-diff(sin(x),x)
+ã¨ã™ã‚‹ãŒï¼Œä¸­ã«ãƒ€ãƒ–ルクォートãŒå…¥ã£ã¦ã„ã‚‹ãŸã‚,全体を文字列ã«ã™ã‚‹ã“ã¨ãŒã§ããªã„。
-ã¨ã„ã†ã‚³ãƒžãƒ³ãƒ‰ã‚’Maximaã«æ¸¡ã—ã¦ï¼Œæˆ»ã‚Šå€¤ã‚’Cindyã®å¤‰æ•°mx1ã«ä»£å…¥ã™ã‚‹ã€‚
+ã“ã®ã‚ˆã†ãªå ´åˆã¯ï¼Œç¬¬2引数を使ã£ã¦
-\verb|Mxfun("1", "diff(sin(x),x)",[]])|
+\verb| Mxfun("1","concat",["a","b"])|
+
+ã¨ã™ã‚Œã°ã‚ˆã„。
-ã¨ï¼Œç¬¬ï¼‘引数ã«ã¾ã¨ã‚ã¦ã‚‚åŒã˜çµæžœã«ãªã‚‹ã€‚ãŸã ã—,ã“ã®å ´åˆï¼Œç¬¬2引数ã¯ç©ºãƒªã‚¹ãƒˆã¨ã™ã‚‹ã€‚
+\vspace{\baselineskip}
+<å‚考> CindyScript ã® unicode(code) 関数を用ã„ã¦ãƒ€ãƒ–ルクォートを表ã—,次ã®ã‚ˆã†ã«ã™ã‚‹ã“ã¨ã‚‚ã§ãる。
+
+\begin{verbatim}
+dq=unicode("22");
+comm="concat("+dq+"a"+dq+","+dq+"b"+dq+")";
+Mxfun("1",comm,[]);
+\end{verbatim}
+
+\vspace{\baselineskip}
+ã€ä¾‹ã€‘$f(x)=\sin x$ を微分ã™ã‚‹
-文字列を引数ã¨ã™ã‚‹å ´åˆï¼Œä¾‹ãˆã°ï¼Œæ–‡å­—列を連çµã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰concatã§ã¯ï¼Œ
+\verb| Mxfun("1", "diff",["sin(x)","x"])|
-concat("a","b")
+ã¨ã™ã‚‹ã¨
-ã¨ã™ã‚‹ãŒï¼ŒCindyscriptã®æ–‡å­—列ã®å‡¦ç†ã®é–¢ä¿‚ã§ï¼Œç¬¬ï¼‘引数ã§ã¯ã“ã®å½¢ã§è¨˜è¿°ã§ããªã„。
+\verb| diff(sin(x),x)|
-ã—ãŸãŒã£ã¦ï¼Œã“ã®ã‚ˆã†ãªå ´åˆã¯ï¼Œç¬¬2引数を使ã£ã¦
+ã¨ã„ã†ã‚³ãƒžãƒ³ãƒ‰ã‚’Maximaã«æ¸¡ã—ã¦ï¼Œæˆ»ã‚Šå€¤ã‚’Cindyã®å¤‰æ•°mx1ã«ä»£å…¥ã™ã‚‹ã€‚
-\verb|Mxfun("1","concat",["a","b"])|
-
-ã¨ã™ã‚Œã°ã‚ˆã„。
+\verb| Mxfun("1", "diff(sin(x),x)",[]])|
+
+ã¨ï¼Œç¬¬ï¼‘引数ã«ã¾ã¨ã‚ã¦ã‚‚åŒã˜çµæžœã«ãªã‚‹ã€‚ãŸã ã—,ã“ã®å ´åˆï¼Œç¬¬2引数ã¯ç©ºãƒªã‚¹ãƒˆã¨ã™ã‚‹ã€‚
\vspace{\baselineskip}
-{\bf Cindyscriptã®å¾®åˆ†ã¨ã®é•ã„}
+{\bf <å‚考>Cindyscriptã®å¾®åˆ†ã¨ã®é•ã„}
Cindyscriptã§ã‚‚微分ã¯ã§ãる。ãŸã¨ãˆã°ï¼Œ
\begin{verbatim}
@@ -4777,17 +4917,12 @@ println(mx1);
\end{verbatim}
ã§ã¯ï¼Œã‚³ãƒ³ã‚½ãƒ¼ãƒ«ã« \verb|cos(x)| ã¨è¡¨ç¤ºã•ã‚Œã‚‹ã€‚
-mx1ã¯æ–‡å­—列ã§ã‚ã‚‹ã®ã§ï¼Œ
-\begin{verbatim}
-g(x):=parse(mx1);
-\end{verbatim}
-ã¨ã™ã‚Œã°ï¼Œg(x)を導関数ã¨ã™ã‚‹ã“ã¨ãŒã§ã,\verb|plot(g(#))| ã§ã‚°ãƒ©ãƒ•ã‚’æãã“ã¨ãŒã§ãる。
+mx1ã¯æ–‡å­—列ã§ã‚ã‚‹ã®ã§ï¼Œ\verb|Plotdata("1",mx1,"x")| ã§ã‚°ãƒ©ãƒ•ãŒæã‘る。
ã¾ãŸï¼ŒCindyscriptã®å¾®åˆ†ã§ã¯ï¼Œ3階ã‹4階ã¾ã§ã®å°Žé–¢æ•°ãŒè¨ˆç®—上ã®é™åº¦ã§ã‚ã‚‹ã®ã«å¯¾ã—,Maximaãªã‚‰ä½•éšŽã§ã‚‚微分ãŒã§ãã‚‹ã®ã§ï¼Œãƒ†ã‚¤ãƒ©ãƒ¼å±•é–‹ãªã©ã§æœ‰åˆ©ã§ã‚る。
\vspace{\baselineskip}
-\vspace{\baselineskip}
-例$\sin x$ 㮠テイラー展開を行ã„,グラフを表示ã™ã‚‹ã€‚
+ã€ä¾‹ã€‘$\sin x$ 㮠テイラー展開ã«ã‚ˆã‚‹è¿‘ä¼¼ã®ã‚°ãƒ©ãƒ•ã‚’表示ã™ã‚‹ã€‚
\begin{verbatim}
Mxfun("1","taylor",["sin(x)","x",0,7],[""]);
Plotdata("1","sin(x)","x",["da"]);
@@ -4796,14 +4931,14 @@ Plotdata("2",mx1,"x");
\vspace{\baselineskip}
\begin{center} \input{Fig/taylor} \end{center}
\vspace{\baselineskip}
-Mxtex() を用ã„ã¦ï¼ŒMxfun()ã®çµæžœã® mx1ã‚’TeX書å¼ã«ã—ã¦è¡¨ç¤ºã™ã‚‹ã“ã¨ã‚‚ã§ãる。
+ãªãŠï¼ŒMxtex() を用ã„ã‚Œã°ï¼ŒMxfun()ã®çµæžœã® mx1ã‚’TeX書å¼ã«ã—ã¦è¡¨ç¤ºã§ãる。
-\verb|Expr([[1,2],"e",Mxtex("1",mx1)]);|
+\verb| Expr([[1,2],"e",Mxtex("1",mx1)]);|
を追加ã™ã‚Œã°[1,2]ã®ä½ç½®ã«å¼ãŒè¡¨ç¤ºã•ã‚Œã‚‹ã€‚
\vspace{\baselineskip}
-{\bf 応用ã€ä¾‹ã€‘接線ã®æ–¹ç¨‹å¼ã‚’作る}
+ã€ä¾‹ã€‘接線ã®æ–¹ç¨‹å¼ã‚’作る
\vspace{\baselineskip}
$f(x)=\dfrac{e^x+e^{-x}}{2}$ ã®ï¼Œ$x=a$ã«ãŠã‘る接線ã®æ–¹ç¨‹å¼ã‚’作る。
@@ -4824,7 +4959,9 @@ println(tf);
\end{verbatim}
ãŒè¡¨ç¤ºã•ã‚Œã‚‹ã€‚
-\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+åŒæ§˜ã®ä¾‹ã‚’ CalcbyM() ã§ä¾‹ç¤ºã—ã¦ã„ã‚‹ã®ã§å‚ç…§ã•ã‚ŒãŸã„。
+
+%\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
\vspace{\baselineskip}
\hypertarget{mxtex}{}
\item[関数]Mxtex(name,å¼)
@@ -4881,8 +5018,9 @@ Cindyscriptã®æ–‡å­—列ã®é–¢æ•° replace を用ã„ã¦ï¼Œ
ã€ä¾‹ã€‘2次関数ã®ã‚°ãƒ©ãƒ•ã‚’表示ã—,$x$軸ã¨ã®äº¤ç‚¹ã®$x$座標を表示ã™ã‚‹ã€‚
\begin{layer}{150}{0}
-\putnotese{60}{20}{ \input{Fig/mxtex03}}
+\putnotese{60}{05}{ \input{Fig/mxtex03}}
\end{layer}
+
\begin{verbatim}
fx="x^2-x-3";
cmdL=[
@@ -4972,7 +5110,7 @@ Expr([2,-0.5],"e",tx2);
\end{description}
\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
-\newpage
+%\newpage
%FriCASã¨ã®é€£æº==================================
\subsection{FriCAS(Axiom)ã¨ã®é€£æº}
@@ -5003,7 +5141,7 @@ Expr([2,-0.5],"e",tx2);
\end{description}
\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
-\newpage
+%\newpage
%MeshLabã¨ã®é€£æº==================================
\subsection{MeshLabã¨ã®é€£æº}
@@ -5094,9 +5232,6 @@ options ã¯ï¼Œé¢ã®åŽšã¿ã®æŒ‡å®šã€‚厚ã¿ã¯ä¸­å¿ƒç·šã«å¯¾ã—,両å´ã«ã¤
\vspace{\baselineskip}
ã€ä¾‹ã€‘三角形ã®ãƒ—レートをæã
-\begin{layer}{150}{0}
-\putnotese{80}{15}{ \includegraphics[bb=0 0 287.01 228.01 , width=3cm]{Fig/meshlab03.pdf} }
-\end{layer}
\begin{verbatim}
Xyzax3data("","x=[-5,5]","y=[-5,5]","z=[-5,5]");
p1=[2,0,0];
@@ -5108,6 +5243,11 @@ Mkobjcrvcmd("2","ax3d");
Mkviewobj("plane",Concatcmd([oc1,oc2]),["m","v"]);
\end{verbatim}
+\begin{center} \includegraphics[bb=0 0 287.01 228.01 , width=4cm]{Fig/meshlab03.pdf} \end{center}
+%\begin{layer}{150}{0}
+%\putnotese{80}{15}{ \includegraphics[bb=0 0 287.01 228.01 , width=3cm]{Fig/meshlab03.pdf} }
+%\end{layer}
+
\vspace{\baselineskip}
\hypertarget{mkobjpolycmd}{}
\item[関数]Mkobjpolycmd(name,PD,options)
@@ -5139,8 +5279,8 @@ PDã¯ï¼Œå¹³é¢ã®æ画コマンドã«ã‚ˆã‚‹ãƒ—ロットデータãŒä½¿ãˆã‚‹ã€‚
\vspace{\baselineskip}
ã€ä¾‹ã€‘回転放物線
-\begin{layer}{150}{0}
-\putnotese{70}{0}{ \includegraphics[bb=0 0 287.01 189.01 , width=4cm]{Fig/meshlab06.pdf}}
+\begin{layer}{150}{20}
+\putnotes{58}{37}{ \includegraphics[bb=0 0 287.01 189.01 , width=5cm]{Fig/meshlab06.pdf}}
\end{layer}
\begin{verbatim}
fd=[
@@ -5152,9 +5292,9 @@ Mkobjthickcmd("1",fd,[40,40,0.2,"+n+s-e-w+","assume(R>0)"]);
Mkviewobj("pala",oc1,["m","v","Wait=5"]);
\end{verbatim}
-%\begin{center}\includegraphics[bb=0 0 574 378 , width=5cm]{Fig/meshlab06.pdf}\end{center}
+%\begin{center}\includegraphics[bb=0 0 574 378 , width=4cm]{Fig/meshlab06.pdf}\end{center}
-\vspace{\baselineskip}
+\vspace{37mm}
\hypertarget{mkviewobj}{}
\item[関数]Mkviewobj(name,PD, options)
\item[機能]objファイルを作æˆã€‚optionã«ã‚ˆã‚Š MeshLab ã‚’ç«‹ã¡ä¸Šã’ã¦è¡¨ç¤ºã™ã‚‹ã€‚
@@ -5173,7 +5313,7 @@ Mkviewobj("pala",oc1,["m","v","Wait=5"]);
\end{description}
\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
-\newpage
+%\newpage
%表計算ソフトã¨ã®é€£æº==================================
\subsection{表計算ソフトã¨ã®é€£æº}
表計算ソフトã§ã¯ï¼Œè¤‡æ•°ã®ã‚»ãƒ«ã‚’é¸æŠžã—ã¦ã‚³ãƒ”ー(Windowsã§ã¯ Crtl+ C ,Macã§ã¯ Command+C)ã™ã‚‹ã¨ï¼Œã‚»ãƒ«ã®å†…容ã¯tab区切りã®ãƒ†ã‚­ã‚¹ãƒˆãƒ‡ãƒ¼ã‚¿ã¨ã—ã¦ã‚¯ãƒªãƒƒãƒ—ボードã«ã‚³ãƒ”ーã•ã‚Œã‚‹ã€‚ã“れをCindyscriptエディタã«ãƒšãƒ¼ã‚¹ãƒˆã™ã‚‹ã“ã¨ã§è¡¨è¨ˆç®—ソフトã®ãƒ‡ãƒ¼ã‚¿ã‚’\ketcindy ã§åˆ©ç”¨ã§ãる。逆ã«ï¼ŒCindyscriptã®ã‚³ãƒ³ã‚½ãƒ¼ãƒ«ã¸ã®å‡ºåŠ›ã‚’表計算ソフトã®ã‚·ãƒ¼ãƒˆã«ã‚³ãƒ”ーã™ã‚‹ã“ã¨ã‚‚ã§ãる。
@@ -5306,7 +5446,7 @@ namelistã¯ï¼ŒCSVファイルã®1行目ã«è¿½åŠ ã•ã‚Œã‚‹é …ç›®å。çœç•¥ã™ã‚
Cinderellaã®ä½œå›³æ©Ÿèƒ½ã¨Cindyscriptを用ã„ã¦ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ãŒã§ãã‚‹ãŒï¼ŒPDFã«ã™ã‚‹ã“ã¨ã§CinderellaãŒãªãã¦ã‚‚PDFビュアーãŒã‚ã‚Œã°ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã‚’実行ã§ãã‚‹ã®ã§ï¼Œãƒ—レゼンテーションや教æã®å—ã‘渡ã—ãªã©ã«ä¾¿åˆ©ã§ã‚る。
-次ã®ç”»é¢ã¯ï¼Œsamplesフォルダã«ã‚る「s06animationã€ã®ã€Œs0601cycloidã€ã®ã‚‚ã®ã§ã‚る。ã“れをã²ãªå½¢ã¨ã—ã¦ä½¿ã†ã®ãŒã‚ˆã„。
+次ã®ç”»é¢ã¯ï¼Œsamplesフォルダã«ã‚る「s06animationã€ã®ã€Œs0601cycloidã€ã®ã‚‚ã®ã§ã‚る。ã“れをã²ãªå½¢ã¨ã—ã¦ä½¿ã†ã®ãŒã‚ˆã„。ã™ã§ã«ã‚るスライダãªã©ãŒé‚ªé­”ã§ã‚ã‚Œã°ï¼Œæ¶ˆåŽ»ãƒœã‚¿ãƒ³ã§æ¶ˆåŽ»ã™ã‚‹ã‹ï¼Œtemplate2allbuttons.cdy ã‚’ã²ãªå½¢ã¨ã—ã¦ç”¨ã„る。
\vspace{\baselineskip}
\includegraphics[bb=0 0 732.04 376.02 , width=12cm]{Fig/mvgaiyou01.pdf}
@@ -5314,15 +5454,15 @@ Cinderellaã®ä½œå›³æ©Ÿèƒ½ã¨Cindyscriptを用ã„ã¦ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ãŒã§ã
ç”»é¢ä¸Šæ–¹ã®ãƒœã‚¿ãƒ³ã«ã¯ï¼Œæ¬¡ã®ã‚ˆã†ãªã‚¹ã‚¯ãƒªãƒ—トãŒå‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¦ã„る。
\begin{tabbing}
-12345678\=1234567897890123456\=\kill
-Figure\>: Viewtex(); \>ç¾åœ¨ã®ç”»é¢ã®PDFデータを作る\\
-Parent \>:複数ã®ã‚¹ã‚¯ãƒªãƒ—ト\>Figpdf() を使ã†ã¨ãã«ä½¿ç”¨ã™ã‚‹ã€‚\\
-ParaF \>: Parafolder(); \>アニメーションã®ãƒ‡ãƒ¼ã‚¿ã‚’作る\\
-Anime\>: Mkanimation(); \>アニメーションPDFを作る\\
-Flip \>: Mkflipanime(); \>パラパラ動画PDFを作る
+1234\=12345678\=1234567897890123456\=\kill
+\>Figure\>: Viewtex(); \>ç¾åœ¨ã®ç”»é¢ã®PDFデータを作る\\
+\>Parent \>:複数ã®ã‚¹ã‚¯ãƒªãƒ—ト\>Figpdf() を使ã†ã¨ãã«ä½¿ç”¨ã™ã‚‹ã€‚\\
+\>ParaF \>: Parafolder(); \>アニメーションã®ãƒ•ãƒ¬ãƒ¼ãƒ ãƒ‡ãƒ¼ã‚¿ã‚’作る\\
+\>Anime\>: Mkanimation(); \>アニメーションPDFを作る\\
+\>Flip \>: Mkflipanime(); \>パラパラ動画PDFを作る
\end{tabbing}
-アニメーションã®ä½œæˆã¯ï¼Œãƒ•ãƒ¬ãƒ¼ãƒ ã‚’定義ã™ã‚‹é–¢æ•°ã‚’作æˆã—,Mkanimation() 関数を実行ã™ã‚‹(Animeボタン)。
+アニメーションPDFを作るã«ã¯ï¼Œãƒ•ãƒ¬ãƒ¼ãƒ ã‚’定義ã™ã‚‹é–¢æ•°ã‚’記述ã—,「ParaFã€ãƒœã‚¿ãƒ³ã§ãƒ•ãƒ¬ãƒ¼ãƒ ãƒ‡ãƒ¼ã‚¿ã‚’作り,「Animeã€ã¾ãŸã¯ã€ŒFlipã€ãƒœã‚¿ãƒ³ã§PDFを作æˆã™ã‚‹ã€‚
%ãŸã¨ãˆã°ï¼ŒFhead ㌠"hoge" ã®å ´åˆï¼ŒTeX ã®æ–‡æ›¸ã«ã¯\\
% \verb|\begin{center} \input{hogemoviefigs.tex}|\\
%ã§å‹•ç”»ã‚’挿入ã™ã‚‹ã“ã¨ãŒã§ãる。
@@ -5334,9 +5474,11 @@ Flip \>: Mkflipanime(); \>パラパラ動画PDFを作る
%パッケージ㯠animate ã« dvipdfmx オプションをã¤ã‘る。\\
%\verb|\usepackage[dvipdfmx]{animate}|
-ãªãŠï¼Œã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³PDFã§ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã‚’è¡Œã†ã«ã¯Adobe Acrobat Reader ãªã©ï¼Œã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã«å¯¾å¿œã—ãŸPDFリーダーãŒå¿…è¦ã§ã‚る。Windowsã®SumatraPDF,Mac㮠プレビューã§ã¯å‹•ã‹ãªã„。
+Anime ボタンを押ã™ã¨ï¼Œ\verb|\usepackage[dvipdfmx]{animate}| ã§ãƒ‘ッケージを読ã¿è¾¼ã¿ï¼Œanimateinline 環境ã®ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã‚’作る。
+
+Flip ボタンを押ã™ã¨ï¼Œanimateinline 環境ã§ã¯ãªã,フレームã«åˆ†å‰²ã—ãŸPDFãŒç”Ÿæˆã•ã‚Œã‚‹ã€‚
-Flipボタンを押ã™ã¨ï¼Œãƒ•ãƒ¬ãƒ¼ãƒ ã«åˆ†å‰²ã—ãŸPDFãŒç”Ÿæˆã•ã‚Œã¦è¡¨ç¤ºã•ã‚Œã‚‹ã€‚
+ãªãŠï¼Œã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³PDFã§ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã‚’è¡Œã†ã«ã¯Adobe Acrobat Reader ãªã©ï¼Œã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã«å¯¾å¿œã—ãŸPDFリーダーãŒå¿…è¦ã§ã‚る。Windowsã®SumatraPDF,Mac㮠プレビューã§ã¯ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ãŒã§ããªã„。
\subsection{関数}
\begin{description}
@@ -5344,7 +5486,11 @@ Flipボタンを押ã™ã¨ï¼Œãƒ•ãƒ¬ãƒ¼ãƒ ã«åˆ†å‰²ã—ãŸPDFãŒç”Ÿæˆã•ã‚Œã¦è¡¨ç
\hypertarget{setpara}{}
\item[関数]Setpara(fname,funcstr,range,options1,options2)
\item[機能]アニメーションã®è¨­å®šã‚’ã™ã‚‹
-\item[説明]fname ã¯å‡ºåŠ›ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«å,funcstrã¯å‹•ç”»é–¢æ•°å,rangeã¯ç¯„囲
+\item[説明]fname ã¯å‡ºåŠ›ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«å,funcstrã¯å®šç¾©ã—ãŸå‹•ç”»é–¢æ•°å,rangeã¯ç¯„囲
+
+「Animeã€ãƒœã‚¿ãƒ³ã‚’押ã™ã¨ï¼Œanimate+fname.pdf ãŒä½œã‚‰ã‚Œã‚‹ã€‚å†ç”Ÿã¯ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ©ã‹ï¼Œç”»é¢ã‚¯ãƒªãƒƒã‚¯ã§è¡Œã†ã€‚
+
+「Flipã€ãƒœã‚¿ãƒ³ã‚’押ã™ã¨ï¼Œflipanime+filename.pdf ãŒä½œã‚‰ã‚Œã‚‹ã€‚å†ç”Ÿï¼ˆã‚³ãƒžé€ã‚Šï¼‰ã¯ï¼ŒAcrobat Reader ã®ãƒšãƒ¼ã‚¸é€ã‚Šãƒœã‚¿ãƒ³ã§è¡Œã†ã€‚
options1 ã¯ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã®ãƒ‡ãƒ¼ã‚¿ã‚’作るãŸã‚ã®è¨­å®šã€‚
\begin{tabbing}
@@ -5356,14 +5502,24 @@ options2 ã¯ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã«ã¤ã„ã¦ã®è¨­å®šã§ï¼Œæ¬¡ã®é€šã‚Šã€‚
\begin{tabbing}
1234567890123\=90123456789012345678\=\kill
Frate=n\>1秒間ã®ãƒ•ãƒ¬ãƒ¼ãƒ æ•°ã€‚åˆæœŸå€¤ã¯20。 \\
-Title=str\> タイトル。\\
+Title=str\> タイトル。指定ã—ãªã„å ´åˆã¯ fname ã¨åŒã˜ã€‚\\
Scale=n\> 図ã®å¤§ãã•ã®æ‹¡å¤§çŽ‡ \\
-opA\> animate.sty ã®ãŸã‚ã®ã‚ªãƒ—ション。 \\
-\> loop:loopã™ã‚‹ï¼Œcontrols:ボタンを表示,buttonsize:ボタンã®ã‚µã‚¤ã‚º\\
-\> step:コマé€ã‚Šãƒ¢ãƒ¼ãƒ‰\\
-\>åˆæœŸè¨­å®šã¯loop,controls,buttonsize=3mm\\
-\> +ã‚’ã¤ã‘ã‚‹ã¨ãƒ¢ãƒ¼ãƒ‰ãŒè¿½åŠ ã•ã‚Œã‚‹ã€‚ãŸã¨ãˆã° \verb|"OpA=+step"| ã§\\
-\>\verb|"OpA=[loop,controls,buttonsize=3mm,step]"| ã¨ãªã‚‹ã€‚
+opA=[option]\> animateinline 環境ã®ãŸã‚ã®ã‚ªãƒ—ション \\
+\>åˆæœŸè¨­å®šã¯\verb|[loop,controls,buttonsize=3mm]|。\\
+\> loop:繰り返ã—å†ç”Ÿã™ã‚‹ã€‚\\
+\> controls:コントローラを表示ã™ã‚‹\\
+\> buttonsize:コントローラã®ã‚µã‚¤ã‚º\\
+\> palindrome:å転ã—ã¦ç¹°ã‚Šè¿”ã—å†ç”Ÿã™ã‚‹\\
+\> step:コマé€ã‚Šãƒ¢ãƒ¼ãƒ‰ã«ã™ã‚‹ã€‚コントローラもコマé€ã‚Šä»•æ§˜ã€‚\\
+\>\verb|"OpA=[controls,buttonsize=5mm]" |ã®ã‚ˆã†ã«è¨˜è¿°ã™ã‚‹ã€‚\\
+\> +ã‚’ã¤ã‘ã‚‹ã¨åˆæœŸè¨­å®šã®ã‚‚ã®ã«è¿½åŠ ã™ã‚‹ã“ã¨ãŒã§ãる。\\
+\>ãŸã¨ãˆã° \verb|"OpA=+step"| ã§\\
+\>\verb|"OpA=[loop,controls,buttonsize=3mm,step]"| ã¨ãªã‚‹ã€‚\\
+\>\verb|"OpA=[]"| ã¨ã™ã‚‹ã¨ï¼Œã‚ªãƒ—ションãªã—ã¨ãªã‚Šï¼Œ\\
+\>ç”»é¢ã‚’クリックã™ã‚‹ã¨ç¹°ã‚Šè¿”ã—ãªã—ã§å†ç”Ÿã•ã‚Œã‚‹ã€‚\\
+記述例\\
+\verb|Setpara("cycloid","mf(t)","t=[0,60]",["Div=60"],|\\
+\verb| ["Frate=30","Title="サイクロイド","Scale=1.5","OpA=[controls]"]);|\\
\end{tabbing}
\vspace{\baselineskip}
@@ -5396,36 +5552,38 @@ opA\> animate.sty ã®ãŸã‚ã®ã‚ªãƒ—ション。 \\
%\begin{description}
\vspace{\baselineskip}
ã€ä¾‹ã€‘定円上を動ã点Pã¨ï¼Œå®šç‚¹Aã‚’çµã¶ç·šåˆ†ã®ä¸­ç‚¹ã‚’Qã¨ã—ã¦å‹•ãを見る。
-アニメーションを定義ã™ã‚‹é–¢æ•°ã¯ï¼Œæ™‚é–“ã‚’ $t$ ã¨ã™ã‚Œã°ï¼Œæ™‚刻 $t$ ã«ãŠã‘る図(動ãã‚‚ã®ã ã‘)を定義ã™ã‚‹ã€‚時刻ã¯å˜ãªã‚‹åª’介変数ã§ã‚ã‚‹ã®ã§ï¼Œ$t$ ã§ãªã $s$ ãªã©ã§ã‚‚よã„。
+
+アニメーション(フレーム)を定義ã™ã‚‹é–¢æ•°ã¯ï¼Œæ™‚刻を $t$ ã¨ã—ã¦ï¼Œ $t$ ã«ãŠã‘る図を定義ã™ã‚‹ã¨è€ƒãˆã‚‹ã€‚時刻ã¯å˜ãªã‚‹åª’介変数ã§ã‚ã‚‹ã®ã§ï¼Œ$t$ ã§ãªã $s$ ãªã©ã§ã‚‚よã„。関数åã¯ï¼ŒãŸã¨ãˆã° mf(movie frame) ã¨ã™ã‚‹ã€‚
\begin{verbatim}
Setax(["","","sw","","sw"]);
Slider("A-C-B",[0,YMIN-1],[2*pi,YMIN-1]);
Circledata("1",[[0,0],[0,2]]);
mf(t):=(
-pt=2*[cos(t),sin(t)];
-mp=(pt+[4,0])/2;
-Listplot("1",[[4,0],pt]);
-Pointdata("1",[mp,pt],["Size=2"]);
-if(t==0,
-ptlist=[mp];
-,
-ptlist=append(ptlist,mp);
-);
-Letter([[4,0],"s","A",pt,"en","P",mp,"ne","Q"]);
-Pointdata("2",ptlist,["Size=2","Color=red"]);
+ pt=2*[cos(t),sin(t)];
+ mp=(pt+[4,0])/2;
+ Listplot("1",[[4,0],pt]);
+ Pointdata("1",[mp,pt],["Size=2"]);
+ if(t==0,
+ ptlist=[mp];
+ ,
+ ptlist=append(ptlist,mp);
+ );
+ Letter([[4,0],"s","A",pt,"en","P",mp,"ne","Q"]);
+ Pointdata("2",ptlist,["Size=2","Color=red"]);
);
mf(C.x);
Setpara("middle","mf(t)","t=[0,4*pi]");
\end{verbatim}
-ã“ã®ä¾‹ã®å ´åˆï¼Œ\verb|mf(C.x)| を実行ã™ã‚‹ã¨ã‚¹ãƒ©ã‚¤ãƒ€ã‚’å‹•ã‹ã™ã“ã¨ã§ã‚¤ãƒ³ã‚¿ãƒ©ã‚¯ãƒ†ã‚£ãƒ–ã«è»Œè·¡ã‚’表示ã§ãる。
+ã“ã®ä¾‹ã®å ´åˆï¼Œ\verb|mf(C.x)| を実行ã™ã‚‹ã¨ã‚¹ãƒ©ã‚¤ãƒ€ã‚’å‹•ã‹ã™ã“ã¨ã§ã‚¤ãƒ³ã‚¿ãƒ©ã‚¯ãƒ†ã‚£ãƒ–ã«è»Œè·¡ã‚’表示ã§ãる。アニメーションを作る上ã§ã¯ \verb|mf(C.x)| やスライダã¯ãªãã¦ã‚‚よã„。
+
Cinderellaã®ç”»é¢ã¯æ¬¡ã®ã‚ˆã†ã«ãªã‚‹ã€‚
\vspace{\baselineskip}
\hspace{20mm} \includegraphics[bb=0.00 0.00 608.03 367.02,width=8cm]{Fig/moviedata01.pdf}
-アニメーションを作æˆã™ã‚‹ã¨ã㯠\verb|//mf(C.x)| ã¨ã‚³ãƒ¡ãƒ³ãƒˆã‚¢ã‚¦ãƒˆã—ã¦ã‹ã‚‰ Anime ボタンをクリックã™ã‚‹ã€‚次ã®å›³ã¯ï¼Œã§ã上ãŒã£ãŸ animatemiddle.pdf ã®å§‹ã‚ã®ç”»é¢ã§ã‚る。
+アニメーションを作æˆã™ã‚‹ã¨ã㯠\verb|//mf(C.x)| ã¨ã‚³ãƒ¡ãƒ³ãƒˆã‚¢ã‚¦ãƒˆã—ã¦ã‹ã‚‰ 「ParaFã€ã€ŒAnime〠ボタンをクリックã™ã‚‹ã€‚次ã®å›³ã¯ï¼Œã§ã上ãŒã£ãŸ animatemiddle.pdf ã®å§‹ã‚ã®ç”»é¢ã§ã‚る。
\hspace{30mm}\includegraphics[bb=0.00 0.00 470.02 394.02,width=6cm]{Fig/moviedata02.pdf}
@@ -5433,7 +5591,7 @@ Cinderellaã®ç”»é¢ã¯æ¬¡ã®ã‚ˆã†ã«ãªã‚‹ã€‚
\verb| Setpara("middle","mf(t)","t=[0,4*pi]",["Div=30"],["Frate=6"]);|
-\verb|["Div=150"],["Frage=30"]|ã¨ã™ã‚‹ã¨ï¼Œã‚„ã¯ã‚Š5秒間ã®ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã¨ãªã‚‹ãŒï¼Œ1秒間ã®ãƒ•ãƒ¬ãƒ¼ãƒ æ•°ãŒå¤šã„ãŸã‚,ãªã‚らã‹ãªå‹•ãã¨ãªã‚‹ã€‚ã“ã‚Œã¯æ¨™æº–çš„ãªãƒ“デオã®ãƒ•ãƒ¬ãƒ¼ãƒ ãƒ¬ãƒ¼ãƒˆã§ã‚る。ãŸã ã—,ファイルサイズã¯ç´„5å€ã¨ãªã‚‹ã€‚
+\verb|["Div=150"],["Frate=30"]|ã¨ã™ã‚‹ã¨ï¼Œã‚„ã¯ã‚Š5秒間ã®ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã¨ãªã‚‹ãŒï¼Œ1秒間ã®ãƒ•ãƒ¬ãƒ¼ãƒ æ•°ãŒå¤šã„ãŸã‚,ãªã‚らã‹ãªå‹•ãã¨ãªã‚‹ã€‚ã“ã‚Œã¯æ¨™æº–çš„ãªãƒ“デオã®ãƒ•ãƒ¬ãƒ¼ãƒ ãƒ¬ãƒ¼ãƒˆã§ã‚る。ãŸã ã—,ファイルサイズã¯ç´„5å€ã¨ãªã‚‹ã€‚
\begin{flushright} \hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
@@ -5444,7 +5602,7 @@ Cinderellaã®ç”»é¢ã¯æ¬¡ã®ã‚ˆã†ã«ãªã‚‹ã€‚
%==================== Slide ===============
-\section{\ketcindy スライド}
+\section{KeTスライド}
\subsection{概è¦ã¨åˆ¶ä½œæ‰‹é †}
\ketcindy ã§ä½œæˆã—ãŸå›³ã¨ãƒ†ã‚­ã‚¹ãƒˆã‚’çµ±åˆã—ã¦ãƒ—レゼンテーション用ã®ã‚¹ãƒ©ã‚¤ãƒ‰PDFを作æˆã™ã‚‹ã€‚å¿…è¦ãªãƒ•ã‚¡ã‚¤ãƒ«ã¯ï¼Œã‚¹ãƒ©ã‚¤ãƒ‰ã®å†…容を記述ã—ãŸãƒ†ã‚­ã‚¹ãƒˆãƒ•ã‚¡ã‚¤ãƒ«ï¼ˆã“ã“ã§ã¯ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ファイルã¨å‘¼ã¶ï¼‰ã¨ï¼Œã‚¿ã‚¤ãƒˆãƒ«ã‚„図を作æˆã—,コンテンツファイルã¨çµ±åˆã™ã‚‹ \ketcindy ã®ãƒ•ã‚¡ã‚¤ãƒ«ã§ã‚る。ã“ã®2ã¤ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ï¼Œæ‹¡å¼µå­ãŒ txt 㨠cdy ã§ï¼Œãƒ•ã‚¡ã‚¤ãƒ«åã¯åŒä¸€ã¨ã™ã‚‹ã€‚ãŸã¨ãˆã°ï¼Œã‚³ãƒ³ãƒ†ãƒ³ãƒ„ファイルを makeslide.txt , \ketcindy ファイルを makeslide.cdy ã¨ã—ãŸã¨ãã®ï¼Œåˆ¶ä½œã‚¤ãƒ¡ãƒ¼ã‚¸ã‚’次ã®å›³ã«ç¤ºã™ã€‚
@@ -5473,7 +5631,7 @@ Cinderellaã®ç”»é¢ã¯æ¬¡ã®ã‚ˆã†ã«ãªã‚‹ã€‚
(4) Slide ボタンã§ã‚¹ãƒ©ã‚¤ãƒ‰PDFを作æˆã™ã‚‹ã€‚
-PDFã¨ï¼Œé–¢é€£ã™ã‚‹ä¸­é–“ファイルã¯ï¼Œä½œæ¥­ãƒ•ã‚©ãƒ«ãƒ€ã§ã¯ãªã,makeslide.cdyã®ã‚るフォルダã«ä½œæˆã•ã‚Œã‚‹ã€‚ã¾ãŸï¼Œã‚¹ãƒ©ã‚¤ãƒ‰PDFã¯ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã¨åŒæ§˜ï¼ŒAdobe Reader ã§é–‹ãå¿…è¦ãŒã‚る。
+PDFã¨ï¼Œé–¢é€£ã™ã‚‹ä¸­é–“ファイルã¯ï¼Œä½œæ¥­ãƒ•ã‚©ãƒ«ãƒ€ã§ã¯ãªã,makeslide.cdyã®ã‚るフォルダã«ä½œæˆã•ã‚Œã‚‹ã€‚ã¾ãŸï¼Œã‚¹ãƒ©ã‚¤ãƒ‰PDFã¯ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã¨åŒæ§˜ï¼ŒWindows,Macã§ã¯Adobe Reader ã§é–‹ãå¿…è¦ãŒã‚る。Linux(Ubuntu)ã§ã¯ Evince ã§ãƒ—レゼンテーションãŒã§ãる。
\subsection{コンテンツファイル}
@@ -5708,6 +5866,8 @@ end//
\vspace{\baselineskip}
{\bf ã€ãƒ¬ã‚¤ãƒ¤ãƒ¼ã€‘}
+ketlayerã®\verb|\begin{layer}・・\end{layer}| ã¨ã—ã¦æ›¸ã出ã™ã€‚本æ¥ã®è¨˜è¿°ã‚ˆã‚Šç°¡ç´ ã«ãªã£ã¦ã„る。
+
\hspace{10mm}\verb|layer::{範囲}{0}//|
㧠layer環境ã®å§‹ã¾ã‚Šã‚’示ã™ã€‚layer環境ã®çµ‚ã‚ã‚Šã¯
@@ -5742,6 +5902,7 @@ end//
{\bf ã€ãƒ†ã‚­ã‚¹ãƒˆã¨å‹•ç”»ã€‘}
コマンド以外ã®ãƒ†ã‚­ã‚¹ãƒˆã¯ãã®ã¾ã¾ \TeX\ ã«æ›¸ã出ã•ã‚Œã‚‹ã€‚行末ã«ã¯ // ã‚’ã¤ã‘る。
+
テキストを途中ã§æ”¹è¡Œã™ã‚‹ã«ã¯ï¼Œ\TeX\ 㮠強制改行マーク \textbackslash \textbackslash ã‚’ã¤ã‘る。
å‹•ç”»ã®å ´åˆã¯ï¼Œå‹•ç”»ã®è¨­å®šã‚’ã—ã¦ï¼ˆã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã®ç¯€ã‚’å‚照)ファイルを作る。
@@ -5806,6 +5967,13 @@ mp4ファイルを追加ã™ã‚‹ã¨ãã¯ï¼Œ\verb|\inputmovie|を用ã„る。\\
\hspace{10mm}\verb|\inputsountclik[90]{1}{0.4}{フォルダ/}{ファイル}|\\
2番目ã¨3番目ã®å¼•æ•°ã¯ï¼Œå¹…ã¨é«˜ã•ã®\verb|\linewidth|ã‹ã‚‰ã®å€çŽ‡ã§ã‚る。
+\vspace{\baselineskip}
+{\bf ã€ä½™ç™½ãªã©ã®ç·¨é›†ã€‘}
+
+スライドã®ä¸Šå´ä½™ç™½ã¨ã—ã¦ï¼ŒåˆæœŸçŠ¶æ…‹ã§ã€€\verb|\vspace*{18mm}| ãŒè¨­å®šã•ã‚Œã‚‹ã€‚次ã®ãƒšãƒ¼ã‚¸ã«ã¯ã¿å‡ºã—ã¦ã—ã¾ã†ã‚ˆã†ãªå ´åˆã¯ï¼Œå‡ºåŠ›ã•ã‚ŒãŸ tex ファイルã§èª¿æ•´ã™ã‚Œã°ã‚ˆã„。
+
+ãã®ä»–,é©å®œç·¨é›†ã—ã¦ï¼Œkc.command(bat/sh) を実行ã™ã‚Œã°ï¼Œç´°ã‹ã„部分を修正ã—ãŸPDFを作æˆã™ã‚‹ã“ã¨ãŒã§ãる。
+
\subsection{関数}
makeslide.cdy ã§ä½¿ã†ï¼Œ\ketcindy ã®é–¢æ•°ã€‚
@@ -5924,6 +6092,9 @@ Settitle([
例ã®ã‚ˆã†ã«ï¼Œã‚¿ã‚¤ãƒˆãƒ«ãƒªã‚¹ãƒˆã¯æ”¹è¡Œã™ã‚‹ã¨è¦‹ã‚„ã™ã„。
\end{description}
+
+\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+
\newpage
%================== 3Dæ¦‚è¦ ===============
\section{\ketcindy 3D}
@@ -6057,7 +6228,7 @@ optionsãŒãªã„ã¨ãã¯ï¼Œä»¥ä¸‹ã® åˆæœŸè¨­å®šã‚’用ã„る。
\end{description}
%================== 3Dæç”» ===============
-\newpage
+%\newpage
\subsection{æç”»}
%================== 3D点・線 ===============
@@ -6094,8 +6265,6 @@ Pointdata3d("1",[[1,1,1],[0,1,0]],["Size=2","Color=red"]);
\end{verbatim}
\vspace{\baselineskip}
-\begin{flushright} \hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
-\vspace{\baselineskip}
%---------------- Putpoint3d----------------------------------------------
\hypertarget{putpoint3d}{}
\item[関数]Putpoint3d(リスト,option)
@@ -6122,8 +6291,6 @@ optionã¯ï¼Œ"fix"( åˆæœŸè¨­å®š) ã¾ãŸã¯ "free"。リスト ["free"] ã«ã—ã¦
空間ã«ãŠã‘る点ã®åº§æ¨™ã¯ï¼Œç‚¹åã«"3d"を付加ã—ãŸåå‰ã®å¤‰æ•°ã«ä»£å…¥ã•ã‚Œã‚‹ã€‚ãŸã¨ãˆã°ï¼Œç‚¹Aã®åº§æ¨™ã¯A3dã§ã‚る。ã“ã‚Œã«ã‚ˆã‚Šï¼Œç‚¹ã®åº§æ¨™ã‚’å–å¾—ã§ãる。
-\begin{flushright} \hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
-
%----------------Putaxes3d---------------------------------------------
\vspace{\baselineskip}
\hypertarget{putaxes3d}{}
@@ -6140,11 +6307,10 @@ Putaxes3d(5);原点ã¨ï¼Œ$x(5,0,0),y(0,5,0),z(0,0,5)$ を作る。
Putaxes3d([1,2,3]);原点ã¨ï¼Œ$x(1,0,0),y(0,2,0),z(0,0,3)$ を作る。
-\begin{flushright} \hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
- %----------------PutonCurve3d---------------------------------------------
+ %----------------Putoncurve3d---------------------------------------------
\vspace{\baselineskip}
\hypertarget{putonCurve3d}{}
-\item[関数]PutonCurve3d(点å,PD)
+\item[関数]Putoncurve3d(点å,PD)
\item[機能]空間曲線上ã«ç‚¹ã‚’ã¨ã‚‹
\item[説明]プロットデータPDã®æ›²ç·šä¸Šã«ï¼Œç‚¹åã®ç‚¹ã‚’ã¨ã‚‹ã€‚
@@ -6184,12 +6350,8 @@ options ã¯ç·šç¨®ï¼ˆdr,da,do)
・Spaceline("2",[A,B,C,A]);作図ã•ã‚Œã¦ã„ã‚‹2点A,B,Cã‚’çµã‚“ã ä¸‰è§’形をæã。
-
・節点を表示ã™ã‚‹å ´åˆã¯ï¼ŒPointdata3d() ã§æç”»ã™ã‚‹ã€‚
-\begin{layer}{150}{0}
-\putnotese{80}{10}{ \input{Fig/oresenex01}}
-\end{layer}
\begin{verbatim}
pt=[[2,0,0],[2,0,2],[2,2,2],[0,2,2],[0,4,2],[0,4,4]];
Spaceline("1",pt);
@@ -6201,7 +6363,13 @@ Pointdata3d("1",pt,["Size=3"]);
\verb|pname=apply(1..6,"P"+text(#));|
ã®ã‚ˆã†ã«ã—ã¦ï¼Œåå‰ãƒªã‚¹ãƒˆã‚’作るã“ã¨ãŒã§ãる。
-\vspace{\baselineskip}
+
+%\vspace{\baselineskip}
+%\begin{layer}{150}{0}
+%\putnotese{80}{10}{ \input{Fig/oresenex01}}
+%\end{layer}
+ \begin{center} \input{Fig/oresenex01} \end{center}
+
%------------------ Spacecurve-----------------------------------------------
\hypertarget{spacecurve}{}
\item[関数]Spacecurve(name,å¼,定義域,options)
@@ -6257,10 +6425,8 @@ Pointdata3d("1",pt,["Size=3"]);
ã€ä¾‹ã€‘\verb|Mkbezierptcrv3d(["A","B","C","D"]);|\\
線分AB上ã«2点a1p,a2p,線分BC上ã«2点a2p,a2q,線分CD上ã«2点a3p,a3qãŒã§ãる。
-
-\begin{flushright} \hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
-
\vspace{\baselineskip}
+
%------------------ Skeletonparadata-----------------------------------------------
\hypertarget{skeletonparadata}{}
\item[関数]Skeletonparadata(name,PDリスト,PDリスト,option)
@@ -6310,21 +6476,32 @@ Spacecurve("1","[2*cos(t),2*sin(t),0.2*t]","t=[0,4*pi]",["Num=100"]);
\end{description}
-\newpage
+
+\begin{flushright} \hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+
+%\newpage
%================== 3D多é¢ä½“ ===============
\subsubsection{多é¢ä½“}
多é¢ä½“ã®æç”»ã«ã¤ã„ã¦ï¼Œå››é¢ä½“ã®å ´åˆã‚’例ã«ã—ã¦èª¬æ˜Žã™ã‚‹ã€‚
-å››é¢ä½“ã¯4ã¤ã®é¢ã‹ã‚‰ãªã£ã¦ã„る。頂点をA,B,C,Dã¨ã™ã‚‹ã¨ï¼Œ4ã¤ã®é¢ã¯
+\begin{layer}{130}{0}
+\putnotesw{130}{0}{\input{Fig/concatobj}}
+\end{layer}
+
+å››é¢ä½“ã¯4ã¤ã®é¢ã‹ã‚‰ãªã£ã¦ã„る。
-\hspace{20mm} △ABC,△ABD,△ACD,△BCD
+頂点をA,B,C,Dã¨ã™ã‚‹ã¨ï¼Œ4ã¤ã®é¢ã¯
+
+\hspace{10mm} △ABC,△ABD,△ACD,△BCD
ã§ã‚る。
- \begin{center} \input{Fig/concatobj} \end{center}
+% \begin{center} \input{Fig/concatobj} \end{center}
+
+頂点ã®ãƒªã‚¹ãƒˆ[A,B,C,D] ã«å¯¾ã—,Aã‹ã‚‰é †ã«ç•ªå·ã‚’
-頂点ã®ãƒªã‚¹ãƒˆ[A,B,C,D] ã«å¯¾ã—,Aã‹ã‚‰é †ã«ç•ªå·ã‚’ã¤ã‘ã‚‹ã¨ï¼Œå„é¢ã®é ‚点ã®é †ç•ªã¯
+ã¤ã‘ã‚‹ã¨ï¼Œå„é¢ã®é ‚点ã®é †ç•ªã¯
\hspace{20mm}[1,2,3],[1,2,4],[1,3,4],[2,3,4]
@@ -6930,7 +7107,7 @@ ExeccmdC("1");
\begin{flushright} \hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
\end{description}
-\newpage
+%\newpage
%================== 3Dプロットデータã®æ“作 ===============
\subsection{プロットデータã®æ“作}
@@ -6970,8 +7147,7 @@ println("PD="+Datalist3d());
\end{verbatim}
ã¨ã™ã‚‹ã¨ï¼Œã‚³ãƒ³ã‚½ãƒ¼ãƒ«ã«PD=[ax3d,AB3d] ã¨è¡¨ç¤ºã•ã‚Œã‚‹ã€‚
-
-\begin{flushright} \hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+\vspace{\baselineskip}
%------------------- Changestyle3d -----------------------------------------------
\hypertarget{changestyle3d}{}
@@ -7028,6 +7204,9 @@ Pointdata3d("1",intercrvsf1);
ã®ã‚ˆã†ã«è¡¨ç¤ºã•ã‚Œï¼Œç”»é¢ã«ã¯äº¤ç‚¹ãŒè¡¨ç¤ºã•ã‚Œã‚‹ã€‚
+
+\begin{flushright} \hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+
%------------------- IntersectsgpL -----------------------------------------------
\vspace{\baselineskip}
\hypertarget{intersectsgpL}{}
@@ -7071,19 +7250,23 @@ Spaceline("2",[p3,p4,p5,p3]);
ret=IntersectsgpL("P",[p1,p2],[p3,p4,p5],"put");
println("flag1="+ret_2+": flag2="+ret_3);
\end{verbatim}
+
\begin{layer}{150}{0}
-\putnotese{10}{20}{ \input{Fig/wire01}}
-\putnotese{60}{20}{ \input{Fig/wire02}}
+\putnotese{10}{15}{ \input{Fig/wire01}}
+\putnotese{60}{15}{ \input{Fig/wire02}}
\end{layer}
+
\begin{verbatim}
p2=[0,0,1/2]; p2=[-1,1,1];
flag1=false : flag2=trueflag1=true : flag2=true
\end{verbatim}
-\vspace{30mm}
+
+\newpage%\vspace{55mm}
\begin{layer}{150}{0}
-\putnotese{10}{20}{ \input{Fig/wire03}}
-\putnotese{60}{20}{ \input{Fig/wire04}}
+\putnotese{10}{15}{ \input{Fig/wire03}}
+\putnotese{60}{15}{ \input{Fig/wire04}}
\end{layer}
+
\begin{verbatim}
p2=[1,2,1]; p2=[1,0,1/2];
flag1=true : flag2=false  flag1=false : flag2=false
@@ -7159,8 +7342,6 @@ ExeccmdC("1");
\end{verbatim}
%\begin{center} \input{Fig/sfcut} \end{center}
-\begin{flushright} \hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
-
%------------------Partcrv3d -----------------------------------------------
\vspace{\baselineskip}
@@ -7172,12 +7353,12 @@ ExeccmdC("1");
始点ã¨çµ‚点ã¯ï¼Œãƒ—ロットデータã®ç•ªå·ã‚‚ã—ãã¯æ›²ç·šä¸Šã«ã¨ã£ãŸç‚¹ã®è­˜åˆ¥åã§ç¤ºã™ã€‚
\vspace{\baselineskip}
-ã€ä¾‹ã€‘螺旋をæã一部分を太ãã™ã‚‹ã€‚PutonCurve3d() ã§èžºæ—‹ä¸Šã«ç‚¹C,DãŒã§ãã‚‹ã®ã§ï¼Œãƒ‰ãƒ©ãƒƒã‚°ã—ã¦é©å½“ãªä½ç½®ã«ç§»å‹•ã™ã‚‹ã€‚
+ã€ä¾‹ã€‘螺旋をæã一部分を太ãã™ã‚‹ã€‚Putoncurve3d() ã§èžºæ—‹ä¸Šã«ç‚¹C,DãŒã§ãã‚‹ã®ã§ï¼Œãƒ‰ãƒ©ãƒƒã‚°ã—ã¦é©å½“ãªä½ç½®ã«ç§»å‹•ã™ã‚‹ã€‚
\begin{verbatim}
Xyzax3data("","x=[-5,5]","y=[-5,5]","z=[-5,4]");
Spacecurve("1","[2*cos(t),2*sin(t),0.2*t]","t=[0,4*pi]",["Num=100"]);
-PutonCurve3d("C","sc3d1");
-PutonCurve3d("D","sc3d1");
+Putoncurve3d("C","sc3d1");
+Putoncurve3d("D","sc3d1");
Partcrv3d("1",C,D,"sc3d1",["dr,3"]);
Letter([C,"n2","C",D,"n2","D"]);
\end{verbatim}
@@ -7193,6 +7374,8 @@ Partcrv3d("1",3.3,8.5,"sc3d1");
\end{verbatim}
\begin{center} \input{Fig/partcrv3d2} \end{center}
+\begin{flushright} \hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+
%------------------Reflectdata3d-----------------------------------------------
\hypertarget{reflectdata3d}{}
\item[関数]Reflectdata3d(name , PDlist , list , options)
@@ -7244,6 +7427,8 @@ Spaceline("1",[A,B,C,A]);
å¹³é¢BCDã«é–¢ã™ã‚‹é¡æ˜ ç‚¹\verb| Reflectpoint3d(A3d,[B3d,C3d,D3d]);|
+\begin{flushright} \hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+
%------------------Rotatedata3d -----------------------------------------------
\vspace{\baselineskip}
\hypertarget{rotatedata3d}{}
@@ -7326,6 +7511,8 @@ Putpoint3d(["B",pt]);
点Bã®ä½ç½®ã¯(4,-3,5)ã«ãªã‚‹ã€‚
+%\begin{flushright} \hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+
%------------------ Translatedata3d -----------------------------------------------
\vspace{\baselineskip}
\hypertarget{translatedata3d}{}
@@ -7356,8 +7543,6 @@ VertexEdgeFace("1",phd);
\end{verbatim}
\begin{center} \input{Fig/translate01} \end{center}
-\begin{flushright} \hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
-
%------------------Translatepoint3d( -----------------------------------------------
\hypertarget{translatepoint3d}{}
\item[関数]Translatepoint3d(座標,平行移動é‡)
@@ -7371,11 +7556,9 @@ Putpoint3d(["A",[1,0,0]]);
pt=Translatepoint3d(A3d,[-1,1,1]);
Putpoint3d(["B",pt]);
\end{verbatim}
-\vspace{\baselineskip}
+%\vspace{\baselineskip}
\begin{flushright} \hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
-
-
\end{description}
\newpage
%ãã®ä»–==================================
@@ -7434,9 +7617,6 @@ Letter([P,"w","P",A,"ne","A",B,"e","B",C,"ws","C",D,"nw","D",]);
Skeletonparadata("1");
\end{verbatim}
-
-\begin{flushright} \hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
-\vspace{\baselineskip}
%-----------------Perppt( -----------------------------------------------
\hypertarget{perppt}{}
\item[関数]Perppt(点å,点,点リスト,option)
@@ -7478,6 +7658,10 @@ Letter([A,"nw","A",B,"ne","B",C,"ne","C",O,"nw","O",H,"ne","H"]);
%\vspace{\baselineskip}
\begin{center}\scalebox{0.9}{ \input{Fig/perppt}} \end{center}
+
+\begin{flushright} \hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+%\vspace{\baselineskip}
+
%------------------Projcoordpara -----------------------------------------------
\hypertarget{projcoordpara}{}
\item[関数]Projcoordpara(座標)
@@ -7537,7 +7721,7 @@ Nohiddenbyfaces("1","phf3d1");
ã“ã®ä»–ã«n01〜n92ã¾ã§æ•´é¢å‡¸å¤šé¢ä½“ãŒã‚る。
-\begin{flushright} \hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
+%\begin{flushright} \hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright}
%-------------------Xyzcoord-----------------------------------------------
@@ -7551,6 +7735,7 @@ Nohiddenbyfaces("1","phf3d1");
\vspace{\baselineskip}
ã€ä¾‹ã€‘点Aをドラッグã—ã¦å‹•ã‹ã—ãŸã¨ã,Aã®åº§æ¨™ã‚’求ã‚る。
+
\verb|println(Xyzcoord(A.x,A.y,Az.y));|
ã«ã‚ˆã‚Šï¼Œã‚³ãƒ³ã‚½ãƒ¼ãƒ«ã«åº§æ¨™ãŒè¡¨ç¤ºã•ã‚Œã‚‹ã€‚
@@ -7977,6 +8162,7 @@ Cinderellaã§ä½¿ã£ã¦ã„る用語ã«æ¬¡ã®ã‚‚ã®ãŒã‚る。
\hyperlink{drwxy}{Drwxy()} \>座標軸を先ã«æã\\
\hyperlink{fontsize}{Fontsize(記å·)}\>フォントサイズを設定ã™ã‚‹\\
\hyperlink{ketinit}{Ketinit(options)}\>\ketcindy ã‚’åˆæœŸåŒ–ã™ã‚‹\\
+\hyperlink{initglist}{Initglist} \> ketlib スロットã®æ画データを追加ã™ã‚‹\\
\hyperlink{ptsize}{Ptsize(æ•°)} \>表示ã™ã‚‹ç‚¹ã®å¤§ãã•ã‚’設定ã™ã‚‹\\
\hyperlink{setarrow}{Setarrow(size,angle,pos,cut,style}\>矢線ã®å½¢çŠ¶ã‚’設定ã™ã‚‹\\
\hyperlink{setax}{Setax(list)}\>座標軸ã®æ›¸å¼ã‚’設定ã™ã‚‹\\
@@ -7992,7 +8178,8 @@ Cinderellaã§ä½¿ã£ã¦ã„る用語ã«æ¬¡ã®ã‚‚ã®ãŒã‚る。
\hyperlink{setwindow}{Setwindow()}\>æ画領域を設定ã™ã‚‹\\
\hyperlink{usegraphics}{Usegraphics()} \>グラフィクスパッケージを\verb|"pict2e"| ã«å¤‰æ›´ã™ã‚‹\\
ã€æ画】\\
-\hyperlink{addgraph}{AddGraph(name ,プロットデータ)} \>ユーザー定義ã®ãƒ—ロットデータをæç”»ã™ã‚‹\\
+\hyperlink{drawfigures}{Drawfigures(name ,figlist,optionlist)} \>複数ã®ãƒ‡ãƒ¼ã‚¿ã®ã‚¹ã‚¿ã‚¤ãƒ«ã‚’リストã§ä¸Žãˆã¦æç”»ã™ã‚‹\\
+%\hyperlink{addgraph}{Addgraph(name ,プロットデータ)} \>ユーザー定義ã®ãƒ—ロットデータをæç”»ã™ã‚‹\\
\hyperlink{anglemark}{Anglemark(点list, options)}\>角ã®å°ã‚’入れる\\
\hyperlink{setarrow}{Setarrow(options)}\>矢線をスタイルを設定ã™ã‚‹\\
\hyperlink{arrowdata}{Arrowdata(name.[始点,終点],options)}\>2点間をçµã¶çŸ¢ç·šã‚’æã\\
@@ -8041,9 +8228,9 @@ Cinderellaã§ä½¿ã£ã¦ã„る用語ã«æ¬¡ã®ã‚‚ã®ãŒã‚る。
\hyperlink{pointdata}{Pointdata(name,点list,options)}\>点データを作る\\
\hyperlink{polygonplot}{Polygonplot(name,点list,æ•´æ•°,options)}\>正多角形をæã\\
\hyperlink{putintersect}{Putintersect(点å,PD1,PD2)}\>2曲線ã®äº¤ç‚¹ã‚’作る\\
-\hyperlink{putoncurve}{PutonCurve(name,PD,åˆæœŸå€¤)}\>曲線上ã«ç‚¹ã‚’作る\\
-\hyperlink{putonline}{PutonLine(点å,座標1,座標2)}\>直線上ã«ç‚¹ã‚’作る\\
-\hyperlink{putonseg}{PutonSeg(点å,座標1,座標2)}\>線分上ã«ç‚¹ã‚’作る\\
+\hyperlink{putoncurve}{Putoncurve(name,PD,åˆæœŸå€¤)}\>曲線上ã«ç‚¹ã‚’作る\\
+\hyperlink{putonline}{Putonline(点å,座標1,座標2)}\>直線上ã«ç‚¹ã‚’作る\\
+\hyperlink{putonseg}{Putonseg(点å,座標1,座標2)}\>線分上ã«ç‚¹ã‚’作る\\
\hyperlink{putpoint}{Putpoint(点å,座標1,座標2)}\>点を作る\\
\hyperlink{reflectdata}{Reflectdata(name,PD,点list,options)}\>プロットデータã®é¡æ˜ ã‚’作æˆ\\
\hyperlink{reflectpoint}{Reflectpoint(点,対称点/対称軸)}\>点ã®é¡æ˜ ã‚’作æˆ\\
@@ -8059,11 +8246,11 @@ Cinderellaã§ä½¿ã£ã¦ã„る用語ã«æ¬¡ã®ã‚‚ã®ãŒã‚る。
\hyperlink{translatepoint}{Translatepoint(点,ベクトル)}\>点を平行移動ã™ã‚‹\\
\hyperlink{vtickmark}{Vtickmark([横座標 , æ–¹å‘ , 文字])}\>縦軸ã«ç›®ç››ã‚Šã‚’æã\\
ã€ä½œè¡¨ã€‘\\
-\hyperlink{changetablestyle}{ChangeTablestyle(罫線list, options)}\>Table ã®ç½«ç·šã®æ画オプションを変更ã™ã‚‹ã€‚\\
+\hyperlink{changetablestyle}{Changetablestyle(罫線list, options)}\>Table ã®ç½«ç·šã®æ画オプションを変更ã™ã‚‹ã€‚\\
\hyperlink{findcell}{Findcell(列番å·, 行番å·)}\>セルã®æƒ…å ±listã‚’è¿”ã™\\
\hyperlink{putcell}{Putcell (列番å·, 行番å·, ä½ç½®, 文字)} \>セルã«æ–‡å­—列を入れる\\
-\hyperlink{putcol}{PutcoL (列番å·, ä½ç½®ï¼Œæ–‡å­—列list)} \>1列ã«é †ã«æ–‡å­—を書ã入れる\\
-\hyperlink{putcolexpr}{PutcoLexpr (列番å·, ä½ç½®ï¼Œæ–‡å­—列list)}\>1列ã«é †ã«\TeX 書å¼ã®æ–‡å­—を書ã入れる\\
+\hyperlink{putcell}{Putcellexpr (列番å·, 行番å·, ä½ç½®, 文字)} \>セルã«æ•°å¼ã‚’入れる\\\hyperlink{putcol}{Putcol (列番å·, ä½ç½®ï¼Œæ–‡å­—列list)} \>1列ã«é †ã«æ–‡å­—を書ã入れる\\
+\hyperlink{putcolexpr}{Putcolexpr (列番å·, ä½ç½®ï¼Œæ–‡å­—列list)}\>1列ã«é †ã«\TeX 書å¼ã®æ–‡å­—を書ã入れる\\
\hyperlink{putrow}{Putrow (行番å·, ä½ç½®ï¼Œæ–‡å­—列list)} \>1行ã«é †ã«æ–‡å­—を書ã入れる\\
\hyperlink{putrowexpr}{Putrowexpr (行番å·, ä½ç½®ï¼Œæ–‡å­—列list)} \>1行ã«é †ã«\TeX 書å¼ã®æ–‡å­—を書ã入れる\\
\hyperlink{tabledata}{Tabledata("" , 縦横 ,除外 , options)}\>表ã®æž ã‚’作æˆã™ã‚‹\\
@@ -8125,6 +8312,9 @@ Cinderellaã§ä½¿ã£ã¦ã„る用語ã«æ¬¡ã®ã‚‚ã®ãŒã‚る。
\hyperlink{texcom}{Texcom(コード)} \>\TeX ã®ã‚³ãƒ¼ãƒ‰ã‚’書ã出ã™\\
\hyperlink{textformat}{Textformat(æ•°,æ¡æ•°)} \>å°æ•°ç‚¹ä»¥ä¸‹ã®æ¡æ•°ã‚’指定ã—ã¦æ•°å€¤ã‚’文字列化ã™ã‚‹\\
\hyperlink{windispg}{Windispg()}\>定義ã•ã‚ŒãŸãƒ—ロットデータをæç”»é¢ã«æã\\
+\hyperlink{fracform}{Fracform(æ•°,分æ¯ãƒªã‚¹ãƒˆ)}\>簡易TeX-like書å¼ã®æ–‡å­—列を返ã™\\
+\hyperlink{totexform}{Totexform(TeX-like書å¼)}\>TeX書å¼ã®æ–‡å­—列を返ã™\\
+\hyperlink{tocindyform}{Tocindyform(TeX-like書å¼}\>Cindy書å¼ã®æ–‡å­—列を返ã™\\
\vspace{\baselineskip}
ã€ï¼²ã¨ã®é€£æºã€‘\\
\hyperlink{boxplot}{Boxplot(åå‰,データ,ä½ç½®,高ã•,option)} \>ç®±ã²ã’図をæã\\
@@ -8203,7 +8393,7 @@ Cinderellaã§ä½¿ã£ã¦ã„る用語ã«æ¬¡ã®ã‚‚ã®ãŒã‚る。
\hyperlink{phparadata}{Phparadata(name,name2,options)}\>多é¢ä½“を陰線処ç†ã—ã¦æã\\
\hyperlink{pointdata3d}{Pointdata3d(åå‰,点list,options)} \>空間点ã®ãƒ‡ãƒ¼ã‚¿ã‚’作æˆã™ã‚‹\\
\hyperlink{putaxes3d}{Putaxes3d([x,y,z])}\>軸上ã«å¹¾ä½•ç‚¹ã‚’ã¨ã‚‹\\
-\hyperlink{putonCurve3d}{PutonCurve3d(点å,PD)}\>空間曲線上ã«ç‚¹ã‚’ã¨ã‚‹\\
+\hyperlink{putonCurve3d}{Putoncurve3d(点å,PD)}\>空間曲線上ã«ç‚¹ã‚’ã¨ã‚‹\\
\hyperlink{putonseg3d}{Putonseg3d(点å,点1,点2)}\>線分上ã«ç‚¹ã‚’ã¨ã‚‹\\
\hyperlink{putpoint3d}{Putpoint3d(list,option)}\>空間点をã¨ã‚‹\\
\hyperlink{readobj}{Readobj(ファイルå)}\>objファイルを読ã¿è¾¼ã‚€\\
diff --git a/Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeLinuxE.tex b/Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeLinuxE.tex
index d42acd524ac..b366eff95b6 100644
--- a/Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeLinuxE.tex
+++ b/Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeLinuxE.tex
@@ -65,13 +65,13 @@ How to install KeTCindy(Linux)
\item Style files for \ketcindy\ will be copied and mktexlsr will be executed.
\item In Cinderella/PlugIns\\
\hspace*{5mm}KetcindyPluign.jar will be copied.\\
- \hspace*{5mm}ketcindy.ini will be generated .
+ \hspace*{5mm}ketcindy.ini will be generated or remade(if selected).
+ \item TeX(typeset) will be usually latex,xelatex or pdflatex.
\end{itemize}
\item Open setwork.sh with a text editor and confirm/modify it.
\begin{itemize}
\item Execute on terminal:\\
\hspace*{10mm}\verb|bash setwork.sh|
- \item TeX(typeset) will be usually latex,xelatex or pdflatex.
\item Contents of “work†will be copied into "ketcindy"(work folder).
\item \verb|.ketcindy.conf| will be also generated in User's home.\\
\hspace*{10mm}You can change the setting of PasthT, Mackc, etc.
diff --git a/Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeLinuxJ.tex b/Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeLinuxJ.tex
index 03595f047f4..301b47d4a79 100644
--- a/Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeLinuxJ.tex
+++ b/Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeLinuxJ.tex
@@ -68,16 +68,17 @@
   \verb|sudo bash setketcindy.sh|
\item scriptsã®ä¸­èº«ãŒ\TeX ã«ã‚³ãƒ”ーã•ã‚Œã‚‹
\item ketcindyã®styleファイルãŒ\TeX ã«ã‚³ãƒ”ーã•ã‚ŒmktexlsrãŒå®Ÿè¡Œã•ã‚Œã‚‹ï¼Ž
- \item Cinderellaã®Pluginsã«KetcindyPlugin.jarãŒã‚³ãƒ”ーã•ã‚Œketcindy.iniãŒä½œæˆã•ã‚Œã‚‹ï¼Ž
+ \item Cinderellaã®Pluginsã«KetcindyPlugin.jarãŒã‚³ãƒ”ーã•ã‚Œã‚‹ï¼Ž
+ \item Pluginsã«ketcindy.iniãŒä½œæˆã•ã‚Œã‚‹ï¼ˆæ–°è¦ã¾ãŸã¯å†ä½œæˆã®å ´åˆï¼‰
+ \item タイプセットã®æ–¹æ³•ï¼ˆTeXã®ç¨®é¡žï¼‰\\
+ \hspace*{10mm}通常ã¯ï¼Œplatex (p)ã¾ãŸã¯uplatex(u)ã‚’é¸ã¶ï¼Ž
\end{itemize}
\item setwork.shをテキストエディタã§é–‹ã„ã¦ï¼Œãƒ‘スを確èªï¼Œä¿®æ­£ã™ã‚‹ï¼Ž
\begin{itemize}
\item ターミナルã§ä»¥ä¸‹ã‚’実行ã™ã‚‹ï¼Ž\\
   \verb|bash setketwork.sh|
\item 作業ディレクトリketcindyãŒãƒ¦ãƒ¼ã‚¶ãƒ›ãƒ¼ãƒ ã«ä½œæˆã•ã‚Œã‚‹ï¼Ž
- \item タイプセットã®æ–¹æ³•ï¼ˆ\TeX ã®ç¨®é¡žï¼‰\\
- \hspace*{10mm}通常ã¯ï¼Œplatex (p)ã¾ãŸã¯uplatex(u)ã‚’é¸ã¶ï¼Ž
- \item ketcindyフォルダã«workフォルダã®ä¸­èº«ãŒã‚³ãƒ”ーã•ã‚Œã‚‹ï¼Ž
+ \item ketcindyフォルダã«workフォルダã®ä¸­èº«ãŒã‚³ãƒ”ーã•ã‚Œã‚‹ï¼Ž
\item \verb|.ketcindy.conf|(ä¸å¯è¦–ファイルã ãŒç·¨é›†å¯èƒ½ï¼‰ãŒãƒ¦ãƒ¼ã‚¶ãƒ›ãƒ¼ãƒ ã«ä½œæˆã•ã‚Œã‚‹ï¼Ž\\
\hspace*{10mm}注)\TeX を切り替ãˆã‚‹ã¨ããªã©ã¯ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’修正ã™ã‚‹ï¼Ž
\item マニュアルもコピーã•ã‚Œã‚‹ï¼Ž
diff --git a/Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeMacE.tex b/Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeMacE.tex
index bafe8c7c61c..67142fe8964 100644
--- a/Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeMacE.tex
+++ b/Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeMacE.tex
@@ -56,6 +56,7 @@ How to install KeTCindy(Mac)
\end{itemize}
\item Open ketcindy(-master)/forMac.
\begin{itemize}
+ \item[Rem)]If the folder name includes spaces, remove them.
\item[Rem)]If you use TeX other than TeXLIve/KeTTeX,
\begin{itemize}
\item Open setketcindy.command with a text editor.
@@ -70,7 +71,8 @@ How to install KeTCindy(Mac)
\item ketcindystyle files will be copied and mktexlsr will be executed.
\item In Cinderella/PlugIns\\
\hspace*{5mm}KetcindyPluign.jar will be copied.\\
- \hspace*{5mm}ketcindy.ini will be generated .
+ \hspace*{5mm}ketcindy.ini will be generated or remade(if selected).
+ \item TeX(typeset) will be usually latex,xelatex or pdflatex.
\end{itemize}
\item Double-click setwork.command.
\begin{itemize}
@@ -78,7 +80,6 @@ How to install KeTCindy(Mac)
\end{itemize}
\begin{itemize}
\item Work directory "ketcindy" will be generated in User's home.
- \item TeX(typeset) will be usually latex,xelatex or pdflatex.
\item Contents of “work†will be copied into "ketcindy"
\item \verb|.ketcindy.conf| will be also generated in User's home.\\
\hspace*{10mm}You can change the setting of PasthT, Mackc, etc.
@@ -95,7 +96,7 @@ How to install KeTCindy(Mac)
\item Test run of KeTCindy
\begin{enumerate}[(1)]
\item Double-click "template1basic.cdy" in work directory "ketcindy".\\
- \hspace*{10mm}Then a frame in white appear on the screen. \end{enumerate}
+ \hspace*{10mm}Then a frame in white appear on the screen.
\item Press "Figure" button at the top left, then the final PDF output is displayed.
\begin{itemize}
\item[Rem)]To close the window of Terminal when the process exits :
@@ -103,8 +104,9 @@ How to install KeTCindy(Mac)
\item Start \verb|Terminal|.\\
\hspace*{10mm}Preferences \verb|>| Shell \verb|>| "Colse if the shell exited clearly"
\end{itemize}
+ \item[Rem)]It will be better to delete installer folder "ketcindy(-master)" .
\end{itemize}
-
+ \end{enumerate}
\item Set Texworks if necessary. For example, in case of KeTTeX,
\begin{itemize}
\item Downloadable from \url{https://github.com/TeXworks/texworks/releases/}.
@@ -118,9 +120,14 @@ How to install KeTCindy(Mac)
\item Install Xcode if you use gcc for drawings of surface.
\begin{itemize}
\item[Rem)]f you want to use only gcc, execute on Terminal:\\
- \hspace*{10mm}\verb|sudo xcode-select —install|
+ \hspace*{10mm}\verb|sudo xcode-select --install|
\end{itemize}
+\item Others
+ \begin{itemize}
+ \item Terminal command to allow to execute all aplications (Sierra or later)\\
+\hspace*{20mm}sudo spctl --master-disable
+ \end{itemize}
\end{enumerate}
\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeMacJ.tex b/Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeMacJ.tex
index ba98fdd75dd..eaab9903d14 100644
--- a/Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeMacJ.tex
+++ b/Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeMacJ.tex
@@ -79,16 +79,17 @@ KETCindyã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ« (Mac)
\begin{itemize}
\item scriptsã®ä¸­èº«ãŒTeXã«ã‚³ãƒ”ーã•ã‚Œã‚‹
\item ketcindyã®styleファイルãŒTeXã«ã‚³ãƒ”ーã•ã‚ŒmktexlsrãŒå®Ÿè¡Œã•ã‚Œã‚‹ï¼Ž
- \item Cinderellaã®Pluginsã«KetcindyPlugin.jarをコピー,ketcindy.iniãŒä½œæˆã•ã‚Œã‚‹ï¼Ž
- \end{itemize}
+ \item Cinderellaã®Pluginsã«KetcindyPlugin.jarãŒã‚³ãƒ”ーã•ã‚Œã‚‹ï¼Ž
+ \item Pluginsã«ketcindy.iniãŒä½œæˆã•ã‚Œã‚‹ï¼ˆæ–°è¦ã¾ãŸã¯å†ä½œæˆã®å ´åˆï¼‰
+ \item タイプセットã®æ–¹æ³•ï¼ˆTeXã®ç¨®é¡žï¼‰\\
+ \hspace*{10mm}通常ã¯ï¼Œplatex (p)ã¾ãŸã¯uplatex(u)ã‚’é¸ã¶ï¼Ž
+ \end{itemize}
\item setwork.commandをダブルクリック
\begin{itemize}
\item[注)]é–‹ã‹ãªã„ã¨ãã¯Control+クリックã§ã‚¿ãƒ¼ãƒŸãƒŠãƒ«ã‚’é¸ã¶ï¼Ž
\end{itemize}
\begin{itemize}
\item 作業ディレクトリketcindyãŒãƒ¦ãƒ¼ã‚¶ãƒ›ãƒ¼ãƒ ã«ä½œæˆã•ã‚Œã‚‹ï¼Ž
- \item タイプセットã®æ–¹æ³•ï¼ˆTeXã®ç¨®é¡žï¼‰\\
- \hspace*{10mm}通常ã¯ï¼Œplatex (p)ã¾ãŸã¯uplatex(u)ã‚’é¸ã¶ï¼Ž
\item ketcindyフォルダã«workフォルダã®ä¸­èº«ãŒã‚³ãƒ”ーã•ã‚Œã‚‹ï¼Ž
\item \verb|.ketcindy.conf|(ä¸å¯è¦–ファイルã ãŒç·¨é›†å¯èƒ½ï¼‰ãŒãƒ¦ãƒ¼ã‚¶ãƒ›ãƒ¼ãƒ ã«ä½œæˆã•ã‚Œã‚‹ï¼Ž\\
\hspace*{10mm}注)TeXを切り替ãˆã‚‹ã¨ããªã©ã¯ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’修正ã™ã‚‹ï¼Ž
@@ -120,6 +121,7 @@ KETCindyã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ« (Mac)
\hspace*{5mm}ターミナル>環境設定 \verb|>|(プロファイル)\verb|>| シェル\\
\hspace*{10mm}「シェルãŒæ­£å¸¸ã«çµ‚了ã—ãŸå ´åˆé–‰ã˜ã‚‹ã€ã‚’é¸æŠž
\end{itemize}
+ \item[注)]インストール用ã®ketcindy(-master)フォルダã¯å‰Šé™¤ã—ãŸæ–¹ãŒæ··ä¹±ã—ãªã„.
\end{itemize}
\end{enumerate}
@@ -149,7 +151,7 @@ KETCindyã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ« (Mac)
\item 曲é¢æç”»ã®ãŸã‚ã«ã¯, gccãŒå¿…è¦ã§ã‚る.
\item XcodeãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ãªã‘ã‚Œã°ï¼Œã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ï¼Ž\\
\hspace*{5mm}注) ターミナルã§æ¬¡ã‚’実行ã™ã‚Œã°ï¼Œgccã ã‘ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã‚‹ï¼Ž\\
- \hspace*{20mm}\verb|sudo xcode-select —install|
+ \hspace*{20mm}\verb|sudo xcode-select --install|
\end{itemize}
\item 手動ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹å ´åˆï¼ˆKeTTeX)\\
diff --git a/Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeWinE.tex b/Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeWinE.tex
index 49cae8839b2..58aa67c2b41 100644
--- a/Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeWinE.tex
+++ b/Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeWinE.tex
@@ -64,7 +64,7 @@ How to install KeTCindy(Windows)
\item Edit paths in it.
\end{itemize}
\end{itemize}
- \item Right click the following batch file setketcindy.bat and select "Run as adiministrator".\\
+ \item Right click a following batch file setketcindy.bat and select "Run as adiministrator".\\
\hspace*{10mm}\Ltab{15mm}{KeTTeX} setketcindy.bat\\
\hspace*{10mm}\Ltab{15mm}{TeXLive} setketcindytexlive.bat\\
\hspace*{10mm}\Ltab{15mm}{Others} edited setketcindy.bat
@@ -73,7 +73,10 @@ How to install KeTCindy(Windows)
\item ketcindystyle files will be copied and mktexlsr will be executed.
\item In Cinderella/PlugIns\\
\hspace*{5mm}KetcindyPluign.jar will be copied.\\
- \hspace*{5mm}ketcindy.ini will be generated .
+ \hspace*{5mm}ketcindy.ini will be generated (if make/remake is chosen).
+ \item TeX(typeset) will be usually latex,xelatex or pdflatex.
+ \item Input the version numbers of R, Maxima, for example 3.4.2,\ 5.37.3.
+
\end{itemize}
\item Double-click setwork.bat.
\begin{itemize}
@@ -81,9 +84,7 @@ How to install KeTCindy(Windows)
\end{itemize}
\begin{itemize}
\item Work directory "ketcindy" will be generated in User's home.
- \item TeX(typeset) will be usually latex,xelatex or pdflatex.
- \item Input the version numbers of R, Maxima, for example 3.4.2,\ 5.37.3.
- \item Contents of “work†will be copied into "ketcindy"
+ \item Contents of “work†will be copied into "ketcindy"
\item \verb|.ketcindy.conf| will be also generated in User's home.\\
\hspace*{10mm}You can change the setting of PasthT, Mackc, etc.
\item Template of "ketcindy.conf" will be also copied to work directory.
@@ -99,7 +100,7 @@ How to install KeTCindy(Windows)
\item Test run of KeTCindy
\begin{enumerate}[(1)]
\item Double-click "template1basic.cdy" in work directory "ketcindy".\\
- \hspace*{10mm}Then a frame in white appear on the screen. \end{enumerate}
+ \hspace*{10mm}Then a frame in white appear on the screen.
\item Press "Figure" button at the top left, then the final PDF output is displayed.
\begin{itemize}
\item[Rem)]To close the window of Terminal when the process exits :
@@ -107,7 +108,9 @@ How to install KeTCindy(Windows)
\item Start \verb|Terminal|.\\
\hspace*{10mm}Preferences > Shell \verb|>| "Colse if the shell exited clearly"
\end{itemize}
+ \item[Rem)]It will be better to delete installer folder "ketcindy(-master)" .
\end{itemize}
+ \end{enumerate}
\item Set Texworks if necessary. For example, in case of KeTTeX,
\begin{itemize}
diff --git a/Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeWinJ.tex b/Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeWinJ.tex
index 23c46b9d5ea..199fed6ce28 100644
--- a/Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeWinJ.tex
+++ b/Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeWinJ.tex
@@ -69,22 +69,23 @@ KETCindyã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ« (Windows)
\item パスを修正ã™ã‚‹ï¼Ž
\end{itemize}
\end{itemize}
- \item 次ã®ãƒãƒƒãƒãƒ•ã‚¡ã‚¤ãƒ«ã‚’å³ã‚¯ãƒªãƒƒã‚¯ã€Œç®¡ç†è€…ã¨ã—ã¦å®Ÿè¡Œã€ã‚’é¸ã¶ï¼Ž\\
- \hspace*{3zw}\Ltab{5zw}{KeTTeX} setketcindy.bat\\
+ \item 次ã®ã„ãšã‚Œã‹ã®ãƒãƒƒãƒãƒ•ã‚¡ã‚¤ãƒ«ã‚’å³ã‚¯ãƒªãƒƒã‚¯ã€Œç®¡ç†è€…ã¨ã—ã¦å®Ÿè¡Œã€ã‚’é¸ã¶ï¼Ž\\
+ \hspace*{3zw}\Ltab{5zw}{KeTTeX} setketcindykettex.bat\\
\hspace*{3zw}\Ltab{5zw}{TeXLive} setketcindytexlive.bat\\
\hspace*{3zw}\Ltab{5zw}{W32TeX} setketcindyw32J.bat\\
\hspace*{3zw}\Ltab{5zw}{ä»–ã®TeX} setketcindy.bat(è¦ä¿®æ­£ï¼‰
\begin{itemize}
\item scriptsã®ä¸­èº«ãŒTeXã«ã‚³ãƒ”ーã•ã‚Œã‚‹
\item ketcindyã®styleファイルãŒTeXã«ã‚³ãƒ”ーã•ã‚ŒmktexlsrãŒå®Ÿè¡Œã•ã‚Œã‚‹ï¼Ž
- \item Cinderellaã®Pluginsã«KetcindyPlugin.jarをコピー,ketcindy.iniãŒä½œæˆã•ã‚Œã‚‹ï¼Ž
+ \item Cinderellaã®Pluginsã«KetcindyPlugin.jarãŒã‚³ãƒ”ーã•ã‚Œã‚‹ï¼Ž
+ \item Pluginsã«ketcindy.iniãŒä½œæˆã•ã‚Œã‚‹ï¼ˆä½œæˆã¾ãŸã¯å†ä½œæˆã‚’é¸ã‚“ã å ´åˆï¼‰ï¼Ž
+ \item タイプセットã®æ–¹æ³•ï¼ˆTeXã®ç¨®é¡žï¼‰\\
+ \hspace*{10mm}通常ã¯ï¼Œplatex (p)ã¾ãŸã¯uplatex(u)ã‚’é¸ã¶ï¼Ž
+ \item R,\ Maximaã§ã¯ï¼Œãƒãƒ¼ã‚¸ãƒ§ãƒ³ç•ªå·ï¼ˆ3.4.2,\ 5.37.3ãªã©ï¼‰ã‚’入れる.
\end{itemize}
\item setwork.batをダブルクリック
\begin{itemize}
\item 作業ディレクトリketcindyãŒãƒ¦ãƒ¼ã‚¶ãƒ›ãƒ¼ãƒ ã«ä½œæˆã•ã‚Œã‚‹ï¼Ž
- \item タイプセットã®æ–¹æ³•ï¼ˆTeXã®ç¨®é¡žï¼‰\\
- \hspace*{10mm}通常ã¯ï¼Œplatex (p)ã¾ãŸã¯uplatex(u)ã‚’é¸ã¶ï¼Ž
- \item R,\ Maximaã§ã¯ï¼Œãƒãƒ¼ã‚¸ãƒ§ãƒ³ç•ªå·ï¼ˆ3.4.2,\ 5.37.3ãªã©ï¼‰ã‚’入れる.
\item ketcindyフォルダã«workフォルダã®ä¸­èº«ãŒã‚³ãƒ”ーã•ã‚Œã‚‹ï¼Ž
\item \verb|.ketcindy.conf|(編集å¯èƒ½ï¼‰ãŒãƒ¦ãƒ¼ã‚¶ãƒ›ãƒ¼ãƒ ã«ä½œæˆã•ã‚Œã‚‹ï¼Ž\\
\hspace*{10mm}注)TeXを切り替ãˆã‚‹ã¨ããªã©ã¯ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’修正ã™ã‚‹ï¼Ž
@@ -116,6 +117,7 @@ KETCindyã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ« (Windows)
\hspace*{5mm}ターミナル>環境設定 \verb|>|(プロファイル)\verb|>| シェル\\
\hspace*{10mm}「シェルãŒæ­£å¸¸ã«çµ‚了ã—ãŸå ´åˆé–‰ã˜ã‚‹ã€ã‚’é¸æŠž
\end{itemize}
+ \item[注)]インストール用ã®ketcindy(-master)フォルダã¯å‰Šé™¤ã—ãŸæ–¹ãŒæ··ä¹±ã—ãªã„.
\end{itemize}
\end{enumerate}