diff options
Diffstat (limited to 'graphics/pstricks/contrib/pst-geo/tex/pst-geo.tex')
-rw-r--r-- | graphics/pstricks/contrib/pst-geo/tex/pst-geo.tex | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/graphics/pstricks/contrib/pst-geo/tex/pst-geo.tex b/graphics/pstricks/contrib/pst-geo/tex/pst-geo.tex index 7e7f2ee3bb..8d9135c6c4 100644 --- a/graphics/pstricks/contrib/pst-geo/tex/pst-geo.tex +++ b/graphics/pstricks/contrib/pst-geo/tex/pst-geo.tex @@ -5,11 +5,12 @@ %% %% Package `pst-geo' %% +%% Copyright 2016, 2021 %% Manuel Luque <Mluque5130@aol.com> (France) %% Giuseppe Matarazzo <joematara@hotmail.com> (Italy) %% Herbert Voss <hvoss@tug.org> (Germany) %% -%% December 07, 2016 +%% September 1, 2021 %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN archives @@ -30,16 +31,16 @@ % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax - \pst@addfams{pst-geo} % -\def\fileversion{0.06} -\def\filedate{2016/12/08} +\def\fileversion{0.07} +\def\filedate{2021/09/01} \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}{specialData}[]{\def\psk@geo@specialData{#1}} \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 @@ -50,7 +51,7 @@ % type=6 ==> Babinet % type=7 ==> Collignon % type=8 ==> Bonne -\psset{path=data,level=1,type=1} +\psset{path=data,level=1,type=1,specialData={}} \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}} @@ -393,7 +394,7 @@ \geo@variablesMap{0} /Y #2 def /X #1 def - X CoeffX 20 div Y CoeffY 20 div){#3}% + X CoeffX 20 div Y CoeffY 20 div ){#3}% } % %------------------- hv 2004-05-08 ---------------------- @@ -403,27 +404,28 @@ \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} + \def\pst@tempb{all}% \ifx\pst@tempb\psk@geo@mapCountry - \mapput@v[#1](#2,#3)[#4]{#5} + \mapput@v[#1](#2,#3)[#4]{#5}% \else - \def\pst@tempb{#6} + \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% + \mapput@v[#1](#2,#3)[#4]{#5}% + \fi + \fi }} \def\mapput@v[#1](#2,#3)[#4]#5{{% - \pnodeMap(#2,#3){#4} + \pnodeMap(#2,#3){#4}% % \typeout{Node: #4} \pst@dima=\psk@geo@nodeWidth - \pscircle[style=psNodeMapStyle](#4){\pst@dima} - \pscircle*(#4){0.5\pst@dima} + \pscircle[style=psNodeMapStyle](#4){\pst@dima}% + \pscircle*(#4){0.5\pst@dima}% \uput{1.2\pst@dima}[#1](#4){\psframebox[style=psNodeMapStyle]{\psNodeLabelStyle #5}}% }} @@ -612,6 +614,11 @@ DrawBdy \fi \fi + \ifx\psk@geo@specialData\@empty\else + (\psk@geo@specialData.dat) run + \psk@geo@specialData\space + DrawRivers + \fi % \ifPst@geo@maillage % meridiens @@ -834,7 +841,7 @@ /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 + /AngleRayonsSoleil latitude_parallel 23.5 sin 360 jours mul 365.25 div sin mul tx@geoDict begin arccos end sub def /u1 0 def /u2 AngleRayonsSoleil cos def /u3 AngleRayonsSoleil sin def % /Julien jd hour 24 div add def % |