summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-07-02 18:05:35 +0000
committerKarl Berry <karl@freefriends.org>2008-07-02 18:05:35 +0000
commit19f58e5098cf443de58d21c46f277ff489457c4b (patch)
tree0b004bdf085fe1c098de0f03a219ec92bd6d1654 /Master/texmf-dist/tex/generic/pstricks/pstricks.tex
parent0877203879f5740a1fe1f5ca82680de5e1200be4 (diff)
pstricks update (1jul08)
git-svn-id: svn://tug.org/texlive/trunk@9169 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pstricks/pstricks.tex')
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex85
1 files changed, 50 insertions, 35 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 09d4be2988c..83cf7585a81 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -20,44 +20,44 @@
% See the PSTricks User's Guide for description.
% This uses the header file `pstricks.pro'.
%
-\def\fileversion{1.24}
-\def\filedate{2008/06/17}
+\def\fileversion{1.25}
+\def\filedate{2008/06/26}
%
\csname PSTricksLoaded\endcsname
\let\PSTricksLoaded\endinput
\edef\PstAtCode{\the\catcode`\@}
\catcode`\@=11\relax
-\expandafter\ifx\csname @latexerr\endcsname\relax
-\long\def\@ifundefined#1#2#3{\expandafter\ifx\csname
- #1\endcsname\relax#2\else#3\fi}
-\def\@namedef#1{\expandafter\def\csname #1\endcsname}
-\def\@nameuse#1{\csname #1\endcsname}
-%
-\def\@eha{%
- Your command was ignored.^^J
- Type \space I <command> <return> \space to replace
- it with another command,^^J
- or \space <return> \space to continue without it.}
-\def\@spaces{\space\space\space\space}
-\def\typeout#1{\immediate\write\@unused{#1}}
-\alloc@7\write\chardef\sixt@@n\@unused
-\def\@empty{}
-\def\@gobble#1{}
-\def\@nnil{\@nil}
-%
-\def\@ifnextchar#1#2#3{%
- \let\@tempe#1\def\@tempa{#2}\def\@tempb{#3}\futurelet\@tempc\@ifnch}
-%
-\def\@ifnch{%
- \ifx\@tempc\@sptoken \let\@tempd\@xifnch
- \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}
-\endgroup
+\expandafter\ifx\csname @latexerr\endcsname\relax% do we have LaTeX?
+ \def\typeout#1{\immediate\write\@unused{#1}}
+ \alloc@7\write\chardef\sixt@@n\@unused
+ \typeout{we are running tex and have to define some LaTeX commands ...}
+ \long\def\@ifundefined#1#2#3{\expandafter\ifx\csname
+ #1\endcsname\relax#2\else#3\fi}
+ \def\@namedef#1{\expandafter\def\csname #1\endcsname}
+ \def\@nameuse#1{\csname #1\endcsname}
+ \def\@eha{%
+ Your command was ignored.^^J
+ Type \space I <command> <return> \space to replace
+ it with another command,^^J
+ or \space <return> \space to continue without it.}
+ \def\@spaces{\space\space\space\space}
+ \def\@empty{}
+ \def\@gobble#1{}
+ \def\@nnil{\@nil}
+%
+ \def\@ifnextchar#1#2#3{%
+ \let\@tempe#1\def\@tempa{#2}\def\@tempb{#3}\futurelet\@tempc\@ifnch}
+%
+ \def\@ifnch{%
+ \ifx\@tempc\@sptoken \let\@tempd\@xifnch
+ \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}
+ \endgroup
\fi
%
% hv 2007-10-16 to fix the bug in pst-node with \\[name=...]
@@ -460,7 +460,7 @@
% v 1.05 begin
\def\psset@PstDebug#1{\pst@getint{#1}{\Pst@Debug}}% hv 2004-06-22
\psset{PstDebug=0}
-\def\psDEBUG{\@ifnextchar[\psDEBUG@i{\ps@DEBUG@i[PSTricks]}}
+\def\psDEBUG{\@ifnextchar[\psDEBUG@i{\psDEBUG@i[PSTricks]}}
\def\psDEBUG@i[#1]#2{\ifnum\Pst@Debug>0 \expandafter\typeout{<#1>: #2}\fi}
% end
\def\pst@getlength#1#2{%
@@ -810,6 +810,9 @@
% /HardLight 4
\psset@blendmode{0}
%
+\def\tx@LineFill{LineFill }
+\def\tx@PenroseFill{PenroseFill }
+%
\def\psfs@none{}
\def\psfs@solid{\pst@fill{\pst@usecolor\psfillcolor \tx@setTransparency fill }}
\def\psfs@eofill{\pst@fill{\pst@usecolor\psfillcolor \tx@setTransparency eofill}}
@@ -847,7 +850,19 @@
\@namedef{psfs@hlines*}{\psfs@solid \psfs@hlines}
\def\psfs@crosshatch{\psfs@vlines \psfs@hlines}
\@namedef{psfs@crosshatch*}{\psfs@solid \psfs@vlines \psfs@hlines}
-\def\tx@LineFill{LineFill }
+%
+\def\psset@psscale#1{\pst@checknum{#1}\psk@psscale}
+\psset@psscale{1}
+%
+\def\pst@penroseFill{%
+ gsave % restore in PenroseFill
+ \pst@number\pslinewidth SLW
+ \pst@usecolor\pshatchcolor
+ \psk@psscale
+ \tx@PenroseFill }
+\def\psfs@penrose{\pst@fill\pst@penroseFill}
+\@namedef{psfs@penrose*}{\psfs@solid \psfs@penrose}
+%
\def\psset@fillstyle#1{%
\edef\pst@tempg{#1}\def\pst@temph{none}%
\ifx\pst@tempg\pst@temph