summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news18.pdfbin67433 -> 68179 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news18.tex6
-rw-r--r--Master/texmf-dist/dvips/pstricks/pstricks-fonts-lm.pro69
-rw-r--r--Master/texmf-dist/dvips/pstricks/pstricks-fonts-ps.pro32
-rw-r--r--Master/texmf-dist/dvips/pstricks/pstricks-fonts-urw.pro61
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def4
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex24
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pst-platform.sty142
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty179
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pstricks.sty10
10 files changed, 510 insertions, 17 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news18.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news18.pdf
index b0be347d0f0..48123340820 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news18.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news18.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news18.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news18.tex
index 74d1035fab2..1cf91b97cd0 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news18.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news18.tex
@@ -51,9 +51,13 @@ this new file.
%--------------------------------------------------------------------------------------
-\section{\texttt{pstricks.tex} (v. 2.81 -- 2018/01/01)}
+\section{\texttt{pstricks.tex} (v. 2.84 -- 2018/05/01)}
%--------------------------------------------------------------------------------------
+Use the \Lcs{long} definition for \Lcs{@fornoop} to be compatible to the latest
+chanegs in \LaTeX.
+
+
\subsection{PostScript Fonts}
This version of PSTricks uses the Ghostscript fonts from URW instead of the
diff --git a/Master/texmf-dist/dvips/pstricks/pstricks-fonts-lm.pro b/Master/texmf-dist/dvips/pstricks/pstricks-fonts-lm.pro
new file mode 100644
index 00000000000..5ab5e436dfd
--- /dev/null
+++ b/Master/texmf-dist/dvips/pstricks/pstricks-fonts-lm.pro
@@ -0,0 +1,69 @@
+% $Id: pstricks-fonts.pro 446 2017-04-19 11:40:55Z 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/Master/texmf-dist/dvips/pstricks/pstricks-fonts-ps.pro b/Master/texmf-dist/dvips/pstricks/pstricks-fonts-ps.pro
new file mode 100644
index 00000000000..da5cdb7a1ee
--- /dev/null
+++ b/Master/texmf-dist/dvips/pstricks/pstricks-fonts-ps.pro
@@ -0,0 +1,32 @@
+% $Id: pstricks-fonts.pro 446 2017-04-19 11:40:55Z 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/Master/texmf-dist/dvips/pstricks/pstricks-fonts-urw.pro b/Master/texmf-dist/dvips/pstricks/pstricks-fonts-urw.pro
new file mode 100644
index 00000000000..a0dd8bdda59
--- /dev/null
+++ b/Master/texmf-dist/dvips/pstricks/pstricks-fonts-urw.pro
@@ -0,0 +1,61 @@
+% $Id: pstricks-fonts.pro 446 2017-04-19 11:40:55Z 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/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def b/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def
index f711b7589f8..db8528d0317 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def
@@ -1,6 +1,6 @@
-%% $Id: pstricks-tex.def 617 2017-10-04 16:16:21Z herbert $
+%% $Id: pstricks-tex.def 704 2018-01-06 09:50:33Z herbert $
%% pstricks-tex.def
-%% Copyright 2017 Herbert Voss
+%% Copyright 2017- Herbert Voss
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 8232b1a2872..2471de42665 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -1,4 +1,4 @@
-%% $Id: pstricks.tex 702 2018-01-06 08:43:54Z herbert $
+%% $Id: pstricks.tex 726 2018-02-05 13:52:25Z herbert $
%% pstricks.tex
%% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu.
%% COPYRIGHT 2000-2003 by Denis Girou.
@@ -36,7 +36,9 @@
\expandafter\ifx\csname @latexerr\endcsname\relax % do we have TeX? then @latexerr isn't defined
\input pstricks-tex.def
\fi
-%
+
+\let\ifpstUndefined\@ifundefined
+
%\catcode`\@=\PstAtCode\relax
\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey.tex \fi
\ifx\PSTFPloaded\endinput\else\input pst-fp.tex\fi
@@ -78,8 +80,8 @@
\fi
\let\pgfforeach\foreach
%
-\def\fileversion{2.82}
-\def\filedate{2018/01/06}
+\def\fileversion{2.84}
+\def\filedate{2018/05/01}
\pst@addfams{pstricks}
%
%\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{}
@@ -87,7 +89,7 @@
%
% stolen from latex.ltx to make it TeX compatible
\newcount\psLoopIndex
-\def\@fornoop#1\@@#2#3{}
+\long\def\@fornoop#1\@@#2#3{}
\long\def\@for#1:=#2\do#3{%
\pst@cntm=0
\expandafter\def\expandafter\@fortmp\expandafter{#2}%
@@ -3810,10 +3812,10 @@ pop
\def\pswedge{\def\pst@par{}\pst@object{pswedge}}
\def\pswedge@i{\@ifnextchar({\pswedge@ii}{\pswedge@ii(0,0)}}
\def\pswedge@ii(#1)#2#3#4{%
- \begin@ClosedObj%
+ \begin@ClosedObj
\pssetlength\pst@dimc{#2}%
- \pst@getangle{#3}\pst@tempa%
- \pst@getangle{#4}\pst@tempb%
+ \pst@getangle{#3}\pst@tempa
+ \pst@getangle{#4}\pst@tempb
\pst@@getcoor{#1}%
\def\pst@linetype{1}%
\addto@pscode{
@@ -3822,13 +3824,12 @@ pop
2 copy
moveto
\ifPst@SpecialLength \pst@SpecialLength \else \pst@number\pst@dimc \fi
-% \pst@number\pst@dimc
\psk@dimen CLW mul sub % Adjusted radius
\pst@tempa \pst@tempb
arc
closepath}%
- \showpointsfalse%
- \end@ClosedObj%
+ \showpointsfalse
+ \end@ClosedObj
}
\def\tx@ellipse#1{ \ifx\psk@rot\@empty 0 \else \psk@rot \fi #1 Ellipse }
\def\tx@Ellipse{ \ifx\psk@rot\@empty 0 \else \psk@rot \fi Ellipse }
@@ -4328,6 +4329,7 @@ pop
\newif\ifshowgrid
\newdimen\sh@wgridXunit
\newdimen\sh@wgridYunit
+
\define@key[psset]{pstricks}{showgrid}[b]{\expandafter\pst@@showgrid#1!!\@nil}
\def\pst@@showgrid#1#2#3\@nil{% hv 20130403
\def\showgridp@s{0}%
diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty b/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty
new file mode 100644
index 00000000000..a1bde247b6b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty
@@ -0,0 +1,142 @@
+% $Id: pst-platform.sty 446 2017-04-19 11:40:55Z 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
new file mode 100644
index 00000000000..c363a62f801
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty
@@ -0,0 +1,179 @@
+% $Id: pstricks-pdf.sty 446 2017-04-19 11:40:55Z herbert $
+%%
+%% This is file `pstricks-pdf.sty'.
+%%
+%% IMPORTANT NOTICE:
+%%
+%% pstricks-pdf.sty Copyright (C) 2017 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.
+%%
+
+\NeedsTeXFormat{LaTeX2e}
+
+\ProvidesPackage{pstricks-pdf}[2017/03/17 v0.01 creating pdf output (HV)]
+%
+\RequirePackage{ifpdf,xkeyval,pst-platform,ifluatex,ifxetex}
+
+\newif\if@app@off@
+\newif\if@app@crop@
+\newcounter{app@runs}
+\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
+ \@app@crop@true
+ \or
+ \@app@crop@false
+ \fi}
+\DeclareOptionX{on}[]{\@app@off@false}
+\DeclareOptionX{ext}{\def\app@ext{#1}}
+\DeclareOptionX{latex}{%
+ \def\app@latex@opts{%
+ \ifwindows
+ -disable-write18
+ \else
+ -no-shell-escape
+ \fi
+ -jobname="\app@jobname"
+ -interaction=batchmode
+ #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}{%
+ \let\app@rm@files\@empty
+ \@for\@ii:=#1\do{%
+ \edef\app@rm@files{\app@rm@files,\app@jobname.\@ii}}}
+
+\DeclareOptionX{runs}{%
+ \setcounter{app@runs}{#1}% support calc
+ \ifnum\c@app@runs > \z@
+ \else
+ \app@PackageWarning{The number of runs must be at least one.}%
+ \c@app@runs\@ne
+ \fi}
+
+\DeclareOptionX*{%
+ \PassOptionsToPackage{prologue}{xcolor}% to get named colors into the ps file
+ \PassOptionsToPackage\CurrentOption{pstricks}%
+ \PassOptionsToPackage\CurrentOption{pst-pdf}%
+}
+
+\ExecuteOptionsX{%
+ ext=tex,
+ crop=on,
+ latex={},
+ dvips={-Ppdf},
+ pdfcrop={},
+ cleanup={log,aux,dvi,ps,pdf},
+ runs=1
+}
+\ifwindows
+ \ExecuteOptionsX{pspdf={}}
+\else
+ \ExecuteOptionsX{pspdf={-dAutoRotatePages=/None}}
+\fi
+%
+\ProcessOptionsX\relax
+%
+\ifxetex\@app@off@true\fi
+%
+\def\app@nl{^^J\space\space\space\space}
+\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}}
+\newcommand\OnlyIfFileExists[2]{\IfFileExists{#1}{#2}{}}
+\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}}%
+ \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}{}%
+ \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
+ \if@app@crop@
+ \ifxetex\else
+ \app@convert{pstopdf}{\app@jobname.ps}{\app@jobname.pdf}%
+ \fi
+ \app@convert{pdfcrop}{\app@jobname.pdf}{\app@pics}%
+ \else
+ \ifxetex\else
+ \app@convert{pstopdf}{\app@jobname.ps}{\app@pics}%
+ \fi
+ \fi
+ \IfFileExists{\app@pics}
+ {\app@cleanup}
+ {\app@PackageWarning{Could not create \app@pics.
+ Auxiliary files not deleted.}}}
+\edef\app@rm{\ifwindows del \else rm -- \fi}
+\newcommand\app@try@rm[1]{%
+ \@for\@tempa:=#1\do{%
+ \OnlyIfFileExists{\@tempa}{\ShellEscape{\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@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 "-------------------------------------------------"}
+ \app@compile
+ \ShellEscape{echo "-------------------------------------------------"}
+ \ShellEscape{echo "pstricks-pdf: End auxiliary LaTeX compilation"}
+ \ShellEscape{echo "-------------------------------------------------"}
+ \fi
+ \if@app@crop@
+ \PassOptionsToPackage{notightpage}{pst-pdf}
+ \fi
+\else
+ \ifx\APPmakepictures\@undefined
+ \PassOptionsToPackage{inactive}{pst-pdf}
+ \else
+ \if@app@crop@
+ \PassOptionsToPackage{notightpage}{pst-pdf}
+ \fi
+ \fi
+\fi
+\RequirePackage{pst-pdf}
+\RequirePackage{pstricks}
+\@ifclassloaded{beamer}{\setbeamertemplate{navigation symbols}}{}%
+%
+\let\app@ig\includegraphics
+%
+%%
+%% 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 bebc8480004..7d928352b04 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 680 2017-12-05 12:22:55Z herbert $
+% $Id: pstricks.sty 704 2018-01-06 09:50:33Z herbert $
%%
%% This is file `pstricks.sty'.
%%
@@ -50,23 +50,27 @@
%---------------------------------COLOR --------------------------------
\DeclareOption{monochrome}{%
\AtBeginDocument{\special{ps:
+ true setglobal globaldict begin
/setrgbcolor { add add 0 gt {1}{0} ifelse setgray } def
/setcmykcolor{ 4 dict begin
/k ED /y ED /m ED /c ED
1 1 k sub c mul k add sub 0.29 mul
1 1 k sub m mul k add sub 0.587 mul add
1 1 k sub y mul k add sub 0.114 mul add
- end 0 gt {1}{0} ifelse setgray } def }}}
+ end 0 gt {1}{0} ifelse setgray } def
+ end false setglobal }}}
\DeclareOption{grayscale}{%
\AtBeginDocument{\special{ps:
+ true setglobal globaldict begin
/setrgbcolor { 0.07 mul exch 0.71 mul add exch 0.21 mul add setgray } def
/setcmykcolor{ 4 dict begin
/k ED /y ED /m ED /c ED
1 1 k sub c mul k add sub 0.29 mul
1 1 k sub m mul k add sub 0.587 mul add
1 1 k sub y mul k add sub 0.114 mul add
- end setgray } def }}}
+ end setgray } def
+ end false setglobal }}}
\DeclareOption*{\PassOptionsToPackage\CurrentOption{\pst@ColorPackage}}
\ProcessOptions\relax
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-08 07:07:46 +0000