summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/pstricks
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-06-11 21:09:12 +0000
committerKarl Berry <karl@freefriends.org>2020-06-11 21:09:12 +0000
commita1a946ff7eceabb8096d4bec23510234a240af84 (patch)
tree0b15fbfd33a5371a3f1778cf5e7e06c70a621629 /Master/texmf-dist/tex/latex/pstricks
parentdb3622d54b18c9315619271b5b916549f82ae093 (diff)
pstricks (11jun20)
git-svn-id: svn://tug.org/texlive/trunk@55515 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/pstricks')
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pst-platform.sty142
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty105
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pstricks.sty23
3 files changed, 54 insertions, 216 deletions
diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty b/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty
deleted file mode 100644
index 08af2b1c3a2..00000000000
--- a/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty
+++ /dev/null
@@ -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@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@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/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty
index db3be75a186..bbed5743017 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/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 <hvoss@tug.org>
+%% pstricks-pdf.sty Copyright (C) 2020 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.
%% 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/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
index 4c84dde2182..eca5930bae4 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 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@gmx.de>
%% Herbert Voss <hvoss@tug.org>
-%% 2019- Herbert Voss <hvoss@tug.org>
+%% 2019-current 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,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'.