12 files changed, 26 insertions, 25 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-geo/Changes b/Master/texmf-dist/doc/generic/pst-geo/Changes
index 668ec61ccc9..1843e127351 100644
--- a/Master/texmf-dist/doc/generic/pst-geo/Changes
+++ b/Master/texmf-dist/doc/generic/pst-geo/Changes
@@ -1,14 +1,22 @@
 ..... pst-map2d.tex
+1.08  2008-04-05  rename internal \variables... macro to prevent clash
+		  with package pst-vue3d
 1.07  2005-11-11  fix introduced bug with loading xkey
 1.06  2005-11-10  using pst-xkey instead of pst-key
 
 ..... pst-map2dII.tex
+0.82  2008-04-05  rename internal \variables... macro to prevent clash
+		  with package pst-vue3d
 0.81  2005-11-10  using pst-xkey instead of pst-key
 
 ..... pst-map3d.tex
+1.04  2008-04-05  rename internal \variables... macro to prevent clash
+		  with package pst-vue3d
 1.03  2005-11-10  using pst-xkey instead of pst-key
 
 ..... pst-map3dII.tex
+0.24  2008-04-05  rename internal \variables... macro to prevent clash
+		  with package pst-vue3d
 0.23  2005-11-10  using pst-xkey instead of pst-key
 
 
diff --git a/Master/texmf-dist/doc/generic/pst-geo/README.TEXLIVE b/Master/texmf-dist/doc/generic/pst-geo/README.TEXLIVE
deleted file mode 100644
index ae6bd9418ea..00000000000
--- a/Master/texmf-dist/doc/generic/pst-geo/README.TEXLIVE
+++ /dev/null
@@ -1,6 +0,0 @@
-We have removed the large data files and pdf documentation from pst-geo
-in TeX Live in order to save space for the CD-sized TL "inst"
-distribution.  The files can be found at
-CTAN:graphics/pstricks/contrib/pst-geo.
-
---karl@tug.org, January 2007.  (This README.TEXLIVE file is public domain.)
diff --git a/Master/texmf-dist/doc/generic/pst-geo/data.tgz b/Master/texmf-dist/doc/generic/pst-geo/data.tgz
new file mode 100644
index 00000000000..8190239c2d1
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-geo/data.tgz
diff --git a/Master/texmf-dist/doc/generic/pst-geo/dataII.tgz b/Master/texmf-dist/doc/generic/pst-geo/dataII.tgz
new file mode 100644
index 00000000000..a9bc0618c5a
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-geo/dataII.tgz
diff --git a/Master/texmf-dist/doc/generic/pst-geo/doc-map2d.pdf b/Master/texmf-dist/doc/generic/pst-geo/doc-map2d.pdf
new file mode 100644
index 00000000000..0e1038ff644
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-geo/doc-map2d.pdf
diff --git a/Master/texmf-dist/doc/generic/pst-geo/doc-map2dII.pdf b/Master/texmf-dist/doc/generic/pst-geo/doc-map2dII.pdf
new file mode 100644
index 00000000000..4a923a35b50
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-geo/doc-map2dII.pdf
diff --git a/Master/texmf-dist/doc/generic/pst-geo/doc-map3d.pdf b/Master/texmf-dist/doc/generic/pst-geo/doc-map3d.pdf
new file mode 100644
index 00000000000..7a78bece06b
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-geo/doc-map3d.pdf
diff --git a/Master/texmf-dist/doc/generic/pst-geo/doc-map3dII.pdf b/Master/texmf-dist/doc/generic/pst-geo/doc-map3dII.pdf
new file mode 100644
index 00000000000..704f20de40b
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-geo/doc-map3dII.pdf
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