From b69acf2e173c49aedc57f462e26d923309a4ea55 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 6 Apr 2008 13:11:39 +0000 Subject: pst-geo update (5apr08) git-svn-id: svn://tug.org/texlive/trunk@7330 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/pst-geo/pst-map2d.tex | 10 +++++----- Master/texmf-dist/tex/generic/pst-geo/pst-map2dII.tex | 10 +++++----- Master/texmf-dist/tex/generic/pst-geo/pst-map3d.tex | 8 ++++---- Master/texmf-dist/tex/generic/pst-geo/pst-map3dII.tex | 9 ++++----- 4 files changed, 18 insertions(+), 19 deletions(-) (limited to 'Master/texmf-dist/tex/generic/pst-geo') 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 e93eecd1b6b..fa44efba13f 100644 --- a/Master/texmf-dist/tex/generic/pst-geo/pst-map2d.tex +++ b/Master/texmf-dist/tex/generic/pst-geo/pst-map2d.tex @@ -32,8 +32,8 @@ \pst@addfams{pst-map2d}% added 2004-09-29 hv % -\def\fileversion{1.07} -\def\filedate{2005/11/11} +\def\fileversion{1.08} +\def\filedate{2008/04/05} \message{`PST-map2d' v\fileversion, \filedate\space (ML/GM/HV)} % \SpecialCoor @@ -110,7 +110,7 @@ \define@key[psset]{pst-map2d}{MEX}[false]{\@nameuse{Pst@WorldMap@MEX#1}} \psset{MEX=false} % -\def\VariablesMap{% +\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 @@ -178,7 +178,7 @@ \psset{#1}% \begin@ClosedObj \addto@pscode{% - \VariablesMap + \geo@variablesMap (\psk@WorldMap@Path/river.dat) run (\psk@WorldMap@Path/pcoast.dat) run (\psk@WorldMap@Path/pisland.dat) run @@ -361,7 +361,7 @@ DrawCitys \def\pnodeMap(#1,#2)#3{% hv 2004-05-09 \pst@killglue \pnode(! - \VariablesMap + \geo@variablesMap /Y #2 def /X #1 def X CoeffX 20 div Y CoeffY 20 div){#3}% diff --git a/Master/texmf-dist/tex/generic/pst-geo/pst-map2dII.tex b/Master/texmf-dist/tex/generic/pst-geo/pst-map2dII.tex index 35c449004e0..9e16370f270 100644 --- a/Master/texmf-dist/tex/generic/pst-geo/pst-map2dII.tex +++ b/Master/texmf-dist/tex/generic/pst-geo/pst-map2dII.tex @@ -28,8 +28,8 @@ \ifx\PSTXKeyLoaded\endinput\else\input pst-xkey.tex \fi % % -\def\fileversion{0.81} -\def\filedate{2005/11/10} +\def\fileversion{0.82} +\def\filedate{2008/04/05} \message{`PST-map2dII v\fileversion, \filedate\space (ML/GM/HV)} \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -115,7 +115,7 @@ \define@key[psset]{pst-map2dII}{level}{\edef\psk@WorldMapII@level{#1}}% hv 2004-05-05 \psset{level=5}% only every 5th data record % -\def\VariablesMap{% +\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 @@ -183,7 +183,7 @@ \use@par% \begin@ClosedObj \addto@pscode{ - \VariablesMap + \geo@variablesMap 1 setlinejoin 0 0 translate /xunit {\pst@number\psxunit\space mul 20 div } def @@ -443,7 +443,7 @@ \def\pnodeMap(#1,#2)#3{% hv 2004-05-09 \pst@killglue \pnode(! - \VariablesMap + \geo@variablesMap /Y #2 def /X #1 def X CoeffX 20 div Y CoeffY 20 div){#3}% 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 f2613405cf3..6bfecd2f11a 100644 --- a/Master/texmf-dist/tex/generic/pst-geo/pst-map3d.tex +++ b/Master/texmf-dist/tex/generic/pst-geo/pst-map3d.tex @@ -28,8 +28,8 @@ \ifx\PSTnodesLoaded\endinput\else\input pst-node.tex\fi % hv 2004-05-09 \ifx\PSTXKeyLoaded\endinput\else\input pst-xkey.tex \fi -\def\fileversion{1.03} -\def\filedate{2005/11/10} +\def\fileversion{1.04} +\def\filedate{2008/04/05} \message{`PST-map3d v\fileversion, \filedate\space (ML/GM/HV)} \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -66,7 +66,7 @@ \define@key[psset]{pst-map3d}{level}{\edef\psk@WorldMap@level{#1}} \psset{level=1} % -\def\variablesTroisD{% +\def\geo@variablesIIID{% /RotX \psk@TroisD@RotX\space def /RotY \psk@TroisD@RotY\space def /RotZ \psk@TroisD@RotZ\space def @@ -101,7 +101,7 @@ \begin@ClosedObj \addto@pscode{% /increment \psk@WorldMap@increment\space def - \variablesTroisD + \geo@variablesIIID (\psk@WorldMap@Path/river.dat) run (\psk@WorldMap@Path/pisland.dat) run (\psk@WorldMap@Path/pborder.dat) run diff --git a/Master/texmf-dist/tex/generic/pst-geo/pst-map3dII.tex b/Master/texmf-dist/tex/generic/pst-geo/pst-map3dII.tex index a0116a97668..9f9cae4d6d6 100644 --- a/Master/texmf-dist/tex/generic/pst-geo/pst-map3dII.tex +++ b/Master/texmf-dist/tex/generic/pst-geo/pst-map3dII.tex @@ -27,8 +27,8 @@ \ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi \ifx\PSTXKeyLoaded\endinput\else\input pst-xkey\fi -\def\fileversion{0.23} -\def\filedate{2005/11/10} +\def\fileversion{0.24} +\def\filedate{2008/04/05} \message{`PST-mapThreeDII v\fileversion, \filedate\space (ML/GM/HV)} \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -49,7 +49,6 @@ \define@key[psset]{pst-map3dII}{Dobs}{\edef\psk@TroisD@Dobs{#1}} \define@key[psset]{pst-map3dII}{Decran}{\edef\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}{\edef\psk@WorldMapII@increment{#1}} @@ -58,7 +57,7 @@ \define@key[psset]{pst-map3dII}{level}{\edef\psk@WorldMapII@level{#1}}% hv 2004-05-05 \psset{level=5} % -\def\variablesTroisD{% +\def\geo@variablesIIID{% /RotX \psk@TroisD@RotX\space def /RotY \psk@TroisD@RotY\space def /RotZ \psk@TroisD@RotZ\space def @@ -121,7 +120,7 @@ \psset{#1}% \begin@ClosedObj \addto@pscode{% - \variablesTroisD + \geo@variablesIIID 1 setlinejoin 0 0 translate /increment \psk@WorldMapII@increment\space def -- cgit v1.2.3