summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-03-17 16:33:30 +0000
committerKarl Berry <karl@freefriends.org>2009-03-17 16:33:30 +0000
commit31be7e2d49b9eb33e82ba1a3b9b05bcafce81282 (patch)
treeb19b511fc70ae4a64a62de73c4612a36ff97c5bf
parent8e0ffb65e364a93d9ba7bc24dd19137e0e54bf7d (diff)
pstricks-add (16mar09)
git-svn-id: svn://tug.org/texlive/trunk@12409 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.dat947
-rw-r--r--Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdfbin2019940 -> 2022749 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex68
-rw-r--r--Master/texmf-dist/dvips/pstricks-add/pstricks-add.pro21
-rw-r--r--Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex183
-rw-r--r--Master/texmf-dist/tex/latex/pstricks-add/pstricks-add.sty6
7 files changed, 1124 insertions, 107 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks-add/Changes b/Master/texmf-dist/doc/generic/pstricks-add/Changes
index 3dabe9a7c81..2add814c3c2 100644
--- a/Master/texmf-dist/doc/generic/pstricks-add/Changes
+++ b/Master/texmf-dist/doc/generic/pstricks-add/Changes
@@ -1,6 +1,7 @@
-%% $Id: Changes 99 2009-03-03 10:37:34Z herbert $
+%% $Id: Changes 109 2009-03-16 11:24:38Z herbert $
%%
pstricks-add.pro -----------
+ v 0.22 2009-03-17 - add LineByHand stuff
v 0.21 2008-10-13 - add bubblesort macro
v 0.20 2008-01-12 - moved the AlgParser into pst-algparser.pro
- moved Pyth2 and tan into pstricks.pro
@@ -34,6 +35,9 @@ pstricks-add.sty ----------- (hv)
pstricks-add.tex ----------- (Dominik Rodriguez/hv)
+ v 3.20 2009-03-16 - add option showOriginTick, similiar to showorigin from
+ the basic pst-plot
+ v 3.19 2009-03-06 - fix introduced bug with division in the \psgraph macro
v 3.18 2009-03-03 - fix bug with division in the \psgraph macro
- add macro \psComment
- add optional argument for \psplot and \parametricplot
diff --git a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.dat b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.dat
new file mode 100644
index 00000000000..d26aea31920
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.dat
@@ -0,0 +1,947 @@
+\begin{filecontents*}{demo0.data}
+ 0.1414 0.0052
+ 0.2828 0.0217
+ 0.4243 0.0480
+ 0.5657 0.0890
+ 0.7071 0.1375
+ 0.8485 0.1906
+ 0.9899 0.2663
+ 1.1314 0.3580
+ 1.2728 0.4644
+ 1.4142 0.5801
+ 1.5556 0.7033
+ 1.6971 0.8899
+ 1.8385 1.1143
+ 1.9799 1.2593
+ 2.1213 1.5692
+ 2.2627 3.2331
+ 2.4042 4.4097
+ 2.5456 5.8186
+ 2.6870 7.4441
+ 2.8284 8.2287
+\end{filecontents*}
+
+\begin{filecontents*}{demo1.data}
+1 99447169
+2 110351058
+3 123557238
+4 138346129
+5 145050826
+6 160363212
+7 174000394
+8 183856559
+9 189128691
+10 197634845
+11 213257357
+12 216899512
+13 230152738
+14 224144907
+15 247410024
+16 261168438
+17 252920343
+18 326153799
+19 319442110
+20 310351522
+21 381919943
+22 438043888
+23 357527766
+24 603304997
+\end{filecontents*}
+
+\begin{filecontents*}{demo2.data}
+ 1989 3.08
+ 1990 3.84
+ 1991 4.08
+ 1992 3.21
+ 1993 5.23
+ 1994 2.97
+ 1995 2.53
+ 1996 2.8
+ 1997 2.78
+ 1998 3.15
+ 1999 2.32
+ 2000 2.4
+ 2001 2.46
+\end{filecontents*}
+\begin{filecontents*}{demo3.data}
+ 1989 3.08
+ 1990 3.1
+ 1991 3.08
+ 1992 3.21
+ 1993 5.0
+ 1994 2.27
+ 1995 3.53
+ 1996 3.8
+ 1997 2.8
+ 1998 4.15
+ 1999 3.32
+ 2000 1.4
+ 2001 2.46
+\end{filecontents*}
+
+\begin{filecontents*}{data3.data}
+ 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.data}
+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.data}
+[% file dataMul.data
+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*}
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 12d2eda2520..b9b79770798 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 d237307a2bb..f26b4809112 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 105 2009-03-05 19:55:16Z herbert $
+%% $Id: pstricks-add-doc.tex 111 2009-03-16 19:53:49Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\listfiles
@@ -89,6 +89,21 @@
\makeatother
\lstset{escapechar=ยง}
+\def\bgImage{\psset{unit=1.5}
+\begin{pspicture}(-3,-3)(3,3)
+\psChart[userColor={red!30,green!30,blue!40,gray,cyan!50,
+ magenta!60,cyan},chartSep=30pt,shadow=true,shadowsize=5pt]{34.5,17.2,20.7,15.5,5.2,6.9}{6}{2}
+\psset{nodesepA=5pt,nodesepB=-10pt}
+\ncline{psChartO1}{psChart1}\nput{0}{psChartO1}{1000 (34.5\%)}
+\ncline{psChartO2}{psChart2}\nput{150}{psChartO2}{500 (17.2\%)}
+\ncline{psChartO3}{psChart3}\nput{-90}{psChartO3}{600 (20.7\%)}
+\ncline{psChartO4}{psChart4}\nput{0}{psChartO4}{450 (15.5\%)}
+\ncline{psChartO5}{psChart5}\nput{0}{psChartO5}{150 (5.2\%)}
+\ncline{psChartO6}{psChart6}\nput{0}{psChartO6}{200 (6.9\%)}
+\bfseries%
+\rput(psChartI1){Taxes}\rput(psChartI2){Rent}\rput(psChartI3){Bills}
+\rput(psChartI4){Car}\rput(psChartI5){Gas}\rput(psChartI6){Food}
+\end{pspicture}}
\begin{document}
\title{\texttt{pstricks-add}\\additionals Macros for \texttt{pstricks}%
@@ -6899,12 +6914,12 @@ population changes and the second which describes how the predator population ch
For concreteness let us assume that the prey in our model are rabbits, and that the
predators are foxes. If we let $R(t)$ and $F(t)$ represent the number of rabbits and
foxes, respectively, that are alive at time t, then the Lotka-Volterra model is:
-
+%
\begin{align}
\dot R &= a\cdot R - b\cdot R\cdot F\\
\dot F &= e\cdot b\cdot R\cdot F - c\cdot F
\end{align}
-
+%
where the parameters are defined by:
\begin{description}
\item[a] is the natural growth rate of rabbits in the absence of predation,
@@ -6921,6 +6936,22 @@ the Stella representation of the Lotka-Volterra model will use two stocks, four
converters and many connectors.
\bgroup
+\begin{center}
+\def\InitCond{ 0 10 10}%% xa ya xl
+\def\Faiglelapin{\Vaigle*(y[2]-y[0])/sqrt(y[1]^2+(y[2]-y[0])^2)|%
+ -\Vaigle*y[1]/sqrt(y[1]^2+(y[2]-y[0])^2)|%
+ -\Vlapin}
+\def\Vlapin{1} \def\Vaigle{1.6}
+\psset{unit=.7,subgriddiv=0,gridcolor=lightgray,method=adams,algebraic,%
+ plotpoints=20,showpoints=true}
+\begin{pspicture}[showgrid=true](-3,-3)(10,10)
+ \psplotDiffEqn[plotfuncy=pop 0,whichabs=2,linecolor=red]{0}{10}{\InitCond}{\Faiglelapin}
+ \psplotDiffEqn[whichabs=0,whichord=1,linecolor=black,method=rk4]{0}{10}{\InitCond}{\Faiglelapin}
+ \psplotDiffEqn[whichabs=0,whichord=1,linecolor=blue]{0}{10}{\InitCond}{\Faiglelapin}
+\end{pspicture}
+\end{center}
+
+\begin{lstlisting}[label={fig:aiglelapin},xrightmargin=-1.5cm]
\def\InitCond{ 0 10 10}%% xa ya xl
\def\Faiglelapin{\Vaigle*(y[2]-y[0])/sqrt(y[1]^2+(y[2]-y[0])^2)|%
-\Vaigle*y[1]/sqrt(y[1]^2+(y[2]-y[0])^2)|%
@@ -6928,12 +6959,23 @@ converters and many connectors.
\def\Vlapin{1} \def\Vaigle{1.6}
\psset{unit=.7,subgriddiv=0,gridcolor=lightgray,method=adams,algebraic,%
plotpoints=20,showpoints=true}
-\begin{pspicture}(-3,-8.25)(8,10)\psgrid[griddots=10]
+\begin{pspicture}[showgrid=true](-3,-3)(10,10)
\psplotDiffEqn[plotfuncy=pop 0,whichabs=2,linecolor=red]{0}{10}{\InitCond}{\Faiglelapin}
\psplotDiffEqn[whichabs=0,whichord=1,linecolor=black,method=rk4]{0}{10}{\InitCond}{\Faiglelapin}
\psplotDiffEqn[whichabs=0,whichord=1,linecolor=blue]{0}{10}{\InitCond}{\Faiglelapin}
-\end{pspicture}\hfill
-\begin{pspicture}(0,-0.25)(10,14)\psgrid
+\end{pspicture}
+\end{lstlisting}
+
+
+\begin{center}
+\def\InitCond{ 0 10 10}%% xa ya xl
+\def\Faiglelapin{\Vaigle*(y[2]-y[0])/sqrt(y[1]^2+(y[2]-y[0])^2)|%
+ -\Vaigle*y[1]/sqrt(y[1]^2+(y[2]-y[0])^2)|%
+ -\Vlapin}
+\def\Vlapin{1} \def\Vaigle{1.6}
+\psset{unit=.7,subgriddiv=0,gridcolor=lightgray,method=adams,algebraic,%
+ plotpoints=20,showpoints=true}
+\begin{pspicture}[showgrid=true](0,-0.25)(10,14)
\psplotDiffEqn[plotfuncy=dup 1 get dup mul exch dup 0 get exch 2 get sub dup
mul add sqrt,linecolor=red,method=rk4]{0}{10}{\InitCond}{\Faiglelapin}
\psplotDiffEqn[plotfuncy=dup 1 get dup mul exch dup 0 get exch 2 get sub dup
@@ -6941,8 +6983,10 @@ converters and many connectors.
\psplotDiffEqn[plotfuncy=pop Func aload pop pop dup mul exch dup mul add sqrt,
linecolor=yellow]{0}{10}{\InitCond}{\Faiglelapin}
\end{pspicture}
+\end{center}
\egroup
-\begin{lstlisting}[label={fig:aiglelapin}]
+
+\begin{lstlisting}[label={fig:aiglelapin},xrightmargin=-1.5cm]
\def\InitCond{ 0 10 10}%% xa ya xl
\def\Faiglelapin{\Vaigle*(y[2]-y[0])/sqrt(y[1]^2+(y[2]-y[0])^2)|%
-\Vaigle*y[1]/sqrt(y[1]^2+(y[2]-y[0])^2)|%
@@ -6950,12 +6994,7 @@ converters and many connectors.
\def\Vlapin{1} \def\Vaigle{1.6}
\psset{unit=.7,subgriddiv=0,gridcolor=lightgray,method=adams,algebraic,%
plotpoints=20,showpoints=true}
-\begin{pspicture}(-3,-8)(5,10)\psgrid[griddots=10]
- \psplotDiffEqn[plotfuncy=pop 0,whichabs=2,linecolor=red]{0}{10}{\InitCond}{\Faiglelapin}
- \psplotDiffEqn[whichabs=0,whichord=1,linecolor=black,method=rk4]{0}{10}{\InitCond}{\Faiglelapin}
- \psplotDiffEqn[whichabs=0,whichord=1,linecolor=blue]{0}{10}{\InitCond}{\Faiglelapin}
-\end{pspicture}\hfill
-\begin{pspicture}(10,12)\psgrid
+\begin{pspicture}[showgrid=true](10,12)
\psplotDiffEqn[plotfuncy=dup 1 get dup mul exch dup 0 get exch 2 get sub dup
mul add sqrt,linecolor=red,method=rk4]{0}{10}{\InitCond}{\Faiglelapin}
\psplotDiffEqn[plotfuncy=dup 1 get dup mul exch dup 0 get exch 2 get sub dup
@@ -6967,7 +7006,6 @@ converters and many connectors.
%--------------------------------------------------------------------------------------
-\clearpage
\subsubsection{$y''=y$}
%--------------------------------------------------------------------------------------
@@ -7000,7 +7038,7 @@ trigonometrical functions.
\egroup
\end{center}
-\begin{lstlisting}[label={fig:minusexp}]
+\begin{lstlisting}[label={fig:minusexp},xrightmargin=-1.5cm]
\def\Funct{exch} \psset{xunit=5cm, yunit=0.75cm}
\begin{pspicture}(0,-0.25)(2,7)\psgrid[subgriddiv=1,griddots=10]
\psplot[linewidth=4\pslinewidth, linecolor=green]{0}{2}{Euler x exp} %%e^x
diff --git a/Master/texmf-dist/dvips/pstricks-add/pstricks-add.pro b/Master/texmf-dist/dvips/pstricks-add/pstricks-add.pro
index 4bdeba0acad..6905648fe46 100644
--- a/Master/texmf-dist/dvips/pstricks-add/pstricks-add.pro
+++ b/Master/texmf-dist/dvips/pstricks-add/pstricks-add.pro
@@ -1,4 +1,4 @@
-%% $Id: pstricks-add.pro 49 2008-10-13 10:59:27Z herbert $
+%% $Id: pstricks-add.pro 107 2009-03-12 17:25:46Z herbert $
% PostScript prologue for pstricks-add.tex.
% Version 0.21, 2008/10/15
% For distribution, see pstricks.tex.
@@ -7,6 +7,8 @@
%
/tx@addDict 410 dict def tx@addDict begin
%%
+123 srand % set random generator
+%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
/GTriangle {
gsave
@@ -197,6 +199,23 @@
end
} def
%
+%/amplHand {.8} def
+%/dtHand 2 def
+/varHand { rand sin amplHand mul add } def
+/MovetoByHand { moveto } def
+%/MovetoByHand { /y0 ED /x0 ED x0 y0 moveto } def
+/LinetoByHand { 4 dict begin
+ /y1 ED /x1 ED
+ currentpoint /y0 ED /x0 ED
+ x0 x1 sub dup mul y0 y1 sub dup mul add sqrt /dEnd ED
+ 0 dtHand dEnd { dup
+ x1 x0 sub mul dEnd div x0 add varHand exch
+ y1 y0 sub mul dEnd div y0 add varHand lineto
+ } for
+% /x0 x1 def /y0 y1 def
+ end
+} def
+%
end
%
% END pstricks-add.pro
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 e86aaf65755..a6fcd0ad601 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 99 2009-03-03 10:37:34Z herbert $
+%% $Id: pstricks-add.tex 109 2009-03-16 11:24:38Z 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.18}
-\def\filedate{2009/03/03}
+\def\fileversion{3.20}
+\def\filedate{2009/03/16}
\message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)}
%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -1034,6 +1034,31 @@
\ignorespaces%
}
%
+\def\tx@MovetoByHand{ tx@addDict begin MovetoByHand end }
+\def\tx@LinetoByHand{ tx@addDict begin LinetoByHand end }
+%/amplHand {.8} def
+%/dtHand 2 def
+
+\def\pslineByHand{\pst@object{pslineByHand}}
+\def\pslineByHand@i{%
+ \addbefore@par{VarStepEpsilon=2,varsteptol=0.8}
+ \pst@getarrows{%
+ \begin@OpenObj
+ \pst@getcoors[\pslineByHand@ii}}
+\def\pslineByHand@ii{%
+ \addto@pscode{
+ tx@addDict begin
+ /dtHand \psk@VarStepEpsilon\space def
+ /amplHand \psk@varsteptol\space def
+% \pst@cp % current point
+ \tx@setlinejoin % hv 2007-10-13
+ MovetoByHand
+ counttomark 2 div /maxLines ED
+ 1 1 maxLines { pop LinetoByHand } for
+ end
+ }%
+ \end@OpenObj%
+}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%% %%%%%%%%%%
@@ -1640,6 +1665,7 @@
%\psset@ticklines{none}
\define@key[psset]{pstricks-add}{ylabelFactor}[\relax]{\def\psk@ylabelFactor{#1}}
\define@key[psset]{pstricks-add}{xlabelFactor}[\relax]{\def\psk@xlabelFactor{#1}}
+\define@boolkey[psset]{pstricks-add}[Pst@]{showOriginTick}[true]{}%
%\psset{xlabelFactor=\relax,ylabelFactor=\relax}%
%% #1 : optional arguments passed to psline
@@ -1729,20 +1755,17 @@
\def\pst@tempA{#1}%
\ifx\pst@tempA\@empty\the\@zero\else#1\fi% the integer part
\def\pst@tempA{#2}%
- \ifx\pst@tempA\@empty\@writeDecimals{}\else\@writeDecimals{#2}\fi%
-}
+ \ifx\pst@tempA\@empty\@writeDecimals{}\else\@writeDecimals{#2}\fi}
%
\def\psxs@none{%
\let\psk@arrowA\@empty%
\let\psk@arrowB\@empty%
- \psxs@axes%
-}
+ \psxs@axes}
%
\def\psxs@axes{{%
\ifPst@xAxis\psxs@@axes\pst@dima\pst@dimb\pst@dimc\pst@dimd{}{x}\fi%
- \ifPst@yAxis\psxs@@axes\pst@dima\pst@dimb\pst@dimc\pst@dimd{exch}{y}\fi%
-}}
-
+ \ifPst@yAxis\psxs@@axes\pst@dima\pst@dimb\pst@dimc\pst@dimd{exch}{y}\fi}}
+%
\def\psaxes{\pst@object{psaxes}}
\def\psaxes@i{\pst@getarrows\psaxes@ii}
\def\psaxes@ii(#1){\@ifnextchar({\psaxes@iii(#1)}{\psaxes@iv(0,0)(0,0)(#1)}}
@@ -1990,7 +2013,7 @@
\def\pst@tempA{none}%
\pst@addarrowdef%
\addto@pscode{
- /showOrigin \ifshoworigin true \else false \fi def % 0 and ticks for 0/0 ?
+ /showOrigin \ifPst@showOriginTick true \else false \fi def % ticks for 0/0 ?
\ifis@yAxis 0 \pst@number#4 \else \pst@number#3 0 \fi
\ifis@yAxis 0 \pst@number#2 \else \pst@number#1 0 \fi
ArrowA
@@ -2060,8 +2083,8 @@
\else\@nameuse{psls@\psxsubticklinestyle}\fi stroke} def
%\iffalse
% start ticks ---------------------------------------------------------
- showOrigin { 0 }{ dT } ifelse
- dT MaxValue 1 add{ % the positive part of the axes
+% showOrigin { 0 }{ dT } ifelse
+ 0 dT MaxValue 1 add { % the positive part of the axes
/cntTick exch def % the index
logLines { % log lines?
gsave
@@ -2085,12 +2108,12 @@
grestore % restore main tick status
stroke
/dsubT 0 def % no other subticks
- } if % end logLines
+ } if % end logLines
dsubT abs 0 gt { % du we have subticks?
gsave % save graphic state
% start subticks ----------------------------------------------------------
- /cntsubTick cntTick dsubT add def
- subTNo 1 sub {
+ /cntsubTick cntTick dsubT add def
+ subTNo 1 sub {
cntsubTick abs MaxValue abs le { % out of range?
\ifis@yAxis
\ifPst@maxyTicks true \else false \fi
@@ -2109,29 +2132,32 @@
% end subticks ----------------------------------------------------------
grestore % restore tick status
} if
- gsave
- \ifis@yAxis
- \ifPst@maxyTicks true \else false \fi
- \else
- \ifPst@maxxTicks true \else false \fi
- \fi
- { cntTick minTickline #5 moveto
- cntTick maxTickline #5 lineto }
- { cntTick tickstart #5 moveto % line begin main Tick
- cntTick tickend #5 lineto } ifelse % lineto tick end
- Twidth SLW TColor % set line width and tick color
- LSstroke
- grestore
+ showOrigin {
+ gsave
+ \ifis@yAxis
+ \ifPst@maxyTicks true \else false \fi
+ \else
+ \ifPst@maxxTicks true \else false \fi
+ \fi
+ { cntTick minTickline #5 moveto
+ cntTick maxTickline #5 lineto }
+ { cntTick tickstart #5 moveto % line begin main Tick
+ cntTick tickend #5 lineto } ifelse % lineto tick end
+ Twidth SLW TColor % set line width and tick color
+ LSstroke
+ grestore
+ }{ /showOrigin true def } ifelse % only for the very first tick valid
} for
% end ticks ----------------------------------------------------------
%\fi
%\iffalse
% ================================================ % the other side
+ /showOrigin \ifPst@showOriginTick true \else false \fi def % ticks for 0/0 ?
/dT dT neg def % the other side of the axis
/dsubT dsubT neg def
% start ticks ----------------------------------------------------------
- showOrigin { 0 }{ dT } ifelse
- dT MinValue epsilon viceversa { add }{ sub } ifelse {
+% showOrigin { 0 }{ dT } ifelse
+ 0 dT MinValue epsilon viceversa { add }{ sub } ifelse {
/cntTick exch def
logLines { % log lines?
gsave
@@ -2154,7 +2180,7 @@
subTwidth SLW subTColor % set line width and subtick color
subLSstroke
grestore
- }
+ } % end loglines
dsubT abs 0 gt { % do we have subticks?
gsave % save main state
% start subticks ----------------------------------------------------------
@@ -2171,12 +2197,14 @@
subLSstroke
grestore % restore main state
} if
- gsave
- cntTick tickstart #5 moveto % line begin main Tick
- cntTick tickend #5 lineto % lineto tick end
- Twidth SLW TColor % set line width and tick color
- LSstroke
- grestore
+ showOrigin {
+ gsave
+ cntTick tickstart #5 moveto % line begin main Tick
+ cntTick tickend #5 lineto % lineto tick end
+ Twidth SLW TColor % set line width and tick color
+ LSstroke
+ grestore
+ }{ /showOrigin true def } ifelse % only for the very first tick valid
} for
% end ticks ----------------------------------------------------------
%\fi
@@ -2463,7 +2491,7 @@
%
\def\psgraph{\pst@object{psgraph}}
\def\psgraph@i{\pst@getarrows\psgraph@ii}
-\def\psgraph@ii(#1,#2){\catcode`\!=12
+\def\psgraph@ii(#1,#2){\catcode`\!=12\relax
\@ifnextchar({\psgraph@iii(#1,#2)}{\psgraph@iv(0,0)(#1,#2)}}
\def\psgraph@iii(#1,#2)(#3,#4){\@ifnextchar({\psgraph@v(#1,#2)(#3,#4)}{\psgraph@iv(#1,#2)(#3,#4)}}
%
@@ -2471,39 +2499,29 @@
% minX | minY | maxX | maxY | Length x-axis | length y-axis%
\pst@killglue%
\begingroup%
- \pst@dimo=#3\p@
- \pst@dimp=#1\p@ \multiply\pst@dimp by \m@ne
+ \pst@dimo=#3\p@\pst@dimp=#1\p@\multiply\pst@dimp by \m@ne%
\advance\pst@dimo by \pst@dimp% delta x
- \pst@dimm=#5
- \pst@cntm=\pst@dimm
- \pst@cntn=\pst@dimo
- \divide\pst@cntm by \pst@cntn
- \ifnum\pst@cntm=0 \pst@divide{\pst@dimm}{\pst@dimo}\pst@tempA
- \pst@xunit=\pst@tempA\p@%
- \else\pst@xunit=\pst@cntm\p@\fi
-%
- \pst@dimo=#4\p@
- \pst@dimp=#2\p@ \multiply\pst@dimp by \m@ne
+ \pst@dimm=#5%
+ \divide\pst@dimm by \strip@pt\pst@dimo%
+ \pst@xunit=\pst@dimm%
+%
+ \pst@dimo=#4\p@\pst@dimp=#2\p@\multiply\pst@dimp by \m@ne%
\advance\pst@dimo by \pst@dimp% delta y
- \ifx!#6 \pst@dimm=\pst@cntm\pst@dimo\else\pst@dimm=#6\fi
- \pst@cntm=\pst@dimm
- \pst@cntn=\pst@dimo
- \divide\pst@cntm by \pst@cntn
- \ifnum\pst@cntm=0 \pst@divide{\pst@dimm}{\pst@dimo}\pst@tempA
- \pst@yunit=\pst@tempA\p@%
- \else\pst@yunit=\pst@cntm\p@\fi
+ \ifx!#6\pst@dimm=\strip@pt\pst@dimm\pst@dimo\else\pst@dimm=#6\fi%
+ \divide\pst@dimm by \strip@pt\pst@dimo%
+ \pst@yunit=\pst@dimm%
%
- \pst@dimm=#1\pst@xunit
+ \pst@dimm=#1\pst@xunit%
\advance\pst@dimm by \psk@llx%
- \pst@dimn=#2\pst@yunit
+ \pst@dimn=#2\pst@yunit%
\advance\pst@dimn by \psk@lly%
- \pst@dimo=#3\pst@xunit
+ \pst@dimo=#3\pst@xunit%
\advance\pst@dimo by \psk@urx%
- \pst@dimp=#4\pst@yunit
+ \pst@dimp=#4\pst@yunit%
\advance\pst@dimp by \psk@ury%
- \if@star\pspicture*(\pst@dimm,\pst@dimn)(\pst@dimo,\pst@dimp)\else
- \pspicture(\pst@dimm,\pst@dimn)(\pst@dimo,\pst@dimp)\fi
- \psset{xunit=\pst@xunit,yunit=\pst@yunit}
+ \if@star\pspicture*(\pst@dimm,\pst@dimn)(\pst@dimo,\pst@dimp)\else%
+ \pspicture(\pst@dimm,\pst@dimn)(\pst@dimo,\pst@dimp)\fi%
+ \psset{xunit=\pst@xunit,yunit=\pst@yunit}%
\bgroup%
\use@par%
\psaxes(#1,#2)(#3,#4)%
@@ -2514,27 +2532,17 @@
% Xorig | yorig | minX | minY | maxX | maxY | Length x-axis | length y-axis%
\pst@killglue%
\begingroup%
- \pst@dimo=#5\p@
- \pst@dimp=#3\p@ \multiply\pst@dimp by \m@ne
+ \pst@dimo=#5\p@\pst@dimp=#3\p@\multiply\pst@dimp by \m@ne%
\advance\pst@dimo by \pst@dimp% delta x
- \pst@dimm=#7
- \pst@cntm=\pst@dimm
- \pst@cntn=\pst@dimo
- \divide\pst@cntm by \pst@cntn
- \ifnum\pst@cntm=0 \pst@divide{\pst@dimm}{\pst@dimo}\pst@tempA
- \pst@xunit=\pst@tempA\p@%
- \else\pst@xunit=\pst@cntm\p@\fi
-%
- \pst@dimo=#6\p@
- \pst@dimp=#4\p@ \multiply\pst@dimp by \m@ne
+ \pst@dimm=#7%
+ \divide\pst@dimm by \strip@pt\pst@dimo%
+ \pst@xunit=\pst@dimm%
+%
+ \pst@dimo=#6\p@\pst@dimp=#4\p@\multiply\pst@dimp by \m@ne%
\advance\pst@dimo by \pst@dimp% delta y
- \ifx!#8 \pst@dimm=\pst@cntm\pst@dimo\else\pst@dimm=#8\fi
- \pst@cntm=\pst@dimm
- \pst@cntn=\pst@dimo
- \divide\pst@cntm by \pst@cntn
- \ifnum\pst@cntm=0 \pst@divide{\pst@dimm}{\pst@dimo}\pst@tempA
- \pst@yunit=\pst@tempA\p@%
- \else\pst@yunit=\pst@cntm\p@\fi
+ \ifx!#8\pst@dimm=\strip@pt\pst@dimm\pst@dimo\else\pst@dimm=#8\fi%
+ \divide\pst@dimm by \strip@pt\pst@dimo%
+ \pst@yunit=\pst@dimm%
\iffalse
\pst@dimo=#5\p@\advance\pst@dimo by -#3\p@% delta x
\pst@divide{#7}{\pst@dimo}\pst@tempA%
@@ -2583,11 +2591,11 @@
\def\psgraph@vi(#1,#2)(#3,#4)(#5,#6){%
\ifx\psk@xAxisLabel\@empty\else%
\ifx\psk@xAxisLabelPos\@empty \uput[0](#5,#2){\psk@xAxisLabel}%
- \else \expandafter\setxLabelC@@r\psk@xAxisLabelPos(#3,#5)(#1,#2)\fi
+ \else \expandafter\setxLabelC@@r\psk@xAxisLabelPos(#3,#5)(#1,#2)\fi%
\fi%
\ifx\psk@yAxisLabel\@empty\else%
\ifx\psk@yAxisLabelPos\@empty \uput[90](#1,#6){\psk@yAxisLabel}%
- \else\expandafter\setyLabelC@@r\psk@yAxisLabelPos(#4,#6)(#1,#2)\fi
+ \else\expandafter\setyLabelC@@r\psk@yAxisLabelPos(#4,#6)(#1,#2)\fi%
\fi%
\ignorespaces%
}
@@ -3966,7 +3974,8 @@
braceWidthOuter=10\pslinewidth,
chartNodeI=0.75,
chartNodeO=1.5,
- IQLfactor=1.5
+ IQLfactor=1.5,
+ showOriginTick
}
\psset{%
%%%% pstricks %%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/pstricks-add/pstricks-add.sty b/Master/texmf-dist/tex/latex/pstricks-add/pstricks-add.sty
index dc7a49dd8c4..efd3c133093 100644
--- a/Master/texmf-dist/tex/latex/pstricks-add/pstricks-add.sty
+++ b/Master/texmf-dist/tex/latex/pstricks-add/pstricks-add.sty
@@ -1,14 +1,14 @@
-%% $Id: pstricks-add.sty 7 2007-12-29 22:21:13Z herbert $
+%% $Id: pstricks-add.sty 25 2008-06-06 10:33:45Z herbert $
%
\RequirePackage{pstricks}
-\ProvidesPackage{pstricks-add}[2007/09/03 v. 0.11 package wrapper for
+\ProvidesPackage{pstricks-add}[2007/09/03 v. 0.12 package wrapper for
pstricks-add.tex (hv)]
\input{pstricks-add.tex}
\ProvidesFile{pstricks-add.tex}
[\filedate\space v\fileversion\space `PSTricks-add' (hv)]
\IfFileExists{pstricks-add.pro}{%
\ProvidesFile{pstricks-add.pro}
- [2007/11/18 v. 0.15, PostScript prologue file (hv)]
+ [2009/03/17 v. 0.22, PostScript prologue file (hv)]
\@addtofilelist{pstricks-add.pro}}{}%
\InputIfFileExists{pstricks-add.cfg}{%
\PackageInfo{pstricks-add}{Local config file pstricks-add.cfg used}