From cb1213ecc3657ee8a0debc8b81431d287c0ca48c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 8 Sep 2010 00:30:02 +0000 Subject: pstricks 2.10 (28aug10) git-svn-id: svn://tug.org/texlive/trunk@19605 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/generic/pstricks/Changes.dvips | 1 + .../doc/generic/pstricks/Changes.generic | 9 +++---- .../texmf-dist/doc/generic/pstricks/Changes.latex | 1 + Master/texmf-dist/dvips/pstricks/pst-algparser.pro | 8 ++++-- .../texmf-dist/tex/generic/pstricks/config/Changes | 7 ++++++ .../texmf-dist/tex/generic/pstricks/pstricks.tex | 29 ++++++++++++---------- Master/texmf-dist/tex/latex/pstricks/pstricks.sty | 28 +++++++++++---------- 7 files changed, 49 insertions(+), 34 deletions(-) create mode 100644 Master/texmf-dist/tex/generic/pstricks/config/Changes diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.dvips b/Master/texmf-dist/doc/generic/pstricks/Changes.dvips index 79522211d6c..53500e59ef7 100644 --- a/Master/texmf-dist/doc/generic/pstricks/Changes.dvips +++ b/Master/texmf-dist/doc/generic/pstricks/Changes.dvips @@ -31,6 +31,7 @@ ---- pst-alpparser.pro 0.02 2008-08-02 - commented out empty lines + - add EXP func ( same as exp ) 0.01 2008-01-01 initial version (hv) ---- pstricks97.pro diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic index 12bc2449951..84d7e704240 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.10 2010-08-27 - new optional argument noCurrentPoint, which is + preset to false. +2.09 2010-07-28 - fix bug with rotation values like *0 (ms) 2.08 2010-06-06 - fix bug with uput@vii 2.07 2010-05-24 - fix bug with uput and node setting (ms) 2.06 2010-04-27 - fix bug with trailing space in \pst@isnum @@ -101,9 +104,3 @@ pst-fp.tex ----------- (hv) v 0.02 2009-04-02 initial version -xdvipdfmx.con ------ -0.01 2007-03-11 - first CTAN version, must be renamed to pstricks.con - when used with XeTeX - -vtex.con ------ -0.02 2008-01-01 - disable transparent color setting diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.latex b/Master/texmf-dist/doc/generic/pstricks/Changes.latex index bab46b580a2..3c2f1f34c7b 100644 --- a/Master/texmf-dist/doc/generic/pstricks/Changes.latex +++ b/Master/texmf-dist/doc/generic/pstricks/Changes.latex @@ -1,4 +1,5 @@ pstricks.sty -------- +0.46 2010-08-28 - fix bug with auto-pst-pdf 0.45 2010-06-17 - add option pdf for using auto-pst-pdf together with pdflatex (needs an option -shell-escape for TeXLive or -enable-write18 for MiKTeX) diff --git a/Master/texmf-dist/dvips/pstricks/pst-algparser.pro b/Master/texmf-dist/dvips/pstricks/pst-algparser.pro index d2150d6b074..4d0b78fe983 100644 --- a/Master/texmf-dist/dvips/pstricks/pst-algparser.pro +++ b/Master/texmf-dist/dvips/pstricks/pst-algparser.pro @@ -1,7 +1,7 @@ -% $Id: pst-algparser.pro 90 2009-01-30 10:58:51Z herbert $ +% $Id: pst-algparser.pro 350 2010-06-18 05:18:55Z herbert $ %% %% PostScript prologue for PSTricks algorithm parser -%% Version 0.01, 2008/01/01 +%% Version 0.02, 2010/06/08 %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN archives @@ -558,6 +558,10 @@ end %tx@CoreAnalyzerDict PreCommonFunc { (exp\() StrConcat 5 index StrConcat AddClPar } if PostCommonFunc } def +/EvalFunc_EXP {% + PreCommonFunc + { (EXP\() StrConcat 5 index StrConcat AddClPar } if + PostCommonFunc } def /EvalFunc_sqrt {% PreCommonFunc { dup 0 eq { (1) StrConcat } { 1 sub } ifelse (/\(2*sqrt\() StrConcat 5 index StrConcat (\)\)) StrConcat } if diff --git a/Master/texmf-dist/tex/generic/pstricks/config/Changes b/Master/texmf-dist/tex/generic/pstricks/config/Changes new file mode 100644 index 00000000000..0e14ca192b8 --- /dev/null +++ b/Master/texmf-dist/tex/generic/pstricks/config/Changes @@ -0,0 +1,7 @@ +xdvipdfmx.con ------ +0.02 2010-08-02 - uncomment redefinition of \pst@starbox +0.01 2007-03-11 - first CTAN version, must be renamed to pstricks.con + when used with XeTeX + +vtex.con ------ +0.02 2008-01-01 - disable transparent color setting diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index 41ca3959d49..073895b2440 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -1,7 +1,7 @@ %% pstricks.tex %% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu. %% COPYRIGHT 2000-2003 by Denis Girou. -%% Copyright 2004-2010 Herbert Voss +%% Copyright 2004-2011 Herbert Voss % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -65,8 +65,8 @@ \pst@addfams{pstricks} \ifx\PSTFPloaded\endinput\else \input pst-fp.tex\fi % -\def\fileversion{2.08} -\def\filedate{2010/06/06} +\def\fileversion{2.10} +\def\filedate{2010/08/27} % % stolen from latex.ltx to make it TeX compatible \newcount\psLoopIndex @@ -862,7 +862,6 @@ \edef\psk@origin{\pst@coor T }} \def\psk@origin{} % -\newif\ifPst@algebraic \define@boolkey[psset]{pstricks}[Pst@]{algebraic}[true]{} \psset[pstricks]{algebraic=false} % @@ -1554,6 +1553,9 @@ }} % \newif\ifPst@custom\Pst@customfalse +\define@boolkey[psset]{pstricks}[Pst@]{noCurrentPoint}[true]{} +\psset[pstricks]{noCurrentPoint=false} +% % \def\pscustom{\pst@object{pscustom}} \long\def\pscustom@i#1{% @@ -1805,7 +1807,7 @@ } \def\pscurve@ii{% \addto@pscode{ - \pst@cp % current point + \ifPst@noCurrentPoint\else\pst@cp\fi % current point \psk@curvature\space /c ED /b ED /a ED \ifshowpoints true \else false \fi \ifx\pslinestyle\psls@@symbol \psls@symbol OpenSymbolCurve \else \tx@OpenCurve \fi @@ -2070,7 +2072,7 @@ \ifx\pslinestyle\psls@@symbol\addto@pscode{ \psls@symbol SymbolLine }% \else% \addto@pscode{ - \pst@cp % current point + \ifPst@noCurrentPoint\else\pst@cp\fi % current point? \psline@iii % arc and lineto type \tx@Line % .pro function }% @@ -2153,7 +2155,7 @@ /xS yA yB sub mBC xB mul add mA xA mul sub mBC mA sub div def /yS mBC xS xB sub mul yB add def xS yS xA yA - \pst@cp % current point + \ifPst@noCurrentPoint\else\pst@cp\fi % current point \psline@iii % arc and lineto type \tx@Line % .pro function }% @@ -2266,7 +2268,7 @@ } \def\psbezier@ii{% \addto@pscode{ - \pst@cp + \ifPst@noCurrentPoint\else\pst@cp\fi \ifshowpoints true \else false \fi \ifx\pslinestyle\psls@@symbol \psls@symbol OpenSymbolBezier \else @@ -3416,7 +3418,7 @@ pop \def\getref@r{\def\psk@xref{1}} \psset[pstricks]{ref=c} % -\def\pst@rotlist{ mark RAngle /a ED cleartomark a neg } +\def\pst@rotlist{ mark RAngle /ps@a ED cleartomark ps@a neg } \def\pst@rottable{% @0=% @U=% @@ -3427,6 +3429,7 @@ pop @W=\pst@rotlist 90 add % @S=\pst@rotlist 180 add % @E=\pst@rotlist 90 sub } +% \define@key[psset]{pstricks}{rot}[0]{% \pst@expandafter{\@ifnextchar*{\psset@@@rot}{\psset@@rot}}{#1}\@nil} \def\psset@@rot#1\@nil{% @@ -3434,12 +3437,12 @@ pop \ifx##2\relax\pst@getangle{#1}\psk@rot \else\def\psk@rot{##2}\fi% \pst@Verb{ gsave STV CP T /ps@rot \ifx\psk@rot\@empty 0 \else \psk@rot \fi def grestore }% (MJS) }% - \expandafter\next\pst@rottable @#1=\relax @\@nil% - } + \expandafter\next\pst@rottable @#1=\relax @\@nil} % \def\psset@@@rot#1#2\@nil{% - \psset@@rot#2\@nil - \edef\psk@rot{\pst@rotlist \ifx\psk@rot\@empty\else ps@rot add \fi}}% (MJS) + \psset@@rot#2\@nil% + \edef\psk@rot{\pst@rotlist \ifx\psk@rot\@empty\else\space ps@rot add \fi}% + \pst@Verb{ gsave STV CP T /ps@rot \ifx\psk@rot\@empty 0 \else \psk@rot \fi def grestore }}% (MJS) % %\def\psset@@rot#1\@nil{% %\def\ps@next##1@#1=##2@##3\@nil{% diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty index e4dda9821d4..9f71b371508 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/06/17 v0.45 LaTeX wrapper for `PSTricks' (RN,HV)] + [2010/08/28 v0.46 LaTeX wrapper for `PSTricks' (RN,HV)] % \def\documentclass{% \edef\@tempa{\jobname.tex }% @@ -36,7 +36,7 @@ \newif\ifpst@OldVersion\pst@OldVersionfalse \DeclareOption{97}{\pst@OldVersiontrue} \newif\ifpst@PDF\pst@PDFfalse -\DeclareOption{pdf}{\pst@PDFtrue} +\DeclareOption{pdf}{\global\pst@PDFtrue} %------------------------------------ PLAIN -------------------------------- \DeclareOption{plain}{% \ifpst@OldVersion @@ -55,6 +55,19 @@ \ProcessOptions\relax +\ifpst@PDF + \typeout{>>> Loading package auto-pst-pdf <<<} + \AtBeginDocument{\usepackage{auto-pst-pdf}}% + \ifnum\pdfshellescape=\@ne\else + \PackageWarningNoLine{pstricks}{% +************************************ \MessageBreak + Option pdf needs a "pdflatex -shell-escape " \MessageBreak + or a "pdflatex -enable-write18 " \MessageBreak + (if you are using MikTeX) \MessageBreak +************************************} + \fi% +\fi + \@ifundefined{PSTricksLoaded} {% \let\saved@scalebox\scalebox @@ -89,17 +102,6 @@ \let\scalebox\saved@scalebox }{} % -\ifpst@PDF - \ifnum\pdfshellescape=\@ne\else - \PackageWarningNoLine{pstricks}{% -************************************ \MessageBreak - Option pdf needs a "pdflatex -shell-escape " \MessageBreak - or a "pdflatex -enable-write18 " \MessageBreak - (if you are using MikTeX) \MessageBreak -************************************} - \fi% - \RequirePackage{auto-pst-pdf}% -\fi % \IfFileExists{xcolor.sty}{% \def\pst@ColorPackage{xcolor} -- cgit v1.2.3