diff options
Diffstat (limited to 'Master/texmf-dist')
| -rw-r--r-- | Master/texmf-dist/doc/generic/pst-3dplot/Changes | 8 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/generic/pst-3dplot/README.TEXLIVE | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.dat | 451 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.pdf | bin | 2763311 -> 2934096 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex | 543 | ||||
| -rw-r--r-- | Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro | 23 | ||||
| -rw-r--r-- | Master/texmf-dist/source/generic/pst-3dplot/Makefile | 69 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex | 663 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pst-3dplot/pst-3dplot.sty | 6 |
9 files changed, 878 insertions, 891 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/Changes b/Master/texmf-dist/doc/generic/pst-3dplot/Changes index 82594bd3bd0..410fc2c3fce 100644 --- a/Master/texmf-dist/doc/generic/pst-3dplot/Changes +++ b/Master/texmf-dist/doc/generic/pst-3dplot/Changes @@ -1,4 +1,6 @@ pst-3dplot.pro -------- +0.30 2010-01-01 - add the subroutine /tx@ProjThreeD from pst-3d + to get rid of the dependency 0.29 2009-10-06 add option SphericalCoorType 0.28 2009-07-28 add option showgrid for sphere, paraboloid and cylinder 0.27 2008-11-12 add routine for scalar and vector product @@ -15,7 +17,11 @@ pst-3dplot.pro -------- pst-3dplot.tex -------- -1.86 2009-10-06 - add option SphericalCoorType for digfferent Handling +1.89 2010-01-28 - enable coordinates for calculations +1.88 2009-11-24 - new optional argument CoorOffset +1.87 2009-11-12 - fix problem with \def\pst@par{} for objects + - new boolean CheckCoor=true +1.86 2009-10-06 - add option SphericalCoorType for different Handling of spherical coordinates 1.85 2009-08-14 - add option Hincrement for \psCylinder, preset to 0.5 1.84 2009-07-28 - add option showgrid for sphere, paraboloid diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/README.TEXLIVE b/Master/texmf-dist/doc/generic/pst-3dplot/README.TEXLIVE deleted file mode 100644 index 718ae9ef7c3..00000000000 --- a/Master/texmf-dist/doc/generic/pst-3dplot/README.TEXLIVE +++ /dev/null @@ -1,6 +0,0 @@ -The following files have been removed in the TeX Live installation of -the current package, typically due to duplication, lack of space, or -missing source code. You can find these files on CTAN. If questions or -concerns, email tex-live@tug.org. - - tb72voss3d.pdf diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.dat b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.dat new file mode 100644 index 00000000000..af0b9818b25 --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.dat @@ -0,0 +1,451 @@ +%% $Id: pst-3dplot-doc.dat 236 2009-12-31 08:59:43Z herbert $ +\begin{filecontents}{data3D.Roessler} +2.0, 0.0, 0.0 +1.9737089990827656, 0.31348417289942826, 0.024766924774833776 +1.8955421029937392, 0.6286215677998942, 0.040068360866723524 +1.7670706651447274, 0.9374105709682867, 0.04899535062052031 +1.590723362917843, 1.231909925153328, 0.053481257255618045 +1.3698988432765893, 1.5043858076910284, 0.05484157950815698 +1.1089929624834642, 1.7474740837870646, 0.05405054060802597 +0.8133700003182118, 1.9543472822476953, 0.051871025675487174 +0.48929474661269506, 2.1188790687368217, 0.048905975991643626 +0.14383482236825765, 2.2358007890268707, 0.04561506618192828 +-0.21526210928252393, 2.3008455575942284, 0.042324015908839975 +-0.5797140462526329, 2.3108757369567967, 0.03923987600327629 +-0.9408715928640635, 2.263989804617317, 0.03647450352611535 +-1.2899036444077485, 2.1596047939957033, 0.03407200270285084 +-1.6179979190813427, 1.9985108763333657, 0.032034456961492486 +-1.916571194474139, 1.7828952581841464, 0.030342125259363112 +-2.177483349570605, 1.5163333562604153, 0.028967036053499737 +-2.393249071003189, 1.203746100773438, 0.02788091910922922 +-2.5572411971516513, 0.8513231435128283, 0.027059201419929343 +-2.663879978198744, 0.4664126663883511, 0.02648269287557226 +-2.708802925631934, 0.05737937874793611, 0.02613812515779725 +-2.689010380642566, -0.366566854583293, 0.02601824308118291 +-2.6029824533543895, -0.7955685089005423, 0.02612181932183788 +-2.4507635874341873, -1.2193400325823622, 0.026453773503831633 +-2.2340116946856416, -1.627404968883053, 0.02702548109576835 +-1.9560095794567929, -2.009345350292753, 0.027855313387445277 +-1.6216372226896099, -2.3550576916809978, 0.0289694270702017 +-1.237304403725046, -2.6550095751380067, 0.030402801066270472 +-0.8108440834310077, -2.900490621836054, 0.032200483552030916 +-0.3513679296671862, -3.0838515925562944, 0.03441894582781 +0.13091369384807075, -3.1987254529413782, 0.037127316997633816 +0.6249040658632549, -3.2402244813488377, 0.04040805872135605 +1.1188607672806745, -3.205107879829453, 0.044356285531949 +1.6006599982584453, -3.0919148586449468, 0.04907639328314185 +2.0580794189191347, -2.901058780196999, 0.0546739031971644 +2.479094141310295, -2.6348786393672534, 0.06123953904374337 +2.8521805025686247, -2.2976448885720346, 0.06882184942853445 +3.1666224148830464, -1.8955173551046565, 0.07738493864933163 +3.4128151677144074, -1.4364537367227772, 0.08675049123655466 +3.5825610419485394, -0.9300679485338773, 0.09653017105594026 +3.669349217681727, -0.38743858293399275, 0.1060669508996468 +3.66860848741213, 0.1791307830717498, 0.1144200706612233 +3.577915325329169, 0.7563953873937568, 0.12043944425028498 +3.397134032103045, 1.330489785389733, 0.12296507773843657 +3.1284647683004594, 1.8872735777852254, 0.12113969095590112 +2.7763851169553395, 2.4126873166475082, 0.11474338069347088 +2.347493200120509, 2.893102419451378, 0.10439221252377785 +1.8502875359900435, 3.3156518363301752, 0.09145709971549322 +1.2949340704036636, 3.6685348067552614, 0.07768692767531428 +0.6930599799313174, 3.9412962989715026, 0.06469485290776422 +0.057580017439228595, 4.125085518611976, 0.0535544883671607 +-0.5974736410304217, 4.212896026809753, 0.0446737246961642 +-1.2571594448404535, 4.199784163977488, 0.03793342580559009 +-1.9058990041940127, 4.08305672575688, 0.032943967026847994 +-2.527814237674464, 3.8624164257608915, 0.02926777122899019 +-3.1071099498819583, 3.5400549870758162, 0.026539600559695866 +-3.628477534411971, 3.120686978802803, 0.024497408997019937 +-4.077499745532988, 2.6115208596257036, 0.022967312670967185 +-4.441042526876828, 2.022166249356186, 0.02183745323024855 +-4.70762377765629, 1.3644782840310743, 0.02103647475244307 +-4.867750520480961, 0.6523413832730903, 0.020519623345750852 +-4.914216423301318, -0.09860386913565528, 0.020260779880335346 +-4.842351978806912, -0.8712856726498582, 0.020248271372651484 +-4.6502202511419455, -1.6475713988268783, 0.020483040487167408 +-4.338752026039519, -2.4086757864272217, 0.020978468312466414 +-3.9118154036016124, -3.135598187701918, 0.02176162966335394 +-3.376216299081582, -3.8095791632607905, 0.02287609989009088 +-2.7416279233519663, -4.412565984627867, 0.02438674375662763 +-2.020449069764279, -4.927676106927448, 0.0263873000082302 +-1.2275929169104387, -5.339647448336166, 0.029012132811414647 +-0.3802100602126169, -5.635264385846258, 0.032454389441284426 +0.5026483767307007, -5.803748777659692, 0.03699417971765483 +1.4004193818863429, -5.837106085766177, 0.043042551339674814 +2.2914576917034366, -5.730417843942741, 0.05121029037211145 +3.153492702626417, -5.482073360400736, 0.0624150579030452 +3.9640955128490303, -5.093935743066385, 0.07804527614909976 +4.701135335990834, -4.571440165114393, 0.10020069599445576 +5.343202094338152, -3.9236257147151097, 0.1320161372093747 +5.869975027597972, -3.1631057496848705, 0.17801831977245255 +6.2625361048395805, -2.305983838099523, 0.244311599794074 +6.503681987676289, -1.3717191201774368, 0.3380681890205393 +6.57840462343104, -0.38292840523916694, 0.465331169945956 +6.474884726908676, 0.6349281065446967, 0.6259266868842355 +6.186450753049299, 1.654097487676016, 0.8054981916019673 +5.714653774106046, 2.645500975148737, 0.9687649074913285 +5.485153457789435, 3.015596510728925, 1.0166012832905595 +5.339921215942925, 3.226909997062504, 1.0384587046280915 +5.186682071136008, 3.434465541003078, 1.0551261961946548 +5.025763751435938, 3.6379611848927222, 1.0660892490337464 +4.85752084015581, 3.8371048422086753, 1.070925616446375 +4.68233081773646, 4.031615242907043, 1.0693258338419298 +4.500589406948257, 4.221222733824442, 1.0611105450485159 +4.3127053604557695, 4.4056699109614295, 1.04624341462459 +4.119094870078487, 4.584712065919897, 1.024838603272049 +3.920175808449217, 4.758117435522143, 0.9971620808818797 +2.9858392075994002, 5.452943762343482, 0.812612270361229 +1.9873096085271849, 6.017158252509305, 0.5761300699678681 +0.9483591098403636, 6.4385215920732435, 0.35692931483850815 +-0.11455517619792031, 6.707528542956261, 0.19734838656187356 +-1.1872791673771168, 6.816712688735985, 0.10256792576424685 +-2.253446438874668, 6.760732255312321, 0.055184392730956905 +-3.2928943998362246, 6.536949843632011, 0.03431243820247646 +-4.2825078678305575, 6.14607057676533, 0.025497726306147724 +-5.197910469921709, 5.592581854725916, 0.021436720358505936 +-6.014973211129965, 4.884947449140856, 0.01918889343414334 +-6.710904523262051, 4.0356034038898, 0.017735990844505094 +-7.265043812276318, 3.0608075975441884, 0.01673821309724795 +-7.6594970491088885, 1.980373355821153, 0.016067973381140088 +-7.879680210322718, 0.8173022776918248, 0.015667182591688332 +-7.914786129315629, -0.4026740342570332, 0.015507722703657849 +-7.758170400659039, -1.6516339387966874, 0.015580350992863473 +-7.407646979008621, -2.9000765303331484, 0.01589179881627153 +-6.865684276339126, -4.117590498576616, 0.016465388313506357 +-6.13949432143193, -5.2735666277557565, 0.017344502041150147 +-5.241009918259896, -6.337938044106181, 0.0185996519020146 +-4.1867474992434826, -7.281931234281177, 0.020341131584772302 +-2.9975565059563873, -8.078810200283934, 0.02274125667756507 +-1.6982597726010134, -8.704595969360401, 0.0260741453349296 +-0.3171939084766986, -9.138744160322855, 0.03078926449201528 +1.1143349960221263, -9.364764641047929, 0.03765316948011792 +2.562654596930381, -9.370769958811845, 0.04803576908048059 +3.992342511395334, -9.149944248777466, 0.06451815290928255 +5.3667650121129995, -8.700934303634424, 0.09225064072787606 +6.648340617555662, -8.028185919678632, 0.14213766833161504 +7.798060636152677, -7.142298355161241, 0.23861539188590877 +8.773105938261706, -6.06059156350814, 0.4390837635074791 +9.519689894888124, -4.808384473188431, 0.8817804579958542 +9.715556843103172, -4.329500150199969, 1.1494809094253977 +9.81773413178288, -4.016829077379845, 1.3658701874398937 +9.900541029238141, -3.6987075313296836, 1.6268138317999121 +9.962089675717698, -3.3758098556869536, 1.9410504302689513 +10.00018948311941, -3.04888662875504, 2.31855764021317 +10.012308012691376, -2.718776529596604, 2.770448931895757 +9.995538942646686, -2.3864195564228607, 3.3086837048966977 +9.946585194527254, -2.052871225277392, 3.94550210249929 +9.861768678171382, -1.7193170331617214, 4.692479619636648 +9.73708186383974, -1.387085996749398, 5.559093591932963 +9.568299782347848, -1.0576614731948493, 6.550718962065328 +9.351172749338911, -0.7326867662753687, 7.666044771925456 +9.08171801634688, -0.4139623126097994, 8.894047024693492 +8.756619968751496, -0.10343070822988398, 10.21087893622761 +8.373730800484582, 0.19685424764189477, 11.577326972515616 +7.932635745107376, 0.48477759808564364, 12.93775701555075 +7.435211636522119, 0.7582336234791117, 14.221599174082469 +6.886073311702125, 1.0152147309642172, 15.34821078463603 +6.292783529977407, 1.253912865084775, 16.235280564528697 +5.665714946560136, 1.4728231700121752, 16.809840791003843 +5.017506967463606, 1.670836476399769, 17.019770020196443 +4.362149705724899, 1.8473065769510475, 16.842950446240167 +3.713825877381265, 2.0020810431825202, 16.291491858477364 +3.0857122439713383, 2.1354902283238073, 15.409734893129361 +2.488955133350004, 2.2482965651157674, 14.266615196739622 +1.9319838250982082, 2.3416130942444733, 12.944584694656417 +1.420233020012231, 2.4168044221813445, 11.527975739133392 +0.956247998331239, 2.4753841494682987, 10.09331307070606 +0.5400756034519507, 2.518920634293532, 8.703000830901596 +0.16981526138056538, 2.5489590062894587, 7.402615450102852 +-0.15778744089136104, 2.5669630387768843, 6.221163204496736 +-0.446791500247129, 2.5742768833754552, 5.17327095280853 +-0.7016055965842285, 2.572104267210342, 4.262291727847539 +-0.9266456137826842, 2.5615015641386965, 3.483545485219481 +-1.126100478315251, 2.543380911374715, 2.827214855473147 +-1.3037900140486127, 2.5185199007406154, 2.280674836946092 +-1.4630940545519222, 2.487575018607852, 1.8302151859844284 +-1.6069325141944029, 2.45109672027427, 1.4622163609123322 +-1.7377790868385545, 2.409544675056006, 1.1638834278782881 +-1.9835141009235395, 2.3051188345791296, 0.7072590640032498 +-2.3887006417654564, 2.0322388292260882, 0.2504419005182213 +-2.7029450991651705, 1.694574861067702, 0.095879723140791 +-2.9461595995808962, 1.3024699225902538, 0.046384648911208894 +-3.120441752059532, 0.8651045444426645, 0.03102568413623744 +-3.2226426402441297, 0.39212482135232124, 0.02628376880301836 +-3.2490126324449267, -0.10594257459317138, 0.02482230257421722 +-3.1968404376558923, -0.617718546647487, 0.02445966059229445 +-3.065039502462036, -1.1311616703495304, 0.02457363465961232 +-2.8543708677787727, -1.6338232811282312, 0.024998893728533096 +-2.567525196349059, -2.113133158213107, 0.025704902922585416 +-2.2091308259491678, -2.5567008953635995, 0.026705749958042275 +-1.785706750424512, -2.952623596453139, 0.028036552844253267 +-1.305566047862898, -3.2897919355609506, 0.02974888148444629 +-0.778672311256114, -3.558186939832671, 0.03191197936863889 +-0.2164516650596476, -3.749159998455242, 0.034616199441869416 +0.3684362170460448, -3.85568883233519, 0.037977611037885356 +0.9623636917766951, -3.872602545102222, 0.04214318386540144 +1.5510320089789205, -3.7967694257303495, 0.04729557974764842 +2.1197934352965464, -3.627241869327315, 0.05365555176228012 +2.653992246923785, -3.365353587697903, 0.061478085033157916 +3.13931832811565, -3.0147651331161143, 0.07103549757493581 +3.562167899798263, -2.5814545673411113, 0.08257689459834969 +3.910007397782812, -2.073650761579123, 0.0962499172326951 +4.171738387102823, -1.5017072141949206, 0.11197133881160794 +4.338062453621372, -0.8779144330251918, 0.12924497912729804 +4.40184274907451, -0.21624914586490585, 0.14695809594983122 +4.358449680500153, 0.46794032378242034, 0.16324440859893477 +4.206059703699751, 1.1583098991424128, 0.17556317806347035 +3.945852221923799, 1.837947349374204, 0.1811491492776709 +3.582035878130457, 2.4898318659047374, 0.17785623663471162 +3.1216564558450273, 3.0972954319275137, 0.16513442617814475 +2.5742071345935607, 3.6444521233009963, 0.1446079484787909 +1.9511516041571946, 4.116570803965888, 0.11976405507229838 +1.265515665777983, 4.50038789165048, 0.09475388419321912 +0.5316507955859152, 4.784378524644285, 0.07293467873241884 +-0.23485145287864528, 4.9590119844316565, 0.05597412570263211 +-1.0172176600385359, 5.017005746945389, 0.0438864063753544 +-1.7976520000335394, 4.9535717414511655, 0.035710505226950406 +-2.5576493535039337, 4.7666332999592615, 0.030257246575309142 +-3.278432887475822, 4.456989159788667, 0.026552577356675305 +-3.9414535770933643, 4.028408073527033, 0.02395081115268852 +-4.528900136550702, 3.487646429671672, 0.022071478953300156 +-5.024191706107253, 2.844387271156328, 0.02070024783607598 +-5.412441335675305, 2.1111020142311916, 0.019715135865874634 +-5.6808833433057995, 1.3028375909386654, 0.01904461478416901 +-5.819257434483045, 0.4369328965050377, 0.01864674433575866 +-5.820141438919434, -0.4673302493523888, 0.01849933187934492 +-5.679224237377866, -1.3891349378201778, 0.01859553006488194 +-5.395511002335657, -2.3065876101821967, 0.018942383450095683 +-4.971454009298383, -3.1972174926703314, 0.01956141809463142 +-4.4130037914876645, -4.0385061693137025, 0.02049116364319508 +-3.729577201838434, -4.8084354074449545, 0.021792033072380295 +-2.9339409597276824, -5.486040590331391, 0.02355456279546037 +-2.0420114756136036, -6.051956660154793, 0.025912871771244884 +-1.0725741792652026, -6.488943374424333, 0.029066646146450676 +-0.04692829799898515, -6.782376979650935, 0.03331753837237578 +1.011533780954803, -6.92069617783731, 0.039130596376046725 +2.077799392177286, -6.895791618779578, 0.04724010498213066 +3.125741893881876, -6.703330299827618, 0.05883550970166927 +4.128632855587868, -6.343009575327733, 0.07589290221665458 +5.05961830871354, -5.818740669533577, 0.10176969660424362 +5.892093622654209, -5.138769866823729, 0.14226192916779143 +6.599875333110678, -4.315758780556568, 0.20741828746874774 +7.157025294453949, -3.3668651961391745, 0.3143937050896343 +7.53717722488323, -2.3138915913501545, 0.4910838146045407 +7.712402886847818, -1.183583822195186, 0.7781381478768689 +7.702595198900638, -0.42812350737966265, 1.0439443206254988 +7.67446561506387, -0.16104903030612147, 1.1543319115086785 +7.632948617868841, 0.10667973505044293, 1.2740675192698314 +7.577702707241738, 0.37459113695156165, 1.4030914042130438 +7.508409601786327, 0.6421985954099348, 1.5410859148352525 +7.424784720783314, 0.9090014912274651, 1.6874212963397872 +7.3265895117122435, 1.174486461988975, 1.8411028818789186 +7.213645486787356, 1.4381291707465322, 2.000724000730259 +7.08584965988093, 1.6993966058812497, 2.1644299556565616 +6.943190871410281, 1.9577499567045393, 2.3298992018535043 +6.785766265556659, 2.2126480877923727, 2.4943481856925693 +6.613796961846651, 2.463551605430367, 2.654565938477766 +6.427641769878991, 2.7099274723317506, 2.806983257762296 +6.227807666162028, 2.9512540835319805, 2.947779016098424 +6.014955722117556, 3.187026669889763, 3.0730228287014674 +5.789901274794582, 3.4167628500132214, 3.178849201542928 +5.55360738762086, 3.640008111750338, 3.261653809410884 +5.307171059256714, 3.8563409761556864, 3.3182983596224775 +5.051802181036778, 4.065377585263705, 3.3463073348055143 +4.788795867846453, 4.266775464006313, 3.3440384999603214 +4.519499421522313, 4.460236238021824, 3.3108099223278877 +4.245275745765818, 4.645507141955697, 3.2469695421247855 +3.9674654353598813, 4.82238122322642, 3.153898750303703 +3.6873499468628186, 4.9906962275751825, 3.0339482434427665 +3.406118191349739, 5.150332236745906, 2.890311600159902 +3.12483857935146, 5.301208206565302, 2.7268484372224377 +2.8444380385334895, 5.443277617587807, 2.547873693097576 +2.5656888886968816, 5.576523494457237, 2.357931944080772 +2.2892037827722778, 5.70095307113798, 2.1615755320945222 +2.0154382904471495, 5.81659237711927, 1.963162963248748 +1.744700180423593, 5.923480997223305, 1.7666901373964123 +1.4771640906470407, 6.021667219347792, 1.5756622622967296 +1.2128900784178058, 6.111203735988321, 1.3930095469083668 +0.9518445049863615, 6.192144012491572, 1.221045564426458 +0.6939218051735664, 6.2645393828484, 1.0614639164553341 +-0.13367115162002785, 6.442788205774359, 0.6342840983063279 +-1.2100627320994148, 6.539796844326074, 0.2835219482191382 +-2.2500752578957264, 6.47330114030099, 0.11884132977988426 +-3.250285613906829, 6.2439718165630005, 0.053540783798716775 +-4.196135046574074, 5.853976547089403, 0.030630197826803138 +-5.06721808478353, 5.30836764538657, 0.022794185472664354 +-5.841426690446052, 4.615743824149262, 0.01969558880997713 +-6.49731251295517, 3.7884251060162706, 0.018090568801295958 +-7.015335309385255, 2.8423586127367786, 0.01708190414542496 +-7.378614942584927, 1.796869599135022, 0.016424502946090293 +-7.573483778303709, 0.6743040965073674, 0.016040015635774094 +-7.589935824875993, -0.5004180261965485, 0.015898292204984368 +-7.421990842028393, -1.7003280993067817, 0.015990877115598788 +-7.067969634538142, -2.8970006812322575, 0.016325589098541916 +-6.53067286346075, -4.061200110703754, 0.01692684933937439 +-5.817456614184374, -5.163567557246352, 0.017839167606383377 +-4.940200121096248, -6.1753331992821865, 0.019134209420818293 +-3.9151636942566634, -7.06903715332754, 0.02092332395624553 +-2.762737912421797, -7.819242185681628, 0.023379365424123735 +-1.507088639344538, -8.403221137138818, 0.026775335282775335 +-0.17570671939801683, -8.801602493562855, 0.03155497686356822 +1.2011228608846187, -8.998958841781647, 0.038466861583705506 +2.5909080118789567, -8.984325476195657, 0.04883039563280974 +3.959550464832346, -8.751641095998316, 0.06508832904145288 +5.27187993096682, -8.300111543914891, 0.0920082395186199 +6.491952262475553, -7.63451620969267, 0.13940840432511697 +7.582728741990322, -6.7655182495985535, 0.22855155359934456 +8.504235695667463, -5.710136660241023, 0.4073621076943347 +9.20811152798848, -4.492766245374182, 0.7858121391867329 +9.451165302102465, -3.855239780635789, 1.1055274280121736 +9.538728049759913, -3.5487824808305026, 1.3015294428148347 +9.60797725252403, -3.2374138882555825, 1.5351398887405352 +9.657320484583641, -2.921770035363618, 1.8130777525095638 +9.684939493127859, -2.602551239693463, 2.1428510382632773 +9.688766889588388, -2.280530909880685, 2.5326290812217196 +9.666469882855933, -1.956565122748488, 2.990978057503707 +9.61544677823356, -1.6316026346257664, 3.52640607886616 +9.53284394188098, -1.3066947525309012, 4.146658713150576 +9.415602945542282, -0.9830041806268315, 4.857709656231626 +9.260549196207823, -0.6618115798446256, 5.6624125110823424 +9.064533744364885, -0.34451816086358333, 6.558827879034662 +8.8246380431223, -0.032642233174231594, 7.5383240751182985 +8.538445872813158, 0.27219263997712795, 8.583672245477596 +8.204376274793441, 0.5682802288555961, 9.66750511551185 +7.822055816070618, 0.8538668569942097, 10.751646442575037 +7.392689279428867, 1.127200064773404, 11.78788076034458 +6.919369017298653, 1.3865897566594572, 12.720638616816624 +6.407251476286789, 1.6304785279003384, 13.491757456852552 +5.863532687984796, 1.857515335339181, 14.046950117615348 +5.297178484840663, 2.066624596955634, 14.342995599670488 +4.718409083036545, 2.2570619159593073, 14.354193290377983 +4.137991836306676, 2.428448492773784, 14.076544122017214 +3.56644370491083, 2.580779005625226, 13.528566442022477 +3.013269128713752, 2.7144017827432787, 12.748512712193106 +2.486350177342758, 2.8299744395309956, 11.788705787494589 +1.991567428006029, 2.9284016773378174, 10.708389742557397 +1.5326763062431523, 3.0107638187008097, 9.566664406997642 +1.111412651787232, 3.0782446566456216, 8.41676250268043 +0.7277667707293325, 3.1320656685540738, 7.302342672856885 +0.38035226932532257, 3.1734312717389295, 6.25587062404158 +0.06680152098068329, 3.203487294892622, 5.298728978606063 +-0.21586367883078603, 3.2232927336407773, 4.442496444005661 +-0.47091757368808984, 3.233803404870099, 3.6908327091840016 +-0.7016852851618449, 3.2358653333210428, 3.0415177820901573 +-0.9113670530219425, 3.2302154707950024, 2.4883466894435937 +-1.1029238948033526, 3.2174874855420863, 2.0227212404575514 +-1.2790130538063487, 3.198220698721507, 1.6348862215863795 +-1.4419609777867257, 3.172870657692774, 1.3148241539969736 +-1.5937627029203614, 3.1418202395065937, 1.0528572151807694 +-2.101993274633046, 2.973898766660752, 0.43473201862887473 +-2.5847810587134488, 2.6976998774296685, 0.15751879947904163 +-2.9922994335070254, 2.3429048597644946, 0.06496206401319657 +-3.330759433172893, 1.9181764558962058, 0.0358259346748069 +-3.5958830026527364, 1.4324511357554033, 0.026842444524512437 +-3.7808117289834917, 0.8958832654085912, 0.02395993409664841 +-3.879094038380487, 0.32001719539312873, 0.022948452153386145 +-3.8857944085147933, -0.28233369457373164, 0.02260953028177438 +-3.797942906949124, -0.8973256865416054, 0.02262095594544851 +-3.614749318231863, -1.5103803447064017, 0.022904985845180904 +-3.3377133939902524, -2.1065141771427762, 0.023454955802998674 +-2.9706673764613685, -2.6706905197148485, 0.024290828231074365 +-2.519759241666018, -3.1881845090928103, 0.025449651451115808 +-1.9933783513761, -3.6449523887178614, 0.026985842011006955 +-1.402024457740835, -4.027996285751815, 0.028975119439600665 +-0.7581219020613374, -4.325715526817441, 0.031520951831475415 +-0.07578218002167188, -4.528235670683263, 0.0347637614190443 +0.6294805305888491, -4.627706768970493, 0.03889358380592709 +1.3410748905816168, -4.618562932289972, 0.0441669566516942 +2.0416917106858463, -4.497736074326341, 0.05092843998819987 +2.7136887905904636, -4.2648177080108765, 0.05963581740319053 +3.339492536353866, -3.9221638231602576, 0.07088462246215012 +3.902008102813728, -3.474939074113672, 0.08542038050110319 +4.385032053143094, -2.931097539961895, 0.10411353479736482 +4.77366655659884, -2.301297829232222, 0.12785123367156662 +5.054742731741975, -1.598749759384982, 0.15727688939648132 +5.217271726082073, -0.8389877036183063, 0.19230364240806544 +5.252949055601218, -0.03956194347898131, 0.23138920020006068 +5.156725206570757, 0.7803643398873721, 0.27075062838751673 +4.927401732470295, 1.6005236962698655, 0.3040238056894974 +4.5681094114996545, 2.400156334627911, 0.32313209997470504 +4.08642003346071, 3.1586915428744136, 0.32085409664722125 +3.4938552045651723, 3.85642307638721, 0.2944172416116539 +2.8047930883993217, 4.475078864418605, 0.24797520140879956 +2.035158163394719, 4.998212233635217, 0.19170451470456978 +1.2014911005469464, 5.411421482549435, 0.13745835146538982 +0.3207643012834232, 5.7024868102082795, 0.093765781759793 +-0.5892213537916692, 5.8615335075263335, 0.0634523891313674 +-1.5093806674510137, 5.881274687164368, 0.04472715433085047 +-2.4192604593651406, 5.757307783540075, 0.033934121077673546 +-3.297407191621176, 5.488397018788945, 0.0277537372422779 +-4.122007543817511, 5.07668250066827, 0.024018844302520725 +-4.871596642526892, 4.527787604766935, 0.021575384626606506 +-5.525725119205101, 3.850820720933396, 0.01987564499473809 +-6.0655606117591745, 3.058277173200811, 0.018665224236140972 +-6.474430162203531, 2.1658481028149694, 0.0178183893367252 +-6.738308740549882, 1.192142177853216, 0.017267501186505628 +-6.846251134397938, 0.1583259896609392, 0.01697544581004047 +-6.790759476974828, -0.9123099418886927, 0.016924936730755655 +-6.568077210921361, -1.9948510467672929, 0.017114494585318413 +-6.178400766600547, -3.063314263222376, 0.017557710692583973 +-5.626001640417001, -4.091247480383695, 0.018284903709690423 +-4.919253449813759, -5.0523596894206015, 0.019347338524572804 +-4.070560759420412, -5.9211675688611285, 0.020824959267892528 +-3.09618897094418, -6.673643467584464, 0.022839625640272938 +-2.0159973671696005, -7.287849378925841, 0.025577628900753647 +-0.8530806067698964, -7.744541587763247, 0.029328647324738187 +0.36667213111382246, -8.02773131734615, 0.034555018767795334 +1.6150858833262367, -8.125188076474256, 0.04201901687999983 +2.8622538906492307, -8.02887485190668, 0.053025034152899976 +4.0770997333103365, -7.735308526410829, 0.06989680817971138 +5.227882045487002, -7.245846501106422, 0.09694840842876788 +6.282516848871196, -6.566914925448461, 0.14250972076899507 +7.208466697162102, -5.710222731436574, 0.22319936228590626 +7.971688582343952, -4.6930644163752655, 0.3728132314695582 +8.533670662305425, -3.5389310473445112, 0.6596810992783806 +8.792131331877295, -2.6120979670690505, 1.0353870384931827 +8.839573646579051, -2.320764699318184, 1.1908713629857248 +8.87090257978366, -2.0259984600256704, 1.3704663272013125 +8.885109914401811, -1.7283585053857884, 1.5772735606251977 +8.881097244698829, -1.4284450082791116, 1.814485823966621 +8.857676470066595, -1.12690251875592, 2.085253163094494 +8.813576067259218, -0.8244233360033532, 2.3924916148919917 +8.747455325706813, -0.5217505509037185, 2.738624452728525 +8.657929020806591, -0.21968043442758103, 3.125249309712768 +8.543605113618995, 0.08093624479195093, 3.5527312692259185 +8.403137864997262, 0.37919448183198623, 4.019733159804797 +8.235298072199091, 0.6741374611037374, 4.522710410494463 +8.039060806729712, 0.9647617744429308, 5.055418494113888 +7.8137089270703575, 1.2500260430441696, 5.608504079115894 +7.558947747932823, 1.5288634497039384, 6.169272034614508 +7.275022760901465, 1.800198469238202, 6.721732355518512 +6.962828693048845, 2.0629677383684886, 7.247025158543007 +6.623995237931523, 2.316144539460267, 7.724290020767319 +6.260933494331983, 2.558765824549344, 8.1319843419636 +5.876828489402942, 2.789960152414162, 8.44956895026618 +5.475567766354555, 3.0089744573011714, 8.659383848476475 +5.061603759178425, 3.2151973290505755, 8.748458455059811 +4.639757459946976, 3.4081765562191655, 8.709967175545291 +4.214980731856892, 3.5876291076031235, 8.544072459209525 +3.792102169321868, 3.7534424667056783, 8.257994651697016 +3.3755846577409225, 3.905667172348013, 7.865289303919939 +2.969320826577103, 4.044501387296867, 7.384459978932202 +2.576485937968906, 4.1702691375708065, 6.837147440922006 +2.1994581655187235, 4.283394400083416, 6.24618676906171 +1.8398060496747326, 4.384373401081114, 5.633806716423572 +1.4983343389660104, 4.473747339258949, 5.02017580632379 +1.1751738331607897, 4.55207734628084, 4.422404448833488 +0.8698986325393181, 4.619922956552616, 3.8540194272411386 +0.5816549175960387, 4.677824789407899, 3.324855934686289 +0.30928809812589264, 4.726291637548075, 2.8412710676237256 +0.051458835632222436, 4.765791757613755, 2.4065696778141796 +-0.19325781671728326, 4.796747890208006, 2.0215413772617996 +-0.42629267470022375, 4.819535390028161, 1.6850272666076986 +-0.6490221440199537, 4.834482799536002, 1.3944587876822787 +-0.8627258255433654, 4.841874223821472, 1.1463336076973218 +-1.2954600223281432, 4.8333523089052575, 0.7384824684946624 +-2.110903216184799, 4.7165768459672535, 0.2800581822396751 +\end{filecontents} + + +\endinput diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.pdf b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.pdf Binary files differindex 117058e6cf3..a93be92febb 100644 --- a/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.pdf +++ b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.pdf diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex index 97ae30c8454..5a9c7819eeb 100644 --- a/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex +++ b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex @@ -1,474 +1,25 @@ -%% $Id: pst-3dplot-doc.tex 129 2009-08-27 08:54:46Z herbert $ -\listfiles -\begin{filecontents}{data3D.Roessler} -2.0, 0.0, 0.0 -1.9737089990827656, 0.31348417289942826, 0.024766924774833776 -1.8955421029937392, 0.6286215677998942, 0.040068360866723524 -1.7670706651447274, 0.9374105709682867, 0.04899535062052031 -1.590723362917843, 1.231909925153328, 0.053481257255618045 -1.3698988432765893, 1.5043858076910284, 0.05484157950815698 -1.1089929624834642, 1.7474740837870646, 0.05405054060802597 -0.8133700003182118, 1.9543472822476953, 0.051871025675487174 -0.48929474661269506, 2.1188790687368217, 0.048905975991643626 -0.14383482236825765, 2.2358007890268707, 0.04561506618192828 --0.21526210928252393, 2.3008455575942284, 0.042324015908839975 --0.5797140462526329, 2.3108757369567967, 0.03923987600327629 --0.9408715928640635, 2.263989804617317, 0.03647450352611535 --1.2899036444077485, 2.1596047939957033, 0.03407200270285084 --1.6179979190813427, 1.9985108763333657, 0.032034456961492486 --1.916571194474139, 1.7828952581841464, 0.030342125259363112 --2.177483349570605, 1.5163333562604153, 0.028967036053499737 --2.393249071003189, 1.203746100773438, 0.02788091910922922 --2.5572411971516513, 0.8513231435128283, 0.027059201419929343 --2.663879978198744, 0.4664126663883511, 0.02648269287557226 --2.708802925631934, 0.05737937874793611, 0.02613812515779725 --2.689010380642566, -0.366566854583293, 0.02601824308118291 --2.6029824533543895, -0.7955685089005423, 0.02612181932183788 --2.4507635874341873, -1.2193400325823622, 0.026453773503831633 --2.2340116946856416, -1.627404968883053, 0.02702548109576835 --1.9560095794567929, -2.009345350292753, 0.027855313387445277 --1.6216372226896099, -2.3550576916809978, 0.0289694270702017 --1.237304403725046, -2.6550095751380067, 0.030402801066270472 --0.8108440834310077, -2.900490621836054, 0.032200483552030916 --0.3513679296671862, -3.0838515925562944, 0.03441894582781 -0.13091369384807075, -3.1987254529413782, 0.037127316997633816 -0.6249040658632549, -3.2402244813488377, 0.04040805872135605 -1.1188607672806745, -3.205107879829453, 0.044356285531949 -1.6006599982584453, -3.0919148586449468, 0.04907639328314185 -2.0580794189191347, -2.901058780196999, 0.0546739031971644 -2.479094141310295, -2.6348786393672534, 0.06123953904374337 -2.8521805025686247, -2.2976448885720346, 0.06882184942853445 -3.1666224148830464, -1.8955173551046565, 0.07738493864933163 -3.4128151677144074, -1.4364537367227772, 0.08675049123655466 -3.5825610419485394, -0.9300679485338773, 0.09653017105594026 -3.669349217681727, -0.38743858293399275, 0.1060669508996468 -3.66860848741213, 0.1791307830717498, 0.1144200706612233 -3.577915325329169, 0.7563953873937568, 0.12043944425028498 -3.397134032103045, 1.330489785389733, 0.12296507773843657 -3.1284647683004594, 1.8872735777852254, 0.12113969095590112 -2.7763851169553395, 2.4126873166475082, 0.11474338069347088 -2.347493200120509, 2.893102419451378, 0.10439221252377785 -1.8502875359900435, 3.3156518363301752, 0.09145709971549322 -1.2949340704036636, 3.6685348067552614, 0.07768692767531428 -0.6930599799313174, 3.9412962989715026, 0.06469485290776422 -0.057580017439228595, 4.125085518611976, 0.0535544883671607 --0.5974736410304217, 4.212896026809753, 0.0446737246961642 --1.2571594448404535, 4.199784163977488, 0.03793342580559009 --1.9058990041940127, 4.08305672575688, 0.032943967026847994 --2.527814237674464, 3.8624164257608915, 0.02926777122899019 --3.1071099498819583, 3.5400549870758162, 0.026539600559695866 --3.628477534411971, 3.120686978802803, 0.024497408997019937 --4.077499745532988, 2.6115208596257036, 0.022967312670967185 --4.441042526876828, 2.022166249356186, 0.02183745323024855 --4.70762377765629, 1.3644782840310743, 0.02103647475244307 --4.867750520480961, 0.6523413832730903, 0.020519623345750852 --4.914216423301318, -0.09860386913565528, 0.020260779880335346 --4.842351978806912, -0.8712856726498582, 0.020248271372651484 --4.6502202511419455, -1.6475713988268783, 0.020483040487167408 --4.338752026039519, -2.4086757864272217, 0.020978468312466414 --3.9118154036016124, -3.135598187701918, 0.02176162966335394 --3.376216299081582, -3.8095791632607905, 0.02287609989009088 --2.7416279233519663, -4.412565984627867, 0.02438674375662763 --2.020449069764279, -4.927676106927448, 0.0263873000082302 --1.2275929169104387, -5.339647448336166, 0.029012132811414647 --0.3802100602126169, -5.635264385846258, 0.032454389441284426 -0.5026483767307007, -5.803748777659692, 0.03699417971765483 -1.4004193818863429, -5.837106085766177, 0.043042551339674814 -2.2914576917034366, -5.730417843942741, 0.05121029037211145 -3.153492702626417, -5.482073360400736, 0.0624150579030452 -3.9640955128490303, -5.093935743066385, 0.07804527614909976 -4.701135335990834, -4.571440165114393, 0.10020069599445576 -5.343202094338152, -3.9236257147151097, 0.1320161372093747 -5.869975027597972, -3.1631057496848705, 0.17801831977245255 -6.2625361048395805, -2.305983838099523, 0.244311599794074 -6.503681987676289, -1.3717191201774368, 0.3380681890205393 -6.57840462343104, -0.38292840523916694, 0.465331169945956 -6.474884726908676, 0.6349281065446967, 0.6259266868842355 -6.186450753049299, 1.654097487676016, 0.8054981916019673 -5.714653774106046, 2.645500975148737, 0.9687649074913285 -5.485153457789435, 3.015596510728925, 1.0166012832905595 -5.339921215942925, 3.226909997062504, 1.0384587046280915 -5.186682071136008, 3.434465541003078, 1.0551261961946548 -5.025763751435938, 3.6379611848927222, 1.0660892490337464 -4.85752084015581, 3.8371048422086753, 1.070925616446375 -4.68233081773646, 4.031615242907043, 1.0693258338419298 -4.500589406948257, 4.221222733824442, 1.0611105450485159 -4.3127053604557695, 4.4056699109614295, 1.04624341462459 -4.119094870078487, 4.584712065919897, 1.024838603272049 -3.920175808449217, 4.758117435522143, 0.9971620808818797 -2.9858392075994002, 5.452943762343482, 0.812612270361229 -1.9873096085271849, 6.017158252509305, 0.5761300699678681 -0.9483591098403636, 6.4385215920732435, 0.35692931483850815 --0.11455517619792031, 6.707528542956261, 0.19734838656187356 --1.1872791673771168, 6.816712688735985, 0.10256792576424685 --2.253446438874668, 6.760732255312321, 0.055184392730956905 --3.2928943998362246, 6.536949843632011, 0.03431243820247646 --4.2825078678305575, 6.14607057676533, 0.025497726306147724 --5.197910469921709, 5.592581854725916, 0.021436720358505936 --6.014973211129965, 4.884947449140856, 0.01918889343414334 --6.710904523262051, 4.0356034038898, 0.017735990844505094 --7.265043812276318, 3.0608075975441884, 0.01673821309724795 --7.6594970491088885, 1.980373355821153, 0.016067973381140088 --7.879680210322718, 0.8173022776918248, 0.015667182591688332 --7.914786129315629, -0.4026740342570332, 0.015507722703657849 --7.758170400659039, -1.6516339387966874, 0.015580350992863473 --7.407646979008621, -2.9000765303331484, 0.01589179881627153 --6.865684276339126, -4.117590498576616, 0.016465388313506357 --6.13949432143193, -5.2735666277557565, 0.017344502041150147 --5.241009918259896, -6.337938044106181, 0.0185996519020146 --4.1867474992434826, -7.281931234281177, 0.020341131584772302 --2.9975565059563873, -8.078810200283934, 0.02274125667756507 --1.6982597726010134, -8.704595969360401, 0.0260741453349296 --0.3171939084766986, -9.138744160322855, 0.03078926449201528 -1.1143349960221263, -9.364764641047929, 0.03765316948011792 -2.562654596930381, -9.370769958811845, 0.04803576908048059 -3.992342511395334, -9.149944248777466, 0.06451815290928255 -5.3667650121129995, -8.700934303634424, 0.09225064072787606 -6.648340617555662, -8.028185919678632, 0.14213766833161504 -7.798060636152677, -7.142298355161241, 0.23861539188590877 -8.773105938261706, -6.06059156350814, 0.4390837635074791 -9.519689894888124, -4.808384473188431, 0.8817804579958542 -9.715556843103172, -4.329500150199969, 1.1494809094253977 -9.81773413178288, -4.016829077379845, 1.3658701874398937 -9.900541029238141, -3.6987075313296836, 1.6268138317999121 -9.962089675717698, -3.3758098556869536, 1.9410504302689513 -10.00018948311941, -3.04888662875504, 2.31855764021317 -10.012308012691376, -2.718776529596604, 2.770448931895757 -9.995538942646686, -2.3864195564228607, 3.3086837048966977 -9.946585194527254, -2.052871225277392, 3.94550210249929 -9.861768678171382, -1.7193170331617214, 4.692479619636648 -9.73708186383974, -1.387085996749398, 5.559093591932963 -9.568299782347848, -1.0576614731948493, 6.550718962065328 -9.351172749338911, -0.7326867662753687, 7.666044771925456 -9.08171801634688, -0.4139623126097994, 8.894047024693492 -8.756619968751496, -0.10343070822988398, 10.21087893622761 -8.373730800484582, 0.19685424764189477, 11.577326972515616 -7.932635745107376, 0.48477759808564364, 12.93775701555075 -7.435211636522119, 0.7582336234791117, 14.221599174082469 -6.886073311702125, 1.0152147309642172, 15.34821078463603 -6.292783529977407, 1.253912865084775, 16.235280564528697 -5.665714946560136, 1.4728231700121752, 16.809840791003843 -5.017506967463606, 1.670836476399769, 17.019770020196443 -4.362149705724899, 1.8473065769510475, 16.842950446240167 -3.713825877381265, 2.0020810431825202, 16.291491858477364 -3.0857122439713383, 2.1354902283238073, 15.409734893129361 -2.488955133350004, 2.2482965651157674, 14.266615196739622 -1.9319838250982082, 2.3416130942444733, 12.944584694656417 -1.420233020012231, 2.4168044221813445, 11.527975739133392 -0.956247998331239, 2.4753841494682987, 10.09331307070606 -0.5400756034519507, 2.518920634293532, 8.703000830901596 -0.16981526138056538, 2.5489590062894587, 7.402615450102852 --0.15778744089136104, 2.5669630387768843, 6.221163204496736 --0.446791500247129, 2.5742768833754552, 5.17327095280853 --0.7016055965842285, 2.572104267210342, 4.262291727847539 --0.9266456137826842, 2.5615015641386965, 3.483545485219481 --1.126100478315251, 2.543380911374715, 2.827214855473147 --1.3037900140486127, 2.5185199007406154, 2.280674836946092 --1.4630940545519222, 2.487575018607852, 1.8302151859844284 --1.6069325141944029, 2.45109672027427, 1.4622163609123322 --1.7377790868385545, 2.409544675056006, 1.1638834278782881 --1.9835141009235395, 2.3051188345791296, 0.7072590640032498 --2.3887006417654564, 2.0322388292260882, 0.2504419005182213 --2.7029450991651705, 1.694574861067702, 0.095879723140791 --2.9461595995808962, 1.3024699225902538, 0.046384648911208894 --3.120441752059532, 0.8651045444426645, 0.03102568413623744 --3.2226426402441297, 0.39212482135232124, 0.02628376880301836 --3.2490126324449267, -0.10594257459317138, 0.02482230257421722 --3.1968404376558923, -0.617718546647487, 0.02445966059229445 --3.065039502462036, -1.1311616703495304, 0.02457363465961232 --2.8543708677787727, -1.6338232811282312, 0.024998893728533096 --2.567525196349059, -2.113133158213107, 0.025704902922585416 --2.2091308259491678, -2.5567008953635995, 0.026705749958042275 --1.785706750424512, -2.952623596453139, 0.028036552844253267 --1.305566047862898, -3.2897919355609506, 0.02974888148444629 --0.778672311256114, -3.558186939832671, 0.03191197936863889 --0.2164516650596476, -3.749159998455242, 0.034616199441869416 -0.3684362170460448, -3.85568883233519, 0.037977611037885356 -0.9623636917766951, -3.872602545102222, 0.04214318386540144 -1.5510320089789205, -3.7967694257303495, 0.04729557974764842 -2.1197934352965464, -3.627241869327315, 0.05365555176228012 -2.653992246923785, -3.365353587697903, 0.061478085033157916 -3.13931832811565, -3.0147651331161143, 0.07103549757493581 -3.562167899798263, -2.5814545673411113, 0.08257689459834969 -3.910007397782812, -2.073650761579123, 0.0962499172326951 -4.171738387102823, -1.5017072141949206, 0.11197133881160794 -4.338062453621372, -0.8779144330251918, 0.12924497912729804 -4.40184274907451, -0.21624914586490585, 0.14695809594983122 -4.358449680500153, 0.46794032378242034, 0.16324440859893477 -4.206059703699751, 1.1583098991424128, 0.17556317806347035 -3.945852221923799, 1.837947349374204, 0.1811491492776709 -3.582035878130457, 2.4898318659047374, 0.17785623663471162 -3.1216564558450273, 3.0972954319275137, 0.16513442617814475 -2.5742071345935607, 3.6444521233009963, 0.1446079484787909 -1.9511516041571946, 4.116570803965888, 0.11976405507229838 -1.265515665777983, 4.50038789165048, 0.09475388419321912 -0.5316507955859152, 4.784378524644285, 0.07293467873241884 --0.23485145287864528, 4.9590119844316565, 0.05597412570263211 --1.0172176600385359, 5.017005746945389, 0.0438864063753544 --1.7976520000335394, 4.9535717414511655, 0.035710505226950406 --2.5576493535039337, 4.7666332999592615, 0.030257246575309142 --3.278432887475822, 4.456989159788667, 0.026552577356675305 --3.9414535770933643, 4.028408073527033, 0.02395081115268852 --4.528900136550702, 3.487646429671672, 0.022071478953300156 --5.024191706107253, 2.844387271156328, 0.02070024783607598 --5.412441335675305, 2.1111020142311916, 0.019715135865874634 --5.6808833433057995, 1.3028375909386654, 0.01904461478416901 --5.819257434483045, 0.4369328965050377, 0.01864674433575866 --5.820141438919434, -0.4673302493523888, 0.01849933187934492 --5.679224237377866, -1.3891349378201778, 0.01859553006488194 --5.395511002335657, -2.3065876101821967, 0.018942383450095683 --4.971454009298383, -3.1972174926703314, 0.01956141809463142 --4.4130037914876645, -4.0385061693137025, 0.02049116364319508 --3.729577201838434, -4.8084354074449545, 0.021792033072380295 --2.9339409597276824, -5.486040590331391, 0.02355456279546037 --2.0420114756136036, -6.051956660154793, 0.025912871771244884 --1.0725741792652026, -6.488943374424333, 0.029066646146450676 --0.04692829799898515, -6.782376979650935, 0.03331753837237578 -1.011533780954803, -6.92069617783731, 0.039130596376046725 -2.077799392177286, -6.895791618779578, 0.04724010498213066 -3.125741893881876, -6.703330299827618, 0.05883550970166927 -4.128632855587868, -6.343009575327733, 0.07589290221665458 -5.05961830871354, -5.818740669533577, 0.10176969660424362 -5.892093622654209, -5.138769866823729, 0.14226192916779143 -6.599875333110678, -4.315758780556568, 0.20741828746874774 -7.157025294453949, -3.3668651961391745, 0.3143937050896343 -7.53717722488323, -2.3138915913501545, 0.4910838146045407 -7.712402886847818, -1.183583822195186, 0.7781381478768689 -7.702595198900638, -0.42812350737966265, 1.0439443206254988 -7.67446561506387, -0.16104903030612147, 1.1543319115086785 -7.632948617868841, 0.10667973505044293, 1.2740675192698314 -7.577702707241738, 0.37459113695156165, 1.4030914042130438 -7.508409601786327, 0.6421985954099348, 1.5410859148352525 -7.424784720783314, 0.9090014912274651, 1.6874212963397872 -7.3265895117122435, 1.174486461988975, 1.8411028818789186 -7.213645486787356, 1.4381291707465322, 2.000724000730259 -7.08584965988093, 1.6993966058812497, 2.1644299556565616 -6.943190871410281, 1.9577499567045393, 2.3298992018535043 -6.785766265556659, 2.2126480877923727, 2.4943481856925693 -6.613796961846651, 2.463551605430367, 2.654565938477766 -6.427641769878991, 2.7099274723317506, 2.806983257762296 -6.227807666162028, 2.9512540835319805, 2.947779016098424 -6.014955722117556, 3.187026669889763, 3.0730228287014674 -5.789901274794582, 3.4167628500132214, 3.178849201542928 -5.55360738762086, 3.640008111750338, 3.261653809410884 -5.307171059256714, 3.8563409761556864, 3.3182983596224775 -5.051802181036778, 4.065377585263705, 3.3463073348055143 -4.788795867846453, 4.266775464006313, 3.3440384999603214 -4.519499421522313, 4.460236238021824, 3.3108099223278877 -4.245275745765818, 4.645507141955697, 3.2469695421247855 -3.9674654353598813, 4.82238122322642, 3.153898750303703 -3.6873499468628186, 4.9906962275751825, 3.0339482434427665 -3.406118191349739, 5.150332236745906, 2.890311600159902 -3.12483857935146, 5.301208206565302, 2.7268484372224377 -2.8444380385334895, 5.443277617587807, 2.547873693097576 -2.5656888886968816, 5.576523494457237, 2.357931944080772 -2.2892037827722778, 5.70095307113798, 2.1615755320945222 -2.0154382904471495, 5.81659237711927, 1.963162963248748 -1.744700180423593, 5.923480997223305, 1.7666901373964123 -1.4771640906470407, 6.021667219347792, 1.5756622622967296 -1.2128900784178058, 6.111203735988321, 1.3930095469083668 -0.9518445049863615, 6.192144012491572, 1.221045564426458 -0.6939218051735664, 6.2645393828484, 1.0614639164553341 --0.13367115162002785, 6.442788205774359, 0.6342840983063279 --1.2100627320994148, 6.539796844326074, 0.2835219482191382 --2.2500752578957264, 6.47330114030099, 0.11884132977988426 --3.250285613906829, 6.2439718165630005, 0.053540783798716775 --4.196135046574074, 5.853976547089403, 0.030630197826803138 --5.06721808478353, 5.30836764538657, 0.022794185472664354 --5.841426690446052, 4.615743824149262, 0.01969558880997713 --6.49731251295517, 3.7884251060162706, 0.018090568801295958 --7.015335309385255, 2.8423586127367786, 0.01708190414542496 --7.378614942584927, 1.796869599135022, 0.016424502946090293 --7.573483778303709, 0.6743040965073674, 0.016040015635774094 --7.589935824875993, -0.5004180261965485, 0.015898292204984368 --7.421990842028393, -1.7003280993067817, 0.015990877115598788 --7.067969634538142, -2.8970006812322575, 0.016325589098541916 --6.53067286346075, -4.061200110703754, 0.01692684933937439 --5.817456614184374, -5.163567557246352, 0.017839167606383377 --4.940200121096248, -6.1753331992821865, 0.019134209420818293 --3.9151636942566634, -7.06903715332754, 0.02092332395624553 --2.762737912421797, -7.819242185681628, 0.023379365424123735 --1.507088639344538, -8.403221137138818, 0.026775335282775335 --0.17570671939801683, -8.801602493562855, 0.03155497686356822 -1.2011228608846187, -8.998958841781647, 0.038466861583705506 -2.5909080118789567, -8.984325476195657, 0.04883039563280974 -3.959550464832346, -8.751641095998316, 0.06508832904145288 -5.27187993096682, -8.300111543914891, 0.0920082395186199 -6.491952262475553, -7.63451620969267, 0.13940840432511697 -7.582728741990322, -6.7655182495985535, 0.22855155359934456 -8.504235695667463, -5.710136660241023, 0.4073621076943347 -9.20811152798848, -4.492766245374182, 0.7858121391867329 -9.451165302102465, -3.855239780635789, 1.1055274280121736 -9.538728049759913, -3.5487824808305026, 1.3015294428148347 -9.60797725252403, -3.2374138882555825, 1.5351398887405352 -9.657320484583641, -2.921770035363618, 1.8130777525095638 -9.684939493127859, -2.602551239693463, 2.1428510382632773 -9.688766889588388, -2.280530909880685, 2.5326290812217196 -9.666469882855933, -1.956565122748488, 2.990978057503707 -9.61544677823356, -1.6316026346257664, 3.52640607886616 -9.53284394188098, -1.3066947525309012, 4.146658713150576 -9.415602945542282, -0.9830041806268315, 4.857709656231626 -9.260549196207823, -0.6618115798446256, 5.6624125110823424 -9.064533744364885, -0.34451816086358333, 6.558827879034662 -8.8246380431223, -0.032642233174231594, 7.5383240751182985 -8.538445872813158, 0.27219263997712795, 8.583672245477596 -8.204376274793441, 0.5682802288555961, 9.66750511551185 -7.822055816070618, 0.8538668569942097, 10.751646442575037 -7.392689279428867, 1.127200064773404, 11.78788076034458 -6.919369017298653, 1.3865897566594572, 12.720638616816624 -6.407251476286789, 1.6304785279003384, 13.491757456852552 -5.863532687984796, 1.857515335339181, 14.046950117615348 -5.297178484840663, 2.066624596955634, 14.342995599670488 -4.718409083036545, 2.2570619159593073, 14.354193290377983 -4.137991836306676, 2.428448492773784, 14.076544122017214 -3.56644370491083, 2.580779005625226, 13.528566442022477 -3.013269128713752, 2.7144017827432787, 12.748512712193106 -2.486350177342758, 2.8299744395309956, 11.788705787494589 -1.991567428006029, 2.9284016773378174, 10.708389742557397 -1.5326763062431523, 3.0107638187008097, 9.566664406997642 -1.111412651787232, 3.0782446566456216, 8.41676250268043 -0.7277667707293325, 3.1320656685540738, 7.302342672856885 -0.38035226932532257, 3.1734312717389295, 6.25587062404158 -0.06680152098068329, 3.203487294892622, 5.298728978606063 --0.21586367883078603, 3.2232927336407773, 4.442496444005661 --0.47091757368808984, 3.233803404870099, 3.6908327091840016 --0.7016852851618449, 3.2358653333210428, 3.0415177820901573 --0.9113670530219425, 3.2302154707950024, 2.4883466894435937 --1.1029238948033526, 3.2174874855420863, 2.0227212404575514 --1.2790130538063487, 3.198220698721507, 1.6348862215863795 --1.4419609777867257, 3.172870657692774, 1.3148241539969736 --1.5937627029203614, 3.1418202395065937, 1.0528572151807694 --2.101993274633046, 2.973898766660752, 0.43473201862887473 --2.5847810587134488, 2.6976998774296685, 0.15751879947904163 --2.9922994335070254, 2.3429048597644946, 0.06496206401319657 --3.330759433172893, 1.9181764558962058, 0.0358259346748069 --3.5958830026527364, 1.4324511357554033, 0.026842444524512437 --3.7808117289834917, 0.8958832654085912, 0.02395993409664841 --3.879094038380487, 0.32001719539312873, 0.022948452153386145 --3.8857944085147933, -0.28233369457373164, 0.02260953028177438 --3.797942906949124, -0.8973256865416054, 0.02262095594544851 --3.614749318231863, -1.5103803447064017, 0.022904985845180904 --3.3377133939902524, -2.1065141771427762, 0.023454955802998674 --2.9706673764613685, -2.6706905197148485, 0.024290828231074365 --2.519759241666018, -3.1881845090928103, 0.025449651451115808 --1.9933783513761, -3.6449523887178614, 0.026985842011006955 --1.402024457740835, -4.027996285751815, 0.028975119439600665 --0.7581219020613374, -4.325715526817441, 0.031520951831475415 --0.07578218002167188, -4.528235670683263, 0.0347637614190443 -0.6294805305888491, -4.627706768970493, 0.03889358380592709 -1.3410748905816168, -4.618562932289972, 0.0441669566516942 -2.0416917106858463, -4.497736074326341, 0.05092843998819987 -2.7136887905904636, -4.2648177080108765, 0.05963581740319053 -3.339492536353866, -3.9221638231602576, 0.07088462246215012 -3.902008102813728, -3.474939074113672, 0.08542038050110319 -4.385032053143094, -2.931097539961895, 0.10411353479736482 -4.77366655659884, -2.301297829232222, 0.12785123367156662 -5.054742731741975, -1.598749759384982, 0.15727688939648132 -5.217271726082073, -0.8389877036183063, 0.19230364240806544 -5.252949055601218, -0.03956194347898131, 0.23138920020006068 -5.156725206570757, 0.7803643398873721, 0.27075062838751673 -4.927401732470295, 1.6005236962698655, 0.3040238056894974 -4.5681094114996545, 2.400156334627911, 0.32313209997470504 -4.08642003346071, 3.1586915428744136, 0.32085409664722125 -3.4938552045651723, 3.85642307638721, 0.2944172416116539 -2.8047930883993217, 4.475078864418605, 0.24797520140879956 -2.035158163394719, 4.998212233635217, 0.19170451470456978 -1.2014911005469464, 5.411421482549435, 0.13745835146538982 -0.3207643012834232, 5.7024868102082795, 0.093765781759793 --0.5892213537916692, 5.8615335075263335, 0.0634523891313674 --1.5093806674510137, 5.881274687164368, 0.04472715433085047 --2.4192604593651406, 5.757307783540075, 0.033934121077673546 --3.297407191621176, 5.488397018788945, 0.0277537372422779 --4.122007543817511, 5.07668250066827, 0.024018844302520725 --4.871596642526892, 4.527787604766935, 0.021575384626606506 --5.525725119205101, 3.850820720933396, 0.01987564499473809 --6.0655606117591745, 3.058277173200811, 0.018665224236140972 --6.474430162203531, 2.1658481028149694, 0.0178183893367252 --6.738308740549882, 1.192142177853216, 0.017267501186505628 --6.846251134397938, 0.1583259896609392, 0.01697544581004047 --6.790759476974828, -0.9123099418886927, 0.016924936730755655 --6.568077210921361, -1.9948510467672929, 0.017114494585318413 --6.178400766600547, -3.063314263222376, 0.017557710692583973 --5.626001640417001, -4.091247480383695, 0.018284903709690423 --4.919253449813759, -5.0523596894206015, 0.019347338524572804 --4.070560759420412, -5.9211675688611285, 0.020824959267892528 --3.09618897094418, -6.673643467584464, 0.022839625640272938 --2.0159973671696005, -7.287849378925841, 0.025577628900753647 --0.8530806067698964, -7.744541587763247, 0.029328647324738187 -0.36667213111382246, -8.02773131734615, 0.034555018767795334 -1.6150858833262367, -8.125188076474256, 0.04201901687999983 -2.8622538906492307, -8.02887485190668, 0.053025034152899976 -4.0770997333103365, -7.735308526410829, 0.06989680817971138 -5.227882045487002, -7.245846501106422, 0.09694840842876788 -6.282516848871196, -6.566914925448461, 0.14250972076899507 -7.208466697162102, -5.710222731436574, 0.22319936228590626 -7.971688582343952, -4.6930644163752655, 0.3728132314695582 -8.533670662305425, -3.5389310473445112, 0.6596810992783806 -8.792131331877295, -2.6120979670690505, 1.0353870384931827 -8.839573646579051, -2.320764699318184, 1.1908713629857248 -8.87090257978366, -2.0259984600256704, 1.3704663272013125 -8.885109914401811, -1.7283585053857884, 1.5772735606251977 -8.881097244698829, -1.4284450082791116, 1.814485823966621 -8.857676470066595, -1.12690251875592, 2.085253163094494 -8.813576067259218, -0.8244233360033532, 2.3924916148919917 -8.747455325706813, -0.5217505509037185, 2.738624452728525 -8.657929020806591, -0.21968043442758103, 3.125249309712768 -8.543605113618995, 0.08093624479195093, 3.5527312692259185 -8.403137864997262, 0.37919448183198623, 4.019733159804797 -8.235298072199091, 0.6741374611037374, 4.522710410494463 -8.039060806729712, 0.9647617744429308, 5.055418494113888 -7.8137089270703575, 1.2500260430441696, 5.608504079115894 -7.558947747932823, 1.5288634497039384, 6.169272034614508 -7.275022760901465, 1.800198469238202, 6.721732355518512 -6.962828693048845, 2.0629677383684886, 7.247025158543007 -6.623995237931523, 2.316144539460267, 7.724290020767319 -6.260933494331983, 2.558765824549344, 8.1319843419636 -5.876828489402942, 2.789960152414162, 8.44956895026618 -5.475567766354555, 3.0089744573011714, 8.659383848476475 -5.061603759178425, 3.2151973290505755, 8.748458455059811 -4.639757459946976, 3.4081765562191655, 8.709967175545291 -4.214980731856892, 3.5876291076031235, 8.544072459209525 -3.792102169321868, 3.7534424667056783, 8.257994651697016 -3.3755846577409225, 3.905667172348013, 7.865289303919939 -2.969320826577103, 4.044501387296867, 7.384459978932202 -2.576485937968906, 4.1702691375708065, 6.837147440922006 -2.1994581655187235, 4.283394400083416, 6.24618676906171 -1.8398060496747326, 4.384373401081114, 5.633806716423572 -1.4983343389660104, 4.473747339258949, 5.02017580632379 -1.1751738331607897, 4.55207734628084, 4.422404448833488 -0.8698986325393181, 4.619922956552616, 3.8540194272411386 -0.5816549175960387, 4.677824789407899, 3.324855934686289 -0.30928809812589264, 4.726291637548075, 2.8412710676237256 -0.051458835632222436, 4.765791757613755, 2.4065696778141796 --0.19325781671728326, 4.796747890208006, 2.0215413772617996 --0.42629267470022375, 4.819535390028161, 1.6850272666076986 --0.6490221440199537, 4.834482799536002, 1.3944587876822787 --0.8627258255433654, 4.841874223821472, 1.1463336076973218 --1.2954600223281432, 4.8333523089052575, 0.7384824684946624 --2.110903216184799, 4.7165768459672535, 0.2800581822396751 -\end{filecontents} +\input{pst-3dplot-doc.dat} +%% $Id: pst-3dplot-doc.tex 241 2010-01-04 08:22:34Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings - headexclude,footexclude,oneside]{pst-doc} -\usepackage[utf8]{inputenc} -\usepackage{pst-3dplot} -\let\myFV\fileversion + headexclude,footexclude,oneside,dvipsnames,svgnames]{pst-doc} +\listfiles -\usepackage{pst-grad} -\usepackage{showexpl} -\usepackage{tabularx} -\lstset{wide=true} -\usepackage{longtable} -\def\UrlFont{\small\ttfamily} +\usepackage[utf8]{inputenc} +\usepackage{pst-3dplot,pst-3d,pst-grad} +\SpecialCoor +\let\pstFV\fileversion +\let\belowcaptionskip\abovecaptionskip + +%\usepackage{pst-grad} +%\usepackage{showexpl} +%\usepackage{tabularx} +%\usepackage{longtable} +% \makeatletter -\def\verbatim@font{\small\normalfont\ttfamily} +\renewcommand*\l@subsection{\bprot@dottedtocline{2}{1.5em}{3.6em}} +\renewcommand*\l@subsubsection{\bprot@dottedtocline{3}{3.8em}{4.5em}} \makeatother -\let\myPart\part -\renewcommand{\part}[1]{\clearpage\myPart{#1}} -\newcommand\verbI[1]{\small\texttt{#1}} -\psset{subgriddiv=0,gridlabels=7pt,gridcolor=black!15} -\hypersetup{pdfauthor={Herbert Voss},pdftitle={3D Plots}} -% \def\bgImage{% \begin{pspicture}(0,-3)(7,5) \pstThreeDCoor[xMax=2,yMax=13,zMin=0,zMax=6,IIIDticks]% @@ -481,17 +32,22 @@ \pstThreeDLine[linestyle=dashed]{->}(0,0,5)(0,13,5) \end{pspicture} } -% +\lstset{explpreset={pos=l,width=-99pt,overhang=0pt,hsep=\columnsep,vsep=\bigskipamount,rframe={}}, + escapechar=?} +\def\textat{\char064}% +\let\verbI\texttt + \begin{document} \author{Herbert Voß} -\docauthor{} \date{\today} -\title{3D plots: PST-3dplot} -\subtitle{A PSTricks package for drawing 3d objects, v\myFV} -\maketitle% +\title{3D plots: pst-3dplot} +\subtitle{A PSTricks package for drawing 3d objects, v\pstFV} +\maketitle \tableofcontents + + \clearpage \begin{abstract} The well known \LPack{pstricks} package offers excellent macros to insert more or less complex @@ -609,6 +165,7 @@ x^{*}=-x\cdot\cos\alpha+y\cdot\sin\alpha \end{equation} + The z-coordinate is unimportant, because the rotation comes out of the paper plane, so we have only a different $y^*$ value for the two dimensional coordinate but no other $x^*$ value. The $\beta$ angle is well seen in figure \ref{Abb0-3} which derives from figure \ref{Abb0-2}, @@ -755,10 +312,13 @@ listed options with the predefined values. \Lkeyword{RotSequence} & xyz|xzy|yxz|yzx|zxy|zyx|quaternion & xyz\\ \Lkeyword{RotSet} & set|concat|keep & set\\ \Lkeyword{eulerRotation} & true|false & false\\ +\Lkeyword{IIIDOffset} & \{<x,y,z>\} & \{0,0,0\}\\ +\Lkeyword{zlabelFactor} & <text> & \verb=\relax= \\ \end{longtable} } + \lstset{wide=false} \begin{LTXexample}[width=4.25cm] \begin{pspicture}(-3,-2.5)(3,4.25) @@ -849,7 +409,6 @@ ticklabels can be changed by redefining the macro \end{verbatim} - \psset{unit=1.25,gridlabels=0pt} \begin{LTXexample}[width=7.25cm] \begin{pspicture}(-3,-2.5)(3,4) @@ -906,8 +465,31 @@ The following example shows a wrong placing of the labels, the planes should be \end{pspicture} \end{LTXexample} +For the z axis it is possible to define a factor for the values, e.g. + +\setIIIDplotDefaults +\xLkeyword{zlabelFactor} +%\define@key[psset]{pst-3dplot}{zlabelFactor}[\relax]{\def\psk@zlabelFactor{#1}} +\begin{LTXexample}[width=7.25cm] +\begin{pspicture}(-4,-2.25)(1,4) + \pstThreeDCoor[IIIDticks,IIIDlabels, + zlabelFactor=$\cdot10^3$] +\end{pspicture} +\end{LTXexample} + + +\subsection{Offset} +The optional argument \Lkeyword{IIIDOffset} allows to set the intermediate point of all +axes to another point as the default of \verb+(0,0,0)+. The values have to be put into braces: +%\define@key[psset]{pst-3dplot}{zlabelFactor}[\relax]{\def\psk@zlabelFactor{#1}} + +\begin{LTXexample}[width=7.25cm] +\begin{pspicture}(-4,-1.25)(1,4) + \pstThreeDCoor[IIIDticks,IIIDlabels, + yMin=-3,IIIDOffset={(1,-2,1)}] +\end{pspicture} +\end{LTXexample} -\clearpage \subsection{Experimental features} All features are as long as they are not really tested called experimental. With the optional argument \Lkeyword{coorType}, which is by default 0, one can change the the viewing of the axes @@ -1196,9 +778,9 @@ The equation for the examples is \[ f(x,y)=\frac{x^2+2y^2-6x-4y+3}{10} \] \section{Put} -There exists a special option for the put macros: +There exists a special option for the put macros: \xLkeyword{pOrigin} \begin{verbatim} -origin=lt|lB|lb|t|c|B|b|rt|rB|rb +pOrigin=lt|lB|lb|t|c|B|b|rt|rB|rb \end{verbatim} for the placing of the text or other objects. @@ -1318,7 +900,7 @@ following examples show for all three planes the same textbox. \bigskip -The following examples use the \Lkeyword{origin} option to show that there are +The following examples use the \Lkeyword{pOrigin} option to show that there are still some problems with the xy-plane. The second parameter is \Lkeyword{planecorr}. As first the values: @@ -1346,7 +928,7 @@ parameter \Lkeyword{planecorr} to \Lkeyval{normal}; just like in next example: \medskip \begin{LTXexample}[width=6cm] \begin{pspicture}(-3,-2)(3,4) - \psset{origin=lb} + \psset{pOrigin=lb} \pstThreeDCoor[xMax=3.2,yMax=3.2,zMax=4] \pstThreeDDot[drawCoor=true,linecolor=red](1,-1,2) \pstPlanePut[plane=xy,planecorr=normal](1,-1,2) @@ -1371,7 +953,7 @@ letters is parallel to the $y$ axis. It's done by setting \medskip \begin{LTXexample}[width=6cm] \begin{pspicture}(-2,-2)(4,4) - \psset{origin=lb} + \psset{pOrigin=lb} \psset{Alpha=69.3,Beta=19.43} \pstThreeDCoor[xMax=4,yMax=4,zMax=4] \pstThreeDDot[drawCoor=true,linecolor=red](1,-1,2) @@ -2853,6 +2435,11 @@ error. In this case save prevent expanding with e.g.: \verb+\psset{nameX=$\noexp +\clearpage +\section{List of all optional arguments for \texttt{pst-3dplot}} + +\xkvview{family=pst-3dplot,columns={key,type,default}} + \bgroup \nocite{*} diff --git a/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro b/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro index 4260d7ed25e..335b8ad8d66 100644 --- a/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro +++ b/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro @@ -1,4 +1,4 @@ -%% $Id: pst-3dplot.pro 136 2009-10-06 21:37:53Z herbert $ +%% $Id: pst-3dplot.pro 236 2009-12-31 08:59:43Z herbert $ %% %% This is file `pst-3dplot.pro', %% @@ -16,7 +16,7 @@ %% `pst-3dplot' is a PSTricks package to draw 3d curves and graphical objects %% %% -%% version 0.29 / 2009-10-06 Herbert Voss <voss _at_ PSTricks.de> +%% version 0.30 / 2010-01-01 Herbert Voss <voss _at_ PSTricks.de> %% with contributions of Darrell Lamm <darrell.lamm _at_ gtri.gatech.edu< %% % @@ -319,15 +319,6 @@ tx@3DPlotDict begin /factor ED { factor mul } forall 3 array astore } def % % -% 3D objects -/tx@ProjThreeD {% adopted from pst-3d - /z ED /y ED /x ED - Matrix3D aload pop - z mul exch y mul add exch x mul add - 4 1 roll - z mul exch y mul add exch x mul add - exch } def -% /setColorLight { % expects 7 values on stack C M Y K xL yL zL % les rayons de lumi�re xLight dup mul yLight dup mul zLight dup mul add add sqrt /NormeLight ED @@ -343,34 +334,34 @@ tx@3DPlotDict begin /Xpoint Rsphere theta cos mul phi cos mul CX add def /Ypoint Rsphere theta sin mul phi cos mul CY add def /Zpoint Rsphere phi sin mul CZ add def - Xpoint Ypoint Zpoint tx@ProjThreeD moveto + Xpoint Ypoint Zpoint tx@3Ddict begin ProjThreeD end moveto theta 1 theta increment add {% /theta1 ED /Xpoint Rsphere theta1 cos mul phi cos mul CX add def /Ypoint Rsphere theta1 sin mul phi cos mul CY add def /Zpoint Rsphere phi sin mul CZ add def - Xpoint Ypoint Zpoint tx@ProjThreeD lineto + Xpoint Ypoint Zpoint tx@3Ddict begin ProjThreeD end lineto } for phi 1 phi increment add { /phi1 ED /Xpoint Rsphere theta increment add cos mul phi1 cos mul CX add def /Ypoint Rsphere theta increment add sin mul phi1 cos mul CY add def /Zpoint Rsphere phi1 sin mul CZ add def - Xpoint Ypoint Zpoint tx@ProjThreeD lineto + Xpoint Ypoint Zpoint tx@3Ddict begin ProjThreeD end lineto } for theta increment add -1 theta {% /theta1 ED /Xpoint Rsphere theta1 cos mul phi increment add cos mul CX add def /Ypoint Rsphere theta1 sin mul phi increment add cos mul CY add def /Zpoint Rsphere phi increment add sin mul CZ add def - Xpoint Ypoint Zpoint tx@ProjThreeD lineto + Xpoint Ypoint Zpoint tx@3Ddict begin ProjThreeD end lineto } for phi increment add -1 phi { /phi1 ED /Xpoint Rsphere theta cos mul phi1 cos mul CX add def /Ypoint Rsphere theta sin mul phi1 cos mul CY add def /Zpoint Rsphere phi1 sin mul CZ add def - Xpoint Ypoint Zpoint tx@ProjThreeD lineto + Xpoint Ypoint Zpoint tx@3Ddict begin ProjThreeD end lineto } for closepath } def diff --git a/Master/texmf-dist/source/generic/pst-3dplot/Makefile b/Master/texmf-dist/source/generic/pst-3dplot/Makefile deleted file mode 100644 index 2a4d9aca9e6..00000000000 --- a/Master/texmf-dist/source/generic/pst-3dplot/Makefile +++ /dev/null @@ -1,69 +0,0 @@ - -# `Makefile' for `pst-3dplot.pdf', hv, 2007/03/17 - -.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps - -PACKAGE = pst-3dplot - -MAIN = $(PACKAGE)-doc - -TDS = ~/PSTricks/PSTricks-TDS - -LATEX = latex - -ARCHNAME = $(MAIN)-$(shell date +%y%m%d) - -ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Changes Makefile - -all : doc clean -doc: $(MAIN).pdf - -$(MAIN).pdf : $(MAIN).ps - GS_OPTIONS=-dAutoRotatePages=/None ps2pdf $< - -$(MAIN).ps : $(MAIN).dvi - dvips $< - -$(MAIN).dvi : $(MAIN).tex - $(LATEX) $< - $(LATEX) $< - if ! test -f $(basename $<).glo ; then touch $(basename $<).glo; fi - if ! test -f $(basename $<).idx ; then touch $(basename $<).idx; fi - makeindex -t $(basename $<).ilg -s pst-doc.ist -o $(basename $<).ind $(basename $<).idx - makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \ - $(basename $<).glo - bibtex $(basename $<) - $(LATEX) $< - $(LATEX) $< - -clean : - $(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out .blg .Roessler .bbl ) - $(RM) $(addprefix $(MAIN), .dvi .ps .xcp) - -veryclean : clean - $(RM) $(addprefix $(MAIN), .pdf .bbl .blg) - -arch : - zip $(ARCHNAME).zip $(ARCHFILES) - -tds: - cp -u Changes $(TDS)/doc/generic/$(PACKAGE)/ - cp -u README $(TDS)/doc/generic/$(PACKAGE)/ - cp -u $(MAIN).pdf $(TDS)/doc/generic/$(PACKAGE)/ -# - cp -u Changes $(TDS)/tex/latex/$(PACKAGE)/ - cp -u $(PACKAGE).sty $(TDS)/tex/latex/$(PACKAGE)/ -# - cp -u Changes $(TDS)/tex/generic/$(PACKAGE)/ - cp -u $(PACKAGE).tex $(TDS)/tex/generic/$(PACKAGE)/ -# - cp -u Changes $(TDS)/dvips/$(PACKAGE)/ - cp -u $(PACKAGE).pro $(TDS)/dvips/$(PACKAGE)/ -# - cp -u Changes $(TDS)/source/$(PACKAGE)/ - cp -u $(MAIN).tex $(TDS)/source/$(PACKAGE)/ - cp -u $(MAIN).bib $(TDS)/source/$(PACKAGE)/ - cp -u Makefile $(TDS)/source/$(PACKAGE)/ - - -# EOF diff --git a/Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex b/Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex index 395d95988b8..146b6fbf4ba 100644 --- a/Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex +++ b/Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex @@ -1,4 +1,4 @@ -%% $Id: pst-3dplot.tex 136 2009-10-06 21:37:53Z herbert $ +%% $Id: pst-3dplot.tex 293 2010-02-14 17:11:57Z herbert $ %% %% This is file `pst-3dplot.tex', %% @@ -20,58 +20,34 @@ \csname PSTThreeDplotLoaded\endcsname \let\PSTThreeDplotLoaded\endinput % Requires PSTricks, pst-node, pst-plot, multido packages -\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi -\ifx\PSTnodesLoaded\endinput\else\input pst-3d.tex\fi +\ifx\PSTricksLoaded\endinput\else \input pstricks.tex\fi +\ifx\PSTnodesLoaded\endinput\else \input pst-3d.tex\fi \ifx\PSTricksAddLoaded\endinput\else\input pstricks-add.tex\fi% loads node and plot -\ifx\PSTMultidoLoaded\endinput\else\input multido.tex\fi +\ifx\PSTMultidoLoaded\endinput\else \input multido.tex\fi +\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi % -\def\fileversion{1.86} -\def\filedate{2009/10/06} +\def\fileversion{1.89} +\def\filedate{2010/01/28} \message{`PST-3dplot' v\fileversion, \filedate\space (HV,DL)} % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax -\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey \fi + \pst@addfams{pst-3dplot} \SpecialCoor -% -%%%%%%%%%%%%%%%%%% Macrolist %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% \def\pstThreeDPut -% \def\pstThreeDLine -% \def\pstThreeDDot -% \def\pstThreeDNode -% \def\pstUThreeDPut -% \def\pstThreeDSquare -% \def\pstThreeDBox -% \def\pstThreeDSphere -% \def\pstThreeDEllipse -% \def\pstThreeDPlotFunc -% \def\psplotThreeD -% \def\parametricplotThreeD -% \def\psThreeDPlot -% \def\pstThreeDCoor -% \def\fileplotThreeD -% \def\dataplotThreeD -% \def\listplotThreeD -% -% + \newdimen\pst@dimf -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% ---------------- the if's ----------------- % \define@boolkey[psset]{pst-3dplot}[Pst@]{Debug}[true]{}% \define@boolkey[psset]{pst-3dplot}[Pst@]{drawing}[true]{}% draw the coordinates? \define@boolkey[psset]{pst-3dplot}[Pst@]{drawCoor}[true]{}% draw the coordinates of a dot? \define@boolkey[psset]{pst-3dplot}[Pst@]{hiddenLine}[true]{}% emulate hidden line surface? \define@boolkey[psset]{pst-3dplot}[Pst@]{SphericalCoor}[true]{}% (r,phi,theta) -\define@boolkey[psset]{pst-3dplot}[Pst@]{showgrid}[true]{}% draw the coordinates of a dot? -% \Pst@CylindricalCoorfalse}% +\define@boolkey[psset]{pst-3dplot}[Pst@]{IIIDshowgrid}[true]{}% draw the coordinates of a dot? +\define@boolkey[psset]{pst-3dplot}[Pst@]{CoorCheck}[true]{}% check the coordinates \define@boolkey[psset]{pst-3dplot}[Pst@]{CylindricalCoor}[true]{}% (r,phi,z) -% \Pst@SphericalCoorfalse}% \define@boolkey[psset]{pst-3dplot}[Pst@]{leftHanded}[true]{}% left-Handed coor \define@boolkey[psset]{pst-3dplot}[Pst@]{eulerRotation}[true]{}% Use Euler rotation definition -\define@key[psset]{pst-3dplot}{coorType}{% +\define@key[psset]{pst-3dplot}{coorType}[0]{% \pst@getint{#1}\psk@ThreeDplot@coorType \ifcase\psk@ThreeDplot@coorType % 0 is the default @@ -90,53 +66,53 @@ % 0 default % 1 z y are orthogonal and angle x|y is Alpha, Beta has no meaning % 1 z y are orthogonal and angle Alpha is always 135, x-axis shortened by 1/sqrt(2), Beta has no meaning -\define@key[psset]{pst-3dplot}{SphericalCoorType}[0]{\pst@checknum{#1}\psk@ThreeDplot@SphericalCoorType} +\define@key[psset]{pst-3dplot}{SphericalCoorType}[0]{\pst@getint{#1}{\psk@ThreeDplot@SphericalCoorType}} \psset[pst-3dplot]{drawing,drawCoor,hiddenLine=false,SphericalCoor=false,SphericalCoorType=0, - leftHanded=false,eulerRotation=false,coorType=0,showgrid} + leftHanded=false,eulerRotation=false,coorType=0,IIIDshowgrid} % % ------- the global definitions for the pspicture frame ------ % -\define@key[psset]{pst-3dplot}{xMin}{\pst@checknum{#1}\psk@ThreeDplot@xMin } -\define@key[psset]{pst-3dplot}{xMax}{\pst@checknum{#1}\psk@ThreeDplot@xMax } -\define@key[psset]{pst-3dplot}{yMin}{\pst@checknum{#1}\psk@ThreeDplot@yMin } -\define@key[psset]{pst-3dplot}{yMax}{\pst@checknum{#1}\psk@ThreeDplot@yMax } -\define@key[psset]{pst-3dplot}{zMin}{\pst@checknum{#1}\psk@ThreeDplot@zMin } -\define@key[psset]{pst-3dplot}{zMax}{\pst@checknum{#1}\psk@ThreeDplot@zMax } -\define@key[psset]{pst-3dplot}{xThreeDunit}{\pst@checknum{#1}\psk@ThreeDplot@xThreeDunit } -\define@key[psset]{pst-3dplot}{yThreeDunit}{\pst@checknum{#1}\psk@ThreeDplot@yThreeDunit } -\define@key[psset]{pst-3dplot}{zThreeDunit}{\pst@checknum{#1}\psk@ThreeDplot@zThreeDunit } -\define@key[psset]{pst-3dplot}{xRotVec}{\pst@checknum{#1}\psk@ThreeDplot@xRotVec } % Rotation vector x -\define@key[psset]{pst-3dplot}{yRotVec}{\pst@checknum{#1}\psk@ThreeDplot@yRotVec } % Rotation vector y -\define@key[psset]{pst-3dplot}{zRotVec}{\pst@checknum{#1}\psk@ThreeDplot@zRotVec } % Rotation vector z -\define@key[psset]{pst-3dplot}{deltax}{\pst@checknum{#1}\psk@ThreeDplot@deltax } -\define@key[psset]{pst-3dplot}{deltay}{\pst@checknum{#1}\psk@ThreeDplot@deltay } -\define@key[psset]{pst-3dplot}{deltaz}{\pst@checknum{#1}\psk@ThreeDplot@deltaz } -\define@key[psset]{pst-3dplot}{Deltax}{\pst@checknum{#1}\psk@ThreeDplot@Deltax } -\define@key[psset]{pst-3dplot}{Deltay}{\pst@checknum{#1}\psk@ThreeDplot@Deltay } -\define@key[psset]{pst-3dplot}{Deltaz}{\pst@checknum{#1}\psk@ThreeDplot@Deltaz } +\define@key[psset]{pst-3dplot}{xMin}[-1]{\def\psk@ThreeDplot@xMin{#1}} +\define@key[psset]{pst-3dplot}{xMax}[4]{\def\psk@ThreeDplot@xMax{#1}} +\define@key[psset]{pst-3dplot}{yMin}[-1]{\def\psk@ThreeDplot@yMin{#1}} +\define@key[psset]{pst-3dplot}{yMax}[4]{\def\psk@ThreeDplot@yMax{#1}} +\define@key[psset]{pst-3dplot}{zMin}[-1]{\def\psk@ThreeDplot@zMin{#1}} +\define@key[psset]{pst-3dplot}{zMax}[4]{\def\psk@ThreeDplot@zMax{#1}} +\define@key[psset]{pst-3dplot}{xThreeDunit}[1.0]{\def\psk@ThreeDplot@xThreeDunit{#1}} +%\define@key[psset]{pst-3dplot}{xThreeDunit}{\pst@checknum{#1}\psk@ThreeDplot@xThreeDunit } +\define@key[psset]{pst-3dplot}{yThreeDunit}[1.0]{\def\psk@ThreeDplot@yThreeDunit{#1}} +\define@key[psset]{pst-3dplot}{zThreeDunit}[1.0]{\def\psk@ThreeDplot@zThreeDunit{#1}} +\define@key[psset]{pst-3dplot}{xRotVec}[0]{\pst@checknum{#1}\psk@ThreeDplot@xRotVec } % Rotation vector x +\define@key[psset]{pst-3dplot}{yRotVec}[0]{\pst@checknum{#1}\psk@ThreeDplot@yRotVec } % Rotation vector y +\define@key[psset]{pst-3dplot}{zRotVec}[0]{\pst@checknum{#1}\psk@ThreeDplot@zRotVec } % Rotation vector z +\define@key[psset]{pst-3dplot}{deltax}[1.0]{\def\psk@ThreeDplot@deltax{#1}} +%\define@key[psset]{pst-3dplot}{deltax}{\pst@checknum{#1}\psk@ThreeDplot@deltax} +\define@key[psset]{pst-3dplot}{deltay}[1.0]{\def\psk@ThreeDplot@deltay{#1}} +\define@key[psset]{pst-3dplot}{deltaz}[1.0]{\def\psk@ThreeDplot@deltaz{#1}} +\define@key[psset]{pst-3dplot}{Deltax}[1.0]{\def\psk@ThreeDplot@Deltax{#1}} +\define@key[psset]{pst-3dplot}{Deltay}[1.0]{\def\psk@ThreeDplot@Deltay{#1}} +\define@key[psset]{pst-3dplot}{Deltaz}[1.0]{\def\psk@ThreeDplot@Deltaz{#1}} % % -------------- the angles and the plotpoints ------------- % -\define@key[psset]{pst-3dplot}{Alpha}{\pst@getangle{#1}\psk@ThreeDplot@Alpha } % Horizontal turn -\define@key[psset]{pst-3dplot}{Beta}{\pst@getangle{#1}\psk@ThreeDplot@Beta }% Vertical turn -\define@key[psset]{pst-3dplot}{RotX}{\pst@getangle{#1}\psk@ThreeD@RotX }% x rotation -\define@key[psset]{pst-3dplot}{RotY}{\pst@getangle{#1}\psk@ThreeD@RotY }% y rotation -\define@key[psset]{pst-3dplot}{RotZ}{\pst@getangle{#1}\psk@ThreeD@RotZ }% z rotation -\define@key[psset]{pst-3dplot}{RotAngle}{\pst@getangle{#1}\psk@ThreeD@RotAngle }% General rotation angle -\define@key[psset]{pst-3dplot}{RotSequence}{\def\psk@ThreeD@RotS{#1 }}% +\define@key[psset]{pst-3dplot}{Alpha}[45]{\pst@getangle{#1}\psk@ThreeDplot@Alpha } % Horizontal turn +\define@key[psset]{pst-3dplot}{Beta}[30]{\pst@getangle{#1}\psk@ThreeDplot@Beta }% Vertical turn +\define@key[psset]{pst-3dplot}{RotX}[0]{\pst@getangle{#1}\psk@ThreeD@RotX }% x rotation +\define@key[psset]{pst-3dplot}{RotY}[0]{\pst@getangle{#1}\psk@ThreeD@RotY }% y rotation +\define@key[psset]{pst-3dplot}{RotZ}[0]{\pst@getangle{#1}\psk@ThreeD@RotZ }% z rotation +\define@key[psset]{pst-3dplot}{RotAngle}[0]{\pst@getangle{#1}\psk@ThreeD@RotAngle }% General rotation angle +\define@key[psset]{pst-3dplot}{RotSequence}[xyz]{\def\psk@ThreeD@RotS{#1 }}% % Set or Concat -\define@key[psset]{pst-3dplot}{RotSet}{\def\psk@ThreeD@RotSet{#1 }}% -\define@key[psset]{pst-3dplot}{PlaneSequence}{\def\psk@ThreeD@PlaneSequence{#1 }}% -\define@key[psset]{pst-3dplot}{zCoor}{\pst@checknum{#1}\psk@ThreeDplot@zCoor } +\define@key[psset]{pst-3dplot}{RotSet}[set]{\def\psk@ThreeD@RotSet{#1 }}% +\define@key[psset]{pst-3dplot}{PlaneSequence}[{}]{\def\psk@ThreeD@PlaneSequence{#1 }}% +\define@key[psset]{pst-3dplot}{zCoor}[0]{\pst@checknum{#1}\psk@ThreeDplot@zCoor } \psset[pst-3dplot]{zCoor=0} % -%\define@boolkey[psset]{pst-3dplot}[Pst@]{algebraic}[true]{}% same as in pstricks-add -%\psset[pst-3dplot]{algebraic=false} \def\drawStyle@xLines{xLines}% 0 \def\drawStyle@yLines{yLines}% 1 \def\drawStyle@xyLines{xyLines}% 2 \def\drawStyle@yxLines{yxLines}% 3 -\define@key[psset]{pst-3dplot}{drawStyle}{% how to draw 3D functions +\define@key[psset]{pst-3dplot}{drawStyle}[xLines]{% how to draw 3D functions \def\pst@tempa{#1}% \ifx\pst@tempa\drawStyle@xLines\let\psk@ThreeDplot@drawStyle\z@\else% \ifx\pst@tempa\drawStyle@yLines\let\psk@ThreeDplot@drawStyle\@ne\else% @@ -148,55 +124,49 @@ } \psset[pst-3dplot]{drawStyle=xLines} % -\define@key[psset]{pst-3dplot}{xPlotpoints}{\def\psk@ThreeDplot@xPlotpoints{#1}} -\define@key[psset]{pst-3dplot}{yPlotpoints}{\def\psk@ThreeDplot@yPlotpoints{#1}} -\define@key[psset]{pst-3dplot}{beginAngle}{\def\psk@ThreeDplot@beginAngle{#1}}% for ellipse/circle arc -\define@key[psset]{pst-3dplot}{endAngle}{\def\psk@ThreeDplot@endAngle{#1}}% for ellipse/circle arc -\define@key[psset]{pst-3dplot}{linejoin}{\def\psk@ThreeDplot@linejoin{#1 }}% how lines come together 0,1,2 -\define@key[psset]{pst-3dplot}{plane}{\edef\psk@ThreeDplot@plane{#1}}% xy,xz,yz +\define@key[psset]{pst-3dplot}{xPlotpoints}[25]{\def\psk@ThreeDplot@xPlotpoints{#1}} +\define@key[psset]{pst-3dplot}{yPlotpoints}[25]{\def\psk@ThreeDplot@yPlotpoints{#1}} +\define@key[psset]{pst-3dplot}{beginAngle}[0]{\def\psk@ThreeDplot@beginAngle{#1}}% for ellipse/circle arc +\define@key[psset]{pst-3dplot}{endAngle}[360]{\def\psk@ThreeDplot@endAngle{#1}}% for ellipse/circle arc +%\define@key[psset]{pst-3dplot}{linejoin}{\def\psk@ThreeDplot@linejoin{#1 }}% how lines come together 0,1,2 +\define@key[psset]{pst-3dplot}{plane}[xy]{\def\psk@ThreeDplot@plane{#1}}% xy,xz,yz % must be expanded -\define@key[psset]{pst-3dplot}{pOrigin}{\def\psk@ThreeDplot@pOrigin{#1}}% combination of (lr)(tBb) -\define@key[psset]{pst-3dplot}{IIIDdAlpha}{\def\psk@IIIDdAlpha{#1 }} +\define@key[psset]{pst-3dplot}{pOrigin}[c]{\def\psk@ThreeDplot@pOrigin{#1}}% combination of (lr)(tBb) +\define@key[psset]{pst-3dplot}{IIIDdAlpha}[0]{\def\psk@IIIDdAlpha{#1 }} \def\ThreeDplot@planeXY{xy} \def\ThreeDplot@planeXZ{xz} \def\ThreeDplot@planeYZ{yz} % % -------------- the length and node definitions ------------- % -\define@key[psset]{pst-3dplot}{XO}{\def\psk@ThreeDplot@XO{#1}}% the X-offset -\define@key[psset]{pst-3dplot}{YO}{\def\psk@ThreeDplot@YO{#1}}% the y-offset -\define@key[psset]{pst-3dplot}{angleStep}{% for circles - \def\psk@ThreeDplot@angleStep{#1}} -\define@key[psset]{pst-3dplot}{posStart}{% where the arrows start - \def\psk@ThreeDplot@posStart{#1}} -\define@key[psset]{pst-3dplot}{length}{% the length of the before|outlines - \def\psk@ThreeDplot@length{#1}} -\define@key[psset]{pst-3dplot}{arrowOffset}{% offset for \arrowLine - \def\psk@ThreeDplot@arrowOffset{#1}} -\define@key[psset]{pst-3dplot}{visibleLineStyle}{% offset for \arrowLine - \edef\psk@ThreeDplot@visibleLineStyle{#1}} -\define@key[psset]{pst-3dplot}{invisibleLineStyle}{% offset for \arrowLine - \edef\psk@ThreeDplot@invisibleLineStyle{#1}} +\define@key[psset]{pst-3dplot}{XO}[0]{\def\psk@ThreeDplot@XO{#1}}% the X-offset +\define@key[psset]{pst-3dplot}{YO}[0]{\def\psk@ThreeDplot@YO{#1}}% the y-offset +\define@key[psset]{pst-3dplot}{angleStep}[1]{\def\psk@ThreeDplot@angleStep{#1}}% for circles +\define@key[psset]{pst-3dplot}{posStart}[0]{\def\psk@ThreeDplot@posStart{#1}}% where the arrows start +\define@key[psset]{pst-3dplot}{length}[2]{\def\psk@ThreeDplot@length{#1}}% the length of the before|outlines +\define@key[psset]{pst-3dplot}{arrowOffset}[0]{\def\psk@ThreeDplot@arrowOffset{#1}}%offset for \arrowLine +\define@key[psset]{pst-3dplot}{visibleLineStyle}[solid]{\def\psk@ThreeDplot@visibleLineStyle{#1}}% offset for \arrowLine +\define@key[psset]{pst-3dplot}{invisibleLineStyle}[dashed]{\def\psk@ThreeDplot@invisibleLineStyle{#1}}%offset for \arrowLine % \define@boolkey[psset]{pst-3dplot}[Pst@]{IIIDticks}[true]{} \define@boolkey[psset]{pst-3dplot}[Pst@]{IIIDlabels}[true]{} -\define@key[psset]{pst-3dplot}{Dz}{\def\psk@Dz{#1}} -\define@key[psset]{pst-3dplot}{IIIDxTicksPlane}{\def\psk@IIIDxTicksPlane{#1}} -\define@key[psset]{pst-3dplot}{IIIDyTicksPlane}{\def\psk@IIIDyTicksPlane{#1}} -\define@key[psset]{pst-3dplot}{IIIDzTicksPlane}{\def\psk@IIIDzTicksPlane{#1}} -\define@key[psset]{pst-3dplot}{IIIDticksize}{\def\psk@IIIDticksize{#1}} -\define@key[psset]{pst-3dplot}{IIIDxticksep}{\def\psk@IIIDxticksep{#1}} -\define@key[psset]{pst-3dplot}{IIIDyticksep}{\def\psk@IIIDyticksep{#1}} -\define@key[psset]{pst-3dplot}{IIIDzticksep}{\def\psk@IIIDzticksep{#1}} -\define@key[psset]{pst-3dplot}{nameX}{\def\psk@ThreeDplot@nameX{#1}}% start of the object arrow -\define@key[psset]{pst-3dplot}{spotX}{\def\psk@ThreeDplot@spotX{#1}}% where to draw the label -\define@key[psset]{pst-3dplot}{nameY}{\def\psk@ThreeDplot@nameY{#1}} -\define@key[psset]{pst-3dplot}{spotY}{\def\psk@ThreeDplot@spotY{#1}} -\define@key[psset]{pst-3dplot}{nameZ}{\def\psk@ThreeDplot@nameZ{#1}} -\define@key[psset]{pst-3dplot}{spotZ}{\def\psk@ThreeDplot@spotZ{#1}} +\define@key[psset]{pst-3dplot}{Dz}[1]{\def\psk@Dz{#1}} +\define@key[psset]{pst-3dplot}{IIIDxTicksPlane}[xy]{\def\psk@IIIDxTicksPlane{#1}} +\define@key[psset]{pst-3dplot}{IIIDyTicksPlane}[yz]{\def\psk@IIIDyTicksPlane{#1}} +\define@key[psset]{pst-3dplot}{IIIDzTicksPlane}[yz]{\def\psk@IIIDzTicksPlane{#1}} +\define@key[psset]{pst-3dplot}{IIIDticksize}[0.1]{\def\psk@IIIDticksize{#1}} +\define@key[psset]{pst-3dplot}{IIIDxticksep}[-0.2]{\def\psk@IIIDxticksep{#1}} +\define@key[psset]{pst-3dplot}{IIIDyticksep}[-0.2]{\def\psk@IIIDyticksep{#1}} +\define@key[psset]{pst-3dplot}{IIIDzticksep}[0.2]{\def\psk@IIIDzticksep{#1}} +\define@key[psset]{pst-3dplot}{nameX}[$x$]{\def\psk@ThreeDplot@nameX{#1}}% start of the object arrow +\define@key[psset]{pst-3dplot}{spotX}[180]{\def\psk@ThreeDplot@spotX{#1}}% where to draw the label +\define@key[psset]{pst-3dplot}{nameY}[$y$]{\def\psk@ThreeDplot@nameY{#1}} +\define@key[psset]{pst-3dplot}{spotY}[0]{\def\psk@ThreeDplot@spotY{#1}} +\define@key[psset]{pst-3dplot}{nameZ}[$z$]{\def\psk@ThreeDplot@nameZ{#1}} +\define@key[psset]{pst-3dplot}{spotZ}[90]{\def\psk@ThreeDplot@spotZ{#1}} % % ### begin Torsten Suhling -\define@key[psset]{pst-3dplot}{planecorr}{\def\psk@ThreeDplot@planecorr{#1}}% make plane tags readable +\define@key[psset]{pst-3dplot}{planecorr}[none]{\def\psk@ThreeDplot@planecorr{#1}}% make plane tags readable \def\ThreeDplot@planecorrNone{none} % default \def\ThreeDplot@planecorrNormal{normal} % make planes readable \def\ThreeDplot@planecorrXYrot{xyrot} % and put tag for xy-plane @@ -210,18 +180,14 @@ \newcount\pst@cntx \newcount\pst@cnty \newcount\pst@cntz \newdimen\pst@dimx \newdimen\pst@dimy \newdimen\pst@dimz % -\define@key[psset]{pst-3dplot}{planeGrid}{\def\psk@planeGrid{#1}} -\define@key[psset]{pst-3dplot}{planeGridOffset}{\def\psk@planeGridOffset{#1}} -%\define@key[psset]{pst-3dplot}{subticks}{\def\psk@xsubticks{#1}\def\psk@ysubticks{#1}} -%\define@key[psset]{pst-3dplot}{xsubticks}{\def\psk@xsubticks{#1}} -%\define@key[psset]{pst-3dplot}{ysubticks}{\def\psk@ysubticks{#1}} +\define@key[psset]{pst-3dplot}{planeGrid}[xy]{\def\psk@planeGrid{#1}} +\define@key[psset]{pst-3dplot}{planeGridOffset}[0]{\def\psk@planeGridOffset{#1}} % \define@boolkey[psset]{pst-3dplot}[PstThreeDplot@]{showInside}[true]{} \define@key[psset]{pst-3dplot}{SegmentColor}{\pst@getcolor{#1}\psk@ThreeDplot@SegmentColor} -\define@key[psset]{pst-3dplot}{increment}{\pst@checknum{#1}\psk@ThreeDplot@increment} -\define@key[psset]{pst-3dplot}{Hincrement}{\pst@checknum{#1}\psk@ThreeDplot@Hincrement} -%\define@key[psset]{pst-3dplot}{CMYK}{\def\psk@ThreeDplot@CMYK{#1}} -\define@key[psset]{pst-3dplot}{xyzLight}{\def\psk@ThreeDplot@xyzLight{#1 }} +\define@key[psset]{pst-3dplot}{increment}[10]{\pst@checknum{#1}\psk@ThreeDplot@increment} +\define@key[psset]{pst-3dplot}{Hincrement}[0.5]{\pst@checknum{#1}\psk@ThreeDplot@Hincrement} +\define@key[psset]{pst-3dplot}{xyzLight}[1 1 2]{\def\psk@ThreeDplot@xyzLight{#1 }} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % @@ -246,17 +212,18 @@ % % \def\setIIIDplotDefaults{% + \psset[pstricks]{linejoin=1}% \psset[pst-3dplot]{ - Debug=false, + Debug=false,CoorCheck=true, drawing=true,hiddenLine=false,eulerRotation=false, xMin=-1,xMax=4,yMin=-1,yMax=4,zMin=-1,zMax=4, - xThreeDunit=1.0,yThreeDunit=1.0,zThreeDunit=1.0,Alpha=45,Beta=30, - deltax=1,deltay=1,deltaz=1,Deltax=1,Deltay=1,Deltaz=1, + xThreeDunit=1,yThreeDunit=1.0,zThreeDunit=1.0,Alpha=45,Beta=30, + deltax=1,deltay=1.0,deltaz=1.0,Deltax=1.0,Deltay=1.0,Deltaz=1.0, RotX=0,RotY=0,RotZ=0,RotSequence=xyz,RotSet=set, xRotVec=1,yRotVec=0,zRotVec=0,RotAngle=0, PlaneSequence={}, drawStyle=xLines,xPlotpoints=25,yPlotpoints=25,beginAngle=0,endAngle=360, - linejoin=1,XO=0,YO=0,angleStep=1,posStart=0,length=2,arrowOffset=0, + XO=0,YO=0,angleStep=1,posStart=0,length=2,arrowOffset=0, visibleLineStyle=solid,invisibleLineStyle=dashed,nameX=$x$,spotX=180, nameY=$y$,spotY=0,nameZ=$z$,spotZ=90,plane=xy,pOrigin=c, drawCoor=false,SphericalCoor=false, CylindricalCoor=false, @@ -295,7 +262,7 @@ /Sin1Sin2 Sin1 Sin2 mul def /Cos1Cos2 Cos1 Cos2 mul def /Sin1Cos2 Sin1 Cos2 mul def - /showgrid \ifPst@showgrid true \else false \fi def + /showgrid \ifPst@IIIDshowgrid true \else false \fi def currentdict tx@3DPlotDict ne dup {tx@3DPlotDict begin} if % Begin the correct dict if necessary /eulerRotation \ifPst@eulerRotation true \else false \fi def @@ -326,12 +293,22 @@ \let#4\pst@getValueY% \let#5\pst@getValueZ% } +\def\pst@addThreeDVecPS(#1,#2,#3)(#4,#5,#6)#7#8#9{% (#1)+(#2)=(#7,#8,#9) + \def#7{ #1 #4 add }% + \def#8{ #2 #5 add }% + \def#9{ #3 #6 add }% +} \def\pst@subThreeDVec(#1)(#2,#3,#4)#5#6#7{% (#1)-(#2,#3,#4)=(#5,#6,#7) \pst@calcThreeDVec(#1)(-#2,-#3,-#4)% \let#5\pst@getValueX% \let#6\pst@getValueY% \let#7\pst@getValueZ% } +\def\pst@subThreeDVecPS(#1,#2,#3)(#4,#5,#6)#7#8#9{% (#1)-(#2)=(#7,#8,#9) + \def#7{ #1 #4 sub }% + \def#8{ #2 #5 sub }% + \def#9{ #3 #6 sub }% +} % \def\pst@calcThreeDVec(#1,#2,#3)(#4,#5,#6){{% #1+#4; #2+#5; #3+#6 \pst@dima=#1 pt% @@ -352,19 +329,26 @@ % \def\psxyzlabel#1{\bgroup\footnotesize\textsf{#1}\egroup} % -\def\pstThreeDCoor{\pst@object{pstThreeDCoor}} +\define@key[psset]{pst-3dplot}{IIIDOffset}{\def\psk@ThreeDplot@Offset{#1}} +\define@key[psset]{pst-3dplot}{zlabelFactor}[\relax]{\def\psk@zlabelFactor{#1}} +\psset[pst-3dplot]{IIIDOffset={(0,0,0)},zlabelFactor={}}% for coor axes +% +\def\pst@getIIIDValues(#1,#2,#3)#4#5#6\@nil{\def#4{#1}\def#5{#2}\def#6{#3}} +% +\def\pstThreeDCoor{\def\pst@par{}\pst@object{pstThreeDCoor}} \def\pstThreeDCoor@i{% \pst@killglue% \begingroup% \addbefore@par{linewidth=0.5pt,linecolor=red,arrows=->,dotstyle=|}% \use@par% - \pstThreeDNode(\psk@ThreeDplot@xMin,0,0){xMin}% + \expandafter\pst@getIIIDValues\psk@ThreeDplot@Offset{\pst@OffsetX}{\pst@OffsetY}{\pst@OffsetZ}\@nil + \pstThreeDNode(\psk@ThreeDplot@xMin,\pst@OffsetY,\pst@OffsetZ){xMin}% \psset[pst-3dplot]{RotSet=keep}% Keep the current rotation matrix - \pstThreeDNode(\psk@ThreeDplot@xMax,0,0){xMax}% - \pstThreeDNode(0,\psk@ThreeDplot@yMin,0){yMin}% - \pstThreeDNode(0,\psk@ThreeDplot@yMax,0){yMax}% - \pstThreeDNode(0,0,\psk@ThreeDplot@zMin){zMin}% - \pstThreeDNode(0,0,\psk@ThreeDplot@zMax){zMax}% + \pstThreeDNode(\psk@ThreeDplot@xMax,\pst@OffsetY,\pst@OffsetZ){xMax}% + \pstThreeDNode(\pst@OffsetX,\psk@ThreeDplot@yMin,\pst@OffsetZ){yMin}% + \pstThreeDNode(\pst@OffsetX,\psk@ThreeDplot@yMax,\pst@OffsetZ){yMax}% + \pstThreeDNode(\pst@OffsetX,\pst@OffsetY,\psk@ThreeDplot@zMin){zMin}% + \pstThreeDNode(\pst@OffsetX,\pst@OffsetY,\psk@ThreeDplot@zMax){zMax}% \ifPst@drawing% ThreeDplot axes \psline(xMin)(xMax)% \psline(yMin)(yMax)% @@ -374,85 +358,145 @@ \uput[\psk@ThreeDplot@spotZ](zMax){\psk@ThreeDplot@nameZ}% \ifPst@IIIDticks% %------------ x ticks and labels -------------------------- - \pst@dimx=\psk@ThreeDplot@xMax\p@ - \pst@dima=\psk@ThreeDplot@xThreeDunit\p@ - \pst@dima=\psk@ThreeDplot@deltax\pst@dima - \divide\pst@dimx by \pst@dima - \pst@cntx=\number\pst@dimx\advance\pst@cntx by -1% - \multido{\rA=\psk@Dx+\psk@Dx, - \rB=\psk@ThreeDplot@deltax+\psk@ThreeDplot@deltax} - {\pst@cntx}{% the coor increment - \pstThreeDLine[arrows=-](\rB,-\psk@IIIDticksize,0)(\rB,\psk@IIIDticksize,0)% - \ifPst@IIIDlabels% - \pstPlanePut[plane=\psk@IIIDxTicksPlane](\rB,\psk@IIIDxticksep,0){\psxyzlabel{\rA}}% - \fi% - }% end of multido - \pst@dimx=\psk@ThreeDplot@xMin\p@ - \pst@dima=\psk@ThreeDplot@xThreeDunit\p@ - \divide\pst@dimx by \pst@dima - \ifdim\psk@ThreeDplot@xMin pt<\p@ \pst@cntx=-\number\pst@dimx - \else\pst@cntx=\number\pst@dimx - \fi% - \multido{\rA=-\psk@Dx+-\psk@Dx, - \rB=-\psk@ThreeDplot@xThreeDunit+-\psk@ThreeDplot@xThreeDunit} - {\pst@cntx}{% - \pstThreeDLine[arrows=-](\rB,-\psk@IIIDticksize,0)(\rB,\psk@IIIDticksize,0)% - \ifPst@IIIDlabels% - \pstPlanePut[plane=\psk@IIIDxTicksPlane](\rB,\psk@IIIDxticksep,0){\psxyzlabel{\rA}}% - \fi% - }% end of multido and the x ticks and labels + \ifdim\psk@ThreeDplot@xMax pt>0pt % only for positive parts of the axes + \ifdim\psk@ThreeDplot@xMin pt>\z@ + \pstFPadd\pst@tempC\psk@ThreeDplot@xMax{-\psk@ThreeDplot@xMin} + \else\let\pst@tempC\psk@ThreeDplot@xMax\fi + \pstFPadd\pst@tempC\pst@tempC{-\pst@OffsetX} + \pstFPDiv\pst@tempB\pst@tempC{\psk@ThreeDplot@deltax} + \pst@cntx=\pst@tempB \advance\pst@cntx by -1% + \pstFPdiv\pst@tempB\psk@IIIDticksize{\psk@ThreeDplot@yThreeDunit} + \pstFPadd\pst@tempA{-\pst@tempB}{\pst@OffsetY} + \pstFPadd\pst@tempB{\pst@tempB}{\pst@OffsetY} + \pstFPadd\pst@tempC\pst@OffsetX{\psk@ThreeDplot@deltax} + \pstFPadd\pst@tempD\pst@OffsetX{\psk@Dx} + \pst@dimm=\pst@tempD pt\edef\pst@tempD{\strip@pt\pst@dimm}% strip the 00... from fp + \pstFPadd\pst@tempE{\psk@IIIDxticksep}{\pst@OffsetY} + \pstFPdiv\pst@tempE\pst@tempE\psk@ThreeDplot@yThreeDunit + \multido{\nA=\pst@tempD+\psk@Dx, + \rB=\pst@tempC+\psk@ThreeDplot@deltax} + {\the\pst@cntx}{% + \pstThreeDLine[arrows=-](\rB,\pst@tempA,\pst@OffsetZ)(\rB,\pst@tempB,\pst@OffsetZ)% + \ifPst@IIIDlabels% + \pstPlanePut[plane=\psk@IIIDxTicksPlane](\rB,\pst@tempE,\pst@OffsetZ){\psxyzlabel{\nA\psk@xlabelFactor}}% + \fi% + }% end of multido + \fi% + \ifdim\psk@ThreeDplot@xMin pt<\z@\relax % only for negative parts of the axes + \pstFPadd\pst@tempB\psk@ThreeDplot@xMin{-\pst@OffsetX} + \pstFPDiv\pst@tempB\pst@tempB{\psk@ThreeDplot@deltax}% + \pst@cntx=-\pst@int{\pst@tempB}% + \pstFPdiv{\pst@tempB}{\psk@IIIDticksize}{\psk@ThreeDplot@yThreeDunit} + \pstFPadd{\pst@tempA}{-\pst@tempB}{\pst@OffsetY} + \pstFPadd{\pst@tempB}{\pst@tempB}{\pst@OffsetY} + \pstFPadd{\pst@tempC}{\pst@OffsetX}{-\psk@ThreeDplot@deltax} + \pstFPadd{\pst@tempD}{\pst@OffsetX}{-\psk@Dx} + \pst@dimm=\pst@tempD pt\edef\pst@tempD{\strip@pt\pst@dimm}% strip the 00... from fp + \pstFPadd\pst@tempE{\psk@IIIDxticksep}{\pst@OffsetY} + \pstFPdiv\pst@tempE\pst@tempE\psk@ThreeDplot@yThreeDunit + \multido{\nA=\pst@tempD+-\psk@Dx, + \rB=\pst@tempC+-\psk@ThreeDplot@deltax} + {\the\pst@cntx}{% + \pstThreeDLine[arrows=-](\rB,\pst@tempA,\pst@OffsetZ)(\rB,\pst@tempB,\pst@OffsetZ)% + \ifPst@IIIDlabels% + \pstPlanePut[plane=\psk@IIIDxTicksPlane](\rB,\pst@tempE,\pst@OffsetZ){\psxyzlabel{\nA\psk@xlabelFactor}}% + \fi% + }% end of multido and the x ticks and labels + \fi %------------ y ticks and labels -------------------------- - \pst@dimy=\psk@ThreeDplot@yMax\p@ - \pst@dima=\psk@ThreeDplot@yThreeDunit\p@ - \pst@dima=\psk@ThreeDplot@deltay\pst@dima - \divide\pst@dimy by \pst@dima - \pst@cnty=\number\pst@dimy\advance\pst@cnty by -1 - \multido{\rA=\psk@Dy+\psk@Dy,\rB=\psk@ThreeDplot@deltay+\psk@ThreeDplot@deltay}{\pst@cnty}{% 0.0+\psk@ThreeDplot@yThreeDunit}{\pst@cnty}{% - \pstThreeDLine[arrows=-](-\psk@IIIDticksize,\rB,0)(\psk@IIIDticksize,\rB,0)% - \ifPst@IIIDlabels% - \pstPlanePut[plane=\psk@IIIDyTicksPlane](\psk@IIIDyticksep,\rB,0){\psxyzlabel{\rA}}% - \fi% - }% end of multido - \pst@dimy=\psk@ThreeDplot@yMin\p@% - \pst@dima=\psk@ThreeDplot@yThreeDunit\p@% - \divide\pst@dimy by \pst@dima% - \ifdim\psk@ThreeDplot@yMin pt<\p@ \pst@cnty=-\number\pst@dimy% - \else\pst@cnty=\number\pst@dimy - \fi% - \multido{\rA=-\psk@Dy+-\psk@Dy,% - \rB=-\psk@ThreeDplot@yThreeDunit+-\psk@ThreeDplot@yThreeDunit}{\pst@cnty}{% - \pstThreeDLine[arrows=-](-\psk@IIIDticksize,\rB,0)(\psk@IIIDticksize,\rB,0)% - \ifPst@IIIDlabels% - \pstPlanePut[plane=\psk@IIIDyTicksPlane](\psk@IIIDyticksep,\rB,0){\psxyzlabel{\rA}}% - \fi - }% end of multido and y ticks and labels + \ifdim\psk@ThreeDplot@yMax pt>0pt % only for positive parts of the axes + \ifdim\psk@ThreeDplot@yMin pt>\z@ + \pstFPadd\pst@tempC\psk@ThreeDplot@yMax{-\psk@ThreeDplot@yMin} + \else\let\pst@tempC\psk@ThreeDplot@yMax\fi + \pstFPadd\pst@tempC\pst@tempC{-\pst@OffsetY} + \pstFPDiv\pst@tempB\pst@tempC{\psk@ThreeDplot@deltay} + \pst@cnty=\pst@tempB \advance\pst@cnty by -1% + \pstFPdiv\pst@tempB\psk@IIIDticksize{\psk@ThreeDplot@xThreeDunit} + \pstFPadd\pst@tempA{-\pst@tempB}{\pst@OffsetX} + \pstFPadd\pst@tempB{\pst@tempB}{\pst@OffsetX} + \pstFPadd\pst@tempC{\pst@OffsetY}{\psk@ThreeDplot@deltay} + \pstFPadd\pst@tempD{\pst@OffsetY}{\psk@Dy} + \pst@dimm=\pst@tempD pt\edef\pst@tempD{\strip@pt\pst@dimm}% strip the 00... from fp + \pstFPadd\pst@tempE{\psk@IIIDyticksep}{\pst@OffsetX} + \pstFPdiv\pst@tempE\pst@tempE\psk@ThreeDplot@xThreeDunit + \multido{\nA=\pst@tempD+\psk@Dy, + \rB=\pst@tempC+\psk@ThreeDplot@deltay} + {\the\pst@cnty}{% + \pstThreeDLine[arrows=-](\pst@tempA,\rB,\pst@OffsetZ)(\pst@tempB,\rB,\pst@OffsetZ)% + \ifPst@IIIDlabels% + \pstPlanePut[plane=\psk@IIIDyTicksPlane](\pst@tempE,\rB,\pst@OffsetZ){\psxyzlabel{\nA\psk@ylabelFactor}}% + \fi% + }% end of multido + \fi% + \ifdim\psk@ThreeDplot@yMin pt<\z@ % only for negative parts of the axes + \pstFPadd\pst@tempB\psk@ThreeDplot@yMin{-\pst@OffsetY} + \pstFPDiv\pst@tempB{\pst@tempB}{\psk@ThreeDplot@deltay} + \pst@cnty=-\pst@tempB + \pstFPdiv\pst@tempB{\psk@IIIDticksize}{\psk@ThreeDplot@yThreeDunit} + \pstFPadd\pst@tempA{-\pst@tempB}{\pst@OffsetX} + \pstFPadd\pst@tempB{\pst@tempB}{\pst@OffsetX} + \pstFPadd\pst@tempC{\pst@OffsetY}{-\psk@ThreeDplot@deltay} + \pstFPadd\pst@tempD{\pst@OffsetY}{-\psk@Dy} + \pst@dimm=\pst@tempD pt\edef\pst@tempD{\strip@pt\pst@dimm}% strip the 00... from fp + \pstFPadd\pst@tempE{\psk@IIIDyticksep}{\pst@OffsetX} + \pstFPdiv\pst@tempE\pst@tempE\psk@ThreeDplot@xThreeDunit + \multido{\nA=\pst@tempD+-\psk@Dy,% + \rB=\pst@tempC+-\psk@ThreeDplot@deltay} + {\the\pst@cnty}{% + \pstThreeDLine[arrows=-](\pst@tempA,\rB,\pst@OffsetZ)(\pst@tempB,\rB,\pst@OffsetZ)% + \ifPst@IIIDlabels% + \pstPlanePut[plane=\psk@IIIDyTicksPlane](\pst@tempE,\rB,\pst@OffsetZ){\psxyzlabel{\nA\psk@ylabelFactor}}% + \fi + }% end of multido and y ticks and labels + \fi %------------ z ticks and labels -------------------------- - \pst@dimz=\psk@ThreeDplot@zMax\p@% - \pst@dima=\psk@ThreeDplot@zThreeDunit\p@% - \divide\pst@dimz by \pst@dima% - \pst@cntz=\number\pst@dimz\advance\pst@cntz by -1% - \multido{\rA=0.0+\psk@Dz,\rB=0.0+\psk@ThreeDplot@zThreeDunit}{\pst@cntz}{% - \pstThreeDLine[arrows=-](0,-\psk@IIIDticksize,\rB)(0,\psk@IIIDticksize,\rB)% - \ifPst@IIIDlabels% - \pstPlanePut[plane=\psk@IIIDzTicksPlane](0,\psk@IIIDzticksep,\rB){\psxyzlabel{\rA}}% - \fi% - }% - \pst@dimz=\psk@ThreeDplot@zMin\p@% - \pst@dima=\psk@ThreeDplot@zThreeDunit\p@% - \pst@dima=\psk@ThreeDplot@deltaz\pst@dima% - \divide\pst@dimz by \pst@dima% - \ifdim\psk@ThreeDplot@zMin pt<\p@ \pst@cntz=-\number\pst@dimz - \else\pst@cntz=\number\pst@dimz - \fi% - \multido{\rA=-\psk@Dz+-\psk@Dz,% - \rB=-\psk@ThreeDplot@zThreeDunit+-\psk@ThreeDplot@zThreeDunit}{\pst@cntz}{% - \pstThreeDLine[arrows=-](0,-\psk@IIIDticksize,\rB)(0,\psk@IIIDticksize,\rB)% - \ifPst@IIIDlabels% - \pstPlanePut[plane=\psk@IIIDzTicksPlane](0,\psk@IIIDzticksep,\rB){\psxyzlabel{\rA}}% + \ifdim\psk@ThreeDplot@zMax pt>\z@ % only for positive parts of the axes + \ifdim\psk@ThreeDplot@zMin pt>\z@ + \pstFPadd\pst@tempC\psk@ThreeDplot@zMax{-\psk@ThreeDplot@zMin} + \else\let\pst@tempC\psk@ThreeDplot@zMax \fi% - }% - \fi - \fi% + \pstFPadd\pst@tempC\pst@tempC{-\pst@OffsetZ} + \pstFPDiv\pst@tempB\pst@tempC{\psk@ThreeDplot@deltaz} + \pst@cntz=\pst@int{\pst@tempB} \advance\pst@cntz by -1% + \pstFPdiv\pst@tempB\psk@IIIDticksize{\psk@ThreeDplot@yThreeDunit} + \pstFPadd\pst@tempA{-\pst@tempB}{\pst@OffsetY} + \pstFPadd\pst@tempB{\pst@tempB}{\pst@OffsetY} + \pstFPadd\pst@tempC\pst@OffsetZ{\psk@ThreeDplot@deltaz} + \pstFPadd\pst@tempD\pst@OffsetZ{\psk@Dz} + \pst@dimm=\pst@tempD pt\edef\pst@tempD{\strip@pt\pst@dimm}% strip the 00... from fp + \pstFPadd\pst@tempE{\psk@IIIDzticksep}{\pst@OffsetY} + \pstFPdiv\pst@tempE\pst@tempE\psk@ThreeDplot@yThreeDunit + \multido{\nA=\pst@tempD+\psk@Dz, + \rB=\pst@tempC+\psk@ThreeDplot@deltaz}% + {\the\pst@cntz}{% + \pstThreeDLine[arrows=-](\pst@OffsetX,\pst@tempA,\rB)(\pst@OffsetX,\pst@tempB,\rB)% + \ifPst@IIIDlabels% + \pstPlanePut[plane=\psk@IIIDzTicksPlane](\pst@OffsetX,\pst@tempE,\rB){\psxyzlabel{\nA\psk@zlabelFactor}}% + \fi% + }% + \fi + \ifdim\psk@ThreeDplot@zMin pt<\z@ % only for negative parts of the axes + \pstFPadd\pst@tempB\psk@ThreeDplot@zMin{-\pst@OffsetZ} + \pstFPDiv\pst@tempB\pst@tempB{\psk@ThreeDplot@deltaz} + \pst@cntz=-\pst@tempB% + \pstFPdiv\pst@tempB\psk@IIIDticksize{\psk@ThreeDplot@yThreeDunit} + \pstFPadd\pst@tempA{-\pst@tempB}{\pst@OffsetY} + \pstFPadd\pst@tempB{\pst@tempB}{\pst@OffsetY} + \pstFPadd\pst@tempC\pst@OffsetZ{-\psk@ThreeDplot@deltaz} + \pstFPadd\pst@tempD\pst@OffsetZ{-\psk@Dz} + \pst@dimm=\pst@tempD pt\edef\pst@tempD{\strip@pt\pst@dimm}% strip the 00... from fp + \pstFPadd\pst@tempE{\psk@IIIDzticksep}{\pst@OffsetY} + \pstFPdiv\pst@tempE\pst@tempE\psk@ThreeDplot@yThreeDunit + \multido{\nA=\pst@tempD+-\psk@Dz,% + \rB=\pst@tempC+-\psk@ThreeDplot@deltaz}{\the\pst@cntz}{% + \pstThreeDLine[arrows=-](\pst@OffsetX,\pst@tempA,\rB)(\pst@OffsetX,\pst@tempB,\rB)% + \ifPst@IIIDlabels% + \pstPlanePut[plane=\psk@IIIDzTicksPlane](\pst@OffsetX,\pst@tempE,\rB){\psxyzlabel{\nA\psk@zlabelFactor}}% + \fi% + }% end \multido + \fi% end \ifdim\psk@ThreeDplot@zMin + \fi% end \ifPst@IIIDticks% + \fi% end \ifPst@drawing \endgroup% \ignorespaces% } @@ -460,7 +504,7 @@ % planeGrids % \newdimen\pst@dx\newdimen\pst@dy -\def\pstThreeDPlaneGrid{\pst@object{pstThreeDPlaneGrid}} +\def\pstThreeDPlaneGrid{\def\pst@par{}\pst@object{pstThreeDPlaneGrid}} \def\pstThreeDPlaneGrid@i(#1,#2)(#3,#4){{% \pst@killglue \use@par @@ -514,7 +558,7 @@ % transform the 3d coordinates of the point (#1,#2,#3) % into a 2d and moveto % -\def\pstThreeDmoveto{\pst@object{pstThreeDmoveto}} +\def\pstThreeDmoveto{\def\pst@par{}\pst@object{pstThreeDmoveto}} \def\pstThreeDmoveto@i(#1,#2,#3){% \pst@killglue \begingroup @@ -563,7 +607,7 @@ \def\psput@##1{\pst@@getcoor{##1}\leavevmode\psput@cartesian}% }% -\def\pstThreeDLine{\NormalIIIDCoor\pst@object{lineIIID}} +\def\pstThreeDLine{\NormalIIIDCoor\def\pst@par{}\pst@object{lineIIID}} \def\lineIIID@i{% \pst@killglue% \pst@getarrows{% @@ -575,7 +619,7 @@ \addto@pscode{% \pst@3ddict \IIIDplot@variables - \psk@ThreeDplot@linejoin setlinejoin +% \psk@ThreeDplot@linejoin setlinejoin /dxUnit \psk@ThreeDplot@xThreeDunit\space def /dyUnit \psk@ThreeDplot@yThreeDunit\space def /dzUnit \psk@ThreeDplot@zThreeDunit\space def @@ -595,9 +639,8 @@ % % set a 3d dot % -\def\pstThreeDDot{\pst@object{pstThreeDDot}} +\def\pstThreeDDot{\def\pst@par{}\pst@object{pstThreeDDot}} \def\pstThreeDDot@i(#1,#2,#3){% - \def\pst@tempThreeDDot{#1 #2 #3 } \begin@SpecialObj \pstThreeDNode(#1,#2,#3){pst@A} % we need the parameters \ifx\psk@dotstyle\@none\else\psdots(pst@A)\fi @@ -606,8 +649,8 @@ \addto@pscode{ \pst@3ddict \IIIDplot@variables - \psk@ThreeDplot@linejoin setlinejoin - \pst@tempThreeDDot +% \psk@ThreeDplot@linejoin setlinejoin + #1 #2 #3 \ifPst@SphericalCoor ConvertToCartesian \else @@ -653,14 +696,15 @@ % transform the 3d coordinates of the node (#1,#2,#3) % into a 2d node with the name #4 % -\def\pstThreeDNode{\pst@object{pstThreeDNode}} +\def\pstThreeDNode{\def\pst@par{}\pst@object{pstThreeDNode}} \def\pstThreeDNode@i(#1,#2,#3)#4{% \begin@SpecialObj% - \def\pst@tempThreeDNode{#1 #2 #3 }% +% \def\pst@tempThreeDNode{#1 #2 #3 }% \pnode(! \pst@3ddict \IIIDplot@variables - \pst@tempThreeDNode + #1 #2 #3 +% \pst@tempThreeDNode \ifPst@SphericalCoor ConvertToCartesian \else @@ -674,8 +718,7 @@ % %\define@key[psset]{pst-3dplot}{nodeType}{\pst@getint{#1}\pst@IIIDNodeType} %\psset{nodeType=0} -% -\def\pstIIIDNode{\pst@object{pstIIIDNode}} +\def\pstIIIDNode{\def\pst@par{}\pst@object{pstIIIDNode}} \def\pstIIIDNode@i(#1)(#2)(#3)(#4)(#5){% \@ifnextchar({\pstIIIDNode@iii(#1)(#2)(#3)(#4)(#5)}{\pstIIIDNode@ii(#1)(#2)(#3)(#4)(#5)}} @@ -731,30 +774,25 @@ }\ignorespaces} % % Trangle [options](Point1)(Point2)(Point3) -% -%\def\pstThreeDTriangle{\@ifnextchar[{\do@ThreeDTriangle}{\do@ThreeDTriangle[]}} -\def\pstThreeDTriangle{\pst@object{pst@ThreeDTriangle}} -\def\pst@ThreeDTriangle@i(#1)(#2)(#3){% +\def\pstThreeDTriangle{\def\pst@par{}\pst@object{pst@ThreeDTriangle}} +\def\pst@ThreeDTriangle@i(#1,#2,#3)(#4,#5,#6)(#7,#8,#9){% \begingroup \use@par \ifPst@drawCoor% \bgroup - \pstThreeDDot[style=showCoorStyle](#1) - \pstThreeDDot[style=showCoorStyle](#2) - \pstThreeDDot[style=showCoorStyle](#3) + \pstThreeDDot[style=showCoorStyle](#1,#2,#3) + \pstThreeDDot[style=showCoorStyle](#4,#5,#6) + \pstThreeDDot[style=showCoorStyle](#7,#8,#9) \egroup \fi% - \getThreeDCoor{#1}\pst@tempAA - \getThreeDCoor{#2}\pst@tempBB - \getThreeDCoor{#3}\pst@tempCC \begin@ClosedObj \addto@pscode{% \pst@3ddict \IIIDplot@variables - \psk@ThreeDplot@linejoin setlinejoin - /P1 { \pst@tempAA } def % x y z or Radius longitude lattitude - /P2 { \pst@tempBB } def % - /P3 { \pst@tempCC } def % +% \psk@ThreeDplot@linejoin setlinejoin + /P1 { #1 #2 #3 } def % x y z or Radius longitude lattitude + /P2 { #4 #5 #6 } def % + /P3 { #7 #8 #9 } def % /SphericalCoor \ifPst@SphericalCoor true \else false \fi def % /xUnit { \pst@number\psxunit\space mul } def /yUnit { \pst@number\psyunit\space mul } def @@ -775,16 +813,6 @@ end }% \end@ClosedObj% -\iffalse - \pstThreeDNode(#1){A} - \pstThreeDNode(#2){B} - \pstThreeDNode(#3){C} - \ifx\psk@fillstyle\@none% - \else\pscustom{\code{\psk@ThreeDplot@linejoin\space setlinejoin}\fi% - \psline(A)(B)(C)(A)(B)% - \ifx\psk@fillstyle\@none\else}\fi% - \end@SpecialObj -\fi \endgroup \ignorespaces} % @@ -795,30 +823,25 @@ % (#3) first direction vector ux,uy,uz % (#4) second direction vector wx,wy,wz % -\def\pstThreeDSquare{\pst@object{pstThreeDSquare}} -\def\pstThreeDSquare@i(#1)(#2)(#3){% - \ifPst@drawCoor {% - \pstThreeDDot[style=showCoorStyle](#1)% - \pst@addThreeDVec(#1)(#2)\pst@tempAA\pst@tempBB\pst@tempCC - \pstThreeDDot[style=showCoorStyle](\pst@tempAA,\pst@tempBB,\pst@tempCC)% - \pst@addThreeDVec(#1)(#3)\pst@tempAA\pst@tempBB\pst@tempCC - \pstThreeDDot[style=showCoorStyle](\pst@tempAA,\pst@tempBB,\pst@tempCC)% - \pst@addThreeDVec(\pst@tempAA,\pst@tempBB,\pst@tempCC)% - (#2)\pst@tempAA\pst@tempBB\pst@tempCC - \pstThreeDDot[style=showCoorStyle](\pst@tempAA,\pst@tempBB,\pst@tempCC)% - }% - \fi - \getThreeDCoor{#1}\pst@tempAA - \getThreeDCoor{#2}\pst@tempBB - \getThreeDCoor{#3}\pst@tempCC +\def\pstThreeDSquare{\def\pst@par{}\pst@object{pstThreeDSquare}} +\def\pstThreeDSquare@i(#1,#2,#3)(#4,#5,#6)(#7,#8,#9){% + \ifPst@drawCoor % + \pstThreeDDot[style=showCoorStyle](#1,#2,#3)% +% \pst@addThreeDVecPS(#1,#2,#3)(#4,#5,#6)\pst@tempAA\pst@tempBB\pst@tempCC + \pstThreeDDot[style=showCoorStyle](#1 #4 add, #2 #5 add, #3 #6 add)% +% \pst@addThreeDVecPS(#1,#2,#3)(#7,#8,#9)\pst@tempAA\pst@tempBB\pst@tempCC + \pstThreeDDot[style=showCoorStyle](#1 #7 add, #2 #8 add, #3 #9 add)% +% \pst@addThreeDVecPS(\pst@tempAA,\pst@tempBB,\pst@tempCC)(#4,#5,#6)\pst@tempA\pst@tempB\pst@tempC + \pstThreeDDot[style=showCoorStyle](#1 #4 add #7 add, #2 #5 add #8 add, #3 #6 add #9 add)% + \fi% \begin@ClosedObj \addto@pscode{ \pst@3ddict \IIIDplot@variables - \psk@ThreeDplot@linejoin setlinejoin - /P1 { \pst@tempAA } def % x y z or Radius longitude lattitude - /P2 { \pst@tempBB } def % - /P3 { \pst@tempCC } def % +% \psk@ThreeDplot@linejoin setlinejoin + /P1 { #1 #2 #3 } def % x y z or Radius longitude lattitude + /P2 { #4 #5 #6 } def % + /P3 { #7 #8 #9 } def % /SphericalCoor \ifPst@SphericalCoor true \else false \fi def % /xUnit { \pst@number\psxunit\space mul } def /yUnit { \pst@number\psyunit\space mul } def @@ -844,7 +867,6 @@ }% \end@ClosedObj% } - % % draws a threeD Box % [#1] options @@ -852,48 +874,48 @@ % (#3) second direction vector vx,vy,vz % (#4) third direction vector wx,wy,wz % -\def\pstThreeDBox{\@ifnextchar[{\pstThreeDBox@i}{\pstThreeDBox@i[]}} -\def\pstThreeDBox@i[#1](#2)(#3)(#4)(#5){% +\def\pstThreeDBox{\pst@object{pstThreeDBox}} +\def\pstThreeDBox@i(#1,#2,#3){% \pst@killglue% \begingroup% - \psset{linestyle=\psk@ThreeDplot@invisibleLineStyle}% - \psset{#1}% -% \pstVerb{ \pst@3ddict \IIIDplot@variables\space end }% + \addbefore@par{linestyle=\psk@ThreeDplot@invisibleLineStyle}% + \use@par% + \def\pst@tempX{#1 }% + \def\pst@tempY{#2 }% + \def\pst@tempZ{#3 }% + \pstThreeDBox@ii% +} +\def\pstThreeDBox@ii(#1,#2,#3)(#4,#5,#6)(#7,#8,#9){%%\def\pstThreeDBox@i[#1](#2)(#3)(#4)(#5) \iftrue - \pstThreeDSquare[#1](#2)(#4)(#5) % lower square - \pstThreeDSquare(#2)(#3)(#4)% back square -% + \pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#4,#5,#6)(#7,#8,#9)% lower square + \pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#1,#2,#3)(#4,#5,#6)% back square \psset{linestyle=\psk@ThreeDplot@visibleLineStyle}% - \pst@addThreeDVec(#2)(#4)\pst@tempA\pst@tempB\pst@tempC - \pstThreeDSquare[#1](\pst@tempA,\pst@tempB,\pst@tempC)(#3)(#5)% left square - \pst@addThreeDVec(#2)(#3)\pst@tempA\pst@tempB\pst@tempC - \pstThreeDSquare[#1](\pst@tempA,\pst@tempB,\pst@tempC)(#4)(#5)% top square - \pst@addThreeDVec(#2)(#5)\pst@tempA\pst@tempB\pst@tempC - \pstThreeDSquare[#1](\pst@tempA,\pst@tempB,\pst@tempC)(#3)(#4)% front square + \pstThreeDSquare(\pst@tempX #4 add,\pst@tempY #5 add,\pst@tempZ #6 add)(#1,#2,#3)(#7,#8,#9)% left square + \pstThreeDSquare(\pst@tempX #1 add,\pst@tempY #2 add,\pst@tempZ #3 add)(#4,#5,#6)(#7,#8,#9)% top square + \pstThreeDSquare(\pst@tempX #7 add,\pst@tempY #8 add,\pst@tempZ #9 add)(#1,#2,#3)(#4,#5,#6)% front square \else% better support for hidden lines - \pstThreeDSquare[#1](#2)(#4)(#5) % lower square + \pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#4,#5,#6)(#7,#8,#9) % lower square \pst@absdim{\psk@ThreeDplot@Alpha pt}\pst@dimo - \ifdim\pst@dimo<90pt \ifdim\pst@dimo>270pt - \pstThreeDSquare(#2)(#3)(#4)% back square - \else - \pst@addThreeDVec(#2)(#5)\pst@tempA\pst@tempB\pst@tempC - \pstThreeDSquare[#1](\pst@tempA,\pst@tempB,\pst@tempC)(#3)(#4)% front square - \fi\fi -% + \ifdim\pst@dimo<90pt + \ifdim\pst@dimo>270pt + \pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#1,#2,#3)(#4,#5,#6)% back square + \else + \pstThreeDSquare(\pst@tempX #7 add,\pst@tempY #8 add,\pst@tempZ #9 add)(#1,#2,#3)(#4,#5,#6)% front square + \fi% + \fi% \psset{linestyle=\psk@ThreeDplot@visibleLineStyle}% - \pst@addThreeDVec(#2)(#4)\pst@tempA\pst@tempB\pst@tempC - \pstThreeDSquare[#1](\pst@tempA,\pst@tempB,\pst@tempC)(#3)(#5)% left square - \pst@addThreeDVec(#2)(#3)\pst@tempA\pst@tempB\pst@tempC - \pstThreeDSquare[#1](\pst@tempA,\pst@tempB,\pst@tempC)(#4)(#5)% top square - \ifdim\pst@dimo<90pt \ifdim\pst@dimo>270pt - \pst@addThreeDVec(#2)(#5)\pst@tempA\pst@tempB\pst@tempC - \pstThreeDSquare[#1](\pst@tempA,\pst@tempB,\pst@tempC)(#3)(#4)% front square - \else - \pstThreeDSquare(#2)(#3)(#4)% back square - \fi\fi -\fi - \endgroup% - \ignorespaces% + \pstThreeDSquare(\pst@tempX #4 add,\pst@tempY #5 add,\pst@tempZ #6 add)(#1,#2,#3)(#7,#8,#9)% left square + \pstThreeDSquare(\pst@tempX #1 add,\pst@tempY #2 add,\pst@tempZ #3 add)(#4,#5,#6)(#7,#8,#9)% top square + \ifdim\pst@dimo<90pt + \ifdim\pst@dimo>270pt + \pstThreeDSquare(\pst@tempX #7 add,\pst@tempY #8 add,\pst@tempZ #9 add)(#1,#2,#3)(#4,#5,#6)% front square + \else + \pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#1,#2,#3)(#4,#5,#6)% back square + \fi% + \fi% +\fi% + \endgroup% + \ignorespaces% } % % set a 3d ellipse/circle @@ -903,7 +925,7 @@ % #3 radius ax,ay,az % #4 radius bx,by,bz % -\def\pstThreeDEllipse{\pst@object{pstThreeDEllipse}} +\def\pstThreeDEllipse{\def\pst@par{}\pst@object{pstThreeDEllipse}} \def\pstThreeDEllipse@i(#1)(#2)(#3){% \addbefore@par{plotstyle=curve}% \@nameuse{beginplot@\psplotstyle}% @@ -912,7 +934,7 @@ \getThreeDCoor{#3}\pst@tempB% b \addto@pscode{% \pst@3ddict \IIIDplot@variables end - \psk@ThreeDplot@linejoin setlinejoin +% \psk@ThreeDplot@linejoin setlinejoin \ifPst@SphericalCoor \pst@tempC\space \tx@ConvertToCartesian /zM \tx@Z def /yM \tx@Y def /xM \tx@X def % center @@ -984,7 +1006,7 @@ }% \@nameuse{endplot@\psplotstyle}} % -\def\pstThreeDCircle{\pst@object{pstThreeDCircle}} +\def\pstThreeDCircle{\def\pst@par{}\pst@object{pstThreeDCircle}} \def\pstThreeDCircle@i(#1)(#2)(#3){% (vec O)(vec a)(vec b) \addbefore@par{plotstyle=curve}% \@nameuse{beginplot@\psplotstyle}% @@ -993,7 +1015,7 @@ \getThreeDCoor{#3}\pst@tempB% b \addto@pscode{% \pst@3ddict \IIIDplot@variables end - \psk@ThreeDplot@linejoin setlinejoin +% \psk@ThreeDplot@linejoin setlinejoin \ifPst@SphericalCoor \pst@tempC\space \tx@ConvertToCartesian /zM \tx@Z def /yM \tx@Y def /xM \tx@X def % center @@ -1048,7 +1070,7 @@ % % cone[options](center)(radiusA vec)(radiusB vec){height} % -\def\pstThreeDCone{\pst@object{pstThreeDCone}} +\def\pstThreeDCone{\def\pst@par{}\pst@object{pstThreeDCone}} \def\pstThreeDCone@i(#1)(#2)(#3)#4{{% \use@par \pstThreeDEllipse(#1)(#2)(#3)% @@ -1059,7 +1081,7 @@ \addto@pscode{ \pst@3ddict \IIIDplot@variables - \psk@ThreeDplot@linejoin setlinejoin +% \psk@ThreeDplot@linejoin setlinejoin /xUnit { \pst@number\psxunit\space mul } def /yUnit { \pst@number\psyunit\space mul } def /SphericalCoor \ifPst@SphericalCoor true \else false \fi def % @@ -1076,7 +1098,7 @@ \end@OpenObj% }\ignorespaces} % -\def\pstRotNodeIIID{\pst@object{RotNodeIIID}} +\def\pstRotNodeIIID{\def\pst@par{}\pst@object{RotNodeIIID}} \def\RotNodeIIID@i(#1,#2,#3)(#4,#5,#6)#7{% \pst@killglue \begingroup% @@ -1102,7 +1124,9 @@ % % Paraboloid (Idea is from Manuel ... ) % -\def\pstParaboloid{\pst@object{pstParaboloid}} +\def\tx@SetMatrixThreeD{tx@3Ddict begin SetMatrixThreeD end } + +\def\pstParaboloid{\def\pst@par{}\pst@object{pstParaboloid}} \def\pstParaboloid@i{\@ifnextchar(\pstParaboloid@ii{\pstParaboloid@ii(0,0,0)}} \def\pstParaboloid@ii(#1,#2,#3)#4#5{% #1:height #2:radius \addto@par{viewpoint=0 0 0}% @@ -1129,7 +1153,7 @@ viewpoint \pst@3ddict /vZ ED /vY ED /vX ED \IIIDplot@variables - \psk@ThreeDplot@linejoin setlinejoin +% \psk@ThreeDplot@linejoin setlinejoin /pas 0.5 def /pas10 pas 10 div def /cmyk {} def % we need only the values @@ -1165,13 +1189,13 @@ \ignorespaces} % % Sphere, the new one -\def\pstThreeDSphere{\pst@object{pstSphereIIID}} +\def\pstThreeDSphere{\def\pst@par{}\pst@object{pstSphereIIID}} \def\pstSphereIIID@i(#1,#2,#3)#4{% #1:origin (x,y,z) #2:radius \addto@par{viewpoint=0 0 0}% to make it compatible with pst-3dplot \begin@SpecialObj% \use@par \addto@pscode{% - \psk@ThreeDplot@linejoin setlinejoin +% \psk@ThreeDplot@linejoin setlinejoin /viewpoint {% to make it compatible with parallel projection \psk@viewpoint \ifcase\psk@ThreeDplot@coorType @@ -1201,14 +1225,14 @@ \end@SpecialObj% \ignorespaces} % -\def\pstIIIDCylinder{\pst@object{pstIIIDCylinder}} +\def\pstIIIDCylinder{\def\pst@par{}\pst@object{pstIIIDCylinder}} \def\pstIIIDCylinder@i{\@ifnextchar({\pstIIIDCylinder@ii}{\pstIIIDCylinder@ii(0,0,0)}} \def\pstIIIDCylinder@ii(#1,#2,#3)#4#5{{% \let\pst@parOrig\pst@par \begin@ClosedObj \addto@pscode{% \pst@3ddict \IIIDplot@variables end - \psk@ThreeDplot@linejoin setlinejoin +% \psk@ThreeDplot@linejoin setlinejoin /POrig { #1 #2 #3 \ifPst@CylindricalCoor \tx@ConvCylToCartesian \fi \pst@number\psunit mul 3 1 roll @@ -1226,7 +1250,7 @@ \begin@SpecialObj \addto@pscode{% \pst@3ddict \IIIDplot@variables end - \psk@ThreeDplot@linejoin setlinejoin +% \psk@ThreeDplot@linejoin setlinejoin /POrig { #1 #2 #3 \ifPst@CylindricalCoor \tx@ConvCylToCartesian \fi \pst@number\psunit mul 3 1 roll @@ -1247,7 +1271,7 @@ \begin@ClosedObj \addto@pscode{% \pst@3ddict \IIIDplot@variables end - \psk@ThreeDplot@linejoin setlinejoin +% \psk@ThreeDplot@linejoin setlinejoin /POrig { #1 #2 #3 #5 add \ifPst@CylindricalCoor \tx@ConvCylToCartesian \fi \pst@number\psunit mul 3 1 roll @@ -1265,7 +1289,7 @@ % %-------------------------- Cylinder ---------------------------- % -\def\psCylinder{\pst@object{psCylinder}} +\def\psCylinder{\def\pst@par{}\pst@object{psCylinder}} \def\psCylinder@i{\@ifnextchar(\psCylinder@ii{\psCylinder@ii(0,0,0)}} \def\psCylinder@ii(#1,#2,#3)#4#5{% #1,#2,#3: center of the bottom #4:radius #5:height \addto@par{viewpoint=0 0 0}% @@ -1292,7 +1316,7 @@ viewpoint \pst@3ddict /vZ ED /vY ED /vX ED \IIIDplot@variables end - \psk@ThreeDplot@linejoin setlinejoin +% \psk@ThreeDplot@linejoin setlinejoin % #1 #2 #3 \ifPst@CylindricalCoor \tx@ConvCylToCartesian \fi \pst@number\pst@dima \pst@number\psxunit div % Radius @@ -1328,7 +1352,7 @@ % %-------------------------- Box ---------------------------- % -\def\psBox{\pst@object{psBox}} +\def\psBox{\def\pst@par{}\pst@object{psBox}} \def\psBox@i{\@ifnextchar(\psBox@ii{\psBox@ii(0,0,0)}} \def\psBox@ii(#1,#2,#3)#4#5#6{% #1,#2,#3: center of the lower left edge % #4:width #5:height #6:depth @@ -1355,7 +1379,7 @@ \tx@3DPlotDict /vZ ED /vY ED /vX ED \IIIDplot@variables - \psk@ThreeDplot@linejoin setlinejoin +% \psk@ThreeDplot@linejoin setlinejoin % #1 2 div #2 2 div #3 2 div % wieso 1/2 ???? \pst@number\pst@dima \pst@number\psxunit div % Width @@ -1608,9 +1632,12 @@ } \def\parametricPlotThreeD@ii(#1,#2)(#3,#4)#5{{% \pst@killglue% - \pst@dima=#3pt\pst@dimb=#4pt % #3=#4, then we have a 3d line - \ifdim\pst@dima=\pst@dimb\psset{yPlotpoints=1}\fi% and set yPlotpoints=1 \use@par% + \ifPst@CoorCheck% + \pst@dima=#3pt\pst@dimb=#4pt % #3=#4, then we have a 3d line + \ifdim\pst@dima=\pst@dimb + \def\psk@ThreeDplot@yPlotpoints{1 }\fi% and set yPlotpoints=1 + \fi% \@pstfalse% \@nameuse{beginplot@\psplotstyle}% \@nameuse{testqp@\psplotstyle}% quick plot or something special @@ -2226,7 +2253,7 @@ \edef#3{\UseCos#1}% } % -\def\pstRotPointIIID{\pst@object{RotPointIIID}}% A real TeX solution +\def\pstRotPointIIID{\def\pst@par{}\pst@object{RotPointIIID}}% A real TeX solution \def\RotPointIIID@i(#1,#2,#3)#4#5#6{% \pst@killglue% \begingroup% diff --git a/Master/texmf-dist/tex/latex/pst-3dplot/pst-3dplot.sty b/Master/texmf-dist/tex/latex/pst-3dplot/pst-3dplot.sty index 55e33c6bcc2..a10bb9e0cfd 100644 --- a/Master/texmf-dist/tex/latex/pst-3dplot/pst-3dplot.sty +++ b/Master/texmf-dist/tex/latex/pst-3dplot/pst-3dplot.sty @@ -1,11 +1,11 @@ -%% $Id: pst-3dplot.sty 121 2009-07-28 18:03:37Z herbert $ +%% $Id: pst-3dplot.sty 293 2010-02-14 17:11:57Z herbert $ \RequirePackage{pstricks} -\ProvidesPackage{pst-3dplot}[2009/07/28 package wrapper for +\ProvidesPackage{pst-3dplot}[2010/01/01 package wrapper for pst-3dplot.tex (hv)] \input{pst-3dplot.tex} \IfFileExists{pst-3dplot.pro}{% \ProvidesFile{pst-3dplot.pro} - [2009/07/28 v. 0.28, PostScript prologue file (hv)] + [2010/01/01 v. 0.30, PostScript prologue file (hv)] \@addtofilelist{pst-3dplot.pro}}{}% \ProvidesFile{pst-3dplot.tex} [\filedate\space v\fileversion\space `PST-3dplot' (hv)] |