summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2024-01-30 03:00:44 +0000
committerNorbert Preining <norbert@preining.info>2024-01-30 03:00:44 +0000
commit084f5d8435744b7ea7ef487ec111a7bfd100ed62 (patch)
treed4e91f6ef6d075509a2b33942f57337725089951 /graphics
parent6c43653052d016d5913aabb728c484f0e62b4754 (diff)
CTAN sync 202401300300
Diffstat (limited to 'graphics')
-rw-r--r--graphics/pstricks/contrib/pst-solarsystem/Changes7
-rw-r--r--graphics/pstricks/contrib/pst-solarsystem/README13
-rw-r--r--graphics/pstricks/contrib/pst-solarsystem/doc/pst-solarsystem-doc.pdfbin284568 -> 546673 bytes
-rw-r--r--graphics/pstricks/contrib/pst-solarsystem/doc/pst-solarsystem-doc.tex33
-rw-r--r--graphics/pstricks/contrib/pst-solarsystem/dvips/pst-solarsystem.pro2
-rw-r--r--graphics/pstricks/contrib/pst-solarsystem/latex/pst-solarsystem.sty4
-rw-r--r--graphics/pstricks/contrib/pst-solarsystem/tex/pst-solarsystem.tex105
7 files changed, 115 insertions, 49 deletions
diff --git a/graphics/pstricks/contrib/pst-solarsystem/Changes b/graphics/pstricks/contrib/pst-solarsystem/Changes
index 2791a26884..3fdd0000f4 100644
--- a/graphics/pstricks/contrib/pst-solarsystem/Changes
+++ b/graphics/pstricks/contrib/pst-solarsystem/Changes
@@ -1,14 +1,15 @@
..... pst-solarsystem.tex
+0.14 2024-01-29 - support for languages EN/DE/FR
0.13 2017-08-22 - values->solarValues
0.12a 2017-08-14 - updated documentation
0.12 2012-01-01 - first version
..... pst-solarsystem.pro
-0.10 2012-01-01 - first version
+0.12 2012-01-01 - first version
..... pst-solarsystem.sty
-0.10 2012-01-01 - first version
+0.12 2012-01-01 - first version
..... pst-solarsystem-doc.tex
- 2012-01-01 - first version
+ 2042-01-29 - first version
diff --git a/graphics/pstricks/contrib/pst-solarsystem/README b/graphics/pstricks/contrib/pst-solarsystem/README
index 09a0ac1ae1..dce92c9f19 100644
--- a/graphics/pstricks/contrib/pst-solarsystem/README
+++ b/graphics/pstricks/contrib/pst-solarsystem/README
@@ -1,12 +1,11 @@
pst-solarsystem: drawing solar objects
Save the files pst-solarsystem.sty|tex|pro in a directory, which is part of your
-local TeX tree. The pro file should go into $TEXMF/dvips/pstricks/
-Then do not forget to run texhash to update this tree.
-For more information see the documentation of your LATEX distribution
-on installing packages into your local TeX system or read the
-TeX Frequently Asked Questions:
-(http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages).
+local TeX tree or use your package manager to install pst-solarsystem.
+
PSTricks is PostScript Tricks, the documentation cannot be run
-with pdftex, use the sequence latex->dvips->ps2pdf or xelatex.
+with pdftex, use the sequence latex->dvips->ps2pdf or xelatex or (best)
+lualatex (creates directly a PDF).
+
+hvoss@tug.org.
diff --git a/graphics/pstricks/contrib/pst-solarsystem/doc/pst-solarsystem-doc.pdf b/graphics/pstricks/contrib/pst-solarsystem/doc/pst-solarsystem-doc.pdf
index b23e717f6b..96ace7d125 100644
--- a/graphics/pstricks/contrib/pst-solarsystem/doc/pst-solarsystem-doc.pdf
+++ b/graphics/pstricks/contrib/pst-solarsystem/doc/pst-solarsystem-doc.pdf
Binary files differ
diff --git a/graphics/pstricks/contrib/pst-solarsystem/doc/pst-solarsystem-doc.tex b/graphics/pstricks/contrib/pst-solarsystem/doc/pst-solarsystem-doc.tex
index cea906760a..44fc8ef6ba 100644
--- a/graphics/pstricks/contrib/pst-solarsystem/doc/pst-solarsystem-doc.tex
+++ b/graphics/pstricks/contrib/pst-solarsystem/doc/pst-solarsystem-doc.tex
@@ -1,10 +1,11 @@
-%% $Id: pst-solarsystem-doc.tex 620 2012-01-01 14:09:57Z herbert $
+%% $Id: pst-solarsystem-doc.tex 852 2024-01-29 18:34:46Z herbert $
+\DocumentMetadata{}
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,
smallheadings, headexclude,footexclude,oneside]{pst-doc}
\usepackage{pst-solarsystem}
\let\pstFV\fileversion
\usepackage{pstricks-add}
-\renewcommand\bgImage{\resizebox{0.6\linewidth}{!}{\SolarSystem[Day=1,Month=1,Year=2012,Hour=12,viewpoint=1 -1 2]}}
+\renewcommand\bgImage{\resizebox{0.5\linewidth}{!}{\SolarSystem[Day=29,Month=1,Year=2024,Hour=24,viewpoint=1 -1 2,solarValues=false]}}
\lstset{language=PSTricks,
morekeywords={psGammaDist,psChiIIDist,psTDist,psFDist,psBetaDist,psPlotImpl},basicstyle=\footnotesize\ttfamily}
@@ -19,11 +20,13 @@
\author{Manuel Luque \\Herbert Vo\ss}
\docauthor{}
\date{\today}
-\maketitle
+\settitle
+
\tableofcontents
-\vspace{2cm}
+
+\section{introduction}
For the method of calculation, I was guided by:
\begin{itemize}
\item that given by \textit{Jean Meeus} astronomical calculations in the book for use by
@@ -75,6 +78,28 @@ graph.
\clearpage
+
+Possible languages are DE, FR and the default EN.
+With the setting \verb|language=DE|:
+
+
+\begin{center}
+\SolarSystem[language=DE]
+
+\SolarSystem[Day=30,Month=06,Year=2001,Hour=23,Minute=59,Second=59,
+ viewpoint=1 -1 2,solarValues=false,language=DE]
+\end{center}
+
+
+\begin{verbatim}
+\SolarSystem[language=DE]
+\SolarSystem[Day=30,Month=06,Year=2001,Hour=23,Minute=59,Second=59,
+ viewpoint=1 -1 2,solarValues=false,language=DE]
+\end{verbatim}
+
+\clearpage
+
+
\section{List of all optional arguments for \texttt{pst-solarsystem}}
\xkvview{family=pst-solarsystem,columns={key,type,default}}
diff --git a/graphics/pstricks/contrib/pst-solarsystem/dvips/pst-solarsystem.pro b/graphics/pstricks/contrib/pst-solarsystem/dvips/pst-solarsystem.pro
index 774ba4cc2e..cb359119d8 100644
--- a/graphics/pstricks/contrib/pst-solarsystem/dvips/pst-solarsystem.pro
+++ b/graphics/pstricks/contrib/pst-solarsystem/dvips/pst-solarsystem.pro
@@ -111,7 +111,7 @@ P 0 eq Q 0 eq and {
LO 360 gt {/LO LO 360 sub def} if
} def
%%%%% pour l'affichage des valeurs ----------------
-/Times-Roman findfont
+/NimbusRomNo9L-Regu findfont
100 scalefont
setfont
/MG 72 def
diff --git a/graphics/pstricks/contrib/pst-solarsystem/latex/pst-solarsystem.sty b/graphics/pstricks/contrib/pst-solarsystem/latex/pst-solarsystem.sty
index 9b341be4c9..734b0d2bee 100644
--- a/graphics/pstricks/contrib/pst-solarsystem/latex/pst-solarsystem.sty
+++ b/graphics/pstricks/contrib/pst-solarsystem/latex/pst-solarsystem.sty
@@ -1,6 +1,6 @@
-%% $Id: pst-solarsystem.sty 620 2012-01-01 14:09:57Z herbert $
+%% $Id: pst-solarsystem.sty 852 2024-01-29 18:34:46Z herbert $
\RequirePackage{pstricks}
-\ProvidesPackage{pst-solarsystem}[2012/01/01 package wrapper for
+\ProvidesPackage{pst-solarsystem}[2024/01/29 package wrapper for
pst-solarsystem.tex]
\input{pst-solarsystem.tex}
\IfFileExists{pst-solarsystem.pro}{%
diff --git a/graphics/pstricks/contrib/pst-solarsystem/tex/pst-solarsystem.tex b/graphics/pstricks/contrib/pst-solarsystem/tex/pst-solarsystem.tex
index daff8cb001..462b6b7a1f 100644
--- a/graphics/pstricks/contrib/pst-solarsystem/tex/pst-solarsystem.tex
+++ b/graphics/pstricks/contrib/pst-solarsystem/tex/pst-solarsystem.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-solarsystem.tex 620 2012-01-01 14:09:57Z herbert $
+%% $Id: pst-solarsystem.tex 851 2024-01-29 18:19:57Z herbert $
%%
%% This is file `pst-solarsystem.tex',
%%
@@ -6,8 +6,8 @@
%%
%% Package `pst-solarsystem.tex'
%%
-%% Manuel Luque <manuel -> perce.de>
-%% Herbert Voss <herbert -> dante.de>
+%% Manuel Luque <manuel.luque27@gmail.com>
+%% Herbert Voss <hvoss@tug.org>
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives
@@ -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.13}
-\def\filedate{2017/08/22}
+\def\fileversion{0.14}
+\def\filedate{2024/01/29}
\message{`PSTSOLARSYSTEME' v\fileversion, \filedate}
%
\pstheader{pst-solarsystem.pro}
@@ -36,14 +36,57 @@
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
%
\pst@addfams{pst-solarsystem}
+
+\def\SolarSystemLangEN{%
+ \def\ps@@Mercury{Mercury}%
+ \def\ps@@Venus{Venus}%
+ \def\ps@@Earth{Earth}%
+ \def\ps@@Mars{Mars}%
+ \def\ps@@Jupiter{Jupiter}%
+ \def\ps@@Saturn{Saturn}%
+ \def\ps@@Longitude{longitude at $^\mathrm{o}$}%
+ \def\ps@@Latitude{latitude at $^\mathrm{o}$}%
+ \def\ps@@Distance{distance at U.A.}%
+}
+
+\def\SolarSystemLangDE{%
+ \def\ps@@Mercury{Merkur}%
+ \def\ps@@Venus{Venus}%
+ \def\ps@@Earth{Erde}%
+ \def\ps@@Mars{Mars}%
+ \def\ps@@Jupiter{Jupiter}%
+ \def\ps@@Saturn{Saturn}%
+ \def\ps@@Longitude{Längengrad $^\mathrm{o}$ }%
+ \def\ps@@Latitude{Breitengrad $^\mathrm{o}$ }%
+ \def\ps@@Distance{Entfernung bei U.A. }%
+}
+
+\def\SolarSystemLangFR{%
+ \def\ps@@Mercury{Mercure}%
+ \def\ps@@Venus{V{\´e}nus}%
+ \def\ps@@Earth{Terre}%
+ \def\ps@@Mars{Mars}%
+ \def\ps@@Jupiter{Jupiter}%
+ \def\ps@@Saturn{Saturn}%
+ \def\ps@@Longitude{longitude a $^\mathrm{o}$}%
+ \def\ps@@Latitude{latitude a $^\mathrm{o}$}%
+ \def\ps@@Distance{distance a U.A. }%
+}
+\let\SolarSystemLangen\SolarSystemLangEN
+\let\SolarSystemLangde\SolarSystemLangDE
+\let\SolarSystemLangfr\SolarSystemLangFR
+
+
\define@key[psset]{pst-solarsystem}{Day}[\number\day]{\def\psk@SolarSystemD{#1}}
\define@key[psset]{pst-solarsystem}{Month}[\number\month]{\def\psk@SolarSystemM{#1}}
\define@key[psset]{pst-solarsystem}{Year}[\number\year]{\def\psk@SolarSystemY{#1}}
\define@key[psset]{pst-solarsystem}{Hour}[12]{\def\psk@SolarSystemH{#1}}
\define@key[psset]{pst-solarsystem}{Minute}[0]{\def\psk@SolarSystemMi{#1}}
\define@key[psset]{pst-solarsystem}{Second}[0]{\def\psk@SolarSystemS{#1}}
+\define@key[psset]{pst-solarsystem}{language}[EN]{\@nameuse{SolarSystemLang#1}}
%
-\psset{Day=\number\day,Month=\number\month,Year=\number\year,Hour=12,Minute=0,Second=0}
+\psset{Day=\number\day,Month=\number\month,Year=\number\year,Hour=12,Minute=0,Second=0,
+ language=EN}
%% === show the results ---------------------
%\newif\ifPst@solar@values
%\define@key[psset]{pst-solarsystem}{solarValues}{\@nameuse{Pst@solar@values#1}\ifPst@solar@values true \else false \fi}
@@ -51,9 +94,7 @@
\psset[pst-solarsystem]{solarValues=true}
-
-
-\newpsstyle{planetes}{linestyle=none,fillstyle=gradient,gradmidpoint=0,gradend=white,GradientCircle}
+\newpsstyle{planets}{linestyle=none,fillstyle=gradient,gradmidpoint=0,gradend=white,GradientCircle}
\newcommand\Jupiter{%
\psclip{\pscircle[fillstyle=solid,fillcolor=yellow]{1.5}}
\psset{fillstyle=solid,fillcolor={[cmyk]{0 0.2 0.4 0}},linestyle=none}
@@ -66,7 +107,7 @@
\psellipse[fillstyle=solid,fillcolor={[cmyk]{0 0.4 0.6 0}},linestyle=none](-0.3,-0.6)(0.35,0.2)
\pscircle{1.5}}
%
-\newcommand\Saturne{%
+\newcommand\Saturn{%
\psellipse(3,0.7)
\psellipse[linewidth=2\pslinewidth](3.5,1)
\psellipse(4,1.2)
@@ -132,8 +173,8 @@
\pnode(! radius LO cos mul radius LO sin mul){M}
}%
\rput(M){\psset{unit=2}%
- \pscircle[style=planetes,gradbegin=black,GradientPos={(0.01,0.01)}]{0.02}
- \uput[u](0,0){\footnotesize\textsf{Mercure}}}
+ \pscircle[style=planets,gradbegin=black,GradientPos={(0.01,0.01)}]{0.02}
+ \uput[u](0,0){\footnotesize\textsf{\ps@@Mercury}}}
\ifPst@solarValues
\rput(-2.5,-4.25){\psPrintValue{LO}}%
\rput(-2.5,-4.75){\psPrintValue{LA}}%
@@ -153,8 +194,8 @@
\pnode(! radius LO cos mul radius LO sin mul){V}
}%
\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}}}
+ \pscircle[style=planets,gradbegin={[HTML]{6F2D0A}},GradientPos={(0.03,0.03)}]{0.051}%
+ \uput{0.07}[u](0,0){\footnotesize\textsf{\ps@@Venus}}}
\ifPst@solarValues
\rput(-1.5,-4.25){\psPrintValue{LO}}%
\rput(-1.5,-4.75){\psPrintValue{LA}}%
@@ -172,8 +213,8 @@
1 E x LP sub cos mul add div}
\pnode(! radius LO cos mul radius LO sin mul){Terre}}
\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}}}%
+ \pscircle[style=planets,gradbegin=blue,GradientPos={(0.013,0.03)}]{0.0536}%
+ \uput{0.08}[u](0,0){\footnotesize\textsf{\ps@@Earth}}}%
\ifPst@solarValues
\rput(-0.5,-4.25){\psPrintValue{LO}}%
\rput(-0.5,-4.75){\psPrintValue{0.000}}%
@@ -195,8 +236,8 @@ marLM marKA marHA marQ marP orbitalparameters
\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}}}%
+ \psset{unit=2}\pscircle[style=planets,gradbegin=red,GradientPos={(0.01,0.01)}]{0.02857}
+ \uput[u](0,0){\footnotesize\textsf{\ps@@Mars}}}%
\ifPst@solarValues
\rput(0.5,-4.25){\psPrintValue{LO}}%
\rput(0.5,-4.75){\psPrintValue{LA}}%
@@ -220,13 +261,13 @@ marLM marKA marHA marQ marP orbitalparameters
\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}}}%
+ \uput{1.5}[u](0,0){\footnotesize\textsf{\ps@@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
+% JSaturn
\pstVerb{%
satLM satKA satHA satQ satP orbitalparameters
/aS asat def
@@ -241,10 +282,10 @@ satLM satKA satHA satQ satP orbitalparameters
\psplot[polarplot=true,plotpoints=361,linestyle=dashed,linecolor=blue]{180 LN add}{LN 360 add}{%
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}
+\pnode(! radius LO cos mul radius LO sin mul){Saturn}%
}%
- \rput(Saturne){\psset{unit=0.1}\Saturne%
- \uput{1.7}[u](0,0){\footnotesize\textsf{Saturne}}}%
+ \rput(Saturn){\psset{unit=0.1}\Saturn%
+ \uput{1.7}[u](0,0){\footnotesize\textsf{\ps@@Saturn}}}%
\ifPst@solarValues
\rput(2.5,-4.25){\psPrintValue{LO}}%
\rput(2.5,-4.75){\psPrintValue{LA}}%
@@ -253,15 +294,15 @@ satLM satKA satHA satQ satP orbitalparameters
}
\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.}%
+ \rput(-4.5,-7.75){\ps@@Mercury}%
+ \rput(-2.5,-7.75){\ps@@Venus}%
+ \rput(-0.5,-7.75){\ps@@Earth}%
+ \rput(1.5,-7.75){\ps@@Mars}%
+ \rput(3.5,-7.75){\ps@@Jupiter}%
+ \rput(5.5,-7.75){\ps@@Saturn}%
+ \rput[r](-5.5,-8.42){\ps@@Longitude}%
+ \rput[r](-5.5,-9.42){\ps@@Latitude}%
+ \rput[r](-5.5,-10.42){\ps@@Distance}%
\fi
\end{pspicture}}}
%