From c2fde990c352049f8aa6bc9629fee95bad518cde Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 12 Jun 2020 03:02:39 +0000 Subject: CTAN sync 202006120302 --- graphics/pstricks/base/Changes | 7 +- graphics/pstricks/base/doc/pst-news20.pdf | Bin 39952 -> 56052 bytes graphics/pstricks/base/doc/pst-news20.tex | 107 +++++++++++----- graphics/pstricks/base/dvips/pstricks-fonts-lm.pro | 69 ---------- graphics/pstricks/base/dvips/pstricks-fonts-ps.pro | 32 ----- .../pstricks/base/dvips/pstricks-fonts-urw.pro | 61 --------- graphics/pstricks/base/generic/pstricks.tex | 11 +- graphics/pstricks/base/latex/pst-platform.sty | 142 --------------------- graphics/pstricks/base/latex/pstricks-pdf.sty | 105 +++++++-------- graphics/pstricks/base/latex/pstricks.sty | 23 ++-- 10 files changed, 144 insertions(+), 413 deletions(-) delete mode 100644 graphics/pstricks/base/dvips/pstricks-fonts-lm.pro delete mode 100644 graphics/pstricks/base/dvips/pstricks-fonts-ps.pro delete mode 100644 graphics/pstricks/base/dvips/pstricks-fonts-urw.pro delete mode 100644 graphics/pstricks/base/latex/pst-platform.sty (limited to 'graphics') diff --git a/graphics/pstricks/base/Changes b/graphics/pstricks/base/Changes index a79536fa9e..816f1fe0e8 100644 --- a/graphics/pstricks/base/Changes +++ b/graphics/pstricks/base/Changes @@ -1,4 +1,4 @@ -% $Id: Changes 4 2020-06-09 08:32:19Z herbert $ +% $Id: Changes 6 2020-06-10 18:50:14Z herbert $ Changelog for @@ -25,6 +25,7 @@ pstricks.tex -------- versions like 2.47a have only changes in other files, but not in this main package. +3.00 2020-06-11 - added package pstricks-pdf for using auto-pst-pdf 2.99 2020-06-09 - added two optional arguments for \psgrid: griddx and griddy 2.97 2019-05-11 - fix for trailing space with \pscustom 2.96 2019-02-23 - use \ifx\pgfkeysloaded\relax for the test @@ -276,6 +277,9 @@ in this main package. 1.06 2005-02-24 fix spurious blank in doublestroke (hv) +pstricks-pdf.sty -------------(hv) +0.01 2020-06-11 - first CTAN version + pst-fp.tex ----------- (hv) @@ -418,6 +422,7 @@ Version 97 patch 3, 98/06/01 pstricks.sty -------- +0.70 2020-06-11 - added optional argument xetex 0.69 2018-12-22 - added optional argument xetex 0.68 2018-02-08 - make grayscale and monochrome option use the global dictionary diff --git a/graphics/pstricks/base/doc/pst-news20.pdf b/graphics/pstricks/base/doc/pst-news20.pdf index fb73a7c29c..c3bdd08629 100644 Binary files a/graphics/pstricks/base/doc/pst-news20.pdf and b/graphics/pstricks/base/doc/pst-news20.pdf differ diff --git a/graphics/pstricks/base/doc/pst-news20.tex b/graphics/pstricks/base/doc/pst-news20.tex index b304d4b798..cf75126c9d 100644 --- a/graphics/pstricks/base/doc/pst-news20.tex +++ b/graphics/pstricks/base/doc/pst-news20.tex @@ -1,55 +1,93 @@ -%% $Id: pst-news20.tex 4 2020-06-09 08:32:19Z herbert $ -\PassOptionsToPackage{useCalc}{pstricks} +%% $Id: pst-news20.tex 6 2020-06-10 18:50:14Z herbert $ \documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, - headinclude=false,footinclude=false,twoside]{pst-doc} + headinclude=false,footinclude=false,twoside]{scrartcl} + \listfiles -\let\Lfile\LFile -\usepackage{pstricks} -\let\pstnodeFV\fileversion -\let\pstnodeFD\filedate -\usepackage{pst-node} -\usepackage{pst-plot} -\usepackage{pst-solides3d} -\usepackage{pst-node} -\usepackage{pst-calculate} +\usepackage[T1]{fontenc} +\usepackage{listings} +\lstset{basicstyle=\ttfamily\small} +\usepackage{libertinus} +\usepackage[scaled=0.88]{beramono} +\usepackage{babel} +\usepackage[svgnames,dvipsnames,x11names]{pstricks-pdf} \usepackage{pstricks-add} -\usepackage{xkvview} -\renewcommand\bgImage{\psscalebox{15}{\color{blue!20}\the\year}} -\def\textat{\char064} -\usepackage{dtk-logos} + \usepackage{biblatex} \addbibresource{PSTricks.bib} - -\lstset{explpreset={width=-99pt,overhang=0pt,hsep=\columnsep,vsep=\bigskipamount,rframe={}}, - escapechar=?} +\def\Lcs#1{\texttt{\textbackslash#1}} \begin{document} -%\psset{PstDebug=1} -\title{\texttt{News -- \the\year}\\ \Large new macros and bugfixes for the -basic package \nxLFile{pstricks}} +\title{\texttt{News -- \the\year}\\ \Large new macros and bugfixes for the basic package.} \author{Herbert Voß} \date{\today} \maketitle -\clearpage \tableofcontents -\clearpage \part{\texttt{pstricks} -- package} %-------------------------------------------------------------------------------------- \section{\texttt{pstricks.sty} -- \texttt{pstricks-pdf.sty}} %-------------------------------------------------------------------------------------- +With the package \texttt{pstricks-pdf} you can now use + +\begin{verbatim} +pdflatex --shell-escape +\end{verbatim} + +This document was created this way. Remember that you have to use the environment \texttt{postscript} +if you do not use the environment \texttt{pspicture} or a lot of PS-code outside this environment: + +\begin{lstlisting} +\begin{postscript} +\pstVerb{/LL 1 def /RR 140 def /CCmy 6 def /RsqC RR dup mul 1000 div CCmy mul 1000 div def +/omegam LL RR div 1000 mul RR div CCmy div 1000 mul 1 sub sqrt RR mul 3 sqrt div LL div def +/phiomegafunc {/omega exch def LL RsqC sub omega CCmy mul 1000 div omega mul 1000 div + LL mul LL mul sub omega mul dup 0 ge {RR atan}{RR atan 360 sub} ifelse} def +/phimax omegam phiomegafunc def} +\begin{center} +\begin{psgraph}[axesstyle=frame,yAxisLabel=$\varphi$,xAxisLabel=$\omega$/Hz, + yticksize=0 16cm,xticksize=-90 + 90,subticksize=1,Dy=20,Dx=100,xsubticks=2](0,0)(0,-90)(800,90){16cm}{8cm} +\psplot[linecolor=Blue1,plotpoints=200,linewidth=2pt]{0}{800}{x phiomegafunc} +\uput{0pt}[0](10,75){$R=$\psPrintValue{RR}\hspace{2em}$\Omega$} +\uput{0pt}[0](10,65){$C=$\psPrintValue{CCmy}\hspace{0.75em}$\mu$F} +\uput{0pt}[0](10,55){$L=\psPrintValue{LL}\hspace{0.75em}\text{H}$} +\pscircle*[linecolor=Red1](!omegam phimax){2pt} +\end{psgraph} +\end{center} +\end{postscript} +\end{lstlisting} + +\resizebox{\linewidth}{!}{% +\begin{postscript} +\pstVerb{/LL 1 def /RR 140 def /CCmy 6 def /RsqC RR dup mul 1000 div CCmy mul 1000 div def /omegam +LL RR div 1000 mul RR div CCmy div 1000 mul 1 sub sqrt RR mul 3 sqrt div LL div def /phiomegafunc +{/omega exch def LL RsqC sub omega CCmy mul 1000 div omega mul 1000 div LL mul LL mul sub omega mul +dup 0 ge {RR atan}{RR atan 360 sub} ifelse} def /phimax omegam phiomegafunc def} +\begin{psgraph}[axesstyle=frame,yAxisLabel=$\varphi$,xAxisLabel=$\omega$/Hz, + yticksize=0 16cm,xticksize=-90 + 90,subticksize=1,Dy=20,Dx=100,xsubticks=2](0,0)(0,-90)(800,90){16cm}{8cm} +\psplot[linecolor=Blue1,plotpoints=200,linewidth=2pt]{0}{800}{x phiomegafunc} +\uput*{0pt}[0](10,75){$R=$\psPrintValue{RR}\hspace{2em}$\Omega$} +\uput*{0pt}[0](10,65){$C=$\psPrintValue{CCmy}\hspace{0.75em}$\mu$F} +\uput*{0pt}[0](10,55){$L=\psPrintValue{LL}\hspace{0.75em}\text{H}$} +\psdot[linecolor=Red1](!omegam phimax) +\end{psgraph} +\end{postscript}% +} + +(Example by Poul Riis) %-------------------------------------------------------------------------------------- \section{\texttt{pstricks.tex} (v. 2.99 -- 2020/06/09)} %-------------------------------------------------------------------------------------- -New optional arguments \Lkeyword{griddx} and \Lkeyword{griddy}, which are only valid +New optional arguments \texttt{griddx} and \texttt{griddy}, which are only valid for \Lcs{psgrid}: -\begin{LTXexample}[pos=t,vsep=10mm] +\begin{lstlisting}[basicstyle=\small\ttfamily] \psset{unit=5mm} \newpsstyle{gridstyle}{gridlabels=8pt, gridfont=Helvetica, gridcolor=red, subgridcolor=gray, subgriddiv=5, gridwidth=.8pt, subgridwidth=.4pt, @@ -57,9 +95,19 @@ for \Lcs{psgrid}: griddx=5, griddy=2 } \begin{pspicture}[showgrid](25,25) \end{pspicture} -\end{LTXexample} +\end{lstlisting} -\newpage + +\bigskip +\begin{postscript} +\psset{unit=5mm} +\newpsstyle{gridstyle}{gridlabels=8pt, gridfont=Helvetica, gridcolor=red, + subgridcolor=gray, subgriddiv=5, gridwidth=.8pt, subgridwidth=.4pt, + griddots=10, subgriddots=5, + griddx=5, griddy=2 } +\begin{pspicture}[showgrid](25,25) +\end{pspicture} +\end{postscript} %-------------------------------------------------------------------------------------- \section{\texttt{pstricks.pro}} @@ -67,11 +115,10 @@ for \Lcs{psgrid}: The function \texttt{Grid} supports GridDX and GridDY. + \nocite{*} \printbibliography -\printindex - \end{document} 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 -%% -%% This package may be distributed under the terms of the LaTeX Project -%% Public License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1.0 or, at your option, any later version. -%% -\ProvidesPackage{pst-platform} - [2017/03/17 v0.01 Testing for the operating system, patch for luatex] -\RequirePackage{shellesc,pdftexcmds,catchfile,ifluatex} -%% -% The following code is from ifplatform.sty, it fixes a bug with lualatex -%% -\newif\ifshellescape -\newif\ifwindows -\newif\ifmacosx -\newif\iflinux -\newif\ifcygwin -\newcommand\windowsname{Windows} -\newcommand\notwindowsname{*NIX} -\newcommand\linuxname{Linux} -\newcommand\macosxname{Mac\,OS\,X} -\newcommand\cygwinname{Cygwin} -\newcommand\unknownplatform{[Unknown]} -\edef\ip@file{\jobname.w18} -\newif\if@ip@nix@ -\ifnum\pdf@shellescape=1\relax - \shellescapetrue -\else - \ifluatex\else - \PackageWarningNoLine{ifplatform}{^^J \space\space\space - shell escape is disabled, - so I can only detect \@backslashchar ifwindows% - } - \fi -\fi -\def\ip@cantdecide{% - \PackageWarningNoLine{ifplatform}{^^J \space\space\space - I can't tell if this is Windows or *nix; - you appear to be both% - }% -} -\ifluatex - \csname\directlua{ - if os.type == "unix" then - tex.sprint("@ip@nix@true") - elseif os.type == "windows" then - tex.sprint("windowstrue") - end - }\endcsname -\else - \IfFileExists{nul:}{\@ip@nix@false}{\@ip@nix@true} - \IfFileExists{/dev/null}{\windowsfalse}{\windowstrue} - \edef\ip@windows@echo@test{echo \string# > "\ip@file"} - \def\ip@backupplan{% - \IfFileExists{\ip@file}{% - \PackageWarningNoLine{ifplatform}{^^J \space\space\space - Please delete the file "\ip@file" and try again% - }% - \ip@cantdecide - }{% - \ShellEscape{\ip@windows@echo@test}% - \IfFileExists{\ip@file}{% - \ShellEscape{del "\ip@file"}% - \windowstrue - }{% - \@ip@nix@true - }% - }% - } - \ifwindows - \if@ip@nix@ - \PackageWarningNoLine{ifplatform}{^^J \space\space\space - I can't tell if this is Windows or *nix; - you appear to be neither% - } - \fi - \else - \if@ip@nix@\else - \ifshellescape - \ip@backupplan - \else - \ip@cantdecide - \fi - \fi - \fi - \fi - \def\ip@only@six#1#2#3#4#5#6#7\@nil{#1#2#3#4#5#6} - \if@ip@nix@ - \ifshellescape - \ifwindows\else - \ShellEscape{uname -s > "\ip@file"} - \CatchFileDef\@tempa{\ip@file}{} - \ShellEscape{rm -- "\ip@file"} - \edef\@tempa{\expandafter\zap@space\@tempa\@empty} - \def\@tempb{Linux} - \ifx\@tempa\@tempb - \linuxtrue - \else - \def\@tempb{Darwin} - \ifx\@tempa\@tempb - \macosxtrue - \else - \def\@tempb{CYGWIN} - \edef\@tempc{\expandafter\ip@only@six\@tempa------\@nil} - \ifx\@tempb\@tempc - \cygwintrue - \else - \edef\unknownplatform{\@tempa} - \fi - \fi - \fi - \fi -\fi\fi -\edef\platformname{% - \ifwindows - \noexpand\windowsname - \else - \ifshellescape - \iflinux - \noexpand\linuxname - \else - \ifmacosx - \noexpand\macosxname - \else - \ifcygwin - \noexpand\cygwinname - \else - \noexpand\unknownplatform - \fi - \fi - \fi - \else - \noexpand\notwindowsname - \fi - \fi -} -%% -%% End of file `pst-platform.sty'. diff --git a/graphics/pstricks/base/latex/pstricks-pdf.sty b/graphics/pstricks/base/latex/pstricks-pdf.sty index db3be75a18..bbed574301 100644 --- a/graphics/pstricks/base/latex/pstricks-pdf.sty +++ b/graphics/pstricks/base/latex/pstricks-pdf.sty @@ -1,21 +1,23 @@ -% $Id: pstricks-pdf.sty 4 2020-06-09 08:32:19Z herbert $ +% $Id: pstricks-pdf.sty 6 2020-06-10 18:50:14Z herbert $ %% %% This is file `pstricks-pdf.sty'. %% %% IMPORTANT NOTICE: %% -%% pstricks-pdf.sty Copyright (C) 2017 Herbert Voss +%% pstricks-pdf.sty Copyright (C) 2020 Herbert Voss %% %% This package may be distributed under the terms of the LaTeX Project %% Public License, as described in lppl.txt in the base LaTeX distribution. %% Either version 1.0 or, at your option, any later version. %% +%% +%% This code is more or less exactly the same as for auto-pst-pdf from +%% Will Robertson +%% \NeedsTeXFormat{LaTeX2e} - -\ProvidesPackage{pstricks-pdf}[2017/03/17 v0.01 creating pdf output (HV)] -% -\RequirePackage{ifpdf,xkeyval,pst-platform,ifluatex,ifxetex} +\ProvidesPackage{pstricks-pdf}[2020/06/11 v0.01 creating pdf output (hv)] +\RequirePackage{ifpdf,xkeyval,ifplatform} \newif\if@app@off@ \newif\if@app@crop@ @@ -23,10 +25,6 @@ \def\app@suffix{autopp} \edef\app@jobname{\jobname-\app@suffix} \edef\app@pics{\jobname-pics.pdf} - -%%% -% the following code is adapted from auto-pst-pdf -%%% \DeclareOptionX{off}[]{\@app@off@true} \define@choicekey{pstricks-pdf.sty}{crop}[\@tempa\@tempb]{on,off}{% \ifcase\@tempb\relax @@ -48,7 +46,6 @@ #1}} \DeclareOptionX{dvips}{\def\app@dvips@opts{#1}} \DeclareOptionX{pspdf}{\def\app@pspdf@opts{#1}} -\def\app@pdfcrop@opts{--hres}%%% hv 20130405 \DeclareOptionX{pdfcrop}{\def\app@pdfcrop@opts{#1}} \DeclareOptionX{cleanup}{% @@ -64,11 +61,7 @@ \c@app@runs\@ne \fi} -\DeclareOptionX*{% - \PassOptionsToPackage{prologue}{xcolor}% to get named colors into the ps file - \PassOptionsToPackage\CurrentOption{pstricks}% - \PassOptionsToPackage\CurrentOption{pst-pdf}% -} +\DeclareOptionX*{\PassOptionsToPackage{\CurrentOption}{pst-pdf}\PassOptionsToPackage{\CurrentOption}{pstricks}} \ExecuteOptionsX{% ext=tex, @@ -84,13 +77,11 @@ \else \ExecuteOptionsX{pspdf={-dAutoRotatePages=/None}} \fi -% -\ProcessOptionsX\relax -% -\ifxetex\@app@off@true\fi -% +\ProcessOptionsX +\def\app@exe{\immediate\write18} \def\app@nl{^^J\space\space\space\space} -\newcommand\app@PackageError[2]{\PackageError{pstricks-pdf}{\app@nl #1^^J}{#2}} +\newcommand\app@PackageError[2]{% + \PackageError{pstricks-pdf}{\app@nl #1^^J}{#2}} \newcommand\app@PackageWarning[1]{% \PackageWarning{pstricks-pdf}{\app@nl #1^^JThis warning occured}} \newcommand\app@PackageInfo[1]{\PackageInfo{pstricks-pdf}{#1}} @@ -98,31 +89,22 @@ \newcommand\NotIfFileExists[2]{\IfFileExists{#1}{}{#2}} \def\app@convert#1#2#3{% \OnlyIfFileExists{#2}{% -% \expandafter\typeout\expandafter{\csname app@cmd@#1\endcsname}% - \typeout{filenameIN: #2}% - \typeout{filenameOUT: #3}% - \ShellEscape{\csname app@cmd@#1\endcsname{#2}{#3}}% + \app@exe{\csname app@cmd@#1\endcsname{#2}{#3}}% \NotIfFileExists{#3}{\app@PackageWarning{Creation of #3 failed.}}}} \def\app@compile{% \app@cleanup \app@remove@container \loop\ifnum\c@app@runs > \@ne - \app@convert{extralatex}{\jobname.\app@ext}{}% + \app@convert{extralatex}{\jobname.\app@ext}{\app@jobname.dvi}% \advance\c@app@runs\m@ne \repeat - \app@convert{latex}{\jobname.\app@ext}{}% - \ifxetex\else - \app@convert{dvips}{\app@jobname.dvi}{\app@jobname.ps}% - \fi + \app@convert{latex}{\jobname.\app@ext}{\app@jobname.dvi}% + \app@convert{dvips}{\app@jobname.dvi}{\app@jobname.ps}% \if@app@crop@ - \ifxetex\else - \app@convert{pstopdf}{\app@jobname.ps}{\app@jobname.pdf}% - \fi + \app@convert{pstopdf}{\app@jobname.ps}{\app@jobname.pdf}% \app@convert{pdfcrop}{\app@jobname.pdf}{\app@pics}% \else - \ifxetex\else - \app@convert{pstopdf}{\app@jobname.ps}{\app@pics}% - \fi + \app@convert{pstopdf}{\app@jobname.ps}{\app@pics}% \fi \IfFileExists{\app@pics} {\app@cleanup} @@ -131,31 +113,35 @@ \edef\app@rm{\ifwindows del \else rm -- \fi} \newcommand\app@try@rm[1]{% \@for\@tempa:=#1\do{% - \OnlyIfFileExists{\@tempa}{\ShellEscape{\app@rm "\@tempa"}}}} + \OnlyIfFileExists{\@tempa}{\app@exe{\app@rm "\@tempa"}}}} \def\app@remove@container{\app@try@rm{\app@pics}} \def\app@cleanup{\app@try@rm{\app@rm@files}} -\ifluatex -% \def\app@cmd@latex#1#2{lualatex --output-format=dvi \app@latex@opts\space "\unexpanded{\let\APPmakepictures\empty\input} #1"} -% \def\app@cmd@extralatex#1#2{lualatex --output-format=dvi \app@latex@opts\space "\unexpanded{\let\APPmakepictures\undefined\input} #1"} - \def\app@cmd@latex#1#2{xelatex \app@latex@opts\space "\unexpanded{\AtBeginDocument{\pagestyle{empty}}\let\APPmakepictures\empty\input} #1"} - \def\app@cmd@extralatex#1#2{xelatex \app@latex@opts\space "\unexpanded{\AtBeginDocument{\pagestyle{empty}}\let\APPmakepictures\undefined\input} #1"} -\else - \def\app@cmd@latex#1#2{latex \app@latex@opts\space "\unexpanded{\let\APPmakepictures\empty\input} #1"} - \def\app@cmd@extralatex#1#2{\@app@prog\space \app@latex@opts\space "\unexpanded{\let\APPmakepictures\undefined\input} #1"} - \def\app@cmd@dvips#1#2{dvips \app@dvips@opts\space -o "#2" "#1"} - \def\app@cmd@pstopdf#1#2{ps2pdf \app@pspdf@opts\space "#1" "#2"} -\fi +\def\app@cmd@latex#1#2{latex \app@latex@opts\space + "\unexpanded{\let\APPmakepictures\empty\input} #1"} +\def\app@cmd@extralatex#1#2{latex \app@latex@opts\space + "\unexpanded{\let\APPmakepictures\undefined\input} #1"} +\def\app@cmd@dvips#1#2{dvips \app@dvips@opts\space -o "#2" "#1"} +\def\app@cmd@pstopdf#1#2{ps2pdf \app@pspdf@opts\space "#1" "#2"} \def\app@cmd@pdfcrop#1#2{pdfcrop \app@pdfcrop@opts\space "#1" "#2"} \ifpdf \if@app@off@\else - \ShellEscape{echo " "} - \ShellEscape{echo "-------------------------------------------------"} - \ShellEscape{echo "pstricks-pdf: Auxiliary LaTeX compilation"} - \ShellEscape{echo "-------------------------------------------------"} + \ifshellescape + \app@exe{echo " "} + \app@exe{echo "-------------------------------------------------"} + \app@exe{echo "pstricks-pdf: Auxiliary LaTeX compilation"} + \app@exe{echo "-------------------------------------------------"} \app@compile - \ShellEscape{echo "-------------------------------------------------"} - \ShellEscape{echo "pstricks-pdf: End auxiliary LaTeX compilation"} - \ShellEscape{echo "-------------------------------------------------"} + \app@exe{echo "-------------------------------------------------"} + \app@exe{echo "pstricks-pdf: End auxiliary LaTeX compilation"} + \app@exe{echo "-------------------------------------------------"} + \else + \app@PackageError{% + "shell escape" (or "write18") is not enabled:\app@nl + pstricks-pdf will not work!} + {You need to run LaTeX with the equivalent of + "pdflatex -shell-escape"\app@nl + Or turn off pstricks-pdf.}% + \fi \fi \if@app@crop@ \PassOptionsToPackage{notightpage}{pst-pdf} @@ -170,10 +156,9 @@ \fi \fi \RequirePackage{pst-pdf} -\RequirePackage{pstricks} -\@ifclassloaded{beamer}{\setbeamertemplate{navigation symbols}}{}% -% \let\app@ig\includegraphics -% + +\ifpdf\else\RequirePackage{pstricks}\fi + %% %% End of file `pstricks-pdf.sty'. diff --git a/graphics/pstricks/base/latex/pstricks.sty b/graphics/pstricks/base/latex/pstricks.sty index 4c84dde218..eca5930bae 100644 --- a/graphics/pstricks/base/latex/pstricks.sty +++ b/graphics/pstricks/base/latex/pstricks.sty @@ -1,4 +1,4 @@ -% $Id: pstricks.sty 4 2020-06-09 08:32:19Z herbert $ +% $Id: pstricks.sty 6 2020-06-10 18:50:14Z 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 %% Herbert Voss -%% 2019- Herbert Voss +%% 2019-current Herbert Voss %% %% 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,7 +17,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{pstricks}[2018/12/21 v0.69 LaTeX wrapper for `PSTricks' (RN,HV)] +\ProvidesPackage{pstricks}[2020/06/11 v0.70 LaTeX wrapper for `PSTricks' (RN,HV)] % \def\documentclass{% \edef\@tempa{\jobname.tex }% @@ -34,6 +34,7 @@ \fi } % +\RequirePackage{iftex} \def\pst@ColorPackage{xcolor} \DeclareOption{noxcolor}{\def\pst@ColorPackage{color}} % @@ -41,10 +42,12 @@ \newif\ifpst@psfonts \pst@psfontsfalse \newif\if@check@engine \@check@enginetrue \newif\ifpst@xetex \pst@xetexfalse +\newif\ifpst@autopdf \pst@autopdffalse \DeclareOption{useCalc}{\pst@useCalctrue} \DeclareOption{psfonts}{\pst@psfontstrue} \DeclareOption{noEngineCheck}{\@check@enginefalse} +\DeclareOption{pdf}{\global\pst@autopdftrue} \DeclareOption{xetex}{\global\pst@xetextrue} % %---------------------------------DISTILLER -------------------------------- @@ -80,19 +83,10 @@ \ProcessOptions\relax -\RequirePackage{iftex} -\RequirePackage{shellesc} +%\RequirePackage{iftex} \ifpst@useCalc \RequirePackage{pst-calculate} \fi -%\ifPDFTeX -% \ifpdfshellescape\else -% \@latex@error -% {You are running `\jobname.tex' with pdflatex and without option `--shell-escape' ,\MessageBreak -% you need package auto-pst-pdf and that option!}% -% {Alternatively use xelatex or latex->dvips->ps2pdf} -% \fi -%\fi \RequirePackage{\pst@ColorPackage} % \@ifundefined{PSTricksLoaded} @@ -105,7 +99,7 @@ \ProvidesFile{pst-fp.tex}[\filedate\space v\fileversion\space `PST-fp' (hv)] \IfFileExists{pstricks.pro}{% \ProvidesFile{pstricks.pro} - [2018/11/14 v. 1.29, PostScript prologue file (hv)] + [2020/06/09 v. 1.31, PostScript prologue file (hv)] \@addtofilelist{pstricks.pro}}{}% \IfFileExists{pst-algparser.pro}{% \ProvidesFile{pst-algparser.pro}[2011/10/31 v. 0.04, PostScript prologue file (hv)] @@ -248,5 +242,6 @@ \typeout{>>> Loading XeTeX special macros}% \input{pstricks-xetex.def}% \fi +\endinput % %% End of file `pstricks.sty'. -- cgit v1.2.3