diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/Changes.generic | 1 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pstricks/pstricks.app | 138 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pstricks/pstricks.sty | 22 |
3 files changed, 9 insertions, 152 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic index 11555cd484b..8d8076f353e 100644 --- a/Master/texmf-dist/doc/generic/pstricks/Changes.generic +++ b/Master/texmf-dist/doc/generic/pstricks/Changes.generic @@ -2,6 +2,7 @@ pstricks.tex -------- versions like 2.47a have only changes in other files, but not in this main package. +2.62a 2015-07-27 - upload the correct pstricks.sty 2.62 2015-07-24 - added optional argument bgcolor 2.61 2015-06-28 - added optional arguments precode and postcode 2.60 2014-10-25 - make it compatible for using it with ConTeXt diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.app b/Master/texmf-dist/tex/latex/pstricks/pstricks.app deleted file mode 100644 index 38bd2afe179..00000000000 --- a/Master/texmf-dist/tex/latex/pstricks/pstricks.app +++ /dev/null @@ -1,138 +0,0 @@ -\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} -\DeclareOptionX{off}[]{\@app@off@true} -\define@choicekey{auto-pst-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}} -\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{\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 -\def\app@exe{\immediate\write18} -\def\app@nl{^^J\space\space\space\space} -\newcommand\app@PackageError[2]{% - \PackageError{auto-pst-pdf}{\app@nl #1^^J}{#2}} -\newcommand\app@PackageWarning[1]{% - \PackageWarning{auto-pst-pdf}{\app@nl #1^^JThis warning occured}} -\newcommand\app@PackageInfo[1]{\PackageInfo{auto-pst-pdf}{#1}} -\newcommand\OnlyIfFileExists[2]{\IfFileExists{#1}{#2}{}} -\newcommand\NotIfFileExists[2]{\IfFileExists{#1}{}{#2}} -\def\app@convert#1#2#3{% - \OnlyIfFileExists{#2}{% - \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@jobname.dvi}% - \advance\c@app@runs\m@ne - \repeat - \app@convert{latex}{\jobname.\app@ext}{\app@jobname.dvi}% - \app@convert{dvips}{\app@jobname.dvi}{\app@jobname.ps}% - \if@app@crop@ - \app@convert{pstopdf}{\app@jobname.ps}{\app@jobname.pdf}% - \app@convert{pdfcrop}{\app@jobname.pdf}{\app@pics}% - \else - \app@convert{pstopdf}{\app@jobname.ps}{\app@pics}% - \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}{\app@exe{\app@rm "\@tempa"}}}} -\def\app@remove@container{\app@try@rm{\app@pics}} -\def\app@cleanup{\app@try@rm{\app@rm@files}} -\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 - \ifshellescape - \app@exe{echo " "} - \app@exe{echo "-------------------------------------------------"} - \app@exe{echo "auto-pst-pdf: Auxiliary LaTeX compilation"} - \app@exe{echo "-------------------------------------------------"} - \app@compile - \app@exe{echo "-------------------------------------------------"} - \app@exe{echo "auto-pst-pdf: End auxiliary LaTeX compilation"} - \app@exe{echo "-------------------------------------------------"} - \else - \app@PackageError{% - "shell escape" (or "write18") is not enabled:\app@nl - auto-pst-pdf will not work!} - {You need to run LaTeX with the equivalent of - "pdflatex -shell-escape"\app@nl - Or turn off auto-pst-pdf.}% - \fi - \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} -\let\app@ig\includegraphics
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty index 14c94b22dee..d34dd775288 100644 --- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty +++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty @@ -56,9 +56,9 @@ % \DeclareOption*{\OptionNotUsed} % -%\ProcessOptions\relax +\ProcessOptions\relax % -\RequirePackage{ifpdf,xkeyval,ifplatform} +\RequirePackage{ifpdf} % \ifpst@loadPDF \ifnum\pdfshellescape=\@ne\else @@ -69,28 +69,22 @@ (if you are using MikTeX) \MessageBreak ************************************} \fi + \def\app@pdfcrop@opts{--hres}%%% hv 20130405 \@ifclassloaded{beamer}{% \ifpdf \else\setbeamertemplate{navigation symbols}{} \fi - \AtEndOfPackage{\input{pstricks.app}}% - \typeout{>>> Loading auto-pst-pdf at end of pstricks.sty }}% - {\let\pst@document\document - \def\document{% + \AtEndOfPackage{\RequirePackage{auto-pst-pdf}}} + {\AtBeginDocument{% {\@ifundefined{shorthandoff} % we have no babel until now - { \typeout{>>> noshorthand}\input{pstricks.app}} + { \typeout{noshorthand}\usepackage{auto-pst-pdf}} { \@ifundefined{bbl@active@"}{}{\shorthandoff{"}} - \input{pstricks.app}% - \typeout{>>> Loading auto-pst-pdf at begin of document }% - \@ifundefined{bbl@active@"}{}{\shorthandon{"}}}} - \pst@document}% - } - \def\app@pdfcrop@opts{--hres}%%% hv 20130405 + \usepackage{auto-pst-pdf} + \@ifundefined{bbl@active@"}{}{\shorthandon{"}}}}}} \fi % \ifpst@ovl \RequirePackage{pst-ovl}\fi % \@ifundefined{PSTricksLoaded} {% - \ProcessOptions\relax \let\saved@scalebox\scalebox \ifpst@OldVersion \def\psDEBUG[#1]#2{} |