summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/generic/pst-geo/pst-map2d.tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/doc/generic/pst-geo/pst-map2d.tex')
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/pst-map2d.tex95
1 files changed, 48 insertions, 47 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-geo/pst-map2d.tex b/Master/texmf-dist/doc/generic/pst-geo/pst-map2d.tex
index 9825d8376ad..e93eecd1b6b 100644
--- a/Master/texmf-dist/doc/generic/pst-geo/pst-map2d.tex
+++ b/Master/texmf-dist/doc/generic/pst-geo/pst-map2d.tex
@@ -19,10 +19,6 @@
%% `pst-map2d' is a PSTricks package to create geographical objects
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\fileversion{1.05}
-\def\filedate{2004/05/10}
-
-\message{`PST-map2d' v\fileversion, \filedate\space (ML/GM/HV)}
\csname PSTMaptwod\endcsname
\let\PSTMaptwodLoaded\endinput
@@ -30,23 +26,28 @@
% Require PSTricks
\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi
\ifx\PSTnodesLoaded\endinput\else\input pst-node.tex\fi
-% David Carlisle interface to the `keyval' package.
-\input pst-key.tex
+\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.07}
+\def\filedate{2005/11/11}
+\message{`PST-map2d' v\fileversion, \filedate\space (ML/GM/HV)}
+%
\SpecialCoor
%
-\define@key{psset}{path}{\edef\psk@WorldMap@Path{#1}} % chemin des données
-\setkeys{psset}{path=data}
+\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}{level}{\edef\psk@WorldMap@level{#1}}
-\setkeys{psset}{level=1}
+\define@key[psset]{pst-map2d}{level}{\edef\psk@WorldMap@level{#1}}
+\psset{level=1}
%
-\define@key{psset}{type}{\edef\psk@WorldMap@type{#1}}
-\setkeys{psset}{type=1}
+\define@key[psset]{pst-map2d}{type}{\edef\psk@WorldMap@type{#1}}
+\psset{type=1}
% type=1 ==> Mercator
% type=2 ==> Lambert
% type=3 ==> simple
@@ -55,59 +56,59 @@
% type=6 ==> Babinet
% type=7 ==> Collignon
% type=8 ==> Bonne
-\define@key{psset}{n}{\edef\psk@WorldMap@n{#1}}
-\setkeys{psset}{n=1.77245} % sqrt(pi) % pour Collignon
+\define@key[psset]{pst-map2d}{n}{\edef\psk@WorldMap@n{#1}}
+\psset{n=1.77245} % sqrt(pi) % pour Collignon
%
-\define@key{psset}{limiteL}{\edef\psk@WorldMap@limiteL{#1}}
-\setkeys{psset}{limiteL=180} % longitude limite
+\define@key[psset]{pst-map2d}{limiteL}{\edef\psk@WorldMap@limiteL{#1}}
+\psset{limiteL=180} % longitude limite
%
-\define@key{psset}{latitude0}{\edef\psk@WorldMap@latitudeO{#1}}
-\setkeys{psset}{latitude0=45} % pour Bonne latitude 0
+\define@key[psset]{pst-map2d}{latitude0}{\edef\psk@WorldMap@latitudeO{#1}}
+\psset{latitude0=45} % pour Bonne latitude 0
%
-\define@key{psset}{longitude0}{\edef\psk@WorldMap@longitudeO{#1}}
-\setkeys{psset}{longitude0=0} % pour Bonne longitude 0
+\define@key[psset]{pst-map2d}{longitude0}{\edef\psk@WorldMap@longitudeO{#1}}
+\psset{longitude0=0} % pour Bonne longitude 0
%
-\define@key{psset}{increment}{\edef\psk@WorldMap@increment{#1}}
-\setkeys{psset}{increment=10}
+\define@key[psset]{pst-map2d}{increment}{\edef\psk@WorldMap@increment{#1}}
+\psset{increment=10}
%
-\define@key{psset}{MapFillColor}{\edef\psk@WorldMap@Fillcolor{#1}} % couleur des continents
-\setkeys{psset}{MapFillColor= 0.99 0.95 0.7 }
+\define@key[psset]{pst-map2d}{MapFillColor}{\edef\psk@WorldMap@Fillcolor{#1}} % couleur des continents
+\psset{MapFillColor= 0.99 0.95 0.7 }
%
\newif\ifPst@WorldMap@capitals
-\define@key{psset}{capital}[false]{\@nameuse{Pst@WorldMap@capitals#1}}
-\setkeys{psset}{capital=false}
+\define@key[psset]{pst-map2d}{capital}[false]{\@nameuse{Pst@WorldMap@capitals#1}}
+\psset{capital=false}
%
\newif\ifPst@WorldMap@city
-\define@key{psset}{city}[false]{\@nameuse{Pst@WorldMap@city#1}}
-\setkeys{psset}{city=false}
+\define@key[psset]{pst-map2d}{city}[false]{\@nameuse{Pst@WorldMap@city#1}}
+\psset{city=false}
%
\newif\ifPst@WorldMap@Rivers
-\define@key{psset}{rivers}[true]{\@nameuse{Pst@WorldMap@Rivers#1}}
-\setkeys{psset}{rivers=true}
+\define@key[psset]{pst-map2d}{rivers}[true]{\@nameuse{Pst@WorldMap@Rivers#1}}
+\psset{rivers=true}
%
\newif\ifPst@WorldMap@Borders
-\define@key{psset}{borders}[true]{\@nameuse{Pst@WorldMap@Borders#1}}
-\setkeys{psset}{borders=false}
+\define@key[psset]{pst-map2d}{borders}[true]{\@nameuse{Pst@WorldMap@Borders#1}}
+\psset{borders=false}
%
\newif\ifPst@WorldMap@maillage
-\define@key{psset}{maillage}[true]{\@nameuse{Pst@WorldMap@maillage#1}}
-\setkeys{psset}{maillage=true}
+\define@key[psset]{pst-map2d}{maillage}[true]{\@nameuse{Pst@WorldMap@maillage#1}}
+\psset{maillage=true}
%
\newif\ifPst@WorldMap@Fill
-\define@key{psset}{Fill}[true]{\@nameuse{Pst@WorldMap@Fill#1}}
-\setkeys{psset}{Fill=true}
+\define@key[psset]{pst-map2d}{Fill}[true]{\@nameuse{Pst@WorldMap@Fill#1}}
+\psset{Fill=true}
%
\newif\ifPst@WorldMap@USA
-\define@key{psset}{USA}[false]{\@nameuse{Pst@WorldMap@USA#1}}
-\setkeys{psset}{USA=false}
+\define@key[psset]{pst-map2d}{USA}[false]{\@nameuse{Pst@WorldMap@USA#1}}
+\psset{USA=false}
%
\newif\ifPst@WorldMap@AUS
-\define@key{psset}{AUS}[false]{\@nameuse{Pst@WorldMap@AUS#1}}
-\setkeys{psset}{AUS=false}
+\define@key[psset]{pst-map2d}{AUS}[false]{\@nameuse{Pst@WorldMap@AUS#1}}
+\psset{AUS=false}
%
\newif\ifPst@WorldMap@MEX
-\define@key{psset}{MEX}[false]{\@nameuse{Pst@WorldMap@MEX#1}}
-\setkeys{psset}{MEX=false}
+\define@key[psset]{pst-map2d}{MEX}[false]{\@nameuse{Pst@WorldMap@MEX#1}}
+\psset{MEX=false}
%
\def\VariablesMap{%
/Coeff_mercatorY {2 div 45 add dup sin exch cos div ln 57.2958 mul} def % Mercator
@@ -174,7 +175,7 @@
\def\WorldMap{\pst@object{WorldMap}}
\def\WorldMap@i{\@ifnextchar[{\WorldMap@do}{\WorldMap@do[]}}
\def\WorldMap@do[#1]{{%
- \setkeys{psset}{#1}%
+ \psset{#1}%
\begin@ClosedObj
\addto@pscode{%
\VariablesMap
@@ -368,10 +369,10 @@ DrawCitys
%
%------------------- hv 2004-05-08 ----------------------
\def\psNodeLabelStyle{}
-\define@key{psset}{mapCountry}{\edef\psk@WorldMap@mapCountry{#1}}
-\setkeys{psset}{mapCountry=all}
-\define@key{psset}{nodeWidth}{\edef\psk@WorldMap@nodeWidth{#1}}
-\setkeys{psset}{nodeWidth=1mm}
+\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]}}