pst-geo update (31aug09)

git-svn-id: svn://tug.org/texlive/trunk@15032 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 92 insertions, 127 deletions

diff --git a/Master/texmf-dist/tex/generic/pst-geo/pst-map3d.tex b/Master/texmf-dist/tex/generic/pst-geo/pst-map3d.tex
index 7f0fcdd5008..4e4344ad592 100644
--- a/Master/texmf-dist/tex/generic/pst-geo/pst-map3d.tex
+++ b/Master/texmf-dist/tex/generic/pst-geo/pst-map3d.tex
@@ -7,15 +7,16 @@
 %%
 %% Manuel Luque <Mluque5130@aol.com> (France)
 %% Giuseppe Matarazzo  <joematara@hotmail.com> (Italy)
+%% Herbert Voss  <hvoss@tug.org> (Germany)
 %%
-%% May 29, 2008
+%% 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-map2dII' is a PSTricks package to create geographical objects
+%%   `pst-map3d' is a PSTricks package to create geographical objects
 %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % nouvelle version de pst-map3d %
@@ -29,8 +30,8 @@
 \ifx\PSTnodesLoaded\endinput\else\input pst-node.tex\fi
 \ifx\PSTXKeyLoaded\endinput\else\input pst-xkey.tex \fi
 
-\def\fileversion{2.0}
-\def\filedate{2008/03/05}
+\def\fileversion{2.03}
+\def\filedate{2009/08/28}
 
 \message{`PST-map3d v\fileversion, \filedate}
 \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -40,144 +41,108 @@
 \definecolor{darkgreen}{cmyk}{1,0,1,0.5}
 \SpecialCoor
 %
