summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Master/texmf-dist/doc/generic/pst-solarsystem/Changes1
-rw-r--r--Master/texmf-dist/doc/generic/pst-solarsystem/pst-solarsystem-doc.pdfbin284529 -> 284568 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-solarsystem/pst-solarsystem-doc.tex6
-rw-r--r--Master/texmf-dist/tex/generic/pst-solarsystem/pst-solarsystem.tex141
4 files changed, 78 insertions, 70 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-solarsystem/Changes b/Master/texmf-dist/doc/generic/pst-solarsystem/Changes
index 43753e18b27..2791a268840 100644
--- a/Master/texmf-dist/doc/generic/pst-solarsystem/Changes
+++ b/Master/texmf-dist/doc/generic/pst-solarsystem/Changes
@@ -1,4 +1,5 @@
..... pst-solarsystem.tex
+0.13 2017-08-22 - values->solarValues
0.12a 2017-08-14 - updated documentation
0.12 2012-01-01 - first version
diff --git a/Master/texmf-dist/doc/generic/pst-solarsystem/pst-solarsystem-doc.pdf b/Master/texmf-dist/doc/generic/pst-solarsystem/pst-solarsystem-doc.pdf
index ca86fc44249..b23e717f6ba 100644
--- a/Master/texmf-dist/doc/generic/pst-solarsystem/pst-solarsystem-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-solarsystem/pst-solarsystem-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-solarsystem/pst-solarsystem-doc.tex b/Master/texmf-dist/doc/generic/pst-solarsystem/pst-solarsystem-doc.tex
index f92f53f96ad..cea906760a9 100644
--- a/Master/texmf-dist/doc/generic/pst-solarsystem/pst-solarsystem-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-solarsystem/pst-solarsystem-doc.tex
@@ -52,7 +52,7 @@ with the following parameters, for example:
By default, if no parameter is specified, \Lcs{SolarSystem} gives the configuration
day 0 hours to compile.
-The \Lkeyword{values} is enabled by default. It displays the values of
+The \Lkeyword{solarValues} is enabled by default. It displays the values of
longitude, latitude, and the distance in astronomical units.
The accuracy of the calculations is about 0.1 to 0.3 degrees (comparing to ephemeris
@@ -63,14 +63,14 @@ graph.
\begin{center}
\SolarSystem
-\SolarSystem[Day=30,Month=06,Year=2001,Hour=23,Minute=59,Second=59,viewpoint=1 -1 2,values=false]
+\SolarSystem[Day=30,Month=06,Year=2001,Hour=23,Minute=59,Second=59,viewpoint=1 -1 2,solarValues=false]
\end{center}
\begin{verbatim}
\SolarSystem[Day=30,Month=06,Year=2001,
Hour=23,Minute=59,Second=59,
- viewpoint=1 -1 2,values=false]
+ viewpoint=1 -1 2,solarValues=false]
\end{verbatim}
diff --git a/Master/texmf-dist/tex/generic/pst-solarsystem/pst-solarsystem.tex b/Master/texmf-dist/tex/generic/pst-solarsystem/pst-solarsystem.tex
index d20cd9bfb4d..daff8cb001e 100644
--- a/Master/texmf-dist/tex/generic/pst-solarsystem/pst-solarsystem.tex
+++ b/Master/texmf-dist/tex/generic/pst-solarsystem/pst-solarsystem.tex
@@ -27,8 +27,8 @@
\ifx\GradientLoaded\endinput\else \input pst-grad \fi
\ifx\PSTtoolsLoaded\endinput\else \input pst-tools\fi
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
-\def\fileversion{0.12a}
-\def\filedate{2017/08/14}
+\def\fileversion{0.13}
+\def\filedate{2017/08/22}
\message{`PSTSOLARSYSTEME' v\fileversion, \filedate}
%
\pstheader{pst-solarsystem.pro}
@@ -45,8 +45,13 @@
%
\psset{Day=\number\day,Month=\number\month,Year=\number\year,Hour=12,Minute=0,Second=0}
%% === show the results ---------------------
-\define@boolkey[psset]{pst-solarsystem}[Pst@]{values}[true]{}
-\psset[pst-solarsystem]{values}
+%\newif\ifPst@solar@values
+%\define@key[psset]{pst-solarsystem}{solarValues}{\@nameuse{Pst@solar@values#1}\ifPst@solar@values true \else false \fi}
+\define@boolkey[psset]{pst-solarsystem}[Pst@]{solarValues}[true]{}
+\psset[pst-solarsystem]{solarValues=true}
+
+
+
\newpsstyle{planetes}{linestyle=none,fillstyle=gradient,gradmidpoint=0,gradend=white,GradientCircle}
\newcommand\Jupiter{%
@@ -80,8 +85,8 @@
%
\def\SolarSystem{\pst@object{SolarSystem}}
\def\SolarSystem@i{{%
- \pst@killglue%
- \use@par%
+ \pst@killglue
+ \use@keep@par
\begin{pspicture}(-8,-8)(8,8)
\psgrid[subgriddiv=0,gridcolor=lightgray,griddots=10,gridlabels=0pt]%
\pstVerb{%
@@ -112,8 +117,8 @@
\uput[180](-7,0){180\textsuperscript{o}}
\uput[270](0,-6.9){270\textsuperscript{o}}
\psline[linestyle=dotted](0,-7)(0,7)}%
- \pscircle[linestyle=none,fillstyle=gradient,gradmidpoint=0,gradend=yellow,GradientCircle=true,gradbegin=gray]{0.5}%
- {\psset{unit=2}
+ \pscircle[linestyle=none,fillstyle=gradient,gradmidpoint=0,gradend=yellow,GradientCircle=true,gradbegin=gray]{0.5}%
+ {\psset{unit=2}
% Mercure
\pstVerb{%
merLM merKA merHA merQ merP orbitalparameters
@@ -129,10 +134,10 @@
\rput(M){\psset{unit=2}%
\pscircle[style=planetes,gradbegin=black,GradientPos={(0.01,0.01)}]{0.02}
\uput[u](0,0){\footnotesize\textsf{Mercure}}}
- \ifPst@values
- \rput(-2.5,-4.25){\psPrintValue{LO}}
- \rput(-2.5,-4.75){\psPrintValue{LA}}
- \rput(-2.5,-5.25){\psPrintValue{radius}}
+ \ifPst@solarValues
+ \rput(-2.5,-4.25){\psPrintValue{LO}}%
+ \rput(-2.5,-4.75){\psPrintValue{LA}}%
+ \rput(-2.5,-5.25){\psPrintValue{radius}}%
\fi
% Venus
\pstVerb{%
@@ -150,10 +155,10 @@
\rput(V){\psset{unit=2}%
\pscircle[style=planetes,gradbegin={[HTML]{6F2D0A}},GradientPos={(0.03,0.03)}]{0.051}%
\uput{0.07}[u](0,0){\footnotesize\textsf{V\'enus}}}
- \ifPst@values
- \rput(-1.5,-4.25){\psPrintValue{LO}}
- \rput(-1.5,-4.75){\psPrintValue{LA}}
- \rput(-1.5,-5.25){\psPrintValue{radius}}
+ \ifPst@solarValues
+ \rput(-1.5,-4.25){\psPrintValue{LO}}%
+ \rput(-1.5,-4.75){\psPrintValue{LA}}%
+ \rput(-1.5,-5.25){\psPrintValue{radius}}%
\fi
% Earth
\pstVerb{%
@@ -169,41 +174,42 @@
\rput(Terre){\psset{unit=2}%
\pscircle[style=planetes,gradbegin=blue,GradientPos={(0.013,0.03)}]{0.0536}%
\uput{0.08}[u](0,0){\footnotesize\textsf{Terre}}}%
- \ifPst@values
- \rput(-0.5,-4.25){\psPrintValue{LO}}
- \rput(-0.5,-4.75){\psPrintValue{0.000}}
- \rput(-0.5,-5.25){\psPrintValue{radius}}
+ \ifPst@solarValues
+ \rput(-0.5,-4.25){\psPrintValue{LO}}%
+ \rput(-0.5,-4.75){\psPrintValue{0.000}}%
+ \rput(-0.5,-5.25){\psPrintValue{radius}}%
\fi
% Mars
-\pstVerb{%
+ \pstVerb{%
marLM marKA marHA marQ marP orbitalparameters
amar /radius exch 1 E dup mul sub mul
1 E LO LP sub cos mul add div def
- }%
- \ThreeDput{%
+ }%
+ \ThreeDput{%
\psplot[polarplot=true,plotpoints=361,linecolor=red]{LN }{LN 180 add}{%
amar 1 E dup mul sub mul
1 E x LP sub cos mul add div}%
\psplot[polarplot=true,plotpoints=361,linestyle=dashed,linecolor=blue]{180 LN add}{LN 360 add}{%
amar 1 E dup mul sub mul
1 E x LP sub cos mul add div}%
-\pnode(! radius LO cos mul radius LO sin mul){Mars}}
-\rput(Mars){%
- \psset{unit=2}\pscircle[style=planetes,gradbegin=red,GradientPos={(0.01,0.01)}]{0.02857}
- \uput[u](0,0){\footnotesize\textsf{Mars}}}%
-\ifPst@values
-\rput(0.5,-4.25){\psPrintValue{LO}}
-\rput(0.5,-4.75){\psPrintValue{LA}}
-\rput(0.5,-5.25){\psPrintValue{radius}}
-\fi
+\pnode(! radius LO cos mul radius LO sin mul){Mars}%
+ }
+ \rput(Mars){%
+ \psset{unit=2}\pscircle[style=planetes,gradbegin=red,GradientPos={(0.01,0.01)}]{0.02857}
+ \uput[u](0,0){\footnotesize\textsf{Mars}}}%
+ \ifPst@solarValues
+ \rput(0.5,-4.25){\psPrintValue{LO}}%
+ \rput(0.5,-4.75){\psPrintValue{LA}}%
+ \rput(0.5,-5.25){\psPrintValue{radius}}%
+ \fi
% Jupiter
-\pstVerb{%
+ \pstVerb{%
jupLM jupKA jupHA jupQ jupP orbitalparameters
/aJ ajup def
aJ /radius exch 1 E dup mul sub mul
1 E LO LP sub cos mul add div def
- }%
- \ThreeDput{%
+ }%
+ \ThreeDput{%
\psset{unit=0.5}
\psplot[polarplot=true,plotpoints=361,linecolor=red]{LN }{LN 180 add}{%
aJ 1 E dup mul sub mul
@@ -212,23 +218,23 @@ marLM marKA marHA marQ marP orbitalparameters
aJ 1 E dup mul sub mul
1 E x LP sub cos mul add div}%
\pnode(! radius LO cos mul radius LO sin mul){Jupiter}
-}%
-\rput(Jupiter){\psset{unit=0.1}\Jupiter%
- \uput{1.5}[u](0,0){\footnotesize\textsf{Jupiter}}}%
-\ifPst@values
-\rput(1.5,-4.25){\psPrintValue{LO}}
-\rput(1.5,-4.75){\psPrintValue{LA}}
-\rput(1.5,-5.25){\psPrintValue{radius}}
-\fi
+ }%
+ \rput(Jupiter){\psset{unit=0.1}\Jupiter%
+ \uput{1.5}[u](0,0){\footnotesize\textsf{Jupiter}}}%
+ \ifPst@solarValues
+ \rput(1.5,-4.25){\psPrintValue{LO}}%
+ \rput(1.5,-4.75){\psPrintValue{LA}}%
+ \rput(1.5,-5.25){\psPrintValue{radius}}%
+ \fi
% JSaturne
-\pstVerb{%
+ \pstVerb{%
satLM satKA satHA satQ satP orbitalparameters
/aS asat def
aS /radius exch 1 E dup mul sub mul
1 E LO LP sub cos mul add div def
- }%
- \ThreeDput{%
-\psset{unit=0.35}
+ }%
+ \ThreeDput{%
+ \psset{unit=0.35}
\psplot[polarplot=true,plotpoints=361,linecolor=red]{LN }{LN 180 add}{%
aS 1 E dup mul sub mul
1 E x LP sub cos mul add div}%
@@ -236,26 +242,27 @@ satLM satKA satHA satQ satP orbitalparameters
aS 1 E dup mul sub mul
1 E x LP sub cos mul add div}%
\pnode(! radius LO cos mul radius LO sin mul){Saturne}
-}%
-\rput(Saturne){\psset{unit=0.1}\Saturne%
- \uput{1.7}[u](0,0){\footnotesize\textsf{Saturne}}}%
-\ifPst@values
-\rput(2.5,-4.25){\psPrintValue{LO}}
-\rput(2.5,-4.75){\psPrintValue{LA}}
-\rput(2.5,-5.25){\psPrintValue{radius}}
-\fi
-}
-\ifPst@values
-\rput(-4.5,-7.75){Mercure}
-\rput(-2.5,-7.75){Venus}
-\rput(-0.5,-7.75){Earth}
-\rput(1.5,-7.75){Mars}
-\rput(3.5,-7.75){Jupiter}
-\rput(5.5,-7.75){Saturn}
-\rput(-6.5,-8.42){longitude at $^\mathrm{o}$}
-\rput(-6.5,-9.42){latitude at $^\mathrm{o}$}
-\rput(-6.5,-10.42){distance at U.A.}
-\fi
+ }%
+ \rput(Saturne){\psset{unit=0.1}\Saturne%
+ \uput{1.7}[u](0,0){\footnotesize\textsf{Saturne}}}%
+ \ifPst@solarValues
+ \rput(2.5,-4.25){\psPrintValue{LO}}%
+ \rput(2.5,-4.75){\psPrintValue{LA}}%
+ \rput(2.5,-5.25){\psPrintValue{radius}}%
+ \fi
+ }
+ \use@par
+ \ifPst@solarValues
+ \rput(-4.5,-7.75){Mercure}%
+ \rput(-2.5,-7.75){Venus}%
+ \rput(-0.5,-7.75){Earth}%
+ \rput(1.5,-7.75){Mars}%
+ \rput(3.5,-7.75){Jupiter}%
+ \rput(5.5,-7.75){Saturn}%
+ \rput(-6.5,-8.42){longitude at $^\mathrm{o}$}%
+ \rput(-6.5,-9.42){latitude at $^\mathrm{o}$}%
+ \rput(-6.5,-10.42){distance at U.A.}%
+ \fi
\end{pspicture}}}
%
\catcode`\@=\PstAtCode\relax
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-12 00:22:44 +0000