diff options
author | Karl Berry <karl@freefriends.org> | 2010-11-04 22:54:05 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-11-04 22:54:05 +0000 |
commit | 97feaccaf34dfd3ad2d01c2d31a71d82a3a2e845 (patch) | |
tree | 5e556502b772770c3feb79a4c648005fab2d5609 /Master | |
parent | bb64659eb013780c07781bc90d37b77be7189782 (diff) |
pstricks 2.13 (3nov10)
git-svn-id: svn://tug.org/texlive/trunk@20315 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/Changes | 1 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/Changes.generic | 11 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/Changes.latex | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/pst-doc.cls | 8 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/pst-news10.pdf | bin | 523763 -> 530771 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/pst-news10.tex | 24 | ||||
-rw-r--r-- | Master/texmf-dist/dvips/pstricks/pst-dots97.pro | 132 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/pstPlain.tex | 5 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/pstricks.tex | 102 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pstricks/pstricks.sty | 43 |
10 files changed, 299 insertions, 29 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes b/Master/texmf-dist/doc/generic/pstricks/Changes index bc99d21eb73..3472649cd57 100644 --- a/Master/texmf-dist/doc/generic/pstricks/Changes +++ b/Master/texmf-dist/doc/generic/pstricks/Changes @@ -1,3 +1,4 @@ +2010-11-03 - extensions to pst-doc.cls v 0.16 2010-05-15 - extensions to pst-doc.cls v 0.15 2010-01-04 - extensions to pst-doc.cls v 0.14 2009-12-08 - extensions to pst-doc.cls diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic index 276651d595c..179b5490460 100644 --- a/Master/texmf-dist/doc/generic/pstricks/Changes.generic +++ b/Master/texmf-dist/doc/generic/pstricks/Changes.generic @@ -1,4 +1,15 @@ pstricks.tex -------- +2.13 2010-11-01 - new macro and counter for the type of read coordinates + \pstCheckCoorType{#1} sets the macro \pst@C@@rType +% \pst@C@@rType = 0 cartesian (x,y) +% = 1 polar (r;phi) +% = 2 PS (! x y) +% = 3 mixed ((x,y)|(x,y)) +% = 4 algebraic (*x f(x)) +% = 5 node (A) +% = 6 special node ([...]A) +% = 7 node (>A) + 2.12 2010-09-16 - new optional argument for setflat - fix bug with doubled linecap definition - fix bug with missing linejoin in \psls@solid diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.latex b/Master/texmf-dist/doc/generic/pstricks/Changes.latex index 3c2f1f34c7b..9fc9cfc49ad 100644 --- a/Master/texmf-dist/doc/generic/pstricks/Changes.latex +++ b/Master/texmf-dist/doc/generic/pstricks/Changes.latex @@ -1,4 +1,6 @@ pstricks.sty -------- +0.47 2010-09-18 - fix bug with option 97, load pstricks97.pro and + pst-dots97.pro 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 diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-doc.cls b/Master/texmf-dist/doc/generic/pstricks/pst-doc.cls index c44d5983d24..2758aa299ad 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 327 2010-05-24 15:54:43Z herbert $ +% $Id: pst-doc.cls 413 2010-11-03 20:06:24Z herbert $ % %% %% The PSTricks Project @@ -15,11 +15,12 @@ %% % \listfiles -\ProvidesClass{pst-doc}[2010/05/15 v 0.15 PSTricks documentation class (hv)] +\ProvidesClass{pst-doc}[2010/11/03 v 0.16 PSTricks documentation class (hv)] \DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}} \ProcessOptions\relax % -\LoadClass[titlepage,DIV13]{scrartcl} +\LoadClass[%titlepage, +DIV13]{scrartcl} % \RequirePackage[dvipsnames,x11names,svgnames,table]{xcolor} \RequirePackage[T1]{fontenc} @@ -399,6 +400,7 @@ \def\OptArg{\@ifnextchar*\OptArg@i{\OptArg@ii*}}% star version without braces \def\OptArg@i*#1{\colorbox{black!20}{\texttt{#1}}\kern1pt} \def\OptArg@ii*#1{\colorbox{black!20}{\texttt{[#1]}}\kern1pt} +\def\DBS{{\ttfamily\textbackslash\textbackslash}} \def\docauthor#1{\gdef\@docauthor{#1}} \docauthor{} diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news10.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news10.pdf Binary files differindex 151df5f09ef..02206673830 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news10.pdf +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news10.pdf diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news10.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news10.tex index 23804d0f6c2..28f430967e5 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news10.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news10.tex @@ -68,6 +68,30 @@ run. \section{\texttt{pstricks.tex} (\pstricksFV -- \pstricksFD)} %-------------------------------------------------------------------------------------- +\subsection{Coordinates} +With the setting \Lcs{SpecialCoor} the package allows different kinds of coordinates. +The macro \Lcs{uput} can now be used in a different way. +The default behaviour for nodes with a relative point puts its argument \emph{without} rotation +on the line $\overline{AB}$. When using the prefix > before the node or the $x$-value for +cartesian coordinates, the behaviour is different. Now the angle between the line $\overline{OB}$ +and the horizontal line +is taken into account and the placement of the argument of \Lcs{uput} is different to +the default behaviour. + +\begin{LTXexample}[width=6cm,wide=true] +\begin{pspicture}[showgrid](5,6) +\pnode(0,4){A}\psdot(A) +\pnode(3,2){B}\psdot(B) +\psline(A)(B) +\psline[linestyle=dashed](A)(3,4) +\psline[linestyle=dashed](A)(3,6) +\psline[linestyle=dashed](B) +\uput{1cm}[(B)](A){foo} +\uput{1cm}[(B)](>A){bar} +\end{pspicture} +\end{LTXexample} + + \subsection{New optional arguments} The new arguments are only valid for the macros \Lcs{psellipse}, \Lcs{pscircle}, \Lcs{psarc}. \Lcs{psellipticarc}, \Lcs{pscurve}, \Lcs{psplot}, and \Lcs{psparametricplot}. diff --git a/Master/texmf-dist/dvips/pstricks/pst-dots97.pro b/Master/texmf-dist/dvips/pstricks/pst-dots97.pro new file mode 100644 index 00000000000..8c83b963525 --- /dev/null +++ b/Master/texmf-dist/dvips/pstricks/pst-dots97.pro @@ -0,0 +1,132 @@ +%!PS-Adobe-2.0 +%%Title: Dot Font for PSTricks +%%Creator: Timothy Van Zandt <tvz@Princeton.EDU> +%%Creation Date: May 7, 1993 +%% Version 97 patch 1, 99/12/16 +%% Modified by Etienne Riga <etienne.riga@skynet.be> - Dec. 16, 1999 +%% to add /Diamond, /SolidDiamond and /BoldDiamond +10 dict dup begin + /FontType 3 def + /FontMatrix [ .001 0 0 .001 0 0 ] def + /FontBBox [ 0 0 0 0 ] def + /Encoding 256 array def + 0 1 255 { Encoding exch /.notdef put } for + Encoding + dup (b) 0 get /Bullet put + dup (c) 0 get /Circle put + dup (C) 0 get /BoldCircle put + dup (u) 0 get /SolidTriangle put + dup (t) 0 get /Triangle put + dup (T) 0 get /BoldTriangle put + dup (r) 0 get /SolidSquare put + dup (s) 0 get /Square put + dup (S) 0 get /BoldSquare put + dup (q) 0 get /SolidPentagon put + dup (p) 0 get /Pentagon put + dup (P) 0 get /BoldPentagon put +% DG/SR modification begin - Dec. 16, 1999 - From Etienne Riga + dup (l) 0 get /SolidDiamond put + dup (d) 0 get /Diamond put + (D) 0 get /BoldDiamond put +% DG/SR modification end + /Metrics 13 dict def + Metrics begin + /Bullet 1000 def + /Circle 1000 def + /BoldCircle 1000 def + /SolidTriangle 1344 def + /Triangle 1344 def + /BoldTriangle 1344 def + /SolidSquare 886 def + /Square 886 def + /BoldSquare 886 def + /SolidPentagon 1093.2 def + /Pentagon 1093.2 def + /BoldPentagon 1093.2 def +% DG/SR modification begin - Dec. 16, 1999 - From Etienne Riga + /SolidDiamond 1008 def + /Diamond 1008 def + /BoldDiamond 1008 def +% DG/SR modification end + /.notdef 0 def + end + /BBoxes 13 dict def + BBoxes begin + /Circle { -550 -550 550 550 } def + /BoldCircle /Circle load def + /Bullet /Circle load def + /Triangle { -571.5 -330 571.5 660 } def + /BoldTriangle /Triangle load def + /SolidTriangle /Triangle load def + /Square { -450 -450 450 450 } def + /BoldSquare /Square load def + /SolidSquare /Square load def + /Pentagon { -546.6 -465 546.6 574.7 } def + /BoldPentagon /Pentagon load def + /SolidPentagon /Pentagon load def +% DG/SR modification begin - Dec. 16, 1999 - From Etienne Riga + /Diamond { -428.5 -742.5 428.5 742.5 } def + /BoldDiamond /Diamond load def + /SolidDiamond /Diamond load def +% DG/SR modification end + /.notdef { 0 0 0 0 } def + end + /CharProcs 20 dict def + CharProcs begin + /Adjust { + 2 copy dtransform floor .5 add exch floor .5 add exch idtransform + 3 -1 roll div 3 1 roll exch div exch scale + } def + /CirclePath { 0 0 500 0 360 arc closepath } def + /Bullet { 500 500 Adjust CirclePath fill } def + /Circle { 500 500 Adjust CirclePath .9 .9 scale CirclePath + eofill } def + /BoldCircle { 500 500 Adjust CirclePath .8 .8 scale CirclePath + eofill } def + /BoldCircle { CirclePath .8 .8 scale CirclePath eofill } def + /TrianglePath { 0 660 moveto -571.5 -330 lineto 571.5 -330 lineto + closepath } def + /SolidTriangle { TrianglePath fill } def + /Triangle { TrianglePath .85 .85 scale TrianglePath eofill } def + /BoldTriangle { TrianglePath .7 .7 scale TrianglePath eofill } def + /SquarePath { -450 450 moveto 450 450 lineto 450 -450 lineto + -450 -450 lineto closepath } def + /SolidSquare { SquarePath fill } def + /Square { SquarePath .89 .89 scale SquarePath eofill } def + /BoldSquare { SquarePath .78 .78 scale SquarePath eofill } def + /PentagonPath { + -337.8 -465 moveto + 337.8 -465 lineto + 546.6 177.6 lineto + 0 574.7 lineto + -546.6 177.6 lineto + closepath + } def + /SolidPentagon { PentagonPath fill } def + /Pentagon { PentagonPath .89 .89 scale PentagonPath eofill } def + /BoldPentagon { PentagonPath .78 .78 scale PentagonPath eofill } def +% DG/SR modification begin - Dec. 16, 1999 - From Etienne Riga + /DiamondPath { 0 742.5 moveto -428.5 0 lineto 0 -742.5 lineto + 428.5 0 lineto closepath } def + /SolidDiamond { DiamondPath fill } def + /Diamond { DiamondPath .85 .85 scale DiamondPath eofill } def + /BoldDiamond { DiamondPath .7 .7 scale DiamondPath eofill } def +% DG/SR modification end + /.notdef { } def + end + /BuildGlyph { + exch + begin + Metrics 1 index get exec 0 + BBoxes 3 index get exec + setcachedevice + CharProcs begin load exec end + end + } def + /BuildChar { + 1 index /Encoding get exch get + 1 index /BuildGlyph get exec + } bind def +end +/PSTricksDotFont exch definefont pop +%END pst-dots.pro diff --git a/Master/texmf-dist/tex/generic/pstricks/pstPlain.tex b/Master/texmf-dist/tex/generic/pstricks/pstPlain.tex new file mode 100644 index 00000000000..243413cede7 --- /dev/null +++ b/Master/texmf-dist/tex/generic/pstricks/pstPlain.tex @@ -0,0 +1,5 @@ +%\input pst-xkey +\input pstricks +This is a test +\bye + diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index 084e7a17e9c..05f5a9efc3c 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -65,8 +65,8 @@ \pst@addfams{pstricks} \ifx\PSTFPloaded\endinput\else \input pst-fp.tex\fi % -\def\fileversion{2.12} -\def\filedate{2010/09/16} +\def\fileversion{2.13} +\def\filedate{2010/11/01} % % stolen from latex.ltx to make it TeX compatible \newcount\psLoopIndex @@ -670,6 +670,9 @@ \edef\pst@coors{\pst@coor\pst@coors}% \@ifnextchar({\pst@@getcoors}{\pst@aftercoors}% } +% +\newcount\pst@C@@rType% 0: default cartesian coordinates and angles +% \def\pst@getangle#1#2{\pst@@getangle{#1}\let#2\pst@angle} \def\pst@angle{0 } % @@ -680,6 +683,7 @@ } \def\NormalCoor{% \def\pst@@getcoor##1{\pst@expandafter\cartesian@coor{##1},\relax,\@nil}% + \def\pstCheckCoorType##1{\global\pst@C@@rType=0}% \Pst@SpecialLengthfalse \def\pssetlength##1##2{% \let\@psunit\psunit @@ -710,6 +714,15 @@ \xdef\pst@tempg{##1}% \endgroup% \expandafter\special@coor\pst@tempg||\@nil}% + \def\pstCheckCoorType##1{% + \begingroup% + \pst@activecoor% + \xdef\pst@tempg{##1}% + \endgroup + \psDEBUG[pstCheckCoorType]{:Checking coor \pst@tempg:}% + \expandafter\pst@CheckCoorType\pst@tempg||\@nil% + \psDEBUG[pstCheckCoorType]{::Coor type=\the\pst@C@@rType::}% + }% \def\pssetlength##1##2{% \begingroup% \pst@activecoor% @@ -731,13 +744,60 @@ \catcode`\;=13 \catcode`\!=13 \catcode`\*=13 +\catcode`\>=13 \gdef\pst@activecoor{% \def|{\string|}% \def;{\string;}% \def!{\string!}% \def*{\string*}% algebraic expression hv 2007-11-17 + \def>{\string>}% } \endgroup +% \pst@C@@rType = 0 cartesian (x,y) +% = 1 polar (r;phi) +% = 2 PS (! x y) +% = 3 mixed ((x,y)|(x,y)) +% = 4 algebraic (*x f(x)) +% = 5 node (A) +% = 6 special node ([...]A) +% = 7 node (>A) +\def\pst@CheckCoorType#1|#2|#3\@nil{% + \ifx#3|\relax + \global\pst@C@@rType=3\relax + \else + \expandafter\pst@@CheckCoorType#1;;\@nil% + \fi} +% +\def\pst@@CheckCoorType#1#2;#3;#4\@nil{% + \ifx#1>\relax% node with special rotation for \uput + \global\pst@C@@rType=7\relax% + \else + \ifcat#1a\relax% node names should start with a letter + \global\pst@C@@rType=5\relax% + \else + \ifx#1[\relax% special node coor: [..]A + \global\pst@C@@rType=6\relax% + \else + \ifx#1!\relax% PostScript code: x y + \global\pst@C@@rType=2\relax% + \else + \ifx#1*\relax% algebraic PostScript code: x f(x) + \global\pst@C@@rType=4\relax% + \else + \ifx#3;\relax + \global\pst@C@@rType=1\relax% + \else + \global\pst@C@@rType=0\relax% + \fi + \fi + \fi + \fi + \fi + \fi + \psDEBUG[pstCheckCoorType]{::\the\pst@C@@rType::}% + }% +% +% \def\special@coor#1|#2|#3\@nil{% \ifx#3|\relax \mixed@coor{#1}{#2}% @@ -752,6 +812,9 @@ \ifx#1[\relax% special node coor: [..]A \def\ps@next{\Node@coor[}% \else + \ifx#1>\relax% PostScript code: x y + \def\ps@next{\special@@@@coor}% + \else \ifx#1!\relax% PostScript code: x y \def\ps@next{\raw@coor}% \else @@ -761,7 +824,7 @@ \def\ps@next{\special@@@coor#1}% \fi \fi - \fi + \fi\fi \fi \ps@next% } @@ -772,6 +835,14 @@ \cartesian@coor#1,\relax,\@nil \fi% } +\def\special@@@@coor#1#2;#3;#4\@nil{% + \def\ps@A{A}\def\ps@B{#1}% + \ifcat\ps@A\ps@B\relax% + \node@coor#1#2;;\@nil% + \else% + \cartesian@coor#1#2,\relax,\@nil + \fi% +} \def\mixed@coor#1#2{% \begingroup% % DG/SR modification begin - Oct. 27, 1997 - Patch 6 @@ -3687,18 +3758,19 @@ pop \begingroup% \use@par% \if@star\pst@starbox\fi% + \pstCheckCoorType{#1}% needed for \uput@vii \uput@vi% \psput@{#1}\pst@hbox \endgroup% \ignorespaces} +% \def\uput@vi{% \ifx\psk@uputref\@empty\uput@vii\tx@UUput{}% \else% \ifx\psk@rot\@empty\expandafter\uput@viii\psk@uputref% \else\uput@vii\tx@UUput{}\fi% \fi} - -% Fix \uput@vii +% \def\uput@vii#1#2{% \edef\pst@coor{% \pst@number\pslabelsep @@ -3706,13 +3778,23 @@ pop \pst@number{\wd\pst@hbox}% \pst@number{\ht\pst@hbox}% \pst@number{\dp\pst@hbox}% - ps@refangle % CHANGED (MJS) FROM \psk@refangle\space - \ifx\psk@rot\@empty\else\psk@rot\space sub \fi + \ifnum\pst@C@@rType=7 + ps@refangle % CHANGED (MJS) FROM \psk@refangle\space + \ifx\psk@rot\@empty\else ps@rot\space sub \fi + \else + \psk@refangle\space + \ifx\psk@rot\@empty\else \psk@rot\space sub \fi + \fi \tx@Uput #1}% + %\show\pst@coor \setbox\pst@hbox=\hbox to\z@{\hss\vbox to\z@{\vss\box\pst@hbox\vss}\hss}% - \setbox\pst@hbox=\psput@special\pst@hbox% - \ifx\psk@rot\@empty\else\pst@rotate{ps@rot }\pst@hbox\fi}% (MJS) -% \ifx\psk@rot\@empty\else\pst@rotate\psk@rot\pst@hbox\fi} + \setbox\pst@hbox=\psput@special\pst@hbox + \ifnum\pst@C@@rType=7 + \ifx\psk@rot\@empty\else\pst@rotate{ps@rot }\pst@hbox\fi% CHANGED FROM \psk@rot (MJS) + \else + \ifx\psk@rot\@empty\else\pst@rotate{\psk@rot}\pst@hbox\fi% + \fi} +% % \def\uput@viii#1#2{% \ifnum#1>\z@\relax\ifnum#2>\z@\relax\pslabelsep=.707\pslabelsep\fi\fi% diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty index 9f71b371508..0aa3884b5c7 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/08/28 v0.46 LaTeX wrapper for `PSTricks' (RN,HV)] + [2010/09/18 v0.47 LaTeX wrapper for `PSTricks' (RN,HV)] % \def\documentclass{% \edef\@tempa{\jobname.tex }% @@ -80,21 +80,32 @@ \input{\pst@tempa}% \ProvidesFile{\pst@tempa} [\filedate\space v\fileversion\space `PSTricks' (tvz,hv)] - \input{pst-fp.tex} - \ProvidesFile{pst-fp.tex} - [\filedate\space v\fileversion\space `PST-fp' (hv)] - \IfFileExists{pstricks.pro}{% - \ProvidesFile{pstricks.pro} - [2010/04/24 v. 1.07, PostScript prologue file (hv)] - \@addtofilelist{pstricks.pro}}{}% - \IfFileExists{pst-dots.pro}{% - \ProvidesFile{pst-dots.pro} - [2006/12/19 v. 2.00, PostScript prologue file (hv)] - \@addtofilelist{pst-dots.pro}}{}% - \IfFileExists{pst-algparser.pro}{% - \ProvidesFile{pst-algparser.pro} - [2008/01/01 v. 0.01, PostScript prologue file (hv)] - \@addtofilelist{pst-algparser.pro}}{}% + \ifpst@OldVersion + \IfFileExists{pstricks97.pro}{% + \ProvidesFile{pstricks97.pro}% + [1998/06/01 v. 97 patch 3, PostScript prologue file (hv)] + \@addtofilelist{pstricks97.pro}}{}% + \IfFileExists{pst-dots97.pro}{% + \ProvidesFile{pst-dots97.pro} + [1999/12/16 v. 97 patch 1, PostScript prologue file (hv)] + \@addtofilelist{pst-dots97.pro}}{}% + \else + \input{pst-fp.tex} + \ProvidesFile{pst-fp.tex} + [\filedate\space v\fileversion\space `PST-fp' (hv)] + \IfFileExists{pstricks.pro}{% + \ProvidesFile{pstricks.pro} + [2010/04/24 v. 1.07, PostScript prologue file (hv)] + \@addtofilelist{pstricks.pro}}{}% + \IfFileExists{pst-dots.pro}{% + \ProvidesFile{pst-dots.pro} + [2006/12/19 v. 2.00, PostScript prologue file (hv)] + \@addtofilelist{pst-dots.pro}}{}% + \IfFileExists{pst-algparser.pro}{% + \ProvidesFile{pst-algparser.pro} + [2008/01/01 v. 0.01, PostScript prologue file (hv)] + \@addtofilelist{pst-algparser.pro}}{}% + \fi {% \let\psscalebox\scalebox \let\psscaleboxto\scaleboxto |