pst-3dplot update (17jun07)

git-svn-id: svn://tug.org/texlive/trunk@4450 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2007-06-17 21:35:47 +0000
committer: Karl Berry <karl@freefriends.org> 2007-06-17 21:35:47 +0000
commit: c4ae47344ef52c976c8de09bd07d290cd2bb983f (patch)
tree: 2297cae4f0b28585c24c372846dd41da10950d63 /Master/texmf-dist
parent: 47e22c8c21f92ffb4d94e0bcf8785980d52dbbe0 (diff)
25 files changed, 891 insertions, 1037 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/Changes b/Master/texmf-dist/doc/generic/pst-3dplot/Changes
index ccdcca1878d..24ad9f5145f 100644
--- a/Master/texmf-dist/doc/generic/pst-3dplot/Changes
+++ b/Master/texmf-dist/doc/generic/pst-3dplot/Changes
@@ -6,6 +6,11 @@ pst-3dplot.pro --------
 
 
 pst-3dplot.tex --------
+1.74  2007-06-12  - fix bug with the optional argument of plane
+                  - fix typo for pstParaboloid
+	          - add macro pstIIIDCylinder
+		  - revert Changes to the hidden line support
+1.73  2007-02-12  better support for hidden lines of a box
 1.72  2006-02-07  - allow negative direction for ellipse
                   - add code for left-Handed coor (experimental
 		    and not documented)
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/README b/Master/texmf-dist/doc/generic/pst-3dplot/README
index ddb20db1770..01b1ff9c915 100644
--- a/Master/texmf-dist/doc/generic/pst-3dplot/README
+++ b/Master/texmf-dist/doc/generic/pst-3dplot/README
@@ -2,7 +2,7 @@
 %%
 %% Herbert Voss <voss _at_ pstricks.de> (Germany)
 %%
-%% 2004-12-04
+%% 2007-06-17
 %%
 
 PSTricks offers excellent macros to insert more or less complex 
@@ -26,7 +26,7 @@ pst-3dplot uses the extended version of the keyval package. So
 be sure that you 
 - have installed xkeyval with the special pst-xkey
   (CTAN: tex-archive/macros/latex/contrib/xkeyval/)