-\define@key[psset]{pst-map3d}{path}{\edef\psk@WorldMap@Path{#1}} % chemin des données
+\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}{\edef\psk@TroisD@RotX{#1}} % rotation autour de Ox en degrés
-\define@key[psset]{pst-map3d}{RotY}{\edef\psk@TroisD@RotY{#1}} % rotation autour de Oy en degrés
-\define@key[psset]{pst-map3d}{RotZ}{\edef\psk@TroisD@RotZ{#1}} % rotation autour de OZ en degrés
-\define@key[psset]{pst-map3d}{Radius}{\edef\psk@TroisD@Radius{#1}} % rayon de la sphère
+\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}{\edef\psk@TroisD@Theta{#1}}
-\define@key[psset]{pst-map3d}{PHI}{\edef\psk@TroisD@Phi{#1}}
-\define@key[psset]{pst-map3d}{Dobs}{\edef\psk@TroisD@Dobs{#1}}
-\define@key[psset]{pst-map3d}{Decran}{\edef\psk@TroisD@Ecran{#1}}
-\psset{THETA=0,PHI=45,Dobs=20,Decran=25}
+\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{RotX=0,RotY=0,RotZ=0,Radius=5}
+\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{Day=\number\day,Month=\number\month,Year=\number\year}
-\define@key[psset]{pst-map3d}{hour}{\edef\psk@WorldMap@hour{#1}}
-\psset{hour=12} % en heures
+\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}{\edef\psk@WorldMap@mapgriddiv{#1}}
-\psset{gridmapdiv=10}
+\define@key[psset]{pst-map3d}{gridmapdiv}{\def\psk@WorldMap@mapgriddiv{#1}}
+\psset[pst-map3d]{gridmapdiv=10}
 %
-\define@key[psset]{pst-map3d}{longitudeMeridien}{\edef\psk@WorldMap@longitudeMeridien{#1}}
-\psset{longitudeMeridien=0}
+\define@key[psset]{pst-map3d}{longitudeMeridien}{\def\psk@WorldMap@longitudeMeridien{#1}}
+\psset[pst-map3d]{longitudeMeridien=0}
 %
 \newdimen\psmeridienwidth
-\def\psset@meridienwidth#1{\pssetlength\psmeridienwidth{#1}}
-\psset@meridienwidth{1pt}
+\define@key[psset]{pst-map3d}{meridienwidth}[1pt]{\pssetlength\psmeridienwidth{#1}}
+\psset[pst-map3d]{meridienwidth=1pt}
 %
-\define@key[psset]{pst-map3d}{meridiencolor}{%
-\pst@getcolor{#1}\psmeridiencolor}
+\define@key[psset]{pst-map3d}{meridiencolor}[red]{\pst@getcolor{#1}\psmeridiencolor}
 \psset[pst-map3d]{meridiencolor=red}
 %
-\define@key[psset]{pst-map3d}{latitudeParallel}{\edef\psk@WorldMap@latitudeParallel{#1}}
-\psset{latitudeParallel=0}
+\define@key[psset]{pst-map3d}{latitudeParallel}[0]{\def\psk@WorldMap@latitudeParallel{#1}}
+\psset[pst-map3d]{latitudeParallel=0}
 %
 \newdimen\psparallelwidth
-\def\psset@parallelwidth#1{\pssetlength\psparallelwidth{#1}}
-\psset@parallelwidth{1pt}
+\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}
+\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}
+\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}
+\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}
+\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}
+\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}
+\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}
+\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}
+\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}
+\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}
+\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}
+\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}
+\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}
+\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}
+\define@key[psset]{pst-map3d}{circlecolor}{\pst@getcolor{#1}\pscirclecolor}
 \psset[pst-map3d]{circlecolor=blue}
-
-\define@key[psset]{pst-map3d}{circlesep}{\edef\psk@WorldMap@circlesep{#1}}
-\psset{circlesep=2} % en degres
-
+\define@key[psset]{pst-map3d}{circlesep}{\def\psk@WorldMap@circlesep{#1}}
+\psset[pst-map3d]{circlesep=2} % en degres
 \newdimen\pscirclewidth
-\def\psset@circlewidth#1{\pssetlength\pscirclewidth{#1}}
-\psset@circlewidth{.5pt}
-
+\define@key[psset]{pst-map3d}{circlewidth}{\pssetlength\pscirclewidth{#1}}
+\psset[pst-map3d]{circlewidth=.5pt}
 \newdimen\psgridmapwidth
-\def\psset@gridmapwidth#1{\pssetlength\psgridmapwidth{#1}}
-\psset@gridmapwidth{.8pt}
-
+\define@key[psset]{pst-map3d}{gridmapwidth}[0.8pt]{\pssetlength\psgridmapwidth{#1}}
+\psset[pst-map3d]{gridmapwidth=.8pt}
 \newdimen\psborderwidth
-\def\psset@borderwidth#1{\pssetlength\psborderwidth{#1}}
-\psset@borderwidth{.8pt}
-
+\define@key[psset]{pst-map3d}{borderwidth}[0.8pt]{\pssetlength\psborderwidth{#1}}
+\psset[pst-map3d]{borderwidth=.8pt}
 \newdimen\pscoastwidth
-\def\psset@coastwidth#1{\pssetlength\pscoastwidth{#1}}
-\psset@coastwidth{.8pt}
-
+\define@key[psset]{pst-map3d}{coastwidth}[0.8pt]{\pssetlength\pscoastwidth{#1}}
+\psset[pst-map3d]{coastwidth=.8pt}
 \newdimen\pswfraczonwidth
-\def\psset@wfraczonwidth#1{\pssetlength\pswfraczonwidth{#1}}
-\psset@wfraczonwidth{.8pt}
-
+\define@key[psset]{pst-map3d}{wfraczonwidth}[0.8pt]{\pssetlength\pswfraczonwidth{#1}}
+\psset[pst-map3d]{wfraczonwidth=.8pt}
 \newdimen\pswmaglinwidth
-\def\psset@wmaglinwidth#1{\pssetlength\pswmaglinwidth{#1}}
-\psset@wmaglinwidth{.8pt}
-
+\define@key[psset]{pst-map3d}{wmaglinwidth}[0.8pt]{\pssetlength\pswmaglinwidth{#1}}
+\psset[pst-map3d]{wmaglinwidth=.8pt}
 \newdimen\psridgewidth
-\def\psset@ridgewidth#1{\pssetlength\psridgewidth{#1}}
-\psset@ridgewidth{2pt}
+\define@key[psset]{pst-map3d}{ridgewidth}[2pt]{\pssetlength\psridgewidth{#1}}
+\psset[pst-map3d]{ridgewidth=2pt}
 
-\def\variablesTroisD{%
+\def\variablesIIID@map3d{%
     /RotX \psk@TroisD@RotX\space def
     /RotY \psk@TroisD@RotY\space def
     /RotZ \psk@TroisD@RotZ\space def
@@ -278,7 +243,7 @@
 \begin@ClosedObj%
 \addto@pscode{%
   /increment \psk@WorldMap@mapgriddiv\space def
-  \variablesTroisD
+  \variablesIIID@map3d
   /mapcolor  {\pst@usecolor\psmapcolor currentrgbcolor} def
   /bordercolor  {\pst@usecolor\psbordercolor currentrgbcolor} def
   /coastcolor  {\pst@usecolor\pscoastcolor currentrgbcolor} def
@@ -620,8 +585,8 @@ end}%
 \def\pnodeMapIIID{\pst@object{pnodeMapIIID}}
 \def\pnodeMapIIID@i(#1,#2)#3{%
    \begin@SpecialObj%
-   \pnode( !
-   \variablesTroisD
+   \pnode(!
+   \variablesIIID@map3d
    tx@map3DDict begin
    MatriceTransformationZXY
         /Xpoint {#2 cos #1 cos mul Rsphere mul} def
@@ -667,14 +632,14 @@ formulesTroisD
     \fi%
   \fi%
 }}
-\def\mapputIIID@v[#1](#2,#3)[#4]#5{{%
+\def\mapputIIID@v[#1](#2,#3)[#4]#5{%
   \pnodeMapIIID(#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){\psframebox[style=NodeLabelStyle]{\sf#5}}%
-}}
+  \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
@@ -684,7 +649,7 @@ formulesTroisD
    \begingroup
    \begin@SpecialObj%
    \addto@pscode{%
-   \variablesTroisD
+   \variablesIIID@map3d
    /longitude_meridien #1 def
    /meridienwidth {\pst@number\psmeridienwidth SLW} def
    /meridiencolor  {\pst@usecolor\psmeridiencolor currentrgbcolor} def
@@ -710,10 +675,10 @@ formulesTroisD
    \begingroup
    \begin@SpecialObj%
    \addto@pscode{%
-   \variablesTroisD
-  /latitude_parallel #1 def
-  /parallelwidth {\pst@number\psparallelwidth SLW} def
-  /parallelcolor  {\pst@usecolor\psparallelcolor currentrgbcolor} def
+   \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
@@ -773,24 +738,24 @@ formulesTroisD
 
 \def\psepicenter{\pst@object{psepicenter}}
 \def\psepicenter@i(#1,#2)#3{%
-   \begin@SpecialObj%
-   \addto@pscode{%
-   \variablesTroisD
-  /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}%
-   \mapputIIID(#1,#2){#3}
-   \end@SpecialObj%
-   \ignorespaces%
-}
+  \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