texlive[55515] Master/texmf-dist: pstricks (11jun20)
commits+karl at tug.org
commits+karl at tug.org
Thu Jun 11 23:09:12 CEST 2020
Revision: 55515
http://tug.org/svn/texlive?view=revision&revision=55515
Author: karl
Date: 2020-06-11 23:09:12 +0200 (Thu, 11 Jun 2020)
Log Message:
-----------
pstricks (11jun20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/pstricks/pst-news20.pdf
trunk/Master/texmf-dist/doc/generic/pstricks/pst-news20.tex
trunk/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
trunk/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty
trunk/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
Removed Paths:
-------------
trunk/Master/texmf-dist/dvips/pstricks/pstricks-fonts-lm.pro
trunk/Master/texmf-dist/dvips/pstricks/pstricks-fonts-ps.pro
trunk/Master/texmf-dist/dvips/pstricks/pstricks-fonts-urw.pro
trunk/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty
Modified: trunk/Master/texmf-dist/doc/generic/pstricks/pst-news20.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/pstricks/pst-news20.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pstricks/pst-news20.tex 2020-06-11 13:21:26 UTC (rev 55514)
+++ trunk/Master/texmf-dist/doc/generic/pstricks/pst-news20.tex 2020-06-11 21:09:12 UTC (rev 55515)
@@ -1,41 +1,30 @@
-%% $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}
%--------------------------------------------------------------------------------------
@@ -42,14 +31,63 @@
\section{\texttt{pstricks.sty} -- \texttt{pstricks-pdf.sty}}
%--------------------------------------------------------------------------------------
+With the package \texttt{pstricks-pdf} you can now use
+
+\begin{verbatim}
+pdflatex --shell-escape <file>
+\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,10 +95,20 @@
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 @@
The function \texttt{Grid} supports GridDX and GridDY.
+
\nocite{*}
\printbibliography
-\printindex
-
\end{document}
Deleted: trunk/Master/texmf-dist/dvips/pstricks/pstricks-fonts-lm.pro
===================================================================
--- trunk/Master/texmf-dist/dvips/pstricks/pstricks-fonts-lm.pro 2020-06-11 13:21:26 UTC (rev 55514)
+++ trunk/Master/texmf-dist/dvips/pstricks/pstricks-fonts-lm.pro 2020-06-11 21:09:12 UTC (rev 55515)
@@ -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
-
Deleted: trunk/Master/texmf-dist/dvips/pstricks/pstricks-fonts-ps.pro
===================================================================
--- trunk/Master/texmf-dist/dvips/pstricks/pstricks-fonts-ps.pro 2020-06-11 13:21:26 UTC (rev 55514)
+++ trunk/Master/texmf-dist/dvips/pstricks/pstricks-fonts-ps.pro 2020-06-11 21:09:12 UTC (rev 55515)
@@ -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
Deleted: trunk/Master/texmf-dist/dvips/pstricks/pstricks-fonts-urw.pro
===================================================================
--- trunk/Master/texmf-dist/dvips/pstricks/pstricks-fonts-urw.pro 2020-06-11 13:21:26 UTC (rev 55514)
+++ trunk/Master/texmf-dist/dvips/pstricks/pstricks-fonts-urw.pro 2020-06-11 21:09:12 UTC (rev 55515)
@@ -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
Modified: trunk/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pstricks/pstricks.tex 2020-06-11 13:21:26 UTC (rev 55514)
+++ trunk/Master/texmf-dist/tex/generic/pstricks/pstricks.tex 2020-06-11 21:09:12 UTC (rev 55515)
@@ -2906,8 +2906,8 @@
\addto at pscode{
/xGridOffset \psk at xgridoffset\space def
/yGridOffset \psk at ygridoffset\space def
- /GridDX \psk at xgridDX\space def
- /GridDY \psk at ygridDY\space def
+ /GridDX \psk at xgridDX def
+ /GridDY \psk at ygridDY def
gsave
\tx at setStrokeTransparency
\psk at subgridwidth SLW
@@ -2926,6 +2926,8 @@
gsave
/xGridOffset \psk at xgridoffset def
/yGridOffset \psk at ygridoffset def
+ /GridDX \psk at xgridDX def
+ /GridDY \psk at ygridDY def
\tx at setStrokeTransparency
\psk at gridwidth SLW
\pst at usecolor\psgridcolor
@@ -4485,7 +4487,6 @@
\newdimen\sh at wgridXunit
\newdimen\sh at wgridYunit
-\define at key[psset]{pstricks}{showgrid}[b]{\expandafter\pst@@showgrid#1!!\@nil}
\def\pst@@showgrid#1#2#3\@nil{% hv 20130403
\def\showgridp at s{0}%
\ifx#1b\showgridtrue\else% bottom
@@ -4498,9 +4499,11 @@
\sh at wgridXunit=\psxunit
\sh at wgridYunit=\psyunit
\fi
+}
-}
+\define at key[psset]{pstricks}{showgrid}[b]{\expandafter\pst@@showgrid#1!!\@nil}
\psset[pstricks]{showgrid=f}
+
\define at boolkey[psset]{pstricks}[Pst@]{pgffunctions}[true]{}
\psset[pstricks]{pgffunctions=false}
%
Deleted: trunk/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty 2020-06-11 13:21:26 UTC (rev 55514)
+++ trunk/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty 2020-06-11 21:09:12 UTC (rev 55515)
@@ -1,142 +0,0 @@
-% $Id: pst-platform.sty 4 2020-06-09 08:32:19Z herbert $
-%%
-%% This is file `pst-platform.sty',
-%%
-%% Copyright (C) 2017 Herbert Voß <hvoss at 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.
-%% 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 at file{\jobname.w18}
-\newif\if at ip@nix@
-\ifnum\pdf at 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 at 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 at nix@true")
- elseif os.type == "windows" then
- tex.sprint("windowstrue")
- end
- }\endcsname
-\else
- \IfFileExists{nul:}{\@ip at nix@false}{\@ip at nix@true}
- \IfFileExists{/dev/null}{\windowsfalse}{\windowstrue}
- \edef\ip at windows@echo at test{echo \string# > "\ip at file"}
- \def\ip at backupplan{%
- \IfFileExists{\ip at file}{%
- \PackageWarningNoLine{ifplatform}{^^J \space\space\space
- Please delete the file "\ip at file" and try again%
- }%
- \ip at cantdecide
- }{%
- \ShellEscape{\ip at windows@echo at test}%
- \IfFileExists{\ip at file}{%
- \ShellEscape{del "\ip at file"}%
- \windowstrue
- }{%
- \@ip at nix@true
- }%
- }%
- }
- \ifwindows
- \if at 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 at ip@nix@\else
- \ifshellescape
- \ip at backupplan
- \else
- \ip at cantdecide
- \fi
- \fi
- \fi
- \fi
- \def\ip at only@six#1#2#3#4#5#6#7\@nil{#1#2#3#4#5#6}
- \if at ip@nix@
- \ifshellescape
- \ifwindows\else
- \ShellEscape{uname -s > "\ip at file"}
- \CatchFileDef\@tempa{\ip at file}{}
- \ShellEscape{rm -- "\ip at file"}
- \edef\@tempa{\expandafter\zap at 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 at 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'.
Modified: trunk/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty 2020-06-11 13:21:26 UTC (rev 55514)
+++ trunk/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty 2020-06-11 21:09:12 UTC (rev 55515)
@@ -1,22 +1,24 @@
-% $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 <hvoss at tug.org>
+%% pstricks-pdf.sty Copyright (C) 2020 Herbert Voss <hvoss at 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.
%% 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}[2020/06/11 v0.01 creating pdf output (hv)]
+\RequirePackage{ifpdf,xkeyval,ifplatform}
-\ProvidesPackage{pstricks-pdf}[2017/03/17 v0.01 creating pdf output (HV)]
-%
-\RequirePackage{ifpdf,xkeyval,pst-platform,ifluatex,ifxetex}
-
\newif\if at app@off@
\newif\if at app@crop@
\newcounter{app at runs}
@@ -23,10 +25,6 @@
\def\app at suffix{autopp}
\edef\app at jobname{\jobname-\app at suffix}
\edef\app at pics{\jobname-pics.pdf}
-
-%%%
-% the following code is adapted from auto-pst-pdf
-%%%
\DeclareOptionX{off}[]{\@app at off@true}
\define at choicekey{pstricks-pdf.sty}{crop}[\@tempa\@tempb]{on,off}{%
\ifcase\@tempb\relax
@@ -48,7 +46,6 @@
#1}}
\DeclareOptionX{dvips}{\def\app at dvips@opts{#1}}
\DeclareOptionX{pspdf}{\def\app at pspdf@opts{#1}}
-\def\app at pdfcrop@opts{--hres}%%% hv 20130405
\DeclareOptionX{pdfcrop}{\def\app at pdfcrop@opts{#1}}
\DeclareOptionX{cleanup}{%
@@ -64,11 +61,7 @@
\c at 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 at off@true\fi
-%
+\ProcessOptionsX
+\def\app at exe{\immediate\write18}
\def\app at nl{^^J\space\space\space\space}
-\newcommand\app at PackageError[2]{\PackageError{pstricks-pdf}{\app at nl #1^^J}{#2}}
+\newcommand\app at PackageError[2]{%
+ \PackageError{pstricks-pdf}{\app at nl #1^^J}{#2}}
\newcommand\app at PackageWarning[1]{%
\PackageWarning{pstricks-pdf}{\app at nl #1^^JThis warning occured}}
\newcommand\app at PackageInfo[1]{\PackageInfo{pstricks-pdf}{#1}}
@@ -98,31 +89,22 @@
\newcommand\NotIfFileExists[2]{\IfFileExists{#1}{}{#2}}
\def\app at convert#1#2#3{%
\OnlyIfFileExists{#2}{%
-% \expandafter\typeout\expandafter{\csname app at cmd@#1\endcsname}%
- \typeout{filenameIN: #2}%
- \typeout{filenameOUT: #3}%
- \ShellEscape{\csname app at cmd@#1\endcsname{#2}{#3}}%
+ \app at exe{\csname app at cmd@#1\endcsname{#2}{#3}}%
\NotIfFileExists{#3}{\app at PackageWarning{Creation of #3 failed.}}}}
\def\app at compile{%
\app at cleanup
\app at remove@container
\loop\ifnum\c at app@runs > \@ne
- \app at convert{extralatex}{\jobname.\app at ext}{}%
+ \app at convert{extralatex}{\jobname.\app at ext}{\app at jobname.dvi}%
\advance\c at app@runs\m at ne
\repeat
- \app at convert{latex}{\jobname.\app at ext}{}%
- \ifxetex\else
- \app at convert{dvips}{\app at jobname.dvi}{\app at jobname.ps}%
- \fi
+ \app at convert{latex}{\jobname.\app at ext}{\app at jobname.dvi}%
+ \app at convert{dvips}{\app at jobname.dvi}{\app at jobname.ps}%
\if at app@crop@
- \ifxetex\else
- \app at convert{pstopdf}{\app at jobname.ps}{\app at jobname.pdf}%
- \fi
+ \app at convert{pstopdf}{\app at jobname.ps}{\app at jobname.pdf}%
\app at convert{pdfcrop}{\app at jobname.pdf}{\app at pics}%
\else
- \ifxetex\else
- \app at convert{pstopdf}{\app at jobname.ps}{\app at pics}%
- \fi
+ \app at convert{pstopdf}{\app at jobname.ps}{\app at pics}%
\fi
\IfFileExists{\app at pics}
{\app at cleanup}
@@ -131,31 +113,35 @@
\edef\app at rm{\ifwindows del \else rm -- \fi}
\newcommand\app at try@rm[1]{%
\@for\@tempa:=#1\do{%
- \OnlyIfFileExists{\@tempa}{\ShellEscape{\app at rm "\@tempa"}}}}
+ \OnlyIfFileExists{\@tempa}{\app at exe{\app at rm "\@tempa"}}}}
\def\app at remove@container{\app at try@rm{\app at pics}}
\def\app at cleanup{\app at try@rm{\app at rm@files}}
-\ifluatex
-% \def\app at cmd@latex#1#2{lualatex --output-format=dvi \app at latex@opts\space "\unexpanded{\let\APPmakepictures\empty\input} #1"}
-% \def\app at cmd@extralatex#1#2{lualatex --output-format=dvi \app at latex@opts\space "\unexpanded{\let\APPmakepictures\undefined\input} #1"}
- \def\app at cmd@latex#1#2{xelatex \app at latex@opts\space "\unexpanded{\AtBeginDocument{\pagestyle{empty}}\let\APPmakepictures\empty\input} #1"}
- \def\app at cmd@extralatex#1#2{xelatex \app at latex@opts\space "\unexpanded{\AtBeginDocument{\pagestyle{empty}}\let\APPmakepictures\undefined\input} #1"}
-\else
- \def\app at cmd@latex#1#2{latex \app at latex@opts\space "\unexpanded{\let\APPmakepictures\empty\input} #1"}
- \def\app at cmd@extralatex#1#2{\@app at prog\space \app at latex@opts\space "\unexpanded{\let\APPmakepictures\undefined\input} #1"}
- \def\app at cmd@dvips#1#2{dvips \app at dvips@opts\space -o "#2" "#1"}
- \def\app at cmd@pstopdf#1#2{ps2pdf \app at pspdf@opts\space "#1" "#2"}
-\fi
+\def\app at cmd@latex#1#2{latex \app at latex@opts\space
+ "\unexpanded{\let\APPmakepictures\empty\input} #1"}
+\def\app at cmd@extralatex#1#2{latex \app at latex@opts\space
+ "\unexpanded{\let\APPmakepictures\undefined\input} #1"}
+\def\app at cmd@dvips#1#2{dvips \app at dvips@opts\space -o "#2" "#1"}
+\def\app at cmd@pstopdf#1#2{ps2pdf \app at pspdf@opts\space "#1" "#2"}
\def\app at cmd@pdfcrop#1#2{pdfcrop \app at pdfcrop@opts\space "#1" "#2"}
\ifpdf
\if at app@off@\else
- \ShellEscape{echo " "}
- \ShellEscape{echo "-------------------------------------------------"}
- \ShellEscape{echo "pstricks-pdf: Auxiliary LaTeX compilation"}
- \ShellEscape{echo "-------------------------------------------------"}
+ \ifshellescape
+ \app at exe{echo " "}
+ \app at exe{echo "-------------------------------------------------"}
+ \app at exe{echo "pstricks-pdf: Auxiliary LaTeX compilation"}
+ \app at exe{echo "-------------------------------------------------"}
\app at compile
- \ShellEscape{echo "-------------------------------------------------"}
- \ShellEscape{echo "pstricks-pdf: End auxiliary LaTeX compilation"}
- \ShellEscape{echo "-------------------------------------------------"}
+ \app at exe{echo "-------------------------------------------------"}
+ \app at exe{echo "pstricks-pdf: End auxiliary LaTeX compilation"}
+ \app at exe{echo "-------------------------------------------------"}
+ \else
+ \app at PackageError{%
+ "shell escape" (or "write18") is not enabled:\app at nl
+ pstricks-pdf will not work!}
+ {You need to run LaTeX with the equivalent of
+ "pdflatex -shell-escape"\app at nl
+ Or turn off pstricks-pdf.}%
+ \fi
\fi
\if at app@crop@
\PassOptionsToPackage{notightpage}{pst-pdf}
@@ -170,10 +156,9 @@
\fi
\fi
\RequirePackage{pst-pdf}
-\RequirePackage{pstricks}
-\@ifclassloaded{beamer}{\setbeamertemplate{navigation symbols}}{}%
-%
\let\app at ig\includegraphics
-%
+
+\ifpdf\else\RequirePackage{pstricks}\fi
+
%%
%% End of file `pstricks-pdf.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pstricks/pstricks.sty 2020-06-11 13:21:26 UTC (rev 55514)
+++ trunk/Master/texmf-dist/tex/latex/pstricks/pstricks.sty 2020-06-11 21:09:12 UTC (rev 55515)
@@ -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 <Rolf.Niepraschk at gmx.de>
%% Herbert Voss <hvoss at tug.org>
-%% 2019- Herbert Voss <hvoss at tug.org>
+%% 2019-current Herbert Voss <hvoss at 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,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 at ColorPackage{xcolor}
\DeclareOption{noxcolor}{\def\pst at ColorPackage{color}}
%
@@ -41,10 +42,12 @@
\newif\ifpst at psfonts \pst at psfontsfalse
\newif\if at check@engine \@check at enginetrue
\newif\ifpst at xetex \pst at xetexfalse
+\newif\ifpst at autopdf \pst at autopdffalse
\DeclareOption{useCalc}{\pst at useCalctrue}
\DeclareOption{psfonts}{\pst at psfontstrue}
\DeclareOption{noEngineCheck}{\@check at enginefalse}
+\DeclareOption{pdf}{\global\pst at autopdftrue}
\DeclareOption{xetex}{\global\pst at xetextrue}
%
%---------------------------------DISTILLER --------------------------------
@@ -80,19 +83,10 @@
\ProcessOptions\relax
-\RequirePackage{iftex}
-\RequirePackage{shellesc}
+%\RequirePackage{iftex}
\ifpst at useCalc
\RequirePackage{pst-calculate}
\fi
-%\ifPDFTeX
-% \ifpdfshellescape\else
-% \@latex at 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 at 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'.
More information about the tex-live-commits
mailing list.