-- do not load another package after pst-3dplot, which loads
+- do not load another package behind pst-3dplot, which loads
   the old keyval.sty or pst-key.tex
 
 
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/doc/data3D.Roessler b/Master/texmf-dist/doc/generic/pst-3dplot/doc/data3D.Roessler
deleted file mode 100644
index 2e24034944f..00000000000
--- a/Master/texmf-dist/doc/generic/pst-3dplot/doc/data3D.Roessler
+++ /dev/null
@@ -1,445 +0,0 @@
-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
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/doc/data3D.dat b/Master/texmf-dist/doc/generic/pst-3dplot/doc/data3D.dat
deleted file mode 100644
index c56ef06385d..00000000000
--- a/Master/texmf-dist/doc/generic/pst-3dplot/doc/data3D.dat
+++ /dev/null
@@ -1,80 +0,0 @@
-0.0000    1.0000    0.0000
--0.4207    0.9972    0.0191
--0.8067    0.8188    0.0186
--1.0856    0.4805    0.0181
--1.2001    0.0270    0.0179
--1.1164   -0.4731    0.0179
--0.8321   -0.9375    0.0183
--0.3793   -1.2830    0.0191
-0.1781   -1.4397    0.0201
-0.7529   -1.3647    0.0213
-1.2471   -1.0511    0.0225
-2.9919   -4.5900    0.0263
-4.6325   -3.3405    0.0336
-5.6113   -1.4126    0.0416
-5.7034    0.9176    0.0461
-4.8193    3.2814    0.0423
-3.0313    5.2738    0.0324
-0.5717    6.5204    0.0232
--2.1937    6.7435    0.0173
--4.8149    5.8176    0.0139
--6.8245    3.8094    0.0121
--7.8314    0.9658    0.0113
--7.5712   -2.2905    0.0113
--5.9805   -5.4324    0.0123
--3.2204   -7.9075    0.0145
-0.3319   -9.2314    0.0191
-4.1296   -9.0774    0.0285
-7.5345   -7.3471    0.0496
-9.9175   -4.2080    0.1015
-10.7610   -0.0911    0.2171
-9.7684    4.3570    0.3447
-7.0011    8.3782    0.2440
-2.8690   11.2558    0.0624
--2.0644   12.4223    0.0192
--7.0556   11.5392    0.0123
--11.2538    8.5847    0.0096
--13.8638    3.9016    0.0084
--14.3091   -1.8662    0.0082
--12.3204   -7.8079    0.0088
--8.0329  -12.9119    0.0107
--1.9908  -16.2251    0.0153
-4.9109  -17.0221    0.0283
-11.5451  -14.9523    0.0883
-16.6599  -10.1427    0.7747
-17.5042   -8.5822    1.6313
-18.0446   -6.9165    3.6535
-18.0827   -5.1836    8.4083
-17.7951   -4.3118   12.6433
-17.2038   -3.4531   18.5927
-16.2194   -2.6256   26.2726
-14.7707   -1.8518   34.8984
-12.8566   -1.1567   42.5359
-10.5984   -0.5626   46.5660
-8.2381   -0.0824   45.2414
-6.0536    0.2844   39.0709
-4.2431    0.5515   30.4315
-2.8714    0.7392   21.8370
-1.8976    0.8685   14.7556
-1.2334    0.9572    9.5636
-0.7879    1.0186    6.0280
-0.4880    1.0616    3.7309
--0.5934    1.0894    0.0260
--1.0036    0.8390    0.0184
--1.2740    0.4189    0.0178
--1.3467   -0.1127    0.0176
--1.1925   -0.6735    0.0178
--0.8193  -1.1683   0.0183
--0.5630  -1.3628   0.0187
--0.2718  -1.5080   0.0192
-0.0434  -1.5956   0.0198
-0.3699  -1.6196   0.0204
-0.6944  -1.5762   0.0211
-1.0029  -1.4645   0.0218
-1.2815  -1.2865   0.0226
-1.5171  -1.0470   0.0232
-1.6977  -0.7536   0.0238
-1.8135  -0.4167   0.0242
-1.8568  -0.0488   0.0245
-1.8228   0.3350   0.0245
-1.7096   0.7201   0.0243
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/doc/pst-3dplot-doc.pdf b/Master/texmf-dist/doc/generic/pst-3dplot/doc/pst-3dplot-doc.pdf
deleted file mode 100644
index 9141e91335c..00000000000
--- a/Master/texmf-dist/doc/generic/pst-3dplot/doc/pst-3dplot-doc.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/examples/3DLine.pdf b/Master/texmf-dist/doc/generic/pst-3dplot/examples/3DLine.pdf
deleted file mode 100644
index 606fbda3a30..00000000000
--- a/Master/texmf-dist/doc/generic/pst-3dplot/examples/3DLine.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/examples/3DLine.tex b/Master/texmf-dist/doc/generic/pst-3dplot/examples/3DLine.tex
deleted file mode 100644
index 042d5ca7ea7..00000000000
--- a/Master/texmf-dist/doc/generic/pst-3dplot/examples/3DLine.tex
+++ /dev/null
@@ -1,174 +0,0 @@
-\documentclass[12pt,a4paper]{article}
-\usepackage{pstricks}
-\SpecialCoor
-\usepackage{multido}
-\usepackage{pst-3dplot}
-\usepackage{pst-grad}
-\usepackage{url}
-\usepackage{listings}
-\lstset{language=[LaTeX]TEX,basicstyle=\ttfamily\scriptsize,%
-  extendedchars=true,numbers=left,numberstyle=\tiny,%
-  xleftmargin=2em,breaklines=true}
-\makeatletter
-\def\modulo#1#2#3{%
-  \pst@cnta=#1\pst@cntb=#2\relax%
-  \pst@cntc=\pst@cnta%
-  \divide\pst@cnta by \pst@cntb%
-  \multiply\pst@cntb by \pst@cnta%
-  \advance\pst@cntc by -\pst@cntb%
-  \def\pst@tempa{\the\pst@cntc}%
-  \let#3\pst@tempa%
-}
-\makeatother
-
-\begin{document}
-
-This demo file uses the \verb+\pst@mod+ macro from \verb+pstricks-add+, which is
-available at \url{http://www.perce.de/LaTeX/pstricks-add}. If you install this package
-then delete the macro in the preamble of this document.
-
-
-\begin{center}
-\begin{pspicture}(-6,-2.25)(6,5)
-  \pstThreeDCoor[xMin=-3,xMax=5,yMin=-1,yMax=5,zMin=-1,zMax=5,drawCoor=false]%
-  \multido{\iA=0+30,\iB=30+30,\iC=1+1}{12}{%
-    \modulo{\iC}{7}{\iCTemp}%
-    \ifcase\iCTemp\psset{fillcolor=black,gradend=black}%
-      \or\psset{fillcolor=red,gradend=red}%
-      \or\psset{fillcolor=green,gradend=green}%
-      \or\psset{fillcolor=blue,gradend=blue}%
-      \or\psset{fillcolor=cyan,gradend=cyan}%
-      \or\psset{fillcolor=magenta,gradend=magenta}%
-      \or\psset{fillcolor=yellow,gradend=yellow}%
-    \fi%
-    \pstThreeDLine[SphericalCoor=true,%
-%    fillstyle=solid,linestyle=none]%
-       fillstyle=gradient,gradbegin=white,gradmidpoint=0]%
-       (0,0,0)(1,\iA,60)(2,\iA,50)(3,\iA,40)(4,\iA,30)(5,\iA,20)(6,\iA,10)%
-       (6,\iB,10)(5,\iB,20)(4,\iB,30)(3,\iB,40)(2,\iB,50)(1,\iB,60)(0,0,0)
-  }%
-  \pstThreeDLine[linecolor=red](0,0,0)(0,0,5)%
-\end{pspicture}
-\end{center}
-
-
-
-\begin{lstlisting}[float=h,label={Use of the 3D line macro}]
-\begin{pspicture}(-6,-2.25)(6,5)
-  \pstThreeDCoor[xMin=-3,xMax=5,yMin=-1,yMax=5,zMin=-1,zMax=5,drawCoor=false]
-  \multido{\iA=0+30,\iB=30+30,\iC=1+1}{12}{%
-    \modulo{\iC}{7}{\iCTemp}
-    \ifcase\iCTemp\psset{fillcolor=black,gradend=black}
-      \or\psset{fillcolor=red,gradend=red}
-      \or\psset{fillcolor=green,gradend=green}
-      \or\psset{fillcolor=blue,gradend=blue}
-      \or\psset{fillcolor=cyan,gradend=cyan}
-      \or\psset{fillcolor=magenta,gradend=magenta}
-      \or\psset{fillcolor=yellow,gradend=yellow}
-    \fi
-    \pstThreeDLine[SphericalCoor=true,%
-%    fillstyle=solid,linestyle=none]%
-       fillstyle=gradient,gradbegin=white,gradmidpoint=0]%
-       (0,0,0)(1,\iA,60)(2,\iA,50)(3,\iA,40)(4,\iA,30)(5,\iA,20)(6,\iA,10)%
-       (6,\iB,10)(5,\iB,20)(4,\iB,30)(3,\iB,40)(2,\iB,50)(1,\iB,60)(0,0,0)
-  }
-  \pstThreeDLine[linecolor=red](0,0,0)(0,0,5)
-\end{pspicture}
-\end{lstlisting}
-
-\begin{center}
-\begin{pspicture}(-6,-4)(6,5)
-  \psset{Beta=45}%
-  \pstThreeDCoor[xMin=-3,xMax=6,yMin=-1,yMax=6,zMin=-1,zMax=5,drawCoor=false]
-  \multido{\iA=0+30,\iB=30+30,\iC=1+1}{12}{%
-    \modulo{\iC}{7}{\iCTemp}%
-    \ifcase\iCTemp\psset{fillcolor=black,gradend=black}%
-      \or\psset{fillcolor=red,gradend=red}%
-      \or\psset{fillcolor=green,gradend=green}%
-      \or\psset{fillcolor=blue,gradend=blue}%
-      \or\psset{fillcolor=cyan,gradend=cyan}%
-      \or\psset{fillcolor=magenta,gradend=magenta}%
-      \or\psset{fillcolor=yellow,gradend=yellow}%
-    \fi%
-    \pstThreeDLine[SphericalCoor=true,%
-%      fillstyle=solid,linestyle=none]%
-       fillstyle=gradient,gradbegin=white,gradmidpoint=0,gradangle=\iA]%
-        (0,0,0)(1,\iA,60)(2,\iA,50)(3,\iA,40)(4,\iA,30)(5,\iA,20)(6,\iA,10)%
-        (6,\iB,10)(5,\iB,20)(4,\iB,30)(3,\iB,40)(2,\iB,50)(1,\iB,60)(0,0,0)%
-  }
-  \pstThreeDLine[linecolor=red]{->}(0,0,0)(0,0,5)%
-\end{pspicture}
-\end{center}
-
-\begin{lstlisting}[label={Another view}]
-\begin{pspicture}(-6,-4)(6,5)
-  \psset{Beta=45}
-  \pstThreeDCoor[xMin=-3,xMax=6,yMin=-1,yMax=6,zMin=-1,zMax=5,drawCoor=false]
-  \multido{\iA=0+30,\iB=30+30,\iC=1+1}{12}{%
-    \modulo{\iC}{7}{\iCTemp}
-    \ifcase\iCTemp\psset{fillcolor=black,gradend=black}
-      \or\psset{fillcolor=red,gradend=red}
-      \or\psset{fillcolor=green,gradend=green}
-      \or\psset{fillcolor=blue,gradend=blue}
-      \or\psset{fillcolor=cyan,gradend=cyan}
-      \or\psset{fillcolor=magenta,gradend=magenta}
-      \or\psset{fillcolor=yellow,gradend=yellow}
-    \fi
-    \pstThreeDLine[SphericalCoor=true,%
-%      fillstyle=solid,linestyle=none]%
-       fillstyle=gradient,gradbegin=white,gradmidpoint=0,gradangle=\iA]%
-        (0,0,0)(1,\iA,60)(2,\iA,50)(3,\iA,40)(4,\iA,30)(5,\iA,20)(6,\iA,10)%
-        (6,\iB,10)(5,\iB,20)(4,\iB,30)(3,\iB,40)(2,\iB,50)(1,\iB,60)(0,0,0)
-  }
-  \pstThreeDLine[linecolor=red]{->}(0,0,0)(0,0,5)
-\end{pspicture}
-\end{lstlisting}
-
-
-\begin{center}
-\begin{pspicture}(-6.5,-6)(6,6.25)
-  \psset{Alpha=0,Beta=90}
-  \pstThreeDCoor[xMin=-3,xMax=6,yMin=-1,yMax=6,zMin=-1,zMax=5,drawCoor=false]
-  \multido{\iA=0+30,\iB=30+30,\iC=1+1}{12}{%
-    \modulo{\iC}{7}{\iCTemp}% 
-    \ifcase\iCTemp\psset{fillcolor=black,gradend=black}%
-      \or\psset{fillcolor=red,gradend=red}%
-      \or\psset{fillcolor=green,gradend=green}%
-      \or\psset{fillcolor=blue,gradend=blue}%
-      \or\psset{fillcolor=cyan,gradend=cyan}%
-      \or\psset{fillcolor=magenta,gradend=magenta}%
-      \or\psset{fillcolor=yellow,gradend=yellow}%
-    \fi
-    \pstThreeDLine[SphericalCoor=true,%
-      fillstyle=gradient,gradbegin=white,gradmidpoint=0,gradangle=\iA]%
-       (0,0,0)(1,\iA,60)(2,\iA,50)(3,\iA,40)(4,\iA,30)(5,\iA,20)(6,\iA,10)%
-       (6,\iB,10)(5,\iB,20)(4,\iB,30)(3,\iB,40)(2,\iB,50)(1,\iB,60)(0,0,0)%
-  }%
-  \pstThreeDLine[linecolor=red]{->}(0,0,0)(0,0,5)
-\end{pspicture}
-\end{center}
-
-\begin{lstlisting}[label={View from above}]
-\begin{pspicture}(-6.5,-6)(6,6.25)
-  \psset{Alpha=0,Beta=90}%
-  \pstThreeDCoor[xMin=-3,xMax=6,yMin=-1,yMax=6,zMin=-1,zMax=5,drawCoor=false]%
-  \multido{\iA=0+30,\iB=30+30,\iC=1+1}{12}{%
-    \modulo{\iC}{7}{\iCTemp}%
-    \ifcase\iCTemp\psset{fillcolor=black,gradend=black}%
-      \or\psset{fillcolor=red,gradend=red}%
-      \or\psset{fillcolor=green,gradend=green}%
-      \or\psset{fillcolor=blue,gradend=blue}%
-      \or\psset{fillcolor=cyan,gradend=cyan}%
-      \or\psset{fillcolor=magenta,gradend=magenta}%
-      \or\psset{fillcolor=yellow,gradend=yellow}%
-    \fi%
-    \pstThreeDLine[SphericalCoor=true,%
-      fillstyle=gradient,gradbegin=white,gradmidpoint=0,gradangle=\iA]%
-       (0,0,0)(1,\iA,60)(2,\iA,50)(3,\iA,40)(4,\iA,30)(5,\iA,20)(6,\iA,10)%
-       (6,\iB,10)(5,\iB,20)(4,\iB,30)(3,\iB,40)(2,\iB,50)(1,\iB,60)(0,0,0)%
-  }%
-  \pstThreeDLine[linecolor=red]{->}(0,0,0)(0,0,5)%
-\end{pspicture}
-\end{lstlisting}
-
-\end{document}
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/examples/3d0.pdf b/Master/texmf-dist/doc/generic/pst-3dplot/examples/3d0.pdf
deleted file mode 100644
index 4d24248b78c..00000000000
--- a/Master/texmf-dist/doc/generic/pst-3dplot/examples/3d0.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/examples/3d0.tex b/Master/texmf-dist/doc/generic/pst-3dplot/examples/3d0.tex
deleted file mode 100644
index e5e21a2bccd..00000000000
--- a/Master/texmf-dist/doc/generic/pst-3dplot/examples/3d0.tex
+++ /dev/null
@@ -1,56 +0,0 @@
-\documentclass[12pt]{article}
-\usepackage{pstricks}
-\definecolor{light}{rgb}{0.3,0.4,0.6}
-\usepackage{pst-3dplot}
-\pagestyle{empty}
-\def\drawCircles{%
-%	\pstThreeDCoor[xMax=14,yMax=14,zMax=7.5,linewidth=0.1pt]
-  \parametricplotThreeD[xPlotpoints=100](80,360)(0,360){%
-	/k 2 def /k2 4 def
-	t cos k mul 3 u sin k mul add mul
-	t sin k mul 3 u sin k mul add mul
-	u cos k2 mul
-  }
-  \parametricplotThreeD[yPlotpoints=75](0,360)(80,360){%
-	/k 2 def /k2 4 def
-	u cos k mul 3 t sin k mul add mul
-	u sin k mul 3 t sin k mul add mul
-	t cos k2 mul
-  }
-%	\parametricplotThreeD[xPlotpoints=100,yPlotpoints=1,linecolor=red,linewidth=2pt](80,360)(0,360){%
-%		/k 2 def /k2 4 def
-%		t cos k mul 2 u sin k mul add mul
-%		t sin k mul 2 u sin k mul add mul
-%		u cos k2 mul
-%	}
-  \parametricplotThreeD[yPlotpoints=1,linecolor=red,linewidth=2pt](0,360)(80,360){%
-	/k 2 def /k2 4 def
-	u cos k mul 3 t sin k mul add mul
-	u sin k mul 3 t sin k mul add mul
-	t cos k2 mul
-  }
-}
-
-\begin{document}
-
-\psset{unit=0.75}
-\begin{pspicture}(-5,-5)(5,5)
-	\psset{Beta=20,Alpha=50,linewidth=0.1pt,linecolor=light}
-	\drawCircles
-\end{pspicture}
-
-\clearpage
-%\psset{unit=0.75}
-\begin{pspicture}(-5,-5)(5,5)
-	\psset{Beta=90,Alpha=50,linewidth=0.1pt,linecolor=light}
-	\drawCircles
-\end{pspicture}
-
-\clearpage
-%\psset{unit=0.75}
-\begin{pspicture}(-5,-5)(5,5)
-	\psset{Beta=0,Alpha=50,linewidth=0.1pt,linecolor=light}
-	\drawCircles
-\end{pspicture}
-
-\end{document}
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/examples/3d1.pdf b/Master/texmf-dist/doc/generic/pst-3dplot/examples/3d1.pdf
deleted file mode 100644
index 49cfb1670cc..00000000000
--- a/Master/texmf-dist/doc/generic/pst-3dplot/examples/3d1.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/examples/3d1.tex b/Master/texmf-dist/doc/generic/pst-3dplot/examples/3d1.tex
deleted file mode 100644
index 12def4d2fe4..00000000000
--- a/Master/texmf-dist/doc/generic/pst-3dplot/examples/3d1.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\documentclass[12pt]{article}
-\usepackage{pst-3dplot}
-\begin{document}
-
-\psset{unit=3cm,Beta=10,Alpha=60}
-
-\begin{pspicture}(-1,-1)(1,1)
-\pstThreeDCoor[xMax=2.5,yMax=2.5,zMax=2.5,drawing=false]
-\pstThreeDBox(1,1,-1)(-2,0,0)(0,-2,0)(0,0,2)
-\psplotThreeD[linecolor=blue,drawStyle=xyLines](-1,1)(-1,1){x 2 exp y mul}
-\psplotThreeD[linecolor=red,drawStyle=yLines](-1,1)(-1,1){x 2 exp y mul}
-\end{pspicture}
-
-\end{document}
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/examples/3d2.pdf b/Master/texmf-dist/doc/generic/pst-3dplot/examples/3d2.pdf
deleted file mode 100644
index c59928ac8d8..00000000000
--- a/Master/texmf-dist/doc/generic/pst-3dplot/examples/3d2.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/examples/3d2.tex b/Master/texmf-dist/doc/generic/pst-3dplot/examples/3d2.tex
deleted file mode 100644
index b5af48c2ec1..00000000000
--- a/Master/texmf-dist/doc/generic/pst-3dplot/examples/3d2.tex
+++ /dev/null
@@ -1,31 +0,0 @@
-\documentclass[a4paper,12pt]{article}
-\usepackage{pstricks}
-\usepackage{pst-3dplot}
-\usepackage{pst-grad}
-\parindent=0pt
-\makeatletter
-
-\begin{document}
-
-\begin{pspicture}(-5,-5)(5,5)
-\pstThreeDCoor
-\pstThreeDPut(1,0,0){
-  \parametricplotThreeD[xPlotpoints=20,yPlotpoints=50](0,360)(0,360){%
-    /a 1.5 def /b 2 def /c 3 def
-    a t cos u sin mul mul
-    b t sin u sin mul mul
-    c u cos mul
-  }
-}
-\pstThreeDPut(-1,2,3){
-  \parametricplotThreeD[hiddenLine=true,plotstyle=curve,fillstyle=gradient,
-    gradbegin=red,gradend=white,xPlotpoints=20,yPlotpoints=50](0,360)(0,360){%
-    /a 3.5 def /b 2 def /c 2 def
-    a t cos u sin mul mul
-    b t sin u sin mul mul
-    c u cos mul
-  }
-}
-\end{pspicture}
-
-\end{document}
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/examples/polar2.pdf b/Master/texmf-dist/doc/generic/pst-3dplot/examples/polar2.pdf
deleted file mode 100644
index 3e014077dc6..00000000000
--- a/Master/texmf-dist/doc/generic/pst-3dplot/examples/polar2.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/examples/polar2.tex b/Master/texmf-dist/doc/generic/pst-3dplot/examples/polar2.tex
deleted file mode 100644
index 848214fe518..00000000000
--- a/Master/texmf-dist/doc/generic/pst-3dplot/examples/polar2.tex
+++ /dev/null
@@ -1,81 +0,0 @@
-\listfiles
-\documentclass[a4paper]{article}%  Herbert Voss 2004-10-06
-\usepackage{pstricks}
-\usepackage{pstricks-add}
-\usepackage{multido}
-\def\func{%
-    const0 x sin dup mul 3 mul div neg /p exch def
-    p abs sqrt neg /r exch def
-    const1 2.0 div neg /q exch def
-    p 0 lt {
-      p dup mul p mul q dup mul add 0 le {
-        q r 3 exp div arccos 
-        3 div cos r dup add neg mul
-      }{
-        q r 3 exp div arch
-        3 div cosh r dup add neg mul
-      } ifelse
-    }{
-      q r 3 exp div arsh
-      3 div sinh r dup add neg mul      
-    } ifelse
-}
-\begin{document}
-\textbf{Dynamical flow around a cylinder}
-\[
-\left(r^2-\frac{c_1}{r}\right)\sin^2\theta=c_0
-\]
-
-which is the same as
-
-\[
-r^3-\frac{c_0}{\sin^2\theta}\cdot r-c_1=0
-\]
-
-which can be solved by the formula of Cardano:
-
-\[
-r^3+3pr+2q=0
-\]
-
-\bigskip
-\begin{pspicture*}(-5,-2.5)(5,2.5)
-  \pstVerb{
-    /e 2.718281828459045 def
-    /arccos { dup dup mul neg 1.0 add sqrt exch atan } def
-    /sinh { dup e exch exp exch neg e exch exp sub 2 div } def
-    /cosh { dup e exch exp exch neg e exch exp add 2 div } def
-    /arsh { dup dup mul 1 add sqrt add ln } def
-    /arch { dup dup mul 1 sub sqrt add ln } def
-  }
-  \psaxes(0,0)(-5,-2.5)(5,2.5)
-  \pscircle[linecolor=red]{1}
-  \psset{plotpoints=100,linewidth=0.05pt,polarplot=true,linecolor=blue}
-  \multido{\rA=0.005+0.05}{5}{
-    \psplot{1}{179}{%
-      /const0 \rA\space def 
-      /const1 1.0 def % cylinder radius
-      \func
-    }
-    \psplot{181}{359}{%
-      /const0 \rA\space def 
-      /const1 1.0 def % cylinder radius
-      \func
-    }%
-  }
-  \multido{\rA=0.03+0.25}{20}{
-    \psplot{1}{179}{%
-      /const0 \rA\space def 
-      /const1 1.0 def % cylinder radius
-      \func
-    }
-    \psplot{181}{359}{%
-      /const0 \rA\space def 
-      /const1 1.0 def % cylinder radius
-      \func
-    }%
-  }
-\end{pspicture*}
-
-\end{document}
-
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/examples/spherCoor.pdf b/Master/texmf-dist/doc/generic/pst-3dplot/examples/spherCoor.pdf
deleted file mode 100644
index bdf3fa1cd29..00000000000
--- a/Master/texmf-dist/doc/generic/pst-3dplot/examples/spherCoor.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/examples/spherCoor.tex b/Master/texmf-dist/doc/generic/pst-3dplot/examples/spherCoor.tex
deleted file mode 100644
index 6b54d12fb1f..00000000000
--- a/Master/texmf-dist/doc/generic/pst-3dplot/examples/spherCoor.tex
+++ /dev/null
@@ -1,32 +0,0 @@
-\documentclass[]{article}
-\usepackage{pstricks}
-\usepackage{pst-3dplot}
-\pagestyle{empty}
-\parindent=0pt
-
-\begin{document}
-
-\begin{center}
-\begin{pspicture}(-4.8,-1.5)(4.8,3.5)
-\psset{unit=5cm,drawCoor,beginAngle=90,endAngle=180,linestyle=dotted}
-\def\oA{\pstThreeDLine[linecolor=blue,linewidth=3pt,arrows=c-> ](0,0,0)(1,60,70)}
-\def\oB{\pstThreeDLine[linecolor=red,linewidth=3pt,arrows=c->](0,0,0)(1,10,50)}
-\def\oAB{\pstThreeDEllipse[beginAngle=58,endAngle=90](0,0,0)(1,140,40)(1,10,50)}
-\pstThreeDCoor[drawing=true, linewidth=1pt,linecolor=black,linestyle=solid,%
-  xMin=0,xMax=1.1, yMin=0,yMax=1.1, zMin=0,zMax=1.1]
-\pstThreeDEllipse(0,0,0)(-1,0,0)(0,1,0)
-\pstThreeDEllipse(0,0,0)(-1,0,0)(0,0,1)
-\pstThreeDEllipse[beginAngle=0,endAngle=90](0,0,0)(0,0,1)(0,1,0)
-\psset{SphericalCoor,linestyle=solid}
-\pstThreeDDot[dotstyle=none](1,10,50)
-\pstThreeDDot[dotstyle=none](1,60,70)
-\pscustom[fillstyle=crosshatch,hatchcolor=yellow,linestyle=none]{\oB\oAB\oA}
-\oA \oB \oAB
-\pstThreeDPut[origin=lb](1,60,70){$\vec\Omega_1$}
-\pstThreeDPut[origin=rb](1,10,50){$\vec\Omega_2 \,$}
-\pstThreeDPut[origin=lb](1,10,65){$\gamma_{12}$}
-\end{pspicture}
-\end{center}
-
-\end{document}
-
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/doc/pst-3dplot.bib b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.bib
index 0e306e28974..3b785845e22 100644
--- a/Master/texmf-dist/doc/generic/pst-3dplot/doc/pst-3dplot.bib
+++ b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.bib
@@ -1,4 +1,5 @@
 @STRING{dtk	= {{D}ie {\TeX}nische {K}om{\"o}die} }
+
 @Book{PostScript,
   Author         = {Kollock, Nikolai G.},
   Title          = {PostScript richtig eingesetzt: vom Konzept zum
@@ -22,7 +23,7 @@
   Title          = {PSTricks Support for pdf},
   Author         = {Herbert Voss},
   Organization   = {},
-  Address        = {\url{http://www.educat.hu-berlin.de/~voss/lyx/pdf/pdfoutput.phtml}},
+  Address        = {\url{http://PSTricks.de/pdf/pdfoutput.phtml}},
   Note           = {},
   year           = 2002,
 }
@@ -99,3 +100,30 @@
 }
 
 
+@Book{companion,
+  author	= {Michel Goosens and Frank Mittelbach and Alexander
+		  Samarin},
+  title		= {The {\LaTeX} {G}raphics {C}ompanion},
+  publisher	= {{Addison-Wesley Publishing Company}},
+  year		= {2004},
+  edition	= {2.},
+  address	= {Reading, Mass.}
+}
+
+@Book{PSTricks2,
+  author	= {Herbert Vo\ss},
+  title		= {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
+  edition	= {4.},
+  publisher	= {DANTE -- Lehmanns},
+  year		= {2007},
+  address	= {Heidelberg/Hamburg}
+}
+
+@Book{voss:math,
+  author	= {Herbert Vo\ss},
+  title		= {\LaTeX\ in {M}athematik und {N}aturwissenschaften},
+  publisher	= {{Franzis-Verlag}},
+  year		= {2006},
+  address	= {Poing}
+}
+
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
new file mode 100644
index 00000000000..9f53681952b
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.pdf
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/doc/pst-3dplot-doc.tex b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex
index 33c35b47f43..b3af53cb325 100644
--- a/Master/texmf-dist/doc/generic/pst-3dplot/doc/pst-3dplot-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex
@@ -1,9 +1,460 @@
+\listfiles
 \documentclass[11pt,a4paper]{article}
+
+\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}
+
+
 \usepackage[T1]{fontenc}
 \usepackage[latin1]{inputenc}
 \usepackage{amsmath}
 \usepackage{graphicx}
-\usepackage{geometry}
+\usepackage{geometry,lmodern}
 \usepackage{pstricks}
 \usepackage{pst-grad}
 \usepackage{showexpl}
@@ -17,7 +468,7 @@
 \usepackage{calc}
 \usepackage{comment}
 \usepackage{prettyref}
-\usepackage[scaled=0.8]{luximono}
+%\usepackage[scaled=0.8]{luximono}
 \pagestyle{fancy}
 \usepackage{url}
 \usepackage{longtable}
@@ -39,6 +490,8 @@
 \psset{subgriddiv=0,gridlabels=7pt,gridcolor=black!15}
 \usepackage[pdfauthor={Herbert Voss},pdftitle={3D Plots},linktocpage,colorlinks]{hyperref}
 %
+
+%
 \begin{document}
 \author{Herbert Vo�\thanks{voss@perce.de}}
 \date{\today}
@@ -366,7 +819,9 @@ Cartesian coordinate system.
 
 
 \subsection{Ticks}
-With the option \verb+IIIDticks+ the axes get ticks and labels. There are several options to place the labels in right plane to get an optimal view.  The view of the ticklabels can be changed by redefining the macro
+With the option \verb+IIIDticks+ the axes get ticks and labels. There are several 
+options to place the labels in right plane to get an optimal view.  The view of the 
+ticklabels can be changed by redefining the macro
 
 \begin{verbatim}
 \def\psxyzlabel#1{\bgroup\footnotesize\textsf{#1}\egroup}
@@ -393,8 +848,8 @@ With the option \verb+IIIDticks+ the axes get ticks and labels. There are severa
 \begin{LTXexample}[width=7.25cm]
 \begin{pspicture}(-3,-2.5)(3,4)\psgrid
   \pstThreeDCoor[linecolor=black,%
-     IIIDticks,IIIDzTicksPlane=xz,IIIDzticksep=-0.2,%
-     IIIDxTicksPlane=xz,,IIIDxticksep=-0.2,%
+     IIIDticks,IIIDzTicksPlane=yz,IIIDzticksep=-0.2,%
+     IIIDxTicksPlane=yz,,IIIDxticksep=-0.2,%
      IIIDyTicksPlane=xy,,IIIDyticksep=0.2,%
      Dx=2,Dy=1,Dz=0.25,Alpha=-135,Beta=-30]%
 \end{pspicture}
@@ -412,20 +867,24 @@ The following example shows a wrong placing of the labels, the planes should be
 \end{LTXexample}
 
 \begin{LTXexample}[width=7.25cm]
-\begin{pspicture}(-3,-2.25)(2,3)
+\psset{Alpha=-60,Beta=60}
+\begin{pspicture}(-4,-2.25)(1,3)
   \psgrid
-  \psset{Alpha=30,Beta=30}
-  \pstThreeDCoor[linecolor=black,IIIDticks]
-  \pstThreeDDot[linecolor=red,drawCoor=true](1,0.5,0.5)% the center
-  \psset{linecolor=blue, linewidth=1.5pt}
-  \pstThreeDEllipse(1,0.5,0.5)(-0.5,1,0.5)(1,-0.5,-1)
-  \psset{beginAngle=0,endAngle=270,linecolor=green}
-  \pstThreeDDot[linecolor=red,drawCoor=true](2,1,2.5)% the center
-  \pstThreeDEllipse(2,1,2.5)(-0.5,0.5,0.5)(0.5,0.5,-1)
+  \pstThreeDCoor[linecolor=black,%
+      IIIDticks,planecorr=normal,
+      Dx=2,Dy=1,Dz=0.25]%
 \end{pspicture}
 \end{LTXexample}
 
-
+\begin{LTXexample}[width=7.25cm]
+\psset{Alpha=-60,Beta=60}
+\begin{pspicture}(-4,-2.25)(1,3)
+  \psgrid
+  \pstThreeDCoor[linecolor=black,%
+      IIIDticks,planecorr=xyrot,
+      Dx=2,Dy=1,Dz=0.25]%
+\end{pspicture}
+\end{LTXexample}
 
 \section{Rotation}
 
@@ -442,7 +901,7 @@ additional one for the rotating sequence, which can be any combination of the th
 \end{LTXexample}
 
 \begin{LTXexample}[pos=t]
-\psset{unit=2,linewidth=1.5pt}
+\psset{unit=2,linewidth=1.5pt,drawCoor=false}
 \begin{pspicture}(-2,-1.5)(2,2.5)%
   \pstThreeDCoor[xMin=0,xMax=2,yMin=0,yMax=2,zMin=0,zMax=2]%
   \pstThreeDBox[RotX=90,RotY=90,RotZ=90,%
@@ -987,7 +1446,7 @@ These are the origin vector $\vec{o}$ and three direction vectors $\vec{u}$, $\v
 
 
 \begin{LTXexample}[width=5.25cm]
-\begin{pspicture}(-2,-1.25)(3,4.25)\psgrid
+\begin{pspicture}(-2,-1.25)(3,4.25)
   \psset{Alpha=30,Beta=30}
   \pstThreeDCoor[xMin=-3,xMax=1,yMin=-1,yMax=2,zMin=-1,zMax=4]
   \pstThreeDDot[drawCoor=true](-1,1,2)
@@ -1004,15 +1463,49 @@ These are the origin vector $\vec{o}$ and three direction vectors $\vec{u}$, $\v
 \end{LTXexample}
 
 \begin{LTXexample}[width=5.25cm]
-\begin{pspicture}(-2,-1.25)(3,4.25)\psgrid
+\begin{pspicture}(-2,-1.25)(3,4.25)
   \psset{Alpha=30,Beta=30}
   \pstThreeDCoor[xMin=-3,xMax=1,yMin=-1,yMax=2,zMin=-1,zMax=4]
-  \pstThreeDBox(-1,1,2)(0,0,2)(2,0,0)(0,1,0)
+  \pstThreeDBox[hiddenLine](-1,1,2)(0,0,2)(2,0,0)(0,1,0)
   \pstThreeDDot[drawCoor=true](-1,1,2)
 \end{pspicture}
 \end{LTXexample}
 
+\begin{LTXexample}[width=5.25cm]
+\begin{pspicture}(-2,-1.25)(3,4.25)
+  \psset{Alpha=210,Beta=30}
+  \pstThreeDCoor[xMin=-3,xMax=1,yMin=-1,yMax=2,zMin=-1,zMax=4]
+  \pstThreeDBox[hiddenLine](-1,1,2)(0,0,2)(2,0,0)(0,1,0)
+  \pstThreeDDot[drawCoor=true](-1,1,2)
+\end{pspicture}
+\end{LTXexample}
 
+\begin{LTXexample}[width=5.25cm]
+\begin{pspicture}(-2,-1.25)(3,4.25)
+  \psset{Alpha=30,Beta=30}
+  \pstThreeDCoor[xMin=-3,xMax=1,yMin=-1,yMax=2,zMin=-1,zMax=4]
+  \pstThreeDBox[hiddenLine](-1,1,2)(0,0,2)(2,0,0)(0,1,0)
+  \pstThreeDDot[drawCoor=true](-1,1,2)
+\end{pspicture}
+\end{LTXexample}
+
+\begin{LTXexample}[width=5.25cm]
+\begin{pspicture}(-2,-1.25)(3,4.25)
+  \psset{Alpha=130,Beta=30}
+  \pstThreeDCoor[xMin=-3,xMax=1,yMin=-1,yMax=2,zMin=-1,zMax=4]
+  \pstThreeDBox[hiddenLine](-1,1,2)(0,0,2)(2,0,0)(0,1,0)
+  \pstThreeDDot[drawCoor=true](-1,1,2)
+\end{pspicture}
+\end{LTXexample}
+
+\begin{LTXexample}[width=5.25cm]
+\begin{pspicture}(-2,-1.25)(3,4.25)
+  \psset{Alpha=130,Beta=100}
+  \pstThreeDCoor[xMin=-3,xMax=1,yMin=-1,yMax=2,zMin=-1,zMax=4]
+  \pstThreeDBox[hiddenLine](-1,1,2)(0,0,2)(2,0,0)(0,1,0)
+  \pstThreeDDot[drawCoor=true](-1,1,2)
+\end{pspicture}
+\end{LTXexample}
 
 \section{Ellipses and circles}
 
@@ -1264,7 +1757,63 @@ In the following example the circle is drawn with only $20$  plotpoints and the
 \end{lstlisting}
 
 % ---------------------------------------------------------------------------------------
-\subsection{\CMD{pstParaboloid}}
+\section{\CMD{pstIIIDCylinder}}
+% ---------------------------------------------------------------------------------------
+The syntax is 
+ 
+\begin{verbatim}
+\pstIIIDCylinder[Parameter](x,y,z){radius}{height}
+\end{verbatim}
+
+\verb+(x,y,z)+ defines the center of the lower part of the cylinder. If it is
+missing, then \verb+(0,0,0)+ are taken into account.
+
+\begin{LTXexample}[width=6.5cm]
+\psframebox{%
+\begin{pspicture}(-3.5,-2)(3,6)
+\pstThreeDCoor[zMax=6]
+\pstIIIDCylinder{2}{5}
+\end{pspicture}
+}
+\end{LTXexample}
+
+\begin{LTXexample}[width=6.5cm]
+\psframebox{%
+\begin{pspicture}(-3.5,-2)(3,6.75)
+\pstThreeDCoor[zMax=7]
+\pstIIIDCylinder[RotY=30,fillstyle=solid,
+    fillcolor=red!20,linecolor=black!60](0,0,0){2}{5}
+\end{pspicture}
+}
+\end{LTXexample}
+
+\begin{LTXexample}[width=6.5cm]
+\psframebox{%
+\begin{pspicture}(-3.2,-1.75)(3,6.25)
+\pstThreeDCoor[zMax=7]
+\pstIIIDCylinder[linecolor=black!20,
+    increment=0.4,fillstyle=solid]{2}{5}
+\psset{linecolor=red}
+\pstThreeDLine{->}(0,0,5)(0,0,7)
+\end{pspicture}
+}
+\end{LTXexample}
+
+\begin{LTXexample}[width=7.5cm]
+\psframebox{%
+\begin{pspicture}(-4.5,-1.5)(3,6.8)
+\psset{Beta=20}
+\pstThreeDCoor[zMax=7]
+\pstIIIDCylinder[fillcolor=blue!20,
+    RotX=45](1,1,0){2}{5}
+\end{pspicture}
+}
+\end{LTXexample}
+
+\clearpage
+
+% ---------------------------------------------------------------------------------------
+\section{\CMD{pstParaboloid}}
 % ---------------------------------------------------------------------------------------
 The syntax is 
  
@@ -1527,7 +2076,7 @@ Drawing three dimensional functions with curves which are transparent makes it d
 \caption{Plot of the equation \ref{eq:3dfunc} with the \texttt{drawStyle=xyLines} option}
 \end{figure*}
 
-\begin{figure*}
+\begin{figure*}[htbp]
 \centering
 \begin{pspicture}(-6,-4)(6,5)
 	\psgrid
@@ -1547,7 +2096,7 @@ Drawing three dimensional functions with curves which are transparent makes it d
 \texttt{hiddenLine=true} option}
 \end{figure*}
 
-\begin{figure*}
+\begin{figure*}[htbp]
 \centering
 \begin{pspicture}(-6,-4)(6,5)
   \psgrid
@@ -1642,11 +2191,11 @@ and at last both together is also not a problem when having these parametric fun
 \end{lstlisting}
 
 
-\begin{figure}[htb]
+\begin{figure}[htbp]
 {\psset{xunit=1.75cm,yunit=1.75cm}
 \begin{pspicture}(-1,-1)(1,1)
 \psgrid
-\setDefaults
+\setIIIDplotDefaults
 %\pstThreeDCoor[xMin=-1,xMax=1,yMin=-1,yMax=1,zMin=-1,zMax=1]
 \parametricplotThreeD[plotstyle=curve](0,360)(0,360){%
 	t cos u sin mul
@@ -1716,7 +2265,8 @@ The in the following examples used data file has 446 entries like
 6.26093349..., 2.55876582..., 8.131984...
 \end{verbatim}
 
-This may take some time on slow machines when using the \CMD{listplotThreeD} macro. The possible options for the lines are the ones from table \ref{tab:lineOptions}. 
+This may take some time on slow machines when using the \CMD{listplotThreeD} macro. 
+The possible options for the lines are the ones from table \ref{tab:lineOptions}. 
 
 \subsection{\textbackslash\texttt{fileplotThreeD}}
 The syntax is very easy
@@ -1725,9 +2275,11 @@ The syntax is very easy
 \fileplotThreeD[<options>]{<datafile>}
 \end{verbatim}}
 
-If the data file is not in the same directory than the document, insert the file name with the full path. Figure \ref{fig:fileplot} shows a file plot with the option \texttt{linestyle=line}.
+If the data file is not in the same directory than the document, insert the file name 
+with the full path. Figure \ref{fig:fileplot} shows a file plot with the option \texttt{linestyle=line}.
 
-\begin{figure}[htb]
+
+\begin{figure}[!htbp]
 \begin{LTXexample}[pos=t]
 \begin{pspicture}(-6,-3)(6,10)
   \psset{xunit=0.5cm,yunit=0.75cm,Alpha=30,Beta=30}% the global parameters
@@ -1735,11 +2287,11 @@ If the data file is not in the same directory than the document, insert the file
   \fileplotThreeD[plotstyle=line]{data3D.Roessler}
 \end{pspicture}%
 \end{LTXexample}%
-\caption{Demonstration of \texttt{\textbackslash fileplotThreeD} with \texttt{Alpha=30} and \texttt{Beta=15}}\label{fig:fileplot}
+\caption{Demonstration of \CMD{fileplotThreeD} with \texttt{Alpha=30} and \texttt{Beta=15}}\label{fig:fileplot}
 \end{figure}
 
 
-\subsection{\textbackslash\texttt{dataplotThreeD}}
+\subsection{\CMD{dataplotThreeD}}
 The syntax is 
 
 \begin{verbatim}
@@ -1753,7 +2305,7 @@ In difference to the macro \CMD{fileplotThreeD} the \CMD{dataplotThreeD} cannot
 \end{verbatim}
 
 \readdata{\dataThreeD}{data3D.Roessler}
-\begin{figure}[htb]
+\begin{figure}[htbp]
 \begin{LTXexample}[width=8.5cm]
 \begin{pspicture}(-4.5,-3.5)(4,11)
   \psset{xunit=0.5cm,yunit=0.75cm,Alpha=-30}
@@ -1765,7 +2317,7 @@ In difference to the macro \CMD{fileplotThreeD} the \CMD{dataplotThreeD} cannot
 \end{figure}
 
 
-\subsection{\textbackslash\texttt{listplotThreeD}}
+\subsection{\CMD{listplotThreeD}}
 The syntax is 
 \begin{verbatim}
 \listplotThreeD[<options>]{<data object>}
@@ -1920,7 +2472,9 @@ coordinates of the vector $\vec{C}=\vec{A}-\vec{B}$.
 \item use the \verb|ps4pdf| package.\footnote{\url{http://www.perce.de/LaTeX/ps4pdf/}}
 \end{itemize}
 
-If you need package \verb|graphicx.sty| load it before any \verb|pstricks| package. You do not need to load \verb|pstricks.sty|, it will be done by \verb|pst-3dplot| by default.
+If you need package \verb|graphicx.sty| load it before any \verb|pstricks| package. 
+You do not need to load 
+\verb|pstricks.sty|, it will be done by \verb|pst-3dplot| by default.
 
 \section{FAQ}
 \begin{itemize}
@@ -1946,11 +2500,13 @@ error. In this case save prevent expanding with e.g.: \verb+\psset{nameX=$\noexp
 \end{itemize}
 
 
+
 \section{Credits}
 Bruce Burlton | Christophe Jorssen | Chris Kuklewicz | Thorsten Suhling
 
+\nocite{*}
 
 \bibliographystyle{plain}
-\bibliography{pst-3dplot}
+\bibliography{pst-3dplot-doc}
 
 \end{document}
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/doc/tb72voss3d.pdf b/Master/texmf-dist/doc/generic/pst-3dplot/tb72voss3d.pdf
index ef3bc1f69bb..ef3bc1f69bb 100644
--- a/Master/texmf-dist/doc/generic/pst-3dplot/doc/tb72voss3d.pdf
+++ b/Master/texmf-dist/doc/generic/pst-3dplot/tb72voss3d.pdf
diff --git a/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro b/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro
index d8cffb1e8fb..30b2d62eece 100644
--- a/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro
+++ b/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro
@@ -20,6 +20,8 @@
 /tx@3DPlotDict 50 dict def
 tx@3DPlotDict begin
 %
+/printDot { gsave 2 copy 2 0 360 arc fill stroke grestore } def
+%
 /saveCoor { 
   dzUnit mul /z exch def
   dyUnit mul /y exch def
@@ -34,6 +36,8 @@ tx@3DPlotDict begin
   /y2D x leftHanded { neg } if Alpha sin mul y Alpha cos mul add neg Beta sin mul z Beta cos mul add def
 } def
 %
+/Conv3D2D { /z ED /y ED /x ED ConvertTo2D x2D y2D } def
+%
 /ConvertToCartesian {
   /latitude exch def
   /longitude exch def
@@ -42,11 +46,22 @@ tx@3DPlotDict begin
   /x { Radius longitude cos mul latitude cos mul } def
   /y { Radius longitude sin mul latitude cos mul } def
 } def
+/ConvCylToCartesian { % r phi h -> x y z
+  3 1 roll			% r phi h
+  /Phi ED
+  /Radius ED			% h->z
+  Radius Phi cos mul exch 	% x z
+  Radius Phi sin mul exch	% x y z
+} def
 %
 /SphericalTo2D {
   x y z ConvertToCartesian ConvertTo2D
 } def
 %
+/CylinderTo2D { %  r phi h
+  x y z ConvCylToCartesian ConvertTo2D
+} def
+%
 /convertStackTo2D {
   counttomark
   /n exch def /n3 n 3 div cvi def
@@ -69,9 +84,9 @@ tx@3DPlotDict begin
 /formulesTroisD{%
   /xObservateur x Sin1 mul neg y Cos1 mul add def
   /yObservateur x Cos1Sin2 mul neg y Sin1Sin2 mul sub z Cos2 mul add def
-  /zObservateur x neg Cos1Cos2 mul y Sin1Cos2 mul sub z Sin2 mul sub Dobs add def
-  /Xi DScreen xObservateur mul zObservateur div def
-  /Yi DScreen yObservateur mul zObservateur div def
+  /zObservateur x neg Cos1Cos2 mul y Sin1Cos2 mul sub z Sin2 mul sub def
+  /Xi xObservateur mul zObservateur Div def
+  /Yi yObservateur mul zObservateur Div def
 } def
 %
 /RotatePointXYZ{% Mxx are defined in the TeX file
@@ -236,5 +251,52 @@ tx@3DPlotDict begin
     % /StartTheta StartTheta increment 2 div add def
   } for
 } def
+%
+%
+/MoveTo { Conv3D2D moveto } def
+/LineTo { Conv3D2D lineto } def
 
+/IIIDEllipse { % x y z rA rB startAngle endAngle Wedge
+  /dAngle 1 def
+  /isWedge ED
+  /endAngle ED
+  /startAngle ED
+  /radiusB ED
+  /radiusA ED
+  startAngle cos radiusA mul startAngle sin radiusB mul 0 
+  isWedge { 0 0 moveto LineTo }{ MoveTo } ifelse
+  /Angle startAngle def
+  startAngle dAngle endAngle {
+    /Angle ED
+    Angle cos radiusA mul Angle sin radiusB mul 0 LineTo  
+  } for
+  isWedge { 0 0 lineto } if
+} def
+
+/IIIDCircle { % x y z r startAngle endAngle Wedge
+  7 3 roll % startAngle endAngle Wedge x y z r
+  dup      % startAngle endAngle Wedge x y z r r
+  8 -3 roll
+  IIIDEllipse 
+} def
+
+/IIIDWedge { % x y z r startAngle endAngle
+  true IIIDCircle
+} def
+
+/IIIDCylinder {% x y z r h start end wedge
+  /isWedge ED
+  /increment ED
+  /endAngle ED
+  /startAngle ED
+  /height ED
+  /radius ED
+  startAngle increment endAngle {
+    /Angle exch def
+    radius Angle 0 ConvCylToCartesian MoveTo  
+    radius Angle height ConvCylToCartesian LineTo  
+  } for
+  stroke
+} def
+%
 end
diff --git a/Master/texmf-dist/source/generic/pst-3dplot/Makefile b/Master/texmf-dist/source/generic/pst-3dplot/Makefile
new file mode 100644
index 00000000000..294bb21f319
--- /dev/null
+++ b/Master/texmf-dist/source/generic/pst-3dplot/Makefile
@@ -0,0 +1,48 @@
+
+# `Makefile' for `pst-3dplot.pdf', hv, 2007/03/17
+
+.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps
+
+PACKAGE = pst-3dplot
+
+MAIN = $(PACKAGE)-doc
+
+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 -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \
+	  $(basename $<).glo
+	makeindex -t $(basename $<).ilg -o $(basename $<).ind \
+	  $(basename $<).idx
+	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)
+
+veryclean : clean
+	$(RM) $(addprefix $(MAIN), .pdf .bbl .blg)
+
+arch :
+	zip $(ARCHNAME).zip $(ARCHFILES)
+
+# 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 e8812bd5102..88063d0edd8 100644
--- a/Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex
+++ b/Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex
@@ -22,11 +22,11 @@
 \ifx\PSTnodesLoaded\endinput\else\input pst-3d.tex\fi
 \ifx\PSTnodesLoaded\endinput\else\input pst-node.tex\fi
 \ifx\PSTplotLoaded\endinput\else\input pst-plot.tex\fi% plotpoints
-%\ifx\PSTVueTroisDLoaded\endinput\else\input pst-vue3d.tex\fi
+\ifx\PSTricksAddLoaded\endinput\else\input pstricks-add.tex\fi
 \ifx\PSTMultidoLoaded\endinput\else\input multido.tex\fi
 %
-\def\fileversion{1.72}
-\def\filedate{2006/02/07}
+\def\fileversion{1.74}
+\def\filedate{2007/06/17}
 \message{`PST-3dplot' v\fileversion, \filedate\space (HV)}
 %
 \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -60,18 +60,15 @@
 %
 % ---------------- the if's -----------------
 %
-\newif\ifPst@drawing%			draw the coordinates?
-\define@key[psset]{pst-3dplot}{drawing}[true]{\@nameuse{Pst@drawing#1}}
-\newif\ifPst@drawCoor%		draw the coordinates of a dot?
-\define@key[psset]{pst-3dplot}{drawCoor}[true]{\@nameuse{Pst@drawCoor#1}}
-\newif\ifPst@hiddenLine%	emulate hidden line surface?
-\define@key[psset]{pst-3dplot}{hiddenLine}[true]{\@nameuse{Pst@hiddenLine#1}}
-\newif\ifPst@SphericalCoor% 	(r,phi,theta)
-\define@key[psset]{pst-3dplot}{SphericalCoor}[true]{\@nameuse{Pst@SphericalCoor#1}}
-\psset[pst-3dplot]{SphericalCoor=false}
-\newif\ifPst@leftHanded%			left-Handed coor?
-\define@key[psset]{pst-3dplot}{leftHanded}[true]{\@nameuse{Pst@leftHanded#1}}
-\psset[pst-3dplot]{leftHanded=false}
+\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)
+    \Pst@CylindricalCoorfalse}% 
+\define@boolkey[psset]{pst-3dplot}[Pst@]{CylindricalCoor}[true]{% (r,phi,z)
+    \Pst@SphericalCoorfalse}% 
+\define@boolkey[psset]{pst-3dplot}[Pst@]{leftHanded}[true]{}% left-Handed coor
+\psset[pst-3dplot]{drawing,drawCoor,hiddenLine=false,SphericalCoor=false,leftHanded=false}
 %
 % ------- the global definitions for the pspicture frame ------
 %
@@ -127,9 +124,10 @@
 \define@key[psset]{pst-3dplot}{linejoin}{%		how lines come together 0,1,2
   \def\psk@ThreeDplot@linejoin{#1}}
 \define@key[psset]{pst-3dplot}{plane}{%			xy,xz,yz
-  \def\psk@ThreeDplot@plane{#1}}
-\define@key[psset]{pst-3dplot}{pOrigin}{%			combination of (lr)(tBb)
+  \edef\psk@ThreeDplot@plane{#1}}	%		must be expanded 
+\define@key[psset]{pst-3dplot}{pOrigin}{%		combination of (lr)(tBb)
   \def\psk@ThreeDplot@pOrigin{#1}}
+\define@key[psset]{pst-3dplot}{IIIDdAlpha}{\def\psk@IIIDdAlpha{#1 }}
 \def\ThreeDplot@planeXY{xy}
 \def\ThreeDplot@planeXZ{xz}
 \def\ThreeDplot@planeYZ{yz}
@@ -149,9 +147,9 @@
 \define@key[psset]{pst-3dplot}{arrowOffset}{%	offset for \arrowLine
   \def\psk@ThreeDplot@arrowOffset{#1}}
 \define@key[psset]{pst-3dplot}{visibleLineStyle}{%	offset for \arrowLine
-  \def\psk@ThreeDplot@visibleLineStyle{#1}}
+  \edef\psk@ThreeDplot@visibleLineStyle{#1}}
 \define@key[psset]{pst-3dplot}{invisibleLineStyle}{%	offset for \arrowLine
-  \def\psk@ThreeDplot@invisibleLineStyle{#1}}
+  \edef\psk@ThreeDplot@invisibleLineStyle{#1}}
 %
 \newif\if@IIIDticks%          draw the ticks?
 \define@key[psset]{pst-3dplot}{IIIDticks}[true]{\@nameuse{@IIIDticks#1}}
@@ -212,26 +210,29 @@
 \def\tx@ConvertToIID{\pst@3ddict ConvertTo2D end }
 \def\tx@SphericalCoor{\pst@3ddict SphericalCoor end }
 \def\tx@ConvertToCartesian{\pst@3ddict ConvertToCartesian end }
+\def\tx@ConvCylToCartesian{\pst@3ddict ConvCylToCartesian end }
 %
-\def\setDefaults{%
+%
+\def\setIIIDplotDefaults{%
   \psset[pst-3dplot]{%
-  drawing=true,hiddenLine=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,%
-  RotX=0,RotY=0,RotZ=0,RotSequence=xyz,%
-  drawStyle=xLines,xPlotpoints=25,yPlotpoints=25,beginAngle=0,endAngle=360,%
-  linejoin=1,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,SphericalCoor=false,%
-  Dz=1,IIIDticks=false,IIIDxTicksPlane=xy,IIIDyTicksPlane=yz,IIIDzTicksPlane=yz,%
+  drawing=true,hiddenLine=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,
+  RotX=0,RotY=0,RotZ=0,RotSequence=xyz,
+  drawStyle=xLines,xPlotpoints=25,yPlotpoints=25,beginAngle=0,endAngle=360,
+  linejoin=1,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,
+  Dz=1,IIIDticks=false,IIIDxTicksPlane=xy,IIIDyTicksPlane=yz,IIIDzTicksPlane=yz,
   IIIDticksize=0.1,IIIDxticksep=-0.4,IIIDyticksep=-0.2,IIIDzticksep=0.2,
-  planecorr=off,%
+  planecorr=off,
   planeGrid=xy,planeGridOffset=0,subticks=10,
-  leftHanded=false%
+  leftHanded=false,IIIDdAlpha=0
   }%
   \def\pst@linetype{2}%  to prevent an unknown linetyp with dash
 }
-\setDefaults
+\setIIIDplotDefaults
 %
 \def\variablesIIID{
 %  0 0 translate
@@ -509,8 +510,8 @@
   \addbefore@par{linestyle=dashed,linewidth=0.5pt}% default
 %  \typeout{\pst@par}
   \begin@SpecialObj
-  \pstThreeDNode(#1,#2,#3){A}% we need the parameters
-  \ifx\psk@dotstyle\@none\else\psdots(A)\fi%
+  \pstThreeDNode(#1,#2,#3){pst@A}% we need the parameters
+  \ifx\psk@dotstyle\@none\else\psdots(pst@A)\fi%
   \ifPst@drawCoor%  
     \addto@pscode{
        \pst@3ddict
@@ -599,25 +600,24 @@
 %
 % Trangle [options](Point1)(Point2)(Point3)
 %
-\def\pstThreeDTriangle{\@ifnextchar[{\do@ThreeDTriangle}{\do@ThreeDTriangle[]}}
-\def\do@ThreeDTriangle[#1](#2)(#3)(#4){{%
-  \ifx#1\empty\else\psset{#1}\fi%
+%\def\pstThreeDTriangle{\@ifnextchar[{\do@ThreeDTriangle}{\do@ThreeDTriangle[]}}
+\def\pstThreeDTriangle{\pst@object{pst@ThreeDTriangle}}
+\def\pst@ThreeDTriangle@i(#1)(#2)(#3){%
+  \begin@SpecialObj
   \ifPst@drawCoor%
-    \pstThreeDDot[drawCoor=true](#2)%
-    \pstThreeDDot[drawCoor=true](#3)%
-    \pstThreeDDot[drawCoor=true](#4)%
+    \pstThreeDDot[drawCoor=true](#1)
+    \pstThreeDDot[drawCoor=true](#2)
+    \pstThreeDDot[drawCoor=true](#3)
   \fi%
-  \pstThreeDNode(#2){A}%
-  \pstThreeDNode(#3){B}%
-  \pstThreeDNode(#4){C}%
+  \pstThreeDNode(#1){A}
+  \pstThreeDNode(#2){B}
+  \pstThreeDNode(#3){C}
   \ifx\psk@fillstyle\@none%
-  \else%
-    \pscustom{%
-      \code{\psk@ThreeDplot@linejoin\space setlinejoin}%
-  \fi%
-  \psline[#1](A)(B)(C)(A)(B)%
+  \else\pscustom{\code{\psk@ThreeDplot@linejoin\space setlinejoin}\fi%
+  \psline(A)(B)(C)(A)(B)%
   \ifx\psk@fillstyle\@none\else}\fi%
-}\ignorespaces}
+  \end@SpecialObj
+  \ignorespaces}
 %
 % draws a threeD square as a polygon
 %
@@ -672,7 +672,7 @@
         ConvertTo2D
         /x3 x2D xUnit neg x2 add def /y3 y2D yUnit neg y2 add def
         [ x0 y0 x1 y1 x2 y2 x3 y3 x0 y0
-        \pst@cp\space \psline@iii\space \tx@Line\space
+        \pst@cp\space \psline@iii\space \tx@Line\space closepath
       end
     }%
   \end@OpenObj%
@@ -691,11 +691,8 @@
   \begingroup%
   \psset{linestyle=\psk@ThreeDplot@invisibleLineStyle}%
   \psset{#1}%
-  \pstVerb{ 
-    \pst@3ddict
-      \variablesIIID
-    end
-  }%
+  \pstVerb{ \pst@3ddict \variablesIIID end }%
+\iftrue
   \pstThreeDSquare[#1](#2)(#4)(#5) % 	lower square
   \pstThreeDSquare(#2)(#3)(#4)% 	back square
 %
@@ -706,6 +703,28 @@
   \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
+\else% better support for hidden lines
+  \pstThreeDSquare[#1](#2)(#4)(#5) % 	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
+%
+  \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%
 }
@@ -844,10 +863,12 @@
 \newif\ifPstThreeDplot@showInside
 \define@key[psset]{pst-3dplot}{showInside}[true]{\@nameuse{PstThreeDplot@showInside@#1}}
 \define@key[psset]{pst-3dplot}{SegmentColor}{\pst@getcolor{#1}\psk@ThreeDplot@SegmentColor}
-\define@key[psset]{pst-3dplot}{increment}{\pst@getint{#1}\psk@ThreeDplot@increment}
+\define@key[psset]{pst-3dplot}{increment}{\pst@checknum{#1}\psk@ThreeDplot@increment}
 %\define@key[psset]{pst-3dplot}{CMYK}{\def\psk@ThreeDplot@CMYK{#1}} 
 \define@key[psset]{pst-3dplot}{xyzLight}{\def\psk@ThreeDplot@xyzLight{#1}} 
-\psset[pst-3dplot]{xyzLight=1 1 2,showInside=true,SegmentColor={[cmyk]{0.2,0.6,1,0}},increment=10}
+\newcmykcolor{SegColor}{0.2 0.6 1 0}
+\psset[pst-3dplot]{xyzLight=1 1 2,showInside=true,SegmentColor=SegColor,increment=10}
+%\psset[pst-3dplot]{xyzLight=1 1 2,showInside=true,SegmentColor={[cmyk]{0.2,0.6,1,0}},increment=10}
 %
 \def\pstParaboloid{\pst@object{pstParaboloid}}
 \def\pstParaboloid@i#1#2{% #1:height  #2:radius 
@@ -867,11 +888,11 @@
   0 viewpoint 0 \tx@SetMatrixThreeD
   viewpoint /vZ ED /vY ED /vX ED
   1 setlinejoin
-  % les rayons de lumière
+  % les rayons de lumi�re
   /xLight 1 def
   /yLight 0.1 def
   /zLight 0.2 def
-  % précision du tracé
+  % pr�cision du trac�
   /pas 0.5 def
   /pas10 {pas 10 div} bind def
 %
@@ -888,7 +909,7 @@
     /V {Z sqrt} bind def
     /TableauxPoints [
       0 1 359 { 
-        /U exch def [ U U Z V caclculate2DPoint ] % on décrit le cercle
+        /U exch def [ U U Z V calculate2DPoint ] % on d�crit le cercle
       } for
     ] def
     newpath
@@ -943,7 +964,7 @@
           nZfacette dup mul
           add add sqrt} bind def
         NormeN 0 eq {/NormeN 1e-10 def} if
-% test de visibilité
+% test de visibilit�
        /PSfacette vX nXfacette mul
                   vY nYfacette mul add
                   vZ nZfacette mul add def
@@ -985,8 +1006,7 @@
   \end@SpecialObj%
 \ignorespaces}
 %
-% Sphere
-% the new one
+% Sphere, the new one
 \def\pstThreeDSphere{\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
@@ -1015,6 +1035,65 @@
   \end@SpecialObj%
 \ignorespaces}
 %
+\def\pstIIIDCylinder{\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 \variablesIIID end
+    /POrig {
+      #1 #2 #3 \ifPst@CylindricalCoor \tx@ConvCylToCartesian \fi
+      \pst@number\psunit mul 3 1 roll 
+      \pst@number\psunit mul 3 1 roll 
+      \pst@number\psunit mul 3 1 roll } def 
+    tx@3DPlotDict begin 
+      POrig Conv3D2D translate
+      #4 \pst@number\psunit mul dup 0 360 false
+      \pst@usecolor{\pslinecolor}
+      IIIDEllipse 
+    end
+  }% end of pscode
+  \end@ClosedObj
+  \let\pst@par\pst@parOrig
+  \begin@SpecialObj
+  \addto@pscode{%
+    \pst@3ddict \variablesIIID end
+    /POrig {
+      #1 #2 #3 \ifPst@CylindricalCoor \tx@ConvCylToCartesian \fi
+      \pst@number\psunit mul 3 1 roll 
+      \pst@number\psunit mul 3 1 roll 
+      \pst@number\psunit mul 3 1 roll } def 
+    tx@3DPlotDict begin 
+      POrig Conv3D2D translate
+      #4 \pst@number\psunit mul  	% radius	
+      #5 \pst@number\psunit mul		% height
+      0 360 				% for the future
+      \psk@ThreeDplot@increment
+      false				% wedge?
+      IIIDCylinder 
+    end
+  }% end of pscode
+  \end@SpecialObj
+  \let\pst@par\pst@parOrig
+  \begin@ClosedObj
+  \addto@pscode{%
+    \pst@3ddict \variablesIIID end
+    /POrig {
+      #1 #2 #3 #5 add \ifPst@CylindricalCoor \tx@ConvCylToCartesian \fi
+      \pst@number\psunit mul 3 1 roll 
+      \pst@number\psunit mul 3 1 roll 
+      \pst@number\psunit mul 3 1 roll } def 
+    tx@3DPlotDict begin 
+      POrig Conv3D2D translate
+      #4 \pst@number\psunit mul dup 0 360 false
+      \pst@usecolor{\pslinecolor}
+      IIIDEllipse 
+    end
+  }% end of pscode
+  \end@ClosedObj
+}\ignorespaces}
+%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 \def\psplotinit#1{\xdef\psplot@init{#1 }}
@@ -1516,7 +1595,7 @@
 % ================================================================
         \ifx\psk@ThreeDplot@planecorr\ThreeDplot@planecorrOff
 		/SignFlag 	1 def
-		/AlphaOffset 	0 def
+		/AlphaOffset 0 \psk@IIIDdAlpha add def
 	\else%
           \ifx\psk@ThreeDplot@plane\ThreeDplot@planeXY 			% XY-layer's tag
             \ifx\psk@ThreeDplot@planecorr\ThreeDplot@planecorrXYrot 	% Tag written parallel y-axis
diff --git a/Master/texmf-dist/tpm/pst-3dplot.tpm b/Master/texmf-dist/tpm/pst-3dplot.tpm
index a3f26f7ae7b..352b97b931a 100644
--- a/Master/texmf-dist/tpm/pst-3dplot.tpm
+++ b/Master/texmf-dist/tpm/pst-3dplot.tpm
@@ -3,7 +3,7 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/pst-3dplot.zip">
     <TPM:Name>pst-3dplot</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/09/12 18:38:04</TPM:Date>
+    <TPM:Date>2007/06/17 17:59:33</TPM:Date>
     <TPM:Version>1.1</TPM:Version>
     <TPM:Creator>rahtz</TPM:Creator>
     <TPM:Title>Draw 3d curves and graphs using PSTricks.</TPM:Title>
@@ -21,34 +21,23 @@ its command argument decoding.
     <TPM:Size>2862771</TPM:Size>
     <TPM:License></TPM:License>
     <TPM:Build/>
-    <TPM:RunFiles size="75535">
+    <TPM:RunFiles size="80044">
 texmf-dist/dvips/pst-3dplot/pst-3dplot.pro
 texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex
 texmf-dist/tex/latex/pst-3dplot/pst-3dplot.sty
 texmf-dist/tpm/pst-3dplot.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="2787236">
+    <TPM:DocFiles size="2029349">
 texmf-dist/doc/generic/pst-3dplot/Changes
 texmf-dist/doc/generic/pst-3dplot/README
-texmf-dist/doc/generic/pst-3dplot/doc/data3D.Roessler
-texmf-dist/doc/generic/pst-3dplot/doc/data3D.dat
-texmf-dist/doc/generic/pst-3dplot/doc/pst-3dplot-doc.pdf
-texmf-dist/doc/generic/pst-3dplot/doc/pst-3dplot-doc.tex
-texmf-dist/doc/generic/pst-3dplot/doc/pst-3dplot.bib
-texmf-dist/doc/generic/pst-3dplot/doc/tb72voss3d.pdf
-texmf-dist/doc/generic/pst-3dplot/examples/3DLine.pdf
-texmf-dist/doc/generic/pst-3dplot/examples/3DLine.tex
-texmf-dist/doc/generic/pst-3dplot/examples/3d0.pdf
-texmf-dist/doc/generic/pst-3dplot/examples/3d0.tex
-texmf-dist/doc/generic/pst-3dplot/examples/3d1.pdf
-texmf-dist/doc/generic/pst-3dplot/examples/3d1.tex
-texmf-dist/doc/generic/pst-3dplot/examples/3d2.pdf
-texmf-dist/doc/generic/pst-3dplot/examples/3d2.tex
-texmf-dist/doc/generic/pst-3dplot/examples/polar2.pdf
-texmf-dist/doc/generic/pst-3dplot/examples/polar2.tex
-texmf-dist/doc/generic/pst-3dplot/examples/spherCoor.pdf
-texmf-dist/doc/generic/pst-3dplot/examples/spherCoor.tex
+texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.bib
+texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.pdf
+texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex
+texmf-dist/doc/generic/pst-3dplot/tb72voss3d.pdf
     </TPM:DocFiles>
+    <TPM:SourceFiles size="1106">
+texmf-dist/source/generic/pst-3dplot/Makefile
+    </TPM:SourceFiles>
     <TPM:Provides>Package/pst-3dplot</TPM:Provides>
   </rdf:Description>
 </rdf:RDF>
author	Karl Berry <karl@freefriends.org>	2007-06-17 21:35:47 +0000
committer	Karl Berry <karl@freefriends.org>	2007-06-17 21:35:47 +0000
commit	c4ae47344ef52c976c8de09bd07d290cd2bb983f (patch)
tree	2297cae4f0b28585c24c372846dd41da10950d63 /Master/texmf-dist
parent	47e22c8c21f92ffb4d94e0bcf8785980d52dbbe0 (diff)