summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-09-12 03:05:00 +0000
committerNorbert Preining <norbert@preining.info>2021-09-12 03:05:00 +0000
commitcac1f99f7d65e4d3c8bc7575c30f6b1bc605a683 (patch)
tree5f9e3be4c324b6dd447d114753337b4977615c64 /graphics
parentbbb409a0db8bab4e45fd1fa3e7f269a855296bbc (diff)
CTAN sync 202109120304
Diffstat (limited to 'graphics')
-rw-r--r--graphics/pstricks/contrib/pst-calendar/Changes5
-rw-r--r--graphics/pstricks/contrib/pst-calendar/README13
-rw-r--r--graphics/pstricks/contrib/pst-calendar/README.md15
-rw-r--r--graphics/pstricks/contrib/pst-calendar/doc/pst-calendar-doc.pdfbin0 -> 142568 bytes
-rw-r--r--graphics/pstricks/contrib/pst-calendar/doc/pst-calendar-doc.tex169
-rw-r--r--graphics/pstricks/contrib/pst-calendar/latex/pst-calendar.sty (renamed from graphics/pstricks/contrib/pst-calendar/pst-calendar.sty)110
-rw-r--r--graphics/pstricks/contrib/pst-calendar/pst-calendar-docDE.ltx226
-rw-r--r--graphics/pstricks/contrib/pst-calendar/pst-calendar-docDE.pdfbin138683 -> 0 bytes
-rw-r--r--graphics/pstricks/contrib/pst-calendar/pst-calendar-docDE.tex131
-rw-r--r--graphics/pstricks/contrib/pst-calendar/pst-calendar-docFR.pdfbin164316 -> 0 bytes
-rw-r--r--graphics/pstricks/contrib/pst-calendar/pst-calendar-docFR.tex382
-rw-r--r--graphics/pstricks/contrib/pst-dart/Changes3
-rw-r--r--graphics/pstricks/contrib/pst-dart/README.md7
-rw-r--r--graphics/pstricks/contrib/pst-dart/doc/pst-dart-doc.pdfbin408049 -> 421175 bytes
-rw-r--r--graphics/pstricks/contrib/pst-dart/doc/pst-dart-doc.tex47
-rw-r--r--graphics/pstricks/contrib/pst-dart/latex/pst-dart.sty12
-rw-r--r--graphics/pstricks/contrib/pst-dart/tex/pst-dart.tex35
17 files changed, 301 insertions, 854 deletions
diff --git a/graphics/pstricks/contrib/pst-calendar/Changes b/graphics/pstricks/contrib/pst-calendar/Changes
index 884b50f371..02f68812a4 100644
--- a/graphics/pstricks/contrib/pst-calendar/Changes
+++ b/graphics/pstricks/contrib/pst-calendar/Changes
@@ -1,7 +1,8 @@
..... pst-calendar.sty
+0.48 2021-09-11 small changes to the code
0.47 2005-11-09 first CTAN version
-..... pst-calendar-docFR.tex
- 2004-11-09 first CTAN version
+..... pst-calendar-doc.tex
+ 2021-09-11 english documentation
diff --git a/graphics/pstricks/contrib/pst-calendar/README b/graphics/pstricks/contrib/pst-calendar/README
deleted file mode 100644
index cf3a6469bf..0000000000
--- a/graphics/pstricks/contrib/pst-calendar/README
+++ /dev/null
@@ -1,13 +0,0 @@
-Save the files pst-calendar.sty in a directory, which is part of your
-local TeX tree.
-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 LATEX distribution or the
-TeX Frequently Asked Questions:
-(http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages).
-
-pst-calendar needs pstricks, fp, pst-3d, multido and pst-xkey
-which should be all part of your
-local TeX installation, otherwise get it from a CTAN server, f.ex.
-ftp://ftp.ctan.org
-
diff --git a/graphics/pstricks/contrib/pst-calendar/README.md b/graphics/pstricks/contrib/pst-calendar/README.md
new file mode 100644
index 0000000000..f52495873c
--- /dev/null
+++ b/graphics/pstricks/contrib/pst-calendar/README.md
@@ -0,0 +1,15 @@
+# Calendars #
+
+Save the files pst-calendar.sty in a directory, which is part of your
+local TeX tree.
+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.
+
+PSTricks is PostScript Tricks, the documentation cannot be run
+with pdftex, use the sequence latex->dvips->ps2pdf or xelatex
+or lualatex with the package luapstricks.lua
+
+pst-calendar is a PSTricks related package to print different calendars.
+
diff --git a/graphics/pstricks/contrib/pst-calendar/doc/pst-calendar-doc.pdf b/graphics/pstricks/contrib/pst-calendar/doc/pst-calendar-doc.pdf
new file mode 100644
index 0000000000..5ce489e52f
--- /dev/null
+++ b/graphics/pstricks/contrib/pst-calendar/doc/pst-calendar-doc.pdf
Binary files differ
diff --git a/graphics/pstricks/contrib/pst-calendar/doc/pst-calendar-doc.tex b/graphics/pstricks/contrib/pst-calendar/doc/pst-calendar-doc.tex
new file mode 100644
index 0000000000..8cc293fc5c
--- /dev/null
+++ b/graphics/pstricks/contrib/pst-calendar/doc/pst-calendar-doc.tex
@@ -0,0 +1,169 @@
+%% $Id: pst-calendar-doc.tex 230 2021-09-11 18:04:30Z herbert $
+\RequirePackage{pdfmanagement-testphase}
+\DeclareDocumentMetadata{}
+\documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
+ headinclude=false,footinclude=false,twoside,english]{pst-doc}
+\usepackage{pst-calendar}
+\let\pstFV\fileversion
+\lstset{pos=l,wide=false,language=PSTricks,
+ morekeywords={multidipole,parallel},basicstyle=\footnotesize\ttfamily}
+%
+\def\bgImage{\psscalebox{0.3}{\psCalDodecaeder[Year=2021,style=september]}}
+
+\addbibresource{\jobname.bib}
+
+\begin{document}
+
+\title{\texttt{pst-calendar}}
+\subtitle{A PSTricks package for creating calendars; v.\pstCalendarVersion}
+\author{Manuel Luque \\Herbert Voß}
+\docauthor{Herbert Voß}
+\date{\today}
+\settitle
+
+\tableofcontents
+
+\clearpage
+
+\begin{abstract}
+\noindent
+\texttt{pst-calendar}
+provides two macros for creating calendar pages or calendar dodecahedra. The month
+and year can be freely selected, although calendars are only possible between 2000
+and 2099. The calculation takes place exclusively with the macros of the \LPack{fp} package.
+\end{abstract}
+
+
+\vfill\noindent
+Thanks to: \\
+ Denis Girou; Timmothy Van Zandt;
+
+%\tableofcontents
+
+
+\section{\LPack{pst-calendar} -- different calendars}
+
+
+The package has the three options \Loption{french}, \Loption{english} and
+\Loption{ngerman}. \Loption{english} is selected by default, which means that the names
+of the months and weeks are then output in this language. Ngerman was chosen for this documentation.
+This package does not offer any calendar operations in the mathematical sense, but allows
+the output of calendar pages. pst-calendar has special language adaptations for English
+(standard), French and German. This also applies
+to the options listed in~\ref{tab:calendrier:options}. There is no special \TeX\
+version, so adjustments are necessary here if you are not working with \LaTeX.
+
+
+\begin{BDef}
+\Lcs{psCalendar}\OptArgs\\
+\Lcs{psCalDodecaeder}\OptArgs
+\end{BDef}
+
+If no data is specified, the current date is always assumed and the corresponding month for
+\Lcs{psCalendar} and the corresponding months for \Lcs{psCalDodecaeder} are printed.
+
+\begin{table}[htb]
+\caption{Available options for \texttt{calendrierfp}}\label{tab:calendrier:options}
+\begin{tabularx}{\linewidth}{@{} ll@{}c>{\RaggedRight}X@{}}
+\emph{name} & \emph{value} & \emph{default} & \emph{meaning}\\\hline
+\Lkeyword{Year} & \Larga{Integer} & \verb+\number\year+ & year\\
+\Lkeyword{Month} & \Larga{$1\ldots 12$} & \verb+\number\month+ & month\\
+\Lkeyword{MonthT}& \Larga{$1\ldots 12$} & \verb+\number\month+ & mark the current day in the given month\\
+\Lkeyword{Day} & \Larga{$1\ldots 31$} & \verb+\number\day+ & month\\
+\Lkeyword{Style} & \Larga{Month} & \verb+\number\month+ & month on the fron in a dodecaeder
+\end{tabularx}
+\end{table}
+
+
+\bgroup
+\begin{LTXexample}[pos=t]
+\psscalebox{0.5}{\psCalendar}
+\psscalebox{0.5}{\psCalendar[Year=2021,Month=1]}
+\psscalebox{0.5}{\psCalendar[Year=2021,Tag=23,Month=2,MonthUse=2]}
+\end{LTXexample}
+\egroup
+
+
+The only problem are the holidays, which so far have been based exclusively on the French guidelines.
+However, the corresponding code sequences in the package are easy to recognize and can be changed accordingly.
+The output of a complete year can easily be realized with the help of the \Lcs{multido} macro.
+
+\begin{center}
+\bgroup
+\multido{\iM=1+3}{4}{%
+ \multido{\iMM=\iM+1}{3}{\psscalebox{0.5}{\psCalendar[Year=2021,Month=\iMM]}}\\}
+\egroup
+\end{center}
+
+\begin{lstlisting}
+\multido{\iM=1+3}{4}{%
+ \multido{\iMM=\iM+1}{3}{\psscalebox{0.5}{\psCalendar[Year=2021,Month=\iMM]}}\\}
+\end{lstlisting}
+
+
+A much more appealing output enables \Lcs{psCalDodecaeder}, which arranges the months on the sides of a dodecahedron.
+Without specifying any month or year, January of the current year is assumed. With the option \Lkeyword{style}\texttt{=⟨month⟩}
+you can always place a different month on the front.
+
+
+\bgroup\xLcs{psCalDodecaeder}\xLkeyword{Year}\xLkeyword{Month}\xLkeyword{style}\xLkeyval{april}
+\xLcs{psscalebox}
+\begin{LTXexample}[pos=t]
+\psscalebox{0.2}{\psCalDodecaeder}\hfill
+\psscalebox{0.2}{\psCalDodecaeder[Year=2021,Month=1]}\hfill
+\psscalebox{0.2}{\psCalDodecaeder[Year=2021,style=april]}
+\end{LTXexample}
+\egroup
+
+\begin{center}
+\bgroup\xLkeyval{january}\xLkeyval{february}\xLkeyval{march}\xLkeyval{april}\xLkeyval{may}\xLkeyval{june}
+\xLkeyval{july}\xLkeyval{august}\xLkeyval{september}\xLkeyval{october}\xLkeyval{november}\xLkeyval{december}
+\psscalebox{0.2}{\psCalDodecaeder[Year=2021,style=january]}\hfill
+\psscalebox{0.2}{\psCalDodecaeder[Year=2021,style=february]}\hfill
+\psscalebox{0.2}{\psCalDodecaeder[Year=2021,style=march]}\\
+\psscalebox{0.2}{\psCalDodecaeder[Year=2021,style=april]}\hfill
+\psscalebox{0.2}{\psCalDodecaeder[Year=2021,style=may]}\hfill
+\psscalebox{0.2}{\psCalDodecaeder[Year=2021,style=june]}\\
+\psscalebox{0.2}{\psCalDodecaeder[Year=2021,style=july]}\hfill
+\psscalebox{0.2}{\psCalDodecaeder[Year=2021,style=august]}\hfill
+\psscalebox{0.2}{\psCalDodecaeder[Year=2021,style=september]}\\
+\psscalebox{0.2}{\psCalDodecaeder[Year=2021,style=october]}\hfill
+\psscalebox{0.2}{\psCalDodecaeder[Year=2021,style=november]}\hfill
+\psscalebox{0.2}{\psCalDodecaeder[Year=2021,style=december]}
+\egroup
+\end{center}
+
+\begin{lstlisting}
+\psscalebox{0.2}{\psCalDodecaeder[Year=2021,style=january]}\hfill
+\psscalebox{0.2}{\psCalDodecaeder[Year=2021,style=february]}\hfill
+\psscalebox{0.2}{\psCalDodecaeder[Year=2021,style=march]}\\
+\psscalebox{0.2}{\psCalDodecaeder[Year=2021,style=april]}\hfill
+\psscalebox{0.2}{\psCalDodecaeder[Year=2021,style=may]}\hfill
+\psscalebox{0.2}{\psCalDodecaeder[Year=2021,style=june]}\\
+\psscalebox{0.2}{\psCalDodecaeder[Year=2021,style=july]}\hfill
+\psscalebox{0.2}{\psCalDodecaeder[Year=2021,style=august]}\hfill
+\psscalebox{0.2}{\psCalDodecaeder[Year=2021,style=september]}\\
+\psscalebox{0.2}{\psCalDodecaeder[Year=2021,style=october]}\hfill
+\psscalebox{0.2}{\psCalDodecaeder[Year=2021,style=november]}\hfill
+\psscalebox{0.2}{\psCalDodecaeder[Year=2021,style=december]}
+\end{lstlisting}
+
+
+\section{List of the available options for \texttt{pst-calendar}}
+
+%\begin{center}
+\xkvview{family=pst-calendar,columns={key,type,default}}
+%\end{center}
+
+
+
+\nocite{*}
+\bgroup
+\raggedright
+\printbibliography
+\egroup
+
+\printindex
+
+
+\end{document} \ No newline at end of file
diff --git a/graphics/pstricks/contrib/pst-calendar/pst-calendar.sty b/graphics/pstricks/contrib/pst-calendar/latex/pst-calendar.sty
index c34692384f..0c9885bdfd 100644
--- a/graphics/pstricks/contrib/pst-calendar/pst-calendar.sty
+++ b/graphics/pstricks/contrib/pst-calendar/latex/pst-calendar.sty
@@ -1,3 +1,4 @@
+%% $Id: pst-calendar.sty 231 2021-09-11 18:06:55Z herbert $
%%
%% This is file `pst-calendar.sty',
%%
@@ -6,7 +7,7 @@
%% Package `pst-calendar.sty'
%%
%% Manuel LUQUE <Mluque5130aol.com>
-%% Herbert Voss <voss _at_ perce.de>
+%% 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
@@ -14,38 +15,26 @@
%%
%% DESCRIPTION:
%% `pst-calendar' is a PSTricks package to draw a calendar,
-%% as a tabular or as doecahedron
+%% as a tabular or as dodecahedron
%%
% Requires PSTricks, pstricks, pst-3d, multido, fp packages
%% Manuel LUQUE <Mluque5130aol.com> %%
-%% 1 Octobre 1999 pour le dodécaèdre %%
-%% 23 avril 2003 pour le calendrier %%
-%% 27 avril : placer une date de son choix
-%% suggestion de Jean-Michel Sarlat
-%% jours fériés et fêtes : 1 mai 003 %%
-%% 1 et 8 mai, 15 août, 1 et 11 novembre, 25 décembre
-%% fête de Pâques %%
-%% ascension et pentecôte : 8 mai 2003
%
\NeedsTeXFormat{LaTeX2e}
%
-\ProvidesPackage{pst-calendar}
- [2005/11/09 v0.47 calendars with `PSTricks' (ML,hv)]
- %
+\ProvidesPackage{pst-calendar}[2021/09/11 v0.48 calendars with `PSTricks' (ML,hv)]
%
\RequirePackage{fp}
\FPmessagesfalse
\RequirePackage{pstricks}
-\SpecialCoor%
\RequirePackage{pst-3d}
\RequirePackage{multido}
\RequirePackage{pst-xkey}
+\def\pstCalendarVersion{0.48}
+
\pst@addfams{pst-calendar}% hv
-\def\CalendrierFP@version{Version 0.47, 2005-11-07}
-\message{`pst-Calendar avec FP', \CalendrierFP@version\space ML/hv}
-%
\DeclareOption{english}{%
\def\ps@Jan{January}
\def\ps@Feb{February}
@@ -68,7 +57,7 @@
\def\ps@Son{S}
}
\DeclareOption{french}{%
-\typeout{pst-calendar: using french options}
+\typeout{pst-calendar: using french option}
\def\ps@Jan{JANVIER}
\def\ps@Feb{FEVRIER}
\def\ps@Mar{MARS}
@@ -90,6 +79,7 @@
\def\ps@Son{D}
}
\DeclareOption{ngerman}{%
+\typeout{pst-calendar: using ngerman option}
\def\ps@Jan{Januar}
\def\ps@Feb{Februar}
\def\ps@Mar{M\"arz}
@@ -114,23 +104,23 @@
\ExecuteOptions{english}
\ProcessOptions
%
-\define@key[psset]{pst-calendar}{Day}{\def\psk@CalendrierJ{#1}}
-\define@key[psset]{pst-calendar}{MonthUse}{\def\psk@CalendrierMchoix{#1}}
-\define@key[psset]{pst-calendar}{Month}{\def\psk@CalendrierM{#1}}
-\define@key[psset]{pst-calendar}{Year}{\def\psk@CalendrierA{#1}}
-\psset{Day=\number\day,Month=\number\month,MonthUse=\number\month,Year=\number\year}
+\define@key[psset]{pst-calendar}{Day}[1]{\def\psk@CalendrierJ{#1}}
+\define@key[psset]{pst-calendar}{MonthUse}[1]{\def\psk@CalendrierMchoix{#1}}
+\define@key[psset]{pst-calendar}{Month}[1]{\def\psk@CalendrierM{#1}}
+\define@key[psset]{pst-calendar}{Year}[2099]{\def\psk@CalendrierA{#1}}
+\psset[pst-calendar]{Day=\number\day,Month=\number\month,MonthUse=\number\month,Year=\number\year}
%
-\define@key[psset]{pst-calendar}{Jour}{\def\psk@CalendrierJ{#1}}
-\define@key[psset]{pst-calendar}{MoisChoisi}{\def\psk@CalendrierMchoix{#1}}
-\define@key[psset]{pst-calendar}{Mois}{\def\psk@CalendrierM{#1}}
-\define@key[psset]{pst-calendar}{An}{\def\psk@CalendrierA{#1}}
-\psset{Jour=\number\day,Mois=\number\month,MoisChoisi=\number\month,An=\number\year}
+\define@key[psset]{pst-calendar}{Jour}[1]{\def\psk@CalendrierJ{#1}}
+\define@key[psset]{pst-calendar}{MoisChoisi}[1]{\def\psk@CalendrierMchoix{#1}}
+\define@key[psset]{pst-calendar}{Mois}[1]{\def\psk@CalendrierM{#1}}
+\define@key[psset]{pst-calendar}{An}[2099]{\def\psk@CalendrierA{#1}}
+\psset[pst-calendar]{Jour=\number\day,Mois=\number\month,MoisChoisi=\number\month,An=\number\year}
%
-\define@key[psset]{pst-calendar}{Tag}{\def\psk@CalendrierJ{#1}}
-\define@key[psset]{pst-calendar}{MonatT}{\def\psk@CalendrierMchoix{#1}}
-\define@key[psset]{pst-calendar}{Monat}{\def\psk@CalendrierM{#1}}
-\define@key[psset]{pst-calendar}{Jahr}{\def\psk@CalendrierA{#1}}
-\psset{Tag=\number\day,Monat=\number\month,MonatT=\number\month,Jahr=\number\year}
+\define@key[psset]{pst-calendar}{Tag}[1]{\def\psk@CalendrierJ{#1}}
+\define@key[psset]{pst-calendar}{MonatT}[1]{\def\psk@CalendrierMchoix{#1}}
+\define@key[psset]{pst-calendar}{Monat}[1]{\def\psk@CalendrierM{#1}}
+\define@key[psset]{pst-calendar}{Jahr}[2099]{\def\psk@CalendrierA{#1}}
+\psset[pst-calendar]{Tag=\number\day,Monat=\number\month,MonatT=\number\month,Jahr=\number\year}
%
\newpsstyle{january}{Vx=-\rc,Vy=0,Vz=-\rd,viewangle=108}
\newpsstyle{february}{Vx=\rc,Vy=0,Vz=-\rd,viewangle=180}
@@ -184,10 +174,10 @@
\definecolor{RougeK}{cmyk}{0.05,0.6,0.6,0}
\definecolor{RougeL}{cmyk}{0.1,0.65,0.65,0}
\newpsstyle{holiday}{framesep=2pt,doubleline=true,doublecolor=red,linecolor=red,fillstyle=solid,fillcolor=RougeA}
-\define@key[psset]{pst-calendar}{Vx}{\def\psk@Solide@Viewpointx{#1}}
-\define@key[psset]{pst-calendar}{Vy}{\def\psk@Solide@Viewpointy{#1}}
-\define@key[psset]{pst-calendar}{Vz}{\def\psk@Solide@Viewpointz{#1}}
-\psset{Vx=1,Vy=1,Vz=1}
+\define@key[psset]{pst-calendar}{Vx}[1]{\def\psk@Solide@Viewpointx{#1}}
+\define@key[psset]{pst-calendar}{Vy}[1]{\def\psk@Solide@Viewpointy{#1}}
+\define@key[psset]{pst-calendar}{Vz}[1]{\def\psk@Solide@Viewpointz{#1}}
+\psset[pst-calendar]{Vx=1,Vy=1,Vz=1}
%
\def\RA{7.36022}\gdef\rb{5.06525}\gdef\ra{8.19574}%
\gdef\rc{5.06525}\gdef\rd{8.19574}
@@ -199,59 +189,59 @@
\pspicture(-8,-12)(8,12)%
\psset{fillstyle=solid}%
\psset{viewpoint={\psk@Solide@Viewpointx} {\psk@Solide@Viewpointy} {\psk@Solide@Viewpointz}}%
-\newcommand{\faceA}{\pspolygon(\RA;18)(\RA;90)(\RA;162)(\RA;234)(\RA;306)}
-\newcommand{\faceB}{\pspolygon(\RA;270)(\RA;-18)(\RA;54)(\RA;126)(\RA;198)}
-\newcommand{\faceC}{\pspolygon(\RA;0)(\RA;72)(\RA;144)(\RA;216)(\RA;288)}
-\newcommand{\faceD}{\pspolygon(\RA;36)(\RA;108)(\RA;180)(\RA;252)(\RA;324)}
+ \newcommand\faceA{\pspolygon(\RA;18)(\RA;90)(\RA;162)(\RA;234)(\RA;306)}
+ \newcommand\faceB{\pspolygon(\RA;270)(\RA;-18)(\RA;54)(\RA;126)(\RA;198)}
+ \newcommand\faceC{\pspolygon(\RA;0)(\RA;72)(\RA;144)(\RA;216)(\RA;288)}
+ \newcommand\faceD{\pspolygon(\RA;36)(\RA;108)(\RA;180)(\RA;252)(\RA;324)}
%face1
-\FPeval{\Test}{(\psk@Solide@Viewpointx)*(0)+(\psk@Solide@Viewpointy)*(\ra)+(\psk@Solide@Viewpointz)*(\rb)}%
-\FPifpos{\Test}\ThreeDput[normal=0 {\ra} {\rb}](0,\ra,\rb){%
-\psset{fillcolor=RougeA}\faceA\rput{36}{\rput(0,0){\psCalendar[Mois=11]}}}\fi
+ \FPeval{\Test}{(\psk@Solide@Viewpointx)*(0)+(\psk@Solide@Viewpointy)*(\ra)+(\psk@Solide@Viewpointz)*(\rb)}%
+ \FPifpos{\Test}\ThreeDput[normal=0 {\ra} {\rb}](0,\ra,\rb){%
+ \psset{fillcolor=RougeA}\faceA\rput{36}{\rput(0,0){\psCalendar[#1,Mois=11]}}}\fi
%face2
-\FPeval{\Test}{(\psk@Solide@Viewpointx)*(0)-(\psk@Solide@Viewpointy)*(\ra)+(\psk@Solide@Viewpointz)*(\rb)}%
-\FPifpos{\Test}\ThreeDput[normal=0 {-\ra} {\rb}](0,-\ra,\rb){%
-\psset{fillcolor=RougeB}\faceA\rput{-36}{\rput(0,0){\psCalendar[Mois=8]}}}\fi
+ \FPeval{\Test}{(\psk@Solide@Viewpointx)*(0)-(\psk@Solide@Viewpointy)*(\ra)+(\psk@Solide@Viewpointz)*(\rb)}%
+ \FPifpos{\Test}\ThreeDput[normal=0 {-\ra} {\rb}](0,-\ra,\rb){%
+ \psset{fillcolor=RougeB}\faceA\rput{-36}{\rput(0,0){\psCalendar[#1,Mois=8]}}}\fi
%face3
-\FPeval{\Test}{(\psk@Solide@Viewpointx)*(0)+(\psk@Solide@Viewpointy)*(\ra)-(\psk@Solide@Viewpointz)*(\rb)}%
-\FPifpos{\Test}\ThreeDput[normal=0 {\ra} {-\rb}](0,\ra,-\rb){%
-\psset{fillcolor=RougeC}\faceB\rput{216}{\rput(0,0){\psCalendar[Mois=6]}}}\fi
+ \FPeval{\Test}{(\psk@Solide@Viewpointx)*(0)+(\psk@Solide@Viewpointy)*(\ra)-(\psk@Solide@Viewpointz)*(\rb)}%
+ \FPifpos{\Test}\ThreeDput[normal=0 {\ra} {-\rb}](0,\ra,-\rb){%
+ \psset{fillcolor=RougeC}\faceB\rput{216}{\rput(0,0){\psCalendar[#1,Mois=6]}}}\fi
%face4
\FPeval{\Test}{(\psk@Solide@Viewpointx)*(0)-(\psk@Solide@Viewpointy)*(\ra)-(\psk@Solide@Viewpointz)*(\rb)}%
\FPifpos{\Test}\ThreeDput[normal=0 {-\ra} {-\rb}](0,-\ra,-\rb){%
-\psset{fillcolor=RougeD}\faceB\rput{144}{\rput(0,0){\psCalendar[Mois=3]}}}\fi%
+\psset{fillcolor=RougeD}\faceB\rput{144}{\rput(0,0){\psCalendar[#1,Mois=3]}}}\fi%
%face 5
\FPeval{\Test}{(\psk@Solide@Viewpointx)*(\rc)+(\psk@Solide@Viewpointy)*(0)+(\psk@Solide@Viewpointz)*(\rd)}%
\FPifpos{\Test}\ThreeDput[normal={\rc} 0 {\rd}](\rc,0,\rd){%
-\psset{fillcolor=RougeE}\faceB\rput(0,0){\psCalendar[Mois=12]}}\fi
+\psset{fillcolor=RougeE}\faceB\rput(0,0){\psCalendar[#1,Mois=12]}}\fi
%face6
\FPeval{\Test}{(\psk@Solide@Viewpointx)*(-\rc)+(\psk@Solide@Viewpointy)*(0)+(\psk@Solide@Viewpointz)*(\rd)}%
\FPifpos{\Test}\ThreeDput[normal={-\rc} 0 {\rd}](-\rc,0,\rd){%
-\psset{fillcolor=RougeF}\faceB\rput{0}{\rput(0,0){\psCalendar[Mois=7]}}}\fi
+\psset{fillcolor=RougeF}\faceB\rput{0}{\rput(0,0){\psCalendar[#1,Mois=7]}}}\fi
%face7
\FPeval{\Test}{(\psk@Solide@Viewpointx)*(\rc)+(\psk@Solide@Viewpointy)*(0)-(\psk@Solide@Viewpointz)*(\rd)}%
\FPifpos{\Test}\ThreeDput[normal={\rc} 0 {-\rd}](\rc,0,-\rd){%
-\psset{fillcolor=RougeG}\faceA\rput{180}{\rput(0,0){\psCalendar[Mois=2]}}}\fi
+\psset{fillcolor=RougeG}\faceA\rput{180}{\rput(0,0){\psCalendar[#1,Mois=2]}}}\fi
%face8
\FPeval{\Test}{(\psk@Solide@Viewpointx)*(-\rc)+(\psk@Solide@Viewpointy)*(0)-(\psk@Solide@Viewpointz)*(\rd)}%
\FPifpos{\Test}\ThreeDput[normal={-\rc} 0 {-\rd}](-\rc,0,-\rd){%
-\psset{fillcolor=RougeH}\faceA\rput{108}{\rput(0,0){\psCalendar[Mois=1]}}}\fi%
+\psset{fillcolor=RougeH}\faceA\rput{108}{\rput(0,0){\psCalendar[#1,Mois=1]}}}\fi%
%face 9
\FPeval{\Test}{(\psk@Solide@Viewpointx)*(\rd)+(\psk@Solide@Viewpointy)*(\rc)+(\psk@Solide@Viewpointz)*(0)}%
\FPifpos{\Test}\ThreeDput[normal={\rd} {\rc} 0](\rd,\rc,0){%
-\psset{fillcolor=RougeI}\faceC\rput{18}{\rput(0,0){\psCalendar[Mois=10]}}}\fi
+\psset{fillcolor=RougeI}\faceC\rput{18}{\rput(0,0){\psCalendar[#1,Mois=10]}}}\fi
%face10
\FPeval{\Test}{(\psk@Solide@Viewpointx)*(-\rd)+(\psk@Solide@Viewpointy)*(\rc)+(\psk@Solide@Viewpointz)*(0)}%
\FPifpos{\Test}\ThreeDput[normal={-\rd} {\rc} 0](-\rd,\rc,0){%
-\psset{fillcolor=RougeJ}\faceD\rput{198}{\rput(0,0){\psCalendar[Mois=5]}}}\fi
+\psset{fillcolor=RougeJ}\faceD\rput{198}{\rput(0,0){\psCalendar[#1,Mois=5]}}}\fi
%face11
\FPeval{\Test}{(\psk@Solide@Viewpointx)*(\rd)-(\psk@Solide@Viewpointy)*(\rc)+(\psk@Solide@Viewpointz)*(0)}%
\FPifpos{\Test}\ThreeDput[normal={\rd} {-\rc} 0](\rd,-\rc,0){%
-\psset{fillcolor=RougeK}\faceD\rput{-18}{\rput(0,0){\psCalendar[Mois=9]}}}\fi
+\psset{fillcolor=RougeK}\faceD\rput{-18}{\rput(0,0){\psCalendar[#1,Mois=9]}}}\fi
%face8
\FPeval{\Test}{(\psk@Solide@Viewpointx)*(-\rd)+(\psk@Solide@Viewpointz)*(0)-(\psk@Solide@Viewpointy)*(\rc)}%
\FPifpos{\Test}\ThreeDput[normal={-\rd} {-\rc} 0](-\rd,-\rc,0){%
-\psset{fillcolor=RougeL}\faceC\rput{162}{\rput(0,0){\psCalendar[Mois=4]}}}\fi%
-\endpspicture
+ \psset{fillcolor=RougeL}\faceC\rput{162}{\rput(0,0){\psCalendar[#1,Mois=4]}}}\fi%
+\endpspicture%
}}
%
%
diff --git a/graphics/pstricks/contrib/pst-calendar/pst-calendar-docDE.ltx b/graphics/pstricks/contrib/pst-calendar/pst-calendar-docDE.ltx
deleted file mode 100644
index caa831ddd3..0000000000
--- a/graphics/pstricks/contrib/pst-calendar/pst-calendar-docDE.ltx
+++ /dev/null
@@ -1,226 +0,0 @@
-\documentclass[11pt,a4paper,ngerman]{article}
-\usepackage[latin1]{inputenc}%
-\usepackage[T1]{fontenc}
-\usepackage{babel}
-\usepackage{lmodern}
-\parindent=0pt
-\parskip=5pt plus 3pt minus 2pt
-\usepackage{enumerate,longtable,url}
-\let\OldUrl=\url
-\renewcommand\url[1]{\protect\OldUrl{#1}}
-
-\usepackage[scaled]{luximono}
-%
-\usepackage{xspace,nonfloat}
-\usepackage[bottom]{footmisc}
-%
-\usepackage{tabularx}
-\usepackage{longtable}
-\usepackage{ltxtable}
-\usepackage{varioref}
-\usepackage[NewCommands,NewParameters]{ragged2e}
-\usepackage{url}
-\def\UrlFont{\ttfamily}
-\makeatletter
-%\def\verbatim@font{\small\normalfont\ttfamily}
-%
-\usepackage[dvipsnames,prologue,table]{pstricks}
-\colorlet{tableheadcolor}{gray!25}
-\colorlet{tablerowcolor}{gray!12}
-\newcommand\XCBox[1]{\fcolorbox{black}{#1}{\phantom{aa}} \small #1}
-\usepackage{pst-calendar}
-\let\PSTfileversion\fileversion
-\SpecialCoor
-\psset{griddots=10,subgriddiv=0,gridlabels=7pt}
-%
-\definecolor{hellgelb}{rgb}{1,1,0.8}
-\definecolor{shadecolor}{rgb}{0.9,0.9,0.9}
-\definecolor{sphgrau}{rgb}{0.40,0.40,0.40}
-%
-% ------------------------------- Namen Abkuerungen ----------------------
-\newcommand{\La}%
- {L\kern-.36em
- {\setbox0\hbox{T}%
- \vbox to\ht0{\hbox{$\m@th$%
- \csname S@\f@size\endcsname
- \fontsize\sf@size\z@
- \math@fontsfalse\selectfont
- A}%
- \vss}%
- }}
-\def\AllTeX{(\La\kern-.075em)\kern-.075em\TeX\xspace}
-\def\AMS{American Mathematical Society\xspace}
-\def\AmS{$\mathcal{A}$\kern-.1667em\lower.5ex\hbox
- {$\mathcal{M}$}\kern-.125em$\mathcal{S}$}
-\def\AmSLaTeX{\AmS-\LaTeX\xspace}
-\let\latex\LaTeX
-\let\tex\TeX
-%
-\def\BibTeX{\textsc{Bib}\kern-.08em\TeX\index{BiBTeX@Bib\TeX}}
-\def\PT{Plain \TeX\index{Plain TeX@Plain \TeX}\xspace}
-\def\PST{{\texttt{PSTricks}}\xspace}
-\def\CTAN{{\texttt{CTAN}}\index{CTAN}\xspace}
-\def\PDF{{\texttt{PDF}}\xspace}
-\def\pst{{\texttt{pstricks}}\xspace}
-\def\PS{PostScript\xspace}
-\def\CT{Con\TeX t\index{ConTeXt@Con\TeX t}\xspace}
-\def\GS{Ghostscript\index{Ghostscript}\xspace}
-\def\GeX{G\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\@}
-\def\at{\char064}
-\def\VTeX{\texttt{V\TeX}\index{VTeX@\texttt{V\protect\TeX}}}
-\newcommand*\CMD[1]{{\texttt{\textbackslash #1}}}
-\newcommand\Paket[1]{\texttt{#1}}
-\providecommand\Programm[1]{\textsf{#1}}
-\providecommand\RaggedRight{\raggedright}
-%
-\def\Index#1{\index{#1}#1}
-\index{Environment|see{Umgebung}}
-\def\eIndex#1{\index{Umgebung!#1@\texttt{#1}}\index{#1@\texttt{#1}}}
-\def\tIndex#1{\index{#1@\texttt{#1}}}
-\def\cIndex#1{\index{#1@\protect\CMD{#1}}}
-\def\pIndex#1{\index{Parameter@\textbf{Parameter}!#1@\texttt{#1}}\index{#1@\texttt{#1}}}
-\def\ppIndex#1{\index{Parameter@\textbf{Parameter}!#1@\texttt{#1}}}
-\def\sIndex#1{\index{Syntax@\textbf{Syntax}!\protect\CMD{#1}}}
-\def\csIndex#1{\sIndex{#1}\cIndex{#1}}
-\def\PIndex#1{\index{Paket@\textbf{Paket}!\texttt{#1}}}
-\def\mIndex#1{\texttt{#1}\tIndex{#1}\pIndex{#1}}
-\def\aref#1{$\rightarrow$\vref{#1}}
-\def\PSindex#1{\index{PostScript!#1}}
-\def\Makroindex#1{\index{Makro!#1@\protect\CMD{#1}}}
-\def\Optindex#1{\index{Parameter@\textbf{Parameter}!\texttt{#1}}}
-\def\ttindex#1{\index{#1@\texttt{#1}}}
-\def\vert{\ensuremath{|}}
-%
-\let\Olddegrees\textdegrees
-\def\textdegrees{\ensuremath{\mbox{\Olddegrees}}}
-\def\sa{\ensuremath{\sphericalangle}\xspace}% needs amssymb
-%
-%
-%%-------------------------------- danger ---------------------------------------------
-\usepackage{manfnt}
-\usepackage{lettrine}
-\newsavebox{\dBox}
-
-\newenvironment{dangerPar*}
-{\gdef\dangerSym{\dbend\,\dbend}\@dangerPar}
-{\end@dangerPar}
-
-\newenvironment{dangerPar}
-{\gdef\dangerSym{\dbend\phantom{\,\dbend}}\@dangerPar}
-{\end@dangerPar}
-
-\def\@dangerPar{%
- \begin{lrbox}{\dBox}
- \minipage[c]{\linewidth-\widthof{\dangerSym}-\columnsep}%
-}
-\def\end@dangerPar{%
- \endminipage
- \end{lrbox}%
- \trivlist\item\relax
- \noindent
- \minipage[c]{\widthof{\dangerSym}}
- \raisebox{\height}[.9\height][.1\height]{\dangerSym}% ???
- \endminipage
- \hfill
- \minipage[c]{\wd\dBox}
- \usebox{\dBox}
- \endminipage%
- \endtrivlist
-}
-\newsavebox{\bombbox}
-\sbox\bombbox{%
- \psset{unit=.55ex}%
- \begin{pspicture}(-4,-4)(4,4)
- \pscircle[fillcolor=gray,fillstyle=solid]{4}
- \rput{45}{\psscaleboxto(6,0){\textsf{\textbf{PS}}}}
- \psellipse*(0,3.8)(1,.2)
- \psellipse*(0,5.5)(1,.2)
- \psframe*(-1,3.8)(1,5.5)
- \psbezier(0,5.5)(0,7)(1,8)(3.5,8)
- \multido{\r=-0+40}{9}{\rput{\r}(3.5,8){\psline(0,0)(.4,0)}}
- \end{pspicture}}
-
-\newcommand\danger{%
- \lettrine[lines=2,lraise=0.65,nindent=0pt,findent=.5em]{{\small\dbend}}}
-
-\newcommand\ddanger{%
- \lettrine[lines=2,lraise=0.65,nindent=0pt,findent=.5em]{%
- {\small\dbend\,\dbend}}}
-
-\newcommand\DANGER{%
- \lettrine[lines=3,lraise=0.01,lhang=0,nindent=0pt,findent=.75em]{%
- \usebox\bombbox}}
-%%------------------------------- Rest ------------------------------------------
-\pretolerance=500
-\tolerance=1000
-\hbadness=3000
-\vbadness=3000
-\hyphenpenalty=400
-
-%-------------------------------- Listings -------------------------------------
-\usepackage{showexpl}% not a real PSTricks package
-%
-\renewcommand{\ttdefault}{ul9}% Luxi Mono
-%\lstset{language=PSTricks,keywordstyle=\small\fontfamily{ul9}\bfseries}
-\lstset{wide=true}
-%
-%-------------------------------- Allgemein -------------------------------------
-%\addtolength\belowcaptionskip{-10pt}
-%
-\providecommand\dante{DANTE \eV}
-\providecommand\eV{e.V\kern-.18em\@ifnextchar.{}{.}}
-\def\textat{\protect\makeatletter\texttt{@}\protect\makeatother}
-
-\def\lBrace{\texttt{\{}}
-\def\rBrace{\texttt{\}}}
-\def\lBracket{\texttt{[}}
-\def\rBracket{\texttt{]}}
-%
-\newcounter{SX@refC}% for texlive8
-\def\PSTemph#1{\textit{\texttt{#1}}}
-%
-\def\LPack#1{\texttt{#1}\PIndex{#1}}
-\def\Lmenv#1{\texttt{#1}\eIndex{#1}}
-\def\Lmcs#1{\CMD{#1}\Makroindex{#1}\cIndex{#1}}
-\let\xLcs\Lmcs
-\let\Lmsyn\Lmcs
-\let\Lcs\CMD
-\let\Lit\texttt
-\def\Loption#1{\texttt{#1}\Optindex{#1}\ttindex{#1}}
-\def\LProg#1{\texttt{#1}\pIndex{#1}}
-\let\Prog\LProg
-\def\LFile#1{\texttt{#1}\tIndex{#1}}
-\def\LColor#1{\texttt{#1}\index{Farbe!#1@\texttt{#1}}}
-\def\Lindex#1{#1\index{#1}}% Ausgeben und in den Index
-\def\Lext#1{\texttt{#1}\index{Dateiendung!#1@\texttt{#1}}}
-\def\LClass#1{\texttt{#1}}
-\def\Lmnotation#1{\texttt{#1}\tIndex{#1}}
-\newcommand\Larga{}
-\DeclareRobustCommand\Larga[1]{$\langle$\PSTemph{#1}$\rangle$}
-\newcommand\LargA{}
-\DeclareRobustCommand\LargA[1]{\lBrace$\langle$\PSTemph{#1}$\rangle$\rBrace}
-\newcommand\Largs{}
-\DeclareRobustCommand\Largs[1]{\lBracket$\langle$\PSTemph{#1}$\rangle$\rBracket}
-\newcommand\Largb{}
-\DeclareRobustCommand\Largb[1]{\lBrace$\langle$\PSTemph{#1}$\rangle$\rBrace}
-\newcommand\Largr{}
-\DeclareRobustCommand\Largr[1]{\PSTemph{({#1})}}
-\DeclareRobustCommand\Largra[1]{(\Larga{#1})}
-\newcommand\Larg{}
-\DeclareRobustCommand\Larg[1]{\lBrace\texttt{#1}\rBrace}
-\def\begEnv#1{\CMD{begin\{#1\}}\tIndex{#1}}
-\def\endEnv#1{\CMD{end\{#1\}}}
-\def\OptArg{\Largs{Optionen}}
-\def\Largrao{($\langle x_0,y_0\rangle$)}
-\def\Largrai{($\langle x_1,y_1\rangle$)}
-\def\Largraii{($\langle x_2,y_2\rangle$)}
-\def\Largraiii{($\langle x_3,y_3\rangle$)}
-\def\Largran{($\langle x_n,y_n\rangle$)}
-%
-\input random
-%
-\begin{document}
-
-\input{pst-calendar-docDE}
-
-\end{document}
diff --git a/graphics/pstricks/contrib/pst-calendar/pst-calendar-docDE.pdf b/graphics/pstricks/contrib/pst-calendar/pst-calendar-docDE.pdf
deleted file mode 100644
index 86ae9dbb86..0000000000
--- a/graphics/pstricks/contrib/pst-calendar/pst-calendar-docDE.pdf
+++ /dev/null
Binary files differ
diff --git a/graphics/pstricks/contrib/pst-calendar/pst-calendar-docDE.tex b/graphics/pstricks/contrib/pst-calendar/pst-calendar-docDE.tex
deleted file mode 100644
index 23522d6f7a..0000000000
--- a/graphics/pstricks/contrib/pst-calendar/pst-calendar-docDE.tex
+++ /dev/null
@@ -1,131 +0,0 @@
-\title{\texttt{PST-Calendar} - plotting calendars\\
-\footnotesize{version \PSTfileversion}}
-\author{%
-Manuel Luque\thanks{\url{Mluque5130@aol.com}} and
-Herbert Vo\ss\thanks{\url{voss@pstricks.de}}}
-\date{\today}
-\maketitle
-
-\begin{abstract}
-\texttt{pst-calendar} stellt zwei Makros für das Erstellen von Kalenderblättern
-oder Kalender-Dodekaedern. Der Monat und das Jahr können frei gewählt werden,
-wobei Kalender nur zwischen 2000 und 2099 möglich sind. Die Berechnung
-erfolgt ausschließlich mit den Makros des \LPack{fp}-Pakets.
-\end{abstract}
-
-%\tableofcontents
-
-
-\section{\LPack{pst-calendar} -- Verschiedene Kalenderoperationen}
-
-Das Paket hat die drei Optionen \Loption{french}, \Loption{english} und \Loption{ngerman}.
-Standardmäßig wird \verb+english+ ausgewählt, womit die Monats- und WOchennamen dann
-in eben dieser Sprache ausgegeben werden. Für die Dokumentation wurde \verb+ngerman+
-ausgewählt.
-
-
-Dieses Paket bietet keine Kalenderoperationen im mathematischen Sinne, sondern erlaubt
-die Ausgabe von Kalenderblättern. \LPack{pst-calendar} verfügt über speziellen Sprachanpassungen
-für Englisch (Standard),Französisch und Deutsch. Dies bezieht sich auch auf die Optionen, die
-in Tabelle~\ref{tab:calendrier:options} zusammengestellt sind.
-Es existiert keine spezielle
-\TeX-Version, sodass hier spezielle Anpassungen nötig werden, wenn nicht mit \LaTeX\
-gearbeitet wird.
-
-\Lmsyn{psCalendar}\OptArg\\
-\Lmsyn{psCalDodecaeder}\OptArg
-
-Ohne Angabe von Daten wird immer vom aktuellen Tagesdatum ausgegangen und der entsprechende Monat
-für \Lmcs{psCalendar} und die entsprechenden Monate für \Lmcs{psCalDodecaeder} ausgegeben.
-\begin{table}[htb]
-\caption{Zusammenstellung der verfügbaren Optionen für \texttt{calendrierfp}}\label{tab:calendrier:options}
-\begin{tabularx}{\linewidth}{@{}ll@{}c>{\RaggedRight}X@{}}
-\emph{Name} & \emph{Wert} & \emph{Vorgabe} & \emph{Bedeutung}\\\hline
-\Loption{Jahr} & \Larga{Integer} & \verb+\number\year+ & betrachteter Jahr\\
-\Loption{Monat} & \Larga{$1\ldots 12$} & \verb+\number\month+ & betrachteter Monat\\
-\Loption{MonatT} & \Larga{$1\ldots 12$} & \verb+\number\month+ & Markierung des aktuellen Tages im angegebenen Monat\\
-\Loption{Tag} & \Larga{$1\ldots 31$} & \verb+\number\day+ & betrachteter Monat\\
-\Loption{style} & \Larga{Monat} & \verb+\number\month+ & vorne liegender Monat beim Dodekaeder
-\end{tabularx}
-\end{table}
-
-
-\bgroup
-\begin{LTXexample}[pos=t]
-\psscalebox{0.5}{\psCalendar}
-\psscalebox{0.5}{\psCalendar[Jahr=2006,Monat=1]}
-\psscalebox{0.5}{\psCalendar[Jahr=2006,Tag=23,Monat=2,MonatT=2]}
-\end{LTXexample}
-\egroup
-
-Das einzige Problem sind die Feiertage, die bislang noch ausschließlich auf den französichen
-Vorgaben aufbauen. Die entsprechenden Kode-Sequenzen in dem Paket sind jedoch leicht zu
-erkennen und entsprechend zu ändern. Die Ausgabe eines kompletten Jahres lässt sich
-mithilfe des \Lmcs{multido}-Makros leicht realisieren.
-
-
-\begin{center}
-\bgroup
-\multido{\iM=1+3}{4}{%
- \multido{\iMM=\iM+1}{3}{\psscalebox{0.5}{\psCalendar[Jahr=2006,Monat=\iMM]}}\\}
-\egroup
-\end{center}
-
-\begin{lstlisting}
-\multido{\iM=1+3}{4}{%
- \multido{\iMM=\iM+1}{3}{\psscalebox{0.5}{\psCalendar[Jahr=2006,Monat=\iMM]}}\\}
-\end{lstlisting}
-
-Eine weitaus ansprechendere Ausgabe ermöglicht \Lmcs{psCalDodecaeder}, welcher die
-Monate auf den Seiten eines Dodekaeders\index{Dodekaeder} anordnet. Ohne Angabe irgendeines
-Monates beziehungsweise Jahres wird grundsätzlich vom Januar des aktuellen Jahres
-ausgegangen. Mit der Option \Loption{style}\verb+=+\Larga{Monat} kann man jederzeit
-einen anderen Monat auf die Vorderseite platzieren.
-
-\bgroup
-\begin{LTXexample}[pos=t]
-\psscalebox{0.2}{\psCalDodecaeder}\hfill
-\psscalebox{0.2}{\psCalDodecaeder[Jahr=2006,Monat=1]}\hfill
-\psscalebox{0.2}{\psCalDodecaeder[Jahr=2006,style=April]}
-\end{LTXexample}
-\egroup
-
-\begin{center}
-\bgroup
-\psscalebox{0.2}{\psCalDodecaeder[Jahr=2006,style=Januar]}\hfill
-\psscalebox{0.2}{\psCalDodecaeder[Jahr=2006,style=Februar]}\hfill
-\psscalebox{0.2}{\psCalDodecaeder[Jahr=2006,style=Maerz]}\\
-\psscalebox{0.2}{\psCalDodecaeder[Jahr=2006,style=April]}\hfill
-\psscalebox{0.2}{\psCalDodecaeder[Jahr=2006,style=Mai]}\hfill
-\psscalebox{0.2}{\psCalDodecaeder[Jahr=2006,style=Juni]}\\
-\psscalebox{0.2}{\psCalDodecaeder[Jahr=2006,style=Juli]}\hfill
-\psscalebox{0.2}{\psCalDodecaeder[Jahr=2006,style=August]}\hfill
-\psscalebox{0.2}{\psCalDodecaeder[Jahr=2006,style=September]}\\
-\psscalebox{0.2}{\psCalDodecaeder[Jahr=2006,style=Oktober]}\hfill
-\psscalebox{0.2}{\psCalDodecaeder[Jahr=2006,style=November]}\hfill
-\psscalebox{0.2}{\psCalDodecaeder[Jahr=2006,style=Dezember]}
-\egroup
-\end{center}
-
-\begin{lstlisting}
-\psscalebox{0.2}{\psCalDodecaeder[Jahr=2006,style=Januar]}\hfill
-\psscalebox{0.2}{\psCalDodecaeder[Jahr=2006,style=Februar]}\hfill
-\psscalebox{0.2}{\psCalDodecaeder[Jahr=2006,style=Maerz]}\\
-\psscalebox{0.2}{\psCalDodecaeder[Jahr=2006,style=April]}\hfill
-\psscalebox{0.2}{\psCalDodecaeder[Jahr=2006,style=Mai]}\hfill
-\psscalebox{0.2}{\psCalDodecaeder[Jahr=2006,style=Juni]}\\
-\psscalebox{0.2}{\psCalDodecaeder[Jahr=2006,style=Juli]}\hfill
-\psscalebox{0.2}{\psCalDodecaeder[Jahr=2006,style=August]}\hfill
-\psscalebox{0.2}{\psCalDodecaeder[Jahr=2006,style=September]}\\
-\psscalebox{0.2}{\psCalDodecaeder[Jahr=2006,style=Oktober]}\hfill
-\psscalebox{0.2}{\psCalDodecaeder[Jahr=2006,style=November]}\hfill
-\psscalebox{0.2}{\psCalDodecaeder[Jahr=2006,style=Dezember]}
-\end{lstlisting}
-
-\iffalse
-\nocite{*}
-\bibliographystyle{plain}
-\bibliography{pst-labo-doc}
-\fi
-
-\endinput \ No newline at end of file
diff --git a/graphics/pstricks/contrib/pst-calendar/pst-calendar-docFR.pdf b/graphics/pstricks/contrib/pst-calendar/pst-calendar-docFR.pdf
deleted file mode 100644
index f522579e21..0000000000
--- a/graphics/pstricks/contrib/pst-calendar/pst-calendar-docFR.pdf
+++ /dev/null
Binary files differ
diff --git a/graphics/pstricks/contrib/pst-calendar/pst-calendar-docFR.tex b/graphics/pstricks/contrib/pst-calendar/pst-calendar-docFR.tex
deleted file mode 100644
index cce06c5ef1..0000000000
--- a/graphics/pstricks/contrib/pst-calendar/pst-calendar-docFR.tex
+++ /dev/null
@@ -1,382 +0,0 @@
-\documentclass{article}
-\usepackage[latin1]{inputenc}%
-\usepackage[T1]{fontenc}
-\usepackage[a4paper,margin=2cm]{geometry}
-%% Manuel LUQUE <Mluque5130aol.com> %%
-%% 1 Octobre 1999 pour le dodécaèdre %%
-%% 23 avril 2003 pour le calendrier %%
-%% 26 avril : calcul de la date de Pâques %%
-%% 27 avril 20003 : repérer une date particulière,
-%% suggestion de Jean-Michel Sarlat %%
-%% jours fériés : 1 et 8 mai, 1 et 11 décembre
-%% 25 août et lundi de Pâques
-\pagestyle{empty}
-%
-\usepackage[french]{pst-calendar}
-%
-\usepackage{url}
-\newcommand\Encadre[1]{\psframebox[fillstyle=solid,fillcolor=yellow,linecolor=red]{#1}}
-\title{Calculer un calendrier avec \LaTeX{},\\
-le dessiner en 3D avec PSTricks (version 0.47)}
-\author{Manuel Luque}
-\date{\today}
-\begin{document}
-
-\maketitle
-%{\typein[\Year]{Entrez l'année (2000...2099)?}
-%\def\Year{2006}
-\begin{center}
-\psset{An=2006}
-\begin{tabular}{ll}
-\psCalendar[Mois=1]&\psCalendar[Mois=2]\\
-\psCalendar[Mois=3]&\psCalendar[Mois=4]\\
-\psCalendar[Mois=5]&\psCalendar[Mois=6]
-\end{tabular}
-
-\end{center}
-\begin{center}
-\begin{tabular}{ll}
-\psCalendar[Mois=7]&\psCalendar[Mois=8]\\
-\psCalendar[Mois=9]&\psCalendar[Mois=10]\\
-\psCalendar[Mois=11]&\psCalendar[Mois=12]
-\end{tabular}
-\end{center}
-%}
-\begin{center}
-\psscalebox{0.5}{\psCalDodecaeder[Vx=-\rd,Vy=\rc,Vz=0,viewangle=198]}
-\end{center}
-\section{Objectifs, outils et méthodes adoptés}
-\subsection{Objectifs}
-Il s'agissait de calculer avec \LaTeX{}, un calendrier valable de l'an
-2\,000 à l'an 2\,099 (je suis optimiste), puis d'adopter une méthode
-originale de représentation en 3D, en plaçant chaque mois sur l'une des
-faces d'un dodécaèdre. Un calendrier de ce type était, il y quelques années,
-offert par les visiteurs médicaux des laboratoires \textsc{Pfizer}.
-\subsection{Outils adoptés}
-Il existe déjà un calendrier écrit en \LaTeX{}, dont les calculs sont faits
-directement en \TeX{}. Il s'agit de \texttt{calendar}, écrit par Michael
-Barret et disponible sur le serveur du \texttt{CTAN} ; c'est très bien fait.
-
-Un calendrier en 3D, dessiné avec PSTricks, est déjà proposé depuis plusieurs d'années par Denis
-Girou sur : \url{http://tug.org/applications/PSTricks/More}.
-
-Donc, rien de neuf, mais revu à ma façon : pour ma part j'ai décidé d'utiliser les macros du package \texttt{fp} de Michael
-Mehlich, qui forment un excellent outil de calcul. La lecture du code écrit
-avec ce package est plus compréhensible que celui écrit en \TeX{} de base.
-
-Pour la représentation en 3d, j'ai aussi, utilisé PSTricks de Timothy Van Zandt, et
-en particulier l'extension \texttt{pst-3d}.
-\subsection{Méthode adoptée}
-La méthode de calcul des jours de semaine du calendrier est déduite de quelques
-observations :
-\begin{enumerate}
- \item Le 1 janvier 2\,000 est un samedi. On adopte la convention de
- représenter les jours de semaine par un numéro : j'ai choisi :
-\begin{center}
- \renewcommand{\arraystretch}{1.5}
- \begin{tabular}{ccccccc}
- lundi&mardi&mercredi&jeudi&vendredi&samedi&dimanche\\ \hline
- 1&2&3&4&5&6&7
- \end{tabular}
-\end{center}
- \item Une année ordinaire comprend 365 jours, or $365=52\times7+1$. Il y a
- donc un décalage de 1~jour dans le nom des jours pour l'année suivante si
- elle est ordinaire elle aussi. Autrement dit le 1~janvier 2\,001 devrait
- être un dimanche ($6+1=7$). Or l'an 2\,000 est bissextile et comporte 366~jours : le
- décalage sera de 2, le 1~janvier 2\,001 correspondra au numéro $6+2=8=1\ (modulo\ 7)$.
- \item Sur la période retenue 2\,000/2\,099 les années divisibles par 4 :
- 2\,000, 2\,004, 2\,008 etc. sont bissextiles. On déterminera donc si
- l'année choisie est bissextile en testant si elle est un multiple de~4.
-\begin{verbatim}
-% test d'une année bissextile
-\FPeval{\YearBissextil}{(\psk@CalendrierA)/4}
-\FPtrunc{\YearBissextil}{\YearBissextil}{0}
-\FPeval{\YearBissextil}{(\YearBissextil)*4}
-\FPtrunc{\YearBissextil}{\YearBissextil}{0}
-\ifnum\YearBissextil=\psk@CalendrierA
-etc.
-\end{verbatim}
- \item Pour une année choisie, on calculera le décalage par rapport à
- 2\,000, en comptant les années et en ajoutant 1 chaque fois qu'il y aura
- dans cet intervalle une année bissextile (en tenant compte de 2\,000).
- \item On retient pour le début de chaque mois :
-\begin{center}
- \renewcommand{\arraystretch}{1.5}
- \begin{tabular}{c|c|c}
- mois&année ordinaire&année bissextile\\ \hline
- janvier&1&1\\
- février&32&32\\
- mars&60&61\\
- avril&91&92\\
- mai&121&122\\
- juin&152&153\\
- juillet&182&183\\
- août&213&214\\
- septembre&244&245\\
- octobre&274&275\\
- novembre&305&306\\
- décembre&335&336\\
- \end{tabular}
-\end{center}
-\end{enumerate}
-
-
-
-
-\section{L'utilisation}
-\subsection{Utilisation simple}
-Si on veut voir uniquement le mois de l'année choisie, on fera, par exemple :
-\begin{verbatim}
-\psCalendar[An=2099,Mois=12,Jour=25,MoisChoisi=12]
-\end{verbatim}
-\begin{center}
-\psCalendar[An=2099,Mois=12,Jour=25,MoisChoisi=12]
-\end{center}
-Cette étude ne teste pas si les valeurs introduites pour l'année(\texttt{An}) et le mois(\texttt{Mois}), sont correctes !
-
-Par défaut, la commande \verb+\psCalendar+ affiche le mois et l'année en
-cours et entoure la date du jour (suggestion de Jean-Michel \textsc{Sarlat}).
-
-Si on veut voir afficher, un jour d'un mois particulier, on rajoutera le
-paramètre \Encadre{\texttt{MoisChoisi=valeur}} aux autres, comme dans
-l'exemple précédent et le suivant.
-\begin{center}
-\psCalendar
-\end{center}
-\begin{verbatim}
-\psCalendar[An=2004,Mois=6,Jour=21,MoisChoisi=6]
-\end{verbatim}
-\begin{center}
-\psCalendar[An=2004,Mois=6,Jour=21,MoisChoisi=6]
-\end{center}
-\subsection{Le calendrier en 3D}
-La commande s'écrit très simplement :
-\begin{verbatim}
-\psCalDodecaeder
-\end{verbatim}
-\begin{center}
-\psscalebox{0.5}{\psCalDodecaeder}
-\end{center}
-pour avoir le calendrier de l'année en cours. Si le schéma est trop grand à
-votre goût, encadrez la commande par un \verb+\psscalebox{0.5}{\psCalDodecaeder}+
-
-Pour avoir le mois de mai face à soi, on écrira, par exemple :
-\begin{verbatim}
-\psscalebox{0.5}{\psCalDodecaeder[style=mai]}
-\end{verbatim}
-\begin{center}
-\psscalebox{0.5}{\psCalDodecaeder[style=mai]}
-\end{center}
-\verb+Vx, Vy, Vz+ sont les valeurs des paramètres de \texttt{viewpoint=-5.85 -3.62
-0} de la commande \verb+\ThreeDput+ de \verb+pst-3d+, qui sont les
-coordonnées d'un vecteur définissant la direction où se trouve
-l'observateur (la direction de la projection parallèle).
-
-On jouera aussi sur le paramètre \verb+viewangle+, pour amener la face
-observée dans le bon sens de la lecture.
-
-Pour avoir le mois de janvier face à soi, on écrira :
-\begin{verbatim}
-\psscalebox{0.35}{\psCalDodecaeder[style=janvier]}
-\end{verbatim}
-\begin{center}
-\psscalebox{0.35}{\psCalDodecaeder[style=janvier]}
-\end{center}
-Pour avoir le mois de février face à soi, on écrira :
-\begin{verbatim}
-\psscalebox{0.35}{\psCalDodecaeder[style=fevrier]}
-\end{verbatim}
-\begin{center}
-\psscalebox{0.35}{\psCalDodecaeder[style=fevrier]}
-\end{center}
-Pour avoir le mois de mars face à soi, on écrira :
-\begin{verbatim}
-\psscalebox{0.35}{\psCalDodecaeder[style=mars]}
-\end{verbatim}
-\begin{center}
-\psscalebox{0.35}{\psCalDodecaeder[style=mars]}
-\end{center}
-Pour avoir le mois d'avril face à soi, on écrira :
-\begin{verbatim}
-\psscalebox{0.35}{\psCalDodecaeder[style=avril]}
-\end{verbatim}
-\begin{center}
-\psscalebox{0.35}{\psCalDodecaeder[style=avril]}
-\end{center}
-Pour avoir le mois de juin face à soi, on écrira :
-\begin{verbatim}
-\psscalebox{0.35}{\psCalDodecaeder[style=juin]}
-\end{verbatim}
-\begin{center}
-\psscalebox{0.35}{\psCalDodecaeder[style=juin]}
-\end{center}
-Pour avoir le mois de juillet face à soi, on écrira :
-\begin{verbatim}
-\psscalebox{0.35}{\psCalDodecaeder[style=juillet]}
-\end{verbatim}
-\begin{center}
-\psscalebox{0.35}{\psCalDodecaeder[style=juillet]}
-\end{center}
-Pour avoir le mois d'août face à soi, on écrira :
-\begin{verbatim}
-\psscalebox{0.35}{\psCalDodecaeder[style=aout]}
-\end{verbatim}
-\begin{center}
-\psscalebox{0.35}{\psCalDodecaeder[style=aout]}
-\end{center}
-Pour avoir le mois de septembre face à soi, on écrira :
-\begin{verbatim}
-\psscalebox{0.35}{\psCalDodecaeder[style=septembre]}
-\end{verbatim}
-\begin{center}
-\psscalebox{0.35}{\psCalDodecaeder[style=septembre]}
-\end{center}
-Pour avoir le mois d'octobre face à soi, on écrira :
-\begin{verbatim}
-\psscalebox{0.35}{\psCalDodecaeder[style=octobre]}
-\end{verbatim}
-\begin{center}
-\psscalebox{0.35}{\psCalDodecaeder[style=octobre]}
-\end{center}
-Pour avoir le mois de novembre face à soi, on écrira :
-\begin{verbatim}
-\psscalebox{0.35}{\psCalDodecaeder[style=novembre]}
-\end{verbatim}
-\begin{center}
-\psscalebox{0.35}{\psCalDodecaeder[style=novembre]}
-\end{center}
-Pour avoir le mois de décembre face à soi, on écrira :
-\begin{verbatim}
-\psscalebox{0.35}{\psCalDodecaeder[style=decembre]}
-\end{verbatim}
-\begin{center}
-\psscalebox{0.35}{\psCalDodecaeder[style=decembre]}
-\end{center}
-Pour visualiser une année particulière, avec un mois choisi face à soi, et un jour de ce mois, (15~mai~2004) on
-fera :
-\begin{verbatim}
-\psscalebox{0.35}{\psCalDodecaeder[style=mai,An=2004,MoisChoisi=5,Jour=15]}
-\end{verbatim}
-\begin{center}
-\psscalebox{0.35}{\psCalDodecaeder[style=mai,An=2004,MoisChoisi=5,Jour=15]}
-\end{center}
-\section{Calcul de la date de Pâques}
-On trouve sur internet, à propos de ce sujet de nombreux sites. \'A partir
-de la \textit{définition} de la fête proprement dite, les formules <<
-magiques >> abondent. L'une d'elle a retenu mon attention, je l'ai
-retranscrite avec le package \texttt{fp}. Dans l'ordre, un aperçu de la
-page, puis le codage des calculs avec \texttt{fp}.
-
-Le site : \texttt{http://www.altcal.com/elmcal.html}, et un extrait :
-
-\begin{verbatim}
-Version 2.0 - 11 Nov 1998
-
-Copyright and disclaimer
-------------------------
- This document is Copyright (C) 1998 by Claus Tondering.
- E-mail: claus@tondering.dk.
- The document may be freely distributed, provided this
- copyright notice is included and no money is charged for
- the document.
- This document is provided "as is". No warranties are made as
- to its correctness.
-
-G = year mod 19
-
-For the Julian calendar:
- I = (19*G + 15) mod 30
- J = (year + year/4 + I) mod 7
-
-For the Gregorian calendar:
- C = year/100
- H = (C - C/4 - (8*C+13)/25 + 19*G + 15) mod 30
- I = H - (H/28)*(1 - (H/28)*(29/(H + 1))*((21 - G)/11))
- J = (year + year/4 + I + 2 - C + C/4) mod 7
-
-Thereafter, for both calendars:
-L = I - J
-EasterMonth = 3 + (L + 40)/44
-EasterDay = L + 28 - 31*(EasterMonth/4)
-\end{verbatim}
-
-\hrule
-{\blue
-\begin{verbatim}
-\FPset{\Year}{1981} % placer ici l'année
-\FPeval\GY{(\Year)-19*trunc((\Year)/19,0)}
-\FPeval{\Cent}{trunc((\Year)/100,0)}
-\FPeval{\Iter}{trunc((\Cent)-trunc((\Cent)/4,0)-trunc((8*(\Cent)+13)/25,0)+
- (\GY)*19+15,0)}
-\FPeval{\Iterdiv}{trunc((\Iter)/30,0)}
-\FPeval\Hepact{(\Iter)-30*(\Iterdiv)}
-\FPeval\Inbre{trunc((\Hepact)-trunc((\Hepact)/28,0)*
- (1-trunc((\Hepact)/28,0))*(trunc(29/((\Hepact)+1),0)*trunc((21-(\GY))/11,0)),0)}
-\FPeval\Jnbreinter{trunc((\Year)+trunc((\Year)/4,0)+(\Inbre)+2-(\Cent)+trunc((\Cent)/4,0),0)}
-\FPeval\Jnbre{trunc((\Jnbreinter)-7*trunc((\Jnbreinter)/7,0),0)}
-\FPeval\Lnbre{trunc((\Inbre)-(\Jnbre),0)}
-\FPeval\Month{trunc(3+trunc(((\Lnbre)+40)/44,0),0)}
-\FPeval\Day{trunc((\Lnbre)+28-31*trunc((\Month)/4,0),0)}
-\ifnum\Month=4
- \ifnum\Day>25 \FPeval{\Day}{trunc((\Day)-7,0)} \fi
-\fi
-
-P\^aques le Dimanche \FPprint\Day/\FPprint\Month/\FPprint\Year
-\end{verbatim}}
-\FPset{\Year}{1981} % placer ici l'année
-\FPeval\GY{(\Year)-19*trunc((\Year)/19,0)}
-\FPeval{\Cent}{trunc((\Year)/100,0)}
-\FPeval{\Iter}{trunc((\Cent)-trunc((\Cent)/4,0)-trunc((8*(\Cent)+13)/25,0)+
- (\GY)*19+15,0)}
-\FPeval{\Iterdiv}{trunc((\Iter)/30,0)}
-\FPeval\Hepact{(\Iter)-30*(\Iterdiv)}
-\FPeval\Inbre{trunc((\Hepact)-trunc((\Hepact)/28,0)*
- (1-trunc((\Hepact)/28,0))*(trunc(29/((\Hepact)+1),0)*trunc((21-(\GY))/11,0)),0)}
-\FPeval\Jnbreinter{trunc((\Year)+trunc((\Year)/4,0)+(\Inbre)+2-(\Cent)+trunc((\Cent)/4,0),0)}
-\FPeval\Jnbre{trunc((\Jnbreinter)-7*trunc((\Jnbreinter)/7,0),0)}
-\FPeval\Lnbre{trunc((\Inbre)-(\Jnbre),0)}
-\FPeval\Month{trunc(3+trunc(((\Lnbre)+40)/44,0),0)}
-\FPeval\Day{trunc((\Lnbre)+28-31*trunc((\Month)/4,0),0)}
-\ifnum\Month=4
- \ifnum\Day>25 \FPeval{\Day}{trunc((\Day)-7,0)} \fi
-\fi
-
-\centerline{\Encadre{P\^aques tombe le dimanche
-\FPprint\Day/\FPprint\Month/\FPprint\Year}}
-
-Vous y reconnaîtrez sans peine l'algorithme initial, j'ai rajouté les trois
-dernières lignes, car l'auteur des formules précédentes semble avoir oublié
-que Pâques peut varier seulement entre le 22~mars et le 25~avril inclus
- Sans cette correction, le programme affiche dans l'exemple précédent (1981), le dimanche 26~avril au lieu du
- 19~avril.
-
-Pour le tester quelques dates :
-\begin{center}
-\begin{tabular}{c|c}
-1978& 26 mars \\ \hline
-1979&15 avril \\ \hline
-1980&6 avril \\ \hline
-2000&23 avril \\ \hline
-2002&31 mars \\ \hline
-2003&20 avril \\ \hline
-\end{tabular}
-\end{center}
-Ce n'est pas garanti sans erreurs, l'emploi des fonctions \texttt{trunc} ou
-\texttt{round} ou \texttt{clip} ne donnent pas à 100\% toujours, le résultat
-attendu. Par exemple si \texttt{fp} calcule $14.99999999$, alors que
-de toute évidence c'est $15$, il ne vaut mieux pas faire
-\texttt{trunc} pour avoir la partie entière, mais \texttt{round},
-car sinon on commet une erreur d'une unité en moins ! Il faudrait
-donc prévoir de tester ces cas !
-\section{Que reste-t-il à faire ? Problèmes !}
-\begin{itemize}
- \item Placer les jours fériés du lundi de Pâques et du lundi de
- Pentecôte.
- \item Dessiner automatiquement le mois en cours, face à notre regard.
- \item Prévoir un test qui limite l'année choisie à l'intervalle permis,
- soit $[2000-2099]$.
- \item Trouver un moyen simple, élégant et cohérent d'entourer la date choisie.
- \item Débusquer les erreurs, si vous en trouvez\ldots
-\end{itemize}
-
-\end{document}
diff --git a/graphics/pstricks/contrib/pst-dart/Changes b/graphics/pstricks/contrib/pst-dart/Changes
index 09f94ce443..5446e2bee8 100644
--- a/graphics/pstricks/contrib/pst-dart/Changes
+++ b/graphics/pstricks/contrib/pst-dart/Changes
@@ -1,6 +1,7 @@
..... pst-dart.tex
+0.03 2021-09-11 - Use the \ThreeDput macro instead of modifying the trandformation matrix
0.02 2018-02-09 - add \psDart for darts
- - rename borad to \psDartBoard
+ - rename board to \psDartBoard
0.01 2018-01-27 first version
diff --git a/graphics/pstricks/contrib/pst-dart/README.md b/graphics/pstricks/contrib/pst-dart/README.md
index 6dc2e0f983..50fb3f4fcd 100644
--- a/graphics/pstricks/contrib/pst-dart/README.md
+++ b/graphics/pstricks/contrib/pst-dart/README.md
@@ -9,15 +9,14 @@ 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 TeX 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).
+TeX Frequently Asked Questions
pst-dart needs pstricks, which should already
be part of your local TeX installation, otherwise get it from a
-CTAN server, http://mirror.ctan.org
+CTAN server, https://mirror.ctan.org
PSTricks is PostScript Tricks, the documentation cannot be run
with pdftex, use the sequence latex->dvips->ps2pdf or
pdflatex with package auto-pst-pdf or xelatex.
-%% $Id: README.md 713 2018-01-28 19:31:56Z herbert $
+%% $Id: README.md 226 2021-09-11 14:30:22Z herbert $
diff --git a/graphics/pstricks/contrib/pst-dart/doc/pst-dart-doc.pdf b/graphics/pstricks/contrib/pst-dart/doc/pst-dart-doc.pdf
index 89f8519e2b..0781a2acb7 100644
--- a/graphics/pstricks/contrib/pst-dart/doc/pst-dart-doc.pdf
+++ b/graphics/pstricks/contrib/pst-dart/doc/pst-dart-doc.pdf
Binary files differ
diff --git a/graphics/pstricks/contrib/pst-dart/doc/pst-dart-doc.tex b/graphics/pstricks/contrib/pst-dart/doc/pst-dart-doc.tex
index ad125eebf2..1307b9d58d 100644
--- a/graphics/pstricks/contrib/pst-dart/doc/pst-dart-doc.tex
+++ b/graphics/pstricks/contrib/pst-dart/doc/pst-dart-doc.tex
@@ -1,13 +1,17 @@
%% $Id: pst-dart-doc.tex 728 2018-02-09 19:29:41Z herbert $
-\documentclass[fontsize=11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,
- headings=small, headinclude=false,footinclude=false,oneside]{pst-doc}
-\usepackage[utf8]{inputenc}
-\usepackage{dtk-logos}
+
+\errorcontextlines=100
+\RequirePackage{pdfmanagement-testphase}
+\DeclareDocumentMetadata{}
+\documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
+ headinclude=false,footinclude=false,twoside,english]{pst-doc}
+
+\usepackage{hvlogos,iftex}
\usepackage{pst-dart}
\let\pstDartFV\fileversion
-\renewcommand\bgImage{\psDartBoard[unit=2,fontsize=15pt]}
+\renewcommand\bgImage{}%\psDartBoard[unit=2,fontsize=15pt]}
-\addbibresource{pst-dart-doc.bib}
+\addbibresource{\jobname.bib}
\lstset{language=PSTricks,
@@ -25,12 +29,14 @@
%
\begin{document}
+
+
\title{\texttt{pst-dart}}
\subtitle{Plotting a Dart ; v.\pstDartFV}
\author{Thomas Söll\\Herbert Voß}
\docauthor{}
\date{\today}
-\maketitle
+\settitle
\tableofcontents
@@ -62,6 +68,7 @@
\section{Examples}
\subsection{The default size}
+
\begin{LTXexample}
\begin{pspicture}[showgrid](-3,-3)(9,3)
\psDartBoard % The default Dartboard (radius=2.1cm)
@@ -70,6 +77,7 @@
\end{LTXexample}
+
\subsection{Scaling}
\begin{LTXexample}[pos=r,width=0.58\linewidth]
@@ -132,30 +140,35 @@ environment \Lenv{pspicture} as can be seen in the above examples..
\section{Changing the viewpoint}
-You can change the viewpoint with the two optional arguments \Lkeyword{preCode}\footnote{There is also a \Lkeyword{postCode},
-which is not of real interest here.}
-which allow to change the transformation matrix of PostScript. However, it does \emph{not} work
-with \XeLaTeX, you have to choose the Sequenz \texttt{latex}$\rightarrow$\texttt{dvips}$\rightarrow$\texttt{ps2pdf}.
+You can change the viewpoint with the optional argument
+\Lkeyword{viewpoint}
+%\footnote{There is also a \Lkeyword{postCode},
+%which is not of real interest here.}
+which expects three space separated values for $x$ $y$ $z$, where at least one value must be unless 0.
+%allow to change the transformation matrix of PostScript. However, it does \emph{not} work
+%with \XeLaTeX, you have to choose the Sequenz \texttt{latex}$\rightarrow$\texttt{dvips}$\rightarrow$\texttt{ps2pdf}.
+
\begin{LTXexample}[pos=t]
-\begin{pspicture}(-4.5,-4.5)(4.5,4.5)
-\psDartBoard[preCode={[1 0.2 0.5 1 0 0 ] concat },fontsize=18pt,unit=1.5]
-\psDart[unit=0.5,rot=45](1,-1)
+\begin{pspicture}(-2,-3)(12,4)
+\psDartBoard[boardview=1 0 0,fontsize=18pt,unit=1.5]
+\psDart[unit=0.5,rot=110](1,-1)
+%%
+\psDartBoard[boardview=1 0 1,fontsize=18pt,unit=1.5](10cm,0)
+\psDart[unit=0.5,rot=50](9cm,-1cm)
\end{pspicture}
\end{LTXexample}
-
-
\clearpage
\section{List of all optional arguments for \texttt{pst-dart}}
\xkvview{family=pst-dart,columns={key,type,default}}
+\nocite{*}
\bgroup
\RaggedRight
-\nocite{*}
\printbibliography
\egroup
diff --git a/graphics/pstricks/contrib/pst-dart/latex/pst-dart.sty b/graphics/pstricks/contrib/pst-dart/latex/pst-dart.sty
index 83758903b9..96c778dbe2 100644
--- a/graphics/pstricks/contrib/pst-dart/latex/pst-dart.sty
+++ b/graphics/pstricks/contrib/pst-dart/latex/pst-dart.sty
@@ -1,13 +1,15 @@
\RequirePackage{pstricks}
-\ProvidesPackage{pst-dart}[2017/08/17 package wrapper for pst-dart.tex (hv)]
+\ProvidesPackage{pst-dart}[2021/09/11 package wrapper for pst-dart.tex (hv)]
\RequirePackage{multido}
\RequirePackage{pst-xkey}
%
\input{pst-dart.tex}
\ProvidesFile{pst-dart.tex}
[\filedate\space v\fileversion\space `PST-dart' (hv)]
-\IfFileExists{pst-dart.pro}{%
- \ProvidesFile{pst-dart.pro}[2014/05/07 v. 0.16, PostScript prologue file (hv)]
-\@addtofilelist{pst-dart.pro}}{}%
+%IfFileExists{pst-dart.pro}{%
+% \ProvidesFile{pst-dart.pro}[2014/05/07 v. 0.16, PostScript prologue file (hv)]
+%\@addtofilelist{pst-dart.pro}}{}%
+
\endinput
-%% $Id: pst-dart.sty 713 2018-01-28 19:31:56Z herbert $
+
+%% $Id: pst-dart.sty 226 2021-09-11 14:30:22Z herbert $
diff --git a/graphics/pstricks/contrib/pst-dart/tex/pst-dart.tex b/graphics/pstricks/contrib/pst-dart/tex/pst-dart.tex
index 064a309e7f..8b1907da5f 100644
--- a/graphics/pstricks/contrib/pst-dart/tex/pst-dart.tex
+++ b/graphics/pstricks/contrib/pst-dart/tex/pst-dart.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-dart.tex 728 2018-02-09 19:29:41Z herbert $
+%% $Id: pst-dart.tex 229 2021-09-11 14:35:39Z herbert $
%%
%% This is file `pst-dart.tex',
%%
@@ -22,19 +22,21 @@
\ifx\PSTricksLoaded\endinput\else \input pstricks.tex\fi
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey.tex \fi
\ifx\GradientLoaded\endinput\else \input pst-grad.tex \fi
+\ifx\PSTthreeDLoaded\endinput\else \input pst-3d.tex \fi
%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
% interface to the `xkeyval' package
\pst@addfams{pst-dart}
%
-\def\fileversion{0.02}
-\def\filedate{2018/02/09}
+\def\fileversion{0.03}
+\def\filedate{2021/09/11}
\message{`PST-dart' v\fileversion, \filedate\space (ts,hv)}
%
\define@key[psset]{pst-dart}{preCode}[]{\def\psk@dart@preCode{#1}}
\define@key[psset]{pst-dart}{postCode}[]{\def\psk@dart@postCode{#1}}
+\define@key[psset]{pst-dart}{boardview}[]{\def\psk@dart@boardview{#1}}
\define@key[psset]{pst-dart}{fontsize}[10pt]{\def\psk@dart@fontsize{\fontsize{#1}{#1}}}
-\psset[pst-dart]{fontsize=10pt,preCode=,postCode=}
+\psset[pst-dart]{fontsize=10pt,boardview={},preCode=,postCode=}
\newcmykcolor{Red}{0 1 1 0}
\newcmykcolor{Green}{1 0 1 0}
@@ -43,12 +45,21 @@
\def\psDartBoard@i{\@ifnextchar(\psDartBoard@ii{\psDartBoard@ii(0,0)}}%
\def\psDartBoard@ii(#1){%
\begingroup
- \addbefore@par{unit=0.1mm}%
+ \addbefore@par{boardview={}}%,unit=0.1mm}%
\use@par
\degrees[20]%
- \rput(#1){%
- \begin{pspicture}(-210,-210)(210,210)%
- \pstVerb{gsave \psk@dart@preCode }%
+ \ifx\psk@dart@boardview\@empty
+ \rput(#1){\psset{unit=0.1mm}\psDartBoard@iii}%
+ \else
+ \rput(#1){\psset{unit=0.1mm}%
+ \ThreeDput[normal=\psk@dart@boardview](0,0,0){\psDartBoard@iii}}%
+ \fi
+ \endgroup
+ \ignorespaces
+}
+
+\def\psDartBoard@iii{%
+ \begin{pspicture}(-210,-210)(210,210)%
\pscircle*(0,0){210}
% Gerader Part.
\psset{linewidth=0.5pt}%
@@ -67,12 +78,10 @@
\pscircle[fillstyle=solid,fillcolor=Green,linecolor=gray!30,linewidth=0.5pt,linecolor=white]{15.9}
\pscircle[fillstyle=solid,fillcolor=Red,linecolor=gray!30,linewidth=0.5pt,linecolor=white]{6.35}
\psforeach{\iA}{6,13,4,18,1,20,5,12,9,14,11,8,16,7,19,3,17,2,15,10}{%
- \rput(190;\the\psLoopIndex){\psk@dart@fontsize\selectfont\white\iA}}
- \pstVerb{ \psk@dart@postCode grestore }%
- \end{pspicture}}%
- \endgroup
- \ignorespaces
+ \rput(190;\the\psLoopIndex){\psk@dart@fontsize\selectfont\white\iA}}
+ \end{pspicture}%
}
+
%
\colorlet{gold}{orange!50!yellow}