summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-10 21:26:22 +0000
committerKarl Berry <karl@freefriends.org>2016-05-10 21:26:22 +0000
commitd2cbd5d0742f30305d0debc84b932d2064d890c7 (patch)
tree3a0bb3e2ac6a86a2bd7faa6077f897d8261ead7f /Master
parentb656cfa10e3f0e35eb31d350548a1c2c325314b6 (diff)
pst-plot (10may16)
git-svn-id: svn://tug.org/texlive/trunk@41006 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/Changes3
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/Contents4
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/data/Data.dat19
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/data/LSM.data1
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/data/LSM2.data4
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/data/boxplot.data1
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/data/data.data815
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/data/data1.dat18
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/data/data3.data34
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/data/dataMul.data9
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/data/demo.txt18
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/data/demo0.data20
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/data/demo1.data24
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/data/demo2.data13
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/data/demo3.data13
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/data/dotmatrix.data (renamed from Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.dat)952
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/data/pstricks-add-data9.data4
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/data/test.data5
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/data/zz.tex5
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/dtk02-1.pdfbin439324 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/dtk02-1.tex561
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/dtk02-2.bib86
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/dtk02-2.pdfbin141286 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/dtk02-2.tex375
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.eps4315
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdfbin1229577 -> 1324263 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pngbin29970 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex303
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/tugboat01-4.bib120
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/tugboat01-4.pdfbin114016 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/tugboat01-4.tex705
-rw-r--r--Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex421
32 files changed, 1434 insertions, 7414 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-plot/Changes b/Master/texmf-dist/doc/generic/pst-plot/Changes
index dd596d6869f..3af9f7e229f 100644
--- a/Master/texmf-dist/doc/generic/pst-plot/Changes
+++ b/Master/texmf-dist/doc/generic/pst-plot/Changes
@@ -1,4 +1,7 @@
----- pst-plot.tex
+1.72 2016-05-09 - fix for xLabels=...
+1.71 2014-10-14 - fix for \psx|yTick and trigLabels
+ - added fractionLabel
1.70 2014-08-23 - added x|ytrigLabelBase
1.69 2014-08-17 - bugfix for \psgraph (arrows)
1.68 2014-08-04 - set trigLabels=false for \psx|yTick
diff --git a/Master/texmf-dist/doc/generic/pst-plot/Contents b/Master/texmf-dist/doc/generic/pst-plot/Contents
deleted file mode 100644
index fd84649dc46..00000000000
--- a/Master/texmf-dist/doc/generic/pst-plot/Contents
+++ /dev/null
@@ -1,4 +0,0 @@
-pst-plot-doc.pdf: the main documentation
-dtk02-1.pdf : Die mathematischen Funktionen von PostScript
-dtk02-2.pdf : Die Plotfunktionen von pst-plot
-tugboat01-4.pdf : The plot functions of pst-plot
diff --git a/Master/texmf-dist/doc/generic/pst-plot/data/Data.dat b/Master/texmf-dist/doc/generic/pst-plot/data/Data.dat
new file mode 100644
index 00000000000..5061d285338
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-plot/data/Data.dat
@@ -0,0 +1,19 @@
+98, 32
+20, 11
+79, 26
+14, 9
+23, 22
+21, 10
+58, 25
+13, 8
+19, 5
+53, 29
+41, 37
+11, 2
+83, 25
+71, 51
+10, 7
+89, 17
+10, 6
+ , 41
+ , 75
diff --git a/Master/texmf-dist/doc/generic/pst-plot/data/LSM.data b/Master/texmf-dist/doc/generic/pst-plot/data/LSM.data
new file mode 100644
index 00000000000..bd37595b2af
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-plot/data/LSM.data
@@ -0,0 +1 @@
+0 1 1 3 2.8 4 3 2.9 2 5 4 4 5 5.5 6 8.2 8 7
diff --git a/Master/texmf-dist/doc/generic/pst-plot/data/LSM2.data b/Master/texmf-dist/doc/generic/pst-plot/data/LSM2.data
new file mode 100644
index 00000000000..42ed912743c
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-plot/data/LSM2.data
@@ -0,0 +1,4 @@
+0.003298697 1.397785583
+0.003193358 1.615489564
+0.003094538 2.044019006
+0.003001651 2.259240127
diff --git a/Master/texmf-dist/doc/generic/pst-plot/data/boxplot.data b/Master/texmf-dist/doc/generic/pst-plot/data/boxplot.data
new file mode 100644
index 00000000000..52cdac20533
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-plot/data/boxplot.data
@@ -0,0 +1 @@
+2 4 6 8 10 12 14 16 18 20 22 24 26 28 30 32
diff --git a/Master/texmf-dist/doc/generic/pst-plot/data/data.data b/Master/texmf-dist/doc/generic/pst-plot/data/data.data
new file mode 100644
index 00000000000..2c40d2bf756
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-plot/data/data.data
@@ -0,0 +1,815 @@
+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
diff --git a/Master/texmf-dist/doc/generic/pst-plot/data/data1.dat b/Master/texmf-dist/doc/generic/pst-plot/data/data1.dat
new file mode 100644
index 00000000000..7852d421656
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-plot/data/data1.dat
@@ -0,0 +1,18 @@
+%% LaTeX2e file `data/data1.dat'
+%% generated by the `filecontents' environment
+%% from source `pst-plot-doc' on 2016/05/09.
+%%
+256.4912 0.0674
+259.7543 0.0904
+264.7287 0.0502
+270.1739 0.0339
+276.2696 0.0531
+281.4192 0.0402
+284.4351 -0.1221
+286.7098 -0.2659
+289.9052 -0.8337
+292.8813 -1.391
+295.1299 -1.3968
+297.858 -1.8959
+299.5145 -0.608
+302.1028 -0.323
diff --git a/Master/texmf-dist/doc/generic/pst-plot/data/data3.data b/Master/texmf-dist/doc/generic/pst-plot/data/data3.data
new file mode 100644
index 00000000000..72d3c3be920
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-plot/data/data3.data
@@ -0,0 +1,34 @@
+ 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
diff --git a/Master/texmf-dist/doc/generic/pst-plot/data/dataMul.data b/Master/texmf-dist/doc/generic/pst-plot/data/dataMul.data
new file mode 100644
index 00000000000..92c0c729b69
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-plot/data/dataMul.data
@@ -0,0 +1,9 @@
+[% 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
+]%
diff --git a/Master/texmf-dist/doc/generic/pst-plot/data/demo.txt b/Master/texmf-dist/doc/generic/pst-plot/data/demo.txt
new file mode 100644
index 00000000000..8316b213dd4
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-plot/data/demo.txt
@@ -0,0 +1,18 @@
+% X1 X2 Y1 Y2
+ 2 55.1500 10.35 11.26
+ 31 59.7167 11.06 11.11
+ 34 65.7167 11.87 10.83
+ 40 62.1833 11.59 11.19
+ 45 56.0500 10.74 11.50
+ 47 68.2667 12.65 11.11
+ 52 69.7500 13.23 11.38
+ 55 76.3333 14.28 11.22
+ 59 75.4000 14.69 11.69
+ 62 78.6000 15.25 11.64
+ 66 69.3167 14.06 12.17
+ 69 77.5500 15.24 11.79
+ 73 70.8833 14.52 12.29
+ 75 60.6167 13.10 12.97
+ 79 68.3833 14.43 12.66
+ 82 56.6833 12.05 12.75
+ 87 95.1333 21.10 13.31
diff --git a/Master/texmf-dist/doc/generic/pst-plot/data/demo0.data b/Master/texmf-dist/doc/generic/pst-plot/data/demo0.data
new file mode 100644
index 00000000000..f54471bcd05
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-plot/data/demo0.data
@@ -0,0 +1,20 @@
+ 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
diff --git a/Master/texmf-dist/doc/generic/pst-plot/data/demo1.data b/Master/texmf-dist/doc/generic/pst-plot/data/demo1.data
new file mode 100644
index 00000000000..df41d032acf
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-plot/data/demo1.data
@@ -0,0 +1,24 @@
+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
diff --git a/Master/texmf-dist/doc/generic/pst-plot/data/demo2.data b/Master/texmf-dist/doc/generic/pst-plot/data/demo2.data
new file mode 100644
index 00000000000..c23b0976556
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-plot/data/demo2.data
@@ -0,0 +1,13 @@
+ 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
diff --git a/Master/texmf-dist/doc/generic/pst-plot/data/demo3.data b/Master/texmf-dist/doc/generic/pst-plot/data/demo3.data
new file mode 100644
index 00000000000..298a59572c4
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-plot/data/demo3.data
@@ -0,0 +1,13 @@
+ 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
diff --git a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.dat b/Master/texmf-dist/doc/generic/pst-plot/data/dotmatrix.data
index 0a7bbbe462e..f3f0fed76af 100644
--- a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.dat
+++ b/Master/texmf-dist/doc/generic/pst-plot/data/dotmatrix.data
@@ -1,954 +1,3 @@
-%% $Id: pst-plot-doc.dat 265 2010-01-22 13:12:25Z herbert $
-
-\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*}
-
-\begin{filecontents*}{dotmatrix.data}
/dotmatrix[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
0 3.55721976826610e-05 7.10098397054862e-05 0.000106179218337400 0.000140948314227245 0.000175187621984492 0.000208770953664963 0.000241576213186616 0.000273486135027779 0.000304388980960940 0.000334179189043621 0.000362757969617793 0.000390033843653419 0.000415923119402198 0.000440350303996051 0.000463248447322438 0.000484559416226169 0.000504234097815616 0.000522232531380950 0.000538523969154052 0.000553086866845215 0.000565908805572195 0.000576986347444655 0.000586324827674254 0.000593938086640890 0.000599848145853288 0.000604084832192025 0.000606685355211490 0.000607693842600914 0.000607160839161454 0.000605142774845305 0.000601701407523750 0.000596903246204681 0.000590818960408233 0.000583522781334101 0.000575091900319286 0.000565605869894256 0.000555146012503538 0.000543794841668432 0.000531635500040626 0.000518751218431540 0.000505224799509438 0.000491138129440830 0.000476571720320545 0.000461604285792338 0.000446312351814765 0.000430769904081227 0.000415048073163803 0.000399214858022859 0.000383334888113103 0.000367469223925737 0.000351675195439473 0.000336006277613348 0.000320512001744182 0.000305237901233126 0.000290225490060503 0.000275512272056985 0.000261131778882534 0.000247113634482260 0.000233483643680056 0.000220263902495435 0.000207472927725208 0.000195125803317794 0.000183234341082114 0.000171807253312969 0.000160850334978290 0.000150366653197985 0.000140356741846882 0.000130818799232720 0.000121748886931625 0.000113141128005480 0.000104987902975447 9.72800420811486e-05 9.00070125134514e-05 8.31570994681451e-05 7.67175800260978e-05 7.06748890209231e-05 6.50147762061274e-05 5.97224541787482e-05 5.47827366543926e-05 5.01801668183491e-05 4.58991355982523e-05 4.19239898150034e-05 3.82391302698594e-05 3.48290999165398e-05 3.16786623477432e-05 2.87728708956824e-05 2.60971287062900e-05 2.36372401969279e-05 2.13794543481244e-05 1.93105003115693e-05 1.74176158398266e-05 1.56885690586239e-05 1.41116741107415e-05 1.26758012021665e-05 1.13703815769372e-05 1.01854079377041e-05 9.11143081512803e-06 8.13955137149691e-06 7.26141110301448e-06 6.46917888169302e-06 5.75553575225182e-06 5.11365787241708e-06 4.53719795702202e-06 4.02026555777493e-06 3.55740648189000e-06 3.14358162432604e-06 2.77414546044891e-06 2.44482441880781e-06 2.15169532759495e-06 1.89116410344578e-06 1.65994482765746e-06 1.45503933278485e-06 1.27371740196806e-06 1.11349766432732e-06 9.72129252320764e-07 8.47574271125848e-07 7.37991115819433e-07 6.41718659390393e-07 5.57261323326896e-07 4.83275032659841e-07 4.18554048785211e-07 3.62018666098751e-07 3.12703752334804e-07 2.69748107431428e-07 2.32384611660035e-07 1.99931130552005e-07 1.71782141759689e-07 1.47401047291372e-07 1.26313133510536e-07 1.08099140773015e-07 9.23894045374465e-08 7.88585301628072e-08 6.72205643055703e-08 5.72246268309735e-08 4.86509683590999e-08 4.13074199683516e-08 3.50262031147937e-08 2.96610694369645e-08 2.50847418237912e-08 2.11866298297780e-08 1.78707942607004e-08 1.50541374700753e-08 1.26647975834498e-08 1.06407265226112e-08 8.92843326868213e-09 7.48187533210205e-09 6.26148283964499e-09 5.23330100677357e-09 4.36823806635273e-09 3.64140691227171e-09 3.03154985202930e-09 2.52053690226148e-09 2.09292901827224e-09 1.73559854460096e-09 1.43739997709567e-09 1.18888488030947e-09 9.82055470917730e-10 8.10151995951498e-10 6.67469594980510e-10 5.49200823566641e-10 4.51300482656350e-10 3.70369786889370e-10 3.03557275703718e-10 2.48474190337725e-10 2.03122326330599e-10 1.65832623745896e-10 1.35212985826933e-10 1.10104010310221e-10 8.95414967084000e-11 7.27247446134699e-11 5.89897905928689e-11 4.77868532587916e-11 3.86613523425465e-11 3.12379646105503e-11 2.52072506869869e-11 2.03144535014864e-11 1.63501362737793e-11 1.31423644419937e-11 1.05501916260206e-11 8.45823639417473e-12 6.77217959829401e-12 5.41502542250546e-12 4.32400712527613e-12 3.44802499305498e-12 2.74553273942610e-12 2.18279390683592e-12 1.73244285068225e-12 1.37230563882454e-12 1.08442584547819e-12 8.54269144942517e-13 6.70065687392197e-13 5.22273478857019e-13 4.03135486383725e-13 3.06312901419961e-13 2.26583857544003e-13 1.59586895154530e-13 1.01609487163431e-13 4.93990878491629e-14 3.95491901851490e-23
0 7.10098397054862e-05 0.000141751416020061 0.000211958153932731 0.000281366840321891 0.000349719267892208 0.000416763835171107 0.000482257088692742 0.000545965194147556 0.000607665324071400 0.000667146950578733 0.000724213032697039 0.000778681089019991 0.000830384147649470 0.000879171566724636 0.000924909720222220 0.000967482545138054 0.00100679194760712 0.00104275806696967 0.00107531939822616 0.00110443277472625 0.00113007321428987 0.00115223363324645 0.00117092443408555 0.00118617297352754 0.00119802291883291 0.00120653350106478 0.00121177867479294 0.00121384619437294 0.00121283661744622 0.00120886224668520 0.00120204602104999 0.00119252036793198 0.00118042602753878 0.00116591086072752 0.00114912865122836 0.00113023791282282 0.00110940071156269 0.00108678151254416 0.00106254606009997 0.00103686029955006 0.00100988934787237 0.000981796519829984 0.000952742415233168 0.000922884072135310 0.000892374189873565 0.000861360424978567 0.000829984762104086 0.000798382961276905 0.000766684081948596 0.000735010083552576 0.000703475501539085 0.000672187197183655 0.000641244178846474 0.000610737491804684 0.000580750173290111 0.000551357268943037 0.000522625906539245 0.000494615422562590 0.000467377536977695 0.000440956571405264 0.000415389705813230 0.000390707268807321 0.000366933056630764 0.000344084676060405 0.000322173906510954 0.000301207076825173 0.000281185452430705 0.000262105628778507 0.000243959927238200 0.000226736789907072 0.000210421170086628 0.000194994915488899 0.000180437141549294 0.000166724592539549 0.000153831988489068 0.000141732356232225 0.000130397343199671 0.000119797512860520 0.000109902620997097 0.000100681872252645 9.21041566333525e-05 8.41382658681118e-05 7.67530897315433e-05 6.99177926176025e-05 6.36019708122222e-05 5.77757910540333e-05 5.24101110926103e-05 4.74765830544146e-05 4.29477405084972e-05 3.87970701879512e-05 3.49990693701931e-05 3.15292899505684e-05 2.83643702607905e-05 2.54820556876788e-05 2.28612091398708e-05 2.04818123920652e-05 1.83249593092009e-05 1.63728419181426e-05 1.46087302531899e-05 1.30169468552663e-05 1.15828367541101e-05 1.02927337092739e-05 9.13392343019199e-06 8.09460443891211e-06 7.16384718210089e-06 6.33155194233900e-06 5.58840604313386e-06 4.92584078804394e-06 4.33598852225348e-06 3.81164015525259e-06 3.34620343623061e-06 2.93366222962570e-06 2.56853699711201e-06 2.24584665428891e-06 1.96107193545312e-06 1.71012036814056e-06 1.48929293051592e-06 1.29525243914638e-06 1.12499369205023e-06 9.75815372112111e-07 8.45293698758663e-07 7.31257801119908e-07 6.31766773530200e-07 5.45088363994784e-07 4.69679237983748e-07 4.04166753419524e-07 3.47332177843171e-07 2.98095275270451e-07 2.55500188064241e-07 2.18702538048130e-07 1.86957670935596e-07 1.59609968843383e-07 1.36083156994054e-07 1.15871532664165e-07 9.85320467995676e-08 8.36771714736398e-08 7.09684894055204e-08 6.01109449385655e-08 5.08476992664290e-08 4.29555360846042e-08 3.62407672996123e-08 3.05355918446311e-08 2.56948639925819e-08 2.15932308519106e-08 1.81226018549755e-08 1.51899161079307e-08 1.27151763392979e-08 1.06297209059851e-08 8.87470791868172e-09 7.39978791849105e-09 6.16194381450619e-09 5.12447887051513e-09 4.25613544652557e-09 3.53032899548162e-09 2.92448342502271e-09 2.41945544778022e-09 1.99903687655627e-09 1.64952506558843e-09 1.35935281983060e-09 1.11877007773579e-09 9.19570610394952e-10 7.54857758165700e-10 6.18843977247153e-10 5.06679602025103e-10 4.14306814197562e-10 3.38335312019869e-10 2.75936633842311e-10 2.24754482596032e-10 1.82828754789540e-10 1.48531287365473e-10 1.20511597702400e-10 9.76511429534519e-11 7.90248181611845e-11 6.38686028101141e-11 5.15524182842690e-11 4.15573868673441e-11 3.34568180879361e-11 2.69003275218171e-11 2.16006010574310e-11 1.73223710813383e-11 1.38732618900777e-11 1.10961863069496e-11 8.86305060624213e-12 7.06954020839523e-12 5.63081854157307e-12 4.47797592606110e-12 3.55509925581288e-12 2.81686900233027e-12 2.22657438883080e-12 1.75449168083585e-12 1.37654282590828e-12 1.07320091580412e-12 8.28586569647025e-13 6.29718842033405e-13 4.65900367224311e-13 3.28193120514788e-13 2.08986116355313e-13 1.01609356455991e-13 7.79136094652033e-23
@@ -1150,4 +199,3 @@
0 4.93990861551487e-14 1.01609356036612e-13 1.59586773958547e-13 2.26583508878272e-13 3.06312916403498e-13 4.03135369324916e-13 5.22273372194655e-13 6.70065332124526e-13 8.54268766944467e-13 1.08442562796287e-12 1.37230516693107e-12 1.73244241339376e-12 2.18279322022255e-12 2.74553221123005e-12 3.44802412259397e-12 4.32400633383540e-12 5.41502483370198e-12 6.77217885794658e-12 8.45823560118100e-12 1.05501906535553e-11 1.31423635532004e-11 1.63501351721394e-11 2.03144523634364e-11 2.52072494392824e-11 3.12379634523064e-11 3.86613509179151e-11 4.77868519352872e-11 5.89897893680399e-11 7.27247431403372e-11 8.95414951439684e-11 1.10104008747266e-10 1.35212984308537e-10 1.65832622205424e-10 2.03122324640121e-10 2.48474188667949e-10 3.03557274010806e-10 3.70369785213140e-10 4.51300480933838e-10 5.49200821661638e-10 6.67469592943021e-10 8.10151994167535e-10 9.82055468965794e-10 1.18888487845356e-09 1.43739997517530e-09 1.73559854260010e-09 2.09292901648078e-09 2.52053690031334e-09 3.03154985009397e-09 3.64140691042908e-09 4.36823806469660e-09 5.23330100503925e-09 6.26148283784940e-09 7.48187533060028e-09 8.92843326718280e-09 1.06407265213179e-08 1.26647975820713e-08 1.50541374685544e-08 1.78707942594068e-08 2.11866298284919e-08 2.50847418228028e-08 2.96610694359737e-08 3.50262031138515e-08 4.13074199677025e-08 4.86509683584590e-08 5.72246268306292e-08 6.72205643049539e-08 7.88585301624797e-08 9.23894045373845e-08 1.08099140772979e-07 1.26313133510656e-07 1.47401047291522e-07 1.71782141760272e-07 1.99931130552695e-07 2.32384611660558e-07 2.69748107432066e-07 3.12703752335709e-07 3.62018666099685e-07 4.18554048786263e-07 4.83275032661095e-07 5.57261323328281e-07 6.41718659391945e-07 7.37991115821117e-07 8.47574271127405e-07 9.72129252322543e-07 1.11349766432918e-06 1.27371740197008e-06 1.45503933278677e-06 1.65994482765956e-06 1.89116410344789e-06 2.15169532759720e-06 2.44482441880999e-06 2.77414546045121e-06 3.14358162432833e-06 3.55740648189237e-06 4.02026555777725e-06 4.53719795702443e-06 5.11365787241946e-06 5.75553575225420e-06 6.46917888169540e-06 7.26141110301683e-06 8.13955137149925e-06 9.11143081513042e-06 1.01854079377065e-05 1.13703815769395e-05 1.26758012021687e-05 1.41116741107438e-05 1.56885690586261e-05 1.74176158398287e-05 1.93105003115713e-05 2.13794543481265e-05 2.36372401969299e-05 2.60971287062921e-05 2.87728708956842e-05 3.16786623477451e-05 3.48290999165417e-05 3.82391302698614e-05 4.19239898150051e-05 4.58991355982541e-05 5.01801668183509e-05 5.47827366543945e-05 5.97224541787501e-05 6.50147762061292e-05 7.06748890209250e-05 7.67175800260998e-05 8.31570994681471e-05 9.00070125134533e-05 9.72800420811505e-05 0.000104987902975449 0.000113141128005482 0.000121748886931627 0.000130818799232723 0.000140356741846884 0.000150366653197987 0.000160850334978293 0.000171807253312972 0.000183234341082117 0.000195125803317797 0.000207472927725211 0.000220263902495439 0.000233483643680060 0.000247113634482264 0.000261131778882538 0.000275512272056989 0.000290225490060507 0.000305237901233131 0.000320512001744187 0.000336006277613353 0.000351675195439479 0.000367469223925742 0.000383334888113109 0.000399214858022865 0.000415048073163809 0.000430769904081234 0.000446312351814771 0.000461604285792345 0.000476571720320553 0.000491138129440838 0.000505224799509447 0.000518751218431548 0.000531635500040634 0.000543794841668440 0.000555146012503547 0.000565605869894265 0.000575091900319295 0.000583522781334111 0.000590818960408242 0.000596903246204691 0.000601701407523760 0.000605142774845315 0.000607160839161463 0.000607693842600924 0.000606685355211500 0.000604084832192035 0.000599848145853298 0.000593938086640900 0.000586324827674263 0.000576986347444665 0.000565908805572204 0.000553086866845224 0.000538523969154061 0.000522232531380959 0.000504234097815625 0.000484559416226177 0.000463248447322446 0.000440350303996058 0.000415923119402206 0.000390033843653425 0.000362757969617800 0.000334179189043627 0.000304388980960946 0.000273486135027784 0.000241576213186620 0.000208770953664967 0.000175187621984495 0.000140948314227247 0.000106179218337402 7.10098397054876e-05 3.55721976826622e-05 2.76160147305969e-19
0 3.95491901851265e-23 7.79136094651913e-23 1.13943924004746e-22 1.46560616720613e-22 1.74786283647544e-22 1.97774883035107e-22 2.14837063895569e-22 2.25460817396216e-22 2.29326833708802e-22 2.26318104577811e-22 2.16523483259740e-22 2.00235093558387e-22 1.77939663054348e-22 1.50304036916180e-22 1.18155302425947e-22 8.24561154674231e-23 4.42759638240989e-23 4.75922401763114e-24 -3.49090350986960e-23 -7.35384806080202e-23 -1.09969116416284e-22 -1.43105991153474e-22 -1.71951972882502e-22 -1.95637606756550e-22 -2.13447157485355e-22 -2.24840051030513e-22 -2.29467065992949e-22 -2.27180780676301e-22 -2.18039952171195e-22 -2.02307683944327e-22 -1.80443422941583e-22 -1.53089010580389e-22 -1.21049188766849e-22 -8.52671268535417e-23 -4.67956832464190e-23 -6.76524179281927e-24 3.36509358685597e-23 7.32728281816057e-23 1.10950186036125e-22 1.45598414102625e-22 1.76232758373692e-22 2.01999811896500e-22 2.22205436027755e-22 2.36338307933912e-22 2.44088443474871e-22 2.45360203883535e-22 2.40279470296400e-22 2.29194857096344e-22 2.12673027712580e-22 1.91488369446663e-22 1.66607471402502e-22 1.39169026249061e-22 1.10459937210040e-22 8.18885517217096e-23 5.49560585723975e-23 3.12271728314591e-23 1.23012899261904e-23 -2.14684498173405e-25 -4.73062952107854e-24 3.06531579929271e-25 1.63976978575308e-23 4.49825758349525e-23 8.74376528606504e-23 1.45081884305406e-22 2.19190659675396e-22 3.11018440860674e-22 4.21830287891620e-22 5.52942309316366e-22 7.05770901341519e-22 8.81890477310832e-22 1.08309924228388e-21 1.31149244057461e-21 1.56954240112069e-21 1.86018462943058e-21 2.18690914753826e-21 2.55385626621681e-21 2.96591598639579e-21 3.42883026856224e-21 3.94929747751670e-21 4.53507840245017e-21 5.19510336459916e-21 5.93958005211474e-21 6.78010185864492e-21 7.72975664242870e-21 8.80323596009888e-21 1.00169449572636e-20 1.13891132097542e-20 1.29399068988814e-20 1.46915427651739e-20 1.66684043126343e-20 1.88971607249044e-20 2.14068889023474e-20 2.42291989322790e-20 2.73983631620571e-20 3.09514488561957e-20 3.49284541853024e-20 3.93724470186409e-20 4.43297056772703e-20 4.98498604556858e-20 5.59860343427130e-20 6.27949809739369e-20 7.03372174360658e-20 7.86771491268005e-20 8.78831834610403e-20 9.80278288151163e-20 1.09187774724645e-19 1.21443949008194e-19 1.34881547187541e-19 1.49590029324820e-19 1.65663079205628e-19 1.83198520672989e-19 2.02298185866530e-19 2.23067730150305e-19 2.45616388626129e-19 2.70056669330620e-19 2.96503978505920e-19 3.25076173717461e-19 3.55893041067236e-19 3.89075693316578e-19 4.24745886386271e-19 4.63025252440240e-19 5.04034448577776e-19 5.47892221052581e-19 5.94714385898420e-19 6.44612727863551e-19 6.97693820631022e-19 7.54057772420677e-19 8.13796902221397e-19 8.76994353078728e-19 9.43722650052348e-19 1.01404221164873e-18 1.08799982471442e-18 1.16562709393252e-18 1.24693887818568e-18 1.33193172712019e-18 1.42058233225368e-18 1.51284600789864e-18 1.60865521801234e-18 1.70791816581408e-18 1.81051746362054e-18 1.91630890082207e-18 2.02512032824481e-18 2.13675067729908e-18 2.25096913229198e-18 2.36751447406636e-18 2.48609461270984e-18 2.60638632644356e-18 2.72803522294347e-18 2.85065593825973e-18 2.97383258717724e-18 3.09711947730038e-18 3.22004209734930e-18 3.34209838812537e-18 3.46276030234974e-18 3.58147565710958e-18 3.69767027997800e-18 3.81075044702390e-18 3.92010560791931e-18 4.02511139021128e-18 4.12513287158327e-18 4.21952810562057e-18 4.30765188325442e-18 4.38885970872900e-18 4.46251196565850e-18 4.52797824556244e-18 4.58464180823333e-18 4.63190414044817e-18 4.66918957693264e-18 4.69594994516934e-18 4.71166919365509e-18 4.71586796159982e-18 4.70810804685911e-18 4.68799672814087e-18 4.65519089725330e-18 4.60940095739128e-18 4.55039444421051e-18 4.47799932772405e-18 4.39210695487944e-18 4.29267459503193e-18 4.17972755340951e-18 4.05336082104877e-18 3.91374023353839e-18 3.76110311520485e-18 3.59575839006804e-18 3.41808614593275e-18 3.22853664330911e-18 3.02762876640577e-18 2.81594791914959e-18 2.59414337497880e-18 2.36292509496250e-18 2.12306003453810e-18 1.87536796475549e-18 1.62071683929466e-18 1.36001774360898e-18 1.09421946726766e-18 8.24302744862564e-19 5.51274214644105e-19 2.76160147305969e-19 2.14476560289169e-33
] def
-\end{filecontents*}
diff --git a/Master/texmf-dist/doc/generic/pst-plot/data/pstricks-add-data9.data b/Master/texmf-dist/doc/generic/pst-plot/data/pstricks-add-data9.data
new file mode 100644
index 00000000000..8bd09389cc7
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-plot/data/pstricks-add-data9.data
@@ -0,0 +1,4 @@
+some nonsense in this line ---time forcex forcey
+0 0.2
+1 1
+2 4
diff --git a/Master/texmf-dist/doc/generic/pst-plot/data/test.data b/Master/texmf-dist/doc/generic/pst-plot/data/test.data
new file mode 100644
index 00000000000..91b4c977bc7
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-plot/data/test.data
@@ -0,0 +1,5 @@
+ 0 3 8
+ 2 4 7
+ 5 5 5.5
+ 7 3.5 5
+ 10 2 9
diff --git a/Master/texmf-dist/doc/generic/pst-plot/data/zz.tex b/Master/texmf-dist/doc/generic/pst-plot/data/zz.tex
new file mode 100644
index 00000000000..c518596242e
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-plot/data/zz.tex
@@ -0,0 +1,5 @@
+\documentclass{minimal}
+\usepackage{filecontents}
+\begin{document}
+\input{pst-plot-doc.dat}
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/generic/pst-plot/dtk02-1.pdf b/Master/texmf-dist/doc/generic/pst-plot/dtk02-1.pdf
deleted file mode 100644
index 0fc4ce30313..00000000000
--- a/Master/texmf-dist/doc/generic/pst-plot/dtk02-1.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-plot/dtk02-1.tex b/Master/texmf-dist/doc/generic/pst-plot/dtk02-1.tex
deleted file mode 100644
index 1ca703b0c6c..00000000000
--- a/Master/texmf-dist/doc/generic/pst-plot/dtk02-1.tex
+++ /dev/null
@@ -1,561 +0,0 @@
-\documentclass[ngerman,12]{dtk}
-\begin{filecontents*}{\jobname}
-@Book{PostScript,
- Author = {Kollock, Nikolai G.},
- Title = {PostScript richtig eingesetzt: vom Konzept zum
- praktischen Einsatz},
- Publisher = {IWT},
- Address = {Vaterstetten},
- year = 1989,
-}
-
-@Manual{pstricks,
- Title = {PSTricks - {\PS} macros for Generic TeX},
- Author = {Timothy Van Zandt},
- Organization = {},
- Address = {},
- Note = {\url{http://www.tug.org/application/PSTricks}},
- year = 1993,
-}
-\end{filecontents*}
-\NeedPackage{pst-plot}
-\NeedPackage{url}
-\NeedPackage{longtable}
-%\makeatletter
-%\newcommand{\La}%
-% {L\kern-.36em
-% {\setbox0\hbox{T}%
-% \vbox to\ht0{\hbox{$\m@th$%
-% \csname S@\f@size\endcsname
-% \fontsize\sf@size\z@
-% \math@fontsfalse\selectfont
-% A}%
-% \vss}%
-% }}
-%\newcommand\AllTeX{(\La\kern-.075em)\kern-.075em\TeX}
-%\makeatother
-
-\title{Die mathematischen Funktionen von Postscript}
-\author{Herbert Voß}
-\address{Herbert}{Voß}{Wasgenstr. 21\\14129 Berlin\\voss@perce.de}
-\maketitle
-\begin{abstract}
- \PS, faktisch genauso alt wie \TeX, ist im Verhältnis dazu allgemein
- noch weniger bekannt, wenn es darum geht zu beurteilen, was es denn
- nun im eigentlichen Sinne ist. Außerdem wird häufig vergessen, dass
- sich mit den \PS-Funktionen viele Dinge erledigen lassen, bei denen
- sonst auf externe Programme zurückgegriffen wird. Dies wird im
- Folgenden für die mathematischen Funktionen im Zusammenhang mit dem
- Paket \texttt{pst-plot} gezeigt.
-\end{abstract}
-
-\section{Einführung}
-
-\PS, sehr häufig nur als Druckertreiber bekannt oder im Zusammenhang
-damit als Seitenbeschreibungssprache, ist ähnlich wie \TeX{} eine
-Programmiersprache, wobei \PS\ eindeutig als sogenannte Hochsprache
-bezeichnet werden muss.\cite{PostScript} Während die Ursprünge der
-Entwicklung bis in die Anfänge der siebziger Jahre zurückgehen, datiert
-die erste veröffentlichte \PS-Version von 1982, was nicht zufällig
-das Jahr der Gründung von \emph{Adobe System Incorporated} ist. Der
-erste Laserdrucker mit vollständiger \PS-Implementierung war der
-\emph{Apple Laserwriter}. Der einzige Computer, der \PS\ auch für
-die Bildschirmausgabe (Display \PS) verwendet, ist \emph{Next}.
-
-
-\section{\PS-Befehle}
-
-\PS~arbeitet mit dem so genannten Stack-System, welches den Benutzern
-von HP-Taschenrechnern geläufig und auch unter dem Namen \emph{UPN},
-\emph{Umgekehrte Polnische Notation} (Reverse Polish Notation), bekannt
-ist und letztlich den internen Standard für alle Computer darstellt.
-Die normale Notation für die Multiplikation "`$a*b=$"' wird zu
-"`$a$<enter>$b$<enter>*"'. Es sind immer zuerst die Parameter
-(Variablen) auf dem Stack abzulegen (durch <enter> symbolisiert),
-bevor eine der mathematischen Funktionen aufgerufen wird. Die hier
-beschriebenen Befehle beziehen sich immer auf das oberste Stack-Element
-oder die obersten beiden Stack-Elemente.
-
-Die direkte Anwendung der \PS-Befehle für die Darstellung
-mathematischer Zusammenhänge bringt gegenüber Programmen wie
-beispielsweise \texttt{gnuplot} nicht immer Vorteile in der
-endgültigen Druckausgabe. Auch lässt sich nicht unbedingt jedes
-mathematische Problem mit den \PS-Befehlen einfach lösen. Vorteile
-ergeben sich durch die Übersichtlichkeit und vor allen Dingen in der
-Länge der Textdateien.
-
-
-\section{Anwendung mit pst-plot}
-
-Das umfangreiche Paket \texttt{pstricks} (\url{CTAN:/graphics/pstricks/})
-ist nichts weiter als ein Frontend für \LaTeXTeX\ zu den \PS-Funktionen.
-Das Paket \texttt{pst-plot} (\url{CTAN:/graphics/pstricks/latex/pst-plot.sty}),
-welches Teil des Pakets \texttt{pstricks} ist, ermöglicht mit zwei
-Befehlen die Anwendung der \PS-Funktionen für das Zeichnen von mathematischen
-Funktionen. Mit der Anweisung \texttt{\textbackslash{}usepackage\{pst-plot\}}
-wird automatisch das übergeordnete Paket \texttt{pstricks} geladen.
-
-Die grundsätzliche Struktur der hier behandelten Befehle ist:
-
-\begin{verbatim}
-\psplot[Parameter]{xmin}{xmax}{Funktion f(x)}
-\parametricplot[Parameter]{tmin}{tmax}{Funktionen x(t), y(t)}
-\end{verbatim}
-
-Hierin bedeuten $\left[x_{min};\ x_{max}\right]$ und $\left[t_{min};\
- t_{max}\right]$ das jeweilige Definitionsintervall (Start- und
-Endwert). Die möglichen Parameter können der Dokumentation zu
-\texttt{pstricks} entnommen werden, die zwar schon älteren Datums ist,
-jedoch völlig ausreicht \cite{pstricks}. Hier ist im
-Zusammenhang mit den Funktionen lediglich der Parameter
-\texttt{plotpoints} interessant, welcher die Anzahl der Stützstellen
-angibt und standardmäßig auf 50 gesetzt ist. Sämtliche berechneten
-Punkte werden intern mit \texttt{\textbackslash{}psline} verbunden, so
-dass sich eine zu geringe Anzahl an Stützstellen durch einen
-Polygonzug bemerkbar macht. Mit Werten um $200$ liegt man in den
-meisten Fällen auf der richtigen Seite. In diesem Zusammenhang ist
-unbedingt zu beachten, dass geänderte Parameter so lange ihren Wert
-behalten, bis innerhalb eines \LaTeX{}-Laufs eine neue Wertzuweisung
-erfolgt.
-
-Der Variablenname für \texttt{psplot} ist per Definition $x$ und
-für \texttt{parametricplot} $t$. Beide können nicht verändert werden,
-was jedoch bezüglich der Anwendung keinerlei Einschränkung darstellt.
-Die Variablen können beliebig oft innerhalb eines Ausdrucks verwendet
-werden, denn erst mit der schließenden Klammer für den Funktionsausdruck
-wird davon ausgegangen, dass die zweite Koordinate für einen Punkt
-des Graphen oben auf dem Stack liegt. Der einzige Unterschied zwischen
-diesen beiden Befehlen ist, dass bei \texttt{psplot} nur der oberste
-Stack-Wert ($y$) und bei \texttt{parametricplot} die obersten beiden
-Stack-Werte ($x;y$) als Argumente verwendet werden.
-
-Zu beachten ist unbedingt, dass mit den beiden Befehlen keine
-Fehlermeldungen ausgegeben werden, was insbesondere für diejenigen
-mathematischen Funktionen von Interesse ist, deren Definitionsbereich
-nicht ganz $\Re $ entspricht. Denn bei \emph{einem} fehlerhaften
-Argument, beispielsweise $\sqrt{-1}$, wird der komplette Graph nicht
-gezeichnet!
-
-Der Vollständigkeit halber sei erwähnt, dass \texttt{pst-plot} noch
-weitere drei Befehle zum Zeichnen von Funktionsgraphen zur Verfügung
-stellt, die jedoch alle externe Datensätze voraussetzen:
-
-\begin{quote}
-\verb|\fileplot[|\var{Parameter}\verb|]{|\var{Dateiname}\verb|}|\\
-\verb|\dataplot[|\var{Parameter}\verb|]{|\var{Befehle}\verb|}|\\
-\verb|\listplot[|\var{Parameter}\verb|]{|\var{Liste}\verb|}|
-\end{quote}
-
-Weitere Informationen kann man der Dokumentation zu \texttt{pstricks}
-entneh\-men \cite{pstricks}.
-
-
-\section{Beispiele für \texttt{\textbackslash{}psplot}}
-
-Für alle Beispiele wird jeweils die komplette
-\texttt{pspicture}-Umgebung angegeben, sodass eine direkte Übernahme
-der Beispiele möglich ist. Eine Dokumentation des
-\texttt{multido}-Befehls findet man unter \url{CTAN:
- /macros/latex209/contrib/multido/multido.doc}, alle anderen in der
-Dokumenation zu \texttt{pstricks} \cite{pstricks}.
-
-\subsection{Sinusfunktion}
-
-\begin{tabular}{ll}\toprule
-Funktion &\PS \\\midrule
-$y(x)=\sin x$&\tt x sin \\\bottomrule
-\end{tabular}
-
-\begin{minipage}[c]{5.25cm}%
-\psset{xunit=0.0111cm,yunit=1cm}%
-\begin{pspicture}(-20,-1.25)(400,1.25)%
-\psline[linewidth=1pt]{->}(-20,0)(400,0)%
-\psline[linewidth=1pt]{->}(0,-1.25)(0,1.25)%
-\multido{\n=+90}{5}{\psline[linestyle=dotted]%
- (\n,-1.25)(\n,1.25)\rput(\n,-0.25){\scriptsize{\n}}}
-\multido{\n=-1+1}{3}{\psline[linestyle=dotted]%
- (0,\n)(405,\n)\rput[r](-4,\n){\scriptsize{\n}}}
-\psplot[plotstyle=curve,linewidth=1.5pt]{-20}{400}{x sin}% postscriptfunction
-\rput[l](-5,1.75){$\mathbf{y}$}%
-\rput[l](390,-.25){$\mathbf{x}$}%
-\rput[l](180,0.75){$y=\sin x$}%
-%rput[l](1.57,-0.25){$\frac{\pi}{2}$}%
-\end{pspicture}
-\end{minipage}%
-\hfill
-\begin{minipage}[c]{0.50\columnwidth}%
-\scriptsize
-\begin{verbatim}
-\psset{xunit=0.0111cm,yunit=1cm}
-\begin{pspicture}(-20,-1.25)(400,1.25)
-\psline[linewidth=1pt]{->}(-20,0)(400,0)
-\psline[linewidth=1pt]{->}(0,-1.25)(0,1.25)
-\multido{\n=+90}{5}{\psline[linestyle=dotted]%
- (\n,-1.25)(\n,1.25)\rput(\n,-0.25)%
- {\scriptsize \n}}
-\multido{\n=-1+1}{3}{\psline[linestyle=dotted]%
- (0,\n)(405,\n)\rput[r](-4,\n){\scriptsize \n}}
-\psplot[plotstyle=curve,linewidth=1.5pt]%
- {-20}{400}{x sin}% postscript function
-\rput[l](-5,1.75){$\mathbf{y}$}
-\rput[l](390,-.25){$\mathbf{x}$}
-\rput[l](180,0.75){$y=\sin x$}
-\end{pspicture}
-\end{verbatim}
-\end{minipage}%
-
-\subsection{Potenzfunktion}
-
-Dargestellt wird eine Parabel dritten Grades sowie ihre
-Umkehrfunktion, wobei die Intervallunterscheidung nicht zwingend ist,
-wenn man die Exponentialschreibweise mit $y=x^{-\frac{1}{3}}$ wählt.
-
-\begin{tabular}{p{4.5cm}p{3cm}}\toprule
-Funktion&\PS\\\midrule
-$y(x)=x^{3}$
-
-$y^{-1}(x)=\left\{ \begin{array}{cc}
- +\sqrt[3]{\left|x\right|} & x>0\\
- -\sqrt[3]{\left|x\right|} & x<0\\ \end{array}
-\right.$&
-\parbox[t]{3cm}{\tt x 3 exp \\
-x 0.333 exp
-
-\rm (Umkehrfunktion)}\\\bottomrule
-\end{tabular}
-
-\begin{minipage}[c]{5.5cm}%
-\begin{pspicture}(-2.5,-2.5)(2.5,2.5)%
-\psset{xunit=0.75cm,yunit=0.75cm}
-\psgrid[subgriddiv=1,griddots=10,gridlabels=7pt](-3,-3)(3,3)
-\psline[linewidth=1pt]{->}(-3,0)(3,0)
-\psline[linewidth=1pt]{->}(0,-3)(0,3)
-\psline[linewidth=0.5pt,linestyle=dotted](-3,-3)(3,3)
-\psplot[plotstyle=curve,linewidth=1.5pt]{-1.45}{1.45}{x 3 exp}% postscript function
-\psplot[plotstyle=curve,linewidth=1.5pt, linestyle=dashed]%
- {0}{3}{x 0.333 exp}% postscript function
-\psplot[plotstyle=curve,linewidth=1.5pt, linestyle=dashed]%
- {-3}{0}{x -1 mul 0.333 exp -1 mul}% postscript function
-\rput[l](-.25,3.25){$\mathbf{y}$}
-\rput[l](3.25,-.25){$\mathbf{x}$}
-\rput[l](1.5,2.5){$y=x^3$}
-\rput[l](1.25,0.5){$y=+\sqrt[3]{|x|}$}
-\rput[r](-1.25,-0.5){$y=-\sqrt[3]{|x|}$}
-\end{pspicture}\end{minipage}%
-\begin{minipage}[c]{0.50\columnwidth}%
-\scriptsize\begin{verbatim}
-\begin{pspicture}(-3,-3)(3,3)
-\psgrid[subgriddiv=1,griddots=10,%
- gridlabels=7pt](-3,-3)(3,3)%
-\psline[linewidth=1pt]{->}(-3,0)(3,0)%
-\psline[linewidth=1pt]{->}(0,-3)(0,3)%
-\psline[linewidth=0.5pt,linestyle=dotted]%
- (-3,-3)(3,3)%
-\psplot[plotstyle=curve,linewidth=1.5pt]%
- {-1.4}{1.4}{x 3 exp}% postscript function
-\psplot[plotstyle=curve,linewidth=1.5pt,%
- linestyle=dashed]{0}{3}{x 0.333 exp}
-\psplot[plotstyle=curve,linewidth=1.5pt,%
- linestyle=dashed]{-3}{0}%
- {x -1 mul 0.333 exp -1 mul}
-\rput[l](-.25,3.5){$\mathbf{y}$}%
-\rput[l](3.5,-.25){$\mathbf{x}$}%
-\rput[l](1.5,2.5){$y=x^3$}%
-\rput[l](1.25,0.5){$y=+\sqrt[3]{|x|}$}%
-\rput[r](-1.25,-0.5){$y=-\sqrt[3]{|x|}$}
-\end{pspicture}
-\end{verbatim}
-\end{minipage}%
-
-
-\subsection{Beispiel aus der Leistungselektronik}
-
-Gezeigt wird die graphische Darstellung des relativen Strommittelwertes
-für eine Stromrichtersteuerung durch ein Thyristorpaar. Hierbei entspricht
-der Parameter $\varphi $ der Phasenverschiebung zwischen Strom und
-Spannung. Die unabhängige Variable $\alpha $ bezeichnet den Steuerwinkel.
-
-\begin{tabular}{ll}\toprule
-Funktion&
-$\displaystyle \frac{I(\alpha )}{I_{0}}=\left\{ \begin{array}{ll}
- \sqrt{1-\frac{\alpha }{\pi }+\frac{1}{2\pi }\sin 2\alpha } & \varphi =0\\
- & \\
- \sqrt{\left(2-\frac{2\alpha }{\pi }\right)\left(2+\cos 2\alpha
-\right)+\frac{3}{\pi }\sin 2\alpha } & \varphi =\frac{\pi }{2}\\ \end{array}
-\right.$\smallskip{}
-\\
-\hline
-\PS&
-\begin{tabular}{p{7.5cm}l}
-\tt 1 x 180 div sub 1 6.28 div x 2 mul sin mul add sqrt&
-$\varphi =0$\\
-%\hline
-\tt 2 x 90 div sub x 2 mul cos 2 add mul x 2 mul sin 3 3.15 div mul add
-sqrt&
-$\varphi =\frac{\pi }{2}$\\
-\end{tabular}\\\bottomrule
-\end{tabular}
-
-Zu beachten ist, dass \PS~die Argumente für die trigonometrischen
-Funktionen im Gradmaß erwartet, sodass für relative Winkel auf gleiche
-Einheiten zu achten ist. Der Ausdruck $\frac{\alpha }{\pi }$ ist
-daher durch $\frac{\alpha }{180}$ zu ersetzen.
-
-\begin{minipage}[c]{6.5cm}%
-\begin{center}\psset{xunit=0.0275cm,yunit=4cm}
-\begin{pspicture}(0,-0.25)(190,1.25)
-\psline[linewidth=1pt]{->}(0,0)(190,0)
-\psline[linewidth=1pt]{->}(0,0)(0,1.15)
-\multido{\n=30+30}{6}{\psline[linestyle=dotted](\n,0)(\n,1)\rput(\n,-0.05){\scriptsize{\n}}}
-\multido{\n=0.2+0.2}{5}{\psline[linestyle=dotted](0,\n)(180,\n)\rput[r](-4,\n){\scriptsize{\n}}}
-\psplot[plotstyle=curve,linewidth=1.5pt]{0}{180}%
-{1 x 180 div sub 1 6.28 div x 2 mul sin mul add sqrt}% postscriptfunction
-\psplot[plotstyle=curve,linewidth=1.5pt,linestyle=dashed]{90}{180}%
-{2 x 90 div sub x 2 mul cos 2 add mul x 2 mul sin 3 3.15 div mul add sqrt}% postscriptfunction
-\rput(0,1.2){$\mathbf{I/I_0}$}
-\rput[l](190,-.05){$\mathbf{\alpha}$}
-\rput(45,0.85){$\varphi=0$}
-\rput(120,0.9){$\varphi=90°$}
-\end{pspicture}\end{center}\end{minipage}%
-\begin{minipage}[c]{0.50\columnwidth}%
-\scriptsize
-\begin{verbatim}
-\psset{xunit=0.0333cm,yunit=3cm}
-\begin{pspicture}(0,-0.25)(190,1.25)
-\psline[linewidth=1pt]{->}(0,0)(190,0)
-\psline[linewidth=1pt]{->}(0,0)(0,1.15)
-\multido{\n=30+30}{6}{\psline[%
- linestyle=dotted](\n,0)(\n,1)%
- \rput(\n,-0.05){\scriptsize \n}}
-\multido{\n=0.2+0.2}{5}{\psline[%
- linestyle=dotted](0,\n)(180,\n)%
- \rput[r](-4,\n){\scriptsize \n}}
-\psplot[plotstyle=curve,%
- linewidth=1.5pt]{0}{180}%
- {1 x 180 div sub 1 6.28 %
- div x 2 mul sin mul add sqrt}
-\psplot[plotstyle=curve,%
- linewidth=1.5pt,linestyle=dashed]%
- {90}{180}{2 x 90 div sub x 2 mul cos%
- 2 add mul x 2 mul sin 3 3.15%
- div mul add sqrt}
-\rput(0,1.2){$\mathbf{I/I_0}$}
-\rput[l](190,-.05){$\mathbf{\alpha}$}
-\rput(45,0.85){$\varphi=0$}
-\rput(120,0.9){$\varphi=90°$}
-\end{verbatim}
-\end{minipage}%
-
-
-\renewcommand{\arraystretch}{1.0}
-
-
-\section{Beispiele für \texttt{\textbackslash{}parametricplot}}
-
-
-\subsection{Lissajous-Figur}
-
-Die aus der Physik oder Elektrotechnik bekannten Lissajous-Figuren sind
-ein typischer Anwendungsfall für Gleichungen in Parameterform. Die
-hier angegebene Darstellung beruht auf den Funktionen:
-
-\begin{tabular}{cl}\toprule
-Funktion&
-\PS\\\midrule
-$x=\sin 1.5t$&\tt
-t 1.5 mul sin\\
-%\hline
-$y=\sin \left(2t+\frac{\pi }{3}\right)$&\tt
-t 2 mul 60 add sin\\\bottomrule
-\end{tabular}
-
-\begin{minipage}[c]{4cm}%
-\begin{center}\psset{xunit=1.5cm,yunit=1.5cm}
-\begin{pspicture}(-1.1,-1.1)(1.1,1.1)
-\psgrid[subgriddiv=0,griddots=10,gridlabels=7pt](-1,-1)(1,1)
-\parametricplot%
- [plotstyle=curve,linewidth=1.5pt,plotpoints=200]%
- {-360}{360}%
- {t 1.5 mul sin t 2 mul 60 add sin}
-\end{pspicture}\end{center}\end{minipage}%
-\hfill{}\begin{minipage}[c]{0.75\columnwidth}%
-\scriptsize
-\begin{verbatim}
-\psset{xunit=1.5cm,yunit=1.5cm}
-\begin{pspicture}(-1,-1)(1,1)
-\psgrid[subgriddiv=0,griddots=10,gridlabels=7pt]%
- (-1,-1)(1,1)
-\parametricplot[plotstyle=curve,linewidth=1.5pt,%
- plotpoints=200]{-360}{360}{%
- t 1.5 mul sin t 2 mul 60 add sin}
-\end{pspicture}
-\end{verbatim}
-\end{minipage}%
-
-
-Aufgrund der "`Länge"' des Graphen wurde der Wert für
-\texttt{plotpoints} auf $200$ gesetzt, sodass auch die "`Ecken"' des
-Graphen mit starker Krümmung kontinuierlich erscheinen.
-
-
-\subsection{Strophoide}
-
-Zum Schluss wird eine sogenannte Strophoide dargestellt, die durch
-folgende Beziehungen gegeben ist, wobei $a$ durch einen Zahlenwert
-ersetzt werden muss:
-
-\def\arraystretch{1.2}
-
-\begin{tabular}{cl}\toprule
-Funktion&
-\PS\\
-\midrule
-$x(t)=\frac{\displaystyle a\left(t^{2}-1\right)}{\displaystyle t^{2}+1}$&\tt
-t t mul 1 sub $a$ mul t t mul 1 add div\\
-%\hline
-$y(t)=\frac{\displaystyle at\left(t^{2}-1\right)}{\displaystyle t^{2}+1}$&\tt
-t t mul 1 sub t mul $a$ mul t t mul 1 add div \\\bottomrule
-\end{tabular}
-
-\begin{minipage}[c]{4cm}%
-\begin{center}\psset{xunit=2cm,yunit=2cm}
-\begin{pspicture}(-1.25,-1.25)(1.25,1.25)
-\psgrid[subgriddiv=1,griddots=10,gridlabels=7pt](-1,-1)(1,1)
-\parametricplot%
- [plotstyle=curve,plotpoints=200,linewidth=1.5pt]{-1.85}{1.85}%
- {t t mul 1 sub t t mul 1 add div % a=1
- t t mul 1 sub t mul t t mul 1 add div}
-\parametricplot[plotstyle=curve,plotpoints=200,%
- linewidth=1.5pt, linestyle=dashed]{-4.5}{4.5}%
- {t t mul 1 sub 0.25 mul t t mul 1 add div % a=0.25
- t t mul 1 sub t mul 0.25 mul t t mul 1 add div}
-\parametricplot[plotstyle=curve,plotpoints=200,%
- linewidth=1.5pt, linestyle=dotted]{-2.1}{2.1}%
- {t t mul 1 sub 0.75 mul t t mul 1 add div % a=0.75
- t t mul 1 sub t mul 0.75 mul t t mul 1 add div}
-\rput[l](-0.95,-0.4){$\scriptstyle a=1;\ 0.75;\ 0.25$}
-\end{pspicture}\end{center}\end{minipage}%
-\hfill{}\begin{minipage}[c]{0.57\columnwidth}%
-\scriptsize
-\begin{verbatim}
-\psset{xunit=2cm,yunit=2cm}
-\begin{pspicture}(-1.25,-1.25)(1.25,1.25)
-\psgrid[subgriddiv=1,griddots=10,%
- gridlabels=7pt](-1,-1)(1,1)
-\parametricplot[plotstyle=curve,plotpoints=200,%
- linewidth=1.5pt]{-1.85}{1.85}%
- {t t mul 1 sub t t mul 1 add div % a=1
- t t mul 1 sub t mul t t mul 1 add div}
-\parametricplot[plotstyle=curve,plotpoints=200,%
- linewidth=1.5pt, linestyle=dashed]{-5}{5}%
- {t t mul 1 sub 0.25 mul t t mul 1 add div %
- t t mul 1 sub t mul 0.25 mul t t mul 1 add div}
-\parametricplot[plotstyle=curve,plotpoints=200,%
- linewidth=1.5pt, linestyle=dashed]{-1}{1}%
- {t t mul 1 sub 0.75 mul t t mul 1 add div %
- t t mul 1 sub t mul 0.75 mul t t mul 1 add div}
-\rput[l](-0.95,-0.4){$\scriptstyle %
- a=1;\ 0.75;\ 0.25$}
-\end{pspicture}
-\end{verbatim}
-\end{minipage}%
-
-
-\appendix
-
-\section{Zusammenstellung der mathematischen \PS-Funktionen}
-
-Die folgende tabellarische Zusammenstellung enthält bis auf die
-Matrizenbefehle alle mathematischen Funktionen mit ihren
-Eigenschaften. Hierin sind \emph{<int>} und \emph{<real>} die
-bekannten Integer und Reals, während für \emph{<any>} jeder
-beliebige Typ und für \emph{<num>} \emph{real} oder \emph{integer}
-gesetzt werden kann. Unabhängig von der Null gelten für Zahlen unter
-\PS\ die folgenden Grenzen, wobei die Angaben für \emph{real}
-betragsmäßig zu verstehen sind.
-
-\begin{tabular}{lcc}\toprule
-&
-\emph{integer}&
-\emph{real}\\
-\hline
-kleinster Wert&
-$-2^{32}$&
-$\pm 10^{-38}$\\
-größter Wert&
-$2^{32}-1$&
-$\pm 10^{38}$\\\bottomrule
-\end{tabular}
-
-\begingroup
-\def\arraystretch{1.1}%
-\begin{longtable}{p{10.5mm}p{26mm}p{36mm}p{28mm}}
-\toprule
-\textit{Name}&
-\textit{Bedeutung}&
-\textit{Anwendung}&
-\textit{Beispiel}\\\midrule
-\endhead
-abs&Absolutwert&<num> abs&$-3$~abs~$\rightarrow 3$ \\
-%\hline
-add&Addition\footnotemark&<num1> <num2> add&$5$~$7$~add~$\rightarrow 12$\\
-%\hline
-atan&Arcus Tangens\footnotemark&<real1> <real2> atan&$2$~$45$~atan$\rightarrow 2.54$\\
-%\hline
-cos&Cosinus\footnotemark&<real> cos&$60$~cos$\rightarrow 0.5$\\
-%\hline
-cvi&Real$\rightarrow $Integer&<real> cvi&$14.13$~cvi$\rightarrow 14$\\
-%\hline
-cvr&Integer$\rightarrow $Real&<int> cvr&$14$~cvr$\rightarrow 14.00$\\
-%\hline
-div&Division\footnotemark&<real1> <real2> div&$100\ 8$~div$\rightarrow 12.5$\\
-%\hline
-dup&\raggedright Dupliziere oberstes Stack-Element&<any> dup&$12$~dup$\rightarrow 12\ 12$\\
-%\hline
-exch&Exchange\footnotemark&<any1> <any2> exch&$12\ 13$~exch$\rightarrow 13\ 12$\\
-%\hline
-exp&Potenz&<real1> <real2> exp&$3\ 4$~exp$\rightarrow 81.0$\\
-%\hline
-idiv&\raggedright ganzzahlige Division&<int1> <int2> idiv&$100\ 8$~idiv$\rightarrow 12$\\
-%\hline
-ln&\raggedright natürlicher Logarithmus&<real> ln&$12$~ln$\rightarrow 2.48491$\\
-%\hline
-log &Zehner-Logarithmus &<real> log&$1000$~log$\rightarrow 3.00$\\
-%\hline
-mod &Modulo&<int1> <int2> mod&$5\ 3\ $mod$\rightarrow 2$\\
-%\hline
-mul &Multiplikation$^{1}$ &<num1> <num2> mul&$5\ 3\ $mul$\rightarrow 15$\\
-%\hline
-neg &\raggedright Negiere Vorzeichen&<num> neg&$5\ $neg$\rightarrow -5$\\
-%\hline
-round &Runden&<real> round&$5.7\ $round$\rightarrow 6$\\
-%\hline
-sin &Sinus$^{3}$&<real> sin&$30$~sin$\rightarrow 0.5$\\
-%\hline
-sqrt &Quadratwurzel&<real> sqrt&$16$ sqrt$\rightarrow 4.0$\\
-%\hline
-sub &Subtraktion$^{1}$&<num1> <num2> sub&$17\ 19\ $sub$\rightarrow -2$\\
-%\hline
-truncate&Dezimalteil abtrennen\footnotemark&<real> truncate&$-33.33\rightarrow 33.00\ $\\\bottomrule
-\end{longtable}
-
-\small\parskip=1pt
-Anmerkungen:
-
-$^{1}$ Sind beide Argumente ganze Zahlen ist auch das Ergebnis vom
-Typ Integer.
-
-$^{2}$ Entspricht der Darstellung $\alpha =
-\textrm{arctan}\displaystyle \frac{<real1>}{<real2>}$.
-
-$^{3}$ Das Argument wird im Gradmaß erwartet.
-
-$^{4}$ Das Ergebnis ist grundsätzlich vom Typ \emph{real}.
-
-$^{5}$ Die Anordnung der letzten beiden Stack-Elemente wird vertauscht.
-
-$^{6}$ Das Ergebnis bleibt vom Typ \emph{real}.
-\endgroup
-
-\bibliography{\jobname}
-\end{document}
diff --git a/Master/texmf-dist/doc/generic/pst-plot/dtk02-2.bib b/Master/texmf-dist/doc/generic/pst-plot/dtk02-2.bib
deleted file mode 100644
index f27916c11eb..00000000000
--- a/Master/texmf-dist/doc/generic/pst-plot/dtk02-2.bib
+++ /dev/null
@@ -1,86 +0,0 @@
-%% -*-bibtex-*-
-@STRING{beiprogramm = {{\TeX}-Beiprogramm} }
-@STRING{bretter = {Bretter, die die Welt bedeuten} }
-@STRING{dtk = {{D}ie {\TeX}nische {K}om{\"o}die} }
-@STRING{editorial = {Editorial} }
-@STRING{fremdebuehne = {Von fremden B{\"u}hnen} }
-@STRING{fundus = {Aus dem Fundus} }
-@STRING{hinterbuehne = {Hinter der B{\"u}hne} }
-@STRING{leserbrief = {Leserbrief(e)} }
-@STRING{magazin = {Magazin} }
-@STRING{rezension = {Rezensionen} }
-@STRING{schonimmer = {Was Sie schon immer {\"u}ber {\TeX} wissen wollten
- \dots} }
-@STRING{theaterkasse = {Von der Theaterkasse} }
-@STRING{theatertage = {{\TeX}-Theatertage} }
-
-@Article{ dtk02.1:voss:mathematischen,
- author = {Herbert Vo{\ss}},
- title = {Die mathematischen Funktionen von Postscript},
- journal = dtk,
- year = 2002,
- volume = {1/02},
- altvolume = 1,
- altnumber = 14,
- month = mar,
- pages = {},
- annote = bretter,
- keywords = {},
- abstract = { \PS, faktisch genauso alt wie {\TeX}, ist im
- Verh{\"a}ltnis dazu allgemein noch weniger bekannt, wenn es
- darum geht zu beurteilen, was es denn nun im eigentlichen
- Sinne ist. Au{\ss}erdem wird h{\"a}ufig vergessen, dass
- sich mit den \PS-Funktionen viele Dinge erledigen lassen,
- bei denen sonst auf externe Programme zur{\"u}ckgegriffen
- wird. Dies wird im Folgenden f{\"u}r die mathematischen
- Funktionen im Zusammenhang mit dem Paket \texttt{pst-plot}
- gezeigt. }
-}
-
-@Book{ companion,
- author = {Michel Goosens and Frank Mittelbach and Alexander
- Samarin},
- title = {The {\LaTeX} Graphics Companion},
- publisher = {Addison-Wesley Publishing Company},
- year = {1997},
- address = {Reading, Mass.}
-}
-
-@Article{ girou:01:,
- author = {Denis Girou},
- title = {Pr\'esentation de PSTricks},
- journal = {Cahier GUTenberg},
- year = 1994,
- volume = {16},
- month = apr,
- pages = {21-70}
-}
-
-@Article{ girou:02:,
- author = {Timothy van Zandt and Denis Girou},
- title = {Inside PSTricks},
- journal = TUGboat,
- year = 1994,
- volume = {15},
- month = sep,
- pages = {239-246}
-}
-
-@Book{PostScript,
- Author = {Kollock, Nikolai G.},
- Title = {PostScript richtig eingesetzt: vom Konzept zum
- praktischen Einsatz},
- Publisher = {IWT},
- Address = {Vaterstetten},
- year = 1989,
-}
-
-@Manual{pstricks,
- Title = {PSTricks - {\PS} macros for Generic TeX},
- Author = {Timothy van Zandt},
- Organization = {},
- Address = {http://www.tug.org/application/PSTricks},
- Note = {},
- year = 1993
-}
-
diff --git a/Master/texmf-dist/doc/generic/pst-plot/dtk02-2.pdf b/Master/texmf-dist/doc/generic/pst-plot/dtk02-2.pdf
deleted file mode 100644
index 014508059ef..00000000000
--- a/Master/texmf-dist/doc/generic/pst-plot/dtk02-2.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-plot/dtk02-2.tex b/Master/texmf-dist/doc/generic/pst-plot/dtk02-2.tex
deleted file mode 100644
index 353db1f24f8..00000000000
--- a/Master/texmf-dist/doc/generic/pst-plot/dtk02-2.tex
+++ /dev/null
@@ -1,375 +0,0 @@
-\documentclass[ngerman]{dtk}
-\usepackage[T1]{fontenc}
-\usepackage[latin1]{inputenc}
-%\usepackage{pslatex}
-\usepackage{tabularx}
-\usepackage{url}
-\usepackage{graphicx}
-\usepackage{cite}
-%\makeatletter
-%\newcommand{\La}%
-% {L\kern-.36em
-% {\setbox0\hbox{T}%
-% \vbox to\ht0{\hbox{$\m@th$%
-% \csname S@\f@size\endcsname
-% \fontsize\sf@size\z@
-% \math@fontsfalse\selectfont
-% A}%
-% \vss}%
-% }}
-%\makeatother
-%\def\AllTeX{(\La\kern-.075em)\kern-.075em\TeX}
-
-\begin{document}
-\NeedPackage{tabularx}
-\NeedPackage{url}
-\NeedPackage{graphicx}
-\NeedPackage{cite}
-
-
-\title{Die Plot-Funktionen von \texttt{pst-plot}}
-\author{Laura E. Jackson\and Herbert Voß}
-\maketitle
-\begin{abstract}
- Im letzten Heft wurden die mathematischen Funktionen von \PS~im
- Zusammenhang mit dem \LaTeX-Paket \texttt{pst-plot} zum Zeichnen von
- Funktionen beschrieben und durch Beispiele erläutert. In diesem Teil
- werden die bislang nur erwähnten Plot-Funktionen für externe Daten
- behandelt.
-\end{abstract}
-
-\section{Einführung}
-Die graphische Darstellung externer Datensätze gehört zu den
-Standardproblemen von technisch-wissenschaftlichen Veröffentlichungen.
-Sehr häufig werden diese mit \texttt{gnuplot} eingelesen, dargestellt,
-mit Koordinatenachsen und weiteren Hinweisen versehen und dann
-abschließend nach \LaTeX\ exportiert. Im Folgenden werden Wege
-aufgezeigt, die den Umweg über \texttt{gnuplot} oder entsprechende
-Programme überflüssig machen können.
-
-Die Geschichte und die Bedeutung von \PS\ wurden hinreichend im
-letzten Heft \cite{dtk02.1:voss:mathematischen} behandelt, ebenso wie
-das benötigte Paket \texttt{pst-plot}
-(\url{CTAN:/graphics/pstricks/latex/pst-plot.sty}), welches Teil des
-Pakets \texttt{pstricks} ist und mit der Anweisung
-\texttt{\textbackslash{}usepackage\{pst-plot\}} einzubinden ist. Daher
-braucht an dieser Stelle nicht weiter auf diese spezifischen Dinge
-eingegangen zu werden.
-
-Das Paket \texttt{pst-plot} stellt die folgenden drei Plot-Funktionen
-für die Darstellung externer Daten mit folgender Syntax zur Verfügung:
-
-\begin{verbatim}
-\fileplot*[<Parameter>]{<Dateiname>}
-\dataplot*[<Parameter>]{<Befehle>}
-\listplot*[<Parameter>]{<Liste>}
-\end{verbatim}
-
-Die Sternversionen stehen hierbei wie für alle Objekte von
-\texttt{PSTricks} jeweils für die inverse Darstellung der Daten,
-d.\,h. für eine standardmäßige Schwarz-Weiß-Grafik erhält man mit der
-Sternversion das Negativ. Im Folgenden wird nur die normale
-Darstellung berücksichtigt, da dies keine Einschränkung der
-Allgemeinheit bedeutet.
-
-Im Zusammenhang mit den Plot-Funktionen sind noch folgende Befehle
-interessant, die ebenfalls durch das Paket \texttt{pst-plot} definiert
-sind:
-
-\begin{verbatim}
-\readdata{<Objectname>}{<Dateiname>}
-\savedata{<Objectname>}{<Dateiname>}
-\end{verbatim}
-
-Weitere Informationen kann man der Dokumentation zu \texttt{pstricks}
-entneh\-men\cite{pstricks} oder der umfangreichen Beschreibung in
-\cite{companion,girou:01:,girou:02:}, die jedoch alle nicht die
-wesentlichen Unterschiede zwischen den drei Plot-Funktionen
-herausarbeiten. Für alle Beispiele wird jeweils die komplette
-\texttt{pspicture}-Umgebung angegeben, so dass eine direkte Übernahme
-der Beispiele möglich ist. Eine Dokumentation des
-\texttt{multido}-Befehls findet man unter \url{CTAN:
- /macros/latex209/contrib/multido/multido.doc}, alle anderen hier
-nicht weiter erwähnten in der Dokumenation zu
-\texttt{pstricks} \cite{pstricks}.
-
-\section{Plot-Stile}
-
-Insbesondere der Plot-Stil ist als Parameter von Bedeutung und kann
-folgende Werte annehmen:
-
-\noindent\begin{tabularx}{1.0\linewidth}{rX}\toprule
- \emph{Stilparameter} & \emph{Bedeutung}\\\midrule
-% \hline
- \texttt{plotstyle=dots} & Wertepaare als einzelne Punkte setzen\\
- \texttt{=line} & Wertepaare durch eine Gerade verbinden\\
- \texttt{=polygon} & Wie \texttt{line}, nur mit geschlossenem
- Linienzug\\
- \texttt{=curve} & Interpolation zwischen den Wertepaaren,
- wobei die Kurve über den Anfangs-/Endpunkt
- hinausgehen kann\\
- \texttt{=ecurve} & Wie \texttt{curve}, nur beginnt/endet die
- Kurve bei dem Anfangs-/Endwertepaar.\\
- \texttt{=ccurve} & Wie \texttt{curve}, nur mit geschlossenem
- Kurvenzug\\\bottomrule
-\end{tabularx}
-
-Bei einer fehlenden Angabe wird grundsätzlich die \texttt{line}-Option
-gewählt.
-
-
-\section{Beispiele für \texttt{\textbackslash{}fileplot}}
-
-\texttt{fileplot} ist immer dann angebracht, wenn in einer Datei
-gespeicherte Zahlenpaare $(x|y)$ geplottet werden sollen. Diese sind
-als reine Zahlenwerte paarweise in einer oder mehreren Zeilen
-anzuordnen und dürfen nur auf vier verschiedene Arten getrennt sein
-(Leerschritt, Komma oder runde bzw. geschweifte Klammern):
-
-\verb#x y x,y (x,y) {x,y}#
-
-Der als Trenner häufig benutzte Tabulator (\texttt{\textbackslash{}t}
-bzw. \texttt{\textbackslash{}009}) ist demnach nicht zulässig, kann
-aber leicht durch Texteditoren oder für Unix mit
-
-\texttt{tr '\textbackslash{}t' ' ' < inFile > outFile}
-
-ersetzt werden. Diese Datendateien dürfen bis auf das \TeX-übliche
-Kommentarzeichen "`\%"' keine anderen Zeichen außer den
-Zahlenwerten selbst enthalten.
-
-Das erste Beispiel zeigt ein UV/VIS-Absorptionsspektrum ($A=\lg
-\frac{I_{0}}{I}$ als Funktion der Wellenlänge), während das zweite
-eine Populationsentwicklung in Abhängigkeit des Brutfaktors darstellt
-(Feigenbaum-Diagramm). Aus dem jeweils angegebenen Quellcode ergibt
-sich die Art des Plot-Stils.
-
-\begin{minipage}[c]{0.45\linewidth}%
- \centering\includegraphics{plot-pdf-fig1}
-\end{minipage}%
-\hfill\begin{minipage}[c]{0.52\linewidth}%
- \scriptsize
-\begin{verbatim}
-\psset{xunit=0.003cm,yunit=1.5cm}
-\begin{pspicture}(-0.25,-0.25)(1950,4)
- \fileplot[plotstyle=line, linewidth=1.5pt]{%
- fileplot.data}
- \psaxes[dx=400,Dx=400]{->}(1900,4)
- \multido{\n=200+200}{9}{%
- \psline[linestyle=dotted](\n,0)(\n,4)
- }
- \multido{\n=+1}{5}{%
- \psline[linestyle=dotted](0,\n)(1800,\n)
- }
-\end{pspicture}
-\end{verbatim}
-\end{minipage}%
-
-\begin{minipage}[c]{0.48\linewidth}%
-\centering\includegraphics{plot-pdf-fig2}
-\end{minipage}%
-\hfill{}\begin{minipage}[c]{0.48\linewidth}%
-\scriptsize\begin{center}
-\begin{verbatim}
-\psset{xunit=1.5cm,yunit=6cm}
-\begin{pspicture}(-0.25,-.25)(4.25,1)
- \fileplot[plotstyle=dots]{feigenbaum.data}
- \psaxes{->}(0,0)(4.05,1)
- \rput(4,-0.05){$x$}
- \rput(0.2,1.05){$y$}
- \rput[l](0.2,3.5){Feigenbaum-Diagramm}
-\end{pspicture}
-\end{verbatim}
-\end{center}
-\end{minipage}%
-
-
-\texttt{fileplot} hat den Vorteil der einfachen Anwendung, aber den
-wesentlichen Nachteil, extrem speicherintensiv zu sein, denn \TeX{}
-muss erst alle Zahlenpaare vor einer weiteren Verarbeitung laden. Man
-kann davon ausgehen, dass man bei mehr als 1000 Punkten
-Schwierigkeiten mit der standardmäßig eingestellten
-\TeX-Speicherkapazität bekommen kann. Weiterhin erhöht sich durch das
-Laden der Zahlenpaare die Zeit eines Kompilationsvorgangs ganz
-erheblich.
-
-Eine Möglichkeit, Speicherproblemen aus dem Weg zu gehen, ist die
-Anwendung der \texttt{\textbackslash{}PSTtoEPS}-Funktion des Pakets
-\texttt{pst-eps}, auf die hier jedoch nicht weiter eingegangen wird
-(siehe dazu \cite{pstricks}).
-
-
-\section{Beispiel für \texttt{\textbackslash{}dataplot}}
-
-Ebenso wie \texttt{\textbackslash{}fileplot} benötigt
-\texttt{\textbackslash{}dataplot} einen externen Datensatz, der durch
-eine andere Anwendung erstellt wurde. Im Gegensatz dazu kann dieser
-externe Datensatz jedoch nicht mit \texttt{\textbackslash{}dataplot}
-selbst geladen werden. Dies erfolgt mit dem oben angegebenen
-Befehl \texttt{\textbackslash{}readdata}, beispielsweise
-
-\texttt{\textbackslash{}readdata\{\textbackslash{}feigenbaum\}\{feigenbaum.data\}}
-
-\texttt{\textbackslash{}feigenbaum} ist dann der Name des
-Grafikobjekts. Die Zahl der eingelesenen Dateien ist nur durch den
-Speicher bestimmt, d.\,h. dass mit \texttt{\textbackslash{}dataplot}
-einfache Overlays möglich sind. Die Ausgabe dieser Daten erfolgt mit
-\texttt{\textbackslash{}dataplot\{<Objektname>\}}, beispielsweise
-\texttt{\textbackslash{}dataplot\{\textbackslash{}feigenbaum\}}.
-
-Das angegebene Beispiel zeigt zwei getrennte Datendateien, die in
-einem Koordinatensystem dargestellt werden. Es handelt sich um die
-Sortierzeiten der Verfahren "`Bubble-Sort"' und "`Select-Sort"' in
-Abhängigkeit der Anzahl der zu sortierenden Elemente, wobei das
-Verfahren der Parameter ist. Die Anordnung der Elemente war zu Beginn
-jeweils zufällig verteilt.
-
-\begin{minipage}[c]{0.55\linewidth}%
- \centering\includegraphics{plot-pdf-fig3}
-\end{minipage}%
-\hfill{}\begin{minipage}[c]{0.42\linewidth}%
- \scriptsize\begin{center}
-\begin{verbatim}
-\psset{xunit=0.0005cm,yunit=0.005cm}
-\begin{pspicture}(0,0)(10000,1000)
- \readdata{\bubble}{bubble.data}
- \readdata{\select}{select.data}
- \dataplot[plotstyle=line]{\bubble}
- \dataplot[plotstyle=line]{\select}
- \psline{->}(0,0)(10000,0)
- \psline{->}(0,0)(0,1000)
- \rput[l](40,920){Zeit}
- \rput[r](9990,-30){Elemente}
- \rput[l](4500,800){Bubble-Sort}
- \rput[l](7500,200){Select-Sort}
-\end{pspicture}
-\end{verbatim}
-\end{center}
-\end{minipage}%
-
-
-Grundsätzlich bleibt festzustellen, dass für den reinen Anwender zwischen
-\texttt{dataplot} und \texttt{fileplot} formal kein wesentlicher Unterschied
-besteht. Bei größeren Datenmengen bringt \texttt{dataplot} den Vorteil
-der schnelleren Verarbeitung und Darstellung, wobei es dafür aber
-noch speicherplatzintensiver als \texttt{fileplot} ist.
-
-Weiterhin benutzt \texttt{\textbackslash{}dataplot} intern die im
-nächsten Abschnitt beschriebene Funktion
-\texttt{\textbackslash{}listplot}, wenn Parameter angegeben werden.
-Daraus folgt, dass \texttt{\textbackslash{}dataplot} letztlich nur
-Sinn macht, wenn Polygonzüge gezeichnet werden sollen. In diesem Fall
-zeichnet sich diese Funktion durch eine größere Plot-Geschwindigkeit
-aus, macht aber andererseits nichts anderes als die
-\texttt{pspolygon}-Funktion.
-
-
-\section{Beispiel für \texttt{\textbackslash{}listplot}}
-
-Im Gegensatz zu den vorhergehenden Plot-Funktionen wird das Argument
-von \texttt{\textbackslash{}listplot} zuerst von \TeX{} expandiert,
-wenn es sich um einen \TeX-Befehl handelt, andernfalls wird es
-unverändert an \PS\ durchgereicht. Daraus folgt, dass man komplette
-\PS-Programme im Argument von \texttt{\textbackslash{}listplot}
-ablegen kann. Diese Möglichkeit der Kombination von \TeX{} und
-\PS\ bleibt jedoch in der gesamten Literatur zu \texttt{PSTricks}
-faktisch unberücksichtigt. Dies liegt wohl auch daran, dass
-\texttt{PSTricks} sehr \PS-nah programmiert wurde, sodass sich
-letztlich für jede Anwendung entsprechende \texttt{PSTricks}-Befehle
-finden lassen.
-
-Das angegebene Beispiel zeigt in der Originaldarstellung die
-Entwicklung eines Hènon-Attraktors. Die rechte Grafik enthält
-zusätzlich zum normalen Datensatz einen durch erweiterten \PS-Code
-erzwungenen "`Draft"'-Hinweis. Hierbei ist zum Verständnis allerdings
-eine Kenntnis der \PS-Befehle unabdingbar, wenn dies fehlerfrei
-erfolgen soll. Der angegebene Source\-code enthält aus Platzgründen
-nicht die eigentlichen Daten, die lediglich aus einer Folge von
-Zahlenpaaren bestehen, die durch "`space"' voneinander zu trennen
-sind.
-
-\begin{minipage}[c]{0.48\linewidth}%
-\centering\includegraphics{plot-pdf-fig4}
-\end{minipage}%
-\hfill{}\begin{minipage}[c]{0.48\linewidth}%
-\centering\includegraphics{plot-pdf-fig5}
-\end{minipage}
-
-\begin{minipage}[t]{0.48\linewidth}%
-\scriptsize\begin{verbatim}
-\readdata{\henon}{henon.dat}
-\psset{xunit=1.5cm, yunit=3cm}
-\begin{pspicture}(-2,-0.75)(2.25,1.5)
- \psaxes{->}(0,0)(-2,-0.5)(1.5,1.25)
- \listplot[%
- showpoints=true,%
- plotstyle=curve]{\henon}
-\end{pspicture}
-\end{verbatim}
-\end{minipage}%
-\hfill{}\begin{minipage}[t]{0.48\linewidth}%
-\scriptsize\begin{center}\begin{verbatim}
-\newcommand{\DataB}{%
- [ ... Daten ... ]
- gsave % speichere Grafikstatus
- /Helvetica findfont 40 scalefont setfont
- 45 rotate % Rotiere um 45 Grad
- 0.9 setgray % 1 entspricht Weiß
- -60 10 moveto (DRAFT) show
- grestore
-}
-\psset{xunit=1.5cm, yunit=3cm}
-\begin{pspicture}(-3,-0.75)(2.25,1.5)
- \psaxes{->}(0,0)(-2,-0.5)(1.5,1.25)
- \listplot[%
- showpoints=true,%
- plotstyle=curve]{\dataB}
-\end{pspicture}
-\end{verbatim}
-\end{center}
-\end{minipage}%
-
-
-Zum Manipulieren des Datensatzes von \texttt{\textbackslash{}listplot}
-kann alternativ auch die entsprechende Funktion aus \texttt{pst-plot}
-verändert werden. Möchte man beispielsweise, aus welchen Gründen auch
-immer, die $x|y$-Werte vertauschen und den Graphen um 45° rotieren
-lassen (was einer Rotation um die x-Achse mit anschließender Drehung
-entspricht), so kann dies einfach durch Neudefinition von
-\texttt{\textbackslash{}pst@def} erfolgen, was dann zur folgenden
-Abbildung führt:
-
-\begin{minipage}{0.48\linewidth}
-\scriptsize\begin{center}\begin{verbatim}
-\makeatletter
-\pst@def{ScalePoints}<%
-%----------------------------------------
- 45 rotate % rotiere alle Objekte
-%----------------------------------------
- /y ED /x ED
- counttomark dup dup cvi eq
- not { exch pop } if
- /m exch def /n m 2 div cvi def
- n {
-%----------------------------------------
- exch % tausche oberste Stackelemente
-%----------------------------------------
- y mul m 1 roll
- x mul m 1 roll
- /m m 2 sub
- def } repeat>
-\makeatother
-\end{verbatim}
-\end{center}\end{minipage}%
-\hfill
-\begin{minipage}{0.48\linewidth}
- \centering\includegraphics{plot-pdf-fig6}
-\end{minipage}
-
-
-\bibliography{plot}
-
-\address{Herbert}{Voß}{Wasgenstr. 21\\14129 Berlin\\voss@perce.de}
-\address{Laura Elizabeth}{Jackson}{Raleigh, North Carolina (USA)\\
- lejacks2@unity.ncsu.edu }
-\end{document}
diff --git a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.eps b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.eps
deleted file mode 100644
index 36d3fcf0513..00000000000
--- a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.eps
+++ /dev/null
@@ -1,4315 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%Produced by poppler pdftops version: 0.22.1 (http://poppler.freedesktop.org)
-%%Creator: TeX
-%%LanguageLevel: 2
-%%DocumentSuppliedResources: (atend)
-%%BoundingBox: 0 0 190 186
-%%HiResBoundingBox: 0 0 190 186
-%%DocumentSuppliedResources: (atend)
-%%EndComments
-%%BeginProlog
-%%BeginResource: procset xpdf 3.00 0
-%%Copyright: Copyright 1996-2011 Glyph & Cog, LLC
-/xpdf 75 dict def xpdf begin
-% PDF special state
-/pdfDictSize 15 def
-/pdfSetup {
- /setpagedevice where {
- pop 2 dict begin
- /Policies 1 dict dup begin /PageSize 6 def end def
- { /Duplex true def } if
- currentdict end setpagedevice
- } {
- pop
- } ifelse
-} def
-/pdfSetupPaper {
- 2 array astore
- /setpagedevice where {
- pop 2 dict begin
- /PageSize exch def
- /ImagingBBox null def
- currentdict end setpagedevice
- } {
- pop
- } ifelse
-} def
-/pdfStartPage {
- pdfDictSize dict begin
- /pdfFillCS [] def
- /pdfFillXform {} def
- /pdfStrokeCS [] def
- /pdfStrokeXform {} def
- /pdfFill [0] def
- /pdfStroke [0] def
- /pdfFillOP false def
- /pdfStrokeOP false def
- /pdfLastFill false def
- /pdfLastStroke false def
- /pdfTextMat [1 0 0 1 0 0] def
- /pdfFontSize 0 def
- /pdfCharSpacing 0 def
- /pdfTextRender 0 def
- /pdfPatternCS false def
- /pdfTextRise 0 def
- /pdfWordSpacing 0 def
- /pdfHorizScaling 1 def
- /pdfTextClipPath [] def
-} def
-/pdfEndPage { end } def
-% PDF color state
-/cs { /pdfFillXform exch def dup /pdfFillCS exch def
- setcolorspace } def
-/CS { /pdfStrokeXform exch def dup /pdfStrokeCS exch def
- setcolorspace } def
-/sc { pdfLastFill not { pdfFillCS setcolorspace } if
- dup /pdfFill exch def aload pop pdfFillXform setcolor
- /pdfLastFill true def /pdfLastStroke false def } def
-/SC { pdfLastStroke not { pdfStrokeCS setcolorspace } if
- dup /pdfStroke exch def aload pop pdfStrokeXform setcolor
- /pdfLastStroke true def /pdfLastFill false def } def
-/op { /pdfFillOP exch def
- pdfLastFill { pdfFillOP setoverprint } if } def
-/OP { /pdfStrokeOP exch def
- pdfLastStroke { pdfStrokeOP setoverprint } if } def
-/fCol {
- pdfLastFill not {
- pdfFillCS setcolorspace
- pdfFill aload pop pdfFillXform setcolor
- pdfFillOP setoverprint
- /pdfLastFill true def /pdfLastStroke false def
- } if
-} def
-/sCol {
- pdfLastStroke not {
- pdfStrokeCS setcolorspace
- pdfStroke aload pop pdfStrokeXform setcolor
- pdfStrokeOP setoverprint
- /pdfLastStroke true def /pdfLastFill false def
- } if
-} def
-% build a font
-/pdfMakeFont {
- 4 3 roll findfont
- 4 2 roll matrix scale makefont
- dup length dict begin
- { 1 index /FID ne { def } { pop pop } ifelse } forall
- /Encoding exch def
- currentdict
- end
- definefont pop
-} def
-/pdfMakeFont16 {
- exch findfont
- dup length dict begin
- { 1 index /FID ne { def } { pop pop } ifelse } forall
- /WMode exch def
- currentdict
- end
- definefont pop
-} def
-% graphics state operators
-/q { gsave pdfDictSize dict begin } def
-/Q {
- end grestore
- /pdfLastFill where {
- pop
- pdfLastFill {
- pdfFillOP setoverprint
- } {
- pdfStrokeOP setoverprint
- } ifelse
- } if
-} def
-/cm { concat } def
-/d { setdash } def
-/i { setflat } def
-/j { setlinejoin } def
-/J { setlinecap } def
-/M { setmiterlimit } def
-/w { setlinewidth } def
-% path segment operators
-/m { moveto } def
-/l { lineto } def
-/c { curveto } def
-/re { 4 2 roll moveto 1 index 0 rlineto 0 exch rlineto
- neg 0 rlineto closepath } def
-/h { closepath } def
-% path painting operators
-/S { sCol stroke } def
-/Sf { fCol stroke } def
-/f { fCol fill } def
-/f* { fCol eofill } def
-% clipping operators
-/W { clip newpath } def
-/W* { eoclip newpath } def
-/Ws { strokepath clip newpath } def
-% text state operators
-/Tc { /pdfCharSpacing exch def } def
-/Tf { dup /pdfFontSize exch def
- dup pdfHorizScaling mul exch matrix scale
- pdfTextMat matrix concatmatrix dup 4 0 put dup 5 0 put
- exch findfont exch makefont setfont } def
-/Tr { /pdfTextRender exch def } def
-/Tp { /pdfPatternCS exch def } def
-/Ts { /pdfTextRise exch def } def
-/Tw { /pdfWordSpacing exch def } def
-/Tz { /pdfHorizScaling exch def } def
-% text positioning operators
-/Td { pdfTextMat transform moveto } def
-/Tm { /pdfTextMat exch def } def
-% text string operators
-/xyshow where {
- pop
- /xyshow2 {
- dup length array
- 0 2 2 index length 1 sub {
- 2 index 1 index 2 copy get 3 1 roll 1 add get
- pdfTextMat dtransform
- 4 2 roll 2 copy 6 5 roll put 1 add 3 1 roll dup 4 2 roll put
- } for
- exch pop
- xyshow
- } def
-}{
- /xyshow2 {
- currentfont /FontType get 0 eq {
- 0 2 3 index length 1 sub {
- currentpoint 4 index 3 index 2 getinterval show moveto
- 2 copy get 2 index 3 2 roll 1 add get
- pdfTextMat dtransform rmoveto
- } for
- } {
- 0 1 3 index length 1 sub {
- currentpoint 4 index 3 index 1 getinterval show moveto
- 2 copy 2 mul get 2 index 3 2 roll 2 mul 1 add get
- pdfTextMat dtransform rmoveto
- } for
- } ifelse
- pop pop
- } def
-} ifelse
-/cshow where {
- pop
- /xycp {
- 0 3 2 roll
- {
- pop pop currentpoint 3 2 roll
- 1 string dup 0 4 3 roll put false charpath moveto
- 2 copy get 2 index 2 index 1 add get
- pdfTextMat dtransform rmoveto
- 2 add
- } exch cshow
- pop pop
- } def
-}{
- /xycp {
- currentfont /FontType get 0 eq {
- 0 2 3 index length 1 sub {
- currentpoint 4 index 3 index 2 getinterval false charpath moveto
- 2 copy get 2 index 3 2 roll 1 add get
- pdfTextMat dtransform rmoveto
- } for
- } {
- 0 1 3 index length 1 sub {
- currentpoint 4 index 3 index 1 getinterval false charpath moveto
- 2 copy 2 mul get 2 index 3 2 roll 2 mul 1 add get
- pdfTextMat dtransform rmoveto
- } for
- } ifelse
- pop pop
- } def
-} ifelse
-/Tj {
- fCol
- 0 pdfTextRise pdfTextMat dtransform rmoveto
- currentpoint 4 2 roll
- pdfTextRender 1 and 0 eq {
- 2 copy xyshow2
- } if
- pdfTextRender 3 and dup 1 eq exch 2 eq or {
- 3 index 3 index moveto
- 2 copy
- currentfont /FontType get 3 eq { fCol } { sCol } ifelse
- xycp currentpoint stroke moveto
- } if
- pdfTextRender 4 and 0 ne {
- 4 2 roll moveto xycp
- /pdfTextClipPath [ pdfTextClipPath aload pop
- {/moveto cvx}
- {/lineto cvx}
- {/curveto cvx}
- {/closepath cvx}
- pathforall ] def
- currentpoint newpath moveto
- } {
- pop pop pop pop
- } ifelse
- 0 pdfTextRise neg pdfTextMat dtransform rmoveto
-} def
-/TJm { 0.001 mul pdfFontSize mul pdfHorizScaling mul neg 0
- pdfTextMat dtransform rmoveto } def
-/TJmV { 0.001 mul pdfFontSize mul neg 0 exch
- pdfTextMat dtransform rmoveto } def
-/Tclip { pdfTextClipPath cvx exec clip newpath
- /pdfTextClipPath [] def } def
-/Tclip* { pdfTextClipPath cvx exec eoclip newpath
- /pdfTextClipPath [] def } def
-% Level 2/3 image operators
-/pdfImBuf 100 string def
-/pdfImStr {
- 2 copy exch length lt {
- 2 copy get exch 1 add exch
- } {
- ()
- } ifelse
-} def
-/skipEOD {
- { currentfile pdfImBuf readline
- not { pop exit } if
- (%-EOD-) eq { exit } if } loop
-} def
-/pdfIm { image skipEOD } def
-/pdfImM { fCol imagemask skipEOD } def
-/pr { 2 index 2 index 3 2 roll putinterval 4 add } def
-/pdfImClip {
- gsave
- 0 2 4 index length 1 sub {
- dup 4 index exch 2 copy
- get 5 index div put
- 1 add 3 index exch 2 copy
- get 3 index div put
- } for
- pop pop rectclip
-} def
-/pdfImClipEnd { grestore } def
-% shading operators
-/colordelta {
- false 0 1 3 index length 1 sub {
- dup 4 index exch get 3 index 3 2 roll get sub abs 0.004 gt {
- pop true
- } if
- } for
- exch pop exch pop
-} def
-/funcCol { func n array astore } def
-/funcSH {
- dup 0 eq {
- true
- } {
- dup 6 eq {
- false
- } {
- 4 index 4 index funcCol dup
- 6 index 4 index funcCol dup
- 3 1 roll colordelta 3 1 roll
- 5 index 5 index funcCol dup
- 3 1 roll colordelta 3 1 roll
- 6 index 8 index funcCol dup
- 3 1 roll colordelta 3 1 roll
- colordelta or or or
- } ifelse
- } ifelse
- {
- 1 add
- 4 index 3 index add 0.5 mul exch 4 index 3 index add 0.5 mul exch
- 6 index 6 index 4 index 4 index 4 index funcSH
- 2 index 6 index 6 index 4 index 4 index funcSH
- 6 index 2 index 4 index 6 index 4 index funcSH
- 5 3 roll 3 2 roll funcSH pop pop
- } {
- pop 3 index 2 index add 0.5 mul 3 index 2 index add 0.5 mul
- funcCol sc
- dup 4 index exch mat transform m
- 3 index 3 index mat transform l
- 1 index 3 index mat transform l
- mat transform l pop pop h f*
- } ifelse
-} def
-/axialCol {
- dup 0 lt {
- pop t0
- } {
- dup 1 gt {
- pop t1
- } {
- dt mul t0 add
- } ifelse
- } ifelse
- func n array astore
-} def
-/axialSH {
- dup 0 eq {
- true
- } {
- dup 8 eq {
- false
- } {
- 2 index axialCol 2 index axialCol colordelta
- } ifelse
- } ifelse
- {
- 1 add 3 1 roll 2 copy add 0.5 mul
- dup 4 3 roll exch 4 index axialSH
- exch 3 2 roll axialSH
- } {
- pop 2 copy add 0.5 mul
- axialCol sc
- exch dup dx mul x0 add exch dy mul y0 add
- 3 2 roll dup dx mul x0 add exch dy mul y0 add
- dx abs dy abs ge {
- 2 copy yMin sub dy mul dx div add yMin m
- yMax sub dy mul dx div add yMax l
- 2 copy yMax sub dy mul dx div add yMax l
- yMin sub dy mul dx div add yMin l
- h f*
- } {
- exch 2 copy xMin sub dx mul dy div add xMin exch m
- xMax sub dx mul dy div add xMax exch l
- exch 2 copy xMax sub dx mul dy div add xMax exch l
- xMin sub dx mul dy div add xMin exch l
- h f*
- } ifelse
- } ifelse
-} def
-/radialCol {
- dup t0 lt {
- pop t0
- } {
- dup t1 gt {
- pop t1
- } if
- } ifelse
- func n array astore
-} def
-/radialSH {
- dup 0 eq {
- true
- } {
- dup 8 eq {
- false
- } {
- 2 index dt mul t0 add radialCol
- 2 index dt mul t0 add radialCol colordelta
- } ifelse
- } ifelse
- {
- 1 add 3 1 roll 2 copy add 0.5 mul
- dup 4 3 roll exch 4 index radialSH
- exch 3 2 roll radialSH
- } {
- pop 2 copy add 0.5 mul dt mul t0 add
- radialCol sc
- encl {
- exch dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add
- 0 360 arc h
- dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add
- 360 0 arcn h f
- } {
- 2 copy
- dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add
- a1 a2 arcn
- dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add
- a2 a1 arcn h
- dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add
- a1 a2 arc
- dup dx mul x0 add exch dup dy mul y0 add exch dr mul r0 add
- a2 a1 arc h f
- } ifelse
- } ifelse
-} def
-end
-%%EndResource
-%%EndProlog
-%%BeginSetup
-xpdf begin
-%%BeginResource: font CMR10
-%!FontType1-1.0: CMR10
-12 dict begin
-/FontInfo 10 dict dup begin
-/Notice (Copyright \(c\) 1997, 2009 American Mathematical Society \(<htt\
-p://www.ams.org>\), with Reserved Font Name CMR10.) readonly def
-/FullName (CMR10) readonly def
-/FamilyName (Computer Modern) readonly def
-/isFixedPitch false def
-/ItalicAngle 0 def
-/UnderlinePosition 0 def
-/UnderlineThickness 0 def
-end readonly def
-/FontName /CMR10 def
-/PaintType 0 def
-/FontType 1 def
-/FontMatrix [0.001 0 0 0.001 0 0] readonly def
-/FontBBox [0 -22 460 666] readonly def
-/StrokeWidth 0 def
-/Encoding 256 array
-0 1 255 {1 index exch /.notdef put} for
-dup 48 /zero put
-dup 49 /one put
-readonly def
-currentdict end
-currentfile eexec
-5AA4F71255501637F1A431BAB555283D093E1B588B45B0281559110D21315C62
-BD638C6B34BA54AA75227715D9947EBCD51A104CAEA657499E94138F5645BF68
-368BB1B1EC8E4776F067FFF2CE9B89FB7E63A7DB304498C1036D399C47A4CB79
-BD517EDB02BEB90195FD7DDAF3E839BCE2DB156D9337DBB2305A465B3E0FFB97
-1985C79DC71C47E26F9F0F042B2CDEE97B679358059256FB93D662D43C7ECB5B
-1A564DFCECB963478373C69F52172F071E0AA6082A3E10D9E1CE2851CFA210EE
-7BD5FCB1AAE15E89D1FB339D587D218B89C18A32F47C7451A80CB1FC07CF5EF6
-FA6B0AF338BD4E48F07258C8AB349EE790EF474E6D540CD5017BDA227D234CDE
-C5B56DC44D44AB50DFB075E5E1022F04510349EA668084E7A051605C83646AF5
-902E437867493A954EAEF35981EA89706F0AC717DFC491968979A7EF87F475E4
-8F22A3A7D7750B755878A9B88483EDC2409C0D58BE116764B583FF78D1FBF3AD
-289831C79680B7183956FD64718B7BBE2D8DF65EB9DAA46A90706B45496ACFE9
-78439069B8944845B613846CACD0BD317E15DCE9A145DA4A73543497BE96D0F8
-0424FAA59B7D95A144A3105086E99A505A3C5690E5DA2B73BF30CD76DC45E22D
-08E8D930DE1E4BEEEFC4B71C09FD0C971492DA26A65F32174950E118076C6B15
-F011519CE597727AAFC0A926A49F230E5C3E064AC109DFA882E92CE333E3F8B6
-C615F78278B7F1030B345EAA6A0D8EAE575073DB0E32FAB6C582479E4EC6FB80
-F059078FE6FF66949EA2E808AE44F33A4D9E01E09E9EADC870A28B819C4E0820
-D818F5F039A83A38563AB405661D539EE3692510F3090743F00D4ECAC10D73C1
-B423FCADA2CA4E9EEBEAC7B26A552FE4F3878FB9B6C3A4306EC95E89EEDF0C96
-AA7E082AD8C802E1516310BEEFD8E9C204E1450531B21066CA69360BE3624A82
-3BEDE8715F4777CC0AC3EA27E35FD8BBA3175E98CE6759BD0AC1C4E48AE1E8CF
-D6AF153F802B3D22E19E66C661F09D0B14913993D3984A8EDEC5364DEC72CDC1
-B0B8E8601D77FE1A735EBC13428AC5DE573D4C4B0D24A8718532EDFDB6AAA910
-5BE7A1D0462FD2EC028B81D7655466C02CA3F9AE6C824ADD55B131CAC7F5762E
-E82BFC24BC4F705CA88CD480CE6FE5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-cleartomark
-%%EndResource
-/F8_0 /CMR10 1 1
-[ /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
- /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
- /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
- /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
- /space/exclam/quotedbl/numbersign/dollar/percent/ampersand/quotesingle
- /parenleft/parenright/asterisk/plus/comma/hyphen/period/slash
- /zero/one/two/three/four/five/six/seven
- /eight/nine/colon/semicolon/less/equal/greater/question
- /at/A/B/C/D/E/F/G
- /H/I/J/K/L/M/N/O
- /P/Q/R/S/T/U/V/W
- /X/Y/Z/bracketleft/backslash/bracketright/asciicircum/underscore
- /grave/a/b/c/d/e/f/g
- /h/i/j/k/l/m/n/o
- /p/q/r/s/t/u/v/w
- /x/y/z/braceleft/bar/braceright/asciitilde/bullet
- /Euro/bullet/quotesinglbase/florin/quotedblbase/ellipsis/dagger/daggerdbl
- /circumflex/perthousand/Scaron/guilsinglleft/OE/bullet/Zcaron/bullet
- /bullet/quoteleft/quoteright/quotedblleft/quotedblright/bullet/endash/emdash
- /tilde/trademark/scaron/guilsinglright/oe/bullet/zcaron/Ydieresis
- /space/exclamdown/cent/sterling/currency/yen/brokenbar/section
- /dieresis/copyright/ordfeminine/guillemotleft/logicalnot/hyphen/registered/macron
- /degree/plusminus/twosuperior/threesuperior/acute/mu/paragraph/periodcentered
- /cedilla/onesuperior/ordmasculine/guillemotright/onequarter/onehalf/threequarters/questiondown
- /Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla
- /Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex/Idieresis
- /Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis/multiply
- /Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn/germandbls
- /agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla
- /egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis
- /eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/divide
- /oslash/ugrave/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis]
-pdfMakeFont
-%%BeginResource: font CMSY10
-%!FontType1-1.0: CMSY10
-12 dict begin
-/FontInfo 10 dict dup begin
-/Notice (Copyright \(c\) 1996 Y&Y, Inc. All Right Reserved. http://www.Y\
-andY.com) readonly def
-/FullName (CMSY10) readonly def
-/FamilyName (Computer Modern) readonly def
-/isFixedPitch false def
-/ItalicAngle 0 def
-/UnderlinePosition 0 def
-/UnderlineThickness 0 def
-end readonly def
-/FontName /CMSY10 def
-/PaintType 0 def
-/FontType 1 def
-/FontMatrix [0.001 0 0 0.001 0 0] readonly def
-/FontBBox [0 0 694 270] readonly def
-/StrokeWidth 0 def
-/Encoding 256 array
-0 1 255 {1 index exch /.notdef put} for
-dup 0 /minus put
-readonly def
-currentdict end
-currentfile eexec
-5AA4F71255501637F1A431BAB555283D093E1B588B45B0281559110D21315C62
-BD638C6B34BA54AA75227715D9947EBCD51A104CAEA657499E94138F5645BF68
-368BB1B1EC8E4776F067FFF2CE9B89FB7E63A7DB304498C1036D399C47A4CB79
-BD517EDB02BEB90195FD7DDAF3E839BCE2DB156D9337DBB2305A465B3E0FFB97
-1985C79DC71C47E26F9F0F042B2CDEE97B679358059256FB93D662D43C7ECB5B
-1A564DFCECB963478373C69F52172F071E0AA6082A3E10D9E1CE2851CFA210EE
-7BD5FCB1AAE15E89D1FB339D587D218B89C18A32F47C7451A80CB1FC07CF5EF6
-FCC85D7215D6A753D1600581E5546F14F3D65234054555B96FD9B9668401E43D
-DAC0F02F812EB053F8E70788172E1CEFDE15EF41FC327A1B4488DC9CE2E03ED3
-9D08B7BA52AA388099C155D35826603EBCE0FBEF2F304388F2BA93EF3C286D9E
-6D4BF5678A5CE0006044E6AC7CF79731B4D0FDFCDDE082D6445639D2E0F9B866
-D7B4711CD8D9B582D95B6B37D41986287A3AA7C1E70917AB9D5E0395FF11012D
-42D0EF50A3856BD4460CDFFB7037506BC2221C56B45F3568E94E45881A9C1A40
-AD47F209AD55BBB63AF364B44CB52EF5E564ED09D036F2AF4EBCD2549D2F645C
-04049A0D7C43EEA08221467D6645B0C2F458DECD88030FF06A852C4FEAA2A851
-FEDB3DD29E21ADECB70385CC9CDE214A507EE55308C0B7F02C923A0FB8945F9C
-1D0417D7550BA219D72EE31B9877D835A6A3E7B9FFBC27106A27277EC6D3CEE0
-3EE3528475809AD99A537F5C8CD9F70C74A236D5C53DE9C7857373E10F61B800
-5E822ABD4ADAA88A4F8558E534B67AC90C81DCAEE4CBE962FE5569662600E0BC
-62DE62E37A03F608F4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-cleartomark
-%%EndResource
-/F9_0 /CMSY10 1 1
-[ /minus/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
- /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
- /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
- /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
- /space/exclam/quotedbl/numbersign/dollar/percent/ampersand/quotesingle
- /parenleft/parenright/asterisk/plus/comma/hyphen/period/slash
- /zero/one/two/three/four/five/six/seven
- /eight/nine/colon/semicolon/less/equal/greater/question
- /at/A/B/C/D/E/F/G
- /H/I/J/K/L/M/N/O
- /P/Q/R/S/T/U/V/W
- /X/Y/Z/bracketleft/backslash/bracketright/asciicircum/underscore
- /grave/a/b/c/d/e/f/g
- /h/i/j/k/l/m/n/o
- /p/q/r/s/t/u/v/w
- /x/y/z/braceleft/bar/braceright/asciitilde/bullet
- /Euro/bullet/quotesinglbase/florin/quotedblbase/ellipsis/dagger/daggerdbl
- /circumflex/perthousand/Scaron/guilsinglleft/OE/bullet/Zcaron/bullet
- /bullet/quoteleft/quoteright/quotedblleft/quotedblright/bullet/endash/emdash
- /tilde/trademark/scaron/guilsinglright/oe/bullet/zcaron/Ydieresis
- /space/exclamdown/cent/sterling/currency/yen/brokenbar/section
- /dieresis/copyright/ordfeminine/guillemotleft/logicalnot/hyphen/registered/macron
- /degree/plusminus/twosuperior/threesuperior/acute/mu/paragraph/periodcentered
- /cedilla/onesuperior/ordmasculine/guillemotright/onequarter/onehalf/threequarters/questiondown
- /Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla
- /Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex/Idieresis
- /Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis/multiply
- /Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn/germandbls
- /agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla
- /egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis
- /eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/divide
- /oslash/ugrave/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis]
-pdfMakeFont
-%%EndSetup
-pdfStartPage
-[] 0 d
-1 i
-0 j
-0 J
-10 M
-1 w
-/DeviceGray {} cs
-[0] sc
-/DeviceGray {} CS
-[0] SC
-false op
-false OP
-{} settransfer
-0 0 190 186 re
-W
-q
-q
-[1 0 0 1 -9 -15] cm
-q
-[1 0 0 1 0 0] cm
-0 0 215.52 215.52 re
-W
-q
-[0.1 0 0 0.1 0 0] cm
-7.97011 w
-/DeviceGray {} CS
-[0] SC
-270 269.801 1700.79 1700.79 re
-S
-1.99253 w
-/DeviceGray {} CS
-[0.5] SC
-312.52 269.801 m
-312.52 299.688 l
-355.039 269.801 m
-355.039 299.688 l
-397.559 269.801 m
-397.559 299.688 l
-440.078 269.801 m
-440.078 299.688 l
-482.598 269.801 m
-482.598 299.688 l
-525.117 269.801 m
-525.117 299.688 l
-567.637 269.801 m
-567.637 299.688 l
-610.156 269.801 m
-610.156 299.688 l
-652.676 269.801 m
-652.676 299.688 l
-695.195 269.801 m
-695.195 299.688 l
-737.715 269.801 m
-737.715 299.688 l
-780.234 269.801 m
-780.234 299.688 l
-822.754 269.801 m
-822.754 299.688 l
-865.273 269.801 m
-865.273 299.688 l
-907.793 269.801 m
-907.793 299.688 l
-950.316 269.801 m
-950.316 299.688 l
-992.836 269.801 m
-992.836 299.688 l
-1035.36 269.801 m
-1035.36 299.688 l
-1077.88 269.801 m
-1077.88 299.688 l
-S
-3.98506 w
-/DeviceGray {} CS
-[0] SC
-270 269.801 m
-270 309.652 l
-S
-1.99253 w
-/DeviceGray {} CS
-[0.5] SC
-1162.91 269.801 m
-1162.91 299.688 l
-1205.43 269.801 m
-1205.43 299.688 l
-1247.95 269.801 m
-1247.95 299.688 l
-1290.47 269.801 m
-1290.47 299.688 l
-1332.99 269.801 m
-1332.99 299.688 l
-1375.51 269.801 m
-1375.51 299.688 l
-1418.03 269.801 m
-1418.03 299.688 l
-1460.55 269.801 m
-1460.55 299.688 l
-1503.07 269.801 m
-1503.07 299.688 l
-1545.59 269.801 m
-1545.59 299.688 l
-1588.11 269.801 m
-1588.11 299.688 l
-1630.63 269.801 m
-1630.63 299.688 l
-1673.15 269.801 m
-1673.15 299.688 l
-1715.67 269.801 m
-1715.67 299.688 l
-1758.19 269.801 m
-1758.19 299.688 l
-1800.71 269.801 m
-1800.71 299.688 l
-1843.23 269.801 m
-1843.23 299.688 l
-1885.75 269.801 m
-1885.75 299.688 l
-1928.27 269.801 m
-1928.27 299.688 l
-S
-3.98506 w
-/DeviceGray {} CS
-[0] SC
-1120.39 269.801 m
-1120.39 309.652 l
-S
-1970.79 269.801 m
-1970.79 309.652 l
-S
-270 269.801 m
-270 309.652 l
-S
-1.99253 w
-/DeviceGray {} CS
-[0.5] SC
-270 312.32 m
-299.887 312.32 l
-270 354.84 m
-299.887 354.84 l
-270 397.359 m
-299.887 397.359 l
-270 439.879 m
-299.887 439.879 l
-270 482.398 m
-299.887 482.398 l
-270 524.918 m
-299.887 524.918 l
-270 567.438 m
-299.887 567.438 l
-270 609.957 m
-299.887 609.957 l
-270 652.477 m
-299.887 652.477 l
-270 694.996 m
-299.887 694.996 l
-270 737.516 m
-299.887 737.516 l
-270 780.035 m
-299.887 780.035 l
-270 822.555 m
-299.887 822.555 l
-270 865.074 m
-299.887 865.074 l
-270 907.594 m
-299.887 907.594 l
-270 950.113 m
-299.887 950.113 l
-270 992.633 m
-299.887 992.633 l
-270 1035.15 m
-299.887 1035.15 l
-270 1077.67 m
-299.887 1077.67 l
-S
-3.98506 w
-/DeviceGray {} CS
-[0] SC
-270 269.801 m
-309.852 269.801 l
-S
-1.99253 w
-/DeviceGray {} CS
-[0.5] SC
-270 1162.71 m
-299.887 1162.71 l
-270 1205.23 m
-299.887 1205.23 l
-270 1247.75 m
-299.887 1247.75 l
-270 1290.27 m
-299.887 1290.27 l
-270 1332.79 m
-299.887 1332.79 l
-270 1375.31 m
-299.887 1375.31 l
-270 1417.83 m
-299.887 1417.83 l
-270 1460.35 m
-299.887 1460.35 l
-270 1502.87 m
-299.887 1502.87 l
-270 1545.39 m
-299.887 1545.39 l
-270 1587.91 m
-299.887 1587.91 l
-270 1630.43 m
-299.887 1630.43 l
-270 1672.95 m
-299.887 1672.95 l
-270 1715.47 m
-299.887 1715.47 l
-270 1757.99 m
-299.887 1757.99 l
-270 1800.51 m
-299.887 1800.51 l
-270 1843.03 m
-299.887 1843.03 l
-270 1885.55 m
-299.887 1885.55 l
-270 1928.07 m
-299.887 1928.07 l
-S
-3.98506 w
-/DeviceGray {} CS
-[0] SC
-270 1120.2 m
-309.852 1120.2 l
-S
-270 1970.59 m
-309.852 1970.59 l
-S
-270 269.801 m
-309.852 269.801 l
-S
-1.99253 w
-/DeviceGray {} CS
-[0.5] SC
-312.52 1970.59 m
-312.52 1940.7 l
-355.039 1970.59 m
-355.039 1940.7 l
-397.559 1970.59 m
-397.559 1940.7 l
-440.078 1970.59 m
-440.078 1940.7 l
-482.598 1970.59 m
-482.598 1940.7 l
-525.117 1970.59 m
-525.117 1940.7 l
-567.637 1970.59 m
-567.637 1940.7 l
-610.156 1970.59 m
-610.156 1940.7 l
-652.676 1970.59 m
-652.676 1940.7 l
-695.195 1970.59 m
-695.195 1940.7 l
-737.715 1970.59 m
-737.715 1940.7 l
-780.234 1970.59 m
-780.234 1940.7 l
-822.754 1970.59 m
-822.754 1940.7 l
-865.273 1970.59 m
-865.273 1940.7 l
-907.793 1970.59 m
-907.793 1940.7 l
-950.316 1970.59 m
-950.316 1940.7 l
-992.836 1970.59 m
-992.836 1940.7 l
-1035.36 1970.59 m
-1035.36 1940.7 l
-1077.88 1970.59 m
-1077.88 1940.7 l
-S
-3.98506 w
-/DeviceGray {} CS
-[0] SC
-270 1970.59 m
-270 1930.73 l
-S
-1.99253 w
-/DeviceGray {} CS
-[0.5] SC
-1162.91 1970.59 m
-1162.91 1940.7 l
-1205.43 1970.59 m
-1205.43 1940.7 l
-1247.95 1970.59 m
-1247.95 1940.7 l
-1290.47 1970.59 m
-1290.47 1940.7 l
-1332.99 1970.59 m
-1332.99 1940.7 l
-1375.51 1970.59 m
-1375.51 1940.7 l
-1418.03 1970.59 m
-1418.03 1940.7 l
-1460.55 1970.59 m
-1460.55 1940.7 l
-1503.07 1970.59 m
-1503.07 1940.7 l
-1545.59 1970.59 m
-1545.59 1940.7 l
-1588.11 1970.59 m
-1588.11 1940.7 l
-1630.63 1970.59 m
-1630.63 1940.7 l
-1673.15 1970.59 m
-1673.15 1940.7 l
-1715.67 1970.59 m
-1715.67 1940.7 l
-1758.19 1970.59 m
-1758.19 1940.7 l
-1800.71 1970.59 m
-1800.71 1940.7 l
-1843.23 1970.59 m
-1843.23 1940.7 l
-1885.75 1970.59 m
-1885.75 1940.7 l
-1928.27 1970.59 m
-1928.27 1940.7 l
-S
-3.98506 w
-/DeviceGray {} CS
-[0] SC
-1120.39 1970.59 m
-1120.39 1930.73 l
-S
-1970.79 1970.59 m
-1970.79 1930.73 l
-S
-270 1970.59 m
-270 1930.73 l
-S
-1.99253 w
-/DeviceGray {} CS
-[0.5] SC
-1970.79 312.32 m
-1940.9 312.32 l
-1970.79 354.84 m
-1940.9 354.84 l
-1970.79 397.359 m
-1940.9 397.359 l
-1970.79 439.879 m
-1940.9 439.879 l
-1970.79 482.398 m
-1940.9 482.398 l
-1970.79 524.918 m
-1940.9 524.918 l
-1970.79 567.438 m
-1940.9 567.438 l
-1970.79 609.957 m
-1940.9 609.957 l
-1970.79 652.477 m
-1940.9 652.477 l
-1970.79 694.996 m
-1940.9 694.996 l
-1970.79 737.516 m
-1940.9 737.516 l
-1970.79 780.035 m
-1940.9 780.035 l
-1970.79 822.555 m
-1940.9 822.555 l
-1970.79 865.074 m
-1940.9 865.074 l
-1970.79 907.594 m
-1940.9 907.594 l
-1970.79 950.113 m
-1940.9 950.113 l
-1970.79 992.633 m
-1940.9 992.633 l
-1970.79 1035.15 m
-1940.9 1035.15 l
-1970.79 1077.67 m
-1940.9 1077.67 l
-S
-3.98506 w
-/DeviceGray {} CS
-[0] SC
-1970.79 269.801 m
-1930.94 269.801 l
-S
-1.99253 w
-/DeviceGray {} CS
-[0.5] SC
-1970.79 1162.71 m
-1940.9 1162.71 l
-1970.79 1205.23 m
-1940.9 1205.23 l
-1970.79 1247.75 m
-1940.9 1247.75 l
-1970.79 1290.27 m
-1940.9 1290.27 l
-1970.79 1332.79 m
-1940.9 1332.79 l
-1970.79 1375.31 m
-1940.9 1375.31 l
-1970.79 1417.83 m
-1940.9 1417.83 l
-1970.79 1460.35 m
-1940.9 1460.35 l
-1970.79 1502.87 m
-1940.9 1502.87 l
-1970.79 1545.39 m
-1940.9 1545.39 l
-1970.79 1587.91 m
-1940.9 1587.91 l
-1970.79 1630.43 m
-1940.9 1630.43 l
-1970.79 1672.95 m
-1940.9 1672.95 l
-1970.79 1715.47 m
-1940.9 1715.47 l
-1970.79 1757.99 m
-1940.9 1757.99 l
-1970.79 1800.51 m
-1940.9 1800.51 l
-1970.79 1843.03 m
-1940.9 1843.03 l
-1970.79 1885.55 m
-1940.9 1885.55 l
-1970.79 1928.07 m
-1940.9 1928.07 l
-S
-3.98506 w
-/DeviceGray {} CS
-[0] SC
-1970.79 1120.2 m
-1930.94 1120.2 l
-S
-1970.79 1970.59 m
-1930.94 1970.59 l
-S
-1970.79 269.801 m
-1930.94 269.801 l
-S
-/DeviceGray {} cs
-[0] sc
-q
-[10 0 0 10 0 0] cm
-[1 0 0 1 0 0] Tm
-0 0 Td
-[1 0 0 1 9.23984 24.1] Tm
-0 0 Td
-/F9_0 9.96264 Tf
-(\000)
-[7.750934
-0] Tj
--5.14756 TJm
-7.8 0 Td
-/F8_0 9.96264 Tf
-(1)
-[4.98132
-0] Tj
--5.88993 TJm
-7.8 84.7199 Td
-(0)
-[4.98132
-0] Tj
--5.88993 TJm
-7.8 169.6801 Td
-(1)
-[4.98132
-0] Tj
--5.88993 TJm
-11.4 -8.5199 Td
-/F9_0 9.96264 Tf
-(\000)
-[7.750934
-0] Tj
--5.14771 TJm
-19.2 -8.5199 Td
-/F8_0 9.96264 Tf
-(1)
-[4.98132
-0] Tj
--7642.41 TJm
-(0)
-[4.98132
-0] Tj
--8027.88 TJm
-(1)
-[4.98132
-0] Tj
--5.88993 TJm
-Q
-/DeviceGray {} cs
-[0.3999] sc
-365.059 349.613 m
-382.594 371.621 l
-355.082 365.699 l
-369.078 363.242 l
-f
-1.99253 w
-/DeviceGray {} CS
-[0.3999] SC
-325.898 336.473 m
-369.078 363.242 l
-S
-362.309 432.344 m
-382.594 451.848 l
-354.543 449.605 l
-368.094 445.324 l
-f
-325.898 426.34 m
-368.094 445.324 l
-S
-359.93 515.965 m
-382.594 532.645 l
-354.488 534.098 l
-367.363 528.078 l
-f
-325.898 515.641 m
-367.363 528.078 l
-S
-358.051 600.227 m
-382.594 614 l
-354.879 618.891 l
-366.918 611.336 l
-f
-325.898 604.363 m
-366.918 611.336 l
-S
-356.707 684.895 m
-382.594 695.93 l
-355.574 703.789 l
-366.723 694.977 l
-f
-325.898 692.527 m
-366.723 694.977 l
-S
-355.82 769.762 m
-382.594 778.426 l
-356.387 788.68 l
-366.699 778.902 l
-f
-325.898 780.129 m
-366.699 778.902 l
-S
-355.281 854.699 m
-382.594 861.48 l
-357.164 873.535 l
-366.77 863.062 l
-f
-325.898 867.152 m
-366.77 863.062 l
-S
-354.98 939.684 m
-382.594 945.113 l
-357.789 958.402 l
-366.867 947.469 l
-f
-325.898 953.617 m
-366.867 947.469 l
-S
-354.836 1024.68 m
-382.594 1029.3 l
-358.188 1043.31 l
-366.945 1032.12 l
-f
-325.898 1039.51 m
-366.945 1032.12 l
-S
-354.793 1109.71 m
-382.594 1114.07 l
-358.324 1128.31 l
-366.973 1117.03 l
-f
-325.898 1124.84 m
-366.973 1117.04 l
-S
-354.836 1194.78 m
-382.594 1199.4 l
-358.188 1213.41 l
-366.945 1202.21 l
-f
-325.898 1209.6 m
-366.945 1202.21 l
-S
-354.98 1279.86 m
-382.594 1285.29 l
-357.789 1298.58 l
-366.867 1287.64 l
-f
-325.898 1293.79 m
-366.867 1287.64 l
-S
-355.281 1364.97 m
-382.594 1371.75 l
-357.164 1383.8 l
-366.77 1373.34 l
-f
-325.898 1377.42 m
-366.77 1373.34 l
-S
-355.82 1450.12 m
-382.594 1458.79 l
-356.387 1469.04 l
-366.699 1459.26 l
-f
-325.898 1460.48 m
-366.699 1459.26 l
-S
-356.707 1535.34 m
-382.594 1546.38 l
-355.57 1554.23 l
-366.723 1545.42 l
-f
-325.898 1542.97 m
-366.723 1545.42 l
-S
-358.055 1620.77 m
-382.594 1634.54 l
-354.879 1639.43 l
-366.918 1631.88 l
-f
-325.898 1624.9 m
-366.918 1631.88 l
-S
-359.93 1706.59 m
-382.594 1723.27 l
-354.488 1724.71 l
-367.363 1718.7 l
-f
-325.898 1706.25 m
-367.363 1718.7 l
-S
-362.312 1793.06 m
-382.594 1812.57 l
-354.543 1810.32 l
-368.094 1806.04 l
-f
-325.898 1787.05 m
-368.094 1806.04 l
-S
-365.059 1880.43 m
-382.594 1902.44 l
-355.082 1896.51 l
-369.082 1894.05 l
-f
-325.898 1867.27 m
-369.082 1894.05 l
-S
-447.359 347.297 m
-467.641 366.801 l
-439.59 364.559 l
-453.141 360.277 l
-f
-410.949 341.289 m
-453.141 360.277 l
-S
-444.672 430.77 m
-467.641 447.031 l
-439.57 449 l
-452.328 442.742 l
-f
-410.949 431.156 m
-452.328 442.742 l
-S
-442.582 515.023 m
-467.641 527.824 l
-440.141 533.797 l
-451.871 525.777 l
-f
-410.949 520.457 m
-451.871 525.777 l
-S
-441.141 599.715 m
-467.641 609.18 l
-441.141 618.645 l
-451.738 609.18 l
-f
-410.949 609.184 m
-451.738 609.18 l
-S
-440.262 684.602 m
-467.641 691.109 l
-442.336 703.414 l
-451.836 692.848 l
-f
-410.949 697.348 m
-451.836 692.848 l
-S
-439.797 769.523 m
-467.641 773.605 l
-443.512 788.086 l
-452.051 776.727 l
-f
-410.949 784.949 m
-452.051 776.727 l
-S
-439.59 854.434 m
-467.641 856.66 l
-444.523 872.707 l
-452.289 860.805 l
-f
-410.949 871.973 m
-452.289 860.809 l
-S
-439.516 939.355 m
-467.641 940.293 l
-445.285 957.383 l
-452.496 945.137 l
-f
-410.949 958.438 m
-452.496 945.137 l
-S
-439.5 1024.3 m
-467.641 1024.48 l
-445.754 1042.17 l
-452.633 1029.73 l
-f
-410.949 1044.32 m
-452.633 1029.73 l
-S
-439.5 1109.32 m
-467.641 1109.25 l
-445.914 1127.13 l
-452.68 1114.63 l
-f
-410.949 1129.66 m
-452.68 1114.63 l
-S
-439.5 1194.4 m
-467.641 1194.58 l
-445.754 1212.27 l
-452.633 1199.83 l
-f
-410.949 1214.42 m
-452.633 1199.83 l
-S
-439.516 1279.53 m
-467.641 1280.47 l
-445.285 1297.56 l
-452.496 1285.31 l
-f
-410.949 1298.61 m
-452.496 1285.31 l
-S
-439.59 1364.7 m
-467.641 1366.93 l
-444.523 1382.98 l
-452.289 1371.08 l
-f
-410.949 1382.24 m
-452.289 1371.08 l
-S
-439.797 1449.88 m
-467.641 1453.96 l
-443.508 1468.44 l
-452.047 1457.08 l
-f
-410.949 1465.3 m
-452.047 1457.08 l
-S
-440.266 1535.05 m
-467.641 1541.56 l
-442.332 1553.86 l
-451.836 1543.29 l
-f
-410.949 1547.79 m
-451.836 1543.29 l
-S
-441.141 1620.26 m
-467.641 1629.72 l
-441.141 1639.19 l
-451.738 1629.72 l
-f
-410.949 1629.72 m
-451.738 1629.72 l
-S
-442.582 1705.64 m
-467.641 1718.45 l
-440.141 1724.41 l
-451.871 1716.4 l
-f
-410.949 1711.07 m
-451.871 1716.4 l
-S
-444.676 1791.49 m
-467.641 1807.75 l
-439.57 1809.71 l
-452.328 1803.46 l
-f
-410.949 1791.87 m
-452.328 1803.46 l
-S
-447.359 1878.11 m
-467.641 1897.62 l
-439.59 1895.37 l
-453.141 1891.09 l
-f
-410.949 1872.09 m
-453.141 1891.09 l
-S
-530.023 345.871 m
-552.688 362.551 l
-524.586 364 l
-537.457 357.98 l
-f
-495.996 345.543 m
-537.457 357.98 l
-S
-527.629 429.977 m
-552.688 442.777 l
-525.188 448.75 l
-536.922 440.73 l
-f
-495.996 435.41 m
-536.922 440.73 l
-S
-526.004 514.641 m
-552.688 523.574 l
-526.383 533.566 l
-536.789 523.891 l
-f
-495.996 524.711 m
-536.789 523.891 l
-S
-525.078 599.5 m
-552.688 604.926 l
-527.887 618.219 l
-536.965 607.289 l
-f
-495.996 613.434 m
-536.965 607.289 l
-S
-524.66 684.367 m
-552.688 686.855 l
-529.422 702.688 l
-537.301 690.859 l
-f
-495.996 701.602 m
-537.301 690.859 l
-S
-524.547 769.176 m
-552.688 769.355 l
-530.805 787.043 l
-537.68 774.605 l
-f
-495.996 789.199 m
-537.68 774.605 l
-S
-524.59 853.945 m
-552.688 852.41 l
-531.922 871.398 l
-538.027 858.566 l
-f
-495.996 876.223 m
-538.027 858.566 l
-S
-524.68 938.746 m
-552.688 936.039 l
-532.73 955.879 l
-538.297 942.805 l
-f
-495.996 962.688 m
-538.297 942.805 l
-S
-524.754 1023.62 m
-552.688 1020.23 l
-533.219 1040.55 l
-538.465 1027.34 l
-f
-495.996 1048.58 m
-538.465 1027.34 l
-S
-524.781 1108.6 m
-552.688 1104.99 l
-533.383 1125.46 l
-538.523 1112.22 l
-f
-495.996 1133.91 m
-538.523 1112.22 l
-S
-524.754 1193.71 m
-552.688 1190.32 l
-533.219 1210.64 l
-538.465 1197.44 l
-f
-495.996 1218.67 m
-538.465 1197.44 l
-S
-524.68 1278.92 m
-552.688 1276.21 l
-532.73 1296.05 l
-538.297 1282.98 l
-f
-495.996 1302.86 m
-538.297 1282.98 l
-S
-524.59 1364.21 m
-552.688 1362.68 l
-531.918 1381.67 l
-538.027 1368.84 l
-f
-495.996 1386.49 m
-538.027 1368.84 l
-S
-524.547 1449.54 m
-552.688 1449.71 l
-530.801 1467.4 l
-537.68 1454.96 l
-f
-495.996 1469.55 m
-537.68 1454.96 l
-S
-524.66 1534.81 m
-552.688 1537.3 l
-529.422 1553.13 l
-537.301 1541.3 l
-f
-495.996 1552.04 m
-537.301 1541.3 l
-S
-525.078 1620.04 m
-552.688 1625.47 l
-527.883 1638.76 l
-536.965 1627.83 l
-f
-495.996 1633.97 m
-536.965 1627.83 l
-S
-526.004 1705.26 m
-552.688 1714.2 l
-526.383 1724.19 l
-536.789 1714.51 l
-f
-495.996 1715.32 m
-536.789 1714.51 l
-S
-527.629 1790.69 m
-552.688 1803.5 l
-525.188 1809.46 l
-536.922 1801.45 l
-f
-495.996 1796.12 m
-536.922 1801.45 l
-S
-530.027 1876.68 m
-552.688 1893.37 l
-524.586 1894.81 l
-537.461 1888.79 l
-f
-495.996 1876.35 m
-537.461 1888.79 l
-S
-613.188 345.094 m
-637.727 358.863 l
-610.016 363.754 l
-622.051 356.199 l
-f
-581.035 349.227 m
-622.051 356.199 l
-S
-611.227 429.629 m
-637.727 439.094 l
-611.227 448.559 l
-621.828 439.094 l
-f
-581.035 439.094 m
-621.828 439.094 l
-S
-610.117 514.461 m
-637.727 519.887 l
-612.926 533.18 l
-622.004 522.246 l
-f
-581.035 528.395 m
-622.004 522.246 l
-S
-609.656 599.273 m
-637.727 601.242 l
-614.762 617.504 l
-622.418 605.531 l
-f
-581.035 617.121 m
-622.418 605.531 l
-S
-609.598 683.984 m
-637.727 683.172 l
-616.477 701.621 l
-622.914 688.949 l
-f
-581.035 705.285 m
-622.914 688.949 l
-S
-609.742 768.605 m
-637.727 765.668 l
-617.934 785.668 l
-623.395 772.551 l
-f
-581.035 792.883 m
-623.395 772.551 l
-S
-609.945 853.203 m
-637.727 848.723 l
-619.07 869.789 l
-623.797 856.387 l
-f
-581.035 879.906 m
-623.797 856.387 l
-S
-610.133 937.875 m
-637.727 932.355 l
-619.875 954.105 l
-624.094 940.535 l
-f
-581.035 966.375 m
-624.094 940.535 l
-S
-610.262 1022.66 m
-637.727 1016.54 l
-620.352 1038.68 l
-624.273 1025.02 l
-f
-581.035 1052.26 m
-624.273 1025.02 l
-S
-610.305 1107.62 m
-637.727 1101.31 l
-620.508 1123.57 l
-624.336 1109.88 l
-f
-581.035 1137.59 m
-624.336 1109.88 l
-S
-610.262 1192.76 m
-637.727 1186.64 l
-620.352 1208.77 l
-624.273 1195.12 l
-f
-581.035 1222.36 m
-624.273 1195.12 l
-S
-610.133 1278.05 m
-637.727 1272.53 l
-619.871 1294.28 l
-624.094 1280.71 l
-f
-581.035 1306.55 m
-624.094 1280.71 l
-S
-609.945 1363.47 m
-637.727 1359 l
-619.066 1380.06 l
-623.797 1366.66 l
-f
-581.035 1390.18 m
-623.797 1366.66 l
-S
-609.742 1448.96 m
-637.727 1446.03 l
-617.93 1466.03 l
-623.395 1452.91 l
-f
-581.035 1473.24 m
-623.395 1452.91 l
-S
-609.598 1534.43 m
-637.727 1533.62 l
-616.477 1552.07 l
-622.914 1539.39 l
-f
-581.035 1555.73 m
-622.914 1539.39 l
-S
-609.656 1619.82 m
-637.727 1621.79 l
-614.758 1638.04 l
-622.414 1626.07 l
-f
-581.035 1637.66 m
-622.414 1626.07 l
-S
-610.117 1705.08 m
-637.727 1710.51 l
-612.922 1723.8 l
-622.004 1712.87 l
-f
-581.035 1719.01 m
-622.004 1712.87 l
-S
-611.227 1790.34 m
-637.727 1799.81 l
-611.227 1809.27 l
-621.828 1799.81 l
-f
-581.035 1799.8 m
-621.828 1799.81 l
-S
-613.191 1875.9 m
-637.727 1889.68 l
-610.016 1894.57 l
-622.051 1887.01 l
-f
-581.035 1880.03 m
-622.051 1887.01 l
-S
-696.891 344.711 m
-722.773 355.746 l
-695.754 363.605 l
-706.902 354.793 l
-f
-666.082 352.348 m
-706.902 354.793 l
-S
-695.398 429.465 m
-722.773 435.973 l
-697.469 448.281 l
-706.969 437.715 l
-f
-666.082 442.215 m
-706.969 437.715 l
-S
-694.746 514.281 m
-722.773 516.77 l
-699.512 532.602 l
-707.387 520.773 l
-f
-666.082 531.512 m
-707.387 520.773 l
-S
-694.648 598.938 m
-722.773 598.125 l
-701.527 616.57 l
-707.961 603.902 l
-f
-666.082 620.238 m
-707.961 603.902 l
-S
-694.84 683.441 m
-722.773 680.055 l
-703.305 700.371 l
-708.555 687.164 l
-f
-666.082 708.402 m
-708.555 687.164 l
-S
-695.141 767.867 m
-722.773 762.551 l
-704.762 784.168 l
-709.082 770.633 l
-f
-666.082 796.004 m
-709.082 770.633 l
-S
-695.445 852.305 m
-722.773 845.605 l
-705.871 868.102 l
-709.504 854.363 l
-f
-666.082 883.027 m
-709.504 854.363 l
-S
-695.688 936.863 m
-722.773 929.238 l
-706.648 952.297 l
-709.812 938.441 l
-f
-666.082 969.492 m
-709.812 938.441 l
-S
-695.844 1021.58 m
-722.773 1013.43 l
-707.102 1036.8 l
-709.996 1022.88 l
-f
-666.082 1055.38 m
-709.996 1022.88 l
-S
-695.895 1106.52 m
-722.773 1098.19 l
-707.254 1121.66 l
-710.055 1107.73 l
-f
-666.082 1140.71 m
-710.055 1107.73 l
-S
-695.844 1191.68 m
-722.773 1183.52 l
-707.102 1206.89 l
-709.992 1192.98 l
-f
-666.082 1225.48 m
-709.992 1192.98 l
-S
-695.688 1277.04 m
-722.773 1269.41 l
-706.645 1292.47 l
-709.809 1278.62 l
-f
-666.082 1309.66 m
-709.809 1278.62 l
-S
-695.445 1362.57 m
-722.773 1355.88 l
-705.871 1378.38 l
-709.504 1364.64 l
-f
-666.082 1393.29 m
-709.504 1364.64 l
-S
-695.141 1448.22 m
-722.773 1442.91 l
-704.762 1464.53 l
-709.082 1450.99 l
-f
-666.082 1476.36 m
-709.082 1450.99 l
-S
-694.84 1533.89 m
-722.773 1530.5 l
-703.305 1550.82 l
-708.555 1537.61 l
-f
-666.082 1558.84 m
-708.555 1537.61 l
-S
-694.648 1619.48 m
-722.773 1618.67 l
-701.523 1637.11 l
-707.961 1624.45 l
-f
-666.082 1640.77 m
-707.961 1624.45 l
-S
-694.746 1704.9 m
-722.773 1707.39 l
-699.508 1723.22 l
-707.387 1711.39 l
-f
-666.082 1722.13 m
-707.387 1711.39 l
-S
-695.398 1790.18 m
-722.773 1796.7 l
-697.465 1809 l
-706.969 1798.43 l
-f
-666.082 1802.92 m
-706.969 1798.43 l
-S
-696.891 1875.52 m
-722.773 1886.56 l
-695.754 1894.42 l
-706.902 1885.61 l
-f
-666.082 1883.15 m
-706.902 1885.61 l
-S
-781.051 344.531 m
-807.824 353.195 l
-781.617 363.449 l
-791.93 353.672 l
-f
-751.129 354.898 m
-791.93 353.672 l
-S
-779.98 429.34 m
-807.824 433.422 l
-783.695 447.902 l
-792.23 436.543 l
-f
-751.129 444.766 m
-792.23 436.543 l
-S
-779.684 514.043 m
-807.824 514.219 l
-785.938 531.906 l
-792.816 519.473 l
-f
-751.129 534.066 m
-792.816 519.473 l
-S
-779.836 598.508 m
-807.824 595.574 l
-788.027 615.574 l
-793.488 602.453 l
-f
-751.129 622.789 m
-793.488 602.453 l
-S
-780.191 682.82 m
-807.824 677.504 l
-789.809 699.121 l
-794.129 685.582 l
-f
-751.129 710.957 m
-794.129 685.582 l
-S
-780.586 767.074 m
-807.824 760 l
-791.23 782.727 l
-794.676 768.941 l
-f
-751.129 798.555 m
-794.676 768.941 l
-S
-780.945 851.383 m
-807.824 843.055 l
-792.301 866.527 l
-795.102 852.594 l
-f
-751.129 885.578 m
-795.102 852.594 l
-S
-781.219 935.852 m
-807.824 926.684 l
-793.043 950.633 l
-795.406 936.617 l
-f
-751.129 972.043 m
-795.406 936.617 l
-S
-781.387 1020.52 m
-807.824 1010.88 l
-793.477 1035.08 l
-795.59 1021.03 l
-f
-751.129 1057.93 m
-795.59 1021.03 l
-S
-781.445 1105.44 m
-807.824 1095.64 l
-793.621 1119.93 l
-795.648 1105.87 l
-f
-751.129 1143.26 m
-795.648 1105.87 l
-S
-781.387 1190.61 m
-807.824 1180.97 l
-793.477 1205.18 l
-795.59 1191.12 l
-f
-751.129 1228.03 m
-795.59 1191.12 l
-S
-781.219 1276.02 m
-807.824 1266.86 l
-793.043 1290.8 l
-795.406 1276.79 l
-f
-751.129 1312.21 m
-795.406 1276.79 l
-S
-780.945 1361.66 m
-807.824 1353.33 l
-792.301 1376.8 l
-795.102 1362.87 l
-f
-751.129 1395.84 m
-795.102 1362.87 l
-S
-780.586 1447.43 m
-807.824 1440.36 l
-791.23 1463.09 l
-794.676 1449.3 l
-f
-751.129 1478.91 m
-794.676 1449.3 l
-S
-780.188 1533.27 m
-807.824 1527.95 l
-789.809 1549.57 l
-794.129 1536.03 l
-f
-751.129 1561.39 m
-794.129 1536.03 l
-S
-779.836 1619.05 m
-807.824 1616.12 l
-788.027 1636.12 l
-793.488 1623 l
-f
-751.129 1643.32 m
-793.488 1623 l
-S
-779.684 1704.66 m
-807.824 1704.84 l
-785.934 1722.53 l
-792.816 1710.09 l
-f
-751.129 1724.68 m
-792.816 1710.09 l
-S
-779.98 1790.05 m
-807.824 1794.14 l
-783.691 1808.62 l
-792.23 1797.26 l
-f
-751.129 1805.47 m
-792.23 1797.26 l
-S
-781.051 1875.34 m
-807.824 1884.01 l
-781.617 1894.26 l
-791.93 1884.48 l
-f
-751.129 1885.7 m
-791.93 1884.48 l
-S
-865.551 344.43 m
-892.863 351.211 l
-867.434 363.266 l
-877.043 352.793 l
-f
-836.168 356.883 m
-877.043 352.793 l
-S
-864.812 429.211 m
-892.863 431.438 l
-869.746 447.484 l
-877.512 435.586 l
-f
-836.168 446.75 m
-877.512 435.586 l
-S
-864.766 513.773 m
-892.863 512.234 l
-872.094 531.223 l
-878.203 518.391 l
-f
-836.168 536.047 m
-878.203 518.391 l
-S
-865.082 598.07 m
-892.863 593.59 l
-874.203 614.652 l
-878.93 601.254 l
-f
-836.168 624.773 m
-878.93 601.254 l
-S
-865.531 682.219 m
-892.863 675.52 l
-875.961 698.016 l
-879.594 684.277 l
-f
-836.168 712.938 m
-879.594 684.277 l
-S
-865.984 766.344 m
-892.863 758.016 l
-877.34 781.488 l
-880.141 767.555 l
-f
-836.168 800.539 m
-880.141 767.555 l
-S
-866.371 850.555 m
-892.863 841.07 l
-878.371 865.191 l
-880.566 851.152 l
-f
-836.168 887.562 m
-880.566 851.152 l
-S
-866.656 934.957 m
-892.863 924.703 l
-879.082 949.234 l
-880.867 935.137 l
-f
-836.168 974.027 m
-880.867 935.137 l
-S
-866.832 1019.58 m
-892.863 1008.89 l
-879.496 1033.65 l
-881.043 1019.53 l
-f
-836.168 1059.92 m
-881.043 1019.53 l
-S
-866.895 1104.49 m
-892.863 1093.66 l
-879.633 1118.49 l
-881.102 1104.36 l
-f
-836.168 1145.25 m
-881.102 1104.36 l
-S
-866.832 1189.68 m
-892.863 1178.99 l
-879.496 1203.75 l
-881.043 1189.62 l
-f
-836.168 1230.01 m
-881.043 1189.62 l
-S
-866.656 1275.13 m
-892.863 1264.88 l
-879.082 1289.41 l
-880.867 1275.31 l
-f
-836.168 1314.2 m
-880.867 1275.31 l
-S
-866.367 1360.83 m
-892.863 1351.34 l
-878.371 1375.46 l
-880.566 1361.43 l
-f
-836.168 1397.83 m
-880.566 1361.43 l
-S
-865.984 1446.7 m
-892.863 1438.38 l
-877.34 1461.85 l
-880.141 1447.91 l
-f
-836.168 1480.89 m
-880.141 1447.91 l
-S
-865.531 1532.66 m
-892.863 1525.96 l
-875.957 1548.46 l
-879.59 1534.72 l
-f
-836.168 1563.38 m
-879.59 1534.72 l
-S
-865.082 1618.61 m
-892.863 1614.13 l
-874.203 1635.2 l
-878.93 1621.79 l
-f
-836.168 1645.31 m
-878.93 1621.79 l
-S
-864.766 1704.39 m
-892.863 1702.86 l
-872.094 1721.84 l
-878.203 1709.02 l
-f
-836.168 1726.66 m
-878.203 1709.02 l
-S
-864.812 1789.93 m
-892.863 1792.16 l
-869.742 1808.2 l
-877.512 1796.3 l
-f
-836.168 1807.46 m
-877.512 1796.3 l
-S
-865.555 1875.24 m
-892.863 1882.03 l
-867.434 1894.08 l
-877.039 1883.61 l
-f
-836.168 1887.68 m
-877.039 1883.61 l
-S
-950.297 344.367 m
-977.91 349.793 l
-953.105 363.086 l
-962.188 352.152 l
-f
-921.219 358.297 m
-962.188 352.152 l
-S
-949.785 429.086 m
-977.91 430.023 l
-955.555 447.113 l
-962.766 434.867 l
-f
-921.219 448.164 m
-962.766 434.867 l
-S
-949.902 513.523 m
-977.91 510.816 l
-957.953 530.656 l
-963.52 517.582 l
-f
-921.219 537.465 m
-963.52 517.582 l
-S
-950.316 597.691 m
-977.91 592.172 l
-960.055 613.922 l
-964.277 600.352 l
-f
-921.219 626.191 m
-964.277 600.352 l
-S
-950.824 681.727 m
-977.91 674.102 l
-961.781 697.16 l
-964.945 683.309 l
-f
-921.219 714.355 m
-964.945 683.309 l
-S
-951.305 765.762 m
-977.91 756.598 l
-963.129 780.543 l
-965.496 766.531 l
-f
-921.219 801.957 m
-965.496 766.531 l
-S
-951.707 849.906 m
-977.91 839.652 l
-964.129 864.188 l
-965.914 850.09 l
-f
-921.219 888.98 m
-965.914 850.09 l
-S
-952 934.262 m
-977.91 923.285 l
-964.816 948.191 l
-966.207 934.051 l
-f
-921.219 975.445 m
-966.207 934.051 l
-S
-952.18 1018.86 m
-977.91 1007.47 l
-965.215 1032.59 l
-966.383 1018.43 l
-f
-921.219 1061.33 m
-966.383 1018.43 l
-S
-952.238 1103.76 m
-977.91 1092.24 l
-965.348 1117.42 l
-966.441 1103.25 l
-f
-921.219 1146.66 m
-966.441 1103.25 l
-S
-952.18 1188.96 m
-977.91 1177.57 l
-965.215 1202.68 l
-966.383 1188.52 l
-f
-921.219 1231.43 m
-966.383 1188.52 l
-S
-952 1274.44 m
-977.91 1263.46 l
-964.816 1288.37 l
-966.207 1274.23 l
-f
-921.219 1315.62 m
-966.207 1274.23 l
-S
-951.703 1360.18 m
-977.91 1349.93 l
-964.129 1374.46 l
-965.914 1360.36 l
-f
-921.219 1399.25 m
-965.914 1360.36 l
-S
-951.305 1446.12 m
-977.91 1436.96 l
-963.129 1460.9 l
-965.492 1446.89 l
-f
-921.219 1482.31 m
-965.492 1446.89 l
-S
-950.824 1532.17 m
-977.91 1524.55 l
-961.781 1547.61 l
-964.945 1533.75 l
-f
-921.219 1564.8 m
-964.945 1533.75 l
-S
-950.316 1618.23 m
-977.91 1612.71 l
-960.055 1634.46 l
-964.273 1620.89 l
-f
-921.219 1646.73 m
-964.273 1620.89 l
-S
-949.902 1704.14 m
-977.91 1701.44 l
-957.949 1721.28 l
-963.52 1708.2 l
-f
-921.219 1728.08 m
-963.52 1708.2 l
-S
-949.785 1789.8 m
-977.91 1790.74 l
-955.551 1807.83 l
-962.766 1795.59 l
-f
-921.219 1808.88 m
-962.766 1795.59 l
-S
-950.301 1875.18 m
-977.91 1880.61 l
-953.105 1893.89 l
-962.184 1882.96 l
-f
-921.219 1889.1 m
-962.184 1882.96 l
-S
-1035.19 344.324 m
-1062.95 348.945 l
-1038.55 362.953 l
-1047.3 351.762 l
-f
-1006.26 359.148 m
-1047.3 351.762 l
-S
-1034.81 428.992 m
-1062.95 429.172 l
-1041.06 446.859 l
-1047.94 434.426 l
-f
-1006.26 449.016 m
-1047.94 434.426 l
-S
-1035.02 513.355 m
-1062.95 509.969 l
-1043.48 530.285 l
-1048.73 517.078 l
-f
-1006.26 538.316 m
-1048.73 517.078 l
-S
-1035.48 597.441 m
-1062.95 591.32 l
-1045.57 613.457 l
-1049.5 599.797 l
-f
-1006.26 627.039 m
-1049.5 599.797 l
-S
-1036.02 681.406 m
-1062.95 673.25 l
-1047.28 696.625 l
-1050.17 682.711 l
-f
-1006.26 715.207 m
-1050.17 682.711 l
-S
-1036.51 765.391 m
-1062.95 755.75 l
-1048.6 779.957 l
-1050.71 765.902 l
-f
-1006.26 802.805 m
-1050.71 765.902 l
-S
-1036.92 849.496 m
-1062.95 838.805 l
-1049.58 863.566 l
-1051.13 849.441 l
-f
-1006.26 889.828 m
-1051.13 849.441 l
-S
-1037.22 933.824 m
-1062.95 922.434 l
-1050.25 947.547 l
-1051.42 933.387 l
-f
-1006.26 976.293 m
-1051.42 933.387 l
-S
-1037.4 1018.41 m
-1062.95 1006.62 l
-1050.65 1031.93 l
-1051.59 1017.75 l
-f
-1006.26 1062.18 m
-1051.59 1017.75 l
-S
-1037.46 1103.3 m
-1062.95 1091.39 l
-1050.78 1116.76 l
-1051.65 1102.57 l
-f
-1006.26 1147.52 m
-1051.65 1102.57 l
-S
-1037.4 1188.51 m
-1062.95 1176.72 l
-1050.65 1202.03 l
-1051.59 1187.85 l
-f
-1006.26 1232.28 m
-1051.59 1187.85 l
-S
-1037.22 1274 m
-1062.95 1262.61 l
-1050.25 1287.72 l
-1051.42 1273.56 l
-f
-1006.26 1316.47 m
-1051.42 1273.56 l
-S
-1036.92 1359.77 m
-1062.95 1349.07 l
-1049.58 1373.84 l
-1051.13 1359.71 l
-f
-1006.26 1400.1 m
-1051.13 1359.71 l
-S
-1036.51 1445.75 m
-1062.95 1436.11 l
-1048.6 1460.32 l
-1050.71 1446.26 l
-f
-1006.26 1483.16 m
-1050.71 1446.26 l
-S
-1036.02 1531.85 m
-1062.95 1523.7 l
-1047.28 1547.07 l
-1050.17 1533.16 l
-f
-1006.26 1565.65 m
-1050.17 1533.16 l
-S
-1035.48 1617.98 m
-1062.95 1611.87 l
-1045.57 1634 l
-1049.5 1620.34 l
-f
-1006.26 1647.58 m
-1049.5 1620.34 l
-S
-1035.02 1703.97 m
-1062.95 1700.59 l
-1043.48 1720.91 l
-1048.73 1707.7 l
-f
-1006.26 1728.93 m
-1048.73 1707.7 l
-S
-1034.81 1789.71 m
-1062.95 1789.89 l
-1041.06 1807.57 l
-1047.94 1795.14 l
-f
-1006.26 1809.73 m
-1047.94 1795.14 l
-S
-1035.19 1875.13 m
-1062.95 1879.76 l
-1038.54 1893.77 l
-1047.3 1882.57 l
-f
-1006.26 1889.95 m
-1047.3 1882.57 l
-S
-1120.2 344.309 m
-1148 348.66 l
-1123.73 362.906 l
-1132.38 351.629 l
-f
-1091.3 359.434 m
-1132.38 351.629 l
-S
-1119.86 428.961 m
-1148 428.891 l
-1126.27 446.77 l
-1133.04 434.273 l
-f
-1091.3 449.301 m
-1133.04 434.273 l
-S
-1120.09 513.293 m
-1148 509.684 l
-1128.69 530.156 l
-1133.83 516.91 l
-f
-1091.3 538.598 m
-1133.83 516.91 l
-S
-1120.57 597.352 m
-1148 591.039 l
-1130.78 613.297 l
-1134.61 599.609 l
-f
-1091.3 627.324 m
-1134.61 599.609 l
-S
-1121.12 681.297 m
-1148 672.969 l
-1132.48 696.441 l
-1135.28 682.508 l
-f
-1091.3 715.488 m
-1135.28 682.508 l
-S
-1121.62 765.262 m
-1148 755.465 l
-1133.79 779.758 l
-1135.82 765.691 l
-f
-1091.3 803.09 m
-1135.82 765.691 l
-S
-1122.03 849.355 m
-1148 838.52 l
-1134.77 863.355 l
-1136.24 849.223 l
-f
-1091.3 890.113 m
-1136.24 849.223 l
-S
-1122.32 933.676 m
-1148 922.152 l
-1135.43 947.332 l
-1136.53 933.164 l
-f
-1091.3 976.578 m
-1136.53 933.164 l
-S
-1122.51 1018.26 m
-1148 1006.34 l
-1135.82 1031.71 l
-1136.7 1017.53 l
-f
-1091.3 1062.46 m
-1136.7 1017.53 l
-S
-1122.57 1103.15 m
-1148 1091.11 l
-1135.95 1116.54 l
-1136.75 1102.35 l
-f
-1091.3 1147.8 m
-1136.75 1102.35 l
-S
-1122.51 1188.36 m
-1148 1176.44 l
-1135.82 1201.8 l
-1136.7 1187.62 l
-f
-1091.3 1232.56 m
-1136.7 1187.62 l
-S
-1122.32 1273.85 m
-1148 1262.33 l
-1135.43 1287.51 l
-1136.53 1273.34 l
-f
-1091.3 1316.75 m
-1136.53 1273.34 l
-S
-1122.03 1359.63 m
-1148 1348.79 l
-1134.77 1373.63 l
-1136.24 1359.49 l
-f
-1091.3 1400.38 m
-1136.24 1359.49 l
-S
-1121.62 1445.62 m
-1148 1435.82 l
-1133.79 1460.12 l
-1135.82 1446.05 l
-f
-1091.3 1483.44 m
-1135.82 1446.05 l
-S
-1121.12 1531.74 m
-1148 1523.41 l
-1132.47 1546.89 l
-1135.28 1532.96 l
-f
-1091.3 1565.93 m
-1135.28 1532.96 l
-S
-1120.57 1617.89 m
-1148 1611.58 l
-1130.78 1633.84 l
-1134.61 1620.15 l
-f
-1091.3 1647.86 m
-1134.61 1620.15 l
-S
-1120.09 1703.91 m
-1148 1700.31 l
-1128.69 1720.78 l
-1133.83 1707.53 l
-f
-1091.3 1729.21 m
-1133.83 1707.53 l
-S
-1119.86 1789.68 m
-1148 1789.61 l
-1126.27 1807.48 l
-1133.04 1794.99 l
-f
-1091.3 1810.01 m
-1133.04 1794.99 l
-S
-1120.2 1875.12 m
-1148 1879.48 l
-1123.73 1893.71 l
-1132.38 1882.44 l
-f
-1091.3 1890.23 m
-1132.38 1882.44 l
-S
-1205.29 344.324 m
-1233.05 348.945 l
-1208.64 362.953 l
-1217.39 351.762 l
-f
-1176.35 359.148 m
-1217.39 351.762 l
-S
-1204.91 428.992 m
-1233.05 429.172 l
-1211.16 446.859 l
-1218.04 434.426 l
-f
-1176.35 449.016 m
-1218.04 434.426 l
-S
-1205.11 513.355 m
-1233.05 509.969 l
-1213.57 530.285 l
-1218.82 517.078 l
-f
-1176.35 538.316 m
-1218.82 517.078 l
-S
-1205.58 597.441 m
-1233.05 591.324 l
-1215.67 613.457 l
-1219.59 599.797 l
-f
-1176.35 627.039 m
-1219.59 599.797 l
-S
-1206.11 681.406 m
-1233.05 673.254 l
-1217.38 696.625 l
-1220.27 682.711 l
-f
-1176.35 715.207 m
-1220.27 682.711 l
-S
-1206.61 765.391 m
-1233.05 755.75 l
-1218.7 779.957 l
-1220.81 765.902 l
-f
-1176.35 802.805 m
-1220.81 765.902 l
-S
-1207.02 849.496 m
-1233.05 838.805 l
-1219.68 863.566 l
-1221.23 849.441 l
-f
-1176.35 889.828 m
-1221.23 849.441 l
-S
-1207.31 933.824 m
-1233.05 922.434 l
-1220.35 947.547 l
-1221.52 933.387 l
-f
-1176.35 976.293 m
-1221.52 933.387 l
-S
-1207.49 1018.41 m
-1233.05 1006.62 l
-1220.74 1031.93 l
-1221.69 1017.75 l
-f
-1176.35 1062.18 m
-1221.69 1017.75 l
-S
-1207.55 1103.31 m
-1233.05 1091.39 l
-1220.87 1116.76 l
-1221.75 1102.57 l
-f
-1176.35 1147.52 m
-1221.75 1102.57 l
-S
-1207.49 1188.51 m
-1233.05 1176.72 l
-1220.74 1202.03 l
-1221.69 1187.85 l
-f
-1176.35 1232.28 m
-1221.69 1187.85 l
-S
-1207.31 1274 m
-1233.05 1262.61 l
-1220.35 1287.72 l
-1221.52 1273.56 l
-f
-1176.35 1316.46 m
-1221.52 1273.56 l
-S
-1207.02 1359.77 m
-1233.05 1349.07 l
-1219.68 1373.84 l
-1221.23 1359.71 l
-f
-1176.35 1400.1 m
-1221.23 1359.71 l
-S
-1206.61 1445.75 m
-1233.05 1436.11 l
-1218.7 1460.32 l
-1220.81 1446.26 l
-f
-1176.35 1483.16 m
-1220.81 1446.26 l
-S
-1206.11 1531.86 m
-1233.05 1523.7 l
-1217.37 1547.07 l
-1220.26 1533.16 l
-f
-1176.35 1565.65 m
-1220.26 1533.16 l
-S
-1205.58 1617.98 m
-1233.05 1611.87 l
-1215.67 1634 l
-1219.59 1620.34 l
-f
-1176.35 1647.57 m
-1219.59 1620.34 l
-S
-1205.11 1703.97 m
-1233.05 1700.59 l
-1213.57 1720.91 l
-1218.82 1707.7 l
-f
-1176.35 1728.93 m
-1218.82 1707.7 l
-S
-1204.91 1789.71 m
-1233.05 1789.89 l
-1211.16 1807.58 l
-1218.04 1795.14 l
-f
-1176.35 1809.72 m
-1218.04 1795.14 l
-S
-1205.29 1875.13 m
-1233.05 1879.76 l
-1208.64 1893.77 l
-1217.39 1882.57 l
-f
-1176.35 1889.95 m
-1217.39 1882.57 l
-S
-1290.47 344.367 m
-1318.09 349.797 l
-1293.28 363.086 l
-1302.36 352.152 l
-f
-1261.39 358.297 m
-1302.36 352.152 l
-S
-1289.96 429.086 m
-1318.09 430.023 l
-1295.73 447.113 l
-1302.94 434.871 l
-f
-1261.39 448.164 m
-1302.94 434.871 l
-S
-1290.07 513.527 m
-1318.09 510.82 l
-1298.12 530.656 l
-1303.7 517.582 l
-f
-1261.39 537.465 m
-1303.7 517.582 l
-S
-1290.49 597.691 m
-1318.09 592.172 l
-1300.23 613.922 l
-1304.45 600.355 l
-f
-1261.39 626.188 m
-1304.45 600.355 l
-S
-1291 681.727 m
-1318.09 674.102 l
-1301.96 697.16 l
-1305.12 683.309 l
-f
-1261.39 714.355 m
-1305.12 683.309 l
-S
-1291.48 765.766 m
-1318.09 756.598 l
-1303.3 780.543 l
-1305.67 766.531 l
-f
-1261.39 801.953 m
-1305.67 766.531 l
-S
-1291.88 849.91 m
-1318.09 839.656 l
-1304.3 864.188 l
-1306.09 850.09 l
-f
-1261.39 888.977 m
-1306.09 850.09 l
-S
-1292.18 934.262 m
-1318.09 923.285 l
-1304.99 948.191 l
-1306.38 934.051 l
-f
-1261.39 975.441 m
-1306.38 934.051 l
-S
-1292.35 1018.86 m
-1318.09 1007.48 l
-1305.39 1032.59 l
-1306.56 1018.43 l
-f
-1261.39 1061.33 m
-1306.56 1018.43 l
-S
-1292.41 1103.77 m
-1318.09 1092.24 l
-1305.52 1117.42 l
-1306.61 1103.25 l
-f
-1261.39 1146.66 m
-1306.61 1103.25 l
-S
-1292.35 1188.96 m
-1318.09 1177.57 l
-1305.39 1202.68 l
-1306.55 1188.52 l
-f
-1261.39 1231.43 m
-1306.56 1188.52 l
-S
-1292.17 1274.44 m
-1318.09 1263.46 l
-1304.99 1288.37 l
-1306.38 1274.23 l
-f
-1261.39 1315.62 m
-1306.38 1274.23 l
-S
-1291.88 1360.18 m
-1318.09 1349.93 l
-1304.3 1374.46 l
-1306.09 1360.36 l
-f
-1261.39 1399.25 m
-1306.09 1360.36 l
-S
-1291.48 1446.12 m
-1318.09 1436.96 l
-1303.3 1460.9 l
-1305.67 1446.89 l
-f
-1261.39 1482.31 m
-1305.67 1446.89 l
-S
-1291 1532.17 m
-1318.09 1524.55 l
-1301.95 1547.61 l
-1305.12 1533.75 l
-f
-1261.39 1564.8 m
-1305.12 1533.75 l
-S
-1290.49 1618.23 m
-1318.09 1612.72 l
-1300.23 1634.46 l
-1304.45 1620.89 l
-f
-1261.39 1646.73 m
-1304.45 1620.9 l
-S
-1290.07 1704.14 m
-1318.09 1701.44 l
-1298.12 1721.28 l
-1303.7 1708.2 l
-f
-1261.39 1728.08 m
-1303.7 1708.2 l
-S
-1289.96 1789.8 m
-1318.09 1790.74 l
-1295.73 1807.83 l
-1302.94 1795.59 l
-f
-1261.39 1808.88 m
-1302.94 1795.59 l
-S
-1290.47 1875.18 m
-1318.09 1880.61 l
-1293.28 1893.89 l
-1302.36 1882.96 l
-f
-1261.39 1889.1 m
-1302.36 1882.96 l
-S
-1375.82 344.43 m
-1403.13 351.211 l
-1377.7 363.266 l
-1387.31 352.793 l
-f
-1346.44 356.879 m
-1387.31 352.793 l
-S
-1375.08 429.211 m
-1403.13 431.441 l
-1380.02 447.484 l
-1387.78 435.586 l
-f
-1346.44 446.746 m
-1387.78 435.586 l
-S
-1375.04 513.773 m
-1403.13 512.238 l
-1382.36 531.223 l
-1388.47 518.395 l
-f
-1346.44 536.047 m
-1388.47 518.395 l
-S
-1375.35 598.07 m
-1403.13 593.59 l
-1384.47 614.656 l
-1389.2 601.254 l
-f
-1346.44 624.77 m
-1389.2 601.254 l
-S
-1375.8 682.219 m
-1403.13 675.52 l
-1386.23 698.016 l
-1389.86 684.277 l
-f
-1346.44 712.938 m
-1389.86 684.281 l
-S
-1376.25 766.348 m
-1403.13 758.016 l
-1387.61 781.488 l
-1390.41 767.559 l
-f
-1346.44 800.535 m
-1390.41 767.559 l
-S
-1376.64 850.559 m
-1403.13 841.074 l
-1388.64 865.195 l
-1390.84 851.156 l
-f
-1346.44 887.559 m
-1390.84 851.156 l
-S
-1376.93 934.957 m
-1403.13 924.703 l
-1389.35 949.238 l
-1391.14 935.141 l
-f
-1346.44 974.023 m
-1391.14 935.141 l
-S
-1377.1 1019.59 m
-1403.13 1008.89 l
-1389.77 1033.66 l
-1391.31 1019.53 l
-f
-1346.44 1059.91 m
-1391.31 1019.53 l
-S
-1377.16 1104.49 m
-1403.13 1093.66 l
-1389.9 1118.49 l
-1391.37 1104.36 l
-f
-1346.44 1145.25 m
-1391.37 1104.36 l
-S
-1377.1 1189.68 m
-1403.13 1178.99 l
-1389.77 1203.75 l
-1391.31 1189.62 l
-f
-1346.44 1230.01 m
-1391.31 1189.62 l
-S
-1376.93 1275.13 m
-1403.13 1264.88 l
-1389.35 1289.41 l
-1391.14 1275.32 l
-f
-1346.44 1314.2 m
-1391.14 1275.32 l
-S
-1376.64 1360.83 m
-1403.13 1351.34 l
-1388.64 1375.46 l
-1390.84 1361.43 l
-f
-1346.44 1397.83 m
-1390.84 1361.43 l
-S
-1376.25 1446.7 m
-1403.13 1438.38 l
-1387.61 1461.85 l
-1390.41 1447.92 l
-f
-1346.44 1480.89 m
-1390.41 1447.92 l
-S
-1375.8 1532.66 m
-1403.13 1525.97 l
-1386.23 1548.46 l
-1389.86 1534.73 l
-f
-1346.44 1563.38 m
-1389.86 1534.73 l
-S
-1375.35 1618.61 m
-1403.13 1614.14 l
-1384.47 1635.2 l
-1389.2 1621.8 l
-f
-1346.44 1645.31 m
-1389.2 1621.8 l
-S
-1375.04 1704.39 m
-1403.13 1702.86 l
-1382.36 1721.84 l
-1388.47 1709.02 l
-f
-1346.44 1726.66 m
-1388.47 1709.02 l
-S
-1375.08 1789.93 m
-1403.13 1792.16 l
-1380.01 1808.2 l
-1387.78 1796.3 l
-f
-1346.44 1807.46 m
-1387.78 1796.3 l
-S
-1375.82 1875.24 m
-1403.13 1882.03 l
-1377.7 1894.08 l
-1387.31 1883.61 l
-f
-1346.44 1887.68 m
-1387.31 1883.61 l
-S
-1461.41 344.531 m
-1488.18 353.199 l
-1461.98 363.449 l
-1472.29 353.672 l
-f
-1431.49 354.895 m
-1472.29 353.672 l
-S
-1460.34 429.34 m
-1488.18 433.426 l
-1464.05 447.902 l
-1472.59 436.543 l
-f
-1431.49 444.762 m
-1472.59 436.543 l
-S
-1460.04 514.043 m
-1488.18 514.223 l
-1466.29 531.91 l
-1473.17 519.473 l
-f
-1431.49 534.062 m
-1473.17 519.473 l
-S
-1460.2 598.512 m
-1488.18 595.578 l
-1468.38 615.574 l
-1473.84 602.457 l
-f
-1431.49 622.785 m
-1473.84 602.457 l
-S
-1460.55 682.82 m
-1488.18 677.504 l
-1470.16 699.121 l
-1474.48 685.586 l
-f
-1431.49 710.953 m
-1474.48 685.586 l
-S
-1460.95 767.078 m
-1488.18 760.004 l
-1471.59 782.73 l
-1475.03 768.941 l
-f
-1431.49 798.551 m
-1475.03 768.941 l
-S
-1461.3 851.387 m
-1488.18 843.059 l
-1472.66 866.527 l
-1475.46 852.598 l
-f
-1431.49 885.574 m
-1475.46 852.598 l
-S
-1461.57 935.852 m
-1488.18 926.688 l
-1473.4 950.633 l
-1475.77 936.621 l
-f
-1431.49 972.039 m
-1475.77 936.621 l
-S
-1461.74 1020.52 m
-1488.18 1010.88 l
-1473.83 1035.09 l
-1475.95 1021.03 l
-f
-1431.49 1057.93 m
-1475.95 1021.03 l
-S
-1461.8 1105.44 m
-1488.18 1095.64 l
-1473.98 1119.93 l
-1476 1105.87 l
-f
-1431.49 1143.26 m
-1476 1105.87 l
-S
-1461.74 1190.61 m
-1488.18 1180.97 l
-1473.83 1205.18 l
-1475.95 1191.13 l
-f
-1431.49 1228.02 m
-1475.95 1191.13 l
-S
-1461.57 1276.03 m
-1488.18 1266.86 l
-1473.4 1290.81 l
-1475.76 1276.8 l
-f
-1431.49 1312.21 m
-1475.76 1276.8 l
-S
-1461.3 1361.66 m
-1488.18 1353.33 l
-1472.66 1376.8 l
-1475.46 1362.87 l
-f
-1431.49 1395.84 m
-1475.46 1362.87 l
-S
-1460.95 1447.43 m
-1488.18 1440.36 l
-1471.59 1463.09 l
-1475.03 1449.3 l
-f
-1431.49 1478.91 m
-1475.03 1449.3 l
-S
-1460.55 1533.27 m
-1488.18 1527.95 l
-1470.16 1549.57 l
-1474.48 1536.03 l
-f
-1431.49 1561.39 m
-1474.48 1536.03 l
-S
-1460.19 1619.05 m
-1488.18 1616.12 l
-1468.38 1636.12 l
-1473.84 1623 l
-f
-1431.49 1643.32 m
-1473.84 1623 l
-S
-1460.04 1704.66 m
-1488.18 1704.84 l
-1466.29 1722.53 l
-1473.17 1710.09 l
-f
-1431.49 1724.68 m
-1473.17 1710.09 l
-S
-1460.34 1790.05 m
-1488.18 1794.14 l
-1464.05 1808.62 l
-1472.59 1797.26 l
-f
-1431.49 1805.47 m
-1472.59 1797.26 l
-S
-1461.41 1875.34 m
-1488.18 1884.02 l
-1461.97 1894.26 l
-1472.29 1884.48 l
-f
-1431.49 1885.7 m
-1472.29 1884.48 l
-S
-1547.34 344.711 m
-1573.22 355.75 l
-1546.2 363.605 l
-1557.35 354.797 l
-f
-1516.53 352.344 m
-1557.35 354.797 l
-S
-1545.84 429.465 m
-1573.22 435.977 l
-1547.91 448.281 l
-1557.41 437.715 l
-f
-1516.53 442.211 m
-1557.41 437.715 l
-S
-1545.19 514.281 m
-1573.22 516.773 l
-1549.95 532.602 l
-1557.83 520.773 l
-f
-1516.53 531.512 m
-1557.83 520.773 l
-S
-1545.09 598.938 m
-1573.22 598.129 l
-1551.97 616.574 l
-1558.41 603.906 l
-f
-1516.53 620.234 m
-1558.41 603.906 l
-S
-1545.29 683.441 m
-1573.22 680.059 l
-1553.75 700.375 l
-1559 687.168 l
-f
-1516.53 708.402 m
-1559 687.168 l
-S
-1545.59 767.867 m
-1573.22 762.555 l
-1555.2 784.172 l
-1559.52 770.633 l
-f
-1516.53 796 m
-1559.52 770.633 l
-S
-1545.89 852.305 m
-1573.22 845.609 l
-1556.31 868.105 l
-1559.95 854.367 l
-f
-1516.53 883.023 m
-1559.95 854.367 l
-S
-1546.13 936.863 m
-1573.22 929.238 l
-1557.09 952.297 l
-1560.25 938.445 l
-f
-1516.53 969.488 m
-1560.25 938.445 l
-S
-1546.29 1021.58 m
-1573.22 1013.43 l
-1557.55 1036.8 l
-1560.44 1022.89 l
-f
-1516.53 1055.38 m
-1560.44 1022.89 l
-S
-1546.34 1106.52 m
-1573.22 1098.2 l
-1557.7 1121.66 l
-1560.5 1107.73 l
-f
-1516.53 1140.71 m
-1560.5 1107.73 l
-S
-1546.29 1191.68 m
-1573.22 1183.53 l
-1557.55 1206.89 l
-1560.44 1192.98 l
-f
-1516.53 1225.47 m
-1560.44 1192.98 l
-S
-1546.13 1277.04 m
-1573.22 1269.41 l
-1557.09 1292.47 l
-1560.25 1278.62 l
-f
-1516.53 1309.66 m
-1560.25 1278.62 l
-S
-1545.89 1362.58 m
-1573.22 1355.88 l
-1556.31 1378.38 l
-1559.95 1364.64 l
-f
-1516.53 1393.29 m
-1559.95 1364.64 l
-S
-1545.59 1448.23 m
-1573.22 1442.91 l
-1555.2 1464.53 l
-1559.52 1450.99 l
-f
-1516.53 1476.36 m
-1559.52 1450.99 l
-S
-1545.29 1533.89 m
-1573.22 1530.5 l
-1553.75 1550.82 l
-1559 1537.61 l
-f
-1516.53 1558.84 m
-1559 1537.61 l
-S
-1545.09 1619.48 m
-1573.22 1618.67 l
-1551.96 1637.11 l
-1558.41 1624.45 l
-f
-1516.53 1640.77 m
-1558.41 1624.45 l
-S
-1545.19 1704.9 m
-1573.22 1707.4 l
-1549.95 1723.22 l
-1557.83 1711.39 l
-f
-1516.53 1722.12 m
-1557.83 1711.39 l
-S
-1545.84 1790.18 m
-1573.22 1796.7 l
-1547.91 1809 l
-1557.41 1798.43 l
-f
-1516.53 1802.92 m
-1557.41 1798.43 l
-S
-1547.34 1875.52 m
-1573.22 1886.57 l
-1546.2 1894.42 l
-1557.35 1885.61 l
-f
-1516.53 1883.15 m
-1557.35 1885.61 l
-S
-1633.73 345.094 m
-1658.27 358.867 l
-1630.55 363.754 l
-1642.59 356.203 l
-f
-1601.57 349.223 m
-1642.59 356.203 l
-S
-1631.77 429.629 m
-1658.27 439.098 l
-1631.77 448.559 l
-1642.37 439.094 l
-f
-1601.57 439.09 m
-1642.37 439.094 l
-S
-1630.66 514.461 m
-1658.27 519.891 l
-1633.46 533.18 l
-1642.54 522.25 l
-f
-1601.57 528.391 m
-1642.54 522.25 l
-S
-1630.2 599.277 m
-1658.27 601.246 l
-1635.3 617.504 l
-1642.96 605.531 l
-f
-1601.57 617.117 m
-1642.96 605.531 l
-S
-1630.14 683.984 m
-1658.27 683.176 l
-1637.02 701.621 l
-1643.45 688.953 l
-f
-1601.57 705.281 m
-1643.45 688.953 l
-S
-1630.28 768.605 m
-1658.27 765.672 l
-1638.47 785.672 l
-1643.93 772.551 l
-f
-1601.57 792.879 m
-1643.93 772.551 l
-S
-1630.48 853.203 m
-1658.27 848.727 l
-1639.61 869.789 l
-1644.34 856.391 l
-f
-1601.57 879.902 m
-1644.34 856.391 l
-S
-1630.67 937.875 m
-1658.27 932.359 l
-1640.41 954.109 l
-1644.63 940.539 l
-f
-1601.57 966.367 m
-1644.63 940.539 l
-S
-1630.8 1022.66 m
-1658.27 1016.55 l
-1640.89 1038.68 l
-1644.81 1025.02 l
-f
-1601.57 1052.26 m
-1644.81 1025.02 l
-S
-1630.84 1107.62 m
-1658.27 1101.31 l
-1641.05 1123.57 l
-1644.88 1109.88 l
-f
-1601.57 1137.59 m
-1644.88 1109.88 l
-S
-1630.8 1192.76 m
-1658.27 1186.64 l
-1640.89 1208.78 l
-1644.81 1195.12 l
-f
-1601.57 1222.35 m
-1644.81 1195.12 l
-S
-1630.67 1278.05 m
-1658.27 1272.54 l
-1640.41 1294.28 l
-1644.63 1280.71 l
-f
-1601.57 1306.54 m
-1644.63 1280.71 l
-S
-1630.48 1363.48 m
-1658.27 1359 l
-1639.61 1380.06 l
-1644.34 1366.66 l
-f
-1601.57 1390.17 m
-1644.34 1366.66 l
-S
-1630.28 1448.96 m
-1658.27 1446.03 l
-1638.47 1466.03 l
-1643.93 1452.91 l
-f
-1601.57 1473.23 m
-1643.93 1452.91 l
-S
-1630.14 1534.43 m
-1658.27 1533.62 l
-1637.01 1552.07 l
-1643.45 1539.4 l
-f
-1601.57 1555.72 m
-1643.45 1539.4 l
-S
-1630.2 1619.82 m
-1658.27 1621.79 l
-1635.3 1638.05 l
-1642.95 1626.07 l
-f
-1601.57 1637.65 m
-1642.95 1626.07 l
-S
-1630.66 1705.08 m
-1658.27 1710.52 l
-1633.46 1723.8 l
-1642.54 1712.87 l
-f
-1601.57 1719 m
-1642.54 1712.87 l
-S
-1631.77 1790.34 m
-1658.27 1799.82 l
-1631.77 1809.27 l
-1642.37 1799.81 l
-f
-1601.57 1799.8 m
-1642.37 1799.81 l
-S
-1633.73 1875.91 m
-1658.27 1889.68 l
-1630.55 1894.57 l
-1642.59 1887.02 l
-f
-1601.57 1880.03 m
-1642.59 1887.02 l
-S
-1720.64 345.871 m
-1743.31 362.555 l
-1715.2 364 l
-1728.08 357.984 l
-f
-1686.61 345.539 m
-1728.08 357.984 l
-S
-1718.25 429.977 m
-1743.31 442.781 l
-1715.8 448.75 l
-1727.54 440.73 l
-f
-1686.61 435.406 m
-1727.54 440.73 l
-S
-1716.62 514.641 m
-1743.31 523.578 l
-1717 533.566 l
-1727.41 523.895 l
-f
-1686.61 524.707 m
-1727.41 523.895 l
-S
-1715.7 599.5 m
-1743.31 604.934 l
-1718.5 618.219 l
-1727.58 607.289 l
-f
-1686.61 613.43 m
-1727.58 607.289 l
-S
-1715.28 684.367 m
-1743.31 686.863 l
-1720.04 702.688 l
-1727.92 690.863 l
-f
-1686.61 701.598 m
-1727.92 690.863 l
-S
-1715.17 769.176 m
-1743.31 769.359 l
-1721.42 787.043 l
-1728.3 774.609 l
-f
-1686.61 789.195 m
-1728.3 774.609 l
-S
-1715.21 853.945 m
-1743.31 852.414 l
-1722.54 871.398 l
-1728.64 858.57 l
-f
-1686.61 876.219 m
-1728.64 858.57 l
-S
-1715.3 938.75 m
-1743.31 936.043 l
-1723.35 955.879 l
-1728.91 942.805 l
-f
-1686.61 962.684 m
-1728.91 942.805 l
-S
-1715.37 1023.62 m
-1743.31 1020.23 l
-1723.84 1040.55 l
-1729.09 1027.34 l
-f
-1686.61 1048.57 m
-1729.09 1027.34 l
-S
-1715.4 1108.61 m
-1743.31 1105 l
-1724 1125.47 l
-1729.14 1112.22 l
-f
-1686.61 1133.9 m
-1729.14 1112.22 l
-S
-1715.37 1193.71 m
-1743.31 1190.33 l
-1723.84 1210.64 l
-1729.09 1197.44 l
-f
-1686.61 1218.67 m
-1729.09 1197.44 l
-S
-1715.3 1278.92 m
-1743.31 1276.22 l
-1723.35 1296.05 l
-1728.91 1282.98 l
-f
-1686.61 1302.86 m
-1728.91 1282.98 l
-S
-1715.21 1364.22 m
-1743.31 1362.69 l
-1722.54 1381.67 l
-1728.64 1368.84 l
-f
-1686.61 1386.48 m
-1728.64 1368.84 l
-S
-1715.17 1449.54 m
-1743.31 1449.72 l
-1721.42 1467.4 l
-1728.3 1454.97 l
-f
-1686.61 1469.55 m
-1728.3 1454.97 l
-S
-1715.28 1534.81 m
-1743.31 1537.31 l
-1720.04 1553.13 l
-1727.92 1541.31 l
-f
-1686.61 1552.04 m
-1727.92 1541.31 l
-S
-1715.7 1620.04 m
-1743.31 1625.48 l
-1718.5 1638.76 l
-1727.58 1627.83 l
-f
-1686.61 1633.96 m
-1727.58 1627.83 l
-S
-1716.62 1705.26 m
-1743.31 1714.2 l
-1717 1724.19 l
-1727.41 1714.52 l
-f
-1686.61 1715.32 m
-1727.41 1714.52 l
-S
-1718.25 1790.69 m
-1743.31 1803.5 l
-1715.8 1809.46 l
-1727.54 1801.45 l
-f
-1686.61 1796.11 m
-1727.54 1801.45 l
-S
-1720.65 1876.68 m
-1743.31 1893.37 l
-1715.2 1894.81 l
-1728.08 1888.8 l
-f
-1686.61 1876.34 m
-1728.08 1888.8 l
-S
-1808.07 347.297 m
-1828.36 366.809 l
-1800.3 364.559 l
-1813.86 360.281 l
-f
-1771.66 341.285 m
-1813.86 360.281 l
-S
-1805.39 430.773 m
-1828.36 447.035 l
-1800.28 449 l
-1813.04 442.746 l
-f
-1771.66 431.152 m
-1813.04 442.746 l
-S
-1803.3 515.027 m
-1828.36 527.832 l
-1800.86 533.797 l
-1812.59 525.777 l
-f
-1771.66 520.453 m
-1812.59 525.777 l
-S
-1801.86 599.719 m
-1828.36 609.184 l
-1801.85 618.645 l
-1812.45 609.184 l
-f
-1771.66 609.176 m
-1812.45 609.184 l
-S
-1800.98 684.602 m
-1828.36 691.113 l
-1803.05 703.418 l
-1812.55 692.852 l
-f
-1771.66 697.344 m
-1812.55 692.852 l
-S
-1800.51 769.523 m
-1828.36 773.613 l
-1804.22 788.086 l
-1812.76 776.727 l
-f
-1771.66 784.941 m
-1812.76 776.727 l
-S
-1800.3 854.434 m
-1828.36 856.668 l
-1805.23 872.707 l
-1813 860.809 l
-f
-1771.66 871.965 m
-1813 860.809 l
-S
-1800.23 939.355 m
-1828.36 940.297 l
-1806 957.387 l
-1813.21 945.141 l
-f
-1771.66 958.43 m
-1813.21 945.141 l
-S
-1800.21 1024.3 m
-1828.36 1024.49 l
-1806.46 1042.17 l
-1813.35 1029.74 l
-f
-1771.66 1044.32 m
-1813.35 1029.74 l
-S
-1800.21 1109.32 m
-1828.36 1109.25 l
-1806.62 1127.13 l
-1813.39 1114.64 l
-f
-1771.66 1129.65 m
-1813.39 1114.64 l
-S
-1800.21 1194.4 m
-1828.36 1194.58 l
-1806.46 1212.27 l
-1813.35 1199.83 l
-f
-1771.66 1214.41 m
-1813.35 1199.83 l
-S
-1800.23 1279.53 m
-1828.36 1280.47 l
-1806 1297.56 l
-1813.21 1285.32 l
-f
-1771.66 1298.6 m
-1813.21 1285.32 l
-S
-1800.3 1364.7 m
-1828.36 1366.94 l
-1805.23 1382.98 l
-1813 1371.08 l
-f
-1771.66 1382.23 m
-1813 1371.08 l
-S
-1800.51 1449.88 m
-1828.36 1453.97 l
-1804.22 1468.45 l
-1812.76 1457.09 l
-f
-1771.66 1465.3 m
-1812.76 1457.09 l
-S
-1800.98 1535.05 m
-1828.36 1541.56 l
-1803.04 1553.86 l
-1812.55 1543.3 l
-f
-1771.66 1547.79 m
-1812.55 1543.3 l
-S
-1801.86 1620.26 m
-1828.36 1629.73 l
-1801.85 1639.19 l
-1812.45 1629.73 l
-f
-1771.66 1629.71 m
-1812.45 1629.73 l
-S
-1803.3 1705.64 m
-1828.36 1718.45 l
-1800.85 1724.41 l
-1812.59 1716.4 l
-f
-1771.66 1711.07 m
-1812.59 1716.4 l
-S
-1805.39 1791.49 m
-1828.36 1807.75 l
-1800.28 1809.71 l
-1813.04 1803.46 l
-f
-1771.66 1791.86 m
-1813.04 1803.46 l
-S
-1808.08 1878.11 m
-1828.36 1897.62 l
-1800.3 1895.37 l
-1813.86 1891.09 l
-f
-1771.66 1872.09 m
-1813.86 1891.09 l
-S
-1895.87 349.617 m
-1913.4 371.629 l
-1885.89 365.703 l
-1899.89 363.246 l
-f
-1856.71 336.465 m
-1899.89 363.246 l
-S
-1893.12 432.348 m
-1913.4 451.855 l
-1885.35 449.605 l
-1898.9 445.328 l
-f
-1856.71 426.332 m
-1898.9 445.328 l
-S
-1890.74 515.969 m
-1913.4 532.652 l
-1885.3 534.098 l
-1898.17 528.078 l
-f
-1856.71 515.633 m
-1898.17 528.078 l
-S
-1888.87 600.23 m
-1913.4 614.004 l
-1885.69 618.891 l
-1897.73 611.336 l
-f
-1856.71 604.355 m
-1897.73 611.336 l
-S
-1887.52 684.895 m
-1913.4 695.934 l
-1886.38 703.789 l
-1897.53 694.98 l
-f
-1856.71 692.523 m
-1897.53 694.98 l
-S
-1886.63 769.762 m
-1913.4 778.43 l
-1887.2 788.68 l
-1897.51 778.906 l
-f
-1856.71 780.121 m
-1897.51 778.906 l
-S
-1886.09 854.699 m
-1913.4 861.488 l
-1887.97 873.535 l
-1897.58 863.066 l
-f
-1856.71 867.145 m
-1897.58 863.066 l
-S
-1885.79 939.684 m
-1913.4 945.117 l
-1888.6 958.402 l
-1897.68 947.473 l
-f
-1856.71 953.609 m
-1897.68 947.473 l
-S
-1885.64 1024.68 m
-1913.4 1029.31 l
-1889 1043.31 l
-1897.75 1032.12 l
-f
-1856.71 1039.5 m
-1897.75 1032.12 l
-S
-1885.6 1109.71 m
-1913.4 1114.07 l
-1889.13 1128.31 l
-1897.78 1117.04 l
-f
-1856.71 1124.83 m
-1897.78 1117.04 l
-S
-1885.64 1194.78 m
-1913.4 1199.4 l
-1889 1213.41 l
-1897.75 1202.21 l
-f
-1856.71 1209.59 m
-1897.75 1202.21 l
-S
-1885.79 1279.86 m
-1913.4 1285.29 l
-1888.6 1298.58 l
-1897.68 1287.65 l
-f
-1856.71 1293.79 m
-1897.68 1287.65 l
-S
-1886.09 1364.97 m
-1913.4 1371.76 l
-1887.97 1383.8 l
-1897.58 1373.34 l
-f
-1856.71 1377.41 m
-1897.58 1373.34 l
-S
-1886.63 1450.12 m
-1913.4 1458.79 l
-1887.2 1469.04 l
-1897.51 1459.27 l
-f
-1856.71 1460.48 m
-1897.51 1459.27 l
-S
-1887.52 1535.34 m
-1913.4 1546.38 l
-1886.38 1554.23 l
-1897.53 1545.43 l
-f
-1856.71 1542.96 m
-1897.53 1545.43 l
-S
-1888.87 1620.77 m
-1913.4 1634.55 l
-1885.69 1639.43 l
-1897.73 1631.88 l
-f
-1856.71 1624.89 m
-1897.73 1631.88 l
-S
-1890.75 1706.59 m
-1913.4 1723.27 l
-1885.3 1724.71 l
-1898.18 1718.7 l
-f
-1856.71 1706.25 m
-1898.18 1718.7 l
-S
-1893.12 1793.06 m
-1913.4 1812.57 l
-1885.35 1810.32 l
-1898.91 1806.05 l
-f
-1856.71 1787.04 m
-1898.91 1806.05 l
-S
-1895.88 1880.43 m
-1913.4 1902.44 l
-1885.89 1896.52 l
-1899.89 1894.06 l
-f
-1856.71 1867.27 m
-1899.89 1894.06 l
-S
-9.96264 w
-/DeviceRGB {} CS
-[1 0 0] SC
-269.207 694.203 m
-286.387 698.457 l
-303.566 701.941 l
-320.746 704.695 l
-337.926 706.742 l
-355.105 708.109 l
-372.285 708.824 l
-389.465 708.918 l
-406.645 708.41 l
-423.824 707.328 l
-441.004 705.699 l
-458.184 703.547 l
-475.363 700.895 l
-492.543 697.766 l
-509.723 694.188 l
-526.902 690.18 l
-544.082 685.766 l
-561.262 680.973 l
-578.441 675.816 l
-595.621 670.328 l
-612.801 664.523 l
-629.98 658.43 l
-647.16 652.062 l
-664.34 645.445 l
-681.52 638.605 l
-698.699 631.559 l
-715.879 624.324 l
-733.059 616.926 l
-750.238 609.387 l
-767.418 601.719 l
-784.598 593.949 l
-801.777 586.094 l
-818.957 578.172 l
-836.137 570.203 l
-853.316 562.203 l
-870.496 554.188 l
-887.676 546.18 l
-904.855 538.195 l
-922.035 530.246 l
-939.215 522.352 l
-956.395 514.523 l
-973.574 506.781 l
-990.754 499.137 l
-1007.93 491.602 l
-1025.11 484.195 l
-1042.29 476.922 l
-1059.47 469.801 l
-1076.65 462.84 l
-1093.83 456.051 l
-1111.01 449.445 l
-1128.19 443.035 l
-1145.37 436.824 l
-1162.55 430.828 l
-1179.73 425.051 l
-1196.91 419.5 l
-1214.09 414.191 l
-1231.27 409.121 l
-1248.45 404.305 l
-1265.63 399.746 l
-1282.81 395.449 l
-1299.99 391.426 l
-1317.17 387.672 l
-1334.35 384.199 l
-1351.53 381.012 l
-1368.71 378.113 l
-1385.89 375.508 l
-1403.07 373.199 l
-1420.25 371.195 l
-1437.43 369.492 l
-1454.61 368.094 l
-1471.79 367.012 l
-1488.96 366.238 l
-1506.14 365.785 l
-1523.32 365.648 l
-1540.5 365.836 l
-1557.68 366.344 l
-1574.86 367.18 l
-1592.04 368.348 l
-1609.22 369.844 l
-1626.4 371.672 l
-1643.58 373.836 l
-1660.76 376.34 l
-1677.94 379.184 l
-1695.12 382.371 l
-1712.3 385.902 l
-1729.48 389.781 l
-1746.66 394.012 l
-1763.84 398.594 l
-1781.02 403.531 l
-1798.2 408.828 l
-1815.38 414.488 l
-1832.55 420.512 l
-1849.73 426.902 l
-1866.91 433.668 l
-1884.09 440.812 l
-1901.27 448.332 l
-1918.45 456.242 l
-1935.63 464.539 l
-1952.81 473.23 l
-1969.99 482.324 l
-S
-/DeviceRGB {} CS
-[0 1 0] SC
-269.207 1119.4 m
-286.387 1119.4 l
-303.566 1118.71 l
-320.746 1117.35 l
-337.926 1115.33 l
-355.105 1112.67 l
-372.285 1109.38 l
-389.465 1105.47 l
-406.645 1100.96 l
-423.824 1095.86 l
-441.004 1090.2 l
-458.184 1083.99 l
-475.363 1077.23 l
-492.543 1069.96 l
-509.723 1062.2 l
-526.902 1053.94 l
-544.082 1045.22 l
-561.262 1036.06 l
-578.441 1026.47 l
-595.621 1016.47 l
-612.801 1006.09 l
-629.98 995.352 l
-647.16 984.266 l
-664.34 972.859 l
-681.52 961.156 l
-698.699 949.176 l
-715.879 936.945 l
-733.059 924.484 l
-750.238 911.816 l
-767.418 898.965 l
-784.598 885.957 l
-801.777 872.812 l
-818.957 859.555 l
-836.137 846.211 l
-853.316 832.801 l
-870.496 819.352 l
-887.676 805.883 l
-904.855 792.418 l
-922.035 778.98 l
-939.215 765.59 l
-956.395 752.27 l
-973.574 739.043 l
-990.754 725.926 l
-1007.93 712.941 l
-1025.11 700.109 l
-1042.29 687.445 l
-1059.47 674.973 l
-1076.65 662.699 l
-1093.83 650.652 l
-1111.01 638.84 l
-1128.19 627.281 l
-1145.37 615.992 l
-1162.55 604.98 l
-1179.73 594.266 l
-1196.91 583.852 l
-1214.09 573.758 l
-1231.27 563.992 l
-1248.45 554.562 l
-1265.63 545.48 l
-1282.81 536.75 l
-1299.99 528.387 l
-1317.17 520.391 l
-1334.35 512.773 l
-1351.53 505.535 l
-1368.71 498.688 l
-1385.89 492.23 l
-1403.07 486.168 l
-1420.25 480.512 l
-1437.43 475.254 l
-1454.61 470.406 l
-1471.79 465.969 l
-1488.96 461.941 l
-1506.14 458.328 l
-1523.32 455.129 l
-1540.5 452.348 l
-1557.68 449.984 l
-1574.86 448.043 l
-1592.04 446.52 l
-1609.22 445.414 l
-1626.4 444.73 l
-1643.58 444.473 l
-1660.76 444.633 l
-1677.94 445.219 l
-1695.12 446.227 l
-1712.3 447.656 l
-1729.48 449.512 l
-1746.66 451.793 l
-1763.84 454.5 l
-1781.02 457.633 l
-1798.2 461.191 l
-1815.38 465.18 l
-1832.55 469.602 l
-1849.73 474.453 l
-1866.91 479.738 l
-1884.09 485.457 l
-1901.27 491.617 l
-1918.45 498.219 l
-1935.63 505.262 l
-1952.81 512.75 l
-1969.99 520.691 l
-S
-/DeviceRGB {} CS
-[0 0 1] SC
-269.207 1544.6 m
-286.387 1548.93 l
-303.566 1552.67 l
-320.746 1555.8 l
-337.926 1558.33 l
-355.105 1560.27 l
-372.285 1561.6 l
-389.465 1562.34 l
-406.645 1562.49 l
-423.824 1562.04 l
-441.004 1561.01 l
-458.184 1559.38 l
-475.363 1557.17 l
-492.543 1554.38 l
-509.723 1551 l
-526.902 1547.04 l
-544.082 1542.5 l
-561.262 1537.39 l
-578.441 1531.71 l
-595.621 1525.47 l
-612.801 1518.66 l
-629.98 1511.3 l
-647.16 1503.39 l
-664.34 1494.95 l
-681.52 1485.96 l
-698.699 1476.45 l
-715.879 1466.42 l
-733.059 1455.89 l
-750.238 1444.86 l
-767.418 1433.36 l
-784.598 1421.38 l
-801.777 1408.94 l
-818.957 1396.06 l
-836.137 1382.76 l
-853.316 1369.05 l
-870.496 1354.96 l
-887.676 1340.49 l
-904.855 1325.68 l
-922.035 1310.53 l
-939.215 1295.08 l
-956.395 1279.34 l
-973.574 1263.34 l
-990.754 1247.11 l
-1007.93 1230.66 l
-1025.11 1214.03 l
-1042.29 1197.24 l
-1059.47 1180.32 l
-1076.65 1163.29 l
-1093.83 1146.19 l
-1111.01 1129.03 l
-1128.19 1111.86 l
-1145.37 1094.68 l
-1162.55 1077.55 l
-1179.73 1060.47 l
-1196.91 1043.48 l
-1214.09 1026.62 l
-1231.27 1009.89 l
-1248.45 993.34 l
-1265.63 976.984 l
-1282.81 960.848 l
-1299.99 944.961 l
-1317.17 929.344 l
-1334.35 914.02 l
-1351.53 899.016 l
-1368.71 884.344 l
-1385.89 870.035 l
-1403.07 856.102 l
-1420.25 842.562 l
-1437.43 829.438 l
-1454.61 816.746 l
-1471.79 804.496 l
-1488.96 792.707 l
-1506.14 781.395 l
-1523.32 770.566 l
-1540.5 760.238 l
-1557.68 750.414 l
-1574.86 741.109 l
-1592.04 732.336 l
-1609.22 724.094 l
-1626.4 716.395 l
-1643.58 709.242 l
-1660.76 702.648 l
-1677.94 696.609 l
-1695.12 691.137 l
-1712.3 686.234 l
-1729.48 681.902 l
-1746.66 678.145 l
-1763.84 674.965 l
-1781.02 672.367 l
-1798.2 670.348 l
-1815.38 668.914 l
-1832.55 668.062 l
-1849.73 667.801 l
-1866.91 668.129 l
-1884.09 669.043 l
-1901.27 670.551 l
-1918.45 672.648 l
-1935.63 675.344 l
-1952.81 678.633 l
-1969.99 682.52 l
-S
-Q
-Q
-Q
-Q
-showpage
-%%PageTrailer
-pdfEndPage
-%%Trailer
-end
-%%DocumentSuppliedResources:
-%%+ font CMR10
-%%+ font CMSY10
-%%EOF
diff --git a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf
index bb8cbaeabf1..c703c16aad0 100644
--- a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.png b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.png
deleted file mode 100644
index 3b8638dab0e..00000000000
--- a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.png
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex
index 6a7e4d2b69c..74f1e8bcb8c 100644
--- a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex
@@ -1,15 +1,12 @@
-% $Id: pst-plot-doc.tex 83 2014-08-23 15:04:57Z herbert $
+% $Id: pst-plot-doc.tex 133 2014-11-03 09:10:47Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside,dvipsnames,svgnames]{pst-doc}
\listfiles
-
\usepackage[utf8]{inputenc}
\usepackage{pst-ode,
pst-node,
pst-plot
}
-%\usepackage{pstricks-gvb}
-\SpecialCoor
\let\pstFV\fileversion
\let\belowcaptionskip\abovecaptionskip
%
@@ -25,8 +22,6 @@
escapechar=?}
\def\textat{\char064}%
-\input{\jobname.dat}
-
\begin{document}
\title{\texttt{pst-plot}\\plotting data and functions \\\small v.\pstFV}
\docauthor{Herbert Vo\ss}
@@ -53,8 +48,8 @@ Martin Chicoine;
Gerry Coombes;
Ulrich Dirr;
Christophe Fourey;
-Hubert G\"a\ss lein;
-J\"urgen Gilg;
+Hubert Gäßlein;
+Jürgen Gilg;
Denis Girou;
Peter Hutnick;
Christophe Jorssen;
@@ -63,11 +58,11 @@ Alexander Kornrumpf;
Manuel Luque;
Patrice Mégret;
Jens-Uwe Morawski;
-Tobias N\"ahring;
+Tobias Nähring;
Rolf Niepraschk;
Martin Paech;
Alan Ristow;
-Christine R\"omer;
+Christine Römer;
Arnaud Schmittbuhl
\end{abstract}
@@ -152,8 +147,8 @@ the data in \Lcs{fileplot} (with \Lcs{savedata}, the data must be delimited by
\verb|[ ]|, and with \Lcs{readdata}, bracketing the data with \verb|[ ]| speeds things
up). You can concatenate and reuse lists, as in
\begin{lstlisting}[style=syntax]
-\readdata{\foo}{foo.data}
-\readdata{\bar}{bar.data}
+\readdata{\foo}{data/foo.data}
+\readdata{\bar}{data/bar.data}
\dataplot{\foo\bar}
\dataplot[origin={0,1}]{\bar}
\end{lstlisting}
@@ -383,13 +378,9 @@ The next example uses an external file for the data, which must first be read by
macro \Lcs{readdata}. The next one creates a horizontal boxplot by rotating
the output with $-90$ degrees.
-\begin{filecontents}{boxplot.data}
-2 4 6 8 10 12 14 16 18 20 22 24 26 28 30 32
-\end{filecontents}
-
%\begin{LTXexample}[pos=t]
-\readdata{\data}{boxplot.data}
+\readdata{\data}{data/boxplot.data}
\begin{pspicture}(-1,-1)(2,10)
\psset{yunit=0.25,fillstyle=solid}
\savedata{\data}[2 4 6 8 10 12 14 16 18 20 22 24 26 28 30 32]
@@ -406,7 +397,7 @@ the output with $-90$ degrees.
%\end{LTXexample}
\begin{lstlisting}
-\readdata{\data}{boxplot.data}
+\readdata{\data}{data/boxplot.data}
\begin{pspicture}(-1,-1)(2,10)
\psset{yunit=0.25,fillstyle=solid}
\savedata{\data}[2 4 6 8 10 12 14 16 18 20 22 24 26 28 30 32]
@@ -426,38 +417,16 @@ the output with $-90$ degrees.
It is also possible to read a data column from an external file:
-\begin{filecontents*}{Data.dat}
-98, 32
-20, 11
-79, 26
-14, 9
-23, 22
-21, 10
-58, 25
-13, 8
-19, 5
-53, 29
-41, 37
-11, 2
-83, 25
-71, 51
-10, 7
-89, 17
-10, 6
- , 41
- , 75
-\end{filecontents*}
-
\begin{pspicture}(-1,-1)(5,6)
\psaxes[axesstyle=frame,dy=1cm,Dy=20,ticksize=4pt 0](0,0)(4,5)
-\psreadDataColumn{1}{,}{\data}{Data.dat}
+\psreadDataColumn{1}{,}{\data}{data/Data.dat}
\rput(1,0){\psBoxplot[fillcolor=red!40,yunit=0.05]{\data}}
-\psreadDataColumn{2}{,}{\data}{Data.dat}
+\psreadDataColumn{2}{,}{\data}{data/Data.dat}
\rput(3,0){\psBoxplot[fillcolor=blue!40,yunit=0.05]{\data}}
\end{pspicture}
\begin{lstlisting}
-\begin{filecontents*}{Data.dat}
+\begin{filecontents*}{data/Data.dat}
98, 32
20, 11
79, 26
@@ -481,9 +450,9 @@ It is also possible to read a data column from an external file:
\begin{pspicture}(-1,-1)(5,6)
\psaxes[axesstyle=frame,dy=1cm,Dy=20,ticksize=4pt 0](0,0)(4,5)
-\psreadDataColumn{1}{,}{\data}{Data.dat}
+\psreadDataColumn{1}{,}{\data}{data/Data.dat}
\rput(1,0){\psBoxplot[fillcolor=red!40,yunit=0.05]{\data}}
-\psreadDataColumn{2}{,}{\data}{Data.dat}
+\psreadDataColumn{2}{,}{\data}{data/Data.dat}
\rput(3,0){\psBoxplot[fillcolor=blue!40,yunit=0.05]{\data}}
\end{pspicture}
\end{lstlisting}
@@ -493,36 +462,39 @@ With the optional argument \Lkeyword{postAction} one can modify the $y$ value of
an output with a vertical axis in logarithm scaling:
-\begin{pspicture}(-1,-3)(9,5)
+\begin{pspicture}(-1,-3)(6,5)
\psset{fillstyle=solid}
+\iffalse
\psaxes[ylogBase=10,Oy=-2,logLines=y,ticksize=0 4pt, subticks=5](1,-2)(9,4)
-\rput(3,0){\psBoxplot[fillcolor=red!30,barwidth=0.9cm,postAction=Log]{
+\rput(3,0){\psBoxplot[fillcolor=red!30,barwidth=0.9cm,postAction=1 gt {Log} if]{
0.09 0.44 0.12 0.06 0.32 0.23 0.44 0.02 0.15 0.18 0 0.29 0 0.11 0.26 0.11
0 0.45 0.04 0.14 0.03 0.12 0.14 0.31 0.06 0.06 0.11 0.12 0.12 0.12 0.13
0.01 0.40 0.01 0.03 0.17 0 0.10 0.15 0.16 0.06 0.10 0.01 0.60 0.26 0.11
0.15 0.22 0.14 0.01 }}
- \rput(4,0){\psBoxplot[fillcolor=red!30,barwidth=0.9cm,postAction=Log]{
+ \rput(4,0){\psBoxplot[fillcolor=red!30,barwidth=0.9cm,postAction=1 gt {Log} if]{
0.07 0.49 0.34 0.20 0.02 1.08 6.83 0.31 0.54 0.02 0.29 0.18 0.60 0.09 0.61
1.37 0.26 0.03 2.30 0.09 3.15 0.13 0.29 0.27 1.30 0.73 0.63 0.24 10.03 0
0.26 0.18 3.29 2.43 1.94 0.22 0.23 0.60 1.69 0.35 3.96 0.56 9.90 0.10 0.43
0.22 0.26 0.31 0.29 0.79 }}
- \rput(5,0){\psBoxplot[fillcolor=red!30,barwidth=0.9cm,postAction=Log]{
+\fi
+\psaxes[ylogBase=10,Oy=-2,Ox=1,logLines=y,ticksize=0 4pt, subticks=5](1,-2)(6,4)
+ \rput(2,0){\psBoxplot[fillcolor=red!30,barwidth=0.9cm,postAction=Log]{
12.70 1.34 0.68 0.51 1.77 0.04 3.79 287.05 1.35 5.41 15.56 3.13 0.91 7.48
2.40 1.04 3.53 0.58 31.71 7.89 4.90 2.61 0.89 0.03 3.78 8.11 4.82 1.02 5.57
8.85 0.15 17.59 0.21 8.10 2.15 3.43 6.44 1.65 6.83 23.54 0.52 1.47 0.75
3.54 3.59 5.56 0.33 8.58 1.90 0.78 }}
- \rput(6,0){\psBoxplot[fillcolor=red!30,barwidth=0.9cm,postAction=Log]{
+ \rput(3,0){\psBoxplot[fillcolor=red!30,barwidth=0.9cm,postAction=Log]{
55.72 14.91 14.95 6.01 6.53 88.30 281.50 40.15 13.41 0.91 1.65 44.32 13.41
7.33 3.51 3.44 70.40 0.75 58.20 54.88 26.45 33.76 0.70 0.05 0.29 57.12
14.30 31.11 18.56 0.48 21.33 1.15 2.22 3.88 1.78 151.25 7.77 137.92 0.50
3.01 1.99 23.18 119.59 17.50 15.87 13.63 21.85 23.53 68.72 2.90 }}
- \rput(7,0){\psBoxplot[fillcolor=red!30,barwidth=0.9cm,postAction=Log]{
+ \rput(4,0){\psBoxplot[fillcolor=red!30,barwidth=0.9cm,postAction=Log]{
1.19 1.94 13.40 7.40 267.30 5.94 11.05 6.51 2.94 5.45 5.24 231 4.48 0.68
311.29 77.47 621.20 139.08 1933.59 2.52 100.96 11.02 153.43 26.67 83.84
4.31 106.34 15.90 1118.59 9.49 131.48 48.92 5.85 3.74 1.05 32.03 5.69
45.10 12.43 238.56 28.75 1.01 119.29 12.09 31.18 16.60 29.67 138.55
17.42 0.83 }}
- \rput(8,0){\psBoxplot[fillcolor=red!30,barwidth=0.9cm,postAction=Log]{
+ \rput(5,0){\psBoxplot[fillcolor=red!30,barwidth=0.9cm,postAction=Log]{
2077.45 762.10 469 143.60 685 3600 20.20 249.60 269 0.30 0.20 779.40 1.80
146.80 1.30 32.50 137 2016.40 2.30 33.90 801.60 2.20 646.90 3600 1184 627
500.50 238.30 477.40 3600 17.80 1726.80 2 316.70 174.50 2802.70 335.30
@@ -532,36 +504,26 @@ an output with a vertical axis in logarithm scaling:
\begin{lstlisting}
-\begin{pspicture}(-1,-3)(9,5)
+\begin{pspicture}(-1,-3)(6,5)
\psset{fillstyle=solid}
-\psaxes[ylogBase=10,Oy=-2,logLines=y,ticksize=0 4pt, subticks=5](1,-2)(9,4)
-\rput(3,0){\psBoxplot[fillcolor=red!30,barwidth=0.9cm,postAction=Log]{
- 0.09 0.44 0.12 0.06 0.32 0.23 0.44 0.02 0.15 0.18 0 0.29 0 0.11 0.26 0.11
- 0 0.45 0.04 0.14 0.03 0.12 0.14 0.31 0.06 0.06 0.11 0.12 0.12 0.12 0.13
- 0.01 0.40 0.01 0.03 0.17 0 0.10 0.15 0.16 0.06 0.10 0.01 0.60 0.26 0.11
- 0.15 0.22 0.14 0.01 }}
- \rput(4,0){\psBoxplot[fillcolor=red!30,barwidth=0.9cm,postAction=Log]{
-0.07 0.49 0.34 0.20 0.02 1.08 6.83 0.31 0.54 0.02 0.29 0.18 0.60 0.09 0.61
-1.37 0.26 0.03 2.30 0.09 3.15 0.13 0.29 0.27 1.30 0.73 0.63 0.24 10.03 0
-0.26 0.18 3.29 2.43 1.94 0.22 0.23 0.60 1.69 0.35 3.96 0.56 9.90 0.10 0.43
-0.22 0.26 0.31 0.29 0.79 }}
- \rput(5,0){\psBoxplot[fillcolor=red!30,barwidth=0.9cm,postAction=Log]{
+\psaxes[ylogBase=10,Oy=-2,Ox=1,logLines=y,ticksize=0 4pt, subticks=5](1,-2)(6,4)
+ \rput(2,0){\psBoxplot[fillcolor=red!30,barwidth=0.9cm,postAction=Log]{
12.70 1.34 0.68 0.51 1.77 0.04 3.79 287.05 1.35 5.41 15.56 3.13 0.91 7.48
2.40 1.04 3.53 0.58 31.71 7.89 4.90 2.61 0.89 0.03 3.78 8.11 4.82 1.02 5.57
8.85 0.15 17.59 0.21 8.10 2.15 3.43 6.44 1.65 6.83 23.54 0.52 1.47 0.75
3.54 3.59 5.56 0.33 8.58 1.90 0.78 }}
- \rput(6,0){\psBoxplot[fillcolor=red!30,barwidth=0.9cm,postAction=Log]{
+ \rput(3,0){\psBoxplot[fillcolor=red!30,barwidth=0.9cm,postAction=Log]{
55.72 14.91 14.95 6.01 6.53 88.30 281.50 40.15 13.41 0.91 1.65 44.32 13.41
7.33 3.51 3.44 70.40 0.75 58.20 54.88 26.45 33.76 0.70 0.05 0.29 57.12
14.30 31.11 18.56 0.48 21.33 1.15 2.22 3.88 1.78 151.25 7.77 137.92 0.50
3.01 1.99 23.18 119.59 17.50 15.87 13.63 21.85 23.53 68.72 2.90 }}
- \rput(7,0){\psBoxplot[fillcolor=red!30,barwidth=0.9cm,postAction=Log]{
+ \rput(4,0){\psBoxplot[fillcolor=red!30,barwidth=0.9cm,postAction=Log]{
1.19 1.94 13.40 7.40 267.30 5.94 11.05 6.51 2.94 5.45 5.24 231 4.48 0.68
311.29 77.47 621.20 139.08 1933.59 2.52 100.96 11.02 153.43 26.67 83.84
4.31 106.34 15.90 1118.59 9.49 131.48 48.92 5.85 3.74 1.05 32.03 5.69
45.10 12.43 238.56 28.75 1.01 119.29 12.09 31.18 16.60 29.67 138.55
17.42 0.83 }}
- \rput(8,0){\psBoxplot[fillcolor=red!30,barwidth=0.9cm,postAction=Log]{
+ \rput(5,0){\psBoxplot[fillcolor=red!30,barwidth=0.9cm,postAction=Log]{
2077.45 762.10 469 143.60 685 3600 20.20 249.60 269 0.30 0.20 779.40 1.80
146.80 1.30 32.50 137 2016.40 2.30 33.90 801.60 2.20 646.90 3600 1184 627
500.50 238.30 477.40 3600 17.80 1726.80 2 316.70 174.50 2802.70 335.30
@@ -622,7 +584,7 @@ as for the x-axis.
\psset{unit=1cm}
\begin{center}
-\readdata{\data}{demo1.data}
+\readdata{\data}{data/demo1.data}
\pstScalePoints(1,1e-08){}{}% (x,y){additional x operator}{y op}
\psset{llx=-1cm,lly=-1cm}
\begin{psgraph}[axesstyle=frame,xticksize=0 7.59,yticksize=0 25,%
@@ -633,7 +595,7 @@ as for the x-axis.
\end{center}
\begin{lstlisting}
-\readdata{\data}{demo1.data}
+\readdata{\data}{data/demo1.data}
\pstScalePoints(1,1e-08){}{}% (x,y){additional x operator}{y op}
\psset{llx=-1cm,lly=-1cm}
?\ON?\begin{psgraph}?\OFF?[axesstyle=frame,xticksize=0 7.59,yticksize=0 25,%
@@ -663,7 +625,7 @@ In the following example, the y unit gets the same value as the one for the x-ax
%-----------------------------------------------------------------------------
\begin{center}
-\readdata{\data}{demo1.data}
+\readdata{\data}{data/demo1.data}
\psset{xAxisLabel=x-Axis,yAxisLabel=y-Axis,llx=-.5cm,lly=-1cm,lly=-1cm,ury=0.5cm,
xAxisLabelPos={c,-1},yAxisLabelPos={-7,c}}
\pstScalePoints(1,0.00000001){}{}
@@ -674,7 +636,7 @@ In the following example, the y unit gets the same value as the one for the x-ax
\end{center}
\begin{lstlisting}
-\readdata{\data}{demo1.data}
+\readdata{\data}{data/demo1.data}
\psset{?\ON?xAxisLabel?\OFF?=x-Axis,?\ON?yAxisLabel?\OFF?=y-Axis,llx=-.5cm,lly=-1cm,ury=0.5cm,
?\ON?xAxisLabelPos?\OFF?={c,-1},?\ON?yAxisLabelPos?\OFF?={-7,c}}
\pstScalePoints(1,0.00000001){}{}
@@ -687,7 +649,7 @@ In the following example, the y unit gets the same value as the one for the x-ax
%-----------------------------------------------------------------------------
\begin{LTXexample}[pos=t,preset=\centering]
-\readdata{\data}{demo1.data}
+\readdata{\data}{data/demo1.data}
\psset{llx=-0.5cm,lly=-1cm}
\pstScalePoints(1,0.000001){}{}
\psgraph[arrows=->,Dx=5,dy=200\psyunit,Dy=200,subticks=5,ticksize=-10pt 0,
@@ -700,7 +662,7 @@ In the following example, the y unit gets the same value as the one for the x-ax
%-----------------------------------------------------------------------------
\begin{center}
-\readdata{\data}{demo1.data}
+\readdata{\data}{data/demo1.data}
\pstScalePoints(1,0.2){}{log}
\psset{lly=-0.75cm}
\psgraph[ylogBase=10,Dx=5,Dy=1,subticks=5](0,0)(25,2){12cm}{4cm}
@@ -712,7 +674,7 @@ In the following example, the y unit gets the same value as the one for the x-ax
\begin{lstlisting}
-\readdata{\data}{demo1.data}
+\readdata{\data}{data/demo1.data}
\pstScalePoints(1,0.2){}{log}
\psset{lly=-0.75cm}
\psgraph[?\ON?ylogBase?\OFF?=10,Dx=5,Dy=1,subticks=5](0,0)(25,2){12cm}{4cm}
@@ -723,7 +685,7 @@ In the following example, the y unit gets the same value as the one for the x-ax
%-----------------------------------------------------------------------------
\begin{LTXexample}[pos=t,preset=\centering]
-\readdata{\data}{demo0.data}
+\readdata{\data}{data/demo0.data}
\psset{lly=-0.75cm,ury=0.5cm}
\pstScalePoints(1,1){}{log}
\begin{psgraph}[arrows=->,Dx=0.5,ylogBase=10,Oy=-1,xsubticks=10,%
@@ -738,7 +700,7 @@ In the following example, the y unit gets the same value as the one for the x-ax
\begin{LTXexample}[pos=t,preset=\centering]
\psset{lly=-0.75cm,ury=0.5cm}
-\readdata{\data}{demo0.data}
+\readdata{\data}{data/demo0.data}
\pstScalePoints(1,1){}{log}
\psgraph[arrows=->,Dx=0.5,ylogBase=10,Oy=-1,subticks=4](0,-3)(3,1){6cm}{3cm}
\listplot[linecolor=red,linewidth=2pt,showpoints=true,plotstyle=LineToXAxis]{\data}
@@ -749,8 +711,8 @@ In the following example, the y unit gets the same value as the one for the x-ax
%-----------------------------------------------------------------------------
\begin{center}
-\readdata{\data}{demo2.data}%
-\readdata{\dataII}{demo3.data}%
+\readdata{\data}{data/demo2.data}%
+\readdata{\dataII}{data/demo3.data}%
\pstScalePoints(1,1){1989 sub}{}
\psset{llx=-0.5cm,lly=-1cm, xAxisLabel=Year,yAxisLabel=Whatever,%
xAxisLabelPos={c,-0.4in},yAxisLabelPos={-0.4in,c}}
@@ -762,8 +724,8 @@ In the following example, the y unit gets the same value as the one for the x-ax
\end{center}
\begin{lstlisting}
-\readdata{\data}{demo2.data}%
-\readdata{\dataII}{demo3.data}%
+\readdata{\data}{data/demo2.data}%
+\readdata{\dataII}{data/demo3.data}%
\pstScalePoints(1,1){1989 sub}{}
\psset{llx=-0.5cm,lly=-1cm, ?\ON?xAxisLabel?\OFF?=Year,?\ON?yAxisLabel?\OFF?=Whatever,%
?\ON?xAxisLabelPos?\OFF?={c,-0.4in},?\ON?yAxisLabelPos?\OFF?={-0.4in,c}}
@@ -777,8 +739,8 @@ In the following example, the y unit gets the same value as the one for the x-ax
%\begin{LTXexample}[pos=t,preset=\centering]
\begin{center}
-\readdata{\data}{demo2.data}%
-\readdata{\dataII}{demo3.data}%
+\readdata{\data}{data/demo2.data}%
+\readdata{\dataII}{data/demo3.data}%
\psset{llx=-0.5cm,lly=-0.75cm,plotstyle=LineToXAxis}
\pstScalePoints(1,1){1989 sub}{2 sub}
\begin{psgraph}[axesstyle=frame,Dx=2,Ox=1989,Oy=2,subticks=2](0,0)(12,4){6in}{3in}
@@ -790,8 +752,8 @@ In the following example, the y unit gets the same value as the one for the x-ax
%\end{LTXexample}
\begin{lstlisting}
-\readdata{\data}{demo2.data}%
-\readdata{\dataII}{demo3.data}%
+\readdata{\data}{data/demo2.data}%
+\readdata{\dataII}{data/demo3.data}%
\psset{llx=-0.5cm,lly=-0.75cm,plotstyle=LineToXAxis}
\pstScalePoints(1,1){1989 sub}{2 sub}
\begin{psgraph}[axesstyle=frame,Dx=2,Ox=1989,Oy=2,subticks=2](0,0)(12,4){6in}{3in}
@@ -885,8 +847,8 @@ can be outside of the visible \Lenv{pspicture} environment.
\medskip
\begin{center}
-\readdata{\data}{demo2.data}%
-\readdata{\dataII}{demo3.data}%
+\readdata{\data}{data/demo2.data}%
+\readdata{\dataII}{data/demo3.data}%
\psset{llx=-1cm,lly=-1.25cm,urx=0.5cm,ury=0.1in,xAxisLabel=Year,%
yAxisLabel=Whatever,xAxisLabelPos={c,-0.4in},%
yAxisLabelPos={-0.4in,c}}
@@ -902,8 +864,8 @@ can be outside of the visible \Lenv{pspicture} environment.
\begin{lstlisting}
-\readdata{\data}{demo2.data}%
-\readdata{\dataII}{demo3.data}%
+\readdata{\data}{data/demo2.data}%
+\readdata{\dataII}{data/demo3.data}%
\psset{llx=-1cm,lly=-1.25cm,urx=0.5cm,ury=0.1in,xAxisLabel=Year,%
yAxisLabel=Whatever,xAxisLabelPos={c,-0.4in},%
yAxisLabelPos={-0.4in,c}}
@@ -930,8 +892,8 @@ The legend has to be defined \emph{before} the environment \Lenv{psgraph}.
\medskip
\begin{center}
-\readdata{\data}{demo2.data}%
-\readdata{\dataII}{demo3.data}%
+\readdata{\data}{data/demo2.data}%
+\readdata{\dataII}{data/demo3.data}%
\psset{llx=-1cm,lly=-1.25cm,urx=0.5cm,ury=0.1in,xAxisLabel=Year,%
yAxisLabel=Whatever,xAxisLabelPos={c,-0.4in},%
yAxisLabelPos={-0.4in,c}}
@@ -948,8 +910,8 @@ The legend has to be defined \emph{before} the environment \Lenv{psgraph}.
\begin{lstlisting}
-\readdata{\data}{demo2.data}%
-\readdata{\dataII}{demo3.data}%
+\readdata{\data}{data/demo2.data}%
+\readdata{\dataII}{data/demo3.data}%
\psset{llx=-1cm,lly=-1.25cm,urx=0.5cm,ury=0.1in,xAxisLabel=Year,%
yAxisLabel=Whatever,xAxisLabelPos={c,-0.4in},%
yAxisLabelPos={-0.4in,c}}
@@ -986,8 +948,8 @@ The macro \Lcs{psframebox} uses the style \Lkeyval{legendstyle} which is preset
\medskip
\begin{center}
-\readdata{\data}{demo2.data}%
-\readdata{\dataII}{demo3.data}%
+\readdata{\data}{data/demo2.data}%
+\readdata{\dataII}{data/demo3.data}%
\psset{llx=-1cm,lly=-1.25cm,urx=0.5cm,ury=0.1in,xAxisLabel=Year,%
yAxisLabel=Whatever,xAxisLabelPos={c,-0.4in},%
yAxisLabelPos={-0.4in,c}}
@@ -1005,8 +967,8 @@ The macro \Lcs{psframebox} uses the style \Lkeyval{legendstyle} which is preset
\begin{lstlisting}
-\readdata{\data}{demo2.data}%
-\readdata{\dataII}{demo3.data}%
+\readdata{\data}{data/demo2.data}%
+\readdata{\dataII}{data/demo3.data}%
\psset{llx=-1cm,lly=-1.25cm,urx=0.5cm,ury=0.1in,xAxisLabel=Year,%
yAxisLabel=Whatever,xAxisLabelPos={c,-0.4in},%
yAxisLabelPos={-0.4in,c}}
@@ -1127,6 +1089,8 @@ redefinition, then do it for \Lcs{pst@@@hlabel} and
& \pageref{values}\\
\Lkeyword{decimalSeparator} & char & . & \pageref{comma}\\ %ok
\Lkeyword{fontscale} & real & 10 & \pageref{values}\\
+\Lkeyword{fractionLabelBase} & integer & 0 & \pageref{fraclabels}\\
+\Lkeyword{fractionLabels} & boolean & \false & \pageref{fraclabels}\\
\Lkeyword{ignoreLines} & integer & 0 & \pageref{ignorelines}\\
\Lkeyword{labelFontSize} & macro & \{\} & \pageref{labelfontsize}\\
\Lkeyword{labels} & \Lkeyval{all}|\Lkeyval{x}|\Lkeyval{y}|\Lkeyval{none}
@@ -1237,25 +1201,9 @@ redefinition, then do it for \Lcs{pst@@@hlabel} and
There is a new value \Lkeyval{cspline} for the plotstyle to interpolate a curve with cubic splines.
-\begin{filecontents}{data1.dat}
-256.4912 0.0674
-259.7543 0.0904
-264.7287 0.0502
-270.1739 0.0339
-276.2696 0.0531
-281.4192 0.0402
-284.4351 -0.1221
-286.7098 -0.2659
-289.9052 -0.8337
-292.8813 -1.391
-295.1299 -1.3968
-297.858 -1.8959
-299.5145 -0.608
-302.1028 -0.323
-\end{filecontents}
%
\begin{LTXexample}[pos=b]
-\readdata{\foo}{data1.dat}
+\readdata{\foo}{data/data1.dat}
\begin{psgraph}[axesstyle=frame,ticksize=6pt,subticks=5,ury=1cm,
Ox=250,Dx=10,Oy=-2,](250,-2)(310,0.2){0.8\linewidth}{0.3\linewidth}
\listplot[plotstyle=cspline,linecolor=red,linewidth=0.5pt,showpoints]{\foo}
@@ -1637,7 +1585,7 @@ options allow you to define the additional part of the value, but
it must be set in math mode when using math operators or macros like \Lcs{cdot}!
\begin{LTXexample}[pos=b]
-\readdata{\data}{demo1.data}
+\readdata{\data}{data/demo1.data}
\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}
@@ -1646,6 +1594,26 @@ it must be set in math mode when using math operators or macros like \Lcs{cdot}!
\pstScalePoints(1,1){}{}% reset
\end{LTXexample}
+
+\begin{LTXexample}[pos=t]
+\psset{xunit=0.05, yunit=2,labelFontSize=\scriptstyle,algebraic,plotpoints=500}
+\newpsstyle{mygrid}{%
+ Dx=10,Dy=0.5,labels=none,subticks=5,tickwidth=0.4pt,subtickwidth=0.2pt,
+ tickcolor=Red!30,subtickcolor=ForestGreen!30,
+ xticksize=-1 1.5,yticksize=0 180,subticksize=1}
+\begin{pspicture}(-10,-1.3)(190,1.8)
+ \psaxes[style=mygrid](0,0)(0,-1)(180,1.51)
+ \psplot[linecolor=NavyBlue]{0}{180}{sin(x*Pi/180)+1/2}
+ \psaxes[Dx=20,Dy=0.5,linecolor=gray,tickcolor=gray,linewidth=1pt,ticksize=-3pt 3pt,
+ xlabelFactor={}^\circ]{<->}(0,0)(-5,-1.2)(185,1.7)[$x$,0][$y$,90]
+\end{pspicture}
+\end{LTXexample}
+
+\psset{unit=1cm}
+
+
+\clearpage
+
%--------------------------------------------------------------------------------------
\subsection{Options \nxLkeyword{decimalSeparator} and \nxLkeyword{comma}}\label{comma}
%--------------------------------------------------------------------------------------
@@ -1709,6 +1677,27 @@ behaviour.
%--------------------------------------------------------------------------------------
+\subsection[Option \nxLkeyword{fractionLabels}]{Options \nxLkeyword{fractionLabels},
+\nxLkeyword{xfractionLabels}, \nxLkeyword{yfractionLabels}, \nxLkeyword{fractionLabelBase}, \nxLkeyword{xfractionLabelBase},
+and \nxLkeyword{yfractionLabelBase}}\label{fraclabels}
+%--------------------------------------------------------------------------------------
+With the option \Lkeyword{fractionLabels}=\true\ the labels on the axes
+are set as fractions.
+The option \Lkeyword{fractionLabelBase} sets the
+denominator of fraction. The default value of 0 is the same as no
+fraction.
+
+\begin{LTXexample}[pos=t]
+\psset{fractionLabels,fractionLabelBase=3,unit=3cm}
+\begin{pspicture}(-2,-1)(2,1)
+ \psaxes[dx=0.333,dy=0.333](0,0)(-2,-1)(2,1)
+ \psplot[algebraic,plotpoints=100]{-2}{2}{0.4*x-1/3}
+\end{pspicture}
+\end{LTXexample}
+
+
+
+%--------------------------------------------------------------------------------------
\subsection[Option \nxLkeyword{triglabels}]{Options \nxLkeyword{trigLabels},
\nxLkeyword{xtrigLabels}, \nxLkeyword{ytrigLabels}, \nxLkeyword{trigLabelBase}, \nxLkeyword{xtrigLabelBase},
and \nxLkeyword{ytrigLabelBase}
@@ -2760,21 +2749,21 @@ records, e.\,g. \Lkeyword{nStep}=10, only every 10\textsuperscript{th}
record is saved.
\begin{lstlisting}
-\readdata[ignoreLines=2]{\dataA}{stressrawdata.data}
-\readdata[nStep=10]{\dataA}{stressrawdata.data}
+\readdata[ignoreLines=2]{\dataA}{data/stressrawdata.data}
+\readdata[nStep=10]{\dataA}{data/stressrawdata.data}
\end{lstlisting}
The default value for \Lkeyword{ignoreLines} is $0$ and for \Lkeyword{nStep} is $1$.
the following data file has two text lines which shall be ignored by the \Lcs{readdata} macro:
\begin{LTXexample}[width=4cm]
-\begin{filecontents*}{pstricks-add-data9.data}
+\begin{filecontents*}{data/pstricks-add-data9.data}
some nonsense in this line ---time forcex forcey
0 0.2
1 1
2 4
\end{filecontents*}
-\readdata[ignoreLines=2]{\data}{pstricks-add-data9.data}
+\readdata[ignoreLines=2]{\data}{data/pstricks-add-data9.data}
\pspicture(2,4)
\listplot[showpoints]{\data}
\psaxes{->}(2,4)
@@ -2797,7 +2786,7 @@ for the \Lcs{listplot} macro, which is not a real limitation, because all data r
from a file with the \Lcs{readdata} macro (see example files or~\cite{dtk02.2:jackson.voss:plot-funktionen}):
\begin{lstlisting}[style=syntax]
-\readdata[nStep=10]{\data}{/home/voss/data/data1.data}
+\readdata[nStep=10]{\data}{data/data1.data}
\end{lstlisting}
\xLcs{readdata}
@@ -2822,7 +2811,7 @@ The datafile \verb|data.data| contains $1000$ data records. The thin blue line i
of all records with the plotstyle option \Lkeyval{curve}.\xLkeyword{nStep}\xLkeyword{xStep}\xLkeyword{yStep}
\begin{LTXexample}[preset=\centering,pos=t]
-\readdata{\data}{data.data}
+\readdata{\data}{data/data.data}
\psset{xunit=12.5cm,yunit=0.2mm}
\begin{pspicture}(-0.080,-30)(1,270)
\pstScalePoints(1,1){1000 div}{1000 div}
@@ -2834,7 +2823,7 @@ of all records with the plotstyle option \Lkeyval{curve}.\xLkeyword{nStep}\xLkey
\end{LTXexample}
\begin{LTXexample}[preset=\centering,pos=t]
-\readdata{\data}{data.data}
+\readdata{\data}{data/data.data}
\psset{xunit=12.5cm,yunit=0.2mm}
\begin{pspicture}(-0.080,-30)(1,270)
\pstScalePoints(1,1){1000 div}{1000 div}
@@ -2858,7 +2847,7 @@ of all records with the plotstyle option \Lkeyval{curve}.\xLkeyword{nStep}\xLkey
%--------------------------------------------------------------------------------------
\begin{LTXexample}[preset=\centering,pos=t]
-\readdata{\data}{data.data}
+\readdata{\data}{data/data.data}
\psset{xunit=12.5cm,yunit=0.2mm}
\begin{pspicture}(-0.080,-30)(1,270)
\pstScalePoints(1,1){1000 div}{1000 div}
@@ -2877,7 +2866,7 @@ of all records with the plotstyle option \Lkeyval{curve}.\xLkeyword{nStep}\xLkey
%--------------------------------------------------------------------------------------
\begin{LTXexample}[preset=\centering,pos=t]
-\readdata{\data}{data.data}
+\readdata{\data}{data/data.data}
\psset{xunit=12.5cm,yunit=0.2mm}
\begin{pspicture}(-0.080,-30)(1,270)
\pstScalePoints(1,1){1000 div}{1000 div}
@@ -2897,7 +2886,7 @@ of all records with the plotstyle option \Lkeyval{curve}.\xLkeyword{nStep}\xLkey
%--------------------------------------------------------------------------------------
\begin{LTXexample}[preset=\centering,pos=t]
-\readdata{\data}{data.data}
+\readdata{\data}{data/data.data}
\psset{xunit=12.5cm,yunit=0.2mm}
\begin{pspicture}(-0.080,-30)(1,270)
\pstScalePoints(1,1){1000 div}{1000 div}
@@ -2949,7 +2938,7 @@ We have the following data file:
without any modification to the data file:
\begin{LTXexample}[preset=\centering,pos=t]
-\readdata\Data{dataMul.data}
+\readdata\Data{data/dataMul.data}
\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)[$\mathbf{x}$,-90][$\mathbf{y}$,0]
@@ -2990,30 +2979,9 @@ data set.
\end{lstlisting}
-\begin{filecontents*}{demo.txt}
-% X1 X2 Y1 Y2
- 2 55.1500 10.35 11.26
- 31 59.7167 11.06 11.11
- 34 65.7167 11.87 10.83
- 40 62.1833 11.59 11.19
- 45 56.0500 10.74 11.50
- 47 68.2667 12.65 11.11
- 52 69.7500 13.23 11.38
- 55 76.3333 14.28 11.22
- 59 75.4000 14.69 11.69
- 62 78.6000 15.25 11.64
- 66 69.3167 14.06 12.17
- 69 77.5500 15.24 11.79
- 73 70.8833 14.52 12.29
- 75 60.6167 13.10 12.97
- 79 68.3833 14.43 12.66
- 82 56.6833 12.05 12.75
- 87 95.1333 21.10 13.31
-\end{filecontents*}
-
\begin{LTXexample}[pos=t,preset=\centering]
-\readdata{\data}{demo.txt}
+\readdata{\data}{data/demo.txt}
\psset{xAxisLabel={},yAxisLabel={},llx=-5mm}
\begin{psgraph}[axesstyle=frame,Dy=5,Dx=10,ticksize=5pt 0](0,0)(100,25){10cm}{8cm}
\psset{dotstyle=square,dotscale=1.5,linewidth=1.5pt}
@@ -3036,7 +3004,7 @@ Otherwise we do not get a closed path. With the option
\Lkeyword{ChangeOrder} the values are used in reverse order:
\begin{LTXexample}[pos=t,preset=\centering]
-\begin{filecontents*}{test.data}
+\begin{filecontents*}{data/test.data}
0 3 8
2 4 7
5 5 5.5
@@ -3045,7 +3013,7 @@ Otherwise we do not get a closed path. With the option
\end{filecontents*}
\psset{lly=-.5cm}
\begin{psgraph}[axesstyle=frame,ticklinestyle=dotted,ticksize=0 10](0,0)(10,10){4in}{2in}%
-\readdata{\data}{test.data}%
+\readdata{\data}{data/test.data}%
\pscustom[fillstyle=solid,fillcolor=blue!40]{%
\listplot[plotNo=2,plotNoMax=2]{\data}%
\listplot[plotNo=1,plotNoMax=2,ChangeOrder]{\data}}
@@ -3063,7 +3031,7 @@ is set by an angle (0\ldots360) and the values of \Index{Saturation} and \Index{
are set by the relative $y$ value of the data records. The default value for
\Lkeyword{Hue} is 180.
-\readdata{\data}{data3.data}
+\readdata{\data}{data/data3.data}
\psset{xunit=10,yunit=0.02}
\begin{pspicture}(0,-50)(1.1,400)
\psaxes[dy=1cm,Dy=50]{->}(0,0)(0,-50)(1.1,400)
@@ -3073,7 +3041,7 @@ are set by the relative $y$ value of the data records. The default value for
\psset{unit=1cm}
\begin{lstlisting}
-\readdata{\data}{data3.data}
+\readdata{\data}{data/data3.data}
\psset{xunit=10,yunit=0.02}
\begin{pspicture}(0,-50)(1.1,400)
\psaxes[dy=1cm,Dy=50]{->}(0,0)(0,-50)(1.1,400)
@@ -3263,11 +3231,8 @@ best all data records.
\bgroup
\centering
-\begin{filecontents*}{LSM.data}
-0 1 1 3 2.8 4 3 2.9 2 5 4 4 5 5.5 6 8.2 8 7
-\end{filecontents*}
\psset{lly=-.5cm}
-\readdata{\data}{LSM.data}
+\readdata{\data}{data/LSM.data}
\begin{psgraph}[arrows=->](0,0)(0,0)(8,8){.5\textwidth}{!}
\listplot[plotstyle=dots]{\data}
\listplot[plotstyle=LSM,linecolor=red]{\data}
@@ -3276,11 +3241,11 @@ best all data records.
\begin{lstlisting}
-\begin{filecontents*}{LSM.data}
+\begin{filecontents*}{data/LSM.data}
0 1 1 3 2.8 4 3 2.9 2 5 4 4 5 5.5 6 8.2 8 7
\end{filecontents*}
\psset{lly=-.5cm}
-\readdata{\data}{LSM.data}
+\readdata{\data}{data/LSM.data}
\begin{psgraph}[arrows=->](0,0)(0,0)(8,8){.5\textwidth}{!}
\listplot[plotstyle=dots]{\data}
\listplot[?\ON?plotstyle?\OFF?=?\ON?LSM?\OFF?,linecolor=red]{\data}
@@ -3295,10 +3260,7 @@ They are preset with an empty value \verb+{}+.
\bgroup
\centering
-\begin{filecontents*}{LSM.data}
-0 1 1 3 2.8 4 3 2.9 2 5 4 4 5 5.5 6 8.2 8 7
-\end{filecontents*}
-\readdata{\data}{LSM.data}
+\readdata{\data}{data/LSM.data}
\psset{lly=-1.75cm}
\begin{psgraph}[arrows=->](0,0)(0,0)(8,8){.5\textwidth}{!}
\listplot[plotstyle=dots]{\data}
@@ -3307,10 +3269,7 @@ They are preset with an empty value \verb+{}+.
\egroup
\begin{lstlisting}
-\begin{filecontents*}{LSM.data}
-0 1 1 3 2.8 4 3 2.9 2 5 4 4 5 5.5 6 8.2 8 7
-\end{filecontents*}
-\readdata{\data}{LSM.data}
+\readdata{\data}{data/LSM.data}
\psset{lly=-1.75cm}
\begin{psgraph}[arrows=->](0,0)(0,0)(8,8){.5\textwidth}{!}
\listplot[plotstyle=dots]{\data}
@@ -3332,13 +3291,7 @@ we subtract 0.003 from all x-values and then scale them with
\bgroup
\centering
-\begin{filecontents*}{LSM.data}
-0.003298697 1.397785583
-0.003193358 1.615489564
-0.003094538 2.044019006
-0.003001651 2.259240127
-\end{filecontents*}
-\readdata{\data}{LSM.data}
+\readdata{\data}{data/LSM2.data}
\pstScalePoints(10000,1){ 0.003 sub }{}
\psset{lly=-1.75cm}
\psgraph[arrows=->,Ox=0.0030,Dx=0.0001,dx=\psxunit](0,0)(3.2,3){10cm}{5cm}
@@ -3349,13 +3302,13 @@ we subtract 0.003 from all x-values and then scale them with
\egroup
\begin{lstlisting}
-\begin{filecontents*}{LSM.data}
+\begin{filecontents*}{data/LSM2.data}
0.003298697 1.397785583
0.003193358 1.615489564
0.003094538 2.044019006
0.003001651 2.259240127
\end{filecontents*}
-\readdata{\data}{LSM.data}
+\readdata{\data}{data/LSM2.data}
?\ON?\pstScalePoints?\OFF?(10000,1){ 0.003 sub }{}
\psset{lly=-1.75cm}
\psgraph[arrows=->,Ox=0.0030,Dx=0.0001,dx=\psxunit](0,0)(3.2,3){10cm}{5cm}
diff --git a/Master/texmf-dist/doc/generic/pst-plot/tugboat01-4.bib b/Master/texmf-dist/doc/generic/pst-plot/tugboat01-4.bib
deleted file mode 100644
index 817ec870cce..00000000000
--- a/Master/texmf-dist/doc/generic/pst-plot/tugboat01-4.bib
+++ /dev/null
@@ -1,120 +0,0 @@
-%% -*-bibtex-*-
-@STRING{tugboat = {TUGboat} }
-@STRING{beiprogramm = {{\TeX}-Beiprogramm} }
-@STRING{bretter = {Bretter, die die Welt bedeuten} }
-@STRING{dtk = {{D}ie {\TeX}nische {K}om{\"o}die} }
-@STRING{editorial = {Editorial} }
-@STRING{fremdebuehne = {Von fremden B{\"u}hnen} }
-@STRING{fundus = {Aus dem Fundus} }
-@STRING{hinterbuehne = {Hinter der B{\"u}hne} }
-@STRING{leserbrief = {Leserbrief(e)} }
-@STRING{magazin = {Magazin} }
-@STRING{rezension = {Rezensionen} }
-@STRING{schonimmer = {Was Sie schon immer {\"u}ber {\TeX} wissen wollten \dots} }
-@STRING{theaterkasse = {Von der Theaterkasse} }
-@STRING{theatertage = {{\TeX}-Theatertage} }
-
-@Article{ dtk02.1:voss:mathematischen,
- author = {Herbert Vo{\ss}},
- title = {Die mathematischen Funktionen von Postscript},
- journal = dtk,
- year = 2002,
- volume = {1/02},
- altvolume = 1,
- altnumber = 14,
- month = mar,
- pages = {},
- annote = bretter,
- keywords = {},
- abstract = { \PS, faktisch genauso alt wie {\TeX}, ist im
- Verh{\"a}ltnis dazu allgemein noch weniger bekannt, wenn es
- darum geht zu beurteilen, was es denn nun im eigentlichen
- Sinne ist. Au{\ss}erdem wird h{\"a}ufig vergessen, dass
- sich mit den \PS-Funktionen viele Dinge erledigen lassen,
- bei denen sonst auf externe Programme zur{\"u}ckgegriffen
- wird. Dies wird im Folgenden f{\"u}r die mathematischen
- Funktionen im Zusammenhang mit dem Paket \texttt{pst-plot}
- gezeigt. }
-}
-
-@Book{companion,
- author = {Michel Goosens and Frank Mittelbach and Alexander
- Samarin},
- title = {The {\LaTeX} {G}raphics {C}ompanion},
- publisher = {{Addison-Wesley Publishing Company}},
- year = {1997},
- address = {Reading, Mass.}
-}
-
-@Book{voss:chaos,
- author = {Herbert Vo{\ss}},
- title = {Chaos und {F}raktale selbst programmieren: von {M}andelbrotmengen {\"u}ber {F}arbmanipulationen zur perfekten Darstellung},
- publisher = {{Franzis Verlag}},
- year = {1994},
- address = {Poing}
-}
-
-@Article{girou:01:,
- author = {Denis Girou},
- title = {Pr\'esentation de {PST}ricks},
- journal = {Cahier {GUT}enberg},
- year = 1994,
- volume = {16},
- month = apr,
- pages = {21-70}
-}
-
-@Article{girou:02:,
- author = {{Timothy van} Zandt and Denis Girou},
- title = {Inside {PST}ricks},
- journal = TUGboat,
- year = 1994,
- volume = {15},
- month = sep,
- pages = {239-246}
-}
-
-@Book{PostScript,
- Author = {Kollock, Nikolai G.},
- Title = {PostScript richtig eingesetzt: vom {K}onzept zum
- praktischen {E}insatz},
- Publisher = {IWT},
- Address = {Vaterstetten},
- year = 1989,
-}
-
-@Book{ThinkPostScript,
- Author = {Reid, Glenn C.},
- Title = {Thinking in {P}ost{S}cript},
- Publisher = {Addison-Wesley},
- Address = {Boston},
- year = 1990,
-}
-
-@Manual{pstricks,
- Title = {PSTricks - {\PS} macros for generic {\TeX}},
- Author = {{Timothy van} Zandt},
- Organization = {},
- Address = {\url{http://www.tug.org/application/PSTricks}},
- Note = {},
- year = 1993
-}
-
-@Manual{pst-plot,
- Title = {\texttt{pst-plot}: Plotting two dimensional functions and data},
- Author = {{Timothy van} Zandt},
- Organization = {},
- Address = {\url{CTAN:graphics/pstricks/generic/pst-plot.tex}},
- Note = {},
- year = 1999
-}
-
-@Manual{multido,
- Title = {\texttt{multido.tex} - a loop macro, that supports fixed-point addition},
- Author = {{Timothy van} Zandt},
- Organization = {},
- Address = {\url{CTAN:/graphics/pstricks/generic/multido.tex}},
- Note = {},
- year = 1997
-}
-
diff --git a/Master/texmf-dist/doc/generic/pst-plot/tugboat01-4.pdf b/Master/texmf-dist/doc/generic/pst-plot/tugboat01-4.pdf
deleted file mode 100644
index eae65d2599b..00000000000
--- a/Master/texmf-dist/doc/generic/pst-plot/tugboat01-4.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-plot/tugboat01-4.tex b/Master/texmf-dist/doc/generic/pst-plot/tugboat01-4.tex
deleted file mode 100644
index bc6a4f7a9c4..00000000000
--- a/Master/texmf-dist/doc/generic/pst-plot/tugboat01-4.tex
+++ /dev/null
@@ -1,705 +0,0 @@
-%\documentclass[final,harvardcite]{ltugboat}
-\documentclass[final]{ltugboat}
-\PrelimDraftfalse
-\InputIfFileExists{tugboat.dates}%
- {}{}
-\InputIfFileExists{tb72pages.tex}%
- {}{\def\TBpstplot{1001}}
-\setcounter{page}{\TBpstplot}
-
-\overfullrule=6pt
-
-\usepackage[T1]{fontenc}
-\usepackage[latin1]{inputenc}
-\usepackage[scaled=0.96]{helvet}
-\usepackage{mathptmx}
-\usepackage{courier}
-\usepackage{comment}
-\usepackage{tabularx}
-
-\usepackage{graphicx}
-%\usepackage{pstcol}
-%\usepackage{pst-plot}%
-%
-\newcommand\verbI[1]{{\small\texttt{#1}}}
-\newcommand\CMD[1]{{\small\textbackslash\texttt{#1}}}
-\setlength{\belowcaptionskip}{\abovecaptionskip}
-%
-\usepackage{listings}
-\lstset{language=[LaTeX]TEX,basicstyle=\ttfamily\footnotesize,%
- extendedchars=true,numbers=left,numberstyle=\tiny,%
- xleftmargin=2em,breaklines=true}
-%
-\usepackage{ifpdf}
-\ifpdf%
- \usepackage[%
- pdftex,%
- pdfauthor={Jana and Herbert Voss},%
- pdftitle={2D Plots},%
- linktocpage,%
- colorlinks]{hyperref}
-\hypersetup{%
-colorlinks,linkcolor={black}, citecolor={black}, pagecolor={black},
-urlcolor={black}
-}
-
-\else
- \usepackage[%
- ps2pdf,%
- pdfauthor={Jana and Herbert Voss},%
- pdftitle={2D Plots},%
- linktocpage,%
- colorlinks]{hyperref}
-\fi
-\makeatletter
-\usepackage{url}
-
-\begin{document}
-
-\sectitle{Graphics}
-
-
-\title{The plot functions of \texttt{pst-plot}\thanks{Translated from
-``Die Plot-Funktionen von pst-plot,''
-\textsl{Die TeXnische Kom\"odie} \textbf{2/02}, June 2002, pages 27-34,
-with permission.}}
-
-\author{Jana Voß}
-\address{Wasgenstr. 21\\14129 Berlin \textsc{GERMANY}}
-\netaddress{Jana@perce.de}
-%
-\author{Herbert Voß}
-\address{Wasgenstr. 21\\14129 Berlin \textsc{GERMANY}}
-\personalURL{http://www.perce.de}
-\netaddress{voss@perce.de}
-
-\maketitle
-
-\begin{abstract}
- Plotting of external data records is one of the standard problems of
- technical and industrial publications. One common approach is
- importing the data files into an external program, such as
- \verbI{gnuplot}, provided with axes of coordinates and further
- references, and finally exported to \LaTeX. By contrast, in this
- article we explain ways to get proper data plotting without using
- external applications.
-\end{abstract}
-
-\section{Introduction}
-
-The history and the meaning of \PS{} have been covered sufficiently in
-many articles. For the programming language \PS{} have a look at
-\cite{PostScript,ThinkPostScript}. The package \verbI{pst-plot}
-\cite{pst-plot} under consideration here is part of the \verbI{pstricks}
-project. It must be loaded into a \LaTeX{} document as usual with
-\CMD{usepackage\{pst-plot\}} or alternatively, for documents written in Plain\TeX,
-with \CMD{input pst-plot.tex}.
-
-\verbI{pst-plot} provides three plot macros for the representation of
-external data, with the following syntax:
-
-{\small\begin{verbatim}
-\listplot*[<parameter>]{<data macro>}
-\dataplot*[<parameter>]{<data macro>}
-\fileplot*[<parameter>]{<file name>}
-\end{verbatim}}
-
- The starred forms have the same meaning as with all macros of
- \verbI{pstricks}: to plot the data in a reversed mode. Thus, for a
- default black-on-white diagram one produces the negative with the
- starred command form, namely white-on-black. Additionally, a negative plot
- implies that \PS{} closes the path of the points from the last to
- the first one and fills all points inside this closed path with the
- actual fillcolor. For our purposes in this article there will be no
- real sense in this negative view; therefore, all of the following
- examples are plotted with the normal (unstarred) form only.
-
-For further information about the package \verbI{pstricks} have a look at the (more
-or less) official documentation \cite{pstricks}, or the extensive
-description in the ``standard \LaTeX'' book \cite{companion} or in
-\cite{girou:01:,girou:02:}. Altogether, however, these do not fully
-describe the substantial differences between these three plot macros.
-
-For all of the examples in this article, the complete \verbI{pspicture}
-environment is indicated, so that the examples may be directly copied.
-The Documentation of the \verbI{multido} macro used here can be found in the
-package itself \cite{multido}; macros not otherwise mentioned are
-described in the \verbI{pstricks} documentation \cite{pstricks}.
-
-The general \verbI{plotstyle} parameter is particularly important, and
-can take the values shown in table \ref{tab:options}.
-
-\begin{table}
-\caption{Possible options}\label{tab:options}
-\begin{tabularx}{1.0\linewidth}{r|X}
-style option& meaning\\
-\hline
-\verbI{plotstyle=dots} & plot $(x,y)$ as a dot\\
-\verbI{=line} & draw a line from a dot to the following one\\
-\verbI{=polygon} & nearly the same as \verbI{line}, but with a line from the last to the first dot\\
-\verbI{=curve} & interpolation between three dots, whereby the curve can go beyond the point of origin and/or termination point\\
-\verbI{=ecurve} & like \verbI{curve}, but ends at the first/last dot\\
-\verbI{=ccurve} & like \verbI{curve}, but closed\\
-\end{tabularx}
-\end{table}
-
-By default, the \verbI{line} option is selected.
-
-The following general commands are also useful in conjunction with the
-plot commands. They are also defined by the \verbI{pst-plot} package:
-
-{\small\begin{verbatim}
-\readdata{<data macro name>}{<file name>}
-\savedata{<data macro name>}{<file name>}
-\end{verbatim}}
-
- In the following examples only the \CMD{readdata} macro is used,
- but it would be straightforward to create examples with
- \CMD{savedata}.
-
-\section{Examples for \CMD{listplot}}
-
-The syntax of \CMD{listplot} is :
-
-{\small\begin{verbatim}
-\listplot{<data macro name>}
-\end{verbatim}}
-
- The data macro may contain any additional \AllTeX- or
- \PS-commands. The \AllTeX{} macros are expanded first before they
- are passed as a \textbf{list} of $x|y$ values to \PS. The data
- records can be defined inside the document like
-
-{\small\begin{verbatim}
-\newcommand{\dataA}{
- 1.00000000 1.00000000
- 0.56000000 0.31000000
- 0.85841600 0.17360000
- ...
-\end{verbatim}}
-
-\noindent or can be read from an external data file with the \CMD{readdata} macro:
-
-{\small\begin{verbatim} \readdata{\dataA}{/anyPath/data.dat}
-\end{verbatim}}
-
- The example in figure \ref{fig:listplot1} shows the Henon
- attractor, a typical graphic of a system with chaotic
- behavior\cite{voss:chaos}.
-
- Figure \ref{fig:listplot2} is nearly the same as
- figure~\ref{fig:listplot1}, with the addition of \PS{} code to
- get
- the "Draft" watermark. (Some familiarity with \PS{} is needed to
- fully understand its operation.) To save space, listing
- \ref{lst:listplot2} does not contain the data, which is nothing
- more than a sequence of pairs of floats, each value separated by a
- space, as shown above.
-
-\begin{figure}[htb]
-\centering
-\begin{comment}
-\PSforPDF{%
-\readdata{\henon}{henon.dat}
-\psset{xunit=1.5cm, yunit=3cm}
-\begin{pspicture}(-2,-0.5)(2.25,1.25)
- \psaxes{->}(0,0)(-2,-0.5)(1.5,1.25)
- \listplot[%
- showpoints=true,%
- plotstyle=curve]{\henon}
-\end{pspicture}%
-}
-\end{comment}
-\includegraphics{fig4}
-\caption{Example for \CMD{listplot}}\label{fig:listplot1}
-\end{figure}
-
-\begin{figure}[htb]
-\centering
-\begin{comment}
-\newcommand{\dataA}{
- 1.00000000 1.00000000
- 0.56000000 0.31000000
- 0.85841600 0.17360000
- 0.11249564 0.26610896
- 1.24788537 0.03487365
--1.20752013 0.38684447
--0.71282656 -0.37433124
--0.10602649 -0.22097623
- 0.76283584 -0.03286821
- 0.12916912 0.23647911
- 1.21245320 0.04004243
--1.07681914 0.37586049
--0.29387634 -0.33381393
- 0.54182291 -0.09110166
- 0.48615456 0.16796510
- 0.82762650 0.15070791
- 0.16435741 0.25656422
- 1.21766498 0.05095080
--1.08414872 0.37747614
--0.31506881 -0.33608610
- 0.52096746 -0.09767133
- 0.51150245 0.16149991
- 0.78474587 0.15856576
- 0.27177620 0.24327122
- 1.13690951 0.08425062
--0.77704042 0.35244195
- 0.48298173 -0.24088253
- 0.42320673 0.14972434
- 0.89181467 0.13119409
--0.01408602 0.27646255
- 1.27617683 -0.00436667
--1.34958997 0.39561482
--1.22719125 -0.41837289
--1.58701052 -0.38042929
- gsave
- /Helvetica findfont 40 scalefont setfont
- 45 rotate
- 0.9 setgray
- -60 10 moveto (DRAFT) show
- grestore
-}
-\psset{xunit=1.5cm, yunit=3cm}
-\begin{pspicture}(-2,-0.5)(2.25,1.25)
- \psaxes{->}(0,0)(-2,-0.5)(1.5,1.25)
- \listplot[%
- showpoints=true,%
- linecolor=red,%
- plotstyle=curve]{\dataA}
-\end{pspicture}%
-\end{comment}
-\includegraphics{fig5}
-\caption{Example for modified \CMD{listplot}}\label{fig:listplot2}
-\end{figure}
-
-
-\begin{lstlisting}[caption={\LaTeX\ source for figure \ref{fig:listplot1}},%
- label={lst:listplot1}]
-\readdata{\henon}{henon.dat}
-\psset{xunit=1.5cm, yunit=3cm}
-\begin{pspicture}(-3,-0.5)(2.25,1.25)
- \psaxes{->}(0,0)(-2,-0.5)(1.5,1.25)
- \listplot[%
- showpoints=true,%
- linecolor=red,%
- plotstyle=curve]{\dataA}
-\end{pspicture}
-\end{lstlisting}
-
-
-\begin{lstlisting}[caption={\LaTeX\ source for figure \ref{fig:listplot2}},%
- label={lst:listplot2}]
-\newcommand{\DataA}{%
- [ ... data ... ]
- gsave % save graphic status
- /Helvetica findfont 40 scalefont setfont
- 45 rotate % rotate by 45 degrees
- 0.9 setgray % 1 is color white
- -60 10 moveto (DRAFT) show
- grestore
-}
-\psset{xunit=1.5cm, yunit=3cm}
-\begin{pspicture}(-3,-0.5)(2.25,1.25)
- \psaxes{->}(0,0)(-2,-0.5)(1.5,1.25)
- \listplot[%
- showpoints=true,%
- plotstyle=curve]{\dataA}
-\end{pspicture}
-\end{lstlisting}
-
-
-Naturally, \verbI{[... data ...]} is replaced by all
-the $x|y$-values; they're omitted here only to save space.
-
-As an alternative to direct modification of the data set passed to
-\CMD{listplot}, one can redefine the macro \verbI{defScalePoints} from
-\verbI{pst-plot}. For example, to change the $x|y$ values and then
-rotate the whole plotted graphic (don't ask why!), the redefinition is
-as shown in listing \ref{lst:listplot3}.
-
-\begin{lstlisting}[%
- caption={\LaTeX\ source for figure \ref{fig:listplot3}},%
- label={lst:listplot3}]
-\makeatletter
-\pst@def{ScalePoints}<%
-%-------------------------------------
- 45 rotate % rotate the whole object
-%-------------------------------------
- /y ED /x ED
- counttomark dup dup cvi eq not { exch pop } if
- /m exch def /n m 2 div cvi def
- n {
-%-------------------------------------
- exch % exchange the last two elements
-%-------------------------------------
- y mul m 1 roll
- x mul m 1 roll
- /m m 2 sub
- def } repeat>
-\makeatother
-\end{lstlisting}
-
-\noindent This gives figure \ref{fig:listplot3}.
-
-
-
-\begin{figure}[htb]
-\centering
-\begin{comment}
-\makeatletter
-\pst@def{ScalePoints}<%
-%-----------------------------------------------
- 45 rotate % rotate the whole object
-%-----------------------------------------------
- /y ED /x ED
- counttomark dup dup cvi eq not { exch pop } if
- /m exch def /n m 2 div cvi def
- n {
-%-----------------------------------------------
- exch % exchange the last two elements
-%-----------------------------------------------
- y mul m 1 roll
- x mul m 1 roll
- /m m 2 sub
- def } repeat>
-\makeatother
-\readdata{\henon}{henon.dat}
-\begin{pspicture}(-0.5,-2.75)(3,3)
-\psset{xunit=3cm, yunit=1.5cm}
- \psaxes{->}(0,0)(-0.5,-2)(1.25,2)
- \listplot[%
- showpoints=true,%
- plotstyle=curve]{\henon}
-\end{pspicture}%
-\end{comment}
-\includegraphics{fig6}
-\caption{Example for \CMD{listplot} with a redefined \verbI{ScalePoints}}\label{fig:listplot3}
-\end{figure}
-
-Thus, the advantage of \CMD{listplot} is that one can easily modify the
-data values without any external program. Here is one more example---suppose
-you have the following data records:
-
-{\small\begin{verbatim}
-1050, 0.368
-1100, 0.371
-1200, 0.471
-1250, 0.428
-1300, 0.391
-1350, 0.456
-1400, 0.499
-1500, 1.712
-1550, 0.475
-1600, 0.497
-\end{verbatim}}
-
-\noindent which perhaps came automatically from a technical device. The
-unit of the x-values is micrometer but it makes more sense to use
-millimeter for the plot. A redefinition of \verbI{ScalePoints} makes it
-very easy to plot the data with this change of scale:
-
-\begin{lstlisting}[caption={Rescale all x values},label={lst:lstplot}]
- \makeatletter
-\pst@def{ScalePoints}<%
- /y ED /x ED
- counttomark dup dup cvi eq not { exch pop } if
- /m exch def /n m 2 div cvi def
- n {
- y mul m 1 roll
- x mul 1000 div m 1 roll% <-- divide by 1000
- /m m 2 sub
- def } repeat>
-\makeatother
-\end{lstlisting}
-
-\begin{figure}[htb]
-\centering
-\begin{comment}
-\makeatletter
-\begin{pdfpic}
-\pst@def{ScalePoints}<%
- /y ED /x ED
- counttomark dup dup cvi eq not { exch pop } if
- /m exch def /n m 2 div cvi def
- n {
- y mul m 1 roll
- x mul 1000 div m 1 roll% <-- divide by 1000
- /m m 2 sub
- def } repeat>
-\makeatother
-\def\dataA{%
-1050 0.368
-1100 0.371
-1200 0.471
-1250 0.428
-1300 0.391
-1350 0.456
-1400 0.499
-1500 1.712
-1550 0.475
-1600 0.497 }%
-\psset{xunit=5}
-\begin{pspicture}(1,-0.25)(2,2.25)
- \psaxes[Dx=0.25,Ox=1]{->}(1,0)(2,2)
- \psaxes[Dx=0.05,Ox=1,labels=none,ticksize=0.05](1,0)(2,0)
- \listplot[plotstyle=dots,linecolor=red]{\dataA}
-\end{pspicture}%
-\end{pdfpic}
-\end{comment}
-\includegraphics{fig7}
-\caption{Example for modified data values with a redefined \verbI{ScalePoints}} \label{fig:lstplot4}
-\end{figure}
-
-
-
-\section{Examples for \CMD{dataplot}}
-
-\CMD{dataplot} has the same syntax as \CMD{listplot}, so the first
-question is, what is the difference between the two? \CMD{listplot}
-builds a list of all the data and then multiplies all values with the
-length unit. This takes some time, so you may prefer a so-called
-``quick plot'', where the data can be passed more quickly to \PS,
-depending on the plotstyle and especially the option \verbI{showpoints}.
-Table \ref{tab:quickplot} shows whether this is possible. A quick plot
-is not possible with \CMD{listplot}, whereas \CMD{dataplot} uses it
-whenever possible. When it is not possible, \CMD{dataplot} simply calls
-\CMD{listplot}.
-
-
-\def\hI{\hangindent=3em}
-\begin{table}[htb]
-\caption{Possible options for a ''quick plot``}\label{tab:quickplot}
-\begin{tabularx}{\columnwidth}{lX|l}
-plotstyle & options & macro\\\hline
-\verbI{line} & all, except & quick plot\\
- & \verbI{linearc}, \verbI{showpoints}, \verbI{arrows}, & \CMD{listplot}\\
-\verbI{polygon} & all, except & quick plot\\
- & \verbI{linearc}, \verbI{showpoints} & \CMD{listplot}\\
-\verbI{dots} & all & quick plot\\
-\verbI{bezier} & all, except & quick plot\\
- &\verbI{arrows}, \verbI{showpoints} & \CMD{listplot}\\
-\hI\verbI{cbezier} & all, except& \CMD{listplot}\\
- &\verbI{showpoints} & quick plot\\
-\verbI{curve} & all & \CMD{listplot}\\
-\verbI{ecurve} & all & \CMD{listplot}\\
-\verbI{ccurve} & all & \CMD{listplot}
-\end{tabularx}
-\end{table}
-
-
-\CMD{dataplot} needs to be passed a macro holding the data. The data is
-typically saved in an external file, which can be read by (for instance)
-the \CMD{readdata} macro, as follows:
-
-{\small\begin{verbatim}
-\readdata{<object name>}{<data file>}
-\end{verbatim}}
-
-\noindent For example:
-
-{\small\begin{verbatim}
-\readdata{\feigenbaum}{feigenbaum.data}
-\end{verbatim}}
-
-The amount of data is limited only by \TeX's memory. The above example
-can be plotted with:
-
-{\small\begin{verbatim}
-\dataplot{\feigenbaum}
-\end{verbatim}}
-
- Overlays with different data files are also possible. For example,
- figure~\ref{fig:dataplot} shows the use of two different data files
- which are plotted using one coordinate system. It shows the sorting
- time for ``Bubble-Sort'' and ``Select-Sort{}'' as a function of the
- number of the elements.
-
-\begin{figure}
-\centering
-\begin{comment}%
-\psset{xunit=0.0005cm,yunit=0.005cm}
-\begin{pspicture}(0,-50)(10000,1100)
- \readdata{\bubble}{bubble.data}
- \readdata{\select}{select.data}
- \dataplot[%
- plotstyle=line,%
- linecolor=blue]{\bubble}
- \dataplot[%
- plotstyle=line,%
- linecolor=red,%
- linewidth=2pt]{\select}
- \psline{->}(0,0)(10000,0)
- \psline{->}(0,0)(0,1000)
- \rput[l](40,920){time}
- \rput[r](9990,-30){elements}
- \rput[l](4500,800){Bubble-Sort}
- \rput[l](7500,200){Select-Sort}
-\end{pspicture}%
-\end{comment}
-\includegraphics{fig0}
-\caption{Example for \CMD{dataplot}}\label{fig:dataplot}
-\end{figure}
-
-\begin{lstlisting}[caption={\LaTeX\ source for figure \ref{fig:dataplot}}]
-\psset{xunit=0.0005cm,yunit=0.005cm}
-\begin{pspicture}(0,-50)(10000,1100)
- \readdata{\bubble}{bubble.data}
- \readdata{\select}{select.data}
- \dataplot[%
- plotstyle=line,%
- linecolor=blue]{\bubble}
- \dataplot[%
- plotstyle=line,%
- linecolor=red,%
- linewidth=2pt]{\select}
- \psline{->}(0,0)(10000,0)
- \psline{->}(0,0)(0,1000)
- \rput[l](20,995){time}
- \rput[r](9990,-20){elements}
- \rput[l](4500,800){Bubble-Sort}
- \rput[l](7500,200){Select-Sort}
-\end{pspicture}
-\end{lstlisting}
-
-In summary, the advantage of \CMD{dataplot} is the possibility of a
-''quick plot``, and the advantage of \CMD{listplot} is that it is easy
-to manipulate the data values before they are plotted.
-
-
-\section{Examples for \CMD{fileplot}}
-
-\CMD{fileplot} can be used whenever $(x|y)$ data that is saved in a file
-is to be plotted. The values must be given as pure numerical values in
-pairs, one pair on each line, and may have spaces, commas, parentheses,
-and braces as punctuation, as follows:
-
-\begin{verbatim}
-x y
-x,y
-(x,y)
-{x,y}
-\end{verbatim}
-
-The tab character (\CMD{t} or \acro{ASCII} \CMD{009}) is often used as a
-separator, but tab is \emph{not} valid here. Tabs may be converted to
-spaces in many ways, for example with the standard Unix utility
-\texttt{tr}:
-
-{\small\begin{verbatim}
-tr '\t' ' ' <inFile >outFile
-\end{verbatim}}
-
-The data files may also contain \% characters, but no other characters
-are allowed.
-
-Our first example for \CMD{fileplot} is shown in
-figure~\ref{fig:fileplot1}, which is an \acro{UV/VIS} absorber spectrum
-$A=\lg \frac{I_{0}}{I}$ as a function of the wavelength. The second
-example (figure~\ref{fig:fileplot2}) shows the evolution of a population
-as a function of the spawn factor (Feigenbaum diagram
-\cite{voss:chaos}). The source code for these images is shown in
-listings~\ref{lst:fileplot1} and~\ref{lst:fileplot2}.
-
-\begin{figure}[htb]
-\centering
-\begin{comment}%
-\psset{xunit=0.0025cm,yunit=1.1cm}
-\begin{pspicture}(-25,-.25)(1950,4)
- \fileplot[plotstyle=line, linewidth=1.5pt]{fileplot.data}
- \psaxes[dx=400,Dx=400]{->}(1900,4)
- \multido{\n=200+200}{9}{%
- \psline[linestyle=dotted](\n,0)(\n,4)
- }
- \multido{\n=+1}{5}{%
- \psline[linestyle=dotted](0,\n)(1800,\n)%
- }
-\end{pspicture}%
-\end{comment}
-\includegraphics{fig1}
-\caption{Example for \CMD{fileplot}}\label{fig:fileplot1}
-\end{figure}
-
-\begin{lstlisting}[caption={\LaTeX\ source for figure \ref{fig:fileplot1}},label={lst:fileplot1}]
-\psset{xunit=0.0025cm,yunit=1.1cm}
-\begin{pspicture}(-25,-.25)(1950,4)
- \fileplot[plotstyle=line]{fileplot.data}
- \psaxes[dx=400,Dx=400]{->}(1900,4)
- \multido{\n=200+200}{9}{%
- \psline[linestyle=dotted](\n,0)(\n,4)%
- }
- \multido{\n=+1}{5}{%
- \psline[linestyle=dotted]%
- (0,\n)(1800,\n)%
- }
-\end{pspicture}
-\end{lstlisting}
-
-
-\begin{figure}[htb]
-\centering
-\begin{comment}%
-\psset{xunit=1.25cm,yunit=5cm}
-\begin{pspicture}(-0.25,-0.05)(4.25,1.2)
- \fileplot[plotstyle=dots]{feigenbaum.data}
- \psaxes{->}(0,0)(4.05,1)
- \rput(4,-0.05){$x$}
- \rput(0.2,1.05){$y$}
- \rput[l](0.2,3.75){Feigenbaum-Diagram}
-\end{pspicture}%
-\end{comment}
-\includegraphics{fig2}
-\caption{Another example for \CMD{fileplot}}\label{fig:fileplot2}
-\end{figure}
-
-
-\begin{lstlisting}[caption={\LaTeX\ source for figure \ref{fig:fileplot2}},label={lst:fileplot2}]
-\psset{xunit=1.5cm,yunit=6cm}
-\begin{pspicture}(-0.25,-0.05)(4.25,1)
- \fileplot[plotstyle=dots]{%
- feigenbaum.data}
- \psaxes{->}(0,0)(4.05,1)
-\end{pspicture}
-\end{lstlisting}
-
-As you may see in listing \ref{lst:fileplot}, \CMD{fileplot} does little
-of its own. It first calls \CMD{readdata} to read the data, and then,
-depending on the kind of data and specified options, \CMD{fileplot} uses
-\CMD{dataplot} for a quick plot if possible. Otherwise, it falls back
-to \CMD{listplot}.
-
-\begin{lstlisting}[caption={The source of the \CMD{fileplot} macro},label={lst:fileplot}]
-\def\fileplot{\def\pst@par{}\pst@object{fileplot}}
-\def\fileplot@i#1{%
- \pst@killglue
- \begingroup
- \use@par
- \@pstfalse
- \@nameuse{testqp@\psplotstyle}%
- \if@pst
- \dataplot@ii{\pst@readfile{#1}}%
- \else
- \listplot@ii{\pst@altreadfile{#1}}%
- \fi
- \endgroup
- \ignorespaces%
-}
-\end{lstlisting}
-
-\CMD{fileplot} has the advantage of being easy to use, but the
-disadvantage of needing a lot of memory: \TeX{} has to read the all the
-data values before it can process anything. As a rule of thumb, when
-there are more than 1000 data entries \TeX{}'s main menory must be
-increased. Furthermore, the running time may be enormous, especially on
-slow machines.
-
-To prevent such problems, one can use the \CMD{PSTtoEPS} macro to create
-an \texttt{eps} file. For more information, see the documentation of
-\verbI{pstricks} \cite{pstricks}.
-
-\bibliographystyle{plain}
-\bibliography{\jobname}
-%\bibliographystyle{ltugbib}
-
-\makesignature
-
-\end{document}
diff --git a/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
index d248c402a95..a39ae857556 100644
--- a/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
+++ b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
@@ -1,4 +1,4 @@
-% $Id: pst-plot.tex 83 2014-08-23 15:04:57Z herbert $
+% $Id: pst-plot.tex 251 2016-01-16 17:50:04Z herbert $
%%
%% BEGIN pst-plot.tex
%%
@@ -6,7 +6,7 @@
%% See the betadoc documentation for usage.
%%
%% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu.
-%% COPYRIGHT 2009-2015 by Herbert Voss, hvoss@tug.org.
+%% COPYRIGHT 2009-2016 by Herbert Voss, hvoss@tug.org.
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN
@@ -19,11 +19,12 @@
\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey.tex\fi
\ifx\PSTtoolsloaded\endinput\else\input pst-tools.tex\fi
+\ifx\PSTtoolsloaded\endinput\else\input pstricks-add.tex\fi
\ifx\PSTFPloaded\endinput\else \input pst-fp.tex \fi
\ifx\MultidoLoaded\endinput\else \input multido.tex \fi
%
-\def\fileversion{1.70}
-\def\filedate{2014/08/23}
+\def\fileversion{1.72}
+\def\filedate{2016/05/09}
\message{ v\fileversion, \filedate\space (tvz,hv)}
%
\edef\TheAtCode{\the\catcode`\@}
@@ -1192,6 +1193,70 @@ D\space##1%
\define@boolkey[psset]{pst-plot}[]{showorigin}[true]{}
\psset[pst-plot]{showorigin}
%
+\long\def\psrotatebox#1#2{%
+ \leavevmode
+ \Grot@setangle{#1}%
+ \setbox\z@\hbox{{#2}}%
+ \Grot@x\z@
+ \Grot@y\z@
+ \Grot@box}
+\def\Grot@setangle#1{\edef\Grot@angle{#1}}
+\def\Grot@Px#1#2#3{%
+ #1\Grot@cos#2%
+ \advance#1-\Grot@sin#3}
+\def\Grot@Py#1#2#3{%
+ #1\Grot@sin#2%
+ \advance#1\Grot@cos#3}
+\def\Grot@box{%
+ \begingroup
+ \CalculateSin\Grot@angle
+ \CalculateCos\Grot@angle
+ \edef\Grot@sin{\UseSin\Grot@angle}%
+ \edef\Grot@cos{\UseCos\Grot@angle}%
+ \Grot@r\wd\z@ \advance\Grot@r-\Grot@x
+ \Grot@l\z@ \advance\Grot@l-\Grot@x
+ \Grot@h\ht\z@ \advance\Grot@h-\Grot@y
+ \Grot@d-\dp\z@ \advance\Grot@d-\Grot@y
+ \ifdim\Grot@sin\p@>\z@
+ \ifdim\Grot@cos\p@>\z@
+ \Grot@Py\Grot@height \Grot@r\Grot@h%B
+ \Grot@Px\Grot@right \Grot@r\Grot@d%E
+ \Grot@Px\Grot@left \Grot@l\Grot@h%C
+ \Grot@Py\Grot@depth \Grot@l\Grot@d%D
+ \else
+ \Grot@Py\Grot@height \Grot@r\Grot@d%E
+ \Grot@Px\Grot@right \Grot@l\Grot@d%D
+ \Grot@Px\Grot@left \Grot@r\Grot@h%B
+ \Grot@Py\Grot@depth \Grot@l\Grot@h%C
+ \fi
+ \else
+ \ifdim\Grot@cos\p@<\z@
+ \Grot@Py\Grot@height \Grot@l\Grot@d%D
+ \Grot@Px\Grot@right \Grot@l\Grot@h%C
+ \Grot@Px\Grot@left \Grot@r\Grot@d%E
+ \Grot@Py\Grot@depth \Grot@r\Grot@h%B
+ \else
+ \Grot@Py\Grot@height \Grot@l\Grot@h%C
+ \Grot@Px\Grot@right \Grot@r\Grot@h%B
+ \Grot@Px\Grot@left \Grot@l\Grot@d%D
+ \Grot@Py\Grot@depth \Grot@r\Grot@d%E
+ \fi
+ \fi
+ \advance\Grot@height\Grot@y
+ \advance\Grot@depth\Grot@y
+ \Grot@Px\dimen@ \Grot@x\Grot@y
+ \Grot@Py\dimen@ii \Grot@x\Grot@y
+ \dimen@-\dimen@ \advance\dimen@-\Grot@left
+ \dimen@ii-\dimen@ii \advance\dimen@ii\Grot@y
+ \setbox\z@\hbox{%
+ \kern\dimen@
+ \raise\dimen@ii\hbox{\Grot@start\box\z@\Grot@end}}%
+ \ht\z@\Grot@height
+ \dp\z@-\Grot@depth
+ \advance\Grot@right-\Grot@left\wd\z@\Grot@right
+ \leavevmode\box\z@
+ \endgroup}
+%
\define@key[psset]{pst-plot}{labelFontSize}[{}]{\def\psk@xlabelFontSize{#1}\def\psk@ylabelFontSize{#1}}%
\define@key[psset]{pst-plot}{xlabelFontSize}[{}]{\def\psk@xlabelFontSize{#1}}%
\define@key[psset]{pst-plot}{ylabelFontSize}[{}]{\def\psk@ylabelFontSize{#1}}%
@@ -1264,8 +1329,33 @@ D\space##1%
\pst@getint{#1}{\psk@ytrigLabelBase}\psset{ytrigLabels}}
\psset[pst-plot]{trigLabelBase=0}
%
-\define@boolkey[psset]{pst-plot}[Pst@]{xtrigLabels}[true]{%
- \ifPst@xtrigLabels
+\define@key[psset]{pst-plot}{fractionLabelBase}[0]{\pst@getint{#1}{\psk@xfractionLabelBase}\let\psk@yfractionLabelBase\psk@xfractionLabelBase}
+\define@key[psset]{pst-plot}{xfractionLabelBase}[0]{%
+ \pst@getint{#1}{\psk@xfractionLabelBase}\psset{xfractionLabels}}
+\define@key[psset]{pst-plot}{yfractionLabelBase}[0]{%
+ \pst@getint{#1}{\psk@yfractionLabelBase}\psset{yfractionLabels}}
+\psset[pst-plot]{fractionLabelBase=0}
+%
+\def\setDefaulthLabels{%
+ \ifPst@xmathLabel\def\pshlabel##1{$\psk@xlabelFontSize##1$}\else\def\pshlabel##1{\psk@xlabelFontSize##1}\fi
+ \def\pst@@@hlabel##1{%
+ \edef\@xyDecimals{\psk@xDecimals}%
+% \ifnum\psk@ticks<\tw@ % ticks=all|x
+ \ifnum\psk@labels<\tw@ % labels=all|x
+ \ifx\psk@xlogBase\@empty%
+ \pshlabel{\psk@xlabelFontSize\expandafter\@LabelComma##1..\@nil\psk@xlabelFactor}%
+ \else%
+ \ifPst@xmathLabel%
+ \pshlabel{\psk@xlabelFontSize\psk@xlogBase^{\expandafter\@stripDecimals##1..\@nil}}%
+ \else%
+ \pshlabel{\psk@xlabelFontSize\psk@xlogBase\textsuperscript{\expandafter\@stripDecimals##1..\@nil}}%
+ \fi
+ \fi%
+ \fi%
+ }%
+ \ifPst@xmathLabel \def\pshlabel##1{$\psk@xlabelFontSize##1$}\else\def\pshlabel##1{\psk@xlabelFontSize##1}\fi
+}
+\def\setTrighLabels{%
\def\pst@@@hlabel##1{\pshlabel{##1}}
\def\pshlabel##1{%
\ifnum\psk@xtrigLabelBase<2
@@ -1324,33 +1414,31 @@ D\space##1%
\fi%
\fi%
}%
- \else%
- \def\pst@@@hlabel##1{%
- \edef\@xyDecimals{\psk@xDecimals}%
-% \ifnum\psk@ticks<\tw@ % ticks=all|x
- \ifnum\psk@labels<\tw@ % labels=all|x
- \ifx\psk@xlogBase\@empty%
- \pshlabel{\psk@xlabelFontSize\expandafter\@LabelComma##1..\@nil\psk@xlabelFactor}%
+}
+%
+\def\setDefaultvLabels{%
+ \ifPst@ymathLabel\def\psvlabel##1{$\psk@ylabelFontSize##1$}\else\def\psvlabel##1{\psk@ylabelFontSize##1}\fi
+ \def\pst@@@vlabel##1{%
+ \edef\@xyDecimals{\psk@yDecimals}%
+% \ifodd\psk@ticks % ticks=all||y (0,2)
+ \ifodd\psk@labels % labelss=all||y (0,2)
+ \else%
+ \ifx\psk@ylogBase\@empty
+ \psvlabel{\expandafter\@LabelComma##1..\@nil\psk@ylabelFactor}%
\else%
- \ifPst@xmathLabel%
- \pshlabel{\psk@xlabelFontSize\psk@xlogBase^{\expandafter\@stripDecimals##1..\@nil}}%
- \else%
- \pshlabel{\psk@xlabelFontSize\psk@xlogBase\textsuperscript{\expandafter\@stripDecimals##1..\@nil}}%
- \fi
+ \ifPst@ymathLabel%
+ \psvlabel{\psk@ylogBase^{\expandafter\@stripDecimals##1..\@nil }}%
+ \else
+ \psvlabel{\psk@ylogBase\textsuperscript{\expandafter\@stripDecimals##1..\@nil }}%
+ \fi%
\fi%
\fi%
}%
- \ifPst@xmathLabel%
- \def\pshlabel##1{$\psk@xlabelFontSize##1$}\else\def\pshlabel##1{\psk@xlabelFontSize##1}\fi%
- \fi%
}%
-%
-\define@boolkey[psset]{pst-plot}[Pst@]{ytrigLabels}[true]{%
- \ifPst@ytrigLabels
- \def\pst@@@vlabel##1{\psvlabel{##1}}
+\def\setTrigvLabels{%
+ \def\pst@@@vlabel##1{\psvlabel{##1}}
\def\psvlabel##1{%
- \ifnum\psk@ytrigLabelBase<2
- \def\de@nominator{\@ne}\else\def\de@nominator{\psk@ytrigLabelBase}\fi
+ \ifnum\psk@ytrigLabelBase<2 \def\de@nominator{\@ne}\else\def\de@nominator{\psk@ytrigLabelBase}\fi
\def\pst@tempA{##1}
\pst@abs{\pst@tempA}\pst@cntm
\pst@mod{\pst@cntm}{\de@nominator}\pst@cntp % cntb=##1 modulo trigLabelBase
@@ -1375,8 +1463,8 @@ D\space##1%
\fi%
\else%
\ifPst@ymathLabel%
- $\psk@ylabelFontSize%
- \ifnum\pst@cntp=\@ne% % < 1 pi?
+ $\psk@ylabelFontSize
+ \ifnum\pst@cntp=\@ne% % < 1 pi? $
\if\pst@cntm=\@ne%
\frac{\pi}{\de@nominator}% % pi/x
\else\ifnum\pst@tempA=-1 \frac{-\pi}{\de@nominator}%
@@ -1388,10 +1476,10 @@ D\space##1%
\else\ifnum\pst@tempA=\de@nominator \pi%
\else\frac{\pst@tempA\pi}{\de@nominator}%
\fi\fi\fi$%
- \else%
- \psk@ylabelFontSize%
+ \else
+ \psk@ylabelFontSize
\ifnum\pst@cntp=\@ne% % < 1 pi?
- \if\pst@cntm=\@ne%
+ \if\pst@cntm=\@ne
$\frac{\pi}{\de@nominator}$% % pi/x
\else\ifnum\pst@tempA=-1 $\frac{-\pi}{\de@nominator}$%
\else \ifnum\pst@tempA=1 $\frac{\pi}{\de@nominator}$%
@@ -1405,30 +1493,115 @@ D\space##1%
\fi%
\fi%
}%
- \else
- \def\pst@@@vlabel##1{%
- \edef\@xyDecimals{\psk@yDecimals}%
-% \ifodd\psk@ticks % ticks=all||y (0,2)
- \ifodd\psk@labels % labelss=all||y (0,2)
- \else%
- \ifx\psk@ylogBase\@empty%
- \psvlabel{\expandafter\@LabelComma##1..\@nil\psk@ylabelFactor}%
- \else%
- \ifPst@ymathLabel%
- \psvlabel{\psk@ylogBase^{\expandafter\@stripDecimals##1..\@nil }}%
- \else
- \psvlabel{\psk@ylogBase\textsuperscript{\expandafter\@stripDecimals##1..\@nil }}%
- \fi%
- \fi%
- \fi%
+}%$
+%
+\def\setFractionvLabels{%
+ \def\pst@@@vlabel##1{\psvlabel{##1}}
+ \def\psvlabel##1{%
+ \ifnum\psk@yfractionLabelBase<2 \def\de@nominator{\@ne}\else\def\de@nominator{\psk@yfractionLabelBase}\fi
+ \def\pst@tempA{##1}%
+ \pst@abs{\pst@tempA}\pst@cntm
+ \pst@mod{\pst@cntm}{\de@nominator}\pst@cntp % cntb=##1 modulo trigLabelBase
+ \ifnum\@ne>\pst@cntp % 1 > modulo -> then we have pi/x
+ \pst@cnto=\pst@cntm \divide\pst@cnto by \de@nominator
+ \ifPst@ymathLabel$\psk@ylabelFontSize\ifnum\pst@tempA<0 -\fi\the\pst@cnto\psk@ylabelFactor$%
+ \else \psk@ylabelFontSize\ifnum\pst@tempA<0 -\fi\the\pst@cnto\psk@ylabelFactor
+ \fi
+ \else
+ \ifPst@ymathLabel
+ $\psk@ylabelFontSize
+ \ifnum\pst@cntp=\@ne % < 1? $
+ \if\pst@cntm=\@ne
+ \frac{1}{\de@nominator}\psk@ylabelFactor% % 1/x
+ \else\ifnum\pst@tempA=-1 \frac{-1}{\de@nominator}\psk@ylabelFactor%
+ \else \ifnum\pst@tempA=1 \frac{1}{\de@nominator}\psk@ylabelFactor%
+ \else\frac{\pst@tempA}{\de@nominator}\psk@ylabelFactor% x/y
+ \fi\fi\fi
+ \else
+ \ifnum\pst@tempA=1 \frac{1}{\de@nominator}\psk@ylabelFactor%
+ \else\ifnum\pst@tempA=\de@nominator 1\psk@xlabelFactor \else\frac{\pst@tempA}{\de@nominator}\psk@ylabelFactor%
+ \fi\fi\fi$
+ \else
+ \psk@ylabelFontSize
+ \ifnum\pst@cntp=\@ne% % < 1?
+ \if\pst@cntm=\@ne
+ $\frac{1}{\de@nominator}\psk@ylabelFactor$% % 1/x
+ \else\ifnum\pst@tempA=-1 $\frac{-1}{\de@nominator}\psk@ylabelFactor$%
+ \else \ifnum\pst@tempA=1 $\frac{1}{\de@nominator}\psk@ylabelFactor$%
+ \else$\frac{\pst@tempA}{\de@nominator}\psk@ylabelFactor$% x/y
+ \fi\fi\fi%
+ \else%
+ \ifnum\pst@tempA=1 $\frac{1}{\de@nominator}\psk@ylabelFactor$%
+ \else\ifnum\pst@tempA=\de@nominator 1\psk@ylabelFactor
+ \else$\frac{\pst@tempA}{\de@nominator}\psk@ylabelFactor$% %$
+ \fi\fi\fi
+ \fi
+ \fi
+ }%
+}%$
+\def\setFractionhLabels{%
+ \def\pst@@@hlabel##1{\pshlabel{##1}}%
+ \def\pshlabel##1{%
+ \ifnum\psk@xfractionLabelBase<2 \def\de@nominator{\@ne}\else\def\de@nominator{\psk@xfractionLabelBase}\fi
+ \def\pst@tempA{##1}%
+ \pst@abs{\pst@tempA}\pst@cntm
+ \pst@mod{\pst@cntm}{\de@nominator}\pst@cntp% cntb=##1 modulo trigLabelBase
+ \ifnum\@ne>\pst@cntp % 1 > modulo -> then we have 1/x
+ \pst@cnto=\pst@cntm \divide\pst@cnto by \de@nominator
+ \ifPst@xmathLabel$\psk@xlabelFontSize\ifnum\pst@tempA<0 -\fi\the\pst@cnto\psk@xlabelFactor$%
+ \else \psk@xlabelFontSize\ifnum\pst@tempA<0 -\fi\the\pst@cnto\psk@xlabelFactor
+ \fi
+ \else
+ \ifPst@xmathLabel
+ $\psk@xlabelFontSize% $
+ \ifnum\pst@cntp=\@ne
+ \if\pst@cntm=\@ne \frac{1}{\de@nominator}\psk@xlabelFactor% % 1/x
+ \else\ifnum\pst@tempA=-1 \frac{-1}{\de@nominator}\psk@xlabelFactor%
+ \else\ifnum\pst@tempA=1 \frac{1}{\de@nominator}\psk@xlabelFactor%
+ \else\frac{\pst@tempA}{\de@nominator}\psk@xlabelFactor% x/y
+ \fi\fi\fi%
+ \else%
+ \ifnum\pst@tempA=1 \frac{1}{\de@nominator}\psk@xlabelFactor%
+ \else\ifnum\pst@tempA=\de@nominator 1\psk@xlabelFactor\else\frac{\pst@tempA}{\de@nominator}\psk@xlabelFactor%
+ \fi\fi\fi$
+ \else
+ \psk@xlabelFontSize
+ \ifnum\pst@cntp=\@ne
+ \if\pst@cntm=\@ne $\frac{1}{\de@nominator}\psk@xlabelFactor$% % 1/x
+ \else\ifnum\pst@tempA=-1 $\frac{-1}{\de@nominator}\psk@xlabelFactor$%
+ \else \ifnum\pst@tempA=1 $\frac{1}{\de@nominator}\psk@xlabelFactor$%
+ \else$\frac{\pst@tempA}{\de@nominator}\psk@xlabelFactor$% x/y
+ \fi\fi\fi
+ \else
+ \ifnum\pst@tempA=1 $\frac{1}{\de@nominator}\psk@xlabelFactor$%
+ \else\ifnum\pst@tempA=\de@nominator 1\psk@xlabelFactor%
+ \else$\frac{\pst@tempA}{\de@nominator}\psk@xlabelFactor$% %$
+ \fi\fi\fi
+ \fi
+ \fi
}%
- \fi}%
+}%$
+%
+\define@boolkey[psset]{pst-plot}[Pst@]{xtrigLabels}[true]{%
+ \ifPst@xtrigLabels \setTrighLabels \else \setDefaulthLabels\fi}
+%
+\define@boolkey[psset]{pst-plot}[Pst@]{ytrigLabels}[true]{%
+ \ifPst@ytrigLabels \setTrigvLabels \else \setDefaultvLabels \fi}
+%
\define@boolkey[psset]{pst-plot}[Pst@]{trigLabels}[true]{%
\ifPst@trigLabels\psset[pst-plot]{xtrigLabels,ytrigLabels=false}
\else \psset[pst-plot]{xtrigLabels=false,ytrigLabels=false}%
\fi}
\psset[pst-plot]{trigLabels=false}
%
+\define@boolkey[psset]{pst-plot}[Pst@]{xfractionLabels}[true]{%
+ \ifPst@xfractionLabels \setFractionhLabels \else \setDefaulthLabels \fi}
+\define@boolkey[psset]{pst-plot}[Pst@]{yfractionLabels}[true]{%
+ \ifPst@yfractionLabels \setFractionvLabels \else \setDefaultvLabels \fi}
+\define@boolkey[psset]{pst-plot}[Pst@]{fractionLabels}[true]{%
+ \ifPst@fractionLabels \setFractionhLabels\setFractionvLabels\Pst@xfractionLabelstrue\Pst@yfractionLabelstrue\fi}
+\psset[pst-plot]{fractionLabels=false}
+%
%logLines=all|x|y|none (0,1,2,3)
\def\psk@logLines{3}
\define@key[psset]{pst-plot}{logLines}[none]{\pst@expandafter\psset@@logLines#1\@nil\psk@logLines}
@@ -1486,7 +1659,7 @@ D\space##1%
\def\psyTick@ii#1(#2)#3{{%
\pst@killglue
\addbefore@par{arrows=-,linewidth=\psk@ytickwidth\pslinewidth}
- \ifPst@ytrigLabels\addto@par{ytrigLabels=false}\fi
+ \ifPst@ytrigLabels \setDefaultvLabels \fi
\use@par
\edef\temp@coor{(!\pst@number\pst@yticksizeB \pst@number\psxunit div #2)(!\pst@number\pst@yticksizeA \pst@number\psxunit div #2)}%
\expandafter\psline\temp@coor
@@ -1752,23 +1925,23 @@ D\space##1%
\def\psaxes@v(#1)(#2)(#3)[#4]{\@ifnextchar[{\psaxes@vi(#1)(#2)(#3)[#4]}{\psaxes@vi(#1)(#2)(#3)[#4][]}}%
\def\psaxes@vi(#1)(#2)(#3)[#4,#5][#6,#7]{%
\psaxes@vii(#1)(#2)(#3)%
- \begingroup%
+ \begingroup
\SpecialCoor
\use@par
\ifshowgrid\psgrid[style=gridstyleA]\fi
\uput{\psxlabelsep}[#5](#3|#1){#4}\uput{\psylabelsep}[#7](#1|#3){#6}%
- \endgroup%
+ \endgroup
\ignorespaces}
%
\def\psaxes@vii(#1,#2)(#3,#4)(#5,#6){%
- \pst@killglue%
- \begingroup%
+ \pst@killglue
+ \begingroup
\pssetxlength\pst@dimc{#5}% ur-x
\pssetylength\pst@dimd{#6}% ur-y
- \ifdim\pst@dimc<\z@\ifdim\pst@dimd<\z@\relax% axes show to left and down
- \addbefore@par{xlabelPos=top,ylabelPos=right}\fi\fi%
- \setbox\pst@hbox=\hbox\bgroup%
- \use@par% now the same with an optional unit=... in par
+ \ifdim\pst@dimc<\z@ \ifdim\pst@dimd<\z@ % axes show to left and down
+ \addbefore@par{xlabelPos=top,ylabelPos=right}\fi\fi
+ \setbox\pst@hbox=\hbox\bgroup
+ \use@keep@par% now the same with an optional unit=... in par
\ifshowgrid\psgrid[style=gridstyleA]\fi
\pssetxlength\pst@dimg{#1}% o-x
\pssetylength\pst@dimh{#2}% o-y
@@ -1781,24 +1954,28 @@ D\space##1%
% X axis labels (\psk@log = 0 or 1)
%
% Whole thing will be translated to origin:
- \advance\pst@dima by -\pst@dimg% Dist. from ll-x to o-x
- \advance\pst@dimb by -\pst@dimh% Dist. from ll-y to o-y
- \advance\pst@dimc by -\pst@dimg% Dist. from ur-x to o-x
- \advance\pst@dimd by -\pst@dimh% Dist. from ur-y to o-y
+ \pst@dima=\dimexpr\pst@dima-\pst@dimg\relax
+ \pst@dimb=\dimexpr\pst@dimb-\pst@dimh\relax
+ \pst@dimc=\dimexpr\pst@dimc-\pst@dimg\relax
+ \pst@dimd=\dimexpr\pst@dimd-\pst@dimh\relax
+% \advance\pst@dima by -\pst@dimg% Dist. from ll-x to o-x
+% \advance\pst@dimb by -\pst@dimh% Dist. from ll-y to o-y
+% \advance\pst@dimc by -\pst@dimg% Dist. from ur-x to o-x
+% \advance\pst@dimd by -\pst@dimh% Dist. from ur-y to o-y
% Make lines/arrows or frame:
\@nameuse{psxs@\psk@axesstyle}% \psxs@axes or \psxs@frame or \psxs@polar
- \ifPst@yAxis%
- \begingroup%
- \ifdim\pst@dima=\z@\else\showoriginfalse\fi%
- \ifnum\psk@dy=\z@%
- \pst@dimg=\psk@Dy\psyunit%
- \ifdim\pst@dimg<\p@\pst@cnta=\psk@Dy\edef\psk@Dy{-\the\pst@cnta}\fi% v.1.21
+ \ifPst@yAxis
+ \begingroup
+ \ifdim\pst@dima=\z@ \else\showoriginfalse\fi
+ \ifnum\psk@dy=\z@
+ \pst@dimg=\psk@Dy\psyunit
+ \ifdim\pst@dimg<\p@ \pst@cnta=\psk@Dy\edef\psk@Dy{\the\numexpr-1*\pst@cnta}\fi% v.1.21
\edef\psk@dy{\number\pst@dimg}%
- \fi%
+ \fi
% \ifPst@xAxis\else\showorigintrue\fi% 2009-10-21
- \pst@vlabels{\pst@dimd}{\psk@arrowB}{#3}{#5}%
- \ifPst@xAxis\ifdim\pst@dima<\z@\showoriginfalse\fi\fi% no 0 when x- axis is crossing
- \pst@vlabels{\pst@dimb}{\psk@arrowA}{#3}{#5}%
+ \pst@vlabels{\pst@dimd}{\psk@arrowB}{#4}{#6}%
+ \ifPst@xAxis\ifdim\pst@dima<\z@ \showoriginfalse\fi\fi% no 0 when x- axis is crossing
+ \pst@vlabels{\pst@dimb}{\psk@arrowA}{#4}{#6}%
\endgroup
\fi
\ifPst@xAxis
@@ -1806,46 +1983,46 @@ D\space##1%
\ifdim\pst@dimb=\z@\else\showoriginfalse\fi
\ifnum\psk@dx=\z@
\pst@dimg=\psk@Dx\psxunit
- \ifdim\pst@dimg<\p@\pst@cnta=\psk@Dx\edef\psk@Dx{-\the\pst@cnta}% v.1.21
+ \ifdim\pst@dimg<\p@\pst@cnta=\psk@Dx\edef\psk@Dx{\the\numexpr-1*\pst@cnta}% v.1.21
\fi% v.1.21
\edef\psk@dx{\number\pst@dimg}%
- \fi%
+ \fi
% \ifPst@yAxis\else\showorigintrue\fi% 2009-10-21
- \pst@hlabels{\pst@dimc}{\psk@arrowB}{#4}{#6}%
- \ifPst@yAxis\showoriginfalse\fi%
- \pst@hlabels{\pst@dima}{\psk@arrowA}{#4}{#6}%
- \endgroup%
- \fi%
+ \pst@hlabels{\pst@dimc}{\psk@arrowB}{#3}{#5}%
+ \ifPst@yAxis\showoriginfalse\fi
+ \pst@hlabels{\pst@dima}{\psk@arrowA}{#3}{#5}%
+ \endgroup
+ \fi
% Now close "\pst@hbox" (which is 0-dimensional), and put it at the origin.
- \egroup%
- \pssetxlength\pst@dimg{#1}%
- \pssetylength\pst@dimh{#2}%
- \leavevmode\psput@cartesian\pst@hbox%
- \endgroup%
- \ignorespaces%
+ \egroup
+ \pssetxlength\pst@dimg{#1}
+ \pssetylength\pst@dimh{#2}
+ \leavevmode\psput@cartesian\pst@hbox
+ \endgroup
+ \ignorespaces
}
%
\newif\ifis@yAxis%
%
\def\psxs@@axes#1#2#3#4#5#6{% llx,lly,urx,ury,exch,x|y,arrowA,arrowB
- \pst@killglue%
- \begin@SpecialObj%
+ \pst@killglue
+ \begin@SpecialObj
\ifx#6x\relax% % x-axis?
- \is@yAxisfalse%
- \ifnum\psk@dx=\z@%
- \pst@dimg=\psk@Dx\psxunit%
+ \is@yAxisfalse
+ \ifnum\psk@dx=\z@
+ \pst@dimg=\psk@Dx\psxunit
\def\psk@dx{\number\pst@dimg}%
- \fi%
- \else%
- \is@yAxistrue%
- \ifnum\psk@dy=\z@%
- \pst@dimg=\psk@Dy\psyunit%
+ \fi
+ \else
+ \is@yAxistrue
+ \ifnum\psk@dy=\z@
+ \pst@dimg=\psk@Dy\psyunit
\def\psk@dy{\number\pst@dimg}%
- \fi%
- \fi%
- \let\pst@linetype\pst@arrowtype%
+ \fi
+ \fi
+ \let\pst@linetype\pst@arrowtype
\def\pst@axes{axes}%
- \pst@addarrowdef%
+ \pst@addarrowdef
\addto@pscode{
/showOrigin \ifPst@showOriginTick true \else false \fi def % ticks for 0/0 ?
\ifis@yAxis 0 \pst@number#4 \else \pst@number#3 0 \fi
@@ -2062,10 +2239,10 @@ D\space##1%
\end@SpecialObj%
% now draw the axes again with the correct linecolor
\ifx\psk@axesstyle\@none\else
- \ifPst@yAxis\psline[linecolor=\pslinecolor](0,#2)(0,#4)\fi%
- \ifPst@xAxis\psline[linecolor=\pslinecolor](#1,0)(#3,0)\fi%
- \fi%
- \ignorespaces%
+ \ifPst@yAxis\psline[linecolor=\pslinecolor](0,#2)(0,#4)\fi
+ \ifPst@xAxis\psline[linecolor=\pslinecolor](#1,0)(#3,0)\fi
+ \fi
+ \ignorespaces
}%
%
\def\psxs@frame{%
@@ -2177,8 +2354,10 @@ D\space##1%
\fi%
\fi%
\else
- \pst@cnta=#1\relax% % Distance (in sp) to end.
- \pstFPdiv\pst@tempA{\the\pst@cnta}{\psk@dx}%
+% \pst@cnta=#1\relax% % Distance (in sp) to end.
+ \edef\pst@tempA{\strip@pt#1}
+ \pstFPmul\pst@tempA{\pst@tempA}{65536}
+ \pstFPdiv\pst@tempA{\pst@tempA}{\psk@dx}%
\pstFPadd\pst@tempA{1.55}{\pst@tempA}% % to prevent rounding errors
\edef\pst@tempB{\pst@int{\pst@tempA}}%
% \divide\pst@cnta\psk@dx\relax% % Number of ticks/labels
@@ -2214,23 +2393,24 @@ D\space##1%
% \psk@labels 0:all; 1:x; 2:y; 3:none
\def\pst@vlabels#1#2#3#4{%
\ifx\empty\psk@yLabels
- \ifdim#1=\z@\else%
- \ifx#2\empty\else\advance#1\ifdim#1>\z@-\fi7\pslinewidth\fi%
+ \ifdim#1=\z@\else
+ \ifx#2\empty\else\advance#1\ifdim#1>\z@-\fi7\pslinewidth\fi
\pst@cnta=#1\relax% % % Distance (in sp) to end.
\divide\pst@cnta\psk@dy\relax% % Number of ticks/labels
- \ifnum\pst@cnta=\z@\else%
- \pst@dima=\psk@dy sp% % Space between ticks.
- \ifodd\number\psk@labels\else\ifPst@yAxis\pst@@vlabels\fi\fi%
- \showoriginfalse%
- \fi%
- \fi%
- \else%
- \pst@cnta=#1\relax% % % Distance (in sp) to end.
- \pstFPdiv\pst@tempA{\the\pst@cnta}{\psk@dy}
- \pstFPadd\pst@tempA{1.55}{\pst@tempA} % to prevent rounding errors
- \edef\pst@tempB{\pst@int{\pst@tempA}}
-% \divide\pst@cnta\psk@dy\relax% % Number of ticks/labels
- \edef\pst@tempA{\psk@Dy}
+ \ifnum\pst@cnta=\z@\else
+ \pst@dima=\psk@dy sp % Space between ticks.
+ \ifodd\number\psk@labels\else\ifPst@yAxis\pst@@vlabels\fi\fi
+ \showoriginfalse
+ \fi
+ \fi
+ \else
+ \edef\pst@tempA{\strip@pt#1}
+ \pstFPmul\pst@tempA{\pst@tempA}{65536}
+ \pstFPdiv\pst@tempA{\pst@tempA}{\psk@dy}%
+ \pstFPadd\pst@tempA{1.55}{\pst@tempA}% % to prevent rounding errors
+ \edef\pst@tempB{\pst@int{\pst@tempA}}%
+% \divide\pst@cnta\psk@dy\relax% % Number of ticks/labels
+ \edef\pst@tempA{\psk@Dy}%
\multido{\nA=#3+1,\rA=#3+\pst@tempA}{\pst@tempB}{\uput{\psylabelsep}[180]{\pst@yLabelsRot}(0,\rA){%
\strut\expandafter\psvlabel\expandafter{\psPutYLabel{\nA}}}}%
\fi%
@@ -2468,7 +2648,6 @@ D\space##1%
\ifx\relax\pslegend@text\relax \else\pslegend@iii[\pslegend@ref](!\pslegend@coor)\fi
\expandafter\psset\expandafter{\psgraph@para}%
\ifnum\psk@axespos>0
- \typeout{\psgraph@para}%
\expandafter\psaxes\psgraph@coor
\fi
\endpspicture