From 44376c98a6543220ca702536b7f618f7cc62168f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 23 Sep 2017 23:06:08 +0000 Subject: pstricks (23sep17) git-svn-id: svn://tug.org/texlive/trunk@45389 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/pstricks/pst-fp.tex | 21 ++- .../texmf-dist/tex/generic/pstricks/pstricks.tex | 113 ++++++------- Master/texmf-dist/tex/latex/pstricks/pst-doc.cls | 8 +- .../texmf-dist/tex/latex/pstricks/pst-platform.sty | 142 ++++++++++++++++ .../texmf-dist/tex/latex/pstricks/pstricks-pdf.sty | 179 +++++++++++++++++++++ Master/texmf-dist/tex/latex/pstricks/pstricks.sty | 64 +++----- 6 files changed, 402 insertions(+), 125 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/pstricks/pst-platform.sty create mode 100644 Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex b/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex index 2d4e748193a..2ea9cf11f4f 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex @@ -1,4 +1,4 @@ -%% $Id: pst-fp.tex 465 2017-05-22 17:50:57Z herbert $ +%% $Id: pst-fp.tex 446 2017-04-19 11:40:55Z herbert $ %% %% %% This is file `pst-fp.tex', @@ -121,12 +121,12 @@ \def\pstFP@swallow#1\relax{} % \def\ifpstFP@zero#1{% - \ifnum - \expandafter\ifnum\csname pstFP@#1ia\endcsname=0 0\else1\fi - \expandafter\ifnum\csname pstFP@#1ib\endcsname=0 0\else1\fi - \expandafter\ifnum\csname pstFP@#1fa\endcsname=0 0\else1\fi + \ifnum% + \expandafter\ifnum\csname pstFP@#1ia\endcsname=0 0\else1\fi% + \expandafter\ifnum\csname pstFP@#1ib\endcsname=0 0\else1\fi% + \expandafter\ifnum\csname pstFP@#1fa\endcsname=0 0\else1\fi% \expandafter\ifnum\csname pstFP@#1fb\endcsname=0 0\else1\fi% - =0\relax + =0\relax% } % %read value @@ -485,8 +485,7 @@ \fi% \global\let\pstFP@tmp\pstFP@tmp% }% -% \pstFPstripZeros\pstFP@tmp{#1}% - \let#1\pstFP@tmp + \let#1\pstFP@tmp% } @@ -582,8 +581,7 @@ \global\let\pstFP@tmp=\pstFP@tmp% % }% -% \pstFPstripZeros\pstFP@tmp{#1}% - \let#1\pstFP@tmp + \let#1\pstFP@tmp% } %multiply two values @@ -707,8 +705,7 @@ \else\typeout{pstFPmul: Overflow}\fi% \else\typeout{pstFPmul: Overflow}\fi% \global\let\pstFP@tmp\pstFP@tmp}% -% \pstFPstripZeros\pstFP@tmp{#1}% - \let#1\pstFP@tmp + \let#1\pstFP@tmp% } % \catcode`\@=\PstAtCode\relax diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index 6f2e964c58a..24722d45cbe 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -18,17 +18,14 @@ \csname PSTricksLoaded\endcsname \let\PSTricksLoaded\endinput % -%% !! loading additional TeX packages see line 105/140 !! -%% !! loading config file pstricks.con line 491 !! -%% !! loading pro files line 515 !! -%% !! fileversion and date see line 143 !! +%% !! loading additional TeX packages see line 112 !! +%% !! loading config file pstricks.con line 476 !! +%% !! loading pro files line 489 !! +%% !! fileversion and date see line 119 !! % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax % -\ifx\c@lor@to@ps\@undefined - \def\c@lor@to@ps{\PSTricks_Not_Configured_For_This_Format}% message for a pdflatex run -\fi \expandafter\ifx\csname @latexerr\endcsname\relax % do we have LaTeX? then it is false \newwrite\@unused \def\typeout#1{\immediate\write\@unused{#1}}% @@ -83,7 +80,7 @@ \else\ifx\@tempc\@tempe \let\@tempd\@tempa \else \let\@tempd\@tempb \fi \fi \@tempd% - }% + } \begingroup \def\:{\global\let\@sptoken= } \: \def\:{\@xifnch} \expandafter\gdef\: {\futurelet\@tempc\@ifnch} @@ -97,8 +94,7 @@ \expandafter\@fornoop \else #4\relax\expandafter\@tforloop\fi#2\@@#3{#4}} \long\def\@break@tfor#1\@@#2#3{\csname fi\endcsname\csname fi\endcsname} - %\ifx\pst@psfontstrue\@undefined \let\ifpst@psfonts\iffalse\fi % is defined in pstricks.sty -\fi +\fi% \catcode`\@=\PstAtCode\relax % % now we have all commands defined, for TeX and LaTeX @@ -136,19 +132,16 @@ \catcode`\@=\PstAtCode\relax \ifx\PSTFPloaded\endinput\else \input pst-fp.tex\fi % -\catcode`\@=11\relax \@ifundefined{pgfutil@empty}{\input pgfutil-common.tex}{} \@ifundefined{pgkeys@empty}{\input pgfkeys.code.tex}{} \@ifundefined{pgffor@emptyvalues}{\input pgffor.code.tex}{} \let\pgfforeach\foreach % -\def\fileversion{2.76} -\def\filedate{2017/09/17} +\def\fileversion{2.72b} +\def\filedate{2017/04/19} +\catcode`\@=11\relax \pst@addfams{pstricks} % -%\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{} -%\psset{useURWfonts} -% % stolen from latex.ltx to make it TeX compatible \newcount\psLoopIndex \def\@fornoop#1\@@#2#3{} @@ -631,7 +624,7 @@ \gdef\pslbrace[{ ] \gdef\psrbrace[} ] \endgroup -% + \pstVerb{ /pssetRGBcolor /setrgbcolor load def /pssetCMYKcolor /setcmykcolor load def @@ -642,8 +635,8 @@ %\expandafter\edef\csname color@#1\endcsname{#2}% \expandafter\edef\csname\string\color@#1\endcsname{#2}% hv 1.14 2005-12-17 \ignorespaces} -% -\def\pst@color#1{\def\pst@currentcolor{#1}\pstVerb{#1}\aftergroup\pst@endcolor}% +\def\pst@color#1{% + \def\pst@currentcolor{#1}\pstVerb{#1}\aftergroup\pst@endcolor}% \def\pst@endcolor{\pstVerb{\pst@currentcolor}} \def\pst@currentcolor{0 setgray} \def\altcolormode{% @@ -685,8 +678,8 @@ \def\pst@usecolor#1{\csname\string\color@#1\endcsname\space} % \def\newgray#1#2{% - \pst@checknum{#2}\pst@tempg - \@newcolor{#1}{\pst@tempg setgray}}% + \pst@checknum{#2}\pst@tempg + \@newcolor{#1}{\pst@tempg setgray}} \def\newrgbcolor#1#2{% \pst@expandafter\pst@getnumiii{#2} {} {} {} {}\@nil \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi setrgbcolor}} @@ -707,18 +700,6 @@ \newrgbcolor{yellow}{1 1 0} \newrgbcolor{cyan}{0 1 1} \newrgbcolor{magenta}{1 0 1} - -\@ifundefined{xglobal}% do we have xcolor loaded? - {\@newcolor{randomgray}{Rand setgray}% - \@newcolor{randomrgb}{Rand Rand Rand setrgbcolor}% - \@newcolor{randomcmyk}{Rand Rand Rand Rand setcmykcolor}% - \@newcolor{randomhsb}{Rand Rand Rand sethsbcolor}% - }{% - \definecolor[ps]{randomgray}{gray}{Rand}% - \definecolor[ps]{randomrgb}{rgb}{Rand Rand Rand}% - \definecolor[ps]{randomcmyk}{cmyk}{Rand Rand Rand Rand}% - \definecolor[ps]{randomhsb}{hsb}{Rand Rand Rand}% - } % \define@boolkey[psset]{pstricks}[Pst@]{draft}[true]{} \define@key[psset]{pstricks}{bgcolor}{\def\pst@bgcolor{#1}}% background for pspicture @@ -851,12 +832,10 @@ \def\@degrees[#1]{% \pst@checknum{#1}\pst@tempg \edef\pst@angleunit{360 \pst@tempg div mul }% - \pstVerb{tx@Dict begin startGlobal /pst@angleunit {\pst@angleunit} def endGlobal end}% \ignorespaces} % -\def\radians{\def\pst@angleunit{57.2956 mul }}% -\def\pst@angleunit{}% -\pstVerb{tx@Dict begin startGlobal /pst@angleunit {\pst@angleunit} def endGlobal end}% +\def\radians{\def\pst@angleunit{57.2956 mul }} +\def\pst@angleunit{} % \def\SpecialCoor{% \def\pst@@getcoor##1{% @@ -1090,16 +1069,18 @@ \fi\fi} % \def\special@length#1#2\@nil#3{% + \psDEBUG[special@length]{ #1|#2|#3 }% \ifx !#1\relax \edef\pst@SpecialLength{ #2 \pst@number\psunit mul }% - \Pst@SpecialLengthtrue + \Pst@SpecialLengthtrue% + \psDEBUG[special@length]{ Special length: \pst@SpecialLength}% \else \let\@psunit\psunit \afterassignment\pstunit@off - #3 #1#2\@psunit - \Pst@SpecialLengthfalse - \fi -} + #3 #1#2\@psunit% + \Pst@SpecialLengthfalse% + \psDEBUG[special@length]{ Normal length: \the#3 }% + \fi} % \def\Cartesian{% \def\cartesian@coor##1,##2,##3\@nil{% @@ -1124,14 +1105,14 @@ \def\psk@origin{} % \define@boolkey[psset]{pstricks}[Pst@]{algebraic}[true]{} -\psset{algebraic=false} +\psset%[pstricks] +{algebraic=false} % -\define@boolkey[psset]{pstricks}[]{swapaxes}[true]{% \if@pst +\define@boolkey[psset]{pstricks}[]{swapaxes}[true]{% \if@pst \@nameuse{@pst#1}% \if@pst\def\psk@swapaxes{-90 rotate -1 1 scale }% \else\def\psk@swapaxes{}% - \fi -} + \fi} \psset[pstricks]{swapaxes=false} % \define@boolkey[psset]{pstricks}[]{showpoints}[true]{} @@ -2460,33 +2441,33 @@ \newpsfontdotH{Bpentagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(P)}{(q)} \newpsfontdot{pentagon*}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(q)} % DG/SR modification begin - Mar. 18, 1997 and Dec. 16, 1999 - Patch 14 -%\newpsfontdot{diamond*}[1.9 0.0 0.0 1.9 -0.4598 -0.70775]{StandardSymL}{} -%\newpsfontdot{diamond}[2.3 0.0 0.0 2.3 -0.8533 -0.5336]{StandardSymL}{} +%\newpsfontdot{diamond*}[1.9 0.0 0.0 1.9 -0.4598 -0.70775]{Symbol}{} +%\newpsfontdot{diamond}[2.3 0.0 0.0 2.3 -0.8533 -0.5336]{Symbol}{} % D.G. modification begin - Jan. 17, 2000 \newpsfontdotH{diamond}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(d)}{(l)} \newpsfontdotH{Bdiamond}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(D)}{(l)} \newpsfontdot{diamond*}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(l)} % DG/SR modification end -\newpsfontdot{oplus}[1.44928 0.0 0.0 1.44928 -0.562319 -0.478261]{StandardSymL}{} -\newpsfontdot{otimes}[1.44928 0.0 0.0 1.44928 -0.562319 -0.475362]{StandardSymL}{} -\newpsfontdot{x}[1.8 0.0 0.0 1.8 -0.495 -0.4788]{StandardSymL}{} -\newpsfontdot{+}[2.3 0.0 0.0 2.3 -0.6486 -0.5819]{NimbusRomNo9L-Regu}{<2B>} -\newpsfontdot{asterisk}[2.43309 0.0 0.0 2.43309 -0.609489 -1.14477]{NimbusRomNo9L-Regu}{<2A>} -\newpsfontdot{B+}[2.3 0.0 0.0 2.3 -0.6555 -0.5819]{NimbusRomNo9L-Bold}{<2B>} -\newpsfontdot{Basterisk}[2.29358 0.0 0.0 2.29358 -0.576835 -1.08486]{NimbusRomNo9L-Bold}{<2A>} -\newpsfontdot{|}[1.98413 0.0 0.0 1.38 -0.258929 -0.5]{NimbusSanL-Regu}{(|)} +\newpsfontdot{oplus}[1.44928 0.0 0.0 1.44928 -0.562319 -0.478261]{Symbol}{} +\newpsfontdot{otimes}[1.44928 0.0 0.0 1.44928 -0.562319 -0.475362]{Symbol}{} +\newpsfontdot{x}[1.8 0.0 0.0 1.8 -0.495 -0.4788]{Symbol}{} +\newpsfontdot{+}[2.3 0.0 0.0 2.3 -0.6486 -0.5819]{Times-Roman}{<2B>} +\newpsfontdot{asterisk}[2.43309 0.0 0.0 2.43309 -0.609489 -1.14477]{Times-Roman}{<2A>} +\newpsfontdot{B+}[2.3 0.0 0.0 2.3 -0.6555 -0.5819]{Times-Bold}{<2B>} +\newpsfontdot{Basterisk}[2.29358 0.0 0.0 2.29358 -0.576835 -1.08486]{Times-Bold}{<2A>} +\newpsfontdot{|}[1.98413 0.0 0.0 1.38 -0.258929 -0.5]{Helvetica}{(|)} % DG/SR modification begin - Oct. 27, 1997 - Patch 7 -%[1.98413 0.0 0.0 1.98413 -0.258929 -0.712302]{NimbusSanL-Regu}{(|)} +%[1.98413 0.0 0.0 1.98413 -0.258929 -0.712302]{Helvetica}{(|)} % DG/SR modification end -\newpsfontdot{B|}[1.98413 0.0 0.0 1.38 -0.277778 -0.5]{NimbusSanL-Bold}{(|)}% +\newpsfontdot{B|}[1.98413 0.0 0.0 1.38 -0.277778 -0.5]{Helvetica-Bold}{(|)}% % DG/SR modification begin - Oct. 27, 1997 - Patch 7 -%[1.98413 0.0 0.0 1.98413 -0.277778 -0.78302]{NimbusSanL-Bold}{(|)} +%[1.98413 0.0 0.0 1.98413 -0.277778 -0.78302]{Helvetica-Bold}{(|)} % DG/SR modification end \iffalse -\newpsfontdot{*}[2.77778 0.0 0.0 2.77778 -0.638889 -0.813889]{StandardSymL}{} -\newpsfontdot{o}[3.33333 0.0 0.0 3.33333 -0.666667 -1.78167]{StandardSymL}{} -\newpsfontdot{Bo}[4.69484 0.0 0.0 4.69484 -0.78169 -2.97418]{NimbusRomNo9L-Bold}{} +\newpsfontdot{*}[2.77778 0.0 0.0 2.77778 -0.638889 -0.813889]{Symbol}{} +\newpsfontdot{o}[3.33333 0.0 0.0 3.33333 -0.666667 -1.78167]{Symbol}{} +\newpsfontdot{Bo}[4.69484 0.0 0.0 4.69484 -0.78169 -2.97418]{Times-Bold}{} \fi % Etienne Riga \newpsfontdot{Asterisk}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(k)} @@ -2866,12 +2847,8 @@ \pst@cntg=#1\relax\edef\psk@subgriddiv{\the\pst@cntg}} \psset[pstricks]{subgriddiv=5} % -\define@key[psset]{pstricks}{gridfont}[NimbusSanL-Regu]{\def\psk@gridfont{/#1 }}% hv 2007-11-13 -\ifpst@psfonts - \psset[pstricks]{gridfont=Helvetica}% -\else - \psset[pstricks]{gridfont=NimbusSanL-Regu}% -\fi +\define@key[psset]{pstricks}{gridfont}[Helvetica]{\def\psk@gridfont{/#1 }}% hv 2007-11-13 +\psset[pstricks]{gridfont=Helvetica} % \define@key[psset]{pstricks}{gridlabels}[10pt]{\pst@getlength{#1}\psk@gridlabels} \psset[pstricks]{gridlabels=10pt} diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls b/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls index f0a84e5347e..15f71fd95b5 100644 --- a/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls +++ b/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls @@ -1,4 +1,4 @@ -% $Id: pst-doc.cls 533 2017-08-24 14:56:30Z herbert $ +% $Id: pst-doc.cls 444 2017-04-19 10:55:35Z herbert $ % %% %% The PSTricks Project @@ -26,8 +26,8 @@ \RequirePackage{amsmath, amssymb} \ifxetex \usepackage{unicode-math} - \usepackage{libertinus-otf} - \setmonofont[Scale=MatchLowercase,FakeStretch=0.92]{DejaVu Sans Mono} + \usepackage{libertinus} + \setmonofont[Scale=MatchLowercase,FakeStretch=0.92]{Anonymous Pro} \setmathfont{XITS Math} \else \RequirePackage[T1]{fontenc} @@ -35,7 +35,6 @@ %\RequirePackage[euler-digits]{eulervm} \RequirePackage{bera} %\RequirePackage[scaled=0.85]{luximono} - \RequirePackage[utf8]{inputenc} \fi \usepackage[includeheadfoot,lmargin=2cm,tmargin=1cm,bmargin=1.5cm,rmargin=1.5cm]{geometry} \RequirePackage{ifpdf} @@ -103,7 +102,6 @@ \RequirePackage{subfig} \RequirePackage{setspace} \RequirePackage{paralist} -\RequirePackage{biblatex} % \RequirePackage{fancyvrb} \newenvironment{Xverbatim}[2][]% 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ß +%% +%% 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 +%% +%% 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 9cb20210519..6d2703b2ba8 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 554 2017-09-17 19:04:49Z herbert $ +% $Id: pstricks.sty 446 2017-04-19 11:40:55Z herbert $ %% %% This is file `pstricks.sty'. %% @@ -17,7 +17,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{pstricks}[2017/09/17 v0.65 LaTeX wrapper for `PSTricks' (RN,HV)] +\ProvidesPackage{pstricks}[2017/03/17 v0.63 LaTeX wrapper for `PSTricks' (RN,HV)] % \def\documentclass{% \edef\@tempa{\jobname.tex }% @@ -40,9 +40,7 @@ %---------------------------------DISTILLER -------------------------------- \newif\ifpst@distiller\pst@distillerfalse \DeclareOption{distiller}{\pst@distillertrue} -% -\newif\ifpst@psfonts\pst@psfontsfalse -\DeclareOption{psfonts}{\pst@psfontstrue} + %---------------------------------COLOR -------------------------------- \DeclareOption{monochrome}{% \AtBeginDocument{\special{ps: @@ -67,16 +65,6 @@ \DeclareOption*{\PassOptionsToPackage\CurrentOption{\pst@ColorPackage}} \ProcessOptions\relax -\RequirePackage{iftex} -\RequirePackage{shellesc} -%\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} @@ -84,11 +72,11 @@ \let\saved@scalebox\scalebox \input{pstricks}% \ProvidesFile{pstricks.tex}[\filedate\space v\fileversion\space `PSTricks' (tvz,hv)] - \input{pst-fp.tex}% + \input{pst-fp.tex} \ProvidesFile{pst-fp.tex}[\filedate\space v\fileversion\space `PST-fp' (hv)] \IfFileExists{pstricks.pro}{% \ProvidesFile{pstricks.pro} - [2017/09/12 v. 1.25, PostScript prologue file (hv)] + [2012/10/16 v. 1.15, 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)] @@ -109,29 +97,25 @@ [ /ca \psk@strokeopacityalpha /CA \psk@strokeopacityalpha /SetTransparency pdfmark > \pst@def{setBlendmode}< - [ /BM% - \ifcase\psk@blendmode - /Normal \or - /Compatible \or - /Screen \or - /Multiply \or - /HardLight \or - /Darken \or - /Lighten \or - /Difference \or - /ColorDodge \or - /ColorBurn \or - /SoftLight \or - /Hue \or - /Saturation \or - /Luminosity \or - /Overlay \or - /Exclusion \or - /Color - \else - /Normal - \fi - /ca \psk@shapealpha /CA \psk@opacityalpha /SetTransparency pdfmark > + [ /BM\ifcase\psk@blendmode% + /Normal \or % 0 + /Multiply \or % 1 + /Screen \or % 2 + /Overlay \or % 3 + /Darken \or % 4 + /Lighten \or % 5 + /ColorDodge \or % 6 + /ColorBurn \or % 7 + /HardLight \or % 8 + /SoftLight \or % 9 + /Difference \or % 10 + /Exclusion \or % 11 + /Hue \or % 12 + /Color \or % 13 + /Saturation \or % 14 + /Luminosity % 15 + \else /Normal \fi + /ca \psk@shapealpha /CA \psk@opacityalpha /SetTransparency pdfmark >% \fi % \@ifpackageloaded{xcolor}{% -- cgit v1.2.3