summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Changes.generic3
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Makefile91
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/images/tiger.pdfbin0 -> 34337 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-doc.cls34
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news10.pdfbin530771 -> 533974 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news10.tex37
-rw-r--r--Master/texmf-dist/dvips/pstricks/pstricks.pro60
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex64
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pstricks.sty16
9 files changed, 177 insertions, 128 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
index 6cc691e6f9a..729373ff700 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.generic
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
@@ -1,4 +1,7 @@
pstricks.tex --------
+2.17 2011-01-30 - added \psLoop for loops without a defined counter
+2.16 2010-12-18 - added optional argument dashcolor and new linestyle
+ coloreddashed
2.15 2010-11-25 - bugfix for using \pstCheckCoorType
2.14 2010-11-14 - bugfix for using \pst@pyth. Now \pst@Pyth, which uses
no dimen registers
diff --git a/Master/texmf-dist/doc/generic/pstricks/Makefile b/Master/texmf-dist/doc/generic/pstricks/Makefile
deleted file mode 100644
index 246d87e2c11..00000000000
--- a/Master/texmf-dist/doc/generic/pstricks/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-# `Makefile' for `pst-news.pdf', hv, 2007/03/17
-
-.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps
-
-PACKAGE = pst-news$(shell date +%y)
-
-MAIN = $(PACKAGE)
-
-BASE = pstricks
-
-LATEX = latex
-
-TDS = ~/PSTricks/PSTricks-TDS
-
-ARCHNAME = $(MAIN)-$(shell date +%y%m%d)
-
-ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Changes Makefile
-
-all : doc clean
-doc: $(MAIN).pdf
-
-$(MAIN).pdf : $(MAIN).ps
- GS_OPTIONS=-dAutoRotatePages=/None ps2pdf $<
-
-$(MAIN).ps : $(MAIN).dvi
- dvips $<
-
-$(MAIN).dvi : $(MAIN).tex
- $(LATEX) $<
- $(LATEX) $<
- if ! test -f $(basename $<).glo ; then touch $(basename $<).glo; fi
- if ! test -f $(basename $<).idx ; then touch $(basename $<).idx; fi
- makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \
- $(basename $<).glo
- makeindex -t $(basename $<).ilg -o $(basename $<).ind \
- $(basename $<).idx
- bibtex $(basename $<)
- $(LATEX) $<
- $(LATEX) $<
-
-clean :
- $(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out .blg .Roessler .bbl )
- $(RM) $(addprefix $(MAIN), .dvi .ps)
-
-veryclean : clean
- $(RM) $(addprefix $(MAIN), .pdf .bbl .blg)
-
-arch :
- zip $(ARCHNAME).zip $(ARCHFILES)
-
-tds:
-#################### base #########################
- cp -u ../config/* ../.base/config/
-#
- cp -u Changes ../.base/doc/
- cp -u pst-doc.* ../.base/doc/
- cp -u PSTricks.bib* ../.base/doc/
- cp -u pst-news* ../.base/doc/
- cp -u pst-user* ../.base/doc/
- cp -u *.sty ../.base/doc/
- cp -u pstricks-* ../.base/doc/
- cp -u test* ../.base/doc/
- cp -u images/* ../.base/doc/images/
-#
- cp -u ../dvips/* ../.base/dvips/
- cp -u ../generic/* ../.base/generic/
- cp -u ../latex/* ../.base/latex/
- cp -u ../README ../.base/
-#
-#################### TDS #########################
- cp -u Changes $(TDS)/doc/generic/$(BASE)/
- cp -u README $(TDS)/doc/generic/$(BASE)/
- cp -u $(MAIN).pdf $(TDS)/doc/generic/$(BASE)/
-#
- cp -u ../latex/Changes $(TDS)/tex/latex/$(BASE)/
- cp -u ../latex/$(BASE).sty $(TDS)/tex/latex/$(BASE)/
-#
- cp -u ../generic/Changes $(TDS)/tex/generic/$(BASE)/
- cp -u ../generic/$(BASE).tex $(TDS)/tex/generic/$(BASE)/
-#
- cp -u ../dvips/Changes $(TDS)/dvips/$(BASE)/
- cp -u ../dvips/$(BASE).pro $(TDS)/dvips/$(BASE)/
- cp -u ../dvips/$(BASE)97.pro $(TDS)/dvips/$(BASE)/
- cp -u ../dvips/pst-dots* $(TDS)/dvips/$(BASE)/
-#
- cp -u Changes $(TDS)/source/$(BASE)/
- cp -u $(MAIN).tex $(TDS)/source/$(BASE)/
-# cp -u $(MAIN).bib $(TDS)/source/$(BASE)/
- cp -u Makefile $(TDS)/source/$(BASE)/
-
-# EOF
diff --git a/Master/texmf-dist/doc/generic/pstricks/images/tiger.pdf b/Master/texmf-dist/doc/generic/pstricks/images/tiger.pdf
new file mode 100644
index 00000000000..ff53d6b4e43
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pstricks/images/tiger.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-doc.cls b/Master/texmf-dist/doc/generic/pstricks/pst-doc.cls
index 2758aa299ad..0aa215fdb1a 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-doc.cls
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-doc.cls
@@ -1,4 +1,4 @@
-% $Id: pst-doc.cls 413 2010-11-03 20:06:24Z herbert $
+% $Id: pst-doc.cls 455 2011-01-30 11:19:19Z herbert $
%
%%
%% The PSTricks Project
@@ -118,9 +118,7 @@ DIV13]{scrartcl}
\fboxsep=0pt
\fcolorbox{Black!15}{Black!15}{\bfseries\strut##1}%
}}
-\providecommand\OFF{%
- \xdef\lst@alloverstyle##1{##1}%
-}
+\providecommand\OFF{\xdef\lst@alloverstyle##1{##1}}
\lstset{%
language=PSTricks,%
float=hbp,%
@@ -135,18 +133,19 @@ DIV13]{scrartcl}
extendedchars=true, %
showspaces=false, %
showstringspaces=false, %
- numbers=left,
- numbersep=0.8em,
- numberstyle=\tiny, %
+% numbers=left,
+% numbersep=0.8em,
+% numberstyle=\tiny, %
breaklines=true, %
breakautoindent=true,
captionpos=b,
xleftmargin=1em
}
\lstset{explpreset={pos=t,wide=false,rframe={},preset=\centering}}
-\lstdefinestyle{syntax}{backgroundcolor=\color{blue!20},numbers=none,xleftmargin=0pt,xrightmargin=0pt,
+\lstdefinestyle{syntax}{backgroundcolor=\color{blue!15},numbers=none,xleftmargin=0pt,xrightmargin=0pt,
frame=single}
-\lstdefinestyle{code}{backgroundcolor=\color{red!20},numbers=left,xleftmargin=0pt,xrightmargin=0pt,
+\lstdefinestyle{code}{backgroundcolor=\color{red!15},%numbers=left,
+xleftmargin=0pt,xrightmargin=0pt,
frame=single}
\RequirePackage{xkvview}
@@ -218,6 +217,23 @@ DIV13]{scrartcl}
\setcounter{secnumdepth}{2} % Abbildungsnummerierung mit groesserer Tiefe
\setcounter{tocdepth}{2} % Inhaltsverzeichnis mit groesserer Tiefe
%
+\renewcommand*\l@section[2]{%
+ \ifnum \c@tocdepth >\z@
+ \addpenalty\@secpenalty
+ \addvspace{1.0em \@plus\p@}%
+ \setlength\@tempdima{2em}%
+ \begingroup
+ \parindent \z@ \rightskip \@pnumwidth
+ \parfillskip -\@pnumwidth
+ \leavevmode \bfseries
+ \advance\leftskip\@tempdima
+ \hskip -\leftskip
+ #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
+ \endgroup
+ \fi}
+\renewcommand*\l@subsection{\bprot@dottedtocline{2}{1.5em}{3.6em}}
+\renewcommand*\l@subsubsection{\bprot@dottedtocline{3}{3.8em}{4.5em}}
+%
% Inhalte von List of Figures
\IfPackageLoaded{subfig}{\setcounter{lofdepth}{1} %1 = nur figures, 2 = figures + subfigures
}
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news10.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news10.pdf
index 02206673830..4780230be3e 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news10.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news10.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news10.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news10.tex
index 28f430967e5..b7c6840b9fb 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news10.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news10.tex
@@ -99,6 +99,7 @@ The new arguments are only valid for the macros \Lcs{psellipse}, \Lcs{pscircle},
\medskip
\begin{tabular}{@{} l >{\em}l l l @{}}\toprule
\emph{name} & type & \emph{default} & \emph{description}\\\midrule
+\Lkeyword{dashcolor} & color & \nxLcs{relax} & for colored dashed lines \\
\Lkeyword{startLW} & length & \Lcs{pslinewidth} & starting linewidth \\
\Lkeyword{endLW} & length & \Lcs{pslinewidth} & ending linewidth \\
\Lkeyword{startWL} & integer& 380 & starting wave length\\
@@ -107,6 +108,42 @@ The new arguments are only valid for the macros \Lcs{psellipse}, \Lcs{pscircle},
\Lkeyword{variableColor} & boolean & \false & use variable color\\\bottomrule
\end{tabular}
+\bigskip
+\begingroup
+\psset{linewidth=2mm,linestyle=dashed}
+\begin{pspicture}(4,-4)
+\psline[linecolor=blue,dashcolor=red,linearc=0.5](0,0)(4,0)(4,-4)
+\psline[linecolor=blue,dashcolor=cyan,linearc=0.5](0,0)(0,-4)(4,-4)
+\end{pspicture}\quad
+\begin{pspicture}(4,4)
+\psframe[linecolor=blue,dashcolor=green,framearc=0.5](0,0)(4,4)
+\end{pspicture}
+\quad \psset{linecap=2,dash=5mm 5mm }
+\begin{pspicture}(4,-4)
+\psline[linecolor=black,dashcolor=black!40,linecap=0](0,0)(4,-4)
+\psline[linecolor=blue,dashcolor=red,linearc=0.5](0,0)(4,0)(4,-4)
+\psline[linecolor=blue,dashcolor=cyan,linearc=0.5](0,0)(0,-4)(4,-4)
+\end{pspicture}
+\endgroup
+
+\begin{lstlisting}
+\psset{linewidth=2mm,linestyle=dashed}
+\begin{pspicture}(4,-4)
+\psline[linecolor=blue,dashcolor=red,linearc=0.5](0,0)(4,0)(4,-4)
+\psline[linecolor=blue,dashcolor=cyan,linearc=0.5](0,0)(0,-4)(4,-4)
+\end{pspicture}\quad
+\begin{pspicture}(4,4)
+\psframe[linecolor=blue,dashcolor=green,framearc=0.5](0,0)(4,4)
+\end{pspicture}
+\quad \psset{linecap=2,dash=5mm 5mm }
+\begin{pspicture}(4,-4)
+\psline[linecolor=black,dashcolor=black!40,linecap=0](0,0)(4,-4)
+\psline[linecolor=blue,dashcolor=red,linearc=0.5](0,0)(4,0)(4,-4)
+\psline[linecolor=blue,dashcolor=cyan,linearc=0.5](0,0)(0,-4)(4,-4)
+\end{pspicture}
+\end{lstlisting}
+
+
\begin{LTXexample}[width=7cm,wide=true]
\psset{endLW=15pt}
\begin{pspicture}(-3.5,-2.5)(3.5,2.5)
diff --git a/Master/texmf-dist/dvips/pstricks/pstricks.pro b/Master/texmf-dist/dvips/pstricks/pstricks.pro
index 18aeacb6052..ea18f469bc8 100644
--- a/Master/texmf-dist/dvips/pstricks/pstricks.pro
+++ b/Master/texmf-dist/dvips/pstricks/pstricks.pro
@@ -1,4 +1,4 @@
-% $Id: pstricks.pro 327 2010-05-24 15:54:43Z herbert $
+% $Id: pstricks.pro 455 2011-01-30 11:19:19Z herbert $
%
%% PostScript prologue for pstricks.tex.
%% Version 1.07, 2009/04/30
@@ -197,6 +197,53 @@ tx@Dict begin
pop pop
} def
%
+/TruchetFill { % on stack: scaling factor
+ 10 dict begin
+ dup dup scale
+ 1 exch div round /penroseFactor ED
+ a 0 dtransform round exch round exch
+ 2 copy idtransform
+ exch Atan rotate
+ idtransform pop /a ED
+ .25 .25 itransform pathbbox
+ /y2 ED
+ a Div ceiling cvi /x2 ED /y1 ED
+ a Div cvi /x1 ED /y2 y2 y1 sub def
+ clip
+ newpath
+ systemdict
+ /setstrokeadjust known { true setstrokeadjust } if
+ /ma a neg def
+ /ha a 2 div def
+ /mha ha neg def
+ /tile {
+ rand dup 2 idiv 2 mul eq { 90 rotate } if
+ mha mha moveto ha mha lineto
+ ha ha lineto mha ha lineto
+% closepath .1 setlinewidth stroke
+ contents
+ } def
+ /contents{
+ 0 ha moveto ha 0 lineto
+ 0 mha moveto mha 0 lineto
+% 1 setlinewidth stroke
+ } def
+ /dotiling {
+ f ma mul a f a mul {
+ /i exch def
+ f ma mul a f a mul {
+ /j exch def
+ gsave i j translate
+ tile stroke grestore
+ } for
+ } for
+ } def
+%
+ /f 3 def
+ 5 srand dotiling
+ end % local user dict
+} def
+%
/BeginArrow {
ADict begin % hold it local, for end see EndArrow
/@mtrx CM def
@@ -656,16 +703,17 @@ tx@Dict begin
/Points [ x1 y1 xSP ySP xSP 2 mul x1 sub y1 ] def
} def
%
-%
/Grid {
newpath
/a 4 string def
- /b ED /c ED /n ED
+ /b ED % psk@gridlabels in pt
+ /c ED % { \pst@usecolor\psgridlabelcolor }
+ /n ED % psk@griddots
cvi dup 1 lt { pop 1 } if
- /s ED
+ /s ED % \psk@subgriddiv
s div dup 0 eq { pop 1 } if
- /dy ED s div dup 0 eq { pop 1 } if
- /dx ED dy div round dy mul
+ /dy ED s div dup 0 eq { pop 1 } if % \pst@number\psyunit abs
+ /dx ED dy div round dy mul % \pst@number\psxunit abs
/y0 ED dx div round dx mul
/x0 ED dy div round cvi
/y2 ED dx div round cvi
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index bab470b5dcb..bc406da7684 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -57,6 +57,7 @@
\def\:{\global\let\@sptoken= } \:
\def\:{\@xifnch} \expandafter\gdef\: {\futurelet\@tempc\@ifnch}
\endgroup
+ \def\endtabular{\crcr\egroup\egroup $\egroup}
\fi
%
% now we have all commands defined, for TeX and LaTeX
@@ -65,8 +66,8 @@
\pst@addfams{pstricks}
\ifx\PSTFPloaded\endinput\else \input pst-fp.tex\fi
%
-\def\fileversion{2.15}
-\def\filedate{2010/11/25}
+\def\fileversion{2.17}
+\def\filedate{2011/01/30}
%
% stolen from latex.ltx to make it TeX compatible
\newcount\psLoopIndex
@@ -137,7 +138,14 @@
\edef\pst@tempa{\pst@tempa,\pst@tempA}%
\repeat%
\psForeach@ii{#1}{\pst@tempa}{#5}}
-%
+
+\def\psrecur@i#1{\csname ps@rn#1\psrecur@i}
+\long\def\ps@rnm#1{\endcsname{#1}#1\global\advance\psLoopIndex by \@ne}
+\long\def\ps@rn#1{}
+\def\psLoop#1{\global\psLoopIndex=0
+ \csname ps@rn\expandafter\psrecur@i
+ \romannumeral\number\number#1 000\endcsname\endcsname}
+
%
% hv 2007-10-16 to fix the bug in pst-node with \\[name=...]
% hv fix bug with empty fnodes in psmatrix
@@ -978,13 +986,21 @@
\ifpsshadow 1\else \z@\fi\fi\fi}}
%
\def\psls@none{}
-\def\psls@solid{\psk@linejoin\space setlinejoin \psk@linecap\space setlinecap stroke }
+\def\psls@solid{ \psk@linejoin\space setlinejoin \psk@linecap\space setlinecap stroke }
+\def\psls@coloreddashed{ \psls@solid grestore gsave \pst@usecolor\psdashcolor \tx@setlinejoin \psls@dashed }
%
\newdimen\pslinewidth
\define@key[psset]{pstricks}{linewidth}[0.8pt]{\pssetlength\pslinewidth{#1}}
\psset[pstricks]{linewidth=.8pt}
\define@key[psset]{pstricks}{linecolor}[black]{\pst@getcolor{#1}\pslinecolor}
\psset[pstricks]{linecolor=black}
+%
+\newif\ifPst@coloreddashed
+\define@key[psset]{pstricks}{dashcolor}[white]{%
+ \ifx\relax#1\relax\Pst@coloreddashedfalse%
+ \else\Pst@coloreddashedtrue\pst@getcolor{#1}\psdashcolor
+ \fi}
+\psset{dashcolor=\relax}
%\define@key[psset]{pstricks}{linecap}[0]{\pst@getint{#1}\psk@linecap}% hv 2007-12-01
%\psset[pstricks]{linecap=0} >>>>>>>>>>>>> siehe unten
\define@key[psset]{pstricks}{linejoin}[0]{\pst@getint{#1}\psk@linejoin}% hv 2007-10-13
@@ -1032,6 +1048,7 @@
\def\tx@DashLine{DashLine }
%
\def\psls@dashed{
+ \ifPst@coloreddashed \psls@solid grestore gsave \pst@usecolor\psdashcolor \tx@setlinejoin \fi
\psk@linecap\space setlinecap
\ifpsdashadjust
[ \psk@dash ] \pst@linetype\space \tx@DashLine
@@ -1102,6 +1119,7 @@
%
\def\tx@LineFill{LineFill }
\def\tx@PenroseFill{PenroseFill }
+\def\tx@TruchetFill{TruchetFill }
%
\def\psfs@none{}
\def\psfs@solid{\pst@fill{\pst@usecolor\psfillcolor \tx@setTransparency fill }}
@@ -1152,6 +1170,15 @@
\def\psfs@penrose{\pst@fill\pst@penroseFill}
\@namedef{psfs@penrose*}{\psfs@solid \psfs@penrose}
%
+\def\pst@truchetFill{%
+ gsave % restore in PenroseFill
+ \pst@number\pslinewidth SLW
+ \pst@usecolor\pshatchcolor
+ \psk@psscale
+ \tx@TruchetFill }
+\def\psfs@truchet{ \pst@fill\pst@truchetFill }
+\@namedef{psfs@truchet*}{\psfs@solid \psfs@truchet}
+%
\define@key[psset]{pstricks}{fillstyle}[none]{%
\edef\pst@tempg{#1}\def\pst@temph{none}%
\ifx\pst@tempg\pst@temph
@@ -2572,11 +2599,11 @@
\let\pst@thisbox\relax
\long\def\pst@makenotverbbox#1#2{%
\edef\pst@mathflag{%
- \ifpsmathbox\ifmmode\ifinner 1\else 2\fi\else \z@\fi\else \z@\fi}%
+ \ifpsmathbox\ifmmode\ifinner 1\else 2\fi\else\z@\fi\else\z@\fi}%
\setbox\pst@hbox=\hbox{%
\ifcase\pst@mathflag\or$\m@th\textstyle\or$\m@th\displaystyle\fi
{\pst@thisbox\the\everypsbox#2}%
- \ifnum\pst@mathflag>\z@$\fi% $
+ \ifnum\pst@mathflag>\z@$\fi% $
}%
#1}
%
@@ -2679,12 +2706,12 @@
\def\psdblframebox{\def\pst@par{}\pst@object{psdblframebox}}
\def\psdblframebox@i{\addto@par{doubleline=true}\psframebox@i}
\def\psclip#1{%
- \leavevmode
- \begingroup
- \begin@psclip
- \begingroup
+ \leavevmode%
+ \begingroup%
+ \begin@psclip%
+ \begingroup%
\def\use@pscode{%
- \pstVerb{%
+ \pstVerb{
\pst@dict
/mtrxc CM def
CP CP T
@@ -2704,9 +2731,9 @@
\def\@multips(##1)(##2)##3##4{\pst@misplaced\multips}%
\def\nc@object##1##2##3##4{\pst@misplaced{node connection}}%
\hbox to\z@{#1}%
- \endgroup
+ \endgroup%
\def\endpsclip{%
- \end@psclip
+ \end@psclip%
\endgroup}%
\ignorespaces}
\def\endpsclip{\pst@misplaced\endpsclip}
@@ -2724,8 +2751,8 @@
\def\clipbox@@#1{%
\pssetlength\pst@dimg{#1}%
\leavevmode\hbox{%
- \begin@psclip
- \pst@Verb{%
+ \begin@psclip%
+ \pst@Verb{
CM \tx@STV CP T newpath
/a \pst@number\pst@dimg def
/w \pst@number{\wd\pst@hbox}a add def
@@ -2740,8 +2767,8 @@
newpath
0 0 moveto
setmatrix}%
-\unhbox\pst@hbox
-\end@psclip}}
+ \unhbox\pst@hbox%
+ \end@psclip}}
\def\psshadowbox{\def\pst@par{}\pst@object{psshadowbox}}
\def\psshadowbox@i{\pst@makebox\psshadowbox@ii}
\def\psshadowbox@ii{%
@@ -3059,7 +3086,7 @@ pop
\def\psarc{\pst@object{psarc}}
\def\psarc@i{\@ifnextchar({\psarc@iii}{\psarc@ii}}
\def\psarc@ii#1{\addto@par{arrows=#1}%
- \@ifnextchar({\psarc@iii}{\psarc@iii(0,0)}%
+ \@ifnextchar(\psarc@iii{\psarc@iii(0,0)}%
}
\def\psarc@iii(#1)#2#3#4{%
\begin@OpenObj
@@ -3764,7 +3791,6 @@ pop
\use@par%
\if@star\pst@starbox\fi%
\pstCheckCoorType{#1}% needed for \uput@vii
-\typeout{====\the\pst@C@@rType====}%
\uput@vi%
\psput@{#1}\pst@hbox
\endgroup%
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
index 0aa3884b5c7..a12b8cd2499 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
@@ -16,7 +16,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pstricks}
- [2010/09/18 v0.47 LaTeX wrapper for `PSTricks' (RN,HV)]
+ [2010/09/18 v0.48 LaTeX wrapper for `PSTricks' (RN,HV)]
%
\def\documentclass{%
\edef\@tempa{\jobname.tex }%
@@ -46,8 +46,7 @@
\def\pst@tempa{pstricks.tex}%
\fi
\input{\pst@tempa}%
- \ProvidesFile{\pst@tempa}%
- [\filedate\space v\fileversion\space `PSTricks' (tvz)]%
+ \ProvidesFile{\pst@tempa}[\filedate\space v\fileversion\space `PSTricks' (tvz)]%
\endinput
}
@@ -55,6 +54,17 @@
\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}}%