summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-04-19 00:34:40 +0000
committerKarl Berry <karl@freefriends.org>2008-04-19 00:34:40 +0000
commitecf4c0dc5174ff18976b4c6a060ea223c8a539ba (patch)
treec4d898b8a573fba9255b52fa41fa81ff18b17f7c
parent4e2ac77b6408065820377abd25541151953797dd (diff)
pstricks-add 3.01 (17apr08)
git-svn-id: svn://tug.org/texlive/trunk@7505 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/pstricks-add/Changes6
-rw-r--r--Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdfbin1650515 -> 1653269 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex922
-rw-r--r--Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex71
4 files changed, 967 insertions, 32 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks-add/Changes b/Master/texmf-dist/doc/generic/pstricks-add/Changes
index db88c6b17d3..6849ace2dd5 100644
--- a/Master/texmf-dist/doc/generic/pstricks-add/Changes
+++ b/Master/texmf-dist/doc/generic/pstricks-add/Changes
@@ -1,4 +1,4 @@
-%% $Id: Changes 6 2007-12-29 21:41:43Z herbert $
+%% $Id: Changes 20 2008-04-15 18:40:18Z herbert $
%%
pstricks-add.pro ----------- (Dominik Rodriguez/hv)
v 0.20 2008-01-12 - moved the AlgParser into pst-algparser.pro
@@ -33,6 +33,10 @@ pstricks-add.sty ----------- (hv)
pstricks-add.tex ----------- (Dominik Rodriguez/hv)
+ v 3.01 2008-04-15 - import changes from pst-plot in \ps@axisiv
+ new option mathLabel for setting labels in text
+ or math mode
+ - fix bug with labelstyle
v 3.00 2008-01-01 - delete transalpha stuff
- load header file pst-algparser.pro
v 2.93 2007-12-23 - fix bug with transpalpha
diff --git a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf
index b2abc1817ba..8ccd6bdec9a 100644
--- a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex
index a4f585e9cff..be94d8f35e6 100644
--- a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex
+++ b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex
@@ -1,4 +1,4 @@
-%% $Id: pstricks-add-doc.tex 5 2007-12-24 12:49:08Z herbert $
+%% $Id: pstricks-add-doc.tex 20 2008-04-15 18:40:18Z herbert $
\documentclass[12pt]{article}
\listfiles
\usepackage{filecontents}
@@ -83,6 +83,892 @@
2001 2.46
\end{filecontents*}
+\begin{filecontents*}{data3.dat}
+ 0.000 -2.50 0.005 -1.99 0.010 -0.30
+ 0.015 4.13 0.020 13.38 0.025 28.98 0.030 50.90 0.035 77.54 0.040 107.38
+ 0.045 140.64 0.050 178.40 0.055 219.83 0.060 261.04 0.065 296.91 0.070 324.44
+ 0.075 343.62 0.080 355.50 0.085 361.69 0.090 365.03 0.095 368.62 0.100 373.63
+ 0.105 378.46 0.110 380.61 0.115 379.02 0.120 373.82 0.125 365.64 0.130 356.65
+ 0.135 350.11 0.140 346.68 0.145 342.68 0.150 333.46 0.155 318.08 0.160 300.16
+ 0.165 284.50 0.170 274.03 0.175 269.79 0.180 271.15 0.185 275.29 0.190 278.41
+ 0.195 278.36 0.200 276.25 0.205 274.57 0.210 273.76 0.215 271.64 0.220 266.67
+ 0.225 259.84 0.230 253.63 0.235 249.81 0.240 248.42 0.245 248.77 0.250 250.60
+ 0.255 254.21 0.260 259.40 0.265 264.37 0.270 266.65 0.275 265.49 0.280 262.59
+ 0.285 260.82 0.290 261.87 0.295 264.55 0.300 265.84 0.305 263.56 0.310 257.47
+ 0.315 248.74 0.320 238.67 0.325 227.49 0.330 214.46 0.335 198.64 0.340 179.05
+ 0.345 154.73 0.350 125.23 0.355 91.14 0.360 53.95 0.365 15.45 0.370 -21.37
+ 0.375 -49.99 0.380 -62.54 0.385 -56.58 0.390 -37.83 0.395 -15.76 0.400 1.86
+ 0.405 11.54 0.410 13.66 0.415 10.78 0.420 5.87 0.425 1.24 0.430 -1.95
+ 0.435 -3.54 0.440 -3.98 0.445 -3.80 0.450 -3.43 0.455 -3.16 0.460 -3.09
+ 0.465 -3.21 0.470 -3.44 0.475 -3.76 0.480 -4.13 0.485 -4.46 0.490 -4.74
+ 0.495 -4.99 0.500 -5.30 0.505 -5.66 0.510 -6.05 0.515 -6.44 0.520 -6.73
+ 0.525 -6.81 0.530 -6.67 0.535 -6.38 0.540 -6.08 0.545 -5.83 0.550 -5.66
+ 0.555 -5.56 0.560 -5.49 0.565 -5.45 0.570 -5.46 0.575 -5.51 0.580 -5.61
+ 0.585 -5.73 0.590 -5.81 0.595 -5.84 0.600 -5.83 0.605 -5.82 0.610 -5.84
+ 0.615 -5.87 0.620 -5.91 0.625 -5.98 0.630 -6.07 0.635 -6.17 0.640 -6.30
+ 0.645 -6.41 0.650 -6.43 0.655 -6.30 0.660 -6.01 0.665 -5.55 0.670 -4.96
+ 0.675 -4.37 0.680 -3.94 0.685 -3.79 0.690 -3.94 0.695 -4.33 0.700 -4.83
+ 0.705 -5.31 0.710 -5.65 0.715 -5.85 0.720 -5.95 0.725 -6.02 0.730 -6.10
+ 0.735 -6.19 0.740 -6.29 0.745 -6.37 0.750 -6.40 0.755 -6.32 0.760 -6.07
+ 0.765 -5.64 0.770 -5.08 0.775 -4.47 0.780 -3.84 0.785 -3.19 0.790 -2.58
+ 0.795 -2.11 0.800 -1.84 0.805 -1.78 0.810 -1.90 0.815 -2.15 0.820 -2.45
+ 0.825 -2.71 0.830 -2.86 0.835 -2.91 0.840 -2.96 0.845 -3.02 0.850 -3.10
+ 0.855 -3.20 0.860 -3.36 0.865 -3.52 0.870 -3.63 0.875 -3.64 0.880 -3.52
+ 0.885 -3.30 0.890 -3.04 0.895 -2.80 0.900 -2.59 0.905 -2.42 0.910 -2.27
+ 0.915 -0.53 0.920 -0.16 0.925 0.08 0.930 0.13 0.935 -0.05 0.940 -0.41
+ 0.945 -0.90 0.950 -1.44 0.955 -1.99 0.960 -2.46 0.965 -2.79 0.970 -2.98
+ 0.975 -3.08 0.980 -3.13 0.985 -3.13 0.990 -3.05 0.995 -2.86 1.000 -2.57
+\end{filecontents*}
+
+\begin{filecontents*}{data.dat}
+0 0
+1 1
+2 3
+3 6
+4 6
+5 11
+6 15
+7 18
+8 25
+9 26
+10 32
+11 37
+12 37
+13 44
+14 52
+15 65
+16 67
+17 82
+18 89
+19 104
+20 104
+21 111
+22 133
+23 142
+24 144
+25 166
+26 171
+27 182
+28 205
+29 230
+30 235
+31 256
+32 268
+33 289
+34 322
+35 356
+36 363
+37 394
+38 413
+39 430
+40 461
+41 496
+42 527
+43 563
+44 590
+45 616
+46 616
+47 652
+48 685
+49 694
+50 728
+51 779
+52 785
+53 791
+54 823
+55 846
+56 891
+57 892
+58 894
+59 922
+60 976
+61 1002
+62 1025
+63 1083
+64 1130
+65 1173
+66 1176
+67 1208
+68 1211
+69 1221
+70 1272
+71 1281
+72 1290
+73 1329
+74 1379
+75 1428
+76 1460
+77 1489
+78 1550
+79 1600
+80 1666
+81 1678
+82 1680
+83 1760
+84 1785
+85 1796
+86 1874
+87 1881
+88 1932
+89 1936
+90 1968
+91 2016
+92 2091
+93 2111
+94 2181
+95 2227
+96 2260
+97 2354
+98 2371
+99 2423
+100 2498
+101 2552
+102 2585
+103 2622
+104 2676
+105 2678
+106 2752
+107 2842
+108 2904
+109 2984
+110 3029
+111 3037
+112 3062
+113 3162
+114 3181
+115 3266
+116 3364
+117 3461
+118 3479
+119 3494
+120 3523
+121 3630
+122 3668
+123 3699
+124 3815
+125 3939
+126 4003
+127 4107
+128 4168
+129 4199
+130 4231
+131 4304
+132 4331
+133 4354
+134 4416
+135 4435
+136 4448
+137 4514
+138 4601
+139 4672
+140 4736
+141 4843
+142 4845
+143 4923
+144 5059
+145 5095
+146 5240
+147 5255
+148 5289
+149 5393
+150 5475
+151 5586
+152 5647
+153 5669
+154 5733
+155 5837
+156 5871
+157 5881
+158 5970
+159 5973
+160 6055
+161 6107
+162 6266
+163 6399
+164 6402
+165 6474
+166 6605
+167 6669
+168 6837
+169 6908
+170 6958
+171 7103
+172 7183
+173 7319
+174 7464
+175 7513
+176 7672
+177 7693
+178 7841
+179 7891
+180 8035
+181 8200
+182 8337
+183 8515
+184 8545
+185 8546
+186 8632
+187 8793
+188 8822
+189 8996
+190 9073
+191 9227
+192 9317
+193 9381
+194 9394
+195 9494
+196 9614
+197 9744
+198 9805
+199 9923
+200 9942
+201 10079
+202 10169
+203 10322
+204 10393
+205 10570
+206 10723
+207 10802
+208 10862
+209 10958
+210 11054
+211 11216
+212 11409
+213 11528
+214 11659
+215 11793
+216 11888
+217 11900
+218 12081
+219 12082
+220 12161
+221 12311
+222 12345
+223 12403
+224 12469
+225 12678
+226 12695
+227 12732
+228 12863
+229 12896
+230 13120
+231 13142
+232 13361
+233 13549
+234 13702
+235 13821
+236 13978
+237 14182
+238 14356
+239 14472
+240 14668
+241 14794
+242 15008
+243 15092
+244 15148
+245 15172
+246 15218
+247 15430
+248 15639
+249 15744
+250 15973
+251 16076
+252 16233
+253 16466
+254 16572
+255 16752
+256 16987
+257 17013
+258 17034
+259 17101
+260 17301
+261 17495
+262 17576
+263 17604
+264 17610
+265 17720
+266 17924
+267 17933
+268 17997
+269 18152
+270 18353
+271 18417
+272 18553
+273 18663
+274 18897
+275 18934
+276 19092
+277 19366
+278 19615
+279 19783
+280 19980
+281 20044
+282 20249
+283 20484
+284 20623
+285 20641
+286 20718
+287 20937
+288 21202
+289 21401
+290 21403
+291 21657
+292 21667
+293 21693
+294 21893
+295 22053
+296 22115
+297 22207
+298 22342
+299 22617
+300 22724
+301 22851
+302 23048
+303 23263
+304 23379
+305 23586
+306 23597
+307 23761
+308 23853
+309 24112
+310 24421
+311 24718
+312 24904
+313 25001
+314 25298
+315 25387
+316 25430
+317 25611
+318 25895
+319 26138
+320 26186
+321 26482
+322 26753
+323 27073
+324 27266
+325 27497
+326 27663
+327 27871
+328 27982
+329 28032
+330 28037
+331 28082
+332 28363
+333 28416
+334 28626
+335 28672
+336 28995
+337 29143
+338 29192
+339 29491
+340 29515
+341 29618
+342 29731
+343 30003
+344 30259
+345 30288
+346 30312
+347 30613
+348 30730
+349 30941
+350 30951
+351 31118
+352 31438
+353 31582
+354 31722
+355 31984
+356 32116
+357 32425
+358 32780
+359 32841
+360 33017
+361 33378
+362 33523
+363 33742
+364 33859
+365 34163
+366 34349
+367 34687
+368 34755
+369 34939
+370 35136
+371 35226
+372 35456
+373 35802
+374 35957
+375 36266
+376 36623
+377 36876
+378 37192
+379 37566
+380 37901
+381 37914
+382 37974
+383 38260
+384 38311
+385 38329
+386 38347
+387 38354
+388 38724
+389 38794
+390 39163
+391 39372
+392 39656
+393 39959
+394 40224
+395 40446
+396 40550
+397 40604
+398 40932
+399 41331
+400 41533
+401 41920
+402 42274
+403 42338
+404 42644
+405 42815
+406 42962
+407 43222
+408 43457
+409 43615
+410 44001
+411 44263
+412 44274
+413 44427
+414 44545
+415 44916
+416 45298
+417 45523
+418 45537
+419 45659
+420 45793
+421 46125
+422 46455
+423 46725
+424 46751
+425 46820
+426 46954
+427 47162
+428 47361
+429 47709
+430 47981
+431 48040
+432 48241
+433 48585
+434 48745
+435 49167
+436 49215
+437 49652
+438 49977
+439 50108
+440 50161
+441 50399
+442 50421
+443 50523
+444 50637
+445 50846
+446 51223
+447 51592
+448 51740
+449 52142
+450 52447
+451 52813
+452 53012
+453 53333
+454 53380
+455 53556
+456 53876
+457 54028
+458 54231
+459 54642
+460 54935
+461 55191
+462 55618
+463 55978
+464 56029
+465 56051
+466 56356
+467 56503
+468 56582
+469 56709
+470 57169
+471 57598
+472 57751
+473 58214
+474 58566
+475 58695
+476 58963
+477 59314
+478 59719
+479 60158
+480 60380
+481 60582
+482 60674
+483 61030
+484 61163
+485 61328
+486 61752
+487 61764
+488 61978
+489 62369
+490 62556
+491 62997
+492 63268
+493 63736
+494 63796
+495 63874
+496 63896
+497 64259
+498 64582
+499 65061
+500 65410
+501 65879
+502 66153
+503 66445
+504 66799
+505 67153
+506 67345
+507 67747
+508 67976
+509 68216
+510 68324
+511 68635
+512 68883
+513 69203
+514 69359
+515 69871
+516 69924
+517 70071
+518 70523
+519 70604
+520 70849
+521 71038
+522 71307
+523 71553
+524 72026
+525 72365
+526 72788
+527 72928
+528 73199
+529 73601
+530 73648
+531 73825
+532 74113
+533 74258
+534 74283
+535 74611
+536 75104
+537 75609
+538 75804
+539 76075
+540 76480
+541 76837
+542 77166
+543 77602
+544 77886
+545 78348
+546 78793
+547 79243
+548 79711
+549 80033
+550 80149
+551 80449
+552 80563
+553 80750
+554 80930
+555 81198
+556 81252
+557 81324
+558 81835
+559 82227
+560 82730
+561 82861
+562 83211
+563 83399
+564 83482
+565 83678
+566 84126
+567 84131
+568 84501
+569 84542
+570 84772
+571 85126
+572 85250
+573 85594
+574 85694
+575 85710
+576 85776
+577 86099
+578 86327
+579 86451
+580 86512
+581 86955
+582 87037
+583 87541
+584 87928
+585 88137
+586 88585
+587 88877
+588 89170
+589 89241
+590 89780
+591 89880
+592 89990
+593 90462
+594 90538
+595 90720
+596 91265
+597 91809
+598 92109
+599 92707
+600 93188
+601 93341
+602 93621
+603 94003
+604 94474
+605 94659
+606 95163
+607 95281
+608 95511
+609 95837
+610 96311
+611 96859
+612 97314
+613 97744
+614 97854
+615 98301
+616 98710
+617 99216
+618 99678
+619 99820
+620 100357
+621 100957
+622 101109
+623 101361
+624 101383
+625 101726
+626 101765
+627 101848
+628 102168
+629 102246
+630 102392
+631 102516
+632 102949
+633 102973
+634 103258
+635 103663
+636 104075
+637 104558
+638 104941
+639 105149
+640 105342
+641 105760
+642 105926
+643 106075
+644 106412
+645 106561
+646 106900
+647 107513
+648 108090
+649 108266
+650 108268
+651 108901
+652 108959
+653 109365
+654 109642
+655 110203
+656 110707
+657 111246
+658 111438
+659 111922
+660 112262
+661 112916
+662 113319
+663 113661
+664 114136
+665 114291
+666 114722
+667 115066
+668 115095
+669 115461
+670 115697
+671 116359
+672 116550
+673 116919
+674 116974
+675 117531
+676 117767
+677 118054
+678 118510
+679 118664
+680 119002
+681 119298
+682 119431
+683 119704
+684 120280
+685 120542
+686 120998
+687 121446
+688 121450
+689 121882
+690 122081
+691 122738
+692 122853
+693 123331
+694 123626
+695 124268
+696 124389
+697 124497
+698 125149
+699 125734
+700 126280
+701 126797
+702 127219
+703 127346
+704 127842
+705 128531
+706 128899
+707 129465
+708 129540
+709 130021
+710 130072
+711 130693
+712 131143
+713 131843
+714 131949
+715 132401
+716 132554
+717 132861
+718 133249
+719 133770
+720 134488
+721 135178
+722 135190
+723 135404
+724 135851
+725 136059
+726 136174
+727 136739
+728 136997
+729 137702
+730 138214
+731 138587
+732 139096
+733 139241
+734 139840
+735 140159
+736 140309
+737 140922
+738 141616
+739 142352
+740 142763
+741 143147
+742 143484
+743 144165
+744 144608
+745 144686
+746 145034
+747 145417
+748 145939
+749 145981
+750 146171
+751 146608
+752 147226
+753 147718
+754 148254
+755 148487
+756 148668
+757 149226
+758 149314
+759 149434
+760 150073
+761 150366
+762 150797
+763 150951
+764 151291
+765 151813
+766 152307
+767 152588
+768 153185
+769 153313
+770 153483
+771 154016
+772 154602
+773 154805
+774 154890
+775 155126
+776 155806
+777 156377
+778 156692
+779 156734
+780 156883
+781 157412
+782 157929
+783 158547
+784 158764
+785 158973
+786 159385
+787 159416
+788 159637
+789 159670
+790 160103
+791 160549
+792 160679
+793 161283
+794 161951
+795 162320
+796 162776
+797 163374
+798 164039
+799 164090
+800 164460
+801 164947
+802 165162 803 165373 804 165703 805 165906 806 166207 807 166815
+808 167412 809 168041 810 168758 811 168994 812 169548 813 170116
+814 170134 815 170275 816 170725 817 171110 818 171652 819 172034
+820 172524 821 172996 822 173240 823 174005 824 174380 825 175092
+826 175597 827 176176 828 176920 829 177290 830 177982 831 178062
+832 178824 833 179596 834 179693 835 180165 836 180650 837 181475
+838 182033 839 182121 840 182814 841 183388 842 183971 843 184270
+844 184786 845 185560 846 186048 847 186777 848 187228 849 187467
+850 187788 851 187831 852 187835 853 187979 854 188220 855 188853
+856 189642 857 190249 858 190994 859 191590 860 192304 861 192904
+862 193122 863 193575 864 194069 865 194874 866 195488 867 196335
+868 197090 869 197859 870 198241 871 198948 872 199153 873 199264
+874 199531 875 200155 876 200335 877 201046 878 201848 879 201885
+880 201979 881 202107 882 202892 883 203113 884 203406 885 203888
+886 204508 887 204880 888 205419 889 206285 890 206301 891 206455
+892 206902 893 207157 894 207246 895 207758 896 208566 897 208977
+898 209635 899 209773 900 210085 901 210951 902 211525 903 211557
+904 212143 905 212342 906 212833 907 213309 908 213515 909 214052
+910 214773 911 215134 912 215895 913 216268 914 216808 915 217435
+916 217828 917 217888 918 218804 919 219013 920 219563 921 219629
+922 220022 923 220829 924 221335 925 221385 926 221772 927 222538
+928 223369 929 223421 930 224214 931 224950 932 225376 933 225441
+934 225647 935 225874 936 226647 937 227340 938 227981 939 228754
+940 229465 941 230385 942 230550 943 231021 944 231829 945 232030
+946 232657 947 232855 948 233463 949 234013 950 234622 951 235472
+952 235775 953 235914 954 236551 955 236951 956 237532 957 237668
+958 238018 959 238404 960 239162 961 239195 962 240002 963 240893
+964 241209 965 242172 966 242201 967 242263 968 242465 969 243094
+970 243710 971 243799 972 244333 973 244861 974 245416 975 246031
+976 246139 977 246486 978 247242 979 247666 980 247869 981 248654
+982 249249 983 249324 984 249402 985 250116 986 250382 987 250517
+988 251198 989 251929 990 252212 991 252213 992 252493 993 253441
+994 253948 995 254830 996 254984 997 255322 998 256249 999 256500
+\end{filecontents*}
+
+\begin{filecontents*}{dataMul.dat}
+[% file dataMul.dat
+0 0 3.375 0.0625 10 5.375 7.1875 4.5
+20 7.1875 8.375 6.25 30 5.75 7.75 6.6875
+40 2.1875 5.75 5.9375 50 -1.9375 2.1875 4.3125
+60 -5.125 -1.8125 0.875 70 -6.4375 -5.3125 -2.6875
+80 -4.875 -7.1875 -4.875 90 0 -7.625 -5.625
+100 5.5 -6.3125 -5.8125 110 6.8125 -2.75 -4.75
+120 5.25 2.875 -0.75
+]%
+\end{filecontents*}
\usepackage[T1]{fontenc}
\usepackage[latin1]{inputenc}
@@ -1371,6 +2257,8 @@ All examples are printed with \verb|\psset{arrowscale=2,linecolor=red}|.
\end{LTXexample}
+\clearpage
+
%--------------------------------------------------------------------------------------
\subsubsection{\CMD{pcline}}
%--------------------------------------------------------------------------------------
@@ -3468,7 +4356,7 @@ of the value, but it must be set in math mode when using math operators!
\readdata{\data}{demo1.dat}
\pstScalePoints(1,0.000001){}{}% (x,y){additional x operator}{y op}
\psset{llx=-1cm,lly=-1cm}
-\psgraph[ylabelFactor={$\cdot 10^6$},Dx=5,Dy=100](0,0)(25,750){8cm}{5cm}
+\psgraph[ylabelFactor=\cdot 10^6,Dx=5,Dy=100](0,0)(25,750){8cm}{5cm}
\listplot[linecolor=red, linewidth=2pt, showpoints=true]{\data}
\endpsgraph
\pstScalePoints(1,1){}{}% reset
@@ -3976,7 +4864,7 @@ The datafile \verb|data.dat| contains $1000$ data records. The thin blue line is
of all records with the plotstyle option \verb|curve|.
\begin{LTXexample}[preset=\centering,pos=t]
-\readdata{\data}{examples/data.dat}
+\readdata{\data}{data.dat}
\psset{xunit=0.125mm,yunit=0.0002mm}
\begin{pspicture}(-80,-30000)(1000,270000)
\psaxes[Dx=100,dx=100,Dy=50000,dy=50000](1000,250000)
@@ -3986,14 +4874,14 @@ of all records with the plotstyle option \verb|curve|.
\end{LTXexample}
-
+\clearpage
%--------------------------------------------------------------------------------------
\subsubsection{Example for \texttt{nStart/xStart}}
%--------------------------------------------------------------------------------------
\begin{LTXexample}[preset=\centering,pos=t]
-\readdata{\data}{examples/data.dat}
+\readdata{\data}{data.dat}
\psset{xunit=0.125mm,yunit=0.0002mm}
\begin{pspicture}(-80,-30000)(1000,270000)
\psaxes[Dx=100,dx=100,Dy=50000,dy=50000](1000,250000)
@@ -4007,7 +4895,7 @@ of all records with the plotstyle option \verb|curve|.
%--------------------------------------------------------------------------------------
\begin{LTXexample}[preset=\centering,pos=t]
-\readdata{\data}{examples/data.dat}
+\readdata{\data}{data.dat}
\psset{xunit=0.125mm,yunit=0.0002mm}
\begin{pspicture}(-80,-30000)(1000,310000)
\psaxes[axesstyle=frame,Dx=100,dx=100,Dy=50000,dy=50000](1000,300000)
@@ -4016,13 +4904,14 @@ of all records with the plotstyle option \verb|curve|.
\end{LTXexample}
+\clearpage
%--------------------------------------------------------------------------------------
\subsubsection{Example for all new options}
%--------------------------------------------------------------------------------------
\begin{LTXexample}[preset=\centering,pos=t]
-\readdata{\data}{examples/data.dat}
+\readdata{\data}{data.dat}
\psset{xunit=0.125mm,yunit=0.0002mm}
\begin{pspicture}(-80,-30000)(1000,310000)
\psaxes[axesstyle=frame,Dx=100,dx=100,Dy=50000,dy=50000](1000,300000)
@@ -4045,7 +4934,7 @@ possible to have a kind of a zoom to the original graphic.
\begin{center}
\psset{xunit=10cm, yunit=0.01cm}
-\readdata{\data}{examples/data3.dat}
+\readdata{\data}{data3.dat}
\begin{pspicture}(-0.1,-100)(1.5,700.0)
\psaxes[Dx=0.25,Dy=100,dy=100\psyunit,ticksize=-4pt 0,%
labelFontSize={\footnotesize}]{->}(0,0)(0,-100)(1.4,520)
@@ -4071,7 +4960,7 @@ possible to have a kind of a zoom to the original graphic.
\begin{lstlisting}
\psset{xunit=10cm, yunit=0.01cm}
-\readdata{\data}{examples/data3.dat}
+\readdata{\data}{data3.dat}
\begin{pspicture}(-0.1,-100)(1.5,700.0)
\psaxes[Dx=0.25,Dy=100,dy=100\psyunit,ticksize=-4pt 0,%
labelFontSize={\footnotesize}]{->}(0,0)(0,-100)(1.4,520)
@@ -4095,6 +4984,7 @@ possible to have a kind of a zoom to the original graphic.
\end{lstlisting}
+\clearpage
\resetOptions
%--------------------------------------------------------------------------------------
@@ -4102,7 +4992,7 @@ possible to have a kind of a zoom to the original graphic.
%--------------------------------------------------------------------------------------
\begin{LTXexample}[preset=\centering,pos=t]
-\readdata{\data}{examples/data.dat}
+\readdata{\data}{data.dat}
\psset{xunit=0.125mm,yunit=0.0002mm}
\begin{pspicture}(-80,-30000)(1000,310000)
\psaxes[axesstyle=frame,Dx=100,dx=100,Dy=50000,dy=50000](1000,300000)
@@ -4132,7 +5022,7 @@ present. There are no real restrictions in the maximum number for \verb+plotNoMa
We have the following data file:
\begin{lstlisting}[style=syntax]
-[% file examples/data.dat
+[% file data.dat
0 0 3.375 0.0625
10 5.375 7.1875 4.5
20 7.1875 8.375 6.25
@@ -4153,7 +5043,7 @@ We have the following data file:
without any modification to the data file:
\begin{LTXexample}[preset=\centering,pos=t]
-\readdata\Data{examples/dataMul.dat}
+\readdata\Data{dataMul.dat}
\psset{xunit=0.1cm, yunit=0.5cm,lly=-0.5cm}
\begin{pspicture}(0,-7.5)(150,10)
\psaxes[Dx=10,Dy=2.5]{->}(0,0)(0,-7.5)(150,7.5)
@@ -4460,7 +5350,7 @@ The y-length maybe given as !, then the macro uses the same unit as for the x-ax
\pstScalePoints(1,0.000001){}{}% (x,y){additional x operator}{y op}
\psset{llx=-1cm,lly=-1cm}
\begin{psgraph}[axesstyle=frame,xticksize=0 759,yticksize=0 25,%
- subticks=0,ylabelFactor={$\cdot 10^6$},%
+ subticks=0,ylabelFactor=\cdot 10^6,
Dx=5,dy=100\psyunit,Dy=100](0,0)(25,750){10cm}{6cm} % parameters
\listplot[linecolor=red,linewidth=2pt,showpoints=true]{\data}
\end{psgraph}
@@ -4471,7 +5361,7 @@ The y-length maybe given as !, then the macro uses the same unit as for the x-ax
\pstScalePoints(1,0.000001){}{}% (x,y){additional x operator}{y op}
\psset{llx=-1cm,lly=-1cm}
§\ON§\begin{psgraph}§\OFF§[axesstyle=frame,xticksize=0 759,yticksize=0 25,%
- subticks=0,ylabelFactor={$\cdot 10^6$},%
+ subticks=0,ylabelFactor=\cdot 10^6,
Dx=5,dy=100\psyunit,Dy=100](0,0)(25,750){10cm}{6cm} % parameters
\listplot[linecolor=red,linewidth=2pt,showpoints=true]{\data}
§\ON§\end{psgraph}§\OFF§
@@ -4502,7 +5392,7 @@ In the following example, the y unit gets the same value as the one for the x-ax
xAxisLabelPos={3cm,-1cm},yAxisLabelPos={-1.5cm,2.5cm}}
\pstScalePoints(1,0.00000001){}{}
\begin{psgraph}[axesstyle=frame,xticksize=0 7.5,yticksize=0 25,subticksize=1,
- ylabelFactor={$\cdot 10^8$},Dx=5,Dy=1,xsubticks=2](0,0)(25,7.5){5.5cm}{5cm}
+ ylabelFactor=\cdot 10^8,Dx=5,Dy=1,xsubticks=2](0,0)(25,7.5){5.5cm}{5cm}
\listplot[linecolor=red, linewidth=2pt, showpoints=true]{\data}
\end{psgraph}
\end{center}
@@ -4513,7 +5403,7 @@ In the following example, the y unit gets the same value as the one for the x-ax
§\ON§xAxisLabelPos§\OFF§={3cm,-1cm},§\ON§yAxisLabelPos§\OFF§={-1.5cm,2.5cm}}
\pstScalePoints(1,0.00000001){}{}
\begin{psgraph}[axesstyle=frame,xticksize=0 7.5,yticksize=0 25,subticksize=1,
- §\ON§ylabelFactor§\OFF§={$\cdot 10^8$},Dx=5,Dy=1,xsubticks=2](0,0)(25,7.5){5.5cm}{5cm}
+ §\ON§ylabelFactor§\OFF§=\cdot 10^8,Dx=5,Dy=1,xsubticks=2](0,0)(25,7.5){5.5cm}{5cm}
\listplot[linecolor=red, linewidth=2pt, showpoints=true]{\data}
\end{psgraph}
\end{lstlisting}
diff --git a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
index 9dabc1f9ac3..ab07c6579c2 100644
--- a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
+++ b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
@@ -1,4 +1,4 @@
-%% $Id: pstricks-add.tex 7 2007-12-29 22:21:13Z herbert $
+%% $Id: pstricks-add.tex 20 2008-04-15 18:40:18Z herbert $
%%
%%
%% This is file `pstricks-add.tex',
@@ -29,8 +29,8 @@
\ifx\MultidoLoaded\endinput\else \input multido \fi
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
%
-\def\fileversion{3.00}
-\def\filedate{2008/01/01}
+\def\fileversion{3.01}
+\def\filedate{2008/01/26}
\message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)}
%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -1357,9 +1357,15 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
\define@key[psset]{pstricks-add}{labelFontSize}{\def\psk@labelFontSize{#1}}%
-\psset{labelFontSize={}}
-\def\pshlabel#1{\psk@labelFontSize#1}%
-\def\psvlabel#1{\psk@labelFontSize#1}
+\define@boolkey[psset]{pstricks-add}[Pst@]{mathLabel}[true]{%
+ \ifPst@mathLabel
+ \def\pshlabel##1{\psk@labelFontSize$##1$}%
+ \def\psvlabel##1{\psk@labelFontSize$##1$}
+ \else
+ \def\pshlabel##1{\psk@labelFontSize##1}%
+ \def\psvlabel##1{\psk@labelFontSize##1}
+ \fi}
+\psset{labelFontSize={},mathLabel}
%
\define@boolkey[psset]{pstricks-add}[Pst@]{comma}[true]{}
\define@boolkey[psset]{pstricks-add}[Pst@]{xAxis}[true]{}
@@ -1425,7 +1431,10 @@
\fi%
\fi%
}
- \def\pshlabel##1{\psk@labelFontSize##1}%
+ \ifPst@mathLabel
+ \def\pshlabel##1{\psk@labelFontSize$##1$}\else
+ \def\pshlabel##1{\psk@labelFontSize##1}%
+ \fi
\fi
}
\psset{trigLabels=false}
@@ -1590,7 +1599,12 @@
\ifdim\pst@dima=\z@\else\showoriginfalse\fi%
\ifnum\psk@dy=\z@%
\pst@dimg=\psk@Dy\psyunit%
+ \ifnum\Pst@Debug>0 \typeout{==DEBUG== pst-plot(psaxes@iv): \textbackslash pst@dimg=\the\pst@dimg}\fi % v.1.21
+ \ifdim\pst@dimg<\p@ \pst@cnta=\psk@Dy \edef\psk@Dy{-\the\pst@cnta} % v.1.21
+ \ifnum\Pst@Debug>0 \typeout{==DEBUG== pst-plot(psaxes@iv): Dy -> -Dy (was negative)}\fi % v.1.21
+ \fi % v.1.21
\edef\psk@dy{\number\pst@dimg}%
+ \ifnum\Pst@Debug>0 \typeout{==DEBUG== pst-plot(psaxes@iv): \textbackslash psk@dy=\psk@dy}\fi % v.1.21
\fi%
\ifPst@xAxis\else\showorigintrue\fi%
\pst@vlabels{\pst@dimd}{\psk@arrowB}{#3}{#5}%
@@ -1603,7 +1617,12 @@
\ifdim\pst@dimb=\z@\else\showoriginfalse\fi%
\ifnum\psk@dx=\z@%
\pst@dimg=\psk@Dx\psxunit%
+ \ifnum\Pst@Debug>0 \typeout{==DEBUG== pst-plot(psaxes@iv): \textbackslash pst@dimg=\the\pst@dimg}\fi % v.1.21
+ \ifdim\pst@dimg<\p@ \pst@cnta=\psk@Dx \edef\psk@Dx{-\the\pst@cnta} % v.1.21
+ \ifnum\Pst@Debug>0 \typeout{==DEBUG== pst-plot(psaxes@iv): Dx -> -Dx (was negative)}\fi % v.1.21
+ \fi % v.1.21
\edef\psk@dx{\number\pst@dimg}%
+ \ifnum\Pst@Debug>0 \typeout{==DEBUG== pst-plot(psaxes@iv): \textbackslash psk@dx=\psk@dx}\fi % v.1.21
\fi%
\ifPst@yAxis\else\showorigintrue\fi%
\pst@hlabels{\pst@dimc}{\psk@arrowB}{#4}{#6}%
@@ -1661,11 +1680,27 @@
\define@key[psset]{pstricks-add}{yticksize}{\set@yticksize{#1}}% overwrites the definition in pstricks
%\psset{ticksize=-4pt 4pt}
%
-% full= 0, top=1, bottom=-1
+% full= 0, top=1, bottom=-1 => 0 1 2
+\def\psset@tickstyle#1{\pst@expandafter\psset@@tickstyle{#1}\@nil}% overwrite it
+\def\psset@@tickstyle#1#2\@nil{%
+ \ifx#1f\let\psk@tickstyle\z@\else
+ \ifx#1t\let\psk@tickstyle\@ne
+ \edef\psk@xticksize{0 \pst@number\pst@xticksizeB}%
+ \edef\psk@yticksize{0 \pst@number\pst@yticksizeB}%
+ \else
+ \ifx#1b\let\psk@tickstyle\m@ne
+ \edef\psk@xticksize{\pst@number\pst@xticksizeA 0}%
+ \edef\psk@yticksize{\pst@number\pst@yticksizeA 0}%
+ \else
+ \@pstrickserr{Bad tick style: `#1#2'}\@ehpa
+ \fi\fi\fi
+}
+
+\iffalse
\define@key[psset]{}{tickstyle}{%
\pst@expandafter\psset@@tickstyle{#1}\@nil%
\pst@cnta=\psk@tickstyle
- \advance\pst@cnta by 1
+ \advance\pst@cnta by \@ne
\ifcase\pst@cnta% bottom
\pst@xticksizeB=\z@
\pst@yticksizeB=\z@
@@ -1675,6 +1710,7 @@
\pst@yticksizeA=\z@
\fi
}
+\fi
%\psset{tickstyle=full}%
%
%
@@ -1953,7 +1989,7 @@
\divide\pst@cnta\psk@dx\relax% % Number of ticks/labels
\ifnum\pst@cnta=\z@\else%
\pst@dimb=\psk@dx sp% % Space between ticks.
-% \ifPst@yAxis\else\showorigintrue\fi%
+ \ifPst@yAxis\else\showorigintrue\fi%
\ifnum\psk@labels<\tw@ \ifPst@xAxis\pst@@hlabels\fi\fi%
\showoriginfalse%
\fi%
@@ -1967,8 +2003,11 @@
\ifnum\pst@cnta<\z@\pst@dimb=-\pst@dimb\fi%
\hbox to\z@{%
\ifshoworigin\hbox to \z@{\hss\pst@@@hlabel{\psk@Ox}\hss}\fi%
- \mmultido{\n=\psk@Ox+\psk@Dx}{\pst@cnta}{%
- \hskip\pst@dimb\hbox to \z@{\hss\pst@@@hlabel{\n}\hss}%
+ \mmultido{\nA=\psk@Ox+\psk@Dx}{\pst@cnta}{%
+ \hskip\pst@dimb\hbox to \z@{\hss%
+ \ifdim\nA pt=\z@ \pst@@@hlabel{0}\else\expandafter\pst@@@hlabel{\nA}\fi% prevent -0, doesn't work with \ifnum
+% \ifnum\nA=0 \pst@@@hlabel{0}\else\expandafter\pst@@@hlabel{\nA}\fi
+ \hss}%
}\hss%
}%
\ifdim\pst@dimd>\z@\vss\else\vskip\pst@dimm\fi%
@@ -2004,14 +2043,16 @@
\pst@@@vlabel{\psk@Oy}%
\ifdim\pst@dimc>\z@\hskip\pst@dimm\else\hss\fi}\vss}%
\fi%
- \mmultido{\n=\psk@Oy+\psk@Dy}{\pst@cnta}{%
+ \mmultido{\nA=\psk@Oy+\psk@Dy}{\pst@cnta}{%
\vbox to\pst@dima{\vss}
\vbox to \z@{%
\vss\hbox to\z@{%
\ifdim\pst@dimc>\z@%
- \hss\pst@@@vlabel{\n}\hskip\pst@dimm%
+ \hss\pst@@@vlabel{\nA}\hskip\pst@dimm%
\else%
- \hskip\pst@dimm\pst@@@vlabel{\n}\hss%
+ \hskip\pst@dimm%\ifnum\nA=0 \pst@@@vlabel{0}\else\pst@@@vlabel{\nA}\fi
+ \ifdim\nA pt=\z@ \pst@@@vlabel{0}\else\pst@@@vlabel{\nA}\fi% prevent -0, doesn't work with \ifnum
+ \hss%
\fi
}\vss%
}}%