summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-10-30 19:35:21 +0000
committerKarl Berry <karl@freefriends.org>2023-10-30 19:35:21 +0000
commit91118aaa15a65f174f37e70744ff7f34ade614ae (patch)
tree5613ca822ba426a41c3a1b4a96959309546eaeea
parent8222f84ad8947e7f1ce907aaa186c938502f06c5 (diff)
pstricks (30oct23)
git-svn-id: svn://tug.org/texlive/trunk@68705 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/README10
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news23.pdfbin97884 -> 98838 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news23.tex3
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/test-pst.pdfbin189902 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/test-pst.tex257
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex4
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pstricks.sty23
7 files changed, 31 insertions, 266 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/README b/Master/texmf-dist/doc/generic/pstricks/README
index 1fd4da8c3dc..cb3dc0071f7 100644
--- a/Master/texmf-dist/doc/generic/pstricks/README
+++ b/Master/texmf-dist/doc/generic/pstricks/README
@@ -1,4 +1,4 @@
-PSTricks 2022
+PSTricks 2023
This package may be distributed under the terms of the LaTeX Project
Public License, as described in lppl.txt in the base LaTeX distribution.
@@ -113,8 +113,12 @@ pdf graphic files.
See documentation for more informations.
+6 - Running lualatex with luapstricks.lua
+Works in nearly all cases and make more sense than using auto-pst-pdf-lua.
+However, it can be slow for heavy calculations.
-6 - Documentation
+
+7 - Documentation
-------------
There is a mailing list devoted to discussions on PSTricks usage.
The informations to subscribe to this list and to consult the archives can
@@ -122,4 +126,4 @@ be found on the Web page.
--
-Denis Girou, Sebastian Rahtz and Herbert Voss (updated August 2021)
+Denis Girou, Sebastian Rahtz and Herbert Voss (updated August 2023)
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news23.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news23.pdf
index f3ea94ee0e7..9df95b74b7b 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news23.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news23.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news23.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news23.tex
index d72471253af..0dfc437b462 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news23.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news23.tex
@@ -30,6 +30,9 @@
%--------------------------------------------------------------------------------------
\section{\texttt{pstricks.sty}}
%--------------------------------------------------------------------------------------
+With \LuaLaTeX\ the package now tries to detect if the command \Lcs{DocumentMetadata} is
+needed. If yes, than it is defined as \Verb|\DocumentMetadata{}|.
+
%--------------------------------------------------------------------------------------
\section{\texttt{pstricks.tex} (v. 3.19 -- 2023/04/30)}
diff --git a/Master/texmf-dist/doc/generic/pstricks/test-pst.pdf b/Master/texmf-dist/doc/generic/pstricks/test-pst.pdf
deleted file mode 100644
index 2ac2bd0199a..00000000000
--- a/Master/texmf-dist/doc/generic/pstricks/test-pst.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pstricks/test-pst.tex b/Master/texmf-dist/doc/generic/pstricks/test-pst.tex
deleted file mode 100644
index 2af57b5daa6..00000000000
--- a/Master/texmf-dist/doc/generic/pstricks/test-pst.tex
+++ /dev/null
@@ -1,257 +0,0 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*- Mode: Latex -*- %%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% test-pst.tex --- Various PSTricks tests, from the PSTricks chapter
-%% of "The LaTeX Graphics Companion" (by Goossens, Rahtz,
-%% Mittelbach, Addison Wesley, 1997)
-%%
-%% Author : Sebastian RAHTZ (Oxford University - GB)
-%% <sebastian.rahtz@computing-services.oxford.ac.uk>
-%% Created the : Tue Feb 3 20:37:47 1998
-%% Last mod. by : Denis GIROU (CNRS/IDRIS - France) <Denis.Girou@idris.fr>
-%% Last mod. the : Wed May 5 20:09:18 1999
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\documentclass{article}
-
-\usepackage[latin1]{inputenc} % From LaTeX distribution
-\usepackage{calc} % From LaTeX distribution
-\usepackage{graphicx} % From LaTeX distribution
-\usepackage{ifthen} % From LaTeX distribution
-\usepackage{subfigure} % From CTAN/macros/latex/contrib/supported/subfigure
-\usepackage{pst-all} % From PSTricks
-\usepackage{pst-poly} % From pstricks/contrib/pst-poly
-\usepackage{multido} % From PSTricks
-\input{random.tex} % From CTAN/macros/generic
-
-% Take care that on some non Unix systems, you may have to replace
-% the / character by, for instance, the : one (\input{lgc:#2.inl}})
-\newcommand{\ExampleSubFigure}[2][0.3333]{%
-\subfigure[Example #2]{%
- \begin{minipage}[t]{#1\textwidth}
- \parbox[b]{\textwidth}{%
- \centering
- \input{lgc/#2.inl}}
- \end{minipage}}}
-
-\newpsobject{showgrid}{psgrid}{subgriddiv=1,griddots=10,gridlabels=6pt}
-
-% New colors defined
-\definecolor{brown}{rgb}{.65, .16, .16}
-\definecolor{lightblue}{rgb}{.68, .85, .9}
-\definecolor{palegreen}{rgb}{.6, .98, .6}
-\definecolor{pink}{rgb}{1, .75, .8}
-\definecolor{wheat}{rgb}{.96, .87, .7}
-
-% Layout changes
-\textheight=23cm
-\topmargin=-2cm
-\textwidth=16cm
-\oddsidemargin=0cm
-\evensidemargin=0cm
-
-\begin{document}
-
-\title{Test file for the PSTricks 97 distribution:\\
- most of the PSTricks examples of\\
- \emph{The \LaTeX{} Graphics Companion}}
-\author{Sebastian \textsc{Rahtz} --- March 1997}
-\date{Version 1.3 (September 9, 1998)}
-\maketitle
-
-\begin{figure}[!htbp]
- \centering
- \ExampleSubFigure{4-2-1}%
- \ExampleSubFigure{4-2-2}%
- \ExampleSubFigure{4-2-3}
- \ExampleSubFigure{4-2-4}%
- \ExampleSubFigure{4-2-5}
- \caption{Section 2}
-\end{figure}
-
-\begin{figure}[!htbp]
- \centering
- \ExampleSubFigure{4-3-1}%
- \ExampleSubFigure{4-3-2}
- \caption{Section 3}
-\end{figure}
-
-\clearpage
-\begin{figure}[!htbp]
- \centering
- \ExampleSubFigure{4-4-1}%
- \ExampleSubFigure{4-4-2}%
- \ExampleSubFigure{4-4-3}
- \ExampleSubFigure{4-4-4}%
- \ExampleSubFigure{4-4-5}%
- \ExampleSubFigure{4-4-6}
- \ExampleSubFigure{4-4-7}%
- \ExampleSubFigure{4-4-8}%
- \ExampleSubFigure{4-4-9}
- \ExampleSubFigure{4-4-10}%
- \ExampleSubFigure{4-4-11}%
- \ExampleSubFigure{4-4-12}
- \caption{Section 4}
-\end{figure}
-
-\clearpage
-\begin{figure}[!htbp]
- \centering
- \ExampleSubFigure[0.5]{4-5-1}%
- \ExampleSubFigure[0.5]{4-5-2}
- \ExampleSubFigure[0.75]{4-5-3}%
- \ExampleSubFigure[0.25]{4-5-4}
- \ExampleSubFigure[0.15]{4-5-5}%
- \ExampleSubFigure[0.25]{4-5-6}%
- \ExampleSubFigure[0.2]{4-5-7}%
- \ExampleSubFigure[0.2]{4-5-8}%
- \ExampleSubFigure[0.2]{4-5-9}
- \ExampleSubFigure[0.5]{4-5-10}%
- \ExampleSubFigure[0.5]{4-5-11}
- \caption{Section 5-A}
-\end{figure}
-
-\clearpage
-\begin{figure}[!htbp]
- \centering
- \ExampleSubFigure[1]{4-5-13}
- \ExampleSubFigure[1]{4-5-14}
- \ExampleSubFigure[1]{4-5-16}
- \caption{Section 5-B}
-\end{figure}
-
-\clearpage
-\begin{figure}[!htbp]
- \centering
- \ExampleSubFigure{4-6-1}%
- \ExampleSubFigure{4-6-2}%
- \ExampleSubFigure{4-6-3}
- \ExampleSubFigure{4-6-4}%
- \ExampleSubFigure{4-6-5}%
- \ExampleSubFigure{4-6-6}
- \ExampleSubFigure{4-6-7}%
- \ExampleSubFigure{4-6-8}%
- \ExampleSubFigure{4-6-9}
- \ExampleSubFigure{4-6-10}%
- \ExampleSubFigure{4-6-11}%
- \ExampleSubFigure{4-6-12}
- \ExampleSubFigure{4-6-13}%
- \ExampleSubFigure{4-6-14}%
- \ExampleSubFigure{4-6-15}
- \ExampleSubFigure{4-6-16}%
- \ExampleSubFigure{4-6-17}%
- \ExampleSubFigure{4-6-18}
- \caption{Section 6-A}
-\end{figure}
-
-\clearpage
-\begin{figure}[!htbp]
- \centering
- \ExampleSubFigure{4-6-19}%
- \ExampleSubFigure{4-6-20}%
- \ExampleSubFigure{4-6-21}
- \ExampleSubFigure{4-6-22}%
- \ExampleSubFigure{4-6-23}%
- \ExampleSubFigure{4-6-24}
- \ExampleSubFigure{4-6-25}
- \caption{Section 6-B}
-\end{figure}
-
-\begin{figure}[!htbp]
- \centering
- \ExampleSubFigure[1]{4-6-26}
- \ExampleSubFigure{4-6-27}%
- \ExampleSubFigure{4-6-28}%
- \ExampleSubFigure{4-6-29}
- \ExampleSubFigure[0.3333]{4-6-30}%
- \ExampleSubFigure[0.6667]{4-6-31}
- \ExampleSubFigure[1]{4-6-32}
- \caption{Section 6-C}
-\end{figure}
-
-\clearpage
-\begin{figure}[!htbp]
- \centering
- \ExampleSubFigure[1]{4-6-33}
- \ExampleSubFigure[0.5]{4-6-34}%
- \ExampleSubFigure[0.5]{4-6-35}
- \ExampleSubFigure[0.5]{4-6-36}%
- \ExampleSubFigure[0.5]{4-6-37}
- \caption{Section 6-D}
-\end{figure}
-
-\clearpage
-\begin{figure}[!htbp]
- \centering
- \ExampleSubFigure[1]{4-6-38}
- \ExampleSubFigure[1]{4-6-39}
- \ExampleSubFigure[0.5]{4-6-40}%
- \ExampleSubFigure[0.5]{4-6-41}
- \caption{Section 6-E}
-\end{figure}
-
-\clearpage
-\begin{figure}[!htbp]
- \centering
- \ExampleSubFigure[0.5]{4-6-42}%
- \ExampleSubFigure[0.5]{4-6-43}
- \ExampleSubFigure{4-6-44}%
- \ExampleSubFigure{4-6-45}%
- \ExampleSubFigure{4-6-46}
- \caption{Section 6-F}
-\end{figure}
-
-\clearpage
-\begin{figure}[!htbp]
- \centering
- \ExampleSubFigure[1]{4-7-1}
- \ExampleSubFigure[1]{4-7-2}
- \ExampleSubFigure[1]{4-7-4}
- \caption{Section 7}
-\end{figure}
-
-\clearpage
-\begin{figure}[!htbp]
- \centering
- \ExampleSubFigure[0.5]{4-8-1}%
- \ExampleSubFigure[0.25]{4-8-2}%
- \ExampleSubFigure[0.25]{4-8-3}
- \ExampleSubFigure[1]{4-8-4}
- \caption{Section 8-A}
-\end{figure}
-
-\clearpage
-\begin{figure}[!htbp]
- \centering
- \ExampleSubFigure[1]{4-8-5}
- \caption{Section 8-B}
-\end{figure}
-
-\begin{figure}[!htbp]
- \centering
- \ExampleSubFigure[0.5]{4-9-1}%
- \ExampleSubFigure[0.5]{4-9-2}
- \caption{Section 9}
-\end{figure}
-
-\clearpage
-\begin{figure}[!htbp]
- \centering
- \ExampleSubFigure[0.4]{4-10-1}%
- \ExampleSubFigure[0.2]{4-10-2}%
- \ExampleSubFigure[0.2]{4-10-3}%
- \ExampleSubFigure[0.2]{4-10-4}
- \ExampleSubFigure[0.4]{4-10-5}%
- \ExampleSubFigure[0.2]{4-10-6}%
- \ExampleSubFigure[0.4]{4-10-7}
- \caption{Section 10-A}
-\end{figure}
-
-\clearpage
-\begin{figure}[!htbp]
- \centering
- \ExampleSubFigure[1]{4-10-8}
- \ExampleSubFigure[1]{4-10-9}
- \ExampleSubFigure[1]{4-10-10}
- \caption{Section 10-B}
-\end{figure}
-
-\end{document}
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 2252c6bb12e..34a8898279b 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -88,8 +88,8 @@
\let\pgfforeach\foreach
%
-\def\fileversion{3.19}
-\def\filedate{2023/04/30}
+\def\fileversion{3.19a}
+\def\filedate{2023/10/30}
\pst@addfams{pstricks}
%
%\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{}
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
index 93a02ea1621..407ecae7b58 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
@@ -1,4 +1,4 @@
-% $Id: pstricks.sty 645 2022-10-25 04:57:20Z herbert $
+% $Id: pstricks.sty 792 2023-10-30 17:30:03Z herbert $
%%
%% This is file `pstricks.sty'.
%%
@@ -8,7 +8,7 @@
%% pstcol.sty Copyright (C) 1994-1996 1999 David Carlisle
%% pstricks.sty Copyright (C) 2004- Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
%% Herbert Voss <hvoss@tug.org>
-%% 2019-current Herbert Voss <hvoss@tug.org>
+%% 2019- Herbert Voss <hvoss@tug.org>
%%
%% This package may be distributed under the terms of the LaTeX Project
%% Public License, as described in lppl.txt in the base LaTeX distribution.
@@ -17,8 +17,7 @@
\NeedsTeXFormat{LaTeX2e}
-
-\ProvidesPackage{pstricks}[2022/19/23 v0.72 LaTeX wrapper for `PSTricks' (RN,HV)]
+\ProvidesPackage{pstricks}[2023/10/05 v0.73 LaTeX wrapper for `PSTricks' (RN,HV)]
%
\def\documentclass{%
\edef\@tempa{\jobname.tex }%
@@ -45,6 +44,7 @@
\newif\if@check@engine \@check@enginetrue
\newif\ifpst@xetex \pst@xetexfalse
\newif\ifpst@autopdf \pst@autopdffalse
+\newif\ifpst@metadata \pst@metadatatrue
\DeclareOption{useCalc}{\pst@useCalctrue}
\DeclareOption{gsfonts}{\pstGSfontstrue}
@@ -52,6 +52,7 @@
\DeclareOption{noEngineCheck}{\@check@enginefalse}
\DeclareOption{pdf}{\global\pst@autopdftrue}
\DeclareOption{xetex}{\global\pst@xetextrue}
+\DeclareOption{nometadata}{\global\pst@metadatafalse}
%
%---------------------------------DISTILLER --------------------------------
\newif\ifpst@distiller\pst@distillerfalse
@@ -85,6 +86,20 @@
\DeclareOption*{\PassOptionsToPackage\CurrentOption{\pst@ColorPackage}}
\ProcessOptions\relax
+\let\pgfutil@protected\protected
+\let\pgfutil@unexpanded\unexpanded
+
+\ifpst@metadata
+ \ifluatex
+ \@ifclassloaded{beamer}{}{% do not execute \DocumentMetadata
+% \RequirePackage{pdfmanagement-testphase}
+ \typeout{>>>Setting Metadata ... }%
+ \DocumentMetadata{}%
+ \makeatletter
+ }
+ \fi
+\fi
+
\ifpst@useCalc
\RequirePackage{pst-calculate}
\fi