diff options
| author | Karl Berry <karl@freefriends.org> | 2018-05-31 21:29:23 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2018-05-31 21:29:23 +0000 |
| commit | d6e7660de561375d1c5ac7689c1bc64a6e838fed (patch) | |
| tree | db0d0bded89e35a7321f0c5363ec6db0a56c608e /Master/texmf-dist/doc/latex/visualtikz | |
| parent | f0f17bdc41dd87d1ccf27aab79a0e78759d4a2eb (diff) | |
visualtikz (31may18)
git-svn-id: svn://tug.org/texlive/trunk@47888 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/latex/visualtikz')
57 files changed, 6471 insertions, 1110 deletions
diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/Classeur1.csv b/Master/texmf-dist/doc/latex/visualtikz/Source/Classeur1.csv new file mode 100644 index 00000000000..9fe9d024af6 --- /dev/null +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/Classeur1.csv @@ -0,0 +1,994 @@ +x,y +0,0 +0.08,0 +0.16,0 +0.24,0 +0.32,0 +0.4,0 +0.48,0 +0.56,0 +0.64,0 +0.72,0 +0.8,0 +0.88,0 +0.96,0 +1.04,0 +1.12,0 +1.2,0 +1.28,0 +1.36,0 +1.44,0 +1.52,0 +1.6,0 +1.68,0 +1.76,0 +1.84,0 +1.92,0 +2,0 +2.08,0 +2.16,0 +2.24,0 +2.32,0 +2.4,0 +2.48,0 +2.56,0 +2.64,0 +2.72,0 +2.8,0 +2.88,0 +2.96,0 +3.04,0.047430083 +3.12,0.070863178 +3.2,0.094110295 +3.28,0.117172912 +3.36,0.140052492 +3.44,0.162750488 +3.52,0.185268341 +3.6,0.207607482 +3.68,0.229769327 +3.76,0.251755285 +3.84,0.273566751 +3.92,0.29520511 +4,0.316671736 +4.08,0.337967992 +4.16,0.35909523 +4.24,0.380054792 +4.32,0.400848008 +4.4,0.421476198 +4.48,0.441940673 +4.56,0.462242731 +4.64,0.482383662 +4.72,0.502364744 +4.8,0.522187246 +4.88,0.541852426 +4.96,0.561361534 +5.04,0.580715808 +5.12,0.599916476 +5.2,0.618964758 +5.28,0.637861863 +5.36,0.656608991 +5.44,0.675207332 +5.52,0.693658068 +5.6,0.711962369 +5.68,0.730121398 +5.76,0.748136307 +5.84,0.766008241 +5.92,0.783738335 +6,0.801327713 +6.08,0.817648205 +6.16,0.833281239 +6.24,0.848236698 +6.32,0.862524354 +6.4,0.876153863 +6.48,0.889134773 +6.56,0.901476521 +6.64,0.913188434 +6.72,0.924279732 +6.8,0.934759529 +6.88,0.944636832 +6.96,0.953920545 +7.04,0.962619468 +7.12,0.970742298 +7.2,0.978297631 +7.28,0.985293964 +7.36,0.991739695 +7.44,0.997643121 +7.52,1.003012445 +7.6,1.007855773 +7.68,1.012181117 +7.76,1.015996392 +7.84,1.019309422 +7.92,1.022127941 +8,1.024459587 +8.08,1.026311912 +8.16,1.027692378 +8.24,1.028608357 +8.32,1.029067135 +8.4,1.029075912 +8.48,1.028641802 +8.56,1.027771833 +8.64,1.026472953 +8.72,1.024752023 +8.8,1.022615825 +8.88,1.020071059 +8.96,1.017124344 +9.04,1.013782221 +9.12,1.01007804 +9.2,1.006031042 +9.28,1.001660081 +9.36,0.996983627 +9.44,0.992019776 +9.52,0.986786252 +9.6,0.981300412 +9.68,0.975579255 +9.76,0.969639426 +9.84,0.96349722 +9.92,0.957168587 +10,0.950669141 +10.08,0.94401416 +10.16,0.937218597 +10.24,0.930297077 +10.32,0.92326391 +10.4,0.916133093 +10.48,0.908918312 +10.56,0.901632949 +10.64,0.89429009 +10.72,0.886902523 +10.8,0.879482748 +10.88,0.872042978 +10.96,0.864595146 +11.04,0.857150909 +11.12,0.849721649 +11.2,0.842318485 +11.28,0.834952266 +11.36,0.827633586 +11.44,0.820372782 +11.52,0.813179939 +11.6,0.806064896 +11.68,0.799037247 +11.76,0.792106348 +11.84,0.785281317 +11.92,0.778571044 +12,0.771984186 +12.08,0.765529179 +12.16,0.759213597 +12.24,0.753044496 +12.32,0.747028427 +12.4,0.741171448 +12.48,0.735479141 +12.56,0.729956618 +12.64,0.724608539 +12.72,0.719439124 +12.8,0.714452161 +12.88,0.709651019 +12.96,0.705038664 +13.04,0.700617663 +13.12,0.696390202 +13.2,0.692358091 +13.28,0.688522779 +13.36,0.684885362 +13.44,0.681446595 +13.52,0.6782069 +13.6,0.675166378 +13.68,0.672324818 +13.76,0.669681704 +13.84,0.667236228 +13.92,0.664987298 +14,0.662933546 +14.08,0.661073338 +14.16,0.65940478 +14.24,0.65792573 +14.32,0.656633805 +14.4,0.655526388 +14.48,0.654600636 +14.56,0.65385349 +14.64,0.653281679 +14.72,0.652881731 +14.8,0.652649979 +14.88,0.652582567 +14.96,0.652675458 +15.04,0.652924442 +15.12,0.653325141 +15.2,0.65387303 +15.28,0.654563455 +15.36,0.655391639 +15.44,0.656352703 +15.52,0.65744167 +15.6,0.658653484 +15.68,0.659983014 +15.76,0.661425075 +15.84,0.662974428 +15.92,0.664625797 +16,0.666373878 +16.08,0.668213347 +16.16,0.670138871 +16.24,0.672145116 +16.32,0.674226755 +16.4,0.676378479 +16.48,0.678595001 +16.56,0.680871067 +16.64,0.683201462 +16.72,0.685581018 +16.8,0.68800462 +16.88,0.690467213 +16.96,0.692963807 +17.04,0.695489486 +17.12,0.698039411 +17.2,0.700608826 +17.28,0.703193064 +17.36,0.705787552 +17.44,0.708387816 +17.52,0.710989485 +17.6,0.713588295 +17.68,0.716180094 +17.76,0.718760845 +17.84,0.721326633 +17.92,0.723873662 +18,0.726398265 +18.08,0.728896903 +18.16,0.73136617 +18.24,0.733802795 +18.32,0.736203643 +18.4,0.738565718 +18.48,0.740886164 +18.56,0.743162266 +18.64,0.74539145 +18.72,0.747571288 +18.8,0.74969949 +18.88,0.751773912 +18.96,0.753792553 +19.04,0.755753551 +19.12,0.75765519 +19.2,0.75949589 +19.28,0.761274213 +19.36,0.76298886 +19.44,0.764638667 +19.52,0.766222606 +19.6,0.767739782 +19.68,0.769189432 +19.76,0.77057092 +19.84,0.771883739 +19.92,0.773127506 +20,0.774301959 +20.08,0.775406956 +20.16,0.77644247 +20.24,0.77740859 +20.32,0.778305512 +20.4,0.779133542 +20.48,0.77989309 +20.56,0.780584665 +20.64,0.781208875 +20.72,0.781766422 +20.8,0.782258096 +20.88,0.782684779 +20.96,0.783047432 +21.04,0.783347097 +21.12,0.783584892 +21.2,0.783762008 +21.28,0.783879703 +21.36,0.783939301 +21.44,0.783942186 +21.52,0.7838898 +21.6,0.783783637 +21.68,0.78362524 +21.76,0.783416199 +21.84,0.783158146 +21.92,0.78285275 +22,0.782501715 +22.08,0.782106776 +22.16,0.781669694 +22.24,0.781192255 +22.32,0.780676263 +22.4,0.780123542 +22.48,0.779535927 +22.56,0.778915262 +22.64,0.7782634 +22.72,0.777582196 +22.8,0.776873506 +22.88,0.776139183 +22.96,0.775381074 +23.04,0.774601019 +23.12,0.773800845 +23.2,0.772982367 +23.28,0.772147382 +23.36,0.771297668 +23.44,0.770434983 +23.52,0.769561061 +23.6,0.768677608 +23.68,0.767786305 +23.76,0.7668888 +23.84,0.765986712 +23.92,0.765081624 +24,0.764175085 +24.08,0.763268606 +24.16,0.762363659 +24.24,0.761461678 +24.32,0.760564053 +24.4,0.759672132 +24.48,0.758787222 +24.56,0.757910582 +24.64,0.757043427 +24.72,0.756186926 +24.8,0.7553422 +24.88,0.754510322 +24.96,0.753692317 +25.04,0.752889163 +25.12,0.752101786 +25.2,0.751331065 +25.28,0.750577828 +25.36,0.749842855 +25.44,0.749126875 +25.52,0.748430568 +25.6,0.747754565 +25.68,0.747099448 +25.76,0.746465749 +25.84,0.745853954 +25.92,0.745264497 +26,0.744697769 +26.08,0.744154112 +26.16,0.743633821 +26.24,0.743137147 +26.32,0.742664295 +26.4,0.742215428 +26.48,0.741790663 +26.56,0.741390077 +26.64,0.741013705 +26.72,0.740661541 +26.8,0.740333542 +26.88,0.740029624 +26.96,0.739749667 +27.04,0.739493517 +27.12,0.739260983 +27.2,0.73905184 +27.28,0.738865833 +27.36,0.738702675 +27.44,0.738562047 +27.52,0.738443605 +27.6,0.738346975 +27.68,0.738271759 +27.76,0.738217532 +27.84,0.738183849 +27.92,0.738170239 +28,0.738176214 +28.08,0.738201264 +28.16,0.738244862 +28.24,0.738306465 +28.32,0.738385513 +28.4,0.738481433 +28.48,0.738593639 +28.56,0.738721533 +28.64,0.738864507 +28.72,0.739021945 +28.8,0.739193221 +28.88,0.739377704 +28.96,0.739574758 +29.04,0.739783742 +29.12,0.740004011 +29.2,0.74023492 +29.28,0.740475822 +29.36,0.74072607 +29.44,0.74098502 +29.52,0.741252028 +29.6,0.741526454 +29.68,0.741807664 +29.76,0.742095027 +29.84,0.742387919 +29.92,0.742685722 +30,0.742987827 +30.08,0.743293634 +30.16,0.74360255 +30.24,0.743913994 +30.32,0.744227395 +30.4,0.744542193 +30.48,0.744857841 +30.56,0.745173804 +30.64,0.74548956 +30.72,0.745804601 +30.8,0.746118433 +30.88,0.746430576 +30.96,0.746740566 +31.04,0.747047953 +31.12,0.747352304 +31.2,0.747653202 +31.28,0.747950245 +31.36,0.748243048 +31.44,0.748531244 +31.52,0.748814481 +31.6,0.749092424 +31.68,0.749364758 +31.76,0.749631182 +31.84,0.749891413 +31.92,0.750145187 +32,0.750392255 +32.08,0.750632386 +32.16,0.750865367 +32.24,0.751091001 +32.32,0.751309108 +32.4,0.751519526 +32.48,0.751722109 +32.56,0.751916726 +32.64,0.752103265 +32.72,0.752281628 +32.8,0.752451734 +32.88,0.752613516 +32.96,0.752766923 +33.04,0.75291192 +33.12,0.753048485 +33.2,0.75317661 +33.28,0.753296304 +33.36,0.753407586 +33.44,0.753510489 +33.52,0.753605061 +33.6,0.753691359 +33.68,0.753769454 +33.76,0.753839428 +33.84,0.753901374 +33.92,0.753955397 +34,0.754001611 +34.08,0.754040139 +34.16,0.754071115 +34.24,0.75409468 +34.32,0.754110987 +34.4,0.754120192 +34.48,0.754122462 +34.56,0.754117971 +34.64,0.754106898 +34.72,0.754089428 +34.8,0.754065754 +34.88,0.754036071 +34.96,0.754000582 +35.04,0.753959492 +35.12,0.753913011 +35.2,0.753861351 +35.28,0.753804729 +35.36,0.753743364 +35.44,0.753677475 +35.52,0.753607286 +35.6,0.753533021 +35.68,0.753454903 +35.76,0.753373159 +35.84,0.753288013 +35.92,0.753199691 +36,0.753108418 +36.08,0.753014416 +36.16,0.752917909 +36.24,0.752819118 +36.32,0.75271826 +36.4,0.752615554 +36.48,0.752511213 +36.56,0.752405447 +36.64,0.752298467 +36.72,0.752190476 +36.8,0.752081677 +36.88,0.751972266 +36.96,0.751862437 +37.04,0.751752379 +37.12,0.751642277 +37.2,0.751532312 +37.28,0.751422659 +37.36,0.751313487 +37.44,0.751204963 +37.52,0.751097246 +37.6,0.75099049 +37.68,0.750884846 +37.76,0.750780456 +37.84,0.750677458 +37.92,0.750575985 +38,0.750476162 +38.08,0.750378109 +38.16,0.750281941 +38.24,0.750187766 +38.32,0.750095687 +38.4,0.7500058 +38.48,0.749918195 +38.56,0.749832957 +38.64,0.749750163 +38.72,0.749669886 +38.8,0.749592193 +38.88,0.749517143 +38.96,0.749444793 +39.04,0.749375189 +39.12,0.749308376 +39.2,0.749244391 +39.28,0.749183266 +39.36,0.749125028 +39.44,0.749069697 +39.52,0.749017289 +39.6,0.748967816 +39.68,0.748921283 +39.76,0.74887769 +39.84,0.748837033 +39.92,0.748799304 +40,0.74876449 +40.08,0.748732572 +40.16,0.748703529 +40.24,0.748677335 +40.32,0.74865396 +40.4,0.748633369 +40.48,0.748615526 +40.56,0.748600389 +40.64,0.748587914 +40.72,0.748578053 +40.8,0.748570756 +40.88,0.748565969 +40.96,0.748563636 +41.04,0.748563699 +41.12,0.748566096 +41.2,0.748570763 +41.28,0.748577635 +41.36,0.748586646 +41.44,0.748597725 +41.52,0.748610802 +41.6,0.748625804 +41.68,0.748642659 +41.76,0.748661291 +41.84,0.748681626 +41.92,0.748703586 +42,0.748727094 +42.08,0.748752073 +42.16,0.748778444 +42.24,0.74880613 +42.32,0.748835051 +42.4,0.748865129 +42.48,0.748896286 +42.56,0.748928444 +42.64,0.748961524 +42.72,0.74899545 +42.8,0.749030144 +42.88,0.749065531 +42.96,0.749101535 +43.04,0.749138083 +43.12,0.7491751 +43.2,0.749212516 +43.28,0.749250257 +43.36,0.749288256 +43.44,0.749326444 +43.52,0.749364753 +43.6,0.749403119 +43.68,0.749441477 +43.76,0.749479766 +43.84,0.749517924 +43.92,0.749555894 +44,0.749593618 +44.08,0.749631041 +44.16,0.749668109 +44.24,0.749704773 +44.32,0.749740982 +44.4,0.749776689 +44.48,0.749811849 +44.56,0.749846418 +44.64,0.749880356 +44.72,0.749913623 +44.8,0.749946183 +44.88,0.749978 +44.96,0.750009041 +45.04,0.750039277 +45.12,0.750068678 +45.2,0.750097217 +45.28,0.750124871 +45.36,0.750151617 +45.44,0.750177434 +45.52,0.750202305 +45.6,0.750226213 +45.68,0.750249143 +45.76,0.750271084 +45.84,0.750292024 +45.92,0.750311956 +46,0.750330872 +46.08,0.750348768 +46.16,0.75036564 +46.24,0.750381488 +46.32,0.750396311 +46.4,0.750410112 +46.48,0.750422894 +46.56,0.750434663 +46.64,0.750445425 +46.72,0.750455188 +46.8,0.750463962 +46.88,0.750471757 +46.96,0.750478587 +47.04,0.750484465 +47.12,0.750489404 +47.2,0.750493422 +47.28,0.750496536 +47.36,0.750498762 +47.44,0.75050012 +47.52,0.750500631 +47.6,0.750500314 +47.68,0.750499192 +47.76,0.750497287 +47.84,0.750494622 +47.92,0.75049122 +48,0.750487106 +48.08,0.750482305 +48.16,0.750476842 +48.24,0.750470743 +48.32,0.750464034 +48.4,0.750456741 +48.48,0.750448891 +48.56,0.750440512 +48.64,0.75043163 +48.72,0.750422272 +48.8,0.750412467 +48.88,0.75040224 +48.96,0.75039162 +49.04,0.750380634 +49.12,0.750369309 +49.2,0.750357673 +49.28,0.750345751 +49.36,0.750333571 +49.44,0.750321159 +49.52,0.750308541 +49.6,0.750295743 +49.68,0.750282791 +49.76,0.750269708 +49.84,0.750256521 +49.92,0.750243253 +50,0.750229928 +50.08,0.750216568 +50.16,0.750203197 +50.24,0.750189836 +50.32,0.750176507 +50.4,0.750163231 +50.48,0.750150028 +50.56,0.750136917 +50.64,0.750123918 +50.72,0.750111049 +50.8,0.750098328 +50.88,0.750085771 +50.96,0.750073394 +51.04,0.750061214 +51.12,0.750049245 +51.2,0.7500375 +51.28,0.750025995 +51.36,0.75001474 +51.44,0.750003748 +51.52,0.74999303 +51.6,0.749982597 +51.68,0.749972459 +51.76,0.749962623 +51.84,0.749953099 +51.92,0.749943894 +52,0.749935015 +52.08,0.749926468 +52.16,0.749918259 +52.24,0.749910391 +52.32,0.74990287 +52.4,0.749895699 +52.48,0.74988888 +52.56,0.749882416 +52.64,0.749876308 +52.72,0.749870556 +52.8,0.749865162 +52.88,0.749860125 +52.96,0.749855443 +53.04,0.749851116 +53.12,0.749847141 +53.2,0.749843516 +53.28,0.749840238 +53.36,0.749837304 +53.44,0.749834708 +53.52,0.749832448 +53.6,0.749830518 +53.68,0.749828913 +53.76,0.749827626 +53.84,0.749826653 +53.92,0.749825987 +54,0.749825621 +54.08,0.749825547 +54.16,0.749825759 +54.24,0.749826249 +54.32,0.749827009 +54.4,0.749828031 +54.48,0.749829307 +54.56,0.749830827 +54.64,0.749832584 +54.72,0.749834569 +54.8,0.749836772 +54.88,0.749839184 +54.96,0.749841796 +55.04,0.749844599 +55.12,0.749847583 +55.2,0.749850739 +55.28,0.749854057 +55.36,0.749857528 +55.44,0.749861142 +55.52,0.74986489 +55.6,0.749868762 +55.68,0.749872748 +55.76,0.74987684 +55.84,0.749881028 +55.92,0.749885303 +56,0.749889655 +56.08,0.749894075 +56.16,0.749898556 +56.24,0.749903086 +56.32,0.749907659 +56.4,0.749912266 +56.48,0.749916898 +56.56,0.749921547 +56.64,0.749926205 +56.72,0.749930864 +56.8,0.749935517 +56.88,0.749940156 +56.96,0.749944774 +57.04,0.749949364 +57.12,0.74995392 +57.2,0.749958434 +57.28,0.749962901 +57.36,0.749967314 +57.44,0.749971668 +57.52,0.749975957 +57.6,0.749980176 +57.68,0.749984319 +57.76,0.749988382 +57.84,0.749992361 +57.92,0.749996251 +58,0.750000047 +58.08,0.750003747 +58.16,0.750007346 +58.24,0.750010841 +58.32,0.75001423 +58.4,0.75001751 +58.48,0.750020677 +58.56,0.75002373 +58.64,0.750026666 +58.72,0.750029484 +58.8,0.750032182 +58.88,0.75003476 +58.96,0.750037215 +59.04,0.750039547 +59.12,0.750041755 +59.2,0.750043839 +59.28,0.750045798 +59.36,0.750047633 +59.44,0.750049344 +59.52,0.750050931 +59.6,0.750052395 +59.68,0.750053736 +59.76,0.750054956 +59.84,0.750056055 +59.92,0.750057035 +60,0.750057897 +60.08,0.750058643 +60.16,0.750059275 +60.24,0.750059794 +60.32,0.750060203 +60.4,0.750060503 +60.48,0.750060698 +60.56,0.750060789 +60.64,0.750060778 +60.72,0.750060669 +60.8,0.750060464 +60.88,0.750060166 +60.96,0.750059778 +61.04,0.750059302 +61.12,0.750058743 +61.2,0.750058101 +61.28,0.750057382 +61.36,0.750056588 +61.44,0.750055722 +61.52,0.750054787 +61.6,0.750053788 +61.68,0.750052726 +61.76,0.750051605 +61.84,0.75005043 +61.92,0.750049202 +62,0.750047925 +62.08,0.750046603 +62.16,0.750045239 +62.24,0.750043836 +62.32,0.750042398 +62.4,0.750040927 +62.48,0.750039428 +62.56,0.750037902 +62.64,0.750036354 +62.72,0.750034786 +62.8,0.750033201 +62.88,0.750031603 +62.96,0.750029994 +63.04,0.750028378 +63.12,0.750026756 +63.2,0.750025133 +63.28,0.75002351 +63.36,0.75002189 +63.44,0.750020275 +63.52,0.750018669 +63.6,0.750017074 +63.68,0.750015491 +63.76,0.750013924 +63.84,0.750012373 +63.92,0.750010843 +64,0.750009333 +64.08,0.750007847 +64.16,0.750006386 +64.24,0.750004952 +64.32,0.750003547 +64.4,0.750002171 +64.48,0.750000827 +64.56,0.749999516 +64.64,0.74999824 +64.72,0.749996998 +64.8,0.749995793 +64.88,0.749994626 +64.96,0.749993497 +65.04,0.749992408 +65.12,0.749991358 +65.2,0.74999035 +65.28,0.749989383 +65.36,0.749988457 +65.44,0.749987575 +65.52,0.749986734 +65.6,0.749985937 +65.68,0.749985183 +65.76,0.749984473 +65.84,0.749983805 +65.92,0.749983182 +66,0.749982601 +66.08,0.749982063 +66.16,0.749981569 +66.24,0.749981116 +66.32,0.749980707 +66.4,0.749980339 +66.48,0.749980012 +66.56,0.749979726 +66.64,0.74997948 +66.72,0.749979274 +66.8,0.749979107 +66.88,0.749978979 +66.96,0.749978887 +67.04,0.749978833 +67.12,0.749978814 +67.2,0.74997883 +67.28,0.74997888 +67.36,0.749978963 +67.44,0.749979078 +67.52,0.749979225 +67.6,0.749979401 +67.68,0.749979606 +67.76,0.74997984 +67.84,0.7499801 +67.92,0.749980386 +68,0.749980696 +68.08,0.74998103 +68.16,0.749981387 +68.24,0.749981764 +68.32,0.749982162 +68.4,0.749982578 +68.48,0.749983012 +68.56,0.749983463 +68.64,0.749983929 +68.72,0.749984409 +68.8,0.749984903 +68.88,0.749985408 +68.96,0.749985924 +69.04,0.74998645 +69.12,0.749986985 +69.2,0.749987527 +69.28,0.749988076 +69.36,0.74998863 +69.44,0.749989188 +69.52,0.74998975 +69.6,0.749990314 +69.68,0.749990879 +69.76,0.749991445 +69.84,0.74999201 +69.92,0.749992574 +70,0.749993136 +70.08,0.749993694 +70.16,0.749994249 +70.24,0.749994799 +70.32,0.749995343 +70.4,0.749995881 +70.48,0.749996411 +70.56,0.749996935 +70.64,0.749997449 +70.72,0.749997955 +70.8,0.749998451 +70.88,0.749998937 +70.96,0.749999413 +71.04,0.749999877 +71.12,0.75000033 +71.2,0.75000077 +71.28,0.750001198 +71.36,0.750001614 +71.44,0.750002016 +71.52,0.750002404 +71.6,0.750002779 +71.68,0.750003139 +71.76,0.750003486 +71.84,0.750003817 +71.92,0.750004135 +72,0.750004437 +72.08,0.750004724 +72.16,0.750004997 +72.24,0.750005254 +72.32,0.750005496 +72.4,0.750005723 +72.48,0.750005935 +72.56,0.750006132 +72.64,0.750006314 +72.72,0.750006481 +72.8,0.750006634 +72.88,0.750006771 +72.96,0.750006894 +73.04,0.750007003 +73.12,0.750007097 +73.2,0.750007178 +73.28,0.750007245 +73.36,0.750007298 +73.44,0.750007338 +73.52,0.750007366 +73.6,0.75000738 +73.68,0.750007382 +73.76,0.750007372 +73.84,0.750007351 +73.92,0.750007318 +74,0.750007274 +74.08,0.750007219 +74.16,0.750007154 +74.24,0.750007079 +74.32,0.750006994 +74.4,0.7500069 +74.48,0.750006797 +74.56,0.750006686 +74.64,0.750006567 +74.72,0.75000644 +74.8,0.750006306 +74.88,0.750006165 +74.96,0.750006018 +75.04,0.750005864 +75.12,0.750005705 +75.2,0.750005541 +75.28,0.750005372 +75.36,0.750005198 +75.44,0.750005021 +75.52,0.75000484 +75.6,0.750004655 +75.68,0.750004468 +75.76,0.750004278 +75.84,0.750004086 +75.92,0.750003893 +76,0.750003698 +76.08,0.750003501 +76.16,0.750003305 +76.24,0.750003108 +76.32,0.75000291 +76.4,0.750002714 +76.48,0.750002517 +76.56,0.750002322 +76.64,0.750002128 +76.72,0.750001935 +76.8,0.750001744 +76.88,0.750001555 +76.96,0.750001369 +77.04,0.750001185 +77.12,0.750001003 +77.2,0.750000825 +77.28,0.75000065 +77.36,0.750000478 +77.44,0.75000031 +77.52,0.750000146 +77.6,0.749999986 +77.68,0.749999829 +77.76,0.749999677 +77.84,0.74999953 +77.92,0.749999387 +78,0.749999248 +78.08,0.749999115 +78.16,0.749998986 +78.24,0.749998862 +78.32,0.749998743 +78.4,0.749998629 +78.48,0.749998521 +78.56,0.749998417 +78.64,0.749998319 +78.72,0.749998226 +78.8,0.749998138 +78.88,0.749998056 +78.96,0.749997978 +79.04,0.749997906 +79.12,0.74999784 +79.2,0.749997778 +79.28,0.749997722 +79.36,0.749997671 diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/Classeur2.csv b/Master/texmf-dist/doc/latex/visualtikz/Source/Classeur2.csv new file mode 100644 index 00000000000..ab71060f7c7 --- /dev/null +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/Classeur2.csv @@ -0,0 +1,994 @@ +x ,y +0,0 +0.08,0 +0.16,0 +0.24,0 +0.32,0 +0.4,0 +0.48,0 +0.56,0 +0.64,0 +0.72,0 +0.8,0 +0.88,0 +0.96,0 +1.04,0 +1.12,0 +1.2,0 +1.28,0 +1.36,0 +1.44,0 +1.52,0 +1.6,0 +1.68,0 +1.76,0 +1.84,0 +1.92,0 +2,0 +2.08,0 +2.16,0 +2.24,0 +2.32,0 +2.4,0 +2.48,0 +2.56,0 +2.64,0 +2.72,0 +2.8,0 +2.88,0 +2.96,0 +3.04,0.474300831 +3.12,0.708631777 +3.2,0.941102954 +3.28,1.171729121 +3.36,1.400524921 +3.44,1.627504882 +3.52,1.852683415 +3.6,2.076074816 +3.68,2.29769327 +3.76,2.517552847 +3.84,2.735667507 +3.92,2.952051099 +4,3.16671736 +4.08,3.37967992 +4.16,3.590952302 +4.24,3.800547919 +4.32,4.008480078 +4.4,4.214761982 +4.48,4.419406728 +4.56,4.62242731 +4.64,4.823836617 +4.72,5.023647437 +4.8,5.221872458 +4.88,5.418524264 +4.96,5.613615341 +5.04,5.807158076 +5.12,5.999164758 +5.2,6.189647578 +5.28,6.378618629 +5.36,6.566089909 +5.44,6.752073323 +5.52,6.936580677 +5.6,7.119623688 +5.68,7.301213976 +5.76,7.481363071 +5.84,7.660082412 +5.92,7.837383345 +6,8.013277128 +6.08,8.176482052 +6.16,8.33281239 +6.24,8.482366983 +6.32,8.625243536 +6.4,8.761538629 +6.48,8.89134773 +6.56,9.014765206 +6.64,9.131884336 +6.72,9.242797319 +6.8,9.347595288 +6.88,9.446368322 +6.96,9.539205452 +7.04,9.626194678 +7.12,9.707422976 +7.2,9.78297631 +7.28,9.852939643 +7.36,9.917396945 +7.44,9.976431208 +7.52,10.03012445 +7.6,10.07855773 +7.68,10.12181117 +7.76,10.15996392 +7.84,10.19309422 +7.92,10.22127941 +8,10.24459587 +8.08,10.26311912 +8.16,10.27692378 +8.24,10.28608357 +8.32,10.29067135 +8.4,10.29075912 +8.48,10.28641802 +8.56,10.27771833 +8.64,10.26472953 +8.72,10.24752023 +8.8,10.22615825 +8.88,10.20071059 +8.96,10.17124344 +9.04,10.13782221 +9.12,10.1007804 +9.2,10.06031042 +9.28,10.01660081 +9.36,9.96983627 +9.44,9.920197761 +9.52,9.867862515 +9.6,9.813004117 +9.68,9.755792553 +9.76,9.696394263 +9.84,9.634972199 +9.92,9.571685872 +10,9.50669141 +10.08,9.440141605 +10.16,9.372185966 +10.24,9.302970768 +10.32,9.232639104 +10.4,9.16133093 +10.48,9.089183116 +10.56,9.016329493 +10.64,8.9429009 +10.72,8.86902523 +10.8,8.794827476 +10.88,8.720429777 +10.96,8.645951459 +11.04,8.571509086 +11.12,8.497216495 +11.2,8.423184846 +11.28,8.349522659 +11.36,8.276335859 +11.44,8.203727818 +11.52,8.13179939 +11.6,8.060648959 +11.68,7.99037247 +11.76,7.921063477 +11.84,7.852813173 +11.92,7.785710436 +12,7.719841858 +12.08,7.655291791 +12.16,7.592135974 +12.24,7.530444964 +12.32,7.47028427 +12.4,7.411714484 +12.48,7.354791406 +12.56,7.299566177 +12.64,7.246085395 +12.72,7.194391243 +12.8,7.144521608 +12.88,7.096510194 +12.96,7.05038664 +13.04,7.006176633 +13.12,6.963902018 +13.2,6.923580908 +13.28,6.885227787 +13.36,6.84885362 +13.44,6.81446595 +13.52,6.782069003 +13.6,6.751663785 +13.68,6.723248178 +13.76,6.696817036 +13.84,6.672362278 +13.92,6.64987298 +14,6.629335461 +14.08,6.610733376 +14.16,6.594047798 +14.24,6.579257303 +14.32,6.566338055 +14.4,6.555263883 +14.48,6.546006365 +14.56,6.5385349 +14.64,6.532816791 +14.72,6.528817313 +14.8,6.526499791 +14.88,6.52582567 +14.96,6.526754583 +15.04,6.529244423 +15.12,6.533251408 +15.2,6.538730303 +15.28,6.545634547 +15.36,6.553916393 +15.44,6.56352703 +15.52,6.574416702 +15.6,6.586534835 +15.68,6.599830145 +15.76,6.614250749 +15.84,6.629744276 +15.92,6.646257968 +16,6.663738778 +16.08,6.682133471 +16.16,6.701388713 +16.24,6.721451162 +16.32,6.742267555 +16.4,6.763784789 +16.48,6.785950006 +16.56,6.808710665 +16.64,6.832014617 +16.72,6.85581018 +16.8,6.880046201 +16.88,6.904672129 +16.96,6.929638073 +17.04,6.954894863 +17.12,6.980394109 +17.2,7.006088256 +17.28,7.031930636 +17.36,7.057875518 +17.44,7.08387816 +17.52,7.109894848 +17.6,7.135882947 +17.68,7.161800937 +17.76,7.187608454 +17.84,7.213266328 +17.92,7.238736619 +18,7.263982648 +18.08,7.288969029 +18.16,7.313661702 +18.24,7.338027951 +18.32,7.362036431 +18.4,7.38565718 +18.48,7.408861638 +18.56,7.431622656 +18.64,7.453914504 +18.72,7.475712877 +18.8,7.4969949 +18.88,7.517739124 +18.96,7.537925529 +19.04,7.557535514 +19.12,7.576551896 +19.2,7.594958895 +19.28,7.61274213 +19.36,7.6298886 +19.44,7.646386672 +19.52,7.662226063 +19.6,7.677397825 +19.68,7.691894319 +19.76,7.705709202 +19.84,7.718837394 +19.92,7.731275062 +20,7.743019591 +20.08,7.754069558 +20.16,7.764424702 +20.24,7.774085897 +20.32,7.78305512 +20.4,7.791335425 +20.48,7.798930902 +20.56,7.805846652 +20.64,7.812088751 +20.72,7.817664215 +20.8,7.822580964 +20.88,7.82684779 +20.96,7.830474317 +21.04,7.833470966 +21.12,7.835848918 +21.2,7.837620076 +21.28,7.838797029 +21.36,7.839393011 +21.44,7.839421863 +21.52,7.838898 +21.6,7.837836365 +21.68,7.836252398 +21.76,7.834161993 +21.84,7.831581464 +21.92,7.828527505 +22,7.825017155 +22.08,7.82106776 +22.16,7.816696939 +22.24,7.811922546 +22.32,7.806762633 +22.4,7.801235424 +22.48,7.795359269 +22.56,7.789152623 +22.64,7.782634003 +22.72,7.775821964 +22.8,7.768735062 +22.88,7.76139183 +22.96,7.753810743 +23.04,7.746010191 +23.12,7.738008454 +23.2,7.729823672 +23.28,7.72147382 +23.36,7.712976683 +23.44,7.704349835 +23.52,7.695610608 +23.6,7.68677608 +23.68,7.677863045 +23.76,7.668888 +23.84,7.65986712 +23.92,7.650816243 +24,7.641750853 +24.08,7.632686061 +24.16,7.623636594 +24.24,7.614616778 +24.32,7.605640525 +24.4,7.596721322 +24.48,7.58787222 +24.56,7.579105821 +24.64,7.570434274 +24.72,7.561869263 +24.8,7.553421999 +24.88,7.545103218 +24.96,7.536923173 +25.04,7.528891628 +25.12,7.521017859 +25.2,7.513310647 +25.28,7.50577828 +25.36,7.498428548 +25.44,7.491268748 +25.52,7.48430568 +25.6,7.477545652 +25.68,7.47099448 +25.76,7.464657493 +25.84,7.458539535 +25.92,7.452644971 +26,7.446977692 +26.08,7.441541119 +26.16,7.43633821 +26.24,7.43137147 +26.32,7.426642955 +26.4,7.42215428 +26.48,7.417906631 +26.56,7.41390077 +26.64,7.410137048 +26.72,7.406615412 +26.8,7.403335416 +26.88,7.400296236 +26.96,7.397496672 +27.04,7.39493517 +27.12,7.392609826 +27.2,7.390518401 +27.28,7.388658332 +27.36,7.387026745 +27.44,7.38562047 +27.52,7.384436048 +27.6,7.38346975 +27.68,7.382717587 +27.76,7.382175322 +27.84,7.381838486 +27.92,7.38170239 +28,7.381762137 +28.08,7.382012636 +28.16,7.382448619 +28.24,7.383064646 +28.32,7.383855126 +28.4,7.384814327 +28.48,7.385936386 +28.56,7.387215327 +28.64,7.38864507 +28.72,7.390219447 +28.8,7.39193221 +28.88,7.393777045 +28.96,7.395747585 +29.04,7.397837421 +29.12,7.400040113 +29.2,7.402349202 +29.28,7.404758221 +29.36,7.407260705 +29.44,7.4098502 +29.52,7.412520279 +29.6,7.415264544 +29.68,7.418076642 +29.76,7.42095027 +29.84,7.423879186 +29.92,7.426857219 +30,7.429878273 +30.08,7.432936338 +30.16,7.436025498 +30.24,7.439139937 +30.32,7.442273945 +30.4,7.445421928 +30.48,7.448578409 +30.56,7.45173804 +30.64,7.454895601 +30.72,7.458046011 +30.8,7.461184329 +30.88,7.464305759 +30.96,7.467405656 +31.04,7.470479529 +31.12,7.473523041 +31.2,7.476532018 +31.28,7.479502447 +31.36,7.48243048 +31.44,7.485312437 +31.52,7.488144805 +31.6,7.490924243 +31.68,7.493647581 +31.76,7.49631182 +31.84,7.498914134 +31.92,7.50145187 +32,7.503922547 +32.08,7.506323858 +32.16,7.508653666 +32.24,7.510910005 +32.32,7.513091079 +32.4,7.51519526 +32.48,7.517221087 +32.56,7.519167262 +32.64,7.521032652 +32.72,7.522816282 +32.8,7.524517337 +32.88,7.526135155 +32.96,7.527669228 +33.04,7.529119196 +33.12,7.530484845 +33.2,7.531766104 +33.28,7.532963042 +33.36,7.53407586 +33.44,7.535104895 +33.52,7.536050608 +33.6,7.536913586 +33.68,7.537694536 +33.76,7.538394277 +33.84,7.539013743 +33.92,7.539553973 +34,7.540016109 +34.08,7.540401389 +34.16,7.540711147 +34.24,7.540946804 +34.32,7.541109866 +34.4,7.541201919 +34.48,7.541224624 +34.56,7.541179711 +34.64,7.541068977 +34.72,7.540894281 +34.8,7.540657537 +34.88,7.540360712 +34.96,7.540005821 +35.04,7.53959492 +35.12,7.539130107 +35.2,7.538613511 +35.28,7.538047292 +35.36,7.537433637 +35.44,7.536774753 +35.52,7.536072864 +35.6,7.535330208 +35.68,7.534549032 +35.76,7.533731589 +35.84,7.532880131 +35.92,7.531996912 +36,7.531084177 +36.08,7.530144163 +36.16,7.529179094 +36.24,7.528191178 +36.32,7.527182605 +36.4,7.52615554 +36.48,7.525112125 +36.56,7.524054475 +36.64,7.522984671 +36.72,7.521904764 +36.8,7.520816768 +36.88,7.519722657 +36.96,7.518624366 +37.04,7.517523789 +37.12,7.516422774 +37.2,7.515323121 +37.28,7.514226585 +37.36,7.51313487 +37.44,7.512049626 +37.52,7.510972456 +37.6,7.509904904 +37.68,7.50884846 +37.76,7.507804561 +37.84,7.506774584 +37.92,7.505759848 +38,7.504761615 +38.08,7.503781088 +38.16,7.502819411 +38.24,7.501877665 +38.32,7.500956875 +38.4,7.500058004 +38.48,7.499181954 +38.56,7.498329569 +38.64,7.497501631 +38.72,7.496698863 +38.8,7.495921929 +38.88,7.495171435 +38.96,7.494447925 +39.04,7.49375189 +39.12,7.49308376 +39.2,7.492443911 +39.28,7.491832661 +39.36,7.491250276 +39.44,7.490696968 +39.52,7.490172893 +39.6,7.489678161 +39.68,7.489212826 +39.76,7.488776896 +39.84,7.488370331 +39.92,7.487993043 +40,7.487644899 +40.08,7.487325723 +40.16,7.487035294 +40.24,7.486773352 +40.32,7.486539597 +40.4,7.486333691 +40.48,7.486155258 +40.56,7.486003888 +40.64,7.485879137 +40.72,7.48578053 +40.8,7.48570756 +40.88,7.485659692 +40.96,7.485636365 +41.04,7.48563699 +41.12,7.485660956 +41.2,7.485707629 +41.28,7.485776355 +41.36,7.485866458 +41.44,7.485977248 +41.52,7.486108017 +41.6,7.486258043 +41.68,7.486426591 +41.76,7.486612915 +41.84,7.486816259 +41.92,7.487035857 +42,7.48727094 +42.08,7.487520728 +42.16,7.487784443 +42.24,7.488061298 +42.32,7.48835051 +42.4,7.488651293 +42.48,7.488962863 +42.56,7.489284438 +42.64,7.489615241 +42.72,7.489954497 +42.8,7.49030144 +42.88,7.490655309 +42.96,7.491015353 +43.04,7.491380829 +43.12,7.491751004 +43.2,7.492125156 +43.28,7.492502575 +43.36,7.492882564 +43.44,7.49326444 +43.52,7.493647533 +43.6,7.49403119 +43.68,7.494414773 +43.76,7.494797659 +43.84,7.495179244 +43.92,7.495558939 +44,7.495936177 +44.08,7.496310406 +44.16,7.496681094 +44.24,7.49704773 +44.32,7.497409818 +44.4,7.497766888 +44.48,7.498118487 +44.56,7.498464181 +44.64,7.498803559 +44.72,7.499136231 +44.8,7.499461827 +44.88,7.499779996 +44.96,7.500090413 +45.04,7.500392768 +45.12,7.500686776 +45.2,7.500972172 +45.28,7.501248711 +45.36,7.50151617 +45.44,7.501774344 +45.52,7.502023051 +45.6,7.502262127 +45.68,7.50249143 +45.76,7.502710835 +45.84,7.502920239 +45.92,7.503119555 +46,7.503308717 +46.08,7.503487676 +46.16,7.5036564 +46.24,7.503814878 +46.32,7.503963111 +46.4,7.50410112 +46.48,7.504228942 +46.56,7.504346628 +46.64,7.504454246 +46.72,7.504551876 +46.8,7.504639616 +46.88,7.504717573 +46.96,7.504785872 +47.04,7.504844646 +47.12,7.504894044 +47.2,7.504934224 +47.28,7.504965356 +47.36,7.504987619 +47.44,7.505001204 +47.52,7.50500631 +47.6,7.505003145 +47.68,7.504991924 +47.76,7.504972871 +47.84,7.504946218 +47.92,7.5049122 +48,7.504871062 +48.08,7.504823051 +48.16,7.504768421 +48.24,7.504707429 +48.32,7.504640338 +48.4,7.50456741 +48.48,7.504488915 +48.56,7.50440512 +48.64,7.504316299 +48.72,7.504222723 +48.8,7.504124666 +48.88,7.504022401 +48.96,7.503916202 +49.04,7.503806342 +49.12,7.503693093 +49.2,7.503576725 +49.28,7.503457508 +49.36,7.503335708 +49.44,7.503211588 +49.52,7.50308541 +49.6,7.502957432 +49.68,7.502827907 +49.76,7.502697085 +49.84,7.502565213 +49.92,7.502432531 +50,7.502299275 +50.08,7.502165678 +50.16,7.502031966 +50.24,7.501898357 +50.32,7.501765068 +50.4,7.501632307 +50.48,7.501500276 +50.56,7.501369171 +50.64,7.501239182 +50.72,7.501110492 +50.8,7.500983277 +50.88,7.500857706 +50.96,7.500733942 +51.04,7.500612139 +51.12,7.500492446 +51.2,7.500375004 +51.28,7.500259946 +51.36,7.500147399 +51.44,7.500037481 +51.52,7.499930305 +51.6,7.499825974 +51.68,7.499724586 +51.76,7.499626231 +51.84,7.499530991 +51.92,7.499438942 +52,7.499350152 +52.08,7.499264682 +52.16,7.499182588 +52.24,7.499103915 +52.32,7.499028705 +52.4,7.498956992 +52.48,7.498888803 +52.56,7.49882416 +52.64,7.498763077 +52.72,7.498705563 +52.8,7.49865162 +52.88,7.498601245 +52.96,7.498554429 +53.04,7.498511157 +53.12,7.498471409 +53.2,7.498435161 +53.28,7.498402381 +53.36,7.498373035 +53.44,7.498347083 +53.52,7.498324481 +53.6,7.498305179 +53.68,7.498289126 +53.76,7.498276264 +53.84,7.498266533 +53.92,7.498259869 +54,7.498256205 +54.08,7.49825547 +54.16,7.498257591 +54.24,7.49826249 +54.32,7.498270091 +54.4,7.498280311 +54.48,7.498293067 +54.56,7.498308273 +54.64,7.498325843 +54.72,7.498345688 +54.8,7.498367716 +54.88,7.498391838 +54.96,7.49841796 +55.04,7.498445988 +55.12,7.498475829 +55.2,7.498507388 +55.28,7.498540569 +55.36,7.498575278 +55.44,7.498611419 +55.52,7.498648897 +55.6,7.498687616 +55.68,7.498727482 +55.76,7.498768401 +55.84,7.49881028 +55.92,7.498853026 +56,7.498896547 +56.08,7.498940754 +56.16,7.498985555 +56.24,7.499030865 +56.32,7.499076595 +56.4,7.499122661 +56.48,7.499168979 +56.56,7.499215467 +56.64,7.499262047 +56.72,7.499308639 +56.8,7.499355167 +56.88,7.499401558 +56.96,7.499447739 +57.04,7.499493641 +57.12,7.499539196 +57.2,7.499584339 +57.28,7.499629007 +57.36,7.49967314 +57.44,7.499716679 +57.52,7.499759569 +57.6,7.499801756 +57.68,7.499843191 +57.76,7.499883824 +57.84,7.499923609 +57.92,7.499962505 +58,7.50000047 +58.08,7.500037467 +58.16,7.500073459 +58.24,7.500108415 +58.32,7.500142303 +58.4,7.500175095 +58.48,7.500206767 +58.56,7.500237295 +58.64,7.500266659 +58.72,7.500294841 +58.8,7.500321825 +58.88,7.500347597 +58.96,7.500372147 +59.04,7.500395466 +59.12,7.500417548 +59.2,7.500438388 +59.28,7.500457983 +59.36,7.500476334 +59.44,7.500493443 +59.52,7.500509313 +59.6,7.50052395 +59.68,7.500537362 +59.76,7.500549558 +59.84,7.50056055 +59.92,7.500570349 +60,7.500578972 +60.08,7.500586433 +60.16,7.50059275 +60.24,7.500597943 +60.32,7.50060203 +60.4,7.500605035 +60.48,7.500606978 +60.56,7.500607886 +60.64,7.500607781 +60.72,7.500606691 +60.8,7.500604642 +60.88,7.500601662 +60.96,7.50059778 +61.04,7.500593025 +61.12,7.500587426 +61.2,7.500581015 +61.28,7.500573822 +61.36,7.50056588 +61.44,7.50055722 +61.52,7.500547875 +61.6,7.500537876 +61.68,7.500527259 +61.76,7.500516054 +61.84,7.500504296 +61.92,7.500492017 +62,7.500479252 +62.08,7.500466032 +62.16,7.500452392 +62.24,7.500438364 +62.32,7.50042398 +62.4,7.500409274 +62.48,7.500394277 +62.56,7.500379022 +62.64,7.500363539 +62.72,7.500347859 +62.8,7.500332013 +62.88,7.500316032 +62.96,7.500299944 +63.04,7.500283779 +63.12,7.500267564 +63.2,7.500251327 +63.28,7.500235096 +63.36,7.500218896 +63.44,7.500202753 +63.52,7.500186692 +63.6,7.500170737 +63.68,7.500154911 +63.76,7.500139236 +63.84,7.500123735 +63.92,7.500108428 +64,7.500093334 +64.08,7.500078474 +64.16,7.500063865 +64.24,7.500049524 +64.32,7.500035469 +64.4,7.500021714 +64.48,7.500008274 +64.56,7.499995164 +64.64,7.499982396 +64.72,7.499969982 +64.8,7.499957933 +64.88,7.49994626 +64.96,7.499934972 +65.04,7.499924077 +65.12,7.499913584 +65.2,7.499903498 +65.28,7.499893827 +65.36,7.499884575 +65.44,7.499875746 +65.52,7.499867345 +65.6,7.499859373 +65.68,7.499851834 +65.76,7.499844727 +65.84,7.499838054 +65.92,7.499831815 +66,7.499826008 +66.08,7.499820633 +66.16,7.499815686 +66.24,7.499811164 +66.32,7.499807066 +66.4,7.499803385 +66.48,7.499800118 +66.56,7.499797259 +66.64,7.499794803 +66.72,7.499792743 +66.8,7.499791073 +66.88,7.499789785 +66.96,7.499788872 +67.04,7.499788325 +67.12,7.499788137 +67.2,7.499788298 +67.28,7.499788799 +67.36,7.499789631 +67.44,7.499790783 +67.52,7.499792247 +67.6,7.499794011 +67.68,7.499796065 +67.76,7.499798398 +67.84,7.499800999 +67.92,7.499803858 +68,7.499806963 +68.08,7.499810303 +68.16,7.499813866 +68.24,7.499817641 +68.32,7.499821616 +68.4,7.49982578 +68.48,7.499830121 +68.56,7.499834628 +68.64,7.499839289 +68.72,7.499844092 +68.8,7.499849026 +68.88,7.49985408 +68.96,7.499859243 +69.04,7.499864503 +69.12,7.499869849 +69.2,7.49987527 +69.28,7.499880756 +69.36,7.499886296 +69.44,7.49989188 +69.52,7.499897497 +69.6,7.499903138 +69.68,7.499908792 +69.76,7.499914451 +69.84,7.499920104 +69.92,7.499925743 +70,7.49993136 +70.08,7.499936944 +70.16,7.499942489 +70.24,7.499947986 +70.32,7.499953427 +70.4,7.499958806 +70.48,7.499964114 +70.56,7.499969345 +70.64,7.499974493 +70.72,7.499979551 +70.8,7.499984514 +70.88,7.499989375 +70.96,7.499994129 +71.04,7.499998772 +71.12,7.500003298 +71.2,7.500007704 +71.28,7.500011984 +71.36,7.500016136 +71.44,7.500020156 +71.52,7.500024041 +71.6,7.500027788 +71.68,7.500031394 +71.76,7.500034857 +71.84,7.500038175 +71.92,7.500041346 +72,7.500044369 +72.08,7.500047243 +72.16,7.500049967 +72.24,7.50005254 +72.32,7.500054962 +72.4,7.500057233 +72.48,7.500059353 +72.56,7.500061323 +72.64,7.500063143 +72.72,7.500064813 +72.8,7.500066335 +72.88,7.500067711 +72.96,7.500068942 +73.04,7.500070029 +73.12,7.500070975 +73.2,7.500071781 +73.28,7.500072449 +73.36,7.500072983 +73.44,7.500073385 +73.52,7.500073657 +73.6,7.500073802 +73.68,7.500073824 +73.76,7.500073725 +73.84,7.500073508 +73.92,7.500073178 +74,7.500072737 +74.08,7.500072189 +74.16,7.500071537 +74.24,7.500070786 +74.32,7.500069939 +74.4,7.500069 +74.48,7.500067972 +74.56,7.50006686 +74.64,7.500065668 +74.72,7.5000644 +74.8,7.500063059 +74.88,7.500061649 +74.96,7.500060175 +75.04,7.500058641 +75.12,7.500057051 +75.2,7.500055409 +75.28,7.500053718 +75.36,7.500051983 +75.44,7.500050208 +75.52,7.500048396 +75.6,7.500046552 +75.68,7.500044679 +75.76,7.500042781 +75.84,7.500040862 +75.92,7.500038926 +76,7.500036975 +76.08,7.500035015 +76.16,7.500033047 +76.24,7.500031076 +76.32,7.500029104 +76.4,7.500027135 +76.48,7.500025173 +76.56,7.500023219 +76.64, 7.500021278 +76.72, 7.500019351 +76.8,7.500017442 +76.88,7.500015554 +76.96,7.500013688 +77.04,7.500011847 +77.12,7.500010034 +77.2,7.500008252 +77.28,7.500006501 +77.36,7.500004784 +77.44,7.500003103 +77.52,7.50000146 +77.6,7.499999857 +77.68,7.499998294 +77.76,7.499996774 +77.84,7.499995299 +77.92,7.499993868 +78, 7.499992484 +78.08,7.499991147 +78.16,7.499989859 +78.24,7.499988621 +78.32,7.499987432 +78.4,7.499986294 +78.48,7.499985207 +78.56,7.499984172 +78.64,7.49998319 +78.72,7.499982259 +78.8,7.499981381 +78.88,7.499980556 +78.96,7.499979784 +79.04,7.499979064 +79.12,7.499978396 +79.2,7.499977781 +79.28,7.499977217 +79.36,7.499976705 diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/MAJ.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/MAJ.tex index e2a025b408f..a70588eafdd 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/MAJ.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/MAJ.tex @@ -1,5 +1,5 @@ -\sub section{version 0.64} +\subsection{version 0.64} \TFRGB{ \textbf{Quoi de neuf version 0.64! } : @@ -20,4 +20,29 @@ \item 3 minors bugs signaled by Jim Diamond corrected \item reorganization of the index \end{itemize} -}
\ No newline at end of file +} + +\subsection{version 0.65} + +\TFRGB{ +\textbf{Quoi de neuf version 0.65! } : + +\begin{itemize} +\item Résolution partielle du conflit entre \BS{usetikzlibrary}\AC{patterns} (\pageref{lib-patterns}) et \BS{usepackage}\AC{tikzpeople} (\pageref{people}) +\item Ajout matrices de n\oe uds \pageref{matrix} +\item Ajout \og library matrix \fg \pageref{lib-matrix} +\item Ajout du module tikzducks \pageref{ducks} +\end{itemize} + +} +{ +\textbf{What's new version 0.65!} : +\begin{itemize} +\item Partial resolution of the conflict between \BS{usetikzlibrary}\AC{patterns} (\pageref{lib-patterns}) and \BS{usepackage}\AC{tikzpeople} (\pageref{people}) + +\item Matrices of nodes \pageref{matrix} +\item Library matrix added \pageref{lib-matrix} +\item Tikzducks package added \pageref{ducks} +\end{itemize} +} + diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/VTKZ.sin.gnuplot b/Master/texmf-dist/doc/latex/visualtikz/Source/VTKZ.sin.gnuplot deleted file mode 100644 index 34677e12d24..00000000000 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/VTKZ.sin.gnuplot +++ /dev/null @@ -1,2 +0,0 @@ -set table "VTKZ.sin.table"; set format "%.5f" -set samples 25; plot [x=0:6.28] sin(x) diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/VTKZ.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/VTKZ.tex index b036ee509c1..0b11486f08c 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/VTKZ.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/VTKZ.tex @@ -2,7 +2,6 @@ \input{tkztitre} -%========================================================== \setcounter{tocdepth}{4} @@ -15,13 +14,13 @@ \newpage -%\section{Les figures de base} \SSCT{Chargement de TikZ}{Tikz loading} \maboite{\BS{usepackage}\AC{tikz} } \SSCT{Les figures de base}{Basic figures} + \input{tkz1} \newpage @@ -29,24 +28,21 @@ \input{tkz2} \newpage -% -\input{tkz3} -% +\input{tkz3} \input{tkz3a} \newpage \SSCT{Insertion de petites images}{Small pictures} + \input{tkzpic} \newpage \input{tkzangles} -%%%%% % % %=================================== - \newpage \SSCT{Les coordonnées }{Coordinates} @@ -55,8 +51,6 @@ \newpage \input{tkzcoord} - -%%%%%================================================== \newpage @@ -64,10 +58,16 @@ \input{tkznoeud1} +\input{tkzpos} + \input{tkzfit} \newpage +\input{tkzthrough} + +\newpage + \SbSSCT{Matrice de n\oe uds}{Matrices and Alignment} @@ -75,7 +75,11 @@ \newpage -%%%====================================================== +\SbSSCT{Matrice de n\oe uds}{Chaine de n\oe uds} + +\input{tkzchains} + +\newpage \SSCT{Constructions particulières }{Transformations} @@ -85,13 +89,13 @@ \SSCT{Placer son dessin}{Placing the picture} -% + \input{tkzfig} \newpage \section{Scope} -% + \input{tkzscope} \newpage @@ -108,14 +112,6 @@ \newpage -%%\section{Placer des objets} -%% -%%%\input{plac} -%% -% -%%\newpage -%% -%%%=================================================== \SSCT{Créer ses couleurs}{Defining your own colors} @@ -134,21 +130,18 @@ \input{tkzstyl} -%%%%%%%=============================================== - \newpage \SSCT{Mettre du texte en valeur}{Text highlighting} \input{tkzboit1} -%============\newpage +\newpage \section{Decorations} \input{tkzdeco} -%========================================================= \newpage @@ -156,58 +149,12 @@ \input{tkzimage} -%%>>>> \section[Mettre des objets en cadre]{Mettre des objets en cadre } -%% - -%%\newpage -%%>>>>> \section[Mettre des objets en bouton]{Mettre des objets en bouton } -% -% -%%%%%%================================================ -% -%\section{Des lignes et liaisons spéciales} \SSCT{Trait à main levée }{Freehand drawing} \input{tkzalea} -%% >>>> \subsection{Tracer avec des symboles} -% -%% -%%\newpage - -%%>>>>> \subsection[Les bobines]{Les bobines \cite{pst-user} \cite{pst-coil}} -%% - -%%\newpage -%% -%%>>>> \subsection[Les accolades]{Les accolades } -%% -% -%%%%%====================================================================== -%%\section{Des remplissages spéciaux} -%%\subsection{Des gradients de couleurs} -%% -%%\subsubsection[Module pst-grad]{Module pst-grad \cite{pst-user} \cite{pst-grad}} -% -%%% -%%\newpage -%%\subsubsection[Module pst-slpe]{Module pst-slpe \cite{pst-slpe}} -%% -% -%% -%%\newpage -%%\subsection[Remplissage par des motifs]{Remplissage par des motifs \cite{pst-fill}} -%% -% -%% -%%\subsection[Remplissage par des points aléatoires]{Remplissage par des points aléatoires \cite{pst-add}} -% -%%\newpage -%% -%%% ======================================================================== -%\section[Effets spéciaux avec du texte ]{Effets spéciaux avec du texte \cite{pst-user} \cite{pst-text}} \SSCT{Effets spéciaux}{Special effect} @@ -222,6 +169,12 @@ \newpage + +\subsection{symbol} + +\input{tkzsymbol} + +\newpage %================================================== \SSCT{Créer un graphe }{Creating Graphs} @@ -232,7 +185,7 @@ \SSCT{Créer un graphe avec pgfplot}{Creation of a graph with pgfplots} -\input{tkzgraph2} % <<<<<<<<<<<<<<<<<<<<<<<<<<<<< +\input{tkzgraph2} \SSCT{Courbes 3D}{3D graph} @@ -265,12 +218,17 @@ \newpage -%%%============================================= - \SSCT{Les répétitions}{Repetitions} -\input{tkzrep1} % OK +\input{tkzrep1} + + +\newpage +\SSCT{Dessin robotisé}{turtle graphics} + + +\input{tkzturtle} %%\subsection[Commande multido]{Commande multido \cite{pst-user} \cite{multido} } %% @@ -345,7 +303,11 @@ \input{tkzanim} -\input{tkztab} +%\newpage +% +%\SSCT{Les tableaux de variations}{Variation of a function} +% +%\input{tkztab} %% %%\newpage %% @@ -371,25 +333,25 @@ \newpage -%%%XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - -\section{Index} - -\begin{enumerate} -\item environnements -\item Commandes -\item paramètres et options -\item Valeurs TikZ -\item Extrémités -\end{enumerate} - -\printindex - -%\newpage +%%%%XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX % -%\SbSSCT{Mises à jour précédente}{Former updates} +%\section{Index} % -%\input{MAJ} +%\begin{enumerate} +%\item environnements +%\item Commandes +%\item paramètres et options +%\item Valeurs TikZ +%\item Extrémités +%\end{enumerate} +% +%\printindex +% +%%\newpage +%% +%%\SbSSCT{Mises à jour précédente}{Former updates} +%% +%%\input{MAJ} \end{document}
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/VisualTikZ.sin.gnuplot b/Master/texmf-dist/doc/latex/visualtikz/Source/VisualTikZ.sin.gnuplot deleted file mode 100644 index 95f0d102743..00000000000 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/VisualTikZ.sin.gnuplot +++ /dev/null @@ -1,2 +0,0 @@ -set table "VisualTikZ.sin.table"; set format "%.5f" -set samples 25; plot [x=0:6.28] sin(x) diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/XXX.csv b/Master/texmf-dist/doc/latex/visualtikz/Source/XXX.csv new file mode 100644 index 00000000000..4ddce0e852c --- /dev/null +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/XXX.csv @@ -0,0 +1,5 @@ +x, y +0, 1 +1, 3 +2, 2 +3, 3
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/XXX.dat b/Master/texmf-dist/doc/latex/visualtikz/Source/XXX.dat new file mode 100644 index 00000000000..4ddce0e852c --- /dev/null +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/XXX.dat @@ -0,0 +1,5 @@ +x, y +0, 1 +1, 3 +2, 2 +3, 3
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/bibtkz.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/bibtkz.tex index dcdb60b0e2b..cfc50c2b9b4 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/bibtkz.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/bibtkz.tex @@ -20,7 +20,7 @@ tikz-optics & \pageref{optics} & tikz-optics.pdf & \DFR \\ pgfplots & \pageref{pgfplots} & pgfplots.pdf & \DGB \\ tikzpeople & \pageref{people} & tikzpeople.pdf & \DGB \\ tikzducks & \pageref{ducks} & tikzducks-doc.pdf & \DGB \\ - +tikzsymbols & \pageref{symbol} & tikzsymbols.pdf & \DGB \\ tkz-tab & \pageref{tabl} & tkz-tab-screen.pdf & \DFR \\ \hline \end{tabular} @@ -40,6 +40,8 @@ backgrounds & \pageref{lib-bkgd} & \BS{usetikzlibrary}\AC{backgrounds} \\ calc & \pageref{lib-calc} & \BS{usetikzlibrary}\AC{calc} \\ +chains & \pageref{lib-chains} & \BS{usetikzlibrary}\AC{chains} +\\ circuits.ee.IEC & \pageref{lib-ee} & \BS{usetikzlibrary}\AC{circuits.ee.IEC} \\ circuits.logic.IEC & \pageref{lib-gate} & \BS{usetikzlibrary}\AC{circuits.logic.IEC} @@ -64,7 +66,6 @@ decorations.shapes & \pageref{lib-shapes} & \BS{usetikzlibrary}\AC{decoration \\ decorations.text & \pageref{lib-text} & \BS{usetikzlibrary}\AC{decorations.text} \\ - fadings & \pageref{lib-fadings} & \BS{usetikzlibrary}\AC{fadings } \\ intersections & \pageref{lib-intersections} & \BS{usetikzlibrary}\AC{intersections} @@ -74,6 +75,8 @@ matrix & \pageref{lib-matrix} & \BS{usetikzlibrary}\AC{matrix} patterns & \pageref{lib-patterns} & \BS{usetikzlibrary}\AC{patterns} \\ plotmarks & \pageref{plotmarks} & \BS{usetikzlibrary}\AC{plotmarks} +\\ +positioning & \pageref{lib-pos} & \BS{usetikzlibrary}\AC{positioning} \\ scopes & \pageref{lib-scopes} & \BS{usetikzlibrary}\AC{scopes} \\ @@ -91,9 +94,13 @@ shapes.multipart & \pageref{lib-mult} & \BS{usetikzlibrary}\AC{shapes.multipa \\ shapes.symbols & \pageref{lib-symb} & \BS{usetikzlibrary}\AC{shapes.symbols} \\ -trees & \pageref{lib-trees} & \BS{usetikzlibrary}\AC{trees} +through & \pageref{lib-through} & \BS{usetikzlibrary}\AC{through} +\\ +trees & \pageref{lib-trees} +\BS{usetikzlibrary}\AC{trees} +\\ +through & \pageref{lib-turtle} & \BS{usetikzlibrary}\AC{turtle} \\ - \hline \end{tabular} @@ -114,7 +121,7 @@ trees & \pageref{lib-trees} & \BS{usetikzlibrary}\AC{trees} automata & \RRR{41} \\ babel & \RRR{42} \\ calendar & \RRR{45} \\ -chains & \RRR{46} \\ +%chains & \RRR{46} \\ %circuits.ee & \RRR{47-4} \\ circular graph drawing library & \RRR{32} \\ @@ -138,8 +145,7 @@ lindenmayersystems & \RRR{55} \\ mindmap & \RRR{58} \\ petri & \RRR{61} \\ phylogenetics graph drawing library & \RRR{33} \\ -plothandlers & \RRR{62} \\ -positioning & \RRR{17-5-3} \\ +plothandlers & \RRR{62} \\ profiler & \RRR{64} \\ quotes library & \RRR{17-10-4} \\ routing graph drawing library & \RRR{34} \\ @@ -147,11 +153,10 @@ shadows & \RRR{66} \\ spy & \RRR{68} \\ svg.path & \RRR{69} \\ -through & \RRR{71} \\ +%through & \RRR{71} \\ topaths & \RRR{70} \\ -trees graph drawing library & \\ -turtle & \RRR{73} \\ -\hline +trees graph drawing library & +\\ \hline \end{tabular} @@ -171,7 +176,9 @@ turtle & \RRR{73} \\ \bibitem{tikstab} tkz-tab-screen.pdf \hspace{1cm} version 1.1c \hspace{1cm} 83 pages \hspace{1cm} \DFR \bibitem{tikzpeople} tikzpeople.pdf \hspace{1cm} \hspace{1cm} 19 pages \hspace{1cm} \DGB -\bibitem{tikzducks} tikzducks-doc.pdf \hspace{1cm} version 0.5a \hspace{1cm} 24 pages \hspace{1cm} \DGB +\bibitem{tikzducks} tikzducks-doc.pdf \hspace{1cm} version 0.6 \hspace{1cm} 28 pages \hspace{1cm} \DGB + +\bibitem{tikzsymbols} tikzsymbols.pdf \hspace{1cm} version sept 2017 \hspace{1cm} 15 pages \hspace{1cm} \DGB \bibitem{animate} animate.pdf \hspace{1cm} \hspace{1cm} 26 pages \hspace{1cm} \DGB diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/data3d.txt b/Master/texmf-dist/doc/latex/visualtikz/Source/data3d.txt new file mode 100644 index 00000000000..c51abc8c9e4 --- /dev/null +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/data3d.txt @@ -0,0 +1,501 @@ +0 0 0 +0.009950042 0.000998334 0.01 +0.019601332 0.003973387 0.02 +0.028660095 0.008865606 0.03 +0.03684244 0.015576734 0.04 +0.043879128 0.023971277 0.05 +0.049520137 0.033878548 0.06 +0.053538953 0.045095238 0.07 +0.055736537 0.057388487 0.08 +0.055944897 0.070499422 0.09 +0.054030231 0.084147098 0.1 +0.049895573 0.09803281 0.11 +0.043482931 0.11184469 0.12 +0.034774848 0.125262564 0.13 +0.0237954 0.137962962 0.14 +0.01061058 0.149624248 0.15 +-0.004671924 0.159931776 0.16 +-0.021903564 0.168583018 0.17 +-0.040896377 0.175292574 0.18 +-0.061425018 0.179797017 0.19 +-0.083229367 0.181859485 0.2 +-0.106017682 0.181273967 0.21 +-0.129470246 0.177869209 0.22 +-0.153243485 0.171512199 0.23 +-0.176974492 0.162111163 0.24 +-0.200285904 0.149618036 0.25 +-0.222791076 0.134030357 0.26 +-0.244099478 0.115392568 0.27 +-0.263822255 0.093796682 0.28 +-0.281577868 0.069382305 0.29 +-0.296997749 0.042336002 0.3 +-0.309731897 0.012890005 0.31 +-0.319454328 -0.018679726 0.32 +-0.325868324 -0.052056079 0.33 +-0.328711385 -0.086883975 0.34 +-0.327759841 -0.12277413 0.35 +-0.32283303 -0.15930736 0.36 +-0.313797012 -0.196039372 0.37 +-0.300567731 -0.232505999 0.38 +-0.283113599 -0.268228802 0.39 +-0.261457448 -0.302720998 0.4 +-0.235677818 -0.335493616 0.41 +-0.205909545 -0.366061824 0.42 +-0.172343644 -0.393951353 0.43 +-0.135226463 -0.418704913 0.44 +-0.09485811 -0.439888553 0.45 +-0.051590162 -0.457097862 0.46 +-0.005822672 -0.469963931 0.47 +0.041999512 -0.478159012 0.48 +0.091391061 -0.48140178 0.49 +0.141831093 -0.479462137 0.5 +0.192768649 -0.472165488 0.51 +0.243628669 -0.459396421 0.52 +0.293818398 -0.441101744 0.53 +0.342734153 -0.417292823 0.54 +0.389768376 -0.388047179 0.55 +0.434316892 -0.353509317 0.56 +0.475786287 -0.313890759 0.57 +0.51360132 -0.269469264 0.58 +0.547212274 -0.220587232 0.59 +0.576102172 -0.167649299 0.6 +0.599793747 -0.111119128 0.61 +0.6178561 -0.05151543 0.62 +0.629910941 0.010592757 0.63 +0.635638348 0.074591491 0.64 +0.634781957 0.139827992 0.65 +0.627153511 0.2056173 0.66 +0.612636709 0.271249447 0.67 +0.591190293 0.335997079 0.68 +0.562850319 0.399123437 0.69 +0.527731578 0.459890619 0.7 +0.486028133 0.517568018 0.71 +0.438012946 0.571440862 0.72 +0.384036588 0.620818733 0.73 +0.324525022 0.665043991 0.74 +0.259976488 0.703499983 0.75 +0.19095748 0.735618951 0.76 +0.118097874 0.76088954 0.77 +0.042085228 0.778863809 0.78 +-0.036341679 0.78916366 0.79 +-0.116400027 0.791486597 0.8 +-0.197270765 0.785610747 0.81 +-0.278106986 0.771399056 0.82 +-0.358042781 0.748802622 0.83 +-0.436202469 0.717863083 0.84 +-0.511710117 0.678714046 0.85 +-0.583699241 0.631581504 0.86 +-0.651322582 0.57678323 0.87 +-0.713761852 0.51472713 0.88 +-0.770237336 0.445908562 0.89 +-0.820017236 0.370906637 0.9 +-0.862426658 0.29037951 0.91 +-0.896856132 0.205058721 0.92 +-0.922769553 0.115742614 0.93 +-0.93971146 0.0232889 0.94 +-0.947313548 -0.071393564 0.95 +-0.945300342 -0.16735371 0.96 +-0.933493933 -0.263607808 0.97 +-0.911817747 -0.359149547 0.98 +-0.880299241 -0.452960535 0.99 +-0.839071529 -0.544021111 1 +-0.788373862 -0.631321355 1.01 +-0.728550965 -0.713872181 1.02 +-0.66005121 -0.790716384 1.03 +-0.583423628 -0.860939528 1.04 +-0.499313774 -0.923680548 1.05 +-0.408458482 -0.978141947 1.06 +-0.311679531 -1.023599467 1.07 +-0.209876299 -1.059411128 1.08 +-0.104017448 -1.085025516 1.09 +0.004868268 -1.099989227 1.1 +0.11570199 -1.103953373 1.11 +0.227365447 -1.096679057 1.12 +0.338712238 -1.078041752 1.13 +0.448579588 -1.048034519 1.14 +0.555800473 -1.006770001 1.15 +0.659215971 -0.95448117 1.16 +0.757687716 -0.891520793 1.17 +0.850110325 -0.8183596 1.18 +0.935423652 -0.735583164 1.19 +1.01262475 -0.643887502 1.2 +1.080779395 -0.544073432 1.21 +1.139033046 -0.437039724 1.22 +1.18662112 -0.323775103 1.23 +1.222878455 -0.205349178 1.24 +1.247247849 -0.082902372 1.25 +1.259287578 0.042365039 1.26 +1.258677787 0.169204693 1.27 +1.245225684 0.296332576 1.28 +1.218869449 0.422442026 1.29 +1.179680816 0.546217148 1.3 +1.127866268 0.666346518 1.31 +1.063766824 0.781537039 1.32 +0.9878564 0.890527784 1.33 +0.900738732 0.992103693 1.34 +0.803142895 1.085108976 1.35 +0.69591743 1.168460068 1.36 +0.580023126 1.241157997 1.37 +0.456524532 1.302300024 1.38 +0.326580248 1.351090427 1.39 +0.191432105 1.386850298 1.4 +0.052393323 1.409026238 1.41 +-0.089164247 1.417197847 1.42 +-0.231823644 1.411083909 1.43 +-0.374136993 1.390547198 1.44 +-0.514640187 1.355597831 1.45 +-0.651867941 1.306395111 1.46 +-0.784369048 1.243247842 1.47 +-0.910721675 1.16661306 1.48 +-1.029548549 1.077093211 1.49 +-1.139531869 0.97543176 1.5 +-1.239427773 0.862507273 1.51 +-1.328080214 0.739326007 1.52 +-1.404434094 0.607013077 1.53 +-1.467547492 0.466802269 1.54 +-1.516602867 0.320024597 1.55 +-1.550917095 0.168095698 1.56 +-1.569950221 0.012502199 1.57 +-1.573312822 -0.145212823 1.58 +-1.560771894 -0.303465144 1.59 +-1.532255169 -0.460645307 1.6 +-1.487853808 -0.615134982 1.61 +-1.427823434 -0.765323618 1.62 +-1.352583451 -0.909625202 1.63 +-1.262714655 -1.046494959 1.64 +-1.158955145 -1.174445815 1.65 +-1.042194539 -1.29206445 1.66 +-0.913466558 -1.398026769 1.67 +-0.773940027 -1.491112616 1.68 +-0.624908366 -1.570219582 1.69 +-0.467777675 -1.634375736 1.7 +-0.304053512 -1.682751159 1.71 +-0.135326495 -1.714668114 1.72 +0.036743138 -1.729609766 1.73 +0.210441864 -1.727227322 1.74 +0.384019936 -1.70734551 1.75 +0.555709009 -1.669966316 1.76 +0.723740149 -1.615270936 1.77 +0.886362041 -1.543619879 1.78 +1.041859212 -1.45555123 1.79 +1.188570075 -1.351777044 1.8 +1.324904611 -1.233177916 1.81 +1.449361496 -1.100795737 1.82 +1.56054449 -0.955824719 1.83 +1.657177917 -0.799600745 1.84 +1.738121053 -0.633589144 1.85 +1.802381279 -0.459371011 1.86 +1.849125831 -0.278628178 1.87 +1.87769203 -0.093127005 1.88 +1.887595858 0.09529888 1.89 +1.878538775 0.284766698 1.9 +1.850412697 0.473363337 1.91 +1.803303066 0.659164663 1.92 +1.73748994 0.840255146 1.93 +1.653447108 1.014747584 1.94 +1.551839191 1.180802746 1.95 +1.433516747 1.336648695 1.96 +1.299509423 1.480599628 1.97 +1.151017187 1.611074 1.98 +0.989399732 1.72661176 1.99 +0.816164124 1.825890501 2 +0.632950824 1.907740353 2.01 +0.441518203 1.971157446 2.02 +0.243725688 2.015315804 2.03 +0.04151572 2.039577516 2.04 +-0.163105313 2.043501078 2.05 +-0.36808699 2.026847791 2.06 +-0.5713554 1.98958614 2.07 +-0.770834118 1.931894087 2.08 +-0.964465412 1.854159235 2.09 +-1.150231446 1.756976841 2.1 +-1.326175272 1.641145681 2.11 +-1.49042139 1.507661793 2.12 +-1.641195663 1.35771013 2.13 +-1.776844373 1.192654215 2.14 +-1.895852214 1.014023857 2.15 +-1.996859034 0.823501062 2.16 +-2.078675129 0.622904253 2.17 +-2.140294938 0.414170953 2.18 +-2.180908968 0.199339091 2.19 +-2.199913818 -0.01947288 2.2 +-2.196920183 -0.240086876 2.21 +-2.171758737 -0.460286854 2.22 +-2.124483813 -0.677841078 2.23 +-2.055374833 -0.89052473 2.24 +-1.96493544 -1.096142653 2.25 +-1.853890336 -1.292551981 2.26 +-1.723179826 -1.477684434 2.27 +-1.573952118 -1.649568044 2.28 +-1.407553421 -1.806348075 2.29 +-1.225515947 -1.94630693 2.3 +-1.029543901 -2.06788282 2.31 +-0.821497601 -2.169687003 2.32 +-0.603375864 -2.250519399 2.33 +-0.377296837 -2.309382406 2.34 +-0.145477441 -2.345492766 2.35 +0.089788356 -2.358291341 2.36 +0.32615224 -2.347450685 2.37 +0.56123499 -2.312880301 2.38 +0.792650424 -2.254729541 2.39 +1.018029618 -2.173388069 2.4 +1.235045135 -2.069483876 2.41 +1.441435043 -1.943878859 2.42 +1.635026444 -1.797661962 2.43 +1.813758293 -1.632139962 2.44 +1.97570326 -1.448825948 2.45 +2.119088398 -1.249425612 2.46 +2.242314406 -1.035821463 2.47 +2.343973275 -0.810055113 2.48 +2.42286412 -0.574307808 2.49 +2.47800703 -0.330879375 2.5 +2.508654775 -0.082165802 2.51 +2.514302233 0.169364343 2.52 +2.494693422 0.421194409 2.53 +2.449826054 0.670784844 2.54 +2.379953536 0.915598803 2.55 +2.285584389 1.153127921 2.56 +2.167479057 1.380918005 2.57 +2.026644137 1.596594357 2.58 +1.864324051 1.797886491 2.59 +1.681990238 1.982651971 2.6 +1.481327959 2.148899132 2.61 +1.264220817 2.294808429 2.62 +1.032733155 2.418752205 2.63 +0.789090473 2.519312649 2.64 +0.535658069 2.595297754 2.65 +0.274918094 2.645755099 2.66 +0.009445254 2.669983293 2.67 +-0.258118617 2.667540961 2.68 +-0.525090838 2.638253136 2.69 +-0.788774784 2.582215007 2.7 +-1.046487118 2.499792934 2.71 +-1.295585091 2.391622728 2.72 +-1.533493623 2.258605169 2.73 +-1.757731893 2.101898806 2.74 +-1.965939164 1.922910087 2.75 +-2.155899571 1.723280894 2.76 +-2.325565617 1.504873604 2.77 +-2.47308012 1.269753803 2.78 +-2.596796395 1.020170811 2.79 +-2.695296426 0.758536207 2.8 +-2.767406854 0.487400556 2.81 +-2.812212595 0.209428557 2.82 +-2.82906792 -0.072627139 2.83 +-2.817604893 -0.355953178 2.84 +-2.777739036 -0.637703575 2.85 +-2.709672162 -0.915028291 2.86 +-2.613892326 -1.185102066 2.87 +-2.491170863 -1.445153187 2.88 +-2.342556536 -1.692491913 2.89 +-2.169366836 -1.924538264 2.9 +-1.973176483 -2.138848889 2.91 +-1.755803252 -2.333142718 2.92 +-1.519291234 -2.505325158 2.93 +-1.26589169 -2.653510548 2.94 +-0.998041672 -2.776042655 2.95 +-0.718340625 -2.871512972 2.96 +-0.429525175 -2.938776637 2.97 +-0.134442375 -2.976965779 2.98 +0.163978364 -2.985500142 2.99 +0.46275435 -2.964094872 3 +0.758879418 -2.912765358 3.01 +1.049354182 -2.831829056 3.02 +1.331216405 -2.721904275 3.03 +1.601571198 -2.583905899 3.04 +1.857620727 -2.41903808 3.05 +2.096693136 -2.22878395 3.06 +2.316270375 -2.014892441 3.07 +2.514014653 -1.779362337 3.08 +2.687793233 -1.524423674 3.09 +2.835701309 -1.252516701 3.1 +2.956082725 -0.966268557 3.11 +3.047548299 -0.668467926 3.12 +3.108991568 -0.362037882 3.13 +3.139601771 -0.050007209 3.14 +3.138873909 0.264519535 3.15 +3.106615787 0.578392904 3.16 +3.042951926 0.888450098 3.17 +2.948324292 1.191546838 3.18 +2.823489825 1.48458924 3.19 +2.669514754 1.76456538 3.2 +2.487765757 2.028576234 3.21 +2.279898023 2.273865652 3.22 +2.047840315 2.497849083 3.23 +1.793777185 2.698140732 3.24 +1.520128481 2.872578877 3.25 +1.22952636 3.019249067 3.26 +0.924790003 3.136504974 3.27 +0.608898294 3.222986638 3.28 +0.284960713 3.277635946 3.29 +-0.043813266 3.299709138 3.3 +-0.37414597 3.288786219 3.31 +-0.702724202 3.244777141 3.32 +-1.026232476 3.1679247 3.33 +-1.341386461 3.058804074 3.34 +-1.644966325 2.918319001 3.35 +-1.933849607 2.747694615 3.36 +-2.20504331 2.54846699 3.37 +-2.455714874 2.322469474 3.38 +-2.683221699 2.071815946 3.39 +-2.885138934 1.798881133 3.4 +-3.059285218 1.506278181 3.41 +-3.20374611 1.196833682 3.42 +-3.316894967 0.873560402 3.43 +-3.397411023 0.539627967 3.44 +-3.444294485 0.198331799 3.45 +-3.456878478 -0.1469394 3.46 +-3.43483769 -0.492737297 3.47 +-3.378193614 -0.835588361 3.48 +-3.28731632 -1.172028759 3.49 +-3.162922718 -1.498639343 3.5 +-3.006071298 -1.812080392 3.51 +-2.818153404 -2.109125741 3.52 +-2.600881081 -2.386695959 3.53 +-2.356271632 -2.641890232 3.54 +-2.086628988 -2.87201662 3.55 +-1.794522095 -3.074620375 3.56 +-1.482760493 -3.247510018 3.57 +-1.154367336 -3.38878091 3.58 +-0.812550102 -3.496836046 3.59 +-0.460669283 -3.570403872 3.6 +-0.102205355 -3.608552905 3.61 +0.259275643 -3.610702998 3.62 +0.620157584 -3.576633133 3.63 +0.976810431 -3.506485617 3.64 +1.325626741 -3.400766641 3.65 +1.663058156 -3.260343167 3.66 +1.985651485 -3.086436162 3.67 +2.29008402 -2.88061021 3.68 +2.573197734 -2.644759615 3.69 +2.832031992 -2.381091093 3.7 +3.063854455 -2.092103218 3.71 +3.266189837 -1.780562817 3.72 +3.436846227 -1.44947853 3.73 +3.573938691 -1.10207179 3.74 +3.675909903 -0.741745499 3.75 +3.741547577 -0.372050712 3.76 +3.769998513 0.003348351 3.77 +3.760779097 0.380710627 3.78 +3.713782121 0.756255483 3.79 +3.629279847 1.126200599 3.8 +3.507923259 1.486800057 3.81 +3.350737489 1.834382261 3.82 +3.159113448 2.165387315 3.83 +2.934795722 2.476403455 3.84 +2.679866843 2.764202182 3.85 +2.396728063 3.025771735 3.86 +2.088076823 3.258348536 3.87 +1.756881113 3.459446307 3.88 +1.406350979 3.626882535 3.89 +1.039907436 3.758802007 3.9 +0.661149102 3.853697168 3.91 +0.273816868 3.910425082 3.92 +-0.118243045 3.928220791 3.93 +-0.511117277 3.906706942 3.94 +-0.900864391 3.84589955 3.95 +-1.283554413 3.746209827 3.96 +-1.655308456 3.608442034 3.97 +-2.012338032 3.433787362 3.98 +-2.350983637 3.223813881 3.99 +-2.667752247 2.980452642 4 +-2.959353301 2.705980052 4.01 +-3.222732843 2.402996675 4.02 +-3.455105434 2.074402671 4.03 +-3.653983518 1.723370086 4.04 +-3.817203939 1.353312266 4.05 +-3.942951309 0.967850699 4.06 +-4.029777992 0.570779583 4.07 +-4.07662048 0.16602849 4.08 +-4.082811975 -0.242376519 4.09 +-4.048091038 -0.650352942 4.1 +-3.972606196 -1.053802642 4.11 +-3.856916442 -1.448653016 4.12 +-3.701987595 -1.830898098 4.13 +-3.509184555 -2.196639196 4.14 +-3.280259493 -2.542124635 4.15 +-3.017336083 -2.863788219 4.16 +-2.72288992 -3.158286004 4.17 +-2.399725299 -3.422531006 4.18 +-2.050948569 -3.653725491 4.19 +-1.679938323 -3.849390501 4.2 +-1.290312699 -4.007392312 4.21 +-0.885894119 -4.125965537 4.22 +-0.470671801 -4.203732634 4.23 +-0.048762417 -4.239719593 4.24 +0.375630722 -4.233367638 4.25 +0.798259537 -4.184540801 4.26 +1.214873707 -4.093529269 4.27 +1.62126341 -3.961048467 4.28 +2.01330186 -3.788233839 4.29 +2.386987197 -3.576631393 4.3 +2.738483325 -3.328184051 4.31 +3.064159261 -3.045213954 4.32 +3.360626604 -2.730400855 4.33 +3.62477473 -2.386756828 4.34 +3.853803362 -2.017597495 4.35 +4.04525215 -1.626510082 4.36 +4.197026978 -1.217318589 4.37 +4.307422697 -0.794046415 4.38 +4.375142047 -0.360876809 4.39 +4.399310558 0.07788847 4.4 +4.379487268 0.517871869 4.41 +4.315671117 0.954663717 4.42 +4.208302952 1.383866419 4.43 +4.058263085 1.801138732 4.44 +3.866864423 2.202239663 4.45 +3.635841208 2.583071565 4.46 +3.367333471 2.939721976 4.47 +3.06386733 3.268503784 4.48 +2.728331317 3.565993301 4.49 +2.36394895 3.82906586 4.5 +1.974247814 4.054928553 4.51 +1.563025447 4.241149779 4.52 +1.134312358 4.385685291 4.53 +0.692332536 4.486900451 4.54 +0.24146184 4.543588469 4.55 +-0.213815318 4.554984414 4.56 +-0.668950575 4.520774837 4.57 +-1.119377061 4.441102903 4.58 +-1.560555217 4.31656894 4.59 +-1.988018546 4.148226399 4.6 +-2.397418824 3.937573235 4.61 +-2.784570313 3.686538779 4.62 +-3.145492542 3.397466213 4.63 +-3.476451193 3.073090806 4.64 +-3.773996694 2.716514118 4.65 +-4.035000115 2.331174398 4.66 +-4.256685985 1.920813479 4.67 +-4.436661705 1.489440472 4.68 +-4.572943219 1.041292617 4.69 +-4.663976705 0.580793677 4.7 +-4.708656012 0.112510273 4.71 +-4.70633568 -0.358893394 4.72 +-4.656839377 -0.828702006 4.73 +-4.560463656 -1.292196286 4.74 +-4.417976967 -1.744700408 4.75 +-4.230613926 -2.181629163 4.76 +-4.000064865 -2.598534409 4.77 +-3.728460761 -2.991150339 4.78 +-3.418353667 -3.355437111 4.79 +-3.072692829 -3.687622374 4.8 +-2.694796711 -3.98424029 4.81 +-2.288321185 -4.242167624 4.82 +-1.857224208 -4.458656551 4.83 +-1.405727301 -4.631363812 4.84 +-0.938274232 -4.758375927 4.85 +-0.45948729 -4.838230196 4.86 +0.025878422 -4.869931243 4.87 +0.512982205 -4.852962936 4.88 +0.996946046 -4.787295539 4.89 +1.472903464 -4.673387999 4.9 +1.936048445 -4.512185326 4.91 +2.381683966 -4.305111089 4.92 +2.805269618 -4.054055053 4.93 +3.20246785 -3.761356094 4.94 +3.569188362 -3.429780523 4.95 +3.901630184 -3.062496025 4.96 +4.196321028 -2.663041462 4.97 +4.450153481 -2.235292821 4.98 +4.660417684 -1.78342564 4.99 +4.824830142 -1.311874269 5 diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/matrix.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/matrix.tex index 928c98eab18..2d6df074b80 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/matrix.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/matrix.tex @@ -1,12 +1,11 @@ - \label{matrix} \begin{center} \RRR{20} \end{center} \begin{tabular}{|c|c|} \hline -\begin{tikzpicture}[baseline=0pt] +\begin{tikzpicture}[baseline=1cm] \draw[help lines] (0,0) grid (4,2); \node [matrix,fill=red!20,draw=blue,very thick] (my matrix) at (2,1) { @@ -472,7 +471,6 @@ execute at end cell=$m^2$\egroup; 4 & & 6 \\ & 8 & 9 \\ }; -%\end{tikzpicture} \\ \hline \end{tabular} @@ -626,7 +624,7 @@ anchor=west & anchor=east \\ \end{tabular} -\SbSSCT{Matrice de n\oe uds comléments}{Matrix Library} +\SbSSCT{Matrice de n\oe uds (compléments) }{Matrix Library} \maboite{\BS{usetikzlibrary}\AC{matrix}} \label{lib-matrix} @@ -650,9 +648,9 @@ anchor=west & anchor=east \\ \BS{begin}\AC{tikzpicture} \\ \BSS{matrix} [matrix of nodes]\\ \{ \\ -1 \& 2 \& 3 \BS{}\BS{} \\ -4 \& 5 \& 6 \BS{}\BS{} \\ -7 \& 8 \& 9 \BS{}\BS{} \\ +1 \hspace{3mm} \& \hspace{3mm} 2 \hspace{3mm} \& \hspace{3mm} 3 \hspace{3mm} \BS{}\BS{} \\ +4 \hspace{3mm} \& \hspace{3mm} 5 \hspace{3mm} \& \hspace{3mm} 6 \hspace{3mm} \BS{}\BS{} \\ +7 \hspace{3mm} \& \hspace{3mm} 8 \hspace{3mm} \& \hspace{3mm} 9 \hspace{3mm} \BS{}\BS{} \\ \}; \\ \BS{end}\AC{tikzpicture} } @@ -663,7 +661,7 @@ anchor=west & anchor=east \\ \begin{tabular}{|c|c|} \hline \begin{tikzpicture}[baseline=0pt] -\matrix (XXX) [matrix of nodes] +\matrix (XXX) [matrix of nodes,column sep=.5cm,row sep=.5cm,every node/.style=draw] { 1 & 2 & 3 \\ 4 & 5 & 6 \\ @@ -674,11 +672,11 @@ anchor=west & anchor=east \\ & \parbox{10cm}{ \BS{begin}\AC{tikzpicture} \\ -\BSS{matrix} \blll{(XXX)} [matrix of nodes]\\ +\BSS{matrix} \blll{(XXX)} [matrix of nodes,column sep=.5cm,row sep=.5cm,every node/.style=draw]\\ \{ \\ -1 \& 2 \& 3 \BS{}\BS{} \\ -4 \& 5 \& 6 \BS{}\BS{} \\ -7 \& 8 \& 9 \BS{}\BS{} \\ +1 \hspace{3mm} \& \hspace{3mm} 2 \hspace{3mm} \& \hspace{3mm} 3 \hspace{3mm} \BS{}\BS{} \\ +4 \hspace{3mm} \& \hspace{3mm} 5 \hspace{3mm} \& \hspace{3mm} 6 \hspace{3mm} \BS{}\BS{} \\ +7 \hspace{3mm} \& \hspace{3mm} 8 \hspace{3mm} \& \hspace{3mm} 9 \hspace{3mm} \BS{}\BS{} \\ \}; \\ \BS{draw}[thick,red,->] \blll{(XXX-1-1)} - - \blll{(XXX-2-3)} ; \\ \BS{end}\AC{tikzpicture} @@ -691,7 +689,7 @@ anchor=west & anchor=east \\ \begin{tabular}{|c|c|} \hline \begin{tikzpicture} -\matrix [matrix of nodes] +\matrix [matrix of nodes,column sep=.5cm,row sep=.5cm,every node/.style=draw] { 8 & 1 & 6 \\ 3 & 5 & |[red]| 7 \\ @@ -713,6 +711,64 @@ anchor=west & anchor=east \\ \bigskip +\begin{tabular}{|c|c|} \hline +\begin{tikzpicture}[baseline=-1cm] +\matrix [matrix of nodes,column sep=.5cm,row sep=.5cm,every node/.style=draw] +{ +AAA & |[circle]| BBB \\ +CCC & |(d) [isosceles triangle]| DDD \\ +| [ellipse]| EEE & FFF \\ +}; +\end{tikzpicture} +& +\begin{tikzpicture} +\matrix [matrix of nodes] +{ +AAA & \& & \rouge{ $|[$circle$]|$} BBB & \BS{}\BS{} \\ +CCC & \& &\rouge{ $|[$isosceles triangle$]|$} DDD & \BS{}\BS{} \\ +\rouge{ $|[$ellipse$]|$} EEE & \& & FFF & \BS{}\BS{} \\ +}; +\end{tikzpicture} +\\ \hline +\end{tabular} + + +\bigskip + +\begin{tabular}{|c|c|} \hline +\begin{tikzpicture}[baseline=-2cm] +\matrix [matrix of nodes,column sep=.5cm,row sep=.5cm,every node/.style=draw] +{ +|(a)| AAA & |(b)| BBB \\ +|(c)| CCC & |(d)| DDD \\ +|(e)| EEE & |(f)| FFF \\ +}; +\draw (a) -- (d); +\draw (d) -- (f); +\end{tikzpicture} +& +\begin{tikzpicture} +\node at (0,1.5) [text width=10cm] +{\BS{matrix} [matrix of nodes,column sep=.5cm,row sep=.5cm,every node/.style=draw] \\ +\{ +}; +\matrix [matrix of nodes] +{ +\rouge{ $|$(a)$|$} AAA & \& & \rouge{ $|$(b)$|$} BBB & \BS{}\BS{} \\ +\rouge{ $|$(c)$|$} CCC & \& & \rouge{ $|$(d)$|$} DDD & \BS{}\BS{} \\ +\rouge{ $|$(e)$|$} EEE & \& & \rouge{ $|$(f)$|$} FFF & \BS{}\BS{} \\ +}; + +\node at (0,-1.2) [text width=10cm] +{ \}; \\ +\BS{draw} (a) - - (d); \\ \BS{draw} (d) - - (f); +}; +\end{tikzpicture} +\\ \hline +\end{tabular} + +\bigskip + \begin{tabular}{|c|c|} \hline \begin{tikzpicture} @@ -750,12 +806,12 @@ a^7 & a^8 & a^9 \\ }; \end{tikzpicture} & -\parbox{10cm}{ +\parbox{8cm}{ \BSS{matrix} [\rouge{ matrix of math nodes}]\\ \{ \\ -A\_1 \& A\_2 \& A\_3 \BS{}\BS{} \\ -a\_4 \& a\_5 \& a\_6 \BS{}\BS{} \\ -a\land 7 \& a\land 8 \& a\land 9 \BS{}\BS{} \\ +A\_1 \hspace{2mm} \& \hspace{2mm} A\_2 \hspace{2mm} \& \hspace{2mm} A\_3 \hspace{2mm} \BS{}\BS{} \\ +a\_4 \hspace{2mm} \& \hspace{2mm} a\_5 \hspace{2mm} \& \hspace{2mm} a\_6 \hspace{2mm} \BS{}\BS{} \\ +a\land 7 \hspace{2mm} \& \hspace{2mm} a\land 8 \hspace{2mm} \& \hspace{2mm} a\land 9 \hspace{2mm} \BS{}\BS{} \\ \}; } \\ \hline @@ -776,9 +832,9 @@ a_7 & a_8 & \\ \parbox{10cm}{ \BSS{matrix} [matrix of math nodes,\rouge{nodes={circle,draw}}]\\ \{ \\ -A\_1 \& \& A\_3 \BS{}\BS{} \\ -a\_4 \& \& a\_6 \BS{}\BS{} \\ -a\_ 7 \& a\_ 8 \& \BS{}\BS{} \\ +A\_1 \hspace{2mm} \& \hspace{12mm} \& \hspace{2mm} A\_3 \hspace{2mm} \BS{}\BS{} \\ +a\_4 \hspace{2mm} \& \hspace{12mm} \& \hspace{2mm} a\_6 \hspace{2mm} \BS{}\BS{} \\ +a\_ 7 \hspace{2mm} \& \hspace{2mm} a\_ 8 \hspace{2mm} \& \hspace{12mm} \BS{}\BS{} \\ \}; } \\ \hline @@ -799,9 +855,9 @@ a_7 & a_8 & \\ \parbox{10cm}{ \BSS{matrix} [matrix of math nodes,nodes={circle,draw} ,\rouge{nodes in empty cells}]\\ \{ \\ -A\_1 \& \& A\_3 \BS{}\BS{} \\ -a\_4 \& \& a\_6 \BS{}\BS{} \\ -a\_ 7 \& a\_ 8 \& \BS{}\BS{} \\ +A\_1 \hspace{2mm} \& \hspace{12mm} \& \hspace{2mm} A\_3 \hspace{2mm} \BS{}\BS{} \\ +a\_4 \hspace{2mm} \& \hspace{12mm} \& \hspace{2mm} a\_6 \hspace{2mm} \BS{}\BS{} \\ +a\_ 7 \hspace{2mm} \& \hspace{2mm} a\_ 8 \hspace{2mm} \& \hspace{12mm} \BS{}\BS{} \\ \}; } \\ \hline @@ -818,7 +874,8 @@ a\_ 7 \& a\_ 8 \& \BS{}\BS{} \\ \begin{tikzpicture}[baseline=0pt] \matrix [matrix of nodes,nodes={text width=2cm,draw}] { -aaa & bbb \\ ccc \\ +aaa & bbb \\ +ccc \\ eee & fff\\ }; \end{tikzpicture} @@ -826,8 +883,8 @@ eee & fff\\ \parbox{10cm}{ \BSS{matrix} [matrix of nodes,\rouge{nodes=\AC{text width=2cm,draw}} ]\\ \{ \\ -aaa \& bbb \BS{}\BS{} \\ -bbb \BS{}\BS{} \\ +aaa \& bbb \BS{}\BS{} \\ +ccc \BS{}\BS{} \\ eee \& fff \BS{}\BS{} \\ \}; } @@ -837,8 +894,8 @@ eee \& fff \BS{}\BS{} \\ \bigskip \begin{tabular}{|c|c|} \hline -\begin{tikzpicture}[baseline=0pt] -\matrix [matrix of nodes,nodes={text width=16mm,draw}] +\begin{tikzpicture}[baseline=0cm] +\matrix [matrix of nodes,nodes={text width=2cm,draw}] { 1 & {aaa \\ bbb \\ ccc } \\ 2 & ddd \\ @@ -846,7 +903,7 @@ eee \& fff \BS{}\BS{} \\ \end{tikzpicture} & \parbox{10cm}{ -\BSS{matrix} [matrix of nodes,\rouge{nodes=\AC{text width=16mm,draw}} ]\\ +\BSS{matrix} [matrix of nodes,nodes=\AC{text width=2cm,draw} ]\\ \{ \\ 1 \& \& \rouge { \AC{aaa \BS{}\BS{} bbb \BS{}\BS{} ccc } } \BS{}\BS{} \\ 2 \& \& ddd \BS{}\BS{} \\ @@ -923,3 +980,4 @@ a_7 & a_8 & a_9 \\ \\ \hline \end{tabular} + diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/mesdata.dat b/Master/texmf-dist/doc/latex/visualtikz/Source/mesdata.dat new file mode 100644 index 00000000000..94eebdba62b --- /dev/null +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/mesdata.dat @@ -0,0 +1,750 @@ +0 +0 +2 +0 +4 +0 +6 +0 +8 +0 +10 +0 +12 +0 +14 +0 +16 +0 +18 +0 +20 +0 +22 +0 +24 +0 +26 +0 +28 +0 +30 +0 +32 +8.65384615384615E-03 +34 +1.69748520710059E-02 +36 +2.49758192990442E-02 +38 +3.26690570183117E-02 +40 +4.00664009791459E-02 +42 +4.71792317107172E-02 +44 +5.40184920295358E-02 +46 +6.05947038745536E-02 +48 +6.69179844947631E-02 +50 +7.29980620141953E-02 +52 +7.88442903982647E-02 +54 +8.44656638444853E-02 +56 +8.98708306196974E-02 +58 +9.50681063650937E-02 +60 +.100065486889513 +62 +.104870660470686 +64 +.108742129150807 +66 +.111744608138862 +68 +.113939215771104 +70 +.115383654461015 +72 +.116132383050858 +74 +.116236780958551 +76 +.115745304496051 +78 +.114703635718597 +80 +.113154824148143 +82 +.111139421698909 +84 +.108695611118332 +86 +.105859328242623 +88 +.102664378352741 +90 +9.91425469037332E-02 +92 +.095323704888151 +94 +9.12359090824897E-02 +96 +8.69703052489587E-02 +98 +8.26089331889049E-02 +100 +7.82253882399092E-02 +102 +7.38854416715555E-02 +104 +6.96476223047869E-02 +106 +6.55637615562666E-02 +108 +6.16795039919442E-02 +110 +.05803478536276 +112 +5.46642799898338E-02 +114 +5.15978192662807E-02 +116 +.048860782947722 +118 +4.64744648133518E-02 +120 +4.44564141938511E-02 +122 +4.28207547812645E-02 +124 +4.15784820589721E-02 +126 +4.07377406168731E-02 +128 +4.02984741773719E-02 +130 +4.02535290292024E-02 +132 +4.05896577765486E-02 +134 +4.12884307943352E-02 +136 +4.23270622951004E-02 +138 +4.36791574567658E-02 +140 +4.53153866322027E-02 +142 +4.72040922591868E-02 +144 +4.93118337116363E-02 +146 +5.16038749785298E-02 +148 +5.40446197242643E-02 +150 +5.65979979721756E-02 +152 +5.92278083603164E-02 +154 +6.18980196442332E-02 +156 +6.45730348643517E-02 +158 +6.72179213546472E-02 +160 +6.97990948833497E-02 +162 +7.22848819910784E-02 +164 +7.46459738376817E-02 +166 +7.68557837174919E-02 +168 +7.88907193374354E-02 +170 +8.07303799676217E-02 +172 +8.23576876641571E-02 +174 +8.37589609238753E-02 +176 +8.49239383556039E-02 +178 +8.58457592380156E-02 +180 +8.65209071757998E-02 +182 +8.69491224599077E-02 +184 +8.71332881802685E-02 +186 +8.70792946271995E-02 +188 +8.67958860475075E-02 +190 +8.62944933899897E-02 +192 +8.55890142793156E-02 +194 +8.46955527885755E-02 +196 +8.36321299453694E-02 +198 +8.24183744334569E-02 +200 +8.10752016279689E-02 +202 +7.96244879143106E-02 +204 +7.80887461774389E-02 +206 +7.64908073983558E-02 +208 +7.48535124484149E-02 +210 +7.31994174201861E-02 +212 +7.15505151676578E-02 +214 +6.99279751406405E-02 +216 +6.83519030811695E-02 +218 +6.68411216968477E-02 +220 +6.54129730313192E-02 +222 +6.40831429098271E-02 +224 +6.28655111775853E-02 +226 +6.17720302178976E-02 +228 +6.08126331950138E-02 +230 +5.99951725923102E-02 +232 +5.93253888901856E-02 +234 +5.88069086325939E-02 +236 +5.84412706506004E-02 +238 +5.82279788314888E-02 +240 +5.81645795299341E-02 +242 +5.82467615020359E-02 +244 +.058468476093218 +246 +5.88220753178465E-02 +248 +5.92984654235974E-02 +250 +5.98872735296933E-02 +252 +6.05770249585333E-02 +254 +6.13553289390854E-02 +256 +6.22090701279834E-02 +258 +6.31246032772814E-02 +260 +6.40879483555098E-02 +262 +6.50849834828864E-02 +264 +6.61016331565093E-02 +266 +6.71240494034383E-02 +268 +6.81387836970041E-02 +270 +6.91329476943944E-02 +272 +.070094361092981 +274 +7.10116851517287E-02 +276 +7.18745406762876E-02 +278 +7.26736095170013E-02 +280 +7.34007188739207E-02 +282 +7.40489079387003E-02 +284 +7.46124766273388E-02 +286 +7.50870163680972E-02 +288 +7.54694231313256E-02 +290 +7.57578931118945E-02 +292 +7.59519016922103E-02 +294 +7.60521665180293E-02 +296 +7.60605957057149E-02 +298 +7.59802223648129E-02 +300 +7.58151267616178E-02 +302 +7.55703475664638E-02 +304 +7.52517837193226E-02 +306 +7.48660885150644E-02 +308 +.074420557552114 +310 +7.39230122072922E-02 +312 +7.33816802967686E-02 +314 +7.28050755598899E-02 +316 +7.22018775609898E-02 +318 +7.15808135460203E-02 +320 +7.09505437155779E-02 +322 +7.03195512841417E-02 +324 +6.96960385883104E-02 +326 +6.90878303862382E-02 +328 +6.85022853583883E-02 +330 +6.79462166784184E-02 +332 +6.74258223748777E-02 +334 +6.69466260518231E-02 +336 +6.65134283818116E-02 +338 +6.61302696302459E-02 +340 +.065800403317842 +342 +6.55262809799862E-02 +344 +6.53095478396895E-02 +346 +6.51510490762494E-02 +348 +6.50508462459234E-02 +350 +6.50082432949823E-02 +352 +6.50218215005579E-02 +354 +6.50894825817165E-02 +356 +6.52084991430467E-02 +358 +6.53755715464282E-02 +360 +6.55868902540127E-02 +362 +6.58382026470722E-02 +364 +6.61248833012819E-02 +366 +6.64420066890556E-02 +368 +6.67844212833582E-02 +370 +6.71468240544578E-02 +372 +6.75238343806269E-02 +374 +6.79100664350271E-02 +376 +6.83001991629375E-02 +378 +6.86890430250722E-02 +380 +.069071602752826 +382 +6.94431354387285E-02 +384 +6.97992033689214E-02 +386 +7.01357210928528E-02 +388 +7.04489963172872E-02 +390 +7.07357643058737E-02 +392 +.070993215560589 +394 +7.12190166561082E-02 +396 +7.14113241913392E-02 +398 +7.15687919128118E-02 +400 +7.16905711512592E-02 +402 +.071776304794575 +404 +7.18261150964601E-02 +406 +7.18405856897189E-02 +408 +7.18207382356294E-02 +410 +7.17680041955508E-02 +412 +7.16841922574966E-02 +414 +7.15714519884722E-02 +416 +7.14322343127589E-02 +418 +7.12692494369251E-02 +420 +7.10854228542012E-02 +422 +7.08838500641083E-02 +424 +7.06677506381301E-02 +426 +7.04404222491157E-02 +428 +7.02051952614377E-02 +430 +6.99653884512352E-02 +432 +6.97242663919441E-02 +434 +6.94849990004157E-02 +436 +6.92506236939753E-02 +438 +6.90240105595198E-02 +440 +6.88078308829934E-02 +442 +6.86045293321095E-02 +444 +6.84163000278219E-02 +446 +6.82450666815956E-02 +448 +6.80924669167763E-02 +450 +6.79598408340894E-02 +452 +6.78482238242416E-02 +454 +6.77583435754537E-02 +456 +.067690621171175 +458 +6.76451761238025E-02 +460 +6.76218351444934E-02 +462 +6.76201444075791E-02 +464 +6.76393850310616E-02 +466 +6.76785914625233E-02 +468 +6.77365724327553E-02 +470 +6.78119341176909E-02 +472 +6.79031051329053E-02 +474 +6.80083629740533E-02 +476 +6.81258615111051E-02 +478 +6.82536591440014E-02 +480 +6.83897472322034E-02 +482 +6.85320784203225E-02 +484 +6.86785944962892E-02 +486 +6.88272534370176E-02 +488 +6.89760553188576E-02 +490 +6.91230667958801E-02 +492 +6.92664438777651E-02 +494 +6.94044527702721E-02 +496 +6.95354885744967E-02 +498 +6.96580916758362E-02 +500 +6.97709616893156E-02 +502 +6.98729688641571E-02 +504 +6.99631628867266E-02 +506 +7.00407790567902E-02 +508 +7.01052418469141E-02 +510 +7.01561658884173E-02 +512 +7.01933544591529E-02 +514 +.070216795578196 +516 +7.02266558399327E-02 +518 +7.02232721448088E-02 +520 +7.02071415058765E-02 +522 +.070178909129084 +524 +7.01393549808511E-02 +526 +7.00893790687755E-02 +528 +7.00299856702604E-02 +530 +6.99622667494569E-02 +532 +6.98873848052101E-02 +534 +6.98065553917653E-02 +536 +6.97210295499615E-02 +538 +6.96320763796638E-02 +540 +.069540965974463 +542 +6.94489529274091E-02 +544 +6.93572606020051E-02 +546 +6.92670663461226E-02 +548 +6.91794878082006E-02 +550 +6.90955704953537E-02 +552 +6.90162766921392E-02 +554 +6.89424758370401E-02 +556 +6.88749364315033E-02 +558 +6.88143195339553E-02 +560 +6.87611738688768E-02 +562 +6.87159325590632E-02 +564 +6.86789114678791E-02 +566 +6.86503091179041E-02 +568 +6.86302081330842E-02 +570 +6.86185781335716E-02 +572 +6.86152799960287E-02 +574 +6.86200713774634E-02 +576 +.068632613387772 +578 +6.86524782852125E-02 +580 +6.86791580600716E-02 +582 +.068712073764894 +584 +6.87505854448091E-02 +586 +6.87940025187264E-02 +588 +6.88415944614338E-02 +590 +6.88926016378633E-02 +592 +.068946246143908 +594 +6.90017425130696E-02 +596 +6.90583081547697E-02 +598 +6.91151733982292E-02 +600 +6.91715910252419E-02 +602 +6.92268451857889E-02 +604 +6.92802596020638E-02 +606 +6.93312049789347E-02 +608 +6.93791055519569E-02 +610 +6.94234447175844E-02 +612 +6.94637697040173E-02 +614 +6.94996952549777E-02 +616 +.069530906312447 +618 +6.95571596978478E-02 +620 +6.95782848041526E-02 +622 +6.95941833237932E-02 +624 +.069604828048886 +626 +6.96102607910671E-02 +628 +6.96105894780171E-02 +630 +6.96059844924774E-02 +632 +6.95966743271208E-02 +634 +6.95829406349998E-02 +636 +6.95651127603981E-02 +638 +6.95435618387442E-02 +640 +6.95186945567963E-02 +642 +6.94909466655901E-02 +644 +6.94607763386813E-02 +646 +6.94286574670512E-02 +648 +6.93950729797413E-02 +650 +6.93605082758991E-02 +652 +6.93254448495436E-02 +654 +.069290354183079 +656 +6.92556919794993E-02 +658 +6.92218927964455E-02 +660 +6.91893651379076E-02 +662 +6.91584870515237E-02 +664 +6.91296022712335E-02 +666 +6.91030169366188E-02 +668 +6.90789969117144E-02 +670 +6.90577657175263E-02 +672 +6.90395030840526E-02 +674 +6.90243441193745E-02 +676 +6.90123790854742E-02 +678 +6.90036537629227E-02 +680 +6.89981703795634E-02 +682 +6.89958890718582E-02 +684 +6.89967298417301E-02 +686 +6.90005749665894E-02 +688 +6.90072718158024E-02 +690 +6.90166360231945E-02 +692 +6.90284549622911E-02 +694 +6.90424914688981E-02 +696 +6.90584877543145E-02 +698 +6.90761694519412E-02 +700 +6.90952497402759E-02 +702 +6.91154334862485E-02 +704 +6.91364213545037E-02 +706 +6.91579138305384E-02 +708 +6.91796151085055E-02 +710 +6.92012367979255E-02 +712 +6.92225014074661E-02 +714 +6.92431455682682E-02 +716 +6.92629229639543E-02 +718 +6.92816069393858E-02 +720 +6.92989927653496E-02 +722 +6.93148995415982E-02 +724 +6.93291717259538E-02 +726 +6.93416802824548E-02 +728 +6.93523234466986E-02 +730 +6.93610271115614E-02 +732 +6.93677448412852E-02 +734 +6.93724575264642E-02 +736 +6.93751726966913E-02 +738 +6.93759235114835E-02 +740 +.069374767453575 +742 +6.93717847516939E-02 +744 +6.93670765625211E-02 +746 +6.93607629436317E-02 +748 +6.93529806508421E-02 diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/symbol.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/symbol.tex new file mode 100644 index 00000000000..bf36fa9d28e --- /dev/null +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/symbol.tex @@ -0,0 +1,178 @@ + + + + +\begin{tabular}{|c|c|c|c|c|c|c|}\hline +& \pot[5] & \fryingpan[5] & \eggbeater[5] & \sieve[5] \\ \hline +\DGE & \BSS{Kochtopf}[5]& \BSS{Bratpfanne}[5] & \BSS{Schneebesen}[5] & \BSS{Sieb}[5] \\ \hline +\DGB & \BSS{pot}[5]& \BSS{fryingpan}[5] & \BSS{eggbeater}[5] & \BSS{sieve}[5] \\ \hline \hline + + +& \blender[5] & \trident[5] & \bakingplate[5] & \oven[5] \\ \hline +\DGE & \BSS{Purierstab}[5] & \BSS{Dreizack}[5] & \BSS{Backblech}[5] & \BSS{Ofen}[5] \\ \hline \hline +\DGB & \BSS{blender}[5] & \BSS{trident}[5] & \BSS{bakingplate}[5] & \BSS{oven}[5] \\ \hline \hline + + +& \pan[5] & \cooker[5] & \squeezer[5] & \bowl[5] \\ \hline +\DGE & \BSS{Pfanne}[5] & \BSS{Herd}[5] & \BSS{Saftpresse}[5] & \BSS{Schussel}[5] \\ \hline +\DGB & \BSS{pan}[5] & \BSS{cooker}[5] & \BSS{squeezer}[5] & \BSS{bowl}[5] \\ \hline + & \peeler[5] & \grater[5] & \bottle[5] & \rollingpin[5]\\ \hline +\DGE & \BSS{Schaler}[5] & \BSS{Reibe}[5] &\BSS{Flasche}[5] & \BSS{Nudelholz}[5] \\ \hline +\DGB & \BSS{peeler}[5] & \BSS{grater}[5] & \BSS{bottle}[5] & \BSS{rollingpin}[5] \\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|c|c|c|c|} \hline + +\Smiley[5] & \Sadey[5] & \Neutrey[5] & \Changey[5]{0} & \cChangey[5]{0} \\ \hline +\BSS{Smiley}[5] & \BSS{Sadey}[5] & \BSS{Neutrey}[5] & \BSS{Changey}[5]\AC{0} & \BSS{cChangey}[5]\AC{0} \\ \hline + +\Annoey[5] & \Laughey[5] & \Winkey[5] & \oldWinkey[5] & \Sey[5] \\ \hline +\BSS{Annoey}[5] & \BSS{Laughey}[5] & \BSS{Winkey[}5] & \BSS{oldWinkey}[5] & \BSS{Sey}[5] \\ \hline + +\Xey[5] & \Innocey[5] & \wInnocey[5] & \Cooley[5] & \Tongey[5] \\ \hline +\BSS{Xey}[5] & \BSS{Innocey}[5] & \BSS{wInnocey}[5] & \BSS{Cooley}[5] & \BSS{Tongey}[5] \\ \hline + +\Nursey[5] &\Vomey[5] & \Walley[5] & \rWalley[5] & \Cat[5] \\ \hline +\BSS{Nursey}[5] &\BSS{Vomey}[5] & \BSS{Walley}[5] \BSS{rWalley}[5] & \BSS{Cat}[5] \\ \hline + +\multicolumn{2}{|c|}{\SchrodingersCat[5]{0} } & \Ninja[5] & \Sleepey[5] & \NiceReapey[5] \\ \hline +\multicolumn{2}{|c|}{ \BSS{SchrodingersCat}[5]\AC{0} } & \BSS{Ninja}[5] & \BSS{Sleepey}[5] & \BSS{NiceReapey}[5] \\ \hline + +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|c|c|c|} \hline +\Changey[5]{-2} & \Changey[5]{-1} & \Changey[5]{0} & \Changey[5]{1} & \Changey[5]{2} \\ \hline +\BSS{Changey}[5]\rouge{\AC{-2}} & \BSS{Changey}[5]\rouge{\AC{-1}} & \BSS{Changey}[5]\rouge{\AC{0}} & \BSS{Changey}[5]\rouge{\AC{1}} & \BSS{Changey}[5]\rouge{\AC{2}} \\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|c|c|c|} \hline +\cChangey[5]{-2} & \cChangey[5]{-1} & \cChangey[5]{0} & \cChangey[5]{1} & \cChangey[5]{2} \\ \hline +\BSS{cChangey}[5]\rouge{\AC{-2}} & \BSS{cChangey}[5]\rouge{\AC{-1}} & \BSS{cChangey}[5]\rouge{\AC{0}} & \BSS{cChangey}[5]\rouge{\AC{1}} & \BSS{cChangey}[5]\rouge{\AC{2}} \\ \hline +\end{tabular} + +\bigskip +\begin{tabular}{|c|c|c|} \hline +\SchrodingersCat[5]{- 1} & \SchrodingersCat[5]{0} & \SchrodingersCat[5]{1} \\ \hline +\BSS{SchrodingersCat}[5]\rouge{\AC{-1}} & \BSS{SchrodingersCat}[5]\rouge{\AC{0}} & \BSS{SchrodingersCat}[5]\rouge{\AC{1}} \\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|c|c|} \hline +\Laughey[5][green][red] & \Innocey[5][green][red] & \Tongey[5][green][red] & \Nursey[5][green][red] \\ \hline +\BSS{Laughey}[5]\rouge{[green][red]} & \BSS{Innocey}[5]\rouge{[green][red]} & \BSS{Tongey}[5]\rouge{[green][red]} & \BSS{Nursey}[5]\rouge{[green][red]} \\ \hline + +\Vomey[5][green][red] & \Walley[5][green][red] & \rWalley[5][green][red] & \\ \hline +\BSS{Vomey}[5]\rouge{[green][red]} & \BSS{Walley}[5]\rouge{[green][red]} & \BSS{rWalley}[5]\rouge{[green][red]}& \\ \hline + +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|} \hline +\Ninja[5][green][red][blue] & \Sleepey[5][green][red][blue] \\ \hline +\BSS{Ninja}[5]\rouge{[green][red][blue]} & \BSS{Sleepey}[5]\rouge{[green][red][blue]} \\ \hline +\end{tabular} + + +\bigskip + +\begin{tabular}{|c|c|c|c|c|} \hline +\dSmiley[5] & \dSadey[5] & \dNeutrey[5] & \dChangey[5]{0} & \dcChangey[5]{0} \\ \hline +\BSS{dSmiley}[5] & \BSS{dSadey}[5] & \BSS{dNeutrey}[5] & \BSS{dChangey}[5]\AC{0} & \BSS{dcChangey}[5]\AC{0} \\ \hline + + \dAnnoey[5]& \dLaughey[5] & \dWinkey[5] & \dSey[5] & \dXey[5] \\ \hline + \BSS{dAnnoey}[5]& \BSS{dLaughey}[5] & \BSS{dWinkey}[5] & \BSS{dSey}[5] & \BSS{dXey}[5] \\ \hline + +\dInnocey[5] & \dCooley[5] & \dNinja[5] & \drWalley[5] & \dWalley[5] \\ \hline +\BSS{dInnocey}[5] & \BSS{dCooley}[5] & \BSS{dNinja}[5] & \BSS{drWalley}[5] & \BSS{dWalley}[5] \\ \hline + +\dVomey[5] & \dNursey[5] & \dTongey[5] & \dSleepey[5] & \olddWinkey[5] \\ \hline +\BSS{dVomey}[5] & \BSS{dNursey}[5] & \BSS{dTongey}[5] & \BSS{dSleepey}[5] & \BSS{olddWinkey}[5] \\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|c|c|c|} \hline +\dChangey[5]{-2} & \dChangey[5]{-1} & \dChangey[5]{0} & \dChangey[5]{1} & \dChangey[5]{2} \\ \hline +\BSS{dChangey}[5]\rouge{\AC{-2}} & \BSS{dChangey}[5]\rouge{\AC{-1}} & \BSS{dChangey}[5]\rouge{\AC{0}} & \BSS{dChangey}[5]\rouge{\AC{1}} & \BSS{dChangey}[5]\rouge{\AC{2}} \\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|c|c|c|} \hline +\dcChangey[5]{-2} & \dcChangey[5]{-1} & \dcChangey[5]{0} & \dcChangey[5]{1} & \dcChangey[5]{2} \\ \hline +\BSS{dcChangey}[5]\rouge{\AC{-2}} & \BSS{dcChangey}[5]\rouge{\AC{-1}} & \BSS{dcChangey}[5]\rouge{\AC{0}} & \BSS{dcChangey}[5]\rouge{\AC{1}} & \BSS{dcChangey}[5]\rouge{\AC{2}} \\ \hline +\end{tabular} + +\bigskip +\begin{tabular}{|c|c|c|c|} \hline +\dLaughey[5][green][red] & \dInnocey[5][green][red] & \dTongey[5][green][red] & \dNursey[5][green][red] \\ \hline +\BSS{dLaughey}[5]\rouge{[green][red]} & \BSS{dInnocey}[5]\rouge{[green][red]} & \BSS{dTongey}[5]\rouge{[green][red]} & \BSS{dNursey}[5]\rouge{[green][red]} \\ \hline + +\dVomey[5][green][red] & \dWalley[5][green][red] & \drWalley[5][green][red] & \\ \hline +\BSS{dVomey}[5]\rouge{[green][red]} & \BSS{dWalley}[5]\rouge{[green][red]} & \BSS{drWalley}[5]\rouge{[green][red]}& \\ \hline + +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|} \hline +\dNinja[5][green][red][blue] & \dSleepey[5][green][red][blue] \\ \hline +\BSS{dNinja}[5]\rouge{[green][red][blue]} & \BSS{dSleepey}[5]\rouge{[green][red][blue]} \\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|c|c|c|} \hline +\Strichmaxerl[5] & \Candle[5] & \Fire[5] & \Coffeecup[5] & \Chair[5] \\ \hline +\BSS{Strichmaxerl}[5] & \BSS{Candle}[5] & \BSS{Fire}[5] & \BSS{Coffeecup}[5] & \BSS{Chair}[5] \\ \hline + +\Bed[5] & \Tribar[5] & \Moai[5] & \Snowman[5] & \\ \hline +\BSS{Bed}[5] & \BSS{Tribar}[5] & \BSS{Moai}[5] & \BSS{Snowman}[5] & \\ \hline + +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|c|c|c|} \hline +\multicolumn{5}{|c|}{\BSS{Strichmaxerl}[10][0][0][0][0]} \\ \hline +\Strichmaxerl[10][0][0][0][0] & \Strichmaxerl[10][45][0][0][0] & \Strichmaxerl[10][0][45][0][0] & \Strichmaxerl[10][0][0][45][0] & \Strichmaxerl[10][0][0][0][-45] \\ \hline +[0][0][0][0] & [\rouge{45}][0][0][0] & [0][\rouge{45}][0][0] & [0][0][\rouge{45}][0] & [0][0][0][\rouge{-45}] \\ \hline +\end{tabular} + + +\bigskip + +\begin{tabular}{|c|} \hline +\Tribar[10][green][red][blue] +\\ \hline +\BSS{Tribar}[10][green][red][blue] +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|}\hline +\BasicTree[10]{black}{red}{blue}{leaf} & \BasicTree[10]{black}{red}{blue}{} \\ \hline \BSS{BasicTree}[10]\AC{black}\AC{red}{blue}\AC{leaf} & \BSS{BasicTree}[10]\AC{black}\AC{red}{blue}\AC{} \\ \hline +\end{tabular} + + + +\bigskip +\begin{tabular}{|c|c|c|c|c|} \hline +\Springtree[10] & \Summertree[10] & \Autumntree[10] & \Wintertree[10] & \WorstTree[10] \\ \hline +\BSS{Springtree}[10] & \BSS{Summertree}[10] & \BSS{Autumntree}[10] & \BSS{Wintertree}[10] & \BSS{WorstTree}[10] \\ \hline +\end{tabular} + + + + + + diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/table.dat b/Master/texmf-dist/doc/latex/visualtikz/Source/table.dat index 692bc7e567a..b8a45da5929 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/table.dat +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/table.dat @@ -1,9 +1,9 @@ -0 .3
-.3 .6
-.6 .9
-.9 1.5
-1.2 .6
-1.5 1.2
-1.8 1.5
-2.1 2.0
+0 .3 +.3 .6 +.6 .9 +.9 1.5 +1.2 .6 +1.5 1.2 +1.8 1.5 +2.1 2.0 2.4 3.0
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/table2.dat b/Master/texmf-dist/doc/latex/visualtikz/Source/table2.dat index 9bd74af338f..7fd8dc86318 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/table2.dat +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/table2.dat @@ -1,9 +1,9 @@ -0 0 0
-0 1 0
-0 1 1
-.9 1.5
-1.2 .6
-1.5 1.5
-1.8 0.8
-2.1 2.5
+0 0 0 +0 1 0 +0 1 1 +.9 1.5 +1.2 .6 +1.5 1.5 +1.8 0.8 +2.1 2.5 2.4 3.0
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/table3.dat b/Master/texmf-dist/doc/latex/visualtikz/Source/table3.dat index 66080fdfd28..dd2ef5312ee 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/table3.dat +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/table3.dat @@ -1,6 +1,6 @@ -0 0 0
-0 .5 0
-0 1 1
-1 1 5
-1 .5 0
-1 0 0
+0 0 0 +0 .5 0 +0 1 1 +1 1 5 +1 .5 0 +1 0 0 diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/table3X.dat b/Master/texmf-dist/doc/latex/visualtikz/Source/table3X.dat index 0f256a666d6..d4242e47002 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/table3X.dat +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/table3X.dat @@ -1,6 +1,6 @@ -0 0 0
-0 5 0
-0 1 1
-1 1 5
-1 5 0
-1 0 0
+0 0 0 +0 5 0 +0 1 1 +1 1 5 +1 5 0 +1 0 0 diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/test.sin.gnuplot b/Master/texmf-dist/doc/latex/visualtikz/Source/test.sin.gnuplot deleted file mode 100644 index a1d42190676..00000000000 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/test.sin.gnuplot +++ /dev/null @@ -1,2 +0,0 @@ -set table "test.sin.table"; set format "%.5f" -set samples 25; plot [x=0:6.28] sin(x) diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/test.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/test.tex index 03ac35b5238..c049a64f29e 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/test.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/test.tex @@ -1,7 +1,7 @@ -%\input{versGB} % for english version -\input{versFR} % pour la version française +\input{versGB} % for english version +%\input{versFR} % pour la version française \input{tikzdebut} @@ -13,53 +13,216 @@ \selectlanguage{french} -%========================================================== -%\input{tkztitre} - - - - - - -\newpage +%\input{tkztitre} +% \tableofcontents +% +% +%\newpage -\SbSSCT{Matrice de n\oe uds}{Matrices and Alignment} -\input{matrix} +\input{tkzdatavisual} +% +%\newpage +% +%\RRR{17-2-1} fini +% +% +%/tikz/node font=font commands +% +%\begin{tikzpicture} +%\draw[node font=\itshape] (1,0) -- +(1,1) node[above] {italic}; +%\end{tikzpicture} +% +%\tikz \node [node font=\tiny, minimum height=3em, draw] {tiny}; +%\tikz \node [node font=\small, minimum height=3em, draw] {small}; +% +% +% +% +%/tikz/node align header= +% +% +%\RRR{17-4-4} OK +% +% +%\RRR{17-5} Positioning Nodes +% +% +% +%\RRR{17-5-3 }Advanced Placement Options +% +% +% +% +%\subsubsection{title} +% +%\begin{tikzpicture}[every node/.style={draw}] +%\draw[help lines](0,0) grid (3,2); +%\draw (1,0) node{A} +%(2,0) node[rotate=90,scale=1.5] {B}; +%\draw[rotate=30] (1,0) node{A} +%(2,0) node[rotate=90,scale=1.5] {B}; +%\draw[rotate=60] (1,0) node[transform shape] {A} +%(2,0) node[transform shape,rotate=90,scale=1.5] {B}; +%\end{tikzpicture} +% +%m:::::::::::::::%\begin{tikzpicture} +%%% Install a nonlinear transformation: +%%\pgfsetcurvilinearbeziercurve +%%{\pgfpoint{0mm}{20mm}} +%%{\pgfpoint{10mm}{20mm}} +%%{\pgfpoint{10mm}{10mm}} +%%{\pgfpoint{20mm}{10mm}} +%%\pgftransformnonlinear{\pgfpointcurvilinearbezierorthogonal\pgf@x\pgf@y}% +%%% Draw something: +%%\draw [help lines] (0,-30pt) grid [step=10pt] (80pt,30pt); +%%\foreach \x in {0,20,...,80} +%%\node [fill=red!20] at (\x pt, -20pt) {\x}; +%%\foreach \x in {0,20,...,80} +%%\node [fill=blue!20, transform shape nonlinear] at (\x pt, 20pt) {\x}; +%%\end{tikzpicture} +% +% +%\newpage +% +% +% %\input{tkzcoord} - +% +% +% %\newpage % -%\input{tkzpeople} - +%\SSCT{Les n\oe uds }{Nodes} +% +%\input{tkznoeud1} +% +%\newpage +% +%\input{tkzpos} +% %\newpage % -%\SbSSCT{Canards}{Ducks} +%\SSCT{Mettre du texte en valeur}{Text highlighting} +% +%\input{tkzboit1} +% +%%\begin{tikzpicture} +%%[spy using outlines={circle, magnification=4, size=2cm, connect spies}] +%%\draw [help lines] (0,0) grid (3,2); +%%\draw [decoration=Koch curve type 1] +%%decorate { decorate{ decorate{ decorate{ (0,0) -- (2,0) }}}}; +%%\spy [red] on (1.6,0.3) +%%in node [left] at (3.5,-1.25); +%%\spy [blue, size=1cm] on (1,1) +%%in node [right] at (0,-1.25); +%%\end{tikzpicture} +%% +%%\begin{tikzpicture} +%%[spy using outlines={circle, magnification=4, size=2cm, connect spies}] +%%\draw [help lines] (0,0) grid (3,2); +%%\shadedraw[shading=Mandelbrot set ] (0,0) rectangle (2,2) ; +%%\spy [red] on (1,0.4) +%%in node [left] at (3.5,-1.25); +%%\spy [blue, size=1cm] on (.5,.8) +%%in node [right] at (0,-1.25); +%%\end{tikzpicture} +% +% +%%\input{tkzturtle} +%% +%% +%% +%%\newpage +%% +%%\SbSSCT{Matrice de n\oe uds}{Matrices and Alignment} +%% +%% +%%\input{matrix} +%% +%%\newpage +%% +%%\SbSSCT{Chaine de n\oe uds}{Chains of nodes} +%% +%%\input{tkzchains} +%% +%% +%%\bigskip +% +%%\begin{tikzpicture}[baseline=-1cm] +%%\matrix [matrix of nodes,column sep=.5cm,row sep=.5cm,every node/.style=draw] +%%{ +%%|(a) [red]|AAA & |(b) [circle]| BBB \\ +%%|(c)| CCC & |(d) [isosceles triangle]| DDD \\ +%%|(e) [ellipse]| EEE & |(f)| FFFF \\ +%%}; +%%\draw (a) -- (f); +%%\end{tikzpicture} % -%\input{tkzducks} % %\newpage - - -\newpage - -\section{A Voir} - - - +% +% +% +%%\section{symboles} +%% +%%\input{tkzcoord} +% +%%\newpage +%% +%%\input{tkzpeople} +% +%%\newpage +%% +%%\SbSSCT{Canards}{Ducks} +% +%%\input{tkzducks} +%% +%%\newpage +% +% %\newpage - - +% +%\section{A Voir} +% +% +%%\input{tkzdatavisual} +% +%\begin{tikzpicture} +%\draw[help lines] (0,0) grid (2,2); +%\node[draw,fill=green!20,] (A) at (1,1) {\huge noeud}; +%\fill[red] (A.-30) circle (3pt); +%\end{tikzpicture} +% +% +% +%\begin{tikzpicture} +%\draw[help lines] (0,0) grid (3,2); +%\draw (0,0) -- (1,1); +%\draw[red] (0,0) -- ([xshift=3pt] 1,1); +%\draw (1,0) -- +(30:2cm); +%\draw[red] (1,0) -- +([shift=(135:5pt)] 30:2cm); +%\end{tikzpicture} +% +% +% +%\section{Problèmes a Voir} +% +%%\tikz \node[jester,pattern=yellow,minimum size=1.5cm] at (0,0) {}; +% +%\newpage +% +% %\input{bibtkz} - -\newpage - -\printindex +% +%\newpage +% +%%\printindex \end{document}:
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tikzdebut.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tikzdebut.tex index eeb02accf38..326a0a339f7 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tikzdebut.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tikzdebut.tex @@ -1,7 +1,7 @@ \documentclass[a4paper,10pt]{article} \usepackage{fontspec} -\usepackage[frenchb,english]{babel} +\usepackage[french,english]{babel} %\TFRGB{\selectlanguage{french}}{\selectlanguage{english}} \usepackage{tikzpeople} @@ -66,7 +66,11 @@ %\usetikzlibrary{decorations} \usetikzlibrary{shapes.gates.logic.IEC} \usetikzlibrary{matrix} - +\usetikzlibrary{chains} +%\usetikzlibrary{circuit.plc.sfc} +\usepackage{tikzsymbols} +\usetikzlibrary{datavisualization} +\usetikzlibrary{datavisualization.formats.functions} % \usepackage{tikzducks} @@ -76,20 +80,20 @@ %\usetikzlibrary{babel} \usetikzlibrary{math} \usetikzlibrary{optics} - - +\usetikzlibrary{through} +\usetikzlibrary{turtle} \usetikzlibrary{quotes} \pgfplotsset{compat=1.8} -%\usetikzlibrary{positioning} +\usetikzlibrary{positioning} \usepackage{geometry} \geometry{a4paper,top={3cm}} \usepackage{ifpdf} \usepackage{ifluatex} - +\usetikzlibrary{spy} @@ -98,11 +102,8 @@ \makeindex - \newcommand{\AC}[1]{\{#1\}} - - \newcommand{\BS}[1]{$\backslash$#1} \newcommand{\BSB}[1]{\textbf{\color{blue} {$\backslash$#1}}} @@ -110,9 +111,6 @@ \newcommand{\BSR}[1]{\textbf{\color{red} $\backslash$#1}} - - - %\newcommand{\RDDX}[2]{{\color{red}#1} \index{\textbf{3 Paramètres et options}!#2=#1}} @@ -127,6 +125,11 @@ \draw [fill=white](1,0) rectangle (2,1.5); \draw [fill=red](2,0) rectangle (3,1.5);\endtikzpicture } +\newcommand{\DGE}{ \tikzpicture[scale=.25] +\draw [fill=yellow](0,0) rectangle (3,.5); +\draw [fill=red]((0,.5) rectangle (3,1); +\draw [fill=black](0,1) rectangle (3,1.5); \endtikzpicture } + \newcommand{\DGB}{ \tikzpicture[scale=.25] \draw [fill=blue](0,0) rectangle (3,1.5); \draw [white,line width=.1cm](0,0) -- (3,1.5); diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkz1.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkz1.tex index 1a420b7ba7d..d8363d4441c 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkz1.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkz1.tex @@ -1,6 +1,5 @@ -% -%\subsection{objets} + \begin{center} \begin{tabular}{|c|c|c|} \hline \BS{draw} (0,0) {\color{red}- -} (2,1) ; \RRR{14-2} & @@ -85,10 +84,10 @@ \end{tabular} -%-------------------------------------------------- - \bigskip -\noindent \begin{tabular}{|c|c|c|} \hline + +\noindent +\begin{tabular}{|c|c|c|} \hline \multicolumn{3}{|c|}{\BS{draw} (0,0) \DDD{rectangle} (3,2); \RRR{14-4} }\\ \hline \begin{tikzpicture}[scale=.8,blue,line width=2pt] @@ -114,7 +113,7 @@ \\ \hline \end{tabular} - %----------------------------------------------------- + \bigskip @@ -145,7 +144,6 @@ \end{tabular} - %----------------------------------------------------- \bigskip \noindent \begin{tabular}{|c|c|c|}\hline @@ -170,7 +168,7 @@ \RDD{radius}=1cm & \RDD{x radius}=2cm,\RDD{y radius}=1cm \\ \hline \end{tabular} - %----------------------------------------------------- + \bigskip \noindent \begin{tabular}{|c|c|}\hline @@ -234,8 +232,7 @@ & \begin{tikzpicture}[scale=.8,blue,line width=2pt,fill=green] \draw[help lines] (-3,-2) grid (3,2); -\draw (-2,0) arc (180:-45:2 and 1); -%\draw [dotted,line width=1pt] (0,0) ellipse [x radius=2cm,y radius=1cm]; +\draw (-2,0) arc (180:-45:2 and 1); \end{tikzpicture} \\ \hline \RDD{radius}=1 & \RDD{x radius}=1,\RDD{y radius}=.5 & \\ @@ -353,7 +350,7 @@ \multicolumn{3}{|c|}{\BS{draw} (0,0) \DDD{cos} (1.57,2); }\\ \hline \end{tabular} - %---------------------------------------------------- + \bigskip \begin{center} @@ -383,11 +380,8 @@ \end{tabular} -%---------------------------------------------- \bigskip - - \noindent \begin{tabular}{|c|c|c|} \hline \multicolumn{2}{|c|}{ \bf{\TFRGB{Dessin avec plot}{Drawing with plot} }} \RRR{14-12} \RRR{22} @@ -417,7 +411,6 @@ \end{tabular} - %--------------------------------------------------------- \newpage \SSCT{Chemin}{Path and edge} diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkz2.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkz2.tex index 7972e707f41..c489c93c57e 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkz2.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkz2.tex @@ -192,10 +192,6 @@ \hline \end{tabular} - - - -%------------------------------------------------------ \SbSSCT{Styles de ligne}{Line styles} \begin{center} @@ -307,10 +303,6 @@ \\ \hline \end{tabular} - - - -%----------------------------------------------------------- \SbSSCT{Remplissage en motifs}{Fillings} \label{lib-patterns} @@ -568,8 +560,6 @@ north & south & east & west &south east \\ \hline \end{tabular} - -%=============== \SbSSCT{Ombrage}{Shading} @@ -695,7 +685,7 @@ north & south & east & west &south east \\ \hline \end{tabular} - +\newpage \SbSbSSCT{Bibliothèque shadings}{Shading library} \begin{center} \RRR{65} diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkz3.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkz3.tex index f9e33ce56ef..c5bd6f83ab3 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkz3.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkz3.tex @@ -16,8 +16,7 @@ \tikz \draw [>->,line width=.2cm,blue] (0,0) - - (1.5,1) ; \\ \hline [\FDD{->}] & [\FDD{<-}] & [\FDD{<->}] & [\FDD{>->}] \\ -% & (0.1pt) & (0.2pt) & (0.4pt) \\ - \hline +\hline \tikz \draw[-to,line width=.2cm,blue] (0,0) - - (1.5,1) ; & \tikz \draw[-to reversed,line width=.2cm,blue] (0,0) - - (1.5,1) ; @@ -27,7 +26,6 @@ \tikz \draw [-|,line width=.2cm,blue] (0,0) - - (1.5,1) ; \\ \hline [\FDD{-to}] & [\FDD{-to reversed}] & [\FDD{-o}] & [\FDD{-|}] \\ -% (0.6pt) & (0.8pt) & (1.2pt) & (1.6pt) \\ \hline \tikz \draw[-latex,line width=.2cm,blue] (0,0) - - (1.5,1) ; & diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkz3a.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkz3a.tex index c3db9e56513..58d3e0ec3a3 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkz3a.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkz3a.tex @@ -1,6 +1,5 @@ \subsubsection{\og library arrow.meta \fg} -%Insérer dans le préambule : \maboite{\BS{usetikzlibrary}\AC{arrows.meta}} \label{lib-arrows.meta} @@ -98,7 +97,6 @@ \end{tabular} \bigskip -%\paragraph{rays} \begin{tabular}{|c|c|c|c|c|} \hline \multicolumn{5}{|c|}{ \BS{tikz} \BS{draw}[\FDD{-Rays}],line width=.1cm,blue] (0,0) - - (1.5,1);} @@ -250,7 +248,7 @@ Latex & Kite & Rectangle & Square & Stealth & Turned Square \newpage \Par{Paramètre length}{Parameter length} -%\paragraph{Paramètre length} + \RRR{16-3-1} \begin{tabular}{|c|c|c|c|c|c|} \hline @@ -373,7 +371,6 @@ Straight Barb & Diamond & Ellipse & Kite & Circle & Computer Modern Rightarrow \newpage \Par{Paramètre width}{Parameter width} -%\paragraph{Paramètre width} \RRR{16-3-1} @@ -553,7 +550,6 @@ Straight Barb & Diamond & Ellipse & Kite & Computer Modern Rightarrow \bigskip \Par{Paramètre inset}{Parameter inset} -%\paragraph{Paramètre inset} \RRR{16-3-1} @@ -660,7 +656,6 @@ Straight Barb & Diamond & Ellipse & Kite & Computer Modern Rightarrow \draw[help lines] (0,-1) grid (3,1); \draw [-{Kite[inset=0cm 1]},line width=.2cm,blue] (0,0) - - (3,0) ; \end{tikzpicture} - %\tikz \draw[-{Kite[inset=0cm 1]},line width=.2cm,blue] (0,0) - - (3,1) ; & \begin{tikzpicture}[blue,line width=2pt,baseline=.5cm] \draw[help lines] (0,-1) grid (3,1); @@ -688,7 +683,6 @@ Straight Barb & Diamond & Ellipse & Kite & Computer Modern Rightarrow \draw[help lines] (0,-1) grid (3,1); \draw[-{Kite[inset=1cm .2]},line width=.1cm,blue,double,double distance =2mm] (0,0) - - (3,0) ; \end{tikzpicture} - %\tikz \draw[-{Kite[inset=0cm 1]},line width=.2cm,blue] (0,0) - - (3,1) ; & \begin{tikzpicture}[blue,line width=2pt,baseline=.5cm] \draw[help lines] (0,-1) grid (3,1); @@ -716,7 +710,6 @@ Straight Barb & Diamond & Ellipse & Kite & Computer Modern Rightarrow \draw[help lines] (0,-1) grid (3,1); \draw[-{Kite[inset=0cm .2]},line width=.1cm,blue,double,double distance =2mm] (0,0) - - (3,0) ; \end{tikzpicture} - %\tikz \draw[-{Kite[inset=0cm 1]},line width=.2cm,blue] (0,0) - - (3,1) ; & \begin{tikzpicture}[blue,line width=2pt,baseline=.5cm] \draw[help lines] (0,-1) grid (3,1); @@ -739,9 +732,6 @@ Straight Barb & Diamond & Ellipse & Kite & Computer Modern Rightarrow \bigskip - - -%\paragraph{Paramètre angle} \Par{Paramètre angle}{Parameter angle} \RRR{16-3-1} @@ -786,9 +776,7 @@ Straight Barb & Diamond & Ellipse & Kite & Computer Modern Rightarrow [angle=60:.5cm 1] & [angle=60:.5cm 1] & [angle=60:.5cm 20] & [angle=60:.5cm 5] & [angle=90:.5cm 5] \\ \hline \end{tabular} - -%\paragraph{Paramètre scale} \Par{Paramètre scale}{Parameter scale} \RRR{16-3-2} @@ -817,7 +805,6 @@ Straight Barb & Diamond & Ellipse & Kite & Computer Modern Rightarrow \bigskip -%\paragraph{Paramètre arc} \Par{Paramètre arc}{Parameter arc} \RRR{16-3-3} @@ -839,7 +826,6 @@ Arc Barb[arc=270] & Arc Barb[arc=360] & Hooks[arc=270] & Hooks[arc=360] \bigskip -%\paragraph{Paramètre slant} \Par{Paramètre slant}{Parameter slant} \RRR{16-3-4} @@ -878,7 +864,6 @@ slant=0 & slant=0.3 & slant=0.5 & slant=0.8 & slant=1 \\ \hline Arc Barb & Bracket & Hooks & Parenthesis & Classical TikZ Rightarrow \\ \hline -% \tikz \draw [-{Straight Barb[slant=.5]},line width=.2cm,blue] (0,0) - - (1,1) ; & \tikz \draw [-{Tee Barb[slant=.5]},line width=.2cm,blue] (0,0) - - (1,1) ; @@ -919,9 +904,6 @@ Turned Square & Fast Round & Fast Triangle & Round Cap & Triangle Cap \\ \hline \end{tabular} - - -%\paragraph{Paramètre reversed} \Par{Paramètre reversed}{Parameter reversed} \RRR{16-3-5} @@ -940,7 +922,6 @@ Turned Square & Fast Round & Fast Triangle & Round Cap & Triangle Cap \\ \hline Arc Barb & Bracket & Hooks & Classical TikZ Rightarrow \\ \hline -% \tikz \draw [-{Straight Barb[reversed]},line width=.2cm,blue] (0,0) - - (2,1) ; & \tikz \draw [-{Tee Barb[reversed]},line width=.2cm,blue] (0,0) - - (2,1) ; @@ -972,11 +953,8 @@ Straight Barb & Tee Barb & Parenthesis & Computer Modern Rightarrow \\ \hline \end{tabular} - - \newpage -%\paragraph{Paramètre left} \Par{Paramètre left}{Parameter left} \RRR{16-3-5} @@ -1032,7 +1010,6 @@ Kite & Latex & Rectangle & Square & Stealth & Rays \bigskip -%\paragraph{Paramètre right} \Par{Paramètre right}{Parameter right} \RRR{16-3-5} @@ -1087,10 +1064,6 @@ Kite & Latex & Rectangle & Square & Stealth & Rays \\ \hline \end{tabular} - - - -%\paragraph{Paramètre harpon} \Par{Paramètre harpoon}{Parameter harpoon} \RRR{16-3-5} @@ -1139,7 +1112,6 @@ Arc Barb & Bracket& Hooks & Parenthesis & Classical TikZ Rightarrow & Straight B \newpage -%\paragraph{Paramètre color} \Par{Paramètre color}{Parameter color} \RRR{16-3-6} @@ -1216,7 +1188,6 @@ Triangle & Turned Square & Rays & & \bigskip -%\paragraph{Paramètre fill} \Par{Paramètre fill}{Parameter fill} \RRR{16-3-6} @@ -1286,7 +1257,6 @@ Latex & Rectangle & Square & Stealth & Turned Square \newpage -%\paragraph{Paramètre open} \Par{Paramètre open}{Parameter open} \RRR{16-3-6} @@ -1321,7 +1291,7 @@ Latex & Rectangle & Square & Stealth & Turned Square \end{tabular} \bigskip -%\paragraph{Paramètre line cap} + \Par{Paramètre line cap : round or butt}{Parameter line cap : round or butt} \RRR{16-3-7} @@ -1424,7 +1394,6 @@ Straight Barb & Tee Barb & Diamond & Kite & Latex \bigskip -%\paragraph{Paramètre line join} \Par{Paramètre line join : round or miter }{Parameter line join : round or miter} \RRR{16-3-7} @@ -1525,7 +1494,6 @@ Straight Barb & Tee Barb & Diamond & Kite & Latex \\ \hline \end{tabular} -%\paragraph{Paramètre round} \Par{Paramètre round}{Parameter round} \RRR{16-3-7} @@ -1575,9 +1543,6 @@ Straight Barb & Tee Barb & Diamond & Kite & Latex \\ \hline \end{tabular} - - -%\paragraph{Paramètre sharp} \Par{Paramètre sharp}{Parameter sharp} \RRR{16-3-7} @@ -1600,8 +1565,7 @@ Straight Barb & Tee Barb & Diamond & Kite & Latex \end{tabular} \newpage - -%\paragraph{Paramètre line width} + \Par{Paramètre line width}{Parameter line width} \RRR{16-3-7} @@ -1698,39 +1662,8 @@ Straight Barb & Tee Bar & Computer Modern Rightarrow & \hline \end{tabular} -%\begin{tabular}{|c|c|c|c|c|} \hline -% \multicolumn{5}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Circle[open]},line width=.2cm,blue] (0,0) - - (1,1);} -% \\ \hline -%\tikz \draw [-{Arc Barb[line width=.2cm]},line width=.4cm,blue] (0,0) - - (1,1) ; -% & -%\tikz \draw [-{Hooks[line width=.2cm]},line width=.4cm,blue] (0,0) - - (1,1) ; -% & -%\tikz \draw[-{Straight Barb[line width=.2cm]},line width=.4cm,blue] (0,0) - - (1,1) ; -% & -%% \tikz \draw[-{Kite[open]},line width=.2cm,blue] (0,0) - - (1,1) ; -%& -%%\tikz \draw[-{Triangle[open]},line width=.2cm,blue] (0,0) - - (1,1) ; -% \\ \hline -%Arc Barb & Hooks & & & -% \\ \hline -%% -%%\tikz \draw [-{Latex[open]},line width=.2cm,blue] (0,0) - - (1,1) ; -%% & -%%\tikz \draw [-{Rectangle[open]},line width=.2cm,blue] (0,0) - - (1,1) ; -%% & -%% \tikz \draw[-{Square[open]},line width=.2cm,blue] (0,0) - - (1,1) ; -%% & -%%\tikz \draw[-{Stealth[open]},line width=.2cm,blue] (0,0) - - (1,1) ; -%%& -%%\tikz \draw[-{Turned Square[open]},line width=.2cm,blue] (0,0) - - (1,1) ; -%% \\ \hline -%%Latex & Rectangle & Square & Stealth & Turned Square -%% \\ \hline -%\end{tabular} - \newpage -%\paragraph{Paramètre line width'} \Par{Paramètre line width'}{Parameter line width'} \RRR{16-3-7} @@ -1807,8 +1740,6 @@ Straight Barb & Tee Bar & Computer Modern Rightarrow & \bigskip - -%\paragraph{Paramètre quick} \Par{Paramètre quick}{Parameter quick} \RRR{16-3-8} @@ -1836,7 +1767,6 @@ Straight Barb & Tee Bar & Computer Modern Rightarrow & \newpage -%\paragraph{library bending} \Par{Paramètre bending}{Parameter bending} \RRR{16-3-8} @@ -1920,10 +1850,7 @@ flex'=0 & flex'=0.5 & flex'=1 [-{Stealth[length=1cm,open,bend]Stealth[length=1cm,open,bend,sep]}] \\ \hline \end{tabular} - - -%\paragraph{Paramètre cap angle} \Par{Paramètre cap angle}{Parameter cap angle} \RRR{16-5-4} @@ -1947,11 +1874,3 @@ Fast Round[cap angle=20] & Fast Round[cap angle=60] & Fast Round[cap angle=90] Fast Triangle[cap angle=20] & Fast Triangle[cap angle=60] & Fast Triangle[cap angle=90] \\ \hline \end{tabular} - -%========================== - - - - - - diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkz4.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkz4.tex index b5bb2fde067..81506e77574 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkz4.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkz4.tex @@ -1,5 +1,4 @@ -%\subsubsection{Transformations} \begin{center} \RRR{25-3} @@ -57,39 +56,3 @@ \end{tabular} \bigskip - -%============================================== -%\begin{tikzpicture} -%\draw[help lines] (0,0) grid (3,2); -%\draw (0,0) - - (1,1) - - (1,0); -%\draw[rotate=40,blue] (0,0) - - (1,1) - - (1,0); % rotation 40° -%\draw[rotate=-20,red] (0,0) - - (1,1) - - (1,0); % rotation -20° -%\end{tikzpicture} - -%\tikz \draw[x=1cm,y=.5cm] (0,0) rectangle(2,2); - -%\tikz \draw (0,0) rectangle (1,0.5) [xshift=2cm] (0,0) rectangle (1,0.5); - -%\begin{tikzpicture} -%\draw[help lines] (0,0) grid (3,2); -%\draw (0,0) - - (1,1) - - (1,0); -%\draw[scale=2,blue] (0,0) - - (1,1) - - (1,0); % échelle 2 -%\draw[scale=-1,red] (0,0) - - (1,1) - - (1,0); % échelle -1 -%\end{tikzpicture} - -%\begin{tikzpicture} -%\draw[help lines] (0,0) grid (3,2); -%\draw (0,0) - - (1,1) - - (1,0); -%\draw[xslant=2,blue] (0,0) - - (1,1) - - (1,0); -%\draw[xslant=-1,red] (0,0) - - (1,1) - - (1,0); -%\end{tikzpicture} - -%\begin{tikzpicture} -%\draw[help lines] (0,0) grid (3,2); -%\draw (0,0) rectangle (1,0.5); -%\beginscope[xshift=2cm] % Décalage en X de 2cm -%\draw [red] (0,0) rectangle (1,0.5); -%\draw[yshift=1cm,blue] (0,0) rectangle (1,0.5); -%\draw[rotate=30,orange] (0,0) rectangle (1,0.5); -%\endscope -%\end{tikzpicture} diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzangles.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzangles.tex index 9451e71467f..9796f92c8d1 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzangles.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzangles.tex @@ -2,15 +2,11 @@ %TODO problème avec "$\alpha$" -%\subsection{Images prédéfinies : Marquage des angles} \SbSSCT{Images prédéfinies : Marquage des angles}{Drawing angles} \begin{center} \RRR{39} \end{center} - -%Insérer dans le préambule : - \maboite{\BS{usetikzlibrary}\AC{angles} } \label{lib-angles} @@ -80,9 +76,6 @@ pic [fill,{\color{red} angle radius=1cm}] \AC{angle} \bigskip - -%Insérer dans le préambule : - \maboite{\BS{usetikzlibrary}\AC{quotes}} \label{quotes} diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzbackground.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzbackground.tex index 034af4c7bc4..d55f6226add 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzbackground.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzbackground.tex @@ -1,8 +1,5 @@ \tikzset{background rectangle/.style={fill=cyan!20,draw=blue,line width=2pt}} - - -% \subsection{Encadrement} \SbSSCT{Encadrement}{Framing} \label{lib-bkgd} @@ -99,9 +96,6 @@ \end{tabular} -%----------------------------------------------------- - -%\subsection{Encadrement partiel} \SbSSCT{Encadrement partiel}{Partial framing} \tikzset{background top/.style={fill=green!20,draw=blue,line width=2pt}} @@ -110,8 +104,6 @@ \tikzset{background right/.style={fill=green!20,draw=blue,line width=2pt}} \begin{tabular}{|c|c|c|c|c|} \hline -% \multicolumn{4}{|l|}{ [\RDD{show background top}] } -% \\ \hline \begin{tikzpicture}[show background top] \filldraw[fill=yellow] (0,0) ellipse (10mm and 5mm); \end{tikzpicture} @@ -183,8 +175,6 @@ \end{tabular} -%----------------------------------------------------- -%\subsection{Quadrillage} \SbSbSSCT{Quadrillage}{Gridding} \begin{tabular}{|c|l|} \hline @@ -225,10 +215,6 @@ \\ \hline \end{tabular} - -%----------------------------------------------------- - -%\subsection{Encadrement et quadrillage} \SbSbSSCT{Encadrement et quadrillage}{Framing and gridding} \begin{tabular}{|c|l|} \hline diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzboit1.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzboit1.tex index d167fbdbaf1..14ce554b063 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzboit1.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzboit1.tex @@ -2,12 +2,12 @@ \tikzset{blue} -%\subsection{Dans un n\oe ud de Tikz} + \SbSSCT{Dans un n\oe ud de Tikz}{In a TikZ node} \label{noeudboite} \begin{tabular}{|c | c | c | c |} \hline -\multicolumn{4}{|c|}{ \BS{tikz} \BS{draw} (0,0) grid (2,2) (1,1) node[fill=red!20,] \AC{texte}; }\\ +\multicolumn{4}{|c|}{ \BS{tikz} \BS{draw} (0,0) grid (2,2) (1,1) node[ fill=red!20 ] \AC{texte}; }\\ \hline \tikz \draw (0,0) grid (2,2) (1,1) node[fill=red!20] {texte}; & @@ -57,7 +57,7 @@ node[fill=red!20,\RDD{draw}] \begin{tabular}{|c | c | c | c |c |} \hline -\multicolumn{4}{|c|}{ \BS{tikz} \BS{draw} node[draw,\RDD{inner sep}=0pt] \AC{texte}; }\\ +\multicolumn{4}{|c|}{ \BS{tikz} \BS{draw} node[draw,\RDD{inner sep}=0pt] \AC{texte}; \RRR{17-2-3} }\\ \hline \tikz \draw node[draw,inner sep=0pt,blue] {texte}; & @@ -77,7 +77,7 @@ node[fill=red!20,\RDD{draw}] \bigskip \begin{tabular}{|c | c | c | c |} \hline -\multicolumn{4}{|l|}{ \BS{node} [fill=red!20,\RDD{outer sep}=1cm] (A) at (1,1) \AC{texte}; }\\ +\multicolumn{4}{|l|}{ \BS{node} [fill=red!20,\RDD{outer sep}=1cm] (A) at (1,1) \AC{texte}; \RRR{17-2-3} } \\ \multicolumn{4}{|l|}{ \BS{fill} (node cs:name=A,anchor=east) circle (3pt); }\\ \multicolumn{4}{|l|}{ \BS{fill} (node cs:name=A,anchor=south) circle (3pt); }\\ \hline @@ -114,12 +114,11 @@ node[fill=red!20,\RDD{draw}] \multicolumn{4}{|c|}{ \dft{} : 0.5\BS{pgflinewidth} }\\ \hline \end{tabular} -%---------------------------------------------------------------------------------- -%\subsubsection{Taille minimale des noeuds} + \SbSbSSCT{Taille minimale des noeuds}{Minimum size} \begin{tabular}{|c|c|} \hline -\multicolumn{2}{|c|}{ \BS{draw}((0,0) node[fill=blue!20,\RDD{minimum height}=1.5cm,draw] \AC{texte} ; }\\ +\multicolumn{2}{|c|}{ \BS{draw}((0,0) node[fill=blue!20,\RDD{minimum height}=1.5cm,draw] \AC{texte} ; \RRR{17-2-3} }\\ \hline \tikz \draw (0,0) node[fill=red!20,minimum height=1.5cm,draw] {texte}; & @@ -144,13 +143,12 @@ node[fill=red!20,\RDD{draw}] \end{tabular} \newpage -%----------------------------------------------- -%\subsection{Dans un n\oe ud à formes géométriques} + \SbSSCT{Dans un n\oe ud à formes géométriques}{Geometric Shapes nodes} \label{lib-geom} \label{formes} -%Insérer dans le préambule : + \maboite{\BS{usetikzlibrary}\AC{shapes.geometric}} @@ -158,7 +156,7 @@ node[fill=red!20,\RDD{draw}] \begin{center} \RRR{67-3} \end{center} -%\subsubsection{Formes disponibles} + \SbSbSSCT{Formes disponibles}{Available shapes} \label{nd1} @@ -200,7 +198,6 @@ dart & circular sector & cylinder & \\ \hline \end{tabular} -%--------------------------------------------------------------------------------------- \subsubsection{Options} \begin{tabular}{|c|c|c|} \hline @@ -242,23 +239,8 @@ dart & circular sector & cylinder & minimum height=1.5cm & minimum height=1.5cm & minimum width=1.5cm \\ \RDD{trapezium stretches}=true & \RDD{trapezium stretches}=false & \RDD{trapezium stretches} \\ \hline -% -%& -%\begin{tikzpicture} -%\node[trapezium,draw,red,dashed] {texte}; -%\node[trapezium,draw,minimum width=1.5cm,trapezium stretches body=false,draw,blue] {texte}; -%\end{tikzpicture} -%& -%\\ -\end{tabular} -%\tikz \draw (-1,-1) grid (1,1) (0,0) node[fill=red!20,shape=trapezium,draw,minimum height=1.5cm,trapezium stretches=true] {texte}; -% -%\tikz \draw (-1,-1) grid (1,1) (0,0) node[fill=red!20,shape=trapezium,draw,minimum height=1.5cm,trapezium stretches=false] {texte}; -% -%\tikz \draw (-1,-1) grid (1,1) (0,0) node[fill=red!20,shape=trapezium,draw,minimum width=1.5cm,trapezium stretches] {texte}; -% -%\tikz \draw (-1,-1) grid (1,1) (0,0) node[fill=red!20,shape=trapezium,draw,minimum width=1.5cm,trapezium stretches body] {texte}; +\end{tabular} \bigskip @@ -380,7 +362,6 @@ initially 45 & initially 135 & initially 60 \\ \hline \end{tabular} -%\subsection{Ratio hauteur/largeur} \bigskip \begin{tabular}{|c|c|c|c|} \hline @@ -405,11 +386,19 @@ initially 45 & initially 135 & initially 60 \\ \\ \hline \end{tabular} +\bigskip + +\begin{tabular}{|c|} \hline +\BS{draw} node[\rouge {shape border rotate}=30,shape=dart, draw, \rouge {shape border uses incircle}] \AC{texte}; +\\ \hline +\tikz[] \draw node[shape border rotate=30,shape=dart, draw, shape border uses incircle] {texte}; +\\ \hline +\end{tabular} -%============================================================== \newpage -%\subsection{Dans un n\oe ud en forme de symboles} + \SbSSCT{Dans un n\oe ud en forme de symboles}{Symbol Shapes nodes} + \label{lib-symb} \maboite{\BS{usetikzlibrary}\AC{shapes.symbols}} @@ -418,7 +407,6 @@ initially 45 & initially 135 & initially 60 \\ \RRR{67-4} \end{center} -%\subsubsection{Formes disponibles} \SbSbSSCT{Formes disponibles}{Available shapes} \label{nd2} @@ -611,9 +599,9 @@ signal pointer angle=300 \dft{ : tape bend height = 5pt} \\ \hline \end{tabular} -%============================================================= + \newpage -%\subsection{Dans un n\oe ud en forme de flèche} + \SbSSCT{Dans un n\oe ud en forme de flèche}{Arrow Shapes nodes} \label{lib-arr} @@ -623,7 +611,7 @@ signal pointer angle=300 \begin{center} \RRR{67-5} \end{center} -%\subsubsection{Formes disponibles} + \SbSbSSCT{Formes disponibles}{Available shapes} \label{nd3} @@ -813,22 +801,17 @@ angle=45 & angle=120 & extend=1ex & extend=0 & indent=1ex \\ \hline \end{tabular} - - \newpage -%----------------------------------------------------------------------- -%\subsection{Dans un n\oe ud en forme de bulle} + \SbSSCT{Dans un n\oe ud en forme de bulle}{Callout Shapes nodes} \label{lib-call} -%insérer dans le préambule : - \maboite{\BS{usetikzlibrary}\AC{shapes.callouts}} \begin{center} \RRR{67-7} \end{center} -%\subsubsection{Formes disponibles} + \SbSbSSCT{Formes disponibles}{Available shapes} \begin{tabular}{|c|c|c|} \hline @@ -841,7 +824,6 @@ angle=45 & angle=120 & extend=1ex & extend=0 & indent=1ex ellipse callout & rectangle callout & cloud callout \\ \hline \end{tabular} -%------------------------------------------------ \subsubsection{Options} @@ -896,13 +878,9 @@ angle=45 & angle=120 & extend=1ex & extend=0 & indent=1ex \\ \hline \end{tabular} -%------------------------------------------------------------- \bigskip - - -\bigskip \begin{tabular}{|c | c | c | c |} \hline \multicolumn{3}{|c|}{ \BS{node} [ellipse callout,draw,\RDD{callout pointer arc}=1] at (0,1.5) \AC{texte}; }\\ \hline @@ -995,19 +973,14 @@ cloud puffs=5 & aspect=2.5 & cloud puff arc=120 \\ \hline \end{tabular} - - -%---------------------------------------------------------------------- \newpage -%\subsection{Dans un n\oe ud en diverses formes diverses} \SbSSCT{Dans un n\oe ud en diverses formes diverses}{Miscellaneous Shapes nodes} \label{lib-misc} -%insérer dans le préambule: \maboite{\BS{usetikzlibrary}\AC{shapes.misc}} @@ -1015,7 +988,6 @@ cloud puffs=5 & aspect=2.5 & cloud puff arc=120 \RRR{67-8} \end{center} -%\subsubsection{formes disponibles} \SbSbSSCT{Formes disponibles}{Available shapes} \begin{tabular}{|c|c|c|c|} \hline @@ -1037,13 +1009,11 @@ cross out & strike out & rounded rectangle & chamfered rectangle \\ \paragraph{Options \TFRGB{pour}{for} \og rounded rectangle \fg} : -% \begin{tabular}{|c|c|c|c|c|} \hline \multicolumn{5}{|c|}{ \BS{node} [draw, rounded rectangle,\RDD{rounded rectangle arc length}=270] \AC{texte}; }\\ \hline -%\begin{tikzpicture} \tikz \node[draw, rounded rectangle,rounded rectangle arc length=270,blue] {texte}; & \tikz \node[draw, rounded rectangle,rounded rectangle arc length=180,blue] {texte}; @@ -1056,7 +1026,7 @@ cross out & strike out & rounded rectangle & chamfered rectangle \\ \\ \hline 270 & 180 & 120 & 90& 45 \\ \hline -%\end{tikzpicture} + \end{tabular} @@ -1192,46 +1162,12 @@ concave & convex & none \\ \hline \end{tabular} - - - - -%\begin{tikzpicture} -%\tikzset{every node/.style={chamfered rectangle, draw}} -%\node[chamfered rectangle corners=north west] {ghi}; -%\node[chamfered rectangle corners={north east, south east}] at (1.5,0) {789}; -%\end{tikzpicture} - - -%\begin{tikzpicture} -%\tikzset{every node/.style={chamfered rectangle, draw}} -%\node[chamfered rectangle xsep=2pt] {def}; -%\node[chamfered rectangle xsep=2cm] at (1.5,0) {456}; -%\end{tikzpicture} - -%\begin{tikzpicture} -%\tikzset{every node/.style={chamfered rectangle, draw}} -%\node[chamfered rectangle angle=30] {abc}; -%\node[chamfered rectangle angle=60] at (1.5,0) {123}; -%\end{tikzpicture} - -%\begin{tikzpicture} -%\matrix[row sep=5pt, every node/.style={draw, rounded rectangle}]{ -%\node[rounded rectangle west arc=concave] {Concave}; \\ -%\node[rounded rectangle west arc=convex] {Convex}; \\ -%\node[rounded rectangle left arc=none] {None}; \\}; -%\end{tikzpicture} -%\tikz \draw (-1,-1) grid (1,1) (0,0) node[fill=red!20,diamond,draw,rounded corners] {texte};& - -%------------------------------------------------------------------------------------------ - \newpage -%\subsection{N\oe uds à plusieurs parties} + \SbSSCT{N\oe uds à plusieurs parties}{Shapes with Multiple Text Parts} \label{lib-mult} -%insérer dans le préambule : \maboite{\BS{usetikzlibrary}\AC{shapes.multipart}} @@ -1245,7 +1181,7 @@ concave & convex & none \multicolumn{4}{|c|}{ \BS{node} [\RDD{circle split},draw,fill=green!20]\AC{haut \BSS{nodepart}\AC{lower} bas }; }\\ \hline -\tikz \node [circle split,draw,blue,fill=green!20] {haut \nodepart{lower} bas }; % \filldraw[fill=red] (0,0) circle (3pt); +\tikz \node [circle split,draw,blue,fill=green!20] {haut \nodepart{lower} bas }; & \tikz \node [circle solidus,draw,blue,fill=green!20]{haut \nodepart{lower} bas }; @@ -1253,7 +1189,7 @@ concave & convex & none \tikz \node [ellipse split,draw,blue,fill=green!20]{texte haut \nodepart{lower} texte bas }; & \tikz \node [rectangle split,draw,blue,fill=green!20]{haut \nodepart{lower} bas}; -%\tikz \node [rectangle split ,draw,fill=green!20]{a\nodepart{two}b\nodepart{three}c\nodepart{four}d\nodepart{five}e}; + \\ \hline \RDD{circle split} & \RDD{circle solidus} & \RDD{ellipse split} & \RDD{rectangle split} \\ \hline @@ -1262,7 +1198,7 @@ concave & convex & none \bigskip \begin{tabular}{|c|c|} \hline - \begin{tikzpicture} [baseline=0pt]%[every text node part/.style={text centered}] + \begin{tikzpicture} [baseline=0pt] \node[rectangle split,rectangle split parts=5,draw,blue,fill=green!20] at(0,0) {texte 1 \nodepart{second} @@ -1305,7 +1241,7 @@ concave & convex & none \bigskip \begin{tabular}{|c|c|} \hline -\begin{tikzpicture}[baseline=0pt] %[every text node part/.style={align=center}] +\begin{tikzpicture}[baseline=0pt] \node[rectangle split, rectangle split parts=3, draw,blue, text width=2.75cm] {texte 1 \nodepart{two} @@ -1326,7 +1262,7 @@ texte 3b}; \\ \hline \end{tabular} \bigskip -%--------------------------------------------------------------------------------- + \begin{tabular}{|c|c|} \hline \multicolumn{2}{|c|}{ \BS{node}[rectangle split, draw,blue,minimum size = 2cm,\RDD{rectangle split draw splits}= true] } \\ @@ -1406,12 +1342,12 @@ texte 3b}; \BS{node} [rectangle split,rectangle split parts=3,draw,\RDD{rectangle split empty part width}=1cm] \AC{}; } \\ \hline \begin{tikzpicture} -\node[rectangle split,rectangle split parts=3,draw,blue,rectangle split empty part width=2cm]{}; % {texte 1 \nodepart{second} \nodepart{third}texte 3}; +\node[rectangle split,rectangle split parts=3,draw,blue,rectangle split empty part width=2cm]{}; \end{tikzpicture} -%\rule{6cm}{0pt} + & \begin{tikzpicture} -\node[rectangle split,rectangle split parts=3,draw,blue]{}; % {texte 1 \nodepart{second} \nodepart{third}texte 3}; +\node[rectangle split,rectangle split parts=3,draw,blue]{}; \end{tikzpicture} \\ \hline \RDD{rectangle split empty part width}=2cm & \dft : 1ex @@ -1424,9 +1360,7 @@ texte 3b}; % % % % <<<<<<<<<< A voir /pgf/rectangle split use custom fill= (default true) <<<<<<<<<<<<<<<<<<<<<<<<<<<< - -%-------------------------------------------------------------------------------------- \begin{tabular}{|c|c|} \hline \tikz[baseline=0pt] \node[rectangle split, draw,blue,minimum size = 2cm,rectangle split part align={center, left,right}] {texte 1 \nodepart{two} texte 2 \nodepart{three} texte 3 \nodepart{four} texte 4}; @@ -1451,7 +1385,7 @@ texte 3b}; \end{tabular} \bigskip -%-------------------------------------------------------------------- + \begin{tabular}{|c|c|} \hline \tikz[baseline=0pt] \node[rectangle split, draw,blue, minimum width=1cm,rectangle split part fill={red, green,cyan}]{}; @@ -1462,9 +1396,8 @@ texte 3b}; \\ \hline \end{tabular} -%-------------------------------------------- \newpage -%\subsection{Mise en forme du texte} + \SbSSCT{Mise en forme du texte}{Text attributes} \subsubsection{Position} @@ -1474,7 +1407,7 @@ texte 3b}; \end{center} \begin{tabular}{|c|c|c|c|} \hline -\multicolumn{4}{|l|}{ \BS{tikz} \BS{draw} (0,0) node[fill=blue!10,text width=2cm,\RDD{text justified}] }\\ +\multicolumn{4}{|l|}{ \BS{tikz} \BS{draw} (0,0) node[fill=blue!10,\RDD{text width}=2cm,\RDD{text justified}] }\\ \multicolumn{4}{|l|}{ \AC{Ceci est une démonstration d'un texte sur une largeur de 2cm}; }\\ \hline @@ -1490,7 +1423,7 @@ texte 3b}; \tikz \draw (0,0) node[fill=blue!10,text width=2cm,text ragged] {Ceci est une démonstration d'un texte sur une largeur de 2cm .}; \\ \hline -\TFRGB{sans}{without} option & text justified & text centered & text ragged +\TFRGB{sans}{without} option & \RDD{text justified} & \RDD{text centered }& \RDD{text ragged} \\ \hline \tikz \draw (0,0) node[fill=blue!10,text width=2cm,text badly ragged] {Ceci est une démonstration d'un texte sur une largeur de 2cm.}; @@ -1504,7 +1437,7 @@ texte 3b}; \tikz \draw (0,0) node[fill=blue!10,text width=2cm,align=flush center] {Ceci est une démonstration d'un texte sur une largeur de 2cm .}; \\ \hline -text badly ragged & text badly centered & align=center & align=flush center +\RDD{text badly ragged} & \RDD{text badly centered} & \RDD{align}=center & \RDD{align}=flush center \\ \hline \tikz \draw (0,0) node[fill=blue!10,text width=2cm,align=justify] {Ceci est une démonstration d'un texte sur une largeur de 2cm .}; @@ -1518,14 +1451,59 @@ text badly ragged & text badly centered & align=center & align=flush center \tikz \draw (0,0) node[fill=blue!10,text width=2cm,align=flush left] {Ceci est une démonstration d'un texte sur une largeur de 2cm .}; \\ \hline - align=justify & align=flush right & align=right & align=flush left +\RDD{align}=justify & \RDD{align}=flush right & \RDD{align}=right & \RDD{align}=flush left \\ \hline \end{tabular} \bigskip -%-------------------------------------------------------------- -%\subsubsection{Couleur et fontes } +\begin{tabular}{|c|c|} \hline +\tikz[baseline=0cm] \node [draw] { +\begin{tabular}{|c|c|} \hline +AAA & BBB \\ \hline +CCC & DDD \\ \hline +\end{tabular} +}; +& +\parbox{8cm}{ +\BS{tikz} \BS{node} [draw] \AC{ +\BS{begin}\AC{tabular}\AC{|c|c|} \BS{hline} \\ +AAA \& BBB \BS{}\BS{} \BS{hline} \\ +CCC \& DDD \BS{}\BS{} \BS{hline} \\ +\BS{end}\AC{tabular} +};} +\\ \hline +\end{tabular} + +\bigskip + + +\begin{tabular}{|c|c|c|} \hline +\multicolumn{3}{|c|}{\BS{tikz}[align=left] \BS{node}[draw] \AC{AAA \rouge{ \BS{}\BS{} } BBBBBBBB \rouge{ \BS{}\BS{} } CC};} \\ \hline +\tikz[align=left] \node[draw] {AAA\\BBBBBBBB\\CC}; +& +\tikz[align=center] \node[draw] {AAA\\BBBBBBBB\\CC}; +& +\tikz[align=right] \node[draw] {AAA\\BBBBBBBB\\CC}; +\\ \hline +[align=left] & [align=center] &[align=right] +\\ \hline +\end{tabular} + + +\bigskip + +\begin{tabular}{|c|c|} \hline +\multicolumn{2}{|c|}{\BS{tikz}[align=left] \BS{node}[draw] \AC{AAA \BS{}\BS{} \rouge{[1cm] } BBBBBBBB };} +\\ \hline +\rule[-1cm]{0pt}{1,5cm} \tikz[align=left] \node[draw] {AAA\\[1cm]BBBBBBBB\\}; +& +\tikz[align=left] \node[draw] {AAA\\[-1cm]BBBBBBBB\\}; +\\ \hline +\rouge{ [1cm] } & \rouge{[ -1cm] } +\\ \hline +\end{tabular} + \SbSbSSCT{Couleur et fontes }{Colors and Fonts} \begin{tabular}{|c|c|c|c|c|c|} \hline @@ -1551,8 +1529,7 @@ text badly ragged & text badly centered & align=center & align=flush center \bigskip - -%\subsubsection{Taille des fontes} + \SbSbSSCT{Taille des fontes}{Font Sizes} \begin{tabular}{|c|c|c|c|c|c|c|}\hline @@ -1580,22 +1557,26 @@ text badly ragged & text badly centered & align=center & align=flush center \RRR{17-4-4} \end{center} -\begin{tabular}{|c|c|} \hline +\begin{tabular}{|c|c|c|} \hline \tikz \draw (0,0) node[fill=blue!10,text height=1cm,draw]{Texte.}; & \tikz \draw (0,0) node[fill=blue!10,text depth=1cm,draw]{Texte.}; +& +\tikz \draw (0,0) node[fill=blue!10,text depth=0.5cm,,text height=.5cm,draw]{Texte.}; \\ \hline \RDD{text height}=1cm & \RDD{text depth}=1cm +& +\RDD{text height}=0.5cm, \RDD{text depth}=0.5cm \\ \hline \end{tabular} -%\subsection{Positions prédéfinies sur un n\oe ud} +\newpage + \SbSSCT{Positions prédéfinies sur un n\oe ud}{Positions on a node} \label{nomnoeud} -%\subsubsection{pour l'ensemble des n\oe uds} \SbSbSSCT{pour l'ensemble des n\oe uds}{For all types of node} \begin{center} \RRR{17-5-1} @@ -1624,7 +1605,7 @@ text badly ragged & text badly centered & align=center & align=flush center \\ \hline north west & north & north east & text \\ \hline -%--------------------------------------------------------------- + \begin{tikzpicture} \node[rectangle,draw,minimum size=3cm] (A) at (1,1) {\Huge texte}; \fill[red] (node cs:name=A,anchor= west) circle (3pt); @@ -1647,7 +1628,7 @@ north west & north & north east & text \\ \hline west & mid west & base west & base \\ \hline -%------------------------------------------------------------ + \begin{tikzpicture} \node[rectangle,draw,minimum size=3cm] (A) at (1,1) {\Huge texte}; \fill[red] (node cs:name=A,anchor=east) circle (3pt); @@ -1670,7 +1651,7 @@ west & mid west & base west & base \\ \hline east & mid esat & base east & mid \\ \hline -%-------------------------------------- + \begin{tikzpicture} \node[rectangle,draw,minimum size=3cm] (A) at (1,1) {\Huge texte}; \fill[red] (node cs:name=A,anchor= south east) circle (3pt); @@ -1693,7 +1674,7 @@ east & mid esat & base east & mid \\ \hline south east & south & south west & center \\ \hline -%------------------------------------------------------------------------- + \begin{tikzpicture} \node[rectangle,draw,minimum size=3cm] (A) at (1,1) {\Huge texte}; \fill[red] (node cs:name=A,anchor=0) circle (3pt); @@ -1709,25 +1690,631 @@ south east & south & south west & center \fill[red] (node cs:name=A,anchor=-60) circle (3pt); \end{tikzpicture} & -%\begin{tikzpicture} -%\node[rectangle,draw,minimum size=3cm] (A) at (1,1) {\Huge texte}; -%\fill[red] (node cs:name=A,anchor=text) circle (3pt); -%\end{tikzpicture} + \\ \hline -0 & 120 & -60 & %text +0 & 120 & -60 & \\ \hline \end{tabular} -%\subsubsection{spécifique à un n\oe ud} +\newpage + \SbSbSSCT{spécifique à un n\oe ud}{Specific to a node} -\TFRGB{Dans une prochaine version !}{In a future version} +\TFRGB{Consultez }{see} \RRR{67 } + + +\begin{tabular}{|c|c|} \hline +shape=circle & shape=diamond +\\ \hline +\begin{tikzpicture}[] +\node[circle,draw,minimum size=3.5cm] (A) at (1,1) {\Huge XXX}; +\foreach \anchor/\placement in +{north west/above left, north/above, north east/above right, +west/above left, center/above, east/right, +mid west/left, mid/below right, mid east/right, +base west/below left, base/below, base east/below right, +south west/below left, south/below, south east/below right, +text/below, 20/right, 120/above} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[] +\node[diamond,draw,minimum size=3.5cm] (A) at (1,1) {\Huge XXX}; +\foreach \anchor/\placement in +{north west/above left, north/above, north east/above right, +west/left, center/above, east/right, +mid/10, +base/below, +south west/below left, south/below, south east/below right, +text/left, 10/right, 120/above} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\end{tikzpicture} +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|} \hline +shape=ellipse +\\ \hline +\begin{tikzpicture}[] +\node[ellipse,draw,minimum size=3.5cm] (A) at (1,1) {\Huge XXXXXXX}; +\foreach \anchor/\placement in +{north west/above left, north/above, north east/above right, west/left, center/above, east/right, +mid west/left, mid/-75, mid east/right, +base west/200, base/-105, base east/-20, +south west/below left, south/below, south east/below right, +text/-75, 10/right, 130/above} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\end{tikzpicture} +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|} \hline +shape=trapezium +\\ \hline +\begin{tikzpicture}[] +\node[ trapezium,draw,minimum size=3cm] (A) at (1,1) {\Huge XXX}; +\foreach \anchor/\placement in +{center/120, text/below, mid/-45, base/below, mid west/left, base west/-175, mid east/right, base east/-25, +west/175, east/above, north/-75, south/-60, +north west/above, north east/above, +south west/-150, south east/-30, 150/above} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; + +\foreach \anchor/\placement in +{bottom left corner/below, top right corner/right, +top left corner/left, bottom right corner/below, +bottom side/-120, left side/left, right side/right, top side/above} +\fill[red,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\end{tikzpicture} +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|} \hline +shape=semicircle,shape border rotate=0 +\\ \hline +\begin{tikzpicture}[] +\node[ semicircle,shape border rotate=0,draw,minimum size=3cm] (A) at (1,1) {\Huge XXX}; +\foreach \anchor/\placement in +{center/above, base/-160, mid/-40, text/left, base west/-120, base east/-60, mid west/left, mid east/right, north/below, south/-75, east/60, west/120, north west/above left, north east/above right, south west/-140, south east/-60, 30/right} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\foreach \anchor/\placement in +{apex/above, arc start/-60, arc end/-120, chord center/-100} +\fill[red,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\end{tikzpicture} +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|} \hline +shape=regular polygon +\\ \hline +\begin{tikzpicture}[] +\node[ regular polygon,draw,minimum size=3cm] (A) at (1,1) {\Huge XXX}; +\foreach \anchor/\placement in +{ center/97, text/97 , mid/-30, base/below, 75/above, +west/left, east/right, north/-87, south/-60, +north east/right, south east/right, north west/left, south west/left} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; + +\foreach \anchor/\placement in +{corner 1/above, corner 2/left, corner 3/left, corner 4/right, corner 5/right, +side 1/above, side 2/left, side 3/-120, side 4/right, side 5/above} +\fill[red,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\end{tikzpicture} +\\ \hline +\end{tabular} + + +\bigskip + +\begin{tabular}{|c|} \hline +shape=star +\\ \hline +\begin{tikzpicture}[] +\node[ shape=star, star points=5, star point ratio=1.65,draw,minimum size=3cm] (A) at (1,1) {\Huge XXX}; +\foreach \anchor/\placement in +{center/above, +text/below, +mid/-30, +base/-80, +75/above, +west/left, +east/right, +north/below, +south/94, +north east/right, +south east/right, +north west/left, +south west/left} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; + +\foreach \anchor/\placement in +{inner point 1/above left, +inner point 2/left, +inner point 3/below, +inner point 4/right, +inner point 5/above right, +outer point 1/above, +outer point 2/left, +outer point 3/left, +outer point 4/right, +outer point 5/right} +\fill[red,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\end{tikzpicture} +\\ \hline +\end{tabular} + + + +\bigskip + +\begin{tabular}{|c|c|} \hline +shape= isosceles triangle & shape= kite +\\ \hline +\begin{tikzpicture}[] +\node[ shape=isosceles triangle,draw,minimum size=3cm] (A) at (1,1) {\Huge XXX}; +\foreach \anchor/\placement in +{center/above,text/above,150/left,mid/-5, mid west/left, mid east/right,base/-120, base west/-150, +base east/below right ,west/left, east/right, north/above, north west/left, north east/above right, +south /-120 , south east/below right} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\foreach \anchor/\placement in +{apex/above, left corner/left, right corner/left,left side/above, right side/below, lower side/160} +\fill[red,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[] +\node[ shape=kite,draw,minimum size=3cm] (A) at (1,1) {\Huge XXX}; +\foreach \anchor/\placement in +{center/above, text/85, mid/-85, base/-95,mid west/left, base west/-160, +mid east/right, base east/-20,west/left, east/right, north/80, south/below left,north west/above left, north east/above right,south west/left, south east/right, +110/above left} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\foreach \anchor/\placement in +{upper vertex/110, +left vertex/left, +lower vertex/below right, +right vertex/right, +upper left side/left, +upper right side/right, +lower left side/left, +lower right side/below right} +\fill[red,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\end{tikzpicture} +\\ \hline +\end{tabular} + + +\bigskip + +\begin{tabular}{|c|c|} \hline +shape= dart & shape= circular sector +\\ \hline +\begin{tikzpicture}[] +\node[shape=dart, shape border rotate=90,,draw,minimum size=3cm] (A) at (1,1) {\Huge XXX}; +\foreach \anchor/\placement in +{west/left , east/above right , north/below,south/left, +north west/left, north east/right, south west/below, south east/below,110/above left} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\foreach \anchor/\placement in +{tip/above, tail center/right, right tail/below, +left tail/below, right tail/below, left side/above left, right side/above right} +\fill[red,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[] +\node[shape=circular sector,draw,minimum size=3cm] (A) at (1,1) {\Huge XXX}; +\foreach \anchor/\placement in +{west/170 , east/right , north/above , south/below, north west/left, north east/above, south west/left, south east/below, 120/left} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\foreach \anchor/\placement in +{sector center/above, arc start/above, arc end/below, arc center/190} +\fill[red,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\end{tikzpicture} +\\ \hline +\end{tabular} + + + +\bigskip + +\begin{tabular}{|c|c|} \hline +shape=cylinder & shape=cloud +\\ \hline +\begin{tikzpicture}[] +\node[shape=cylinder,draw,minimum size=3cm] (A) at (1,1) {\Huge XXX}; +\foreach \anchor/\placement in +{west/170 , east/-10 , north/above , south/below, north west/left, north east/above, south west/left, south east/below, 120/left} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\foreach \anchor/\placement in +{before top/10 , top/10, after top/below right, before bottom/below left, bottom/190, after bottom/above left} +\fill[red,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[] +\node[shape=cloud,draw,minimum size=3cm] (A) at (1,1) {\Huge XXX}; +\foreach \anchor/\placement in +{west/west , east/east , north/below , south/below left, north west/left, north east/above right, south west/left, south east/right, 110/above} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\foreach \anchor/\placement in +{puff 1/above, puff 2/above left , puff 3/left, puff 4/left, +puff 5/below left, puff 6/below right, puff 7/below right, puff 8/right, +puff 9/right, puff 10/above} +\fill[red,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\end{tikzpicture} + +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|} \hline +shape=starburst +\\ \hline +\begin{tikzpicture}[] +\node[shape=starburst, starburst points=9, starburst point height=2cm,draw,minimum size=3cm] (A) at (1,1) {\Huge XXX}; +\foreach \anchor/\placement in +{west/west , east/east , north/70 , south/above, north west/below , north east/below, south west/below left, south east/-85, 30/above right} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\foreach \anchor/\placement in +{outer point 1/105, outer point 2/above left , +outer point 3/left, outer point 4/left, +outer point 5/below, outer point 6/below, +outer point 7/below, outer point 8/right, +outer point 9/above, +inner point 1/93, inner point 2/160, +inner point 3/190, inner point 4/below left, +inner point 5/below, inner point 6/-85, +inner point 7/-30, inner point 8/above right, +inner point 9/above} +\fill[red,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\end{tikzpicture} +\\ \hline +\end{tabular} + + +\bigskip + +\begin{tabular}{|c|} \hline +shape=signal +\\ \hline +\begin{tikzpicture}[] +\node[signal,signal from=west,draw,minimum size=3.5cm] (A) at (1,1) {\Huge XXX}; +\foreach \anchor/\placement in +{north west/above left, north/above, north east/above right, +west/left, center/above, east/right, +mid west/left, mid/below right, mid east/right, +base west/-160, base/below, base east/below right, +south west/below left, south/below, south east/below right, +text/below, 20/right, 120/above} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\end{tikzpicture} +\\ \hline +\end{tabular} + + +\bigskip + +\begin{tabular}{|c|} \hline +shape=tape +\\ \hline +\begin{tikzpicture}[] +\node[tape, tape bend height=1cm,draw,minimum size=3.5cm] (A) at (1,1) {\Huge XXX}; +\foreach \anchor/\placement in +{north west/above left, north/above, north east/above right, +west/left, center/above, east/right, +mid west/left, mid/below right, mid east/right, +base west/-160, base/110, base east/below right, +south west/below left, south/below, south east/below right, +text/110, 20/right, 120/above} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\end{tikzpicture} +\\ \hline +\end{tabular} + +\begin{tabular}{|c|} \hline +shape=magnetic tape +\\ \hline +\begin{tikzpicture}[] +\node[shape=magnetic tape,draw,minimum size=3cm] (A) at (1,1) {\Huge XXX}; +\foreach \anchor/\placement in +{west/west , east/east , north/above , south/below, north west/above left , north east/above right, south west/left, south east/below, 30/above right} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\foreach \anchor/\placement in +{tail east/right, tail south east/below right, tail north east/above right} +\fill[red,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\end{tikzpicture} +\\ \hline +\end{tabular} + + + +\bigskip + +\begin{tabular}{|c|} \hline +shape=single arrow +\\ \hline +\begin{tikzpicture}[] +\node[shape=single arrow,draw,minimum size=3cm] (A) at (1,1) {\Huge XXXXXX}; +\foreach \anchor/\placement in +{west/170 , east/below right , north/above , south/below, north west/above left, north east/above right, south west/below left, south east/below right, 30/east} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\foreach \anchor/\placement in +{tip/above right, before tip/above, after tip/below, before head/190 , after head/170, after tail/left, before tail/left, tail/190} +\fill[red,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\end{tikzpicture} +\\ \hline +\end{tabular} + + +\bigskip + +\begin{tabular}{|c|} \hline +shape=double arrow +\\ \hline +\begin{tikzpicture}[] +\node[shape=double arrow, double arrow head extend=1.5cm,,draw,minimum size=3cm] (A) at (1,1) {\Huge XXXXXXXXX}; +\foreach \anchor/\placement in +{west/170 , east/-10 , north/above , south/below, north west/above left, north east/above right, south west/below left, south east/below right, 35/above right} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\foreach \anchor/\placement in +{before head 1/above right, before tip 1/above, +tip 1/10, after tip 1/below, +after head 1/below right, before head 2/below left, +before tip 2/below left, tip 2/190, +after tip 2/above left, after head 2/above left} +\fill[red,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\end{tikzpicture} +\\ \hline +\end{tabular} + + +\bigskip + +\begin{tabular}{|c|} \hline +shape=arrow box +\\ \hline +\begin{tikzpicture}[] +\node[shape=arrow box,draw,minimum size=3cm,arrow box arrows={north:2cm from border, south, east:2cm from border, west},arrow box shaft width=1cm,arrow box head extend=0.25cm] (A) at (1,1) {\Huge XXXXXXXXX}; +\foreach \anchor/\placement in +{west/right , east/left , north/below , south/above, north west/left, north east/right, south west/left, south east/right} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\foreach \anchor/\placement in +{north arrow tip/above, +south arrow tip/below, +east arrow tip/right, +west arrow tip/left, +before north arrow/above left, +before north arrow head/110, +before north arrow tip/left, +after north arrow tip/right, +after north arrow head/70, +after north arrow/above right, +before south arrow/below right, +before south arrow head/-70, +before south arrow tip/right, +after south arrow tip/left, +after south arrow head/-110, +after south arrow/below left, +before east arrow/above right, +before east arrow head/right, +before east arrow tip/right, +after east arrow tip/right, +after east arrow head/right, +after east arrow/below right, +before west arrow/below left, +before west arrow head/left, +before west arrow tip/left, +after west arrow tip/west, +after west arrow head/left, +after west arrow/above left} +\fill[red,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\end{tikzpicture} +\\ \hline +\end{tabular} +\bigskip + +\begin{tabular}{|c|} \hline +shape=circle split +\\ \hline +\begin{tikzpicture}[] +\node[shape=circle split,draw,minimum size=3.5cm](A) at (1,1) {XXX\nodepart{lower}YYY} ; +\foreach \anchor/\placement in +{north west/above left, north/above, north east/above right, +west/left, center/above, east/right, +mid west/left, mid/below right, mid east/right, +base west/-160, base/110, base east/below right, +south west/below left, south/below, south east/below right, +text/110, 20/right, 120/above} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\foreach \anchor/\placement in +{text/left, lower/left} +\fill[red,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\end{tikzpicture} +\\ \hline +\end{tabular} + +\begin{tabular}{|c|} \hline +shape=circle solidus +\\ \hline +\begin{tikzpicture}[] +\node[shape=circle solidus,draw,minimum size=3.5cm](A) at (1,1) {XXX\nodepart{lower}YYY} ; +\foreach \anchor/\placement in +{north west/above left, north/above, north east/above right, +west/left, center/above, east/right, +mid west/left, mid/below right, mid east/right, +base west/-160, base/110, base east/below right, +south west/below left, south/below, south east/below right, +text/110, 20/right, 120/above} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\foreach \anchor/\placement in +{text/left, lower/left} +\fill[red,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\end{tikzpicture} +\\ \hline +\end{tabular} + + +\bigskip + +\begin{tabular}{|c|} \hline +shape=ellipse split +\\ \hline +\begin{tikzpicture}[] +\node[shape=ellipse split,draw,minimum size=3.5cm](A) at (1,1) {XXX\nodepart{lower}YYY} ; +\foreach \anchor/\placement in +{north west/above left, north/above, north east/above right, +west/left, center/above, east/right, +mid west/left, mid/below right, mid east/right, +base west/-160, base/110, base east/below right, +south west/below left, south/below, south east/below right, +text/110, 20/right, 120/above} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +; +\end{tikzpicture} +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|} \hline +shape=rectangle split +\\ \hline +\begin{tikzpicture}[] +\node[name=s,shape=rectangle split, rectangle split parts=4,draw,inner ysep=0.75cm](A) at (1,1) +{\nodepart{text}XXXXXXXXXXXXXX\nodepart{two}YYY +\nodepart{three}ZZZ\nodepart{four}four}; +\foreach \anchor/\placement in +{north/above, south/below, east/10, west/170, +north west/above, north east/above, south west/below, south east/below, +center/145, 20/right, mid/30, base/-145} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\foreach \anchor/\placement in +{text split/10, text split east/0, text split west/180,two split/30, two split east/right, two split west/left, +three split/30, three split east/east, three split west/west,text/-170, text east/east, text west/west, +two/left, two east/east, two west/west, +three/left, three east/east, three west/west, +four/west, four east/east, four west/west +} +\fill[red,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\end{tikzpicture} +\\ \hline +\end{tabular} +\bigskip +\begin{tabular}{|c|} \hline +shape=rectangle callout +\\ \hline +\begin{tikzpicture}[] +\node[shape=rectangle callout, callout relative pointer={(1.5cm,-.5cm)},draw, +callout pointer width=2cm, inner xsep=1cm, inner ysep=.5cm] (A) at (1,1) {\Huge XXXXXXX}; +\foreach \anchor/\placement in +{west/west , east/east , north/above , south/below, north west/west , north east/right, south west/left, south east/right, 25/right} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\foreach \anchor/\placement in +{pointer/right} +\fill[red,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\end{tikzpicture} +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|} \hline +shape=ellipse callout +\\ \hline +\begin{tikzpicture}[] +\node[shape=ellipse callout,draw] (A) at (1,1) {\Huge XXXXXX}; +\foreach \anchor/\placement in +{west/west , east/right , north/above, south/below, north west/above left, north east/above right, south west/below left, south east/below right} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\foreach \anchor/\placement in +{pointer/below right} +\fill[red,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\end{tikzpicture} +\\ \hline +\end{tabular} + + +\bigskip + +\begin{tabular}{|c|} \hline +shape=cloud callout +\\ \hline +\begin{tikzpicture}[] +\node[shape=cloud callout,draw,aspect=1.5] (A) at (1,1) {\Huge XXXXXX}; +\foreach \anchor/\placement in +{west/west , east/right , north/below , south/above, north west/above left, north east/above right, south west/below left, south east/below right} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\foreach \anchor/\placement in +{puff 1/above, puff 2/above, puff 3/left, puff 4/left, +puff 5/below left, puff 6/below, puff 7/below right, puff 8/right, +puff 9/right, puff 10/above,pointer/below right} +\fill[red,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\end{tikzpicture} +\\ \hline +\end{tabular} + + +\bigskip + +\begin{tabular}{|c|} \hline +shape=cross out +\\ \hline +\begin{tikzpicture}[] +\node[shape=cross out,draw,minimum size=3cm] (A) at (1,1) {\Huge XXXXXXXXXX}; +\foreach \anchor/\placement in +{west/west , east/right , north/above , south/below, north west/above left, north east/above right, south west/below left, south east/below right} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\end{tikzpicture} +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|} \hline +shape=rounded rectangle +\\ \hline +\begin{tikzpicture}[] +\node[shape=rounded rectangle,draw,minimum size=3cm] (A) at (1,1) {\Huge XXXXXXXXXX}; +\foreach \anchor/\placement in +{west/west , east/right , north/above , south/below, north west/above left, north east/above right, south west/below left, south east/below right} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; + +\end{tikzpicture} +\\ \hline +\end{tabular} + + +\bigskip + +\begin{tabular}{|c|} \hline +shape=chamfered rectangle +\\ \hline +\begin{tikzpicture}[] +\node[shape=chamfered rectangle,draw,minimum size=3cm, chamfered rectangle sep=.5cm,] (A) at (1,1) {\Huge XXXXXX}; +\foreach \anchor/\placement in +{west/west , east/right , north/above , south/below, north west/above left, north east/above right, south west/below left, south east/below right} +\fill[blue,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\foreach \anchor/\placement in +{before north east/above right, after north east/above right, before south east/below right,after south east/below right, before north west/above left, after north west/above left, before south west/below left,after south west/below left} +\fill[red,pin position=\placement] (node cs:name=A,anchor= \anchor) circle (2pt) node[blue,pin=\scriptsize{ \anchor} ] {} ; +\end{tikzpicture} +\\ \hline +\end{tabular} +\normalsize diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzcde.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzcde.tex index 0e54c28d286..f241d266a43 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzcde.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzcde.tex @@ -13,14 +13,14 @@ number of variables]\AC{Description}} \begin{tabular}{ll} -\BS{newcommand} & \\ %\% début de la nouvelle commande \\ +\BS{newcommand} & \\ \AC{\BS{}maboite}[1]{\color{red} \{ } & \% \TFRGB{commande nommée maboite et 1 seul d'argument}{command named \og maboite \fg with one variable } \\ \BS{begin}\AC{center} & \% \TFRGB{centrage sur la ligne}{centering the box } \\ \BS{tikzpicture} \BS{node}[fill=yellow & \% \TFRGB{un n\oe ud de texte de couleur jaune}{a yellow text box} \\ ,text centered & \% \TFRGB{centrage du texte dans la boite}{centering the text in the box} \\ ,text width=.5\BS{linewidth}] & \% \TFRGB{largeur : la moitié de la ligne}{ to set the width of the box} \\ \#1\} ; \BS{end}\AC{center} & \% \TFRGB{\#1 correspond à l'argument}{\#1 will be replaced by the variable} \\ -{\color{red} \} } & \\ % fin de la nouvelle commande \\ +{\color{red} \} } & \\ \end{tabular} \bigskip diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzchains.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzchains.tex new file mode 100644 index 00000000000..09c9e7efee1 --- /dev/null +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzchains.tex @@ -0,0 +1,540 @@ +\SbSbSSCT{Création d'une chaine de n\oe euds}{Starting and Continuing a Chain} + + \maboite{\BS{usetikzlibrary}\AC{chains}} +\label{lib-chains} + + +\begin{center} +\RRR{46-2} +\end{center} + +\bigskip + +\begin{tabular}{|l|} \hline +\BS{begin}\AC{tikzpicture}[\RDD{start chain}] \\ +\BS{node} [\RDD{on chain}] \AC{A};\\ +\BS{node} [\RDD{on chain}] \AC{B};\\ +\BS{node} [\RDD{on chain}] \AC{C};\\ +\BS{end}\AC{tikzpicture} \\ \hline +\begin{tikzpicture}[start chain] +\node [on chain] {A}; +\node [on chain] {B}; +\node [on chain] {C}; +\end{tikzpicture} +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|} \hline +\BS{begin}\AC{tikzpicture}[start chain, \RDD{node distance}= 0.5 cm] +\\ \hline +\begin{tikzpicture}[start chain, node distance= .5 cm] +\node [on chain] {A}; +\node [on chain] {B}; +\node [on chain] {C}; +\end{tikzpicture} +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|} \hline +\BS{begin}\AC{tikzpicture}[start chain=\rouge {going below} ] +\\ \hline +\begin{tikzpicture}[start chain=going below] +\node [on chain] {A}; +\node [on chain] {B}; +\node [on chain] {C}; +\end{tikzpicture} +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|} \hline +\BS{begin}\AC{tikzpicture}[start chain=\rouge {going left} ] +\\ \hline +\rule[0cm]{0pt}{.7cm} +\begin{tikzpicture}[start chain=going left] +\node [on chain] {A}; +\node [on chain] {B}; +\node [on chain] {C}; +\end{tikzpicture} +\\ \hline +\end{tabular} + + +\bigskip + +\begin{tabular}{|c|} \hline +\BS{begin}\AC{tikzpicture}[start chain, \rouge{every node/.style=draw} ] +\\ \hline +\rule[0cm]{0pt}{.7cm} +\begin{tikzpicture}[start chain, every node/.style=draw] +\node [on chain] {A}; +\node [on chain] {B}; +\node [on chain] {C}; +\end{tikzpicture} +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|}\hline +\begin{tikzpicture}[start chain=1 going right, +start chain=2 going left] +\node [draw,on chain=1] {A}; +\node [draw,on chain=1] {B}; +\node [draw,on chain=1] {C}; +\node [draw,on chain=2] at (3,1) {0}; +\node [draw,on chain=2] {1}; +\node [draw,on chain=2] {2}; +\node [draw,on chain=1] {D}; +\end{tikzpicture} + & +\parbox{10cm}{ +\BS{begin}\AC{tikzpicture}[\rouge{start chain=1} going right , \\ +\blll{start chain=2} going left] \\ +\BS{node} [draw,\rouge{on chain=1}] \AC{A}; \\ +\BS{node} [draw,\rouge{on chain=1}] \AC{B}; \\ +\BS{node}[draw,\rouge{on chain=1}] \AC{C}; \\ +\BS{node} [draw,\blll{on chain=2}] at (3,1) \AC{0}; \\ +\BS{node} [draw,\blll{on chain=2}] \AC{1}; \\ +\BS{node} [draw,\blll{on chain=2}] \AC{2}; \\ +\BS{node}[draw,\rouge{on chain=1}] \AC{D}; \\ +\BS{end}\AC{tikzpicture}} +\\ \hline +\end{tabular} + +\bigskip + + +\begin{tabular}{|c|c|} \hline +\rule[-2cm]{0pt}{4cm} +\begin{tikzpicture}[start chain=going right,baseline=-1.5cm] +\node [draw,on chain] {A}; +\node [draw,on chain] {B}; +\node [draw,continue chain=going below,on chain] {C}; +\node [draw,on chain] {D}; +\node [draw,continue chain=going right,on chain] {E}; +\end{tikzpicture} +& +\parbox{11cm}{ +\BS{begin}\AC{tikzpicture}[start chain going right] +\BS{node} [draw,on chain] \AC{A}; \\ +\BS{node} [draw,on chain] \AC{B}; \\ +\BS{node} [draw,\RDD{continue chain}=going below,on chain] \AC{C}; \\ +\BS{node}[draw,on chain] \AC{D}; \\ +\BS{node} [draw,\RDD{continue chain}=going right,on chain] \AC{E}; \\ +\BS{end}\AC{tikzpicture}} +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|} \hline +\begin{tikzpicture}[every node/.style=draw,baseline=-1.5cm] +{ [start chain=1] +\node [on chain] {A}; +\node [on chain] {B}; +\node [on chain] {C}; +} +{ [start chain=2 going below] +\node [on chain=2] at (0.5,-.5) {0}; +\node [on chain=2] {1}; +\node [on chain=2] {2}; +} +{ [continue chain=1] +\node [on chain] {D}; +} +\end{tikzpicture} +& +\parbox{10cm}{ +\BS{begin}\AC{tikzpicture}[start chain going right] \\ +\{ [\RDD{start chain}=1] \\ +\BS{node} [draw,on chain] \AC{A}; \\ +\BS{node} [draw,on chain] \AC{B}; \\ +\BS{node} [draw,on chain] \AC{C}; \\ +\} \\ +\{ [\RDD{start chain}=2] \\ +\BS{node}[draw,on chain=2] \AC{0}; \\ +\BS{node}[draw,on chain=2] \AC{1}; \\ +\BS{node}[draw,on chain=2] \AC{2}; \\ +\} \\ +\{ [\RDD{continue chain}=1] \\ +\BS{node} [draw,on chain] \AC{D}; \\ +\} \\ +\BS{end}\AC{tikzpicture}} +\\ \hline +\end{tabular} + +\bigskip + +\SbSbSSCT{N\oe uds sur la chaine}{Nodes on a Chain} + +\begin{center} +\RRR{46-3} +\end{center} + +\bigskip + +\begin{tabular}{|c|c|} \hline + \begin{tikzpicture}[start chain=XXX placed {at=(\tikzchaincount*-30+90:1.5)},baseline=0pt] + \foreach \i in {1,...,12} + \node [on chain] {\i}; + \draw (0,0) -- (XXX-10); + \draw (0,0) -- (XXX-2); + \end{tikzpicture} +& +\parbox{11cm}{ +\BS{begin}\AC{tikzpicture}[start chain=\blll{XXX} \RDD{placed} \\ \AC{at=(\BSS{tikzchaincount}*-30+90:1.5)}] \\ + \BS{foreach} \BS{i} in \AC{1,...,12} \\ +\BS{node} [on chain] \AC{\BS{i}}; \\ +\BS{draw }(0,0) -- \blll{(XXX-10)}; \\ +\BS{draw }(0,0) -- \blll{(XXX-2)}; \\ +\BS{end}\AC{tikzpicture}} +\\ \hline +\end{tabular} + +\bigskip + + +\begin{tabular}{|c|c|} \hline +\begin{tikzpicture}[start chain,baseline=-1cm] +\node [draw,on chain] {A}; +\node [draw,on chain] {B}; +\node [draw,on chain=going below] {C}; +\node [draw,on chain] {D}; +\node [draw,on chain] {E}; +\end{tikzpicture} +& +\parbox{11cm}{ +\BS{begin}\AC{tikzpicture}[start chain] \\ +\BS{node} [draw,on chain] \AC{A}; \\ +\BS{node} [draw,on chain] \AC{B}; \\ +\BS{node} [draw,on chain=\rouge{going below}] \AC{C}; \\ +\BS{node} [draw,on chain] \AC{D}; \\ +\BS{node} [draw,on chain] \AC{E}; \\ +\BS{end}\AC{tikzpicture}} +\\ \hline +\end{tabular} + + +\bigskip + +\begin{tabular}{|c|c|} \hline +\begin{tikzpicture}[start chain=going {at=(\tikzchainprevious),shift=(30:1)},baseline=1cm] +\node [draw,on chain] {A}; +\node [draw,on chain] {B}; +\node [draw,on chain] {C}; +\node [draw,on chain] {D}; +\end{tikzpicture} +& +\parbox{11cm}{ +\BS{begin}\AC{tikzpicture}[start chain=going \\ \AC{at=(\BSS{tikzchainprevious},shift=(30:1)}] \\ +\BS{node} [draw,on chain] \AC{A}; \\ +\BS{node} [draw,on chain] \AC{B}; \\ +\BS{node} [draw,on chain] \AC{C}; \\ +\BS{node} [draw,on chain] \AC{D}; \\ +\BS{end}\AC{tikzpicture}} +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|} \hline +\begin{tikzpicture}[baseline=1cm] +\node[draw,red] (A) at (0,2) {A}; +{ [start chain] +\node [draw,on chain] {B}; +\node [draw,on chain] {C}; +\chainin (A) [join]; +\node [draw,on chain] {D}; +\node [draw,on chain] {E}; +} +\end{tikzpicture} +& +\parbox{11cm}{ +\BS{begin}\AC{tikzpicture} \\ +\BS{node} [draw,red] (A) at (0,2) \AC{A}; \\ +\{ [start chain] \\ +\BS{node} [draw,on chain] \AC{B}; \\ +\BS{node} [draw,on chain] \AC{C}; \\ +\BSS{chainin} (A) [join]; \\ +\BS{node} [draw,on chain] \AC{D}; \\ +\BS{node} [draw,on chain] \AC{E}; \\ +\} \\ +\BS{end}\AC{tikzpicture}} +\\ \hline +\end{tabular} + + + +\bigskip + +\begin{tabular}{|c|c|} \hline +\begin{tikzpicture}[baseline=-1cm] +\matrix [matrix of nodes,column sep=1cm,row sep=1cm,every node/.style=draw] +{ +|(a) | A & |(b) | B & |(c) | C \\ +|(d) | D & |(e) | E & |(f) | F \\ +}; +{ [start chain,every on chain/.style={join=by ->}] +\chainin (a); +\chainin (b); +\chainin (d); +\chainin (c); +\chainin (f); +\chainin (e); +} +\end{tikzpicture} +& +\parbox{11cm}{ +\BS{begin}\AC{tikzpicture} \\ +\BS{matrix} [matrix of nodes,column sep=5mm,row sep=5mm] ,every node/.style=draw \\ +\{ \\ +|(a) | A \& |(b) | B \& |(c) | C \BS{}\BS{} \\ +|(d) | D \& |(e) | E \& |(f) | F \BS{}\BS{} \\ +\}; \\ +\{ [start chain,every on chain/.style=\AC{join=by ->}] \\ +\BSS{chainin} (a); +\BSS{chainin}(b); +\BSS{chainin}(d); \\ +\BSS{chainin} (c); +\BSS{chainin}(f); +\BSS{chainin}(e); +\} +\BS{end}\AC{tikzpicture} +} +\\ \hline +\end{tabular} + +\bigskip + +\SbSbSSCT{Jonction de n\oe uds}{Joining Nodes on a Chain} + +\begin{center} +\RRR{46-4} +\end{center} + +\bigskip + +\begin{tabular}{|c|c|} \hline +\begin{tikzpicture}[start chain] +\node [draw,on chain] {A}; +\node [draw,on chain,join] {B}; +\node [draw,on chain] {C}; +\node [draw,on chain,join] {D}; +\end{tikzpicture} +& +\parbox{11cm}{ +\BS{begin}\AC{tikzpicture}[start chain] \\ +\BS{node} [draw,on chain] \AC{A}; \\ +\BS{node} [draw,on chain,\RDD{join}] \AC{B}; \\ +\BS{node} [draw,on chain] \AC{C}; \\ +\BS{node} [draw,on chain,\RDD{join}] \AC{D}; \\ +\BS{end}\AC{tikzpicture}} +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|} \hline +\begin{tikzpicture}[start chain, every on chain/.style=join, every join/.style=->] +\node [draw,on chain] {A}; +\node [draw,on chain] {B}; +\node [draw,on chain] {C}; +\node [draw,on chain] {D}; +\end{tikzpicture} +& +\parbox{11cm}{ +\BS{begin}\AC{tikzpicture}[start chain, \RDD{every on chain}/.style=join, \\ \RDD{every join}/.style=->] \\ +\BS{node} [draw,on chain] \AC{A}; \\ +\BS{node} [draw,on chain,\RDD{join}] \AC{B}; \\ +\BS{node} [draw,on chain] \AC{C}; \\ +\BS{node} [draw,on chain,\RDD{join}] \AC{D}; \\ +\BS{end}\AC{tikzpicture}} +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|} \hline +\begin{tikzpicture}[start chain,baseline=-1cm] +\node [draw,on chain] {A}; +\node [draw,on chain] {B}; +\node [draw,on chain] {C}; +\node [draw,on chain=going below,join=with chain-2 ] {D}; +\end{tikzpicture} +& +\parbox{11cm}{ +\BS{begin}\AC{tikzpicture}[start chain] \\ +\BS{node} [draw,on chain] \AC{A}; \\ +\BS{node} [draw,on chain] \AC{B}; \\ +\BS{node} [draw,on chain] \AC{C}; \\ +\BS{node} [draw,on chain=going below,\rouge{join=with chain-2} ] \AC{D}; \\ +\BS{end}\AC{tikzpicture}} +\\ \hline +\begin{tikzpicture}[start chain,baseline=-1cm] +\node [draw,on chain] {A}; +\node [draw,on chain] {B}; +\node [draw,on chain] {C}; +\node [draw,on chain=going below,join=with chain-1 by {blue,<-}] {D}; +\end{tikzpicture} +& +\parbox{12cm}{ +\BS{begin}\AC{tikzpicture}[start chain] \\ +\BS{node} [draw,on chain] \AC{A}; \\ +\BS{node} [draw,on chain] \AC{B}; \\ +\BS{node} [draw,on chain] \AC{C}; \\ +\BS{node} [draw,on chain=going below,join=with chain-1 \rouge{ by \AC{blue,<-}} ] \AC{D}; \\ +\BS{end}\AC{tikzpicture}} +\\ \hline +\end{tabular} + + + +\bigskip + +\SbSbSSCT{Branches}{Branches} + +\begin{center} +\RRR{46-5} +\end{center} + + +\bigskip + +\begin{tabular}{|c|c|} \hline +\begin{tikzpicture} [baseline=-2cm] +{ [start chain=XXX] +\node [draw,on chain] {A}; +\node [draw,on chain] {B}; +{ [start branch=YYY going below] +\node [draw,on chain] {1}; +\node [draw,on chain] {2}; +\node [draw,on chain] {3}; +} +\node [draw,on chain,join=with XXX/YYY-end,join=with XXX/YYY-2 ] {C}; +} +\end{tikzpicture} +& +\parbox{12cm}{ +\BS{begin}\AC{tikzpicture}\\ +\{ [start chain=\blll{XXX}] \\ +\BS{node} [draw,on chain] \AC{A}; \\ +\BS{node} [draw,on chain] \AC{B}; \\ +\{ [\RDD{start branch}=\blll{YYY} going below] \\ +\BS{node} [draw,on chain] \AC{1}; \\ +\BS{node} [draw,on chain] \AC{2}; \\ +\BS{node} [draw,on chain] \AC{3}; \\ +\} \\ +\BS{node} [ draw,on chain,join=with \blll{XXX/YYY}\rouge{-end}, \\ join=with \blll{XXX/YYY}\rouge{-2}] \AC{C}; \\ +\} \\ +\BS{end}\AC{tikzpicture} } + +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|} \hline +\BS{begin}\AC{tikzpicture}[ \RDD{node distance}=.2cm and 3cm] +\\ \hline +\begin{tikzpicture}[ node distance=.2cm and 3cm] +{ [start chain=XXX] +\node [on chain] {A}; +\node [on chain] {B}; +{ [start branch=YYY going below] +\node [on chain] {1}; +\node [on chain] {2}; +\node [on chain] {3}; +} +\node [on chain,join=with XXX/YYY-end] {C}; +} +\end{tikzpicture} +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|} \hline +\begin{tikzpicture}[ node distance=2mm and 1cm,baseline=-2cm] +{ [start chain=XXX] +\node [draw,on chain] {A}; +\node [draw,on chain] {B}; +{ [start branch=YYY going below] +\node [draw,on chain] {1}; +\node [draw,on chain] {2}; +\node [draw,on chain] {3}; +} +\node [draw,on chain,join=with XXX/YYY-end] {C}; +{ +[continue branch=YYY] +\node [draw,on chain] {4}; +\node [draw,on chain] {5}; +} +} +\end{tikzpicture} +& +\parbox{12cm}{ +\BS{begin}\AC{tikzpicture}[ node distance=2mm and 1cm]\\ +\{ [start chain=\blll{XXX}] \\ +\BS{node} [draw,on chain] \AC{A}; \\ +\BS{node} [draw,on chain] \AC{B}; \\ +\{ [start branch=\blll{YYY} going below] \\ +\BS{node} [draw,on chain] \AC{1}; \\ +\BS{node} [draw,on chain] \AC{2}; \\ +\BS{node} [draw,on chain] \AC{3}; \} \\ +\BS{node} [draw,on chain,join=with \blll{XXX/YYY}-end] \AC{C}; \\ +\{ [\RDD{continue branch}=\blll{YYY}]\\ +\BS{node} [on chain] \AC{4}; \\ +\BS{node} [on chain] \AC{5}; \} \\ +\} \\ +\BS{end}\AC{tikzpicture} } +\\ \hline +\end{tabular} + + +\bigskip + +\begin{tabular}{|c|c|} \hline +\begin{tikzpicture}[node distance=2mm and 1cm, every node/.style=draw,baseline=-1cm] +{ [start chain] +\node [on chain] {1}; +\node [on chain] {2}; +{ [start branch=XXX going below] } +\node [on chain] {3}; +{ [start branch=YYY going above] } +\node [on chain] {4}; +{ [continue branch=XXX] +\node [on chain] {a}; +\node [on chain] {b}; +}{ +[continue branch=YYY] +\node [on chain] {A}; +\node [on chain] {B}; +} +} +\end{tikzpicture} +& +\parbox{12cm}{ +\BS{begin}\AC{tikzpicture}[node distance=2mm and 1cm, every node/.style=draw]\\ +\{ [start chain] \\ +\BS{node} [on chain] \AC{1}; \\ +\BS{node} [on chain] \AC{2}; \\ +\{ [\RDD{start branch}=\blll{XXX} going below] \} \\ +\BS{node} [on chain] \AC{3}; \\ +\{ [\RDD{start branch}=\blll{YYY} going above] \} \\ +\BS{node} [on chain] \AC{4}; \\ +\{ [\RDD{continue branch}=\blll{XXX} ] \\ +\BS{node} [on chain] \AC{a}; \\ +\BS{node} [on chain] \AC{b};\} \\ +\{ [\RDD{continue branch}=\blll{YYY} ] \\ +\BS{node} [on chain] \AC{A}; \\ +\BS{node} [on chain] \AC{B}; \} } +\\ \hline +\end{tabular} + + diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzcoord.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzcoord.tex index 3e1aa71ca22..30708a5db5a 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzcoord.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzcoord.tex @@ -1,13 +1,15 @@ -%\subsection{Coordonnées} \SbSSCT{Coordonnées}{Coordinates} \begin{center} \RRR{13-2-1} \end{center} -%\subsubsection{Système de coordonnées \og canvas \fg} + \SbSbSSCT{Système de coordonnées \og canvas \fg}{Canvas coordinates} +\noindent + + \tikzset{every picture/.style=blue,very thick,inner sep=0pt} \begin{tabular}{|c|c|} \hline @@ -24,37 +26,16 @@ \end{tikzpicture} \\ \hline - \BS{fill} (\RDD{canvas cs}:x=2cm,y=1.5cm) circle (2pt); + \BS{fill} (\RDD{canvas cs}:\blll{x=2cm,y=1.5cm}) circle (2pt); & \BS{fill} {\color{blue}(2cm,1.5cm)} circle (2pt); \\ \hline \end{tabular} -%\subsubsection{Système de coordonnées xyz} -\SbSbSSCT{Système de coordonnées xyz}{xyz coordinates} - -\begin{tabular}{|c|c|c|} \hline -\begin{tikzpicture}[->] -\draw (0,0) -- (xyz cs:x=1); -\draw (0,0) -- (xyz cs:y=1); -\draw (0,0) -- (xyz cs:z=1); -\end{tikzpicture} -& -\begin{tikzpicture}[->] -\draw (0,0) -- (1,0,0); -\draw (0,0) -- (0,1,0); -\draw (0,0) -- (0,0,1); -\end{tikzpicture} -\\ \hline -\BS{draw} (0,0) - - (\RDD{xyz cs}:x=1); & \BS{draw} (0,0) - - (1,0,0); \\ -\BS{draw} (0,0) - - (\RDD{xyz cs}:y=1); & \BS{draw} (0,0) - - (0,1,0); \\ -\BS{draw} (0,0) - - (\RDD{xyz cs}:z=1); & \BS{draw} (0,0) - - (0,0,1); -\\ \hline +\SbSbSSCT{Système de coordonnées polaire \og canvas \fg}{Polar coordinates} -\end{tabular} +\noindent -%\subsubsection{Système de coordonnées polaire \og canvas \fg} -\SbSbSSCT{Système de coordonnées polaire \og canvas \fg}{Polar coordinates} \begin{tabular}{|c|c|c|} \hline \TFRGB{Explicite}{explicit} & \TFRGB{Implicite}{implicit} @@ -90,14 +71,41 @@ \\ \hline \BS{fill} (canvas polar cs:angle=45,\RDD{x radius}=3cm,\RDD{y radius}=2cm) circle (2pt); \\ \hline -\end{tabular} +\end{tabular} + + +\SbSbSSCT{Système de coordonnées xyz}{xyz coordinates} + +\noindent + +\begin{tabular}{|c|c|c|} \hline +\begin{tikzpicture}[->] +\draw (0,0) -- (xyz cs:x=1); +\draw[red] (0,0) -- (xyz cs:y=1); +\draw[magenta] (0,0) -- (xyz cs:z=1); +\end{tikzpicture} +& +\begin{tikzpicture}[->] +\draw (0,0) -- (1,0,0); +\draw[red] (0,0) -- (0,1,0); +\draw[magenta] (0,0) -- (0,0,1); +\end{tikzpicture} +\\ \hline +\BS{draw} (0,0) - - (\RDD{xyz cs}:x=1); & \BS{draw} (0,0) - - (1,0,0); \\ +\BS{draw}[red] (0,0) - - (\RDD{xyz cs}:y=1); & \BS{draw}[red] (0,0) - - (0,1,0); \\ +\BS{draw}[magenta] (0,0) - - (\RDD{xyz cs}:z=1); & \BS{draw}[magenta] (0,0) - - (0,0,1); +\\ \hline +\end{tabular} + \newpage -%\subsubsection{Coordinate system xyz polar} % A VOIR + \SbSbSSCT{Coordinate system xyz polar}{Coordinate system xyz polar} +\noindent + \begin{tabular}{|c|c|c|} \hline \TFRGB{Explicite}{explicit} & \TFRGB{Implicite}{implicit} \\ \hline @@ -183,10 +191,6 @@ \\ \hline \end{tabular} - - -%-------------------------------------------------------- -%\subsubsection{Coordonnées barycentriques} \SbSbSSCT{Coordonnées barycentriques}{Barycentric coordinates} \begin{center} @@ -250,8 +254,6 @@ A=0.6,B=0.3 & A=0.2,B=0.4 ,C=.6 & A=0.2,B=0.4,C=.6,D=.8 \\ \hline \end{tabular} - -%\subsection{Coordonnées nominatives : n\oe ud} \SbSbSSCT{Coordonnées nominatives : n\oe ud}{Named coordinates: nodes} \begin{center} @@ -279,12 +281,14 @@ A=0.6,B=0.3 & A=0.2,B=0.4 ,C=.6 & A=0.2,B=0.4,C=.6,D=.8 \\ \hline \end{tabular} -\TFRGB{voir aussi}{see also} page \pageref{nomnoeud} -%--------------------------------------------------------- -%\subsubsection{Coordonnées relatives à un noeud} +\TFRGB{voir aussi}{see also} page \pageref{noeuds} + + \SbSbSSCT{Coordonnées relatives à un noeud}{Coordinates relative to a node} +\noindent + \begin{tabular}{|c|c|c|c|} \hline \multicolumn{4}{|l|}{ \BS{node} [draw,fill=green!20,] (A) at (1,1) \AC{\BS{huge} noeud}; }\\ \multicolumn{4}{|l|}{ \BS{fill}[red] (\RDD{node cs}:\RDD{name}=A,\RDD{anchor}=south) circle (3pt); }\\ @@ -319,6 +323,43 @@ name=A,anchor=south & name=A,anchor=west & name=A,anchor=north & name=A,anchor=e \end{tabular} \bigskip + +\begin{tabular}{|c|c|c|c|} \hline +\multicolumn{4}{|l|}{ \BS{node} [draw,fill=green!20,] \blll{(A)} at (1,1) \AC{\BS{huge} noeud}; }\\ +\multicolumn{4}{|l|}{ \BS{fill}[red] (\blll{A}.south) circle (3pt); }\\ +\hline + +\begin{tikzpicture} +\draw[help lines] (0,0) grid (2,2); +\node[draw,fill=green!20,] (A) at (1,1) {\huge noeud}; +\fill[red] (A.south) circle (3pt); +\end{tikzpicture} +& +\begin{tikzpicture} +\draw[help lines] (0,0) grid (2,2); +\node[draw,fill=green!20,] (A) at (1,1) {\huge noeud}; +\fill[red] (A.west) circle (3pt); +\end{tikzpicture} +& +\begin{tikzpicture} +\draw[help lines] (0,0) grid (2,2); +\node[draw,fill=green!20,] (A) at (1,1) {\huge noeud}; +\fill[red] (A.north) circle (3pt); +\end{tikzpicture} +& +\begin{tikzpicture} +\draw[help lines] (0,0) grid (2,2); +\node[draw,fill=green!20,] (A) at (1,1) {\huge noeud}; +\fill[red] (A.east) circle (3pt); +\end{tikzpicture} +\\ \hline +A.south & A.west & A.north & A.east +\\ \hline +\end{tabular} + + + +\bigskip \begin{tabular}{|c|c|c|c|} \hline \multicolumn{4}{|c|}{ \BS{fill}[red] (node cs:\RDD{name}=A,\RDD{angle}=0) circle (3pt); }\\ \hline @@ -351,21 +392,46 @@ name=A,angle=0 & name=A,angle=-30 & nname=A,angle=-90 & name=A,angle=-150 \\ \hline \end{tabular} +\bigskip -% % % % % % % % % % % % % % % % A voir % % % % % % % % % % % % % % % % % +\begin{tabular}{|c|c|c|c|} \hline +\multicolumn{4}{|c|}{ \BS{fill}[red] (A.0) circle (3pt); }\\ +\hline + +\begin{tikzpicture} +\draw[help lines] (0,0) grid (2,2); +\node[draw,fill=green!20,] (A) at (1,1) {\huge noeud}; +\fill[red] (A.0) circle (3pt); +\end{tikzpicture} +& +\begin{tikzpicture} +\draw[help lines] (0,0) grid (2,2); +\node[draw,fill=green!20,] (A) at (1,1) {\huge noeud}; +\fill[red] (A.-30) circle (3pt); +\end{tikzpicture} +& +\begin{tikzpicture} +\draw[help lines] (0,0) grid (2,2); +\node[draw,fill=green!20,] (A) at (1,1) {\huge noeud}; +\fill[red] (A.-90) circle (3pt); +\end{tikzpicture} +& +\begin{tikzpicture} +\draw[help lines] (0,0) grid (2,2); +\node[draw,fill=green!20,] (A) at (1,1) {\huge noeud}; +\fill[red] (A.-150) circle (3pt); +\end{tikzpicture} +\\ \hline +A.0 & A.-30 & A.-90 & A.-150 +\\ \hline +\end{tabular} + +\TFRGB{voir aussi}{see also} page \pageref{nomnoeud} + + +\newpage -%\subsubsection{Coordonnée à un intersection} -% -%\begin{tikzpicture} -%\draw[help lines] (0,0) grid (3,3); -%%\draw (intersection cs: first line={(A)- -(B)},second line={(1,2)- -(3,0)})coordinate (C); -%%\fill[red](C) circle (2pt); -%%\draw (C) circle (1cm); -%%\node [above]at(C){C}; -%\end{tikzpicture} - -%\subsubsection{ Coordonnée relative à 2 points} \SbSbSSCT{Coordonnées relatives à deux points}{Coordinates relative to two points} \begin{center} \RRR{13-3-1} @@ -395,8 +461,7 @@ at (1,1 {\color{red}-|} 3,3) \end{tabular} -\newpage -%\subsubsection{ Coordonnée relative à une intersection} + \SbSbSSCT{Coordonnée relative à une intersection}{Coordinates relative to an intersection} \begin{center} \RRR{13-3-2} @@ -407,38 +472,38 @@ at (1,1 {\color{red}-|} 3,3) \begin{tabular}{|c|c|c|c|} \hline -\multicolumn{4}{|l|}{ \BS{draw} [\RDD{name path}=cercle] (2,1) circle (1cm); }\\ -\multicolumn{4}{|l|}{ \BS{draw} [\RDD{name path}=rectangle] (0.5,0.5) rectangle +(3,1); }\\ -\multicolumn{4}{|l|}{ \BS{fill} [red,\RDD{ name intersections}=\AC{of=cercle and rectangle}] +\multicolumn{4}{|l|}{ \BS{draw} [\RDD{name path}=XXX] (2,1) circle (1cm); }\\ +\multicolumn{4}{|l|}{ \BS{draw} [\RDD{name path}=YYY] (0.5,0.5) rectangle +(3,1); }\\ +\multicolumn{4}{|l|}{ \BS{fill} [red,\RDD{ name intersections}=\AC{of=xxx and YYY}] (\RDD{intersection}-1) circle (2pt) }\\ \hline \begin{tikzpicture}[scale=.8] \draw [help lines] grid (4,2); -\draw [name path=cercle] (2,1) circle (1cm); -\draw [name path=rectangle] (0.5,0.5) rectangle +(3,1); -\fill [red, name intersections={of=cercle and rectangle}] +\draw [name path=XXX] (2,1) circle (1cm); +\draw [name path=YYY] (0.5,0.5) rectangle +(3,1); +\fill [red, name intersections={of=XXX and YYY}] (intersection-1) circle (2pt) ; \end{tikzpicture} & \begin{tikzpicture}[scale=.8] \draw [help lines] grid (4,2); -\draw [name path=cercle] (2,1) circle (1cm); -\draw [name path=rectangle] (0.5,0.5) rectangle +(3,1); -\fill [red, name intersections={of=cercle and rectangle}] (intersection-2) circle (2pt) ; +\draw [name path=XXX] (2,1) circle (1cm); +\draw [name path=YYY] (0.5,0.5) rectangle +(3,1); +\fill [red, name intersections={of=XXX and YYY}] (intersection-2) circle (2pt) ; \end{tikzpicture} & \begin{tikzpicture}[scale=.8] \draw [help lines] grid (4,2); -\draw [name path=cercle] (2,1) circle (1cm); -\draw [name path=rectangle] (0.5,0.5) rectangle +(3,1); -\fill [red, name intersections={of=cercle and rectangle}] (intersection-3) circle (2pt) ; +\draw [name path=XXX] (2,1) circle (1cm); +\draw [name path=YYY] (0.5,0.5) rectangle +(3,1); +\fill [red, name intersections={of=XXX and YYY}] (intersection-3) circle (2pt) ; \end{tikzpicture} & \begin{tikzpicture}[scale=.8] \draw [help lines] grid (4,2); -\draw [name path=cercle] (2,1) circle (1cm); -\draw [name path=rectangle] (0.5,0.5) rectangle +(3,1); -\fill [red, name intersections={of=cercle and rectangle}] (intersection-4) circle (2pt) ; +\draw [name path=XXX] (2,1) circle (1cm); +\draw [name path=YYY] (0.5,0.5) rectangle +(3,1); +\fill [red, name intersections={of=XXX and YYY}] (intersection-4) circle (2pt) ; \end{tikzpicture} \\ \hline intersection-1 & intersection-2 &intersection-3 & intersection-4 \\ @@ -448,49 +513,46 @@ at (1,1 {\color{red}-|} 3,3) \bigskip \begin{tabular}{|c|} \hline -\BS{fill} [red, name intersections=\AC{of=cercle and rectangle}] \\ +\BS{fill} [red, name intersections=\AC{of=XXX and YYY}] \\ (intersection-1) circle (2pt) {\color{red} node[black,above right] \AC{point a}} ; \\ \hline \begin{tikzpicture} \draw [help lines] grid (4,2); -\draw [name path=cercle] (2,1) circle (1cm); -\draw [name path=rectangle] (0.5,0.5) rectangle +(3,1); -\fill [red, name intersections={of=cercle and rectangle}] +\draw [name path=XXX] (2,1) circle (1cm); +\draw [name path=YYY] (0.5,0.5) rectangle +(3,1); +\fill [red, name intersections={of=XXX and YYY}] (intersection-1) circle (2pt) node[black,above right] {point a} ; \end{tikzpicture} \\ \hline \end{tabular} - - - \bigskip \begin{tabular}{|c|} \hline -\BS{fill} [red, name intersections=\AC{of=cercle and rectangle, \RDD{name}=point}]; \\ -\BS{draw} [red] (point-1) - - (point-3); \BS{draw} [green] (point-2) - - (point-4); +\BS{fill} [red, name intersections=\AC{of=XXX and YYY, \RDD{name}=ZZZ}]; \\ +\BS{draw} [red] (ZZZ-1) - - (ZZZ-3); \BS{draw} [green] (ZZZ-2) - - (ZZZ-4); \\ \hline \begin{tikzpicture} \draw [help lines] grid (4,2); -\draw [name path=cercle] (2,1) circle (1cm); -\draw [name path=rectangle] (0.5,0.5) rectangle +(3,1); -\fill [red, name intersections={of=cercle and rectangle, name=point}]; -\draw [red] (point-1) -- (point-3); -\draw [green] (point-2) -- (point-4); +\draw [name path=XXX] (2,1) circle (1cm); +\draw [name path=YYY] (0.5,0.5) rectangle +(3,1); +\fill [red, name intersections={of=XXX and YYY, name=ZZZ}]; +\draw [red] (ZZZ-1) -- (ZZZ-3); +\draw [green] (ZZZ-2) -- (ZZZ-4); \end{tikzpicture} \\ \hline \end{tabular} \bigskip \begin{tabular}{|c|} \hline -\BS{fill} [red, name intersections=\AC{of=cercle and rectangle, \RDD{by}=\AC{a,b,c,d}}]; \\ +\BS{fill} [red, name intersections=\AC{of=XXX and YYY , \RDD{by}=\AC{a,b,c,d}}]; \\ \BS{draw} [red] (a) - - (c); \hspace{1cm} \BS{draw} [green] (b) - - (d); \\ \hline \begin{tikzpicture} \draw [help lines] grid (4,2); -\draw [name path=cercle] (2,1) circle (1cm); -\draw [name path=rectangle] (0.5,0.5) rectangle +(3,1); -\fill [red, name intersections={of=cercle and rectangle, by={a,b,c,d}}]; +\draw [name path=XXX] (2,1) circle (1cm); +\draw [name path=YYY] (0.5,0.5) rectangle +(3,1); +\fill [red, name intersections={of=XXX and YYY, by={a,b,c,d}}]; \draw [red] (a) -- (c); \draw [green] (b) -- (d); \end{tikzpicture} @@ -500,14 +562,14 @@ at (1,1 {\color{red}-|} 3,3) \bigskip \begin{tabular}{|c|} \hline -\BS{fill} [name intersections=\AC{of=cercle and rectangle, name=i, \RDD{total}=\BS{t}}] [red] \\ +\BS{fill} [name intersections=\AC{of=XXX and YYY, name=i, \RDD{total}=\BS{t}}] [red] \\ \BS{foreach} \BS{s} in \AC{1,...,\BS{t}} \AC{(i-\BS{s}) circle (2pt) node[black,above right] \AC{\BS{s}}} \\ \hline \begin{tikzpicture} \draw [help lines] grid (4,2); -\draw [name path=cercle] (2,1) circle (1cm); -\draw [name path=rectangle] (0.5,0.5) rectangle +(3,1); -\fill [name intersections={of=cercle and rectangle, name=i, total=\t}] +\draw [name path=XXX] (2,1) circle (1cm); +\draw [name path=YYY] (0.5,0.5) rectangle +(3,1); +\fill [name intersections={of=XXX and YYY , name=i, total=\t}] [red] \foreach \s in {1,...,\t}{(i-\s) circle (2pt) node[black,above right] {\s}}; \end{tikzpicture} @@ -516,26 +578,8 @@ at (1,1 {\color{red}-|} 3,3) -%\begin{tikzpicture} -%\clip (-0.5,-0.75) rectangle (3.25,2.25); -%\foreach \pathname/\shift in {line/0cm, curve/2cm}{ -%\tikzset{xshift=\shift} -%\draw [->, name path=curve] (1,1.5) .. controls (-1,1) and (2,0.5) .. (0,0); -% -%\draw [->, name path=line] (0,-.5) -- (1,2) ; -% -%\fill [name intersections={of=line and curve,sort by=\pathname, name=i}] -%[red, opacity=0.5, every node/.style={left=.25cm, black, opacity=1}] -%\foreach \s in {1,2,3}{(i-\s) circle (2pt) node {\footnotesize\s}}; -%} -%\end{tikzpicture} -%--------------------------------------------------------------------------- \newpage -%\subsection{Position calculée} -\SbSSCT{Position calculée}{Calculated positions} - -%\subsubsection{Position calculée avec le module \og pgfmath \fg} \SbSbSSCT{Position calculée avec le module \og pgfmath \fg}{Calculated positions with \og pgfmath \fg } \begin{center} @@ -577,15 +621,13 @@ at (1,1 {\color{red}-|} 3,3) } \\ \hline \end{tabular} -% -%\subsubsection{Position calculée avec \og librairy calc \fg} -\SbSSCT{Position calculée avec \og library calc \fg}{Calculated positions with \og calc library calc \fg} + +\SbSbSSCT{Position calculée avec \og library calc \fg}{Calculated positions with \og calc library calc \fg} \begin{center} \RRR{13-5} \end{center} \label{lib-calc} -%Insérer dans le préambule : \maboite{\BS{usetikzlibrary}\AC{calc}} @@ -606,9 +648,7 @@ at (1,1 {\color{red}-|} 3,3) \hline \end{tabular} - -%\subsubsection{Tangentes avec \og librairy calc \fg} -\SbSSCT{Tangentes avec \og library calc \fg}{Tangents with \og calc library \fg} +\SbSbSSCT{Tangentes avec \og library calc \fg}{Tangents with \og calc library \fg} \begin{center} \RRR{13-2-4} @@ -617,7 +657,6 @@ at (1,1 {\color{red}-|} 3,3) \begin{tabular}{|c|c|} \hline \multicolumn{2}{|l|}{\BS{node}[fill=green!20] (a) at (3,1.5) \AC{A}; } \\ \multicolumn{2}{|l|}{\BS{fill}[red] (\RDD{tangent cs}:\RDD{node}=c,\RDD{point}=\AC{(A)},\RDD{solution}=1); }\\ -%\multicolumn{2}{|l|}{\BS{draw}[red] (1,1) - -(\RDD{tangent} cs:\RDD{node}=c,\RDD{point}=\AC{(3,1.5)} ,\RDD{solution}=1); }\\ \hline \begin{tikzpicture} \draw[help lines] (0,0) grid (4,2); @@ -643,7 +682,6 @@ at (1,1 {\color{red}-|} 3,3) \newpage -%\subsubsection{Point à pourcentage donné } \SbSbSSCT{Point à pourcentage donné }{Percentage position } \begin{center} @@ -684,8 +722,6 @@ at (1,1 {\color{red}-|} 3,3) \end{tabular} - -%\subsubsection{Point à distance donnée} \SbSbSSCT{Point à distance donnée}{Position at a given distance } \begin{center} @@ -725,12 +761,12 @@ at (1,1 {\color{red}-|} 3,3) \\ \hline \end{tabular} -%\subsection{Coordonnées relatives} +\newpage + \SbSbSSCT{Coordonnées relatives}{Relative coordinates} -%Dimension par défaut : 1cm -%\subsubsection{Cartésienne}{Cartésienne} -\SbSbSSCT{Cartésienne}{Cartesian coordinates} + +\Par{Cartésienne}{Cartesian coordinates} \begin{center} \RRR{13-4-1} @@ -740,7 +776,7 @@ at (1,1 {\color{red}-|} 3,3) \TFRGB{relative à l'origine}{relative to the origin} & \TFRGB{relative à une position}{relative to a position} & \TFRGB{relative à la dernière position}{relative to the last position} \\ \hline -\begin{tikzpicture} %[scale=.8] +\begin{tikzpicture} \draw[help lines] (0,-1) grid (3,1); \draw[blue,very thick] (0,0) -- (1,0) - - (2,1) - - (2,-1); \fill[red] (0,0) circle (4pt); @@ -803,9 +839,12 @@ rectangle ++(2,2) rectangle ++(3,3); \\ \end{tabular} +\Par{Polaire }{Polar} {} -%\subsubsection{Polaire } -\SbSbSSCT{Polaire }{Polar} +\bigskip + + +\noindent \begin{tabular}{|c|c|c|c|} \hline \TFRGB{relative à l'origine}{relative to the origin} & \TFRGB{relative à une position}{relative to a position} & \TFRGB{relative à la dernière position}{relative to the last position} @@ -818,13 +857,14 @@ rectangle ++(2,2) rectangle ++(3,3); \\ & \begin{tikzpicture} %[scale=.8] \draw[help lines] (0,-1) grid (4,1); - + \fill[red] (1,0) circle (4pt); \draw[blue,very thick] (0:0) -- (0:1) -- +(30:2) -- +(-30:2); \end{tikzpicture} & \begin{tikzpicture} %[scale=.8] \draw[help lines] (0,-1) grid (5,1); - + \fill[red] (1,0) circle (4pt); + \fill[red] (2.732,1) circle (4pt); \draw[blue,very thick] (0:0)-- (0:1) -- ++(30:2) -- ++(-30:2); \end{tikzpicture} \\ \hline @@ -835,14 +875,16 @@ rectangle ++(2,2) rectangle ++(3,3); \\ \end{tabular} %\subsubsection{coordonnée relative en polaire} -\SbSbSSCT{coordonnée relative en polaire}{Relative polar coordinate} +\Par{coordonnée relative en polaire}{Relative polar coordinate} \begin{center} \RRR{13-4-2} \end{center} \bigskip -\begin{tabular}{|c|c|} \hline +\begin{tabular}{|c|c|} \hline +\multicolumn{2}{|c|}{ \BS{draw}[blue,very thick] (0,0) -- (2,1) -- ([turn]-45:1cm);} + \\ \hline \begin{tikzpicture} %[scale=.8] \draw[help lines] (0,0) grid (4,2); \draw[dotted] (0,0) -- (4,2); diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzcoul.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzcoul.tex index bed85578523..702d772cc54 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzcoul.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzcoul.tex @@ -1,9 +1,4 @@ - -%\subsection{Couleurs} -% -% -%\subsubsection{Couleurs de base } \SbSSCT{Couleurs de base }{Basic colors} \begin{tabular}{|c|c|c|c|c|} \hline @@ -83,8 +78,7 @@ teal & violet & white & yellow & \hline [blue!10] & [blue!30] &[blue!50] & [blue!70] & [blue!90]\\ \hline \end{tabular} - -%\subsubsection{Mélange de couleurs} + \SbSSCT{Mélange de couleurs}{Colors mixing} @@ -108,18 +102,13 @@ teal & violet & white & yellow & \hline [blue!30!red] & [red!80!blue!20] &[red!80!blue!50] & [red!80!blue!50!black!40] \\ \hline \end{tabular} - - -%%+++++++++++++ -%\subsectioa colorn{Créer son nom de couleur} \SbSSCT{Créer son nom de couleur}{Naming a color} \begin{center} \RRR{15-2} \end{center} -%\subsubsection{A pourcentage de rouge vert et bleue} \SbSbSSCT{A pourcentage de rouge vert et bleue}{Percentage of red , green and blue} @@ -138,7 +127,6 @@ teal & violet & white & yellow & \\ \hline \end{tabular} -%\subsubsection{A partir d'une couleur existante} \SbSbSSCT{A partir d'une couleur existante}{From existing color} \begin{tabular}{|c|c|} \hline @@ -167,11 +155,8 @@ teal & violet & white & yellow & \\ \hline \end{tabular} - -%========================== \newpage -%%\section{Opacité} \SSCT{Opacité}{Opacity} \begin{center} @@ -298,26 +283,25 @@ draw opacity=0 & draw opacity=0.25 & draw opacity=0.5 & draw opacity=0.75 & draw \begin{tabular}{|c|c|c|c|c|} \hline \multicolumn{5}{|c|}{\BS{node} at (1,1) [\RDD{text opacity}=1] \AC{ \BS{Huge} texte} ;} \\ \hline -\fbox{\tikz{ %\fill[red] (0,0) rectangle (2,2); +\fbox{\tikz{ \node at (1,1) [text opacity=1] {\Huge texte} ; }} & -\fbox{\tikz{ %\fill[red] (0,0) rectangle (2,2); +\fbox{\tikz{ \node at (1,1) [text opacity=.75] {\Huge texte} ; }} & -\fbox{\tikz{ %\fill[red] (0,0) rectangle (2,2); +\fbox{\tikz{ \node at (1,1) [text opacity=.5] {\Huge texte} ; }} & -\fbox{\tikz{ %\fill[red] (0,0) rectangle (2,2); +\fbox{\tikz{ \node at (1,1) [draw,text opacity=.25] {\Huge texte} ; }} & -\fbox{\tikz{ %\fill[red] (0,0) rectangle (2,2); +\fbox{\tikz{ \node at (1,1) [draw,text opacity=0] {\Huge texte} ;= }} \\ \hline text opacity=1 & text opacity=0.75 & text opacity=0.5 & opacity=0.25 & text opacity=0 \\ \hline \end{tabular} -%=============== \newpage \subsection{Blend Modes} @@ -443,14 +427,12 @@ blend group=colordodge & blend group=colorburn & blend group=hardlight & blend %================== \subsection{Fading} -%Insérer dans le préambule : + \maboite{\BS{usetikzlibrary}\AC{fadings}} \label{lib-fadings} -%\subsubsection{Modèles prédéfinis } - \SbSbSSCT{Modèles prédéfinis }{Preset patterns} \begin{center} @@ -703,9 +685,6 @@ middle color=transparent!20] \\ \hline \end{tabular} - - -%\subsubsection{Modification de la décoloration } \SbSbSSCT{Modification de la décoloration }{Modification of the fading pattern} \begin{center} @@ -779,8 +758,6 @@ VisualTIKZ VisualTIKZ VisualTIKZ VisualTIKZ VisualTIKZ VisualTIKZ VisualTIKZ Vis \\ \hline \end{tabular} -%%========================= - \subsection{Transparency Groups} \begin{center} @@ -829,4 +806,3 @@ VisualTIKZ VisualTIKZ VisualTIKZ VisualTIKZ VisualTIKZ VisualTIKZ VisualTIKZ Vis \end{tikzpicture} \\ \hline \end{tabular} - diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzdatavisual.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzdatavisual.tex new file mode 100644 index 00000000000..3de1fdd0afb --- /dev/null +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzdatavisual.tex @@ -0,0 +1,263 @@ +\RRR{75-2 = Concept: Data Points and Data Formats} + +\begin{tikzpicture} +\datavisualization [school book axes, visualize as smooth line] +data { +x, y +-1.5, 2.25 +-1, 1 +-.5, .25 +0, 0 +.5, .25 +1, 1 +1.5, 2.25 +}; +\end{tikzpicture} + + +\begin{tikzpicture} +\datavisualization [school book axes, visualize as smooth line] +data [format=function] { +var x : interval [-1.5:1.5] samples 7; +func y = \value x*\value x; +}; +\end{tikzpicture} + + +\begin{tikzpicture} +\datavisualization [school book axes, visualize as smooth line] +data [format=function] { +var x : interval [-1.5:1.5] samples 3; +func y = \value x*\value x; +}; +\end{tikzpicture} + +Section 76 gives an in-depth coverage of the available data formats and explains how new data formats +can be defined. + + +\RRR{75-3 = Concept: Axes, Ticks, and Grids} + + +\begin{tikzpicture} +\datavisualization [ +scientific axes, +x axis={length=3cm, ticks=few}, +visualize as smooth line +] +data [format=function] { +var x : interval [-1.5:1.5] samples 20; +func y = \value x*\value x; +}; +\end{tikzpicture} + +\begin{tikzpicture} +\datavisualization [ +scientific axes=clean, +x axis={length=3cm, ticks=few}, +all axes={grid}, +visualize as smooth line +] +data [format=function] { +var x : interval [-1.5:1.5] samples 7; +func y = \value x*\value x; +}; +\end{tikzpicture} + +Section 77 explains in more detail how axes, ticks, and grid lines can be chosen and configured. + + +\RRR {75-4 = Concept: Visualizers} + +\begin{tikzpicture} +\datavisualization [ +scientific axes=clean, +x axis={length=3cm, ticks=few}, +visualize as smooth line +] +data [format=function] { +var x : interval [-1.5:1.5] samples 7; +func y = \value x*\value x; +}; +\end{tikzpicture} + +\begin{tikzpicture} +\datavisualization [ +scientific axes=clean, +x axis={length=3cm, ticks=few}, +visualize as scatter +] +data [format=function] { +var x : interval [-1.5:1.5] samples 7; +func y = \value x*\value x; +}; +\end{tikzpicture} + +Section 78 provides more information on visualizers as well as reference lists. + +\RRR{75-5 = Concept: Style Sheets and Legends } + +\begin{tikzpicture}[baseline] +\datavisualization [ scientific axes=clean, +y axis=grid, +visualize as smooth line/.list={sin,cos,tan}, +style sheet=strong colors, +style sheet=vary dashing, +sin={label in legend={text=$\sin x$}}, +cos={label in legend={text=$\cos x$}}, +tan={label in legend={text=$\tan x$}}, +data/format=function ] +data [set=sin] { +var x : interval [-0.5*pi:4]; +func y = sin(\value x r); +} +data [set=cos] { +var x : interval [-0.5*pi:4]; +func y = cos(\value x r); +} +data [set=tan] { +var x : interval [-0.3*pi:.3*pi]; +func y = tan(\value x r); +}; +\end{tikzpicture} + + +Section 79 details style sheets and legends. + +\RRR{75-6 = Usage} + +\subsection{/pgf/data/read from file=filename} (no default, initially empty) + +If you set the source attribute to a non-empty hfilenamei, the data will be read from this file. In +this case, no hinline datai may be present, not even empty curly braces should be provided. +%\datavisualization ... +data [read from file=file1.csv] +data [read from file=file2.csv]; +The other way round, if read from file is empty, the data must directly follow as hinline datai. +%\datavisualization ... +data { +x, y +1, 2 +2, 3 +}; + +The second important key is format, which is used to specify the data format: + +\subsection{/pgf/data/format} + +Use this key to locally set the format used for parsing the data, see Section 76 for a list of predefined +formats. + +\tikz +\datavisualization [school book axes, visualize as line] +data [/data point/x=1] { +y +1 +2 +} +data [/data point/x=2] { +y +2 +0 +.5 +}; + +\BS{datavisualization} . . . data point[options] . . . ; + +\tikz \datavisualization [school book axes, visualize as line] +data point [x=1, y=1] data point [x=1, y=2] +data point [x=2, y=2] data point [x=2, y=0.5]; + +/tikz/data visualization/data point=options + +\tikzdatavisualizationset{ +horizontal/.style={ +data point={x=#1, y=1}, data point={x=#1, y=2}}, +} +\tikz \datavisualization +[ school book axes, visualize as line, +horizontal=1, +horizontal=2 ]; + +\BS{datavisualization} . . . data group[options]\AC{name}+=\AC{data specifications} . . . ; + + +\tikz \datavisualization data group {points} = { +data { +x, y +0, 1 +1, 2 +2, 2 +5, 1 +2, 0 +1, 1 +} +}; + +\tikz \datavisualization [school book axes, visualize as line] data group {points}; +\qquad +\tikz \datavisualization [scientific axes=clean, visualize as line] data group {points}; + + +\BS{datavisualization} . . . scope[options]{data specification} . . . ; + +%\datavisualization... +%scope [/data point/experiment=7] +%{ +%data [read from file=experiment007-part1.csv] +%data [read from file=experiment007-part2.csv] +%data [read from file=experiment007-part3.csv] +%} +%scope [/data point/experiment=23, format=foo] +%{ +%data [read from file=experiment023-part1.foo] +%data [read from file=experiment023-part2.foo] +%}; + + +\BS{datavisualization} . . . info[options]{code} . . . ; + +\begin{tikzpicture}[baseline] +\datavisualization [ school book axes, visualize as line ] +data [format=function] { +var x : interval [-0.1*pi:2]; +func y = sin(\value x r); +} +info { +\draw [red] (visualization cs: x={(.5*pi)}, y=1) circle [radius=1pt] +node [above,font=\footnotesize] {extremal point}; +}; +\end{tikzpicture} + +\subsection{Coordinate system visualization} + +\BS{datavisualization} . . . info’[options]{code} . . . ; + +\begin{tikzpicture}[baseline] +\datavisualization [ school book axes, visualize as line ] +data [format=function] { +var x : interval [-0.1*pi:2]; +func y = sin(\value x r); +} +info' { +\fill [red] (visualization cs: x={(.5*pi)}, y=1) circle [radius=2mm]; +}; +\end{tikzpicture} + + +\subsection{Predefined node data visualization bounding box} +This rectangle node stores a bounding box of the data visualization that is currently being constructed. +This node can be useful inside info commands or when labels need to be added. + +\subsection{Predefined node data bounding box} +This rectangle node is similar to data visualization bounding box, but it keeps track only of the actual +data. The spaces needed for grid lines, ticks, axis labels, tick labels, and other all other information +that is not part of the actual data is not part of this box. + + +\RRR{75-7 = Advanced: Executing User Code During a Data Visualization} + +\RRR{75-8 = Advanced: Creating New Objects} + + +\section{76 Providing Data for a Data Visualization} diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzdeco.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzdeco.tex index dc21b6ef913..46684f232f7 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzdeco.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzdeco.tex @@ -2,14 +2,11 @@ \subsection{Library \og decorations.pathmorphing \fg} -%Insérer dans le préambule : \maboite{\BS{usetikzlibrary}\AC{decorations.pathmorphing}} \label{lib-morph} \begin{center} \RRR{48-2} \end{center} -%\subsection{Decorations Producing Straight Line Paths} - \subsubsection{\og lineto \fg} \begin{tabular}{|c|c|c|} \hline @@ -35,7 +32,6 @@ (0,0) - - (2,2) & (1,1) circle (1) & (0,0) arc (0:180:3 and 2)\\ \hline \end{tabular} -%---------------- \subsubsection{ \og straight zigzag \fg} \begin{tabular}{|c|c|c|} \hline @@ -124,8 +120,6 @@ \\ \hline \end{tabular} -%---------------------- - \subsubsection{\og random steps \fg } \label{alea} @@ -198,9 +192,7 @@ \bigskip \begin{tabular}{|c|c|c|} \hline -\multicolumn{3}{|c|}{ \BSS{draw}[decorate,decoration= % -%decorate,decoration= }\\ -%\multicolumn{3}{|c|}{ +\multicolumn{3}{|c|}{ \BSS{draw}[decorate,decoration= \AC{random steps,\RDD{segment length}=2cm}] (1,1) circle (1); } \\ \hline \begin{tikzpicture} @@ -224,8 +216,6 @@ \\ \hline \end{tabular} -%----------------- - \subsubsection{\og saw \fg } \begin{tabular}{|c|c|c|} \hline @@ -308,7 +298,6 @@ \\ \hline \end{tabular} -%-------------------- \subsubsection{\og zigzag \fg } \begin{tabular}{|c|c|c|} \hline @@ -397,7 +386,6 @@ \\ \hline \end{tabular} -%------------------------------------ \subsubsection{\og bent \fg } @@ -438,13 +426,6 @@ \end{tikzpicture} & 2.5 pt \\ \hline -%\RDD{aspect}=0 -%& -%\begin{tikzpicture}[baseline=0pt] -%\draw[red!20] (0,-0.5) grid (10,0.5); -%\draw[dotted,red] (0,0) -- (10,0); \draw[decorate,decoration={bent,aspect=0,amplitude=.5cm}] (0,0) -- (10,0); -%\end{tikzpicture} -%& 0.5\\ \parbox{4cm}{ \RDD{aspect}=0.1 (en bleue)\\ \RDD{aspect}=0.9 (en vert)\\ @@ -485,7 +466,6 @@ amplitude=1cm & amplitude=0.5cm & aspect=0.25 \\ \hline \end{tabular} -%----------------- \subsubsection{\og bumps \fg } @@ -541,8 +521,7 @@ amplitude=1cm & amplitude=0.5cm & aspect=0.25 \bigskip \begin{tabular}{|c|c|c|} \hline -\multicolumn{3}{|c|}{ \BSS{draw}[decorate,decoration= %\{decorate,decoration= }\\ -%\multicolumn{3}{|c|}{ +\multicolumn{3}{|c|}{ \BSS{draw}[decorate,decoration= \AC{bumps,\RDD{amplitude}=10pt}] (1,1) circle (1);} \\ \hline \begin{tikzpicture} @@ -566,7 +545,6 @@ amplitude=1cm & amplitude=0.5cm & aspect=0.25 \\ \hline \end{tabular} -%----------------- \subsubsection{\og coil \fg } @@ -679,7 +657,6 @@ amplitude=1cm & amplitude=0.5cm & aspect=0.25 \\ \hline \end{tabular} -%------------------------ \subsubsection{\og curveto \fg } \begin{tabular}{|c|c|c|} \hline @@ -696,45 +673,15 @@ amplitude=1cm & amplitude=0.5cm & aspect=0.25 \end{tikzpicture} & \begin{tikzpicture} -\draw [dotted,red] -(0,0) arc (0:180:3 and 2); -\draw [decorate,decoration=curveto] -(0,0) arc (0:180:3 and 2); +\draw [dotted,red]; +\draw [decorate,decoration=curveto] (0,0) arc (0:180:3 and 2); \end{tikzpicture} \\ \hline -(0,0) - - (2,2) & (1,1) circle (1) & (0,0) arc (0:180:3 and 2) \\ -\hline +(0,0) - - (2,2) & (1,1) circle (1) & (0,0) arc (0:180:3 and 2) +\\ \hline \end{tabular} -% \bigskip -% -%\begin{tabular}{|c|c|c|} \hline -%\begin{tikzpicture} -%\draw [dotted,red](1,1) circle (1); -%\draw [decorate,decoration={curveto,meta-amplitude=1cm}] -%(1,1) circle (1); -%\end{tikzpicture} -%& -%\begin{tikzpicture} -%\draw [dotted,red](1,1) circle (1); -%\draw [decorate,decoration={curveto,meta-amplitude=.5cm}] -%(1,1) circle (1); -%\end{tikzpicture} -%& -%\begin{tikzpicture} -%\draw [dotted,red](1,1) circle (1); -%\draw [decorate,decoration={curveto,meta-segment length=5pt}] -%(1,1) circle (1); -%\end{tikzpicture} -%\\ \hline -%amplitude=1cm & amplitude=.5cm & aspect=.25 -%\\ \hline -% -%\dft : 2.5 & \dft : 2.5pt& \dft : .5\\ -%\hline -%\end{tabular} - -%------------------------ + \subsubsection{\og snake \fg } \begin{tabular}{|c|c|c|} \hline @@ -816,13 +763,10 @@ snake, \\ \hline \end{tabular} -%--------------------------------------------- \newpage \subsection{Library \og decorations.pathreplacing \fg} -%Insérer dans le préambule : - \maboite{\BS{usetikzlibrary}\AC{decorations.pathreplacing}} \label{lib-replac} @@ -927,7 +871,6 @@ amplitude=0.5cm \begin{tabular}{|c|c|} \hline \begin{tikzpicture}[baseline=0pt] -%\draw [help lines] grid (3,2); \draw [decorate,decoration=brace] (0,0) -- (3,0); \end{tikzpicture} & @@ -1184,10 +1127,8 @@ amplitude=0.5cm \\ \hline \end{tabular} -%\newpage \subsubsection{\og show path construction \fg } -%\emph{\TFRGB{Chemin à décorer}{path to decorate}} \begin{tabular}{|l|} \hline \multicolumn{1}{|c|}{ \emph{\TFRGB{Chemin à décorer}{path to decorate}} } @@ -1222,7 +1163,7 @@ decoration=\{ \RDD{show path construction},\\ \end{tabular} \bigskip -%\Par{Fermetures de chemin \og closepath \fg }{ Path terminations : \og closepath \fg } : + \begin{tabular}{|l|} \hline \multicolumn{1}{|c|}{ \textbf{\TFRGB{Fermetures de chemin }{ Path terminations} : \og closepath \fg } } @@ -1242,7 +1183,6 @@ decoration=\{ \RDD{show path construction},\\ \bigskip -%\Par{coupure de chemin \og moveto code \fg }{Broken paths : \og moveto code \fg } : \begin{tabular}{|l|} \hline \multicolumn{1}{|c|}{ \textbf{\TFRGB{coupure de chemin }{ Broken paths} : \og moveto \fg } } @@ -1262,7 +1202,6 @@ decoration=\{ \RDD{show path construction},\\ \newpage -%\Par{composants courbes \og curveto \fg }{ Curved segments : \og curveto \fg }: \begin{tabular}{|l|} \hline \multicolumn{1}{|c|}{ \textbf{\TFRGB{composants courbes }{ Curved segments} : \og curveto \fg } } @@ -1278,11 +1217,7 @@ decoration=\{ \RDD{show path construction},\\ },} ] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) ; \end{tikzpicture} \\ \hline -%\end{tabular} -% -%\bigskip -% -%\begin{tabular}{|l|} + \hline decoration=\{ \RDD{show path construction},\\ \RDD{curveto code}=\AC{ \BS{draw} [red,ultra thick,->] \\ (\BSS{tikzinputsegmentfirst}) - - (\BSS{tikzinputsegmentsupporta}); @@ -1295,11 +1230,7 @@ decoration=\{ \RDD{show path construction},\\ },} ] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) ; \end{tikzpicture} \\ \hline -%\end{tabular} -% -%\bigskip -% -%\begin{tabular}{|l|} + \hline decoration=\{ \RDD{show path construction},\\ \RDD{curveto code}=\AC{ \BS{draw} [red,ultra thick,->] \\ (\BSS{tikzinputsegmentlast}) - - (\BSS{tikzinputsegmentsupportb}); @@ -1312,11 +1243,6 @@ decoration=\{ \RDD{show path construction},\\ },} ] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) ; \end{tikzpicture} \\ \hline -%\end{tabular} -% -%\bigskip -% -%\begin{tabular}{|l|} \hline decoration=\{ \RDD{show path construction},\\ \RDD{curveto code}=\AC{ \BS{draw} [red,ultra thick,->] \\ (\BSS{tikzinputsegmentfirst}) .. controls (\BSS{tikzinputsegmentsupporta}) \\ @@ -1329,23 +1255,18 @@ and (\BSS{tikzinputsegmentsupportb}) .. (\BSS{tikzinputsegmentlast}) \path [decorate,decoration={show path construction,curveto code={ \draw [red,ultra thick,->] (\tikzinputsegmentfirst) .. controls (\tikzinputsegmentsupporta) and (\tikzinputsegmentsupportb) .. (\tikzinputsegmentlast);} } ] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) -- (6,2) sin (7.57,0) -- (8,3) ; -%(0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) ; \end{tikzpicture} \\ \hline .. controls (7,0) and (2,0) .. (5,2) \DW{} \\ \hline \end{tabular} -%- (\tikzinputsegmentlast) \newpage -%----------------------------------------- \subsection{Library \og decorations.markings \fg } -%Insérer dans le préambule : - \maboite{\BS{usetikzlibrary}\AC{decorations.markings}} \label{lib-mark} @@ -1353,7 +1274,6 @@ and (\BSS{tikzinputsegmentsupportb}) .. (\BSS{tikzinputsegmentlast}) \RRR{48-4} \end{center} -%\subsubsection{Sa marque à une position} \SbSbSSCT{Sa marque à une position}{Personal mark at one position} \begin{tabular}{|c|} \hline @@ -1375,7 +1295,6 @@ and (\BSS{tikzinputsegmentsupportb}) .. (\BSS{tikzinputsegmentlast}) \\ \hline \end{tabular} -%\subsubsection{Ses marques : origine, fin et pas } \SbSbSSCT{Ses marques : origine, fin et pas }{Marks between positions with step size} @@ -1433,7 +1352,6 @@ mark= \RDD{between positions} 0 \RDD{and} 1 \RDD{step} 1/10 & \bigskip -%\subsubsection{Marque avec un n\oe ud contenant du texte} \SbSbSSCT{Marque avec un n\oe ud contenant du texte}{Marks with a text node} \begin{tabular}{|c|c|c|} \hline @@ -1490,7 +1408,6 @@ at position 1cm/2 & at position 0.5/2 & at position -0.5/2 \end{tabular} \bigskip -%\subsubsection{Marque avec un n\oe ud contenant une image} \SbSbSSCT{Marque avec un n\oe ud contenant une image} {Mark with a picture node} @@ -1543,7 +1460,6 @@ at position 1cm/2 & at position 0.5/2 & at position -0.5/2 \bigskip -%\subsubsection{Numérotation des marques et affectation d'un nom } \SbSbSSCT{Numérotation des marques et affectation d'un nom }{ Numbered marks} \begin{tabular}{|c|c|}\hline @@ -1581,7 +1497,6 @@ transform shape] \\ \hline \end{tabular} -%\subsubsection{Distance des n\oe uds } \SbSbSSCT{Distance des n\oe uds }{Marks info} \begin{tabular}{|c|} \hline @@ -1608,7 +1523,6 @@ mark=between positions 0 and 1 step 40pt with \\ /pgf/decoration/mark connection node=node name (no default, initially empty) -%\subsubsection{N\oe ud sur une liaison} \SbSbSSCT{N\oe ud sur une liaison}{Mark with a connection node} \begin{tabular}{|c|c|} \hline @@ -1705,7 +1619,6 @@ mark=at position 0.4 with \newpage \subsection{Library \og decorations.footprints \fg } -%Insérer dans le préambule : \maboite{\BS{usetikzlibrary}\AC{decorations.footprints}} \label{lib-footprints} @@ -1845,15 +1758,10 @@ foot of = gnome & foot of = human & foot of = bird & foot of = felis silvestris \end{tabular} - - - ------------------------------- \newpage \subsection{Library \og decorations.shapes \fg } \subsubsection{Introduction} -%Insérer dans le préambule : \maboite{\BS{usetikzlibrary}\AC{decorations.shapes}} \label{lib-shapes} @@ -1943,8 +1851,6 @@ star & regular polygon & signal & kite \\ \hline \end{tabular} - -%\paragraph{Formes} : \bigskip \begin{tabular}{|l|c|}\hline @@ -1997,7 +1903,6 @@ star & regular polygon & signal & kite \\ \hline \end{tabular} -%\paragraph{Paramètres} : \bigskip \begin{tabular}{|c|c|c|c|} \hline @@ -2015,10 +1920,7 @@ star & regular polygon & signal & kite \tikz \draw[decorate with=star,star points=8,decoration={shape size=.5cm,shape sep=1cm}] (0,2.5) -- (3,2.5); \\ \hline star points=3 & star points=4 & star points=5 & star points=8\\ \hline -%\end{tabular} -% -% \bigskip -%\begin{tabular}{|c|c|c|c|} + \hline \multicolumn{4}{|c|}{\BS{draw}[decorate with=star,\RDD{paint}=green,decoration=\AC{shape size=.5cm,shape sep=1cm}] } \\ \\ @@ -2043,8 +1945,7 @@ star points=3 & star points=4 & star points=5 & star points=8\\ \hline \end{tabular} \bigskip -%\paragraph{Espacement}: -%\Par{Espacement}{Spacing}: + \begin{tabular}{|c|c|} \hline \multicolumn{2}{|c|}{ \TFRGB{Espacement}{Spacing} } @@ -2067,8 +1968,7 @@ shape sep=\AC{2cm} \end{tabular} \bigskip -%\paragraph{Type d'espacement}: -%\Par{Type d'espacement}{Type of spacing} : + \begin{tabular}{|l|c|} \hline \multicolumn{2}{|c|}{ \TFRGB{Type d'espacement}{Type of spacing} } @@ -2097,8 +1997,7 @@ shape sep=\AC{1cm,\RDD{between centers}}\}] (0,2.5) - - (10,2.5);} \end{tabular} \bigskip -%\paragraph{Espacement automatique}: -%\Par{Espacement automatique}{Automatic spacing }: + \begin{tabular}{|l|c|} \hline \multicolumn{2}{|c|}{ \TFRGB{Espacement automatique}{Automatic spacing } } @@ -2126,7 +2025,6 @@ shape evenly spread=10 \paragraph{Orientation}: -%\subparagraph{'' shape border rotate ``} : \begin{tabular}{|c|c|} \hline \multicolumn{2}{|c|}{ '' shape border rotate `` } @@ -2147,7 +2045,6 @@ shape border rotate=180 \bigskip -%\subparagraph{'' shape sloped ``}: \begin{tabular}{|c|c|} \hline \multicolumn{2}{|c|}{ \og shape sloped \fg } @@ -2223,9 +2120,6 @@ shape sloped=false -%\subparagraph{'' shift only ``}: - - \begin{tabular}{|c|c|}\hline \multicolumn{2}{|c|}{ \og shift only \fg } \\ \hline @@ -2251,7 +2145,6 @@ avec & sans\\ \end{tabular} -%\paragraph{Dimensions}: \bigskip \begin{tabular}{|c|c|} \hline @@ -2318,13 +2211,10 @@ avec & sans\\ \end{tabular} -%-------------------------------- \newpage \subsection{Library \og decorations.text \fg } -%Insérer dans le préambule : - \maboite{\BS{usetikzlibrary}\AC{decorations.text}} \label{lib-text} @@ -2343,8 +2233,6 @@ avec & sans\\ \\ \hline \end{tabular} -%\paragraph{Texte trop long}: -%\Par{Texte trop long}{Text too long}: \begin{tabular}{|c|} \hline \multicolumn{1}{|c|}{ \TFRGB{Texte trop long}{Text too long} } @@ -2360,8 +2248,6 @@ avec & sans\\ \\ \hline \end{tabular} -%\paragraph{Format du texte}: -%\Par{Format du texte}{Text format}: \begin{tabular}{|c|c|c|} \hline \multicolumn{3}{|c|}{ \TFRGB{Format du texte}{Text format}} @@ -2400,10 +2286,7 @@ text=\AC{ |\BS{red}|texte|| \AC{} } \bigskip \begin{tabular}{|c|c|c|} \hline -%\multicolumn{3}{|c|}{\BS{draw} [decorate,decoration=\AC{text along path, -%text=\AC{ avant |\BS{red} | texte || après }}] -%(1,1) circle (1);} -%\\ \hline + \begin{tikzpicture} \draw[dotted] (1,1) circle (1); \draw [decorate,decoration={text along path, @@ -2432,7 +2315,7 @@ avant | {\color{red} \BS{red}}| texte || après \end{tabular} \bigskip -%\subparagraph{Plusieurs paramètres} : + \begin{tabular}{|c|} \hline \BS{draw} [decorate,decoration=\AC{text along path,\\ @@ -2447,7 +2330,7 @@ text={avant |\Large|Visual |+\bf\color{red}|Tikz|| après }}] \end{tikzpicture} \\ \hline \end{tabular} -%\subparagraph{Changement des délimiteurs} : + \bigskip @@ -2465,8 +2348,6 @@ text={ [ \color{red} ] texte [] }}] \\ \hline \end{tabular} -%\paragraph{Sens du texte}: -%\Par{Sens du texte}{Text orientation}: \bigskip \begin{tabular}{|c|} \hline @@ -2483,8 +2364,6 @@ text color=blue, \RDD{reverse path} }] (1,1) circle (1); \\ \hline \end{tabular} -%\paragraph{Position du texte}: -%\Par{Position du texte}{Text position}: \bigskip \begin{tabular}{|c|c|c|} \hline @@ -2535,8 +2414,6 @@ align=\AC{align=right,\RDD{right indent}=1cm} \\ \hline \end{tabular} -%\paragraph{Justification du texte}: -%\Par{Justification du texte}{Fit to path}: \begin{tabular}{|c|} \hline \multicolumn{1}{|c|}{ \TFRGB{Justification du texte}{Fit to path} } @@ -2554,8 +2431,6 @@ text align=\AC{\RDD{fit to path}}}, decorate] \\ \hline \end{tabular} -%\paragraph{Justification des espaces}: -%\Par{Justification des espaces}{Fit to path stretching spaces}: \begin{tabular}{|c|} \hline @@ -2577,7 +2452,6 @@ text align=\AC{\RDD{fit to path stretching spaces}}}, decorate] \subsection{Library \og decorations.fractals \fg } -%Insérer dans le préambule : \maboite{\BS{usetikzlibrary}\AC{decorations.fractals}} \label{lib-fractals} @@ -2691,7 +2565,7 @@ sans & 1 decorate \subsection{Applications} -%\subsubsection{Décoration d'un n\oe ud} + \SbSbSSCT{Décoration d'un n\oe ud}{Node decoration} \begin{tabular}{|c|c|} \hline @@ -2739,14 +2613,11 @@ decoration=\RDD{bumps}& decoration=\RDD{footprints} \\ \hline \end{tikzpicture} \\ \hline ellipse,decoration=zigzag & decoration= \{text along path,text= \\ -% minimum height=2cm, minimum width=3cm\} + & \AC{Un Deux Trois Quatre Cinq Six Sept Huit Neuf} \} \\ \hline \end{tabular} - - -%\subsubsection{Décoration de liaisons de noeuds} \SbSbSSCT{Décoration de liaisons de noeuds}{Node link decoration} \begin{tabular}{|c|c|c|} \hline @@ -2799,7 +2670,7 @@ decoration=coil & decoration=zigzag & decoration=ticks \\ \bigskip -%\subsubsection{Décoration d'un graphe} + \SbSbSSCT{Décoration d'un graphe}{Graph decoration} \begin{tabular}{|c|c|}\hline @@ -2827,10 +2698,6 @@ plot coordinates {(0,0) (2,1) (4,-2) (6,1) } \end{tabular} - - - -%\subsubsection{Décorations variables} \SbSbSSCT{Décorations variables}{Various decoration} \begin{tabular}{|c|} \hline @@ -2865,7 +2732,6 @@ decoration=\AC{zigzag,\RDD{pre}=footprints,\RDD{pre length}=3cm, \end{tabular} -%\subsubsection{Décoration partielle} \SbSbSSCT{Décoration partielle}{Partial decoration} \begin{tabular}{|c|l|} \hline @@ -2908,7 +2774,7 @@ decoration=\AC{zigzag,\RDD{pre}=footprints,\RDD{pre length}=3cm, \end{tabular} \newpage -%\paragraph{'' lineto ``} : + \begin{tabular}{|c|} \hline @@ -2946,7 +2812,7 @@ decoration=\AC{zigzag,\RDD{pre}=lineto,\RDD{pre length}=3cm, \bigskip -%\paragraph{ `` curveto ``} : + \begin{tabular}{|c|} \hline @@ -2983,7 +2849,7 @@ decoration=\AC{zigzag,\RDD{pre}=curveto,\RDD{pre length}=3cm, \end{tabular} \bigskip -%\paragraph{'' moveto ``} : + \label{moveto} @@ -3020,7 +2886,6 @@ decoration=\AC{zigzag,\RDD{pre}=moveto,\RDD{pre length}=3cm, \\ \hline \end{tabular} -%\subsubsection{Paramètres globaux ou particuliers} \SbSbSSCT{Paramètres globaux ou particuliers}{Global and partial parameters } \begin{tabular}{|l|} \hline @@ -3045,7 +2910,7 @@ decoration=\AC{zigzag,\RDD{pre}=moveto,\RDD{pre length}=3cm, \\ \hline \end{tabular} -%\subsubsection{Tracer le chemin et sa décoration avec \og Postaction \fg} + \SbSbSSCT{Tracer le chemin et sa décoration avec \og Postaction \fg }{Path and its decoration \og Postaction \fg } \begin{tabular}{|c|c|}\hline diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzducks.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzducks.tex index e820892739a..60a34836935 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzducks.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzducks.tex @@ -44,17 +44,20 @@ \bigskip -\begin{tabular}{|c|c|c|c|c|} \hline +\begin{tabular}{|c|c|c|c|c|c|} \hline \tikz \duck[longhair] ; & \tikz \duck[shorthair] ; & \tikz \duck[crazyhair] ; - & - \tikz \duck[recedinghair] ; - \\ -\hline -[\RDD{longhair}] & [\RDD{shorthair}] & [\RDD{crazyhair}] & [\RDD{recedinghair}] \\ +& +\tikz \duck[recedinghair] ; +& +\tikz \duck[mohican] ; +& +\tikz \duck[mullet] ; +\\ \hline +[\RDD{longhair}] & [\RDD{shorthair}] & [\RDD{crazyhair}] & [\RDD{recedinghair}] & [\RDD{mohican}] & [\RDD{mullet}]\\ \hline \tikz \duck[longhair=red] ; & @@ -63,14 +66,22 @@ \tikz \duck[crazyhair=red] ; & \tikz \duck[recedinghair=red] ; + & + \tikz \duck[mohican=red] ; + & + \tikz \duck[mullet=red] ; \\ \hline -[longhair=red] & [shorthair=red] & [crazyhair=red] & [recedinghair=red] \\ +[longhair=red] & [shorthair=red] & [crazyhair=red] & [recedinghair=red] & [mohican=red] & [mullet=red] \\ \hline \end{tabular} \bigskip + + + + \begin{tabular}{|c|c|c|c|c|} \hline \tikz \duck[eyebrow] ; & @@ -101,6 +112,8 @@ \\ \hline [\RDD{tshirt}] & [\RDD{tie}] & [\RDD{jacket}] & [\RDD{cape}]& [tshirt,tie ,jacket ,cape] \\ \hline +\dft{white} & \dft{blue} & \dft{blue} & \dft{red}& +\\ \hline \tikz \duck[tshirt=red] ; & \tikz \duck[tie=red] ; @@ -144,6 +157,19 @@ \\ \hline \tikz \duck[crown]; & +\tikz \duck[queencrown]; +& +\tikz \duck[kingcrown]; +& +\tikz \duck[sheep]; +& +\tikz \duck[horsetail]; +\\ \hline +[\RDD{crown}] &[\RDD{queencrown}]&[\RDD{kingcrown}] & [\RDD{sheep}] &[\RDD{horsetail}] +\\ \hline + +\tikz \duck[crozier]; +& \tikz \duck[unicorn]; & @@ -153,7 +179,7 @@ & \tikz \duck[witch]; \\ \hline -[\RDD{crown}] & [\RDD{unicorn}] &[\RDD{bunny}] & [bunny=red,\RDD{inear}=blue] & [\RDD{witch}] + [\RDD{crozier}] & [\RDD{unicorn}] &[\RDD{bunny}] & [bunny=red,\RDD{inear}=blue] & [\RDD{witch}] \\ \hline \tikz \duck[magicwand]; & @@ -173,7 +199,8 @@ magicwand]; \begin{tabular}{|c|c|c|c|c|} \hline -\tikz \duck[mask]; + +\tikz \duck[squareglasses]; & \tikz \duck[signpost=42]; & @@ -183,7 +210,7 @@ magicwand]; & \tikz \duck[speech={XXX}]; \\ \hline -[\RDD{mask}] & [\RDD{signpost}=42] & \parbox{3cm}{[signpost=XXX,\\ \RDD{signcolour}=green]} & \parbox{3cm}{[signpost=XXX, \\ \RDD{signback}=green]} & [\RDD{speech}=\AC{XXX}] +[\RDD{squareglasses}] & [\RDD{signpost}=42] & \parbox{3cm}{[signpost=XXX,\\ \RDD{signcolour}=green]} & \parbox{3cm}{[signpost=XXX, \\ \RDD{signback}=green]} & [\RDD{speech}=\AC{XXX}] \\ \hline \end{tabular} @@ -274,12 +301,30 @@ magicwand]; & \tikz \duck[wine]; & +\tikz \duck[mask]; & +\tikz \duck[buttons]; \\ \hline - [\RDD{baguette}] & [\RDD{milkshake}] & [\RDD{wine}] & & + [\RDD{baguette}] & [\RDD{milkshake}] & [\RDD{wine}] & [\RDD{mask}] & [\RDD{buttons}] \\ \hline \end{tabular} +\begin{tabular}{|c|c|c|c|c|} \hline +\tikz \duck[basket]; +& +\tikz \duck[easter]; +& +\tikz \duck[easter,egga=red]; +& +\tikz \duck[easter,eggb=red]; +& +\tikz \duck[easter,eggc=red]; +\\ \hline +[\RDD{basket}]& [\RDD{easter}] & [easter,\RDD{egga}=red] & [easter,\RDD{eggb}=red] & [easter,\RDD{eggc}=red] +\\ \hline + +\end{tabular} + \bigskip \begin{tabular}{|c|c|c|c|} \hline @@ -322,13 +367,34 @@ magicwand]; \tikz \duck \path[preaction={fill,green},pattern=dots, pattern color=red] \duckpathcrown ; & +\tikz \duck +\path[preaction={fill,green},pattern=dots, pattern color=red] \duckpathmohican ; +\\ \hline +\BSS{duckpathcrazyhair} & \BSS{duckpathrecedinghair} & \BSS{duckpathcrown} & \BSS{duckpathmohican} +\\ \hline +\tikz \duck +\path[preaction={fill,green},pattern=dots, pattern color=red] \duckpathmullet; +& +\tikz \duck +\path[preaction={fill,green},pattern=dots, pattern color=red] \duckpathqueencrown ; +& +\tikz \duck +\path[preaction={fill,green},pattern=dots, pattern color=red] \duckpathkingcrown ; +& +\tikz \duck +\path[preaction={fill,green},pattern=dots, pattern color=red] \duckpathdarthvader ; +\\ \hline +\BSS{duckpathmullet} & \BSS{duckpathqueencrown} & \BSS{duckpathkingcrown} & \BSS{duckpathdarthvader} \\ \hline -\BSS{duckpathcrazyhair} & \BSS{duckpathrecedinghair} & \BSS{duckpathcrown} & +\tikz \duck +\path[preaction={fill,green},pattern=dots, pattern color=red] \duckpathhorsetail ; +& & & +\\ \hline +\BSS{duckpathhorsetail}& & & \\ \hline \end{tabular} - \SbSbSSCT{Canards aléatoires}{Random ducks} \noindent diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzfig.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzfig.tex index ee97b52a148..dedf3c548c4 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzfig.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzfig.tex @@ -1,7 +1,5 @@ \SbSSCT{Dans le texte}{In the text} - -%\subsubsection{Sans option de décalage} \SbSbSSCT{Sans option de décalage}{Without offset} \begin{center} @@ -11,7 +9,6 @@ \TFRGB{dessin directement dans le texte}{picture in the text} \tikz \draw[blue] (0,0) rectangle(2,2); \tikz \draw[blue] (0,0) circle (1);\TFRGB{ici est inclus le code suivant}{here is the following code} : \BS{tikz} \BS{draw} (0,0) rectangle(2,2);\BS{tikz} \BS{draw} (0,0) circle (1); \bigskip -%\subsubsection{Avec décalage nul} \SbSbSSCT{Avec décalage nul}{With zero offset} \TFRGB{dessin directement dans le texte}{picture in the text} \tikz[baseline=0pt] \draw[blue] (0,0) rectangle(2,2); \tikz[baseline=0pt] \draw[blue] (0,0) circle (1);\TFRGB{ici est inclus le code suivant}{here is the following code} : \BS{tikz}[\RDD{baseline}=0pt] \BS{draw} (0,0) rectangle(2,2);\BS{tikz}[\RDD{baseline}=0pt] \BS{draw} (0,0) circle (1); @@ -20,14 +17,13 @@ \bigskip -%\subsubsection{Avec décalage } \SbSbSSCT{Avec décalage}{With an offset} \TFRGB{dessin directement dans le texte}{picture in the text} \tikz[baseline=1cm] \draw[blue] (0,0) rectangle(2,2); \tikz[baseline=1cm] \draw[blue] (0,0) circle (1);\TFRGB{ici est inclus le code suivant}{here is the following code} : \BS{tikz}[\RDD{baseline}=1cm] \BS{draw} (0,0) rectangle(2,2);\BS{tikz}[\RDD{baseline}=1cm] \BS{draw} (0,0) circle (1); \newpage -%---------------------------------------------------------- + \SbSSCT{Dans un environnement tikzpicture}{In a tikzpicture environment} \begin{center} @@ -98,10 +94,6 @@ \\ \hline \end{tabular} - - - -%\subsection{Dans un environnement fbox} \SbSSCT{Dans un environnement fbox}{In a fbox environment} \noindent @@ -129,7 +121,6 @@ \\ \hline \end{tabular} -%\subsection{Modification du cadrage} \SbSSCT{Modification du cadrage}{Bounding box} \begin{center} @@ -187,10 +178,6 @@ texte après \\ \hline \end{tabular} -%\SbSSCT{Tracer les limites du dessin}{Drawing the bounding box} - - - \bigskip \begin{tabular}{|l|l|} \hline @@ -339,7 +326,6 @@ texte après \\ \hline \end{tabular} -%\subsubsection{Changement d'échelle} \SbSbSSCT{Changement d'échelle}{Scaling} \noindent diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzfit.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzfit.tex index 3fea1571aa4..3e2a8ee848b 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzfit.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzfit.tex @@ -72,7 +72,6 @@ \node[dot] (d) at (1.25,0.25) {d}; \node[dot] (e) at (1.75,1.5) {e}; \node[draw=red,fit=(a) (b) (c) (d) (e)] (xxx) {}; -%\fill at (fit.south) {sud}; \node at (xxx.east) [fill=green!20] {x}; \end{tikzpicture} & @@ -85,7 +84,6 @@ \node[dot] (d) at (1.25,0.25) {d}; \node[dot] (e) at (1.75,1.5) {e}; \node[draw=red,fit=(a) (b) (c) (d) (e)] (xxx) {}; -%\fill at (fit.south) {sud}; \node at (xxx.north east) [fill=green!20] {x}; \end{tikzpicture} & @@ -98,7 +96,6 @@ \node[dot] (d) at (1.25,0.25) {d}; \node[dot] (e) at (1.75,1.5) {e}; \node[draw=red,fit=(a) (b) (c) (d) (e)] (xxx) {}; -%\fill at (fit.south) {sud}; \node at (xxx.center) [fill=green!20] {x}; \end{tikzpicture} \\ \hline xxx.east & xxx.north east & xxx.center \\ @@ -199,7 +196,6 @@ dot/.style={draw,circle,blue}] \node[dot] (c) at (1,2) {c}; \node[dot] (d) at (1.25,0.25) {d}; \node[dot] (e) at (1.75,1.5) {e}; -%\node[draw=green, fit=(a) (b) (c) (d) (e)] {}; \node[draw=red, rotate fit=45, fit=(a) (b) (c) (d) (e)] {}; \end{tikzpicture} & @@ -212,7 +208,6 @@ dot/.style={draw,circle,blue}] \node[dot] (c) at (1,2) {c}; \node[dot] (d) at (1.25,0.25) {d}; \node[dot] (e) at (1.75,1.5) {e}; -%\node[ellipse,draw=green, fit=(a) (b) (c) (d) (e)] {}; \node[ellipse,draw=red, rotate fit=45, fit=(a) (b) (c) (d) (e)] {}; \end{tikzpicture} \\ \hline rotate fit=45 & ellipse, rotate fit=45 \\ diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgraph1.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgraph1.tex index 45c5bf5a215..6fd479057de 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgraph1.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgraph1.tex @@ -18,7 +18,6 @@ \begin{tabular}{|c | c | c | c |} \hline \multicolumn{4}{|c|}{ \BS{tikz} \BS{draw} plot[mark=x] \RDD{file} \AC{table.dat} ; }\\ \hline -%\draw plot[mark=x] file {table.dat}; & \tikz \draw plot[mark=x,smooth] file {table.dat}; & @@ -52,7 +51,6 @@ \bigskip -%\subsubsection{Les types de graphes} \SbSbSSCT{Les types de graphes}{Graph types} \begin{tabular}{|c | c | c | c |} \hline @@ -83,11 +81,8 @@ \bigskip \begin{tabular}{|c | c | c |c |} \hline -%\begin{tikzpicture} -%\draw[help lines] (-2,-3) grid (2,2); + \tikz \draw plot[polar comb,mark=*]coordinates {(0:1) (60:0.5) (120:1.5) (180:3) (240:.5) (300:1) (0:1)}; -%\draw[line width=1pt,color=red] plot coordinates (0:1cm)(60:0.5)(120:1.5)(180:1)(240:3)(300:1)(0:1cm); -%\end{tikzpicture} \\ \hline \BS{tikz} \BS{draw} plot[\RDD{polar comb},mark=*]coordinates \\ \AC{(0:1) (60:0.5) (120:1.5) (180:3) (240:.5) (300:1) (0:1)}; @@ -140,16 +135,13 @@ \tikz \draw[blue] plot[xbar interval,x=.5cm] coordinates {(2,0) (3,1) (1,2) (2,3)}; & \tikz \draw[blue] plot[xbar interval,y=.5cm] coordinates {(2,0) (3,1) (1,2) (2,3)}; -%& -%\tikz \draw[blue!20] plot[xbar interval,x=.5cm,y=.5cm] coordinates {(2,0) (3,1) (1,2) (2,3)}; \\ \hline [\RDD{xbar}] & [\RDD{xbar interval}] & [xbar interval,\RDD{x}=.5cm] & [xbar interval,\RDD{y}=.5cm] \\ \hline \end{tabular} \newpage -%-------------------------------------------------------------- -%\subsubsection{Graphe à partir d'une fonction} + \SbSbSSCT{Graphe à partir d'une fonction}{Graph of a function} @@ -157,21 +149,19 @@ \multicolumn{3}{|c|}{ \BS{draw} [color=red] plot (\BS{x},\BS{x}); }\\ \hline \begin{tikzpicture}[domain=0:4,ultra thick] -%\draw[very thin,color=gray] (-0.1,-1.1) grid (4.1,4.1); + \draw[->,blue,ultra thick] (-.1,0) -- (4.5,0); \draw[->,blue,ultra thick] (0,-1.1) -- (0,04); \draw[color=red] plot (\x,\x); \end{tikzpicture} & \begin{tikzpicture}[domain=0:6.28,ultra thick,x=0.7cm] -%\draw[very thin,color=gray] (-0.1,-2.1) grid (4.1,2.1); \draw[->,blue,ultra thick] (-.1,0) -- (7,0); \draw[->,blue,ultra thick] (0,-2.5) -- (0,2.5); \draw[color=red] plot (\x,{sin(\x r)}); \end{tikzpicture} & \begin{tikzpicture}[domain=0:360,x=0.3,ultra thick] -%\draw[very thin,color=gray] (-0.1,-2.1) grid (4.1,2.1); \draw[->,blue,ultra thick] (-.1,0) -- (370,0); \draw[->,blue,ultra thick] (0,-2.5) -- (0,2.5); \draw[color=red] plot (\x,{sin(\x)}); @@ -218,9 +208,6 @@ Options \\ \hline \end{tabular} - -%------------------------------------------------------------------------- -%\subsubsection{Fonctions paramétriques} \SbSbSSCT{Fonctions paramétriques}{Parametric function} @@ -236,13 +223,9 @@ Options (\AC{sin(\BS{t} r)},\AC{sin(2 *\BS{t} r)}) & (\AC{sin(\BS{t})},\BS{t}/360,\AC{cos(\BS{t})}) \\ \hline \end{tabular} -%\tikz \draw plot[mark=x,mark repeat=3,smooth] file {plots/pgfmanual-sine.table}; - -%\subsection{Marques} \SbSSCT{Marques}{Marks} -%\subsubsection{Marques avec Tikz} \SbSbSSCT{Marques avec TikZ}{Marks with TikZ} \begin{tabular}{|c | c | c | c |} \hline @@ -291,22 +274,20 @@ mark=+ & mark=x & mark=* & mark=ball \\ \hline \begin{tikzpicture}[domain=0:6.28] \draw[very thin,color=gray] (-0.1,-1.1) grid (6.28,1.1); -%\draw[color=red,dashed,mark=*] plot (\x,{sin(\x r)}); + \draw[color=blue,mark size=5pt,mark options={color=magenta},mark=+] plot (\x,{sin(\x r)}); \end{tikzpicture} & \begin{tikzpicture}[domain=0:6.28] \draw[very thin,color=gray] (-0.1,-1.1) grid (6.28,1.1); -%\draw[color=red,dashed,mark=*] plot (\x,{sin(\x r)}); + \draw[color=blue,mark size=5pt,mark options={rotate=10},mark=+] plot (\x,{sin(\x r)}); \end{tikzpicture} \\ \hline \RDD{mark options}=\AC{color=magenta},mark=+ & \RDD{mark options}=\AC{rotate=10},mark=+ \\ \hline \end{tabular} - -%\subsubsection{Marques personnalisées avec text mark} \SbSbSSCT{Marques personnalisées avec text mark}{Marks with text mark} \begin{tabular}{|c | c | c |} \hline @@ -335,12 +316,11 @@ mark=+ & mark=x & mark=* & mark=ball \newpage -%\subsubsection{Marques avec l'extension plotmarks } + \SbSbSSCT{Marques avec l'extension plotmarks }{Marks with plotmarks library} \label{plotmarks} -%Insérer dans le préambule : \maboite{\BS{usetikzlibrary}\AC{plotmarks}} @@ -443,20 +423,10 @@ mark=\RDDX{halfdiamond*}{mark} & mark=\RDDX{halfsquare*}{mark} & mark=\RDDX{half \\ \hline \end{tabular} - - -% \subsection{Graphes avec Gnuplot} \SbSSCT{Graphes avec Gnuplot}{Graph with Gnuplot} \begin{tabular}{|l| } \hline -%\begin{tikzpicture}[domain=0:6.28] -%%\draw[very thin,color=gray] (-0.1,-1.1) grid (7.1,1.1); -%%\draw[->,ultra thick,blue] (-0.2,0) -- (7,0) node[right] {$x$}; -%%\draw[->,ultra thick,blue] (0,-1.2) -- (0,1.2) node[above] {$f(x)$}; -%%\draw[color=red] plot[id=x] function{x} node[right] {$f(x) =x$}; -%\draw[color=red] plot[id=sin] function{sin(x)} ; -%%\draw[color=orange] plot[id=exp] function{0.05*exp(x)} node[right] {$f(x) = \frac{1}{20} \mathrm e^x$}; -%\end{tikzpicture} + \BS{draw}[color=red] plot[\RDD{id}=sin] function\AC{sin(x)} ; \\ \hline \\ diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgraph2.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgraph2.tex index 10e86b3394b..74f0b98b793 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgraph2.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgraph2.tex @@ -1,6 +1,4 @@ -%\subsubsection{Graphes avec pgfplot} -%\SbSSCT{Graphe avec pgfplot}{Graph with pgfplot\label{pgfplot}} -%Insérer dans le préambule + \maboite{\BS{usepackage}\AC{pgfplots} \cite {pgfplots} } \label{pgfplots} @@ -11,7 +9,7 @@ \subsubsection{Axes} \begin{tabular}{|c|c|c|c|} \hline -% \multicolumn{4}{|c|}{ \textbf{Axes}} \\ + \multicolumn{4}{|c|}{ \RRP{4-1}} \\ \hline \begin{tikzpicture}[scale=.5,blue] @@ -46,7 +44,6 @@ \end{tabular} -%\subsubsection{Tracé de la courbe} \SbSSCT{Tracé de la courbe}{Drawing of the graph} @@ -65,11 +62,7 @@ \end{axis} \end{tikzpicture} & -%\begin{tikzpicture}[scale=.5] -%\begin{axis} -%\addplot gnuplot[id=sin]{sin(x)}; -%\end{axis} -%\end{tikzpicture} + \\ \hline \BSS{addplot} coordinates & \BSS{addplot} \AC{x\^{}2 - x +4}; & \BSS{addplot} gnuplot[id=sin]\AC{sin(x)};\\ \AC{(0,0) (1,1) (2,0) (3,1) (4,1) (5,2)}; & & @@ -156,8 +149,6 @@ axes : \RDD{semilogxaxis} & axes : \RDD{semilogxaxis} & axes : \RDD{semilogyaxis \\ \hline \end{tabular} -%\bigskip -%\subsubsection{Ymin ymax} \begin{tabular}{|c|c|c|c|} \hline \begin{tikzpicture}[scale=.4] \begin{axis}[ymax=20,blue] @@ -188,10 +179,6 @@ axes : \RDD{semilogxaxis} & axes : \RDD{semilogxaxis} & axes : \RDD{semilogyaxis \\ \hline \end{tabular} - - -%-------------------------------------------------------- -%\subsubsection{Dimension unitaire en X et Y} \SbSbSSCT{Dimension unitaire en X et Y}{Xunit and Yunit} \begin{tabular}{|c|c|c|c|} \hline @@ -218,7 +205,6 @@ axes : \RDD{semilogxaxis} & axes : \RDD{semilogxaxis} & axes : \RDD{semilogyaxis \\ \hline \end{tabular} -%\subsubsection{Type de graphiques} \SbSbSSCT{Type de graphiques}{Graph type} \begin{tabular}{|c|c|c|c|} \hline @@ -329,20 +315,13 @@ axes : \RDD{semilogxaxis} & axes : \RDD{semilogxaxis} & axes : \RDD{semilogyaxis \end{axis} \end{tikzpicture} & -%\begin{tikzpicture}[scale=.5] -%\begin{axis} -%\addplot [mesh,ultra thick] gnuplot[id=sin]{sin(x)}; -%\end{axis} -%\end{tikzpicture} + \\ \hline \RDD{only marks} & \RDD{scatter} & \RDD{mesh} \\ \hline \end{tabular} - - -%\subsection{quiver} \smallskip \begin{tabular}{|c|c|c|c|} \hline \multicolumn{2}{|c|}{ \BS{addplot} [\RDD{quiver}=\AC{u=1,v=2*x}],->,samples=5,blue,ultra thick] \AC{x\^{}2 - x +4}; } @@ -518,10 +497,8 @@ axes : \RDD{semilogxaxis} & axes : \RDD{semilogxaxis} & axes : \RDD{semilogyaxis \end{tabular} -%-------------------------------------------------------------------------- -%\subsection{Habillage du graphe} \SbSSCT{Habillage du graphe}{Graph information} -%\subsubsection{Titres} + \SbSbSSCT{Titres}{Titles} \begin{tabular}{|c|c|c|c|} \hline @@ -549,8 +526,6 @@ axes : \RDD{semilogxaxis} & axes : \RDD{semilogxaxis} & axes : \RDD{semilogyaxis \\ \hline \end{tabular} -%----------------------------------------------------------------------- -%\subsubsection{Légende} \SbSbSSCT{Légende}{Legend} \begin{tabular}{|c|c|c|c|} \hline @@ -576,9 +551,7 @@ axes : \RDD{semilogxaxis} & axes : \RDD{semilogxaxis} & axes : \RDD{semilogyaxis \BSS{legend}\AC{\$x\^{}2 - x +4\$,\$x\^{}2 - x +2\$,\$x\^{}2 - x \$,\$x\^{}2 - x -2 \$,\$x\^{}2 - x -4 \$}\\ \BS{end}\AC{axis}} \\ \hline -%\end{tabular} -% -%\begin{tabular}{|c|c|c|c|} \hline + \begin{tikzpicture}[blue ,baseline=0pt,scale=.5] \begin{axis}[legend entries={$x^2 - x +4$,$x^2 - x +2$,$x^2 - x $,$x^2 - x -2 $,$x^2 - x -4 $}] \addplot {x^2 - x +4}; @@ -586,7 +559,7 @@ axes : \RDD{semilogxaxis} & axes : \RDD{semilogxaxis} & axes : \RDD{semilogyaxis \addplot {x^2 - x }; \addplot {x^2 - x -2 }; \addplot {x^2 - x -4 }; -%\legend{$x^2 - x +4$,$x^2 - x +2$,$x^2 - x $,$x^2 - x -2 $,$x^2 - x -4 $} + \end{axis} \end{tikzpicture} & @@ -613,7 +586,6 @@ Options \addplot {x^2 - x }; \addplot {x^2 - x -2 }; \addplot {x^2 - x -4 }; -%\legend{$x^2 - x +4$,$x^2 - x +2$,$x^2 - x $,$x^2 - x -2 $,$x^2 - x -4 $} \end{axis} \end{tikzpicture} & @@ -624,7 +596,6 @@ Options \addplot {x^2 - x }; \addplot {x^2 - x -2 }; \addplot {x^2 - x -4 }; -%\legend{$x^2 - x +4$,$x^2 - x +2$,$x^2 - x $,$x^2 - x -2 $,$x^2 - x -4 $} \end{axis} \end{tikzpicture} & @@ -632,7 +603,6 @@ Options \begin{axis}[legend entries={$x^2 - x +4$,$x^2 - x +2$},legend style={shape=ellipse}] \addplot {x^2 - x +4}; \addplot {x^2 - x +2}; -%\legend{$x^2 - x +4$,$x^2 - x +2$,$x^2 - x $,$x^2 - x -2 $,$x^2 - x -4 $} \end{axis} \end{tikzpicture} \\ \hline @@ -680,7 +650,6 @@ legend style=\AC{\RDD{at}=\AC{(.5,.5)}} & legend style=\AC{\RDD{legend pos}=oute \addplot {x^2 - x }; \addplot {x^2 - x -2 }; \addplot {x^2 - x -4 }; -%\legend{$x^2 - x +4$,$x^2 - x +2$,$x^2 - x $,$x^2 - x -2 $,$x^2 - x -4 $} \legend{A,B,C,D,E} \end{axis} \end{tikzpicture} @@ -752,9 +721,6 @@ legend style=\AC{\RDD{legend columns}=2} & legend style=\AC{\RDD{legend columns} \\ \hline \end{tabular} - -%------------------------------------------------------------------------------------------ -%\subsubsection{Taille du graphe} \SbSbSSCT{Taille du graphe}{Size of the graph} \begin{tabular}{|c|c|c|c|} \hline @@ -783,9 +749,6 @@ legend style=\AC{\RDD{legend columns}=2} & legend style=\AC{\RDD{legend columns} \end{tabular} - -%---------------------------------------------------------------------------------------- -%\subsubsection{Quadrillage} \SbSbSSCT{Quadrillage}{Grids} \begin{tabular}{|c|c|c|c|} \hline @@ -847,7 +810,6 @@ legend style=\AC{\RDD{legend columns}=2} & legend style=\AC{\RDD{legend columns} \\ \hline \end{tabular} - -%----------------------------------------------------------------------------------- + \newpage diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgraph3D.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgraph3D.tex index 7013ea7494f..7167d007d3f 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgraph3D.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgraph3D.tex @@ -95,8 +95,6 @@ axis lines=center,axis on top & axis lines*=left & axis lines*=right \end{axis} \end{tikzpicture} - -%\subsubsection{Tracé de la courbe} \SbSbSSCT{Tracé de la courbe}{Graph drawing} \begin{tabular}{|c|c|c|c|} \hline @@ -114,11 +112,7 @@ axis lines=center,axis on top & axis lines*=left & axis lines*=right \end{axis} \end{tikzpicture} & -%\begin{tikzpicture} -%\begin{axis}[width=5cm,blue] -%\addplot3 [surf] gnuplot[id=sinxy]{sin(x)*sin(y)}; -%\end{axis} -%\end{tikzpicture} + \\ \hline \AC{y} & \AC{-x*y} & gnuplot[id=sinxy]\AC{sin(x)*sin(y)}; \\ \hline @@ -235,7 +229,7 @@ coordinates \AC{(0,0,1) (1,0,0) (1,1,0) (0,1,0)}; & file \AC{table3.dat}; & \AC{ \\ \hline \end{tabular} -\bigskip %------------------------------------- +\bigskip \begin{tabular}{|c|c|c|c|} \hline \begin{tikzpicture} @@ -302,9 +296,7 @@ coordinates \AC{(0,0,1) (1,0,0) (1,1,0) (0,1,0)}; & file \AC{table3.dat}; & \AC{ -\bigskip %------------------------------------------------------ - - +\bigskip \begin{tabular}{|c|c|c|c|} \hline \begin{tikzpicture} @@ -350,7 +342,7 @@ coordinates \AC{(0,0,1) (1,0,0) (1,1,0) (0,1,0)}; & file \AC{table3.dat}; & \AC{ \end{tabular} -\bigskip %----------------------------------------------------- +\bigskip \begin{tabular}{|c|c|c|c|} \hline \begin{tikzpicture} @@ -363,9 +355,6 @@ coordinates \AC{(0,0,1) (1,0,0) (1,1,0) (0,1,0)}; & file \AC{table3.dat}; & \AC{ \\ \hline \end{tabular} - -%------------------------------------------------------------------------------ -%\subsubsection{Point de vue} \SbSbSSCT{Point de vue}{Viewpoint} \begin{minipage}[C]{.48\linewidth} @@ -406,7 +395,8 @@ Azimut \\ \RDD{view/el}= angle \TFRGB{de}{from} - 50 \TFRGB{à}{to} +50 \end{center} \end{minipage} -\bigskip %A Voir------------------------------------------------- +\bigskip +%A Voir------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgrid.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgrid.tex index ca36e4db8c4..cda4fe6ab01 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgrid.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgrid.tex @@ -1,4 +1,4 @@ -%\subsection{Quadrillage} + \SbSSCT{Quadrillage}{Grid} @@ -16,25 +16,21 @@ \hline \begin{tikzpicture} \draw[dotted](0,0) grid (3,3); -%\draw[thick] (0,0) grid [step=1] (3,2); \draw[red] (0,0) grid [step=.75cm] (3,3); \end{tikzpicture} & \begin{tikzpicture} \draw[dotted](0,0) grid (3,3); -%\draw[thick] (0,0) grid [step=1] (3,2); \draw[red] (0,0) grid [xstep=.75cm] (3,3); \end{tikzpicture} & \begin{tikzpicture} \draw[dotted](0,0) grid (3,3); -%\draw[thick] (0,0) grid [step=1] (3,2); \draw[red] (0,0) grid [ystep=.75cm] (3,3); \end{tikzpicture} & \begin{tikzpicture} \draw[dotted](0,0) grid (3,3); -%\draw[thick] (0,0) grid [step=1] (3,2); \draw[red] (0,0) grid [step=(45:1)] (3,3); \end{tikzpicture} \\ \hline @@ -52,29 +48,9 @@ step=.75cm & x step=.75cm & ystep=.75cm & step=(45:1) \\ \hline \begin{tikzpicture} \draw[dotted](0,0) grid (3,3); -%\draw[thick] (0,0) grid [step=1] (3,2); \draw[red] (0,0) grid [rotate=45] (3,3); \end{tikzpicture} & \tikz \draw[help lines] (0,0) grid (3,3); \\ \hline \end{tabular} - - - -%\begin{tabular}{|c|c|c|c|c|} \hline -%\multicolumn{5}{|c|}{ \BS{tikz} \BS{draw} [\RDD{step}=1mm] (0,0) grid (2,2); }\\ -%\hline -%\tikz \draw[step=1mm] (0,0) grid (2,2); -%& -%\tikz[rotate=30] \draw (0,0) grid (2,2); -%& -%\tikz \draw (0,0) grid [xstep=.5] (2,2); -%& -%\tikz \draw (0,0) grid [ystep=.5] (2,2); -%& -%\tikz \draw[help lines] (0,0) grid (2,2); -%\\ \hline -%[\RDD{step}=1mm] & [\RDD{rotate}=30] & [\RDD{xstep}=.5] & [\RDD{ystep}=.5] & [\RDD{help lines}] \\ -%\hline -%\end{tabular} diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzmerci.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzmerci.tex index 6fdbf63f3c6..0c771f9cea2 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzmerci.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzmerci.tex @@ -6,4 +6,5 @@ Jim Diamond , Falk Rühl , Axel Kielhorn , Nils Fleischhacker , -Michel Fruchart
\ No newline at end of file +Michel Fruchart , +Ben Vitecek
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkznoeud1.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkznoeud1.tex index 6966cadfc6d..9a6406d6490 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkznoeud1.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkznoeud1.tex @@ -1,9 +1,11 @@ -%\subsection{Définition des n\oe uds} \SbSSCT{Définition des n\oe uds}{Creation of nodes} \tikzset{blue} -\begin{tabular}{|c | c | c | c |} \hline -\multicolumn{4}{|c|}{ \BS{draw} (1,1) node[\RDD{fill}=red!20] \AC{}; }\\ +\label{noeuds} +\noindent + +\begin{tabular}{|c | c | c | c | c |} \hline +\multicolumn{5}{|c|}{ \BS{draw} (1,1) node[\RDD{fill}=red!20] \AC{}; }\\ \hline \tikz \draw (0,0) grid (2,2) (1,1) node[fill=red!20] {}; & @@ -12,6 +14,8 @@ \tikz \draw (0,0) grid (2,2) (1,1) node[circle,fill=red!20] {}; & \tikz \draw (0,0) grid (2,2) (1,1) node[circle,fill=red!20,draw] {}; +& +\tikz \draw (0,0) grid (2,2) (1,1) node[coordinate] {}; \\ \hline \dft & @@ -20,11 +24,13 @@ node[\RDD{draw}] node[\RDD{circle}] & node[\RDD{circle},\RDD{draw}] + & + node[\RDD{coordinate}] \\ \hline \end{tabular} \bigskip -\begin{tabular}{|c | c | c | c |} \hline +\begin{tabular}{|c | c | c | c | } \hline \multicolumn{4}{|c|}{ \BSS{node} \RDD{at} (1,1) [fill=red!20] \AC{}; }\\ \hline \begin{tikzpicture} @@ -46,6 +52,7 @@ node[\RDD{draw}] \draw (0,0) grid (2,2) ; \node at (1,1) [circle,draw] {}; \end{tikzpicture} + \\ \hline [fill=red!20] & @@ -59,15 +66,181 @@ node[\RDD{draw}] \bigskip \TFRGB{Autres types de n\oe uds voir page}{Other type of nodes see page} \pageref{noeudboite} +\bigskip + + +\begin{tabular}{|c|c|} \hline +\BS{draw} (0,0) node at (1,0) \AC{1} node at (2,0) \AC{2} & \BS{draw}(0,0) node foreach \BS{x} in \AC{1,2,...,5}\\ +node at (3,0) \AC{3} node at (4,0) \AC{4} node at (5,0) \AC{5}; & at (\BS{x},0) \AC{\BS{x}};\\ +\hline +\tikz \draw (0,0) node at (1,0) {1} node at (2,0) {2} node at (3,0) {3} node at (4,0) {4} node at (5,0) {5}; +& +\tikz \draw (0,0) node foreach \x in {1,2,...,5} at (\x,0) {\x}; +\\ \hline +\end{tabular} + + + +\bigskip + +\begin{tabular}{|c|} \hline +\BS{draw}[\rouge{every node/.style=\AC{draw,red}}](0,0) node foreach \BS{x} in \AC{1,2,...,5} at (\BS{x},0) \AC{\BS{x}}; +\\ \hline +\rule[-3pt]{0pt}{.8cm}\tikz \draw[every node/.style={draw,red}] (0,0) node foreach \x in {1,2,...,5} at (\x,0) {\x}; +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|} \hline +\BS{draw}[\rouge{every rectangle node/.style=\AC{draw,red}},\\ +\rouge{every circle node/.style=\AC{draw,double}}]\\ (0,0) node at (1,0) \AC{1} node[circle] at (2,0) \AC{2} \\ node[circle] at (3,0) \AC{3} node at (4,0) \AC{4} node at (5,0) \AC{5}; +\\ \hline +\rule[-3pt]{0pt}{1cm} \tikz \draw[every rectangle node/.style={draw,red}, +every circle node/.style={draw,double}] (0,0) node at (1,0) {1} node[circle] at (2,0) {2} node[circle] at (3,0) {3} node at (4,0) {4} node at (5,0) {5}; +\\ \hline +\end{tabular} + +\SbSSCT{Nom des n\oe uds}{Node name} + + +\begin{tabular}{|c|c|c|} +\hline +\multicolumn{3}{|c|}{} \\ +\hline +\begin{tikzpicture} +\node[name=A,fill=red] at (0,0) {}; +\draw (-1,-1) grid (1,1) ; +\draw (A) circle (.5) ; +\end{tikzpicture} +& +\begin{tikzpicture} +\node[name=A,alias=B,fill=red] at (0,0) {} ; +\draw (-1,-1) grid (1,1) ; +\draw (B) circle (.5) ; +\end{tikzpicture} +& +\begin{tikzpicture} +\node[fill=red] (C) at (0,0) {}; +\draw (-1,-1) grid (1,1) ; +\draw (C) circle (.5); +\end{tikzpicture} \\ +\hline +\BS{node}[\RDD{name}=A] at (0,0) \AC{} & \BS{node}[\RDD{name}=A,\RDD{alias}=B] at (0,0) \AC{} & +\BS{node}\rouge {(C)} at (0,0) \AC{} \\ +\BS{draw} (A) circle (.5); & \BS{draw} (B) circle (.5); &\BS{draw} (C) circle (.5); +\\ \hline +\end{tabular} +\newpage +\SbSSCT{Contenu des n\oe uds}{Node contents} +\tikzset{blue} + +\begin{center} +\RRR{17-2-1} +\end{center} + +\begin{tabular}{|c|c|} \hline +\BS{node} at (1,1) [fill=red!20]\rouge { \AC{XXX} }; +& +\BS{node} at (1,1) [fill=red!20,\RDD{node contents}=XXX] \AC{}; +\\ \hline + \begin{tikzpicture} +\draw (0,0) grid (2,2) ; +\node at (1,1) [fill=red!20] {XXX}; +\end{tikzpicture} +& +\begin{tikzpicture} +\draw (0,0) grid (2,2) ; +\node at (1,1) [fill=red!20,node contents=XXX] {}; +\end{tikzpicture} +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|} \hline +\BS{node}[red] at (1,1) [fill=blue!20] \AC{XXX} ; +& +\BS{node}[red] at (1,1) [fill=blue20,node contents=XXX] \AC{}; +\\ \hline + \begin{tikzpicture} +\draw (0,0) grid (2,2) ; +\node[red] at (1,1) [fill=blue!20] {XXX}; +\end{tikzpicture} +& +\begin{tikzpicture} +\draw (0,0) grid (2,2) ; +\node[red] at (1,1) [fill=blue!20,node contents=XXX] {}; +\end{tikzpicture} +\\ \hline +\end{tabular} + + +\SbSSCT{Premier ou arrière plan}{Behind or in front} + +\begin{tabular}{|c|c|} \hline +\multicolumn{2}{|l|}{\BS{tikz} \BS{fill} [fill=blue!50, draw=blue, very thick] +(0,0) } \\ +\multicolumn{2}{|l|}{node [\RDD{behind path}, fill=red!50] \AC{XXXXX} } \\ +\multicolumn{2}{|l|}{- - (1.5,0) - - (1.5,1) - - (0,1) ;} +\\ \hline +\tikz \fill [fill=blue!50, draw=blue, very thick] +(0,0) node [behind path, fill=red!50] {XXXXX} +-- (1.5,0) +-- (1.5,1) +-- (0,1) ; +& +\tikz \fill [fill=blue!50, draw=blue, very thick] +(0,0) node [in front of path, fill=red!50] {XXXXX} +-- (1.5,0) +-- (1.5,1) +-- (0,1) ; +\\ \hline +\RDD{behind path} +& +\RDD{in front of path} +\\ \hline +\end{tabular} + + + +\SbSSCT{Noms à préfixe ou suffixe}{Name prefix or name suffix} + + +\begin{tabular}{|c|c|} +\hline +\begin{tikzpicture}[every node/.style={draw},baseline=0pt] +\draw[name prefix = top-] node (A) at (1,1) {A} node (B) at (2,1) {B} node (C) at (3,1) {C}; +\draw[name prefix = bottom-] node (1) at (1,0) {1} node (2) at (2,0) {2} node(3) at (3,0) {3}; +\draw [red] (top-A) -- (bottom-3); +\end{tikzpicture} +& +\parbox{12cm}{ +\BS{draw}[\RDD{name prefix} = \blll{top-} ] node (A) at (1,1) \AC{A} node (B) at (2,1) \AC{B} node (C) at (3,1) \AC{C}; \\ +\BS{draw}[\RDD{name prefix} = \blll{bottom-}] node (1) at (1,0) \AC{1} node (2) at (2,0) \AC{2} node(3) at (3,0) \AC{3}; \\ +\BS{draw} [red] (\blll{top-}A) -- (\blll{bottom-}3);} +\\ \hline +\begin{tikzpicture}[every node/.style={draw},baseline=0pt] +\draw[name suffix= -top] node (A) at (1,1) {A} node (B) at (2,1) {B} node (C) at (3,1) {C}; +\draw[name suffix= -bottom] node (1) at (1,0) {1} node (2) at (2,0) {2} node(3) at (3,0) {3}; +\draw [red] (A-top) -- (3-bottom); +\end{tikzpicture} +& +\parbox{12cm}{ +\BS{draw}[\RDD{name suffix} = \blll{-top}] node (A) at (1,1) \AC{A} node (B) at (2,1) \AC{B} node (C) at (3,1) \AC{C}; \\ +\BS{draw}[\RDD{name suffix} = \blll{-bottom}] node (1) at (1,0) \AC{1} node (2) at (2,0) \AC{2} node(3) at (3,0) \AC{3}; \\ +\BS{draw} [red] (A \blll{-top}) - - (3 \blll{-bottom});} +\\ \hline + +\end{tabular} -%------------------------------------------------------------------------------- -%\subsection{Liaisons} \SbSSCT{Liaisons}{Links} \label{liaisons} -\begin{tabular}{|c|c|c|} \hline +\begin{tabular}{|c|c|c|} \hline +\multicolumn{3}{|l|}{\BS{node}[draw] (A) at (0,0) \AC{A}; \hspace{.5cm} \BS{node}[draw] (B) at (1.5,1.5) \AC{B}; \hspace{.5cm} \BS{draw} (A) - - (B) } \\ \hline \begin{tikzpicture}[blue] \node[draw] (A) at (0,0) {A}; \node[draw] (B) at (1.5,1.5) {B}; @@ -147,28 +320,7 @@ node[\RDD{draw}] \end{tikzpicture} \\ \hline (A) to[\RDD{out}=90] (B) & (A) to[\RDD{out}=30] (B) & (A) to[\RDD{in}=-90] (B) -\\ \hline -%\begin{tikzpicture}[blue] -%\node[draw] (A) at (0,0) {A}; -%\node[draw] (B) at (2,2) {B}; -%\draw (A) to[in=90] (B); -%\end{tikzpicture} -%& -%\begin{tikzpicture}[blue] -%\node[draw] (A) at (0,0) {A}; -%\node[draw] (B) at (2,2) {B}; -%\draw (B) to[in=0,out=90] (B); -%\end{tikzpicture} -%& -%\begin{tikzpicture}[blue] -%\node[draw] (A) at (0,0) {A}; -%\node[draw] (B) at (2,2) {B}; -%%\draw (A) to[out=45,in=-90] (A); -%\draw (B) to[out=45,in=135] (B); -%\end{tikzpicture} -%\\ \hline -%(A) to[\RDD{in}=90] (B) & (B) to[bend left] (B) & (B) to[out=45,in=135] (B) -%\\ \hline +\\ \hline \end{tabular} \bigskip @@ -266,12 +418,10 @@ controls +(D) \\ \hline \end{tabular} -%--------------------------------------------------------------------------------- -%\subsection{\'Etiquettes sur les n\oe uds} \SbSSCT{\'Etiquettes sur les n\oe uds}{Node labels} \begin{tabular}{|c|c|c|c|} \hline -\multicolumn{4}{|c|}{ \BS{fill}(0,0) circle (2pt) node[\RDD{above}] \AC{texte} ; }\\ +\multicolumn{4}{|c|}{ \BS{fill}(0,0) circle (2pt) node[\RDD{above}] \AC{texte} ; \RRR{17-5-2} }\\ \hline \begin{tikzpicture} \draw[help lines] (-1,-1) grid (1,1) ;\fill (0,0) circle (2pt) node[above] {texte};\end{tikzpicture} @@ -319,7 +469,7 @@ controls +(D) \bigskip \begin{tabular}{|c|c|c|c|} \hline -\multicolumn{4}{|c|}{ \BS{fill}(0,0) circle (2pt) node[\RDD{above}=.3cm] \AC{texte} ; }\\ +\multicolumn{4}{|c|}{ \BS{fill}(0,0) circle (2pt) node[\RDD{above}=.3cm] \AC{texte} ; \RRR{17-5-2} }\\ \hline \begin{tikzpicture} \draw[help lines] (-1,-1) grid (1,1) ;\fill (0,0) circle (2pt) node[above=.3cm] {texte};\end{tikzpicture} @@ -344,8 +494,7 @@ controls +(D) \\ \hline \end{tabular} - -%\begin{tikzpicture} \draw[help lines] (-1,-1) grid (1,1);\fill (0,0) circle (2pt) node[distance=.3cm] {texte};\end{tikzpicture} + \newpage \selectlanguage{french} @@ -394,8 +543,12 @@ controls +(D) \bigskip \shorthandoff{:} - +\SbSSCT{\'Etiquettes épinglées}{The Pin Option} + +\begin{center} +\RRR{17-10-3} +\end{center} \begin{tabular}{|c|c|c|} \hline \multicolumn{3}{|c|}{ \BSS{shorthandoff}\AC{:} \BS{node}[circle,draw,blue,\RDD{pin}=texte] \AC{} ; \BSS{shorthandon}\AC{:} \footnotemark[1] }\\ @@ -432,16 +585,16 @@ controls +(D) \\ \hline \end{tabular} -% % % % % % % % % % >>>>>>>>>> a voir : option edge <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< +\newpage \shorthandon{:} \selectlanguage{english} -% >>>>>>>>>>>>>>>>>>>>>> A Voir : positioning librairy <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -%\subsection{ N\oe uds sur un chemin} \SbSSCT{ N\oe uds sur un chemin}{Nodes on a path} +\RRR{17-8} + \begin{tabular}{|c|c|c|} \hline \multicolumn{3}{|c|}{ \BS{draw}(0,0) .. controls (1,2) and (2,-1) .. (4,0) node[\RDD{at end}] \AC{texte} ; }\\ \hline @@ -506,7 +659,7 @@ controls +(D) \begin{tabular}{|c|c|c|} \hline \multicolumn{3}{|c|}{ \BS{draw}(A) to [bend right] node [\RDD{bend right}] \AC{texte} (B); }\\ \hline -\begin{tikzpicture} %[auto,bend right] +\begin{tikzpicture} \node[draw] (A) at (0,0) {A}; \node[draw] (B) at (2,2) {B}; \draw (A) to [bend right] node [bend right] {texte} (B); @@ -608,7 +761,3 @@ controls +(D) \end{tikzpicture} \\ \hline \end{tabular} - - - - diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzpeople.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzpeople.tex index 23991abd687..22744cdeeb4 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzpeople.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzpeople.tex @@ -40,7 +40,8 @@ \RDD{conductor} & \RDD{cowboy} & \RDD{criminal} & \RDD{dave} & \RDD{graduate} & \RDD{groom} & \RDD{guard} \\ \hline \tikz \node[jester,minimum size=1.5cm] at (0,0) {}; & -\tikz \node[judge,minimum size=1.5cm] at (0,0) {}; & +%\tikz \node[judge,minimum size=1.5cm] at (0,0) {}; +& \tikz \node[mexican,minimum size=1.5cm] at (0,0) {}; & \tikz \node[nun,minimum size=1.5cm] at (0,0) {}; & \tikz \node[nurse,minimum size=1.5cm] at (0,0) {}; & @@ -344,11 +345,12 @@ font=\BS{tiny}] {Hey!};\\ \begin{tabular}{|c|c|c|c|c|}\hline \multicolumn{5}{|c|}{ \BS{tikz} \BS{node}[\blll{judge},\RDD{hair}=red,minimum size=1.5cm] at (0,0) {}; } \\ \hline -\tikz \node[judge,hair=red,minimum size=1.5cm] at (0,0) {}; & -\tikz \node[judge,skin=red,minimum size=1.5cm] at (0,0) {}; & -\tikz \node[judge,shirt=red,minimum size=1.5cm] at (0,0) {}; & -\tikz \node[judge,undershirt=red,minimum size=1.5cm] at (0,0) {}; & -\tikz \node[judge,hairshadow=red,minimum size=1.5cm] at (0,0) {}; +%\tikz \node[judge,hair=red,minimum size=1.5cm] at (0,0) {}; +& +%\tikz \node[judge,skin=red,minimum size=1.5cm] at (0,0) {}; & +%\tikz \node[judge,shirt=red,minimum size=1.5cm] at (0,0) {}; & +%\tikz \node[judge,undershirt=red,minimum size=1.5cm] at (0,0) {}; & +%\tikz \node[judge,hairshadow=red,minimum size=1.5cm] at (0,0) {}; \\ \hline \RDD{hair}=red & \RDD{skin}=red & \RDD{shirt}=red & \RDD{undershirt}=red & \RDD{hairshadow}=red @@ -375,6 +377,7 @@ font=\BS{tiny}] {Hey!};\\ \bigskip + \begin{tabular}{|c|c|c|}\hline \multicolumn{3}{|c|}{ \BS{tikz} \BS{node}[\blll{nun},\RDD{plaid}=red,minimum size=1.5cm] at (0,0) {}; } \\ \hline diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzpic.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzpic.tex index 7f563f0c79a..36a849b95d1 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzpic.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzpic.tex @@ -1,4 +1,4 @@ -%\subsection{Images créées} + \SbSSCT{Images créées}{Own small pictures} \begin{center} @@ -9,8 +9,6 @@ \tikzset{dfr/.pic={\filldraw[blue] (-2pt,0) rectangle (0,5pt) ; \filldraw[fill=white] (0,0) rectangle (2pt,5pt); \filldraw[fill=red] (2pt,0) rectangle (4pt,5pt); }} -%création - \begin{tabular}{|c|c|}\hline \textbf{Création} & \textbf{ Utilisation} \\ \hline \parbox{10cm}{\BS{tikzset}\AC{{\color{red}{dfr/.pic}}=\AC{\BS{filldraw}[blue] (-2pt,0) rectangle (0,5pt) ; \\ \BS{filldraw[fill=white] (0,0) rectangle (2pt,5pt);\\ \BS{filldraw}[fill=red] (2pt,0) rectangle (4pt,5pt); }}}} @@ -20,9 +18,7 @@ \\ \hline \end{tabular} - \bigskip -%placement à une position \begin{tabular}{|c|c|c|} \hline \multicolumn{2}{|c|}{\textbf{\TFRGB{placement à une position}{Positioning }}} diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzpos.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzpos.tex new file mode 100644 index 00000000000..56ecacf631c --- /dev/null +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzpos.tex @@ -0,0 +1,156 @@ +\subsection{Positionnement relatif de n\oe uds} +\label{lib-pos} + +\maboite{\BS{usetikzlibrary}\AC{positioning}} + + +\begin{center} +\RRR{17-5-3} +\end{center} + +\begin{tabular}{|c|c|c|} \hline +\multicolumn{2}{|c|}{\BS{node} (a) at (1,0) [above=.4cm+.6cm,draw] \AC{XXX};} & \\ \hline +\begin{tikzpicture} +\draw[help lines] (0,0) grid (3,2); +\node (a) at (1,0) [above=.4cm+.6cm,draw] {XXX}; +\draw[->,blue,line width=2pt,dotted] (1,0) -- (a.south) node [midway,right,draw=none,fill=red!10] {.4cm+.6cm} ; +\end{tikzpicture} +& +\begin{tikzpicture} +\draw[help lines] (0,0) grid (3,2); +\node (a) at (1,0) [above=.5+sin(60),draw] {XXX}; +\draw[->,blue,line width=2pt,dotted] (1,0) -- (a.south) node [midway,right,draw=none,fill=red!10] {.5+sin(60)} ; +\end{tikzpicture} +& +\begin{tikzpicture} +\draw[help lines] (0,0) grid (2,2); +\node (a) at (1,0) [above=1,draw] {XXX}; +\draw[->,blue,line width=2pt,dotted] (1,0) -- (a.south) node [midway,right,draw=none,fill=red!10] {1} ; +\end{tikzpicture} +\\ \hline +above = \rouge{0.4cm+0.6cm} & above = \rouge{.5+sin(60)} & above = \rouge{1} \\ +\hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|} \hline +\multicolumn{2}{|c|}{\BS{node} (a) at (1,0) [\rouge{above right=3cm and 2cm},draw] \AC{XXX};} \\ \hline +\begin{tikzpicture} +\draw[help lines] (0,0) grid (5,5); +\node (a) at (1,1) [above right=3cm and 2cm,draw] {XXX}; +\draw[->,blue,line width=2pt,dotted] (1,1) |- (a.south west); +\end{tikzpicture} +& +\begin{tikzpicture} +\draw[help lines] (0,0) grid (5,5); + +\node (b) at (1,4) [below right=3cm and 2cm,draw] {XXX}; +\draw[->,blue,line width=2pt,dotted] (1,4) |- (b.north west); +\end{tikzpicture} +\\ \hline +\rouge{above right=3cm and 2cm} & \rouge{below right=3cm and 2cm} +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|} \hline +\begin{tikzpicture}[every node/.style=draw,baseline=1.5cm] +\draw[help lines] (0,0) grid (5,4); +\node (a) at (1,1) {node a}; +\node (b) [above=2cm of a.north east] {XXX}; +\draw[->,blue,line width=2pt,dotted] (a.north) -- (b.south) node [midway,right,draw=none,fill=red!10] {2cm of a.north east} ; +\end{tikzpicture} +& +\parbox{8cm}{ +\BS{node} (a) at (1,1) \AC{node a}; \\ +\BS{node} (b) [\rouge{above=2cm of a.north east}] \AC{XXX};} +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|} \hline +\begin{tikzpicture}[every node/.style=draw] +\draw[help lines] (0,0) grid (2,3); +\node (a) at (1,0) {node a}; +\node (b) [above=1cm of a] {node b}; +\node (c) [above=1cm of b] {node c}; +\draw[->,blue,line width=2pt,dotted] (a.north) -- (b.south) node [midway,right,draw=none,fill=red!10] {1cm} ; +\draw[->,blue,line width=2pt,dotted] (b.north) -- (c.south) node [midway,right,draw=none,fill=red!10] {1cm} ; +\end{tikzpicture} +& +\begin{tikzpicture}[every node/.style=draw] +\draw[help lines] (0,0) grid (2,3); +\node (a) at (1,0) {node a }; +\node (b) [on grid,above=1cm of a] {node b}; +\node (c) [on grid,above=1cm of b] {node c}; +\draw[->,blue,line width=2pt,dotted] (a.center) -- (b.center) node [midway,right,draw=none,fill=red!10] {1cm} ; +\draw[->,blue,line width=2pt,dotted] (b.center) -- (c.center) node [midway,right,draw=none,fill=red!10] {1cm} ; +\end{tikzpicture} +\\ \hline +\BS{node} (a) at (1,0) \AC{node a}; &\BS{node} (a) at (1,0) \AC{node a}; \\ +\BS{node} (b) [above=1cm of a] \AC{node b}; &\BS{node} (b) [\RDD{on grid},above=1cm of a] \AC{node b}; \\ +\BS{node} (c) [above=1cm of b] \AC{node c}; &\BS{node} (c) [\RDD{on grid},above=1cm of b] \AC{node c}; \\ +\hline +\end{tabular} + +\begin{tabular}{|c|c|} \hline +\begin{tikzpicture}[every node/.style=draw,node distance=1cm,baseline = 1.5cm] +\draw[help lines] (0,0) grid (2,3); +\node (a1) at (1,0) {node a}; +\node (b) [above=of a] {node b}; +\node (c) [above=of b] {node c}; +\draw[->,blue,line width=2pt,dotted] (a.north) -- (b.south) node [midway,right,draw=none,fill=red!10] {1cm} ; +\draw[->,blue,line width=2pt,dotted] (b.north) -- (c.south) node [midway,right,draw=none,fill=red!10] {1cm} ; +\end{tikzpicture} + & + \parbox{12cm}{ +\BS{begin}\AC{tikzpicture}[every node/.style=draw,\RDD{node distance}=1mm] \\ +\BS{node} (a1) at (1,0) \AC{node a}; \\ +\BS{node} (b) [above=of a] \AC{node b}; \\ +\BS{node} (c) [above=of b] \AC{node c}; \\ +\BS{end}\AC{tikzpicture} +} + \\ +\hline +\end{tabular} + +\bigskip + +\begin{tabular}{|l|l|} \hline +\begin{tikzpicture}[node distance=2cm] +\draw[help lines] (0,-1) grid (6,1); +\huge +\node[draw] (X) at (0,0) {X}; +\node[draw] (a) [right=of X] {a}; +\node[draw] (y) [right=of a] {y}; +\draw[->,blue,line width=2pt,dotted] (X.east) -- (a.west) node [midway,draw=none,fill=red!10] {\small{2cm}} ; +\draw[->,blue,line width=2pt,dotted] (a.east) -- (y.west) node [midway,draw=none,fill=red!10] {\small{2cm}} ; +\end{tikzpicture} +& +\begin{tikzpicture}[node distance=2cm] +\draw[help lines] (0,-1) grid (6,1); +\huge +\node[draw] (X) at (0,0) {X}; +\node[draw] (a) [base right=of X] {a}; +\node[draw] (y) [base right=of a] {y}; +\draw[->,blue,line width=2pt,dotted] (X.base east) -- (a.base west) node [midway,draw=none,fill=red!10] {\small{2cm}} ; +\draw[->,blue,line width=2pt,dotted] (a.base east) -- (y.base west) node [midway,draw=none,fill=red!10] {\small{2cm}} ; +\end{tikzpicture} +\\ \hline +\BS{node}[draw] (X) at (0,0) \AC{X}; +& +\BS{node}[draw] (X) at (0,0) \AC{X}; +\\ +\BS{node}[draw] (a) [right=of X] \AC{a}; +& +\BS{node}[draw] (a) [base right=of X] \AC{a}; +\\ +\BS{node}[draw] (y) [right=of a] \AC{y}; +& +\BS{node}[draw] (y) [base right=of a] \AC{y}; +\\ \hline +\end{tabular} + diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzrep1.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzrep1.tex index 394b2748448..d41373a952c 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzrep1.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzrep1.tex @@ -1,10 +1,9 @@ \TFRGB{Utilisation du module \og pgffor \fg chargé automatiquement avec TikZ }{Package used : \og pgffor \fg (automatically loaded with TikZ) } -%\subsection{Répétition à 1 variable} \SbSSCT{Répétition à 1 variable}{One variable repetition} -%\psLoop{5}{ \DFR } + \begin{tabular}{|c|} \hline \tikz \foreach \x in {1,...,10} \fill[blue](\x,0) circle (0.4cm); @@ -15,7 +14,7 @@ Variable \BSR{x} : position en X \\ \hline \end{tabular} -%\subsection{Répétition à 2 variables} + \SbSSCT{Répétition à 2 variables}{Two variables repetition} \begin{tabular}{|c|} \hline @@ -126,9 +125,6 @@ Variable \BSR{x} : angle \end{tabular} - - -%\subsection{Répétition à 2 variables - boucles imbriquées} \SbSSCT{Répétition à 2 variables - boucles imbriquées}{Nested loops} \begin{tabular}{|c|c|} \hline diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzscope.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzscope.tex index 4af5f630860..7ef1d0a71c9 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzscope.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzscope.tex @@ -1,4 +1,4 @@ -%\subsection{Environnement Scope} + \SbSSCT{Environnement Scope}{Environment Scope} \begin{center} @@ -42,7 +42,6 @@ \subsection{library scopes} -%\subsubsection{Simplification d'un environnement scope} \SbSbSSCT{Simplification d'un environnement scope}{Shorthand for Scope Environments} \begin{center} @@ -86,7 +85,6 @@ \\ \hline \end{tabular} -%{\subsubsection{Portée d'un seul élément } \SbSbSSCT{Portée d'un seul élément} {Single Command Scopes} \begin{tabular}{|c|c|} \hline diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzstyl.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzstyl.tex index 73efb94cd3c..24958f987f3 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzstyl.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzstyl.tex @@ -1,4 +1,4 @@ -%\subsection{Style sans variable} + \SbSSCT{Styles sans variable}{Styles without variable} \begin{tabular}{|c|c|} \hline @@ -16,8 +16,6 @@ \end{tabular} - -%\subsection{Style à variable} \SbSSCT{Styles avec variable}{Styles with variable} \begin{tabular}{|c|c|} \hline diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzsymbol.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzsymbol.tex new file mode 100644 index 00000000000..9d3cfbcc5fe --- /dev/null +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzsymbol.tex @@ -0,0 +1,186 @@ +\label{symbol} + + \maboite{\BS{usepackage}\AC{tikzsymbols} \cite {tikzsymbols}} + +\begin{tabular}{|c|c|c|} \hline +\Smiley & \Smiley[3] & \Smiley[5][green] \\ \hline +\BSS{Smiley} & \BSS{Smiley}[3] & \BSS{Smiley}[5][green] \\ \hline +\end{tabular} + + +\bigskip + +\begin{tabular}{|c|c|c|c|c|c|c|}\hline +& \pot[5] & \fryingpan[5] & \eggbeater[5] & \sieve[5] \\ \hline +\DGE & \BSS{Kochtopf}[5]& \BSS{Bratpfanne}[5] & \BSS{Schneebesen}[5] & \BSS{Sieb}[5] \\ \hline +\DGB & \BSS{pot}[5]& \BSS{fryingpan}[5] & \BSS{eggbeater}[5] & \BSS{sieve}[5] \\ \hline \hline + + +& \blender[5] & \trident[5] & \bakingplate[5] & \oven[5] \\ \hline +\DGE & \BSS{Purierstab}[5] & \BSS{Dreizack}[5] & \BSS{Backblech}[5] & \BSS{Ofen}[5] \\ \hline \hline +\DGB & \BSS{blender}[5] & \BSS{trident}[5] & \BSS{bakingplate}[5] & \BSS{oven}[5] \\ \hline \hline + + +& \pan[5] & \cooker[5] & \squeezer[5] & \bowl[5] \\ \hline +\DGE & \BSS{Pfanne}[5] & \BSS{Herd}[5] & \BSS{Saftpresse}[5] & \BSS{Schussel}[5] \\ \hline +\DGB & \BSS{pan}[5] & \BSS{cooker}[5] & \BSS{squeezer}[5] & \BSS{bowl}[5] \\ \hline + & \peeler[5] & \grater[5] & \bottle[5] & \rollingpin[5]\\ \hline +\DGE & \BSS{Schaler}[5] & \BSS{Reibe}[5] &\BSS{Flasche}[5] & \BSS{Nudelholz}[5] \\ \hline +\DGB & \BSS{peeler}[5] & \BSS{grater}[5] & \BSS{bottle}[5] & \BSS{rollingpin}[5] \\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|c|c|c|c|} \hline + +\Smiley[5] & \Sadey[5] & \Neutrey[5] & \Changey[5]{0} & \cChangey[5]{0} \\ \hline +\BSS{Smiley}[5] & \BSS{Sadey}[5] & \BSS{Neutrey}[5] & \BSS{Changey}[5]\AC{0} & \BSS{cChangey}[5]\AC{0} \\ \hline + +\Annoey[5] & \Laughey[5] & \Winkey[5] & \oldWinkey[5] & \Sey[5] \\ \hline +\BSS{Annoey}[5] & \BSS{Laughey}[5] & \BSS{Winkey[}5] & \BSS{oldWinkey}[5] & \BSS{Sey}[5] \\ \hline + +\Xey[5] & \Innocey[5] & \wInnocey[5] & \Cooley[5] & \Tongey[5] \\ \hline +\BSS{Xey}[5] & \BSS{Innocey}[5] & \BSS{wInnocey}[5] & \BSS{Cooley}[5] & \BSS{Tongey}[5] \\ \hline + +\Nursey[5] &\Vomey[5] & \Walley[5] & \rWalley[5] & \Cat[5] \\ \hline +\BSS{Nursey}[5] &\BSS{Vomey}[5] & \BSS{Walley}[5] \BSS{rWalley}[5] & \BSS{Cat}[5] \\ \hline + +\multicolumn{2}{|c|}{\SchrodingersCat[5]{0} } & \Ninja[5] & \Sleepey[5] & \NiceReapey[5] \\ \hline +\multicolumn{2}{|c|}{ \BSS{SchrodingersCat}[5]\AC{0} } & \BSS{Ninja}[5] & \BSS{Sleepey}[5] & \BSS{NiceReapey}[5] \\ \hline + +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|c|c|c|} \hline +\Changey[5]{-2} & \Changey[5]{-1} & \Changey[5]{0} & \Changey[5]{1} & \Changey[5]{2} \\ \hline +\BSS{Changey}[5]\rouge{\AC{-2}} & \BSS{Changey}[5]\rouge{\AC{-1}} & \BSS{Changey}[5]\rouge{\AC{0}} & \BSS{Changey}[5]\rouge{\AC{1}} & \BSS{Changey}[5]\rouge{\AC{2}} \\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|c|c|c|} \hline +\cChangey[5]{-2} & \cChangey[5]{-1} & \cChangey[5]{0} & \cChangey[5]{1} & \cChangey[5]{2} \\ \hline +\BSS{cChangey}[5]\rouge{\AC{-2}} & \BSS{cChangey}[5]\rouge{\AC{-1}} & \BSS{cChangey}[5]\rouge{\AC{0}} & \BSS{cChangey}[5]\rouge{\AC{1}} & \BSS{cChangey}[5]\rouge{\AC{2}} \\ \hline +\end{tabular} + +\bigskip +\begin{tabular}{|c|c|c|} \hline +\SchrodingersCat[5]{- 1} & \SchrodingersCat[5]{0} & \SchrodingersCat[5]{1} \\ \hline +\BSS{SchrodingersCat}[5]\rouge{\AC{-1}} & \BSS{SchrodingersCat}[5]\rouge{\AC{0}} & \BSS{SchrodingersCat}[5]\rouge{\AC{1}} \\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|c|c|} \hline +\Laughey[5][green][red] & \Innocey[5][green][red] & \Tongey[5][green][red] & \Nursey[5][green][red] \\ \hline +\BSS{Laughey}[5]\rouge{[green][red]} & \BSS{Innocey}[5]\rouge{[green][red]} & \BSS{Tongey}[5]\rouge{[green][red]} & \BSS{Nursey}[5]\rouge{[green][red]} \\ \hline + +\Vomey[5][green][red] & \Walley[5][green][red] & \rWalley[5][green][red] & \\ \hline +\BSS{Vomey}[5]\rouge{[green][red]} & \BSS{Walley}[5]\rouge{[green][red]} & \BSS{rWalley}[5]\rouge{[green][red]}& \\ \hline + +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|} \hline +\Ninja[5][green][red][blue] & \Sleepey[5][green][red][blue] \\ \hline +\BSS{Ninja}[5]\rouge{[green][red][blue]} & \BSS{Sleepey}[5]\rouge{[green][red][blue]} \\ \hline +\end{tabular} + + +\bigskip + +\begin{tabular}{|c|c|c|c|c|} \hline +\dSmiley[5] & \dSadey[5] & \dNeutrey[5] & \dChangey[5]{0} & \dcChangey[5]{0} \\ \hline +\BSS{dSmiley}[5] & \BSS{dSadey}[5] & \BSS{dNeutrey}[5] & \BSS{dChangey}[5]\AC{0} & \BSS{dcChangey}[5]\AC{0} \\ \hline + + \dAnnoey[5]& \dLaughey[5] & \dWinkey[5] & \dSey[5] & \dXey[5] \\ \hline + \BSS{dAnnoey}[5]& \BSS{dLaughey}[5] & \BSS{dWinkey}[5] & \BSS{dSey}[5] & \BSS{dXey}[5] \\ \hline + +\dInnocey[5] & \dCooley[5] & \dNinja[5] & \drWalley[5] & \dWalley[5] \\ \hline +\BSS{dInnocey}[5] & \BSS{dCooley}[5] & \BSS{dNinja}[5] & \BSS{drWalley}[5] & \BSS{dWalley}[5] \\ \hline + +\dVomey[5] & \dNursey[5] & \dTongey[5] & \dSleepey[5] & \olddWinkey[5] \\ \hline +\BSS{dVomey}[5] & \BSS{dNursey}[5] & \BSS{dTongey}[5] & \BSS{dSleepey}[5] & \BSS{olddWinkey}[5] \\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|c|c|c|} \hline +\dChangey[5]{-2} & \dChangey[5]{-1} & \dChangey[5]{0} & \dChangey[5]{1} & \dChangey[5]{2} \\ \hline +\BSS{dChangey}[5]\rouge{\AC{-2}} & \BSS{dChangey}[5]\rouge{\AC{-1}} & \BSS{dChangey}[5]\rouge{\AC{0}} & \BSS{dChangey}[5]\rouge{\AC{1}} & \BSS{dChangey}[5]\rouge{\AC{2}} \\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|c|c|c|} \hline +\dcChangey[5]{-2} & \dcChangey[5]{-1} & \dcChangey[5]{0} & \dcChangey[5]{1} & \dcChangey[5]{2} \\ \hline +\BSS{dcChangey}[5]\rouge{\AC{-2}} & \BSS{dcChangey}[5]\rouge{\AC{-1}} & \BSS{dcChangey}[5]\rouge{\AC{0}} & \BSS{dcChangey}[5]\rouge{\AC{1}} & \BSS{dcChangey}[5]\rouge{\AC{2}} \\ \hline +\end{tabular} + +\bigskip +\begin{tabular}{|c|c|c|c|} \hline +\dLaughey[5][green][red] & \dInnocey[5][green][red] & \dTongey[5][green][red] & \dNursey[5][green][red] \\ \hline +\BSS{dLaughey}[5]\rouge{[green][red]} & \BSS{dInnocey}[5]\rouge{[green][red]} & \BSS{dTongey}[5]\rouge{[green][red]} & \BSS{dNursey}[5]\rouge{[green][red]} \\ \hline + +\dVomey[5][green][red] & \dWalley[5][green][red] & \drWalley[5][green][red] & \\ \hline +\BSS{dVomey}[5]\rouge{[green][red]} & \BSS{dWalley}[5]\rouge{[green][red]} & \BSS{drWalley}[5]\rouge{[green][red]}& \\ \hline + +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|} \hline +\dNinja[5][green][red][blue] & \dSleepey[5][green][red][blue] \\ \hline +\BSS{dNinja}[5]\rouge{[green][red][blue]} & \BSS{dSleepey}[5]\rouge{[green][red][blue]} \\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|c|c|c|} \hline +\Strichmaxerl[5] & \Candle[5] & \Fire[5] & \Coffeecup[5] & \Chair[5] \\ \hline +\BSS{Strichmaxerl}[5] & \BSS{Candle}[5] & \BSS{Fire}[5] & \BSS{Coffeecup}[5] & \BSS{Chair}[5] \\ \hline + +\Bed[5] & \Tribar[5] & \Moai[5] & \Snowman[5] & \\ \hline +\BSS{Bed}[5] & \BSS{Tribar}[5] & \BSS{Moai}[5] & \BSS{Snowman}[5] & \\ \hline + +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|c|c|c|} \hline +\multicolumn{5}{|c|}{\BSS{Strichmaxerl}[10][0][0][0][0]} \\ \hline +\Strichmaxerl[10][0][0][0][0] & \Strichmaxerl[10][45][0][0][0] & \Strichmaxerl[10][0][45][0][0] & \Strichmaxerl[10][0][0][45][0] & \Strichmaxerl[10][0][0][0][-45] \\ \hline +[0][0][0][0] & [\rouge{45}][0][0][0] & [0][\rouge{45}][0][0] & [0][0][\rouge{45}][0] & [0][0][0][\rouge{-45}] \\ \hline +\end{tabular} + + +\bigskip + +\begin{tabular}{|c|} \hline +\Tribar[10][green][red][blue] +\\ \hline +\BSS{Tribar}[10][green][red][blue] +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|}\hline +\BasicTree[10]{black}{red}{blue}{leaf} & \BasicTree[10]{black}{red}{blue}{} \\ \hline \BSS{BasicTree}[10]\AC{black}\AC{red}\AC{blue}\AC{leaf} & \BSS{BasicTree}[10]\AC{black}\AC{red}\AC{blue}\AC{} \\ \hline +\end{tabular} + + + +\bigskip +\begin{tabular}{|c|c|c|c|c|} \hline +\Springtree[10] & \Summertree[10] & \Autumntree[10] & \Wintertree[10] & \WorstTree[10] \\ \hline +\BSS{Springtree}[10] & \BSS{Summertree}[10] & \BSS{Autumntree}[10] & \BSS{Wintertree}[10] & \BSS{WorstTree}[10] \\ \hline +\end{tabular} + + + + + + diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzthrough.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzthrough.tex new file mode 100644 index 00000000000..81c9981dbce --- /dev/null +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzthrough.tex @@ -0,0 +1,22 @@ + +\SbSSCT{Cercle défini par deux points}{Circle defined by two points } + + + \maboite{\BS{usetikzlibrary}\AC{through}} +\label{lib-through} + + +\begin{center} +\RRR{ 71 } +\end{center} + +\begin{tabular}{|c|} \hline +\BS{node} [draw] at (2,1) [\RDD{circle through}=\AC{(1,2)}] \AC{c}; +\\ \hline +\begin{tikzpicture} +\draw[help lines] (0,0) grid (3,2); +\filldraw [red] (1,2) circle (2pt); +\node [draw] at (2,1) [circle through={(1,2)}] {c}; +\end{tikzpicture} +\\ \hline +\end{tabular}
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkztitre.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkztitre.tex index fdc43e3c919..85c0bd3216d 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkztitre.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkztitre.tex @@ -5,7 +5,7 @@ \DeclareFixedFont{\RMM}{T1}{ptm}{b}{n}{1cm} -\title{ {\RM Visual TikZ} \\ \vspace{1cm} {\RMM Version 0.65} } +\title{ {\RM Visual TikZ} \\ \vspace{1cm} {\RMM Version 0.66} } @@ -102,21 +102,26 @@ Minimal code is given to show the effect of a command or a parameter. The effect \textbf{Quoi de neuf ! } : \begin{itemize} -\item Résolution partielle du conflit entre \BS{usetikzlibrary}\AC{patterns} (\pageref{lib-patterns}) et \BS{usepackage}\AC{tikzpeople} (\pageref{people}) -\item Ajout matrices de n\oe uds \pageref{matrix} -\item Ajout \og library matrix \fg \pageref{lib-matrix} -\item Ajout du module tikzducks \pageref{ducks} +\item Ajout de la library chains \pageref{lib-chains} +\item Ajout de la library through \pageref{lib-through} +\item Ajout de la library turtle \pageref{lib-turtle} +\item Ajout de la library positioning \pageref{lib-pos} +\item Ajout du module tikzsymbols \pageref{symbol} +\item mise à jour du module tikzducks \pageref{ducks} +\item mise à jour des modules shape \pageref{formes} \end{itemize} } { \textbf{What's new } : \begin{itemize} -\item Partial resolution of the conflict between \BS{usetikzlibrary}\AC{patterns} (\pageref{lib-patterns}) and \BS{usepackage}\AC{tikzpeople} (\pageref{people}) - -\item Matrices of nodes \pageref{matrix} -\item Library matrix added \pageref{lib-matrix} -\item Tikzducks package added \pageref{ducks} +\item chains library added \pageref{lib-chains} +\item through library added \pageref{lib-through} +\item turtle library added \pageref{lib-turtle} +\item positioning library added \pageref{lib-pos} +\item Tikzsymbols package added \pageref{symbol} +\item Tikzducks package updated \pageref{ducks} +\item shapes packages updated \pageref{formes} \end{itemize} } diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkztree.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkztree.tex index 9baea5e1e4b..ff92d139626 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkztree.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkztree.tex @@ -75,7 +75,7 @@ \begin{tabular}{|c|c|c|} \hline \begin{tikzpicture} - \node {père}[grow=-30] % angle + \node {père}[grow=-30] child {node {frère}} child {node {moi} child {node {fils}} @@ -84,7 +84,7 @@ \end{tikzpicture} & \begin{tikzpicture} - \node {père}[grow=30] % angle + \node {père}[grow=30] child {node {frère}} child {node {moi} child {node {fils}} @@ -93,7 +93,7 @@ \end{tikzpicture} & \begin{tikzpicture} - \node {père}[grow'=30] % angle + \node {père}[grow'=30] child {node {frère}} child {node {moi} child {node {fils}} @@ -202,12 +202,9 @@ } \\ \hline \end{tabular} - -%\subsection{N\oe uds } - \subsection{Distance} -%\subsubsection{Distance père fils} + \SbSSCT{Distance père fils}{Parent-child distance} \begin{tabular}{|c|c|} \hline @@ -267,7 +264,6 @@ child {node{soeur}}; \\ \hline \end{tabular} -%\subsubsection{Distance frère soeur} \SbSSCT{Distance père fils}{Two children distance} \begin{tabular}{|c|c|} \hline @@ -333,9 +329,7 @@ child {node{soeur}}; level 2/.style={sibling distance=1cm}] \\ \hline \end{tabular} -% -%-------------------------------------------------- -%\subsection{Personnalisation des noeuds} + \SbSSCT{Personnalisation des noeuds}{Nodes customization} \begin{tabular}{|c|c|} \hline @@ -380,11 +374,7 @@ child {node{soeur}}; \end{tabular} \footnotetext[1]{ \TFRGB{autres types de n\oe uds voir}{Other types of nodes see} section \ref{ndbt} } -% -%%----------------------------------------------- - -%\subsubsection{Nom des noeuds} \SbSbSSCT{Nom des noeuds}{Nodes name} \begin{tabular}{|c|c|} \hline @@ -419,7 +409,6 @@ child \AC{child }\\ \\ \BS{draw}[red,ultra thick] {\color{red}(a-1)} -- {\color{red}(a-2)}; \\ } -%\BS{draw}[red,->] \AC(a-2-1-1) -- (a-1); \\ \hline \end{tabular} @@ -461,10 +450,6 @@ child \\ } \\ \hline \end{tabular} - -% %------------------------------------- - - \bigskip @@ -494,13 +479,10 @@ child \AC{node {\color{red}(f)} \AC{soeur}};\\ \end{tabular} - - -%\subsubsection{Omission d'un noeud} \SbSbSSCT{Omission d'un noeud}{Missing a node} \begin{tabular}{|c|} \hline - \begin{tikzpicture} %[level distance=10mm,sibling distance=5mm] + \begin{tikzpicture} \node {0} child { node {1} } child { node {2} } @@ -514,7 +496,6 @@ child \AC{node {\color{red}(f)} \AC{soeur}};\\ \\ \hline \end{tabular} -% \subsubsection{Modification du point d'accrochage} \SbSbSSCT{Modification du point d'accrochage}{Attachment point modification} \begin{tabular}{|l|l|} \hline @@ -578,10 +559,8 @@ child \AC{node {\color{red}(f)} \AC{soeur}};\\ \hline \end{tabular} -%------------------------------------------ -%\subsection{Liaison} \SbSbSSCT{Liaison}{Links} -% + \begin{tabular}{|c|c|c|} \hline \begin{tikzpicture} \node {pére} @@ -589,7 +568,7 @@ child {node {frère}} child {node {moi}edge from parent[red,ultra thick] child {node {fils}} child {node {fille} } } - child {node{soeur}}; %; + child {node{soeur}}; \end{tikzpicture} & \begin{tikzpicture} @@ -602,7 +581,7 @@ child {node {frère}} \end{tikzpicture} & \begin{tikzpicture} - \node {père} % angle + \node {père} child {node {frère}} child {node {moi} child {node {fils}} @@ -635,9 +614,6 @@ child \{node \AC{moi} & child \{node \AC{fils} & child \{ node \AC{fille} \\ \\ \hline \end{tabular} - - -%\subsubsection{\'Etiquetes sur liaisons} \SbSbSSCT{\'Etiquetes sur liaisons}{Labels on link} \begin{tabular}{|c|c|c|c|} \hline @@ -675,13 +651,6 @@ node[\RDD{left},red] & node[\RDD{right},red] & node[\RDD{near end},red] & node[\ \end{tabular} - - - - - - -%\subsubsection{Personalisation des liaisons} \SbSbSSCT{Personalisation des liaisons}{Links customization} \begin{tabular}{|c|c|c|} \hline @@ -729,15 +698,12 @@ node[\RDD{left},red] & node[\RDD{right},red] & node[\RDD{near end},red] & node[\ \end{tabular} - -%-------------------------------------------- \newpage -%\subsection{Options supplémentaires avec « library trees »} + \SbSSCT{Options supplémentaires avec « library trees »}{More options with « library trees »} \label{lib-trees} -%Insérer dans le préambule : \maboite{\BS{usetikzlibrary}\AC{trees}} @@ -745,7 +711,6 @@ node[\RDD{left},red] & node[\RDD{right},red] & node[\RDD{near end},red] & node[\ \RRR{72} \end{center} -%\subsubsection{Positions d'un fils et de deux fils} \SbSbSSCT{Positions d'un fils et de deux fils}{One child and two childrenn position} %\begin{tabular}{|c|c|c|} \hline diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzturtle.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzturtle.tex new file mode 100644 index 00000000000..94a96a49976 --- /dev/null +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzturtle.tex @@ -0,0 +1,176 @@ + + \maboite{\BS{usetikzlibrary}\AC{turtle}} +\label{lib-turtle} + + +\begin{center} +\RRR{ 73 } +\end{center} + +\begin{tabular}{|c|c|c|c|} \hline +\multicolumn{4}{|c|}{ \BS{draw} [blue,line width=3pt,turtle={home,forward}];} \\ \hline +\begin{tikzpicture} +\draw[help lines] (-1.5,-2) grid (1.5,2) ; +\draw [blue,line width=3pt,turtle={home,forward}]; +\end{tikzpicture} +& +\begin{tikzpicture} +\draw[help lines] (-1.5,-2) grid (1.5,2) ; +\draw [blue,line width=3pt,turtle={home,forward=1.5cm}]; +\end{tikzpicture} +& +\begin{tikzpicture} +\draw[help lines] (-1.5,-2) grid (1.5,2) ; +\draw [blue,line width=3pt,turtle={home,fd}]; +\end{tikzpicture} +& +\begin{tikzpicture} +\draw[help lines] (-1.5,-2) grid (1.5,2) ; +\draw [blue,line width=3pt,turtle={home,fd=1.5cm}]; +\end{tikzpicture} +\\ \hline +turtle=\AC{home,forward} & turtle=\AC{home,forward=1.5cm} & turtle=\AC{home,fd} & +turtle=\AC{home,fd=1.5cm} \\ +\hline +\end{tabular} + +\bigskip + + +\begin{tabular}{|c|c|c|c|} +\hline +\multicolumn{4}{|c|}{ \BS{draw} [blue,line width=3pt,turtle={home,left,fd];}} \\ \hline +\hline +\begin{tikzpicture} +\draw (-1,-1) grid (1,1) ; +\draw [blue,line width=3pt,turtle={home,left,fd}]; +\end{tikzpicture} +& +\begin{tikzpicture} +\draw (-1,-1) grid (1,1) ; +\draw [blue,line width=3pt,turtle={home,left=45,fd}]; +\end{tikzpicture} +& +\begin{tikzpicture} +\draw (-1,-1) grid (1,1) ; +\draw [blue,line width=3pt,turtle={home,lt,fd}]; +\end{tikzpicture} +& +\begin{tikzpicture} +\draw (-1,-1) grid (1,1) ; +\draw [blue,line width=3pt,turtle={home,lt=45,fd}]; +\end{tikzpicture} +\\ \hline +turtle=\AC{home,left,fd} & turtle=\AC{home,left=45,fd} & turtle=\AC{home,lt,fd} & +turtle=\AC{home,lt=45,fd} \\ +\hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|c|c|} +\hline +\multicolumn{4}{|c|}{ \BS{draw} [blue,line width=3pt,turtle={home,right,fd];}} \\ \hline +\hline +\begin{tikzpicture} +\draw (-1,-1) grid (1,1) ; +\draw [blue,line width=3pt,turtle={home,right,fd}]; +\end{tikzpicture} +& +\begin{tikzpicture} +\draw (-1,-1) grid (1,1) ; +\draw [blue,line width=3pt,turtle={home,right=45,fd}]; +\end{tikzpicture} +& +\begin{tikzpicture} +\draw (-1,-1) grid (1,1) ; +\draw [blue,line width=3pt,turtle={home,rt,fd}]; +\end{tikzpicture} +& +\begin{tikzpicture} +\draw (-1,-1) grid (1,1) ; +\draw [blue,line width=3pt,turtle={home,rt=45,fd}]; +\end{tikzpicture} +\\ \hline +turtle=\AC{home,right,fd} & turtle=\AC{home,right=45,fd} & turtle=\AC{home,rt,fd} & +turtle=\AC{home,rt=45,fd} \\ +\hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|} \hline +\tikz[blue,line width=3pt] +\draw [->,turtle={home,rt,fd,fd,lt,fd,lt,fd}]; +& +\tikz[blue,line width=3pt] +\draw [->,turtle/distance=2cm,turtle={home,rt,fd,fd,lt,fd,lt,fd}]; +\\ \hline +[->,turtle={home,rt,fd,fd,lt,fd,lt,fd}] & [->,turtle/distance=2cm,turtle={home,rt,fd,fd,lt,fd,lt,fd}] +\\ \hline +\end{tabular} + +\bigskip + + +\begin{tabular}{|c|} \hline +\begin{tikzpicture}[turtle/distance=2cm] +\draw[help lines] (-1.5,-1) grid (6,3) ; +\draw [blue,line width=3pt,dotted,turtle={home,forward,right,forward},fd]; +\draw [red,line width=3pt,turtle={how/.style={bend left},home,fd,rt,fd,fd}] ; +\end{tikzpicture} +\\ \hline +[red,turtle=\AC{\rouge{how/.style}=\AC{bend left},home,fd,rt,fd,fd}] +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|} \hline +\tikz +\filldraw [turtle/distance=2cm,thick,blue,fill=red!20] +[turtle=home] +\foreach \i in {1,...,5} +{ +[turtle={forward,right=144}] +}; +& + +\parbox[b]{10cm}{ +\BS{filldraw}[turtle/distance=2cm,thick,blue,fill=red!20] \\ +$[$ turtle=home $]$ \\ +\BS{foreach} \BS{i} in \AC{1,...,5} \\ +{ +[ turtle=\AC{forward,right=144} ] +}; +} +\\ \hline +\end{tabular} + +\bigskip + + + +\begin{tabular}{|c|c|} \hline +\tikz \draw [thick,blue] +[turtle=home] +\foreach \i in {1,...,25} +{ +[turtle={forward=\i/5,right=120}] +}; +& + +\parbox[b]{10cm}{ +\BS{draw}[thick,blue] \\ +$[$ turtle=home $]$ \\ +\BS{foreach} \BS{i} in \AC{1,...,25} \\ +{ +[turtle=\AC{forward=\BS{i}/5,right=120} ] +}; \\ +\vspace{1cm} +} +\\ \hline +\end{tabular} + + + diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/xxx.txt b/Master/texmf-dist/doc/latex/visualtikz/Source/xxx.txt new file mode 100644 index 00000000000..ab051e9fb66 --- /dev/null +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/xxx.txt @@ -0,0 +1,11 @@ +::0x0,8% +::2 % one blue curve per frame +::7 +::3 +::6 +::c,1x3,5 +::4 +::11 +::5 +::7 +::9 diff --git a/Master/texmf-dist/doc/latex/visualtikz/VisualTikZ-fr.pdf b/Master/texmf-dist/doc/latex/visualtikz/VisualTikZ-fr.pdf Binary files differindex 096b3995277..2557b93fbfd 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/VisualTikZ-fr.pdf +++ b/Master/texmf-dist/doc/latex/visualtikz/VisualTikZ-fr.pdf diff --git a/Master/texmf-dist/doc/latex/visualtikz/VisualTikZ.pdf b/Master/texmf-dist/doc/latex/visualtikz/VisualTikZ.pdf Binary files differindex 52a35de640c..a2b93eff335 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/VisualTikZ.pdf +++ b/Master/texmf-dist/doc/latex/visualtikz/VisualTikZ.pdf |