summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-09-07 03:03:54 +0000
committerNorbert Preining <norbert@preining.info>2021-09-07 03:03:54 +0000
commita7ef56f18421a8ffb9d34c16ff9f017e45e4e6d3 (patch)
tree7e5c6afbefbbbf312f0d8db33fd0884924a5f227 /graphics
parentb63aa636b82853ca4885c1e90c619cdbcfa72730 (diff)
CTAN sync 202109070303
Diffstat (limited to 'graphics')
-rw-r--r--graphics/pgf/contrib/circuitikz/doc/changelog.tex15
-rw-r--r--graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdfbin17688 -> 17688 bytes
-rw-r--r--graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdfbin1440146 -> 1441298 bytes
-rw-r--r--graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex10
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/circuitikz.sty4
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex103
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex20
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex4
-rw-r--r--graphics/pstricks/base/Changes14
-rw-r--r--graphics/pstricks/base/config/distiller.cfg2
-rw-r--r--graphics/pstricks/base/config/dvips.cfg2
-rw-r--r--graphics/pstricks/base/config/dvipsone.cfg2
-rw-r--r--graphics/pstricks/base/config/gastex.cfg2
-rw-r--r--graphics/pstricks/base/config/textures.cfg2
-rw-r--r--graphics/pstricks/base/config/vtex.cfg2
-rw-r--r--graphics/pstricks/base/config/xdvipdfmx.cfg10
-rw-r--r--graphics/pstricks/base/config/xdvipdfmx.cfg.orig244
-rw-r--r--graphics/pstricks/base/doc/PSTricks.bib17
-rw-r--r--graphics/pstricks/base/doc/pst-doc.cls21
-rw-r--r--graphics/pstricks/base/doc/pst-news.tex2
-rw-r--r--graphics/pstricks/base/doc/pst-news08.pdfbin131821 -> 195188 bytes
-rw-r--r--graphics/pstricks/base/doc/pst-news09.tex2
-rw-r--r--graphics/pstricks/base/doc/pst-news10.tex2
-rw-r--r--graphics/pstricks/base/doc/pst-news11.tex2
-rw-r--r--graphics/pstricks/base/doc/pst-news12.tex2
-rw-r--r--graphics/pstricks/base/doc/pst-news13.tex2
-rw-r--r--graphics/pstricks/base/doc/pst-news14.tex2
-rw-r--r--graphics/pstricks/base/doc/pst-news15.tex2
-rw-r--r--graphics/pstricks/base/doc/pst-news16.tex2
-rw-r--r--graphics/pstricks/base/doc/pst-news17.tex2
-rw-r--r--graphics/pstricks/base/doc/pst-news18.tex2
-rw-r--r--graphics/pstricks/base/doc/pst-news19.pdfbin71977 -> 59875 bytes
-rw-r--r--graphics/pstricks/base/doc/pst-news19.tex36
-rw-r--r--graphics/pstricks/base/doc/pst-news20.tex2
-rw-r--r--graphics/pstricks/base/doc/pst-news21.pdfbin531792 -> 512796 bytes
-rw-r--r--graphics/pstricks/base/doc/pst-news21.tex11
-rw-r--r--graphics/pstricks/base/dvips/pstricks-fonts-lm.pro69
-rw-r--r--graphics/pstricks/base/dvips/pstricks-fonts-ps.pro32
-rw-r--r--graphics/pstricks/base/dvips/pstricks-fonts-urw.pro61
-rw-r--r--graphics/pstricks/base/dvips/pstricks.pro34
-rw-r--r--graphics/pstricks/base/generic/pst-fp.tex12
-rw-r--r--graphics/pstricks/base/generic/pstricks-arrows.tex54
-rw-r--r--graphics/pstricks/base/generic/pstricks.con7
-rw-r--r--graphics/pstricks/base/generic/pstricks.tex113
-rw-r--r--graphics/pstricks/base/latex/pstricks-pdf.sty2
-rw-r--r--graphics/pstricks/base/latex/pstricks.sty3
-rw-r--r--graphics/pstricks/contrib/pst-vectorian/Changes3
-rw-r--r--graphics/pstricks/contrib/pst-vectorian/README2
-rw-r--r--graphics/pstricks/contrib/pst-vectorian/doc/psvectorian.pdfbin0 -> 735538 bytes
-rw-r--r--graphics/pstricks/contrib/pst-vectorian/doc/psvectorian.tex (renamed from graphics/pstricks/contrib/pst-vectorian/psvectorian.tex)40
-rw-r--r--graphics/pstricks/contrib/pst-vectorian/dvips/psvectorian.pro (renamed from graphics/pstricks/contrib/pst-vectorian/psvectorian.pro)158
-rw-r--r--graphics/pstricks/contrib/pst-vectorian/latex/psvectorian.sty (renamed from graphics/pstricks/contrib/pst-vectorian/psvectorian.sty)6
-rw-r--r--graphics/pstricks/contrib/pst-vectorian/psvectorian.pdfbin755176 -> 0 bytes
53 files changed, 434 insertions, 707 deletions
diff --git a/graphics/pgf/contrib/circuitikz/doc/changelog.tex b/graphics/pgf/contrib/circuitikz/doc/changelog.tex
index 508a25d9fe..0ce9902781 100644
--- a/graphics/pgf/contrib/circuitikz/doc/changelog.tex
+++ b/graphics/pgf/contrib/circuitikz/doc/changelog.tex
@@ -5,6 +5,21 @@ full list of changes.
\begin{itemize}
\item
+ Version 1.4.3 (2021-09-06)
+
+ Minor release, mainly a single bugfix.
+
+ \begin{itemize}
+ \tightlist
+ \item
+ added hidden anchors of \texttt{ooosource} to the manual
+ \item
+ fix a bug in anchors of \texttt{ooosource} (they did not respect
+ class scaling)
+ \item
+ faster \texttt{use\ fpu\ reciprocal} (thanks to Henri Menke)
+ \end{itemize}
+\item
Version 1.4.2 (2021-07-26)
This is a minor release, containing just a new component and a small
diff --git a/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf b/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf
index 31a4cec4f9..ce5c81d217 100644
--- a/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf
+++ b/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf
index ce0a14da3f..37b39c62f3 100644
--- a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf
+++ b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
index 8de6e6209f..b29332aca2 100644
--- a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
+++ b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
@@ -2545,9 +2545,13 @@ Notice that if you choose the dashed style, the noise sources are fillable:
\footnotetext{Added by André Alves in \texttt{v1.3.5}}
\circuitdescbip*[oosource]{ioosource}{Double Zero style current source}{}
\circuitdescbip*[oosource]{voosource}{Double Zero style voltage source}{}
- \circuitdescbip*[oosourcetrans]{oosourcetrans}{transformer source\footnotemark}{}
+ \circuitdescbip*[oosourcetrans]{oosourcetrans}{transformer source\footnotemark}{}(centerprim/90/0.3, centersec/-90/0.3)
\footnotetext{The \texttt{oosourcetrans} and \texttt{ooosource} componentes have benn added by \href{https://github.com/circuitikz/circuitikz/pull/397}{user \texttt{@olfline} on GitHub}}.
- \circuitdescbip*[ooosource]{ooosource}{transformer with three windings}{}(left/175/0.2, right/5/0.5, prim1/130/.2, prim2/-130/.2, sec1/45/.2, sec2/60/.2, sec3/90/.2, tert1/0/.2, tert2/-45/.2, tert3/-90/.2)
+ \begingroup
+ \ctikzset{sources/scale=1.5}
+ \circuitdescbip*[ooosource]{ooosource}{transformer with three windings\footnotemark}{}(left/175/0.2, right/5/0.7, prim1/130/.2, prim2/-130/.2, sec1/35/.2, sec2/60/.2, sec3/90/.2, tert1/0/.2, tert2/-45/.2, tert3/-90/.2, centerprim/92/0.8, centersec/35/0.9, centertert/-35/0.8)
+ \footnotetext{The component here is scaled up 1.5 times to better show the anchors.}
+ \endgroup
\end{groupdesc}
The transformer shapes vector group options can be specified for the primary (\texttt{prim=\emph{value}}), the secondary (\texttt{sec=\emph{value}}) and tertiary (\texttt{tert=\emph{value}}) three-phase vector groups: the value can be one of \texttt{delta}, \texttt{wye} and \texttt{zig}.
@@ -2582,7 +2586,7 @@ The size of the broken part of the DC current source is configurable by changing
\paragraph{Size.}
You can change the scale of the batteries by setting the key \texttt{batteries/scale}, for the controlled (dependent) sources with \texttt{csources/scale}, and for all the other independent sources and generators with \texttt{sources/scale}, to something different from the default \texttt{1.0}.
-Notice that the size of the double-circle sources (and of the triple-circle one) are tuned so that the full source occupy more or less the same horizontal space than one of the single-circle one; obviously, the circle are much smaller. If you want to have the same circle radius, you have to scale (locally!) those sources by one factor that is \texttt{1.5384} ($1/0.65$) for \texttt{oosource}, \texttt{1.6667} ($1/0.6$) for \texttt{oosourcetrans}, and \texttt{1.8182} ($1/0.55$) for \texttt{ooosource}.
+Notice that the size of the double-circle sources (and of the triple-circle one) are tuned so that the full source occupy more or less the same horizontal space than one of the single-circle one; as a consequence, the circles are much smaller. If you want to have the same circle radius, you have to scale (locally!) those sources by one factor that is \texttt{1.5384} ($1/0.65$) for \texttt{oosource}, \texttt{1.6667} ($1/0.6$) for \texttt{oosourcetrans}, and \texttt{1.8182} ($1/0.55$) for \texttt{ooosource}.
\begin{LTXexample}[varwidth=true]
\begin{circuitikz}
diff --git a/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty b/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
index 5a1b983a14..9349fc801d 100644
--- a/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
+++ b/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
@@ -16,8 +16,8 @@
\providecommand\DeclareRelease[3]{}
\providecommand\DeclareCurrentRelease[2]{}
-\def\pgfcircversion{1.4.2}
-\def\pgfcircversiondate{2021/07/26}
+\def\pgfcircversion{1.4.3}
+\def\pgfcircversiondate{2021/09/06}
\DeclareRelease{0.4}{2012/12/20}{circuitikz-0.4-body.tex}
\DeclareRelease{v0.4}{2012/12/20}{circuitikz-0.4-body.tex}
diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
index 228c46e935..d2c2dcbb84 100644
--- a/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
@@ -2164,7 +2164,18 @@
%% Independent double oo source
\pgfcircdeclarebipolescaled{sources}
-{}
+{
+ \anchor{centerprim}{
+ \northeast
+ \pgf@y=0pt\relax
+ \pgf@x=-\ctikzvalof{bipoles/oosource/circleoffset}\pgf@x
+ }
+ \anchor{centersec}{
+ \northeast
+ \pgf@y=0pt\relax
+ \pgf@x=\ctikzvalof{bipoles/oosource/circleoffset}\pgf@x
+ }
+}
{\ctikzvalof{bipoles/oosource/height}}
{oosource}
{\ctikzvalof{bipoles/oosource/height}}
@@ -2248,7 +2259,18 @@
% % % % round three-phase transformer
\pgfcircdeclarebipolescaled{sources}
-{}
+{
+ \anchor{centerprim}{
+ \northeast
+ \pgf@y=0pt\relax
+ \pgf@x=-\ctikzvalof{bipoles/oosourcetrans/circleoffset}\pgf@x
+ }
+ \anchor{centersec}{
+ \northeast
+ \pgf@y=0pt\relax
+ \pgf@x=\ctikzvalof{bipoles/oosourcetrans/circleoffset}\pgf@x
+ }
+}
{\ctikzvalof{bipoles/oosourcetrans/height}}
{oosourcetrans}
{\ctikzvalof{bipoles/oosourcetrans/height}}
@@ -2330,18 +2352,20 @@
\pgf@y=0pt
}
\savedanchor{\centerprim}{
- \pgf@circ@scaled@Rlen=\ctikzvalof{bipoles/ooosource/height}\pgf@circ@Rlen
- \pgf@circ@scaled@Rlen=-\ctikzvalof{bipoles/ooosource/circleoffset}\pgf@circ@scaled@Rlen
+ \pgf@circ@scaled@Rlen=\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen
+ \pgf@circ@res@other=\ctikzvalof{bipoles/ooosource/height}\pgf@circ@scaled@Rlen
+ \pgf@circ@res@other=-\ctikzvalof{bipoles/ooosource/circleoffset}\pgf@circ@res@other
\pgf@y=0pt
- \pgf@x=.5\pgf@circ@scaled@Rlen
+ \pgf@x=.5\pgf@circ@res@other
}
\anchor{centerprim}{
\centerprim
}
\savedanchor{\centersec}{
- \pgf@circ@scaled@Rlen=\ctikzvalof{bipoles/ooosource/height}\pgf@circ@Rlen
- \pgf@circ@scaled@Rlen=-\ctikzvalof{bipoles/ooosource/circleoffset}\pgf@circ@scaled@Rlen
- \pgfpointpolar{60}{.5\pgf@circ@scaled@Rlen}
+ \pgf@circ@scaled@Rlen=\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen
+ \pgf@circ@res@other=\ctikzvalof{bipoles/ooosource/height}\pgf@circ@scaled@Rlen
+ \pgf@circ@res@other=-\ctikzvalof{bipoles/ooosource/circleoffset}\pgf@circ@res@other
+ \pgfpointpolar{60}{.5\pgf@circ@res@other}
\pgf@y=-\pgf@y
\pgf@x=-\pgf@x
}
@@ -2349,9 +2373,10 @@
\centersec
}
\savedanchor{\centertert}{
- \pgf@circ@scaled@Rlen=\ctikzvalof{bipoles/ooosource/height}\pgf@circ@Rlen
- \pgf@circ@scaled@Rlen=-\ctikzvalof{bipoles/ooosource/circleoffset}\pgf@circ@scaled@Rlen
- \pgfpointpolar{60}{.5\pgf@circ@scaled@Rlen}
+ \pgf@circ@scaled@Rlen=\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen
+ \pgf@circ@res@other=\ctikzvalof{bipoles/ooosource/height}\pgf@circ@scaled@Rlen
+ \pgf@circ@res@other=-\ctikzvalof{bipoles/ooosource/circleoffset}\pgf@circ@res@other
+ \pgfpointpolar{60}{.5\pgf@circ@res@other}
\pgf@y=\pgf@y
\pgf@x=-\pgf@x
}
@@ -2361,44 +2386,52 @@
% add some anchors in case the are needed :)
\anchor{prim1}{
- \pgf@circ@scaled@Rlen=\ctikzvalof{bipoles/ooosource/height}\pgf@circ@Rlen
- \pgf@circ@scaled@Rlen=\ctikzvalof{bipoles/ooosource/circlesize}\pgf@circ@scaled@Rlen
- \pgfpointadd{\centerprim}{\pgfpointpolar{135}{.5\pgf@circ@scaled@Rlen}}
+ \pgf@circ@scaled@Rlen=\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen
+ \pgf@circ@res@other=\ctikzvalof{bipoles/ooosource/height}\pgf@circ@scaled@Rlen
+ \pgf@circ@res@other=\ctikzvalof{bipoles/ooosource/circlesize}\pgf@circ@res@other
+ \pgfpointadd{\centerprim}{\pgfpointpolar{135}{.5\pgf@circ@res@other}}
}
\anchor{prim2}{
- \pgf@circ@scaled@Rlen=\ctikzvalof{bipoles/ooosource/height}\pgf@circ@Rlen
- \pgf@circ@scaled@Rlen=\ctikzvalof{bipoles/ooosource/circlesize}\pgf@circ@scaled@Rlen
- \pgfpointadd{\centerprim}{\pgfpointpolar{-135}{.5\pgf@circ@scaled@Rlen}}
+ \pgf@circ@scaled@Rlen=\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen
+ \pgf@circ@res@other=\ctikzvalof{bipoles/ooosource/height}\pgf@circ@scaled@Rlen
+ \pgf@circ@res@other=\ctikzvalof{bipoles/ooosource/circlesize}\pgf@circ@res@other
+ \pgfpointadd{\centerprim}{\pgfpointpolar{-135}{.5\pgf@circ@res@other}}
}
\anchor{sec1}{
- \pgf@circ@scaled@Rlen=\ctikzvalof{bipoles/ooosource/height}\pgf@circ@Rlen
- \pgf@circ@scaled@Rlen=\ctikzvalof{bipoles/ooosource/circlesize}\pgf@circ@scaled@Rlen
- \pgfpointadd{\centersec}{\pgfpointpolar{0}{.5\pgf@circ@scaled@Rlen}}
+ \pgf@circ@scaled@Rlen=\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen
+ \pgf@circ@res@other=\ctikzvalof{bipoles/ooosource/height}\pgf@circ@scaled@Rlen
+ \pgf@circ@res@other=\ctikzvalof{bipoles/ooosource/circlesize}\pgf@circ@res@other
+ \pgfpointadd{\centersec}{\pgfpointpolar{0}{.5\pgf@circ@res@other}}
}
\anchor{sec2}{
- \pgf@circ@scaled@Rlen=\ctikzvalof{bipoles/ooosource/height}\pgf@circ@Rlen
- \pgf@circ@scaled@Rlen=\ctikzvalof{bipoles/ooosource/circlesize}\pgf@circ@scaled@Rlen
- \pgfpointadd{\centersec}{\pgfpointpolar{45}{.5\pgf@circ@scaled@Rlen}}
+ \pgf@circ@scaled@Rlen=\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen
+ \pgf@circ@res@other=\ctikzvalof{bipoles/ooosource/height}\pgf@circ@scaled@Rlen
+ \pgf@circ@res@other=\ctikzvalof{bipoles/ooosource/circlesize}\pgf@circ@res@other
+ \pgfpointadd{\centersec}{\pgfpointpolar{45}{.5\pgf@circ@res@other}}
}
\anchor{sec3}{
- \pgf@circ@scaled@Rlen=\ctikzvalof{bipoles/ooosource/height}\pgf@circ@Rlen
- \pgf@circ@scaled@Rlen=\ctikzvalof{bipoles/ooosource/circlesize}\pgf@circ@scaled@Rlen
- \pgfpointadd{\centersec}{\pgfpointpolar{90}{.5\pgf@circ@scaled@Rlen}}
+ \pgf@circ@scaled@Rlen=\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen
+ \pgf@circ@res@other=\ctikzvalof{bipoles/ooosource/height}\pgf@circ@scaled@Rlen
+ \pgf@circ@res@other=\ctikzvalof{bipoles/ooosource/circlesize}\pgf@circ@res@other
+ \pgfpointadd{\centersec}{\pgfpointpolar{90}{.5\pgf@circ@res@other}}
}
\anchor{tert1}{
- \pgf@circ@scaled@Rlen=\ctikzvalof{bipoles/ooosource/height}\pgf@circ@Rlen
- \pgf@circ@scaled@Rlen=\ctikzvalof{bipoles/ooosource/circlesize}\pgf@circ@scaled@Rlen
- \pgfpointadd{\centertert}{\pgfpointpolar{0}{.5\pgf@circ@scaled@Rlen}}
+ \pgf@circ@scaled@Rlen=\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen
+ \pgf@circ@res@other=\ctikzvalof{bipoles/ooosource/height}\pgf@circ@scaled@Rlen
+ \pgf@circ@res@other=\ctikzvalof{bipoles/ooosource/circlesize}\pgf@circ@res@other
+ \pgfpointadd{\centertert}{\pgfpointpolar{0}{.5\pgf@circ@res@other}}
}
\anchor{tert2}{
- \pgf@circ@scaled@Rlen=\ctikzvalof{bipoles/ooosource/height}\pgf@circ@Rlen
- \pgf@circ@scaled@Rlen=\ctikzvalof{bipoles/ooosource/circlesize}\pgf@circ@scaled@Rlen
- \pgfpointadd{\centertert}{\pgfpointpolar{-45}{.5\pgf@circ@scaled@Rlen}}
+ \pgf@circ@scaled@Rlen=\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen
+ \pgf@circ@res@other=\ctikzvalof{bipoles/ooosource/height}\pgf@circ@scaled@Rlen
+ \pgf@circ@res@other=\ctikzvalof{bipoles/ooosource/circlesize}\pgf@circ@res@other
+ \pgfpointadd{\centertert}{\pgfpointpolar{-45}{.5\pgf@circ@res@other}}
}
\anchor{tert3}{
- \pgf@circ@scaled@Rlen=\ctikzvalof{bipoles/ooosource/height}\pgf@circ@Rlen
- \pgf@circ@scaled@Rlen=\ctikzvalof{bipoles/ooosource/circlesize}\pgf@circ@scaled@Rlen
- \pgfpointadd{\centertert}{\pgfpointpolar{-90}{.5\pgf@circ@scaled@Rlen}}
+ \pgf@circ@scaled@Rlen=\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen
+ \pgf@circ@res@other=\ctikzvalof{bipoles/ooosource/height}\pgf@circ@scaled@Rlen
+ \pgf@circ@res@other=\ctikzvalof{bipoles/ooosource/circlesize}\pgf@circ@res@other
+ \pgfpointadd{\centertert}{\pgfpointpolar{-90}{.5\pgf@circ@res@other}}
}
}
{\ctikzvalof{bipoles/ooosource/height}}
diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex
index ae5fcf38de..e1d7314931 100644
--- a/graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex
@@ -75,18 +75,22 @@
%% https://github.com/pgf-tikz/pgf/issues/861
%%
%% Thanks to "muzimuzhi Z" https://tex.stackexchange.com/a/547085/38080
+%% Thanks to Henri Menke for a faster approach https://github.com/circuitikz/circuitikz/commit/00966c45c42b464fab5429f89f2b7fb414e9b3f7#commitcomment-54592494
%%
\pgfkeysifdefined{/pgf/fpu/install only/.@cmd}{%
\pgfqkeys{/pgf}{use fpu reciprocal/.code={\pgfkeys{/pgf/fpu/install only={reciprocal}}}}%
}{%
- \pgfqkeys{/pgf}{use fpu reciprocal/.code={%
- \def\pgfmathreciprocal@##1{%
- \begingroup
- \pgfkeys{/pgf/fpu=true,/pgf/fpu/output format=fixed}%
- \pgfmathparse{1/##1}%
- \pgfmath@smuggleone\pgfmathresult
- \endgroup
- }}}%
+ \pgfkeysifdefined{/pgf/use fpu reciprocal/.@cmd}{% use stock one
+ }{
+ \pgfqkeys{/pgf}{use fpu reciprocal/.code={%
+ \def\pgfmathreciprocal@##1{%
+ \begingroup
+ \pgfmathfloatparsenumber{##1}%
+ \pgfmathfloatreciprocal@{\pgfmathresult}%
+ \pgfmathfloattofixed@{\pgfmathresult}%
+ \pgfmath@smuggleone\pgfmathresult
+ \endgroup
+ }}}}%
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex b/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
index 50ac5b4f19..e7187f4ab0 100644
--- a/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
@@ -10,8 +10,8 @@
%
% See the files gpl-3.0_license.txt and lppl-1-3c_license.txt for more details.
-\def\pgfcircversion{1.4.2}
-\def\pgfcircversiondate{2021/07/26}
+\def\pgfcircversion{1.4.3}
+\def\pgfcircversiondate{2021/09/06}
\writestatus{loading}{\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion}
\usemodule[tikz]
diff --git a/graphics/pstricks/base/Changes b/graphics/pstricks/base/Changes
index f1e6919c62..fc78f86512 100644
--- a/graphics/pstricks/base/Changes
+++ b/graphics/pstricks/base/Changes
@@ -1,4 +1,4 @@
-% $Id: Changes 166 2021-08-26 19:52:16Z herbert $
+% $Id: Changes 191 2021-09-05 20:07:31Z herbert $
Changelog for
@@ -25,6 +25,16 @@ pstricks.tex --------
versions like 2.47a have only changes in other files, but not
in this main package.
+3.07 2021-09-05 - fix for vee arrows in pstricks-arrows
+ - with optional argument "gsfonts" for PSTricks, one
+ can use GS fonts from URW, like StandardSymL, NimbusRomNo9L-Regu,
+ NimbusRomNo9L-Bold, ...
+ Default is using the PS fontnames, like Symbol, Times-Roman, Times-Bold,
+ Helvetica, Helvetica-Bold, ...
+ - fixed default setting for linewidth and color
+ - fix for \pst@rotate and lualatex, which has another y direction
+ - use ifPSTlualatex for the rotation shortcut definitions
+ - fix for \pst@rotlist
3.06 2021-08-27 - added support for experimental use of lualatex with luapstricks.lua
- enabled .setblendmode again in pstrick.pro
3.05 2021-08-25 - bug fix for Penrose fill style
@@ -306,6 +316,7 @@ pst-fp.tex ----------- (hv)
xdvipdfmx.con ------
+0.07 2021-09-05 - fix for ps: -> pst:
0.06 2021-08-21 - small changes in the code
0.05 2015-09-11 - move the fix into pstricks.tex
0.04 2015-09-11 - fix bug with wrong scaling for \psput@cartesian
@@ -355,6 +366,7 @@ pstricks-doc -----------
---- pstricks.pro
+1.38 2021-09-05 - increase memory for PenroseFill and PenrodeFillA
1.37 2021-08-27 - revert fix for .setblendmode
1.36 2021-08-25 - fix for function Penrose and PenroseA
1.35 2021-08-21 - fix for new version > 9.53
diff --git a/graphics/pstricks/base/config/distiller.cfg b/graphics/pstricks/base/config/distiller.cfg
index 9ade331215..db654b14d7 100644
--- a/graphics/pstricks/base/config/distiller.cfg
+++ b/graphics/pstricks/base/config/distiller.cfg
@@ -1,4 +1,4 @@
-% $Id: distiller.cfg 4 2020-06-09 08:32:19Z herbert $
+% $Id: distiller.cfg 446 2017-04-19 11:40:55Z herbert $
%% BEGIN: distiller.con (for distiller driver)
%%
%% Configuration file for PSTricks
diff --git a/graphics/pstricks/base/config/dvips.cfg b/graphics/pstricks/base/config/dvips.cfg
index f9c5da698e..d9648c1d0a 100644
--- a/graphics/pstricks/base/config/dvips.cfg
+++ b/graphics/pstricks/base/config/dvips.cfg
@@ -1,4 +1,4 @@
-% $Id: dvips.cfg 4 2020-06-09 08:32:19Z herbert $
+% $Id: dvips.cfg 797 2018-08-23 18:33:16Z herbert $
%% BEGIN: pstricks.con (for dvips driver)
%%
%% Configuration file for PSTricks
diff --git a/graphics/pstricks/base/config/dvipsone.cfg b/graphics/pstricks/base/config/dvipsone.cfg
index bb59975bfa..965e635fd5 100644
--- a/graphics/pstricks/base/config/dvipsone.cfg
+++ b/graphics/pstricks/base/config/dvipsone.cfg
@@ -1,4 +1,4 @@
-% $Id: dvipsone.cfg 4 2020-06-09 08:32:19Z herbert $
+% $Id: dvipsone.cfg 446 2017-04-19 11:40:55Z herbert $
%% BEGIN pstricks.con (for DVIPSONE driver)
%%
%% Configuration file for PSTricks 97: must be renamed `pstricks.con'
diff --git a/graphics/pstricks/base/config/gastex.cfg b/graphics/pstricks/base/config/gastex.cfg
index f0fe5486cd..b3549c8c56 100644
--- a/graphics/pstricks/base/config/gastex.cfg
+++ b/graphics/pstricks/base/config/gastex.cfg
@@ -1,4 +1,4 @@
-% $Id: gastex.cfg 4 2020-06-09 08:32:19Z herbert $
+% $Id: gastex.cfg 446 2017-04-19 11:40:55Z herbert $
%% BEGIN: pstricks.con (for xdvipdfmx driver)
%%
%% Configuration file for PSTricks
diff --git a/graphics/pstricks/base/config/textures.cfg b/graphics/pstricks/base/config/textures.cfg
index ef088b5791..48667d3950 100644
--- a/graphics/pstricks/base/config/textures.cfg
+++ b/graphics/pstricks/base/config/textures.cfg
@@ -1,4 +1,4 @@
-% $Id: textures.cfg 4 2020-06-09 08:32:19Z herbert $
+% $Id: textures.cfg 446 2017-04-19 11:40:55Z herbert $
%% BEGIN pstricks.con (for Textures 1.7 and 1.8 driver)
%%
%% Configuration file for PSTricks 97: must be renamed `pstricks.con'
diff --git a/graphics/pstricks/base/config/vtex.cfg b/graphics/pstricks/base/config/vtex.cfg
index 7cb84c0f9e..e4b7184404 100644
--- a/graphics/pstricks/base/config/vtex.cfg
+++ b/graphics/pstricks/base/config/vtex.cfg
@@ -1,4 +1,4 @@
-% $Id: vtex.cfg 4 2020-06-09 08:32:19Z herbert $
+% $Id: vtex.cfg 446 2017-04-19 11:40:55Z herbert $
%% BEGIN: pstricks.con (for VTeX)
%%
%% Configuration file for PSTricks 97
diff --git a/graphics/pstricks/base/config/xdvipdfmx.cfg b/graphics/pstricks/base/config/xdvipdfmx.cfg
index 663e342f79..8a0b1f5c34 100644
--- a/graphics/pstricks/base/config/xdvipdfmx.cfg
+++ b/graphics/pstricks/base/config/xdvipdfmx.cfg
@@ -1,10 +1,10 @@
-% $Id: xdvipdfmx.cfg 158 2021-08-24 06:57:13Z herbert $
+% $Id: xdvipdfmx.cfg 191 2021-09-05 20:07:31Z herbert $
%
%% BEGIN: pstricks.con (for dvipdfmx driver)
%%
%% Configuration file for PSTricks
%%
-%% Version 0.06 (2021/08/21)
+%% Version 0.07 (2021/09/05)
%%
%% For use with dvipdfmx
%% Created by SMiyata based on standard pstricks.con from TeXLive distribution.
@@ -12,11 +12,9 @@
%% Modified by Denis Girou, Herbert Voss
%%
\def\pstdriver{dvipdfmx}%
-%%\def\pstverb#1{\special{pst: #1}}% Check catcode of "
-\def\pstverb#1{\special{ps: #1}}% Check catcode of "
+\def\pstverb#1{\special{pst: #1}}% Check catcode of "
\def\pstunit{1bp}%
-\def\pstVerb#1{\immediate\special{ps: #1}}%
-%\def\pstVerb#1{\immediate\special{PST: #1}}%
+\def\pstVerb#1{\immediate\special{PST: #1}}%
\def\pstverbscale{72.27 72 div dup scale }%
\def\pstnodescale{72 72.27 div dup scale }%
% DG/SR modification begin - Apr. 28, 1997 (D. Carlisle + S. Rahtz)
diff --git a/graphics/pstricks/base/config/xdvipdfmx.cfg.orig b/graphics/pstricks/base/config/xdvipdfmx.cfg.orig
deleted file mode 100644
index 75a596ca35..0000000000
--- a/graphics/pstricks/base/config/xdvipdfmx.cfg.orig
+++ /dev/null
@@ -1,244 +0,0 @@
-% $Id: xdvipdfmx.cfg 4 2020-06-09 08:32:19Z herbert $
-%
-%% BEGIN: pstricks.con (for xdvipdfmx driver)
-%%
-%% Configuration file for PSTricks
-%%
-%% Version 0.05 (2015/09/11)
-%%
-%% For use with xdvipdfmx
-%% Created by SMiyata based on standard pstricks.con from TeXLive distribution.
-%% This file may be distributed, used and modified freely.
-%% Modified by Denis Girou, Herbert Voss
-%%
-\def\pstdriver{xdvipdfmx}%
-\def\pstverb#1{\special{pst: #1}}% Check catcode of "
-\def\pstunit{1bp}%
-\def\pstVerb#1{\immediate\special{PST: #1}}%
-\def\pstverbscale{72.27 72 div dup scale }%
-\def\pstnodescale{72 72.27 div dup scale }%
-% DG/SR modification begin - Apr. 28, 1997 (D. Carlisle + S. Rahtz)
-% \def\pstheader#1{\special{header=#1}}
-% We used to check for |\AtBeginDvi|, but that was broken in early release
-% so we now check for the existence of |\textsuperscript| (added 1995/05/16)
-\ifx\textsuperscript\@undefined
- \def\pstheader#1{\special{header=#1}}%
-\else
- \ifx\Gin@PS@file@header\@undefined
- \def\pstheader#1{\AtBeginDvi{\special{header=#1}}}%
- \else
- \let\pstheader\Gin@PS@file@header%
- \fi
-\fi
-% DG/SR modification end
-%
-%%
-%%
-%% In the following, CP is short for currentpoint.
-%% The neg is necessary because dvips scales the coordinates by 1 -1.
-%% \tx@NET means neg exch neg exch translate.
-\def\pstrotate{CP CP translate 3 -1 roll neg rotate \tx@NET}%
-%%
-%% ****************** END xdvipdfmx *****************************
-
-
-%%%%%%%%%%%%%%%%%%% !! CUSTOMIZATION STUFF GOES HERE: !! %%%%%%%%%%%%%%%%%%
-%% If you want to include your own customizations to pstricks.tex, then
-%% uncomment the \pstcustomize command, and include your modifications
-%% after \pstcustomize. These will be read in after pstricks.tex.
-\def\c@lor@to@ps#1 #2\@@{\csname c@lor@ps@#1\endcsname#2 \@@}%
-\def\c@lor@ps@#1 #2\@@{TeXDict begin #1 end}%
-\def\c@lor@ps@rgb#1\@@{#1 setrgbcolor}%
-\def\c@lor@ps@hsb#1\@@{#1 sethsbcolor}%
-\def\c@lor@ps@cmyk#1\@@{#1 setcmykcolor}%
-\def\c@lor@ps@gray#1\@@{#1 setgray}%
-\pstcustomize
-\typeout{Using PSTricks configuration for XeTeX+xdvipdfmx}%
-\def\@@scalebox{%
- \leavevmode
- \hbox{%
-\ifdim\pst@tempd\p@<\z@
-\pst@dimg=\pst@tempd\ht\pst@hbox
-\pst@dimh=\pst@tempd\dp\pst@hbox
-\dp\pst@hbox=-\pst@dimg
-\ht\pst@hbox=-\pst@dimh
-\else
-\ht\pst@hbox=\pst@tempd\ht\pst@hbox
-\dp\pst@hbox=\pst@tempd\dp\pst@hbox
-\fi
-\pst@dima=\pst@tempc\wd\pst@hbox
-\ifdim\pst@dima<\z@\kern-\pst@dima\fi
-\special{x: bscale \pst@tempc \pst@tempd}%
-\hbox to \z@{\box\pst@hbox\hss}%
-\special{x: escale}%
-\ifdim\pst@dima>\z@\kern\pst@dima\fi}}%
-%
-\let\ps@@scalebox\@@scalebox
-\def\ps@rotateleft#1{%
-\leavevmode\hbox{\hskip\ht#1\hskip\dp#1\vbox{\vskip\wd#1%
-\pst@Verb{90 \tx@RotBegin}%
-\vbox to \z@{\vss\hbox to \z@{\box#1\hss}\vskip\z@}%
-\pst@Verb{\tx@RotEnd}}}}%
-%
-\def\ps@rotateright#1{%
- \leavevmode\hbox{%
- \hskip\ht#1\hskip\dp#1\vbox{\vskip\wd#1%
- \pst@Verb{-90 \tx@RotBegin}%
- \vbox to \z@{\hbox to \z@{\hss\box#1}\vss}%
- \pst@Verb{\tx@RotEnd}}}}%
-%
-\def\ps@rotatedown#1{%
-\hbox{\hskip\wd#1\vbox{\vskip\ht#1\vskip\dp#1%
-\pst@Verb{180 \tx@RotBegin}%
-\vbox to \z@{\hbox to \z@{\box#1\hss}\vss}%
-\pst@Verb{\tx@RotEnd}}}}%
-%
-\def\begin@psclip{\special{x: gsave}}%
-\def\end@psclip{\special{x: grestore}}%
-\def\@newcolor#1#2#3{%
-\expandafter\edef\csname #1\endcsname{\noexpand\pst@color{#2}}%
-\expandafter\edef\csname\string\color@#1\endcsname{#2}% hv 1.14 2005-12-17
-\expandafter\edef\csname\string\color@xetex@#1\endcsname{#3}%
-\ignorespaces}%
-%
-\def\newgray#1#2{%
- \pst@checknum{#2}\pst@tempg
- \@newcolor{#1}{\pst@tempg setgray}{gray \pst@tempg}%
-}
-\def\newrgbcolor#1#2{%
- \pst@expandafter\pst@getnumiii{#2} {} {} {} {}\@nil
- \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi setrgbcolor}{rgb \pst@tempg \pst@temph \pst@tempi}%
-}%
-\def\newhsbcolor#1#2{%
- \pst@expandafter\pst@getnumiii{#2} {} {} {} {}\@nil
- \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi sethsbcolor}{hsb \pst@tempg \pst@temph \pst@tempi}%
-}%
-\def\newcmykcolor#1#2{%
- \pst@expandafter\pst@getnumiv{#2} {} {} {} {} {}\@nil
- \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi \pst@tempj setcmykcolor}%
- {cmyk \pst@tempg \pst@temph \pst@tempi \pst@tempj}%
-}%
-\newgray{black}{0}%
-\newgray{darkgray}{.25}%
-\newgray{gray}{.5}%
-\newgray{lightgray}{.75}%
-\newgray{white}{1}%
-\newrgbcolor{red}{1 0 0}%
-\newrgbcolor{green}{0 1 0}%
-\newrgbcolor{blue}{0 0 1}%
-\newrgbcolor{yellow}{1 1 0}%
-\newrgbcolor{cyan}{0 1 1}%
-\newrgbcolor{magenta}{1 0 1}%
-
-\@ifundefined{LaTeXe}%
- {\def\current@@@@color{\csname\string\color@xetex@\psfillcolor\endcsname}}{%
- \AtBeginDocument{\@ifpackageloaded{xcolor}{\def\current@@@@color{\psfillcolor}}%
- {\def\current@@@@color{\csname\string\color@\psfillcolor\endcsname}}}}%
-%
-\iffalse
-\def\pst@starbox{%
-\setbox\pst@hbox\hbox{{%
- \def\current@color{\current@@@@color}%
-\dimen@\wd\pst@hbox\advance\dimen@2\psframesep\wd\pst@hbox\dimen@%
-\dimen@\ht\pst@hbox\advance\dimen@\psframesep\ht\pst@hbox\dimen@%
-\dimen@\dp\pst@hbox\advance\dimen@\psframesep\dp\pst@hbox\dimen@%
-\@ifundefined{LaTeXe}{\special{color push \current@color}%
- \rlap{\vrule width\wd\pst@hbox height\ht\pst@hbox depth\dp\pst@hbox}%
- \special{color pop}}%
- {\color@block{\wd\pst@hbox}{\ht\pst@hbox}{\dp\pst@hbox}}}%
-\rlap{\hskip\psframesep\unhbox\pst@hbox}}}
-\fi
-%
-\def\AltClipMode{}%
-%
-\def\putoverlaybox#1{%
-\hbox{\special{x: gsave}\special{x: initoverlay #1}\copy\theoverlaybox\special{x: grestore}}}%
-%
-\def\pst@overlay#1{\edef\curr@overlay{#1}\special{x: clipoverlay #1}\aftergroup\pst@endoverlay}%
-\def\pst@endoverlay{\special{x: clipoverlay \curr@overlay}}%
-\def\AltOverlayMode{}%
-%The next line is not necessary, if pstricks.sty of [2007/02/18 v0.33] or newer is used.
-\@ifundefined{LaTeXe}{}{\AtBeginDocument{\psset{fillcolor=white}}}%
-%
-\endinput
-%
-%
-%%%%%%%%%%%%%%%% DESCRIPTION OF CONFIGURATION DEFINITIONS %%%%%%%%%%%%%%%
-
-Here are the commands that must be defined in this file:
-
- \pstverb{} - The argument is included as verbatim PostScript,
- grouped by save and restore. The coordinate system
- should be square, not rotated, and with the origin
- at TeX's currentpoint.
-
- \pstVerb{} - The argument is included as verbatim PostScript, not
- grouped by (g)save and (g)restore. The currentpoint
- should be TeX's currentpoint.
-
- \pstunit - The units used by driver for graphics included with
- \pstverb. Probably 1bp or 1sp.
-
- \pstverbscale - The PostScript code that scales the coordinate system
- from that in effect with \pstVerb to that in effect
- with \pstverb. Should not translate to the currentpoint.
-
- \pstrotate - The PostScript code that takes a number off the stack
- and rotates the axes properly. I.e.,
- \pstVerb{angle \pstrotate} is used to begin rotations.
-
- \pstheader{} - The argument is a header file (e.g., .pro file).
- If your driver does not support such a special, then
- the command might just remind you to include the header
- when printing. You can use PSTricks without a header,
- in which case it does not matter how you define
- \pstheader. See read-me.pst for details.
- If you cannot change the default directory where your
- driver looks for header files, and you cannot write to
- that directory, then you include the path for your
- PSTricks header files.
- E.g., \def\pstheader#1{\special{header=~/tex/#1}}.
-
- \pstdriver - The name of the driver.
-
-
-%%%%%%%%% !! HOW TO MAKE A TEX FORMAT WITH PSTRICKS PRELOADED !! %%%%%%%%
-
-See your local TeX documentation for instructions on creating a TeX format.
-
-Before making the format, be sure that this configuration file is correct.
-It will be read only when creating the format, and not with every job.
-
-If you are not using header files, there are no more special instructions.
-
-Special instructions when using header files:
-
- - If you want to include supplementary PSTricks files (e.g., pst-node.tex),
- add \input commands in the customization section above.
-
- - If your definition of \pstheader is, e.g.
-
- \def\pstheader#1{\special{\header=#1}}
-
- then change it to
-
- \def\pstheader#1{%
- \expandafter\everyjob\expandafter{\the\everyjob
- \special{header=#1}}}
-
- and put your original definition in the customization section, AFTER
- any \input commands. E.g., the customization section might look like:
-
- \pstcustomize
- \input pst-node.tex
- \input pst-coil.tex
- \def\pstheader#1{\special{header=#1}}
-
- - Input pstricks.tex at the appropriate time when creating the format.
- E.g., when initex stops running:
- *\input pstricks
- *\dump
-
-
-%%
-%% END: pstricks.con
diff --git a/graphics/pstricks/base/doc/PSTricks.bib b/graphics/pstricks/base/doc/PSTricks.bib
index d49525facf..daaa78d445 100644
--- a/graphics/pstricks/base/doc/PSTricks.bib
+++ b/graphics/pstricks/base/doc/PSTricks.bib
@@ -1,21 +1,4 @@
@STRING{dtk = {{D}ie {\TeX}nische {K}om{\"o}die} }
-@STRING{beiprogramm = {{\TeX}-Beiprogramm}}
-@STRING{bretter = {Bretter, die die Welt bedeuten}}
-@STRING{dtk = {DTK}}
-@STRING{editorial = {Editorial}}
-@STRING{fremdebuehne = {Von fremden Bühnen}}
-@STRING{fundus = {Aus dem Fundus}}
-@STRING{grusswort = {Grußwort}}
-@STRING{hinterbuehne = {Hinter der Bühne}}
-@STRING{komascript = {\KOMAScript}}
-@STRING{leserbriefe = {Leserbriefe}}
-@STRING{magazin = {Magazin}}
-@STRING{rezensionen = {Bücher und Rezensionen}}
-@STRING{schonimmer = {Was Sie schon immer über {\TeX} wissen wollten, \dots}}
-@STRING{spielplan = {Spielplan}}
-@STRING{theaterkasse = {Von der Theaterkasse}}
-@STRING{theatertage = {{\TeX}-Theatertage}}
-@STRING{tippstricks = {Tipps und Tricks}}
@Book{PostScript,
Author = {Kollock, Nikolai G.},
diff --git a/graphics/pstricks/base/doc/pst-doc.cls b/graphics/pstricks/base/doc/pst-doc.cls
index e54d5e9893..9e4b244dab 100644
--- a/graphics/pstricks/base/doc/pst-doc.cls
+++ b/graphics/pstricks/base/doc/pst-doc.cls
@@ -23,12 +23,13 @@
%
\RequirePackage[dvipsnames,x11names,svgnames,table]{xcolor}
\RequirePackage{iftex}
+\RequirePackage{everyshi}
\RequirePackage{amsmath, amssymb}
-\ifxetex
+\iftutex
\usepackage{unicode-math}
\usepackage{libertinus-otf}
\setmonofont[Scale=MatchLowercase,FakeStretch=0.92]{DejaVu Sans Mono}
- \setmathfont{XITS Math}
+% \setmathfont{XITS Math}
\else
\RequirePackage[T1]{fontenc}
\RequirePackage{textcomp}
@@ -252,16 +253,17 @@ xleftmargin=0pt,xrightmargin=0pt,
% Inhalte von List of Figures
\IfPackageLoaded{subfig}{\setcounter{lofdepth}{1} %1 = nur figures, 2 = figures + subfigures
}
+\RequirePackage{xurl}
\RequirePackage[colorlinks,
urlcolor=pdfurlcolor,
filecolor=pdffilecolor,
linkcolor=pdflinkcolor,
breaklinks,
linktocpage=true]{hyperref}
-\ifxetex
-\else
- \RequirePackage{breakurl}
-\fi
+%\ifxetex
+%\else
+% \RequirePackage{breakurl}
+%\fi
\newsavebox\TBox
\newenvironment{Bsp}[1]{%
\par\bigskip%
@@ -459,13 +461,12 @@ xleftmargin=0pt,xrightmargin=0pt,
\parbox{17cm}{\sffamily\RaggedRight\bfseries\huge\@title}\\[5pt]
\parbox{15cm}{\sffamily\Large\@subtitle}
- \vspace{5cm}
+ \vspace{4cm}
\parbox{10cm}{\sffamily\@date}
\vfill
- ~\\
- \makebox[.5\textwidth]{\put(0,0){\bgImage}}\\
- ~
+ \makebox[\textwidth]{\bgImage}
+
\vfill
\parbox[b]{19cm}{\sffamily\RaggedRight
diff --git a/graphics/pstricks/base/doc/pst-news.tex b/graphics/pstricks/base/doc/pst-news.tex
index 6f3946714c..f9e40428f8 100644
--- a/graphics/pstricks/base/doc/pst-news.tex
+++ b/graphics/pstricks/base/doc/pst-news.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-news.tex 4 2020-06-09 08:32:19Z herbert $
+%% $Id: pst-news.tex 444 2017-04-19 10:55:35Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\listfiles
diff --git a/graphics/pstricks/base/doc/pst-news08.pdf b/graphics/pstricks/base/doc/pst-news08.pdf
index 00811580d4..428653ebf2 100644
--- a/graphics/pstricks/base/doc/pst-news08.pdf
+++ b/graphics/pstricks/base/doc/pst-news08.pdf
Binary files differ
diff --git a/graphics/pstricks/base/doc/pst-news09.tex b/graphics/pstricks/base/doc/pst-news09.tex
index a548f6e1bb..4a656a8566 100644
--- a/graphics/pstricks/base/doc/pst-news09.tex
+++ b/graphics/pstricks/base/doc/pst-news09.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-news09.tex 4 2020-06-09 08:32:19Z herbert $
+%% $Id: pst-news09.tex 165 2015-07-26 07:27:55Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\listfiles
diff --git a/graphics/pstricks/base/doc/pst-news10.tex b/graphics/pstricks/base/doc/pst-news10.tex
index e679c0a617..d4c018d92e 100644
--- a/graphics/pstricks/base/doc/pst-news10.tex
+++ b/graphics/pstricks/base/doc/pst-news10.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-news10.tex 4 2020-06-09 08:32:19Z herbert $
+%% $Id: pst-news10.tex 697 2017-12-30 19:04:03Z herbert $
\documentclass[11pt,english,BCOR=10mm,DIV12,bibliography=totoc,parskip=false,headings=small,,
headinclude=false,footinclude=false,oneside]{pst-doc}
\listfiles
diff --git a/graphics/pstricks/base/doc/pst-news11.tex b/graphics/pstricks/base/doc/pst-news11.tex
index 61efbef06c..a4254f226f 100644
--- a/graphics/pstricks/base/doc/pst-news11.tex
+++ b/graphics/pstricks/base/doc/pst-news11.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-news11.tex 4 2020-06-09 08:32:19Z herbert $
+%% $Id: pst-news11.tex 165 2015-07-26 07:27:55Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\listfiles
diff --git a/graphics/pstricks/base/doc/pst-news12.tex b/graphics/pstricks/base/doc/pst-news12.tex
index 2b3e185931..759869d864 100644
--- a/graphics/pstricks/base/doc/pst-news12.tex
+++ b/graphics/pstricks/base/doc/pst-news12.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-news12.tex 4 2020-06-09 08:32:19Z herbert $
+%% $Id: pst-news12.tex 847 2018-12-04 08:04:28Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\listfiles
diff --git a/graphics/pstricks/base/doc/pst-news13.tex b/graphics/pstricks/base/doc/pst-news13.tex
index 04b7de5995..2995cf042d 100644
--- a/graphics/pstricks/base/doc/pst-news13.tex
+++ b/graphics/pstricks/base/doc/pst-news13.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-news13.tex 4 2020-06-09 08:32:19Z herbert $
+%% $Id: pst-news13.tex 165 2015-07-26 07:27:55Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\listfiles
diff --git a/graphics/pstricks/base/doc/pst-news14.tex b/graphics/pstricks/base/doc/pst-news14.tex
index f0a108fba1..75b209b580 100644
--- a/graphics/pstricks/base/doc/pst-news14.tex
+++ b/graphics/pstricks/base/doc/pst-news14.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-news14.tex 4 2020-06-09 08:32:19Z herbert $
+%% $Id: pst-news14.tex 165 2015-07-26 07:27:55Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\listfiles
diff --git a/graphics/pstricks/base/doc/pst-news15.tex b/graphics/pstricks/base/doc/pst-news15.tex
index 231a8bd38c..c2369d7018 100644
--- a/graphics/pstricks/base/doc/pst-news15.tex
+++ b/graphics/pstricks/base/doc/pst-news15.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-news15.tex 4 2020-06-09 08:32:19Z herbert $
+%% $Id: pst-news15.tex 444 2017-04-19 10:55:35Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\listfiles
diff --git a/graphics/pstricks/base/doc/pst-news16.tex b/graphics/pstricks/base/doc/pst-news16.tex
index b0d91ec84a..9a544ca5bd 100644
--- a/graphics/pstricks/base/doc/pst-news16.tex
+++ b/graphics/pstricks/base/doc/pst-news16.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-news16.tex 4 2020-06-09 08:32:19Z herbert $
+%% $Id: pst-news16.tex 446 2017-04-19 11:40:55Z herbert $
\documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
headinclude=false,footinclude=false,twoside]{pst-doc}
\listfiles
diff --git a/graphics/pstricks/base/doc/pst-news17.tex b/graphics/pstricks/base/doc/pst-news17.tex
index 1bd25716a6..53cf23c2ce 100644
--- a/graphics/pstricks/base/doc/pst-news17.tex
+++ b/graphics/pstricks/base/doc/pst-news17.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-news17.tex 4 2020-06-09 08:32:19Z herbert $
+%% $Id: pst-news17.tex 699 2017-12-31 10:27:45Z herbert $
\documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
headinclude=false,footinclude=false,twoside]{pst-doc}
\listfiles
diff --git a/graphics/pstricks/base/doc/pst-news18.tex b/graphics/pstricks/base/doc/pst-news18.tex
index ac3ec7c4a4..dde1638e58 100644
--- a/graphics/pstricks/base/doc/pst-news18.tex
+++ b/graphics/pstricks/base/doc/pst-news18.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-news18.tex 4 2020-06-09 08:32:19Z herbert $
+%% $Id: pst-news17.tex 699 2017-12-31 10:27:45Z herbert $
\documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
headinclude=false,footinclude=false,twoside]{pst-doc}
\listfiles
diff --git a/graphics/pstricks/base/doc/pst-news19.pdf b/graphics/pstricks/base/doc/pst-news19.pdf
index 8fceedb1b9..4c32cf3c1c 100644
--- a/graphics/pstricks/base/doc/pst-news19.pdf
+++ b/graphics/pstricks/base/doc/pst-news19.pdf
Binary files differ
diff --git a/graphics/pstricks/base/doc/pst-news19.tex b/graphics/pstricks/base/doc/pst-news19.tex
index c670a6697d..9db696bc29 100644
--- a/graphics/pstricks/base/doc/pst-news19.tex
+++ b/graphics/pstricks/base/doc/pst-news19.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-news19.tex 4 2020-06-09 08:32:19Z herbert $
+%% $Id: pst-news19.tex 934 2019-02-23 14:07:34Z herbert $
\PassOptionsToPackage{useCalc}{pstricks}
\documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
headinclude=false,footinclude=false,twoside]{pst-doc}
@@ -54,11 +54,9 @@ this new file.
%--------------------------------------------------------------------------------------
-\section{\texttt{pstricks.tex} (v. 2.98 -- 2019/05/16)}
+\section{\texttt{pstricks.tex} (v. 2.94 -- 2019/01/07)}
%--------------------------------------------------------------------------------------
-\subsection{Plotting multilines}
-
There is a new macro called \Lcs{psLine} (uppercase L!) which can have
only one or two pairs of coordinates. Remember that \Lcs{psline} can have more.
With \Lcs{psLine} and an defined arrow you'll get nothing for something
@@ -120,36 +118,6 @@ coordinates. It needs
\end{LTXexample}
\fi
-%$
-
-\subsection{Relative coordinates -- experimental}
-
-All objects which can have at least two pairs of coordinates
-can use the »+«-operator to mark relative coordinates:
-
-\begin{BDef}
-\Lcs{psline}\OptArgs\OptArg{\Largr{$x_0,y_0$}}\Largr{$x_1,y_1$}+\Largr{$x_2,y_2$}\ldots\\
-\end{BDef}
-
-\begin{LTXexample}[width=5.5cm]
-\begin{pspicture}[showgrid](5,5)
-\psline[linecolor=blue]{->}%
- (1,1)+(3,4)+(-2,-3)
-\end{pspicture}
-\end{LTXexample}
-
-
-\begin{LTXexample}[width=5.5cm]
-\begin{pspicture}[showgrid](-1,-2)(4,3)
-\psaxes[labels=none]{->}(0,0)(-1,-2)(4,3)
-\psbezier%
- (!0.8 -95 PtoC 1 sub)+(8.5;85)+(5;-100)(2,1)%
- +(1;-70)+(0.5;-110)(3,2)%
- +(1;-80)+(0.5;95)(3.4,-0.8)
-\end{pspicture}
-\end{LTXexample}
-
-
\subsection{Error message}
diff --git a/graphics/pstricks/base/doc/pst-news20.tex b/graphics/pstricks/base/doc/pst-news20.tex
index f5a8094d14..00acba1ff2 100644
--- a/graphics/pstricks/base/doc/pst-news20.tex
+++ b/graphics/pstricks/base/doc/pst-news20.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-news20.tex 25 2020-09-18 06:59:21Z herbert $
+%% $Id: pst-news20.tex 23 2020-09-18 06:29:04Z herbert $
\documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
headinclude=false,footinclude=false,twoside]{scrartcl}
diff --git a/graphics/pstricks/base/doc/pst-news21.pdf b/graphics/pstricks/base/doc/pst-news21.pdf
index fb0d5b9f1d..fde6b2fc62 100644
--- a/graphics/pstricks/base/doc/pst-news21.pdf
+++ b/graphics/pstricks/base/doc/pst-news21.pdf
Binary files differ
diff --git a/graphics/pstricks/base/doc/pst-news21.tex b/graphics/pstricks/base/doc/pst-news21.tex
index 7c8e8cb4ee..447b9ba207 100644
--- a/graphics/pstricks/base/doc/pst-news21.tex
+++ b/graphics/pstricks/base/doc/pst-news21.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-news21.tex 164 2021-08-25 19:26:42Z herbert $
+%% $Id: pst-news21.tex 191 2021-09-05 20:07:31Z herbert $
\documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
headinclude=false,footinclude=false,twoside]{pst-doc}
@@ -132,21 +132,25 @@ the optional argument \texttt{gsfonts}:
There was a bug if this fillstyle was used together with a line sequence.
+
+
+
\psset{unit=1cm}
\centering\vspace{5cm}
\pspicture[showgrid=false](-0.5\linewidth,-4.5)(0.5\linewidth,5)
\rput(0,0){\parbox{4.5cm}{%
- \psclip{\psccurve[linestyle=none,fillstyle=penrose,psscale=.2](-3,-2)
+ \psclip{\psccurve[linestyle=none,fillstyle=penrose,psscale=.2](-3,-2)%
(0.3,-1.5)(2.3,-2)(4.3,-1.5)(6.3,-2)(8,-1.5)(8,2)(-3,2)}
``One of the best new plays I have seen all year: cool, poetic,
ironic \ldots'' proclaimed \emph{The Guardian} upon the London
premiere of this extraordinary play about a Czech director and
his actress wife, confronting exile in America.
- \endpsclip}}%
+ \endpsclip}}
\psline[linearc=0.5cm,showpoints=true,dotstyle=|]{<<->>}(-1,-2)(0,-4)(1,-2)
\endpspicture
+
\begin{lstlisting}
\pspicture[showgrid=false](-0.5\linewidth,-4.5)(0.5\linewidth,5)
\rput(0,0){\parbox{4.5cm}{%
@@ -162,6 +166,7 @@ There was a bug if this fillstyle was used together with a line sequence.
\end{lstlisting}
+
\pspicture[showgrid=false](-0.5\linewidth,-4.5)(0.5\linewidth,5)
\rput(0,0){\parbox{4.5cm}{%
\psclip{\psccurve[linestyle=none,fillstyle=penroseA,psscale=.2](-3,-2)
diff --git a/graphics/pstricks/base/dvips/pstricks-fonts-lm.pro b/graphics/pstricks/base/dvips/pstricks-fonts-lm.pro
deleted file mode 100644
index 952fccfa80..0000000000
--- a/graphics/pstricks/base/dvips/pstricks-fonts-lm.pro
+++ /dev/null
@@ -1,69 +0,0 @@
-% $Id: pstricks-fonts-lm.pro 4 2020-06-09 08:32:19Z herbert $
-%
-%% PostScript font prologue for pstricks.tex.
-%% Version 0.01, 2016/04/22
-%%
-%% This program can be redistributed and/or modified under the terms
-%% of the LaTeX Project Public License Distributed from CTAN archives
-%% in directory macros/latex/base/lppl.txt.
-%
-%
-%true setglobal globaldict begin
-
-%dd-lmbx10 LMRoman10-Bold <dotdigits-clm.enc <lmbx10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
-%dd-lmbxi10 LMRoman10-BoldItalic <dotdigits-clm.enc <lmbxi10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
-%dd-lmbxo10 LMRomanSlant10-Bold <dotdigits-clm.enc <lmbxo10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
-%dd-lmcsc10 LMRomanCaps10-Regular <dotdigits-clm.enc <lmcsc10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
-%dd-lmcsco10 LMRomanCaps10-Oblique <dotdigits-clm.enc <lmcsco10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
-%dd-lmdunh10 LMRomanDunh10-Regular <dotdigits-clm.enc <lmdunh10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
-%dd-lmduno10 LMRomanDunh10-Oblique <dotdigits-clm.enc <lmduno10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
-%dd-lmr10 LMRoman10-Regular <dotdigits-clm.enc <lmr10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
-%dd-lmri10 LMRoman10-Italic <dotdigits-clm.enc <lmri10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
-%dd-lmro10 LMRomanSlant10-Regular <dotdigits-clm.enc <lmro10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
-
-/Times-Roman /LMRoman10-Regular def
-/Times-Bold /LMRoman10-Bold def
-/Times-Italic /LMRoman10-Italic def
-/Times-BoldItalic /LMRoman10-BoldItalic def
-
-%mss8ttl10 LMSans10-Regular <t1-clm.enc <lmss10.pfb " fontinst-autoenc-t1-clm ReEncodeFont "
-%lmssbo8ttl10 LMSans10-BoldOblique <t1-clm.enc <lmssbo10.pfb " fontinst-autoenc-t1-clm ReEncodeFont "
-%lmssbx8ttl10 LMSans10-Bold <t1-clm.enc <lmssbx10.pfb " fontinst-autoenc-t1-clm ReEncodeFont "
-%lmssdc8ttl10 LMSansDemiCond10-Regular <t1-clm.enc <lmssdc10.pfb " fontinst-autoenc-t1-clm ReEncodeFont "
-%lmssdo8ttl10 LMSansDemiCond10-Oblique <t1-clm.enc <lmssdo10.pfb " fontinst-autoenc-t1-clm ReEncodeFont "
-%lmsso8ttl10 LMSans10-Oblique <t1-clm.enc <lmsso10.pfb " fontinst-autoenc-t1-clm ReEncodeFont "
-%dd-lmss10 LMSans10-Regular <dotdigits-clm.enc <lmss10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
-%dd-lmssbo10 LMSans10-BoldOblique <dotdigits-clm.enc <lmssbo10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
-%dd-lmssbx10 LMSans10-Bold <dotdigits-clm.enc <lmssbx10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
-%dd-lmssdc10 LMSansDemiCond10-Regular <dotdigits-clm.enc <lmssdc10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
-%dd-lmssdo10 LMSansDemiCond10-Oblique <dotdigits-clm.enc <lmssdo10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
-%dd-lmsso10 LMSans10-Oblique <dotdigits-clm.enc <lmsso10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
-
-/Helvetica /LMSans10-Regular def
-/Helvetica-Bold /LMSans10-Bold def
-/Helvetica-Oblique /LMSans10-Oblique def
-/Helvetica-BoldOblique /LMSans10-BoldOblique def
-
-%dd-lmtcsc10 LMMonoCaps10-Regular <dotdigits-clm.enc <lmtcsc10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
-%dd-lmtcso10 LMMonoCaps10-Oblique <dotdigits-clm.enc <lmtcso10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
-%dd-lmtk10 LMMonoLt10-Bold <dotdigits-clm.enc <lmtk10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
-%dd-lmtko10 LMMonoLt10-BoldOblique <dotdigits-clm.enc <lmtko10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
-%dd-lmtl10 LMMonoLt10-Regular <dotdigits-clm.enc <lmtl10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
-%dd-lmtlc10 LMMonoLtCond10-Regular <dotdigits-clm.enc <lmtlc10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
-%dd-lmtlco10 LMMonoLtCond10-Oblique <dotdigits-clm.enc <lmtlco10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
-%dd-lmtlo10 LMMonoLt10-Oblique <dotdigits-clm.enc <lmtlo10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
-%dd-lmtt10 LMMono10-Regular <dotdigits-clm.enc <lmtt10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
-%dd-lmtti10 LMMono10-Italic <dotdigits-clm.enc <lmtti10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
-%dd-lmtto10 LMMonoSlant10-Regular <dotdigits-clm.enc <lmtto10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont "
-
-/Courier /LMMono10-Regular def
-/Courier-Bold /LMMono10-Bold def
-/Courier-Oblique /LMMono10-Italic def
-/Courier-BoldOblique /LMMono10-BoldOblique def
-
-/Symbol /StandardSymL def
-
-%end false setglobal
-%
-% end of file
-
diff --git a/graphics/pstricks/base/dvips/pstricks-fonts-ps.pro b/graphics/pstricks/base/dvips/pstricks-fonts-ps.pro
deleted file mode 100644
index a2da535389..0000000000
--- a/graphics/pstricks/base/dvips/pstricks-fonts-ps.pro
+++ /dev/null
@@ -1,32 +0,0 @@
-% $Id: pstricks-fonts-ps.pro 4 2020-06-09 08:32:19Z herbert $
-%
-%% PostScript font prologue for pstricks.tex.
-%% Version 0.01, 2016/04/22
-%%
-%% This program can be redistributed and/or modified under the terms
-%% of the LaTeX Project Public License Distributed from CTAN archives
-%% in directory macros/latex/base/lppl.txt.
-%
-%
-%true setglobal globaldict begin
-
-/Times-Roman /Times-Roman def
-/Times-Bold /Times-Bold def
-/Times-Italic /Times-Italic def
-/Times-BoldItalic /Times-BoldItalic def
-
-/Helvetica /Helvetica def
-/Helvetica-Bold /Helvetica-Bold def
-/Helvetica-Oblique /Helvetica-Oblique def
-/Helvetica-BoldOblique /Helvetica-BoldOblique def
-
-/Courier /Courier def
-/Courier-Bold /Courier-Bold def
-/Courier-Oblique /Courier-Oblique def
-/Courier-BoldOblique /Courier-BoldOblique def
-
-/Symbol /Symbol def
-
-%end false setglobal
-%
-% end of file
diff --git a/graphics/pstricks/base/dvips/pstricks-fonts-urw.pro b/graphics/pstricks/base/dvips/pstricks-fonts-urw.pro
deleted file mode 100644
index 9191a26128..0000000000
--- a/graphics/pstricks/base/dvips/pstricks-fonts-urw.pro
+++ /dev/null
@@ -1,61 +0,0 @@
-% $Id: pstricks-fonts-urw.pro 4 2020-06-09 08:32:19Z herbert $
-%
-%% PostScript font prologue for pstricks.tex.
-%% Version 0.01, 2016/04/22
-%%
-%% This program can be redistributed and/or modified under the terms
-%% of the LaTeX Project Public License Distributed from CTAN archives
-%% in directory macros/latex/base/lppl.txt.
-%
-%
-%true setglobal globaldict begin
-
-%n021003l.pfa:/FontName /NimbusRomNo9L-Regu def
-%n021004l.pfa:/FontName /NimbusRomNo9L-Medi def
-%n021023l.pfa:/FontName /NimbusRomNo9L-ReguItal def
-%n021024l.pfa:/FontName /NimbusRomNo9L-MediItal def
-
-/Times-Roman /NimbusRomNo9L-Regu def
-/Times-Roman-Bold /NimbusRomNo9L-Medi def
-/Times-Italic /NimbusRomNo9L-ReguItal def
-/Times-BoldItalic /NimbusRomNo9L-MediItal def
-
-%n019003l.pfa:/FontName /NimbusSanL-Regu def
-%n019004l.pfa:/FontName /NimbusSanL-Bold def
-%n019023l.pfa:/FontName /NimbusSanL-ReguItal def
-%n019024l.pfa:/FontName /NimbusSanL-BoldItal def
-%n019043l.pfa:/FontName /NimbusSanL-ReguCond def
-%n019044l.pfa:/FontName /NimbusSanL-BoldCond def
-%n019063l.pfa:/FontName /NimbusSanL-ReguCondItal def
-%n019064l.pfa:/FontName /NimbusSanL-BoldCondItal def
-
-%/Helvetica /dd-lmss10 def
-/Helvetica /LMSans10-Regular def
-%/Helvetica /NimbusSanL-Regu def
-/Helvetica-Bold /NimbusSanL-Bold def
-/Helvetica-Oblique /NimbusSanL-ReguItal def
-/Helvetica-BoldOblique /NimbusSanL-BoldItal def
-
-%n022003l.pfa:/FontName /NimbusMonL-Regu cvn def
-%n022004l.pfa:/FontName /NimbusMonL-Bold cvn def
-%n022023l.pfa:/FontName /NimbusMonL-ReguObli cvn def
-%n022024l.pfa:/FontName /NimbusMonL-BoldObli cvn def
-
-/Courier /NimbusMonL-Regu def
-/Courier-Bold /NimbusMonL-Bold def
-/Courier-Oblique /NimbusMonL-ReguObli def
-/Courier-BoldOblique /NimbusMonL-BoldObli def
-
-%s050000l.pfa:/FontName /StandardSymL def
-
-/Symbol /StandardSymL def
-
-%p052003l.pfa:/FontName /URWPalladioL-Roma def
-%p052004l.pfa:/FontName /URWPalladioL-Bold def
-%p052023l.pfa:/FontName /URWPalladioL-Ital def
-%p052024l.pfa:/FontName /URWPalladioL-BoldItal def
-%z003034l.pfa:/FontName /URWChanceryL-MediItal def
-
-%end false setglobal
-%
-% end of file
diff --git a/graphics/pstricks/base/dvips/pstricks.pro b/graphics/pstricks/base/dvips/pstricks.pro
index ac52ca5f7d..91824e557c 100644
--- a/graphics/pstricks/base/dvips/pstricks.pro
+++ b/graphics/pstricks/base/dvips/pstricks.pro
@@ -1,7 +1,7 @@
-% $Id: pstricks.pro 167 2021-08-27 12:15:28Z herbert $
+% $Id: pstricks.pro 191 2021-09-05 20:07:31Z herbert $
%
%% PostScript prologue for pstricks.tex.
-%% Version 1.37, 2021/08/26
+%% Version 1.38, 2021/09/05
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives
@@ -10,7 +10,6 @@
%
% Define the follwing gs-functions if not known, eg when using distiller
%
-
revision 952 gt
{
systemdict /.setopacityalpha known not
@@ -33,10 +32,10 @@ revision 952 gt
/.setshapealpha { pop } bind def
} if
} ifelse
-
+%
%%<bool> .setalphaisshape -
%% If true, the values set by setstrokeconstantalpha and setfillconstantalpha are interpreted as shape values. The initial value of the AIS flag is false.
-
+%
%
/tx@Dict 200 dict def % the main PSTricks dictionary
tx@Dict begin
@@ -121,6 +120,23 @@ tx@Dict begin
%
/startGlobal { true setglobal globaldict begin } bind def
/endGlobal { end false setglobal } bind def
+%
+/setpdfcolor where { % luapstricks specific code
+ /setpdfcolor get /pssetPDFcolor exch def
+ /setpdfcolor {
+ pssetPDFcolor
+ mark
+ currentcolor
+ currentcolorspace 0 get
+ dup /DeviceRGB eq { pop setrgbcolor } {
+ dup /DeviceCMYK eq { pop setcmykcolor } {
+ /DeviceGray eq { setgray } if
+ } ifelse
+ } ifelse
+ cleartomark
+ } def
+} if
+%
/pssetRGBcolor /setrgbcolor load def
/pssetCMYKcolor /setcmykcolor load def
/pssetGraycolor /setgray load def
@@ -306,7 +322,7 @@ tx@Dict begin
} def
%
/PenroseFill {% on stack: scaling factor
- 20 dict begin
+ 40 dict begin
/Scale ED
% 1 exch div round /penroseFactor ED
% a 0 dtransform round exch round exch
@@ -334,7 +350,7 @@ tx@Dict begin
} def
%
/PenroseFillA {% on stack: scaling factor, border color, kite color, dart color
- 30 dict begin
+ 50 dict begin
/Scale ED
Scale dup scale
/border_colour ED
@@ -1247,7 +1263,7 @@ dup angle0 sub dup abs 180 gt { 180 add 360 div floor 360 mul sub } { pop } ifel
} def
%%------------------ tvz/DG/hv (2004-05-10) end -------------------%%
%
-/Rot { CP CP translate 3 -1 roll neg rotate NET } def
+/Rot { CP CP translate 3 -1 roll neg rotate NET } def
%
/RotBegin {
tx@Dict /TMatrix known not { /TMatrix { } def /RAngle { 0 } def } if
@@ -1297,4 +1313,4 @@ dup angle0 sub dup abs 180 gt { 180 add 360 div floor 360 mul sub } { pop } ifel
end
%-----------------------------------------------------------------------------%
%
-% END pstricks.pro
+% END pstricks.pro \ No newline at end of file
diff --git a/graphics/pstricks/base/generic/pst-fp.tex b/graphics/pstricks/base/generic/pst-fp.tex
index e00736bdeb..34cfb16f9e 100644
--- a/graphics/pstricks/base/generic/pst-fp.tex
+++ b/graphics/pstricks/base/generic/pst-fp.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-fp.tex 68 2021-04-08 06:41:14Z herbert $
+%% $Id: pst-fp.tex 4 2020-06-09 08:32:19Z herbert $
%%
%%
%% This is file `pst-fp.tex',
@@ -18,16 +18,16 @@
%% `pst-fp' is a PSTricks related package for a division,
%% multiplication and addition
%%
-%
-\def\fileversion{0.06}
-\def\filedate{2020/11/20}
-\message{`pst-fp' v\fileversion, \filedate\space (hv)}
-
\csname PSTFPloaded\endcsname
\let\PSTFPloaded\endinput
+%
% Requires some packages
\ifx\PSTricksLoaded\endinput\else\input pstricks \fi
%
+\def\fileversion{0.05}
+\def\filedate{2010/01/17}
+\message{`pst-fp' v\fileversion, \filedate\space (hv)}
+%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
%fixed point arithmetic with values between (including)
diff --git a/graphics/pstricks/base/generic/pstricks-arrows.tex b/graphics/pstricks/base/generic/pstricks-arrows.tex
index 5684f3d792..0d89aa6b98 100644
--- a/graphics/pstricks/base/generic/pstricks-arrows.tex
+++ b/graphics/pstricks/base/generic/pstricks-arrows.tex
@@ -1,4 +1,4 @@
-%% $Id: pstricks-arrows.tex 164 2021-08-25 19:26:42Z herbert $
+%% $Id: pstricks-arrows.tex 168 2021-08-28 08:43:24Z herbert $
%%
%% This is file `pstricks-arrows.tex',
%%
@@ -279,35 +279,18 @@
\psset[pstricks]{filledveearrowlength=3mm} % default projected length
\define@key[psset]{pstricks}{filledveearrowangle}[15]{\pst@getangle{#1}\psk@filledveearrowangle}
\psset[pstricks]{filledveearrowangle=15} % default angle
-\define@key[psset]{pstricks}{filledveearrowlinewidth}[0.35mm]{\pst@getlength{#1}\psk@filledveearrowlinewidth}
-\psset[pstricks]{filledveearrowlinewidth=0.35mm} % default vee arrow line width
+\define@key[psset]{pstricks}{filledveearrowlinewidth}[0.8pt]{\pst@getlength{#1}\psk@filledveearrowlinewidth}
+\psset[pstricks]{filledveearrowlinewidth=\pslinewidth} % default vee arrow line width
\define@key[psset]{pstricks}{arrowlinestyle}[solid]{%
\@ifundefined{psls@#1}%
{\@pstrickserr{Line style `#1' not defined}\@eha}%
{\def\psarrowlinestyle{#1}}}
\psset[pstricks]{arrowlinestyle=solid} % default
-\pst@def{VeeArrow}<%
- 1 setlinecap % round caps
- 1 setlinejoin % round join
- setlinewidth % vee arrow line width
- /y ED % projected length
- 2 div /a ED % angle (divide by 2)
- /t ED % false = inside, true = outside
- a sin a cos div y mul /x ED % perpendicular length : x=tan(a).y
- t { 1 -1 scale } if % if outside : symmetry
- x neg y moveto % point #1
- 0 0 L % point #2
- x y L % point #3
- { closepath gsave fill grestore } if % if filled : close and fill
- \@nameuse{psls@\psarrowlinestyle}
- \ps@check@tipcolor
- stroke % draw line
- 0 t { y 2 mul } { 0 } ifelse moveto> % if outside : twice longer line
-
-% VeeArrow : filled? outside? (total) angle (projected) length (arrow) line width
\@namedef{psas@|}{\ps@check@tipcolor \psk@tbarsize \tx@Tbar}
+% VeeArrow : filled? outside? (total) angle (projected) length (arrow) line width
+
\@namedef{psas@v}{%
\ps@check@tipcolor
false false \psk@veearrowangle \psk@veearrowlength \psk@veearrowlinewidth \tx@VeeArrow}
@@ -315,12 +298,37 @@
\ps@check@tipcolor
false true \psk@veearrowangle \psk@veearrowlength \psk@veearrowlinewidth \tx@VeeArrow}
\@namedef{psas@f}{%
- \ps@check@tipcolor
+ \ps@check@tipcolor
true false \psk@filledveearrowangle \psk@filledveearrowlength \psk@filledveearrowlinewidth \tx@VeeArrow}
\@namedef{psas@F}{%
\ps@check@tipcolor
true true \psk@filledveearrowangle \psk@filledveearrowlength \psk@filledveearrowlinewidth \tx@VeeArrow}
+\pst@def{VeeArrow}<%
+ 5 dict begin
+ \pst@arrowscale\space div SLW % vee arrow line width
+ /y ED % projected length
+ 2 div /a ED % angle (divide by 2)
+ /t ED % false = inside, true = outside
+ a sin a cos div y mul /x ED % perpendicular length : x=tan(a).y
+ /x2 x dup add def
+ t { 1 -1 scale } if % if outside : symmetry
+% newpath x2 neg y moveto 0 y neg rlineto x2 dup add 0 rlineto 0 y rlineto closepath clip % to get rid of linecap problem
+ newpath
+ x neg y moveto % lower left
+ 0 0 lineto % arrow tip
+ x y lineto % upper left
+ 0 setlinecap % round caps
+ 2 setlinejoin % round join
+ { closepath 0 setlinewidth gsave fill grestore } if % if filled : close and fill
+ \@nameuse{psls@\psarrowlinestyle}
+ \ps@check@tipcolor
+ stroke % draw line
+ 0 t { y 2 mul } { 0 } ifelse moveto
+ end
+> % if outside : twice longer line
+
+
% And An another arrowhead
% architectural tick / oblique arrow
diff --git a/graphics/pstricks/base/generic/pstricks.con b/graphics/pstricks/base/generic/pstricks.con
index 0c119d13a3..21134fb781 100644
--- a/graphics/pstricks/base/generic/pstricks.con
+++ b/graphics/pstricks/base/generic/pstricks.con
@@ -1,4 +1,4 @@
-%% $Id: pstricks.con 4 2020-06-09 08:32:19Z herbert $
+%% $Id: pstricks.con 170 2021-09-01 09:54:41Z herbert $
%% BEGIN: pstricks.con (for dvips driver)
%%
%% Configuration file for PSTricks
@@ -39,8 +39,11 @@
%% If you want to include your own customizations to pstricks.tex, then
%% uncomment the \pstcustomize command, and include your modifications
%% after \pstcustomize. These will be read in after pstricks.tex.
-%\pstcustomize
+\pstcustomize
+\ifPSTlualatex% luatex has another coordinate system
+ \def\pstrotate{CP CP translate 3 -1 roll rotate \tx@NET}
+\fi
\endinput
%%
diff --git a/graphics/pstricks/base/generic/pstricks.tex b/graphics/pstricks/base/generic/pstricks.tex
index 3bbf6a341e..cd28900b39 100644
--- a/graphics/pstricks/base/generic/pstricks.tex
+++ b/graphics/pstricks/base/generic/pstricks.tex
@@ -81,8 +81,8 @@
\fi
\let\pgfforeach\foreach
%
-\def\fileversion{3.06}
-\def\filedate{2021/08/27}
+\def\fileversion{3.07}
+\def\filedate{2021/09/05}
\pst@addfams{pstricks}
%
%\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{}
@@ -1396,7 +1396,8 @@
{ \pst@usecolor\ps@kitecolor }
{ \pst@usecolor\pshatchcolor }
\psk@psscale
- \tx@PenroseFillA }
+ \tx@PenroseFillA
+}
\def\psfs@penroseA{\pst@fill\pst@penroseFillA}
\@namedef{psfs@penroseA*}{\psfs@solid \psfs@penroseA}
%
@@ -2214,6 +2215,9 @@
}}
%
\pstheader{pst-dots.pro}
+
+\pstGSfontsfalse
+
\newpsfontdot{*}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(b)}
\newpsfontdotH{o}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(c)}{(b)}
\newpsfontdotH{Bo}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(C)}{(b)}
@@ -2226,53 +2230,11 @@
\newpsfontdotH{pentagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(p)}{(q)}
\newpsfontdotH{Bpentagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(P)}{(q)}
\newpsfontdot{pentagon*}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(q)}
-% DG/SR modification begin - Mar. 18, 1997 and Dec. 16, 1999 - Patch 14
-
-\ifpstGSfonts
- %\newpsfontdot{diamond*}[1.9 0.0 0.0 1.9 -0.4598 -0.70775]{StandardSymL}{<E0>}
- %\newpsfontdot{diamond}[2.3 0.0 0.0 2.3 -0.8533 -0.5336]{StandardSymL}{<A8>}
-\else
- %\newpsfontdot{diamond*}[1.9 0.0 0.0 1.9 -0.4598 -0.70775]{Symbol}{<E0>}
- %\newpsfontdot{diamond}[2.3 0.0 0.0 2.3 -0.8533 -0.5336]{Symbol}{<A8>}
-\fi
% D.G. modification begin - Jan. 17, 2000
\newpsfontdotH{diamond}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(d)}{(l)}
\newpsfontdotH{Bdiamond}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(D)}{(l)}
\newpsfontdot{diamond*}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(l)}
% DG/SR modification end
-
-\ifpstGSfonts
- \newpsfontdot{oplus}[1.44928 0.0 0.0 1.44928 -0.562319 -0.478261]{StandardSymL}{<C5>}
- \newpsfontdot{otimes}[1.44928 0.0 0.0 1.44928 -0.562319 -0.475362]{StandardSymL}{<C4>}
- \newpsfontdot{x}[1.8 0.0 0.0 1.8 -0.495 -0.4788]{StandardSymL}{<B4>}
-\else
- \newpsfontdot{oplus}[1.44928 0.0 0.0 1.44928 -0.562319 -0.478261]{Symbol}{<C5>}
- \newpsfontdot{otimes}[1.44928 0.0 0.0 1.44928 -0.562319 -0.475362]{Symbol}{<C4>}
- \newpsfontdot{x}[1.8 0.0 0.0 1.8 -0.495 -0.4788]{Symbol}{<B4>}
-\fi
-\newpsfontdot{+}[2.3 0.0 0.0 2.3 -0.6486 -0.5819]{NimbusRomNo9L-Regu}{<2B>}
-\newpsfontdot{asterisk}[2.43309 0.0 0.0 2.43309 -0.609489 -1.14477]{NimbusRomNo9L-Regu}{<2A>}
-\newpsfontdot{B+}[2.3 0.0 0.0 2.3 -0.6555 -0.5819]{NimbusRomNo9L-Bold}{<2B>}
-\newpsfontdot{Basterisk}[2.29358 0.0 0.0 2.29358 -0.576835 -1.08486]{NimbusRomNo9L-Bold}{<2A>}
-\newpsfontdot{|}[1.98413 0.0 0.0 1.38 -0.258929 -0.5]{NimbusSanL-Regu}{(|)}
-% DG/SR modification begin - Oct. 27, 1997 - Patch 7
-%[1.98413 0.0 0.0 1.98413 -0.258929 -0.712302]{NimbusSanL-Regu}{(|)}
-% DG/SR modification end
-\newpsfontdot{B|}[1.98413 0.0 0.0 1.38 -0.277778 -0.5]{NimbusSanL-Bold}{(|)}%
-% DG/SR modification begin - Oct. 27, 1997 - Patch 7
-%[1.98413 0.0 0.0 1.98413 -0.277778 -0.78302]{NimbusSanL-Bold}{(|)}
-
-% DG/SR modification end
-\iffalse
-\ifpstGSfonts
- \newpsfontdot{*}[2.77778 0.0 0.0 2.77778 -0.638889 -0.813889]{StandardSymL}{<B7>}
- \newpsfontdot{o}[3.33333 0.0 0.0 3.33333 -0.666667 -1.78167]{StandardSymL}{<B0>}
-\else
- \newpsfontdot{*}[2.77778 0.0 0.0 2.77778 -0.638889 -0.813889]{Symbol}{<B7>}
- \newpsfontdot{o}[3.33333 0.0 0.0 3.33333 -0.666667 -1.78167]{Symbol}{<B0>}
-\fi
-\newpsfontdot{Bo}[4.69484 0.0 0.0 4.69484 -0.78169 -2.97418]{NimbusRomNo9L-Bold}{<CA>}
-\fi
% Etienne Riga
\newpsfontdot{Asterisk}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(k)}
\newpsfontdot{BoldAsterisk}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(K)}
@@ -2313,6 +2275,28 @@
\newpsfontdotH{Diamond}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(d)}{(l)}
\newpsfontdotH{BoldDiamond}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(D)}{(l)}
\newpsfontdot{SolidDiamond}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(l)}
+
+\ifpstGSfonts
+ \newpsfontdot{oplus}[1.44928 0.0 0.0 1.44928 -0.562319 -0.478261]{StandardSymL}{<C5>}
+ \newpsfontdot{otimes}[1.44928 0.0 0.0 1.44928 -0.562319 -0.475362]{StandardSymL}{<C4>}
+ \newpsfontdot{x}[1.8 0.0 0.0 1.8 -0.495 -0.4788]{StandardSymL}{<B4>}
+ \newpsfontdot{+}[2.3 0.0 0.0 2.3 -0.6486 -0.5819]{NimbusRomNo9L-Regu}{<2B>}
+ \newpsfontdot{asterisk}[2.43309 0.0 0.0 2.43309 -0.609489 -1.14477]{NimbusRomNo9L-Regu}{<2A>}
+ \newpsfontdot{B+}[2.3 0.0 0.0 2.3 -0.6555 -0.5819]{NimbusRomNo9L-Bold}{<2B>}
+ \newpsfontdot{Basterisk}[2.29358 0.0 0.0 2.29358 -0.576835 -1.08486]{NimbusRomNo9L-Bold}{<2A>}
+ \newpsfontdot{|}[1.98413 0.0 0.0 1.38 -0.258929 -0.5]{NimbusSanL-Regu}{(|)}
+ \newpsfontdot{B|}[1.98413 0.0 0.0 1.38 -0.277778 -0.5]{NimbusSanL-Bold}{(|)}%
+\else
+ \newpsfontdot{oplus}[1.44928 0.0 0.0 1.44928 -0.562319 -0.478261]{Symbol}{<C5>}
+ \newpsfontdot{otimes}[1.44928 0.0 0.0 1.44928 -0.562319 -0.475362]{Symbol}{<C4>}
+ \newpsfontdot{x}[1.8 0.0 0.0 1.8 -0.495 -0.4788]{Symbol}{<B4>}
+ \newpsfontdot{+}[2.3 0.0 0.0 2.3 -0.6486 -0.5819]{Times-Roman}{<2B>}
+ \newpsfontdot{asterisk}[2.43309 0.0 0.0 2.43309 -0.609489 -1.14477]{Times-Roman}{<2A>}
+ \newpsfontdot{B+}[2.3 0.0 0.0 2.3 -0.6555 -0.5819]{Times-Bold}{<2B>}
+ \newpsfontdot{Basterisk}[2.29358 0.0 0.0 2.29358 -0.576835 -1.08486]{Times-Bold}{<2A>}
+ \newpsfontdot{|}[1.98413 0.0 0.0 1.38 -0.258929 -0.5]{Helvetica}{(|)}
+ \newpsfontdot{B|}[1.98413 0.0 0.0 1.38 -0.277778 -0.5]{Helvetica-Bold}{(|)}%
+\fi
%
\newdimen\pslinearc
\define@key[psset]{pstricks}{linearc}[0pt]{\pssetlength\pslinearc{#1}}
@@ -4030,7 +4014,23 @@ pop
\def\getref@r{\def\psk@xref{1}}
\psset[pstricks]{ref=c}
%
-\def\pst@rotlist{ mark RAngle /ps@a ED cleartomark ps@a neg }
+%
+% U Up 0
+% L Left 90
+% D Down 180
+% R Right 270
+%
+% N North *0
+% W West *90
+% S South *180
+% E East *270
+%
+\ifPSTlualatex
+ \def\pst@rotlist{ mark RAngle /ps@a ED cleartomark ps@a }%
+\else
+ \def\pst@rotlist{ mark RAngle /ps@a ED cleartomark ps@a neg }%
+\fi
+
\def\pst@rottable{%
@0=%
@U=%
@@ -4068,11 +4068,21 @@ pop
%
\def\tx@RotBegin{RotBegin }
\def\tx@RotEnd{RotEnd }
-\def\pst@rotate#1#2{%
- \ifx#1\@empty\else
- \setbox#2=\hbox{\pst@Verb{#1 \tx@RotBegin}\box#2\pst@Verb{\tx@RotEnd}}%
- \fi%
-}
+\ifPSTlualatex
+ \def\pst@rotate#1#2{%
+ \ifx#1\@empty\else
+ \setbox#2=\hbox{\pst@Verb{#1 \ifPSTlualatex neg \fi\space \tx@RotBegin}\box#2\pst@Verb{\tx@RotEnd}}%
+ % luatex doesn't have the coordinate system of dvips, so we need negative angles
+ \fi
+ }%
+ \else
+ \def\pst@rotate#1#2{%
+ \ifx#1\@empty\else
+ \setbox#2=\hbox{\pst@Verb{#1 \ifPSTlualatex \fi\space \tx@RotBegin}\box#2\pst@Verb{\tx@RotEnd}}%
+ % luatex doesn't have the coordinate system of dvips, so we need negative angles
+ \fi
+ }%
+ \fi
\def\psput@cartesian#1{%
\hbox to \z@{\kern\pst@dimg{\vbox to \z@{\vss\box#1\vskip\pst@dimh}\hss}}%
}
@@ -4399,6 +4409,7 @@ pop
\ifshowgrid\ifnum\showgridp@s=0\psgrid[style=gridstyle]\fi\fi
% ----------- 1.10/12 end hv -------------------
\ignorespaces% % 2008-12-07
+ \pstVerb{\pst@number\pslinewidth setlinewidth 0 setgray}% default setting
\ifPst@pgffunctions\pstVerb{ pgffunctions }\fi% hv 2013-04-17
}
\def\pic@coor{(0,0)(0,0)(10,10)}
diff --git a/graphics/pstricks/base/latex/pstricks-pdf.sty b/graphics/pstricks/base/latex/pstricks-pdf.sty
index 8fe00f7bc7..9923109fbb 100644
--- a/graphics/pstricks/base/latex/pstricks-pdf.sty
+++ b/graphics/pstricks/base/latex/pstricks-pdf.sty
@@ -1,4 +1,4 @@
-% $Id: pstricks-pdf.sty 25 2020-09-18 06:59:21Z herbert $
+% $Id: pstricks-pdf.sty 23 2020-09-18 06:29:04Z herbert $
%%
%% This is file `pstricks-pdf.sty'.
%%
diff --git a/graphics/pstricks/base/latex/pstricks.sty b/graphics/pstricks/base/latex/pstricks.sty
index e6189b7203..ad58f86fca 100644
--- a/graphics/pstricks/base/latex/pstricks.sty
+++ b/graphics/pstricks/base/latex/pstricks.sty
@@ -1,4 +1,4 @@
-% $Id: pstricks.sty 155 2021-08-23 17:27:13Z herbert $
+% $Id: pstricks.sty 181 2021-09-04 06:35:45Z herbert $
%%
%% This is file `pstricks.sty'.
%%
@@ -84,7 +84,6 @@
\DeclareOption*{\PassOptionsToPackage\CurrentOption{\pst@ColorPackage}}
\ProcessOptions\relax
-
%\RequirePackage{iftex}
\ifpst@useCalc
\RequirePackage{pst-calculate}
diff --git a/graphics/pstricks/contrib/pst-vectorian/Changes b/graphics/pstricks/contrib/pst-vectorian/Changes
new file mode 100644
index 0000000000..1dd4d9be67
--- /dev/null
+++ b/graphics/pstricks/contrib/pst-vectorian/Changes
@@ -0,0 +1,3 @@
+ 0.41 2021-09-06 - modified pro file to make it run with lualatex (hv)
+ 0.4 2012-12-12 - first CTAN version
+ \ No newline at end of file
diff --git a/graphics/pstricks/contrib/pst-vectorian/README b/graphics/pstricks/contrib/pst-vectorian/README
index b3998689b7..db94b90c3d 100644
--- a/graphics/pstricks/contrib/pst-vectorian/README
+++ b/graphics/pstricks/contrib/pst-vectorian/README
@@ -1,5 +1,5 @@
psvectorian package by Patrick FRADIN
-Version 0.4 dated 12 december 2012
+Version 0.41 dated 06 september 2021
This material is subject to the LaTeX Project Public License.
See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the details of that license.
diff --git a/graphics/pstricks/contrib/pst-vectorian/doc/psvectorian.pdf b/graphics/pstricks/contrib/pst-vectorian/doc/psvectorian.pdf
new file mode 100644
index 0000000000..662975cb4e
--- /dev/null
+++ b/graphics/pstricks/contrib/pst-vectorian/doc/psvectorian.pdf
Binary files differ
diff --git a/graphics/pstricks/contrib/pst-vectorian/psvectorian.tex b/graphics/pstricks/contrib/pst-vectorian/doc/psvectorian.tex
index 9252fe1325..e97cc77d07 100644
--- a/graphics/pstricks/contrib/pst-vectorian/psvectorian.tex
+++ b/graphics/pstricks/contrib/pst-vectorian/doc/psvectorian.tex
@@ -1,13 +1,29 @@
+%% The lualatex document version! Needs package luapstricks.lua
+\PassOptionsToPackage{svgnames}{xcolor}
+\RequirePackage{pdfmanagement-testphase}
+\DeclareDocumentMetadata{}
\documentclass[11pt,a4paper,frenchb]{article}
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{lmodern}
+\usepackage[blur]{bclogo}
+\usepackage{unicode-math}
+\usepackage{libertinus}
+\let\mathfrak\relax
\usepackage[charter]{mathdesign}
-\renewcommand{\ttdefault}{lmtt}
+%\let\leftwave\relax
+%\DeclareMathDelimiter{\lwave}{\mathopen} {largesymbols}{"D0}{largesymbols}{"D0}
+%\DeclareMathDelimiter{\rwave}{\mathclose}{largesymbols}{"D0}{largesymbols}{"D0}
+
+%\DeclareMathDelimiter{\levaw}{\mathopen} {largesymbols}{"D1}{largesymbols}{"D1}
+%\DeclareMathDelimiter{\revaw}{\mathclose}{largesymbols}{"D1}{largesymbols}{"D1}
+
+%\let\lwave\leftwave
+%\let\rwave\rightwave
+
+\def\leftwave{\left\lwave}
+\def\rightwave{\right\rwave}
+
+
\usepackage[margin=2.25cm,headheight=15pt]{geometry}
-\usepackage[svgnames]{xcolor}
-\usepackage[]{pstricks}
-\usepackage[blur]{bclogo}
+\usepackage{pstricks}
\usepackage{psvectorian}
\usepackage{fancyvrb,array}
\usepackage{fancyhdr,lastpage}%style fancy
@@ -47,8 +63,7 @@ pdfsubject = {Documentation de psvectorian},% Sujet
\newenvironment*{showCode}[1]{%
\gdef\titre{#1}%
\VerbatimOut{file.txt}}%
-{%
-\endVerbatimOut
+{\endVerbatimOut
\begin{bclogo}[logo=\bccrayon,couleurTexte=Maroon,couleur=AliceBlue,epBord=0.4,barre=wave,blur,couleurOmbre=gray!80,couleurBarre=DarkGreen]{\titre}%
\begin{small}%
\itshape%
@@ -60,6 +75,8 @@ pdfsubject = {Documentation de psvectorian},% Sujet
\end{center}
}%
+
+
\begin{document}
\maketitle
@@ -94,12 +111,11 @@ et pour tout le travail de \og mise en forme\fg{} qu'il réalise. Je remercie é
\vfill
-\clearpage
\section{La macro \emph{psvectorian}}
L'affichage d'un motif à l'endroit $(x,y)$ se fait avec la macro \verb|\rput| de \emph{pstricks}, de la manière suivante:\par\medskip
-{\centering \textbf{$\backslash$rput[refpoint]\{angle\}(x,y)\{$\backslash$psvectorian[options]\{numéro\}\} }\par}
+{\centering \textbf{\textbackslash rput[refpoint]\{angle\}(x,y)\{\textbackslash psvectorian[options]\{numéro\}\} }\par}
\medskip
La macro \verb|\psvectorian[options]{numéro}| dessine le motif correspondant au numéro demandé, celui-ci doit être entre $1$ et $196$. Cette macro peut aussi s'utiliser seule, elle représente un environnement \emph{pspicture} qui sera donc placé au point courant. Les options possibles sont:
@@ -152,6 +168,8 @@ La macro \verb|\psvectorian[options]{numéro}| dessine le motif correspondant au
\end{showCode}
+\clearpage
+
\section{La liste des motifs}
diff --git a/graphics/pstricks/contrib/pst-vectorian/psvectorian.pro b/graphics/pstricks/contrib/pst-vectorian/dvips/psvectorian.pro
index 6bb6cec84c..87585e2876 100644
--- a/graphics/pstricks/contrib/pst-vectorian/psvectorian.pro
+++ b/graphics/pstricks/contrib/pst-vectorian/dvips/psvectorian.pro
@@ -1,6 +1,6 @@
-%% $Id: psvectorian.pro 328 2010-05-24 15:56:43Z herbert $
% PostScript prologue for psvectorian.tex.
% Version 0.3, 2012/11/06
+% Version 0.41, 2021/09/06 (adapted for lualatex by mk and hv)
%
/tx@vectorianDict 410 dict def
%
@@ -329,6 +329,7 @@ fill
1 setlinejoin
%\pst@setColor
newpath
+gsave
-0.8524 0 moveto 135.2106 0 lineto 135.2106 147.8143 lineto -0.8524 147.8143 lineto closepath clip newpath
120.9937 54.2008 moveto
128.762 62.7282 135.2106 69.7373 134.261 79.0239 curveto
@@ -383,7 +384,7 @@ newpath
115.3124 39.6112 113.2255 45.6707 120.9937 54.2008 curveto
closepath
fill
-initclip
+grestore
} def
%
/vec7 {
@@ -1636,6 +1637,7 @@ fill
1 setlinejoin
%\pst@setColor
newpath
+gsave
-0.903 0 moveto 80.4808 0 lineto 80.4808 99.326 lineto -0.903 99.326 lineto closepath clip newpath
39.7745 82.4854 moveto
44.0609 82.4854 47.5329 85.8134 47.5329 89.9174 curveto
@@ -1648,7 +1650,8 @@ newpath
32.0113 85.8134 35.4865 82.4854 39.7745 82.4854 curveto
closepath
fill
-initclip
+grestore
+gsave
-0.903 0 moveto 80.4808 0 lineto 80.4808 99.326 lineto -0.903 99.326 lineto closepath clip newpath
46.5809 51.5862 moveto
46.6801 54.8422 45.1985 57.5014 46.7809 59.2822 curveto
@@ -1694,7 +1697,7 @@ initclip
44.5217 44.8998 46.4897 48.527 46.5809 51.5862 curveto
closepath
fill
-initclip
+grestore
79.5665 12.759 moveto
79.3697 14.7318 77.6561 14.3398 77.7217 13.087 curveto
78.4497 6.3142 73.3169 3.2198 68.7121 3.287 curveto
@@ -1793,6 +1796,7 @@ fill
1 setlinejoin
%\pst@setColor
newpath
+gsave
-0.0021 -0.0244 moveto 122.5091 -0.0244 lineto 122.5091 67.1817 lineto -0.0021 67.1817 lineto closepath clip newpath
49.3488 29.6987 moveto
49.3488 29.6987 51.966 23.1099 57.9317 23.1099 curveto
@@ -1852,7 +1856,7 @@ newpath
44.638 28.2331 47.0472 27.5019 49.3488 29.6987 curveto
closepath
fill
-initclip
+grestore
0.5285 34.6763 moveto
19.9856 34.6763 lineto
23.2879 35.2587 27.5285 36.4347 30.6442 38.8331 curveto
@@ -2084,6 +2088,7 @@ fill
1 setlinejoin
%\pst@setColor
newpath
+gsave
-0.0001 -0.0244 moveto 122.5065 -0.0244 lineto 122.5065 67.1817 lineto -0.0001 67.1817 lineto closepath clip newpath
73.1572 29.6987 moveto
73.1572 29.6987 70.5412 23.1099 64.5748 23.1099 curveto
@@ -2143,7 +2148,7 @@ newpath
77.8676 28.2331 75.4596 27.5019 73.1572 29.6987 curveto
closepath
fill
-initclip
+grestore
121.978 34.6763 moveto
102.5188 34.6763 lineto
99.218 35.2587 94.978 36.4347 91.8628 38.8331 curveto
@@ -2673,6 +2678,7 @@ fill
1 setlinejoin
%\pst@setColor
newpath
+gsave
-0.6207 -0.3181 moveto 74.155 -0.3181 lineto 74.155 59.5814 lineto -0.6207 59.5814 lineto closepath clip newpath
8.4407 28.8812 moveto
9.6375 28.8812 10.6711 28.6652 11.5719 28.2876 curveto
@@ -2720,7 +2726,7 @@ newpath
4.0839 27.9324 6.1095 28.8812 8.4407 28.8812 curveto
closepath
fill
-initclip
+grestore
40.0119 14.7484 moveto
31.1159 8.9756 lineto
31.1159 8.9756 29.2583 21.3036 17.7687 29.142 curveto
@@ -2891,6 +2897,7 @@ fill
1 setlinejoin
%\pst@setColor
newpath
+gsave
-0.8416 0 moveto 81.4539 0 lineto 81.4539 81.1389 lineto -0.8416 81.1389 lineto closepath clip newpath
49.991 29.0767 moveto
53.9126 32.3055 59.4454 31.8431 61.7542 30.5775 curveto
@@ -2949,7 +2956,8 @@ closepath
40.8582 3.283 41.2262 2.9166 41.2262 2.4622 curveto
closepath
fill
-initclip
+grestore
+gsave
-0.8416 0 moveto 81.4539 0 lineto 81.4539 81.1389 lineto -0.8416 81.1389 lineto closepath clip newpath
74.4486 42.0687 moveto
70.8422 47.8591 65.0678 53.7727 59.4854 59.4895 curveto
@@ -3006,7 +3014,7 @@ initclip
81.455 25.7631 79.6646 33.6911 74.4486 42.0687 curveto
closepath
fill
-initclip
+grestore
} def
%
/vec21 {
@@ -3054,6 +3062,7 @@ fill
1 setlinejoin
%\pst@setColor
newpath
+gsave
0 0 moveto 34.3967 0 lineto 34.3967 61.2011 lineto 0 61.2011 lineto closepath clip newpath
28.492 18.607 moveto
26.5464 25.1398 23.5592 25.4134 21.3352 25.1382 curveto
@@ -3106,7 +3115,7 @@ newpath
31.4792 10.6166 30.4376 12.0774 28.492 18.607 curveto
closepath
fill
-initclip
+grestore
} def
%
/vec23 {
@@ -3314,6 +3323,7 @@ fill
1 setlinejoin
%\pst@setColor
newpath
+gsave
-0.4415 0 moveto 59.2312 0 lineto 59.2312 119.8534 lineto -0.4415 119.8534 lineto closepath clip newpath
17.8132 34.1483 moveto
24.9124 30.7659 29.1684 27.2171 29.3396 11.4939 curveto
@@ -3342,7 +3352,8 @@ closepath
24.9268 35.8011 26.9028 37.7771 29.3396 37.7771 curveto
closepath
fill
-initclip
+grestore
+gsave
-0.4415 0 moveto 59.2312 0 lineto 59.2312 119.8534 lineto -0.4415 119.8534 lineto closepath clip newpath
29.0596 8.7899 moveto
26.6068 7.4379 24.6644 6.8235 24.6644 4.3963 curveto
@@ -3351,7 +3362,7 @@ initclip
33.4548 6.8235 31.2564 7.6923 29.0596 8.7899 curveto
closepath
fill
-initclip
+grestore
55.4292 24.9339 moveto
54.0756 27.2171 54.4148 29.3291 54.5828 31.1883 curveto
51.2036 26.6251 48.4148 28.2315 41.9044 24.1723 curveto
@@ -3378,6 +3389,7 @@ fill
1 setlinejoin
%\pst@setColor
newpath
+gsave
-0.7443 -0.0019 moveto 100.6272 -0.0019 lineto 100.6272 98.5984 lineto -0.7443 98.5984 lineto closepath clip newpath
30.4295 63.4183 moveto
25.8727 62.5159 23.2135 58.6502 24.0199 56.9334 curveto
@@ -3561,13 +3573,14 @@ closepath
30.5927 64.8535 29.3015 66.2791 28.3479 67.6551 curveto
closepath
fill
-initclip
+grestore
} def
%
/vec28 {
1 setlinejoin
%\pst@setColor
newpath
+gsave
-0.0148 0 moveto 52.4329 0 lineto 52.4329 101.8568 lineto -0.0148 101.8568 lineto closepath clip newpath
51.5586 2.5068 moveto
46.3282 10.5724 47.2034 17.9804 48.293 21.1404 curveto
@@ -3694,7 +3707,7 @@ closepath
26.2802 65.8188 25.9282 67.9996 24.2098 69.8012 curveto
closepath
fill
-initclip
+grestore
34.8866 19.0716 moveto
35.4306 19.782 34.933 20.2812 34.125 19.7276 curveto
32.8594 18.8492 27.9154 15.5852 29.3314 14.3852 curveto
@@ -3823,6 +3836,7 @@ fill
45.1824 9.246 52.712 25.0588 52.712 25.0588 curveto
closepath
fill
+gsave
-0.0004 0 moveto 63.2644 0 lineto 63.2644 63.868 lineto -0.0004 63.868 lineto closepath clip newpath
59.984 32.5484 moveto
59.9376 32.6316 59.8432 32.7052 59.7856 32.782 curveto
@@ -3894,13 +3908,14 @@ closepath
55.192 27.3596 54.8272 26.3036 54.7136 25.1628 curveto
closepath
fill
-initclip
+grestore
} def
%
/vec31 {
1 setlinejoin
%\pst@setColor
newpath
+gsave
-3.828 -0.0472 moveto 48.4248 -0.0472 lineto 48.4248 51.498 lineto -3.828 51.498 lineto closepath clip newpath
48.425 46.0342 moveto
48.425 46.0342 37.0624 51.4982 32.9155 36.6278 curveto
@@ -3938,7 +3953,7 @@ closepath
34.7624 16.5478 34.8147 15.0438 34.6125 13.6054 curveto
closepath
fill
-initclip
+grestore
} def
%
/vec32 {
@@ -4535,6 +4550,7 @@ fill
1 setlinejoin
%\pst@setColor
newpath
+gsave
-4.1311 -0.2523 moveto 105.4042 -0.2523 lineto 105.4042 105.0378 lineto -4.1311 105.0378 lineto closepath clip newpath
99.7949 103.9072 moveto
96.2317 103.9968 89.8413 102.4528 86.7965 100.104 curveto
@@ -4656,13 +4672,14 @@ closepath
81.7869 90.6992 81.8285 91.1696 81.9229 91.6656 curveto
closepath
fill
-initclip
+grestore
} def
%
/vec38 {
1 setlinejoin
%\pst@setColor
newpath
+gsave
0 -0.2523 moveto 109.5353 -0.2523 lineto 109.5353 105.0378 lineto 0 105.0378 lineto closepath clip newpath
-0.0004 102.5392 moveto
-0.0004 101.408 1.1196 101.0944 4.9564 101.6272 curveto
@@ -4784,7 +4801,7 @@ closepath
23.5756 91.1696 23.6172 90.6992 23.6172 90.2496 curveto
closepath
fill
-initclip
+grestore
} def
%
/vec39 {
@@ -5761,6 +5778,7 @@ closepath
191.1752 56.9474 191.8024 57.5714 192.5656 57.5714 curveto
closepath
fill
+gsave
0 -0.073 moveto 385.344 -0.073 lineto 385.344 64.1533 lineto 0 64.1533 lineto closepath clip newpath
384.8248 1.365 moveto
384.5912 1.4258 360.9784 7.4178 302.9832 15.469 curveto
@@ -5913,7 +5931,7 @@ closepath
285.5048 17.6466 279.14 18.293 272.8984 18.8562 curveto
closepath
fill
-initclip
+grestore
192.9112 27.9474 moveto
189.9672 25.525 188.9256 21.365 188.9256 21.365 curveto
196.0312 21.365 lineto
@@ -6282,6 +6300,7 @@ fill
1 setlinejoin
%\pst@setColor
newpath
+gsave
0 0 moveto 162.627 0 lineto 162.627 60.9336 lineto 0 60.9336 lineto closepath clip newpath
159.4383 53.4108 moveto
158.1215 53.4108 156.9935 52.75 156.5055 51.8108 curveto
@@ -6377,7 +6396,7 @@ closepath
120.6783 33.5676 122.8639 24.5372 120.1407 21.814 curveto
closepath
fill
-initclip
+grestore
} def
%
/vec50 {
@@ -8787,6 +8806,7 @@ closepath
148.796 28.9816 149.9992 27.2536 150.1688 25.932 curveto
closepath
fill
+gsave
-1.2031 -0.0153 moveto 207.2862 -0.0153 lineto 207.2862 102.9209 lineto -1.2031 102.9209 lineto closepath clip newpath
207.2872 26.2296 moveto
204.6008 27.5496 203.54 31.3176 203.14 33.5816 curveto
@@ -8875,13 +8895,14 @@ closepath
147.9912 63.284 156.2872 63.308 156.1832 60.2472 curveto
closepath
fill
-initclip
+grestore
} def
%
/vec58 {
1 setlinejoin
%\pst@setColor
newpath
+gsave
-0.0011 0 moveto 227.7774 0 lineto 227.7774 115.8486 lineto -0.0011 115.8486 lineto closepath clip newpath
223.4339 61.8059 moveto
222.4275 62.9659 221.3875 64.1627 220.1779 65.1691 curveto
@@ -9204,7 +9225,7 @@ closepath
224.5491 56.6651 220.5123 52.3595 219.3763 51.4123 curveto
closepath
fill
-initclip
+grestore
202.7267 63.7339 moveto
202.7267 63.7339 194.5475 60.6091 186.5939 60.4939 curveto
186.4547 60.4939 lineto
@@ -12391,6 +12412,7 @@ closepath
15.9036 6.304 14.7802 7.424 14.7802 8.816 curveto
closepath
fill
+gsave
0 -0.0004 moveto 211.9136 -0.0004 lineto 211.9136 211.8724 lineto 0 211.8724 lineto closepath clip newpath
8.4873 8.816 moveto
8.4873 3.952 12.4317 0 17.2943 0 curveto
@@ -12850,7 +12872,7 @@ closepath
13.6474 2.208 10.6889 5.168 10.6889 8.816 curveto
closepath
fill
-initclip
+grestore
} def
%
/vec64 {
@@ -13045,6 +13067,7 @@ closepath
197.1336 7.424 196.0104 6.304 194.6184 6.304 curveto
closepath
fill
+gsave
0 -0.0004 moveto 211.9136 -0.0004 lineto 211.9136 211.8724 lineto 0 211.8724 lineto closepath clip newpath
194.6184 17.616 moveto
192.58 17.616 190.708 16.928 189.2152 15.76 curveto
@@ -13504,13 +13527,14 @@ closepath
201.2232 5.168 198.2664 2.208 194.6184 2.208 curveto
closepath
fill
-initclip
+grestore
} def
%
/vec65 {
1 setlinejoin
%\pst@setColor
newpath
+gsave
-0.6745 -1.1434 moveto 133.089 -1.1434 lineto 133.089 165.7515 lineto -0.6745 165.7515 lineto closepath clip newpath
130.4624 33.816 moveto
130.4688 35.48 130.3888 37.144 130.1936 38.824 curveto
@@ -13803,7 +13827,7 @@ newpath
131.6816 32.744 131.1824 33.48 130.4624 33.816 curveto
closepath
fill
-initclip
+grestore
} def
%
/vec66 {
@@ -14303,6 +14327,7 @@ fill
64.9424 74.3994 64.6688 74.1274 64.6688 73.7914 curveto
closepath
fill
+gsave
-0.0007 0 moveto 79.7639 0 lineto 79.7639 154.7989 lineto -0.0007 154.7989 lineto closepath clip newpath
71.1008 6.3674 moveto
67.096 9.7274 64.8272 15.1034 62.6128 20.3514 curveto
@@ -14418,7 +14443,8 @@ closepath
66.7184 3.6314 55.84 5.7274 46.8864 15.4554 curveto
closepath
fill
-initclip
+grestore
+gsave
-0.0007 0 moveto 79.7639 0 lineto 79.7639 154.7989 lineto -0.0007 154.7989 lineto closepath clip newpath
38.6848 72.9594 moveto
38.6816 73.0074 39.04 60.9434 39.1232 58.1594 curveto
@@ -14453,7 +14479,7 @@ closepath
29.6528 124.5754 29.6528 124.8474 29.6528 125.1194 curveto
closepath
fill
-initclip
+grestore
17.7376 122.7674 moveto
20.8544 122.7674 23.3936 125.3914 23.3936 128.6234 curveto
23.3936 131.8554 20.8544 134.4794 17.7376 134.4794 curveto
@@ -14739,6 +14765,7 @@ closepath
228.0689 99.7755 236.3841 109.4235 238.1729 111.0235 curveto
closepath
fill
+gsave
-2.5906 0 moveto 363.7001 0 lineto 363.7001 153.919 lineto -2.5906 153.919 lineto closepath clip newpath
353.4225 106.5595 moveto
348.6609 111.7915 340.9825 114.6715 333.8689 113.9195 curveto
@@ -16224,7 +16251,7 @@ closepath
361.3953 96.0155 362.0289 80.3675 354.4417 69.1835 curveto
closepath
fill
-initclip
+grestore
264.0673 97.2635 moveto
264.5185 97.2155 265.3697 97.5675 264.2721 98.4155 curveto
262.4481 99.7275 256.5169 100.0315 253.0817 98.2235 curveto
@@ -18315,6 +18342,7 @@ newpath
125.304 77.7755 128.0352 75.0395 131.4064 75.0395 curveto
closepath
fill
+gsave
-0.0011 0 moveto 206.8011 0 lineto 206.8011 89.407 lineto -0.0011 89.407 lineto closepath clip newpath
201.0576 41.2955 moveto
195.672 50.9915 187.4128 54.5755 187.4128 54.5755 curveto
@@ -18451,7 +18479,7 @@ closepath
183.104 52.0635 178.7968 47.0395 167.3072 48.4795 curveto
closepath
fill
-initclip
+grestore
} def
%
/vec78 {
@@ -18763,6 +18791,7 @@ newpath
203.5727 16.3578 201.3183 18.6138 198.5439 18.6138 curveto
closepath
fill
+gsave
0 -0.0581 moveto 248.8094 -0.0581 lineto 248.8094 123.8137 lineto 0 123.8137 lineto closepath clip newpath
10.0495 86.4698 moveto
10.0495 89.2378 7.8015 91.4938 5.0255 91.4938 curveto
@@ -18771,7 +18800,7 @@ fill
7.8015 81.4458 10.0495 83.6858 10.0495 86.4698 curveto
closepath
fill
-initclip
+grestore
46.6751 82.1658 moveto
47.3903 82.1658 48.0687 82.3098 48.6815 82.5818 curveto
49.5695 81.3658 53.0623 76.7738 54.9311 76.7738 curveto
@@ -18790,6 +18819,7 @@ fill
147.6655 53.3978 147.9183 53.4298 147.9183 53.4298 curveto
closepath
fill
+gsave
0 -0.0581 moveto 248.8094 -0.0581 lineto 248.8094 123.8137 lineto 0 123.8137 lineto closepath clip newpath
225.4671 36.1978 moveto
205.7247 36.5658 194.5935 32.6138 188.8495 29.7338 curveto
@@ -19033,7 +19063,7 @@ closepath
113.0943 24.3578 91.1935 25.0618 84.7311 37.9898 curveto
closepath
fill
-initclip
+grestore
211.1087 18.2458 moveto
208.3343 18.2458 206.0847 16.0058 206.0847 13.2218 curveto
206.0847 10.4538 208.3343 8.1978 211.1087 8.1978 curveto
@@ -19065,6 +19095,7 @@ fill
453.5434 15.0762 383.9142 16.2681 364.3734 16.2681 curveto
closepath
fill
+gsave
0 0 moveto 453.5434 0 lineto 453.5434 30.9271 lineto 0 30.9271 lineto closepath clip newpath
225.5858 30.9281 moveto
206.8555 30.9281 203.5957 13.8247 203.5957 13.8247 curveto
@@ -19073,7 +19104,7 @@ fill
245.943 10.5471 244.316 30.9281 225.5858 30.9281 curveto
closepath
fill
-initclip
+grestore
} def
%
/vec81 {
@@ -19087,6 +19118,7 @@ newpath
61.2625 28.8199 53.3564 27.9064 53.3564 27.9064 curveto
closepath
fill
+gsave
0 -0.6171 moveto 175.6075 -0.6171 lineto 175.6075 44.7373 lineto 0 44.7373 lineto closepath clip newpath
175.4774 24.3667 moveto
156.7008 24.3667 133.5029 30.7154 129.0451 31.9942 curveto
@@ -19179,7 +19211,7 @@ closepath
161.629 22.6539 158.6145 22.2657 158.6145 22.2657 curveto
closepath
fill
-initclip
+grestore
114.3449 22.4027 moveto
114.3449 15.8941 122.2465 16.8076 122.2465 16.8076 curveto
122.2465 16.8076 117.1379 17.7439 117.1379 22.4027 curveto
@@ -19441,6 +19473,7 @@ fill
251.9152 20.4811 250.848 21.5529 249.5304 21.5529 curveto
closepath
fill
+gsave
-0.0001 0 moveto 290.177 0 lineto 290.177 45.3543 lineto -0.0001 45.3543 lineto closepath clip newpath
222.2828 14.423 moveto
177.0438 14.423 lineto
@@ -19483,7 +19516,7 @@ fill
235.5571 11.4638 232.6807 14.4696 222.2828 14.423 curveto
closepath
fill
-initclip
+grestore
201.5326 26.5975 moveto
202.912 26.5975 204.0293 27.5528 204.0293 28.7528 curveto
204.0293 29.9411 202.912 30.9081 201.5326 30.9081 curveto
@@ -19859,6 +19892,7 @@ fill
207.0141 10.6501 207.5649 12.4454 210.0581 12.3914 curveto
closepath
fill
+gsave
-0.0054 0 moveto 453.538 0 lineto 453.538 16.9671 lineto -0.0054 16.9671 lineto closepath clip newpath
347.0996 9.3137 moveto
336.4018 9.1247 330.4947 10.2316 330.4947 10.2316 curveto
@@ -19939,7 +19973,7 @@ closepath
320.5353 11.1495 319.7955 8.9357 319.7955 8.9357 curveto
closepath
fill
-initclip
+grestore
} def
%
/vec87 {
@@ -21935,6 +21969,7 @@ fill
1 setlinejoin
%\pst@setColor
newpath
+gsave
0 0 moveto
29.024 0 lineto
29.024 30.0212 lineto
@@ -21978,7 +22013,7 @@ newpath
-0.0449 0.0407 4.034 -0.5536 8.1819 2.8 curveto
12.3299 6.1536 11.8224 12.0344 10.2788 15.1284 curveto
fill
-initclip
+grestore
} def
%
/vec101 {
@@ -22049,6 +22084,7 @@ newpath
22.2471 13.7955 21.2875 20.1475 21.2875 20.1475 curveto
8.5295 19.1298 0 29.5526 0 29.5526 curveto
fill
+gsave
0 0 moveto
132.0381 0 lineto
132.0381 29.5526 lineto
@@ -22120,7 +22156,7 @@ newpath
110.3429 26.199 121.9302 23.8426 132.0805 29.5526 curveto
132.0805 29.5526 123.5524 19.1298 110.795 20.1475 curveto
fill
-initclip
+grestore
} def
%
/vec102 {
@@ -22483,6 +22519,7 @@ fill
21.2735 3.6593 21.0522 4.7664 21.0522 4.7664 curveto
closepath
fill
+gsave
0 0 moveto
42.2788 0 lineto
42.2788 29.5803 lineto
@@ -22499,7 +22536,7 @@ newpath
38.2354 19.6104 lineto
closepath
fill
-initclip
+grestore
37.8407 20.3494 moveto
37.5449 20.0543 36.6099 20.0045 36.6099 20.0045 curveto
36.6099 20.0045 36.2165 20.2012 36.6597 20.3494 curveto
@@ -22778,6 +22815,7 @@ fill
18.2745 18.2665 21.3269 19.4481 23.0495 21.3674 curveto
24.7734 23.288 25.856 25.3063 27.0874 25.0113 curveto
fill
+gsave
0 0 moveto
44.3231 0 lineto
44.3231 29.3443 lineto
@@ -22803,7 +22841,7 @@ newpath
3.2585 16.839 3.6027 17.9708 5.2269 18.119 curveto
6.8518 18.2665 7.8866 17.035 7.8866 16.7407 curveto
fill
-initclip
+grestore
38.1652 8.6654 moveto
39.1003 7.4838 40.8727 5.2196 39.7409 2.7573 curveto
39.7409 2.7573 38.2137 3.2505 38.2137 4.1356 curveto
@@ -24838,6 +24876,7 @@ fill
14.0101 14.8426 14.379 15.8029 14.379 15.8029 curveto
14.2321 17.2796 12.7548 16.9852 12.7548 16.9852 curveto
fill
+gsave
0 0 moveto
14.5959 0 lineto
14.5959 58.7097 lineto
@@ -24868,7 +24907,7 @@ newpath
9.5794 51.9159 10.6866 50.7349 10.6866 50.7349 curveto
11.0554 52.9499 9.6539 53.3195 9.6539 53.3195 curveto
fill
-initclip
+grestore
11.9426 25.4771 moveto
11.3505 24.5181 11.5725 27.324 11.5725 27.7672 curveto
11.5725 27.7672 12.5321 26.4381 11.9426 25.4771 curveto
@@ -27124,6 +27163,7 @@ fill
37.1716 16.8424 35.5468 18.8601 35.4976 19.5506 curveto
35.4491 20.2384 37.1218 20.683 38.5008 17.9742 curveto
fill
+gsave
0 0 moveto
58.3299 0 lineto
58.3299 58.8013 lineto
@@ -28008,7 +28048,7 @@ closepath
56.0283 48.8443 57.604 51.9466 57.8499 53.3242 curveto
58.0958 54.7026 57.0617 54.7026 57.0617 54.7026 curveto
fill
-initclip
+grestore
} def
%
/vec125 {
@@ -29856,6 +29896,7 @@ fill
1 setlinejoin
%\pst@setColor
newpath
+gsave
0 0 moveto
14.9947 0 lineto
14.9947 14.5895 lineto
@@ -29895,7 +29936,7 @@ newpath
2.5383 14.8832 4.9015 13.2577 6.232 14.5895 curveto
closepath
fill
-initclip
+grestore
} def
%
/vec134 {
@@ -30305,6 +30346,7 @@ fill
35.1533 42.1628 34.3658 42.2584 35.1533 41.2749 curveto
35.9409 40.2913 35.5474 41.9647 35.5474 41.9647 curveto
fill
+gsave
0 0 moveto
72.2259 0 lineto
72.2259 44.1033 lineto
@@ -30344,7 +30386,7 @@ newpath
31.0177 14.8832 33.3809 13.2577 34.7094 14.5895 curveto
closepath
fill
-initclip
+grestore
} def
%
/vec137 {
@@ -30515,6 +30557,7 @@ fill
60.3313 44.164 64.4095 43.5766 68.5575 46.9302 curveto
72.7054 50.2838 72.1979 56.1646 70.655 59.2586 curveto
fill
+gsave
0 0 moveto
149.4304 0 lineto
149.4304 74.1551 lineto
@@ -30554,7 +30597,7 @@ newpath
69.942 14.8832 72.3059 13.2577 73.635 14.5895 curveto
closepath
fill
-initclip
+grestore
84.135 20.7708 moveto
84.135 30.8043 lineto
84.4369 29.7524 84.8303 28.5025 85.3043 26.8974 curveto
@@ -30789,6 +30832,7 @@ fill
1 setlinejoin
%\pst@setColor
newpath
+gsave
0 0 moveto
72.6685 0 lineto
72.6685 36.9041 lineto
@@ -30828,7 +30872,7 @@ newpath
31.2383 14.8899 33.6015 13.2643 34.9307 14.5893 curveto
closepath
fill
-initclip
+grestore
0 17.8405 moveto
0 17.8405 1.6966 16.9526 5.5386 17.697 curveto
9.3778 18.4347 13.8099 20.5725 17.354 21.3853 curveto
@@ -31626,6 +31670,7 @@ fill
1 setlinejoin
%\pst@setColor
newpath
+gsave
0 0 moveto
29.3778 0 lineto
29.3778 29.669 lineto
@@ -31671,7 +31716,7 @@ newpath
2.2695 17.4305 lineto
2.2695 17.4305 2.8603 18.5643 4.7311 18.9605 curveto
fill
-initclip
+grestore
1.5066 27.1293 moveto
1.5066 27.1293 0.9158 23.8099 4.8294 22.6282 curveto
8.7438 21.4466 11.5503 22.8468 13.8391 20.4084 curveto
@@ -32541,6 +32586,7 @@ newpath
22.7357 4.4259 27.6104 7.0897 29.9736 12.4035 curveto
32.3355 17.7242 27.6104 20.6748 23.7705 17.8676 curveto
fill
+gsave
0 0 moveto
30.6072 0 lineto
30.6072 29.4646 lineto
@@ -32583,7 +32629,7 @@ newpath
19.7858 18.5302 20.7461 19.2746 20.7461 19.2746 curveto
20.7461 19.2746 17.4485 18.6394 16.3891 21.713 curveto
fill
-initclip
+grestore
} def
%
/vec148 {
@@ -34800,6 +34846,7 @@ fill
17.3958 1.5588 15.5851 4.7833 15.1541 7.163 curveto
closepath
fill
+gsave
0 0 moveto
44.2485 0 lineto
44.2485 28.6995 lineto
@@ -34997,13 +35044,14 @@ closepath
8.7884 1.1798 7.6068 1.3765 7.4101 0.983 curveto
7.2134 0.5889 6.8931 0.3431 6.8931 0.3431 curveto
fill
-initclip
+grestore
} def
%
/vec162 {
1 setlinejoin
%\pst@setColor
newpath
+gsave
0 0 moveto
29.5524 0 lineto
29.5524 43.5304 lineto
@@ -35147,7 +35195,7 @@ closepath
16.2946 1.1351 15.6724 0.2267 14.9757 0.0354 curveto
14.9757 0.0354 14.9129 0.015 14.833 0.0013 curveto
fill
-initclip
+grestore
10.8783 31.174 moveto
10.8783 31.174 8.9639 32.9362 8.2207 34.193 curveto
7.479 35.4497 7.158 35.5453 6.2154 35.7434 curveto
@@ -36315,6 +36363,7 @@ fill
1 setlinejoin
%\pst@setColor
newpath
+gsave
0 0 moveto
28.5297 0 lineto
28.5297 42.0613 lineto
@@ -36371,7 +36420,7 @@ newpath
14.0833 42.0613 lineto
closepath
fill
-initclip
+grestore
14.1223 25.6465 moveto
14.2794 6.4777 lineto
14.2794 6.4777 13.7288 -0.4508 18.2948 0.0219 curveto
@@ -37876,6 +37925,7 @@ fill
1 setlinejoin
%\pst@setColor
newpath
+gsave
0 0 moveto
44.0288 0 lineto
44.0288 28.7904 lineto
@@ -37892,7 +37942,7 @@ newpath
43.2227 28.2988 42.039 28.4456 40.115 27.4108 curveto
closepath
fill
-initclip
+grestore
24.6556 11.8081 moveto
24.6556 11.8081 27.2367 12.1639 27.8911 13.3216 curveto
28.5434 14.478 25.8441 14.8939 24.6556 11.8081 curveto
@@ -39313,6 +39363,7 @@ fill
61.058 23.2492 61.8332 28.0215 66.3288 29.4873 curveto
70.5157 30.8547 77.9468 28.1185 79.75 25.9868 curveto
fill
+gsave
0 0 moveto
89.8566 0 lineto
89.8566 90.3472 lineto
@@ -39392,7 +39443,8 @@ newpath
65.0283 45.9828 60.7943 48.0503 58.3327 45.1953 curveto
55.8698 42.3396 58.6264 37.9082 60.7943 37.0216 curveto
fill
-initclip
+grestore
+gsave
0 0 moveto
89.8566 0 lineto
89.8566 90.3472 lineto
@@ -39472,7 +39524,7 @@ newpath
44.3651 23.3778 42.2976 27.6118 45.1533 30.0727 curveto
48.009 32.5349 52.4404 29.7783 53.3269 27.6104 curveto
fill
-initclip
+grestore
} def
%
/vec196 {
diff --git a/graphics/pstricks/contrib/pst-vectorian/psvectorian.sty b/graphics/pstricks/contrib/pst-vectorian/latex/psvectorian.sty
index dfe50f7282..5b514720dd 100644
--- a/graphics/pstricks/contrib/pst-vectorian/psvectorian.sty
+++ b/graphics/pstricks/contrib/pst-vectorian/latex/psvectorian.sty
@@ -1,6 +1,6 @@
-% psvectorian.sty 0.4 du 12/12/2012
+% psvectorian.sty 0.41 du 09/06/2021
%% ------------------------------------------------
-%% Copyright (C) 2010-2012 Fradin Patrick
+%% Copyright (C) 2010-2021 Fradin Patrick
%% Adaptation à pst-xkey par Herbert Voss
%% Utilisation de psvectorian.pro conseillée par Herbert Voss
%% ------------------------------------------------
@@ -19,7 +19,7 @@
%
\NeedsTeXFormat{LaTeX2e}%
\RequirePackage{graphicx,pstricks}%
-\ProvidesPackage{psvectorian}[2012/12/12 v0.4 vector ornaments]%
+\ProvidesPackage{psvectorian}[2021/09/06 v0.41 vector ornaments]%
%
\pst@addfams{psvectorian}%% Herbert V.
\pstheader{psvectorian.pro}%% Herbert V.
diff --git a/graphics/pstricks/contrib/pst-vectorian/psvectorian.pdf b/graphics/pstricks/contrib/pst-vectorian/psvectorian.pdf
deleted file mode 100644
index 2f8e36385b..0000000000
--- a/graphics/pstricks/contrib/pst-vectorian/psvectorian.pdf
+++ /dev/null
Binary files differ