summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pst-geo
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-12-13 22:22:52 +0000
committerKarl Berry <karl@freefriends.org>2016-12-13 22:22:52 +0000
commit756d56684e3b021e5a8aee5791c53ecbaa07705e (patch)
tree4d9c8e648f963155115eacddaa50d64c539efef7 /Master/texmf-dist/tex/generic/pst-geo
parent2e859a485b65e4ae3bc61c2c8e26d5dbe050dbd2 (diff)
pst-geo (13dec16)
git-svn-id: svn://tug.org/texlive/trunk@42696 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pst-geo')
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/Staedte3dJG.tex122
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/africa-bdy_II.dat (renamed from Master/texmf-dist/tex/generic/pst-geo/dataII/africa-bdy.dat)bin430869 -> 430869 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/africa-cil_II.dat (renamed from Master/texmf-dist/tex/generic/pst-geo/dataII/africa-cil.dat)bin1208423 -> 1208423 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/africa-riv_II.dat (renamed from Master/texmf-dist/tex/generic/pst-geo/dataII/africa-riv.dat)bin2190429 -> 2190429 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/asia-bdy_II.dat (renamed from Master/texmf-dist/tex/generic/pst-geo/dataII/asia-bdy.dat)bin385718 -> 385718 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/asia-cil_II.dat (renamed from Master/texmf-dist/tex/generic/pst-geo/dataII/asia-cil.dat)bin3821210 -> 3821210 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/asia-isl_II.dat (renamed from Master/texmf-dist/tex/generic/pst-geo/dataII/asia-isl.dat)bin61375 -> 61375 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/asia-riv_II.dat (renamed from Master/texmf-dist/tex/generic/pst-geo/dataII/asia-riv.dat)bin3505155 -> 3505155 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/c-sub.datbin7049 -> 17035 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/capitales.tex51
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/capitales3d.tex51
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/capitals.datbin2901 -> 4843 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/capitals.tex99
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/capitals3d.tex104
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/cities.tex58
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/citysub.datbin6552 -> 12588 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/corse.dat139
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/europe-bdy_II.dat (renamed from Master/texmf-dist/tex/generic/pst-geo/dataII/europe-bdy.dat)bin165937 -> 165937 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/europe-cil_II.dat (renamed from Master/texmf-dist/tex/generic/pst-geo/dataII/europe-cil.dat)bin1360271 -> 1360271 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/europe-riv_II.dat (renamed from Master/texmf-dist/tex/generic/pst-geo/dataII/europe-riv.dat)bin741031 -> 741031 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/france.datbin4174 -> 27434 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/germany.dat889
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/mexico.dat (renamed from Master/texmf-dist/tex/generic/pst-geo/data/mex.dat)bin14638 -> 14638 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/northamerica-bdy_II.datbin0 -> 33687 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/northamerica-cil_II.datbin0 -> 3605367 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/northamerica-pby_II.datbin0 -> 226172 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/northamerica-riv_II.datbin0 -> 1391357 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/rhone.datbin2809 -> 24948 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/seine.datbin4283 -> 39676 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/southamerica-arc_II.datbin0 -> 11850 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/southamerica-bdy_II.datbin0 -> 236981 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/southamerica-cil_II.datbin0 -> 1609207 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/southamerica-riv_II.datbin0 -> 1696772 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/README86
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/c-cap.datbin3063 -> 0 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/c-sub.datbin7049 -> 0 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/citycapitals.datbin2903 -> 0 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/citysub.datbin6552 -> 0 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/namer-bdy.datbin33667 -> 0 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/namer-cil.datbin3605338 -> 0 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/namer-pby.datbin226150 -> 0 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/namer-riv.datbin1391336 -> 0 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/samer-arc.datbin11826 -> 0 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/samer-bdy.datbin236953 -> 0 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/samer-cil.datbin1609186 -> 0 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/samer-riv.datbin1696756 -> 0 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/pst-geo.tex1504
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/pst-map2d.tex410
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/pst-map2dII.tex489
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/pst-map3d.tex761
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/pst-map3dII.tex279
51 files changed, 2883 insertions, 2159 deletions
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/Staedte3dJG.tex b/Master/texmf-dist/tex/generic/pst-geo/data/Staedte3dJG.tex
new file mode 100644
index 00000000000..f25d4431f31
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/Staedte3dJG.tex
@@ -0,0 +1,122 @@
+% (c) Herbert Voss <voss _at_ perce.de
+\mapputIIID[30](6.1,50.7666666667){Aachen}[Germany]
+\mapputIIID(10.8833333333,48.3666666667){Augsburg}[Germany]
+\mapputIIID[165](7.6,47.55){Basel}[Schweiz]
+\mapputIIID(13.3666666667,52.55){Berlin}[Germany]
+\mapputIIID[0](7.46666666667,46.95){Bern}[Schweiz]
+\mapputIIID[-30](7.21666666667,51.4833333333){Bochum}[Germany]
+\mapputIIID[180](7.1,50.7333333333){Bonn}[Germany]
+\mapputIIID[-90](10.5333333333,52.2666666667){Braunschweig}[Germany]
+\mapputIIID(9.76666666667,47.5){Bregenz}[Austria]
+\mapputIIID[-90](8.8,53.0833333333){Bremen}[Germany]
+\mapputIIID[40](8.58333333333,53.55){Bremerhaven}[Germany]
+\mapputIIID(4.33333333333,50.8333333333)[Brussel]{Br\"{u}ssel}[Belgien]
+\mapputIIID[0](12.9166666667,50.8333333333){Chemnitz}[Germany]
+\mapputIIID[0](8.65,49.8666666667){Darmstadt}[Germany]
+\mapputIIID(4.31666666667,52.0666666667)[Den_Haag]{Den Haag}[Niederlande]
+\mapputIIID[0](9.73333333333,47.4166666667){Dornbirn}[Austria]
+\mapputIIID[0](7.45,51.5333333333){Dortmund}[Germany]
+\mapputIIID[40](13.75,51.05){Dresden}[Germany]
+\mapputIIID[180](6.75,51.4333333333){Duisburg}[Germany]
+\mapputIIID[180](6.78333333333,51.2166666667)[Dusseldorf]{D\"{u}sseldorf}[Germany]
+\mapputIIID(11.0333333333,50.9666666667){Erfurt}[Germany]
+\mapputIIID[-60](7.01666666667,51.45){Essen}[Germany]
+\mapputIIID(8.68333333333,50.1166666667){Frankfurt}[Germany]
+\mapputIIID(11.7333333333,48.4){Freising}[Germany]
+\mapputIIID(12.0833333333,50.8666666667){Gera}[Germany]
+\mapputIIID(9.93333333333,51.5333333333)[Gottingen]{G\"{o}ttingen}[Germany]
+\mapputIIID(6.56666666667,53.2166666667){Groningen}[Niederlande]
+\mapputIIID(11.9666666667,51.4666666667){Halle}[Germany]
+\mapputIIID(7.8,51.6833333333){Hamm}[Germany]
+\mapputIIID[-10](8.7,49.4166666667){Heidelberg}[Germany]
+\mapputIIID[200](9.71666666667,52.3666666667){Hannover}[Germany]
+\mapputIIID[0](9.21666666667,49.1333333333){Heilbronn}[Germany]
+\mapputIIID(11.4,47.2666666667){Innsbruck}[Austria]
+\mapputIIID(11.5833333333,50.9333333333){Jena}[Germany]
+\mapputIIID(8.4,49.0166666667){Karlsruhe}[Germany]
+\mapputIIID[-90](10.1333333333,54.3333333333){Kiel}[Germany]
+\mapputIIID[0](6.95,50.9333333333)[Koln]{K\"{o}ln}[Germany]
+\mapputIIID(12.4166666667,51.3333333333){Leipzig}[Germany]
+\mapputIIID(14.3,48.3166666667){Linz}[Austria]
+\mapputIIID[0](10.7,53.8666666667)[Lubeck]{L\"{u}beck}[Germany]
+\mapputIIID[180](8.45,49.4833333333){Ludwigshafen}[Germany]
+\mapputIIID(7.91666666667,47.0333333333){Luzern}[Schweiz]
+\mapputIIID[0](11.6166666667,52.1333333333){Magdeburg}[Germany]
+\mapputIIID[30](8.46666666667,49.4833333333){Mannheim}[Germany]
+\mapputIIID(3.88333333333,43.6){Montpellier}[France]
+\mapputIIID[-90](11.5833333333,48.15)[Munchen]{M\"{u}nchen}[Germany]
+\mapputIIID(7.63333333333,51.9666666667)[Munster]{M\"{u}nster}[Germany]
+\mapputIIID[0](10.2028,50.323)[NES]{Bad Neustadt a.d. Saale}[Germany]
+\mapputIIID(5.86666666667,51.8333333333){Nijmegen}[Niederlande]
+\mapputIIID[-10](11.0833333333,49.45)[Nurnberg]{N\"{u}rnberg}[Germany]
+\mapputIIID[-30](8.76666666667,50.1){Offenbach}[Germany]
+\mapputIIID(2.91666666667,51.2166666667){Oostende}[Belgien]
+\mapputIIID(8.05,52.2666666667)[Osnabruck]{Osnabr\"{u}ck}[Germany]
+\mapputIIID(8.76666666667,51.7166666667){Paderborn}[Germany]
+\mapputIIID(2.33333333333,48.8666666667){Paris}[France]
+\mapputIIID[20](8.7,48.8833333333){Pforzheim}[Germany]
+\mapputIIID(16.8833333333,52.4166666667){Posen}[Polen]
+\mapputIIID[-90](13.0666666667,52.4){Potsdam}[Germany]
+\mapputIIID(12.1,49.0166666667){Regensburg}[Germany]
+\mapputIIID[0](12.1333333333,54.0833333333){Rostock}[Germany]
+\mapputIIID(7.0,49.2333333333)[Saarbrucken]{Saarbr\"{u}cken}[Germany]
+\mapputIIID[-30](10.3333333333,52.0833333333){Salzgitter}[Germany]
+\mapputIIID(15.6166666667,48.2166666667)[Sankt_Poelten]{Sankt Poelten}[Austria]
+\mapputIIID(8.66666666667,47.6666666667){Schaffhausen}[Schweiz]
+\mapputIIID(11.3833333333,53.6333333333){Schwerin}[Germany]
+\mapputIIID(8.03333333333,50.8666666667){Siegen}[Germany]
+\mapputIIID[0](9.18333333333,48.7666666667){Stuttgart}[Germany]
+\mapputIIID(10.0,48.4166666667){Ulm}[Germany]
+\mapputIIID[200](9.53333333333,47.1333333333){Vaduz}[Lichtenstein]
+\mapputIIID(16.3666666667,48.2){Wien}[Austria]
+\mapputIIID[160](8.25,50.0833333333){Wiesbaden}[Germany]
+\mapputIIID(8.75,47.5){Winterthur}[Schweiz]
+\mapputIIID(10.8,52.4333333333){Wolfsburg}[Germany]
+\mapputIIID[0](7.18333333333,51.2666666667){Wuppertal}[Germany]
+\mapputIIID(9.93333333333,49.8)[Wurzburg]{W\"{u}rzburg}[Germany]
+\mapputIIID(8.51666666667,47.3666666667)[Zurich]{Z\"{u}rich}[Schweiz]
+\mapputIIID[-80](12.5,50.7333333333){Zwickau}[Germany]
+% France
+\mapputIIID[90](1.44278,43.6053){Toulouse}[France]
+\mapputIIID[90](0.619444,44.2042){Agen}[France]
+\mapputIIID[90](4.80889,43.9494){Avignon}[France]
+\mapputIIID[90](2.44056,44.9261){Aurillac}[France]
+\mapputIIID[90](5.366667,43.300000){Marseille}[France]
+\mapputIIID[0](4.850000,45.733333){Lyon}[France]
+\mapputIIID[-90](3.0875,45.7806){Clermont-Ferrand}[France]
+\mapputIIID[90](4.39028,45.74347){St Etienne}[France]
+\mapputIIID[90](-0.566667,44.833333){Bordeaux}[France]
+\mapputIIID[90](0.160278,47.65){Angouleme}[France]
+\mapputIIID[90](-1.15,46.1603){La Rochelle}[France]
+\mapputIIID[90](-4.483333,48.383333){Brest}[France]
+\mapputIIID[90](-1.67944,48.1147){Rennes}[France]
+\mapputIIID[-90](-0.36944,49.1831){Caen}[France]
+\mapputIIID[90](5.050000,47.316667){Dijon}[France]
+\mapputIIID[30](2.3775,51.0383){Dunkerque}[France]
+\mapputIIID[90](1.905,47.9031){Orleans}[France]
+\mapputIIID[180](0.100000,49.483333){Le Havre}[France]
+\mapputIIID[90](1.15333,49.0242){Evreux}[France]
+\mapputIIID[90](0.183333,48.000000)[Le_Mans]{Le Mans}[France]
+\mapputIIID[90](0.689167,47.3936){Tours}[France]
+\mapputIIID[90](0.546111,46.8178){Chatellerault}[France]
+\mapputIIID[90](1.266667,45.933333){Limoges}[France]
+\mapputIIID[90](6.183333,49.116667){Metz}[France]
+\mapputIIID[90](-1.583333,47.200000){Nantes}[France]
+\mapputIIID[90](4.016667,49.266667){Reims}[France]
+%\mapputIIID[30](7.74861,48.65){Strasbourg}[France]
+\mapputIIID[30](3.56778,47.7983){Auxerre}[France]
+\mapputIIID[90](3.05,50.6333){Lille}[France]
+\mapputIIID[90](1.06667,49.45){Rouen}[France]
+\mapputIIID[90](5.7,45.2){Grenoble}[France]
+\mapputIIID[90](1.53333,45.16667){Brive}[France]
+\mapputIIID[90](1.45,44.45){Cahors}[France]
+\mapputIIID[90](0.36667,43.333){Pau}[France]
+\mapputIIID[90](2.8833,42.7){Perpignan}[France]
+\mapputIIID[90](-1.55,43.4833){Biarritz}[France]
+\mapputIIID[90](2.333,43.2167){Carcassonne}[France]
+\mapputIIID[90](3.87722,43.6119){Montpellier}[France]
+\mapputIIID[90](0.3333,46.5833){Poitiers}[France]
+\mapputIIID[0](2.21667,43.6167){Castres}[France]
+\mapputIIID[90](1.60778,42.9664){Foix}[France]
+\mapputIIID[90](9.45028,42.7008){Bastia}[France]
+\mapputIIID[90](8.73694,41.9267){Ajaccio}[France]
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/africa-bdy.dat b/Master/texmf-dist/tex/generic/pst-geo/data/africa-bdy_II.dat
index b9431a079eb..b9431a079eb 100644
--- a/Master/texmf-dist/tex/generic/pst-geo/dataII/africa-bdy.dat
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/africa-bdy_II.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/africa-cil.dat b/Master/texmf-dist/tex/generic/pst-geo/data/africa-cil_II.dat
index d7736053baf..d7736053baf 100644
--- a/Master/texmf-dist/tex/generic/pst-geo/dataII/africa-cil.dat
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/africa-cil_II.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/africa-riv.dat b/Master/texmf-dist/tex/generic/pst-geo/data/africa-riv_II.dat
index fd1f33180fc..fd1f33180fc 100644
--- a/Master/texmf-dist/tex/generic/pst-geo/dataII/africa-riv.dat
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/africa-riv_II.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/asia-bdy.dat b/Master/texmf-dist/tex/generic/pst-geo/data/asia-bdy_II.dat
index 7001f12c475..7001f12c475 100644
--- a/Master/texmf-dist/tex/generic/pst-geo/dataII/asia-bdy.dat
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/asia-bdy_II.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/asia-cil.dat b/Master/texmf-dist/tex/generic/pst-geo/data/asia-cil_II.dat
index 94a995292f1..94a995292f1 100644
--- a/Master/texmf-dist/tex/generic/pst-geo/dataII/asia-cil.dat
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/asia-cil_II.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/asia-isl.dat b/Master/texmf-dist/tex/generic/pst-geo/data/asia-isl_II.dat
index 7ecf8eac79b..7ecf8eac79b 100644
--- a/Master/texmf-dist/tex/generic/pst-geo/dataII/asia-isl.dat
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/asia-isl_II.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/asia-riv.dat b/Master/texmf-dist/tex/generic/pst-geo/data/asia-riv_II.dat
index 4e5d0838259..4e5d0838259 100644
--- a/Master/texmf-dist/tex/generic/pst-geo/dataII/asia-riv.dat
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/asia-riv_II.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/c-sub.dat b/Master/texmf-dist/tex/generic/pst-geo/data/c-sub.dat
index 10f9bf0280e..5a7d057309f 100644
--- a/Master/texmf-dist/tex/generic/pst-geo/data/c-sub.dat
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/c-sub.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/capitales.tex b/Master/texmf-dist/tex/generic/pst-geo/data/capitales.tex
deleted file mode 100644
index 28be04099e0..00000000000
--- a/Master/texmf-dist/tex/generic/pst-geo/data/capitales.tex
+++ /dev/null
@@ -1,51 +0,0 @@
-\mapput[90](2.316667,48.85000){Paris}
-\mapput[90](-0.133333,51.016667){London}
-\mapput[90](-3.683333,40.433333){Madrid}
-\mapput[90](-9.133333,38.716667){Lisbon}
-\mapput[90](1.516667,42.516667){Andorra}
-\mapput[90](12.483333,41.883333){Rome}
-\mapput[40](4.366667,50.850000){Brussels}
-\mapput[90](13.416667,52.533333){Berlin}
-\mapput[90](7.433333,46.966667){Bern}
-\mapput[0](12.583333,55.683333){Copenhagen}
-\mapput[90](16.366667,48.216667){Vienna}
-\mapput[90](-6.250000,53.333333){Dublin}
-\mapput[90](-5.933333,54.583333){Belfast}
-\mapput[90](10.733333,59.916667){Oslo}
-\mapput[90](18.066667,59.333333){Stockholm}
-\mapput[90](14.516667,35.900000){Valletta}
-\mapput[90](10.183333,36.783333){Tunis}
-\mapput[90](19.833333,41.333333){Tirane}
-\mapput[90](13.183333,32.883333){Tripoli}
-\mapput[90](14.433333,50.083333){Prague}
-\mapput[90](21.016667,52.233333){Warsaw}
-\mapput[90](4.883333,52.366667){Amsterdam}
-\mapput[-60](6.116667,49.616667){Luxembourg}
-\mapput[0](19.050000,47.516667){Budapest}
-\mapput[90](26.08333,44.4333333){Bucharest}
-\mapput[90](24.933333,60.166667){Helsinsky}
-\mapput[90](23.733333,37.966667){Athens}
-\mapput[90](-22.933333,64.133333){Reykjavik}
-\mapput[90](-6.833333,34.016667){Rabat}
-\mapput[90](3.050000,36.750000){Algiers}
-\mapput[90](15.966667,45.783333){Zagreb}
-\mapput[90](23.316667,42.683333){Sofia}
-\mapput[90](7.433333,43.733333){Monaco}
-\mapput[90](12.433333,43.933333){SanMarino}
-\mapput[90](20.466667,44.816667){Belgrade}
-\mapput[90](18.43333,43.866667){Sarajevo}
-\mapput[90](21.46666,42.01667){Skoje}
-\mapput[90](32.866667,39.933333){Ankara}
-\mapput[90](30.533333,50.433333){Kiev}
-\mapput[90](33.350000,35.166667){Nicosia}
-\mapput[90](31.250000,30.066667){Cairo}
-\mapput[90](37.616667,55.766667){Moscow}
-\mapput[-90](27.550000,53.900000){Minsk}
-\mapput[90](24.100000,56.933333){Riga}
-\mapput[90](24.3333,54.63333){Vilnius}
-\mapput[90](24.8,59.0333){Tallin}
-\mapput[90](28.8333,47){Chisinau}
-\mapput[90](35.500000,33.900000){Beirut}
-\mapput[0](35.216667,31.783333){Jerusalem}
-\mapput[180](34.8,32.0666){Tel-Aviv}
-\mapput[90](38.26667,33.5){Damas}
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/capitales3d.tex b/Master/texmf-dist/tex/generic/pst-geo/data/capitales3d.tex
deleted file mode 100644
index d2a7376a58a..00000000000
--- a/Master/texmf-dist/tex/generic/pst-geo/data/capitales3d.tex
+++ /dev/null
@@ -1,51 +0,0 @@
-\mapputIIID[90](2.316667,48.85000){Paris}
-\mapputIIID[90](-0.133333,51.016667){London}
-\mapputIIID[90](-3.683333,40.433333){Madrid}
-\mapputIIID[90](-9.133333,38.716667){Lisbon}
-\mapputIIID[90](1.516667,42.516667){Andorra}
-\mapputIIID[90](12.483333,41.883333){Rome}
-\mapputIIID[40](4.366667,50.850000){Brussels}
-\mapputIIID[90](13.416667,52.533333){Berlin}
-\mapputIIID[90](7.433333,46.966667){Bern}
-\mapputIIID[0](12.583333,55.683333){Copenhagen}
-\mapputIIID[90](16.366667,48.216667){Vienna}
-\mapputIIID[90](-6.250000,53.333333){Dublin}
-\mapputIIID[90](-5.933333,54.583333){Belfast}
-\mapputIIID[90](10.733333,59.916667){Oslo}
-\mapputIIID[90](18.066667,59.333333){Stockholm}
-\mapputIIID[90](14.516667,35.900000){Valletta}
-\mapputIIID[90](10.183333,36.783333){Tunis}
-\mapputIIID[90](19.833333,41.333333){Tirane}
-\mapputIIID[90](13.183333,32.883333){Tripoli}
-\mapputIIID[90](14.433333,50.083333){Prague}
-\mapputIIID[90](21.016667,52.233333){Warsaw}
-\mapputIIID[90](4.883333,52.366667){Amsterdam}
-\mapputIIID[-60](6.116667,49.616667){Luxembourg}
-\mapputIIID[0](19.050000,47.516667){Budapest}
-\mapputIIID[90](26.08333,44.4333333){Bucharest}
-\mapputIIID[90](24.933333,60.166667){Helsinsky}
-\mapputIIID[90](23.733333,37.966667){Athens}
-\mapputIIID[90](-22.933333,64.133333){Reykjavik}
-\mapputIIID[90](-6.833333,34.016667){Rabat}
-\mapputIIID[90](3.050000,36.750000){Algiers}
-\mapputIIID[90](15.966667,45.783333){Zagreb}
-\mapputIIID[90](23.316667,42.683333){Sofia}
-\mapputIIID[90](7.433333,43.733333){Monaco}
-\mapputIIID[90](12.433333,43.933333){SanMarino}
-\mapputIIID[90](20.466667,44.816667){Belgrade}
-\mapputIIID[90](18.43333,43.866667){Sarajevo}
-\mapputIIID[90](21.46666,42.01667){Skoje}
-\mapputIIID[90](32.866667,39.933333){Ankara}
-\mapputIIID[90](30.533333,50.433333){Kiev}
-\mapputIIID[90](33.350000,35.166667){Nicosia}
-\mapputIIID[90](31.250000,30.066667){Cairo}
-\mapputIIID[90](37.616667,55.766667){Moscow}
-\mapputIIID[-90](27.550000,53.900000){Minsk}
-\mapputIIID[90](24.100000,56.933333){Riga}
-\mapputIIID[90](24.3333,54.63333){Vilnius}
-\mapputIIID[90](24.8,59.0333){Tallin}
-\mapputIIID[90](28.8333,47){Chisinau}
-\mapputIIID[90](35.500000,33.900000){Beirut}
-\mapputIIID[0](35.216667,31.783333){Jerusalem}
-\mapputIIID[180](34.8,32.0666){Tel-Aviv}
-\mapputIIID[90](38.26667,33.5){Damas}
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/capitals.dat b/Master/texmf-dist/tex/generic/pst-geo/data/capitals.dat
index bf27a489ca9..36a751e8199 100644
--- a/Master/texmf-dist/tex/generic/pst-geo/data/capitals.dat
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/capitals.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/capitals.tex b/Master/texmf-dist/tex/generic/pst-geo/data/capitals.tex
new file mode 100644
index 00000000000..e62ce3d2182
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/capitals.tex
@@ -0,0 +1,99 @@
+\mapput[90](2.316667,48.85000){Paris}
+\mapput[90](-0.133333,51.016667){London}
+\mapput[90](-3.683333,40.433333){Madrid}
+\mapput[90](-9.133333,38.716667){Lisbon}
+\mapput[90](1.516667,42.516667){Andorra}
+\mapput[90](12.483333,41.883333){Rome}
+\mapput[40](4.366667,50.850000){Brussels}
+\mapput[90](13.416667,52.533333){Berlin}
+\mapput[90](7.433333,46.966667){Bern}
+\mapput[0](12.583333,55.683333){Copenhagen}
+\mapput[90](16.366667,48.216667){Vienna}
+\mapput[90](-6.250000,53.333333){Dublin}
+\mapput[90](-5.933333,54.583333){Belfast}
+\mapput[90](10.733333,59.916667){Oslo}
+\mapput[90](18.066667,59.333333){Stockholm}
+\mapput[90](14.516667,35.900000){Valletta}
+\mapput[90](10.183333,36.783333){Tunis}[Africa]
+\mapput[90](19.833333,41.333333){Tirane}
+\mapput[90](13.183333,32.883333){Tripoli}[Africa]
+\mapput[90](14.433333,50.083333){Prague}
+\mapput[90](21.016667,52.233333){Warsaw}
+\mapput[90](4.883333,52.366667){Amsterdam}
+\mapput[-60](6.116667,49.616667){Luxembourg}
+\mapput[0](19.050000,47.516667){Budapest}
+\mapput[90](26.08333,44.4333333){Bucharest}
+\mapput[90](24.933333,60.166667){Helsinsky}
+\mapput[90](23.733333,37.966667){Athens}
+\mapput[90](-22.933333,64.133333){Reykjavik}
+\mapput[90](-6.833333,34.016667){Rabat}[Africa]
+\mapput[90](3.050000,36.750000){Algiers}[Africa]
+\mapput[90](15.966667,45.783333){Zagreb}
+\mapput[90](23.316667,42.683333){Sofia}
+\mapput[90](7.433333,43.733333){Monaco}
+\mapput[90](12.433333,43.933333){SanMarino}
+\mapput[90](20.466667,44.816667){Belgrade}
+\mapput[90](18.43333,43.866667){Sarajevo}
+\mapput[90](21.46666,42.01667){Skoje}
+\mapput[90](32.866667,39.933333){Ankara}
+\mapput[90](30.533333,50.433333){Kiev}
+\mapput[90](33.350000,35.166667){Nicosia}
+\mapput[90](31.250000,30.066667){Cairo}[Africa]
+\mapput[90](37.616667,55.766667){Moscow}
+\mapput[-90](27.550000,53.900000){Minsk}
+\mapput[90](24.100000,56.933333){Riga}
+\mapput[90](24.3333,54.63333){Vilnius}
+\mapput[90](24.8,59.0333){Tallin}
+\mapput[90](28.8333,47){Chisinau}
+\mapput[90](35.500000,33.900000){Beirut}
+\mapput[0](35.216667,31.783333){Jerusalem}
+\mapput[180](34.8,32.0666){Tel-Aviv}
+\mapput[90](38.26667,33.5){Damas}
+%%%%%% 19 novembre 2016 %%%%%%%%%%%%%%%%%
+\mapput[90](-8.016667,12.65){Bamako}[Africa] % Mali
+\mapput[90](15.8,2.85){Kampala}[Africa] % UGANDA
+\mapput[90](32.516667,15.583333){Khartoum}[Africa] % SUDAN
+\mapput[90](-4.033333,5.316667){Abidjan}[Africa] % IVORY COAST
+\mapput[90](-.233333,5.533333){Accra}[Africa] % GHANA
+\mapput[90](38.75,9.033333){Addis Ababa}[Africa] % ETHIOPIA
+\mapput[90](47.5,-19){Antananarivo}[Africa] % MADAGASCAR
+\mapput[90](18,4){Bangui}[Africa] % CENTRAL AFRICAN REPUBLIC
+\mapput[0](-17,13){Banjul}[Africa] % GAMBIA
+\mapput[90](-88,17.5){Belize}[Africa] % BELIZE
+\mapput[180](-16,12){Bissau}[Africa] % GUINEA-BISSAU
+\mapput[90](15,-5){Brazzaville}[Africa] % CONGO
+\mapput[90](29.5,-3){Bujumbura}[Africa] % BURUNDI
+\mapput[180](-13.5,9.5){Conakry}[Africa] % GUINEA
+\mapput[90](-17.666667,14.833333){Dakar}[Africa] % SENEGAL
+\mapput[90](39.283333,-6.816667){Dar Es Salaam}[Africa] % TANZANIA
+\mapput[90](43,11.5){Djibouti}[Africa] % Djibouti
+\mapput[180](-13.183333,8.45){Freetown}[Africa] % SIERRA LEONE
+\mapput[90](25.5,-23){Gaborone}[Africa] % BOTSWANA
+\mapput[90](31.066667,-17.816667){Harare}[Africa] % ZIMBABWE
+\mapput[90](15.8,2.85){Kampala}[Africa] % UGANDA
+\mapput[90](30.2,-2){Kigali}[Africa] % RWANDA
+\mapput[0](15.3,-5.316667){Kinshasa}[Africa] % ZAIRE
+\mapput[90](3.433333,6.433333){Lagos}[Africa] % NIGERIA
+\mapput[90](5,9.5){Libreville}[Africa] % GABON
+\mapput[90](34,-14){Lilongwe}[Africa] % MALAWI
+\mapput[90](1.216667,6.116667){Lome}[Africa] % TOGO
+\mapput[90](13.233333,-8.816667){Luanda}[Africa] % ANGOLA
+\mapput[90](28.3,-15.416667){Lusaka}[Africa] % ZAMBIA
+\mapput[180](8.5,4){Malabo}[Africa] % E GUINEA
+\mapput[0](32,-26){Maputo}[Africa] % MOZAMBIQUE
+\mapput[90](45.366667,2.016667){Mogadiscio}[Africa] % SOMALIA
+\mapput[180](-11.5,6.7){Monrovia}[Africa] % LIBERIA
+\mapput[90](16,12){N'djamena}[Africa] % TCHAD
+\mapput[90](36.816667,-1.283333){Nairobi}[Africa] % KENYA
+\mapput[90](3,14){Niamey}[Africa] % NIGER
+\mapput[90](-16,18){Nouakchott}[Africa] % MAURITANIA
+\mapput[90](-1.518,12.366){Ouagadougou}[Africa] % BURKINA
+\mapput[-90](2.65,6.25){Porto Novo}[Africa] % BENIN
+\mapput[90](28.183333,-25.733333){Pretoria}[Africa] % S AFRICA
+\mapput[180](-23.7,15){Praia}[Africa] % CAPE VERDE
+\mapput[90](17.066667,-22.5){Windhoek}[Africa] % NAMIBIA
+\mapput[90](12,4){Yaounde}[Africa] % CAMEROON
+
+
+
+
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/capitals3d.tex b/Master/texmf-dist/tex/generic/pst-geo/data/capitals3d.tex
new file mode 100644
index 00000000000..360d2edc403
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/capitals3d.tex
@@ -0,0 +1,104 @@
+\mapputIIID[90](2.316667,48.85000){Paris}
+\mapputIIID[90](-0.133333,51.016667){London}
+\mapputIIID[90](-3.683333,40.433333){Madrid}
+\mapputIIID[90](-9.133333,38.716667){Lisbon}
+\mapputIIID[90](1.516667,42.516667){Andorra}
+\mapputIIID[90](12.483333,41.883333){Rome}
+\mapputIIID[40](4.366667,50.850000){Brussels}
+\mapputIIID[90](13.416667,52.533333){Berlin}
+\mapputIIID[90](7.433333,46.966667){Bern}
+\mapputIIID[0](12.583333,55.683333){Copenhagen}
+\mapputIIID[90](16.366667,48.216667){Vienna}
+\mapputIIID[90](-6.250000,53.333333){Dublin}
+\mapputIIID[90](-5.933333,54.583333){Belfast}
+\mapputIIID[90](10.733333,59.916667){Oslo}
+\mapputIIID[90](18.066667,59.333333){Stockholm}
+\mapputIIID[90](14.516667,35.900000){Valletta}
+\mapputIIID[90](10.183333,36.783333){Tunis}[Africa]
+\mapputIIID[90](19.833333,41.333333){Tirane}
+\mapputIIID[90](13.183333,32.883333){Tripoli}[Africa]
+\mapputIIID[90](14.433333,50.083333){Prague}
+\mapputIIID[90](21.016667,52.233333){Warsaw}
+\mapputIIID[90](4.883333,52.366667){Amsterdam}
+\mapputIIID[-60](6.116667,49.616667){Luxembourg}
+\mapputIIID[0](19.050000,47.516667){Budapest}
+\mapputIIID[90](26.08333,44.4333333){Bucharest}
+\mapputIIID[90](24.933333,60.166667){Helsinsky}
+\mapputIIID[90](23.733333,37.966667){Athens}
+\mapputIIID[90](-22.933333,64.133333){Reykjavik}
+\mapputIIID[90](-6.833333,34.016667){Rabat}[Africa]
+\mapputIIID[90](3.050000,36.750000){Algiers}[Africa]
+\mapputIIID[90](15.966667,45.783333){Zagreb}
+\mapputIIID[90](23.316667,42.683333){Sofia}
+\mapputIIID[90](7.433333,43.733333){Monaco}
+\mapputIIID[90](12.433333,43.933333){SanMarino}
+\mapputIIID[90](20.466667,44.816667){Belgrade}
+\mapputIIID[90](18.43333,43.866667){Sarajevo}
+\mapputIIID[90](21.46666,42.01667){Skoje}
+\mapputIIID[90](32.866667,39.933333){Ankara}
+\mapputIIID[90](30.533333,50.433333){Kiev}
+\mapputIIID[90](33.350000,35.166667){Nicosia}
+\mapputIIID[90](31.250000,30.066667){Cairo}[Africa]
+\mapputIIID[90](37.616667,55.766667){Moscow}
+\mapputIIID[-90](27.550000,53.900000){Minsk}
+\mapputIIID[90](24.100000,56.933333){Riga}
+\mapputIIID[90](24.3333,54.63333){Vilnius}
+\mapputIIID[90](24.8,59.0333){Tallin}
+\mapputIIID[90](28.8333,47){Chisinau}
+\mapputIIID[90](35.500000,33.900000){Beirut}
+\mapputIIID[0](35.216667,31.783333){Jerusalem}
+\mapputIIID[180](34.8,32.0666){Tel-Aviv}
+\mapputIIID[90](38.26667,33.5){Damas}
+%%%%%% 19 novembre 2016 %%%%%%%%%%%%%%%%%
+\mapputIIID[90](35.500000,33.900000){Beirut}
+\mapputIIID[0](35.216667,31.783333){Jerusalem}
+\mapputIIID[180](34.8,32.0666){Tel-Aviv}
+\mapputIIID[90](38.26667,33.5){Damas}
+\mapputIIID[90](31.250000,30.066667){Cairo}[Africa]
+\mapputIIID[90](-6.833333,34.016667){Rabat}[Africa]
+\mapputIIID[90](3.050000,36.750000){Algiers}[Africa]
+\mapputIIID[90](10.183333,36.783333){Tunis}[Africa]
+\mapputIIID[90](13.183333,32.883333){Tripoli}[Africa]
+\mapputIIID[90](-8.016667,12.65){Bamako}[Africa] % Mali
+\mapputIIID[90](15.8,2.85){Kampala}[Africa] % UGANDA
+\mapputIIID[90](32.516667,15.583333){Khartoum}[Africa] % SUDAN
+\mapputIIID[90](-4.033333,5.316667){Abidjan}[Africa] % IVORY COAST
+\mapputIIID[90](-.233333,5.533333){Accra}[Africa] % GHANA
+\mapputIIID[90](38.75,9.033333){Addis Ababa}[Africa] % ETHIOPIA
+\mapputIIID[90](47.5,-19){Antananarivo}[Africa] % MADAGASCAR
+\mapputIIID[90](18,4){Bangui}[Africa] % CENTRAL AFRICAN REPUBLIC
+\mapputIIID[0](-17,13){Banjul}[Africa] % GAMBIA
+\mapputIIID[90](-88,17.5){Belize}[Africa] % BELIZE
+\mapputIIID[180](-16,12){Bissau}[Africa] % GUINEA-BISSAU
+\mapputIIID[90](15,-5){Brazzaville}[Africa] % CONGO
+\mapputIIID[90](29.5,-3){Bujumbura}[Africa] % BURUNDI
+\mapputIIID[180](-13.5,9.5){Conakry}[Africa] % GUINEA
+\mapputIIID[90](-17.666667,14.833333){Dakar}[Africa] % SENEGAL
+\mapputIIID[90](39.283333,-6.816667){Dar Es Salaam}[Africa] % TANZANIA
+\mapputIIID[90](43,11.5){Djibouti}[Africa] % Djibouti
+\mapputIIID[180](-13.183333,8.45){Freetown}[Africa] % SIERRA LEONE
+\mapputIIID[90](25.5,-23){Gaborone}[Africa] % BOTSWANA
+\mapputIIID[90](31.066667,-17.816667){Harare}[Africa] % ZIMBABWE
+\mapputIIID[90](15.8,2.85){Kampala}[Africa] % UGANDA
+\mapputIIID[90](30.2,-2){Kigali}[Africa] % RWANDA
+\mapputIIID[0](15.3,-5.316667){Kinshasa}[Africa] % ZAIRE
+\mapputIIID[90](3.433333,6.433333){Lagos}[Africa] % NIGERIA
+\mapputIIID[90](5,9.5){Libreville}[Africa] % GABON
+\mapputIIID[90](34,-14){Lilongwe}[Africa] % MALAWI
+\mapputIIID[90](1.216667,6.116667){Lome}[Africa] % TOGO
+\mapputIIID[90](13.233333,-8.816667){Luanda}[Africa] % ANGOLA
+\mapputIIID[90](28.3,-15.416667){Lusaka}[Africa] % ZAMBIA
+\mapputIIID[180](8.5,4){Malabo}[Africa] % E GUINEA
+\mapputIIID[0](32,-26){Maputo}[Africa] % MOZAMBIQUE
+\mapputIIID[90](45.366667,2.016667){Mogadiscio}[Africa] % SOMALIA
+\mapputIIID[180](-11.5,6.7){Monrovia}[Africa] % LIBERIA
+\mapputIIID[90](16,12){N'djamena}[Africa] % TCHAD
+\mapputIIID[90](36.816667,-1.283333){Nairobi}[Africa] % KENYA
+\mapputIIID[90](3,14){Niamey}[Africa] % NIGER
+\mapputIIID[90](-16,18){Nouakchott}[Africa] % MAURITANIA
+\mapputIIID[90](-1.518,12.366){Ouagadougou}[Africa] % BURKINA
+\mapputIIID[-90](2.65,6.25){Porto Novo}[Africa] % BENIN
+\mapputIIID[90](28.183333,-25.733333){Pretoria}[Africa] % S AFRICA
+\mapputIIID[180](-23.7,15){Praia}[Africa] % CAPE VERDE
+\mapputIIID[90](17.066667,-22.5){Windhoek}[Africa] % NAMIBIA
+\mapputIIID[90](12,4){Yaounde}[Africa] % CAMEROON
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/cities.tex b/Master/texmf-dist/tex/generic/pst-geo/data/cities.tex
index 16ddfb35b06..96be54238c2 100644
--- a/Master/texmf-dist/tex/generic/pst-geo/data/cities.tex
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/cities.tex
@@ -95,7 +95,7 @@
\mapput(47.8333333333,30.5){Basra}[Irak]
\mapput(94.75,16.7666666667){Bassein}[Myanmar]
\mapput(-62.7166666667,17.2833333333){Basseterre}[St. Kitts-Nevis]
-\mapput(9.76666666667,1.85){Bata}[Äquatorial-Guinea]
+\mapput(9.76666666667,1.85){Bata}[Äquatorial-Guinea]
\mapput(-91.1833333333,30.45)[Baton_Rouge]{Baton Rouge}[USA]
\mapput(-94.1,30.0833333333){Beaumont}[USA]
\mapput(34.7833333333,31.25){Beersheba}[Israel]
@@ -146,7 +146,7 @@
% \mapput(11.3666666667,46.5166666667){Bozen}[Italy]
\mapput(-1.75,53.8){Bradford}[GreatBritain]
\mapput(-8.43333333333,41.5333333333){Braga}[Portugal]
-\mapput(27.9666666667,45.2833333333){Braila}[Rumänien]
+\mapput(27.9666666667,45.2833333333){Braila}[Rumänien]
\mapput(-47.9166666667,-15.7833333333){Brasilia}[Brasilien]
\mapput(17.1666666667,48.1666666667){Bratislava}[Slovakei]
\mapput(13.0333333333,48.2666666667){Braunau}[Austria]
@@ -164,15 +164,15 @@
\mapput(18.0,53.2666666667){Bromberg}[Polen]
\mapput(-97.5,25.9){Brownsville}[USA]
\mapput(15.2833333333,47.4166666667){Bruckmur}[Austria]
-\mapput(3.23333333333,51.2166666667)[Brugge]{Brügge}[Belgien]
-\mapput(4.33333333333,50.8333333333)[Brussel]{Brüssel}[Belgien]
+\mapput(3.23333333333,51.2166666667)[Brugge]{Brügge}[Belgien]
+\mapput(4.33333333333,50.8333333333)[Brussel]{Brüssel}[Belgien]
\mapput(-5.0,7.7){Buake}[IvoryCoast]
\mapput(-73.1666666667,7.13333333333){Bucaramanga}[Kolumbien]
\mapput(19.0833333333,47.5){Budapest}[Ungarn]
\mapput(-58.45,-34.6)[Buenos_Aires]{Buenos Aires}[Argentinien]
\mapput(-78.8666666667,42.8833333333){Buffalo}[USA]
\mapput(29.3166666667,-3.36666666667){Bujumbura}[Burundi]
-\mapput(26.1,44.4333333333){Bukarest}[Rumänien]
+\mapput(26.1,44.4333333333){Bukarest}[Rumänien]
\mapput(28.8333333333,-2.5){Bukavu}[Zaire]
\mapput(28.7166666667,-20.1666666667){Bulawayo}[Simbabwe]
\mapput(43.9833333333,26.3333333333){Buraidah}[Saudi-Arabien]
@@ -200,7 +200,7 @@
\mapput(-106.316666667,42.85){Casper}[USA]
\mapput(-60.9833333333,14.0166666667){Castries}[St. Lucia]
% \mapput(15.0666666667,37.5166666667){Catania}[Italy]
-\mapput(-52.3333333333,4.93333333333){Cayenne}[Französisch-Guayana]
+\mapput(-52.3333333333,4.93333333333){Cayenne}[Französisch-Guayana]
\mapput(123.933333333,10.2833333333){Cebu}[Philippinen]
\mapput(-91.6666666667,41.9666666667)[Cedar_Rapids]{Cedar Rapids}[USA]
\mapput(-88.25,40.1166666667){Champaign}[USA]
@@ -259,7 +259,7 @@
\mapput(-97.4,27.8)[Corpus_Christi]{Corpus Christi}[USA]
\mapput(2.51666666667,6.4){Cotonou}[Benin]
\mapput(14.3333333333,51.7666666667){Cottbus}[Germany]
-\mapput(23.7833333333,44.3){Craiova}[Rumänien]
+\mapput(23.7833333333,44.3){Craiova}[Rumänien]
\mapput(-72.5166666667,7.91666666667){Cucuta}[Kolumbien]
\mapput(-79.0,-2.9){Cuenca}[Ecuador]
\mapput(-49.25,-25.4166666667){Curitiba}[Brasilien]
@@ -311,7 +311,7 @@
\mapput(31.0,-29.8833333333){Durban}[SouthAfrica]
\mapput(-78.9166666667,36.0){Durham}[USA]
\mapput(19.4666666667,41.3){Durres}[Albanien]
-\mapput(6.78333333333,51.2166666667)[Dusseldorf]{Düsseldorf}[Germany]
+\mapput(6.78333333333,51.2166666667)[Dusseldorf]{Düsseldorf}[Germany]
\mapput(-3.2,55.95){Edinburgh}[GreatBritain]
\mapput(-113.466666667,53.55){Edmonton}[Kanada]
\mapput(100.583333333,46.3){Eerdenet}[Mongolei]
@@ -371,7 +371,7 @@
\mapput(-7.5,40.1333333333){Funchal}[Portugal]
\mapput(25.9166666667,-24.75){Gaborone}[Botswana]
\mapput(-82.3333333333,29.6666666667){Gainesville}[USA]
-\mapput(28.0333333333,45.45){Galatz}[Rumänien]
+\mapput(28.0333333333,45.45){Galatz}[Rumänien]
\mapput(80.2166666667,6.01666666667){Galle}[Sri Lanka]
\mapput(-94.8,29.3){Galveston}[USA]
\mapput(-9.05,53.2666666667){Galway}[Irland]
@@ -393,7 +393,7 @@
\mapput(11.9666666667,57.7166666667){Goeteborg}[Schweden]
\mapput(153.366666667,-27.9833333333)[Gold_Coast]{Gold Coast}[Australia]
\mapput(44.0,56.3333333333){Gorki}[Sowjetunion]
-\mapput(9.93333333333,51.5333333333)[Gottingen]{Göttingen}[Germany]
+\mapput(9.93333333333,51.5333333333)[Gottingen]{Göttingen}[Germany]
\mapput(-85.9833333333,11.9666666667){Granada}[Nicaragua]
\mapput(-97.05,47.9166666667)[Grand_Forks]{Grand Forks}[USA]
\mapput(-85.6666666667,42.9666666667)[Grand_Rapids]{Grand Rapids}[USA]
@@ -463,7 +463,7 @@
\mapput(-86.5833333333,34.7333333333){Huntsville}[USA]
\mapput(78.4333333333,17.3666666667){Hyderabad}[Indien]
\mapput(68.4,25.3833333333){Hyderabad}[Pakistan]
-\mapput(27.6333333333,47.15){Iasi}[Rumänien]
+\mapput(27.6333333333,47.15){Iasi}[Rumänien]
\mapput(3.93333333333,7.38333333333){Ibadan}[Nigeria]
\mapput(-75.3333333333,4.41666666667){Ibague}[Kolumbien]
\mapput(-112.033333333,43.4833333333)[Idaho_Falls]{Idaho Falls}[USA]
@@ -547,15 +547,15 @@
\mapput(-80.5,43.45){Kitchener}[Kanada]
\mapput(28.1833333333,-12.8333333333){Kitwe}[Sambia]
\mapput(14.3333333333,46.6333333333){Klagenfurt}[Austria]
-\mapput(23.6166666667,46.7833333333){Klausenburg}[Rumänien]
+\mapput(23.6166666667,46.7833333333){Klausenburg}[Rumänien]
\mapput(16.3166666667,48.3){Klosterneuburg}[Austria]
\mapput(-83.9166666667,35.9666666667){Knoxville}[USA]
\mapput(135.2,34.6666666667){Kobe}[Japan]
\mapput(7.6,50.35){Koblenz}[Germany]
\mapput(7.41666666667,46.9333333333){Koeniz}[Schweiz]
\mapput(9.5,55.4833333333){Kolding}[Denmark]
-\mapput(6.95,50.9333333333)[Koln]{Köln}[Germany]
-\mapput(28.6666666667,44.2){Konstanza}[Rumänien]
+\mapput(6.95,50.9333333333)[Koln]{Köln}[Germany]
+\mapput(28.6666666667,44.2){Konstanza}[Rumänien]
\mapput(12.5833333333,55.6666666667){Kopenhagen}[Denmark]
\mapput(3.28333333333,50.8333333333){Kortrijk}[Belgien]
\mapput(21.25,48.7333333333){Kosice}[Slovakei]
@@ -565,7 +565,7 @@
\mapput(6.56666666667,51.3333333333){Krefeld}[Germany]
\mapput(15.6,48.4166666667){Krems}[Austria]
\mapput(8.01666666667,58.1333333333){Kristiansand}[Norwegen]
-\mapput(25.5833333333,45.65){Kronstadt}[Rumänien]
+\mapput(25.5833333333,45.65){Kronstadt}[Rumänien]
\mapput(101.7,3.01666666667)[Kuala_Lumpur]{Kuala Lumpur}[Malaysia]
\mapput(103.116666667,5.33333333333)[Kuala_Trengganu]{Kuala Trengganu}[Malaysia]
\mapput(50.15,53.2){Kuibyschew}[Sowjetunion]
@@ -633,7 +633,7 @@
\mapput(102.166666667,19.8833333333)[Luang_Prabang]{Luang Prabang}[Laos]
\mapput(13.5,-14.9166666667){Lubango}[Angola]
\mapput(-101.85,33.5833333333){Lubbock}[USA]
-\mapput(10.7,53.8666666667)[Lubeck]{Lübeck}[Germany]
+\mapput(10.7,53.8666666667)[Lubeck]{Lübeck}[Germany]
\mapput(22.5166666667,51.3){Lublin}[Polen]
\mapput(27.4833333333,-11.6833333333){Lubumbashi}[Zaire]
\mapput(8.45,49.4833333333){Ludwigshafen}[Germany]
@@ -655,7 +655,7 @@
% \mapput(9.2,45.4666666667){Mailand}[Italy]
\mapput(8.25,50.0){Mainz}[Germany]
\mapput(46.3333333333,-15.6666666667){Majunga}[Madagaskar]
-\mapput(8.8,3.75){Malabo}[Äquatorial-Guinea]
+\mapput(8.8,3.75){Malabo}[Äquatorial-Guinea]
\mapput(-4.41666666667,36.7166666667){Malaga}[Spanien]
\mapput(112.75,-7.98333333333){Malang}[Indonesien]
\mapput(-73.6333333333,42.4666666667)[Malden_Bridge]{Malden Bridge}[USA]
@@ -733,11 +733,11 @@
\mapput(97.65,16.5){Moulmein}[Myanmar]
\mapput(-73.8166666667,40.9166666667)[Mount_Vernon]{Mount Vernon}[USA]
\mapput(49.1166666667,14.5666666667){Mukalla}[Jemen]
-\mapput(6.88333333333,51.4333333333)[Mulheim]{Mülheim}[Germany]
+\mapput(6.88333333333,51.4333333333)[Mulheim]{Mülheim}[Germany]
\mapput(71.6,30.1666666667){Multan}[Pakistan]
-\mapput(11.5833333333,48.15)[Munchen]{München}[Germany]
+\mapput(11.5833333333,48.15)[Munchen]{München}[Germany]
\mapput(-85.3833333333,40.1833333333){Muncie}[USA]
-\mapput(7.63333333333,51.9666666667)[Munster]{Münster}[Germany]
+\mapput(7.63333333333,51.9666666667)[Munster]{Münster}[Germany]
\mapput(32.9333333333,-2.51666666667){Mwanza}[Tansania]
\mapput(40.6666666667,-14.55){Nacala}[Mosambik]
\mapput(129.916666667,32.8){Nagasaki}[Japan]
@@ -788,7 +788,7 @@
\mapput(19.85,45.25)[Novi_Sad]{Novi Sad}[Jugoslawien]
\mapput(82.9166666667,55.0333333333){Novosibirsk}[Sowjetunion]
\mapput(-175.233333333,-21.15){Nuku'alofa}[Tonga]
-\mapput(11.0833333333,49.45)[Nurnberg]{Nürnberg}[Germany]
+\mapput(11.0833333333,49.45)[Nurnberg]{Nürnberg}[Germany]
\mapput(-8.81666666667,7.75){Nzerekore}[Guinea]
\mapput(-122.266666667,37.8){Oakland}[USA]
\mapput(6.85,51.4666666667){Oberhausen}[Germany]
@@ -808,14 +808,14 @@
\mapput(2.91666666667,51.2166666667){Oostende}[Belgien]
\mapput(-0.633333333333,35.75){Oran}[Algerien]
\mapput(-88.5166666667,18.1)[Orange_Walk]{Orange Walk}[Belize]
-\mapput(-70.0333333333,12.5333333333){Oranjestad}[Niederländ. Antillen]
+\mapput(-70.0333333333,12.5333333333){Oranjestad}[Niederländ. Antillen]
\mapput(-81.3833333333,28.55){Orlando}[USA]
\mapput(-67.1333333333,-17.9833333333){Oruro}[Bolivien]
\mapput(135.5,34.6666666667){Osaka}[Japan]
\mapput(-88.55,44.0166666667){Oshkosh}[USA]
\mapput(18.6833333333,45.55){Osijek}[Kroatien]
\mapput(10.7333333333,59.9166666667){Oslo}[Norwegen]
-\mapput(8.05,52.2666666667)[Osnabruck]{Osnabrück}[Germany]
+\mapput(8.05,52.2666666667)[Osnabruck]{Osnabrück}[Germany]
\mapput(18.25,49.8333333333){Ostrava}[Slovakei]
\mapput(-75.7,45.4166666667){Ottawa}[Kanada]
\mapput(-1.51666666667,12.3666666667){Ouagadougou}[Burkina Faso]
@@ -947,7 +947,7 @@
\mapput(39.7,47.2333333333){Rostow}[Sowjetunion]
\mapput(4.48333333333,51.9166666667){Rotterdam}[Niederlande]
\mapput(27.9833333333,43.8333333333){Ruse}[Bulgarien]
-\mapput(7.0,49.2333333333)[Saarbrucken]{Saarbrücken}[Germany]
+\mapput(7.0,49.2333333333)[Saarbrucken]{Saarbrücken}[Germany]
\mapput(-121.5,38.5833333333){Sacramento}[USA]
\mapput(-9.33333333333,32.3){Safi}[Marokko]
\mapput(-83.9333333333,43.4333333333){Saginaw}[USA]
@@ -1058,7 +1058,7 @@
\mapput(-64.7,32.4)[St_George's]{St George's}[Bermuda-Inseln]
\mapput(-61.7333333333,12.0666666667)[St_George's]{St George's}[Grenada]
\mapput(-61.8333333333,17.1333333333)[St_John's]{St John's}[Antigua]
-\mapput(-54.05,5.48333333333)[St_Laurent]{St Laurent}[Französisch-Guayana]
+\mapput(-54.05,5.48333333333)[St_Laurent]{St Laurent}[Französisch-Guayana]
\mapput(-73.5333333333,41.05){Stamford}[USA]
\mapput(25.6166666667,42.4166666667)[Stara_Zagora]{Stara Zagora}[Bulgarien]
\mapput(5.75,58.9666666667){Stavanger}[Norwegen]
@@ -1070,7 +1070,7 @@
\mapput(9.18333333333,48.7666666667){Stuttgart}[Germany]
\mapput(-65.2833333333,-19.0333333333){Sucre}[Bolivien]
\mapput(-81.0,46.5){Sudbury}[Kanada]
-\mapput(-0.0,-89.9833333333)[Sudpol]{Südpol}[]
+\mapput(-0.0,-89.9833333333)[Sudpol]{Südpol}[]
\mapput(32.55,29.9833333333){Suez}[Egypt]
\mapput(-122.033333333,37.3833333333){Sunnyvale}[USA]
\mapput(112.75,-7.23333333333){Surabaya}[Indonesien]
@@ -1108,7 +1108,7 @@
\mapput(-87.2166666667,14.1){Tegucigalpa}[Honduras]
\mapput(51.4333333333,35.6666666667){Teheran}[Iran]
\mapput(34.7666666667,32.0833333333)[Tel_Aviv]{Tel Aviv}[Israel]
-\mapput(21.25,45.75){Temeschburg}[Rumänien]
+\mapput(21.25,45.75){Temeschburg}[Rumänien]
\mapput(-111.933333333,33.4166666667){Tempe}[USA]
\mapput(-72.6666666667,-38.75){Temuco}[Chile]
\mapput(16.0333333333,47.7166666667){Ternitz}[Austria]
@@ -1214,7 +1214,7 @@
\mapput(-71.8,42.2666666667){Worcester}[USA]
\mapput(114.25,36.75){Wuhan}[China]
\mapput(7.18333333333,51.2666666667){Wuppertal}[Germany]
-\mapput(9.93333333333,49.8)[Wurzburg]{Würzburg}[Germany]
+\mapput(9.93333333333,49.8)[Wurzburg]{Würzburg}[Germany]
\mapput(108.9,34.2666666667){Xian}[China]
\mapput(-120.516666667,46.6){Yakima}[USA]
\mapput(11.5166666667,3.85){Yaounde}[Kamerun]
@@ -1231,7 +1231,7 @@
\mapput(-16.3333333333,12.5833333333){Ziguinchor}[Senegal]
\mapput(8.96666666667,13.7666666667){Zinder}[Niger]
\mapput(35.3666666667,-15.3666666667){Zomba}[Malawi]
-\mapput(8.51666666667,47.3666666667)[Zurich]{Zürich}[Schweiz]
+\mapput(8.51666666667,47.3666666667)[Zurich]{Zürich}[Schweiz]
\mapput(12.5,50.7333333333){Zwickau}[Germany]
% Italy
\mapput[90](13.600000,37.296389){Agrigento}[Italy]
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/citysub.dat b/Master/texmf-dist/tex/generic/pst-geo/data/citysub.dat
index 7b562e138d7..0a37fe08518 100644
--- a/Master/texmf-dist/tex/generic/pst-geo/data/citysub.dat
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/citysub.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/corse.dat b/Master/texmf-dist/tex/generic/pst-geo/data/corse.dat
index ce1dee18aab..e1e9c7baa6a 100644
--- a/Master/texmf-dist/tex/generic/pst-geo/data/corse.dat
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/corse.dat
@@ -1,3 +1,136 @@
-%!PS
-currentfile<</Predictor 12/Columns 21>>/FlateDecode filter cvx exec
-xÚ•V»N1\û^!…  DB‰Ž/I‰¨‘àAÐS¢|‘ ¹Ë9ƹ³½ãË[œÍ>ff×Ö·÷w‹Å)Ø¡>zy~[.çt2?:îì†49ËœåD–f»OêOmÓ4õýïÑ7ë~Þt¿õ§þÛ¹jcLëO‹pj öUu-kóMù¼i6j˲¬|„˜Íb66³3ªûoç›AoÛØTpp§ØqÄÁÎf}=–f²1fqUï›vq+© »æ¸¶ ,2ä»tlBÇ¡Ë:ØÛ†¦!×8¨ j`6ÔK‘ͤ^±Ëè˜?±ÙîỼ•€/÷&v‘pA¢oì"0¨á©vl!!:rˆË É*¥B\-‪Þìãëf:¢Câ´ oA‰ƒÊÀp» ¤Þ0-<ÇÐEÈ<è˜ÕqÙWáÞ‰s1‚Ô {+ãÖjÐ$ã€z`$ΆøŠ[öÖ r¬¢Î’l\/*ª’+cÞ³LB .P;ÌjRV ÷†›€&&UR%à#¨©ÉB|E߸¹”„ºbÞr¨Lf(ú¢RGöC+U69…Èk}Å ˜ôÜÀ&ê!K˜Ï‡Ù¥6âNM÷C»W/tÌ/…‘û ߌ¯ˆ$Î<É ‰KrÇédµCEa6%Þ¼`â› Ù%…4-ŠñÅ)äÍ?o EëZÔNždË»˜ œ •K¯LxáUÒ{2¹â[N™)¥Ò”ZŒÞzm·5¬è‹wÖ>ÇúìúòjåŒ>V_Ÿ½ÒVl3 \ No newline at end of file
+/corse[[
+[9.433333 43.000000]
+[9.466667 42.983333]
+[9.450000 42.966667]
+[9.483333 42.816667]
+[9.433333 42.633333]
+[9.483333 42.583333]
+[9.516667 42.566667]
+[9.450000 42.650000]
+[9.483333 42.616667]
+[9.533333 42.533333]
+[9.533333 42.500000]
+[9.550000 42.433333]
+[9.533333 42.383333]
+[9.566667 42.266667]
+[9.550000 42.133333]
+[9.416667 41.950000]
+[9.400000 41.950000]
+[9.416667 41.916667]
+[9.400000 41.883333]
+[9.400000 41.700000]
+[9.366667 41.683333]
+[9.383333 41.650000]
+[9.350000 41.633333]
+[9.350000 41.616667]
+[9.300000 41.616667]
+[9.283333 41.600000]
+[9.283333 41.583333]
+[9.316667 41.600000]
+[9.350000 41.583333]
+[9.350000 41.566667]
+[9.266667 41.533333]
+[9.266667 41.500000]
+[9.283333 41.500000]
+[9.266667 41.466667]
+[9.216667 41.450000]
+[9.216667 41.416667]
+[9.216667 41.400000]
+[9.250000 41.416667]
+[9.216667 41.366667]
+[9.166667 41.366667]
+[9.133333 41.400000]
+[9.100000 41.400000]
+[9.116667 41.433333]
+[9.066667 41.450000]
+[9.083333 41.483333]
+[9.033333 41.466667]
+[8.916667 41.483333]
+[8.916667 41.500000]
+[8.883333 41.500000]
+[8.883333 41.516667]
+[8.850000 41.516667]
+[8.850000 41.533333]
+[8.783333 41.550000]
+[8.800000 41.583333]
+[8.783333 41.583333]
+[8.800000 41.633333]
+[8.866667 41.650000]
+[8.883333 41.666667]
+[8.916667 41.683333]
+[8.816667 41.716667]
+[8.783333 41.700000]
+[8.766667 41.716667]
+[8.783333 41.733333]
+[8.716667 41.716667]
+[8.700000 41.733333]
+[8.650000 41.750000]
+[8.716667 41.766667]
+[8.716667 41.800000]
+[8.766667 41.816667]
+[8.783333 41.833333]
+[8.750000 41.850000]
+[8.783333 41.850000]
+[8.783333 41.883333]
+[8.800000 41.900000]
+[8.783333 41.933333]
+[8.750000 41.933333]
+[8.716667 41.916667]
+[8.616667 41.900000]
+[8.616667 41.933333]
+[8.583333 41.966667]
+[8.650000 41.966667]
+[8.666667 41.983333]
+[8.650000 42.000000]
+[8.666667 42.016667]
+[8.750000 42.050000]
+[8.716667 42.066667]
+[8.700000 42.116667]
+[8.650000 42.116667]
+[8.616667 42.133333]
+[8.583333 42.133333]
+[8.583333 42.150000]
+[8.566667 42.150000]
+[8.583333 42.166667]
+[8.566667 42.166667]
+[8.583333 42.183333]
+[8.583333 42.200000]
+[8.550000 42.233333]
+[8.683333 42.266667]
+[8.666667 42.300000]
+[8.600000 42.316667]
+[8.633333 42.333333]
+[8.616667 42.350000]
+[8.550000 42.333333]
+[8.550000 42.383333]
+[8.616667 42.383333]
+[8.616667 42.416667]
+[8.666667 42.416667]
+[8.650000 42.433333]
+[8.683333 42.466667]
+[8.650000 42.483333]
+[8.666667 42.516667]
+[8.716667 42.516667]
+[8.716667 42.583333]
+[8.716667 42.566667]
+[8.766667 42.550000]
+[8.800000 42.583333]
+[8.816667 42.600000]
+[8.866667 42.616667]
+[8.883333 42.633333]
+[9.016667 42.633333]
+[9.050000 42.666667]
+[9.050000 42.683333]
+[9.116667 42.733333]
+[9.250000 42.716667]
+[9.300000 42.683333]
+[9.350000 42.733333]
+[9.333333 42.800000]
+[9.300000 42.833333]
+[9.333333 42.866667]
+[9.316667 42.900000]
+[9.366667 42.916667]
+[9.333333 43.000000]
+[9.383333 43.000000]
+[9.433333 43.000000]
+]]def
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/europe-bdy.dat b/Master/texmf-dist/tex/generic/pst-geo/data/europe-bdy_II.dat
index 00c1ee3dc4c..00c1ee3dc4c 100644
--- a/Master/texmf-dist/tex/generic/pst-geo/dataII/europe-bdy.dat
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/europe-bdy_II.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/europe-cil.dat b/Master/texmf-dist/tex/generic/pst-geo/data/europe-cil_II.dat
index ebfd49d03d6..ebfd49d03d6 100644
--- a/Master/texmf-dist/tex/generic/pst-geo/dataII/europe-cil.dat
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/europe-cil_II.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/europe-riv.dat b/Master/texmf-dist/tex/generic/pst-geo/data/europe-riv_II.dat
index 5b9c648645a..5b9c648645a 100644
--- a/Master/texmf-dist/tex/generic/pst-geo/dataII/europe-riv.dat
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/europe-riv_II.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/france.dat b/Master/texmf-dist/tex/generic/pst-geo/data/france.dat
index e42bf032761..9e7999b1477 100644
--- a/Master/texmf-dist/tex/generic/pst-geo/data/france.dat
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/france.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/germany.dat b/Master/texmf-dist/tex/generic/pst-geo/data/germany.dat
new file mode 100644
index 00000000000..2c79ac8f336
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/germany.dat
@@ -0,0 +1,889 @@
+/germany
+[
+[
+[ 7.583333 47.583333] % 1
+[ 7.566667 47.633333] % 1
+[ 7.516667 47.666667] % 2
+[ 7.516667 47.700000] % 2
+[ 7.550000 47.733333] % 1
+[ 7.533333 47.783333] % 1
+[ 7.566667 47.850000] % 2
+[ 7.550000 47.883333] % 1
+[ 7.583333 47.900000] % 1
+[ 7.583333 47.933333] % 2
+[ 7.616667 47.983333] % 2
+[ 7.566667 48.050000] % 3
+[ 7.583333 48.116667] % 2
+[ 7.683333 48.250000] % 2
+[ 7.700000 48.300000] % 2
+[ 7.750000 48.333333] % 2
+[ 7.733333 48.400000] % 1
+[ 7.766667 48.483333] % 2
+[ 7.800000 48.516667] % 1
+[ 7.800000 48.583333] % 3
+[ 7.833333 48.650000] % 2
+[ 7.950000 48.700000] % 2
+[ 7.966667 48.750000] % 1
+[ 8.016667 48.750000] % 1
+[ 8.033333 48.783333] % 2
+[ 8.100000 48.800000] % 2
+[ 8.133333 48.900000] % 1
+[ 8.183333 48.950000] % 5
+[ 8.233333 48.966667] % 1
+[ 8.083333 48.983333] % 2
+[ 7.950000 49.050000] % 2
+[ 7.866667 49.033333] % 1
+[ 7.800000 49.050000] % 1
+[ 7.766667 49.050000] % 2
+[ 7.650000 49.050000] % 1
+[ 7.600000 49.083333] % 2
+[ 7.533333 49.083333] % 1
+[ 7.483333 49.133333] % 1
+[ 7.500000 49.150000] % 3
+[ 7.483333 49.166667] % 2
+[ 7.383333 49.166667] % 1
+[ 7.366667 49.150000] % 1
+[ 7.316667 49.133333] % 2
+[ 7.300000 49.116667] % 1
+[ 7.233333 49.133333] % 2
+[ 7.200000 49.116667] % 1
+[ 7.116667 49.133333] % 2
+[ 7.100000 49.150000] % 1
+[ 7.083333 49.150000] % 1
+[ 7.083333 49.133333] % 3
+[ 7.050000 49.116667] % 2
+[ 7.033333 49.183333] % 1
+[ 6.950000 49.200000] % 2
+[ 6.933333 49.216667] % 2
+[ 6.850000 49.216667] % 1
+[ 6.866667 49.183333] % 2
+[ 6.850000 49.166667] % 1
+[ 6.833333 49.150000] % 4
+[ 6.733333 49.166667] % 1
+[ 6.716667 49.183333] % 2
+[ 6.733333 49.216667] % 2
+[ 6.700000 49.216667] % 1
+[ 6.666667 49.283333] % 2
+[ 6.566667 49.333333] % 1
+[ 6.566667 49.350000] % 2
+[ 6.600000 49.366667] % 1
+[ 6.533333 49.400000] % 2
+[ 6.533333 49.433333] % 2
+[ 6.466667 49.466667] % 1
+[ 6.416667 49.483333] % 5
+[ 6.366667 49.466667] % 1
+[ 6.350000 49.533333] % 1
+[ 6.366667 49.550000] % 2
+[ 6.366667 49.566667] % 1
+[ 6.433333 49.633333] % 2
+[ 6.416667 49.666667] % 2
+[ 6.516667 49.700000] % 1
+[ 6.500000 49.733333] % 4
+[ 6.516667 49.816667] % 2
+[ 6.400000 49.816667] % 1
+[ 6.366667 49.850000] % 1
+[ 6.316667 49.833333] % 1
+[ 6.300000 49.866667] % 3
+[ 6.250000 49.883333] % 1
+[ 6.216667 49.950000] % 2
+[ 6.183333 49.966667] % 2
+[ 6.183333 49.950000] % 2
+[ 6.133333 50.016667] % 1
+[ 6.133333 50.050000] % 1
+[ 6.116667 50.066667] % 5
+[ 6.133333 50.133333] % 1
+[ 6.150000 50.133333] % 2
+[ 6.133333 50.166667] % 2
+[ 6.183333 50.183333] % 2
+[ 6.166667 50.233333] % 2
+[ 6.283333 50.266667] % 2
+[ 6.316667 50.316667] % 2
+[ 6.366667 50.300000] % 4
+[ 6.400000 50.333333] % 2
+[ 6.350000 50.383333] % 1
+[ 6.366667 50.433333] % 1
+[ 6.333333 50.466667] % 2
+[ 6.350000 50.483333] % 2
+[ 6.216667 50.500000] % 2
+[ 6.166667 50.550000] % 1
+[ 6.233333 50.583333] % 1
+[ 6.250000 50.583333] % 2
+[ 6.266667 50.616667] % 2
+[ 6.166667 50.616667] % 1
+[ 6.183333 50.650000] % 2
+[ 6.116667 50.716667] % 2
+[ 6.033333 50.716667] % 5
+[ 6.016667 50.750000] % 1
+[ 6.016667 50.766667] % 2
+[ 5.983333 50.800000] % 1
+[ 6.016667 50.800000] % 2
+[ 6.016667 50.850000] % 2
+[ 6.066667 50.850000] % 3
+[ 6.083333 50.916667] % 2
+[ 6.016667 50.933333] % 1
+[ 6.016667 50.966667] % 2
+[ 6.033333 50.966667] % 1
+[ 5.950000 50.983333] % 2
+[ 5.883333 50.966667] % 1
+[ 5.900000 51.000000] % 3
+[ 5.866667 51.050000] % 2
+[ 5.900000 51.066667] % 1
+[ 5.933333 51.033333] % 2
+[ 5.950000 51.033333] % 1
+[ 6.000000 51.083333] % 3
+[ 6.166667 51.150000] % 1
+[ 6.150000 51.166667] % 1
+[ 6.166667 51.183333] % 2
+[ 6.166667 51.200000] % 2
+[ 6.083333 51.166667] % 2
+[ 6.066667 51.216667] % 1
+[ 6.083333 51.233333] % 2
+[ 6.216667 51.366667] % 1
+[ 6.216667 51.400000] % 1
+[ 6.200000 51.400000] % 3
+[ 6.216667 51.466667] % 1
+[ 6.200000 51.516667] % 2
+[ 6.100000 51.600000] % 2
+[ 6.116667 51.650000] % 2
+[ 6.033333 51.666667] % 2
+[ 6.033333 51.716667] % 2
+[ 5.950000 51.733333] % 2
+[ 5.983333 51.766667] % 4
+[ 5.950000 51.816667] % 1
+[ 6.016667 51.833333] % 2
+[ 6.050000 51.866667] % 2
+[ 6.166667 51.833333] % 1
+[ 6.166667 51.850000] % 2
+[ 6.116667 51.900000] % 2
+[ 6.166667 51.900000] % 2
+[ 6.200000 51.866667] % 2
+[ 6.283333 51.866667] % 1
+[ 6.316667 51.850000] % 1
+[ 6.366667 51.850000] % 1
+[ 6.366667 51.833333] % 2
+[ 6.400000 51.833333] % 2
+[ 6.400000 51.866667] % 2
+[ 6.466667 51.850000] % 2
+[ 6.600000 51.900000] % 1
+[ 6.683333 51.916667] % 2
+[ 6.716667 51.900000] % 4
+[ 6.833333 51.966667] % 2
+[ 6.800000 52.016667] % 2
+[ 6.683333 52.033333] % 3
+[ 6.700000 52.066667] % 1
+[ 6.750000 52.083333] % 2
+[ 6.766667 52.116667] % 2
+[ 6.866667 52.116667] % 1
+[ 6.900000 52.166667] % 1
+[ 6.950000 52.183333] % 2
+[ 6.983333 52.216667] % 2
+[ 7.050000 52.233333] % 2
+[ 7.033333 52.283333] % 1
+[ 7.066667 52.350000] % 4
+[ 7.066667 52.383333] % 2
+[ 6.983333 52.466667] % 2
+[ 6.950000 52.433333] % 1
+[ 6.850000 52.466667] % 2
+[ 6.750000 52.466667] % 2
+[ 6.700000 52.483333] % 4
+[ 6.683333 52.550000] % 2
+[ 6.766667 52.566667] % 2
+[ 6.716667 52.583333] % 1
+[ 6.716667 52.633333] % 2
+[ 6.733333 52.633333] % 1
+[ 6.783333 52.650000] % 3
+[ 7.050000 52.633333] % 2
+[ 7.066667 52.816667] % 1
+[ 7.100000 52.866667] % 1
+[ 7.183333 52.933333] % 2
+[ 7.216667 53.016667] % 1
+[ 7.183333 53.133333] % 1
+[ 7.216667 53.200000] % 5
+[ 7.200000 53.233333] % 1
+[ 7.233333 53.250000] % 2
+[ 7.233333 53.300000] % 2
+[ 7.283333 53.316667] % 3
+[ 7.366667 53.300000] % 2
+[ 7.333333 53.316667] % 3
+[ 7.050000 53.333333] % 2
+[ 7.016667 53.400000] % 4
+[ 7.050000 53.500000] % 1
+[ 7.100000 53.516667] % 2
+[ 7.150000 53.533333] % 1
+[ 7.083333 53.566667] % 2
+[ 7.100000 53.583333] % 1
+[ 7.233333 53.666667] % 3
+[ 7.300000 53.683333] % 1
+[ 7.466667 53.683333] % 2
+[ 7.516667 53.666667] % 1
+[ 7.683333 53.700000] % 4
+[ 7.966667 53.716667] % 2
+[ 8.033333 53.700000] % 2
+[ 8.050000 53.633333] % 1
+[ 8.116667 53.583333] % 1
+[ 8.116667 53.566667] % 1
+[ 8.150000 53.566667] % 3
+[ 8.166667 53.533333] % 1
+[ 8.166667 53.516667] % 2
+[ 8.066667 53.500000] % 2
+[ 8.066667 53.466667] % 2
+[ 8.100000 53.433333] % 2
+[ 8.150000 53.450000] % 1
+[ 8.200000 53.400000] % 3
+[ 8.233333 53.400000] % 2
+[ 8.300000 53.433333] % 2
+[ 8.316667 53.516667] % 2
+[ 8.233333 53.516667] % 3
+[ 8.233333 53.533333] % 2
+[ 8.250000 53.600000] % 2
+[ 8.316667 53.616667] % 1
+[ 8.350000 53.616667] % 1
+[ 8.383333 53.566667] % 3
+[ 8.550000 53.533333] % 2
+[ 8.483333 53.466667] % 4
+[ 8.500000 53.350000] % 2
+[ 8.500000 53.466667] % 2
+[ 8.566667 53.533333] % 1
+[ 8.483333 53.650000] % 2
+[ 8.483333 53.700000] % 2
+[ 8.583333 53.850000] % 1
+[ 8.600000 53.883333] % 4
+[ 8.666667 53.900000] % 2
+[ 8.733333 53.850000] % 1
+[ 8.800000 53.833333] % 2
+[ 8.900000 53.833333] % 1
+[ 9.016667 53.833333] % 1
+[ 9.016667 53.850000] % 1
+[ 9.083333 53.850000] % 3
+[ 9.283333 53.866667] % 2
+[ 9.566667 53.583333] % 1
+[ 9.683333 53.550000] % 5
+[ 9.833333 53.533333] % 1
+[ 9.816667 53.550000] % 1
+[ 9.683333 53.566667] % 2
+[ 9.566667 53.616667] % 2
+[ 9.533333 53.700000] % 2
+[ 9.433333 53.733333] % 2
+[ 9.400000 53.816667] % 2
+[ 9.333333 53.850000] % 2
+[ 9.216667 53.883333] % 1
+[ 9.033333 53.900000] % 2
+[ 8.983333 53.883333] % 4
+[ 8.900000 53.950000] % 1
+[ 8.883333 53.983333] % 2
+[ 8.833333 54.033333] % 2
+[ 8.883333 54.050000] % 2
+[ 8.983333 54.016667] % 1
+[ 9.000000 54.033333] % 3
+[ 9.016667 54.083333] % 2
+[ 8.983333 54.116667] % 1
+[ 8.983333 54.150000] % 2
+[ 8.950000 54.150000] % 2
+[ 8.866667 54.116667] % 2
+[ 8.816667 54.183333] % 2
+[ 8.850000 54.250000] % 1
+[ 8.916667 54.266667] % 4
+[ 8.966667 54.316667] % 1
+[ 8.900000 54.283333] % 2
+[ 8.733333 54.300000] % 2
+[ 8.683333 54.266667] % 1
+[ 8.633333 54.283333] % 4
+[ 8.600000 54.333333] % 1
+[ 8.616667 54.350000] % 2
+[ 8.700000 54.350000] % 2
+[ 8.633333 54.366667] % 2
+[ 8.633333 54.400000] % 2
+[ 8.866667 54.400000] % 1
+[ 8.950000 54.450000] % 2
+[ 9.000000 54.450000] % 3
+[ 9.016667 54.500000] % 2
+[ 8.900000 54.600000] % 2
+[ 8.816667 54.600000] % 2
+[ 8.850000 54.616667] % 2
+[ 8.816667 54.683333] % 2
+[ 8.683333 54.733333] % 1
+[ 8.700000 54.750000] % 2
+[ 8.633333 54.833333] % 5
+[ 8.666667 54.900000] % 2
+[ 8.716667 54.883333] % 1
+[ 8.816667 54.916667] % 2
+[ 8.916667 54.900000] % 1
+[ 9.033333 54.883333] % 2
+[ 9.166667 54.866667] % 2
+[ 9.216667 54.850000] % 2
+[ 9.250000 54.816667] % 1
+[ 9.350000 54.800000] % 1
+[ 9.400000 54.833333] % 5
+[ 9.450000 54.816667] % 2
+[ 9.450000 54.800000] % 1
+[ 9.516667 54.833333] % 1
+[ 9.550000 54.833333] % 2
+[ 9.583333 54.866667] % 2
+[ 9.583333 54.816667] % 2
+[ 9.716667 54.800000] % 2
+[ 9.816667 54.766667] % 2
+[ 9.866667 54.750000] % 1
+[ 9.900000 54.766667] % 2
+[ 9.900000 54.800000] % 4
+[ 9.966667 54.766667] % 2
+[ 10.016667 54.700000] % 2
+[ 9.983333 54.700000] % 2
+[ 9.933333 54.666667] % 2
+[ 10.033333 54.666667] % 2
+[ 10.033333 54.550000] % 2
+[ 9.983333 54.516667] % 2
+[ 9.850000 54.483333] % 4
+[ 9.866667 54.450000] % 2
+[ 10.116667 54.483333] % 3
+[ 10.200000 54.466667] % 1
+[ 10.166667 54.433333] % 2
+[ 10.200000 54.400000] % 1
+[ 10.133333 54.366667] % 3
+[ 10.150000 54.316667] % 1
+[ 10.183333 54.333333] % 2
+[ 10.233333 54.416667] % 1
+[ 10.283333 54.416667] % 3
+[ 10.333333 54.433333] % 2
+[ 10.616667 54.366667] % 2
+[ 10.683333 54.316667] % 2
+[ 10.766667 54.300000] % 2
+[ 10.933333 54.383333] % 2
+[ 11.050000 54.366667] % 4
+[ 11.133333 54.383333] % 1
+[ 11.116667 54.366667] % 2
+[ 11.066667 54.350000] % 3
+[ 11.100000 54.200000] % 2
+[ 10.883333 54.100000] % 2
+[ 10.800000 54.100000] % 3
+[ 10.750000 54.050000] % 2
+[ 10.783333 54.000000] % 2
+[ 10.866667 53.983333] % 5
+[ 10.900000 53.950000] % 2
+[ 11.050000 54.000000] % 3
+[ 11.183333 54.016667] % 1
+[ 11.200000 53.983333] % 1
+[ 11.250000 53.983333] % 2
+[ 11.250000 53.933333] % 1
+[ 11.300000 53.933333] % 2
+[ 11.333333 53.950000] % 3
+[ 11.450000 53.900000] % 1
+[ 11.483333 53.933333] % 1
+[ 11.466667 53.966667] % 1
+[ 11.533333 54.016667] % 2
+[ 11.516667 54.033333] % 2
+[ 11.583333 54.033333] % 3
+[ 11.633333 54.100000] % 1
+[ 11.616667 54.100000] % 2
+[ 11.683333 54.150000] % 2
+[ 11.816667 54.150000] % 3
+[ 12.083333 54.183333] % 1
+[ 12.083333 54.116667] % 4
+[ 12.116667 54.100000] % 2
+[ 12.100000 54.150000] % 2
+[ 12.133333 54.166667] % 2
+[ 12.100000 54.183333] % 1
+[ 12.200000 54.250000] % 2
+[ 12.350000 54.300000] % 4
+[ 12.533333 54.483333] % 2
+[ 12.550000 54.450000] % 1
+[ 12.650000 54.450000] % 1
+[ 12.900000 54.450000] % 4
+[ 12.916667 54.416667] % 2
+[ 12.800000 54.416667] % 2
+[ 12.700000 54.433333] % 1
+[ 12.666667 54.416667] % 2
+[ 12.633333 54.416667] % 1
+[ 12.583333 54.400000] % 1
+[ 12.600000 54.383333] % 1
+[ 12.550000 54.383333] % 2
+[ 12.533333 54.366667] % 3
+[ 12.466667 54.400000] % 2
+[ 12.366667 54.300000] % 4
+[ 12.383333 54.250000] % 2
+[ 12.450000 54.250000] % 1
+[ 12.416667 54.266667] % 2
+[ 12.416667 54.283333] % 1
+[ 12.483333 54.300000] % 1
+[ 12.483333 54.333333] % 1
+[ 12.550000 54.350000] % 2
+[ 12.566667 54.383333] % 2
+[ 12.600000 54.366667] % 2
+[ 12.716667 54.416667] % 2
+[ 12.683333 54.366667] % 2
+[ 12.716667 54.400000] % 1
+[ 12.733333 54.366667] % 1
+[ 12.766667 54.366667] % 2
+[ 12.783333 54.383333] % 2
+[ 12.816667 54.350000] % 1
+[ 12.883333 54.366667] % 1
+[ 12.900000 54.400000] % 4
+[ 13.033333 54.433333] % 2
+[ 13.033333 54.400000] % 1
+[ 13.100000 54.366667] % 1
+[ 13.066667 54.333333] % 2
+[ 13.116667 54.283333] % 2
+[ 13.166667 54.266667] % 1
+[ 13.150000 54.250000] % 1
+[ 13.183333 54.266667] % 1
+[ 13.216667 54.233333] % 2
+[ 13.283333 54.233333] % 1
+[ 13.300000 54.200000] % 2
+[ 13.350000 54.183333] % 2
+[ 13.316667 54.166667] % 2
+[ 13.400000 54.166667] % 1
+[ 13.383333 54.150000] % 1
+[ 13.416667 54.150000] % 3
+[ 13.450000 54.100000] % 2
+[ 13.500000 54.083333] % 2
+[ 13.483333 54.116667] % 1
+[ 13.633333 54.133333] % 2
+[ 13.716667 54.166667] % 2
+[ 13.700000 54.150000] % 3
+[ 13.800000 54.100000] % 1
+[ 13.783333 54.050000] % 2
+[ 13.750000 54.033333] % 2
+[ 13.916667 53.916667] % 1
+[ 13.816667 53.883333] % 3
+[ 13.816667 53.850000] % 1
+[ 13.850000 53.833333] % 1
+[ 13.966667 53.766667] % 2
+[ 14.083333 53.733333] % 2
+[ 14.183333 53.733333] % 2
+[ 14.233333 53.766667] % 5
+[ 14.266667 53.733333] % 5
+[ 14.283333 53.666667] % 1
+[ 14.316667 53.616667] % 2
+[ 14.300000 53.550000] % 1
+[ 14.383333 53.450000] % 1
+[ 14.416667 53.300000] % 4
+[ 14.450000 53.266667] % 2
+[ 14.383333 53.200000] % 1
+[ 14.383333 53.133333] % 2
+[ 14.350000 53.050000] % 2
+[ 14.150000 52.966667] % 2
+[ 14.166667 52.883333] % 4
+[ 14.133333 52.850000] % 1
+[ 14.150000 52.833333] % 1
+[ 14.216667 52.816667] % 1
+[ 14.300000 52.766667] % 2
+[ 14.350000 52.750000] % 1
+[ 14.483333 52.650000] % 1
+[ 14.600000 52.616667] % 4
+[ 14.633333 52.566667] % 2
+[ 14.616667 52.533333] % 2
+[ 14.633333 52.483333] % 1
+[ 14.583333 52.433333] % 1
+[ 14.550000 52.433333] % 3
+[ 14.533333 52.383333] % 2
+[ 14.583333 52.283333] % 2
+[ 14.716667 52.233333] % 2
+[ 14.683333 52.116667] % 3
+[ 14.766667 52.066667] % 1
+[ 14.716667 52.000000] % 1
+[ 14.716667 51.950000] % 2
+[ 14.700000 51.900000] % 1
+[ 14.616667 51.850000] % 4
+[ 14.600000 51.816667] % 1
+[ 14.650000 51.783333] % 1
+[ 14.666667 51.716667] % 2
+[ 14.750000 51.666667] % 2
+[ 14.766667 51.600000] % 1
+[ 14.716667 51.550000] % 2
+[ 14.733333 51.533333] % 2
+[ 14.950000 51.466667] % 1
+[ 14.983333 51.433333] % 2
+[ 14.966667 51.350000] % 3
+[ 15.033333 51.266667] % 2
+[ 14.966667 51.050000] % 1
+[ 14.900000 50.933333] % 1
+[ 14.816667 50.883333] % 5
+[ 14.833333 50.866667] % 2
+[ 14.800000 50.816667] % 2
+[ 14.716667 50.816667] % 1
+[ 14.716667 50.833333] % 2
+[ 14.616667 50.850000] % 2
+[ 14.650000 50.933333] % 2
+[ 14.566667 50.916667] % 2
+[ 14.600000 50.983333] % 1
+[ 14.566667 51.000000] % 2
+[ 14.500000 51.016667] % 3
+[ 14.500000 51.050000] % 2
+[ 14.483333 51.016667] % 1
+[ 14.450000 51.033333] % 2
+[ 14.416667 51.016667] % 4
+[ 14.300000 51.050000] % 2
+[ 14.250000 50.983333] % 2
+[ 14.316667 50.983333] % 1
+[ 14.300000 50.966667] % 2
+[ 14.316667 50.950000] % 2
+[ 14.400000 50.933333] % 3
+[ 14.400000 50.900000] % 2
+[ 14.250000 50.883333] % 1
+[ 14.200000 50.850000] % 2
+[ 14.066667 50.816667] % 1
+[ 14.033333 50.800000] % 1
+[ 13.983333 50.816667] % 1
+[ 13.950000 50.783333] % 2
+[ 13.900000 50.783333] % 1
+[ 13.900000 50.750000] % 2
+[ 13.866667 50.716667] % 1
+[ 13.766667 50.733333] % 2
+[ 13.550000 50.700000] % 1
+[ 13.533333 50.700000] % 1
+[ 13.550000 50.666667] % 1
+[ 13.516667 50.650000] % 1
+[ 13.516667 50.633333] % 2
+[ 13.466667 50.600000] % 1
+[ 13.416667 50.616667] % 2
+[ 13.383333 50.633333] % 2
+[ 13.316667 50.583333] % 1
+[ 13.283333 50.566667] % 2
+[ 13.250000 50.583333] % 2
+[ 13.183333 50.500000] % 1
+[ 13.133333 50.516667] % 2
+[ 13.033333 50.500000] % 1
+[ 13.016667 50.450000] % 4
+[ 12.983333 50.416667] % 2
+[ 12.933333 50.416667] % 2
+[ 12.816667 50.450000] % 1
+[ 12.816667 50.433333] % 1
+[ 12.783333 50.450000] % 1
+[ 12.750000 50.433333] % 2
+[ 12.700000 50.400000] % 1
+[ 12.666667 50.416667] % 2
+[ 12.616667 50.416667] % 3
+[ 12.516667 50.400000] % 1
+[ 12.483333 50.366667] % 1
+[ 12.483333 50.350000] % 2
+[ 12.400000 50.316667] % 1
+[ 12.400000 50.300000] % 1
+[ 12.366667 50.283333] % 1
+[ 12.350000 50.233333] % 2
+[ 12.333333 50.233333] % 3
+[ 12.316667 50.166667] % 2
+[ 12.283333 50.183333] % 1
+[ 12.283333 50.216667] % 1
+[ 12.250000 50.250000] % 2
+[ 12.250000 50.266667] % 2
+[ 12.200000 50.266667] % 2
+[ 12.183333 50.316667] % 5
+[ 12.100000 50.316667] % 1
+[ 12.116667 50.300000] % 2
+[ 12.133333 50.283333] % 2
+[ 12.100000 50.250000] % 1
+[ 12.150000 50.233333] % 2
+[ 12.183333 50.200000] % 1
+[ 12.216667 50.166667] % 2
+[ 12.200000 50.133333] % 1
+[ 12.200000 50.100000] % 1
+[ 12.250000 50.083333] % 2
+[ 12.266667 50.050000] % 1
+[ 12.350000 50.033333] % 1
+[ 12.433333 49.983333] % 2
+[ 12.466667 49.983333] % 1
+[ 12.500000 49.966667] % 2
+[ 12.483333 49.933333] % 3
+[ 12.550000 49.916667] % 1
+[ 12.500000 49.833333] % 1
+[ 12.466667 49.833333] % 2
+[ 12.466667 49.783333] % 1
+[ 12.400000 49.766667] % 3
+[ 12.400000 49.733333] % 1
+[ 12.450000 49.700000] % 2
+[ 12.516667 49.683333] % 1
+[ 12.516667 49.633333] % 2
+[ 12.566667 49.616667] % 2
+[ 12.600000 49.533333] % 2
+[ 12.633333 49.516667] % 1
+[ 12.633333 49.466667] % 4
+[ 12.666667 49.433333] % 2
+[ 12.750000 49.400000] % 2
+[ 12.800000 49.333333] % 1
+[ 12.883333 49.333333] % 2
+[ 12.883333 49.350000] % 2
+[ 12.966667 49.333333] % 1
+[ 13.033333 49.300000] % 1
+[ 13.033333 49.266667] % 1
+[ 13.083333 49.250000] % 1
+[ 13.116667 49.200000] % 1
+[ 13.183333 49.166667] % 2
+[ 13.183333 49.133333] % 2
+[ 13.316667 49.100000] % 2
+[ 13.400000 49.050000] % 2
+[ 13.400000 48.983333] % 2
+[ 13.483333 48.950000] % 2
+[ 13.516667 48.983333] % 2
+[ 13.633333 48.950000] % 2
+[ 13.650000 48.900000] % 1
+[ 13.683333 48.883333] % 2
+[ 13.733333 48.883333] % 1
+[ 13.816667 48.800000] % 1
+[ 13.816667 48.783333] % 5
+[ 13.833333 48.766667] % 2
+[ 13.800000 48.733333] % 2
+[ 13.833333 48.700000] % 1
+[ 13.816667 48.700000] % 2
+[ 13.816667 48.616667] % 1
+[ 13.800000 48.583333] % 1
+[ 13.750000 48.566667] % 3
+[ 13.733333 48.516667] % 2
+[ 13.600000 48.566667] % 1
+[ 13.566667 48.566667] % 2
+[ 13.516667 48.583333] % 1
+[ 13.500000 48.566667] % 1
+[ 13.466667 48.566667] % 3
+[ 13.450000 48.566667] % 1
+[ 13.433333 48.566667] % 1
+[ 13.450000 48.516667] % 1
+[ 13.433333 48.466667] % 2
+[ 13.433333 48.433333] % 3
+[ 13.400000 48.366667] % 2
+[ 13.283333 48.300000] % 2
+[ 13.166667 48.300000] % 2
+[ 13.016667 48.266667] % 1
+[ 12.966667 48.216667] % 2
+[ 12.866667 48.200000] % 1
+[ 12.833333 48.166667] % 4
+[ 12.766667 48.116667] % 2
+[ 12.766667 48.083333] % 1
+[ 12.850000 48.016667] % 1
+[ 12.883333 47.966667] % 1
+[ 12.933333 47.933333] % 2
+[ 13.016667 47.850000] % 1
+[ 12.933333 47.783333] % 2
+[ 12.916667 47.716667] % 1
+[ 12.983333 47.716667] % 2
+[ 13.016667 47.716667] % 3
+[ 13.083333 47.683333] % 2
+[ 13.100000 47.633333] % 1
+[ 13.066667 47.600000] % 2
+[ 13.050000 47.583333] % 1
+[ 13.066667 47.566667] % 1
+[ 13.033333 47.533333] % 5
+[ 13.050000 47.500000] % 1
+[ 13.016667 47.483333] % 2
+[ 12.950000 47.483333] % 1
+[ 12.850000 47.550000] % 2
+[ 12.816667 47.550000] % 2
+[ 12.783333 47.583333] % 1
+[ 12.800000 47.616667] % 2
+[ 12.833333 47.616667] % 2
+[ 12.766667 47.650000] % 3
+[ 12.783333 47.666667] % 2
+[ 12.666667 47.683333] % 1
+[ 12.600000 47.666667] % 1
+[ 12.583333 47.650000] % 2
+[ 12.516667 47.633333] % 1
+[ 12.450000 47.666667] % 2
+[ 12.450000 47.683333] % 1
+[ 12.450000 47.700000] % 1
+[ 12.366667 47.683333] % 1
+[ 12.333333 47.700000] % 2
+[ 12.250000 47.683333] % 1
+[ 12.233333 47.700000] % 4
+[ 12.250000 47.750000] % 2
+[ 12.183333 47.700000] % 1
+[ 12.200000 47.633333] % 3
+[ 12.200000 47.616667] % 2
+[ 12.000000 47.616667] % 1
+[ 11.850000 47.600000] % 1
+[ 11.833333 47.583333] % 1
+[ 11.683333 47.583333] % 2
+[ 11.633333 47.600000] % 1
+[ 11.600000 47.583333] % 2
+[ 11.566667 47.516667] % 1
+[ 11.500000 47.516667] % 2
+[ 11.433333 47.516667] % 2
+[ 11.383333 47.483333] % 1
+[ 11.400000 47.466667] % 2
+[ 11.400000 47.450000] % 2
+[ 11.333333 47.450000] % 2
+[ 11.283333 47.400000] % 2
+[ 11.233333 47.400000] % 2
+[ 11.233333 47.433333] % 2
+[ 11.216667 47.433333] % 2
+[ 11.116667 47.400000] % 3
+[ 10.983333 47.400000] % 1
+[ 10.966667 47.416667] % 1
+[ 10.983333 47.433333] % 2
+[ 10.916667 47.483333] % 2
+[ 10.866667 47.483333] % 2
+[ 10.916667 47.516667] % 3
+[ 10.883333 47.533333] % 2
+[ 10.766667 47.516667] % 1
+[ 10.750000 47.550000] % 2
+[ 10.600000 47.566667] % 2
+[ 10.566667 47.533333] % 2
+[ 10.500000 47.533333] % 1
+[ 10.466667 47.550000] % 1
+[ 10.483333 47.583333] % 4
+[ 10.466667 47.583333] % 2
+[ 10.433333 47.583333] % 1
+[ 10.450000 47.550000] % 1
+[ 10.433333 47.500000] % 1
+[ 10.466667 47.483333] % 2
+[ 10.466667 47.433333] % 3
+[ 10.433333 47.383333] % 1
+[ 10.383333 47.366667] % 2
+[ 10.333333 47.316667] % 1
+[ 10.233333 47.283333] % 4
+[ 10.166667 47.266667] % 1
+[ 10.183333 47.300000] % 1
+[ 10.216667 47.316667] % 1
+[ 10.200000 47.333333] % 2
+[ 10.233333 47.383333] % 2
+[ 10.183333 47.383333] % 1
+[ 10.150000 47.366667] % 1
+[ 10.116667 47.366667] % 2
+[ 10.100000 47.366667] % 2
+[ 10.066667 47.416667] % 2
+[ 10.100000 47.433333] % 3
+[ 10.050000 47.500000] % 2
+[ 10.000000 47.483333] % 2
+[ 9.966667 47.533333] % 1
+[ 9.966667 47.550000] % 1
+[ 9.916667 47.533333] % 1
+[ 9.883333 47.550000] % 2
+[ 9.850000 47.533333] % 1
+[ 9.816667 47.550000] % 1
+[ 9.816667 47.583333] % 2
+[ 9.783333 47.600000] % 1
+[ 9.750000 47.583333] % 5
+[ 9.566667 47.533333] % 2
+[ 9.300000 47.650000] % 1
+[ 9.166667 47.650000] % 1
+[ 9.133333 47.666667] % 2
+[ 9.050000 47.683333] % 2
+[ 8.883333 47.650000] % 2
+[ 8.850000 47.683333] % 2
+[ 8.866667 47.700000] % 1
+[ 8.816667 47.716667] % 2
+[ 8.816667 47.733333] % 2
+[ 8.766667 47.716667] % 2
+[ 8.800000 47.700000] % 1
+[ 8.800000 47.683333] % 2
+[ 8.716667 47.700000] % 1
+[ 8.733333 47.716667] % 1
+[ 8.716667 47.733333] % 2
+[ 8.733333 47.766667] % 1
+[ 8.683333 47.766667] % 1
+[ 8.683333 47.783333] % 2
+[ 8.650000 47.800000] % 2
+[ 8.633333 47.766667] % 2
+[ 8.616667 47.800000] % 4
+[ 8.566667 47.800000] % 2
+[ 8.566667 47.783333] % 2
+[ 8.483333 47.766667] % 1
+[ 8.450000 47.716667] % 3
+[ 8.400000 47.700000] % 1
+[ 8.416667 47.666667] % 2
+[ 8.450000 47.666667] % 1
+[ 8.466667 47.650000] % 1
+[ 8.533333 47.666667] % 1
+[ 8.583333 47.666667] % 2
+[ 8.616667 47.666667] % 1
+[ 8.633333 47.650000] % 2
+[ 8.600000 47.650000] % 1
+[ 8.600000 47.616667] % 4
+[ 8.583333 47.600000] % 1
+[ 8.566667 47.616667] % 2
+[ 8.516667 47.633333] % 2
+[ 8.466667 47.600000] % 2
+[ 8.500000 47.583333] % 2
+[ 8.333333 47.566667] % 2
+[ 8.283333 47.616667] % 2
+[ 8.200000 47.616667] % 2
+[ 8.083333 47.566667] % 2
+[ 7.916667 47.550000] % 2
+[ 7.900000 47.583333] % 2
+[ 7.816667 47.583333] % 2
+[ 7.783333 47.550000] % 2
+[ 7.666667 47.550000] % 2
+[ 7.616667 47.566667] % 2
+[ 7.666667 47.583333] % 2
+[ 7.666667 47.600000] % 5
+[ 7.583333 47.583333] %2108
+]
+[
+[ 13.116667 54.333333] % 2
+[ 13.133333 54.366667] % 2
+[ 13.266667 54.383333] % 1
+[ 13.233333 54.383333] % 1
+[ 13.233333 54.416667] % 2
+[ 13.216667 54.433333] % 2
+[ 13.150000 54.416667] % 1
+[ 13.183333 54.450000] % 2
+[ 13.266667 54.483333] % 1
+[ 13.233333 54.483333] % 1
+[ 13.233333 54.516667] % 2
+[ 13.166667 54.516667] % 4
+[ 13.150000 54.550000] % 2
+[ 13.266667 54.550000] % 2
+[ 13.300000 54.516667] % 2
+[ 13.300000 54.550000] % 2
+[ 13.366667 54.583333] % 2
+[ 13.350000 54.516667] % 2
+[ 13.400000 54.533333] % 1
+[ 13.366667 54.550000] % 2
+[ 13.383333 54.550000] % 1
+[ 13.416667 54.516667] % 2
+[ 13.416667 54.500000] % 1
+[ 13.466667 54.483333] % 3
+[ 13.500000 54.483333] % 1
+[ 13.500000 54.550000] % 2
+[ 13.516667 54.566667] % 1
+[ 13.466667 54.550000] % 2
+[ 13.383333 54.583333] % 2
+[ 13.366667 54.616667] % 1
+[ 13.300000 54.566667] % 3
+[ 13.250000 54.566667] % 2
+[ 13.300000 54.633333] % 1
+[ 13.233333 54.633333] % 1
+[ 13.216667 54.633333] % 2
+[ 13.233333 54.650000] % 1
+[ 13.283333 54.666667] % 4
+[ 13.416667 54.683333] % 1
+[ 13.450000 54.666667] % 2
+[ 13.383333 54.633333] % 2
+[ 13.416667 54.583333] % 1
+[ 13.466667 54.566667] % 1
+[ 13.650000 54.583333] % 2
+[ 13.683333 54.566667] % 2
+[ 13.683333 54.533333] % 1
+[ 13.583333 54.483333] % 2
+[ 13.583333 54.450000] % 2
+[ 13.616667 54.400000] % 2
+[ 13.683333 54.400000] % 4
+[ 13.766667 54.333333] % 1
+[ 13.733333 54.316667] % 2
+[ 13.716667 54.266667] % 1
+[ 13.700000 54.283333] % 1
+[ 13.716667 54.283333] % 2
+[ 13.716667 54.300000] % 2
+[ 13.650000 54.300000] % 2
+[ 13.716667 54.316667] % 2
+[ 13.616667 54.316667] % 2
+[ 13.683333 54.350000] % 1
+[ 13.650000 54.350000] % 1
+[ 13.616667 54.333333] % 2
+[ 13.583333 54.350000] % 2
+[ 13.500000 54.333333] % 1
+[ 13.400000 54.283333] % 2
+[ 13.350000 54.266667] % 2
+[ 13.366667 54.250000] % 1
+[ 13.366667 54.266667] % 2
+[ 13.416667 54.266667] % 1
+[ 13.433333 54.233333] % 3
+[ 13.400000 54.216667] % 2
+[ 13.300000 54.250000] % 1
+[ 13.316667 54.250000] % 2
+[ 13.333333 54.283333] % 2
+[ 13.266667 54.250000] % 2
+[ 13.200000 54.266667] % 2
+[ 13.200000 54.300000] % 2
+[ 13.150000 54.283333] % 1
+[ 13.150000 54.300000] % 2
+[ 13.183333 54.300000] % 5
+[ 13.116667 54.333333] %5227
+]
+] def
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/mex.dat b/Master/texmf-dist/tex/generic/pst-geo/data/mexico.dat
index 951a68f0e01..951a68f0e01 100644
--- a/Master/texmf-dist/tex/generic/pst-geo/data/mex.dat
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/mexico.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/northamerica-bdy_II.dat b/Master/texmf-dist/tex/generic/pst-geo/data/northamerica-bdy_II.dat
new file mode 100644
index 00000000000..bafabfd7f8a
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/northamerica-bdy_II.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/northamerica-cil_II.dat b/Master/texmf-dist/tex/generic/pst-geo/data/northamerica-cil_II.dat
new file mode 100644
index 00000000000..60859cd4af2
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/northamerica-cil_II.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/northamerica-pby_II.dat b/Master/texmf-dist/tex/generic/pst-geo/data/northamerica-pby_II.dat
new file mode 100644
index 00000000000..b267b7decc9
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/northamerica-pby_II.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/northamerica-riv_II.dat b/Master/texmf-dist/tex/generic/pst-geo/data/northamerica-riv_II.dat
new file mode 100644
index 00000000000..83864ab38ef
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/northamerica-riv_II.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/rhone.dat b/Master/texmf-dist/tex/generic/pst-geo/data/rhone.dat
index 0ba3c51522b..314c724c5dd 100644
--- a/Master/texmf-dist/tex/generic/pst-geo/data/rhone.dat
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/rhone.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/seine.dat b/Master/texmf-dist/tex/generic/pst-geo/data/seine.dat
index ab5c729b110..c3a9655141d 100644
--- a/Master/texmf-dist/tex/generic/pst-geo/data/seine.dat
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/seine.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/southamerica-arc_II.dat b/Master/texmf-dist/tex/generic/pst-geo/data/southamerica-arc_II.dat
new file mode 100644
index 00000000000..b8657e76d57
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/southamerica-arc_II.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/southamerica-bdy_II.dat b/Master/texmf-dist/tex/generic/pst-geo/data/southamerica-bdy_II.dat
new file mode 100644
index 00000000000..af9e20e92af
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/southamerica-bdy_II.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/southamerica-cil_II.dat b/Master/texmf-dist/tex/generic/pst-geo/data/southamerica-cil_II.dat
new file mode 100644
index 00000000000..4174cbdd3a0
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/southamerica-cil_II.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/southamerica-riv_II.dat b/Master/texmf-dist/tex/generic/pst-geo/data/southamerica-riv_II.dat
new file mode 100644
index 00000000000..03d37608066
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/southamerica-riv_II.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/README b/Master/texmf-dist/tex/generic/pst-geo/dataII/README
deleted file mode 100644
index bd25910dd4e..00000000000
--- a/Master/texmf-dist/tex/generic/pst-geo/dataII/README
+++ /dev/null
@@ -1,86 +0,0 @@
-Project pst-geo-compress 2009-07-30
-========================
-
-Author: Heiko Oberdiek <oberdiek@uni-freiburg.de>
-License is LPPL 1.3c,
- maintainance status: maintained
- current maintainer: author
-
-Files:
- README (this file)
- pst-geo-compress.pl
- pst-geo-decompress.pl
-
-Requirements: Ghostscript >= 8.56 (if prediction is used)
-
-`pst-geo' (CTAN:graphics/pstricks/contrib/pst-geo/) comes with
-huge data files:
- CTAN:graphics/pstricks/contrib/pst-geo/data/data.tgz
- CTAN:graphics/pstricks/contrib/pst-geo/dataII/dataII.tgz
-Unpacked the data files consume about 134 MB.
-
-The data files (files with extension `.dat') are PostScript files.
-PostScript supports compression and decompression via filter.
-The Perl script `pst-geo-compress.pl' compresses the data files
-using the /FlateEncode filter and adds code to decompresses the file,
-if read by a PostScript interpreter. Now the space requirements of
-the data files is about 24 MB.
-
-Caveat: Filters /FlateEncode and /FlateDecode require
-PostScript language level 3 (supported by ghostscript).
-(LZW compression don't need language level 3, but
-the compression is less effective.)
-
-Size reduction details:
-* Much unnecessary white space is removed.
-* Some comments are removed (especially number comments
- in .dat files of data.tgz), the remaining comments are preserved
- (especially city names).
-* /FlateEncode filter.
-* PNG prediction (method `up') is used for most of the files.
- Spaces at line ends are added to fill the space up to
- to the columns count. This improves the prediction,
- because these files contains long lists of sorted coordinate pairs.
- The prediction columns count is also the maximal line length,
- because of a ghostscript bug:
-
-Ghostscript has a bug regarding prediction, it is fixed in
-version 8.56 (2007-03-14):
-
-| 2006-12-11T17:30:53.980862Z L. Peter Deutsch
-|
-| Fixes bug: the PNG predictor filters produced incorrect data for the last
-| pixel of each row. (The encoder and decoder had matching bugs, so
-| encode+decode produced the correct result!) Fixes a diff in PS3 CET
-| 23-12U-1.
-
-By having each line at the same length, the last byte of a row
-has always the same value (end of line character). This does
-not trigger this bug (tested with gs 7.07/8.64).
-
-After compression the files aren't human-readable any more.
-The Perl script `pst-geo-decompress.pl' can be used to
-decompress a data file.
-
-Both scripts know option -h that prints a short usage screen.
-Option --gscmd allows to configure the ghostscript programm call,
-if the automatic ghostscript isn't sufficient.
-
-`pst-geo-compress.pl' is called inside the directory where
-the data files are present. Options `-1' and `-2' choose
-between the files from `data.tgz' and `dataII.tgz'.
-
-`pst-geo-decompress.pl' expects the data file to decompress.
-If an output file is given, the result is stored there. Otherwise
-standard output is used.
-
-History:
- 2009-07-30 v1.0 First release
- 2009-07-30 v1.1:
- * Workaround for ghostscript bug added:
- * Files that are compressed with prediction have
- equal line length.
- * Removing comments (except for city data files)
- * Obsolete option --prediction is therefore removed
- * Adding standalone test mode (option `--test').
-
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/c-cap.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/c-cap.dat
deleted file mode 100644
index 27e4e77adb1..00000000000
--- a/Master/texmf-dist/tex/generic/pst-geo/dataII/c-cap.dat
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/c-sub.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/c-sub.dat
deleted file mode 100644
index 10f9bf0280e..00000000000
--- a/Master/texmf-dist/tex/generic/pst-geo/dataII/c-sub.dat
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/citycapitals.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/citycapitals.dat
deleted file mode 100644
index 692ad8410dd..00000000000
--- a/Master/texmf-dist/tex/generic/pst-geo/dataII/citycapitals.dat
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/citysub.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/citysub.dat
deleted file mode 100644
index 7b562e138d7..00000000000
--- a/Master/texmf-dist/tex/generic/pst-geo/dataII/citysub.dat
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/namer-bdy.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/namer-bdy.dat
deleted file mode 100644
index 3df82e7c3a7..00000000000
--- a/Master/texmf-dist/tex/generic/pst-geo/dataII/namer-bdy.dat
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/namer-cil.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/namer-cil.dat
deleted file mode 100644
index 721aadcfeea..00000000000
--- a/Master/texmf-dist/tex/generic/pst-geo/dataII/namer-cil.dat
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/namer-pby.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/namer-pby.dat
deleted file mode 100644
index bd8a7cb22bf..00000000000
--- a/Master/texmf-dist/tex/generic/pst-geo/dataII/namer-pby.dat
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/namer-riv.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/namer-riv.dat
deleted file mode 100644
index f774bbbbf73..00000000000
--- a/Master/texmf-dist/tex/generic/pst-geo/dataII/namer-riv.dat
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/samer-arc.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/samer-arc.dat
deleted file mode 100644
index e317838e234..00000000000
--- a/Master/texmf-dist/tex/generic/pst-geo/dataII/samer-arc.dat
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/samer-bdy.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/samer-bdy.dat
deleted file mode 100644
index 297edec94d1..00000000000
--- a/Master/texmf-dist/tex/generic/pst-geo/dataII/samer-bdy.dat
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/samer-cil.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/samer-cil.dat
deleted file mode 100644
index 91233dbc076..00000000000
--- a/Master/texmf-dist/tex/generic/pst-geo/dataII/samer-cil.dat
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/samer-riv.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/samer-riv.dat
deleted file mode 100644
index dd22d8f1b8e..00000000000
--- a/Master/texmf-dist/tex/generic/pst-geo/dataII/samer-riv.dat
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/pst-geo.tex b/Master/texmf-dist/tex/generic/pst-geo/pst-geo.tex
new file mode 100644
index 00000000000..7e7f2ee3bb6
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/pst-geo.tex
@@ -0,0 +1,1504 @@
+%%
+%% This is file `pst-geo.tex',
+%%
+%% IMPORTANT NOTICE:
+%%
+%% Package `pst-geo'
+%%
+%% Manuel Luque <Mluque5130@aol.com> (France)
+%% Giuseppe Matarazzo <joematara@hotmail.com> (Italy)
+%% Herbert Voss <hvoss@tug.org> (Germany)
+%%
+%% December 07, 2016
+%%
+%% This program can be redistributed and/or modified under the terms
+%% of the LaTeX Project Public License Distributed from CTAN archives
+%% in directory macros/latex/base/lppl.txt.
+%%
+%% DESCRIPTION:
+%% `pst-geo' is a PSTricks package to create geographical objects
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\csname PSTGeo\endcsname
+\let\PSTGeoLoaded\endinput
+
+% Require PSTricks
+\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi
+\ifx\PSTnodesLoaded\endinput\else\input pst-node.tex\fi
+\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey\fi
+%
+\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
+
+
+\pst@addfams{pst-geo}
+%
+\def\fileversion{0.06}
+\def\filedate{2016/12/08}
+\message{`PST-geo' v\fileversion, \filedate\space (ML/HV)}
+%
+\pstheader{pst-geo.pro}
+
+\define@key[psset]{pst-geo}{path}[data]{\def\psk@geo@Path{#1}} % chemin des données
+\define@key[psset]{pst-geo}{level}[1]{\def\psk@geo@level{#1}}
+\define@key[psset]{pst-geo}{type}[1]{\def\psk@geo@type{#1}}
+% type=1 ==> Mercator
+% type=2 ==> Lambert
+% type=3 ==> simple
+% type=4 ==> Sanson-Flamsteed
+% type=5 ==> cylindrical
+% type=6 ==> Babinet
+% type=7 ==> Collignon
+% type=8 ==> Bonne
+\psset{path=data,level=1,type=1}
+\define@key[psset]{pst-geo}{n}[n]{\def\psk@geo@n{#1}}
+\psset{n=1.77245} % sqrt(pi) % pour Collignon
+\define@key[psset]{pst-geo}{limiteL}[180]{\def\psk@geo@limiteL{#1}}
+\psset{limiteL=180} % longitude limite
+\define@key[psset]{pst-geo}{latitude0}[45]{\def\psk@geo@latitudeO{#1}}
+\psset{latitude0=45} % pour Bonne latitude 0
+\define@key[psset]{pst-geo}{longitude0}[0]{\def\psk@geo@longitudeO{#1}}
+\psset{longitude0=0} % pour Bonne longitude 0
+\define@key[psset]{pst-geo}{increment}[10]{\def\psk@geo@increment{#1}}
+\psset{increment=10}
+%
+\define@key[psset]{pst-geo}{MapFillColor}%[{[rgb]{0.99, 0.95, 0.7}}]
+{\pst@getcolor{#1}\psk@geo@Fillcolor} % couleur des continents
+\psset{MapFillColor={[rgb]{0.99, 0.95, 0.7}}}
+\define@key[psset]{pst-geo}{SeaFillColor}%[{[rgb]{0.5, 0.8, 0.8}}]
+{\pst@getcolor{#1}\psk@geo@Seacolor} % sea color
+\psset{SeaFillColor={[rgb]{0.5, 0.8, 0.8}}}
+\define@key[psset]{pst-geo}{LakeFillColor}%[{[rgb]{0.2, 0.2, 0.9}}]
+{\pst@getcolor{#1}\psk@geo@Lakecolor} % lake color
+\psset{LakeFillColor={[rgb]{0.2, 0.2, 0.9}}}
+\define@key[psset]{pst-geo}{RiverFillColor}%[{[rgb]{0, 0, 1}}]
+{\pst@getcolor{#1}\psk@geo@Rivercolor} % river color
+\psset{RiverFillColor={[rgb]{0, 0, 1}}}
+%
+%\define@boolkey[psset]{pst-3dplot}[Pst@]{Debug}[true]{}%
+%
+\define@boolkey[psset]{pst-geo}[Pst@geo@]{capitals}[true]{}
+\define@boolkey[psset]{pst-geo}[Pst@geo@]{cities}[true]{}
+\define@boolkey[psset]{pst-geo}[Pst@geo@]{rivers}[true]{}
+\define@boolkey[psset]{pst-geo}[Pst@geo@]{borders}[true]{}
+\define@boolkey[psset]{pst-geo}[Pst@geo@]{maillage}[true]{}
+\psset{cities=false,capitals=false,rivers=false,borders,maillage}
+\define@boolkey[psset]{pst-geo}[Pst@geo@]{Fill}[true]{}
+\psset{Fill}
+\define@boolkey[psset]{pst-geo}[Pst@geo@]{USA}[true]{}
+\define@boolkey[psset]{pst-geo}[Pst@geo@]{Australia}[true]{}
+\define@boolkey[psset]{pst-geo}[Pst@geo@]{Mexico}[true]{}
+\psset{USA=false,Australia=false,Mexico=false}
+%
+\define@key[psset]{pst-geo}{increment}[10]{\def\psk@geo@increment{#1}}
+\define@boolkey[psset]{pst-geo}[Pst@geo@]{Europe}[true]{}
+\define@boolkey[psset]{pst-geo}[Pst@geo@]{Asia}[true]{}
+\define@boolkey[psset]{pst-geo}[Pst@geo@]{Africa}[true]{}
+\define@boolkey[psset]{pst-geo}[Pst@geo@]{Northamerica}[true]{}
+\define@boolkey[psset]{pst-geo}[Pst@geo@]{Southamerica}[true]{}
+\psset{increment=10,Europe,Asia=false,Africa=false,Northamerica=false,Southamerica=false}
+\define@key[psset]{pst-geo}{all}[true]{\psset{increment=10,Europe,Asia,Africa,Northamerica,Southamerica}}
+
+\def\psNodeLabelStyle{}
+\newpsstyle{psNodeMapStyle}{fillstyle=solid,fillcolor=yellow!80,framesep=1pt,linestyle=none,opacity=0.4}
+\define@key[psset]{pst-geo}{mapCountry}[all]{\def\psk@geo@mapCountry{#1}}
+\define@key[psset]{pst-geo}{nodeWidth}[1mm]{\def\psk@geo@nodeWidth{#1}}
+\psset{mapCountry=all,nodeWidth=1mm}
+
+\definecolor{orange}{cmyk}{0,0.61,0.87,0}
+\definecolor{darkgreen}{cmyk}{1,0,1,0.5}
+
+
+\def\geo@variablesMap#1{%
+% 0 2d
+% 1 2dII
+% 2 3d
+% 3 3dII
+ \ifcase #1 % 2d
+ /Coeff_mercatorY {2 div 45 add dup sin exch cos div ln 57.2958 mul} def % Mercator
+ /Coeff_simpleY {1 mul} def % simple
+ /Coeff_lambertY {sin 57.2958 mul} def % Lambert
+ /Coeff_sanson_flamsteedY {1 mul} def % Sanson_Flamstead
+ /Coeff_cylindricalY { dup sin exch cos div 57.2958 mul} def % Cylindrical
+ /Coeff_babinetY { sin 2 sqrt mul 57.2958 mul} def % Babinet
+ /n \psk@geo@n\space def
+ /Coeff_collignonY { 0 ge { 1 2 sqrt 90 Y sub 2 div sin mul sub 57.2958 mul n mul}
+ { 1 2 sqrt 90 Y add 2 div sin mul sub 57.2958 mul n mul neg} ifelse }def % Collignon
+ /Coeff_BonneY {pop /RHO l0 dup cos exch sin div Y neg l0 add 57.2958 div add def
+ /Theta Y cos X L0 sub mul RHO div def
+ Theta cos RHO mul neg 57.2958 mul }def % Bonne
+%
+ /Coeff_mercatorX {1 mul} def % Mercator
+ /Coeff_simpleX {1 mul} def % simple
+ /Coeff_lambertX {1 mul} def % Lambert
+ /Coeff_sanson_flamsteedX {Y cos mul} def % Sanson_Flamstead
+ /Coeff_cylindricalX { 1 mul } def % Cylindrical
+ /Coeff_babinetX { 2 mul 2 sqrt mul 3.1415926 div Y cos mul} def % Babinet
+ /Coeff_collignonX { 2 mul 2 sqrt mul 90 Y abs sub 2 div sin mul n div} def % Collignon
+ /l0 \psk@geo@latitudeO\space def
+ /L0 \psk@geo@longitudeO\space def
+ /Coeff_BonneX { pop /RHO l0 dup cos exch sin div Y neg l0 add 57.2958 div add def
+ /Theta Y cos X L0 sub mul RHO div def
+ Theta sin RHO mul 57.2958 mul } def % Bonne
+ \ifcase\psk@geo@type\or
+ /CoeffY {Coeff_mercatorY} def
+ /CoeffX {Coeff_mercatorX} def
+ /StartY -85 def
+ \or
+ /CoeffY {Coeff_simpleY} def
+ /CoeffX {Coeff_simpleX} def
+ /StartY -90 def
+ \or
+ /CoeffY {Coeff_lambertY} def
+ /CoeffX {Coeff_lambertX} def
+ /StartY -90 def
+ \or
+ /CoeffY {Coeff_sanson_flamsteedY} def
+ /CoeffX {Coeff_sanson_flamsteedX} def
+ /StartY -90 def
+ \or
+ /CoeffY {Coeff_cylindricalY} def
+ /CoeffX {Coeff_cylindricalX} def
+ /StartY -85 def
+ \or
+ /CoeffY {Coeff_babinetY} def
+ /CoeffX {Coeff_babinetX} def
+ /StartY -90 def
+ \or
+ /CoeffY {Coeff_collignonY} def
+ /CoeffX {Coeff_collignonX} def
+ /StartY -90 def
+ \or
+ /CoeffY {Coeff_BonneY} def
+ /CoeffX {Coeff_BonneX} def
+ /StartY -90 def
+ \fi
+ \or % 2dII
+ /Coeff_mercatorY { 2 div 45 add dup sin exch cos div ln 57.2958 mul } def % Mercator
+ /Coeff_simpleY {1 mul } def % simple
+ /Coeff_lambertY {sin 57.2958 mul } def % Lambert
+ /Coeff_sanson_flamsteedY {1 mul } def % Sanson_Flamstead
+ /Coeff_cylindricalY { dup sin exch cos div 57.2958 mul } def % Cylindrical
+ /Coeff_babinetY { sin 2 sqrt mul 57.2958 mul } def % Babinet
+ /n \psk@geo@n\space def
+ /Coeff_collignonY { 0 ge { 1 2 sqrt 90 Y sub 2 div sin mul sub 57.2958 mul n mul }
+ { 1 2 sqrt 90 Y add 2 div sin mul sub 57.2958 mul n mul neg} ifelse } def % Collignon
+ /Coeff_BonneY { pop /RHO l0 dup cos exch sin div Y neg l0 add 57.2958 div add def
+ /Theta Y cos X L0 sub mul RHO div def
+ Theta cos RHO mul neg 57.2958 mul } def % Bonne
+ /Coeff_mercatorX {1 mul} def % Mercator
+ /Coeff_simpleX {1 mul} def % simple
+ /Coeff_lambertX {1 mul} def % Lambert
+ /Coeff_sanson_flamsteedX {Y cos mul} def % Sanson_Flamstead
+ /Coeff_cylindricalX { 1 mul } def % Cylindrical
+ /Coeff_babinetX { 2 mul 2 sqrt mul 3.1415926 div Y cos mul} def % Babinet
+ /Coeff_collignonX { 2 mul 2 sqrt mul 90 Y abs sub 2 div sin mul n div } def % Collignon
+ /l0 \psk@geo@latitudeO\space def
+ /L0 \psk@geo@longitudeO\space def
+ /Coeff_BonneX {pop /RHO l0 dup cos exch sin div Y neg l0 add 57.2958 div add def
+ /Theta Y cos X L0 sub mul RHO div def
+ Theta sin RHO mul 57.2958 mul } def % Bonne
+ \ifcase\psk@geo@type\or % type 1 % hv 2004-05-04
+ /CoeffY {Coeff_mercatorY} def
+ /CoeffX {Coeff_mercatorX} def
+ /StartY -85 def
+ \or % type 2 % hv 2004-05-04
+ /CoeffY {Coeff_simpleY} def
+ /CoeffX {Coeff_simpleX} def
+ /StartY -90 def
+ \or % type 3 % hv 2004-05-04
+ /CoeffY {Coeff_lambertY} def
+ /CoeffX {Coeff_lambertX} def
+ /StartY -90 def
+ \or % type 4 % hv 2004-05-04
+ /CoeffY {Coeff_sanson_flamsteedY} def
+ /CoeffX {Coeff_sanson_flamsteedX} def
+ /StartY -90 def
+ \or % type 5 % hv 2004-05-04
+ /CoeffY {Coeff_cylindricalY} def
+ /CoeffX {Coeff_cylindricalX} def
+ /StartY -85 def
+ \or % type 6 % hv 2004-05-04
+ /CoeffY {Coeff_babinetY} def
+ /CoeffX {Coeff_babinetX} def
+ /StartY -90 def
+ \or % type 7 % hv 2004-05-04
+ /CoeffY {Coeff_collignonY} def
+ /CoeffX {Coeff_collignonX} def
+ /StartY -90 def
+ \else % every other is type 8 % hv 2004-05-04
+ /CoeffY {Coeff_BonneY} def
+ /CoeffX {Coeff_BonneX} def
+ /StartY -90 def
+ \fi
+ /step \psk@geo@level\space def % hv 2004-05-04
+ /increment \psk@geo@increment\space def
+ \or % 3d
+ /RotX \psk@geo@RotX\space def
+ /RotY \psk@geo@RotY\space def
+ /RotZ \psk@geo@RotZ\space def
+ /THETA \psk@geo@Theta\space def
+ /PHI \psk@geo@Phi\space def
+ /Rsphere \psk@geo@Radius\space def
+ /Dobs \psk@geo@Dobs\space def
+ /DScreen \psk@geo@Ecran\space def
+ /xunit {\pst@number\psxunit\space mul} def
+ /yunit {\pst@number\psyunit\space mul} def
+ /runit {\pst@number\psrunit\space mul} def
+ \or
+ /RotX \psk@geo@RotX\space def
+ /RotY \psk@geo@RotY\space def
+ /RotZ \psk@geo@RotZ\space def
+ /THETA \psk@geo@Theta\space def
+ /PHI \psk@geo@Phi\space def
+ /Rsphere \psk@geo@Radius\space def
+ /Dobs \psk@geo@Dobs\space def
+ /DScreen \psk@geo@Ecran\space def
+ \fi % \ifcase
+ /level \psk@geo@level\space def % hv 2004-05-04
+ /step \psk@geo@level\space def % hv 2004-05-04
+}
+\newcount\TypeProjection
+\def\WorldMap{\pst@object{WorldMap}}
+\def\WorldMap@i{%
+% \psset{#1}%
+ \begin@ClosedObj
+ \addto@pscode{
+ \geo@variablesMap{0}
+ (\psk@geo@Path/river.dat) run
+ (\psk@geo@Path/pcoast.dat) run
+ (\psk@geo@Path/pisland.dat) run
+ (\psk@geo@Path/pborder.dat) run
+ (\psk@geo@Path/plake.dat) run
+ (\psk@geo@Path/usa.dat) run
+ (\psk@geo@Path/aus.dat) run
+ (\psk@geo@Path/mexico.dat) run
+ 1 setlinejoin 0 0 translate
+ /xunit {\pst@number\psxunit\space mul 20 div } def
+ /yunit {\pst@number\psyunit\space mul 20 div } def
+ /increment \psk@geo@increment\space def
+ /limiteLongitude \psk@geo@limiteL\space def
+%
+ \ifPst@geo@Fill
+ gsave
+ newpath
+ /X limiteLongitude neg def
+ /Y StartY def
+ X CoeffX xunit Y CoeffY yunit moveto
+ StartY 2 StartY neg { /Y exch def X CoeffX xunit Y CoeffY yunit lineto } for
+ /X limiteLongitude def
+ StartY neg -2 StartY { /Y exch def X CoeffX xunit Y CoeffY yunit lineto } for
+ closepath
+% /Color {\psk@geo@Seacolor} def
+% Color setrgbcolor
+ \pst@usecolor\psk@geo@Seacolor fill
+ grestore
+ \fi
+ /CalculsPoints {
+ /region exch def
+ newpath
+ /nbr region length def % nombre de régions
+ region 0 get aload pop
+ /Y exch def /X exch def
+ X CoeffX xunit Y CoeffY yunit moveto
+ /ncount 0 def % hv 2004-05-04
+ 0 1 nbr 1 sub {
+ /ncount ncount 1 add def % hv 2004-05-04
+ region exch get aload pop
+ ncount step mod 0 eq nbr ncount sub 0 lt or { % hv 2004-05-04
+ /Y exch def /X exch def
+ X CoeffX xunit Y CoeffY yunit lineto }{ pop pop } ifelse % hv 2004-05-04
+ } for
+ } def
+%
+ /Draw { {
+ CalculsPoints
+ \ifPst@geo@Fill closepath gsave Color fill grestore \fi
+ stroke
+ } forall
+ } def
+ \ifPst@geo@borders border \else coasts \fi
+ /Color { \pst@usecolor\psk@geo@Fillcolor } def
+ Draw islands Draw
+ \ifPst@geo@Mexico mexico Draw \fi
+ \ifPst@geo@USA usa Draw \fi
+ \ifPst@geo@Australia australia Draw \fi
+ /Color { \pst@usecolor\psk@geo@Lakecolor } def
+ lake Draw
+ \ifPst@geo@rivers
+ /DrawRivers { { CalculsPoints \pst@usecolor\psk@geo@Rivercolor stroke } forall } def
+ river DrawRivers
+ \fi
+%
+ \ifPst@geo@maillage
+ % meridiens
+ limiteLongitude neg increment limiteLongitude {% for X
+ /X exch def
+ newpath
+ /Y StartY def
+ X CoeffX xunit StartY CoeffY yunit moveto
+ StartY increment 10 div StartY neg { % for Y
+ /Y exch def
+ X CoeffX xunit Y CoeffY yunit lineto
+ } for
+ gsave
+ X 0 eq {1 0 0 setrgbcolor}{0.2 setgray} ifelse
+ 0.25 setlinewidth
+ stroke
+ grestore
+ } for
+ % parallèles
+ StartY increment StartY neg {% for Y
+ /Y exch def
+ newpath
+ /X limiteLongitude neg def
+ X CoeffX xunit Y CoeffY yunit moveto
+ limiteLongitude neg increment 10 div limiteLongitude { % for X
+ /X exch def
+ X CoeffX xunit Y CoeffY yunit lineto
+ } for
+ % 11 janvier 2004
+ Y 0 eq {1 0 0 setrgbcolor}{0.2 setgray} ifelse
+ 0.25 setlinewidth
+ stroke
+ } for
+ \fi
+ /DrawCities {
+ /CITY exch def
+ /Rayon exch def
+ /nbr CITY length def % nombre de villes
+ 0 1 nbr 1 sub {
+ /compteur exch def
+ CITY compteur get aload pop
+ /X exch def /Y exch def
+ gsave
+ 1 0 0 setrgbcolor newpath
+ X CoeffX xunit Y CoeffY yunit
+ Rayon 0 360 arc closepath fill
+ grestore
+ } for
+ } def
+ \ifPst@geo@cities (\psk@geo@Path/c-cap.dat) run 1.5 % rayon du point
+ citycapitals DrawCities (\psk@geo@Path/c-sub.dat) run 0.5 % rayon du point
+ CitySub DrawCities
+ \fi
+ \ifPst@geo@capitals (\psk@geo@Path/c-cap.dat) run 1.5 citycapitals DrawCities \fi
+ }% end pscode
+ \end@ClosedObj
+}
+%
+\def\pnodeMap(#1,#2)#3{% hv 2004-05-09
+ \pst@killglue
+ \pnode(!
+ \geo@variablesMap{0}
+ /Y #2 def
+ /X #1 def
+ X CoeffX 20 div Y CoeffY 20 div){#3}%
+}
+%
+%------------------- hv 2004-05-08 ----------------------
+%
+%\mapput[90](2.316667,48.85000){Paris}
+%
+\def\mapput{\@ifnextchar[{\mapput@i}{\mapput@i[90]}}
+\def\mapput@i[#1](#2,#3){\@ifnextchar[{\mapput@iii[#1](#2,#3)}{\mapput@ii[#1](#2,#3)}}
+\def\mapput@ii[#1](#2,#3)#4{\mapput@iii[#1](#2,#3)[#4]{#4}}
+\def\mapput@iii[#1](#2,#3)[#4]#5{%
+ \@ifnextchar[{\mapput@iv[#1](#2,#3)[#4]#5}{\mapput@iv[#1](#2,#3)[#4]#5[\@empty]}}
+\def\mapput@iv[#1](#2,#3)[#4]#5[#6]{{%
+% [angle](longitude,lattitude)[node name]{node label}[country]
+ \def\pst@tempb{all}
+ \ifx\pst@tempb\psk@geo@mapCountry
+ \mapput@v[#1](#2,#3)[#4]{#5}
+ \else
+ \def\pst@tempb{#6}
+% \typeout{Compare \pst@tempb{} with \psk@geo@mapCountry}
+ \ifx\pst@tempb\psk@geo@mapCountry
+ \mapput@v[#1](#2,#3)[#4]{#5}
+ \fi%
+ \fi%
+}}
+\def\mapput@v[#1](#2,#3)[#4]#5{{%
+ \pnodeMap(#2,#3){#4}
+% \typeout{Node: #4}
+ \pst@dima=\psk@geo@nodeWidth
+ \pscircle[style=psNodeMapStyle](#4){\pst@dima}
+ \pscircle*(#4){0.5\pst@dima}
+ \uput{1.2\pst@dima}[#1](#4){\psframebox[style=psNodeMapStyle]{\psNodeLabelStyle #5}}%
+}}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 2DII %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ %
+\newcount\TypeProjection
+\def\WorldMapII{\pst@object{WorldMapII}}
+\def\WorldMapII@i{{%
+ \use@par
+ \begin@ClosedObj
+ \addto@pscode{
+ \geo@variablesMap{1}
+ 1 setlinejoin
+ 0 0 translate
+ /xunit {\pst@number\psxunit\space mul 20 div } def
+ /yunit {\pst@number\psyunit\space mul 20 div } def
+ /limiteLongitude \psk@geo@limiteL\space def
+%
+ /CalculsPoints {
+ /region exch def
+ gsave
+ newpath
+ /nbr region length def % nombre de points
+ region nbr 2 sub get
+ /Y exch def
+ region nbr 1 sub get
+ /X exch def
+ X CoeffX xunit Y CoeffY yunit moveto
+ /ncount 0 def % hv 2004-05-04
+ nbr 2 sub -2 2 {
+ /Counter exch def % hv 2004-05-04
+ /ncount ncount 1 add def % hv 2004-05-04
+ ncount step ge { % hv 2004-05-04
+ region Counter get
+ /Y exch def
+ region Counter 1 add get
+ /X exch def
+ X CoeffX xunit Y CoeffY yunit lineto
+ /ncount 0 def % hv 2004-05-04
+ }{ /ncount ncount 1 add def } ifelse % hv 2004-05-04
+ } for
+ } def
+%
+ /CalculsPointsAsia {
+ /region exch def
+ gsave
+ newpath
+ /nbr region length def % nombre de points
+ region nbr 2 sub get
+ /Y exch def
+ region nbr 1 sub get
+ /X exch def
+ X 0 le {/X X 360 add def} if
+ X CoeffX xunit Y CoeffY yunit moveto
+ /ncount 0 def % hv 2004-05-04
+ nbr 2 sub -2 2 {
+ /Counter exch def % hv 2004-05-04
+ /ncount ncount 1 add def % hv 2004-05-04
+ ncount step ge { % hv 2004-05-04
+ region Counter get
+ /Y exch def
+ region Counter 1 add get
+ /X exch def
+ X 0 le {/X X 360 add def} if
+ X CoeffX xunit Y CoeffY yunit lineto
+ /ncount 0 def % hv 2004-05-04
+ }{ /ncount ncount 1 add def } ifelse % hv 2004-05-04
+ } for
+ } def
+%
+ /Draw {
+ { CalculsPoints
+ stroke
+ } forall
+ } def
+%
+ /DrawAsia {
+ { CalculsPointsAsia
+ stroke
+ } forall
+ } def
+ /DrawRivers {
+ { CalculsPoints
+ gsave
+ 0 0 1 setrgbcolor
+ stroke
+ grestore
+ } forall
+ } def
+%
+ /DrawRiversAsia {
+ { CalculsPointsAsia
+ gsave
+ 0 0 1 setrgbcolor
+ stroke
+ grestore
+ } forall
+ } def
+ /DrawBdy {
+ { CalculsPoints
+ gsave
+ 1 0 0 setrgbcolor
+ stroke
+ grestore
+ } forall
+ } def
+ \ifPst@geo@Europe
+ (\psk@geo@Path/europe-cil_II.dat) run
+ europe-cil
+ Draw
+ \ifPst@geo@rivers
+ (\psk@geo@Path/europe-riv_II.dat) run
+ europe-riv
+ DrawRivers
+ \fi
+ \ifPst@geo@borders
+ (\psk@geo@Path/europe-bdy_II.dat) run
+ europe-bdy
+ DrawBdy
+ \fi
+ \fi
+%
+ \ifPst@geo@Africa
+ (\psk@geo@Path/africa-cil_II.dat) run
+ africa-cil
+ Draw
+ \ifPst@geo@rivers
+ (\psk@geo@Path/africa-riv_II.dat) run
+ africa-riv
+ DrawRivers
+ \fi
+ \ifPst@geo@borders
+ (\psk@geo@Path/africa-bdy_II.dat) run
+ africa-bdy
+ DrawBdy
+ \fi
+ \fi
+%
+ \ifPst@geo@Asia
+ (\psk@geo@Path/asia-cil_II.dat) run
+ asia-cil
+ DrawAsia
+ (\psk@geo@Path/asia-isl_II.dat) run
+ asia-isl
+ Draw
+ \ifPst@geo@rivers
+ (\psk@geo@Path/asia-riv_II.dat) run
+ asia-riv
+ DrawRiversAsia
+ \fi
+ \ifPst@geo@borders
+ (\psk@geo@Path/asia-bdy_II.dat) run
+ asia-bdy
+ DrawBdy
+ \fi
+ \fi
+ \ifPst@geo@Northamerica
+ (\psk@geo@Path/northamerica-cil_II.dat) run northamerica-cil Draw
+ \ifPst@geo@rivers
+ (\psk@geo@Path/northamerica-riv_II.dat) run northamerica-riv DrawRivers
+ \fi
+ \ifPst@geo@borders
+ (\psk@geo@Path/northamerica-bdy_II.dat) run
+ (\psk@geo@Path/northamerica-pby_II.dat) run
+ northamerica-bdy
+ DrawBdy
+ northamerica-pby
+ DrawBdy
+ \fi
+ \fi
+ \ifPst@geo@Southamerica
+ (\psk@geo@Path/southamerica-cil_II.dat) run
+ southamerica-cil
+ Draw
+ (\psk@geo@Path/southamerica-arc_II.dat) run
+ southamerica-arc
+ DrawAsia
+ \ifPst@geo@rivers
+ (\psk@geo@Path/southamerica-riv_II.dat) run
+ southamerica-riv
+ DrawRivers
+ \fi
+ \ifPst@geo@borders
+ (\psk@geo@Path/southamerica-bdy_II.dat) run
+ southamerica-bdy
+ DrawBdy
+ \fi
+ \fi
+%
+ \ifPst@geo@maillage
+% meridiens
+ limiteLongitude neg increment limiteLongitude {% for X
+ /X exch def
+ newpath
+ /Y StartY def
+ X CoeffX xunit StartY CoeffY yunit moveto
+ StartY increment 10 div StartY neg { % for Y
+ /Y exch def
+ X CoeffX xunit Y CoeffY yunit lineto
+ } for
+ gsave
+% 11 janvier 2004
+ X 0 eq { 1 0 0 setrgbcolor }{ 0.2 setgray } ifelse
+%
+ 0.25 setlinewidth
+ stroke
+ grestore
+ } for
+% parallèles
+ StartY increment StartY neg {% for Y
+ /Y exch def
+ newpath
+ /X limiteLongitude neg def
+ X CoeffX xunit Y CoeffY yunit moveto
+ limiteLongitude neg increment 10 div limiteLongitude { % for X
+ /X exch def
+ X CoeffX xunit Y CoeffY yunit lineto
+ } for
+% 11 janvier 2004
+ Y 0 eq {1 0 0 setrgbcolor}{0.2 setgray} ifelse
+%
+ 0.25 setlinewidth
+ stroke
+ } for
+ \fi
+ /DrawCities {
+ /CITY exch def
+ /Rayon exch def
+ /nbr CITY length def % nombre de villes
+ 0 1 nbr 1 sub {
+ /compteur exch def
+ CITY compteur get aload pop
+ /X exch def /Y exch def
+ gsave
+ 1 0 0 setrgbcolor newpath
+ X CoeffX xunit Y CoeffY yunit
+ Rayon 0 360 arc closepath fill
+ grestore
+ } for
+ } def
+ \ifPst@geo@cities
+% les capitales
+ (\psk@geo@Path/c-cap.dat) run
+ 1.5 % rayon du point
+ citycapitals
+ DrawCities
+% les autres villes
+ (\psk@geo@Path/c-sub.dat) run
+ 0.5 % rayon du point
+ CitySub
+ DrawCities
+ \fi
+ \ifPst@geo@capitals
+% les capitales
+ (\psk@geo@Path/c-cap.dat) run
+ 1.5
+ citycapitals
+ DrawCities
+ \fi
+ }%
+ \end@ClosedObj
+ }\ignorespaces}
+%
+%%============================================ 3d =======================================================
+%
+\define@key[psset]{pst-geo}{RotX}{\def\psk@geo@RotX{#1}} % rotation autour de Ox en degrés
+\define@key[psset]{pst-geo}{RotY}{\def\psk@geo@RotY{#1}} % rotation autour de Oy en degrés
+\define@key[psset]{pst-geo}{RotZ}{\def\psk@geo@RotZ{#1}} % rotation autour de OZ en degrés
+\define@key[psset]{pst-geo}{Radius}{\def\psk@geo@Radius{#1}} % rayon de la sphère
+%
+\define@key[psset]{pst-geo}{THETA}{\def\psk@geo@Theta{#1}}
+\define@key[psset]{pst-geo}{PHI}{\def\psk@geo@Phi{#1}}
+\define@key[psset]{pst-geo}{Dobs}{\def\psk@geo@Dobs{#1}}
+\define@key[psset]{pst-geo}{Decran}{\def\psk@geo@Ecran{#1}}
+\psset[pst-geo]{THETA=0,PHI=45,Dobs=20,Decran=25,RotX=0,RotY=0,RotZ=0,Radius=5}
+%
+\define@key[psset]{pst-geo}{Day}{\def\psk@geo@J{#1}}
+\define@key[psset]{pst-geo}{Month}{\def\psk@geo@M{#1}}
+\define@key[psset]{pst-geo}{Year}{\def\psk@geo@A{#1}}
+\define@key[psset]{pst-geo}{hour}{\def\psk@geo@hour{#1}}
+\psset[pst-geo]{Day=\number\day,Month=\number\month,Year=\number\year,hour=12}
+%
+\define@key[psset]{pst-geo}{gridmapdiv}{\def\psk@geo@mapgriddiv{#1}}
+\define@key[psset]{pst-geo}{longitudeMeridien}{\def\psk@geo@longitudeMeridien{#1}}
+\newdimen\psmeridienwidth
+\define@key[psset]{pst-geo}{meridienwidth}[1pt]{\pssetlength\psmeridienwidth{#1}}
+\define@key[psset]{pst-geo}{meridiencolor}[red]{\pst@getcolor{#1}\psmeridiencolor}
+\psset[pst-geo]{meridiencolor=red,meridienwidth=1pt,longitudeMeridien=0,gridmapdiv=10}
+%
+\define@key[psset]{pst-geo}{latitudeParallel}[0]{\def\psk@geo@latitudeParallel{#1}}
+\newdimen\psparallelwidth
+\define@key[psset]{pst-geo}{parallelwidth}[1pt]{\pssetlength\psparallelwidth{#1}}
+\define@key[psset]{pst-geo}{parallelcolor}{\pst@getcolor{#1}\psparallelcolor}
+\psset[pst-geo]{parallelcolor=red,latitudeParallel=0,parallelwidth=1pt}
+%
+\definecolor{terre}{rgb}{0.99,0.95,0.7}
+\definecolor{mer}{rgb}{0.5,0.8,0.8}
+\definecolor{darkblue}{cmyk}{1,1,0,0.7}
+
+\define@key[psset]{pst-geo}{mapcolor}{\pst@getcolor{#1}\psmapcolor}
+\define@key[psset]{pst-geo}{bordercolor}[black]{\pst@getcolor{#1}\psbordercolor}
+\define@key[psset]{pst-geo}{islandcolor}[black]{\pst@getcolor{#1}\psislandcolor}
+\define@key[psset]{pst-geo}{coastcolor}[black]{\pst@getcolor{#1}\pscoastcolor}
+\psset[pst-geo]{mapcolor=terre,bordercolor=black,islandcolor=black,coastcolor=black}
+\define@key[psset]{pst-geo}{oceancolor}{\pst@getcolor{#1}\psoceancolor}
+\psset[pst-geo]{oceancolor=mer}
+\define@key[psset]{pst-geo}{rivercolor}{\pst@getcolor{#1}\psrivercolor}
+\psset[pst-geo]{rivercolor=blue}
+\define@key[psset]{pst-geo}{wfraczoncolor}{\pst@getcolor{#1}\pswfraczoncolor}
+\psset[pst-geo]{wfraczoncolor=red}
+\define@key[psset]{pst-geo}{wmaglincolor}{\pst@getcolor{#1}\pswmaglincolor}
+\psset[pst-geo]{wmaglincolor=darkblue}
+\define@key[psset]{pst-geo}{ridgecolor}{\pst@getcolor{#1}\psridgecolor}
+\psset[pst-geo]{ridgecolor=red}
+\define@key[psset]{pst-geo}{transfrmcolor}{\pst@getcolor{#1}\pstransfrmcolor}
+\psset[pst-geo]{transfrmcolor=orange}
+\define@key[psset]{pst-geo}{trenchcolor}{\pst@getcolor{#1}\pstrenchcolor}
+\psset[pst-geo]{trenchcolor=darkgreen}
+\define@key[psset]{pst-geo}{gridmapcolor}{\pst@getcolor{#1}\psgridmapcolor}
+\psset[pst-geo]{gridmapcolor=black}
+\define@key[psset]{pst-geo}{circlecolor}{\pst@getcolor{#1}\pscirclecolor}
+\psset[pst-geo]{circlecolor=blue}
+\define@key[psset]{pst-geo}{circlesep}{\def\psk@geo@circlesep{#1}}
+\psset[pst-geo]{circlesep=2} % en degres
+\newdimen\pscirclewidth
+\define@key[psset]{pst-geo}{circlewidth}{\pssetlength\pscirclewidth{#1}}
+\psset[pst-geo]{circlewidth=.5pt}
+\newdimen\psgridmapwidth
+\define@key[psset]{pst-geo}{gridmapwidth}[0.8pt]{\pssetlength\psgridmapwidth{#1}}
+\psset[pst-geo]{gridmapwidth=.8pt}
+\newdimen\psborderwidth
+\define@key[psset]{pst-geo}{borderwidth}[0.8pt]{\pssetlength\psborderwidth{#1}}
+\psset[pst-geo]{borderwidth=.8pt}
+\newdimen\pscoastwidth
+\define@key[psset]{pst-geo}{coastwidth}[0.8pt]{\pssetlength\pscoastwidth{#1}}
+\psset[pst-geo]{coastwidth=.8pt}
+\newdimen\pswfraczonwidth
+\define@key[psset]{pst-geo}{wfraczonwidth}[0.8pt]{\pssetlength\pswfraczonwidth{#1}}
+\psset[pst-geo]{wfraczonwidth=.8pt}
+\newdimen\pswmaglinwidth
+\define@key[psset]{pst-geo}{wmaglinwidth}[0.8pt]{\pssetlength\pswmaglinwidth{#1}}
+\psset[pst-geo]{wmaglinwidth=.8pt}
+\newdimen\psridgewidth
+\define@key[psset]{pst-geo}{ridgewidth}[2pt]{\pssetlength\psridgewidth{#1}}
+\psset[pst-geo]{ridgewidth=2pt}
+%
+\define@boolkey[psset]{pst-geo}[Pst@geo@]{islands}[true]{}
+\define@boolkey[psset]{pst-geo}[Pst@geo@]{France}[true]{}
+\define@boolkey[psset]{pst-geo}[Pst@geo@]{Germany}[true]{}
+\define@boolkey[psset]{pst-geo}[Pst@geo@]{Canada}[true]{}
+\define@boolkey[psset]{pst-geo}[Pst@geo@]{lakes}[true]{}
+\psset{islands,France=false,Canada=false,lakes=false,Germany=false}
+%
+\define@boolkey[psset]{pst-geo}[Pst@geo@]{gridmap}[true]{}
+\define@boolkey[psset]{pst-geo}[Pst@geo@]{coasts}[true]{}
+\define@boolkey[psset]{pst-geo}[Pst@geo@]{wfraczon}[true]{}
+\define@boolkey[psset]{pst-geo}[Pst@geo@]{ridge}[true]{}
+\define@boolkey[psset]{pst-geo}[Pst@geo@]{wmaglin}[true]{}
+\psset{gridmap,coasts=false,wfraczon=false,ridge=false,wmaglin=false}
+%
+\define@boolkey[psset]{pst-geo}[Pst@geo@]{circles}[true]{}
+\define@boolkey[psset]{pst-geo}[Pst@geo@]{visibility}[true]{}
+\define@boolkey[psset]{pst-geo}[Pst@geo@]{blueEarth}[true]{}
+\define@boolkey[psset]{pst-geo}[Pst@geo@]{daynight}[true]{}
+\psset{circles,visibility,blueEarth,daynight=false}
+%
+\def\WorldMapThreeD{\pst@object{WorldMapThreeD}}
+\def\WorldMapThreeD@i{%
+\begin@ClosedObj
+\addto@pscode{
+ /increment \psk@geo@mapgriddiv\space def
+ \geo@variablesMap{2}
+ /mapcolor {\pst@usecolor\psmapcolor currentrgbcolor} def
+ /bordercolor {\pst@usecolor\psbordercolor currentrgbcolor} def
+ /coastcolor {\pst@usecolor\pscoastcolor currentrgbcolor} def
+ /islandcolor {\pst@usecolor\psislandcolor currentrgbcolor} def
+ /maillagecolor {\pst@usecolor\psgridmapcolor currentrgbcolor} def
+ /oceancolor {\pst@usecolor\psoceancolor currentrgbcolor} def
+ /rivercolor {\pst@usecolor\psrivercolor currentrgbcolor} def
+ /wfraczoncolor {\pst@usecolor\pswfraczoncolor currentrgbcolor} def
+ /wmaglincolor {\pst@usecolor\pswmaglincolor currentrgbcolor} def
+ /ridgecolor {\pst@usecolor\psridgecolor currentrgbcolor} def
+ /transfrmcolor {\pst@usecolor\pstransfrmcolor currentrgbcolor} def
+ /trenchcolor {\pst@usecolor\pstrenchcolor currentrgbcolor} def
+ /circlecolor {\pst@usecolor\pscirclecolor currentrgbcolor} def
+ /circlewidth {\pst@number\pscirclewidth SLW} def
+ /circlesep \psk@geo@circlesep\space def
+ /maillagewidth {\pst@number\psgridmapwidth SLW} def
+ /borderwidth {\pst@number\psborderwidth SLW} def
+ /coastwidth {\pst@number\pscoastwidth SLW} def
+ /wfraczonwidth {\pst@number\pswfraczonwidth SLW} def
+ /wmaglinwidth {\pst@number\pswmaglinwidth SLW} def
+ /ridgewidth {\pst@number\psridgewidth SLW} def
+ /longitude_meridien \psk@geo@longitudeMeridien\space def
+ /meridienwidth {\pst@number\psmeridienwidth SLW} def
+ /meridiencolor {\pst@usecolor\psmeridiencolor currentrgbcolor} def
+ /latitude_parallel \psk@geo@latitudeParallel\space def
+ /parallelwidth {\pst@number\psparallelwidth SLW} def
+ /parallelcolor {\pst@usecolor\psparallelcolor currentrgbcolor} def
+ /year \psk@geo@A\space def
+ /month \psk@geo@M\space def
+ /day \psk@geo@J\space def
+ month 3 lt {/month month 12 add def /year year 1 sub def} if
+ /AA year 100 div truncate def
+ /BB 2 AA sub AA 4 div truncate add def
+ /CC 365.25 year mul truncate def
+ /DD 30.6001 month 1 add mul truncate def
+ /julien BB CC add DD add day add 1720994.5 add def
+ /hour \psk@geo@hour\space def
+ /jours julien 2454367 sub def
+ /AngleRayonsSoleil latitude_parallel 23.5 sin 360 jours mul 365.25 div sin mul arccos sub def
+ /u1 0 def /u2 AngleRayonsSoleil cos def /u3 AngleRayonsSoleil sin def
+% /Julien jd hour 24 div add def
+ %
+ 1 setlinejoin
+ 0 0 translate
+ /pst@fill { \psk@opacityalpha .setopacityalpha fill } def
+ tx@geoDict begin
+ MatriceTransformationZXY
+%
+ /RsphereScreen Rsphere DScreen mul Dobs div
+ 1 Rsphere dup mul Dobs dup mul div sub sqrt div runit def
+%
+/GrandCercle {
+ % cercle vu par l'observateur
+ 0 0 RsphereScreen 0 360 arc
+ closepath
+} def
+%
+\ifPst@geo@visibility
+ /condition { 0 ge } def
+\else
+ /condition { 0 le } def
+\fi
+%
+\ifPst@geo@daynight
+ the_night
+\fi
+%
+\ifPst@geo@blueEarth
+ gsave
+ newpath
+ oceancolor
+ GrandCercle
+ pst@fill % fill
+ grestore
+\fi
+%
+\ifPst@geo@circles
+gsave
+ oceans_seas_hatched
+grestore
+\fi
+%
+\ifPst@geo@borders
+ (\psk@geo@Path/pborder.dat) run
+gsave
+GrandCercle
+clip
+border dup /REGION exch def
+CompteurRegions
+{CalculsPointsRegion
+ closepath
+ gsave
+ mapcolor
+ pst@fill % fill
+ grestore
+ borderwidth
+ bordercolor
+ stroke
+ }forall
+grestore
+\fi
+%
+\ifPst@geo@islands
+ (\psk@geo@Path/pisland.dat) run
+gsave
+GrandCercle
+clip
+islands dup /REGION exch def
+CompteurRegions
+{CalculsPointsRegion
+ closepath
+ gsave
+ mapcolor
+ pst@fill % fill
+ grestore
+ borderwidth
+ islandcolor
+ stroke
+ }forall
+grestore
+\fi
+%
+\ifPst@geo@France
+ (\psk@geo@Path/france.dat) run
+gsave
+GrandCercle
+clip
+france dup /REGION exch def
+CompteurRegions
+{CalculsPointsRegion
+ closepath
+ gsave
+ mapcolor
+ pst@fill % fill
+ grestore
+ borderwidth
+ bordercolor
+ stroke
+ }forall
+grestore
+\fi
+%
+\ifPst@geo@Germany
+ (\psk@geo@Path/germany.dat) run
+ gsave
+ GrandCercle
+ clip
+ germany dup /REGION exch def
+ CompteurRegions
+ {CalculsPointsRegion
+ closepath
+ gsave
+ mapcolor
+ pst@fill % fill
+ grestore
+ borderwidth
+ bordercolor
+ stroke
+ } forall
+grestore
+\fi
+%
+\ifPst@geo@lakes
+ (\psk@geo@Path/plake.dat) run
+gsave
+GrandCercle
+clip
+lake dup /REGION exch def
+CompteurRegions
+{CalculsPointsRegion
+ closepath
+ gsave
+ oceancolor
+ pst@fill % fill
+ grestore
+% borderwidth
+% bordercolor
+0 0 1 setrgbcolor
+ stroke
+ }forall
+grestore
+\fi
+%
+\ifPst@geo@coasts
+ (\psk@geo@Path/pcoast.dat) run
+gsave
+GrandCercle
+clip
+coasts dup /REGION exch def
+CompteurRegions
+{CalculsPointsRegion
+ coastwidth
+ coastcolor
+ stroke
+ }forall
+grestore
+\fi
+%
+\ifPst@geo@USA
+ (\psk@geo@Path/usa.dat) run
+gsave
+GrandCercle
+clip
+usa dup /REGION exch def
+CompteurRegions
+{CalculsPointsRegion
+ closepath
+ gsave
+ mapcolor
+ pst@fill % fill
+ grestore
+ borderwidth
+ bordercolor
+ stroke
+ }forall
+grestore
+\fi
+%
+\ifPst@geo@Mexico
+ (\psk@geo@Path/mex.dat) run
+gsave
+GrandCercle
+clip
+mexico dup /REGION exch def
+CompteurRegions
+{CalculsPointsRegion
+ closepath
+ gsave
+ mapcolor
+ pst@fill % fill
+ grestore
+ borderwidth
+ bordercolor
+ stroke
+ }forall
+grestore
+\fi
+%
+\ifPst@geo@Australia
+ (\psk@geo@Path/aus.dat) run
+gsave
+GrandCercle
+clip
+australia dup /REGION exch def
+CompteurRegions
+{CalculsPointsRegion
+ closepath
+ gsave
+ mapcolor
+ pst@fill % fill
+ grestore
+ borderwidth
+ bordercolor
+ stroke
+ }forall
+grestore
+\fi
+%
+\ifPst@geo@Canada
+ (\psk@geo@Path/canada.dat) run
+gsave
+GrandCercle
+clip
+canada dup /REGION exch def
+CompteurRegions
+{CalculsPointsRegion
+ closepath
+ gsave
+ mapcolor
+ pst@fill % fill
+ grestore
+ borderwidth
+ bordercolor
+ stroke
+ }forall
+grestore
+\fi
+%
+\ifPst@geo@wfraczon
+ (\psk@geo@Path/wfraczon.dat) run
+GrandCercle
+clip
+wfraczon dup /REGION exch def
+CompteurRegions
+{CalculsPointsRegion
+ wfraczoncolor
+ wfraczonwidth
+ stroke}forall
+\fi
+%
+\ifPst@geo@wmaglin
+ (\psk@geo@Path/wmaglin.dat) run
+GrandCercle
+clip
+wmaglin dup /REGION exch def
+CompteurRegions
+{CalculsPointsRegion
+ wmaglincolor
+ wmaglinwidth
+ stroke}forall
+\fi
+%
+\ifPst@geo@ridge
+ (\psk@geo@Path/ridge.dat) run
+gsave
+GrandCercle
+clip
+ridge dup /REGION exch def
+CompteurRegions
+{CalculsPointsRegion
+ ridgecolor
+ ridgewidth
+ stroke}forall
+grestore
+ (\psk@geo@Path/transfrm.dat) run
+gsave
+GrandCercle
+clip
+transfrm dup /REGION exch def
+CompteurRegions
+{CalculsPointsRegion
+ transfrmcolor
+ ridgewidth
+ stroke}forall
+grestore
+ (\psk@geo@Path/trench.dat) run
+gsave
+GrandCercle
+clip
+trench dup /REGION exch def
+CompteurRegions
+{CalculsPointsRegion
+ trenchcolor
+ ridgewidth
+ stroke}forall
+grestore
+\fi
+%
+\ifPst@geo@rivers
+ (\psk@geo@Path/river.dat) run
+GrandCercle
+clip
+river dup /REGION exch def
+CompteurRegions
+{CalculsPointsRegion
+ rivercolor
+ stroke}forall
+\fi
+%
+\ifPst@geo@cities
+% les capitales
+ (\psk@geo@Path/c-cap.dat) run
+ 1.5
+ citycapitals
+ DrawCities
+% les autres villes
+ (\psk@geo@Path/c-sub.dat) run
+ 0.5
+ CitySub
+DrawCities
+\fi
+\ifPst@geo@capitals
+% les capitales
+ (\psk@geo@Path/c-cap.dat) run
+ 2
+ citycapitals
+ DrawCities
+\fi
+%
+\ifPst@geo@gridmap
+ MaillageSphere
+\fi
+end
+}%
+\end@ClosedObj}
+% placer une ville en particulier
+% par sa longitude et sa latitude en degrés
+% si la ville n'est pas visible
+% elle est rejetée hors de l'écran
+\def\pnodeMapIIID{\pst@object{pnodeMapIIID}}
+\def\pnodeMapIIID@i(#1,#2)#3{%
+ \begin@SpecialObj
+ \pnode(!
+ \geo@variablesMap{2}
+ tx@geoDict begin
+ MatriceTransformationZXY
+ /Xpoint {#2 cos #1 cos mul Rsphere mul} def
+ /Ypoint {#2 cos #1 sin mul Rsphere mul} def
+ /Zpoint {#2 sin Rsphere mul } def
+ CalculsPointsAfterTransformations
+% CalcCoordinates
+% /YcoorCity exch def /XcoorCity exch def
+% Test
+% PS 0 ge %
+% {XcoorCity YcoorCity }
+% {/XcoorCity 1000 def /YcoorCity 1000 def}
+% ifelse
+formulesTroisD
+ Xi Yi end){#3}%
+ \end@SpecialObj%
+ \ignorespaces}%
+%
+%
+\def\mapputIIID{\@ifnextchar[{\mapputIIID@i}{\mapputIIID@i[90]}}
+\def\mapputIIID@i[#1](#2,#3){\@ifnextchar[{\mapputIIID@iii[#1](#2,#3)}{\mapputIIID@ii[#1](#2,#3)}}
+\def\mapputIIID@ii[#1](#2,#3)#4{\mapputIIID@iii[#1](#2,#3)[#4]{#4}}
+\def\mapputIIID@iii[#1](#2,#3)[#4]#5{%
+ \@ifnextchar[{\mapputIIID@iv[#1](#2,#3)[#4]#5}{\mapputIIID@iv[#1](#2,#3)[#4]#5[\@empty]}}
+\def\mapputIIID@iv[#1](#2,#3)[#4]#5[#6]{{%
+% [angle](longitude,lattitude)[node name]{node label}[country]
+ \def\pst@tempb{all}
+ \ifx\pst@tempb\psk@geo@mapCountry
+ \mapputIIID@v[#1](#2,#3)[#4]{#5}%
+ \else
+ \def\pst@tempb{#6}%
+% \typeout{Compare \pst@tempb{} with \psk@geo@mapCountry}
+ \ifx\pst@tempb\psk@geo@mapCountry
+ \mapputIIID@v[#1](#2,#3)[#4]{#5}
+ \fi%
+ \fi%
+}}
+\def\mapputIIID@v[#1](#2,#3)[#4]#5{%
+ \pnodeMapIIID(#2,#3){#4}
+ \pst@dima=\psk@geo@nodeWidth
+ \pscircle[style=psNodeMapStyle](#4){\pst@dima}
+ \pscircle*(#4){0.5\pst@dima}
+ \ifx\relax#5\relax\else
+ \uput{1.2\pst@dima}[#1](#4){\psframebox[style=psNodeMapStyle]{#5}}%
+ \fi}
+%
+% dessiner un méridien de longitude donnée
+% longitude en degrés
+\def\psmeridien{\pst@object{psmeridien}}
+\def\psmeridien@i#1{%
+ \pst@killglue
+ \begingroup
+ \begin@SpecialObj%
+ \addto@pscode{%
+ \geo@variablesMap{2}
+ /longitude_meridien #1 def
+ /meridienwidth {\pst@number\psmeridienwidth SLW} def
+ /meridiencolor {\pst@usecolor\psmeridiencolor currentrgbcolor} def
+ tx@geoDict begin
+ MatriceTransformationZXY
+ \ifPst@geo@visibility
+ /condition { 0 ge } def
+ \else
+ /condition { 0 le } def
+ \fi
+ meridien
+ end}%
+ \end@SpecialObj%
+ \endgroup%
+ \ignorespaces%
+}
+%
+% dessiner un cercle parallèle à l'équateur de latitude donnée
+% latitude en degrés
+\def\psparallel{\pst@object{psparallel}}
+\def\psparallel@i#1{%
+ \pst@killglue
+ \begingroup
+ \begin@SpecialObj%
+ \addto@pscode{%
+ \geo@variablesMap{2}
+ /latitude_parallel #1 def
+ /parallelwidth {\pst@number\psparallelwidth SLW} def
+ /parallelcolor {\pst@usecolor\psparallelcolor currentrgbcolor} def
+ tx@geoDict begin
+ MatriceTransformationZXY
+ \ifPst@geo@visibility
+ /condition { 0 ge } def
+ \else
+ /condition { 0 le } def
+ \fi
+ Parallel
+ parallelwidth
+ parallelcolor
+ stroke
+ end}%
+ \end@SpecialObj%
+ \endgroup%
+ \ignorespaces%
+}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% le dessin du globe tellure
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\newpsstyle{Globe}{circles=true}
+\newpsstyle{night}{fillstyle=solid,fillcolor=black,opacity=0.8}
+\define@key[psset]{pst-geo}{styleGlobe}{\def\psk@styleGlobe{#1}}
+\define@key[psset]{pst-geo}{styleNight}{\def\psk@styleNight{#1}}
+\psset[pst-geo]{styleGlobe=Globe,styleNight=night}
+
+\def\psGlobeTellure{\pst@object{psGlobeTellure}}
+\def\psGlobeTellure@i(#1,#2)#3{% longitude, latitude et nom de la ville
+ \begin@SpecialObj%
+ \pnode(!/ux 0 def /uy 90 #2 sub sin def /uz 90 #2 sub cos def 0 0){ttt}%
+ \psset{THETA=0,PHI=0}%
+ {\psset{RotX=#2 90 sub,RotZ=90 #1 add}
+ \WorldMapThreeD[style=\psk@styleGlobe,daynight=false]%
+ \mapputIIID(#1,#2){#3}}%
+ \WorldMapThreeD[style=\psk@styleNight,daynight=true,circles=false,blueEarth=false,
+ borders=false,islands=false,
+ rivers=false,lakes=false,
+ gridmap=false,latitudeParallel=#2]%
+ \psframe*(! -3 \psk@geo@Radius\space neg -1.5 add)(!3 \psk@geo@Radius\space neg -0.5 add)
+ \rput(! 0 \psk@geo@Radius\space neg -1 add){\white\psk@geo@hour h le \psk@geo@J/\psk@geo@M/\psk@geo@A}
+ \end@SpecialObj%
+ \ignorespaces}%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% épicentre d'un tremblement de terre
+% Earthquake Epicenters
+%
+\define@key[psset]{pst-geo}{waves}{\edef\psk@geo@waves{#1}}
+\psset{waves=3} % nombre de cercles concentriques
+\define@key[psset]{pst-geo}{Rmax}{\edef\psk@geo@Rmax{#1}}
+\psset{Rmax=1500} % rayon maximum du séisme en km
+
+\def\psepicenter{\pst@object{psepicenter}}
+\def\psepicenter@i(#1,#2)#3{%
+ \begin@ClosedObj%
+ \addto@pscode{
+ \geo@variablesMap{2}
+ /longitude #1 def
+ /latitude #2 def
+ /nbre \psk@geo@waves\space def
+ /dphi \psk@geo@Rmax\space 0.008983 mul def
+ /circlecolor {\pst@usecolor\pscirclecolor currentrgbcolor} def
+ /circlewidth {\pst@number\pscirclewidth SLW} def
+ tx@geoDict begin
+ circlecolor
+ circlewidth
+ nbre dphi longitude latitude
+ ondes
+ end }%
+ \ifx\relax#3\relax\else\mapputIIID(#1,#2){#3}\fi%
+ \end@ClosedObj%
+ \ignorespaces}
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 3dII %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+\def\WorldMapThreeDII{\pst@object{WorldMapThreeDII}}
+\def\WorldMapThreeDII@i{%
+ \addbefore@par{fillstyle=solid}
+ \begin@ClosedObj
+ \addto@pscode{
+ \geo@variablesMap{3}
+ 1 setlinejoin
+ 0 0 translate
+ /increment \psk@geo@increment\space def
+ /xunit {\pst@number\psxunit\space mul}def
+ /yunit {\pst@number\psyunit\space mul}def
+ /runit {\pst@number\psrunit\space mul}def
+ /pst@fill { \psk@opacityalpha .setopacityalpha fill } def
+ gsave
+ newpath
+ 0.7 0.9 0.9 setrgbcolor
+% cercle vu par l'observateur
+ /RsphereScreen Rsphere DScreen mul Dobs div
+ 1 Rsphere dup mul Dobs dup mul div sub sqrt div runit def
+ 0 0 RsphereScreen 0 360 arc
+ closepath
+ \ifx\psk@fillstyle\relax\else fill \fi
+ grestore
+ /condition {PSfacette 0 le} def
+ /departPhi -90 def
+ tx@geoIIDict begin
+ MatriceTransformation
+ /Draw {
+ { CalculsPoints
+ stroke
+ } forall
+ }def
+%
+ /DrawRivers {
+ { CalculsPoints
+ gsave
+ 0 0 1 setrgbcolor
+ CLW 0.25 mul
+ stroke
+ grestore
+ } forall
+ } def
+%
+ /DrawBdy {
+ { CalculsPoints
+ gsave
+ 1 0 0 setrgbcolor
+ stroke
+ grestore
+ } forall
+ } def
+\ifPst@geo@maillage MaillageSphereII \fi
+\ifPst@geo@Europe
+ (\psk@geo@Path/europe-cil_II.dat) run
+ europe-cil
+ Draw
+ \ifPst@geo@rivers
+(\psk@geo@Path/europe-riv_II.dat) run
+ europe-riv
+ DrawRivers
+ \fi
+ \ifPst@geo@borders
+(\psk@geo@Path/europe-bdy_II.dat) run
+ europe-bdy
+ DrawBdy
+ \fi
+\fi
+%
+\ifPst@geo@Africa
+ (\psk@geo@Path/africa-cil_II.dat) run
+ africa-cil
+ Draw
+ \ifPst@geo@rivers
+ (\psk@geo@Path/africa-riv_II.dat) run
+ africa-riv
+ DrawRivers
+ \fi
+ \ifPst@geo@borders
+ (\psk@geo@Path/africa-bdy_II.dat) run
+ africa-bdy
+ DrawBdy
+ \fi
+\fi
+%
+\ifPst@geo@Asia
+ (\psk@geo@Path/asia-cil_II.dat) run
+ asia-cil
+ Draw
+ \ifPst@geo@rivers
+ (\psk@geo@Path/asia-riv_II.dat) run
+ asia-riv
+ DrawRivers
+ \fi
+ \ifPst@geo@borders
+ (\psk@geo@Path/asia-bdy_II.dat) run
+ asia-bdy
+ DrawBdy
+ \fi
+\fi
+%
+\ifPst@geo@Northamerica
+(\psk@geo@Path/northamerica-cil_II.dat) run
+ northamerica-cil
+ Draw
+\ifPst@geo@rivers
+(\psk@geo@Path/northamerica-riv_II.dat) run
+ northamerica-riv
+ DrawRivers
+ \fi
+\ifPst@geo@borders
+(\psk@geo@Path/northamerica-bdy_II.dat) run
+(\psk@geo@Path/northamerica-pby_II.dat) run
+ northamerica-bdy DrawBdy northamerica-pby DrawBdy
+\fi
+\fi
+%
+\ifPst@geo@Southamerica
+(\psk@geo@Path/southamerica-cil_II.dat) run
+ southamerica-cil
+ Draw
+\ifPst@geo@rivers
+(\psk@geo@Path/southamerica-riv_II.dat) run
+ southamerica-riv
+ DrawRivers
+ \fi
+\ifPst@geo@borders
+(\psk@geo@Path/southamerica-bdy_II.dat) run
+ southamerica-bdy
+ DrawBdy
+\fi
+\fi
+%
+\ifPst@geo@cities
+% les capitales
+ (\psk@geo@Path/c-cap.dat) run
+ 1.5 % rayon du point
+ citycapitals
+ DrawCities
+% les autres villes
+ (\psk@geo@Path/c-sub.dat) run
+ 0.5 % rayon du point
+ CitySub
+DrawCities
+\fi
+\ifPst@geo@capitals
+% les capitales
+ (\psk@geo@Path/citycapitals.dat) run
+ 1.5
+ citycapitals
+ DrawCities
+\fi
+end
+}%
+\end@ClosedObj
+\ignorespaces
+}
+%
+
+%
+\catcode`\@=\PstAtCode\relax
+\endinput
diff --git a/Master/texmf-dist/tex/generic/pst-geo/pst-map2d.tex b/Master/texmf-dist/tex/generic/pst-geo/pst-map2d.tex
deleted file mode 100644
index 367bf05b7f3..00000000000
--- a/Master/texmf-dist/tex/generic/pst-geo/pst-map2d.tex
+++ /dev/null
@@ -1,410 +0,0 @@
-%%
-%% This is file `pst-map2d.tex',
-%%
-%% IMPORTANT NOTICE:
-%%
-%% Package `pst-map2d.tex'
-%%
-%% Manuel Luque <Mluque5130@aol.com> (France)
-%% Giuseppe Matarazzo <joematara@hotmail.com> (Italy)
-%% Herbert Voss <voss@perce.de> (Germany)
-%%
-%% September 26, 2008
-%%
-%% This program can be redistributed and/or modified under the terms
-%% of the LaTeX Project Public License Distributed from CTAN archives
-%% in directory macros/latex/base/lppl.txt.
-%%
-%% DESCRIPTION:
-%% `pst-map2d' is a PSTricks package to create geographical objects
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\csname PSTMaptwod\endcsname
-\let\PSTMaptwodLoaded\endinput
-
-% Require PSTricks
-\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi
-\ifx\PSTnodesLoaded\endinput\else\input pst-node.tex\fi
-\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey\fi
-%
-\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
-
-\pst@addfams{pst-map2d}% added 2004-09-29 hv
-%
-\def\fileversion{1.10}
-\def\filedate{2009/08/28}
-\message{`PST-map2d' v\fileversion, \filedate\space (ML/GM/HV)}
-%
-\SpecialCoor
-%
-\define@key[psset]{pst-map2d}{path}{\edef\psk@WorldMap@Path{#1}} % chemin des données
-\psset{path=data}
-%\openin1=chemin.txt
-%\read1 to \psk@WorldMap@Path
-%
-\define@key[psset]{pst-map2d}{level}{\edef\psk@WorldMap@level{#1}}
-\psset{level=1}
-%
-\define@key[psset]{pst-map2d}{type}{\def\psk@WorldMap@type{#1}}
-\psset{type=1}
-% type=1 ==> Mercator
-% type=2 ==> Lambert
-% type=3 ==> simple
-% type=4 ==> Sanson-Flamsteed
-% type=5 ==> cylindrical
-% type=6 ==> Babinet
-% type=7 ==> Collignon
-% type=8 ==> Bonne
-\define@key[psset]{pst-map2d}{n}{\def\psk@WorldMap@n{#1}}
-\psset{n=1.77245} % sqrt(pi) % pour Collignon
-%
-\define@key[psset]{pst-map2d}{limiteL}{\def\psk@WorldMap@limiteL{#1}}
-\psset{limiteL=180} % longitude limite
-%
-\define@key[psset]{pst-map2d}{latitude0}{\def\psk@WorldMap@latitudeO{#1}}
-\psset{latitude0=45} % pour Bonne latitude 0
-%
-\define@key[psset]{pst-map2d}{longitude0}{\def\psk@WorldMap@longitudeO{#1}}
-\psset{longitude0=0} % pour Bonne longitude 0
-%
-\define@key[psset]{pst-map2d}{increment}{\def\psk@WorldMap@increment{#1}}
-\psset{increment=10}
-%
-\define@key[psset]{pst-map2d}{MapFillColor}{\pst@getcolor{#1}\psk@WorldMap@Fillcolor} % couleur des continents
-\psset{MapFillColor={[rgb]{0.99, 0.95, 0.7}}}
-\define@key[psset]{pst-map2d}{SeaFillColor}{\pst@getcolor{#1}\psk@WorldMap@Seacolor} % sea color
-\psset{SeaFillColor={[rgb]{0.5, 0.8, 0.8}}}
-\define@key[psset]{pst-map2d}{LakeFillColor}{\pst@getcolor{#1}\psk@WorldMap@Lakecolor} % lake color
-\psset{LakeFillColor={[rgb]{0.2, 0.2, 0.9}}}
-\define@key[psset]{pst-map2d}{RiverFillColor}{\pst@getcolor{#1}\psk@WorldMap@Rivercolor} % river color
-\psset{RiverFillColor={[rgb]{0, 0, 1}}}
-%
-%\define@boolkey[psset]{pst-3dplot}[Pst@]{Debug}[true]{}%
-\newif\ifPst@WorldMap@capitals
-\define@key[psset]{pst-map2d}{capital}[false]{\@nameuse{Pst@WorldMap@capitals#1}}
-\psset{capital=false}
-%
-\define@boolkey[psset]{pst-map2d}[Pst@WorldMap@]{city}[false]{}
-\psset{city}
-%
-\newif\ifPst@WorldMap@Rivers
-\define@key[psset]{pst-map2d}{rivers}[true]{\@nameuse{Pst@WorldMap@Rivers#1}}
-\psset{rivers}
-%
-\newif\ifPst@WorldMap@Borders
-\define@key[psset]{pst-map2d}{borders}[true]{\@nameuse{Pst@WorldMap@Borders#1}}
-\psset{borders=false}
-%
-\define@boolkey[psset]{pst-map2d}[Pst@WorldMap@]{maillage}[true]{}
-\psset{maillage}
-%
-\define@boolkey[psset]{pst-map2d}[Pst@WorldMap@]{Fill}[true]{}
-\psset{Fill}
-%
-\define@boolkey[psset]{pst-map2d}[Pst@WorldMap@]{USA}[false]{}
-\psset{USA=false}
-%
-\define@boolkey[psset]{pst-map2d}[Pst@WorldMap@]{AUS}[false]{}
-\psset{AUS=false}
-%
-\define@boolkey[psset]{pst-map2d}[Pst@WorldMap@]{MEX}[false]{}
-\psset{MEX=false}
-%
-\def\geo@variablesMap{%
- /Coeff_mercatorY {2 div 45 add dup sin exch cos div ln 57.2958 mul} def % Mercator
- /Coeff_simpleY {1 mul} def % simple
- /Coeff_lambertY {sin 57.2958 mul} def % Lambert
- /Coeff_sanson_flamsteedY {1 mul} def % Sanson_Flamstead
- /Coeff_cylindricalY { dup sin exch cos div 57.2958 mul} def % Cylindrical
- /Coeff_babinetY { sin 2 sqrt mul 57.2958 mul} def % Babinet
- /n \psk@WorldMap@n\space def
- /Coeff_collignonY { 0 ge { 1 2 sqrt 90 Y sub 2 div sin mul sub 57.2958 mul n mul}
- { 1 2 sqrt 90 Y add 2 div sin mul sub 57.2958 mul n mul neg} ifelse }def % Collignon
- /Coeff_BonneY {pop /RHO l0 dup cos exch sin div Y neg l0 add 57.2958 div add def
- /Theta Y cos X L0 sub mul RHO div def
- Theta cos RHO mul neg 57.2958 mul}def % Bonne
-%
- /Coeff_mercatorX {1 mul} def % Mercator
- /Coeff_simpleX {1 mul} def % simple
- /Coeff_lambertX {1 mul} def % Lambert
- /Coeff_sanson_flamsteedX {Y cos mul} def % Sanson_Flamstead
- /Coeff_cylindricalX { 1 mul } def % Cylindrical
- /Coeff_babinetX { 2 mul 2 sqrt mul 3.1415926 div Y cos mul} def % Babinet
- /Coeff_collignonX { 2 mul 2 sqrt mul 90 Y abs sub 2 div sin mul n div} def % Collignon
- /l0 \psk@WorldMap@latitudeO\space def
- /L0 \psk@WorldMap@longitudeO\space def
- /Coeff_BonneX { pop /RHO l0 dup cos exch sin div Y neg l0 add 57.2958 div add def
- /Theta Y cos X L0 sub mul RHO div def
- Theta sin RHO mul 57.2958 mul } def % Bonne
- \ifcase\psk@WorldMap@type\or
- /CoeffY {Coeff_mercatorY} def
- /CoeffX {Coeff_mercatorX} def
- /StartY -85 def
- \or
- /CoeffY {Coeff_simpleY} def
- /CoeffX {Coeff_simpleX} def
- /StartY -90 def
- \or
- /CoeffY {Coeff_lambertY} def
- /CoeffX {Coeff_lambertX} def
- /StartY -90 def
- \or
- /CoeffY {Coeff_sanson_flamsteedY} def
- /CoeffX {Coeff_sanson_flamsteedX} def
- /StartY -90 def
- \or
- /CoeffY {Coeff_cylindricalY} def
- /CoeffX {Coeff_cylindricalX} def
- /StartY -85 def
- \or
- /CoeffY {Coeff_babinetY} def
- /CoeffX {Coeff_babinetX} def
- /StartY -90 def
- \or
- /CoeffY {Coeff_collignonY} def
- /CoeffX {Coeff_collignonX} def
- /StartY -90 def
- \or
- /CoeffY {Coeff_BonneY} def
- /CoeffX {Coeff_BonneX} def
- /StartY -90 def
- \fi%
- /step \psk@WorldMap@level\space def % hv 2004-05-04
-}
-\newcount\TypeProjection
-\def\WorldMap{\pst@object{WorldMap}}
-\def\WorldMap@i{\@ifnextchar[{\WorldMap@do}{\WorldMap@do[]}}
-\def\WorldMap@do[#1]{{%
- \psset{#1}%
- \begin@ClosedObj
- \addto@pscode{%
- \geo@variablesMap
- (\psk@WorldMap@Path/river.dat) run
- (\psk@WorldMap@Path/pcoast.dat) run
- (\psk@WorldMap@Path/pisland.dat) run
- (\psk@WorldMap@Path/pborder.dat) run
- (\psk@WorldMap@Path/plake.dat) run
- (\psk@WorldMap@Path/usa.dat) run
- (\psk@WorldMap@Path/aus.dat) run
- (\psk@WorldMap@Path/mex.dat) run
- 1 setlinejoin
- 0 0 translate
- /xunit {\pst@number\psxunit\space mul 20 div }def
- /yunit {\pst@number\psyunit\space mul 20 div }def
- /increment \psk@WorldMap@increment\space def
- /limiteLongitude \psk@WorldMap@limiteL\space def
-%
- \ifPst@WorldMap@Fill
- gsave
- newpath
- /X limiteLongitude neg def
- /Y StartY def
- X CoeffX xunit Y CoeffY yunit moveto
- StartY 2 StartY neg {%
- /Y exch def
- X CoeffX xunit Y CoeffY yunit lineto
- } for
- /X limiteLongitude def
- StartY neg -2 StartY {
- /Y exch def
- X CoeffX xunit Y CoeffY yunit lineto
- } for
- closepath
-% /Color {\psk@WorldMap@Seacolor} def
-% Color setrgbcolor
- \pst@usecolor\psk@WorldMap@Seacolor
- fill
- grestore
- \fi
- /CalculsPoints {
- /region exch def
- newpath
- /nbr region length def % nombre de régions
- region 0 get aload pop
- /Y exch def /X exch def
- X CoeffX xunit Y CoeffY yunit moveto
- /ncount 0 def % hv 2004-05-04
- 0 1 nbr 1 sub {
- /ncount ncount 1 add def % hv 2004-05-04
- region exch get aload pop
- ncount step mod 0 eq nbr ncount sub 0 lt or { % hv 2004-05-04
- /Y exch def /X exch def
- X CoeffX xunit Y CoeffY yunit lineto
- }{ pop pop } ifelse % hv 2004-05-04
- } for
- } def
-%
- /Draw { {
- CalculsPoints
- \ifPst@WorldMap@Fill
- closepath
-% Colour in earth's surfaces
- gsave
-% Color setrgbcolor
- Color
- fill
- grestore
- \fi
- stroke
- } forall
- } def
-\ifPst@WorldMap@Borders
- border
-\else
- coasts
-\fi
-/Color { \pst@usecolor\psk@WorldMap@Fillcolor } def
- Draw
-islands
- Draw
-\ifPst@WorldMap@MEX
-mexico
- Draw
-\fi
-\ifPst@WorldMap@USA
-usa
- Draw
-\fi
-\ifPst@WorldMap@AUS
-australia
- Draw
-\fi
-/Color { \pst@usecolor\psk@WorldMap@Lakecolor } def
-lake
- Draw
-% les rivières
-\ifPst@WorldMap@Rivers
-/DrawRivers {
- {
- CalculsPoints
- \pst@usecolor\psk@WorldMap@Rivercolor
- stroke
- } forall
-} def
-%
-river
-DrawRivers
-\fi
-%
-\ifPst@WorldMap@maillage
-% meridiens
-limiteLongitude neg increment limiteLongitude {% for X
- /X exch def
- newpath
- /Y StartY def
- X CoeffX xunit StartY CoeffY yunit moveto
-StartY increment 10 div StartY neg { % for Y
- /Y exch def
- X CoeffX xunit Y CoeffY yunit lineto
-} for
-gsave
-% 11 janvier 2004
-X 0 eq {1 0 0 setrgbcolor}{0.2 setgray} ifelse
-%
-0.25 setlinewidth
-stroke
-grestore
-} for
-% parallèles
-StartY increment StartY neg {% for Y
- /Y exch def
-newpath
- /X limiteLongitude neg def
- X CoeffX xunit Y CoeffY yunit moveto
-limiteLongitude neg increment 10 div limiteLongitude { % for X
- /X exch def
- X CoeffX xunit Y CoeffY yunit lineto
-} for
-% 11 janvier 2004
-Y 0 eq {1 0 0 setrgbcolor}{0.2 setgray} ifelse
-%
-0.25 setlinewidth
-stroke
-} for
-\fi
-/DrawCitys {
-/CITY exch def
-/Rayon exch def
-/nbr CITY length def % nombre de villes
-0 1 nbr 1 sub {
- /compteur exch def
- CITY compteur get aload pop
- /X exch def /Y exch def
- gsave
- 1 0 0 setrgbcolor newpath
- X CoeffX xunit Y CoeffY yunit
- Rayon 0 360 arc closepath fill
- grestore
-} for
-} def
-\ifPst@WorldMap@city
-% les capitales
- (\psk@WorldMap@Path/c-cap.dat) run
- 1.5 % rayon du point
- citycapitals
- DrawCitys
-% les autres villes
- (\psk@WorldMap@Path/c-sub.dat) run
- 0.5 % rayon du point
- CitySub
-DrawCitys
-\fi
-\ifPst@WorldMap@capitals
-% les capitales
- (\psk@WorldMap@Path/c-cap.dat) run
- 1.5
- citycapitals
- DrawCitys
-\fi
-}%
-\end@ClosedObj
-}}
-%
-\def\pnodeMap(#1,#2)#3{% hv 2004-05-09
- \pst@killglue
- \pnode(!
- \geo@variablesMap
- /Y #2 def
- /X #1 def
- X CoeffX 20 div Y CoeffY 20 div){#3}%
-}
-%
-%------------------- hv 2004-05-08 ----------------------
-\def\psNodeLabelStyle{}
-\define@key[psset]{pst-map2d}{mapCountry}{\edef\psk@WorldMap@mapCountry{#1}}
-\psset{mapCountry=all}
-\define@key[psset]{pst-map2d}{nodeWidth}{\edef\psk@WorldMap@nodeWidth{#1}}
-\psset{nodeWidth=1mm}
-\newpsstyle{psNodeMapStyle}{fillstyle=solid,fillcolor=red}
-%
-\def\mapput{\@ifnextchar[{\mapput@i}{\mapput@i[90]}}
-\def\mapput@i[#1](#2,#3){\@ifnextchar[{\mapput@iii[#1](#2,#3)}{\mapput@ii[#1](#2,#3)}}
-\def\mapput@ii[#1](#2,#3)#4{\mapput@iii[#1](#2,#3)[#4]{#4}}
-\def\mapput@iii[#1](#2,#3)[#4]#5{%
- \@ifnextchar[{\mapput@iv[#1](#2,#3)[#4]#5}{\mapput@iv[#1](#2,#3)[#4]#5[\@empty]}}
-\def\mapput@iv[#1](#2,#3)[#4]#5[#6]{{%
-% [angle](longitude,lattitude)[node name]{node label}[country]
- \def\pst@tempb{all}
- \ifx\pst@tempb\psk@WorldMap@mapCountry
- \mapput@v[#1](#2,#3)[#4]{#5}
- \else
- \def\pst@tempb{#6}
-% \typeout{Compare \pst@tempb{} with \psk@WorldMap@mapCountry}
- \ifx\pst@tempb\psk@WorldMap@mapCountry
- \mapput@v[#1](#2,#3)[#4]{#5}
- \fi%
- \fi%
-}}
-\def\mapput@v[#1](#2,#3)[#4]#5{{%
- \pnodeMap(#2,#3){#4}
-% \typeout{Node: #4}
- \pst@dima=\psk@WorldMap@nodeWidth
- \pscircle[style=psNodeMapStyle](#4){\pst@dima}
- \pscircle*(#4){0.5\pst@dima}
- \uput{1.2\pst@dima}[#1](#4){{\psNodeLabelStyle #5}}%
-}}
-%------------------- hv 2004-05-08 ----------------------
-%
-\catcode`\@=\PstAtCode\relax
-\endinput
diff --git a/Master/texmf-dist/tex/generic/pst-geo/pst-map2dII.tex b/Master/texmf-dist/tex/generic/pst-geo/pst-map2dII.tex
deleted file mode 100644
index 794832b1b98..00000000000
--- a/Master/texmf-dist/tex/generic/pst-geo/pst-map2dII.tex
+++ /dev/null
@@ -1,489 +0,0 @@
-%%
-%% This is file `pst-mapII.tex',
-%%
-%% IMPORTANT NOTICE:
-%%
-%% Package `pst-map2dII.tex'
-%%
-%% Manuel Luque <Mluque5130@aol.com> (France)
-%% Giuseppe Matarazzo <joematara@hotmail.com> (Italy)
-%% Herbert Voss <voss@perce.de> (Germany)
-%%
-%% May 09, 2004
-%%
-%% This program can be redistributed and/or modified under the terms
-%% of the LaTeX Project Public License Distributed from CTAN archives
-%% in directory macros/latex/base/lppl.txt.
-%%
-%% DESCRIPTION:
-%% `pst-map2dII' is a PSTricks package to create geographical objects
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\csname PSTMapTwoDII\endcsname
-\let\PSTMapTwoDIILoaded\endinput
-
-% Require PSTricks
-\ifx\PSTnodesLoaded\endinput\else\input pst-node.tex \fi
-\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey.tex \fi
-%
-%
-\def\fileversion{0.83}
-\def\filedate{2009/08/28}
-\message{`PST-map2dII v\fileversion, \filedate\space (ML/GM/HV)}
-\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
-
-\pst@addfams{pst-map2dII}% added 2005-09-29 hv
-
-\SpecialCoor
-%
-\define@key[psset]{pst-map2dII}{path}{\edef\psk@WorldMap@Path{#1}} % chemin des données
-\psset{path=data}
-%
-\define@key[psset]{pst-map2dII}{type}{\edef\psk@WorldMapII@type{#1}}
-\psset{type=1}
-\define@key[psset]{pst-map2dII}{increment}{\edef\psk@WorldMapII@increment{#1}}
-\psset{increment=10}
-% type=1 ==> Mercator
-% type=2 ==> Lambert
-% type=3 ==> simple
-% type=4 ==> Sanson-Flamsteed
-% type=5 ==> cylindrical
-% type=6 ==> Babinet
-% type=7 ==> Collignon
-% type=8 ==> Bonne
-\define@key[psset]{pst-map2dII}{n}{\edef\psk@WorldMap@n{#1}}
-\psset{n=1.77245} % sqrt(pi) % pour Collignon
-%
-\define@key[psset]{pst-map2dII}{limiteL}{\edef\psk@WorldMap@limiteL{#1}}
-\psset{limiteL=180} % longitude limite
-%
-\define@key[psset]{pst-map2dII}{limiteL}{\edef\psk@WorldMap@limiteL{#1}}
-\psset{limiteL=180} % longitude limite
-%
-\define@key[psset]{pst-map2dII}{latitude0}{\edef\psk@WorldMap@latitudeO{#1}}
-\psset{latitude0=45} % pour Bonne latitude 0
-%
-\define@key[psset]{pst-map2dII}{longitude0}{\edef\psk@WorldMap@longitudeO{#1}}
-\psset{longitude0=0} % pour Bonne longitude 0
-%
-\newif\ifPst@WorldMap@capitals
-\define@key[psset]{pst-map2dII}{capital}[false]{\@nameuse{Pst@WorldMap@capitals#1}}
-\psset{capital=false}
-%
-\newif\ifPst@WorldMap@city
-\define@key[psset]{pst-map2dII}{city}[false]{\@nameuse{Pst@WorldMap@city#1}}
-\psset{city=false}
-%
-\newif\ifPst@WorldMapII@Rivers
-\define@key[psset]{pst-map2dII}{rivers}[true]{\@nameuse{Pst@WorldMapII@Rivers#1}}
-\psset{rivers=false}
-%
-\newif\ifPst@WorldMapII@Borders
-\define@key[psset]{pst-map2dII}{borders}[true]{\@nameuse{Pst@WorldMapII@Borders#1}}
-\psset{borders=true}
-%
-\newif\ifPst@WorldMapII@maillage
-\define@key[psset]{pst-map2dII}{maillage}[true]{\@nameuse{Pst@WorldMapII@maillage#1}}
-\psset{maillage=true}
-%
-\newif\ifPst@WorldMapII@Europe
-\define@key[psset]{pst-map2dII}{europe}[true]{\@nameuse{Pst@WorldMapII@Europe#1}}
-\psset{europe=true}
-%
-\newif\ifPst@WorldMapII@Asia
-\define@key[psset]{pst-map2dII}{asia}[true]{\@nameuse{Pst@WorldMapII@Asia#1}}
-\psset{asia=false}
-%
-\newif\ifPst@WorldMapII@Africa
-\define@key[psset]{pst-map2dII}{africa}[true]{\@nameuse{Pst@WorldMapII@Africa#1}}
-\psset{africa=false}
-%
-\newif\ifPst@WorldMapII@namer
-\define@key[psset]{pst-map2dII}{namer}[true]{\@nameuse{Pst@WorldMapII@namer#1}}
-\psset{namer=false}
-%
-\newif\ifPst@WorldMapII@samer
-\define@key[psset]{pst-map2dII}{samer}[true]{\@nameuse{Pst@WorldMapII@samer#1}}
-\psset{samer=false}
-%
-\newif\ifPst@WorldMapII@all% hv 2004-05-05
-\define@key[psset]{pst-map2dII}{all}[true]{%
- \psset{europe=true,asia=true,africa=true,namer=true,samer=true}
-}
-%
-\define@key[psset]{pst-map2dII}{level}{\edef\psk@WorldMapII@level{#1}}% hv 2004-05-05
-\psset{level=5}% only every 5th data record
-%
-\def\geo@variablesMap{%
- /Coeff_mercatorY { 2 div 45 add dup sin exch cos div ln 57.2958 mul } def % Mercator
- /Coeff_simpleY {1 mul } def % simple
- /Coeff_lambertY {sin 57.2958 mul } def % Lambert
- /Coeff_sanson_flamsteedY {1 mul } def % Sanson_Flamstead
- /Coeff_cylindricalY { dup sin exch cos div 57.2958 mul } def % Cylindrical
- /Coeff_babinetY { sin 2 sqrt mul 57.2958 mul } def % Babinet
- /n \psk@WorldMap@n\space def
- /Coeff_collignonY { 0 ge { 1 2 sqrt 90 Y sub 2 div sin mul sub 57.2958 mul n mul }
- { 1 2 sqrt 90 Y add 2 div sin mul sub 57.2958 mul n mul neg} ifelse } def % Collignon
- /Coeff_BonneY { pop /RHO l0 dup cos exch sin div Y neg l0 add 57.2958 div add def
- /Theta Y cos X L0 sub mul RHO div def
- Theta cos RHO mul neg 57.2958 mul } def % Bonne
- /Coeff_mercatorX {1 mul} def % Mercator
- /Coeff_simpleX {1 mul} def % simple
- /Coeff_lambertX {1 mul} def % Lambert
- /Coeff_sanson_flamsteedX {Y cos mul} def % Sanson_Flamstead
- /Coeff_cylindricalX { 1 mul } def % Cylindrical
- /Coeff_babinetX { 2 mul 2 sqrt mul 3.1415926 div Y cos mul} def % Babinet
- /Coeff_collignonX { 2 mul 2 sqrt mul 90 Y abs sub 2 div sin mul n div } def % Collignon
- /l0 \psk@WorldMap@latitudeO\space def
- /L0 \psk@WorldMap@longitudeO\space def
- /Coeff_BonneX {pop /RHO l0 dup cos exch sin div Y neg l0 add 57.2958 div add def
- /Theta Y cos X L0 sub mul RHO div def
- Theta sin RHO mul 57.2958 mul } def % Bonne
- \ifcase\psk@WorldMapII@type\or % type 1 % hv 2004-05-04
- /CoeffY {Coeff_mercatorY} def
- /CoeffX {Coeff_mercatorX} def
- /StartY -85 def
- \or % type 2 % hv 2004-05-04
- /CoeffY {Coeff_simpleY} def
- /CoeffX {Coeff_simpleX} def
- /StartY -90 def
- \or % type 3 % hv 2004-05-04
- /CoeffY {Coeff_lambertY} def
- /CoeffX {Coeff_lambertX} def
- /StartY -90 def
- \or % type 4 % hv 2004-05-04
- /CoeffY {Coeff_sanson_flamsteedY} def
- /CoeffX {Coeff_sanson_flamsteedX} def
- /StartY -90 def
- \or % type 5 % hv 2004-05-04
- /CoeffY {Coeff_cylindricalY} def
- /CoeffX {Coeff_cylindricalX} def
- /StartY -85 def
- \or % type 6 % hv 2004-05-04
- /CoeffY {Coeff_babinetY} def
- /CoeffX {Coeff_babinetX} def
- /StartY -90 def
- \or % type 7 % hv 2004-05-04
- /CoeffY {Coeff_collignonY} def
- /CoeffX {Coeff_collignonX} def
- /StartY -90 def
- \else % every other is type 8 % hv 2004-05-04
- /CoeffY {Coeff_BonneY} def
- /CoeffX {Coeff_BonneX} def
- /StartY -90 def
- \fi
- /step \psk@WorldMapII@level\space def % hv 2004-05-04
- /increment \psk@WorldMapII@increment\space def
-}
- %
-\newcount\TypeProjection
-\def\WorldMapII{\pst@object{WorldMapII}}
-\def\WorldMapII@i{{%
- \use@par%
- \begin@ClosedObj
- \addto@pscode{
- \geo@variablesMap
- 1 setlinejoin
- 0 0 translate
- /xunit {\pst@number\psxunit\space mul 20 div } def
- /yunit {\pst@number\psyunit\space mul 20 div } def
- /limiteLongitude \psk@WorldMap@limiteL\space def
-%
- /CalculsPoints {
- /region exch def
- gsave
- newpath
- /nbr region length def % nombre de points
- region nbr 2 sub get
- /Y exch def
- region nbr 1 sub get
- /X exch def
- X CoeffX xunit Y CoeffY yunit moveto
- /ncount 0 def % hv 2004-05-04
- nbr 2 sub -2 2 {
- /Counter exch def % hv 2004-05-04
- /ncount ncount 1 add def % hv 2004-05-04
- ncount step ge { % hv 2004-05-04
- region Counter get
- /Y exch def
- region Counter 1 add get
- /X exch def
- X CoeffX xunit Y CoeffY yunit lineto
- /ncount 0 def % hv 2004-05-04
- }{ /ncount ncount 1 add def } ifelse % hv 2004-05-04
- } for
- } def
-%
- /CalculsPointsAsia {
- /region exch def
- gsave
- newpath
- /nbr region length def % nombre de points
- region nbr 2 sub get
- /Y exch def
- region nbr 1 sub get
- /X exch def
- X 0 le {/X X 360 add def} if
- X CoeffX xunit Y CoeffY yunit moveto
- /ncount 0 def % hv 2004-05-04
- nbr 2 sub -2 2 {
- /Counter exch def % hv 2004-05-04
- /ncount ncount 1 add def % hv 2004-05-04
- ncount step ge { % hv 2004-05-04
- region Counter get
- /Y exch def
- region Counter 1 add get
- /X exch def
- X 0 le {/X X 360 add def} if
- X CoeffX xunit Y CoeffY yunit lineto
- /ncount 0 def % hv 2004-05-04
- }{ /ncount ncount 1 add def } ifelse % hv 2004-05-04
- } for
- } def
-%
- /Draw {
- { CalculsPoints
- stroke
- } forall
- } def
-%
- /DrawAsia {
- { CalculsPointsAsia
- stroke
- } forall
- } def
- /DrawRivers {
- { CalculsPoints
- gsave
- 0 0 1 setrgbcolor
- stroke
- grestore
- } forall
- } def
-%
- /DrawRiversAsia {
- { CalculsPointsAsia
- gsave
- 0 0 1 setrgbcolor
- stroke
- grestore
- } forall
- } def
- /DrawBdy {
- { CalculsPoints
- gsave
- 1 0 0 setrgbcolor
- stroke
- grestore
- } forall
- } def
- \ifPst@WorldMapII@Europe
- (\psk@WorldMap@Path/europe-cil.dat) run
- europe-cil
- Draw
- \ifPst@WorldMapII@Rivers
- (\psk@WorldMap@Path/europe-riv.dat) run
- europe-riv
- DrawRivers
- \fi
- \ifPst@WorldMapII@Borders
- (\psk@WorldMap@Path/europe-bdy.dat) run
- europe-bdy
- DrawBdy
- \fi
- \fi
-%
- \ifPst@WorldMapII@Africa
- (\psk@WorldMap@Path/africa-cil.dat) run
- africa-cil
- Draw
- \ifPst@WorldMapII@Rivers
- (\psk@WorldMap@Path/africa-riv.dat) run
- africa-riv
- DrawRivers
- \fi
- \ifPst@WorldMapII@Borders
- (\psk@WorldMap@Path/africa-bdy.dat) run
- africa-bdy
- DrawBdy
- \fi
- \fi
-%
- \ifPst@WorldMapII@Asia
- (\psk@WorldMap@Path/asia-cil.dat) run
- asia-cil
- DrawAsia
- (\psk@WorldMap@Path/asia-isl.dat) run
- asia-isl
- Draw
- \ifPst@WorldMapII@Rivers
- (\psk@WorldMap@Path/asia-riv.dat) run
- asia-riv
- DrawRiversAsia
- \fi
- \ifPst@WorldMapII@Borders
- (\psk@WorldMap@Path/asia-bdy.dat) run
- asia-bdy
- DrawBdy
- \fi
- \fi
- \ifPst@WorldMapII@namer
- (\psk@WorldMap@Path/namer-cil.dat) run
- namer-cil
- Draw
- \ifPst@WorldMapII@Rivers
- (\psk@WorldMap@Path/namer-riv.dat) run
- namer-riv
- DrawRivers
- \fi
- \ifPst@WorldMapII@Borders
- (\psk@WorldMap@Path/namer-bdy.dat) run
- (\psk@WorldMap@Path/namer-pby.dat) run
- namer-bdy
- DrawBdy
- namer-pby
- DrawBdy
- \fi
- \fi
- \ifPst@WorldMapII@samer
- (\psk@WorldMap@Path/samer-cil.dat) run
- samer-cil
- Draw
- (\psk@WorldMap@Path/samer-arc.dat) run
- samer-arc
- DrawAsia
- \ifPst@WorldMapII@Rivers
- (samer-riv.dat) run
- samer-riv
- DrawRivers
- \fi
- \ifPst@WorldMapII@Borders
- (\psk@WorldMap@Path/samer-bdy.dat) run
- samer-bdy
- DrawBdy
- \fi
- \fi
-%
- \ifPst@WorldMapII@maillage
-% meridiens
- limiteLongitude neg increment limiteLongitude {% for X
- /X exch def
- newpath
- /Y StartY def
- X CoeffX xunit StartY CoeffY yunit moveto
- StartY increment 10 div StartY neg { % for Y
- /Y exch def
- X CoeffX xunit Y CoeffY yunit lineto
- } for
- gsave
-% 11 janvier 2004
- X 0 eq { 1 0 0 setrgbcolor }{ 0.2 setgray } ifelse
-%
- 0.25 setlinewidth
- stroke
- grestore
- } for
-% parallèles
- StartY increment StartY neg {% for Y
- /Y exch def
- newpath
- /X limiteLongitude neg def
- X CoeffX xunit Y CoeffY yunit moveto
- limiteLongitude neg increment 10 div limiteLongitude { % for X
- /X exch def
- X CoeffX xunit Y CoeffY yunit lineto
- } for
-% 11 janvier 2004
- Y 0 eq {1 0 0 setrgbcolor}{0.2 setgray} ifelse
-%
- 0.25 setlinewidth
- stroke
- } for
- \fi
- /DrawCitys {
- /CITY exch def
- /Rayon exch def
- /nbr CITY length def % nombre de villes
- 0 1 nbr 1 sub {
- /compteur exch def
- CITY compteur get aload pop
- /X exch def /Y exch def
- gsave
- 1 0 0 setrgbcolor newpath
- X CoeffX xunit Y CoeffY yunit
- Rayon 0 360 arc closepath fill
- grestore
- } for
- } def
- \ifPst@WorldMap@city
-% les capitales
- (\psk@WorldMap@Path/c-cap.dat) run
- 1.5 % rayon du point
- citycapitals
- DrawCitys
-% les autres villes
- (\psk@WorldMap@Path/c-sub.dat) run
- 0.5 % rayon du point
- CitySub
- DrawCitys
- \fi
- \ifPst@WorldMap@capitals
-% les capitales
- (\psk@WorldMap@Path/c-cap.dat) run
- 1.5
- citycapitals
- DrawCitys
- \fi
- }%
- \end@ClosedObj
- }\ignorespaces}
-%
-
-\def\pnodeMap(#1,#2)#3{% hv 2004-05-09
- \pst@killglue
- \pnode(!
- \geo@variablesMap
- /Y #2 def
- /X #1 def
- X CoeffX 20 div Y CoeffY 20 div){#3}%
-}
-%
-%------------------- hv 2004-05-08 ----------------------
-\def\psNodeLabelStyle{}
-\define@key[psset]{pst-map2dII}{mapCountry}{\edef\psk@WorldMap@mapCountry{#1}}
-\psset{mapCountry=all}
-\define@key[psset]{pst-map2dII}{nodeWidth}{\edef\psk@WorldMap@nodeWidth{#1}}
-\psset{nodeWidth=1mm}
-\newpsstyle{psNodeMapStyle}{fillstyle=solid,fillcolor=red}
-%
-\def\mapput{\@ifnextchar[{\mapput@i}{\mapput@i[90]}}
-\def\mapput@i[#1](#2,#3){\@ifnextchar[{\mapput@iii[#1](#2,#3)}{\mapput@ii[#1](#2,#3)}}
-\def\mapput@ii[#1](#2,#3)#4{\mapput@iii[#1](#2,#3)[#4]{#4}}
-\def\mapput@iii[#1](#2,#3)[#4]#5{%
- \@ifnextchar[{\mapput@iv[#1](#2,#3)[#4]#5}{\mapput@iv[#1](#2,#3)[#4]#5[\@empty]}}
-\def\mapput@iv[#1](#2,#3)[#4]#5[#6]{{%
-% [angle](longitude,lattitude)[node name]{node label}[country]
- \def\pst@tempb{all}
- \ifx\pst@tempb\psk@WorldMap@mapCountry
- \mapput@v[#1](#2,#3)[#4]{#5}
- \else
- \def\pst@tempb{#6}
-% \typeout{Compare \pst@tempb{} with \psk@WorldMap@mapCountry}
- \ifx\pst@tempb\psk@WorldMap@mapCountry
- \mapput@v[#1](#2,#3)[#4]{#5}
- \fi%
- \fi%
-}}
-\def\mapput@v[#1](#2,#3)[#4]#5{{%
- \pnodeMap(#2,#3){#4}
-% \typeout{Node: #4}
- \pst@dima=\psk@WorldMap@nodeWidth
- \pscircle[style=psNodeMapStyle](#4){\pst@dima}
- \pscircle*(#4){0.5\pst@dima}
- \uput{1.2\pst@dima}[#1](#4){\psNodeLabelStyle #5}%
-}}
-%------------------- hv 2004-05-08 ----------------------
-%
-\catcode`\@=\PstAtCode\relax
-\endinput
diff --git a/Master/texmf-dist/tex/generic/pst-geo/pst-map3d.tex b/Master/texmf-dist/tex/generic/pst-geo/pst-map3d.tex
deleted file mode 100644
index 4e4344ad592..00000000000
--- a/Master/texmf-dist/tex/generic/pst-geo/pst-map3d.tex
+++ /dev/null
@@ -1,761 +0,0 @@
-%%
-%% This is file `pst-map3d.tex',
-%%
-%% IMPORTANT NOTICE:
-%%
-%% Package `pst-map3d.tex'
-%%
-%% Manuel Luque <Mluque5130@aol.com> (France)
-%% Giuseppe Matarazzo <joematara@hotmail.com> (Italy)
-%% Herbert Voss <hvoss@tug.org> (Germany)
-%%
-%% August 9, 2009
-%%
-%% This program can be redistributed and/or modified under the terms
-%% of the LaTeX Project Public License Distributed from CTAN archives
-%% in directory macros/latex/base/lppl.txt.
-%%
-%% DESCRIPTION:
-%% `pst-map3d' is a PSTricks package to create geographical objects
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% nouvelle version de pst-map3d %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\csname PSTMapThreeD\endcsname
-\let\PSTMapThreeDLoaded\endinput
-
-% Require PSTricks
-\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi
-\ifx\PSTnodesLoaded\endinput\else\input pst-node.tex\fi
-\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey.tex \fi
-
-\def\fileversion{2.03}
-\def\filedate{2009/08/28}
-
-\message{`PST-map3d v\fileversion, \filedate}
-\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
-\pst@addfams{pst-map3d}
-%
-\definecolor{orange}{cmyk}{0,0.61,0.87,0}
-\definecolor{darkgreen}{cmyk}{1,0,1,0.5}
-\SpecialCoor
-%
-\define@key[psset]{pst-map3d}{path}{\def\psk@WorldMap@Path{#1}} % chemin des données
-\psset{path=data}
-%
-\pstheader{pst-map3d.pro}
-\define@key[psset]{pst-map3d}{RotX}{\def\psk@TroisD@RotX{#1}} % rotation autour de Ox en degrés
-\define@key[psset]{pst-map3d}{RotY}{\def\psk@TroisD@RotY{#1}} % rotation autour de Oy en degrés
-\define@key[psset]{pst-map3d}{RotZ}{\def\psk@TroisD@RotZ{#1}} % rotation autour de OZ en degrés
-\define@key[psset]{pst-map3d}{Radius}{\def\psk@TroisD@Radius{#1}} % rayon de la sphère
-%
-\define@key[psset]{pst-map3d}{THETA}{\def\psk@TroisD@Theta{#1}}
-\define@key[psset]{pst-map3d}{PHI}{\def\psk@TroisD@Phi{#1}}
-\define@key[psset]{pst-map3d}{Dobs}{\def\psk@TroisD@Dobs{#1}}
-\define@key[psset]{pst-map3d}{Decran}{\def\psk@TroisD@Ecran{#1}}
-\psset[pst-map3d]{THETA=0,PHI=45,Dobs=20,Decran=25}
-%
-\psset[pst-map3d]{RotX=0,RotY=0,RotZ=0,Radius=5}
-%
-\define@key[psset]{pst-map3d}{Day}{\def\psk@WorldMap@J{#1}}
-\define@key[psset]{pst-map3d}{Month}{\def\psk@WorldMap@M{#1}}
-\define@key[psset]{pst-map3d}{Year}{\def\psk@WorldMap@A{#1}}
-\psset[pst-map3d]{Day=\number\day,Month=\number\month,Year=\number\year}
-\define@key[psset]{pst-map3d}{hour}{\def\psk@WorldMap@hour{#1}}
-\psset[pst-map3d]{hour=12} % en heures
-%
-\define@key[psset]{pst-map3d}{gridmapdiv}{\def\psk@WorldMap@mapgriddiv{#1}}
-\psset[pst-map3d]{gridmapdiv=10}
-%
-\define@key[psset]{pst-map3d}{longitudeMeridien}{\def\psk@WorldMap@longitudeMeridien{#1}}
-\psset[pst-map3d]{longitudeMeridien=0}
-%
-\newdimen\psmeridienwidth
-\define@key[psset]{pst-map3d}{meridienwidth}[1pt]{\pssetlength\psmeridienwidth{#1}}
-\psset[pst-map3d]{meridienwidth=1pt}
-%
-\define@key[psset]{pst-map3d}{meridiencolor}[red]{\pst@getcolor{#1}\psmeridiencolor}
-\psset[pst-map3d]{meridiencolor=red}
-%
-\define@key[psset]{pst-map3d}{latitudeParallel}[0]{\def\psk@WorldMap@latitudeParallel{#1}}
-\psset[pst-map3d]{latitudeParallel=0}
-%
-\newdimen\psparallelwidth
-\define@key[psset]{pst-map3d}{parallelwidth}[1pt]{\pssetlength\psparallelwidth{#1}}
-\psset[pst-map3d]{parallelwidth=1pt}
-%
-\define@key[psset]{pst-map3d}{parallelcolor}{\pst@getcolor{#1}\psparallelcolor}
-\psset[pst-map3d]{parallelcolor=red}
-%
-\definecolor{terre}{rgb}{0.99,0.95,0.7}
-\definecolor{mer}{rgb}{0.5,0.8,0.8}
-\definecolor{darkblue}{cmyk}{1,1,0,0.7}
-
-\define@key[psset]{pst-map3d}{mapcolor}{\pst@getcolor{#1}\psmapcolor}
-\psset[pst-map3d]{mapcolor=terre}
-\define@key[psset]{pst-map3d}{bordercolor}{\pst@getcolor{#1}\psbordercolor}
-\psset[pst-map3d]{bordercolor=black}
-\define@key[psset]{pst-map3d}{islandcolor}{\pst@getcolor{#1}\psislandcolor}
-\psset[pst-map3d]{islandcolor=black}
-\define@key[psset]{pst-map3d}{coastcolor}{\pst@getcolor{#1}\pscoastcolor}
-\psset[pst-map3d]{coastcolor=black}
-\define@key[psset]{pst-map3d}{oceancolor}{\pst@getcolor{#1}\psoceancolor}
-\psset[pst-map3d]{oceancolor=mer}
-\define@key[psset]{pst-map3d}{rivercolor}{\pst@getcolor{#1}\psrivercolor}
-\psset[pst-map3d]{rivercolor=blue}
-\define@key[psset]{pst-map3d}{wfraczoncolor}{\pst@getcolor{#1}\pswfraczoncolor}
-\psset[pst-map3d]{wfraczoncolor=red}
-\define@key[psset]{pst-map3d}{wmaglincolor}{\pst@getcolor{#1}\pswmaglincolor}
-\psset[pst-map3d]{wmaglincolor=darkblue}
-\define@key[psset]{pst-map3d}{ridgecolor}{\pst@getcolor{#1}\psridgecolor}
-\psset[pst-map3d]{ridgecolor=red}
-\define@key[psset]{pst-map3d}{transfrmcolor}{\pst@getcolor{#1}\pstransfrmcolor}
-\psset[pst-map3d]{transfrmcolor=orange}
-\define@key[psset]{pst-map3d}{trenchcolor}{\pst@getcolor{#1}\pstrenchcolor}
-\psset[pst-map3d]{trenchcolor=darkgreen}
-\define@key[psset]{pst-map3d}{gridmapcolor}{\pst@getcolor{#1}\psgridmapcolor}
-\psset[pst-map3d]{gridmapcolor=black}
-\define@key[psset]{pst-map3d}{circlecolor}{\pst@getcolor{#1}\pscirclecolor}
-\psset[pst-map3d]{circlecolor=blue}
-\define@key[psset]{pst-map3d}{circlesep}{\def\psk@WorldMap@circlesep{#1}}
-\psset[pst-map3d]{circlesep=2} % en degres
-\newdimen\pscirclewidth
-\define@key[psset]{pst-map3d}{circlewidth}{\pssetlength\pscirclewidth{#1}}
-\psset[pst-map3d]{circlewidth=.5pt}
-\newdimen\psgridmapwidth
-\define@key[psset]{pst-map3d}{gridmapwidth}[0.8pt]{\pssetlength\psgridmapwidth{#1}}
-\psset[pst-map3d]{gridmapwidth=.8pt}
-\newdimen\psborderwidth
-\define@key[psset]{pst-map3d}{borderwidth}[0.8pt]{\pssetlength\psborderwidth{#1}}
-\psset[pst-map3d]{borderwidth=.8pt}
-\newdimen\pscoastwidth
-\define@key[psset]{pst-map3d}{coastwidth}[0.8pt]{\pssetlength\pscoastwidth{#1}}
-\psset[pst-map3d]{coastwidth=.8pt}
-\newdimen\pswfraczonwidth
-\define@key[psset]{pst-map3d}{wfraczonwidth}[0.8pt]{\pssetlength\pswfraczonwidth{#1}}
-\psset[pst-map3d]{wfraczonwidth=.8pt}
-\newdimen\pswmaglinwidth
-\define@key[psset]{pst-map3d}{wmaglinwidth}[0.8pt]{\pssetlength\pswmaglinwidth{#1}}
-\psset[pst-map3d]{wmaglinwidth=.8pt}
-\newdimen\psridgewidth
-\define@key[psset]{pst-map3d}{ridgewidth}[2pt]{\pssetlength\psridgewidth{#1}}
-\psset[pst-map3d]{ridgewidth=2pt}
-
-\def\variablesIIID@map3d{%
- /RotX \psk@TroisD@RotX\space def
- /RotY \psk@TroisD@RotY\space def
- /RotZ \psk@TroisD@RotZ\space def
- /THETA \psk@TroisD@Theta\space def
- /PHI \psk@TroisD@Phi\space def
- /Rsphere \psk@TroisD@Radius\space def
- /Dobs \psk@TroisD@Dobs\space def
- /DScreen \psk@TroisD@Ecran\space def
- /xunit {\pst@number\psxunit\space mul}def
- /yunit {\pst@number\psyunit\space mul}def
- /runit {\pst@number\psrunit\space mul}def
- }%
- %
-\newif\ifPst@WorldMap@island
-\define@key[psset]{pst-map3d}{islands}[false]{\@nameuse{Pst@WorldMap@island#1}}
-\psset{islands=true}
-%
-\newif\ifPst@WorldMap@border
-\define@key[psset]{pst-map3d}{borders}[false]{\@nameuse{Pst@WorldMap@border#1}}
-\psset{borders=true}
-%
-\newif\ifPst@WorldMap@france
-\define@key[psset]{pst-map3d}{france}[true]{\@nameuse{Pst@WorldMap@france#1}}
-\psset{france=false}
-%
-\newif\ifPst@WorldMap@capitals
-\define@key[psset]{pst-map3d}{capitals}[true]{\@nameuse{Pst@WorldMap@capitals#1}}
-\psset{capitals=false}
-%
-\newif\ifPst@WorldMap@usa
-\define@key[psset]{pst-map3d}{usa}[true]{\@nameuse{Pst@WorldMap@usa#1}}
-\psset{usa=false}
-%
-\newif\ifPst@WorldMap@mexico
-\define@key[psset]{pst-map3d}{mexico}[true]{\@nameuse{Pst@WorldMap@mexico#1}}
-\psset{mexico=false}
-%
-\newif\ifPst@WorldMap@australia
-\define@key[psset]{pst-map3d}{australia}[true]{\@nameuse{Pst@WorldMap@australia#1}}
-\psset{australia=false}
-%
-\newif\ifPst@WorldMap@canada
-\define@key[psset]{pst-map3d}{canada}[true]{\@nameuse{Pst@WorldMap@canada#1}}
-\psset{canada=false}
-%
-\newif\ifPst@WorldMap@city
-\define@key[psset]{pst-map3d}{citys}[false]{\@nameuse{Pst@WorldMap@city#1}}
-\psset{citys=false}
-%
-\newif\ifPst@WorldMap@Rivers%
-\define@key[psset]{pst-map3d}{rivers}[false]{\@nameuse{Pst@WorldMap@Rivers#1}}
-\psset{rivers=true}
-%
-\newif\ifPst@WorldMap@Lake%
-\define@key[psset]{pst-map3d}{lakes}[false]{\@nameuse{Pst@WorldMap@Lake#1}}
-\psset{lakes=true}
-%
-\newif\ifPst@WorldMap@gridmap
-\define@key[psset]{pst-map3d}{gridmap}[true]{\@nameuse{Pst@WorldMap@gridmap#1}}
-\psset{gridmap=true}
-%
-\newif\ifPst@WorldMap@coasts
-\define@key[psset]{pst-map3d}{coasts}[true]{\@nameuse{Pst@WorldMap@coasts#1}}
-\psset{coasts=false}
-%
-\newif\ifPst@WorldMap@fraczon
-\define@key[psset]{pst-map3d}{wfraczon}[true]{\@nameuse{Pst@WorldMap@fraczon#1}}
-\psset{wfraczon=false}
-%
-\newif\ifPst@WorldMap@ridge
-\define@key[psset]{pst-map3d}{ridge}[true]{\@nameuse{Pst@WorldMap@ridge#1}}
-\psset{ridge=false}
-%
-\newif\ifPst@WorldMap@maglin
-\define@key[psset]{pst-map3d}{wmaglin}[true]{\@nameuse{Pst@WorldMap@maglin#1}}
-\psset{wmaglin=false}
-%
-\newif\ifPst@WorldMap@circles
-\define@key[psset]{pst-map3d}{circles}[false]{\@nameuse{Pst@WorldMap@circles#1}}
-\psset{circles=true}
-%
-\newif\ifPst@WorldMap@visibility
-\define@key[psset]{pst-map3d}{visibility}[false]{\@nameuse{Pst@WorldMap@visibility#1}}
-\psset{visibility=true}
-%
-\newif\ifPst@WorldMap@blueEarth
-\define@key[psset]{pst-map3d}{blueEarth}[false]{\@nameuse{Pst@WorldMap@blueEarth#1}}
-\psset{blueEarth=true}
-%
-\newif\ifPst@WorldMap@ombre
-\define@key[psset]{pst-map3d}{daynight}[true]{\@nameuse{Pst@WorldMap@ombre#1}}
-\psset{daynight=false}
-%
-\def\WorldMapThreeD{\pst@object{WorldMapThreeD}}
-\def\WorldMapThreeD@i{\@ifnextchar[{\WorldMapThreeD@do}{\WorldMapThreeD@do[]}}
-\def\WorldMapThreeD@do[#1]{{%
-\psset{#1}%
-\begin@ClosedObj%
-\addto@pscode{%
- /increment \psk@WorldMap@mapgriddiv\space def
- \variablesIIID@map3d
- /mapcolor {\pst@usecolor\psmapcolor currentrgbcolor} def
- /bordercolor {\pst@usecolor\psbordercolor currentrgbcolor} def
- /coastcolor {\pst@usecolor\pscoastcolor currentrgbcolor} def
- /islandcolor {\pst@usecolor\psislandcolor currentrgbcolor} def
- /maillagecolor {\pst@usecolor\psgridmapcolor currentrgbcolor} def
- /oceancolor {\pst@usecolor\psoceancolor currentrgbcolor} def
- /rivercolor {\pst@usecolor\psrivercolor currentrgbcolor} def
- /wfraczoncolor {\pst@usecolor\pswfraczoncolor currentrgbcolor} def
- /wmaglincolor {\pst@usecolor\pswmaglincolor currentrgbcolor} def
- /ridgecolor {\pst@usecolor\psridgecolor currentrgbcolor} def
- /transfrmcolor {\pst@usecolor\pstransfrmcolor currentrgbcolor} def
- /trenchcolor {\pst@usecolor\pstrenchcolor currentrgbcolor} def
- /circlecolor {\pst@usecolor\pscirclecolor currentrgbcolor} def
- /circlewidth {\pst@number\pscirclewidth SLW} def
- /circlesep \psk@WorldMap@circlesep\space def
- /maillagewidth {\pst@number\psgridmapwidth SLW} def
- /borderwidth {\pst@number\psborderwidth SLW} def
- /coastwidth {\pst@number\pscoastwidth SLW} def
- /wfraczonwidth {\pst@number\pswfraczonwidth SLW} def
- /wmaglinwidth {\pst@number\pswmaglinwidth SLW} def
- /ridgewidth {\pst@number\psridgewidth SLW} def
- /longitude_meridien \psk@WorldMap@longitudeMeridien\space def
- /meridienwidth {\pst@number\psmeridienwidth SLW} def
- /meridiencolor {\pst@usecolor\psmeridiencolor currentrgbcolor} def
- /latitude_parallel \psk@WorldMap@latitudeParallel\space def
- /parallelwidth {\pst@number\psparallelwidth SLW} def
- /parallelcolor {\pst@usecolor\psparallelcolor currentrgbcolor} def
- /year \psk@WorldMap@A\space def
- /month \psk@WorldMap@M\space def
- /day \psk@WorldMap@J\space def
- month 3 lt {/month month 12 add def /year year 1 sub def} if
- /AA year 100 div truncate def
- /BB 2 AA sub AA 4 div truncate add def
- /CC 365.25 year mul truncate def
- /DD 30.6001 month 1 add mul truncate def
- /julien BB CC add DD add day add 1720994.5 add def
- /hour \psk@WorldMap@hour\space def
- /jours julien 2454367 sub def
- /AngleRayonsSoleil latitude_parallel 23.5 sin 360 jours mul 365.25 div sin mul arccos sub def
- /u1 0 def /u2 AngleRayonsSoleil cos def /u3 AngleRayonsSoleil sin def
-% /Julien jd hour 24 div add def
- %
- 1 setlinejoin
- 0 0 translate
- /pst@fill { \psk@opacityalpha .setopacityalpha fill } def
- tx@map3DDict begin
- MatriceTransformationZXY
-%
- /RsphereScreen Rsphere DScreen mul Dobs div
- 1 Rsphere dup mul Dobs dup mul div sub sqrt div runit def
-%
-/GrandCercle {
- % cercle vu par l'observateur
- 0 0 RsphereScreen 0 360 arc
- closepath
-} def
-%
-\ifPst@WorldMap@visibility
- /condition { 0 ge } def
-\else
- /condition { 0 le } def
-\fi
-%
-\ifPst@WorldMap@ombre
- the_night
-\fi
-%
-\ifPst@WorldMap@blueEarth
- gsave
- newpath
- oceancolor
- GrandCercle
- pst@fill % fill
- grestore
-\fi
-%
-\ifPst@WorldMap@circles
-gsave
- oceans_seas_hatched
-grestore
-\fi
-%
-\ifPst@WorldMap@border
- (\psk@WorldMap@Path/pborder.dat) run
-gsave
-GrandCercle
-clip
-border dup /REGION exch def
-CompteurRegions
-{CalculsPointsRegion
- closepath
- gsave
- mapcolor
- pst@fill % fill
- grestore
- borderwidth
- bordercolor
- stroke
- }forall
-grestore
-\fi
-%
-\ifPst@WorldMap@island
- (\psk@WorldMap@Path/pisland.dat) run
-gsave
-GrandCercle
-clip
-islands dup /REGION exch def
-CompteurRegions
-{CalculsPointsRegion
- closepath
- gsave
- mapcolor
- pst@fill % fill
- grestore
- borderwidth
- islandcolor
- stroke
- }forall
-grestore
-\fi
- %
-\ifPst@WorldMap@france
- (\psk@WorldMap@Path/france.dat) run
-gsave
-GrandCercle
-clip
-france dup /REGION exch def
-CompteurRegions
-{CalculsPointsRegion
- closepath
- gsave
- mapcolor
- pst@fill % fill
- grestore
- borderwidth
- bordercolor
- stroke
- }forall
-grestore
-\fi
-%
-\ifPst@WorldMap@Lake
- (\psk@WorldMap@Path/plake.dat) run
-gsave
-GrandCercle
-clip
-lake dup /REGION exch def
-CompteurRegions
-{CalculsPointsRegion
- closepath
- gsave
- oceancolor
- pst@fill % fill
- grestore
-% borderwidth
-% bordercolor
-0 0 1 setrgbcolor
- stroke
- }forall
-grestore
-\fi
-%
-\ifPst@WorldMap@coasts
- (\psk@WorldMap@Path/pcoast.dat) run
-gsave
-GrandCercle
-clip
-coasts dup /REGION exch def
-CompteurRegions
-{CalculsPointsRegion
- coastwidth
- coastcolor
- stroke
- }forall
-grestore
-\fi
-%
-\ifPst@WorldMap@usa
- (\psk@WorldMap@Path/usa.dat) run
-gsave
-GrandCercle
-clip
-usa dup /REGION exch def
-CompteurRegions
-{CalculsPointsRegion
- borderwidth
- bordercolor
- stroke
- }forall
-grestore
-\fi
-%
-\ifPst@WorldMap@mexico
- (\psk@WorldMap@Path/mex.dat) run
-gsave
-GrandCercle
-clip
-mexico dup /REGION exch def
-CompteurRegions
-{CalculsPointsRegion
- borderwidth
- bordercolor
- stroke
- }forall
-grestore
-\fi
-%
-\ifPst@WorldMap@australia
- (\psk@WorldMap@Path/aus.dat) run
-gsave
-GrandCercle
-clip
-australia dup /REGION exch def
-CompteurRegions
-{CalculsPointsRegion
- borderwidth
- bordercolor
- stroke
- }forall
-grestore
-\fi
-%
-\ifPst@WorldMap@canada
- (\psk@WorldMap@Path/canada.dat) run
-gsave
-GrandCercle
-clip
-canada dup /REGION exch def
-CompteurRegions
-{CalculsPointsRegion
- borderwidth
- bordercolor
- stroke
- }forall
-grestore
-\fi
-%
-\ifPst@WorldMap@fraczon
- (\psk@WorldMap@Path/wfraczon.dat) run
-GrandCercle
-clip
-wfraczon dup /REGION exch def
-CompteurRegions
-{CalculsPointsRegion
- wfraczoncolor
- wfraczonwidth
- stroke}forall
-\fi
-%
-\ifPst@WorldMap@maglin
- (\psk@WorldMap@Path/wmaglin.dat) run
-GrandCercle
-clip
-wmaglin dup /REGION exch def
-CompteurRegions
-{CalculsPointsRegion
- wmaglincolor
- wmaglinwidth
- stroke}forall
-\fi
-%
-\ifPst@WorldMap@ridge
- (\psk@WorldMap@Path/ridge.dat) run
-gsave
-GrandCercle
-clip
-ridge dup /REGION exch def
-CompteurRegions
-{CalculsPointsRegion
- ridgecolor
- ridgewidth
- stroke}forall
-grestore
- (\psk@WorldMap@Path/transfrm.dat) run
-gsave
-GrandCercle
-clip
-transfrm dup /REGION exch def
-CompteurRegions
-{CalculsPointsRegion
- transfrmcolor
- ridgewidth
- stroke}forall
-grestore
- (\psk@WorldMap@Path/trench.dat) run
-gsave
-GrandCercle
-clip
-trench dup /REGION exch def
-CompteurRegions
-{CalculsPointsRegion
- trenchcolor
- ridgewidth
- stroke}forall
-grestore
-\fi
-%
-\ifPst@WorldMap@Rivers
- (\psk@WorldMap@Path/river.dat) run
-GrandCercle
-clip
-river dup /REGION exch def
-CompteurRegions
-{CalculsPointsRegion
- rivercolor
- stroke}forall
-\fi
-%
-\ifPst@WorldMap@city
-% les capitales
- (\psk@WorldMap@Path/c-cap.dat) run
- 1.5
- citycapitals
- DrawCitys
-% les autres villes
- (\psk@WorldMap@Path/c-sub.dat) run
- 0.5
- CitySub
-DrawCitys
-\fi
-\ifPst@WorldMap@capitals
-% les capitales
- (\psk@WorldMap@Path/c-cap.dat) run
- 2
- citycapitals
- DrawCitys
-\fi
-%
-\ifPst@WorldMap@gridmap
- MaillageSphere
-\fi
-end}%
-\end@ClosedObj}}
-% placer une ville en particulier
-% par sa longitude et sa latitude en degrés
-% si la ville n'est pas visible
-% elle est rejetée hors de l'écran
-\def\pnodeMapIIID{\pst@object{pnodeMapIIID}}
-\def\pnodeMapIIID@i(#1,#2)#3{%
- \begin@SpecialObj%
- \pnode(!
- \variablesIIID@map3d
- tx@map3DDict begin
- MatriceTransformationZXY
- /Xpoint {#2 cos #1 cos mul Rsphere mul} def
- /Ypoint {#2 cos #1 sin mul Rsphere mul} def
- /Zpoint {#2 sin Rsphere mul } def
- CalculsPointsAfterTransformations
-% CalcCoordinates
-% /YcoorCity exch def /XcoorCity exch def
-% Test
-% PS 0 ge %
-% {XcoorCity YcoorCity }
-% {/XcoorCity 1000 def /YcoorCity 1000 def}
-% ifelse
-formulesTroisD
- Xi Yi end){#3}%
- \end@SpecialObj%
- \ignorespaces}%
-%
-% adaptation de \mapput de \pst-map2d}
-\define@key[psset]{pst-map3d}{mapCountry}{\edef\psk@WorldMap@mapCountry{#1}}
-\psset{mapCountry=all}
-\define@key[psset]{pst-map3d}{nodeWidth}{\edef\psk@WorldMap@nodeWidth{#1}}
-\psset{nodeWidth=1mm}
-\newpsstyle{psNodeMapStyle}{fillstyle=solid,fillcolor=red}
-\newpsstyle{NodeLabelStyle}{fillstyle=solid,fillcolor=yellow,framesep=0,linestyle=none}
-
-%
-\def\mapputIIID{\@ifnextchar[{\mapputIIID@i}{\mapputIIID@i[90]}}
-\def\mapputIIID@i[#1](#2,#3){\@ifnextchar[{\mapputIIID@iii[#1](#2,#3)}{\mapputIIID@ii[#1](#2,#3)}}
-\def\mapputIIID@ii[#1](#2,#3)#4{\mapputIIID@iii[#1](#2,#3)[#4]{#4}}
-\def\mapputIIID@iii[#1](#2,#3)[#4]#5{%
- \@ifnextchar[{\mapputIIID@iv[#1](#2,#3)[#4]#5}{\mapputIIID@iv[#1](#2,#3)[#4]#5[\@empty]}}
-\def\mapputIIID@iv[#1](#2,#3)[#4]#5[#6]{{%
-% [angle](longitude,lattitude)[node name]{node label}[country]
- \def\pst@tempb{all}
- \ifx\pst@tempb\psk@WorldMap@mapCountry
- \mapputIIID@v[#1](#2,#3)[#4]{#5}%
- \else
- \def\pst@tempb{#6}%
-% \typeout{Compare \pst@tempb{} with \psk@WorldMap@mapCountry}
- \ifx\pst@tempb\psk@WorldMap@mapCountry
- \mapputIIID@v[#1](#2,#3)[#4]{#5}
- \fi%
- \fi%
-}}
-\def\mapputIIID@v[#1](#2,#3)[#4]#5{%
- \pnodeMapIIID(#2,#3){#4}
- \pst@dima=\psk@WorldMap@nodeWidth
- \pscircle[style=psNodeMapStyle](#4){\pst@dima}
- \pscircle*(#4){0.5\pst@dima}
- \ifx\relax#5\relax\else
- \uput{1.2\pst@dima}[#1](#4){\psframebox[style=NodeLabelStyle]{#5}}%
- \fi}
-%
-% dessiner un méridien de longitude donnée
-% longitude en degrés
-\def\psmeridien{\pst@object{psmeridien}}
-\def\psmeridien@i#1{%
- \pst@killglue
- \begingroup
- \begin@SpecialObj%
- \addto@pscode{%
- \variablesIIID@map3d
- /longitude_meridien #1 def
- /meridienwidth {\pst@number\psmeridienwidth SLW} def
- /meridiencolor {\pst@usecolor\psmeridiencolor currentrgbcolor} def
- tx@map3DDict begin
- MatriceTransformationZXY
- \ifPst@WorldMap@visibility
- /condition { 0 ge } def
- \else
- /condition { 0 le } def
- \fi
- meridien
- end}%
- \end@SpecialObj%
- \endgroup%
- \ignorespaces%
-}
-%
-% dessiner un cercle parallèle à l'équateur de latitude donnée
-% latitude en degrés
-\def\psparallel{\pst@object{psparallel}}
-\def\psparallel@i#1{%
- \pst@killglue
- \begingroup
- \begin@SpecialObj%
- \addto@pscode{%
- \variablesIIID@map3d
- /latitude_parallel #1 def
- /parallelwidth {\pst@number\psparallelwidth SLW} def
- /parallelcolor {\pst@usecolor\psparallelcolor currentrgbcolor} def
- tx@map3DDict begin
- MatriceTransformationZXY
- \ifPst@WorldMap@visibility
- /condition { 0 ge } def
- \else
- /condition { 0 le } def
- \fi
- Parallel
- parallelwidth
- parallelcolor
- stroke
- end}%
- \end@SpecialObj%
- \endgroup%
- \ignorespaces%
-}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% le dessin du globe tellure
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\define@key[psset]{pst-map3d}{styleGlobe}{% style du globe
-\edef\psk@styleGlobe{#1}}
-
-\define@key[psset]{pst-map3d}{styleNight}{% style de la partie dans la nuit
-\edef\psk@styleNight{#1}}
-
-\newpsstyle{Globe}{circles=true}
-\newpsstyle{night}{fillstyle=solid,fillcolor=black,opacity=0.8}
-\psset[pst-map3d]{styleGlobe=Globe,styleNight=night}
-
-\def\psGlobeTellure{\pst@object{psGlobeTellure}}
-\def\psGlobeTellure@i(#1,#2)#3{% longitude, latitude et nom de la ville
- \begin@SpecialObj%
- \pnode(!/ux 0 def /uy 90 #2 sub sin def /uz 90 #2 sub cos def 0 0){ttt}%
- \psset{THETA=0,PHI=0}%
- {\psset{RotX=#2 90 sub,RotZ=90 #1 add}
- \WorldMapThreeD[style=\psk@styleGlobe,daynight=false]%
- \mapputIIID(#1,#2){#3}}%
- \WorldMapThreeD[style=\psk@styleNight,daynight=true,circles=false,blueEarth=false,
- borders=false,islands=false,
- rivers=false,lakes=false,
- gridmap=false,latitudeParallel=#2]%
- \psframe*(! -3 \psk@TroisD@Radius\space neg -1.5 add)(!3 \psk@TroisD@Radius\space neg -0.5 add)
- \rput(! 0 \psk@TroisD@Radius\space neg -1 add){\white\psk@WorldMap@hour h le \psk@WorldMap@J/\psk@WorldMap@M/\psk@WorldMap@A}
- \end@SpecialObj%
- \ignorespaces}%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%
-
-% épicentre d'un tremblement de terre
-% Earthquake Epicenters
-%
-\define@key[psset]{pst-map3d}{waves}{\edef\psk@WorldMap@waves{#1}}
-\psset{waves=3} % nombre de cercles concentriques
-\define@key[psset]{pst-map3d}{Rmax}{\edef\psk@WorldMap@Rmax{#1}}
-\psset{Rmax=1500} % rayon maximum du séisme en km
-
-\def\psepicenter{\pst@object{psepicenter}}
-\def\psepicenter@i(#1,#2)#3{%
- \begin@ClosedObj%
- \addto@pscode{
- \variablesIIID@map3d
- /longitude #1 def
- /latitude #2 def
- /nbre \psk@WorldMap@waves\space def
- /dphi \psk@WorldMap@Rmax\space 0.008983 mul def
- /circlecolor {\pst@usecolor\pscirclecolor currentrgbcolor} def
- /circlewidth {\pst@number\pscirclewidth SLW} def
- tx@map3DDict begin
- circlecolor
- circlewidth
- nbre dphi longitude latitude
- ondes
- end }%
- \ifx\relax#3\relax\else\mapputIIID(#1,#2){#3}\fi%
- \end@ClosedObj%
- \ignorespaces}
-%
-\catcode`\@=\PstAtCode\relax
-\endinput
diff --git a/Master/texmf-dist/tex/generic/pst-geo/pst-map3dII.tex b/Master/texmf-dist/tex/generic/pst-geo/pst-map3dII.tex
deleted file mode 100644
index 6728202d4a5..00000000000
--- a/Master/texmf-dist/tex/generic/pst-geo/pst-map3dII.tex
+++ /dev/null
@@ -1,279 +0,0 @@
-%%
-%% This is file `pst-map3dII.tex',
-%%
-%% IMPORTANT NOTICE:
-%%
-%% Package `pst-map3dII.tex'
-%%
-%% Manuel Luque <Mluque5130@aol.com> (France)
-%% Giuseppe Matarazzo <joematara@hotmail.com> (Italy)
-%% Herbert Voss <voss@perce.de> (Germany)
-%%
-%% May 09, 2004
-%%
-%% This program can be redistributed and/or modified under the terms
-%% of the LaTeX Project Public License Distributed from CTAN archives
-%% in directory macros/latex/base/lppl.txt.
-%%
-%% DESCRIPTION:
-%% `pst-map3dII' is a PSTricks package to create geographical objects
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\csname PSTMapThreeDII\endcsname
-\let\PSTMapThreeDII\endinput
-
-% Require PSTricks
-\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi
-\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey\fi
-
-\def\fileversion{0.26}
-\def\filedate{2009/08/28}
-
-\message{`PST-mapThreeDII v\fileversion, \filedate\space (ML/GM/HV)}
-\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
-\pst@addfams{pst-map3dII}
-\pstheader{pst-map3dII.pro}
-\SpecialCoor
-%
-\define@key[psset]{pst-map3dII}{path}{\edef\psk@WorldMap@Path{#1}} % chemin des données
-\psset{path=.}
-%
-\define@key[psset]{pst-map3dII}{RotX}{\def\psk@TroisD@RotX{#1}} % rotation autour de Ox en degrés
-\define@key[psset]{pst-map3dII}{RotY}{\def\psk@TroisD@RotY{#1}} % rotation autour de Oy en degrés
-\define@key[psset]{pst-map3dII}{RotZ}{\def\psk@TroisD@RotZ{#1}} % rotation autour de OZ en degrés
-\define@key[psset]{pst-map3dII}{Radius}{\def\psk@TroisD@Radius{#1}} % rayon de la sphère
-%
-\define@key[psset]{pst-map3dII}{THETA}{\def\psk@TroisD@Theta{#1}}
-\define@key[psset]{pst-map3dII}{PHI}{\def\psk@TroisD@Phi{#1}}
-\define@key[psset]{pst-map3dII}{Dobs}{\def\psk@TroisD@Dobs{#1}}
-\define@key[psset]{pst-map3dII}{Decran}{\def\psk@TroisD@Ecran{#1}}
-\psset{THETA=0,PHI=45,Dobs=20,Decran=25,Radius=5}
-\psset{RotX=0,RotY=0,RotZ=0}
-%
-\define@key[psset]{pst-map3dII}{increment}{\def\psk@WorldMapII@increment{#1}}
-\psset{increment=10}
-%
-\define@key[psset]{pst-map3dII}{level}{\def\psk@WorldMapII@level{#1}}% hv 2004-05-05
-\psset{level=5}
-%
-\def\geo@variablesIIID{%
- /RotX \psk@TroisD@RotX\space def
- /RotY \psk@TroisD@RotY\space def
- /RotZ \psk@TroisD@RotZ\space def
- /THETA \psk@TroisD@Theta\space def
- /PHI \psk@TroisD@Phi\space def
- /Rsphere \psk@TroisD@Radius\space def
- /Dobs \psk@TroisD@Dobs\space def
- /DScreen \psk@TroisD@Ecran\space def
- /step \psk@WorldMapII@level\space def
- }%
- %
-\newif\ifPst@WorldMap@capitals
-\define@key[psset]{pst-map3dII}{capital}[false]{\@nameuse{Pst@WorldMap@capitals#1}}
-\psset{capital=false}
-%
-\newif\ifPst@WorldMap@city
-\define@key[psset]{pst-map3dII}{city}[false]{\@nameuse{Pst@WorldMap@city#1}}
-\psset{city=false}
-%
-\newif\ifPst@WorldMap@maillage
-\define@key[psset]{pst-map3dII}{maillage}[true]{\@nameuse{Pst@WorldMap@maillage#1}}
-\psset{maillage=true}
-%
-\newif\ifPst@WorldMapII@Rivers
-\define@key[psset]{pst-map3dII}{rivers}[true]{\@nameuse{Pst@WorldMapII@Rivers#1}}
-\psset{rivers=true}
-%
-\newif\ifPst@WorldMapII@Borders
-\define@key[psset]{pst-map3dII}{borders}[true]{\@nameuse{Pst@WorldMapII@Borders#1}}
-\psset{borders=true}
-%
-\newif\ifPst@WorldMap@Europe
-\define@key[psset]{pst-map3dII}{europe}[true]{\@nameuse{Pst@WorldMap@Europe#1}}
-\psset{europe=true}
-%
-\newif\ifPst@WorldMap@Asia
-\define@key[psset]{pst-map3dII}{asia}[false]{\@nameuse{Pst@WorldMap@Asia#1}}
-\psset{asia=false}
-%
-\newif\ifPst@WorldMap@Africa
-\define@key[psset]{pst-map3dII}{africa}[false]{\@nameuse{Pst@WorldMap@Africa#1}}
-\psset{africa=false}
-%
-\newif\ifPst@WorldMap@namer
-\define@key[psset]{pst-map3dII}{namer}[false]{\@nameuse{Pst@WorldMap@namer#1}}
-\psset{namer=false}
-%
-\newif\ifPst@WorldMap@samer
-\define@key[psset]{pst-map3dII}{samer}[false]{\@nameuse{Pst@WorldMap@samer#1}}
-\psset{samer=false}
-%
-\newif\ifPst@WorldMapII@all% hv 2004-05-05
-\define@key[psset]{pst-map3dII}{all}[true]{%
- \psset{europe=true,asia=true,africa=true,namer=true,samer=true}
-}
-%
-\def\WorldMapThreeDII{\pst@object{WorldMapThreeDII}}
-\def\WorldMapThreeDII@i{\@ifnextchar[{\WorldMapThreeDII@do}{\WorldMapThreeDII@do[]}}
-\def\WorldMapThreeDII@do[#1]{{%
- \psset{#1}%
- \begin@ClosedObj
- \addto@pscode{%
- \geo@variablesIIID
- 1 setlinejoin
- 0 0 translate
- /increment \psk@WorldMapII@increment\space def
- /xunit {\pst@number\psxunit\space mul}def
- /yunit {\pst@number\psyunit\space mul}def
- /runit {\pst@number\psrunit\space mul}def
- gsave
- newpath
- 0.7 0.9 0.9 setrgbcolor
-% cercle vu par l'observateur
- /RsphereScreen Rsphere DScreen mul Dobs div
- 1 Rsphere dup mul Dobs dup mul div sub sqrt div runit def
- 0 0 RsphereScreen 0 360 arc
- closepath
- fill
- grestore
- /condition {PSfacette 0 le} def
- /departPhi -90 def
- tx@mapII3DDict begin
- MatriceTransformation
- /Draw {
- { CalculsPoints
- stroke
- } forall
- }def
-%
- /DrawRivers {
- { CalculsPoints
- gsave
- 0 0 1 setrgbcolor
- CLW 0.25 mul
- stroke
- grestore
- } forall
- } def
-%
- /DrawBdy {
- { CalculsPoints
- gsave
- 1 0 0 setrgbcolor
- stroke
- grestore
- } forall
- } def
-\ifPst@WorldMap@maillage
- MaillageSphere
-\fi
-\ifPst@WorldMap@Europe
- (\psk@WorldMap@Path/europe-cil.dat) run
- europe-cil
- Draw
- \ifPst@WorldMapII@Rivers
-(\psk@WorldMap@Path/europe-riv.dat) run
- europe-riv
- DrawRivers
- \fi
- \ifPst@WorldMapII@Borders
-(\psk@WorldMap@Path/europe-bdy.dat) run
- europe-bdy
- DrawBdy
- \fi
-\fi
-%
-\ifPst@WorldMap@Africa
- (\psk@WorldMap@Path/africa-cil.dat) run
- africa-cil
- Draw
- \ifPst@WorldMapII@Rivers
- (\psk@WorldMap@Path/africa-riv.dat) run
- africa-riv
- DrawRivers
- \fi
- \ifPst@WorldMapII@Borders
- (\psk@WorldMap@Path/africa-bdy.dat) run
- africa-bdy
- DrawBdy
- \fi
-\fi
-%
-\ifPst@WorldMap@Asia
- (\psk@WorldMap@Path/asia-cil.dat) run
- asia-cil
- Draw
- \ifPst@WorldMapII@Rivers
- (\psk@WorldMap@Path/asia-riv.dat) run
- asia-riv
- DrawRivers
- \fi
- \ifPst@WorldMapII@Borders
- (\psk@WorldMap@Path/asia-bdy.dat) run
- asia-bdy
- DrawBdy
- \fi
-\fi
-%
-\ifPst@WorldMap@namer
-(\psk@WorldMap@Path/namer-cil.dat) run
- namer-cil
- Draw
-\ifPst@WorldMapII@Rivers
-(\psk@WorldMap@Path/namer-riv.dat) run
- namer-riv
- DrawRivers
- \fi
-\ifPst@WorldMapII@Borders
-(\psk@WorldMap@Path/namer-bdy.dat) run
-(\psk@WorldMap@Path/namer-pby.dat) run
- namer-bdy
- DrawBdy
- namer-pby
- DrawBdy
-\fi
-\fi
-%
-\ifPst@WorldMap@samer
-(\psk@WorldMap@Path/samer-cil.dat) run
- samer-cil
- Draw
-\ifPst@WorldMapII@Rivers
-(\psk@WorldMap@Path/samer-riv.dat) run
- samer-riv
- DrawRivers
- \fi
-\ifPst@WorldMapII@Borders
-(\psk@WorldMap@Path/samer-bdy.dat) run
- samer-bdy
- DrawBdy
-\fi
-\fi
-%
-\ifPst@WorldMap@city
-% les capitales
- (\psk@WorldMap@Path/c-cap.dat) run
- 1.5 % rayon du point
- citycapitals
- DrawCitys
-% les autres villes
- (\psk@WorldMap@Path/c-sub.dat) run
- 0.5 % rayon du point
- CitySub
-DrawCitys
-\fi
-\ifPst@WorldMap@capitals
-% les capitales
- (\psk@WorldMap@Path/citycapitals.dat) run
- 1.5
- citycapitals
- DrawCitys
-\fi
-end}%
-\end@ClosedObj
-}}
-%
-%
-\catcode`\@=\PstAtCode\relax
-\endinput