summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pst-geo/pst-map2d.tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/generic/pst-geo/pst-map2d.tex')
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/pst-map2d.tex81
1 files changed, 42 insertions, 39 deletions
diff --git a/Master/texmf-dist/tex/generic/pst-geo/pst-map2d.tex b/Master/texmf-dist/tex/generic/pst-geo/pst-map2d.tex
index fa44efba13f..367bf05b7f3 100644
--- a/Master/texmf-dist/tex/generic/pst-geo/pst-map2d.tex
+++ b/Master/texmf-dist/tex/generic/pst-geo/pst-map2d.tex
@@ -9,7 +9,7 @@
%% Giuseppe Matarazzo <joematara@hotmail.com> (Italy)
%% Herbert Voss <voss@perce.de> (Germany)
%%
-%% May 09, 2004
+%% September 26, 2008
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives
@@ -32,8 +32,8 @@
\pst@addfams{pst-map2d}% added 2004-09-29 hv
%
-\def\fileversion{1.08}
-\def\filedate{2008/04/05}
+\def\fileversion{1.10}
+\def\filedate{2009/08/28}
\message{`PST-map2d' v\fileversion, \filedate\space (ML/GM/HV)}
%
\SpecialCoor
@@ -46,7 +46,7 @@
\define@key[psset]{pst-map2d}{level}{\edef\psk@WorldMap@level{#1}}
\psset{level=1}
%
-\define@key[psset]{pst-map2d}{type}{\edef\psk@WorldMap@type{#1}}
+\define@key[psset]{pst-map2d}{type}{\def\psk@WorldMap@type{#1}}
\psset{type=1}
% type=1 ==> Mercator
% type=2 ==> Lambert
@@ -56,58 +56,59 @@
% type=6 ==> Babinet
% type=7 ==> Collignon
% type=8 ==> Bonne
-\define@key[psset]{pst-map2d}{n}{\edef\psk@WorldMap@n{#1}}
+\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}{\edef\psk@WorldMap@limiteL{#1}}
+\define@key[psset]{pst-map2d}{limiteL}{\def\psk@WorldMap@limiteL{#1}}
\psset{limiteL=180} % longitude limite
%
-\define@key[psset]{pst-map2d}{latitude0}{\edef\psk@WorldMap@latitudeO{#1}}
+\define@key[psset]{pst-map2d}{latitude0}{\def\psk@WorldMap@latitudeO{#1}}
\psset{latitude0=45} % pour Bonne latitude 0
%
-\define@key[psset]{pst-map2d}{longitude0}{\edef\psk@WorldMap@longitudeO{#1}}
+\define@key[psset]{pst-map2d}{longitude0}{\def\psk@WorldMap@longitudeO{#1}}
\psset{longitude0=0} % pour Bonne longitude 0
%
-\define@key[psset]{pst-map2d}{increment}{\edef\psk@WorldMap@increment{#1}}
+\define@key[psset]{pst-map2d}{increment}{\def\psk@WorldMap@increment{#1}}
\psset{increment=10}
%
-\define@key[psset]{pst-map2d}{MapFillColor}{\edef\psk@WorldMap@Fillcolor{#1}} % couleur des continents
-\psset{MapFillColor= 0.99 0.95 0.7 }
+\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}
%
-\newif\ifPst@WorldMap@city
-\define@key[psset]{pst-map2d}{city}[false]{\@nameuse{Pst@WorldMap@city#1}}
-\psset{city=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=true}
+\psset{rivers}
%
\newif\ifPst@WorldMap@Borders
\define@key[psset]{pst-map2d}{borders}[true]{\@nameuse{Pst@WorldMap@Borders#1}}
\psset{borders=false}
%
-\newif\ifPst@WorldMap@maillage
-\define@key[psset]{pst-map2d}{maillage}[true]{\@nameuse{Pst@WorldMap@maillage#1}}
-\psset{maillage=true}
+\define@boolkey[psset]{pst-map2d}[Pst@WorldMap@]{maillage}[true]{}
+\psset{maillage}
%
-\newif\ifPst@WorldMap@Fill
-\define@key[psset]{pst-map2d}{Fill}[true]{\@nameuse{Pst@WorldMap@Fill#1}}
-\psset{Fill=true}
+\define@boolkey[psset]{pst-map2d}[Pst@WorldMap@]{Fill}[true]{}
+\psset{Fill}
%
-\newif\ifPst@WorldMap@USA
-\define@key[psset]{pst-map2d}{USA}[false]{\@nameuse{Pst@WorldMap@USA#1}}
+\define@boolkey[psset]{pst-map2d}[Pst@WorldMap@]{USA}[false]{}
\psset{USA=false}
%
-\newif\ifPst@WorldMap@AUS
-\define@key[psset]{pst-map2d}{AUS}[false]{\@nameuse{Pst@WorldMap@AUS#1}}
+\define@boolkey[psset]{pst-map2d}[Pst@WorldMap@]{AUS}[false]{}
\psset{AUS=false}
%
-\newif\ifPst@WorldMap@MEX
-\define@key[psset]{pst-map2d}{MEX}[false]{\@nameuse{Pst@WorldMap@MEX#1}}
+\define@boolkey[psset]{pst-map2d}[Pst@WorldMap@]{MEX}[false]{}
\psset{MEX=false}
%
\def\geo@variablesMap{%
@@ -210,8 +211,9 @@
X CoeffX xunit Y CoeffY yunit lineto
} for
closepath
- /Color {0.5 0.8 0.8} def
- Color setrgbcolor
+% /Color {\psk@WorldMap@Seacolor} def
+% Color setrgbcolor
+ \pst@usecolor\psk@WorldMap@Seacolor
fill
grestore
\fi
@@ -239,7 +241,8 @@
closepath
% Colour in earth's surfaces
gsave
- Color setrgbcolor
+% Color setrgbcolor
+ Color
fill
grestore
\fi
@@ -251,8 +254,7 @@
\else
coasts
\fi
-%/Color {0.5 0.8 0.5} def
-/Color {\psk@WorldMap@Fillcolor} def
+/Color { \pst@usecolor\psk@WorldMap@Fillcolor } def
Draw
islands
Draw
@@ -268,18 +270,19 @@ usa
australia
Draw
\fi
-/Color {0.5 0.8 0.8} def
+/Color { \pst@usecolor\psk@WorldMap@Lakecolor } def
lake
Draw
% les rivières
\ifPst@WorldMap@Rivers
/DrawRivers {
- {
-CalculsPoints
-0 0 1 setrgbcolor
-stroke
-} forall
-}def
+ {
+ CalculsPoints
+ \pst@usecolor\psk@WorldMap@Rivercolor
+ stroke
+ } forall
+} def
+%
river
DrawRivers
\fi