summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-06-03 21:59:12 +0000
committerKarl Berry <karl@freefriends.org>2009-06-03 21:59:12 +0000
commite5b463a418828fe374d912ea76fb9761bbcbadf8 (patch)
treefb97229ddd891d332c1e7408a7ebb3d60dcf1d93
parente456a279e3cf0cedc71d29f7b8eac5c3b0998a5c (diff)
pstricks update (3jun09)
git-svn-id: svn://tug.org/texlive/trunk@13614 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Changes.generic3
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pst-plot.tex99
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
3 files changed, 47 insertions, 56 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
index 23362149669..2ac8287509a 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.generic
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
@@ -1,4 +1,5 @@
pstricks.tex --------
+1.28 2009-03-17 - fix spurious blank for \SpecialCoor
1.27 2009-01-25 - updated \pssetlength to check for special coor
- renamed internal \next to \ps@next to prevent problems
with other packages
@@ -77,11 +78,11 @@ pst-node.tex --------
pst-plot.tex --------
+1.03 2009-06-01 - fix bug with \ifdim\nA pt, must be sp
1.02 2008-11-24 - add PostScript variable ps@Exit for exit the loop
for \psplot and \psparametricplot
- add new names \psparametricplot, \psdataplot,...
the old names still work
- - add new option yMaxVal for plotting discontinued functions
1.01 2008-01-26 - make negative Dx/Dy work (hv)
1.00 2007-06-26 - added two new line style LineToXaxis/LineToYaxis (hv)
diff --git a/Master/texmf-dist/tex/generic/pstricks/pst-plot.tex b/Master/texmf-dist/tex/generic/pstricks/pst-plot.tex
index 0c0bd221216..86b59f11ad4 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pst-plot.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pst-plot.tex
@@ -1,6 +1,7 @@
+%% $Id: pst-plot.tex 119 2009-06-03 07:37:40Z herbert $
%% BEGIN pst-plot.tex
%%
-%% Plots and axes with PSTricks 97.
+%% Plots and axes with PSTricks
%% See the PSTricks User's Guide for documentation.
%%
%%
@@ -13,25 +14,17 @@
%%
\csname PSTplotLoaded\endcsname
\let\PSTplotLoaded\endinput
-
-\ifx\PSTricksLoaded\endinput\else
- \def\next{\input pstricks.tex }
- \expandafter\next
-\fi
-
-\ifx\MultidoLoaded\endinput\else
- \def\next{\input multido.tex }
- \expandafter\next
-\fi
-
+%
+\ifx\PSTricksLoaded\endinput\else\input pstricks.tex \fi
+\ifx\MultidoLoaded\endinput\else \input multido.tex \fi
+%
\def\fileversion{1.03}
-\def\filedate{2008/11/24}
+\def\filedate{2009/06/01}
\message{ v\fileversion, \filedate}
-
-
+%
\edef\TheAtCode{\the\catcode`\@}
\catcode`\@=11
-
+%
% Using lists of data is optimized for \dataplot and \fileplot
% Here is the tricky part. As each line is read from file,
% we want to ignore trailing delimiters, and convert arbitrary
@@ -102,7 +95,7 @@ D\space##1%
% \ifnum\Pst@Debug>0 \typeout{==DEBUG== pst-plot:readdata:\string\pst@tempg: \pst@tempg}\fi% hv 2008-02-28
\global\let\pst@tempg\relax
\ignorespaces}
-
+%
\def\pst@readfile#1{{\let\readdata@@\pst@@readfile\readdata\pst@tempg{#1}}}
\def\pst@altreadfile#1{%
\openin1=#1
@@ -124,9 +117,9 @@ D\space##1%
\expandafter\pst@@@altreadfile\pst@tempg\@empty\@nil
\ifeof1\else\expandafter\pst@@@altreadfile\fi}
\def\pst@@@altreadfile#1#2\@nil{\addto@pscode{#1#2}}%
-
+%
\def\savedata#1{\begingroup\pst@datadelimiters\savedata@{#1}}
-
+%
\def\beginplot@line{\begin@OpenObj}
\def\endplot@line{\psline@ii}
\def\beginplot@polygon{\begin@ClosedObj}
@@ -162,7 +155,7 @@ D\space##1%
{\@pstrickserr{Plot style `#1' not defined}\@eha}%
{\edef\psplotstyle{#1}}}
\psset@plotstyle{line}
-
+%
\def\psset@plotpoints#1{%
\pst@cntg=#1\relax
\ifnum\pst@cntg<2
@@ -178,7 +171,7 @@ D\space##1%
% \doqp@<foo> : What to do to subsequent points (PS code only).
% \endqp@<foo> : How to end plot.
% \testqp@<foo> : Set \@psttrue if OK to use quick plot.
-
+%
\def\beginqp@line{\pst@oplineto}
\def\doqp@line{L }
\def\endqp@line{\end@OpenObj}%
@@ -192,7 +185,7 @@ D\space##1%
\fi
\fi
\fi}
-
+%
\def\beginqp@polygon{moveto }
\def\doqp@polygon{L }
\def\endqp@polygon{%
@@ -204,7 +197,7 @@ D\space##1%
\@psttrue
\fi
\fi}
-
+%
\def\beginqp@dots{%
\psk@dotsize
\@nameuse{psds@\psk@dotstyle}
@@ -217,7 +210,7 @@ D\space##1%
% DG/SR modification end
\def\endqp@dots{\end@SpecialObj}
\def\testqp@dots{\@psttrue}
-
+%
\def\beginqp@bezier{/n 0 def \pst@oplineto}
\def\doqp@bezier{/n n 1 add def n 3 mod 0 eq { curveto } if }
\def\endqp@bezier{%
@@ -231,7 +224,7 @@ D\space##1%
\fi
\fi
\fi}
-
+%
\def\beginqp@cbezier{/n 0 def moveto }
\def\doqp@cbezier{\doqp@bezier}
\def\endqp@cbezier{%
@@ -275,7 +268,6 @@ n 0 eq not
L
pop pop } if}>
% end (hv) --------------------------------------------------------------
-
%
\def\psdataplot{\def\pst@par{}\pst@object{dataplot}}
\def\dataplot{\def\pst@par{}\pst@object{dataplot}}
@@ -306,7 +298,7 @@ n 0 eq not
#1% % this is \pst@readfile{#1} for fileplot
\addto@pscode{ D }%
\@nameuse{endqp@\psplotstyle}}
-
+%
\def\psfileplot{\def\pst@par{}\pst@object{fileplot}}
\def\fileplot{\def\pst@par{}\pst@object{fileplot}}
\def\fileplot@i#1{%
@@ -318,13 +310,13 @@ n 0 eq not
\if@pst\dataplot@ii{\pst@readfile{#1}}\else\listplot@ii{\pst@altreadfile{#1}}\fi%
\endgroup%
\ignorespaces}
-
+%
\pst@def{ScalePoints}<%
/y ED /x ED
counttomark dup dup cvi eq not { exch pop } if
/m exch def /n m 2 div cvi def
n { y mul m 1 roll x mul m 1 roll /m m 2 sub def } repeat>
-
+%
\def\pslistplot{\def\pst@par{}\pst@object{listplot}}
\def\listplot{\def\pst@par{}\pst@object{listplot}}
\def\listplot@i#1{\listplot@ii{\addto@pscode{#1}}}
@@ -334,12 +326,11 @@ n 0 eq not
#1%
\addto@pscode{\pst@number\psxunit \pst@number\psyunit \tx@ScalePoints}%
\@nameuse{endplot@\psplotstyle}}
-
+%
% \psplot
-
\def\psplotinit#1{\xdef\psplot@init{#1 }}
\def\psplot@init{}
-
+%
\def\psplot{\def\pst@par{}\pst@object{psplot}}
\def\psplot@i#1#2#3{%
\pst@killglue
@@ -393,7 +384,7 @@ n 0 eq not
xy
n 2 roll}%
\@nameuse{endplot@\psplotstyle}}
-
+%
\def\psparametricplot{\def\pst@par{}\pst@object{parametricplot}}% hv 2008-11-22
\def\parametricplot{\def\pst@par{}\pst@object{parametricplot}}
\def\parametricplot@i#1#2#3{%
@@ -449,9 +440,9 @@ n 0 eq not
xy
n 2 roll}%
\@nameuse{endplot@\psplotstyle}}
-
+%
% These axes macros are complicated. Be careful.
-
+%
% \pst@ticks{angle}{dx}{n}{int}
% int=1 if ticks appear on top of axes, 0 otherwise.
\def\pst@ticks#1#2#3#4{%
@@ -473,11 +464,10 @@ n 0 eq not
/x dx def
n { x y1 moveto x y2 lineto stroke /x x dx add def } repeat}%
\end@SpecialObj}
-
-
+%
\def\psset@ticksize#1{\pst@getlength{#1}\psk@ticksize}
\psset@ticksize{3pt}
-
+%
\def\psset@tickstyle#1{\pst@expandafter\psset@@tickstyle{#1}\@nil}
\def\psset@@tickstyle#1#2\@nil{%
\ifx#1f\let\psk@tickstyle\z@\else
@@ -486,7 +476,7 @@ n 0 eq not
\@pstrickserr{Bad tick style: `#1#2'}\@ehpa
\fi\fi\fi}
\psset@tickstyle{full}
-
+%
\def\psset@ticks#1{\pst@expandafter\psset@@ticks{#1}\@nil\psk@ticks}
\def\psset@@ticks#1#2\@nil#3{%
\ifx#1a\let#3\z@\else
@@ -496,10 +486,10 @@ n 0 eq not
\@pstrickserr{Bad argument: `#1#2'}\@ehpa
\fi\fi\fi\fi}
\psset@ticks{all}
-
+%
\def\psset@labels#1{\pst@expandafter\psset@@ticks{#1}\@nil\psk@labels}
\psset@labels{all}
-
+%
\def\psset@Ox#1{\edef\psk@Ox{#1}}
\psset@Ox{0}
\def\psset@Dx#1{\edef\psk@Dx{#1}}
@@ -508,7 +498,7 @@ n 0 eq not
\pssetxlength\pst@dimg{#1}%
\edef\psk@dx{\number\pst@dimg}}
\psset@dx{0}
-
+%
\def\psset@Oy#1{\edef\psk@Oy{#1}}
\psset@Oy{0}
\def\psset@Dy#1{\edef\psk@Dy{#1}}
@@ -517,12 +507,11 @@ n 0 eq not
\pssetylength\pst@dimg{#1}%
\edef\psk@dy{\number\pst@dimg}}
\psset@dy{0}
-
+%
\newif\ifshoworigin
\def\psset@showorigin#1{\@nameuse{showorigin#1}}
\psset@showorigin{true}
-
-
+%
\def\psaxes{\def\pst@par{}\pst@object{psaxes}}
\def\psaxes@i{\pst@getarrows\psaxes@ii}
\def\psaxes@ii(#1){\@ifnextchar({\psaxes@iii(#1)}{\psaxes@iv(0,0)(0,0)(#1)}}
@@ -591,7 +580,7 @@ n 0 eq not
\pssetylength\pst@dimh{#2}%
\leavevmode\psput@cartesian\pst@hbox
\ignorespaces}
-
+%
\def\psxs@axes{%
\psxs@@axes\pst@dima\pst@dimc{}%
\psxs@@axes\pst@dimb\pst@dimd{exch}}
@@ -616,7 +605,7 @@ n 0 eq not
pop pop}%
\pst@stroke
\end@SpecialObj}
-
+%
\def\psxs@frame{%
\begin@SpecialObj
\addto@pscode{%
@@ -633,9 +622,9 @@ n 0 eq not
{\@pstrickserr{Axes style `#1' not defined}\@eha}%
{\edef\psk@axesstyle{#1}}}
\psset@axesstyle{axes}
-
+%
\def\psxs@none{\let\psk@arrowA\@empty\let\psk@arrowB\@empty}
-
+%
% The origin is never the only label.
\def\pst@hlabels#1#2{%
\ifdim#1=\z@\else
@@ -651,7 +640,7 @@ n 0 eq not
\showoriginfalse
\fi
\fi}
-
+%
% Knows \pst@dimb and \pst@cnta
\def\pst@@hlabels{%
\vbox to\z@{%
@@ -669,7 +658,7 @@ n 0 eq not
\ifdim\pst@dimd>\z@\vss\else\vskip\pslabelsep\fi}}%
\def\pshlabel#1{$#1$}
-
+%
\def\pst@vlabels#1#2{%
\ifdim#1=\z@\else
\ifx#2\empty\else
@@ -686,7 +675,7 @@ n 0 eq not
\showoriginfalse
\fi
\fi}
-
+%
% Knows \pst@dima and \pst@cnta
\def\pst@@vlabels{%
\vbox to\z@{%
@@ -705,12 +694,12 @@ n 0 eq not
{\pst@cnta}%
{\vbox to\pst@dima{\vss}\vbox to \z@{\vss\hbox to\z@{%
\ifdim\pst@dimc>\z@\hss\else\hskip\pslabelsep\fi
- \ifdim\nA pt=\z@ \psvlabel{0}\else\psvlabel{\nA}\fi% prevent -0, doesn't work with \ifnum
+ \ifdim\nA sp=\z@ \psvlabel{0}\else\psvlabel{\nA}\fi% prevent -0, doesn't work with \ifnum
\ifdim\pst@dimc>\z@\hskip\pslabelsep\else\hss\fi}\vss}}%
\vss}}
-
+%
\def\psvlabel#1{$#1$}
-
+%
\catcode`\@=\TheAtCode\relax
\endinput
%%
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 8a4abfdc6a1..2a6205d4420 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -397,6 +397,7 @@ chdir $startdir || die "chdir($startdir) failed: $!"; # back to raw
'progkeys', "die 'skipping, noinfo license, author unfindable'",
'proofs', "die 'skipping, nosell license'",
'prosper', '&MAKEflatten',
+ 'ps2eps', "die 'skipping, must go into sources'",
'ps4pdf', "die 'skipping, obsolete'",
'psfig', "die 'skipping, nosell license'",
'psfragx', "&MAKEflatten",