diff options
Diffstat (limited to 'Master/texmf-dist')
49 files changed, 2211 insertions, 1741 deletions
diff --git a/Master/texmf-dist/doc/support/ketcindy/README b/Master/texmf-dist/doc/support/ketcindy/README index 168cbe9a775..aabe9beb100 100644 --- a/Master/texmf-dist/doc/support/ketcindy/README +++ b/Master/texmf-dist/doc/support/ketcindy/README @@ -1,7 +1,7 @@ KeTCindy ======== -Version: 20190927.0 +Version: 20191225.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/setketcindy.sh b/Master/texmf-dist/doc/support/ketcindy/forLinux/setketcindy.sh index 79cc1e491da..d4c7b79ee7c 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 -# 20180616 +# 20181224 # Edit and uncomment the following lines if necessary texpath=/usr/share/texlive @@ -36,7 +36,7 @@ if [ ${ans} = "n" ]; then fi echo copying scripts -sudo cp -r -p scripts/ ${ketcindyscripts}/ +sudo cp -r -p -T scripts/ ${ketcindyscripts}/ if [ $? -gt 0 ]; then echo Error $? sleep 5 @@ -63,7 +63,7 @@ if [ -e KetCindyPlugin.jar ]; then sudo rm KetCindyPlugin.jar fi cd ${ketcindyscripts} -cp -p ketjava/KetCindyPlugin.jar ${cindyplug} +sudo cp -p ketjava/KetCindyPlugin.jar ${cindyplug} echo "KetCindyPlugin.jar copied to Cinderella" # 20190616from @@ -93,6 +93,12 @@ echo "Dirhead=\"${ketcindyscripts}\";" >> ketcindy.ini echo "Homehead=\"${homehead}\";" >> ketcindy.ini echo "setdirectory(Dirhead);" >> ketcindy.ini echo "import(\"setketcindy.txt\");" >> ketcindy.ini + +#191224from +read -p 'Language for Help (j/e) : ' lang +echo "Langhelp=\"${lang}\";" >> ketcindy.ini +#191224upto + echo "import(\"ketoutset.txt\");" >> ketcindy.ini echo "Choose TeX with the 1st(+2nd) character" @@ -116,7 +122,22 @@ if [ ${tex} = "lu" ]; then tex="lualatex" fi echo "PathT=PathThead+\"${tex}\";" >> ketcindy.ini + +read -p 'Number of default graphics (1=tpic, 2=pict2e, 3=tikz) : ' num +if [ ${num} = "1" ]; then + gc="tpic" +fi +if [ ${num} = "2" ]; then + gc="pict2e" +fi +if [ ${num} = "3" ]; then + gc="tikz" +fi +echo "Usegraphics(\"${gc}\");" >> ketcindy.ini + +read -p 'PDF viewer (ex) evince : ' pathpdf echo "Pathpdf=\"${pathpdf}\";" >> ketcindy.ini + echo "Mackc=\"bash\";" >> ketcindy.ini echo "ketcindy.ini generated(updated)" diff --git a/Master/texmf-dist/doc/support/ketcindy/forMac/ReadmeMacJ.pdf b/Master/texmf-dist/doc/support/ketcindy/forMac/ReadmeMacJ.pdf Binary files differindex a2079e6e4b6..ef0ec983324 100644 --- a/Master/texmf-dist/doc/support/ketcindy/forMac/ReadmeMacJ.pdf +++ b/Master/texmf-dist/doc/support/ketcindy/forMac/ReadmeMacJ.pdf diff --git a/Master/texmf-dist/doc/support/ketcindy/forMac/setketcindy.command b/Master/texmf-dist/doc/support/ketcindy/forMac/setketcindy.command index f6c36b14438..30c88b87ce7 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 -# 20190824 +# 20191224 # Edit, uncomment the following lines and choose 4 if necessary #texpath=/Applications/kettex/texlive @@ -116,6 +116,12 @@ echo "Dirhead=\"${ketcindyscripts}\";" >> ketcindy.ini echo "Homehead=\"${homehead}\";" >> ketcindy.ini echo "setdirectory(Dirhead);" >> ketcindy.ini echo "import(\"setketcindy.txt\");" >> ketcindy.ini + +#191224from +read -p 'Language for Help (j/e) : ' lang +echo "Langhelp=\"${lang}\";" >> ketcindy.ini +#191224upto + echo "import(\"ketoutset.txt\");" >> ketcindy.ini echo "Choose TeX with the 1st(+2nd) character" @@ -139,6 +145,19 @@ if [ ${tex} = "lu" ]; then tex="lualatex" fi echo "PathT=PathThead+\"${tex}\";" >> ketcindy.ini + +read -p 'Number of default graphics (1=tpic, 2=pict2e, 3=tikz) : ' num +if [ ${num} = "1" ]; then + gc="tpic" +fi +if [ ${num} = "2" ]; then + gc="pict2e" +fi +if [ ${num} = "3" ]; then + gc="tikz" +fi +echo "Usegraphics(\"${gc}\");" >> ketcindy.ini + echo "Pathpdf=\"preview\";" >> ketcindy.ini pathM="/Applications/Maxima.app/Contents/Resources/maxima.sh" diff --git a/Master/texmf-dist/doc/support/ketcindy/forWindows/setketcindykettex.bat b/Master/texmf-dist/doc/support/ketcindy/forWindows/setketcindykettex.bat index e00927639d8..07236f74018 100755 --- a/Master/texmf-dist/doc/support/ketcindy/forWindows/setketcindykettex.bat +++ b/Master/texmf-dist/doc/support/ketcindy/forWindows/setketcindykettex.bat @@ -1,4 +1,4 @@ -REM 20190616 +REM 20191224 echo off rem Edit the followings if necessary @@ -100,6 +100,12 @@ echo Homehead="%homehead%"; >> ketcindy.ini echo Dirhead="%pathT%%scripts%"; >> ketcindy.ini echo setdirectory(Dirhead); >> ketcindy.ini echo import("setketcindy.txt"); >> ketcindy.ini + +rem 20191224from +set /P STR_INPUT="Language for Help (j/e) :" +echo Langhelp="%STR_INPUT%"; >> ketcindy.ini +rem 20191224to + echo import("ketoutset.txt"); >> ketcindy.ini echo Setting of TeX, R, Maxima @@ -125,6 +131,18 @@ if "%STR_INPUT%" == "lu" ( ) echo PathT=PathThead+"%tex%"; >> ketcindy.ini +set /P STR_INPUT="Number of default graphics (1=tpic 2=pict2e 3=tikz) : " +if "%STR_INPUT%" == "1" ( + set gc=tpic +) +if "%STR_INPUT%" == "2" ( + set gc=pict2e +) +if "%STR_INPUT%" == "3" ( + set gc=tikz +) +echo Usegraphics("%gc%"); >> ketcindy.ini + set prgSm=C:\Program Files (x86)\SumatraPDF\SumatraPDF.exe if not exist "%prgSm%" ( set prgSm=C:\Program Files\SumatraPDF\SumatraPDF.exe diff --git a/Master/texmf-dist/doc/support/ketcindy/forWindows/setketcindyothertex.bat b/Master/texmf-dist/doc/support/ketcindy/forWindows/setketcindyothertex.bat index 4b35d0c9e8a..a3d8e36a66b 100755 --- a/Master/texmf-dist/doc/support/ketcindy/forWindows/setketcindyothertex.bat +++ b/Master/texmf-dist/doc/support/ketcindy/forWindows/setketcindyothertex.bat @@ -1,4 +1,4 @@ -REM 20190904 +REM 20191224 echo off set prgcin=C:\Program Files (x86) @@ -98,6 +98,12 @@ echo Homehead="%homehead%"; >> ketcindy.ini echo Dirhead="%pathT%\%texmf%\scripts\ketcindy"; >> ketcindy.ini echo setdirectory(Dirhead); >> ketcindy.ini echo import("setketcindy.txt"); >> ketcindy.ini + +rem 20191224from +set /P STR_INPUT="Language for Help (j/e) :" +echo Langhelp="%STR_INPUT%"; >> ketcindy.ini +rem 20191224to + echo import("ketoutset.txt"); >> ketcindy.ini echo Setting of TeX, R, Maxima @@ -123,6 +129,18 @@ if "%STR_INPUT%" == "lu" ( ) echo PathT=PathThead+"%tex%"; >> ketcindy.ini +set /P STR_INPUT="Number of default graphics (1=tpic 2=pict2e 3=tikz) : " +if "%STR_INPUT%" == "1" ( + set gc=tpic +) +if "%STR_INPUT%" == "2" ( + set gc=pict2e +) +if "%STR_INPUT%" == "3" ( + set gc=tikz +) +echo Usegraphics("%gc%"); >> ketcindy.ini + set prgSm=C:\Program Files (x86)\SumatraPDF\SumatraPDF.exe if not exist "%prgSm%" ( set prgSm=C:\Program Files\SumatraPDF\SumatraPDF.exe diff --git a/Master/texmf-dist/doc/support/ketcindy/forWindows/setketcindytexlive.bat b/Master/texmf-dist/doc/support/ketcindy/forWindows/setketcindytexlive.bat index e872a00b087..36b890889f0 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 20190904 +REM 20191224 echo off rem Edit the followings if necessary @@ -103,6 +103,12 @@ echo Homehead="%homehead%"; >> ketcindy.ini echo Dirhead="%pathT%\%year%%scripts%"; >> ketcindy.ini echo setdirectory(Dirhead); >> ketcindy.ini echo import("setketcindy.txt"); >> ketcindy.ini + +rem 20191224from +set /P STR_INPUT="Language for Help (j/e) :" +echo Langhelp="%STR_INPUT%"; >> ketcindy.ini +rem 20191224to + echo import("ketoutset.txt"); >> ketcindy.ini echo Setting of TeX, R, Maxima @@ -128,6 +134,18 @@ if "%STR_INPUT%" == "lu" ( ) echo PathT=PathThead+"%tex%"; >> ketcindy.ini +set /P STR_INPUT="Number of default graphics (1=tpic 2=pict2e 3=tikz) : " +if "%STR_INPUT%" == "1" ( + set gc=tpic +) +if "%STR_INPUT%" == "2" ( + set gc=pict2e +) +if "%STR_INPUT%" == "3" ( + set gc=tikz +) +echo Usegraphics("%gc%"); >> ketcindy.ini + set prgSm=C:\Program Files (x86)\SumatraPDF\SumatraPDF.exe if not exist "%prgSm%" ( set prgSm=C:\Program Files\SumatraPDF\SumatraPDF.exe diff --git a/Master/texmf-dist/doc/support/ketcindy/forWindows/setketcindyw32J.bat b/Master/texmf-dist/doc/support/ketcindy/forWindows/setketcindyw32J.bat index 719ae186e2b..fe6fba3c2d5 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 20190616 +REM 20191224 echo off rem Edit the followings if necessary @@ -101,6 +101,12 @@ echo Homehead="%homehead%"; >> ketcindy.ini echo Dirhead="%pathT%%scripts%"; >> ketcindy.ini echo setdirectory(Dirhead); >> ketcindy.ini echo import("setketcindy.txt"); >> ketcindy.ini + +rem 20191224from +set /P STR_INPUT="Language for Help (j/e) :" +echo Langhelp="%STR_INPUT%"; >> ketcindy.ini +rem 20191224to + echo import("ketoutset.txt"); >> ketcindy.ini echo Setting of TeX, R, Maxima @@ -132,6 +138,18 @@ if not exist "%prgSm%" ( ) echo Pathpdf="%prgSm%"; >> ketcindy.ini +set /P STR_INPUT="Number of default graphics (1=tpic 2=pict2e 3=tikz) : " +if "%STR_INPUT%" == "1" ( + set gc=tpic +) +if "%STR_INPUT%" == "2" ( + set gc=pict2e +) +if "%STR_INPUT%" == "3" ( + set gc=tikz +) +echo Usegraphics("%gc%"); >> ketcindy.ini + set /P STR_INPUT="Input version of R (ex)3.5.0 :" set verR=%STR_INPUT% set prg=C:\Program Files diff --git a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic1list.txt b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic1list.txt index 9ed585fb1bf..36dd27b91d4 100644 --- a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic1list.txt +++ b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic1list.txt @@ -1,150 +1,150 @@ -Ketinit,basic1,41,178,Fillstore,Cindyname,Indexall,getname,iswindows,ismacosx,Changesetting,Changework,pathsep,Setwindow,Strictmove -Initglist,basic1,182,185,Ketinit -Setglist,basic1,189,195 -Addglist,basic1,199,205 -Fillstore,basic1,209,242 -Fillblack,basic1,246,260,Fillstore -Fillrestore,basic1,264,276 -Readlines,basic1,280,291,readfile2str -Changesetting,basic1,295,310,pathsep,getname,isexists -Cindyname,basic1,314,321,Cdyname,Getcdyname -Setwindow,basic1,325,362,Toupper,LLcrd,Putpoint,Ptpos,Strictmove,Pcrd -Setfiles,basic1,366,379,Dqq -Setparent,basic1,383,395,Dqq -Reparse,basic1,399,409 -Dqq,basic1,413,413,DqDq -DqDq,basic1,416,419 -PPa,basic1,423,424 -PaO,basic1,428,440 -PaC,basic1,444,456 -PPa,basic1,460,460 -Tab2list,basic1,464,526,Divoptions,Toupper,Indexall -Columnlist,basic1,530,533 -Dispmat,basic1,537,559 -Sep1000,basic1,563,581 -Acos,basic1,585,588 -Asin,basic1,592,595 -Atan,basic1,599,602 -Sqr,basic1,606,609 -Factorial,basic1,613,621 -Norm,basic1,625,637 -Removespace,basic1,642,667 -Indexall,basic1,671,689 -Strsplit,basic1,693,704,Indexall -Parlevel,basic1,708,708,Bracket -Bracket,basic1,711,733,Indexall -Pardiagram,basic1,737,833,Divoptions,Toupper,Bracket,Listplot,Letter,Expr -Changework,basic1,837,895,Divoptions,Strsplit,Toupper,Indexall,isexists,Dqq,makedir,pathsep,iswindows,iskcexists,setexec -Changestyle,basic1,899,931,Divoptions,Com2nd,Getlinestyle,Texcom -Op,basic1,935,947 -Ptselected,basic1,951,967,|mouse -Finddef,basic1,971,990 -Findgeoinfo,basic1,994,1019,Finddef -Dependgeo,basic1,1023,1043,Finddef -Workprocess,basic1,1047,1051,Drawprocess -Drawprocess,basic1,1054,1099,Divoptions,Strsplit,Toupper,Dependgeo -Sortpointlist,basic1,1103,1135 -Toupper,basic1,1139,1154 -Textformat,basic1,1158,1182 -Sprintf,basic1,1186,1203,Textformat -Replaceall,basic1,1207,1217 -Assign,basic1,1221,1284,Textformat -Measuredepth,basic1,1315,1328,Indexall -Flattenlist,basic1,1332,1352,Measuredepth -Divoptions,basic1,1356,1459,Strsplit,Toupper,Colorcmyk2rgb,Colorname2rgb -Dotprod,basic1,1463,1469 -Crossprod,basic1,1473,1485 -Mvprod,basic1,1489,1507,Measuredepth -Ptstart,basic1,1511,1516 -Ptend,basic1,1520,1525 -Numptcrv,basic1,1529,1534 -Ptcrv,basic1,1538,1543 -Invert,basic1,1547,1560,Listplot -Paramoncrv,basic1,1564,1564,Paramoncurve -Paramoncurve,basic1,1567,1593,Nearestpt,LLcrd -Pointoncrv,basic1,1597,1597,Pointoncurve -Pointoncurve,basic1,1600,1618 -Koutenseg,basic1,1622,1731 -Intersectcrvspp,basic1,1737,1880,Divoptions,Measuredepth,LLcrd,Koutenseg -Intersectcrvs,basic1,1884,1890,Intersectcrvspp -Intersectline,basic1,1898,1920,Dotprod,Crossprod -Intersectseg,basic1,1924,2024,Op,Intersectline,Nearestpt -Osplineseg,basic1,2028,2045,Dotprod,Bezier -Intersectpartseg,basic1,2049,2151,Crossprod,Norm,Reflectpoint,Osplineseg,Intersectseg,Op,Intersectline -Collectsameseg,basic1,2155,2197 -Intersectcurvespp,basic1,2201,2307,LLcrd,Intersectpartseg,Collectsameseg,Nearestpt -Intersectcurves,basic1,2311,2318,Intersectcurvespp,190917 -Nearestptcrvphy,basic1,2324,2333,Pcrd,Measuredepth,Nearestpt -Nearestptcrv,basic1,2337,2343,Nearestpt -Nearestpt,basic1,2347,2400,Measuredepth,Paramoncurve -Derivative,basic1,2404,2495,Strsplit,Lineplot,Intersectcurvespp,Pointoncurve,Dotprod,Divoptions,Toupper,PaO,Pcrd,Assign -Tangentplot,basic1,2499,2546,Divoptions,Strsplit,Toupper,Intersectcurvespp,Derivative,Lineplot -Integrate,basic1,2550,2563,Integratefn,Integratedt -Integratedt,basic1,2567,2599,Divoptions,Toupper,IntegrateO,Measuredepth,MeetCurve,LLcrd -Integratefn,basic1,2603,2663,Divoptions,Toupper,Strsplit,Assign,IntegrateO,Textformat -IntegrateO,basic1,2667,2746,Measuredepth,Meetcurve,LLcrd,Dotprod -FindareaP,basic1,2750,2763,Lcrd -FindareaO,basic1,2767,2788,Dist,IntegrateO -Findarea,basic1,2792,2818,Divoptions,Strsplit,Toupper,FindareaO,FindareaP -Findlength,basic1,2822,2834,Lcrd -Inversefun,basic1,2838,2861,Textformat -Com0th,basic1,2865,2869 -Com1st,basic1,2873,2878 -Com2nd,basic1,2882,2887 -Com2ndpre,basic1,2891,2895 -Texcom,basic1,2899,2906,Com2nd -Ketcindylogo,basic1,2910,2914,Com2nd -Drwline,basic1,2918,2921,Textformat,Com2nd -Dashline,basic1,2926,2928,Com2nd -Invdashline,basic1,2932,2934,Com2nd -Dottedline,basic1,2938,2940,Com2nd -Drawlinetype,basic1,2944,2965,Toupper,Drwline,Dashline,Invdashline,Dottedline -Setunitlen,basic1,2969,3021 -Setmarklen,basic1,3025,3029,Com2nd,Textformat -Setorigin,basic1,3033,3037,Com2nd,Textformat -Fontsize,basic1,3041,3044,Com2nd -Setpen,basic1,3048,3052,Com2nd -Setscaling,basic1,3056,3070,Com0th,Setwindow -Lcrd,basic1,3074,3082 -Pcrd,basic1,3086,3094 -LLcrd,basic1,3098,3107 -Doscaling,basic1,3111,3138,Lcrd,LLcrd -Unscaling,basic1,3142,3169,Lcrd,LLcrd -Setpt,basic1,3173,3179,Ptsize,Com2nd -Definecolor,basic1,3183,3191,Texcom -Setcolor,basic1,3195,3222,Colorcmyk2rgb,Com2nd -Colorrgb2cmyk,basic1,3226,3238 -Colorcmyk2rgb,basic1,3242,3249 -Colorrgbhsv,basic1,3253,3285 -Colorhsvrgb,basic1,3289,3303 -Colorrgbhsl,basic1,3307,3343 -Colorhslrgb,basic1,3347,3368,Hue2rgb -Hue2rgb,basic1,3372,3390 -Colorrgbhwb,basic1,3394,3400,Colorrgbhsl,Colorcode -Colorhwbrgb,basic1,3404,3429 -Colorcode,basic1,3433,3446,Colorrgb2cmyk,Colorcmyk2rgb,Colorrgbhsv,Colorrgbhsl,Colorrgbhwb,Colorhsvrgb,Colorhslrgb,Colorhwbrgb -Colorname2rgb,basic1,3450,3500,Colorcmyk2rgb,Assign -Getlinestyle,basic1,3504,3569,Toupper,Drwline,Dashline,Invdashline,Dottedline,Textformat,Drwpt -Chunderscore,basic1,3573,3608,PaO -AddGraph,basic1,3612,3712,Divoptions,Flattenlist,Pcrd,Measuredepth,PaO,Textformat,Com2nd,Getlinestyle,Texcom -Joincrvs,basic1,3716,3812,LLcrd,Divoptions,Numptcrv,Ptstart,Ptend,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom -Partcrv,basic1,3816,3905,Measuredepth,Divoptions,Numptcrv,Ptstart,Ptend,Joincrvs,Nearestpt,LLcrd,Pcrd,Textformat,Lcrd,Com2nd,Getlinestyle,Texcom -Opcrvs,basic1,3909,3917,Listplot -Pointdata,basic1,3921,4065,Divoptions,Strsplit,Colorcmyk2rgb,Colorname2rgb,Toupper,Lcrd,Measuredepth,Pcrd,PaO,Texcom,Textformat,Com2nd -Listplot,basic1,4069,4150,Divoptions,Strsplit,Toupper,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom,Lcrd -Lineplot,basic1,4154,4237,Strsplit,Toupper,Divoptions,Lcrd,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom -Plotdata,basic1,4241,4446,Divoptions,Strsplit,PaO,Dqq,Toupper,Assign,Norm,Measuredepth,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom -Paramplot,basic1,4450,4622,Divoptions,Strsplit,PaO,Dqq,Toupper, differs from Scilab ,Assign,Measuredepth,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom -Polarplot,basic1,4626,4635,Strsplit,Paramplot -Connectseg,basic1,4639,4701,Norm -Implicitplot,basic1,4705,4888,Divoptions,Strsplit,Toupper,Impfun,Connectseg,Measuredepth,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom -Circledata,basic1,4892,5011,Divoptions,Strsplit,Toupper,Lcrd,Defvar,Lineplot,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom -Framedata,basic1,5015,5067,Measuredepth,LLcrd,Divoptions,Lcrd,Listplot -Framedata2,basic1,5071,5078,Lcrd,Framedata -Ovaldata,basic1,5082,5152,Divoptions,Lcrd,Listplot,Circledata,Reflectdata,Joincrvs,Com2nd,Getlinestyle,Texcom,Pcrd,Textformat -Segmark,basic1,5156,5216,Drawsegmark,Divoptions,Toupper,Circledata,Listplot -Parabolaplot,basic1,5220,5260,Lcrd,Rotatepoint,Textformat,Plotdata,Rotatedata -Ellipseplot,basic1,5264,5307,Lcrd,Rotatepoint,Paramplot,Rotatedata -Hyperbolaplot,basic1,5311,5375,Divoptions,Toupper,Lcrd,Rotatepoint,Paramplot,Lineplot,Rotatedata -Polygonplot,basic1,5379,5425,Divoptions,Strsplit,Toupper,Lcrd,Putpoint,Listplot -Putintersect,basic1,5429,5457,Intersectcrvs,Putpoint +Ketinit,basic1,41,179,Fillstore,Usegraphics,Cindyname,Indexall,getname,iswindows,ismacosx,Changesetting,Changework,pathsep,Setwindow,Strictmove +Initglist,basic1,183,186,Ketinit +Setglist,basic1,190,196 +Addglist,basic1,200,206 +Fillstore,basic1,210,243 +Fillblack,basic1,247,261,Fillstore +Fillrestore,basic1,265,277 +Readlines,basic1,281,292,readfile2str +Changesetting,basic1,296,311,pathsep,getname,isexists +Cindyname,basic1,315,322,Cdyname,Getcdyname +Setwindow,basic1,326,375,LLcrd,Putpoint,Ptpos,Strictmove,Pcrd,Toupper +Setfiles,basic1,379,392,Dqq +Setparent,basic1,396,408,Dqq +Reparse,basic1,412,422 +Dqq,basic1,426,426,DqDq +DqDq,basic1,429,432 +PPa,basic1,436,437 +PaO,basic1,441,453 +PaC,basic1,457,469 +PPa,basic1,473,473 +Tab2list,basic1,477,539,Divoptions,Toupper,Indexall +Columnlist,basic1,543,546 +Dispmat,basic1,550,572 +Sep1000,basic1,576,594 +Acos,basic1,598,601 +Asin,basic1,605,608 +Atan,basic1,612,615 +Sqr,basic1,619,622 +Factorial,basic1,626,634 +Norm,basic1,638,650 +Removespace,basic1,655,680 +Indexall,basic1,684,702 +Strsplit,basic1,706,717,Indexall +Parlevel,basic1,721,721,Bracket +Bracket,basic1,724,746,Indexall +Pardiagram,basic1,750,846,Divoptions,Toupper,Bracket,Listplot,Letter,Expr +Changework,basic1,850,908,Divoptions,Strsplit,Toupper,Indexall,isexists,Dqq,makedir,pathsep,iswindows,iskcexists,setexec +Changestyle,basic1,912,965,Divoptions,Com2nd,Getlinestyle,Texcom +Op,basic1,969,981 +Ptselected,basic1,985,1001,|mouse +Finddef,basic1,1005,1024 +Findgeoinfo,basic1,1028,1053,Finddef +Dependgeo,basic1,1057,1077,Finddef +Workprocess,basic1,1081,1085,Drawprocess +Drawprocess,basic1,1088,1133,Divoptions,Strsplit,Toupper,Dependgeo +Sortpointlist,basic1,1137,1169 +Toupper,basic1,1173,1188 +Textformat,basic1,1192,1216 +Sprintf,basic1,1220,1237,Textformat +Replaceall,basic1,1241,1251 +Assign,basic1,1255,1318,Textformat +Measuredepth,basic1,1349,1362,Indexall +Flattenlist,basic1,1366,1386,Measuredepth +Divoptions,basic1,1390,1493,Strsplit,Toupper,Colorcmyk2rgb,Colorname2rgb +Dotprod,basic1,1497,1503 +Crossprod,basic1,1507,1519 +Mvprod,basic1,1523,1541,Measuredepth +Ptstart,basic1,1545,1550 +Ptend,basic1,1554,1559 +Numptcrv,basic1,1563,1568 +Ptcrv,basic1,1572,1577 +Invert,basic1,1581,1594,Listplot +Paramoncrv,basic1,1598,1598,Paramoncurve +Paramoncurve,basic1,1601,1627,Nearestpt,LLcrd +Pointoncrv,basic1,1631,1631,Pointoncurve +Pointoncurve,basic1,1634,1652 +Koutenseg,basic1,1656,1765 +Intersectcrvspp,basic1,1771,1914,Divoptions,Measuredepth,LLcrd,Koutenseg +Intersectcrvs,basic1,1918,1924,Intersectcrvspp +Intersectline,basic1,1932,1954,Dotprod,Crossprod +Intersectseg,basic1,1958,2058,Op,Intersectline,Nearestpt +Osplineseg,basic1,2062,2079,Dotprod,Bezier +Intersectpartseg,basic1,2083,2185,Crossprod,Norm,Reflectpoint,Osplineseg,Intersectseg,Op,Intersectline +Collectsameseg,basic1,2189,2231 +Intersectcurvespp,basic1,2235,2341,LLcrd,Intersectpartseg,Collectsameseg,Nearestpt +Intersectcurves,basic1,2345,2352,Intersectcurvespp,190917 +Nearestptcrvphy,basic1,2358,2367,Pcrd,Measuredepth,Nearestpt +Nearestptcrv,basic1,2371,2377,Nearestpt +Nearestpt,basic1,2381,2434,Measuredepth,Paramoncurve +Derivative,basic1,2438,2529,Strsplit,Lineplot,Intersectcurvespp,Pointoncurve,Dotprod,Divoptions,Toupper,PaO,Pcrd,Assign +Tangentplot,basic1,2533,2580,Divoptions,Strsplit,Toupper,Intersectcurvespp,Derivative,Lineplot +Integrate,basic1,2584,2597,Integratefn,Integratedt +Integratedt,basic1,2601,2633,Divoptions,Toupper,IntegrateO,Measuredepth,MeetCurve,LLcrd +Integratefn,basic1,2637,2697,Divoptions,Toupper,Strsplit,Assign,IntegrateO,Textformat +IntegrateO,basic1,2701,2780,Measuredepth,Meetcurve,LLcrd,Dotprod +FindareaP,basic1,2784,2797,Lcrd +FindareaO,basic1,2801,2822,Dist,IntegrateO +Findarea,basic1,2826,2852,Divoptions,Strsplit,Toupper,FindareaO,FindareaP +Findlength,basic1,2856,2868,Lcrd +Inversefun,basic1,2872,2895,Textformat +Com0th,basic1,2899,2903 +Com1st,basic1,2907,2912 +Com2nd,basic1,2916,2921 +Com2ndpre,basic1,2925,2929 +Texcom,basic1,2933,2940,Com2nd +Ketcindylogo,basic1,2944,2948,Com2nd +Drwline,basic1,2952,2955,Textformat,Com2nd +Dashline,basic1,2960,2962,Com2nd +Invdashline,basic1,2966,2968,Com2nd +Dottedline,basic1,2972,2974,Com2nd +Drawlinetype,basic1,2978,2999,Toupper,Drwline,Dashline,Invdashline,Dottedline +Setunitlen,basic1,3003,3055 +Setmarklen,basic1,3059,3063,Com2nd,Textformat +Setorigin,basic1,3067,3071,Com2nd,Textformat +Fontsize,basic1,3075,3078,Com2nd +Setpen,basic1,3082,3086,Com2nd +Setscaling,basic1,3090,3104,Com0th,Setwindow +Lcrd,basic1,3108,3116 +Pcrd,basic1,3120,3128 +LLcrd,basic1,3132,3141 +Doscaling,basic1,3145,3172,Lcrd,LLcrd +Unscaling,basic1,3176,3203,Lcrd,LLcrd +Setpt,basic1,3207,3213,Ptsize,Com2nd +Definecolor,basic1,3217,3225,Texcom +Setcolor,basic1,3229,3256,Colorcmyk2rgb,Com2nd +Colorrgb2cmyk,basic1,3260,3272 +Colorcmyk2rgb,basic1,3276,3283 +Colorrgbhsv,basic1,3287,3319 +Colorhsvrgb,basic1,3323,3337 +Colorrgbhsl,basic1,3341,3377 +Colorhslrgb,basic1,3381,3402,Hue2rgb +Hue2rgb,basic1,3406,3424 +Colorrgbhwb,basic1,3428,3434,Colorrgbhsl,Colorcode +Colorhwbrgb,basic1,3438,3463 +Colorcode,basic1,3467,3480,Colorrgb2cmyk,Colorcmyk2rgb,Colorrgbhsv,Colorrgbhsl,Colorrgbhwb,Colorhsvrgb,Colorhslrgb,Colorhwbrgb +Colorname2rgb,basic1,3484,3534,Colorcmyk2rgb,Assign +Getlinestyle,basic1,3538,3603,Toupper,Drwline,Dashline,Invdashline,Dottedline,Textformat,Drwpt +Chunderscore,basic1,3607,3642,PaO +AddGraph,basic1,3646,3746,Divoptions,Flattenlist,Pcrd,Measuredepth,PaO,Textformat,Com2nd,Getlinestyle,Texcom +Joincrvs,basic1,3750,3846,LLcrd,Divoptions,Numptcrv,Ptstart,Ptend,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom +Partcrv,basic1,3850,3939,Measuredepth,Divoptions,Numptcrv,Ptstart,Ptend,Joincrvs,Nearestpt,LLcrd,Pcrd,Textformat,Lcrd,Com2nd,Getlinestyle,Texcom +Opcrvs,basic1,3943,3951,Listplot +Pointdata,basic1,3955,4100,Divoptions,Strsplit,Colorcmyk2rgb,Colorname2rgb,Toupper,Lcrd,Measuredepth,Pcrd,PaO,Texcom,Textformat,Com2nd +Listplot,basic1,4104,4185,Divoptions,Strsplit,Toupper,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom,Lcrd +Lineplot,basic1,4189,4272,Strsplit,Toupper,Divoptions,Lcrd,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom +Plotdata,basic1,4276,4481,Divoptions,Strsplit,PaO,Dqq,Toupper,Assign,Norm,Measuredepth,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom +Paramplot,basic1,4485,4657,Divoptions,Strsplit,PaO,Dqq,Toupper, differs from Scilab ,Assign,Measuredepth,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom +Polarplot,basic1,4661,4670,Strsplit,Paramplot +Connectseg,basic1,4674,4736,Norm +Implicitplot,basic1,4740,4923,Divoptions,Strsplit,Toupper,Impfun,Connectseg,Measuredepth,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom +Circledata,basic1,4927,5046,Divoptions,Strsplit,Toupper,Lcrd,Defvar,Lineplot,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom +Framedata,basic1,5050,5117,Measuredepth,LLcrd,Divoptions,Toupper,Lcrd,Listplot +Framedata2,basic1,5121,5128,Lcrd,Framedata +Ovaldata,basic1,5132,5202,Divoptions,Lcrd,Listplot,Circledata,Reflectdata,Joincrvs,Com2nd,Getlinestyle,Texcom,Pcrd,Textformat +Segmark,basic1,5206,5266,Drawsegmark,Divoptions,Toupper,Circledata,Listplot +Parabolaplot,basic1,5270,5310,Lcrd,Rotatepoint,Textformat,Plotdata,Rotatedata +Ellipseplot,basic1,5314,5357,Lcrd,Rotatepoint,Paramplot,Rotatedata +Hyperbolaplot,basic1,5361,5425,Divoptions,Toupper,Lcrd,Rotatepoint,Paramplot,Lineplot,Rotatedata +Polygonplot,basic1,5429,5475,Divoptions,Strsplit,Toupper,Lcrd,Putpoint,Listplot +Putintersect,basic1,5479,5507,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 0e6e2a577c9..dae7a9563a6 100644 --- a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic2list.txt +++ b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic2list.txt @@ -1,99 +1,99 @@ Drwfigs,basic2,22,24,Drawfigures Drawfigures,basic2,28,106,Divoptions,Strsplit,Toupper,Measuredepth,Pointdata,Listplot,Dqq Setarrow,basic2,110,136 -Arrowheaddata,basic2,140,233,Divoptions,Strsplit,Toupper,Touppera,Measuredepth,Nearestpt,|Ptend,Ptstart,Numptcrv,Ptcrv,LLcrd,Intersectcrvspp,Pcrd -Arrowhead,basic2,237,329,Strsplit,Toupper,Measuredepth,Pcrd,Arrowheaddata,Inwindow,Listplot,Divoptions,Dqq,Textformat,LLcrd,Com2nd,Texcom -Arrowdata,basic2,333,335,Lightarrowdata -OldArrowdata,basic2,339,453,Arrowdata,Divoptions,Strsplit,Toupper,Pcrd,Textformat,Listplot,LLcrd,Arrowhead,Setscaling,Lcrd -Lightarrowdata,basic2,457,578,Pcrd,Divoptions,Strsplit,Toupper,Listplot,Textformat,LLcrd,Indexall,Dqq,Com2nd,Texcom,Setscaling,Lcrd -Anglemark,basic2,582,715,Divoptions,Indexall,Strsplit,Dqq,Toupper,Lcrd,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom -Paramark,basic2,719,829,Divoptions,Indexall,Strsplit,Dqq,Toupper,Lcrd,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom -Makebowdata,basic2,833,846,Lcrd,Rotatepoint -Bowdata,basic2,850,1021,Divoptions,Lcrd,Strsplit,Toupper,Makebowdata,Defvar,Norm,LLcrd,Dqq,Measuredepth,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom -Bowname,basic2,1025,1028,Expr -Bownamerot,basic2,1032,1046,Measuredepth,Ptend,Ptstart,Exprrot -Deqdata,basic2,1050,1108,funP,Lcrd,funN -Deqplot,basic2,1112,1256,Lcrd,Divoptions,Toupper,Indexall,Deqdata,Pcrd,Assign,Textformat,RSform,Com2nd,Getlinestyle,Texcom -Enclosing,basic2,1260,1423,Enclosing2,Divoptions,isList,Lcrd,Listplot,Intersectcurvespp,Prepend,Op,Length,Partcrv,Pointoncurve,Pcrd,PaO,Textformat,Com2nd,Getlinestyle,Texcom,LLcrd -Makehatch,basic2,1429,1531,Lineplot,Intersectseg,Norm,Listplot -Anyselected,basic2,1535,1543 -Hatchdata,basic2,1547,1843,HatchdataR,Hatchdatacindy,Listplot,Joincrvs,Enclosing2,Divoptions,Strsplit,Toupper,Anyselected,Bracket,isexists,ReadOutData,Makehatch,Textformat,PaO,Com2nd,Getlinestyle,Texcom,WriteOutData,LLcrd -Shadein,basic2,1847,1934,Framedata,Partcrv,Paramoncrv,Listplot,Intersectcurvespp,Pointoncrv,Joincrvs,Inwindow -Shade,basic2,1938,2066,Divoptions,Strsplit,Toupper,Colorcmyk2rgb,Enclosing,Shadein,Listplot,Joincrvs,Pcrd,PaO,Textformat,Dqq -Rotatepoint,basic2,2072,2082,Lcrd -Translatepoint,basic2,2086,2096,Lcrd -Scalepoint,basic2,2100,2110,Lcrd -Reflectpoint,basic2,2114,2139,Lcrd -Rotatedata,basic2,2143,2229,Divoptions,Lcrd,Strsplit,Toupper,Measuredepth,LLcrd,Pcrd,Textformat,RSform,Com2nd,Getlinestyle,Texcom -Translatedata,basic2,2233,2311,Divoptions,Strsplit,Toupper,Lcrd,Measuredepth,LLcrd,Pcrd,RSform,Textformat,Com2nd,Getlinestyle,Texcom -Scaledata,basic2,2315,2417,Divoptions,Lcrd,Strsplit,Toupper,Measuredepth,LLcrd,Pcrd,Textformat,RSform,Com2nd,Getlinestyle,Texcom -Reflectdata,basic2,2421,2515,Divoptions,Strsplit,Toupper,Lcrd,Measuredepth,LLcrd,Pcrd,RSform,Textformat,Com2nd,Getlinestyle,Texcom -Mksegments,basic2,2520,2535,Listplot -Mkcircles,basic2,2540,2560,Strsplit,Circledata -MakeRarg,basic2,2564,2577,RSslash,Textformat -Htickmark,basic2,2581,2604,Listplot,Expr -Vtickmark,basic2,2608,2629,Listplot,Expr,180710to// tmp=MakeRarg -Vtick,basic2,2633,2643,Listplot -Htick,basic2,2647,2659,LLcrd,Listplot -Setax,basic2,2663,2687,Divoptions -Drwxy,basic2,2691,2797,Divoptions,Strsplit,Toupper,Lightarrowdata,Listplot,Expr,Letter,Addax -Drwpt,basic2,2801,2810,Pointdata -Drawpoint,basic2,2813,2841,Measuredepth,Textformat,Com2nd,Setpen -Addax,basic2,2845,2848 -Expr,basic2,2852,2867,Letter -Letter,basic2,2871,2972,Divoptions,Removespace,Strsplit,Toupper,RSslash,Com2nd,Lcrd,Texcom,Pcrd -Letterrot,basic2,2976,3018,Divoptions,Letter,Com2nd,Dqq,Texcom -Exprrot,basic2,3022,3065,Divoptions,Expr,Com2nd,Dqq,Texcom -Ptpos,basic2,3069,3089,Textformat -Strictmove,basic2,3093,3113,textformat,Textformat -Slider,basic2,3117,3164,Toupper,Strsplit,Indexall,textformat,Listplot,Putonseg -Putpoint,basic2,3168,3179,Textformat,Pcrd -Bezierpt,basic2,3183,3208,Lcrd -Bezier,basic2,3212,3224,Beziercurve -Beziercurve,basic2,3228,3305,Divoptions,Measuredepth,Lcrd,Bezierpt,Pcrd,Textformat,RSform,Com2nd,Getlinestyle,Texcom -Putbezierdata,basic2,3309,3371,Divoptions,Putpoint,Lcrd,Letter -Bezierstart,basic2,3375,3377 -Mkbezierptcrv,basic2,3381,3407,Readcsvsla,Measuredepth,Putbezierdata,Bezier -Mkbeziercrv,basic2,3411,3422,Measuredepth,Bezier -Ospline,basic2,3426,3485,Dotprod,Lcrd,Bezier -CRspline,basic2,3489,3535,Lcrd,Reflectpoint,Bezier -Beziersmooth,basic2,3539,3600,Bzspline,Putpoint,Lcrd,Bezier -Beziersym,basic2,3604,3653,Bzsspline,Putpoint,Lcrd,Bezier -Listbspline2bz,basic2,3657,3672,Lcrd -Bspline,basic2,3676,3684,Listbspline2bz,BezierCurve -Meetcurve,basic2,3688,3748,Measuredepth,LLcrd,Lcrd -Putonline,basic2,3752,3772,LLcrd,Lineplot,Putonseg -Putonseg,basic2,3776,3812,LLcrd,Divoptions,Lcrd,Putpoint,Pcrd,Textformat -Putoncurve,basic2,3816,3845,putoncurve,Putpoint,Paramoncurve,Putonseg,Textformat,Ptend -Crosspoint,basic2,3849,3867,MeetCurve,Putpoint -Periodfun,basic2,3871,4004,Divoptions,Strsplit,Toupper,Plotdata,Translatedata,Setscaling,Norm,Listplot,Textformat -Mkcstable,basic2,4008,4024,Textformat -Fourierseries,basic2,4028,4095,Divoptions,Strsplit,Toupper,Deffun,Plotdata,Assign,Listplot -Tabledata,basic2,4099,4121,Divoptions,Toupper,Tabledatageo,Tabledatalight -Tabledatalight,basic2,4125,4244,Divoptions,Strsplit,Toupper,Tlistplot,Changetablestyle,Addax,Setwindow -Tabledatageo,basic2,4248,4312,Divoptions,Strsplit,Toupper,Putpoint,Tabledatalight -Tgrid,basic2,4316,4331 -Tlistplot,basic2,4335,4364,divoptions,Toupper,Tgrid,Listplot -Changetablestyle,basic2,4368,4456,Indexall,Changestyle,Replaceall,Tlistplot -Findcell,basic2,4460,4486,Tgrid -Putcell,basic2,4490,4525,Findcell,Letter -Putcellexpr,basic2,4529,4541,Putcell -Putrow,basic2,4545,4560,Putcellrow,Putcell -Putrowexpr,basic2,4564,4577,Putrow -Putcol,basic2,4581,4596,Putcellexpr,Putcell -Putcolexpr,basic2,4600,4613,Putcellexpr,Putcol -Setrange,basic2,4617,4623,Pcrd -Inwindow,basic2,4627,4639 -Dashlinedata,basic2,4643,4716 -Windispg,basic2,4720,4787,Drwxy,Measuredepth,Dashlinedata,Textformat -Extractdata,basic2,4792,4848,Divoptions,Com2nd,Getlinestyle,Texcom -Removeout,basic2,4852,4862 -Makecmdlist,basic2,4866,4896 -Savecmdlist,basic2,4900,4906 -Quicksort,basic2,4910,4930 -Lessstr,basic2,4934,4961 -Makehelplist,basic2,4965,5009,PPa -Helplist,basic2,5013,5067,Makehelplist -Help,basic2,5071,5122 -Helpkey,basic2,5126,5144,Help -Example,basic2,5148,5172 +Arrowheaddata,basic2,140,247,Divoptions,Lcrd,Measuredepth,191203,Ptcrv,Nearestpt,Circledata,Intersectcrvspp,Norm,Ptend,Ptstart,Translatepoint,Setscaling,LLcrd +Arrowhead,basic2,251,316,Divoptions,Strsplit,Toupper,Arrowheaddata,Inwindow,Textformat,Pcrd,Norm,Ptend,Ptstart,Nearestpt,Partcrv,Changestyle,Shade,Listplot +Arrowdata,basic2,320,328,Arrowdataseg +Oldarrowdata,basic2,332,446,Oldrrowdata,Divoptions,Strsplit,Toupper,Pcrd,Textformat,Listplot,LLcrd,Arrowhead,Setscaling,Lcrd +Arrowdataseg,basic2,450,548,Divoptions,Strsplit,Toupper,Shade,Listplot,Setscaling,LLcrd +Anglemark,basic2,552,685,Divoptions,Indexall,Strsplit,Dqq,Toupper,Lcrd,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom +Paramark,basic2,689,799,Divoptions,Indexall,Strsplit,Dqq,Toupper,Lcrd,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom +Makebowdata,basic2,803,816,Lcrd,Rotatepoint +Bowdata,basic2,820,991,Divoptions,Lcrd,Strsplit,Toupper,Makebowdata,Defvar,Norm,LLcrd,Dqq,Measuredepth,Pcrd,Textformat,Com2nd,Getlinestyle,Texcom +Bowname,basic2,995,998,Expr +Bownamerot,basic2,1002,1016,Measuredepth,Ptend,Ptstart,Exprrot +Deqdata,basic2,1020,1078,funP,Lcrd,funN +Deqplot,basic2,1082,1226,Lcrd,Divoptions,Toupper,Indexall,Deqdata,Pcrd,Assign,Textformat,RSform,Com2nd,Getlinestyle,Texcom +Enclosing,basic2,1230,1393,Enclosing2,Divoptions,isList,Lcrd,Listplot,Intersectcurvespp,Prepend,Op,Length,Partcrv,Pointoncurve,Pcrd,PaO,Textformat,Com2nd,Getlinestyle,Texcom,LLcrd +Makehatch,basic2,1399,1501,Lineplot,Intersectseg,Norm,Listplot +Anyselected,basic2,1505,1513 +Hatchdata,basic2,1517,1813,HatchdataR,Hatchdatacindy,Listplot,Joincrvs,Enclosing2,Divoptions,Strsplit,Toupper,Anyselected,Bracket,isexists,ReadOutData,Makehatch,Textformat,PaO,Com2nd,Getlinestyle,Texcom,WriteOutData,LLcrd +Shadein,basic2,1817,1904,Framedata,Partcrv,Paramoncrv,Listplot,Intersectcurvespp,Pointoncrv,Joincrvs,Inwindow +Shade,basic2,1908,2042,Divoptions,Strsplit,Toupper,Colorcmyk2rgb,Enclosing,Shadein,Listplot,Joincrvs,Pcrd,PaO,Textformat,Dqq +Rotatepoint,basic2,2046,2056,Lcrd +Translatepoint,basic2,2060,2070,Lcrd +Scalepoint,basic2,2074,2084,Lcrd +Reflectpoint,basic2,2088,2113,Lcrd +Rotatedata,basic2,2117,2203,Divoptions,Lcrd,Strsplit,Toupper,Measuredepth,LLcrd,Pcrd,Textformat,RSform,Com2nd,Getlinestyle,Texcom +Translatedata,basic2,2207,2285,Divoptions,Strsplit,Toupper,Lcrd,Measuredepth,LLcrd,Pcrd,RSform,Textformat,Com2nd,Getlinestyle,Texcom +Scaledata,basic2,2289,2391,Divoptions,Lcrd,Strsplit,Toupper,Measuredepth,LLcrd,Pcrd,Textformat,RSform,Com2nd,Getlinestyle,Texcom +Reflectdata,basic2,2395,2489,Divoptions,Strsplit,Toupper,Lcrd,Measuredepth,LLcrd,Pcrd,RSform,Textformat,Com2nd,Getlinestyle,Texcom +Mksegments,basic2,2494,2509,Listplot +Mkcircles,basic2,2514,2534,Strsplit,Circledata +MakeRarg,basic2,2538,2551,RSslash,Textformat +Htickmark,basic2,2555,2578,Listplot,Expr +Vtickmark,basic2,2582,2603,Listplot,Expr,180710to// tmp=MakeRarg +Vtick,basic2,2607,2617,Listplot +Htick,basic2,2621,2633,LLcrd,Listplot +Setax,basic2,2637,2661,Divoptions +Drwxy,basic2,2665,2771,Divoptions,Strsplit,Toupper,Arrowdataseg,Listplot,Expr,Letter,Addax +Drwpt,basic2,2775,2784,Pointdata +Drawpoint,basic2,2787,2815,Measuredepth,Textformat,Com2nd,Setpen +Addax,basic2,2819,2822 +Expr,basic2,2826,2841,Letter +Letter,basic2,2845,2946,Divoptions,Removespace,Strsplit,Toupper,RSslash,Com2nd,Lcrd,Texcom,Pcrd +Letterrot,basic2,2950,2992,Divoptions,Letter,Com2nd,Dqq,Texcom +Exprrot,basic2,2996,3039,Divoptions,Expr,Com2nd,Dqq,Texcom +Ptpos,basic2,3043,3063,Textformat +Strictmove,basic2,3067,3087,textformat,Textformat +Slider,basic2,3091,3138,Toupper,Strsplit,Indexall,textformat,Listplot,Putonseg +Putpoint,basic2,3142,3154,Ptpos,Textformat,Pcrd +Bezierpt,basic2,3158,3183,Lcrd +Bezier,basic2,3187,3199,Beziercurve +Beziercurve,basic2,3203,3280,Divoptions,Measuredepth,Lcrd,Bezierpt,Pcrd,Textformat,RSform,Com2nd,Getlinestyle,Texcom +Putbezierdata,basic2,3284,3346,Divoptions,Putpoint,Lcrd,Letter +Bezierstart,basic2,3350,3352 +Mkbezierptcrv,basic2,3356,3382,Readcsvsla,Measuredepth,Putbezierdata,Bezier +Mkbeziercrv,basic2,3386,3397,Measuredepth,Bezier +Ospline,basic2,3401,3460,Dotprod,Lcrd,Bezier +CRspline,basic2,3464,3510,Lcrd,Reflectpoint,Bezier +Beziersmooth,basic2,3514,3575,Bzspline,Putpoint,Lcrd,Bezier +Beziersym,basic2,3579,3628,Bzsspline,Putpoint,Lcrd,Bezier +Listbspline2bz,basic2,3632,3647,Lcrd +Bspline,basic2,3651,3659,Listbspline2bz,BezierCurve +Meetcurve,basic2,3663,3723,Measuredepth,LLcrd,Lcrd +Putonline,basic2,3727,3747,LLcrd,Lineplot,Putonseg +Putonseg,basic2,3751,3787,LLcrd,Divoptions,Lcrd,Putpoint,Pcrd,Textformat +Putoncurve,basic2,3791,3820,putoncurve,Putpoint,Paramoncurve,Putonseg,Textformat,Ptend +Crosspoint,basic2,3824,3842,MeetCurve,Putpoint +Periodfun,basic2,3846,3979,Divoptions,Strsplit,Toupper,Plotdata,Translatedata,Setscaling,Norm,Listplot,Textformat +Mkcstable,basic2,3983,3999,Textformat +Fourierseries,basic2,4003,4070,Divoptions,Strsplit,Toupper,Deffun,Plotdata,Assign,Listplot +Tabledata,basic2,4074,4103,Divoptions,Strsplit,Toupper,Tabledatageo,Tabledatalight +Tabledatalight,basic2,4107,4235,Divoptions,Strsplit,Toupper,Tlistplot,Dqq,Changetablestyle,Addax,Setwindow +Tabledatageo,basic2,4239,4303,Divoptions,Strsplit,Toupper,Putpoint,Tabledatalight +Tgrid,basic2,4307,4322 +Tlistplot,basic2,4326,4355,divoptions,Toupper,Tgrid,Listplot +Changetablestyle,basic2,4359,4447,Indexall,Changestyle,Replaceall,Tlistplot +Findcell,basic2,4451,4477,Tgrid +Putcell,basic2,4481,4516,Findcell,Letter +Putcellexpr,basic2,4520,4532,Putcell +Putrow,basic2,4536,4551,Putcellrow,Putcell +Putrowexpr,basic2,4555,4568,Putrow +Putcol,basic2,4572,4587,Putcellexpr,Putcell +Putcolexpr,basic2,4591,4604,Putcellexpr,Putcol +Setrange,basic2,4608,4614,Pcrd +Inwindow,basic2,4618,4630 +Dashlinedata,basic2,4634,4707 +Windispg,basic2,4711,4778,Drwxy,Measuredepth,Dashlinedata,Textformat +Extractdata,basic2,4783,4839,Divoptions,Com2nd,Getlinestyle,Texcom +Removeout,basic2,4843,4853 +Makecmdlist,basic2,4857,4887 +Savecmdlist,basic2,4891,4897 +Quicksort,basic2,4901,4921 +Lessstr,basic2,4925,4952 +Makehelplist,basic2,4956,5000,PPa +Helplist,basic2,5004,5058,Makehelplist +Help,basic2,5062,5113 +Helpkey,basic2,5117,5135,Help +Example,basic2,5139,5163 diff --git a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic3list.txt b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic3list.txt index a5d8260177a..fe1755cc0e4 100644 --- a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic3list.txt +++ b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/basic3list.txt @@ -19,44 +19,44 @@ Makeshell,basic3,927,1027,kc,Indexall,Dqq Convsjiswin,basic3,1031,1055,nkfwin,nkfcpdel,isexists,pathsep Makebat,basic3,1059,1197,kc,iswindows,isincludefull,isexists,Indexall,Dqq Addpackage,basic3,1201,1219 -Usegraphics,basic3,1223,1233,Addpackage -Viewtex,basic3,1237,1311,iswindows,Makebat,kc,Makeshell,WritetoRS -Viewparent,basic3,1315,1333,isexists,iswindows,Makebat,Makeshell,WritetoRS,kc -Figpdf,basic3,1337,1457,Removespace,isexists -Slidework,basic3,1461,1480,isexists,makedir,pathsep,Changework -Setslidemargin,basic3,1484,1487 -Setslidepage,basic3,1491,1516 -Setslidemain,basic3,1520,1544 -Setslidebody,basic3,1548,1585 -Setslidehyper,basic3,1589,1667,Divoptions,Addpackage,Indexall,Toupper -Settitle,basic3,1671,1742,Toupper,Indexall -Maketitle,basic3,1746,1841,iswindows,Makebat,Makeshell,kc,Cindyname,isexists,PaO -Repeatsameslide,basic3,1845,2000,Indexall -Presentation,basic3,2004,2669,readfile2str,isexists,Removespace,fileslist,Repeatsameslide -Mkslides,basic3,2673,2737,Fillblack,Changework,Setdirectory,setexec,isexists,Presentation,iswindows,Makebat,Makeshell,kc,pathsep,Fillrestore -Mkslidesummary,basic3,2741,2806,Fillblack,pathsep,ismacosx,setexec,PPa,PaO,CalcbyR,iswindows,Makebat,Makeshell,kc,Changework,Fillstore -BBdata,basic3,2810,2953,Divoptions,Toupper,ismacosx,Dqq,iswindows,kc,Sprintf,Removespace -Gcd,basic3,2957,2969 -Fracform,basic3,2973,3010 -Totexformpart,basic3,3014,3082,Bracket,Strsplit,Assign -Totexform,basic3,3086,3149,Totexformpart,Indexall,Bracket -Tocindyformpart,basic3,3153,3221,Bracket,Strsplit,Assign -Tocindyform,basic3,3225,3263,Bracket,Indexall,Tocindyformpart -Animepar,basic3,3267,3267,Animationparam -Animationparam,basic3,3271,3290,seconds,stopanimation -Copyketcindyjs,basic3,3294,3355,iswindows,Dqq,kc -Ketjsoption,basic3,3359,3360,Setketcindyjs -Setketcindyjs,basic3,3364,3373 -Ketcindyjsbody,basic3,3377,3381 -Ketcindyjsdata,basic3,3385,3425,Textformat,Dqq,set -Findfun,basic3,3429,3496,Removespace,Indexall -Extractfun,basic3,3500,3517,Indexall,Findfun -Extractall,basic3,3526,3570 -Textedit,basic3,3574,3580 -Textedit2value,basic3,3584,3626,Toupper,Textedit,Removespace,Tocindyform,Totexform,Tomaxform,Strsplit -Parsejson,basic3,3630,3683, unicode -Resizetextsize,basic3,3687,3711,Parsejson -Movetojs,basic3,3715,3723 -Movetojsexe,basic3,3727,3743,Dqq,Parsejson -Setplaybuttons,basic3,3747,3772,Movetojs -Mkketcindyjs,basic3,3776,4448, 12px/10pt = 12px/,Toupper,Colorcode,Colorname2rgb,Copyketcindyjs,isexists,Cdyname,Extractfun,Extractall,pathsep,Readlines,Ketcindyjsdata,Movetojsexe,Resizetextsize,indexall,Indexof,Indexall,Removespace,Strsplit,Dqq +Usegraphics,basic3,1223,1235,Toupper,Addpackage,set +Viewtex,basic3,1239,1313,iswindows,Makebat,kc,Makeshell,WritetoRS +Viewparent,basic3,1317,1335,isexists,iswindows,Makebat,Makeshell,WritetoRS,kc +Figpdf,basic3,1339,1459,Removespace,isexists +Slidework,basic3,1463,1482,isexists,makedir,pathsep,Changework +Setslidemargin,basic3,1486,1489 +Setslidepage,basic3,1493,1518 +Setslidemain,basic3,1522,1546 +Setslidebody,basic3,1550,1587 +Setslidehyper,basic3,1591,1669,Divoptions,Addpackage,Indexall,Toupper +Settitle,basic3,1673,1744,Toupper,Indexall +Maketitle,basic3,1748,1843,iswindows,Makebat,Makeshell,kc,Cindyname,isexists,PaO +Repeatsameslide,basic3,1847,2002,Indexall +Presentation,basic3,2006,2671,readfile2str,isexists,Removespace,fileslist,Repeatsameslide +Mkslides,basic3,2675,2739,Fillblack,Changework,Setdirectory,setexec,isexists,Presentation,iswindows,Makebat,Makeshell,kc,pathsep,Fillrestore +Mkslidesummary,basic3,2743,2808,Fillblack,pathsep,ismacosx,setexec,PPa,PaO,CalcbyR,iswindows,Makebat,Makeshell,kc,Changework,Fillstore +BBdata,basic3,2812,2955,Divoptions,Toupper,ismacosx,Dqq,iswindows,kc,Sprintf,Removespace +Gcd,basic3,2959,2971 +Fracform,basic3,2975,3012 +Totexformpart,basic3,3016,3084,Bracket,Strsplit,Assign +Totexform,basic3,3088,3151,Totexformpart,Indexall,Bracket +Tocindyformpart,basic3,3155,3223,Bracket,Strsplit,Assign +Tocindyform,basic3,3227,3265,Bracket,Indexall,Tocindyformpart +Animepar,basic3,3269,3269,Animationparam +Animationparam,basic3,3273,3292,seconds,stopanimation +Copyketcindyjs,basic3,3296,3357,iswindows,Dqq,kc +Ketjsoption,basic3,3361,3362,Setketcindyjs +Setketcindyjs,basic3,3366,3375 +Ketcindyjsbody,basic3,3379,3384 +Ketcindyjsdata,basic3,3388,3428,Textformat,Dqq,set +Findfun,basic3,3432,3499,Removespace,Indexall +Extractfun,basic3,3503,3520,Indexall,Findfun +Extractall,basic3,3529,3573 +Textedit,basic3,3577,3583 +Textedit2value,basic3,3587,3629,Toupper,Textedit,Removespace,Tocindyform,Totexform,Tomaxform,Strsplit +Parsejson,basic3,3633,3686, unicode +Resizetextsize,basic3,3690,3714,Parsejson +Movetojs,basic3,3718,3726 +Movetojsexe,basic3,3730,3746,Dqq,Parsejson +Setplaybuttons,basic3,3750,3775,Movetojs +Mkketcindyjs,basic3,3779,4476, 12px/10pt = 12px/,Toupper,Colorcode,Colorname2rgb,Copyketcindyjs,isexists,Cdyname,Bracket,Extractfun,Extractall,pathsep,Readlines,Ketcindyjsdata,Movetojsexe,Resizetextsize,indexall,Indexof,Indexall,Removespace,Strsplit,Dqq diff --git a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/makefunlist.cdy b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/makefunlist.cdy Binary files differindex 02a555ec1f9..08ff86ba701 100644 --- a/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/makefunlist.cdy +++ b/Master/texmf-dist/doc/support/ketcindy/ketcindyjs/makefunlist.cdy diff --git a/Master/texmf-dist/doc/support/ketcindy/ketmanual/KeTCindyReferenceE.pdf b/Master/texmf-dist/doc/support/ketcindy/ketmanual/KeTCindyReferenceE.pdf Binary files differindex f6924e269cc..aec56f37c01 100644 --- a/Master/texmf-dist/doc/support/ketcindy/ketmanual/KeTCindyReferenceE.pdf +++ b/Master/texmf-dist/doc/support/ketcindy/ketmanual/KeTCindyReferenceE.pdf diff --git a/Master/texmf-dist/doc/support/ketcindy/ketmanual/KeTCindyReferenceJ.pdf b/Master/texmf-dist/doc/support/ketcindy/ketmanual/KeTCindyReferenceJ.pdf Binary files differindex b9e9d2f6b4e..e8ea9e9b185 100644 --- a/Master/texmf-dist/doc/support/ketcindy/ketmanual/KeTCindyReferenceJ.pdf +++ b/Master/texmf-dist/doc/support/ketcindy/ketmanual/KeTCindyReferenceJ.pdf diff --git a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/ForRef-Arrowhead-2.tex b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/ForRef-Arrowhead-2.tex index 2876d4a66f7..64da40e2ac5 100644 --- a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/ForRef-Arrowhead-2.tex +++ b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/ForRef-Arrowhead-2.tex @@ -1,8 +1,8 @@ -%%% ForRef-Arrowhead-2.tex 2014-11-10 7:14 -%%% ForRef-Arrowhead5all.sce~ 2014-11-10 6:59 +%%% /Users/takatoosetsuo/Dropbox/kettoday/1104arrowhead/fig/ForRef-Arrowhead-2.tex +%%% Generator=ForRef-Arrowhead.cdy {\unitlength=1cm% \begin{picture}% -( 2.03000, 2.02000)( -0.56000, -0.53000)% +(2.03,2.02)(-0.56,-0.53)% \special{pn 8}% % \special{pn 8}% @@ -17,30 +17,42 @@ \special{pa 161 -394}\special{pa 153 -394}\special{fp}\special{pa 122 -394}\special{pa 114 -394}\special{fp}% \special{pa 83 -394}\special{pa 75 -394}\special{fp}\special{pa 43 -394}\special{pa 35 -394}\special{fp}% \special{pa 4 -394}\special{pa -4 -394}\special{fp}\special{pn 8}% -\special{pa 464 -358}\special{pa 394 -394}\special{pa 429 -324}\special{pa 447 -341}% -\special{pa 464 -358}\special{sh 1}\special{ip}% -\special{pn 8}% -\special{pa 464 -358}\special{pa 394 -394}\special{pa 429 -324}\special{pa 447 -341}% -\special{pa 464 -358}% +\special{pa 394 -20}\special{pa 394 20}% +\special{fp}% +\settowidth{\Width}{$1$}\setlength{\Width}{-0.5\Width}% +\settoheight{\Height}{$1$}\settodepth{\Depth}{$1$}\setlength{\Height}{-\Height}% +\put(1.0000000,-0.1000000){\hspace*{\Width}\raisebox{\Height}{$1$}}% +% +\special{pa 20 -394}\special{pa -20 -394}% +\special{fp}% +\settowidth{\Width}{$1$}\setlength{\Width}{-1\Width}% +\settoheight{\Height}{$1$}\settodepth{\Depth}{$1$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% +\put(-0.1000000,1.0000000){\hspace*{\Width}\raisebox{\Height}{$1$}}% +% +{% +\color[rgb]{0,0,0}% +\special{pa 464 -358}\special{pa 394 -394}\special{pa 429 -324}\special{pa 436 -351}% +\special{pa 464 -358}\special{pa 464 -358}\special{sh 1}\special{ip}% +}% +\special{pn 1}% +\special{pa 464 -358}\special{pa 394 -394}\special{pa 429 -324}\special{pa 436 -351}% +\special{pa 464 -358}% \special{fp}% \special{pn 8}% -\special{pa -220 0}\special{pa 579 0}% +\special{pa -220 -0}\special{pa 579 -0}% \special{fp}% -\special{pa 0 209}\special{pa 0 -587}% +\special{pa 0 209}\special{pa 0 -587}% \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(1.5200,0.0000){\hspace*{\Width}\raisebox{\Height}{$x$}}% -% +\put(1.5200000,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.0000,1.5400){\hspace*{\Width}\raisebox{\Height}{$y$}}% -% +\put(0.0000000,1.5400000){\hspace*{\Width}\raisebox{\Height}{$y$}}% % \settowidth{\Width}{O}\setlength{\Width}{-1\Width}% \settoheight{\Height}{O}\settodepth{\Depth}{O}\setlength{\Height}{-\Height}% -\put(-0.0500,-0.0500){\hspace*{\Width}\raisebox{\Height}{O}}% -% +\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/ForRef-Arrowhead-3.tex b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/ForRef-Arrowhead-3.tex index e2ba3929ab3..056959a7abb 100644 --- a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/ForRef-Arrowhead-3.tex +++ b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/ForRef-Arrowhead-3.tex @@ -1,8 +1,8 @@ -%%% ForRef-Arrowhead-3.tex 2014-11-10 7:14 -%%% ForRef-Arrowhead5all.sce~ 2014-11-10 6:59 +%%% /Users/takatoosetsuo/Dropbox/kettoday/1104arrowhead/fig/ForRef-Arrowhead-3.tex +%%% Generator=ForRef-Arrowhead.cdy {\unitlength=1cm% \begin{picture}% -( 2.03000, 2.02000)( -0.56000, -0.53000)% +(2.03,2.02)(-0.56,-0.53)% \special{pn 8}% % \special{pn 8}% @@ -17,30 +17,42 @@ \special{pa 161 -394}\special{pa 153 -394}\special{fp}\special{pa 122 -394}\special{pa 114 -394}\special{fp}% \special{pa 83 -394}\special{pa 75 -394}\special{fp}\special{pa 43 -394}\special{pa 35 -394}\special{fp}% \special{pa 4 -394}\special{pa -4 -394}\special{fp}\special{pn 8}% -\special{pa 546 -434}\special{pa 394 -394}\special{pa 353 -242}\special{pa 449 -338}% -\special{pa 546 -434}\special{sh 1}\special{ip}% -\special{pn 8}% -\special{pa 546 -434}\special{pa 394 -394}\special{pa 353 -242}\special{pa 449 -338}% -\special{pa 546 -434}% +\special{pa 394 -20}\special{pa 394 20}% +\special{fp}% +\settowidth{\Width}{$1$}\setlength{\Width}{-0.5\Width}% +\settoheight{\Height}{$1$}\settodepth{\Depth}{$1$}\setlength{\Height}{-\Height}% +\put(1.0000000,-0.1000000){\hspace*{\Width}\raisebox{\Height}{$1$}}% +% +\special{pa 20 -394}\special{pa -20 -394}% +\special{fp}% +\settowidth{\Width}{$1$}\setlength{\Width}{-1\Width}% +\settoheight{\Height}{$1$}\settodepth{\Depth}{$1$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% +\put(-0.1000000,1.0000000){\hspace*{\Width}\raisebox{\Height}{$1$}}% +% +{% +\color[rgb]{0,0,0}% +\special{pa 622 -455}\special{pa 394 -394}\special{pa 333 -166}\special{pa 461 -327}% +\special{pa 622 -455}\special{pa 622 -455}\special{sh 1}\special{ip}% +}% +\special{pn 1}% +\special{pa 579 -443}\special{pa 394 -394}\special{pa 333 -166}\special{pa 461 -327}% +\special{pa 579 -421}% \special{fp}% \special{pn 8}% -\special{pa -220 0}\special{pa 579 0}% +\special{pa -220 -0}\special{pa 579 -0}% \special{fp}% -\special{pa 0 209}\special{pa 0 -587}% +\special{pa 0 209}\special{pa 0 -587}% \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(1.5200,0.0000){\hspace*{\Width}\raisebox{\Height}{$x$}}% -% +\put(1.5200000,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.0000,1.5400){\hspace*{\Width}\raisebox{\Height}{$y$}}% -% +\put(0.0000000,1.5400000){\hspace*{\Width}\raisebox{\Height}{$y$}}% % \settowidth{\Width}{O}\setlength{\Width}{-1\Width}% \settoheight{\Height}{O}\settodepth{\Depth}{O}\setlength{\Height}{-\Height}% -\put(-0.0500,-0.0500){\hspace*{\Width}\raisebox{\Height}{O}}% -% +\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/ForRef-Arrowhead-4.tex b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/ForRef-Arrowhead-4.tex index 5f77aadf9a8..979df5c017e 100644 --- a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/ForRef-Arrowhead-4.tex +++ b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/ForRef-Arrowhead-4.tex @@ -1,8 +1,8 @@ -%%% ForRef-Arrowhead-4.tex 2014-11-10 7:14 -%%% ForRef-Arrowhead5all.sce~ 2014-11-10 6:59 +%%% /Users/takatoosetsuo/Dropbox/kettoday/1104arrowhead/fig/ForRef-Arrowhead-4.tex +%%% Generator=ForRef-Arrowhead.cdy {\unitlength=1cm% \begin{picture}% -( 2.03000, 2.02000)( -0.56000, -0.53000)% +(2.03,2.02)(-0.56,-0.53)% \special{pn 8}% % \special{pn 8}% @@ -17,30 +17,42 @@ \special{pa 161 -394}\special{pa 153 -394}\special{fp}\special{pa 122 -394}\special{pa 114 -394}\special{fp}% \special{pa 83 -394}\special{pa 75 -394}\special{fp}\special{pa 43 -394}\special{pa 35 -394}\special{fp}% \special{pa 4 -394}\special{pa -4 -394}\special{fp}\special{pn 8}% -\special{pa 449 -449}\special{pa 297 -490}\special{pa 338 -338}\special{pa 394 -394}% -\special{pa 449 -449}\special{sh 1}\special{ip}% -\special{pn 8}% -\special{pa 449 -449}\special{pa 297 -490}\special{pa 338 -338}\special{pa 394 -394}% -\special{pa 449 -449}% +\special{pa 394 -20}\special{pa 394 20}% +\special{fp}% +\settowidth{\Width}{$1$}\setlength{\Width}{-0.5\Width}% +\settoheight{\Height}{$1$}\settodepth{\Depth}{$1$}\setlength{\Height}{-\Height}% +\put(1.0000000,-0.1000000){\hspace*{\Width}\raisebox{\Height}{$1$}}% +% +\special{pa 20 -394}\special{pa -20 -394}% +\special{fp}% +\settowidth{\Width}{$1$}\setlength{\Width}{-1\Width}% +\settoheight{\Height}{$1$}\settodepth{\Depth}{$1$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% +\put(-0.1000000,1.0000000){\hspace*{\Width}\raisebox{\Height}{$1$}}% +% +{% +\color[rgb]{0,0,0}% +\special{pa 498 -401}\special{pa 345 -442}\special{pa 386 -290}\special{pa 423 -365}% +\special{pa 498 -401}\special{pa 498 -401}\special{sh 1}\special{ip}% +}% +\special{pn 1}% +\special{pa 498 -401}\special{pa 345 -442}\special{pa 386 -290}\special{pa 423 -365}% +\special{pa 498 -401}% \special{fp}% \special{pn 8}% -\special{pa -220 0}\special{pa 579 0}% +\special{pa -220 -0}\special{pa 579 -0}% \special{fp}% -\special{pa 0 209}\special{pa 0 -587}% +\special{pa 0 209}\special{pa 0 -587}% \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(1.5200,0.0000){\hspace*{\Width}\raisebox{\Height}{$x$}}% -% +\put(1.5200000,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.0000,1.5400){\hspace*{\Width}\raisebox{\Height}{$y$}}% -% +\put(0.0000000,1.5400000){\hspace*{\Width}\raisebox{\Height}{$y$}}% % \settowidth{\Width}{O}\setlength{\Width}{-1\Width}% \settoheight{\Height}{O}\settodepth{\Depth}{O}\setlength{\Height}{-\Height}% -\put(-0.0500,-0.0500){\hspace*{\Width}\raisebox{\Height}{O}}% -% +\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/ForRef-Arrowhead-5.tex b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/ForRef-Arrowhead-5.tex index fe3dc7034e2..efb026488a4 100644 --- a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/ForRef-Arrowhead-5.tex +++ b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/ForRef-Arrowhead-5.tex @@ -1,8 +1,8 @@ -%%% ForRef-Arrowhead-5.tex 2014-11-10 7:14 -%%% ForRef-Arrowhead5all.sce~ 2014-11-10 6:59 +%%% /Users/takatoosetsuo/Dropbox/kettoday/1104arrowhead/fig/ForRef-Arrowhead-5.tex +%%% Generator=ForRef-Arrowhead.cdy {\unitlength=1cm% \begin{picture}% -( 2.03000, 2.02000)( -0.56000, -0.53000)% +(2.03,2.02)(-0.56,-0.53)% \special{pn 8}% % \special{pn 8}% @@ -17,27 +17,34 @@ \special{pa 161 -394}\special{pa 153 -394}\special{fp}\special{pa 122 -394}\special{pa 114 -394}\special{fp}% \special{pa 83 -394}\special{pa 75 -394}\special{fp}\special{pa 43 -394}\special{pa 35 -394}\special{fp}% \special{pa 4 -394}\special{pa -4 -394}\special{fp}\special{pn 8}% -\special{pn 4}% -\special{pa 484 -379}\special{pa 341 -446}\special{pa 408 -303}% +\special{pa 394 -20}\special{pa 394 20}% \special{fp}% -\special{pn 8}% -\special{pa -220 0}\special{pa 579 0}% +\settowidth{\Width}{$1$}\setlength{\Width}{-0.5\Width}% +\settoheight{\Height}{$1$}\settodepth{\Depth}{$1$}\setlength{\Height}{-\Height}% +\put(1.0000000,-0.1000000){\hspace*{\Width}\raisebox{\Height}{$1$}}% +% +\special{pa 20 -394}\special{pa -20 -394}% +\special{fp}% +\settowidth{\Width}{$1$}\setlength{\Width}{-1\Width}% +\settoheight{\Height}{$1$}\settodepth{\Depth}{$1$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% +\put(-0.1000000,1.0000000){\hspace*{\Width}\raisebox{\Height}{$1$}}% +% +\special{pa 484 -379}\special{pa 341 -446}\special{pa 408 -303}% \special{fp}% -\special{pa 0 209}\special{pa 0 -587}% +\special{pa -220 -0}\special{pa 579 -0}% +\special{fp}% +\special{pa 0 209}\special{pa 0 -587}% \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(1.5200,0.0000){\hspace*{\Width}\raisebox{\Height}{$x$}}% -% +\put(1.5200000,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.0000,1.5400){\hspace*{\Width}\raisebox{\Height}{$y$}}% -% +\put(0.0000000,1.5400000){\hspace*{\Width}\raisebox{\Height}{$y$}}% % \settowidth{\Width}{O}\setlength{\Width}{-1\Width}% \settoheight{\Height}{O}\settodepth{\Depth}{O}\setlength{\Height}{-\Height}% -\put(-0.0500,-0.0500){\hspace*{\Width}\raisebox{\Height}{O}}% -% +\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/ForRef-Arrowhead2-10.tex b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/ForRef-Arrowhead2-10.tex new file mode 100644 index 00000000000..dca82a58363 --- /dev/null +++ b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/ForRef-Arrowhead2-10.tex @@ -0,0 +1,24 @@ +%%% /Users/takatoosetsuo/Dropbox/kettoday/1104arrowhead/fig/ForRef-Arrowhead2-10.tex +%%% Generator=ForRef-Arrowhead2.cdy +{\unitlength=1cm% +\begin{picture}% +(1.75,1.5)(-0.5,-0.25)% +\special{pn 8}% +% +\special{pa 394 -0}\special{pa 393 -15}\special{pa 393 -30}\special{pa 391 -44}% +\special{pa 389 -59}\special{pa 387 -74}\special{pa 384 -88}\special{pa 380 -103}% +\special{pa 376 -117}\special{pa 371 -131}\special{pa 366 -145}\special{pa 360 -159}% +\special{pa 354 -172}\special{pa 347 -185}\special{pa 340 -198}\special{pa 332 -211}% +\special{pa 324 -223}\special{pa 316 -235}\special{pa 306 -247}\special{pa 297 -258}% +\special{pa 287 -270}\special{pa 277 -280}\special{pa 266 -290}\special{pa 255 -300}% +\special{pa 243 -310}\special{pa 231 -319}\special{pa 219 -327}\special{pa 207 -335}% +\special{pa 194 -343}\special{pa 181 -350}\special{pa 168 -356}\special{pa 154 -362}% +\special{pa 140 -368}\special{pa 126 -373}\special{pa 112 -377}\special{pa 98 -381}% +\special{pa 83 -385}\special{pa 69 -388}\special{pa 54 -390}\special{pa 40 -392}% +\special{pa 25 -393}\special{pa 10 -394}\special{pa -5 -394}\special{pa -20 -393}% +\special{pa -35 -392}\special{pa -49 -391}\special{pa -64 -388}\special{pa -79 -386}% +\special{pa -93 -383}\special{pa -107 -379}\special{pa -122 -374}% +\special{fp}% +\special{pa 363 -72}\special{pa 394 -0}\special{pa 411 -77}% +\special{fp}% +\end{picture}}%
\ No newline at end of file diff --git a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/ForRef-Arrowhead2-6.tex b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/ForRef-Arrowhead2-6.tex new file mode 100644 index 00000000000..bfb5d33e695 --- /dev/null +++ b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/ForRef-Arrowhead2-6.tex @@ -0,0 +1,29 @@ +%%% /Users/takatoosetsuo/Dropbox/kettoday/1104arrowhead/fig/ForRef-Arrowhead2-6.tex +%%% Generator=ForRef-Arrowhead2.cdy +{\unitlength=1cm% +\begin{picture}% +(1.75,1.5)(-0.5,-0.25)% +\special{pn 8}% +% +\special{pa 394 -0}\special{pa 393 -15}\special{pa 393 -30}\special{pa 391 -44}% +\special{pa 389 -59}\special{pa 387 -74}\special{pa 384 -88}\special{pa 380 -103}% +\special{pa 376 -117}\special{pa 371 -131}\special{pa 366 -145}\special{pa 360 -159}% +\special{pa 354 -172}\special{pa 347 -185}\special{pa 340 -198}\special{pa 332 -211}% +\special{pa 324 -223}\special{pa 316 -235}\special{pa 306 -247}\special{pa 297 -258}% +\special{pa 287 -270}\special{pa 277 -280}\special{pa 266 -290}\special{pa 255 -300}% +\special{pa 243 -310}\special{pa 231 -319}\special{pa 219 -327}\special{pa 207 -335}% +\special{pa 194 -343}\special{pa 181 -350}\special{pa 168 -356}\special{pa 154 -362}% +\special{pa 140 -368}\special{pa 126 -373}\special{pa 112 -377}\special{pa 98 -381}% +\special{pa 83 -385}\special{pa 69 -388}\special{pa 54 -390}\special{pa 40 -392}% +\special{pa 25 -393}\special{pa 10 -394}\special{pa -5 -394}\special{pa -20 -393}% +\special{pa -35 -392}\special{pa -49 -391}\special{pa -64 -388}\special{pa -79 -386}% +\special{pa -93 -383}\special{pa -107 -379}\special{pa -122 -374}% +\special{fp}% +{\special{pn 0}\color[rgb]{0,0,0}% +\special{pa 179 -365}\special{pa 173 -369}\special{pa 166 -370}\special{pa 159 -368}\special{pa 154 -363}\special{pa 152 -356}\special{pa 153 -349}\special{pa 156 -343}\special{pa 162 -339}\special{pa 169 -339}\special{pa 176 -341}\special{pa 181 -346}\special{pa 183 -353}\special{pa 182 -360}\special{pa 179 -365}\special{sh 1}\special{fp}}% +\special{pn 8}\special{pa 179 -365}\special{pa 173 -369}\special{pa 166 -370}\special{pa 159 -368}\special{pa 154 -363}\special{pa 152 -356}\special{pa 153 -349}\special{pa 156 -343}\special{pa 162 -339}\special{pa 169 -339}\special{pa 176 -341}\special{pa 181 -346}\special{pa 183 -353}\special{pa 182 -360}\special{pa 179 -365}\special{fp}% +\settowidth{\Width}{A}\setlength{\Width}{0\Width}% +\settoheight{\Height}{A}\settodepth{\Depth}{A}\setlength{\Height}{\Depth}% +\put(0.4800000,0.9500000){\hspace*{\Width}\raisebox{\Height}{A}}% +% +\end{picture}}%
\ No newline at end of file diff --git a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/ForRef-Arrowhead2-7.tex b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/ForRef-Arrowhead2-7.tex new file mode 100644 index 00000000000..bd1240bd261 --- /dev/null +++ b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/ForRef-Arrowhead2-7.tex @@ -0,0 +1,32 @@ +%%% /Users/takatoosetsuo/Dropbox/kettoday/1104arrowhead/fig/ForRef-Arrowhead2-7.tex +%%% Generator=ForRef-Arrowhead2.cdy +{\unitlength=1cm% +\begin{picture}% +(1.75,1.5)(-0.5,-0.25)% +\special{pn 8}% +% +\special{pa 394 -0}\special{pa 393 -15}\special{pa 393 -30}\special{pa 391 -44}% +\special{pa 389 -59}\special{pa 387 -74}\special{pa 384 -88}\special{pa 380 -103}% +\special{pa 376 -117}\special{pa 371 -131}\special{pa 366 -145}\special{pa 360 -159}% +\special{pa 354 -172}\special{pa 347 -185}\special{pa 340 -198}\special{pa 332 -211}% +\special{pa 324 -223}\special{pa 316 -235}\special{pa 306 -247}\special{pa 297 -258}% +\special{pa 287 -270}\special{pa 277 -280}\special{pa 266 -290}\special{pa 255 -300}% +\special{pa 243 -310}\special{pa 231 -319}\special{pa 219 -327}\special{pa 207 -335}% +\special{pa 194 -343}\special{pa 181 -350}\special{pa 168 -356}\special{pa 154 -362}% +\special{pa 140 -368}\special{pa 126 -373}\special{pa 112 -377}\special{pa 98 -381}% +\special{pa 83 -385}\special{pa 69 -388}\special{pa 54 -390}\special{pa 40 -392}% +\special{pa 25 -393}\special{pa 10 -394}\special{pa -5 -394}\special{pa -20 -393}% +\special{pa -35 -392}\special{pa -49 -391}\special{pa -64 -388}\special{pa -79 -386}% +\special{pa -93 -383}\special{pa -107 -379}\special{pa -122 -374}% +\special{fp}% +{% +\color[rgb]{0,0,0}% +\special{pa 245 -339}\special{pa 168 -356}\special{pa 220 -297}\special{pa 219 -326}% +\special{pa 245 -339}\special{pa 245 -339}\special{sh 1}\special{ip}% +}% +\special{pn 1}% +\special{pa 245 -339}\special{pa 168 -356}\special{pa 220 -297}\special{pa 219 -326}% +\special{pa 245 -339}% +\special{fp}% +\special{pn 8}% +\end{picture}}%
\ No newline at end of file diff --git a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/ForRef-Arrowhead2-8.tex b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/ForRef-Arrowhead2-8.tex new file mode 100644 index 00000000000..cb8c89c37b2 --- /dev/null +++ b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/ForRef-Arrowhead2-8.tex @@ -0,0 +1,38 @@ +%%% /Users/takatoosetsuo/Dropbox/kettoday/1104arrowhead/fig/ForRef-Arrowhead2-8.tex +%%% Generator=ForRef-Arrowhead2.cdy +{\unitlength=1cm% +\begin{picture}% +(1.75,1.5)(-0.5,-0.25)% +\special{pn 8}% +% +\special{pa 394 -0}\special{pa 393 -15}\special{pa 393 -30}\special{pa 391 -44}% +\special{pa 389 -59}\special{pa 387 -74}\special{pa 384 -88}\special{pa 380 -103}% +\special{pa 376 -117}\special{pa 371 -131}\special{pa 366 -145}\special{pa 360 -159}% +\special{pa 354 -172}\special{pa 347 -185}\special{pa 340 -198}\special{pa 332 -211}% +\special{pa 324 -223}\special{pa 316 -235}\special{pa 306 -247}\special{pa 297 -258}% +\special{pa 287 -270}\special{pa 277 -280}\special{pa 266 -290}\special{pa 255 -300}% +\special{pa 243 -310}\special{pa 231 -319}\special{pa 219 -327}\special{pa 207 -335}% +\special{pa 194 -343}\special{pa 181 -350}\special{pa 168 -356}\special{pa 154 -362}% +\special{pa 140 -368}\special{pa 126 -373}\special{pa 112 -377}\special{pa 98 -381}% +\special{pa 83 -385}\special{pa 69 -388}\special{pa 54 -390}\special{pa 40 -392}% +\special{pa 25 -393}\special{pa 10 -394}\special{pa -5 -394}\special{pa -20 -393}% +\special{pa -35 -392}\special{pa -49 -391}\special{pa -64 -388}\special{pa -79 -386}% +\special{pa -93 -383}\special{pa -107 -379}\special{pa -122 -374}% +\special{fp}% +{% +\color[rgb]{1,0,0}% +{% +\color[rgb]{1,0,0}% +\special{pa 257 -351}\special{pa 107 -400}\special{pa 199 -273}\special{pa 204 -330}% +\special{pa 257 -351}\special{pa 257 -351}\special{sh 1}\special{ip}% +}% +\special{pn 1}% +\special{pa 257 -351}\special{pa 107 -400}\special{pa 199 -273}\special{pa 204 -330}% +\special{pa 257 -351}% +\special{fp}% +\special{pn 8}% +}% +{\special{pn 0}\color[rgb]{0,0,0}% +\special{pa 173 -360}\special{pa 169 -362}\special{pa 164 -361}\special{pa 161 -358}\special{pa 160 -353}\special{pa 162 -349}\special{pa 166 -347}\special{pa 171 -347}\special{pa 175 -351}\special{pa 175 -356}\special{pa 173 -360}\special{sh 1}\special{fp}}% +\special{pn 8}\special{pa 173 -360}\special{pa 169 -362}\special{pa 164 -361}\special{pa 161 -358}\special{pa 160 -353}\special{pa 162 -349}\special{pa 166 -347}\special{pa 171 -347}\special{pa 175 -351}\special{pa 175 -356}\special{pa 173 -360}\special{fp}% +\end{picture}}%
\ No newline at end of file diff --git a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/ForRef-Arrowhead2-9.tex b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/ForRef-Arrowhead2-9.tex new file mode 100644 index 00000000000..3e8872b7d1a --- /dev/null +++ b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/ForRef-Arrowhead2-9.tex @@ -0,0 +1,31 @@ +%%% /Users/takatoosetsuo/Dropbox/kettoday/1104arrowhead/fig/ForRef-Arrowhead2-9.tex +%%% Generator=ForRef-Arrowhead2.cdy +{\unitlength=1cm% +\begin{picture}% +(1.75,1.5)(-0.5,-0.25)% +\special{pn 8}% +% +\special{pa 394 -0}\special{pa 393 -15}\special{pa 393 -30}\special{pa 391 -44}% +\special{pa 389 -59}\special{pa 387 -74}\special{pa 384 -88}\special{pa 380 -103}% +\special{pa 376 -117}\special{pa 371 -131}\special{pa 366 -145}\special{pa 360 -159}% +\special{pa 354 -172}\special{pa 347 -185}\special{pa 340 -198}\special{pa 332 -211}% +\special{pa 324 -223}\special{pa 316 -235}\special{pa 306 -247}\special{pa 297 -258}% +\special{pa 287 -270}\special{pa 277 -280}\special{pa 266 -290}\special{pa 255 -300}% +\special{pa 243 -310}\special{pa 231 -319}\special{pa 219 -327}\special{pa 207 -335}% +\special{pa 194 -343}\special{pa 181 -350}\special{pa 168 -356}\special{pa 154 -362}% +\special{pa 140 -368}\special{pa 126 -373}\special{pa 112 -377}\special{pa 98 -381}% +\special{pa 83 -385}\special{pa 69 -388}\special{pa 54 -390}\special{pa 40 -392}% +\special{pa 25 -393}\special{pa 10 -394}\special{pa -5 -394}\special{pa -20 -393}% +\special{pa -35 -392}\special{pa -49 -391}\special{pa -64 -388}\special{pa -66 -388}% +\special{fp}% +{% +\color[rgb]{0,0,0}% +\special{pa -54 -415}\special{pa -122 -374}\special{pa -43 -367}\special{pa -66 -387}% +\special{pa -54 -415}\special{pa -54 -415}\special{sh 1}\special{ip}% +}% +\special{pn 1}% +\special{pa -54 -415}\special{pa -122 -374}\special{pa -43 -367}\special{pa -66 -387}% +\special{pa -54 -415}% +\special{fp}% +\special{pn 8}% +\end{picture}}%
\ No newline at end of file diff --git a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/HatchZuKitaE.cdy b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/HatchZuKitaE.cdy Binary files differdeleted file mode 100644 index 328c4eb8304..00000000000 --- a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/HatchZuKitaE.cdy +++ /dev/null diff --git a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/Intersectcurvsf.pdf b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/Intersectcurvsf.pdf Binary files differindex 875cfc72245..2e5d37e25d8 100644 --- a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/Intersectcurvsf.pdf +++ b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/Intersectcurvsf.pdf diff --git a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/FigE.tex b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/addax2.tex index 68b951d2f43..68b951d2f43 100644 --- a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/FigE.tex +++ b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/addax2.tex diff --git a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/anglearrow.tex b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/anglearrow.tex new file mode 100644 index 00000000000..85c2063b1c1 --- /dev/null +++ b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/anglearrow.tex @@ -0,0 +1,43 @@ +%%% /Users/takatoosetsuo/Dropbox/kettoday/1104arrowhead/fig/anglearrow.tex +%%% Generator=anglearrow.cdy +{\unitlength=1cm% +\begin{picture}% +(6,6)(-1,-1)% +\special{pn 8}% +% +\special{pa 1575 -0}\special{pa 0 -0}\special{pa 860 -1320}% +\special{fp}% +\color[rgb]{1,0,0}% +\special{pn 8}% +\special{pa 591 -0}\special{pa 586 -74}\special{pa 572 -147}\special{pa 549 -217}% +\special{pa 518 -285}\special{pa 478 -347}\special{pa 430 -404}\special{pa 413 -420}% +\special{fp}% +\special{pn 8}% +{% +\color[rgb]{1,0,0}% +\special{pa 468 -435}\special{pa 322 -495}\special{pa 405 -361}\special{pa 412 -419}% +\special{pa 468 -435}\special{pa 468 -435}\special{sh 1}\special{ip}% +}% +\special{pn 1}% +\special{pa 468 -435}\special{pa 322 -495}\special{pa 405 -361}\special{pa 412 -419}% +\special{pa 468 -435}% +\special{fp}% +\special{pn 8}% +\color[rgb]{0,0,0}% +\special{pa -394 -0}\special{pa 1969 -0}% +\special{fp}% +\special{pa 0 394}\special{pa 0 -1969}% +\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(5.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,5.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/anglearrowscreen.pdf b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/anglearrowscreen.pdf Binary files differnew file mode 100644 index 00000000000..e69421997a9 --- /dev/null +++ b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/anglearrowscreen.pdf diff --git a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/arrowhead.tex b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/arrowhead.tex index d61b5ee62d9..91f0a205d8a 100644 --- a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/arrowhead.tex +++ b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/arrowhead.tex @@ -1,38 +1,120 @@ -%%% test.tex 2014-10-16 20:32 -%%% test.sce 2014-10-16 20:32 +%%% /Users/takatoosetsuo/Dropbox/kettoday/1104arrowhead/fig/arrowhead.tex +%%% Generator=arrowhead.cdy {\unitlength=1cm% \begin{picture}% -( 4.00000, 3.00000)( -1.00000, -0.50000)% +(9,4)(-0.5,-0.5)% \special{pn 8}% % -\special{pa 271 -315}\special{pa 197 -343}\special{pa 240 -277}\special{pa 255 -296}% -\special{pa 271 -315}\special{sh 1}\special{ip}% +{% +\color[rgb]{0,0,0}% +\special{pa 393 -1102}\special{pa 394 -1181}\special{pa 347 -1118}\special{pa 375 -1124}% +\special{pa 393 -1102}\special{pa 393 -1102}\special{sh 1}\special{ip}% +}% +\special{pn 1}% +\special{pa 393 -1102}\special{pa 394 -1181}\special{pa 347 -1118}\special{pa 375 -1124}% +\special{pa 393 -1102}% +\special{fp}% \special{pn 8}% -\special{pa 271 -315}\special{pa 197 -343}\special{pa 240 -277}\special{pa 255 -296}% -\special{pa 271 -315}% +\special{pa 0 -0}\special{pa 375 -1124}% +\special{fp}% +{% +\color[rgb]{0,0,0}% +\special{pa 786 -1024}\special{pa 787 -1181}\special{pa 694 -1054}\special{pa 750 -1067}% +\special{pa 786 -1024}\special{pa 786 -1024}\special{sh 1}\special{ip}% +}% +\special{pn 1}% +\special{pa 786 -1024}\special{pa 787 -1181}\special{pa 694 -1054}\special{pa 750 -1067}% +\special{pa 786 -1024}% \special{fp}% \special{pn 8}% -\settowidth{\Width}{θ}\setlength{\Width}{0\Width}% -\settoheight{\Height}{θ}\settodepth{\Depth}{θ}\setlength{\Height}{\Depth}% -\put(1.0500,0.5500){\hspace*{\Width}\raisebox{\Height}{θ}}% +\special{pa 394 -0}\special{pa 750 -1067}% +\special{fp}% +{% +\color[rgb]{0,0,0}% +\special{pa 1287 -970}\special{pa 1181 -1181}\special{pa 970 -1075}\special{pa 1139 -1054}% +\special{pa 1287 -970}\special{pa 1287 -970}\special{sh 1}\special{ip}% +}% +\special{pn 1}% +\special{pa 1287 -970}\special{pa 1181 -1181}\special{pa 970 -1075}\special{pa 1139 -1054}% +\special{pa 1287 -970}% +\special{fp}% +\special{pn 8}% +\special{pa 787 -0}\special{pa 1139 -1054}% +\special{fp}% +{% +\color[rgb]{0,0,0}% +\special{pa 1376 -354}\special{pa 1378 -591}\special{pa 1238 -401}\special{pa 1321 -420}% +\special{pa 1376 -354}\special{pa 1376 -354}\special{sh 1}\special{ip}% +}% +\special{pn 1}% +\special{pa 1376 -354}\special{pa 1378 -591}\special{pa 1238 -401}\special{pa 1321 -420}% +\special{pa 1376 -354}% +\special{fp}% +\special{pn 8}% +\special{pa 1181 -0}\special{pa 1575 -1181}% +\special{fp}% +{% +\color[rgb]{0,0,0}% +\special{pa 1967 -945}\special{pa 1969 -1181}\special{pa 1828 -991}\special{pa 1897 -968}% +\special{pa 1967 -945}\special{pa 1967 -945}\special{sh 1}\special{ip}% +}% +\special{pn 1}% +\special{pa 1967 -945}\special{pa 1969 -1181}\special{pa 1828 -991}\special{pa 1897 -968}% +\special{pa 1967 -945}% +\special{fp}% +\special{pn 8}% +\special{pa 1575 -0}\special{pa 1897 -968}% +\special{fp}% +\special{pa 2360 -945}\special{pa 2362 -1181}\special{pa 2222 -991}% +\special{fp}% +\special{pa 1969 -0}\special{pa 2362 -1181}% +\special{fp}% +{% +\color[rgb]{0,0,0}% +\special{pa 2754 -945}\special{pa 2756 -1181}\special{pa 2616 -991}\special{pa 2699 -1011}% +\special{pa 2754 -945}\special{pa 2754 -945}\special{sh 1}\special{ip}% +}% +\special{pn 1}% +\special{pa 2754 -945}\special{pa 2756 -1181}\special{pa 2616 -991}\special{pa 2699 -1011}% +\special{pa 2754 -945}% +\special{fp}% +\special{pn 8}% +\special{pn 16}% +\special{pa 2362 -0}\special{pa 2699 -1011}% +\special{fp}% +\special{pn 8}% +{% +\color[rgb]{1,0,0}% +{% +\color[rgb]{1,0,0}% +\special{pa 3148 -945}\special{pa 3150 -1181}\special{pa 3009 -991}\special{pa 3114 -1075}% +\special{pa 3148 -945}\special{pa 3148 -945}\special{sh 1}\special{ip}% +}% +\special{pn 1}% +\special{pa 3148 -945}\special{pa 3150 -1181}\special{pa 3009 -991}\special{pa 3114 -1075}% +\special{pa 3148 -945}% +\special{fp}% +\special{pn 8}% +}% +{% +\color[rgb]{1,0,0}% +\special{pa 2756 -0}\special{pa 3114 -1075}% +\special{fp}% +}% +\special{pa -197 -0}\special{pa 3346 -0}% +\special{fp}% +\special{pa 0 197}\special{pa 0 -1378}% +\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.5500000,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.5500000){\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}}% % -\special{pa 394 0}\special{pa 394 -8}\special{pa 393 -16}\special{pa 393 -25}\special{pa 392 -33}% -\special{pa 392 -41}\special{pa 391 -49}\special{pa 389 -58}\special{pa 388 -66}\special{pa 387 -74}% -\special{pa 385 -82}\special{pa 383 -90}\special{pa 381 -98}\special{pa 379 -106}% -\special{pa 377 -114}\special{pa 374 -122}\special{pa 372 -129}\special{pa 369 -137}% -\special{pa 366 -145}\special{pa 363 -153}\special{pa 360 -160}\special{pa 356 -168}% -\special{pa 353 -175}\special{pa 349 -182}\special{pa 345 -190}\special{pa 341 -197}% -\special{pa 337 -204}\special{pa 332 -211}\special{pa 328 -218}\special{pa 323 -225}% -\special{pa 319 -231}\special{pa 314 -238}\special{pa 309 -245}\special{pa 303 -251}% -\special{pa 298 -257}\special{pa 293 -263}\special{pa 287 -270}\special{pa 281 -275}% -\special{pa 275 -281}\special{pa 270 -287}\special{pa 263 -293}\special{pa 257 -298}% -\special{pa 251 -303}\special{pa 245 -309}\special{pa 238 -314}\special{pa 231 -319}% -\special{pa 225 -323}\special{pa 218 -328}\special{pa 211 -332}\special{pa 204 -337}% -\special{pa 197 -341}% -\special{fp}% -\special{pa 0 0}\special{pa 787 0}% -\special{fp}% -\special{pa 0 0}\special{pa 394 -681}% -\special{fp}% \end{picture}}%
\ No newline at end of file diff --git a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/htickmark.cdy b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/htickmark.cdy Binary files differdeleted file mode 100644 index 4e01ee9b38a..00000000000 --- a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/htickmark.cdy +++ /dev/null diff --git a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/implicit.cdy b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/implicit.cdy Binary files differdeleted file mode 100644 index 9181ea8adce..00000000000 --- a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/implicit.cdy +++ /dev/null diff --git a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/makeslideE.tex b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/makeslideE.tex new file mode 100644 index 00000000000..85d329c418e --- /dev/null +++ b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/makeslideE.tex @@ -0,0 +1,252 @@ +%%% /Users/Hannya/Desktop/fig/makeslide.tex +%%% Generator=makeslide.cdy +{\unitlength=1cm% +\begin{picture}% +(11.4,7.5)(-6.5,-2)% +\special{pn 8}% +% +{% +\color[rgb]{0,0,0}% +\special{pa -1575 -787}\special{pa -1575 -906}\special{pa -1576 -918}\special{pa -1579 -930}% +\special{pa -1583 -941}\special{pa -1590 -952}\special{pa -1598 -961}\special{pa -1607 -969}% +\special{pa -1618 -976}\special{pa -1629 -980}\special{pa -1641 -983}\special{pa -1654 -984}% +\special{pa -1969 -984}\special{pa -2283 -984}\special{pa -2296 -983}\special{pa -2308 -980}% +\special{pa -2319 -976}\special{pa -2330 -969}\special{pa -2339 -961}\special{pa -2347 -952}% +\special{pa -2354 -941}\special{pa -2358 -930}\special{pa -2361 -918}\special{pa -2362 -906}% +\special{pa -2362 -787}\special{pa -2362 -669}\special{pa -2361 -657}\special{pa -2358 -645}% +\special{pa -2354 -634}\special{pa -2347 -623}\special{pa -2339 -614}\special{pa -2330 -606}% +\special{pa -2319 -599}\special{pa -2308 -594}\special{pa -2296 -592}\special{pa -2283 -591}% +\special{pa -1969 -591}\special{pa -1654 -591}\special{pa -1641 -592}\special{pa -1629 -594}% +\special{pa -1618 -599}\special{pa -1607 -606}\special{pa -1598 -614}\special{pa -1590 -623}% +\special{pa -1583 -634}\special{pa -1579 -645}\special{pa -1576 -657}\special{pa -1575 -669}% +\special{pa -1575 -787}% +\special{fp}% +}% +{% +\color[rgb]{0,0,0}% +\special{pa -1575 -197}\special{pa -1575 -315}\special{pa -1576 -327}\special{pa -1579 -339}% +\special{pa -1583 -351}\special{pa -1590 -361}\special{pa -1598 -371}\special{pa -1607 -379}% +\special{pa -1618 -385}\special{pa -1629 -390}\special{pa -1641 -393}\special{pa -1654 -394}% +\special{pa -1969 -394}\special{pa -2283 -394}\special{pa -2296 -393}\special{pa -2308 -390}% +\special{pa -2319 -385}\special{pa -2330 -379}\special{pa -2339 -371}\special{pa -2347 -361}% +\special{pa -2354 -351}\special{pa -2358 -339}\special{pa -2361 -327}\special{pa -2362 -315}% +\special{pa -2362 -197}\special{pa -2362 -79}\special{pa -2361 -66}\special{pa -2358 -54}% +\special{pa -2354 -43}\special{pa -2347 -32}\special{pa -2339 -23}\special{pa -2330 -15}% +\special{pa -2319 -9}\special{pa -2308 -4}\special{pa -2296 -1}\special{pa -2283 -0}% +\special{pa -1969 -0}\special{pa -1654 -0}\special{pa -1641 -1}\special{pa -1629 -4}% +\special{pa -1618 -9}\special{pa -1607 -15}\special{pa -1598 -23}\special{pa -1590 -32}% +\special{pa -1583 -43}\special{pa -1579 -54}\special{pa -1576 -66}\special{pa -1575 -79}% +\special{pa -1575 -197}% +\special{fp}% +}% +{% +\color[rgb]{0,0,0}% +\special{pa -1575 394}\special{pa -1575 276}\special{pa -1576 263}\special{pa -1579 251}% +\special{pa -1583 240}\special{pa -1590 229}\special{pa -1598 220}\special{pa -1607 212}% +\special{pa -1618 205}\special{pa -1629 201}\special{pa -1641 198}\special{pa -1654 197}% +\special{pa -1969 197}\special{pa -2283 197}\special{pa -2296 198}\special{pa -2308 201}% +\special{pa -2319 205}\special{pa -2330 212}\special{pa -2339 220}\special{pa -2347 229}% +\special{pa -2354 240}\special{pa -2358 251}\special{pa -2361 263}\special{pa -2362 276}% +\special{pa -2362 394}\special{pa -2362 512}\special{pa -2361 524}\special{pa -2358 536}% +\special{pa -2354 548}\special{pa -2347 558}\special{pa -2339 567}\special{pa -2330 576}% +\special{pa -2319 582}\special{pa -2308 587}\special{pa -2296 590}\special{pa -2283 591}% +\special{pa -1969 591}\special{pa -1654 591}\special{pa -1641 590}\special{pa -1629 587}% +\special{pa -1618 582}\special{pa -1607 576}\special{pa -1598 567}\special{pa -1590 558}% +\special{pa -1583 548}\special{pa -1579 536}\special{pa -1576 524}\special{pa -1575 512}% +\special{pa -1575 394}% +\special{fp}% +}% +{% +\color[rgb]{0,0,0}% +\special{pa -114 -1189}\special{pa -114 -1701}\special{pa -115 -1713}\special{pa -118 -1725}% +\special{pa -123 -1737}\special{pa -129 -1747}\special{pa -137 -1756}\special{pa -147 -1764}% +\special{pa -157 -1771}\special{pa -169 -1776}\special{pa -181 -1779}\special{pa -193 -1780}% +\special{pa -508 -1780}\special{pa -823 -1780}\special{pa -835 -1779}\special{pa -847 -1776}% +\special{pa -859 -1771}\special{pa -869 -1764}\special{pa -879 -1756}\special{pa -887 -1747}% +\special{pa -893 -1737}\special{pa -898 -1725}\special{pa -901 -1713}\special{pa -902 -1701}% +\special{pa -902 -1189}\special{pa -902 -677}\special{pa -901 -665}\special{pa -898 -653}% +\special{pa -893 -641}\special{pa -887 -631}\special{pa -879 -621}\special{pa -869 -613}% +\special{pa -859 -607}\special{pa -847 -602}\special{pa -835 -599}\special{pa -823 -598}% +\special{pa -508 -598}\special{pa -193 -598}\special{pa -181 -599}\special{pa -169 -602}% +\special{pa -157 -607}\special{pa -147 -613}\special{pa -137 -621}\special{pa -129 -631}% +\special{pa -123 -641}\special{pa -118 -653}\special{pa -115 -665}\special{pa -114 -677}% +\special{pa -114 -1189}% +\special{fp}% +}% +{% +\color[rgb]{0,0,0}% +\special{pa 75 -0}\special{pa 75 -315}\special{pa 74 -327}\special{pa 71 -339}% +\special{pa 66 -351}\special{pa 60 -361}\special{pa 52 -371}\special{pa 42 -379}% +\special{pa 32 -385}\special{pa 20 -390}\special{pa 8 -393}\special{pa -4 -394}% +\special{pa -516 -394}\special{pa -1028 -394}\special{pa -1040 -393}\special{pa -1052 -390}% +\special{pa -1063 -385}\special{pa -1074 -379}\special{pa -1083 -371}\special{pa -1091 -361}% +\special{pa -1098 -351}\special{pa -1102 -339}\special{pa -1105 -327}\special{pa -1106 -315}% +\special{pa -1106 -0}\special{pa -1106 315}\special{pa -1105 327}\special{pa -1102 339}% +\special{pa -1098 351}\special{pa -1091 361}\special{pa -1083 371}\special{pa -1074 379}% +\special{pa -1063 385}\special{pa -1052 390}\special{pa -1040 393}\special{pa -1028 394}% +\special{pa -516 394}\special{pa -4 394}\special{pa 8 393}\special{pa 20 390}% +\special{pa 32 385}\special{pa 42 379}\special{pa 52 371}\special{pa 60 361}% +\special{pa 66 351}\special{pa 71 339}\special{pa 74 327}\special{pa 75 315}% +\special{pa 75 -0}% +\special{fp}% +}% +{% +\color[rgb]{0,0,0}% +\special{pa 1748 -0}\special{pa 1748 -315}\special{pa 1747 -327}\special{pa 1744 -339}% +\special{pa 1739 -351}\special{pa 1733 -361}\special{pa 1725 -371}\special{pa 1715 -379}% +\special{pa 1705 -385}\special{pa 1694 -390}\special{pa 1682 -393}\special{pa 1669 -394}% +\special{pa 984 -394}\special{pa 669 -394}\special{pa 657 -393}\special{pa 645 -390}% +\special{pa 634 -385}\special{pa 623 -379}\special{pa 614 -371}\special{pa 606 -361}% +\special{pa 599 -351}\special{pa 594 -339}\special{pa 592 -327}\special{pa 591 -315}% +\special{pa 591 -0}\special{pa 591 315}\special{pa 592 327}\special{pa 594 339}% +\special{pa 599 351}\special{pa 606 361}\special{pa 614 371}\special{pa 623 379}% +\special{pa 634 385}\special{pa 645 390}\special{pa 657 393}\special{pa 669 394}% +\special{pa 984 394}\special{pa 1299 394}\special{pa 1312 393}\special{pa 1324 390}% +\special{pa 1705 385}\special{pa 1715 379}\special{pa 1725 371}\special{pa 1733 361}% +\special{pa 1739 351}\special{pa 1744 339}\special{pa 1747 327}\special{pa 1748 315}% +\special{pa 1748 -0}% +\special{fp}% +}% +{% +\color[rgb]{0,0,0}% +\special{pa -1575 -787}\special{pa -1378 -787}\special{pa -1378 394}\special{pa -1575 394}% +\special{fp}% +}% +{% +\color[rgb]{0,0,0}% +\special{pa -1575 -197}\special{pa -1220 -197}% +\special{fp}% +}% +{% +\color[rgb]{0,0,0}% +}% +{% +\color[rgb]{0,0,0}% +\special{pa -1256 -173}\special{pa -1181 -197}\special{pa -1256 -221}\special{pa -1256 -197}% +\special{pa -1256 -173}\special{sh 1}\special{ip}% +\special{pn 1}% +\special{pa -1256 -173}\special{pa -1181 -197}\special{pa -1256 -221}\special{pa -1256 -197}% +\special{pa -1256 -173}\special{pa -1181 -197}% +\special{fp}% +\special{pn 8}% +}% +{% +\color[rgb]{0,0,0}% +\special{pa -551 -407}\special{pa -551 -564}% +\special{fp}% +}% +{% +\color[rgb]{0,0,0}% +}% +{% +\color[rgb]{0,0,0}% +\special{pa -526 -529}\special{pa -551 -604}\special{pa -575 -529}\special{pa -551 -529}% +\special{pa -526 -529}\special{sh 1}\special{ip}% +\special{pn 1}% +\special{pa -526 -529}\special{pa -551 -604}\special{pa -575 -529}\special{pa -551 -529}% +\special{pa -526 -529}\special{pa -551 -604}% +\special{fp}% +\special{pn 8}% +}% +{% +\color[rgb]{0,0,0}% +\special{pa -472 -604}\special{pa -472 -446}% +\special{fp}% +}% +{% +\color[rgb]{0,0,0}% +}% +{% +\color[rgb]{0,0,0}% +\special{pa -496 -482}\special{pa -472 -407}\special{pa -447 -482}\special{pa -472 -482}% +\special{pa -496 -482}\special{sh 1}\special{ip}% +\special{pn 1}% +\special{pa -496 -482}\special{pa -472 -407}\special{pa -447 -482}\special{pa -472 -482}% +\special{pa -496 -482}\special{pa -472 -407}% +\special{fp}% +\special{pn 8}% +}% +{% +\color[rgb]{0,0,0}% +\special{pa 160 80}\special{pa 160 -78}\special{pa 396 -78}\special{pa 396 -156}% +\special{pa 554 1}\special{pa 396 159}\special{pa 396 80}\special{pa 160 80}% +\special{fp}% +}% +{% +\color[rgb]{0,0,0}% +\settowidth{\Width}{fig1.tex}\setlength{\Width}{-0.5\Width}% +\settoheight{\Height}{fig1.tex}\settodepth{\Depth}{fig1.tex}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% +\put(-5.0000000,2.0000000){\hspace*{\Width}\raisebox{\Height}{fig1.tex}}% +% +}% +{% +\color[rgb]{0,0,0}% +\settowidth{\Width}{fig2.tex}\setlength{\Width}{-0.5\Width}% +\settoheight{\Height}{fig2.tex}\settodepth{\Depth}{fig2.tex}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% +\put(-5.0000000,0.5000000){\hspace*{\Width}\raisebox{\Height}{fig2.tex}}% +% +}% +{% +\color[rgb]{0,0,0}% +\settowidth{\Width}{movie.tex}\setlength{\Width}{-0.5\Width}% +\settoheight{\Height}{movie.tex}\settodepth{\Depth}{movie.tex}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% +\put(-5.0000000,-1.0000000){\hspace*{\Width}\raisebox{\Height}{movie.tex}}% +% +}% +{% +\color[rgb]{0,0,0}% +\settowidth{\Width}{makeslide.txt}\setlength{\Width}{-0.5\Width}% +\settoheight{\Height}{makeslide.txt}\settodepth{\Depth}{makeslide.txt}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% +\put(-1.4200000,4.7800000){\hspace*{\Width}\raisebox{\Height}{makeslide.txt}}% +% +}% +{% +\color[rgb]{0,0,0}% +\settowidth{\Width}{makeslide.cdy}\setlength{\Width}{-0.5\Width}% +\settoheight{\Height}{makeslide.cdy}\settodepth{\Depth}{makeslide.cdy}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% +\put(-1.3100000,0.0000000){\hspace*{\Width}\raisebox{\Height}{makeslide.cdy}}% +% +}% +{% +\color[rgb]{0,0,0}% +\settowidth{\Width}{makeslide.pdf}\setlength{\Width}{-0.5\Width}% +\settoheight{\Height}{makeslide.pdf}\settodepth{\Depth}{makeslide.pdf}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% +\put(3.0000000,0.0000000){\hspace*{\Width}\raisebox{\Height}{makeslide.pdf}}% +% +}% +{% +\color[rgb]{0,0,0}% +\settowidth{\Width}{Title}\setlength{\Width}{-0.5\Width}% +\settoheight{\Height}{Title}\settodepth{\Depth}{Title}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% +\put(-1.2900000,4.0200000){\hspace*{\Width}\raisebox{\Height}{Title}}% +% +}% +{% +\color[rgb]{0,0,0}% +\settowidth{\Width}{Text1}\setlength{\Width}{-0.5\Width}% +\settoheight{\Height}{Text1}\settodepth{\Depth}{Text1}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% +\put(-1.2900000,3.5200000){\hspace*{\Width}\raisebox{\Height}{Text1}}% +% +}% +{% +\color[rgb]{0,0,0}% +\settowidth{\Width}{fig1}\setlength{\Width}{-0.5\Width}% +\settoheight{\Height}{fig1}\settodepth{\Depth}{fig1}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% +\put(-1.2900000,3.0200000){\hspace*{\Width}\raisebox{\Height}{fig1}}% +% +}% +{% +\color[rgb]{0,0,0}% +\settowidth{\Width}{Text2}\setlength{\Width}{-0.5\Width}% +\settoheight{\Height}{Text2}\settodepth{\Depth}{Text2}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% +\put(-1.2900000,2.5200000){\hspace*{\Width}\raisebox{\Height}{Text2}}% +% +}% +{% +\color[rgb]{0,0,0}% +\settowidth{\Width}{$\dots$}\setlength{\Width}{-0.5\Width}% +\settoheight{\Height}{$\dots$}\settodepth{\Depth}{$\dots$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% +\put(-1.2900000,2.0200000){\hspace*{\Width}\raisebox{\Height}{$\dots$}}% +% +}% +\end{picture}}%
\ No newline at end of file diff --git a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/mkpttableE.tex b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/mkpttableE.tex index 259da15766d..f9397a9282c 100644 --- a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/mkpttableE.tex +++ b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/Fig/mkpttableE.tex @@ -1,1084 +1,595 @@ -%%% /Users/Hannya/Desktop/fig/mkpttableE.tex +%%% /Users/hannya/Desktop/Ketcindy/リファレンス旧/fig/mkpttableE.tex %%% Generator=点作図関数比較.cdy {\unitlength=10mm% \begin{picture}% -(11.5,19.55)(0,1.25)% +(11.25,19.3)(0,1.5)% \special{pn 8}% % \small% -{% -\color[rgb]{0,0,0}% -\special{pa 0 -8189}\special{pa 0 -492}% +\special{pa 0 -8189}\special{pa 0 -591}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 1378 -8189}\special{pa 1378 -492}% +\special{pa 1280 -8189}\special{pa 1280 -591}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 2165 -8189}\special{pa 2165 -492}% +\special{pa 2067 -8189}\special{pa 2067 -591}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 2953 -8189}\special{pa 2953 -492}% +\special{pa 2854 -8189}\special{pa 2854 -591}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 3740 -8189}\special{pa 3740 -492}% +\special{pa 3642 -8189}\special{pa 3642 -591}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 4528 -8189}\special{pa 4528 -492}% +\special{pa 4429 -8189}\special{pa 4429 -591}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 0 -8189}\special{pa 4528 -8189}% +\special{pa 0 -8189}\special{pa 4429 -8189}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 0 -7874}\special{pa 4528 -7874}% +\special{pa 0 -7972}\special{pa 4429 -7972}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 0 -7579}\special{pa 4528 -7579}% +\special{pa 0 -7677}\special{pa 4429 -7677}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 0 -7283}\special{pa 4528 -7283}% +\special{pa 0 -7382}\special{pa 4429 -7382}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 0 -6988}\special{pa 4528 -6988}% +\special{pa 0 -7087}\special{pa 4429 -7087}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 0 -6693}\special{pa 4528 -6693}% +\special{pa 0 -6791}\special{pa 4429 -6791}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 0 -6398}\special{pa 4528 -6398}% +\special{pa 0 -6496}\special{pa 4429 -6496}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 0 -6102}\special{pa 4528 -6102}% +\special{pa 0 -6201}\special{pa 4429 -6201}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 0 -5807}\special{pa 4528 -5807}% +\special{pa 0 -5906}\special{pa 4429 -5906}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 0 -5512}\special{pa 4528 -5512}% +\special{pa 0 -5610}\special{pa 4429 -5610}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 0 -5217}\special{pa 4528 -5217}% +\special{pa 0 -5315}\special{pa 4429 -5315}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 0 -4921}\special{pa 4528 -4921}% +\special{pa 0 -5020}\special{pa 4429 -5020}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 0 -4626}\special{pa 4528 -4626}% +\special{pa 0 -4724}\special{pa 4429 -4724}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 0 -4331}\special{pa 4528 -4331}% +\special{pa 0 -4429}\special{pa 4429 -4429}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 0 -4035}\special{pa 4528 -4035}% +\special{pa 0 -4134}\special{pa 4429 -4134}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 0 -3740}\special{pa 4528 -3740}% +\special{pa 0 -3839}\special{pa 4429 -3839}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 0 -3445}\special{pa 4528 -3445}% +\special{pa 0 -3543}\special{pa 4429 -3543}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 0 -3150}\special{pa 4528 -3150}% +\special{pa 0 -3248}\special{pa 4429 -3248}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 0 -2854}\special{pa 4528 -2854}% +\special{pa 0 -2953}\special{pa 4429 -2953}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 0 -2559}\special{pa 4528 -2559}% +\special{pa 0 -2657}\special{pa 4429 -2657}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 0 -2264}\special{pa 4528 -2264}% +\special{pa 0 -2362}\special{pa 4429 -2362}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 0 -1969}\special{pa 4528 -1969}% +\special{pa 0 -2067}\special{pa 4429 -2067}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 0 -1673}\special{pa 4528 -1673}% +\special{pa 0 -1772}\special{pa 4429 -1772}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 0 -1378}\special{pa 4528 -1378}% +\special{pa 0 -1476}\special{pa 4429 -1476}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 0 -1083}\special{pa 4528 -1083}% +\special{pa 0 -1181}\special{pa 4429 -1181}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 0 -787}\special{pa 4528 -787}% +\special{pa 0 -886}\special{pa 4429 -886}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% -\special{pa 0 -492}\special{pa 4528 -492}% +\special{pa 0 -591}\special{pa 4429 -591}% \special{fp}% -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{command}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{command}\settodepth{\Depth}{command}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(1.7500000,20.4000000){\hspace*{\Width}\raisebox{\Height}{command}}% +\put(1.6200000,20.5200000){\hspace*{\Width}\raisebox{\Height}{command}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{return}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{return}\settodepth{\Depth}{return}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(4.5000000,20.4000000){\hspace*{\Width}\raisebox{\Height}{return}}% +\put(4.2500000,20.5200000){\hspace*{\Width}\raisebox{\Height}{return}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{draw}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{draw}\settodepth{\Depth}{draw}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(6.5000000,20.4000000){\hspace*{\Width}\raisebox{\Height}{draw}}% +\put(6.2500000,20.5200000){\hspace*{\Width}\raisebox{\Height}{draw}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{geo}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{geo}\settodepth{\Depth}{geo}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(8.5000000,20.4000000){\hspace*{\Width}\raisebox{\Height}{geo}}% +\put(8.2500000,20.5200000){\hspace*{\Width}\raisebox{\Height}{geo}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{TeX}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{TeX}\settodepth{\Depth}{TeX}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(10.5000000,20.4000000){\hspace*{\Width}\raisebox{\Height}{TeX}}% +\put(10.2500000,20.5200000){\hspace*{\Width}\raisebox{\Height}{TeX}}% % -}% -{% -\color[rgb]{0,0,0}% -\settowidth{\Width}{Drawpoint}\setlength{\Width}{-0.5\Width}% -\settoheight{\Height}{Drawpoint}\settodepth{\Depth}{Drawpoint}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(1.7500000,19.6200000){\hspace*{\Width}\raisebox{\Height}{Drawpoint}}% -% -}% -{% -\color[rgb]{0,0,0}% -\settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% -\settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(4.5000000,19.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% -% -}% -{% -\color[rgb]{0,0,0}% -\settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% -\settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(6.5000000,19.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% -% -}% -{% -\color[rgb]{0,0,0}% -\settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% -\settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(8.5000000,19.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% -% -}% -{% -\color[rgb]{0,0,0}% -\settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% -\settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(10.5000000,19.6200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% -% -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{Pointdata}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{Pointdata}\settodepth{\Depth}{Pointdata}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(1.7500000,18.8800000){\hspace*{\Width}\raisebox{\Height}{Pointdata}}% +\put(1.6200000,19.8800000){\hspace*{\Width}\raisebox{\Height}{Pointdata}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(4.5000000,18.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(4.2500000,19.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(6.5000000,18.8800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +\put(6.2500000,19.8800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(8.5000000,18.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(8.2500000,19.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(10.5000000,18.8800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +\put(10.2500000,19.8800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{Putpoint}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{Putpoint}\settodepth{\Depth}{Putpoint}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(1.7500000,18.1200000){\hspace*{\Width}\raisebox{\Height}{Putpoint}}% +\put(1.6200000,19.1200000){\hspace*{\Width}\raisebox{\Height}{Putpoint}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(4.5000000,18.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(4.2500000,19.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(6.5000000,18.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(6.2500000,19.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(8.5000000,18.1200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +\put(8.2500000,19.1200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(10.5000000,18.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(10.2500000,19.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{Putintersect}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{Putintersect}\settodepth{\Depth}{Putintersect}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(1.7500000,17.3800000){\hspace*{\Width}\raisebox{\Height}{Putintersect}}% +\put(1.6200000,18.3800000){\hspace*{\Width}\raisebox{\Height}{Putintersect}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(4.5000000,17.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(4.2500000,18.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(6.5000000,17.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(6.2500000,18.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(8.5000000,17.3800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +\put(8.2500000,18.3800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(10.5000000,17.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(10.2500000,18.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{PutonCurve}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{PutonCurve}\settodepth{\Depth}{PutonCurve}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(1.7500000,16.6200000){\hspace*{\Width}\raisebox{\Height}{PutonCurve}}% +\put(1.6200000,17.6200000){\hspace*{\Width}\raisebox{\Height}{PutonCurve}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(4.5000000,16.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(4.2500000,17.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(6.5000000,16.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(6.2500000,17.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(8.5000000,16.6200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +\put(8.2500000,17.6200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(10.5000000,16.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(10.2500000,17.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{PutonLine}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{PutonLine}\settodepth{\Depth}{PutonLine}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(1.7500000,15.8800000){\hspace*{\Width}\raisebox{\Height}{PutonLine}}% +\put(1.6200000,16.8800000){\hspace*{\Width}\raisebox{\Height}{PutonLine}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(4.5000000,15.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(4.2500000,16.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(6.5000000,15.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(6.2500000,16.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(8.5000000,15.8800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +\put(8.2500000,16.8800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(10.5000000,15.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(10.2500000,16.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{PutonSeg}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{PutonSeg}\settodepth{\Depth}{PutonSeg}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(1.7500000,15.1200000){\hspace*{\Width}\raisebox{\Height}{PutonSeg}}% +\put(1.6200000,16.1200000){\hspace*{\Width}\raisebox{\Height}{PutonSeg}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(4.5000000,15.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(4.2500000,16.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(6.5000000,15.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(6.2500000,16.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(8.5000000,15.1200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +\put(8.2500000,16.1200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(10.5000000,15.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(10.2500000,16.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{Reflectpoint}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{Reflectpoint}\settodepth{\Depth}{Reflectpoint}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(1.7500000,14.3800000){\hspace*{\Width}\raisebox{\Height}{Reflectpoint}}% +\put(1.6200000,15.3800000){\hspace*{\Width}\raisebox{\Height}{Reflectpoint}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(4.5000000,14.3800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +\put(4.2500000,15.3800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(6.5000000,14.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(6.2500000,15.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(8.5000000,14.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(8.2500000,15.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(10.5000000,14.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(10.2500000,15.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{Rotatepoint}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{Rotatepoint}\settodepth{\Depth}{Rotatepoint}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(1.7500000,13.6200000){\hspace*{\Width}\raisebox{\Height}{Rotatepoint}}% +\put(1.6200000,14.6200000){\hspace*{\Width}\raisebox{\Height}{Rotatepoint}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(4.5000000,13.6200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +\put(4.2500000,14.6200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(6.5000000,13.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(6.2500000,14.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(8.5000000,13.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(8.2500000,14.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(10.5000000,13.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(10.2500000,14.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{Scalepoint}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{Scalepoint}\settodepth{\Depth}{Scalepoint}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(1.7500000,12.8800000){\hspace*{\Width}\raisebox{\Height}{Scalepoint}}% +\put(1.6200000,13.8800000){\hspace*{\Width}\raisebox{\Height}{Scalepoint}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(4.5000000,12.8800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +\put(4.2500000,13.8800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(6.5000000,12.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(6.2500000,13.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(8.5000000,12.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(8.2500000,13.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(10.5000000,12.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(10.2500000,13.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{Translatepoint}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{Translatepoint}\settodepth{\Depth}{Translatepoint}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(1.7500000,12.1200000){\hspace*{\Width}\raisebox{\Height}{Translatepoint}}% +\put(1.6200000,13.1200000){\hspace*{\Width}\raisebox{\Height}{Translatepoint}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(4.5000000,12.1200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +\put(4.2500000,13.1200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(6.5000000,12.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(6.2500000,13.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(8.5000000,12.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(8.2500000,13.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(10.5000000,12.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(10.2500000,13.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% -\settowidth{\Width}{Drawpoint3d}\setlength{\Width}{-0.5\Width}% -\settoheight{\Height}{Drawpoint3d}\settodepth{\Depth}{Drawpoint3d}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(1.7500000,11.3800000){\hspace*{\Width}\raisebox{\Height}{Drawpoint3d}}% +\settowidth{\Width}{Pointdata3d}\setlength{\Width}{-0.5\Width}% +\settoheight{\Height}{Pointdata3d}\settodepth{\Depth}{Pointdata3d}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% +\put(1.6200000,12.3800000){\hspace*{\Width}\raisebox{\Height}{Pointdata3d}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(4.5000000,11.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(4.2500000,12.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(6.5000000,11.3800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +\put(6.2500000,12.3800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(8.5000000,11.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(8.2500000,12.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% -\settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% -\settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(10.5000000,11.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% +\settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% +\put(10.2500000,12.3800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{Putpoint3d}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{Putpoint3d}\settodepth{\Depth}{Putpoint3d}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(1.7500000,10.6200000){\hspace*{\Width}\raisebox{\Height}{Putpoint3d}}% +\put(1.6200000,11.6200000){\hspace*{\Width}\raisebox{\Height}{Putpoint3d}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(4.5000000,10.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(4.2500000,11.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(6.5000000,10.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(6.2500000,11.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(8.5000000,10.6200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +\put(8.2500000,11.6200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(10.5000000,10.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(10.2500000,11.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{Intersectcrvsf}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{Intersectcrvsf}\settodepth{\Depth}{Intersectcrvsf}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(1.7500000,9.8800000){\hspace*{\Width}\raisebox{\Height}{Intersectcrvsf}}% +\put(1.6200000,10.8800000){\hspace*{\Width}\raisebox{\Height}{Intersectcrvsf}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\triangle$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\triangle$}\settodepth{\Depth}{$\triangle$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(4.5000000,9.8800000){\hspace*{\Width}\raisebox{\Height}{$\triangle$}}% +\put(4.2500000,10.8800000){\hspace*{\Width}\raisebox{\Height}{$\triangle$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(6.5000000,9.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(6.2500000,10.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(8.5000000,9.8800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +\put(8.2500000,10.8800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(10.5000000,9.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(10.2500000,10.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{IntersectsgpL}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{IntersectsgpL}\settodepth{\Depth}{IntersectsgpL}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(1.7500000,9.1200000){\hspace*{\Width}\raisebox{\Height}{IntersectsgpL}}% +\put(1.6200000,10.1200000){\hspace*{\Width}\raisebox{\Height}{IntersectsgpL}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(4.5000000,9.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(4.2500000,10.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(6.5000000,9.1200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +\put(6.2500000,10.1200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(8.5000000,9.1200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +\put(8.2500000,10.1200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(10.5000000,9.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(10.2500000,10.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{Invparapt}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{Invparapt}\settodepth{\Depth}{Invparapt}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(1.7500000,8.3800000){\hspace*{\Width}\raisebox{\Height}{Invparapt}}% +\put(1.6200000,9.3800000){\hspace*{\Width}\raisebox{\Height}{Invparapt}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(4.5000000,8.3800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +\put(4.2500000,9.3800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(6.5000000,8.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(6.2500000,9.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(8.5000000,8.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(8.2500000,9.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(10.5000000,8.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(10.2500000,9.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{Parapt}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{Parapt}\settodepth{\Depth}{Parapt}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(1.7500000,7.6200000){\hspace*{\Width}\raisebox{\Height}{Parapt}}% +\put(1.6200000,8.6200000){\hspace*{\Width}\raisebox{\Height}{Parapt}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(4.5000000,7.6200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +\put(4.2500000,8.6200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(6.5000000,7.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(6.2500000,8.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(8.5000000,7.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(8.2500000,8.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(10.5000000,7.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(10.2500000,8.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{Perpplane}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{Perpplane}\settodepth{\Depth}{Perpplane}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(1.7500000,6.8800000){\hspace*{\Width}\raisebox{\Height}{Perpplane}}% +\put(1.6200000,7.8800000){\hspace*{\Width}\raisebox{\Height}{Perpplane}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(4.5000000,6.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(4.2500000,7.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(6.5000000,6.8800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +\put(6.2500000,7.8800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(8.5000000,6.8800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +\put(8.2500000,7.8800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(10.5000000,6.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(10.2500000,7.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{Perppt}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{Perppt}\settodepth{\Depth}{Perppt}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(1.7500000,6.1200000){\hspace*{\Width}\raisebox{\Height}{Perppt}}% +\put(1.6200000,7.1200000){\hspace*{\Width}\raisebox{\Height}{Perppt}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(4.5000000,6.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(4.2500000,7.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(6.5000000,6.1200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +\put(6.2500000,7.1200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(8.5000000,6.1200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +\put(8.2500000,7.1200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +% +\settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% +\settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% +\put(10.2500000,7.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% +% +\settowidth{\Width}{Pointdata3d}\setlength{\Width}{-0.5\Width}% +\settoheight{\Height}{Pointdata3d}\settodepth{\Depth}{Pointdata3d}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% +\put(1.6200000,6.3800000){\hspace*{\Width}\raisebox{\Height}{Pointdata3d}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(10.5000000,6.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(4.2500000,6.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% +% +\settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% +\settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% +\put(6.2500000,6.3800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +% +\settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% +\settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% +\put(8.2500000,6.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% +% +\settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% +\settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% +\put(10.2500000,6.3800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{PutonCurve3d}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{PutonCurve3d}\settodepth{\Depth}{PutonCurve3d}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(1.7500000,5.3800000){\hspace*{\Width}\raisebox{\Height}{PutonCurve3d}}% +\put(1.6200000,5.6200000){\hspace*{\Width}\raisebox{\Height}{PutonCurve3d}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(4.5000000,5.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(4.2500000,5.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(6.5000000,5.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(6.2500000,5.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(8.5000000,5.3800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +\put(8.2500000,5.6200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(10.5000000,5.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(10.2500000,5.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{PutonSeg3d}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{PutonSeg3d}\settodepth{\Depth}{PutonSeg3d}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(1.7500000,4.6200000){\hspace*{\Width}\raisebox{\Height}{PutonSeg3d}}% +\put(1.6200000,4.8800000){\hspace*{\Width}\raisebox{\Height}{PutonSeg3d}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(4.5000000,4.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(4.2500000,4.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(6.5000000,4.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(6.2500000,4.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(8.5000000,4.6200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +\put(8.2500000,4.8800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(10.5000000,4.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(10.2500000,4.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{Reflectpoint3d}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{Reflectpoint3d}\settodepth{\Depth}{Reflectpoint3d}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(1.7500000,3.8800000){\hspace*{\Width}\raisebox{\Height}{Reflectpoint3d}}% +\put(1.6200000,4.1200000){\hspace*{\Width}\raisebox{\Height}{Reflectpoint3d}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(4.5000000,3.8800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +\put(4.2500000,4.1200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(6.5000000,3.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(6.2500000,4.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(8.5000000,3.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(8.2500000,4.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(10.5000000,3.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(10.2500000,4.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{Rotatepoint3d}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{Rotatepoint3d}\settodepth{\Depth}{Rotatepoint3d}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(1.7500000,3.1200000){\hspace*{\Width}\raisebox{\Height}{Rotatepoint3d}}% +\put(1.6200000,3.3800000){\hspace*{\Width}\raisebox{\Height}{Rotatepoint3d}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(4.5000000,3.1200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +\put(4.2500000,3.3800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(6.5000000,3.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(6.2500000,3.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(8.5000000,3.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(8.2500000,3.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(10.5000000,3.1200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(10.2500000,3.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{Scalepoint3d}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{Scalepoint3d}\settodepth{\Depth}{Scalepoint3d}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(1.7500000,2.3800000){\hspace*{\Width}\raisebox{\Height}{Scalepoint3d}}% +\put(1.6200000,2.6200000){\hspace*{\Width}\raisebox{\Height}{Scalepoint3d}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(4.5000000,2.3800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +\put(4.2500000,2.6200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(6.5000000,2.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(6.2500000,2.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(8.5000000,2.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(8.2500000,2.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(10.5000000,2.3800000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(10.2500000,2.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{Translatepoint3d}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{Translatepoint3d}\settodepth{\Depth}{Translatepoint3d}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(1.7500000,1.6200000){\hspace*{\Width}\raisebox{\Height}{Translatepoint3d}}% +\put(1.6200000,1.8800000){\hspace*{\Width}\raisebox{\Height}{Translatepoint3d}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{$\bigcirc$}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{$\bigcirc$}\settodepth{\Depth}{$\bigcirc$}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(4.5000000,1.6200000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% +\put(4.2500000,1.8800000){\hspace*{\Width}\raisebox{\Height}{$\bigcirc$}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(6.5000000,1.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(6.2500000,1.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(8.5000000,1.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(8.2500000,1.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% -{% -\color[rgb]{0,0,0}% \settowidth{\Width}{-}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{-}\settodepth{\Depth}{-}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(10.5000000,1.6200000){\hspace*{\Width}\raisebox{\Height}{-}}% +\put(10.2500000,1.8800000){\hspace*{\Width}\raisebox{\Height}{-}}% % -}% \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 3771067862e..3cc533bc714 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,172 +1,182 @@ -%%% /Users/takatoosetsuo/Dropbox/kettoday/0511ReuleauxTriangle/fig/tablesample1.tex -%%% Generator=tablesample1.cdy -{\unitlength=1cm% +%%% fig.tex 2014-12-18 15:16 +%%% fig.sce 2014-12-18 15:16 +{\unitlength=5mm% \begin{picture}% -(12,6)(0,0)% -\special{pn 8}% -% -\special{pn 16}% -\special{pa 0 -2362}\special{pa 0 -0}% -\special{fp}% -\special{pn 8}% -\special{pn 16}% -\special{pa 1575 -2362}\special{pa 1575 -0}% -\special{fp}% -\special{pn 8}% -\special{pn 16}% -\special{pa 3150 -2362}\special{pa 3150 -0}% -\special{fp}% -\special{pn 8}% -\special{pn 16}% -\special{pa 4724 -2362}\special{pa 4724 -0}% -\special{fp}% -\special{pn 8}% -\special{pn 16}% -\special{pa 0 -2362}\special{pa 4724 -2362}% -\special{fp}% -\special{pn 8}% -\special{pn 16}% -\special{pa 0 -0}\special{pa 4724 -0}% -\special{fp}% -\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}% -\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 197 -1083}\special{pa 220 -1013}\special{pa 244 -947}\special{pa 268 -883}% -\special{pa 291 -822}\special{pa 315 -764}\special{pa 339 -709}\special{pa 362 -656}% -\special{pa 386 -606}\special{pa 409 -560}\special{pa 433 -516}\special{pa 457 -475}% -\special{pa 480 -436}\special{pa 504 -401}\special{pa 528 -368}\special{pa 551 -339}% -\special{pa 575 -312}\special{pa 598 -288}\special{pa 622 -266}\special{pa 646 -248}% -\special{pa 669 -232}\special{pa 693 -220}\special{pa 717 -210}\special{pa 740 -203}% -\special{pa 764 -198}\special{pa 787 -197}\special{pa 811 -198}\special{pa 835 -203}% -\special{pa 858 -210}\special{pa 882 -220}\special{pa 906 -232}\special{pa 929 -248}% -\special{pa 953 -266}\special{pa 976 -288}\special{pa 1000 -312}\special{pa 1024 -339}% -\special{pa 1047 -368}\special{pa 1071 -401}\special{pa 1094 -436}\special{pa 1118 -475}% -\special{pa 1142 -516}\special{pa 1165 -560}\special{pa 1189 -606}\special{pa 1213 -656}% -\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}% -\special{pa 2055 -633}\special{pa 2079 -598}\special{pa 2102 -565}\special{pa 2126 -535}% -\special{pa 2150 -509}\special{pa 2173 -484}\special{pa 2197 -463}\special{pa 2220 -445}% -\special{pa 2244 -429}\special{pa 2268 -416}\special{pa 2291 -406}\special{pa 2315 -399}% -\special{pa 2339 -395}\special{pa 2362 -394}\special{pa 2386 -395}\special{pa 2409 -399}% -\special{pa 2433 -406}\special{pa 2457 -416}\special{pa 2480 -429}\special{pa 2504 -445}% -\special{pa 2528 -463}\special{pa 2551 -484}\special{pa 2575 -509}\special{pa 2598 -535}% -\special{pa 2622 -565}\special{pa 2646 -598}\special{pa 2669 -633}\special{pa 2693 -671}% -\special{pa 2717 -713}\special{pa 2740 -757}\special{pa 2764 -803}\special{pa 2787 -853}% -\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}% -\special{pa 3630 -830}\special{pa 3654 -795}\special{pa 3677 -762}\special{pa 3701 -732}% -\special{pa 3724 -705}\special{pa 3748 -681}\special{pa 3772 -660}\special{pa 3795 -642}% -\special{pa 3819 -626}\special{pa 3843 -613}\special{pa 3866 -603}\special{pa 3890 -596}% -\special{pa 3913 -592}\special{pa 3937 -591}\special{pa 3961 -592}\special{pa 3984 -596}% -\special{pa 4008 -603}\special{pa 4031 -613}\special{pa 4055 -626}\special{pa 4079 -642}% -\special{pa 4102 -660}\special{pa 4126 -681}\special{pa 4150 -705}\special{pa 4173 -732}% -\special{pa 4197 -762}\special{pa 4220 -795}\special{pa 4244 -830}\special{pa 4268 -868}% -\special{pa 4291 -909}\special{pa 4315 -953}\special{pa 4339 -1000}\special{pa 4362 -1050}% -\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 3346 -394}\special{pa 4528 -394}% +( 12.00000, 9.00000)( -0.00000, -0.00000)% +\special{pn 8}% +% +\special{pn 16}% +\special{pa 0 -1772}\special{pa 787 -1772}% +\special{fp}% +\special{pn 8}% +\special{pn 16}% +\special{pa 787 -1772}\special{pa 1575 -1772}% +\special{fp}% +\special{pn 8}% +\special{pn 16}% +\special{pa 1575 -1772}\special{pa 2362 -1772}% +\special{fp}% +\special{pn 8}% +\special{pn 16}% +\special{pa 0 0}\special{pa 787 0}% +\special{fp}% +\special{pn 8}% +\special{pn 16}% +\special{pa 787 0}\special{pa 1575 0}% +\special{fp}% +\special{pn 8}% +\special{pn 16}% +\special{pa 1575 0}\special{pa 2362 0}% +\special{fp}% +\special{pn 8}% +\special{pn 16}% +\special{pa 0 -1772}\special{pa 0 -1378}% +\special{fp}% +\special{pn 8}% +\special{pn 16}% +\special{pa 0 -1378}\special{pa 0 -1102}% +\special{fp}% +\special{pn 8}% +\special{pn 16}% +\special{pa 0 -1102}\special{pa 0 0}% +\special{fp}% +\special{pn 8}% +\special{pn 16}% +\special{pa 787 -1772}\special{pa 787 -1378}% +\special{fp}% +\special{pn 8}% +\special{pn 16}% +\special{pa 787 -1378}\special{pa 787 -1102}% +\special{fp}% +\special{pn 8}% +\special{pn 16}% +\special{pa 787 -1102}\special{pa 787 0}% \special{fp}% +\special{pn 8}% +\special{pn 16}% +\special{pa 1575 -1772}\special{pa 1575 -1378}% +\special{fp}% +\special{pn 8}% +\special{pn 16}% +\special{pa 1575 -1378}\special{pa 1575 -1102}% +\special{fp}% +\special{pn 8}% +\special{pn 16}% +\special{pa 1575 -1102}\special{pa 1575 0}% +\special{fp}% +\special{pn 8}% +\special{pn 16}% +\special{pa 2362 -1772}\special{pa 2362 -1378}% +\special{fp}% +\special{pn 8}% +\special{pn 16}% +\special{pa 2362 -1378}\special{pa 2362 -1102}% +\special{fp}% +\special{pn 8}% +\special{pn 16}% +\special{pa 2362 -1102}\special{pa 2362 0}% +\special{fp}% +\special{pn 8}% +\special{pa 0 -1378}\special{pa 2362 -1378}% +\special{fp}% +\special{pa 0 -1102}\special{pa 39 -1102}\special{fp}\special{pa 77 -1102}\special{pa 116 -1102}\special{fp}% +\special{pa 155 -1102}\special{pa 194 -1102}\special{fp}\special{pa 232 -1102}\special{pa 271 -1102}\special{fp}% +\special{pa 310 -1102}\special{pa 349 -1102}\special{fp}\special{pa 387 -1102}\special{pa 426 -1102}\special{fp}% +\special{pa 465 -1102}\special{pa 503 -1102}\special{fp}\special{pa 542 -1102}\special{pa 581 -1102}\special{fp}% +\special{pa 620 -1102}\special{pa 658 -1102}\special{fp}\special{pa 697 -1102}\special{pa 736 -1102}\special{fp}% +\special{pa 774 -1102}\special{pa 813 -1102}\special{fp}\special{pa 852 -1102}\special{pa 891 -1102}\special{fp}% +\special{pa 929 -1102}\special{pa 968 -1102}\special{fp}\special{pa 1007 -1102}\special{pa 1046 -1102}\special{fp}% +\special{pa 1084 -1102}\special{pa 1123 -1102}\special{fp}\special{pa 1162 -1102}\special{pa 1200 -1102}\special{fp}% +\special{pa 1239 -1102}\special{pa 1278 -1102}\special{fp}\special{pa 1317 -1102}\special{pa 1355 -1102}\special{fp}% +\special{pa 1394 -1102}\special{pa 1433 -1102}\special{fp}\special{pa 1472 -1102}\special{pa 1510 -1102}\special{fp}% +\special{pa 1549 -1102}\special{pa 1588 -1102}\special{fp}\special{pa 1626 -1102}\special{pa 1665 -1102}\special{fp}% +\special{pa 1704 -1102}\special{pa 1743 -1102}\special{fp}\special{pa 1781 -1102}\special{pa 1820 -1102}\special{fp}% +\special{pa 1859 -1102}\special{pa 1898 -1102}\special{fp}\special{pa 1936 -1102}\special{pa 1975 -1102}\special{fp}% +\special{pa 2014 -1102}\special{pa 2052 -1102}\special{fp}\special{pa 2091 -1102}\special{pa 2130 -1102}\special{fp}% +\special{pa 2169 -1102}\special{pa 2207 -1102}\special{fp}\special{pa 2246 -1102}\special{pa 2285 -1102}\special{fp}% +\special{pa 2323 -1102}\special{pa 2362 -1102}\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}% -\put(2.0000000,5.5000000){\hspace*{\Width}\raisebox{\Height}{$D>0$}}% +\put(2.0000,8.0000){\hspace*{\Width}\raisebox{\Height}{$D>0$}}% +% % \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}% -\put(6.0000000,5.5000000){\hspace*{\Width}\raisebox{\Height}{$D=0$}}% +\put(6.0000,8.0000){\hspace*{\Width}\raisebox{\Height}{$D=0$}}% +% % \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}% -\put(10.0000000,5.5000000){\hspace*{\Width}\raisebox{\Height}{$D<0$}}% +\put(10.0000,8.0000){\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点ã§äº¤ã‚ã‚‹}}% +\put(2.0000,6.3000){\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}% -\put(6.0000000,4.5000000){\hspace*{\Width}\raisebox{\Height}{接ã™ã‚‹}}% +\put(6.0000,6.3000){\hspace*{\Width}\raisebox{\Height}{接ã™ã‚‹}}% +% % \settowidth{\Width}{共有点ãªã—}\setlength{\Width}{-0.5\Width}% \settoheight{\Height}{共有点ãªã—}\settodepth{\Depth}{共有点ãªã—}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% -\put(10.0000000,4.5000000){\hspace*{\Width}\raisebox{\Height}{共有点ãªã—}}% +\put(10.0000,6.3000){\hspace*{\Width}\raisebox{\Height}{共有点ãªã—}}% +% % +\settowidth{\Width}{判別å¼ã¨$x$軸ã®äº¤ç‚¹}\setlength{\Width}{-0.5\Width}% +\settoheight{\Height}{判別å¼ã¨$x$軸ã®äº¤ç‚¹}\settodepth{\Depth}{判別å¼ã¨$x$軸ã®äº¤ç‚¹}\setlength{\Height}{-0.5\Height}\setlength{\Depth}{0.5\Depth}\addtolength{\Height}{\Depth}% +\put(4.0000,10.0000){\hspace*{\Width}\raisebox{\Height}{判別å¼ã¨$x$軸ã®äº¤ç‚¹}}% +% +% +\special{pa 98 -738}\special{pa 110 -703}\special{pa 123 -669}\special{pa 135 -636}% +\special{pa 147 -605}\special{pa 159 -576}\special{pa 171 -548}\special{pa 183 -521}% +\special{pa 195 -496}\special{pa 207 -473}\special{pa 219 -450}\special{pa 231 -430}% +\special{pa 243 -411}\special{pa 255 -393}\special{pa 267 -377}\special{pa 279 -362}% +\special{pa 291 -349}\special{pa 303 -337}\special{pa 315 -326}\special{pa 327 -318}% +\special{pa 339 -310}\special{pa 352 -304}\special{pa 364 -300}\special{pa 376 -297}% +\special{pa 388 -295}\special{pa 400 -295}\special{pa 412 -297}\special{pa 424 -300}% +\special{pa 436 -304}\special{pa 448 -310}\special{pa 460 -318}\special{pa 472 -326}% +\special{pa 484 -337}\special{pa 496 -349}\special{pa 508 -362}\special{pa 520 -377}% +\special{pa 532 -393}\special{pa 544 -411}\special{pa 556 -430}\special{pa 568 -450}% +\special{pa 581 -473}\special{pa 593 -496}\special{pa 605 -521}\special{pa 617 -548}% +\special{pa 629 -576}\special{pa 641 -605}\special{pa 653 -636}\special{pa 665 -669}% +\special{pa 677 -703}\special{pa 689 -738}% +\special{fp}% +\special{pa 886 -837}\special{pa 898 -801}\special{pa 910 -767}\special{pa 922 -735}% +\special{pa 934 -704}\special{pa 946 -674}\special{pa 958 -646}\special{pa 970 -620}% +\special{pa 982 -595}\special{pa 994 -571}\special{pa 1006 -549}\special{pa 1018 -528}% +\special{pa 1030 -509}\special{pa 1043 -491}\special{pa 1055 -475}\special{pa 1067 -460}% +\special{pa 1079 -447}\special{pa 1091 -435}\special{pa 1103 -425}\special{pa 1115 -416}% +\special{pa 1127 -409}\special{pa 1139 -403}\special{pa 1151 -398}\special{pa 1163 -395}% +\special{pa 1175 -394}\special{pa 1187 -394}\special{pa 1199 -395}\special{pa 1211 -398}% +\special{pa 1223 -403}\special{pa 1235 -409}\special{pa 1247 -416}\special{pa 1259 -425}% +\special{pa 1271 -435}\special{pa 1284 -447}\special{pa 1296 -460}\special{pa 1308 -475}% +\special{pa 1320 -491}\special{pa 1332 -509}\special{pa 1344 -528}\special{pa 1356 -549}% +\special{pa 1368 -571}\special{pa 1380 -595}\special{pa 1392 -620}\special{pa 1404 -646}% +\special{pa 1416 -674}\special{pa 1428 -704}\special{pa 1440 -735}\special{pa 1452 -767}% +\special{pa 1464 -801}\special{pa 1476 -837}% +\special{fp}% +\special{pa 1673 -935}\special{pa 1685 -900}\special{pa 1697 -866}\special{pa 1709 -833}% +\special{pa 1721 -802}\special{pa 1733 -773}\special{pa 1746 -745}\special{pa 1758 -718}% +\special{pa 1770 -693}\special{pa 1782 -669}\special{pa 1794 -647}\special{pa 1806 -627}% +\special{pa 1818 -607}\special{pa 1830 -590}\special{pa 1842 -573}\special{pa 1854 -559}% +\special{pa 1866 -545}\special{pa 1878 -534}\special{pa 1890 -523}\special{pa 1902 -514}% +\special{pa 1914 -507}\special{pa 1926 -501}\special{pa 1938 -497}\special{pa 1950 -494}% +\special{pa 1962 -492}\special{pa 1975 -492}\special{pa 1987 -494}\special{pa 1999 -497}% +\special{pa 2011 -501}\special{pa 2023 -507}\special{pa 2035 -514}\special{pa 2047 -523}% +\special{pa 2059 -534}\special{pa 2071 -545}\special{pa 2083 -559}\special{pa 2095 -573}% +\special{pa 2107 -590}\special{pa 2119 -607}\special{pa 2131 -627}\special{pa 2143 -647}% +\special{pa 2155 -669}\special{pa 2167 -693}\special{pa 2179 -718}\special{pa 2191 -745}% +\special{pa 2204 -773}\special{pa 2216 -802}\special{pa 2228 -833}\special{pa 2240 -866}% +\special{pa 2252 -900}\special{pa 2264 -935}% +\special{fp}% +\special{pa 197 -394}\special{pa 591 -394}% +\special{fp}% +\special{pa 984 -394}\special{pa 1378 -394}% +\special{fp}% +\special{pa 1772 -394}\special{pa 2165 -394}% +\special{fp}% \end{picture}}%
\ No newline at end of file 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 aabea0a6656..bb0c5f884f5 100644 --- a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/KeTCindyReferenceE.tex +++ b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/KeTCindyReferenceE.tex @@ -236,21 +236,23 @@ To draw a point in the void mode. \itemket{Description}Generic function to set the color of figures and characters in the \TeX\ figure. \itemket{Examples}\mbox{} +\verb|C.xy=|B.xy|/|C.xy|*C.xy;|\\ +\verb|Listplot([B,A,C]);|\\ \verb|Setcolor([1,0,0]);|\\ -\verb|Circledata([A,D],["Rng=[0,pi/3]"]);|\\ -\verb|Arrowhead(E,[-1,0.8],[2,1]);| +\verb|Anglemark("1",[B,A,C],[3]); //size=3|\\ +\verb|Arrowhead(1,"ag1",[2]); //position=1,size=2| -\verb|Setcolor("red",opacity);|\\ -\hspace*{20mm} opacity is real number from 0 to 1 +%\verb|Setcolor("red",opacity);|\\ +%\hspace*{20mm} opacity is real number from 0 to 1 \itemket{Remark}You can also use color option in each command of drawing. -\verb|Circledata([A,D],["Rng=[0,pi/3]","Color=[1,0,0]"]);|\\ -\verb|Arrowhead(E,[-1,0.8],[2,1],"Color=[1,0,0]");| +\verb|Arrowhead(1,"ag1",["Color=[1,0,0]"]);| -\begin{center} -\includegraphics[bb=0 0 161 134,width=35mm]{Fig/setcolor.pdf} -\end{center} +\vspace{\baselineskip} +\hspace{20mm}% +\includegraphics[width=35mm,bb=0.00 0.00 176.00 165.00]{Fig/anglearrowscreen.pdf}% +\hspace{20mm}\scalebox{0.5}{\input{Fig/anglearrow.tex}} Refer to Color table on Appendix. @@ -350,12 +352,6 @@ Size can be change as a option of "Pointdata". \hspace{20mm}\input{Fig/pointsize} \end{cmd} -%------------Setarrow-------------------------------- -\begin{cmd}{Setarrow}{setarrow} -\itemket{Usage}Setarrow(size,angle,position,cut,segstyle) -\itemket{Description}Generic function to set the arrow. -\itemket{Details} Set the style of arrow. Same as options of \hyperlink{arrowdata}{Arrowdata()} .\\ -\end{cmd} %------------Setmarklen-------------------------------- @@ -708,13 +704,10 @@ This Point P on the asteroid can be move along the curve on the Euclidean view. \end{center} \end{cmd} -%-------------Setarrow------------------------------ +%------------Setarrow-------------------------------- \begin{cmd}{Setarrow}{setarrow} -\itemket{Usage}Setarrow([arrowsize,angle,position,cut,linestyle]); -\itemket{Description}Generic function to set styles of arrows. -\itemket{Details}Defaults are arrowsize(1),angle(18),position(1),cut(1),linestyle("dr"). -\verb|-1| means to unchange the default. -\itemket{Examples}Setsarrow([-1,30,-1,0.2]); +\itemket{Usage}Setarrow(size(1), angle(18), position(1), cut(0.2) +\itemket{Description}set the style of arrow \end{cmd} %------------Arrowdata-------------------------------- @@ -722,22 +715,22 @@ This Point P on the asteroid can be move along the curve on the Euclidean view. \itemket{Usage}Arrowdata(name,[starting point, ending point] , options) \itemket{Description}draw an arrow line between two points. -Options : arrowhead size, arrowhead angle,position,cut position,line type,line color,trimming.\\ -All options do not always reflect on Euclidean view. +Options : Those of Setarrow and "Line=n(y)"(with line),"Cutend="(trimming),"Color=" + \itemket{Examples}\mbox{} \verb| Arrowdata("1",[A,B]);|\\ \verb| Arrowdata("2",[[1,0],[2,3]],[2]);|\\ \verb| Arrowdata("3",[[2,0],[3,3]],[3,45]);|\\ \verb| Arrowdata("4",[[3,0],[4,3]],[3,1,0.5]);|\\ -\verb| Arrowdata("5",[[4,0],[5,3]],[3,1,1,0.5]);|\\ -\verb| Arrowdata("6",[[5,0],[6,3]],[3,1,1,1]);|\\ +\verb| Arrowdata("5",[[4,0],[5,3]],[3,1,1,0]);|\\ +\verb| Arrowdata("6",[[5,0],[6,3]],[3,"Line=y"]);|\\ \verb| Arrowdata("7",[[6,0],[7,3]],[3,"dr,2"]);|\\ \verb| Arrowdata("8",[[7,0],[8,3]],[3,1,1,0.5,"Color=red"]);|\\ -\begin{center} -\input{Fig/arrowdata} -\end{center} +%\vspace{6mm} + +\hspace{20mm}\scalebox{0.9}{\input{Fig/arrowhead}} \begin{minipage}{80mm} \verb| Circledata("1",[A,A.xy+[0.5,0]]);|\\ @@ -754,43 +747,71 @@ All options do not always reflect on Euclidean view. %--------------Arrowhead------------------------------ \begin{cmd}{Arrowhead}{arrowhead} -\itemket{Usage}Arrowhead(point, direction , options) , Arrowhead(point, PD, options) -\itemket{Description}draw an arrowhead with specified direction at a designated point.\\ -Options are: arrowhead size, arrowhead angle,position,shape,position.\\ +\itemket{Usage}(1) Arrowhead(point, direction , options) \\ +\hspace*{18.8mm}(2) Arrowhead(point/positon ratio, PD(curve), options) +\itemket{Description}(1) draw an arrowhead with specified direction at a point.\\ +\hspace*{18.8mm}(2) draw an arrowhead on a PD(curve)\\ +Options are the same as Arrowdata\\ +Position ratio of a point on the curve is from 0 to 1. \itemket{Examples}\mbox{} +\vspace{2mm} + +\begin{layer}{150}{0} +\putnotese{110}{8}{\input{Fig/ForRef-Arrowhead-1}} +\end{layer} + Let A=[1,1]. \begin{enumerate}[(a)] \item \verb|Arrowhead(A,[-1,1]);| \item \verb|Arrowhead([1,1],[-1,1],[2,60]);| -\item \verb|Arrowhead(A,[-1,1],[2,30,"b"]);| -\item \verb|Arrowhead([1,1],[-1,1],[2,20,"lc"]);| +\item \verb|Arrowhead(A,[-1,1],[2,30,0.5);| +\item \verb|Arrowhead([1,1],[-1,1],[2,20,0.5,"Line=y"]);| \end{enumerate} -\hspace*{17mm}% -\Ltab{30mm}{(a)}\Ltab{30mm}{(b)}\Ltab{30mm}{(c)}\Ltab{30mm}{(d)}\\ -\hspace*{20mm}% -\Ltab{30mm}{\input{Fig/ForRef-Arrowhead-2}}% -\Ltab{30mm}{\input{Fig/ForRef-Arrowhead-3}} -\Ltab{30mm}{\input{Fig/ForRef-Arrowhead-4}} -\Ltab{30mm}{\input{Fig/ForRef-Arrowhead-5}} +\vspace{5mm} + +\begin{layer}{150}{0} +\putnotese{0}{0}{(a)} +\putnotese{30}{0}{(b)} +\putnotese{60}{0}{(c)} +\putnotese{90}{0}{(d)} +\putnotese{0}{7}{ \input{Fig/ForRef-Arrowhead-2}} +\putnotese{30}{7}{ \input{Fig/ForRef-Arrowhead-3}} +\putnotese{60}{7}{ \input{Fig/ForRef-Arrowhead-4}} +\putnotese{90}{7}{ \input{Fig/ForRef-Arrowhead-5}} +\end{layer} + +\vspace{30mm} + +\begin{layer}{150}{0} +\putnotese{110}{4}{\input{Fig/ForRef-Arrowhead2-6}} +\end{layer} + +Let A whose position ratio is 0.6 be on the curve cr1. -Let D be on the curve crBC. \begin{enumerate}[(a)]% \setcounter{enumi}{4}% -\item \verb|Arrowhead(D,"crBC");| -\item \verb|Arrowhead(D,"crBC",[2]);| -\item \verb|Arrowhead(D,"crBC",[2,30,"l"]);| -\item \verb|Arrowhead(D,"Invert(crBC)");| +\item \verb|Arrowhead(A,"cr1");| +\item \verb|Arrowhead(0.6,"cr1",[2,1,0.5,"Color=red"]);| +\item \verb|Arrowhead(1,"cr1");| +\item \verb|Arrowhead(1,"Invert(cr1)",["Line=y"]);| \end{enumerate} -\hspace*{17mm}% -\Ltab{30mm}{(e)}\Ltab{30mm}{f)}\Ltab{30mm}{(g)}\Ltab{30mm}{(h)}\\ -\hspace*{20mm}% -\Ltab{30mm}{\input{Fig/ForRef-Arrowhead-7}} -\Ltab{30mm}{\input{Fig/ForRef-Arrowhead-8}} -\Ltab{30mm}{\input{Fig/ForRef-Arrowhead-9}} -\Ltab{30mm}{\input{Fig/ForRef-Arrowhead-10}} +\vspace{5mm} + +\begin{layer}{150}{0} +\putnotese{0}{0}{e)} +\putnotese{30}{0}{(f)} +\putnotese{60}{0}{(g)} +\putnotese{90}{0}{(h)} +\putnotese{0}{7}{ \input{Fig/ForRef-Arrowhead2-7}} +\putnotese{30}{7}{ \input{Fig/ForRef-Arrowhead2-8}} +\putnotese{60}{7}{ \input{Fig/ForRef-Arrowhead2-9}} +\putnotese{90}{7}{ \input{Fig/ForRef-Arrowhead2-10}} +\end{layer} + +\vspace{30mm} \end{cmd} @@ -2218,7 +2239,7 @@ near point from start position : Set in case where the first curve and the last \verb|Hatchdata("8",["i"],[["crAB"]]);| \begin{center} -\input{Fig/HatchZuKita7E.tex}\hspace{10mm}\input{Fig/HatchZuKita8E.tex} +\input{Fig/HatchZuKita7E.tex}\hspace{10mm}\input{Fig/HatchZuKita8.tex} \end{center} %\verb|Hatchdata("9a",["iii"],[["crAB"],["ln1","n"],["ln2","n"]]);|\\ @@ -2261,9 +2282,16 @@ the surrounded region is filled with dots. \begin{cmd}{Shade}{shade} \itemket{Usage}Shade(("name"),list of PD, options); \itemket{Description}This function fills a domain surrounded by a closed curve. -\itemket{Details}\mbox{}\\ -If "Invert" is used in some PD, \verb|Enclosing| is used, if not, \verb|Joincrvs| is used as default. -The options are use of enclosing("Enc=y/n") and color. +\itemket{Details}Options are as follows. () means the default.\\ +\begin{itemize} +\item Starting point. The defaults are the intersect of the first curve and the last one. +\item "Color=" +\item "Enc=n(y)"\ \ Whether \verb|Enclosing| is used. +\item "Trim=n(y)"\ \ Whether it is trimmed in the window. +\item "First=y(n)"\\ +\hspace*{5mm}Whether \verb|Shade| is placed at the top in \TeX. The default is just before Gdata. + +\end{itemize} \itemket{Examples}\mbox{}\\ \verb|Setax([7,"nw"]);|\\ \verb|Plotdata("1","2*sin(x)","x",["Num=100"]);|\\ @@ -5701,7 +5729,7 @@ Find on the screen (not in the space) intersection points (\verb|tmp_1|, \verb|t \itemket{Description} Function to add scripts to the first/last of body tag. \itemket{Examples} \mbox{} -\verb|Ketcindyjsbody(["<p,f10>__Title''],[]);|\\ +\verb|Ketcindyjsbody(["<p,f10>_;_;Title"],[]);|\\ \verb| => <p><font size="10">  Title</font></p>| \end{cmd} @@ -5769,6 +5797,30 @@ Find on the screen (not in the space) intersection points (\verb|tmp_1|, \verb|t %-==Appendix ======================== \section{Appendix} +\subsection{To use other text editor} + + +For example, let the cdyfie be \verb|template.cdy|. + +\begin{enumerate}[(1)] +\item Create \verb|template.txt| and put it in the same folder as the cdy file. +\item Describe in Figures slot as follows, and execute. +\begin{verbatim} + Ketinit(); + setdirectory(Dircdy); + import(Cdyname()+''.txt''); + setdirectory(Dirwork); + Windispg(); +\end{verbatim} + +\item Write scripts in \verb|template.txt| and save it.\\ +Ex)\ \verb|Putpoint("A",[0,0],A.xy);|\\ +\phantom{Ex)\ }\verb|Plotdata("1'',''x^2'',''x'');| + +\item Click any position on the screen. + +\end{enumerate} + \subsection{Color table} \begin{center} @@ -5837,7 +5889,7 @@ Rem) lightgray\ [0,0,0,0.15],\ offwhite\ [0,0,0,0.3],\ cindycolor\ [0.66,0,69,0. {\bf Drawing} \> \\ \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{setarrow}{Setarrow} \> set styles of arrows.\\ \hyperlink{arrowdata}{Arrowdata} \> draw an arrow line between two points.\\ \hyperlink{arrowhead}{Arrowhead} \>draw an arrowhead with specified direction at a designated point.\\ \hyperlink{bezier}{Bezier} \> draw a Bezier curve.\\ 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 4bda400879f..a3510cda78b 100644 --- a/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/KeTCindyReferenceJ.tex +++ b/Master/texmf-dist/doc/support/ketcindy/source/ketmanual/KeTCindyReferenceJ.tex @@ -3,6 +3,7 @@ \usepackage{amsmath} % \usepackage{amsmath,newtxmath} \usepackage[dvipdfmx]{graphicx,color} +\usepackage{enumerate,bm} \usepackage{wrapfig} \usepackage{jsverb} \usepackage[dvipdfmx,bookmarks=false,colorlinks=true,linkcolor=blue]{hyperref} @@ -267,23 +268,29 @@ Setcolor("darkmaz"); \vspace{\baselineskip} -ã€ä¾‹ã€‘Cinderellaã®æ画ツールã¨CindyScriptã§ç·šåˆ†AB,ACã‚’60°ã®è§’ã‚’ãªã™ã‚ˆã†ã«æã„ã¦ãŠã，点Dã¨Eを弧ã®ä¸¡ç«¯ã«ãªã‚‹ã‚ˆã†ã«è¨å®šã—㦠+ã€ä¾‹ã€‘Cを大ãã•ãŒBã¨ä¸€è‡´ã™ã‚‹ã‚ˆã†ã«ã¨ã‚Šï¼ŒAnglemarkã¨çŸ¢å°ã‚’æã \begin{verbatim} -Setcolor([1,0,0]); -Circledata([A,D],["Rng=[0,pi/3]"]); -Arrowhead(E,[-1,0.8],[2,1]); +C.xy=|B.xy|/|C.xy|*C.xy; +Listplot([B,A,C]); +Setcolor("red"); +Anglemark("1",[B,A,C],[3]); //size=3 +Arrowhead(1,"ag1",[2]); //position=1,size=2 \end{verbatim} -を実行ã™ã‚‹ã¨ï¼ŒçŸ¢ã˜ã‚Šã¤ãã®å¼§ã‚’赤ã§è¡¨ç¤ºã™ã‚‹ã“ã¨ãŒã§ãる。 -１行目ã¯ï¼Œ\verb|Setcolor("red");|ã§ã‚‚よã„。 座標軸をæãå ´åˆã¯ï¼Œã“ã®ã‚㨠\verb|Setcolor("black")| ã§é»’ã«æˆ»ã—ã¦ãŠã‹ãªã„ã¨ï¼Œåº§æ¨™è»¸ãŒèµ¤ã§è¡¨ç¤ºã•ã‚Œã¦ã—ã¾ã†ã®ã§è¦æ³¨æ„。 \vspace{\baselineskip} -\hspace{20mm} \includegraphics[width=3.5cm,bb=0 0 161 134]{Fig/setcolor.pdf} +\hspace{20mm}% +%\includegraphics[width=3.5cm,bb=0 0 161 134]{Fig/setcolor.pdf} +\includegraphics[width=35mm,bb=0.00 0.00 176.00 165.00]{Fig/anglearrowscreen.pdf}% +\hspace{20mm}\scalebox{0.5}{\input{Fig/anglearrow.tex}} + \begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright} +\newpage + \vspace{\baselineskip} \hypertarget{deffun}{} \item[関数]Deffun(関数å , 定義ã®ãƒªã‚¹ãƒˆ) @@ -387,12 +394,6 @@ Pointdata("4",D,["Size=4"]); \begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright} -\hypertarget{setarrow}{} -\item[関数]Setarrow(size,angle,position,cut,segstyle) -\item[機能]矢線ã®å½¢çŠ¶ã®è¨å®šã‚’ã™ã‚‹ã€‚ -\item[説明]引数ã¯ï¼Œé †ã«ï¼ŒçŸ¢ã˜ã‚Šã®å¤§ãã•, é–‹ã角, 矢ã˜ã‚Šä½ç½®, 切り込ã¿ä½ç½®, 線種ã¨è¡¨ç¤ºè‰² - -ãã‚Œãžã‚Œã®æ„味ã¨å€¤ã¯ï¼Œ\hyperlink{arrowdata}{Arrowdata()} ã‚’å‚ç…§ã®ã“ã¨ã€‚ \vspace{\baselineskip} \hypertarget{setmarklen}{} @@ -564,7 +565,7 @@ optionsã¯ï¼Œç·šç¨®ãƒ»è¡¨ç¤ºã™ã‚‹æ–‡å—列・解åƒåº¦ãƒ»å‡ºåŠ›ã®æœ‰ç„¡ãªã©ã \hypertarget{pointdata}{} \item[関数]Pointdata(name , 点リスト , options) \item[機能]点ã®ãƒ‡ãƒ¼ã‚¿ã‚’作æˆã™ã‚‹ã€‚ -\item[説明]与ãˆã‚‰ã‚ŒãŸåº§æ¨™ã®ç‚¹ãƒ‡ãƒ¼ã‚¿ã‚’作æˆã™ã‚‹ã€‚オプションã¯"Size=","Color=","Inside"。 +\item[説明]与ãˆã‚‰ã‚ŒãŸåº§æ¨™ã®ç‚¹ãƒ‡ãƒ¼ã‚¿ã‚’作æˆã™ã‚‹ã€‚オプションã¯"Size=","Color=","Inside="。 Inside オプションã¯ï¼Œç‚¹ã®å†…部ã«ã¤ã„ã¦ã®æŒ‡å®šã€‚ @@ -878,29 +879,32 @@ D.xy=Translatepoint(A,B.xy); \begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright} +\vspace{\baselineskip} +\hypertarget{setarrow}{} +\item[関数]Setarrow([arrowsize,angle,position,cut]) +\item[機能]Arrowdata,Arrowheadã§æã矢å°ã®ã‚¹ã‚¿ã‚¤ãƒ«ã‚’è¨å®šã™ã‚‹ã€‚ +\item[説明]arrowsize,angle,position,cut,linestyleã¯ï¼Œé †ã«å¤§ãã•(1)，開ã角(18)，ä½ç½®(1)，切り込ã¿(0.2)ã§ã‚る。（カッコ内ã¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆå€¤ï¼‰ + +\vspace{10mm} + \hypertarget{arrowdata}{} \item[関数]Arrowdata(name,[始点 , 終点] , options) \item[機能]2点間をçµã¶çŸ¢ç·šã‚’æã。 -\item[説明]name ã¯ï¼Œåº§æ¨™ã‚’数値ã§ä¸Žãˆã‚‹ã¨ãã«å¿…è¦ã€‚幾何è¦ç´ ã®è˜åˆ¥åã§ä¸Žãˆã‚‹ã¨ãã¯ãªãã¦ã‚‚よã„。 - -optionsã¯çŸ¢ã˜ã‚Šã®å½¢çŠ¶ãªã©ã®æŒ‡å®šã€‚ +\item[説明]name ã¯ãªãã¦ã‚‚よã„（自動的ã«é€šã—番å·ã‚’ã¤ã‘る）。 -\hspace{10mm} [ 矢ã˜ã‚Šã®å¤§ãã•, é–‹ã角, 矢ã˜ã‚Šä½ç½®,切り込ã¿ä½ç½®, 線種, ç·šã®è¡¨ç¤ºè‰²,トリミング] +optionsã¯çŸ¢ã˜ã‚Šã®å½¢çŠ¶ãªã©ã®æŒ‡å®šï¼ˆãƒªã‚¹ãƒˆã§ä¸Žãˆã‚‹ï¼‰ã€‚ -ã®ãƒªã‚¹ãƒˆã§ä¸Žãˆã‚‹ã€‚矢ã˜ã‚Šã®å¤§ãã•ã‹ã‚‰åˆ‡ã‚Šè¾¼ã¿ä½ç½®ã¾ã§ã¯æ•°ã§ï¼Œå¾Œæ–¹ã®ã‚ªãƒ—ションを指定ã™ã‚‹ã¨ãã¯ï¼Œå‰æ–¹ã‚‚書ã。 +\hspace*{10mm} 数値ã¯ï¼Œ 大ãã•, é–‹ã角, ä½ç½®,切り込ã¿\\ +\hspace*{10mm} "Line=n(y)''（矢å°ã¯ç·šã ã‘），"Cutend=''（トリミング），"Color='' -é–‹ã角ã¯60分法ã§ä¸Žãˆã‚‹ã€‚ãŸã ã—，° ã¯ã¤ã‘ãªã„。5未満ã®æ™‚ã¯18°ã®å€æ•°æŒ‡å®šã¨ã™ã‚‹ã€‚ +é–‹ã角ã¯60分法ã§ä¸Žãˆã‚‹ã€‚2.5未満ã®æ™‚ã¯18°ã®å€æ•°æŒ‡å®šã¨ã™ã‚‹ã€‚ 矢ã˜ã‚Šä½ç½®ã¯ï¼Œç·šåˆ†ã®é•·ã•ã‚’１ã¨ã—ãŸå§‹ç‚¹ã‹ã‚‰ã®è·é›¢ã€‚ -切り込ã¿ä½ç½®ã¯ï¼Œï¼ã®ã¨ã三角形ã®çŸ¢ã˜ã‚Šï¼Œï¼‘ã®ã¨ãç·šã®ã¿ã®çŸ¢ã˜ã‚Šã¨ãªã‚‹ã€‚ - -ãŸã ã—，Cinderellaã®ç”»é¢ä¸Šã«ã¯å…¨ã¦ã¯åæ˜ ã•ã‚Œãªã„。ãŸã¨ãˆã°ï¼Œå¤ªã•æŒ‡å®šã‚’ã—ã¦ã‚‚ç”»é¢ä¸Šã§ã¯å¤ªã•ã¯åŒã˜ã€‚ +切り込ã¿ã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã¯0.2 トリミング :"Cutend=m" ã¾ãŸã¯ "Cutend=[m,n]" ã§ï¼Œå³è¾ºãŒæ•°ã®ã¨ãã¯ä¸¡ç«¯ã‚’mã ã‘カットã™ã‚‹ã€‚リストã®ã¨ãã¯å§‹ç‚¹ã‚’m,終点をnã ã‘カットã™ã‚‹ã€‚mãŒè² ã®ã¨ãã¯å»¶é•·ã™ã‚‹ã€‚ -ã“れらã®è¨å®šã¯ï¼Œ\hyperlink{setarrow}{Setarrow()} ã§åˆæœŸè¨å®šã‚’変更ã™ã‚‹ã“ã¨ãŒã§ãる。 - \vspace{\baselineskip} ã€ä¾‹ã€‘オプションã®è¨å®šã¨ãã®çµæžœã‚’示ã™ã€‚ @@ -909,12 +913,15 @@ Arrowdata("1",[A,B]); Arrowdata("2",[[1,0],[2,3]],[2]); Arrowdata("3",[[2,0],[3,3]],[3,45]); Arrowdata("4",[[3,0],[4,3]],[3,1,0.5]); -Arrowdata("5",[[4,0],[5,3]],[3,1,1,0.5]); -Arrowdata("6",[[5,0],[6,3]],[3,1,1,1]); +Arrowdata("5",[[4,0],[5,3]],[3,1,1,0]); +Arrowdata("6",[[5,0],[6,3]],[3,"Line=y"]); Arrowdata("7",[[6,0],[7,3]],[3,"dr,2"]); Arrowdata("8",[[7,0],[8,3]],[3,1,1,0.5,"Color=red"]); \end{verbatim} -\hspace{20mm}\input{Fig/arrowdata} + +\vspace{6mm} + +\hspace{20mm}\scalebox{0.9}{\input{Fig/arrowhead}} ã€ä¾‹ã€‘ï¼’ã¤ã®å††ã‚’矢線ã§çµã¶ã€‚ @@ -933,87 +940,80 @@ Cinderellaã®ä½œå›³ãƒ„ールã§ï¼’点ABã‚’ã¨ã£ã¦ãŠã。 円A,Bã®åŠå¾„ãŒåŒã˜ï¼ˆãŸã¨ãˆã°0.5）ã§ã‚ã‚Œã°ï¼Œ\verb|Arrowdata([A,B],["Cutend=0.5"]);| ã§ã‚ˆã„。 -\vspace{\baselineskip} -\hypertarget{setarrow}{} -\item[関数]Setarrow([arrowsize,angle,position,cut,linestyle]) -\item[機能]Arrowdata,Arrowheadã§æã矢å°ã®ã‚¹ã‚¿ã‚¤ãƒ«ã‚’è¨å®šã™ã‚‹ã€‚ -\item[説明]arrowsize,angle,position,cut,linestyleã¯ï¼Œé †ã«å¤§ãã•(1)，開ã角(18)，ä½ç½®(1)，切り込ã¿(0)，矢線スタイル("dr")ã§ã‚る。（カッコ内ã¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆå€¤ï¼‰ - - %\begin{flushright}\hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright} \vspace{\baselineskip} \hypertarget{arrowhead}{} -\item[関数]Arrowhead(点 , æ–¹å‘ , options) , Arrowhead(点 , プãƒãƒƒãƒˆãƒ‡ãƒ¼ã‚¿,options) -\item[機能]点ã«çŸ¢ã˜ã‚Šã ã‘ã‚’æã -\item[説明]指定ã•ã‚ŒãŸä½ç½®ã«ï¼ŒæŒ‡å®šã•ã‚ŒãŸæ–¹å‘ã‚’å‘ã„ãŸçŸ¢ã˜ã‚Šã ã‘ã‚’æã。 +\item[関数]（１）Arrowhead(点 , æ–¹å‘ , options)\\ +（２）Arrowhead(点ã¾ãŸã¯ä½ç½®æ¯” , プãƒãƒƒãƒˆãƒ‡ãƒ¼ã‚¿, options) +\item[機能]点ã«çŸ¢ã˜ã‚Šã ã‘ã‚’æã（optionã¯Setarrowã¨åŒã˜ï¼‰ +\item[説明]（１）指定ã•ã‚ŒãŸä½ç½®ã«ï¼ŒæŒ‡å®šã•ã‚ŒãŸæ–¹å‘ã‚’å‘ã„ãŸçŸ¢ã˜ã‚Šã ã‘ã‚’æã。\\ +\hspace*{2.5zw}点ã¯åº§æ¨™ã¾ãŸã¯å¹¾ä½•è¦ç´ å。方å‘ã¯åŽŸç‚¹ã‹ã‚‰è¦‹ã¦åº§æ¨™[a,b]ã®æ–¹å‘。 -点ã¯åº§æ¨™ã¾ãŸã¯å¹¾ä½•è¦ç´ å。方å‘ã¯åŽŸç‚¹ã‹ã‚‰è¦‹ã¦åº§æ¨™[a,b]ã®æ–¹å‘。 -options㯠[大ãã•ï¼ŒçŸ¢ã˜ã‚Šã®é–‹ã角，形状ã¨ä½ç½®] ã®ãƒªã‚¹ãƒˆã€‚ +（２）プãƒãƒƒãƒˆãƒ‡ãƒ¼ã‚¿ï¼ˆæ›²ç·šï¼‰ã‚’指定ã—ãŸã¨ãã¯ï¼Œæ›²ç·šä¸Šã®ç‚¹ã«çŸ¢ã˜ã‚Šã‚’ã¤ã‘る。 -矢ã˜ã‚Šã®é–‹ã角ã¯60分法ã§ç‰‡å´åŠåˆ†ã®è§’。 +\hspace*{2.5zw}曲線ã«ã¯å‘ããŒã‚り，ãã‚Œã«ã‚ˆã£ã¦çŸ¢ã˜ã‚Šã®å‘ããŒæ±ºã¾ã‚‹ã€‚\\ +\hspace*{2.5zw}"Invert(曲線å)" ã¨ã™ã‚‹ã¨å対å‘ãã®çŸ¢ã˜ã‚Šã«ãªã‚‹ã€‚\\ +\hspace*{2.5zw}曲線ã®å‘ãã¨ã¯ï¼Œæ›²ç·šã‚’æãã¨ãã®é †åºã§ï¼Œãƒ—ãƒãƒƒãƒˆãƒ‡ãƒ¼ã‚¿ã®é †åºã§ã‚‚ã‚る。\\ +\hspace*{2.5zw}ä½ç½®æ¯”ã¯æ›²ç·šä¸Šã®ä½ç½®ã‚’表ã™æ¯”率（0ã‹ã‚‰1）。\\ +\hspace*{3.5zw}例ãˆã°ï¼Œåˆ†å‰²æ•°ãŒ50ã§ä½ç½®æ¯”ãŒ0.3ã®ã¨ã　\verb|1+50*0.3=2.5|\\ +\hspace*{4.5zw}2番目ã¨3番目ã®ç‚¹ã®ä¸ç‚¹ -形状ã¯ï¼Œ "f" ：塗りã¤ã¶ã—ã®ä¸‰è§’形（ åˆæœŸè¨å®šï¼‰ã¾ãŸã¯" l " ： ラインã®ã¿ã€‚ +\vspace{0.5zw} -ãŸã ã—，塗りã¤ã¶ã—矢ã˜ã‚Šã¯ç”»é¢ä¸Šã§ã¯å¡—ã‚Šã¤ã¶ã—ã«ãªã‚‰ãªã„。 +\begin{layer}{150}{0} +\putnotese{100}{8}{\input{Fig/ForRef-Arrowhead-1}} +\end{layer} -ä½ç½®ã¯ï¼Œ"t"（ åˆæœŸè¨å®šï¼‰ã¾ãŸã¯ "c" , "b" -\begin{tabbing} -1234\=567890123\=\kill -\>"t" ã¯çŸ¢ã˜ã‚Šã®å…ˆç«¯ãŒçµ‚点ã«ä¸€è‡´\\ -\>"c" ã¯ä¸‰è§’å½¢ã®ä¸å¿ƒãŒçµ‚点ã¨ä¸€è‡´\\ -\>"b" ã¯çµ‚点ãŒçŸ¢ã˜ã‚Šã®åº•è¾ºã«ã®ã‚‹ã€‚ -\end{tabbing} -プãƒãƒƒãƒˆãƒ‡ãƒ¼ã‚¿ã‚’指定ã—ãŸã¨ãã¯ï¼Œæ›²ç·šä¸Šã®ç‚¹ã«çŸ¢ã˜ã‚Šã‚’ã¤ã‘る。 +ã€ä¾‹ã€‘ A ãŒå³å›³ã®ä½ç½®ã®ã¨ã\\ +\hspace*{2.5zw}(ã‚¢) \verb|Arrowhead(A,[-1,1]);|\\ +\hspace*{2.5zw}(イ) \verb|Arrowhead([1,1],[-1,1],[2,60]);|\\ +\hspace*{2.5zw}(ウ) \verb|Arrowhead(A,[-1,1],[2,30,0.5]]);|\\ +\hspace*{2.5zw}(エ) \verb|Arrowhead([1,1],[-1,1],[2,20,0.5,"Line=y"]);| -曲線ã«ã¯å‘ããŒã‚り，ãã‚Œã«ã‚ˆã£ã¦çŸ¢ã˜ã‚Šã®å‘ããŒæ±ºã¾ã‚‹ã€‚" Invert(PD) " ã¨ã™ã‚‹ã¨å対å‘ãã®çŸ¢ã˜ã‚Šã«ãªã‚‹ã€‚ +%\hspace{6mm} +\vspace{5mm} -曲線ã®å‘ãã¨ã¯ï¼Œæ›²ç·šã‚’æãã¨ãã®é †åºã§ï¼Œãƒ—ãƒãƒƒãƒˆãƒ‡ãƒ¼ã‚¿ã®é †åºã§ã‚‚ã‚る。invert() ã¯ã“ã®ãƒ—ãƒãƒƒãƒˆãƒ‡ãƒ¼ã‚¿ã‚’é€†é †ã«ã™ã‚‹ã‚‚ã®ã§ã‚る。 +\begin{layer}{150}{0} +\putnotese{0}{0}{(ã‚¢)} +\putnotese{30}{0}{(イ)} +\putnotese{60}{0}{(ウ)} +\putnotese{90}{0}{(エ)} +\putnotese{0}{7}{ \input{Fig/ForRef-Arrowhead-2}} +\putnotese{30}{7}{ \input{Fig/ForRef-Arrowhead-3}} +\putnotese{60}{7}{ \input{Fig/ForRef-Arrowhead-4}} +\putnotese{90}{7}{ \input{Fig/ForRef-Arrowhead-5}} +\end{layer} -\vspace{\baselineskip} +\vspace{35mm} -ã€ä¾‹ã€‘ +\vspace{0.5zw} -\vspace{\baselineskip} -%\hspace{6mm} \begin{layer}{150}{0} -\putnotese{0}{0}{点 A ãŒå³å›³ã®ä½ç½®ã®ã¨ã} -\putnotese{80}{8}{\input{Fig/ForRef-Arrowhead-1}} -\putnotese{0}{7}{(ã‚¢) Arrowhead(A,[-1,1]);} -\putnotese{0}{14}{(イ) Arrowhead([1,1],[-1,1],[2,60]);} -\putnotese{0}{21}{(ウ) Arrowhead(A,[-1,1],[2,30,"b"]);} -\putnotese{0}{28}{(エ) Arrowhead([1,1],[-1,1],[2,20,"lc"]);} -\putnotese{0}{38}{(ã‚¢)} -\putnotese{30}{38}{(イ)} -\putnotese{60}{38}{(ウ)} -\putnotese{90}{38}{(エ)} -\putnotese{0}{45}{ \input{Fig/ForRef-Arrowhead-2}} -\putnotese{30}{45}{ \input{Fig/ForRef-Arrowhead-3}} -\putnotese{60}{45}{ \input{Fig/ForRef-Arrowhead-4}} -\putnotese{90}{45}{ \input{Fig/ForRef-Arrowhead-5}} +\putnotese{100}{4}{\input{Fig/ForRef-Arrowhead2-6}} \end{layer} -\vspace{75mm} -%\hspace{6mm} +曲線 cr1 上ã®ç‚¹ A ã®ä½ç½®æ¯”ãŒ0.6ã®ã¨ã\\ +\hspace*{2.5zw}(オ) \verb|Arrowhead(A,"cr1");|\\ +\hspace*{2.5zw}(ã‚«) \verb|Arrowhead(0.6,"cr1",[2,1,0.5,"Color=red"]);|\\ +\hspace*{2.5zw}(ã‚) \verb|Arrowhead(1,"cr1");|\\ +\hspace*{2.5zw}(ク) \verb|Arrowhead(1,"Invert(cr1)",["Line=y"]);| + +\vspace{5mm} + \begin{layer}{150}{0} -\putnotese{0}{0}{曲線 crBC 上ã®ç‚¹ D ãŒå³å›³ã®ã‚ˆã†ãªã¨ã} -\putnotese{80}{8}{ \input{Fig/ForRef-Arrowhead-6}} -\putnotese{96}{22}{crBC} -\putnotese{0}{7}{(オ) Arrowhead(D,"crBC");} -\putnotese{0}{14}{(ã‚«) Arrowhead(D,"crBC",[2]);} -\putnotese{0}{21}{(ã‚) Arrowhead(D,"crBC",[2,30,"l"]);} -\putnotese{0}{28}{(ク) Arrowhead(D,"Invert(crBC)");} -\putnotese{0}{38}{(オ)} -\putnotese{30}{38}{(ã‚«)} -\putnotese{60}{38}{(ã‚)} -\putnotese{90}{38}{(ク)} -\putnotese{0}{45}{ \input{Fig/ForRef-Arrowhead-7}} -\putnotese{30}{45}{ \input{Fig/ForRef-Arrowhead-8}} -\putnotese{60}{45}{ \input{Fig/ForRef-Arrowhead-9}} -\putnotese{90}{45}{ \input{Fig/ForRef-Arrowhead-10}} +\putnotese{0}{0}{オ)} +\putnotese{30}{0}{(ã‚«)} +\putnotese{60}{0}{(ã‚)} +\putnotese{90}{0}{(ク)} +\putnotese{0}{7}{ \input{Fig/ForRef-Arrowhead2-7}} +\putnotese{30}{7}{ \input{Fig/ForRef-Arrowhead2-8}} +\putnotese{60}{7}{ \input{Fig/ForRef-Arrowhead2-9}} +\putnotese{90}{7}{ \input{Fig/ForRef-Arrowhead2-10}} \end{layer} -\vspace{70mm} +\vspace{35mm} +%\vspace{70mm} \vspace{\baselineskip} \hypertarget{lineplot}{} @@ -2818,13 +2818,16 @@ optionã® Color ã¯ï¼ŒCinderellaã®ç”»é¢ä¸Šã§ã®æ画色をリストã§ä¸Žãˆ optionsã«ã¯ï¼Œä»–ã«ï¼Œæ¬¡ã®ã‚‚ã®ãŒã‚る。 -・Enclosingを使ã†ã‹ã©ã†ã‹ï¼š''Enc=y/n''（åˆæœŸå€¤ã¯ y） +・Enclosingを使ã†ã‹ã©ã†ã‹ï¼š"Enc=y/n"（åˆæœŸå€¤ã¯ n）\\ +　　　''Enc=y''ã®ã¨ã，複数ã®Shadeを使ã†ã¨ãã¯ï¼Œåå‰ã‚’ã¤ã‘る。 ・Enclosingã®ã¨ãã®é–‹å§‹ç‚¹ï¼Œæ画色 -・æç”»é ˜åŸŸã®ãƒˆãƒªãƒŸãƒ³ã‚°ï¼šTrim=y/n （åˆæœŸå€¤ã¯ n ） +・æç”»é ˜åŸŸã®ãƒˆãƒªãƒŸãƒ³ã‚°ï¼š"Trim=y/n" （åˆæœŸå€¤ã¯ n ） + +・TeXã¸ã®æ›¸ã出ã—ã§ï¼Œå…ˆé ã«é…ç½®ã™ã‚‹ã‹ï¼š"First=y/n" （åˆæœŸå€¤ã¯ n ）\\ +　　　"First=n" ã®ã¨ãã¯ï¼Œä½¿ã‚ã‚Œã¦ã„ã‚‹Gdataã®æ›¸ã出ã—ã®ç›´å‰ã«ãŠã． -複数ã®Shadeを使ã†ã¨ãã¯ï¼Œåå‰ã‚’ã¤ã‘る。 \vspace{\baselineskip} ã€ä¾‹ã€‘$y=2\sin x$ã®ã‚°ãƒ©ãƒ•ã¨ç›´ç·š$y=1$ ã¨ã§å›²ã¾ã‚ŒãŸéƒ¨åˆ†ã«é»’0.2ã®æ¿ƒã•ã§è‰²ã‚’塗る。 @@ -8145,7 +8148,7 @@ Plotdata("1",str,"x"); \begin{verbatim} -ã€ä¾‹ã€‘Ketcindyjsbody(["<p,f10>__Title''],[]); +ã€ä¾‹ã€‘Ketcindyjsbody(["<p,f10>_;_;Title"],[]); 　　　 => <p><font size="10">  Title</font></p> \end{verbatim} @@ -8282,6 +8285,33 @@ Cinderellaã§ä½¿ã£ã¦ã„る用語ã«æ¬¡ã®ã‚‚ã®ãŒã‚る。 \end{tabbing} \hypertarget{colorcodelist}{} +\subsection{ä»–ã®ãƒ†ã‚ストエディタã®ä½¿ç”¨} + +例ãˆã°ï¼Œcdyファイルåã‚’template.cdyã¨ã™ã‚‹ï¼Ž + +\begin{enumerate}[(1)] +\item template.txtを作æˆã—ã¦ï¼Œtemplate.cdyã¨åŒã˜å ´æ‰€ã«ãŠã． +\item template.cdyã®Figuresスãƒãƒƒãƒˆã‚’以下を記述ã—ã¦å®Ÿè¡Œã™ã‚‹ï¼Ž +\begin{verbatim} + Ketinit(); + setdirectory(Dircdy); + import(Cdyname()+''.txt''); + setdirectory(Dirwork); + Windispg(); +\end{verbatim} + +\item template.txtã«ã‚¹ã‚¯ãƒªãƒ—トを書ã„ã¦ä¿å˜ã™ã‚‹ï¼Ž\\ +例）\verb|Putpoint("A",[0,0],A.xy);|\\ +　　\verb|Plotdata("1'',''x^2'',''x'');| +\end{enumerate} + +注）template.txtを変更ã—ãŸå ´åˆã‚‚，cdyç”»é¢ã‚’クリックã™ã‚Œã°ã‚ˆã„． + +\begin{flushright} \hyperlink{functionlist}{$\Rightarrow$関数一覧}\end{flushright} + +\newpage + +\hypertarget{colorcodelist}{} \subsection{色åã¨ã‚«ãƒ©ãƒ¼ã‚³ãƒ¼ãƒ‰ä¸€è¦§} \vspace{\baselineskip} \scalebox{0.85}{\input{Fig/colortable}} @@ -8290,7 +8320,7 @@ Cinderellaã§ä½¿ã£ã¦ã„る用語ã«æ¬¡ã®ã‚‚ã®ãŒã‚る。 \newpage %--------------点ã®ä½œå›³ã«ã¤ã„ã¦ã®æ¯”較表-------------------------------------- -\hypertarget{mkpttable}{} +\hypertarget{mkpttableE}{} \subsection{点ã®ä½œå›³ã«ã¤ã„ã¦ã®æ¯”較表} \vspace{\baselineskip} \scalebox{0.9}{\input{Fig/mkpttable}} 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 eaab9903d14..6408248419f 100644 --- a/Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeMacJ.tex +++ b/Master/texmf-dist/doc/support/ketcindy/source/readme/ReadmeMacJ.tex @@ -178,6 +178,15 @@ KETCindyã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ« (Mac) \item ターミナルã§ä»¥ä¸‹ã‚’実行ã™ã‚‹ï¼Ž\\ \hspace*{1zw}\verb|cp (forMacã®ãƒ‘ス)/ketcindy.conf ~/.ketcindy.conf| \end{enumerate} + +\item ãã®ä»– +\begin{enumerate}[(1)] +\item ダウンãƒãƒ¼ãƒ‰ã—ãŸã‚¢ãƒ—リケーションã®å®Ÿè¡Œã‚’有効ã«ã™ã‚‹æ–¹æ³•\\ +　　ターミナルã¦ã‚™\\ +　　　 sudo spctl --master-disable\\ +　　を実行（一度実行ã™ã‚Œã¯ã‚™ã™ã¸ã‚™ã¦ã®å ´åˆã«æœ‰åŠ¹ã¦ã‚™ã‚る） + \end{enumerate} + \end{enumerate} \end{document}
\ No newline at end of file diff --git a/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic1logr.txt b/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic1logr.txt index a232cdc7be6..15b944ba68f 100644 --- a/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic1logr.txt +++ b/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic1logr.txt @@ -1,3 +1,16 @@ +// 20191203 +// Ketinit changed (Yacut 0.2 as default) +// Changestyle changed ( for list setting, color->) +// 20191126 +// Framedata changed ("corner" option) +// 20191027 +// Ellipseplot, Hyperbolaplot debugged ( for Ptpos ) +// 20191025 +// Pointdata debugged ( Inside=numeric ) +// 20191005 +// Setwindow(str) changed ( in case of deleting NE,SW) +// 20191002 +// Ketinit changed (GPACK) // 20190927 // Setwindow debugged ( for Strictmove) // 20190917 diff --git a/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic1r.cs b/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic1r.cs index 2dc633a782e..e2178a919aa 100644 --- a/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic1r.cs +++ b/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic1r.cs @@ -16,7 +16,7 @@ println("KeTCindy V.3.3.0"); println(ketjavaversion()); -println("ketcindylibbasic1[20190927] loaded"); +println("ketcindylibbasic1[20191203] loaded"); //help:start(); @@ -69,7 +69,8 @@ Ketinit(work,sy,rangex,rangey,strictsep):=(////190831to TenSizeInit=0.02; TenSize=TenSizeInit; YaSize=1; YaAngle=18; YaPosition=1; - YaCut=0; YasenStyle="dr,1"; Yajiristyle="tf"; + YaCut=0.2; //191203 + YasenStyle="dr,1"; Yajiristyle="tf"; KETPICCOUNT=1; KCOLOR=[0,0,0]; GLIST=[]; // no ketjs @@ -99,7 +100,7 @@ Ketinit(work,sy,rangex,rangey,strictsep):=(////190831to FigPdfList=[]; // 16.04.08 //no ketjs off Fillstore(); //181212 ADDPACK=[]; // 16.05.16 //no ketjs on - GPACK="tpic"; //180817 + if(!isstring(GPACK),GPACK="tpic",Usegraphics(GPACK)); //180817//191002 ErrFlag=0; KETJSOP=[]; //190129 REMOVEPTJS=[]; SLIDEFLG="Y"; //190504 @@ -329,14 +330,22 @@ Setwindow(str):=( tmp=indexof(str,"="); // 16.02.10 msg=Toupper(substring(str,tmp,tmp+1)); Strictmove("SW"); Strictmove("NE");//190927 - if((ispoint(SW) & ispoint(NE)), + if((ispoint(SW)) & (ispoint(NE)), tmp1=LLcrd(Ptpos(SW));//190912[2lines] tmp2=LLcrd(Ptpos(NE)); XMIN=tmp1_1; XMAX=tmp2_1; YMIN=tmp1_2; YMAX=tmp2_2; , - Putpoint("SW",Pcrd([XMIN,YMIN])); - Putpoint("NE", Pcrd([XMAX,YMAX])); + if(!ispoint(SW), //191005from + Putpoint("SW",Pcrd([-5,-5])); + XMIN=-5; YMIN=-5; + Ptpos(SW,SW.xy); + ); + if(!ispoint(NE), + Putpoint("NE", Pcrd([5,5])); + XMAX=5; YMAX=5; + Ptpos(NE,NE.xy); + ); //191005to ); if(msg=="Y", // no ketjs on println("Setwindow(["+XMIN+","+XMAX+"],["+YMIN+","+YMAX+"])"); @@ -346,7 +355,8 @@ Setwindow(str):=( drawpoly([Pcrd([XMIN,YMIN]), Pcrd([XMAX,YMIN]), Pcrd([XMAX,YMAX]),Pcrd([XMIN,YMAX])],color->[1,1,1]); // no ketjs off ); -Setwindow(xrange,yrange):=( +Setwindow(xrange,yrange):=Setwindow(xrange,yrange,"Msg=y"); +Setwindow(xrange,yrange,msg):=( //help:Setwindow([2,3],[-1,1]); XMIN=xrange_1; XMAX=xrange_2; @@ -359,6 +369,9 @@ Setwindow(xrange,yrange):=( autoclearlayer(KETPICLAYER,true); drawpoly([Pcrd([XMIN,YMIN]), Pcrd([XMAX,YMIN]), Pcrd([XMAX,YMAX]),Pcrd([XMIN,YMAX])],color->[1,1,1]); //190927to + if(Toupper(substring(msg,0,1))=="Y", + println("Setwindow(["+XMIN+","+XMAX+"],["+YMIN+","+YMAX+"])"); + ); ); ////%Setwindow end//// @@ -896,14 +909,35 @@ Changework(dirorg,options):=( //16.10.21 ////%Changework end//// ////%Changestyle start//// -Changestyle(nameL,style):=( +Changestyle(nameL,styleorg):=( //help:Changestyle(["sgAB"],["da"]); - regional(nmL,name,Ltype,Ltypeorg,Noflg,color,opcindy,tmp); + regional(nmL,name,style,Ltype,Ltypeorg,Noflg,reL,color,opcindy, + tmp,tmp1,tmp2); + style=styleorg; //191203from + style=apply(style, + if(isstring(#),replace(#,",color->","Color="),#); + ); //191203to tmp=Divoptions(style); Ltypeorg=tmp_1; Noflg=tmp_2; color=tmp_(length(tmp)-2); opcindy=tmp_(length(tmp)); + reL=tmp_6; //191203from + if(length(reL)>0, + tmp1=reL_1; + if(islist(tmp1), + tmp=tmp1_1; + if(tmp==0,tmp2="dr"); + if(tmp==1,tmp2="da"); + if(tmp==2,tmp2="id"); + if(tmp==3,tmp2="do"); + if(tmp==-1,tmp2="nodisp"); + forall(2..(length(tmp1)), + if(tmp1_# !=0,tmp2=tmp2+","+text(tmp1_#)); + ); + Ltypeorg=tmp2; + ); + ); if(islist(nameL),nmL=nameL,nmL=[nameL]); forall(nmL,name, tmp=select(GCLIST,#_1==name); @@ -3962,8 +3996,9 @@ Pointdata(nm,listorg,options):=( inside=text(tmp); , if(contains(["0","1"],tmp2), + tmp2=tmp_2; //191025 tmp=[1,1,1]-color; - tmp=parse(tmp_2)*tmp; + tmp=parse(tmp2)*tmp; //191025 inside=[1,1,1]-tmp; , if(tmp2=="N", @@ -5043,22 +5078,37 @@ Framedata(nm,list,optionsorg):=( //190424modified //help:Framedata(); //help:Framedata("1",[C,A]); //help:Framedata("1",[C,dx,dy]); +//help:Framedata("1",[p1,p2],["corner"]); regional(name,options,Out,tmp,tmp1,x1,x2,y1,y2,dx,dy, - opcindy,Ltype,Noflg,strL,cent,dx,dy,color); + opcindy,Ltype,Noflg,strL,cent,dx,dy,color,strL,corner); name="fr"+nm; options=optionsorg; tmp=Divoptions(options); Ltype=tmp_1; Noflg=tmp_2; + strL=tmp_7; //191126 color=tmp_(length(tmp)-2); opcindy=tmp_(length(tmp)); - if(length(list)==2, // 15.05.12 - cent=Lcrd(list_1); tmp=Lcrd(list_2); - dx=abs(tmp_1-cent_1); dy=abs(tmp_2-cent_2); - , - cent=Lcrd(list_1); - dx=list_2; dy=list_3; + corner=0; //191126from + forall(strL, + tmp=substring(Toupper(#),0,1); + if(tmp=="C", + cent=(list_1+list_2)/2; + dx=abs(list_2_1-list_1_1)/2; + dy=abs(list_2_2-list_1_2)/2; + corner=1; + options=remove(options,[#]); + ); ); + if(corner==0, + if(length(list)==2, // 15.05.12 + cent=Lcrd(list_1); tmp=Lcrd(list_2); + dx=abs(tmp_1-cent_1); dy=abs(tmp_2-cent_2); + , + cent=Lcrd(list_1); + dx=list_2; dy=list_3; + ); + ); //191126to x1=cent_1-dx; x2=cent_1+dx; y1=cent_2-dy; y2=cent_2+dy; Listplot("-"+name,[[x1,y1],[x2,y1],[x2,y2],[x1,y2],[x1,y1]],options); @@ -5276,14 +5326,14 @@ Ellipseplot(nm,ptlist,Arg):=( Ellipseplot(nm,ptlist,rng,options):=( //help:Ellipseplot("1",[A,B,3]); //help:Ellipseplot("1",[A,B,C],"[0,pi]",[options]); - regional(pA,pB,d,angle,f,a,b,pM,tmp,tmp1,tmp2); + regional(pA,pB,dd,angle,f,a,b,pM,tmp,tmp1,tmp2); pA=Lcrd(ptlist_1); tmp1=Lcrd(ptlist_2); - if(ispoint(ptlist_3), + if((ispoint(ptlist_3))%(length(ptlist_3)>1), //191027 tmp2=Lcrd(ptlist_3); - d=|tmp2-pA|+|tmp2-tmp1|; + dd=|tmp2-pA|+|tmp2-tmp1|; , - d=ptlist_3; + dd=ptlist_3; ); tmp=(tmp1-pA)/|tmp1-pA|; if(tmp_2>=0, @@ -5297,8 +5347,8 @@ Ellipseplot(nm,ptlist,rng,options):=( ); pB=Rotatepoint(tmp1,-angle,pA); f=|pB_1-pA_1|/2; - a=d/2; - b=sqrt(d^2/4-f^2); + a=dd/2; + b=sqrt(dd^2/4-f^2); pM=(pA+pB)/2; tmp="["+format(pM_1,5)+","+format(pM_2,5)+"]"; tmp=tmp+"+["+format(a,5)+"*cos(t),"+format(b,5)+"*sin(t)]"; @@ -5337,7 +5387,7 @@ Hyperbolaplot(nm,ptlist,rng,optionsorg):=( ); pA=Lcrd(ptlist_1); tmp1=Lcrd(ptlist_2); - if(ispoint(ptlist_3), + if((ispoint(ptlist_3))%(length(ptlist_3)>1), //191027 tmp2=Lcrd(ptlist_3); d=abs(|tmp2-pA|-|tmp2-tmp1|); , diff --git a/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic2logr.txt b/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic2logr.txt index 90dd67b9954..ebc5f932531 100644 --- a/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic2logr.txt +++ b/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic2logr.txt @@ -1,3 +1,48 @@ +// 20191208 +// Arrowheaddata debugged (decision of pC) +// 20191207 +// Arrowheaddata debugged (selecting intersect) +// Arrowhead debugged (name of partcrv) +// 20191204 +// Arrowheaddata changed ( segpos ) +// 20191203 +// Arrowheaddata,Arrowhead changed ( style ) +// 20191202 +// Arrowdataseg,Arrowhead changed (for segpos==1) +// 20191201 +// Arrowdata debugged (pB => pC) +// 20191128 +// Arrowheaddata,Arrowhead remade +// 20191123 +// Setarrow debugged (YaAngle) +// Arrowdataseg debugged (Unitlen,MilliIn) +// 20191119 +// Arrowdata(Arrowdataseg) changed ( making seg short to be hidden ) +// 20191114 +// Arrowhead changed ( position supported ) +// Setarrow changed ( any position ) +// 20191106 +// Lightarrowdata debugged +// 20191104 +// Arrowhead debugged/changed (cut, datalist) +// 20191101 +// Htickmark,Vtickmark changed (options added to ticks) +// 20191030 +// Putpoint changed (for ketcindyjs ) +// 20191023 +// Tabledata debugged (Strsplit(#)) +// 20191012 +// Arrowhead changed (fillpoly) +// 20191011 +// Lightarrowhead debugged (angle) and changed (fillpoly) +// 20191008 +// Shade debugged (in case of "nodisp"/"notex") +// Tabledata changed ("Geo=") +// Tabledatalight changed (tb+Counter+str added ) +// 20191007 +// Shade changed (option "First" added) +// 20191005 +// Putpoint changed (Ptpos added in case of new point) // 20190921 // Enclosing debugged/changed ( in case of length(KL)==1, epspara removed) // 20190917 diff --git a/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic2r.cs b/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic2r.cs index 5f65ad6c50d..2b382904cb8 100644 --- a/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic2r.cs +++ b/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic2r.cs @@ -14,7 +14,7 @@ // along with this program. If not, see <http://www.gnu.org/licenses/> // -println("ketcindylibbasic2[20190921] loaded"); +println("ketcindylibbasic2[20191208] loaded"); //help:start(); @@ -120,10 +120,10 @@ Setarrow(arglist):=( if((tmp_1>0),YaSize=tmp_1); ); if(length(tmp)>=2, - if((tmp_2>0)&(tmp_2<90),YaAngle=tmp_2); + if(tmp_2<2.5,YaAngle=tmp_2*YaAngle,Yaangle=tmp_2); //191123 ); if(length(tmp)>=3, - if((tmp_3>=0)&(tmp_3<=1),YaPosition=tmp_3); + YaPosition=tmp_3; //191114 ); if(length(tmp)>=4, if((tmp_4>=0)&(tmp_4<1),YaCut=tmp_4); @@ -137,99 +137,113 @@ Setarrow(arglist):=( ////%Setarrow end//// ////%Arrowheaddata start//// -Arrowheaddata(point,direction):=Arrowheaddata(point,direction,[]); -Arrowheaddata(point,direction,options):=( +Arrowheaddata(point,direction):= + Arrowheaddata(point,direction,[YaSize,YaAngle,YaPosition,YaCut]); +Arrowheaddata(point,direction,options):=( //191127remade // help:Arrowheaddata(A,B); -// help:Arrowheaddata(options=[size(1),angle(18), "Coord=phy"]); - regional(list,ookisa,hiraki,Houkou,Str,Flg,Ev,Nv,pA,pB, - reL,eqL,coord,pP,rF,gG,Flg,Nj,Eps,scx,scy,tmp,tmp1,tmp2); - Eps=10^(-3); - coord="P"; - ookisa=0.2*YaSize; - hiraki=YaAngle; - iti=1; - kiri=0; - Futosa=0; - Str=YaStyle; +// help:Arrowheaddata("1",A,"gr1"); +// help:Arrowheaddata("1",A,gr1); +// help:Arrowheaddata(options=[size(1),angle(18),pos(1),cut(0)]); + regional(scaley,Eps,size,angle,segpos,cut, Houkou,hflg,Str,Ev,Nv, + reL,pP,vec,pA,pB,pC,par,out,tmp,tmp1,tmp2); + Eps=10^(-4); tmp=Divoptions(options); - eqL=tmp_5; //181018from reL=tmp_6; - forall(eqL, - tmp=Strsplit(#,"="); - tmp1=substring(tmp_1,0,1); - tmp2=substring(tmp_2,0,1); - if(Toupper(tmp1)=="C", - coord=Touppera(tmp2); - ); - ); //181018to - forall(1..(length(reL)), //181110from - tmp=reL_#; - if(#==1,ookisa=ookisa*tmp); - if(#==2, - if(tmp<5, - hiraki=hiraki*tmp; - , - hiraki=tmp; + size=0.2*YaSize*1/2.54*1000/MilliIn; + angle=YaAngle*pi/180; + segpos=YaPosition; + cut=YaCut; + if(length(reL)>=1, + size=0.2*reL_1*1/2.54*1000/MilliIn; + ); + if(length(reL)>=2, + if(reL_2<2.5,angle=reL_2*YaAngle,angle=reL_2); + angle=angle*pi/180; + ); + if(length(reL)>=3, + segpos=reL_3; + ); + if(length(reL)>=4, + cut=reL_4; + ); + if(ispoint(point),pP=Lcrd(point),pP=point); + hflg=0; + out=[]; + if(ispoint(direction), + Houkou=direction.xy; + hflg=2; + ); + if(hflg==0, //191203from + if(!isstring(direction), //191207 + if(Measuredepth(direction)==0, + Houkou=direction; + hflg=2; ); - ); - ); //181110to - Flg=0; - hiraki=hiraki*pi/180; - if(ispoint(direction),Houkou=direction.xy); //181018 - if(isstring(direction),Houkou=parse(direction),Houkou=direction); - if(Measuredepth(Houkou)==2,Houkou=Houkou_1); - if(coord=="P",//181018from - if(ispoint(point),pP=point.xy,pP=point); - , - pP=Pcrd(point); - if(!islist(Houkou_1), - Houkou=Pcrd(Houkou); + ); //191207to + ); //191203to + scaley=SCALEY; + Setscaling(1); //191203(moved) + if(hflg==0, + if(isstring(direction),Houkou=parse(direction),Houkou=direction); + if(!islist(pP), + par=1+(length(Houkou)-1)*pP; //191207 + pP=Ptcrv(par,Houkou); + tmp=floor(tmp); //191203from , - Houkou=apply(Houkou,Pcrd(#)); - ); - );//181018to - if(islist(Houkou_1), - tmp=Nearestpt(pP,Houkou); - pP=tmp_1; - rF=floor(tmp_2); - if(rF==1, - if(|Ptend(Houkou)-Ptstart(Houkou)|<Eps, - rF=Numptcrv(Houkou); - ); - ); - gG=apply(0..10,pP+ookisa*cos(hiraki)*[cos(2*pi/10*#),sin(2*pi/10*#)]); - Flg=0; - forall(1..rF,Nj, - if(Flg==0, - pB=Ptcrv(rF+1-Nj,Houkou); - tmp1=apply([pP,pB],LLcrd(#)); - tmp2=apply(gG,LLcrd(#)); - tmp=Intersectcrvspp([pP,pB],gG); - if(length(tmp)>0, - Houkou=pP-Pcrd(tmp_1_1); - Flg=1; - ); - ); + tmp=Nearestpt(pP,Houkou); + pP=tmp_1; + par=tmp_2; + tmp=floor(par); //191203to + ); + if(tmp<length(Houkou), + tmp1=Houkou_tmp; + tmp2=Houkou_(tmp+1); + , + tmp1=Houkou_(tmp-1); + tmp2=Houkou_tmp; ); - if(Flg==0, + vec=(tmp2-tmp1)/|tmp2-tmp1|; + gG=Circledata("",[pP,size*cos(angle)],["Num=10","nodata"]); + tmp1=Intersectcrvspp(Houkou,gG); + if(length(tmp1)==0, println("Arrowhead may be too large (no intersect)"); - Flg=2; - ); - ); - if(Flg<2, - Ev=-1/|Houkou|*Houkou; - Nv=[-Ev_2, Ev_1]; - if(indexof(Str,"c")>0, - pP=pP-0.5*ookisa*cos(hiraki)*Ev; - ); - if(indexof(Str,"b")>0, - pP=pP-ookisa*cos(hiraki)*Ev; - ); - pA=pP+ookisa*cos(hiraki)*Ev+ookisa*sin(hiraki)*Nv; - pB=pP+ookisa*cos(hiraki)*Ev-ookisa*sin(hiraki)*Nv; - list=[pA,pP,pB]; - list; + , + tmp=select(tmp1,#_2<par); //191208from + if(length(tmp)>0, + tmp=sort(tmp,[-#_2]); + pC=tmp_1_1; + , + if(Norm(Ptend(direction)-Ptstart(direction))>Eps, + tmp=sort(tmp1,[#_2]); + pC=2*pP-tmp_1_1; + , + tmp=sort(tmp1,[-#_2]); + pC=tmp_1_1; + ); + ); //191208to + Houkou=pP-pC; + hflg=1; + ); + ); + if(hflg>=1, + Ev=-Houkou/|Houkou|; + Nv=[-Ev_2, Ev_1]; + pA=pP+size*cos(angle)*Ev+size*sin(angle)*Nv; + pB=pP+size*cos(angle)*Ev-size*sin(angle)*Nv; + if(hflg==2, + pC=(pA+pB)/2; + ); + pC=pC+cut*(pP-pC); + tmp=(pP-(pA+pB)/2); + tmp=(1-segpos)*tmp; + pP=Translatepoint(pP,tmp); + pA=Translatepoint(pA,tmp); + pB=Translatepoint(pB,tmp); + pC=Translatepoint(pC,tmp); + Setscaling(scaley); + out=apply([pA,pP,pB,pC,pA],LLcrd(#)); ); + out; ); ////%Arrowheaddata end//// @@ -242,105 +256,84 @@ Arrowhead(Arg1,Arg2,Arg3):=( Arrowhead(text(ArrowheadNumber),Arg1,Arg2,Arg3); ); ); -Arrowhead(nm,point,direction,optionsorg):=(//181018from +Arrowhead(nm,point,direction,optionsorg):=(//191129remade //help:Arrowhead("1",B,B-A); -//help:Arrowhead(options=[size(1),angle(18),position(1),cut(0),"Coord=P(L)"]); -//help:Arrowhead(the default is -1 for numeric option); -//help:Arrowhead(A,"gr1"); - regional(name,Ltype,Noflg,reL,opstr,opcindy,color,eqL,coord, - options,cut,pP,Houkou,ptstr,hostr,tmp,tmp1,tmp2,list); +//help:Arrowhead("1",[1,2],"gr1"); +//help:Arrowhead("1",0.5,"gr1"); +//help:Arrowhead(options=[size(1),angle(18),position(1),cut(0),"Line=n(y)"]); + regional(Eps,name,Ltype,Noflg,opstr,opcindy,color,eqL,line, + options,pP,Houkou,ptstr,hostr,tmp,tmp1,tmp2,list); + Eps=10^(-4); name="arh"+nm; //181018 ArrowheadNumber=ArrowheadNumber+1; options=optionsorg; tmp=Divoptions(options); Ltype=tmp_1; Noflg=tmp_2; - reL=tmp_6; color=tmp_(length(tmp)-2); eqL=tmp_5; - coord="P"; + line="N"; forall(eqL, tmp=Strsplit(#,"="); tmp1=substring(tmp_1,0,1); tmp2=substring(tmp_2,0,1); - if(Toupper(tmp1)=="C", - coord=Toupper(tmp2); + if(Toupper(tmp1)=="L", + line=Toupper(tmp2); options=remove(options,[#]); ); - ); //181018to - tmp1=[YaSize,YaAngle,YaPosition,YaCut]; //181214from - forall(1..(length(reL)), - if(reL_#<0, reL_#=tmp1_#); - ); - forall((length(reL)+1)..4, - reL=append(reL,tmp1_#); ); - cut=reL_4; - tmp=reL_(1..3); - options=select(options,!isreal(#)); - options=concat(options,tmp); //181214to - if(ispoint(direction),Houkou=direction.xy); //181018 - if(isstring(direction),Houkou=parse(direction),Houkou=direction); - if(Measuredepth(Houkou)==2,Houkou=Houkou_1); - if(coord=="P",//181018from - if(ispoint(point),pP=point.xy,pP=point); - , - pP=Pcrd(point); - if(!islist(Houkou_1), - Houkou=Pcrd(Houkou); - , - Houkou=apply(Houkou,Pcrd(#)); - ); - );//181018to - list=Arrowheaddata(pP,Houkou,options); - if(!Inwindow(LLcrd(pP)),Noflg=2);//181018 + list=Arrowheaddata(point,direction,options); + if((ispoint(point))%(islist(point)), + if(!Inwindow(point),Noflg=2); + ); if(Noflg<3, - tmp1=apply(list,LLcrd(#)); - tmp=name+"="+Textformat(tmp1,5)+";"; //190415 + tmp=name+"="+Textformat(list,5)+";"; parse(tmp); - ); - if(Noflg<3, //190818 if(isstring(Ltype), - Listplot("-arh"+nm,apply(list,LLcrd(#)),concat(options,["notex","Msg=n"])); - ); - ); - if(Noflg==0, - tmp=Divoptions(options); - opstr=tmp_(length(tmp)-1); - opstr=opstr+","+Dqq("Cut="+format(cut,5)); - ptstr=Textformat(LLcrd(pP),5); - if(isstring(direction), //181019 - hostr=direction; - , - if(!islist(Houkou_1), - hostr=format(LLcrd(Houkou),5); + if(line=="N", + fillpoly(apply(list,Pcrd(#)),color->color); + if(Noflg==0, + if((point==1)&(isstring(direction)), //191202from + if(Norm(Ptend(direction)-Ptstart(direction))>Eps, //191203from + tmp=select(GCLIST,#_1==direction); + tmp=tmp_1; + tmp1=Nearestpt(list_4,direction); + tmp1=tmp1_2; + Partcrv(direction,1,tmp1,direction,["Msg=n"]); //191207 + Changestyle("part"+direction,[tmp_2,tmp_3]); + Changestyle(direction,["nodisp"]); + ); + ); //191202to + Listplot("-arh"+nm,list,["dr,0.1","Color="+text(color),"Msg=n"]);//191202 + Shade(["arh"+nm],["Color="+text(color)]); + ); , - hostr=format(apply(Houkou,LLcrd(#)),5); + Listplot("-arh"+nm,list_(1..3),concat(options,["Msg=n"])); ); - ); - if((Noflg==0)&(color!=KCOLOR), //180904 //no ketjs on - Texcom("{");Com2nd("Setcolor("+color+")");//180722 - ); //no ketjs off - Com2nd("Arrowhead("+ptstr+","+hostr+opstr+")"); - if((Noflg==0)&(color!=KCOLOR), //180904 //no ketjs on - Texcom("}");//180722 - ); //no ketjs off + ); ); + list; //191202 ); ////%Arrowhead end//// -////%Arrowdata start//// 190727 (<= Lightarrowdata) -Arrowdata(ptlist):=Lightarrowdata(ptlist,[]); -Arrowdata(Arg1,Arg2):=Lightarrowdata(Arg1,Arg2); -Arrowdata(nm,ptlistorg,optionsorg):=Lightarrowdata(nm,ptlistorg,optionsorg); +////%Arrowdata start//// 191119 (Arrowdataseg,Arrowdatacrv) +Arrowdata(ptlist):=Arrowdataseg(ptlist); +Arrowdata(Arg1,Arg2):=Arrowdataseg(Arg1,Arg2); +Arrowdata(nm,ptlistorg,optionsorg):=( +//help:Arrowdata("1",[A,B]); +//help:Arrowdata("1",[p1,p2]); +//help:Arrowdata(options=[size(1),angle(18),pos(1),cut(0),"Cutend=0,0","Coord=p/l"]); +//help:Arrowdata(optionsadded=["line"]); + Arrowdataseg(nm,ptlistorg,optionsorg); +); ////%Arrowdata end//// -////%OldArrowdata start//// -Arrowdata(ptlist):=OldArrowdata(ptlist,[]); //181110from -OldArrowdata(Arg1,Arg2):=( +////%Oldarrowdata start//// +Oldrrowdata(ptlist):=Oldarrowdata(ptlist,[]); //181110from +Oldrrowdata(Arg1,Arg2):=( regional(name); if(isstring(Arg1), - OldArrowdata(Arg1,Arg2,[]); + Oldarrowdata(Arg1,Arg2,[]); , name=""; forall(Arg1, @@ -348,14 +341,14 @@ OldArrowdata(Arg1,Arg2):=( name=name+#.name; //190505 ); ); - OldArrowdata(name,Arg1,Arg2); + Oldarrowdata(name,Arg1,Arg2); ); -); //181110from -OldArrowdata(nm,ptlistorg,optionsorg):=( +); //181110to +Oldarrowdata(nm,ptlistorg,optionsorg):=( // help:Arrowdata("1",[A,B]); // help:Arrowdata("1",[pt1,pt2]); -// help:Arrowdata(options=[size(1),angle(18),pos(1),cut(0),"Cutend=0,0","Coord=p/l"]); -// help:Arrowdata(optionsadded=["line"]); +// help:Arrowdatacrv(options=[size(1),angle(18),pos(1),cut(0),"Cutend=0,0","Coord=p/l"]); +// help:Arrowdatacrv(optionsadded=["line"]); regional(options,Ltype,Noflg,name,opstr,opcindy,eqL,reL,strL,color,size,coord, flg,lineflg,cutend,tmp,tmp1,tmp2,pA,pB,angle,segpos,cut,scaley,ptlist); name="ar"+nm; @@ -442,7 +435,7 @@ OldArrowdata(nm,ptlistorg,optionsorg):=( ); if(Noflg<2, if(isstring(Ltype), - Listplot("-ar"+nm,[LLcrd(pA),LLcrd(pB)],append(options,"Msg=n")); + Listplot("-ar"+nm,[LLcrd(pA),LLcrd(pB)],concat(options,["Msg=n"])); Arrowhead(nm,pA+segpos*(pB-pA),pB-pA,options); //181110 , if(Noflg==1,Ltype=0); @@ -451,14 +444,14 @@ OldArrowdata(nm,ptlistorg,optionsorg):=( Setscaling(scaley); //190412 [Lcrd(pA),Lcrd(pB)]; ); -////%OldArrowdata end//// +////%Oldarrowdata end//// -////%Lightarrowdata start//// -Lightarrowdata(ptlist):=Lightarrowdata(ptlist,[]); //181110from -Lightarrowdata(Arg1,Arg2):=( +////%Arrowdataseg start//// +Arrowdataseg(ptlist):=Arrowdataseg(ptlist,[]); //181110from +Arrowdataseg(Arg1,Arg2):=( regional(name); if(isstring(Arg1), - Lightarrowdata(Arg1,Arg2,[]); + Arrowdataseg(Arg1,Arg2,[]); , name=""; forall(Arg1, @@ -466,26 +459,23 @@ Lightarrowdata(Arg1,Arg2):=( name=name+#.name; //190505 ); ); - Lightarrowdata(name,Arg1,Arg2); + Arrowdataseg(name,Arg1,Arg2); ); ); //181110from -Lightarrowdata(nm,ptlist,optionsorg):=( -//help:Arrowdata("1",[pt1,pt2]); -//help:Arrowdata(options=[size(1),angle(18),pos(1),cut(0),"Cutend=0,0","Line=y(n)"]); - regional(options,Ltype,Noflg,opstr,opcindy,eqL,reL,strL,color,size,coord,lineflg, - flg,lineflg,cutend,tmp,tmp1,tmp2,pA,pB,angle,segpos,cut,scaley,Ev,Nv,pP); - pA=Pcrd(ptlist_1); pB=Pcrd(ptlist_2); +Arrowdataseg(nm,ptlistorg,optionsorg):=( +//help:Arrowdataseg("1",[pt1,pt2]); +//help:Arrowdataseg(options=[size(1),angle(18),pos(1),cut(0),"Cutend=0,0","Line=n(y)"]); + regional(options,Ltype,Noflg,opstr,opcindy,eqL,reL,strL,color,size,lineflg, + flg,cutend,tmp,tmp1,tmp2,pA,pB,pC,angle,segpos,cut,scaley,Ev,Nv,pP,ptlist); scaley=SCALEY; //190412 Setscaling(1); ptlist=[]; forall(ptlistorg, - if(ispoint(#),tmp=[#.x, scaley*#.y], tmp=[#_1,scaley*#_2]); + if(ispoint(#),tmp=[#.x, #.y], tmp=[#_1,scaley*#_2]); ptlist=append(ptlist,tmp); ); + pA=ptlist_1; pB=ptlist_2; options=optionsorg; - tmp=select(options,isstring(#)); //181214from - tmp1=select(tmp,contains(["dr","da","do","id"],substring(#,0,2))); - if(length(tmp1)==0,options=append(options,YasenStyle)); //181214to tmp=Divoptions(options); Ltype=tmp_1; Noflg=tmp_2; @@ -495,25 +485,26 @@ Lightarrowdata(nm,ptlist,optionsorg):=( color=tmp_(length(tmp)-2); opstr=tmp_(length(tmp)-1); opcindy=tmp_(length(tmp)); - tmp1=[YaSize,YaAngle,YaPosition,YaCut]; //181214from - forall(1..(length(reL)), - if(reL_#<0, reL_#=tmp1_#); - ); - forall((length(reL)+1)..4, - reL=append(reL,tmp1_#); + size=0.2*YaSize*1/2.54*1000/MilliIn; + angle=YaAngle*pi/180; + segpos=YaPosition; + cut=YaCut; + if(length(reL)>=1, + size=0.2*reL_1*1/2.54*1000/MilliIn; + ); + if(length(reL)>=2, + if(reL_2<2.5,angle=reL_2*YaAngle,angle=reL_2); + angle=angle*pi/180; ); - size=reL_1; - angle=reL_2; - segpos=reL_3; - cut=reL_4; - lineflg=0; - if(contains(strL,"l")%contains(strL,"L"), - lineflg=1; - );//181018from - options=remove(options,strL); + if(length(reL)>=3, + segpos=reL_3; + ); + if(length(reL)>=4, + cut=reL_4; + ); + options=remove(options,reL); //191202 cutend=[0,0];//180719 - coord="P";//181018 - lineflg=1; //190504 + lineflg=0; forall(eqL, tmp=Strsplit(#,"="); tmp1=Toupper(substring(tmp_1,0,2)); @@ -523,60 +514,39 @@ Lightarrowdata(nm,ptlist,optionsorg):=( tmp2=replace(tmp2,"]",""); cutend=tokenize(tmp2,","); if(length(cutend)==1,cutend=[cutend_1,cutend_1]); - options=remove(options,[#]); ); if(tmp1=="LI",//190504from tmp2=Toupper(substring(tmp2,0,1)); - if(tmp2=="N",lineflg=0); - options=remove(options,[#]); + if(tmp2=="Y",lineflg=1); );//190504to ); - if(Noflg<3, - tmp="ar"+nm+"="+Textformat([pA,pB],5)+";"; - parse(tmp); - ); - if(Noflg<3, //190818 - if(isstring(Ltype), - if(lineflg==1, //190504from - Listplot("-ar"+nm,[LLcrd(pA),LLcrd(pB)],append(options,"Msg=n")); - , - tmp=pB; - pB=pA; - pA=pB-tmp; - ); //190504to - size=0.2*size; - angle=angle*pi/180; - pP=pA+segpos*(pB-pA); - Ev=-1/|pB-pA|*(pB-pA); - Nv=[-Ev_2, Ev_1]; - tmp1=pP+size*cos(angle)*Ev+size*sin(angle)*Nv; - tmp2=pP+size*cos(angle)*Ev-size*sin(angle)*Nv; - ArrowheadNumber=ArrowheadNumber+1; - Listplot("-arh"+nm,[tmp1,pP,tmp2],append(options,"Msg=n")); - if((Noflg==0)&(color!=KCOLOR), //180904 //no ketjs on - Texcom("{");Com2nd("Setcolor("+color+")");//180722 - ); //no ketjs off - Setscaling(scaley); - tmp1=Textformat(LLcrd(pP),5); //no ketjs on - tmp2=Textformat(LLcrd(pB-pA),5); - if(cut>0, //190727from //no ketjs on - tmp=Indexall(opstr,","); - tmp=tmp_(length(tmp)); - opstr=substring(opstr,0,tmp-1); - opstr=opstr+","+Dqq("Cut="+text(cut)); - ); //190727to - Com2nd("Arrowhead("+tmp1+","+tmp2+opstr+")"); - if((Noflg==0)&(color!=KCOLOR), //180904 - Texcom("}");//180722 - ); //no ketjs off + tmp=pB-pA; + tmp=tmp/|tmp|; + pA=ptlist_1+tmp*cutend_1; + pB=ptlist_2-tmp*cutend_2; + pP=pA+segpos*(pB-pA); + Ev=-1/|pB-pA|*(pB-pA); + Nv=[-Ev_2, Ev_1]; + tmp1=pP+size*cos(angle)*Ev+size*sin(angle)*Nv; + tmp2=pP+size*cos(angle)*Ev-size*sin(angle)*Nv; + pC=pP+(1-cut)*((tmp1+tmp2)/2-pP); + ArrowheadNumber=ArrowheadNumber+1; + if(Noflg<2, + if(lineflg==1, + Listplot("-arh"+nm,[tmp1,pP,tmp2],append(options,"Msg=n")); //191106 , - if(Noflg==1,Ltype=0); + Listplot("-arh"+nm,[tmp1,pP,tmp2,pC,tmp1],["dr,0.1","Color="+color,"Msg=n"]); //191106 + Shade(["arh"+nm],[Ltype,"Color="+color]); + ); + if(lineflg==0, + if(segpos==1,pB=pC); //191202 ); + Listplot("-ar"+nm,[pA,pB],[Ltype,"Color="+color,"Msg=n"]); ); Setscaling(scaley); //190412 - [Lcrd(pA),Lcrd(pB)]; + [LLcrd(pA),LLcrd(pB)]; ); -////%Lightarrowdata end//// +////%Arrowdataseg end//// ////%Anglemark start//// Anglemark(plist):=Anglemark(plist,[]); @@ -1944,20 +1914,17 @@ Shade(Arg1,Arg2):=( ); ); Shade(nm,plistorg,options):=( -//help:Shade(["gr1"],[0.5]); -//help:Shade(["gr1"],["Color=red"]); -//help:Shade(["gr1"],["Trim=y(n)"]); //190224 -// help:Shade(["gr1","sg1"],["Color=[1,0,0]"]); -// help:Shade([[A,B,C,A]]); +//help:Shade(["gr1"]); +// help:Shade(options=["Trim=(n)","Enc=(n)",Rirst=(n)","Color=",Startpoint]); //help:Shade(["gr2","Invert(sg1)"],["Enc=y",(Startpoint)]); - regional(name,plist,jj,nn,trim,tmp,tmp1,tmp2, + regional(name,plist,jj,nn,trim,first,tmp,tmp1,tmp2, opstr,opcindy,eqL,reL,Str,G2,flg,encflg,startpt,color,ctr); name="shade"+nm; plist=plistorg; if(isstring(plist_1), // 16.01.24 - println("output Shade of "+plist); +// println("output Shade of "+plist); , - println("output Shade of lists"); +// println("output Shade of lists"); ); tmp=Divoptions(options); eqL=tmp_5; @@ -1968,6 +1935,7 @@ Shade(nm,plistorg,options):=( tmp=select(plist,indexof(#,"Invert")>0); //180929from if(length(tmp)>0,encflg=1,encflg=0); trim="N"; + first="N"; //191007 forall(eqL, tmp=Strsplit(#,"="); tmp1=Toupper(tmp_1); @@ -1983,6 +1951,9 @@ Shade(nm,plistorg,options):=( if(substring(tmp1,0,1)=="T", trim=substring(tmp2,0,1); ); + if(substring(tmp1,0,1)=="F", + first=substring(tmp2,0,1); + ); ); startpt=[]; forall(reL, @@ -2050,11 +2021,16 @@ Shade(nm,plistorg,options):=( ); Str=Str+substring(tmp1,0,length(tmp1)-1)+")"+")"; //180929 nn=length(COM2ndlist); //190311from - jj=nn; - forall(plist,tmp1, - tmp=select(1..nn,indexof(COM2ndlist_#,tmp1)>0); - jj=min(append(tmp,jj)); - ); + if(first=="Y", //191007from + jj=1; + , + jj=nn; + forall(plist,tmp1, + tmp=select(1..nn,indexof(COM2ndlist_#,tmp1)>0); + jj=min(append(tmp,jj)); + ); + if(jj==0, jj=1); //191008 + ); //191007to tmp1=["Texcom("+Dqq("{")+")","Setcolor("+color+")",Str,"Texcom("+Dqq("}")+")"]; tmp2=COM2ndlist_(1..(jj-1)); tmp=COM2ndlist_(jj..(length(COM2ndlist))); @@ -2066,8 +2042,6 @@ Shade(nm,plistorg,options):=( ); ////%Shade end//// -/////////// end of new Hatchdata(cindy) /////////// - ////%Rotatepoint start//// Rotatepoint(point,Theta,ctr):=( //help:Rotatepoint(A,2*pi/3,B); @@ -2586,7 +2560,7 @@ Htickmark(arglist,options):=( //190203 tmp1=select(1..(length(arglist)),!isstring(arglist_#)); //180710from forall(tmp1,nn, Listplot("ht"+text(nn), - [[arglist_nn,mark],[arglist_nn,-mark]],["Msg=n"]);//181017 + [[arglist_nn,mark],[arglist_nn,-mark]],append(options,"Msg=n"));//191101 if(nn+2<=length(arglist), tmp=arglist_(nn+2); if(!isstring(tmp), @@ -2613,7 +2587,7 @@ Vtickmark(arglist,options):=( //190203 tmp1=select(1..(length(arglist)),!isstring(arglist_#)); //180710from forall(tmp1,nn, Listplot("vt"+text(nn), - [[mark,arglist_nn],[-mark,arglist_nn]],["Msg=n"]); //181021 + [[mark,arglist_nn],[-mark,arglist_nn]],append(options,"Msg=n")); //191101 if(nn+2<=length(arglist), tmp=arglist_(nn+2); if(!isstring(tmp), @@ -2776,9 +2750,9 @@ Drwxy(add,optionsorg):=( 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]]; - Lightarrowdata("axx"+text(AXCOUNT),tmp,tmp1); + Arrowdataseg("axx"+text(AXCOUNT),tmp,tmp1); tmp=[[org_1,yrng_1],[org_1,yrng_2]]; - Lightarrowdata("axy"+text(AXCOUNT),tmp,tmp1); //190419 + Arrowdataseg("axy"+text(AXCOUNT),tmp,tmp1); //190419 , tmp=[[xrng_1,org_2],[xrng_2,org_2]]; tmp1=concat(options,[colorax,"Msg=n"]);//181216,190325 @@ -3168,14 +3142,15 @@ Slider(ptstr,p1,p2,options):=(//190120 Putpoint(name,Pt):=Putpoint(name,Pt,Pt); Putpoint(name,Ptinit,Pt):=( //help:Putpoint("A",[1,2],[1,A.y]); - regional(ptstr); - ptstr=apply(allpoints(),#.name); //no ketjs on + regional(ptstr); + ptstr=apply(allpoints(),#.name); //no ketjs on //191030 if(!contains(ptstr,name), createpoint(name,Pcrd([Ptinit_1,Ptinit_2])); - , //no ketjs off + Ptpos(name,Pcrd([Ptinit_1,Ptinit_2])); //191005 + , //no ketjs off //191030 ptstr=name+".xy="+Textformat(Pcrd(Pt),5)+";"; parse(ptstr); - ); //no ketjs + ); //no ketjs //191030 ); ////%Putpoint end//// @@ -4105,15 +4080,22 @@ Tabledata(Arg1,Arg2,Arg3,Arg4):=( ); ); //190428to Tabledata(nm,xL,yL,rmvL,optionorg):=( -//help:Tabledata(xL,yL,rmvL,["Geo=n"]); +//help:Tabledata(xL,yL,rmvL,["Geo=y(n)"]); //help:Tabledata(options=[2(tick,0 for no tick),"Setwin=y","Move=[0,0]"]); //190428 regional(options,geo,tmp,tmp1,tmp2); options=optionorg; tmp=Divoptions(options); eqL=tmp_5; - tmp=select(tmp_5,indexof(Toupper(#),"GEO")>0); - if(length(tmp)>0, - options=remove(options,tmp); + geo="N"; //191008from + forall(eqL, + tmp=Strsplit(#,"="); //191023 + tmp1=Toupper(substring(tmp_1,0,1)); + if(tmp1=="G", + geo=Toupper(substring(tmp_2,0,1)); + options=remove(options,#); + ); + ); + if(geo=="Y", //191008to Tabledatageo(nm,xL,yL,rmvL,options); , Tabledatalight(nm,xL,yL,rmvL,options); @@ -4134,7 +4116,7 @@ Tabledatalight(nm,xLst,yLst,rmvL,optionorg):=( //help:Tabledatalight(xLst,yLst,rmvL,[0(notick)]); //help:Tabledatalight(xLst,yLst,rmvL,[2,"Setwindow=y","Move=[0,0]"]); //190428 regional(options,rng,name,upleft,ul,flg,tick,eqL,reL,n,m,xsize,ysize, - rlist,clist,Tb,jj,kk,tmp,tmp1,tmp2,tmp3,Eps); + rlist,clist,Tb,jj,kk,tmp,tmp1,tmp2,tmp3,Eps,tbstr); // TableMove is global for Table TABLECOUNT=TABLECOUNT+1; //190428from TableMove=GENTEN; //190428to @@ -4193,17 +4175,20 @@ Tabledatalight(nm,xLst,yLst,rmvL,optionorg):=( Tb=[clist,rlist]; //190427 tmp=name+"="+Tb+";"; //190415 parse(tmp); + tbstr="["; //191008 forall(0..m,jj, //190507from tmp3="c"+text(jj); if(length(rmvL)>=0, tmp1="r"+text(0); tmp2="r"+text(n); - Tlistplot("-"+name+tmp3+tmp1+tmp2,[tmp3+tmp1,tmp3+tmp2],options); + Tlistplot("-"+name+tmp3+tmp1+tmp2,[tmp3+tmp1,tmp3+tmp2],options); + tbstr=tbstr+Dqq(name+tmp3+tmp1+tmp2)+"," //191008 , forall(0..(n-1), tmp1="r"+text(#); tmp2="r"+text(#+1); Tlistplot("-"+name+tmp3+tmp1+tmp2,[tmp3+tmp1,tmp3+tmp2],options); + tbstr=tbstr+Dqq(name+tmp3+tmp1+tmp2)+"," //191008 ); ); //190507to if(tick!=0, //190421 @@ -4218,11 +4203,13 @@ Tabledatalight(nm,xLst,yLst,rmvL,optionorg):=( tmp1="c"+text(0); tmp2="c"+text(m); Tlistplot("-"+name+tmp3+tmp1+tmp2,[tmp1+tmp3,tmp2+tmp3],options); + tbstr=tbstr+Dqq(name+tmp3+tmp1+tmp2)+"," //191008 , forall(0..(m-1), tmp1="c"+text(#); tmp2="c"+text(#+1); Tlistplot("-"+name+tmp3+tmp1+tmp2,[tmp1+tmp3,tmp2+tmp3],options); + tbstr=tbstr+Dqq(name+tmp3+tmp1+tmp2)+"," //191008 ); ); if(tick!=0, //190421 @@ -4231,6 +4218,10 @@ Tabledatalight(nm,xLst,yLst,rmvL,optionorg):=( ); ); ); + tbstr=substring(tbstr,0,length(tbstr)-1)+"]"; //101008from + tmp1=parse(tbstr); + tmp=name+"str="+tbstr+";"; + parse(tmp); //101008to Changetablestyle(rmvL,["nodisp"]); //190428 Addax(0); Eps=10^(-3); diff --git a/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic3logr.txt b/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic3logr.txt index 0d2b2ac394a..644edcc2a3e 100644 --- a/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic3logr.txt +++ b/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic3logr.txt @@ -1,3 +1,7 @@ +// 20191004 +// Mkketcindyjs changed ( import for ketcindyjs supported) +// 20191003 +// Usegraphics changed ( for tpic ) // 201908918 // Defvar changed ( precision 5 -> 16) // 201908916 diff --git a/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic3r.cs b/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic3r.cs index b5308c171bf..16dac182d0a 100644 --- a/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic3r.cs +++ b/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindylibbasic3r.cs @@ -14,7 +14,7 @@ // along with this program. If not, see <http://www.gnu.org/licenses/> // -println("ketcindylibbasic3[20190918] loaded"); +println("ketcindylibbasic3[20191127] loaded"); //help:start(); @@ -1222,14 +1222,16 @@ Addpackage(packorg):=( ////%Usegraphics start//// Usegraphics(gpack):=( //180817 //help:Usegraphics("pict2e"); - if(!contains(ADDPACK,gpack), - if(indexof(gpack,"tikz")>0, //181213from //190615 + regional(tmp); + GPACK=gpack; + if(Toupper(gpack)=="TIKZ", //190615 Addpackage(["pgf","tikz"]); //190101 - , - Addpackage([gpack]); - ); //181213to + ADDPACK=set(ADDPACK); //191127 + ); + if(Toupper(gpack)=="PICT2E", + Addpackage(["pict2e"]); + ADDPACK=set(ADDPACK); //191127 ); - GPACK=gpack; ); ////%Usegraphics end//// @@ -3376,6 +3378,7 @@ Setketcindyjs(list):=( ////%Ketcindyjsbody start//// 190909 Ketcindyjsbody(list1,list2):=( //help:Ketcindyjsbody(listfront,listrear); +//help:Ketcindyjsbody(["<p,f10>_;_;Sample"],[]); //191004 JSBODY=[list1,list2]; JSBODY; ); @@ -3782,7 +3785,7 @@ Mkketcindyjs(options):=( //17.11.18 regional(webflg,localflg,htm,htmorg,from,upto,flg,fL,fun,jj,tmp,tmp1,tmp2,tmp3, libnameL,libL,lib,jc,nn,name,partL,toppart,lastpart,path,ketflg,flg,cmdL,scale, nolabel,color,grid,axes,out,Out,igno,onlyflg,rmptL,colorrgb,ptname,eqflg,eqrep, - figure,dpi,margin,defaultbuttonsize,defaulteditsize); + figure,dpi,margin,defaultbuttonsize,defaulteditsize,dname,fname); libnameL=["basic1","basic2","basic3","3d"]; //190416,190428 webflg="Y"; //190128 texflg removed localflg="Y"; //190209,0215 @@ -3904,7 +3907,32 @@ Mkketcindyjs(options):=( //17.11.18 drawtext(mouse().xy-[0,1],Cdyname()+".html not found",size->24,color->[1,0,0]); wait(3000); , - htmorg=Readlines(Dircdy,Fhead+".html"); + tmp3=Readlines(Dircdy,Fhead+".html"); + tmp=select(1..(length(tmp3)),indexof(tmp3_#,"import")>0); + tmp2=select(tmp,indexof(tmp3_#,"ketcindy.ini")==0); + tmp1=[]; + forall(tmp2, + tmp=Removespace(tmp3_#); + if(substring(tmp,0,2)!="//", + tmp1=append(tmp1,#); + ); + ); + htmorg=[]; + from=1; + forall(tmp1, + htmorg=concat(htmorg,tmp3_(from..(#-2))); + tmp=Bracket(tmp3_(#-1),"()"); + dname=substring(tmp3_(#-1),tmp_1_1,tmp_(length(tmp))_1-1); + dname=parse(dname); + tmp=Bracket(tmp3_#,"()"); + fname=substring(tmp3_#,tmp_1_1,tmp_(length(tmp))_1-1); + fname=parse(fname); + tmp2=Readlines(dname,fname); + htmorg=concat(htmorg,tmp2); + from=#+2; + ); + upto=length(tmp3); + htmorg=concat(htmorg,tmp3_(from..upto)); tmp=select(1..(length(htmorg)),indexof(htmorg_#,"id="+Dqq("csinit"))>0); //190206from from=tmp_1+5; flg=0; diff --git a/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindyliboutlogr.txt b/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindyliboutlogr.txt index 738591b8afd..6b9da36826d 100644 --- a/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindyliboutlogr.txt +++ b/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindyliboutlogr.txt @@ -1,3 +1,7 @@ +// 20191020 +// PlotdataR, PlotdatadiscR debugged ( "Pre=PVF") +// 20191006 +// Sfparadata,... debugged (tmp_7 removed) // 20190821 // CalcbyR changed ( pre->dig, 6->8) // 20190818 diff --git a/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindyliboutr.cs b/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindyliboutr.cs index 7e4a4e5ba86..499b69ebc84 100644 --- a/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindyliboutr.cs +++ b/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindyliboutr.cs @@ -14,7 +14,7 @@ // along with this program. If not, see <http://www.gnu.org/licenses/> // -println("ketcindylibout[20190821] loaded"); +println("ketcindylibout[20191020] loaded"); //help:start(); @@ -1345,8 +1345,8 @@ PlotdataR(name1,Arg1,Arg2,Arg3):=( ); PlotdataR(name1,path,func,variable,optionorg):=( //help:PlotdataR("1","dnorm(x)","x"); -//help:PlotdataR(options=["m/r","Num=50","Wait=10"]); - regional(options,tmp,tmp1,tmp2,tmp3,name,varstr,flg,Num, +//help:PlotdataR(options=["Num=50","Pre=PVF","Wait=10"]); //191020 + regional(options,tmp,tmp1,tmp2,tmp3,name,varstr,flg,Num,pre, Ltype,Noflg,eqL,strL,flg,outreg,filename,wfile,cmdL,waiting); name="grR"+name1; options=optionorg; @@ -1356,23 +1356,28 @@ PlotdataR(name1,path,func,variable,optionorg):=( Num=50; waiting=5; outreg=0; + pre="PVF"; flg=0; forall(eqL, - tmp=indexof(#,"="); - tmp1=substring(#,tmp,length(#)); - if(Toupper(substring(#,0,1))=="N", - Num=parse(tmp1); + tmp=Strsplit(#,"="); + tmp1=Toupper(substring(tmp_1,0,1)); + if(tmp1=="N", + Num=parse(tmp_2); options=remove(options,[#]); ); - if(Toupper(substring(#,0,1))=="W", - waiting=parse(tmp1); + if(tmp1=="W", + waiting=parse(tmp_2); options=remove(options,[#]); ); - if(Toupper(substring(#,0,1))=="O", - tmp=Toupper(substring(tmp1,0,1)); - if(tmp=="T" % tmp=="Y", outreg=1); + if(tmp1=="O", + tmp2=Toupper(substring(tmp_2,0,1)); + if(tmp2=="T" % tmp2=="Y", outreg=1); options=remove(options,[#]); ); + if(tmp1=="P", //191020from + pre=tmp_2; + options=remove(options,[#]); + ); //191020to ); tmp=indexof(variable,"="); if(tmp>0, @@ -1384,13 +1389,14 @@ PlotdataR(name1,path,func,variable,optionorg):=( varstr=replace(varstr,"]",")"); filename=Fhead+name+".r"; wfile=Fhead+name+".txt"; - cmdL=MkprecommandR(); + cmdL=MkprecommandR(pre); //191020 cmdL=concat(cmdL,[ - name+"=Plotdata",[Dq+func+Dq,Dq+varstr+Dq,Dq+"Num="+text(Num)+Dq], - "WriteOutData",[Dq+wfile+Dq,Dq+name+Dq,name] + name+"=Plotdata",[Dqq(func),Dqq(varstr),Dqq("Num="+text(Num))], + "WriteOutData",[Dqq(wfile),Dqq(name),name] ]); if(ErrFlag==0, - CalcbyR(name,cmdL,concat(options,["Cat=middle","Wait="+text(waiting)])); + tmp=["Cat=middle","Wait="+text(waiting)]; //191020[2lines] + CalcbyR(name,cmdL,concat(options,tmp)); ); if(ErrFlag==1, println("PlotdataR not completed"); @@ -1412,23 +1418,44 @@ PlotdataR(name1,path,func,variable,optionorg):=( ////%PlotdiscR start//// PlotdiscR(nm,fun,varrng):=PlotdiscR(nm,fun,varrng,[]); -PlotdiscR(nm,fun,varrng,options):=( +PlotdiscR(nm,fun,varrng,optionorg):=( //help:PlotdiscR("1","dbinom(k,10,0.4)","k=[0,10]"); - regional(name,pb,cmdL,var,range,tmp,tmp1,tmp2,wfile); +//help:PlotdiscR(options=["Pre=PVF","Wait=10"]); //191020 + regional(name,pb,cmdL,var,range,tmp,tmp1,tmp2, + pre,waiting,options,wfile,eqL); name="grd"+nm; + options=optionorg; //191020from + tmp=Divoptions(options); + eqL=tmp_5; + waiting=5; + pre="PVF"; + forall(eqL, + tmp=Strsplit(#,"="); + tmp1=Toupper(substring(tmp_1,0,1)); + if(tmp1=="W", + waiting=parse(tmp_2); + options=remove(options,[#]); + ); + if(tmp1=="P", //191020from + pre=tmp_2; + options=remove(options,[#]); + ); + ); //191020 tmp=indexof(varrng,"="); var=substring(varrng,0,tmp-1); range=parse(substring(varrng,tmp,length(varrng))); if(length(range)==2, range=(range_1)..(range_2); ); - cmdL=[ + wfile=Fhead+name+".txt"; + cmdL=MkprecommandR(pre); //191020from + cmdL=concat(cmdL,[ "fnb=function("+var+") "+fun,[], name+"=sapply",[range,"fnb"] - ]; - wfile=Fhead+name+".txt"; + ]); //191020to if(ErrFlag==0, - CalcbyR(name,cmdL,options); + tmp=["Wait="+text(waiting)]; //191020[2lines] + CalcbyR(name,cmdL,concat(options,tmp)); ); if(ErrFlag==1, println("PlotdiscR not completed"); @@ -5564,11 +5591,11 @@ SfbdparadataC(nm,fdorg,optionorg,optionshorg):=( name3h="sfbdh3d"+nm; fname=Fhead+"sfbd"+nm+".txt"; options=select(optionorg,length(#)>0); //190123from - tmp=Divoptions(options); - if(length(tmp_7)==0,options=append(options,"dr")); +// tmp=Divoptions(options); //191006[2lines] +// if(length(tmp_7)==0,options=append(options,"dr")); optionsh=select(optionshorg,length(#)>0); - tmp=Divoptions(optionsh); - if(length(tmp_7)==0,optionsh=append(optionsh,"do")); //190123to +// tmp=Divoptions(optionsh); //191006[2lines] +// if(length(tmp_7)==0,optionsh=append(optionsh,"do")); //190123to tmp=Divoptions(options); eqL=tmp_5; reL=tmp_6; @@ -5691,12 +5718,12 @@ CrvsfparadataC(nm,Fk,sfbdorg,fdorg,optionorg,optionshorg):=( name2h="crvsfh2d"+nm; name3h="crvsfh3d"+nm; fname=Fhead+"crvsf"+nm+".txt"; - options=select(optionorg,length(#)>0); //190123from - tmp=Divoptions(options); - if(length(tmp_7)==0,options=append(options,"dr")); + options=select(optionorg,length(#)>0); //190123from +// tmp=Divoptions(options); //191006[2lines] +// if(length(tmp_7)==0,options=append(options,"dr")); optionsh=select(optionshorg,length(#)>0); - tmp=Divoptions(optionsh); - if(length(tmp_7)==0,optionsh=append(optionsh,"do")); //190123to +// tmp=Divoptions(optionsh);//191006[2lines] +// if(length(tmp_7)==0,optionsh=append(optionsh,"do")); //190123to tmp=Divoptions(options); eqL=tmp_5; reL=tmp_6; @@ -5880,7 +5907,7 @@ Crv3onsfparadataC(nm,crv3d,sfbdorg,fdorg,optionorg,optionshorg):=( fname=Fhead+"crv3onsf"+nm+".txt"; tmp=apply(fdorg,if(isstring(#),Dqq(#),#)); tmp=text(tmp); - options=optionorg; + options=select(optionorg,length(#)>0); optionsh=select(optionshorg,length(#)>0); //181107 tmp=Divoptions(options); eqL=tmp_5; @@ -6058,11 +6085,11 @@ WireparadataC(nm,sfbd,fdorg,wr1,wr2,optionorg,optionshorg):=( fname=Fhead+"wire"+nm+".txt"; fnameh=replace(fname,".txt","h.txt"); options=select(optionorg,length(#)>0); //190123from - tmp=Divoptions(options); - if(length(tmp_7)==0,options=append(options,"dr")); +// tmp=Divoptions(options); //191006[2lines] +// if(length(tmp_7)==0,options=append(options,"dr")); optionsh=select(optionshorg,length(#)>0); - tmp=Divoptions(optionsh); - if(length(tmp_7)==0,optionsh=append(optionsh,"do")); //190123to +// tmp=Divoptions(optionsh); //191006[2lines] +// if(length(tmp_7)==0,optionsh=append(optionsh,"do")); //190123to tmp=Divoptions(options); eqL=tmp_5; reL=tmp_6; @@ -6385,7 +6412,7 @@ SfcutparadataC(nm,cutfunLorg,sfbd,fdorg,optionorg,optionshorg):=( name3h="sfcuth3d"+nm; fname=Fhead+"sfcut"+nm+".txt"; fnameh=replace(fname,".txt","h.txt"); - options=optionorg; + options=select(optionorg,length(#)>0); optionsh=select(optionshorg,length(#)>0); //181107 tmp=Divoptions(options); eqL=tmp_5; @@ -6414,11 +6441,11 @@ SfcutparadataC(nm,cutfunLorg,sfbd,fdorg,optionorg,optionshorg):=( ); ); options=select(optionorg,length(#)>0); //190123from - tmp=Divoptions(options); - if(length(tmp_7)==0,options=append(options,"dr")); +// tmp=Divoptions(options); //191006[2lines] +// if(length(tmp_7)==0,options=append(options,"dr")); optionsh=select(optionshorg,length(#)>0); - tmp=Divoptions(optionsh); - if(length(tmp_7)==0,optionsh=append(optionsh,"do")); //190123to +// tmp=Divoptions(optionsh); //191006[2lines] +// if(length(tmp_7)==0,optionsh=append(optionsh,"do")); //190123to tmp1=select(options, (indexof(#,"=")>0)&(Toupper(substring(#,0,1))=="C")); //181114from if(length(tmp1)>0, diff --git a/Master/texmf-dist/scripts/ketcindy/ketlib/ketpiccurrent.r b/Master/texmf-dist/scripts/ketcindy/ketlib/ketpiccurrent.r index 76998cc41d6..129d9f0a42a 100755 --- a/Master/texmf-dist/scripts/ketcindy/ketlib/ketpiccurrent.r +++ b/Master/texmf-dist/scripts/ketcindy/ketlib/ketpiccurrent.r @@ -16,10 +16,14 @@ ######################################### -ThisVersion<- "KeTpic for R v5_2_4(20190921)" +ThisVersion<- "KeTpic for R v5_2_4(20191126)" print(ThisVersion) +# 20191126 +# Drwpt debugge/changed (sh 1, pen) +# 20191001 +# Intersectpartseg, Enclosing2 debugged (Listplot => rbind) # 20190921 # Enclosing2 debugged/changed (epspara removed) # 20190627 @@ -2476,14 +2480,14 @@ Drwpt<-function(...){ } Mojisu=0 } - Str1<- "\\special{sh}\\special{fp}" #190405from + Str1<- "\\special{sh 1}\\special{fp}" #190405from, 191126 if(Same=="n"){ Str1<- paste(Str1,"}",sep="") } Str1<- paste(Str1,"%\n",sep="") #190405to cat(Str1,file=Wfile,append=TRUE) } - cat("\\special{pn 4}",file=Wfile,append=TRUE) #181231 + cat("\\special{pn 8}",file=Wfile,append=TRUE) #181231,191126 Mojisu=0 for (J in 1:Nrow(PL)){ Q<- PL[J,] @@ -12685,8 +12689,8 @@ Intersectpartseg<- function(...){ Eps00=10^(-8) Eps0=10^(-4) out=list() - seg1=Listplot(Op(ii,crv1),Op(ii+1,crv1)) - seg2=Listplot(Op(jj,crv2),Op(jj+1,crv2)) + seg1=rbind(Op(ii,crv1),Op(ii+1,crv1)) #191001 + seg2=rbind(Op(jj,crv2),Op(jj+1,crv2)) #191001 tmp1=Op(2,seg1)-Op(1,seg1) tmp2=Op(2,seg2)-Op(1,seg2) snang=abs(Crossprod(tmp1,tmp2))/(Norm(tmp1)*Norm(tmp2)) @@ -12741,8 +12745,8 @@ Intersectpartseg<- function(...){ tmp2=list() for(kk in Looprange(1,Length(os1)-1)){ for(ll in Looprange(1,Length(os2)-1)){ - seg1=Listplot(Op(kk,os1),Op(kk+1,os1)) - seg2=Listplot(Op(ll,os2),Op(ll+1,os2)) + seg1=rbind(Op(kk,os1),Op(kk+1,os1)) #191001 + seg2=rbind(Op(ll,os2),Op(ll+1,os2)) #191001 tmp=Intersectseg(seg1,seg2,Eps1) if((Op(1,tmp)<Eps1)&&(length(tmp)>1)){ #18.02.05 if(Op(1,tmp)<dst+Eps00){ @@ -13055,7 +13059,7 @@ Enclosing2<- function(...){ if(length(KL)==0){ tmp1=Op(Length(Gdata),Gdata) tmp2=Op(1,Fdata) - tmp=Listplot(tmp1,tmp2) + tmp=rbind(tmp1,tmp2) #191001 plist=c(plist,list(tmp)) Start=tmp2 tst=1 diff --git a/Master/texmf-dist/scripts/ketcindy/ketlib/ketpiccurrent_rep2e.r b/Master/texmf-dist/scripts/ketcindy/ketlib/ketpiccurrent_rep2e.r index 084f94c70c2..a71673a6cbf 100755 --- a/Master/texmf-dist/scripts/ketcindy/ketlib/ketpiccurrent_rep2e.r +++ b/Master/texmf-dist/scripts/ketcindy/ketlib/ketpiccurrent_rep2e.r @@ -16,8 +16,12 @@ ######################################### -ThisVersion<- "2ev5_2_4(190405)" +ThisVersion<- "2ev5_2_4(191106)" +# 20191106 +# Drwline debugged ( Thick) +# 20191104 +# Dottedline changed ( Ookisa 2->1) # 20190405 # Drwpt debugged/changed ( Incolor ) # 20181230 @@ -38,7 +42,7 @@ Dottedline<- function(...) varargin <- list(...) Nall <- length(varargin) Nagasa <- 0.1 - Ookisa <- PenThick*2 #17.10.07 + Ookisa <- PenThick*1 #2 #17.10.07,191104(*1) I <- Nall Tmp <- varargin[[I]] while (mode(Tmp)=="numeric" && length(Tmp)==1 ) { @@ -154,9 +158,10 @@ Drwline<-function(...) { varargin<-list(...) Nall<-length(varargin) - Thick<-0 + Thick<- 0 Tmp<-varargin[[Nall]] if (mode(Tmp)=="numeric" && length(Tmp)==1){ + Thick<- PenThick/PenThickInit #191106 Setpen(Tmp) Nall<-Nall-1 } @@ -203,8 +208,7 @@ Drwline<-function(...) } } if (Thick>0){ - Tmp<-PenThick/PenThickInit - Setpen(Tmp) + Setpen(Thick) #191106 } } diff --git a/Master/texmf-dist/scripts/ketcindy/ketlib/ketpiccurrent_reptikz.r b/Master/texmf-dist/scripts/ketcindy/ketlib/ketpiccurrent_reptikz.r index c68ccc5e83e..673d457e780 100644 --- a/Master/texmf-dist/scripts/ketcindy/ketlib/ketpiccurrent_reptikz.r +++ b/Master/texmf-dist/scripts/ketcindy/ketlib/ketpiccurrent_reptikz.r @@ -16,8 +16,12 @@ ######################################### -ThisVersion<- "tikzv1_1_1(190402)" +ThisVersion<- "tikzv1_1_1(191126)" +# 20191126 +# Drwpt debugged/changed +# 20191104 +# Dotteline changed (Ookisa 2->1/0.075) # 2019.04.05 Drwpt ( Incolor, Takato) # 2019.04.02 Beginpicture ( Unitlen, Takato) # 2019.04.02 Drwline ( Sepen restore when finished, Takato) @@ -248,7 +252,7 @@ Dottedline<- function(...) varargin <- list(...) Nall <- length(varargin) Nagasa <- 0.1 - Ookisa <- PenThick*2 #17.10.07 + Ookisa <- PenThick*1/0.075 #2 #171007,191104(1/0.075) I <- Nall Tmp <- varargin[[I]] while (mode(Tmp)=="numeric" && length(Tmp)==1 ) { @@ -503,24 +507,23 @@ Drwpt<-function(...) #181230 P<- Doscaling(P) X=sprintf('%5.5f',P[1]) Y=sprintf('%5.5f',P[2]) - if(Same!="no"){ #190405from - Str=paste("{\\linethickness{0 in}",Incolor,sep="") - } - if(Same!="no"){ #190405from - Str=paste("{\\linethickness{0 in}%\n",sep="") - cat(Str,file=Wfile,append=TRUE) - if(Same=="n"){ #190405 - Str1<- paste("{\\color[rgb]",Incolor,"%\n",sep="") - cat(Str1,file=Wfile,append=TRUE) - } - Str=paste('\\put(',X,',',Y,'){\\circle*{',sprintf('%6.6f',Ra),'}}%\n',sep="") - cat(Str,file=Wfile,append=TRUE) - if(Same=="n"){ - cat("}%\n",file=Wfile,append=TRUE) + Str1<- paste("{\\color[rgb]",Incolor,"%\n",sep="") + cat(Str1,file=Wfile,append=TRUE) + Str=paste('\\fill (',X,',',Y,') circle [radius=',sprintf('%6.6f',Ra/2),'];%\n',sep="") + #191126 + cat(Str,file=Wfile,append=TRUE) + cat("}%\n",file=Wfile,append=TRUE) + Str=paste('\\draw [line width=','0.008','in]',sep="") + for(J in 0:24){ + Tmp1=sprintf('%6.6f',P[1]+Ra/2*cos(J*2*pi/24)) + Tmp2=sprintf('%6.6f',P[2]+Ra/2*sin(J*2*pi/24)) + Str=paste(Str,"(",Tmp1,",",Tmp2,")",sep=""); + if(J<24){ + Str=paste(Str,"--",sep="") + }else{ + Str=paste(Str,";%\n",sep="") } - cat("}%\n",file=Wfile,append=TRUE) } - Str=paste('\\put(',X,',',Y,'){\\circle{',sprintf('%6.6f',Ra),'}}%\n',sep="") cat(Str,file=Wfile,append=TRUE) } } # 190405to diff --git a/Master/texmf-dist/scripts/ketcindy/ketoutset.txt b/Master/texmf-dist/scripts/ketcindy/ketoutset.txt index 5fb93561f50..b553658f6c2 100644 --- a/Master/texmf-dist/scripts/ketcindy/ketoutset.txt +++ b/Master/texmf-dist/scripts/ketcindy/ketoutset.txt @@ -1,7 +1,6 @@ if(!isstring(PathThead), PathThead=""; ); -PathT=PathThead+"uplatex"; if(iswindows(), PathS="C:\Program Files\scilab-6.0.0\bin\scilex"; PathC="C:\MinGW\bin\gcc.exe"; @@ -37,10 +36,10 @@ if(islinux(), PathAd="acroread"; ); -if(indexof(PathT,"platex")>0, - Helplist(["+","+3d","+mv"],"helpJ"); -, +if(Langhelp=="e", Helplist(["+","+3d","+mv"],"helpE"); +, + Helplist(["+","+3d","+mv"],"helpJ"); ); setdirectory(Dircdy); |