summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-03-29 23:27:21 +0000
committerKarl Berry <karl@freefriends.org>2011-03-29 23:27:21 +0000
commit1b69735e67a604bfcff8852bb369f80ed5ada13f (patch)
treed7413597836288775c229bda24a43fb12e8431dc /Master/texmf-dist/tex/latex/pstricks/pstricks.sty
parent62184ea5f28527b106ce338a3730f24a234f6eb0 (diff)
pstricks
git-svn-id: svn://tug.org/texlive/trunk@21881 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/pstricks/pstricks.sty')
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pstricks.sty40
1 files changed, 25 insertions, 15 deletions
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
index a12b8cd2499..15fb4d7c767 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
@@ -5,8 +5,8 @@
%%
%% pstricks.sty Copyright (C) 1997 Timothy Van Zandt
%% pstcol.sty Copyright (C) 1994-1996 1999 David Carlisle
-%% pstricks.sty Copyright (C) 2004-2010 Herbert Voss <voss@perce.de>
-%% Rolf Niepraschk <Rolf.Niepraschk@ptb.de>
+%% pstricks.sty Copyright (C) 2004-2011 Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
+%% 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.
@@ -16,7 +16,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pstricks}
- [2010/09/18 v0.48 LaTeX wrapper for `PSTricks' (RN,HV)]
+ [2011/03/27 v0.49 LaTeX wrapper for `PSTricks' (RN,HV)]
%
\def\documentclass{%
\edef\@tempa{\jobname.tex }%
@@ -54,17 +54,6 @@
\ProcessOptions\relax
-\iffalse
-\def\c@lor@to@ps{%
- \@latex@error
- {You have run the document with pdflatex, but PSTricks\MessageBreak
- requires latex->dvips->ps2pdf or alternatively the use\MessageBreak
- of the package auto-pst-pdf. Then you can run\MessageBreak
- `pdflatex -shell-escape PSTfile.tex'}%
- {See also the PSTricks web pages http://PSTricks.tug.org}\@gobble
-}
-\fi
-
\ifpst@PDF
\typeout{>>> Loading package auto-pst-pdf <<<}
\AtBeginDocument{\usepackage{auto-pst-pdf}}%
@@ -75,9 +64,30 @@
or a "pdflatex -enable-write18 <file>" \MessageBreak
(if you are using MikTeX) \MessageBreak
************************************}
- \fi%
+ \fi
\fi
+\RequirePackage{ifpdf,ifluatex}
+
+\AtBeginDocument{%
+ \ifpdf
+ \ifluatex
+ \def\pst@tempA{lualatex}
+ \else
+ \def\pst@tempA{pdflatex}
+ \fi
+ \@ifpackageloaded{pst-pdf}{}{%
+ \@latex@error{%
+ You have run the document with pdflatex, but PSTricks\MessageBreak
+ requires latex->dvips->ps2pdf or alternatively the use\MessageBreak
+ of the package `auto-pst-pdf'. Then you can run\MessageBreak
+ \space\space`\pst@tempA\space -shell-escape <file>' (TeX Live)
+ \MessageBreak or\MessageBreak
+ \space\space`\pst@tempA\space -enable-write18 <file>' (MikTeX)}%
+ {See also the PSTricks web pages http://PSTricks.tug.org}}%
+ \fi
+}
+
\@ifundefined{PSTricksLoaded}
{%
\let\saved@scalebox\scalebox