diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/Changes.doc | 1 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/pstnews1-15.pdf | bin | 0 -> 87104 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/pstnews1-15.tex | 204 | ||||
| -rw-r--r-- | Master/texmf-dist/dvips/pstricks/Changes | 5 | ||||
| -rw-r--r-- | Master/texmf-dist/dvips/pstricks/pst-dots.pro | 209 | ||||
| -rw-r--r-- | Master/texmf-dist/dvips/pstricks/pstricks.pro | 16 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/Changes | 1 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/pstricks.tex | 113 | ||||
| -rw-r--r-- | Master/texmf-dist/tpm/pstricks.tpm | 10 | ||||
| -rw-r--r-- | Master/texmf/lists/pstricks | 2 |
10 files changed, 414 insertions, 147 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.doc b/Master/texmf-dist/doc/generic/pstricks/Changes.doc index 6dc949ade76..8e031bdd9bb 100644 --- a/Master/texmf-dist/doc/generic/pstricks/Changes.doc +++ b/Master/texmf-dist/doc/generic/pstricks/Changes.doc @@ -1 +1,2 @@ 2005-12-22 new files pstnews1-14.tex|pdf +2006-12-19 new files pstnews1-15.tex|pdf diff --git a/Master/texmf-dist/doc/generic/pstricks/pstnews1-15.pdf b/Master/texmf-dist/doc/generic/pstricks/pstnews1-15.pdf Binary files differnew file mode 100644 index 00000000000..ce326dc8e1a --- /dev/null +++ b/Master/texmf-dist/doc/generic/pstricks/pstnews1-15.pdf diff --git a/Master/texmf-dist/doc/generic/pstricks/pstnews1-15.tex b/Master/texmf-dist/doc/generic/pstricks/pstnews1-15.tex new file mode 100644 index 00000000000..7a1b54508c3 --- /dev/null +++ b/Master/texmf-dist/doc/generic/pstricks/pstnews1-15.tex @@ -0,0 +1,204 @@ +\documentclass[12pt]{article} +\usepackage[T1]{fontenc} +\usepackage[latin1]{inputenc} +%\usepackage{geometry} +\usepackage{pst-all} +\usepackage{showexpl} +\usepackage{tabularx,array,longtable} +\SpecialCoor +\usepackage[colorlinks,linktocpage]{hyperref} +\def\UrlFont{\small\ttfamily} +\makeatletter +\def\verbatim@font{\small\normalfont\ttfamily} +\makeatother +%\usepackage{color} +\definecolor{hellgelb}{rgb}{1,1,0.8} +\definecolor{colKeys}{rgb}{0,0,1} +\definecolor{colIdentifier}{rgb}{0,0,0} +\definecolor{colComments}{rgb}{1,0,0} +\definecolor{colString}{rgb}{0,0.5,0} +% +\usepackage{listings} +\lstset{% + language=PSTricks,% + float=hbp,% + basicstyle=\ttfamily\small, % + identifierstyle=\color{colIdentifier}, % + keywordstyle=\color{colKeys}, % + stringstyle=\color{colString}, % + commentstyle=\color{colComments}, % + columns=flexible, % + tabsize=4, % + frame=single, % + extendedchars=true, % + showspaces=false, % + showstringspaces=false, % + numbers=left, % + numberstyle=\tiny, % + breaklines=true, % +% backgroundcolor=\color{hellgelb}, % + breakautoindent=true, % + captionpos=b,% + xleftmargin=0pt% +} + +%\parindent=0pt +\newcommand\verbI[1]{{\small\texttt{#1}}} +\newcommand\CMD[1]{{\texttt{\textbackslash#1}}} +\let\Lcs\CMD +% +%\psset{subgriddiv=0,griddots=5,gridlabels=7pt} +% +\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}} +\def\PS{PostScript} +% +\begin{document} +\title{\texttt{PSTricks -- version 1.15}\\new macros and bugfixes for \texttt{pstricks}} +\author{Herbert Voß\thanks{% +\url{Herbert.Voss@pstricks.de}}} +\date{\today} + +\maketitle + +\begin{abstract} +This new version of \texttt{pstricks.tex} depends on the also new prologue file +\texttt{pstricks.pro} (v 1.01) and pst-dots.pro (v. 2.00), which should go into +the local \TeX-directory \url{$TEXMFLOCAL/dvips/}. +\end{abstract} + + +\tableofcontents + +\clearpage +%-------------------------------------------------------------------------------------- +\section{linecap} +%-------------------------------------------------------------------------------------- +This was already introduced with version 1.14, but I forgot to mentioned it. +For the line ends one can use the ,,arrows``{} \texttt{c-c}, but only for the ends. For dashed +lines the option \verb+linecap+ can be set to the value 1 to get the dashes with +rounded ends, too. + +\begin{pspicture}(5,3) +\psline[linestyle=dashed,linewidth=8pt,dash=5mm 5mm,linecap=2](0,2.5)(5,2.5) +\psline[linestyle=dashed,linewidth=8pt,dash=5mm 5mm,linecap=1](0,1.5)(5,1.5) +\psline[linestyle=dashed,linewidth=8pt,dash=5mm 5mm](0,0.5)(5,0.5) +\end{pspicture} + +\begin{lstlisting} +\begin{pspicture}(5,3) +\psline[linestyle=dashed,linewidth=8pt,dash=5mm 5mm,linecap=2](0,2.5)(5,2.5) +\psline[linestyle=dashed,linewidth=8pt,dash=5mm 5mm,linecap=1](0,1.5)(5,1.5) +\psline[linestyle=dashed,linewidth=8pt,dash=5mm 5mm](0,0.5)(5,0.5) +\end{pspicture} +\end{lstlisting} + +It is obvious that only the value 1 makes sense for the dashed lines. + +\section{Dots} +Long time ago, Etienne Riga sent the code for some new dotstyles +which are now part of pstricks. + +\psset{dotscale=1.5} +\let\Loption\texttt +\def\multiDot#1{\multido{\nA=0+1}{3}{\psdot[dotstyle=#1]\kern1em}} +\def\cmultiDot#1{\multido{\nA=0+1}{3}{\psdot*[dotstyle=#1]\kern1em}}%} +\begin{longtable}{@{}l@{\kern2em}>{\ttfamily}c>{\ttfamily}c| + l@{\kern2em}>{\ttfamily}c>{\ttfamily}c@{}} +\emph{Name} & \Lcs{psdot} & \Lcs{psdot*} & +\emph{Name} & \Lcs{psdot} & \Lcs{psdot*} \\\hline +\endhead +\Loption{*} & \multiDot{*} & \cmultiDot{*} &%\\ +\Loption{o} & \multiDot{o} & \cmultiDot{o}\\ +\Loption{Bo} & \multiDot{Bo} & \cmultiDot{Bo}&%\\ +\Loption{x} & \multiDot{x} & \cmultiDot{x}\\ +\Loption{+} & \multiDot{+} & \cmultiDot{+}&%\\ +\Loption{B+} & \multiDot{B+} & \cmultiDot{B+}\\ +\Loption{Add} & \multiDot{Add} & \cmultiDot{Add}&%\\ +\Loption{BoldAdd} & \multiDot{BoldAdd} & \cmultiDot{BoldAdd}\\ +\Loption{Oplus} & \multiDot{Oplus} & \cmultiDot{Oplus}&%\\ +\Loption{BoldOplus} & \multiDot{BoldOplus} & \cmultiDot{BoldOplus}\\ +\Loption{SolidOplus} & \multiDot{SolidOplus} & \cmultiDot{SolidOplus} & +\Loption{Hexagon} & \multiDot{Hexagon} & \cmultiDot{Hexagon}\\ +\Loption{BoldHexagon} & \multiDot{BoldHexagon} & \cmultiDot{BoldHexagon}& +\Loption{SolidHexagon} & \multiDot{SolidHexagon} & \cmultiDot{SolidHexagon}\\ +\Loption{asterisk} & \multiDot{asterisk} & \cmultiDot{asterisk}&%\\ +\Loption{Basterisk} & \multiDot{Basterisk} & \cmultiDot{Basterisk}\\ +\Loption{Asterisk} & \multiDot{Asterisk} & \cmultiDot{Asterisk}&%\\ +\Loption{BoldAsterisk} & \multiDot{BoldAsterisk} & \cmultiDot{BoldAsterisk}\\ +\Loption{SolidAsterisk} & \multiDot{SolidAsterisk} & \cmultiDot{SolidAsterisk}& +\Loption{oplus} & \multiDot{oplus} & \cmultiDot{oplus}\\ +\Loption{otimes} & \multiDot{otimes} & \cmultiDot{otimes}& +\Loption{Otimes} & \multiDot{Otimes} & \cmultiDot{Otimes}\\ +\Loption{BoldOtimes} & \multiDot{BoldOtimes} & \cmultiDot{BoldOtimes}& +\Loption{SolidOtimes} & \multiDot{SolidOtimes} & \cmultiDot{SolidOtimes}\\ +\Loption{Mul} & \multiDot{Mul} & \cmultiDot{Mul}&%\\ +\Loption{BoldMul} & \multiDot{BoldMul} & \cmultiDot{BoldMul}\\ +\Loption{|} & \multiDot{|} & \cmultiDot{|}&%\\ +\Loption{B|}\iffalse\index{B*@\texttt{B}|}\fi & \multiDot{B|} & \cmultiDot{B|}\\ +\Loption{Bar} & \multiDot{Bar} & \cmultiDot{Bar}&%\\ +\Loption{BoldBar} & \multiDot{BoldBar} & \cmultiDot{BoldBar}\\ +\Loption{Bullet} & \multiDot{Bullet} & \cmultiDot{Bullet}&%\\ +\Loption{Circle} & \multiDot{Circle} & \cmultiDot{Circle}\\ +\Loption{BoldCircle} & \multiDot{BoldCircle} & \cmultiDot{BoldCircle}&%\\ +\Loption{square} & \multiDot{square} & \cmultiDot{square}\\ +\Loption{Bsquare} & \multiDot{Bsquare} & \cmultiDot{Bsquare} & +\Loption{square*} & \multiDot{square*} & \cmultiDot{square*}\\ +\Loption{Square} & \multiDot{Square} & \cmultiDot{Square}&%\\ +\Loption{BoldSquare} & \multiDot{BoldSquare} & \cmultiDot{BoldSquare}\\ +\Loption{SolidSquare} & \multiDot{SolidSquare} & \cmultiDot{SolidSquare}& +\Loption{diamond} & \multiDot{diamond} & \cmultiDot{diamond}\\ +\Loption{Bdiamond} & \multiDot{Bdiamond} & \cmultiDot{Bdiamond}&%\\ +\Loption{diamond*} & \multiDot{diamond*} & \cmultiDot{diamond}\\ +\Loption{Diamond} & \multiDot{Diamond} & \cmultiDot{Diamond}&%\\ +\Loption{BoldDiamond} & \multiDot{BoldDiamond} & \cmultiDot{BoldDiamond}\\ +\Loption{SolidDiamond} & \multiDot{SolidDiamond} & \cmultiDot{SolidDiamond}& +\Loption{triangle} & \multiDot{triangle} & \cmultiDot{triangle}\\ +\Loption{Btriangle} & \multiDot{Btriangle} & \cmultiDot{Btriangle}& +\Loption{triangle*} & \multiDot{triangle*} & \cmultiDot{triangle*}\\ +\Loption{Triangle} & \multiDot{Triangle} & \cmultiDot{Triangle}&%\\ +\Loption{BoldTriangle} & \multiDot{BoldTriangle} & \cmultiDot{BoldTriangle}\\ +\Loption{SolidTriangle} & \multiDot{SolidTriangle} & \cmultiDot{SolidTriangle}& +\Loption{pentagon} & \multiDot{pentagon} & \cmultiDot{pentagon}\\ +\Loption{Bpentagon} & \multiDot{Bpentagon} & \cmultiDot{Bpentagon}&%\\ +\Loption{pentagon*} & \multiDot{pentagon*}& \cmultiDot{pentagon*}\\ +\Loption{Pentagon} & \multiDot{Pentagon} & \cmultiDot{Pentagon}&%\\ +\Loption{BoldPentagon} & \multiDot{BoldPentagon} & \cmultiDot{BoldPentagon}\\ +\Loption{SolidPentagon} & \multiDot{SolidPentagon} & \cmultiDot{SolidPentagon}& +\Loption{Hexagon} & \multiDot{Hexagon} & \cmultiDot{Hexagon}\\ +\Loption{BoldHexagon} & \multiDot{BoldHexagon} & \cmultiDot{BoldHexagon}& +\Loption{SolidHexagon} & \multiDot{SolidHexagon} & \cmultiDot{SolidHexagon} +\end{longtable} + + +\section{\texttt{pstricks.pro}} +The PostScript header file defines the following functions and constants, which +can be used +in arguments for \CMD{psplot} or any other macro, which reads PostScript code. + +\begin{lstlisting}[basicstyle=\ttfamily\footnotesize] +/Sqrt { dup 0 lt { pop 0 } { sqrt } ifelse } def% return 0 for negative arguments +/Atan { /atan load stopped { pop pop 0 } if } def% return 0 if atan not known +/ATAN1 {neg -1 atan 180 sub } def % atan(x) (only one parameter) +/Div { dup 0 eq { pop } { div } ifelse } def % control the division +/NET { neg exch neg exch T } def % change coordinate system to the negative one +/Pyth { dup mul exch dup mul add sqrt } def % Pythagoras, epects 2 parameter +/PtoC { 2 copy cos mul 3 1 roll sin mul } def % Polar to Cartesian +%----------------- hv added 20050516 --------------- +/Pi 3.14159265359 def +/TwoPi 6.28318530718 def +/Euler 2.71828182846 def +/RadtoDeg { 180 mul Pi div } bind def % convert from radian to degrees +/DegtoRad { Pi mul 180 div } bind def % viceversa +\end{lstlisting} + +\section{Packages} +The package \texttt{pst-char} is now part of \texttt{pst-text} and the +package \texttt{pst-ghsb} is now part of \texttt{pst-grad}. The macros +and enviroments will work in the same way. + +The documented source code of \texttt{pstricks} and \texttt{pst-node} is +now available as a pdf file with a source which can be run by pdf\LaTeX. +Rolf Niepraschk modified the old sources from Timothy Van Zandt for +running with \LaTeX\ and/or pdf\LaTeX. + +\end{document} diff --git a/Master/texmf-dist/dvips/pstricks/Changes b/Master/texmf-dist/dvips/pstricks/Changes index e93b5fb61ae..2974ffd99ce 100644 --- a/Master/texmf-dist/dvips/pstricks/Changes +++ b/Master/texmf-dist/dvips/pstricks/Changes @@ -10,4 +10,7 @@ ---- pst-text.pro -1.00 2005-11-29 (hv) add a patch for japanese text
\ No newline at end of file +1.00 2005-11-29 (hv) add a patch for japanese text + +---- pst-dots.pro +2.00 2006-12-19 add more dot symbols from Etienne Riga (hv) diff --git a/Master/texmf-dist/dvips/pstricks/pst-dots.pro b/Master/texmf-dist/dvips/pstricks/pst-dots.pro index 8c83b963525..e8297d814e0 100644 --- a/Master/texmf-dist/dvips/pstricks/pst-dots.pro +++ b/Master/texmf-dist/dvips/pstricks/pst-dots.pro @@ -1,16 +1,23 @@ -%!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 +%! +%% PostScript prologue for pstricks.tex. +%% Version 2.00, Suggestion of 2006/12/19 +%% For distribution, see pstricks.tex. +%% +%% Timothy Van Zandt <tvz@Princeton.EDU> +%% +%% Modified by Etienne Riga - Dec. 16, 1999 +%% Modified by Herbert Voss (hv) - 2004/12/27 +%% Modified by Etienne Riga - 2005/01/01 (er) %% 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 + /FontMatrix [.001 0 0 .001 0 0] def + /FontBBox [-571.5 -742.5 571.5 742.5] def +% /FontBBox [-1000 -1000 1000 1000] def +% See end of file in /BuildGlyph /Encoding 256 array def - 0 1 255 { Encoding exch /.notdef put } for + 0 1 255 {Encoding exch/.notdef put} for Encoding dup (b) 0 get /Bullet put dup (c) 0 get /Circle put @@ -24,101 +31,111 @@ 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 (k) 0 get /Asterisk put + dup (K) 0 get /BoldAsterisk put + dup (J) 0 get /SolidAsterisk put + dup (h) 0 get /Hexagon put + dup (H) 0 get /BoldHexagon put + dup (G) 0 get /SolidHexagon put + dup (a) 0 get /Add put + dup (A) 0 get /BoldAdd put + dup (x) 0 get /Mul put + dup (X) 0 get /BoldMul put + dup (m) 0 get /Oplus put + dup (M) 0 get /BOplus put + dup (e) 0 get /SolidOplus put + dup (n) 0 get /Otimes put + dup (N) 0 get /BOtimes put + dup (E) 0 get /SolidOtimes put + dup (i) 0 get /Bar put + dup (I) 0 get /BoldBar put 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 47 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 + /CirclePath {0 0 500 0 360 arc closepath} def + /Bullet {CirclePath fill} def + /Circle {CirclePath .9 .9 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 +%-------------- hv begin 2004/07/25 from: er 2003/03/24 + /HexagonPath {0 550 moveto -476 275 lineto -476 -275 lineto + 0 -550 lineto 476 -275 lineto 476 275 lineto closepath} def + /SolidHexagon {HexagonPath fill} def + /Hexagon {HexagonPath .89 .89 scale HexagonPath eofill} def + /BoldHexagon {HexagonPath .79 .79 scale HexagonPath eofill} def + /AsteriskPath {20 0 moveto 10 250 180 500 0 500 curveto + -180 500 -10 250 -20 0 curveto closepath} def + /Asterisk {AsteriskPath 60 rotate AsteriskPath 60 rotate AsteriskPath + 60 rotate AsteriskPath 60 rotate AsteriskPath 60 rotate AsteriskPath + fill} def + /Basterp {50 250 220 500 0 500 curveto + -220 500 -50 250 -50 30 cos 100 mul curveto} def + /BoldAsteriskPath {50 30 cos 100 mul moveto Basterp + 60 rotate Basterp 60 rotate Basterp + 60 rotate Basterp 60 rotate Basterp + 60 rotate Basterp closepath} def + /BoldAsterisk {BoldAsteriskPath fill} def + /SolidAsterisk {CirclePath .9 .9 scale BoldAsteriskPath eofill} def + /CrossPath {40 550 moveto -40 550 lineto -40 40 lineto -550 40 lineto + -550 -40 lineto -40 -40 lineto -40 -550 lineto 40 -550 lineto + 40 -40 lineto 550 -40 lineto 550 40 lineto 40 40 lineto closepath} def + /BoldCrossPath {80 550 moveto -80 550 lineto -80 80 lineto -550 80 lineto + -550 -80 lineto -80 -80 lineto -80 -550 lineto 80 -550 lineto + 80 -80 lineto 550 -80 lineto 550 80 lineto 80 80 lineto closepath} def + /Add {CrossPath fill} def + /Mul {45 rotate CrossPath fill} def + /BoldAdd {BoldCrossPath fill} def + /BoldMul {45 rotate BoldCrossPath fill} def + /Oplus {CirclePath .9 .9 scale CirclePath eofill + .775 .775 scale CrossPath fill} def + /SolidOplus {CirclePath .775 .775 scale BoldCrossPath eofill} def + /BOplus {CirclePath .8 .8 scale CirclePath eofill + .775 .775 scale BoldCrossPath fill} def + /Otimes {CirclePath .9 .9 scale CirclePath eofill + 45 rotate .775 .775 scale CrossPath fill} def + /BOtimes {CirclePath .8 .8 scale CirclePath eofill + 45 rotate .775 .775 scale BoldCrossPath fill } def + /SolidOtimes {CirclePath 45 rotate .775 .775 scale BoldCrossPath eofill} def + /BarPath {40 660 moveto -40 660 lineto -40 -660 lineto 40 -660 lineto + closepath} def + /Bar {BarPath fill} def + /BoldBarPath {80 660 moveto -80 660 lineto -80 -660 lineto 80 -660 lineto + closepath} def + /BoldBar {BoldBarPath fill} def + /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 .865 .865 scale DiamondPath eofill} def + /BoldDiamond {DiamondPath .73 .73 scale DiamondPath eofill} def +%%% /.notdef { } def end /BuildGlyph { exch begin - Metrics 1 index get exec 0 - BBoxes 3 index get exec +% Metrics 1 index get exec 0 + 0 0 +% BBoxes 3 index get exec + -1000 -1000 1000 1000 +% -571.5 -742.5 571.5 742.5 setcachedevice CharProcs begin load exec end end @@ -129,4 +146,4 @@ } bind def end /PSTricksDotFont exch definefont pop -%END pst-dots.pro + diff --git a/Master/texmf-dist/dvips/pstricks/pstricks.pro b/Master/texmf-dist/dvips/pstricks/pstricks.pro index 3418879b649..9a527fb6cff 100644 --- a/Master/texmf-dist/dvips/pstricks/pstricks.pro +++ b/Master/texmf-dist/dvips/pstricks/pstricks.pro @@ -14,8 +14,8 @@ /T /translate load def /TMatrix { } def /RAngle { 0 } def -/Sqrt { dup 0 lt { pop 0 } { sqrt } ifelse } def% return 0 for negative arguments -/Atan { /atan load stopped { pop pop 0 } if } def% return 0 if atan not known +/Sqrt { dup 0 lt { pop 0 } { sqrt } ifelse } def % return 0 for negative arguments +/Atan { /atan load stopped { pop pop 0 } if } def % return 0 if atan not known /ATAN1 {neg -1 atan 180 sub } def % atan(x) (only one parameter) /Div { dup 0 eq { pop } { div } ifelse } def % control the division /NET { neg exch neg exch T } def % change coordinate system to the negative one @@ -138,11 +138,15 @@ CLW moveto } def curveto -.35 0 -.85 .5 -1 1 curveto mtrx setmatrix stroke 0 CLW moveto } def /SD { 0 360 arc fill } def -/EndDot { { /z DS def } { /z 0 def } ifelse /b ED 0 z DS SD b { 0 z DS -CLW sub SD } if 0 DS z add CLW 4 div sub moveto } def +/EndDot { % DS is the dot size + { /z DS def } { /z 0 def } ifelse + /b ED 0 z DS SD b { 0 z DS CLW sub SD } if + 0 DS z add CLW 4 div sub moveto } def +% /Shadow { [ { /moveto load } { /lineto load } { /curveto load } { -/closepath load } /pathforall load stopped { pop pop pop pop CP /moveto -load } if ] cvx newpath 3 1 roll T exec } def + /closepath load } /pathforall load stopped { pop pop pop pop CP /moveto + load } if ] cvx newpath 3 1 roll T exec } def +% /NArray { aload length 2 div dup dup cvi eq not { exch pop } if /n exch cvi def } def /NArray { % holds the coordinates and on top of stack the showpoints boolean diff --git a/Master/texmf-dist/tex/generic/pstricks/Changes b/Master/texmf-dist/tex/generic/pstricks/Changes index 7cea60d5129..44dded9a69e 100644 --- a/Master/texmf-dist/tex/generic/pstricks/Changes +++ b/Master/texmf-dist/tex/generic/pstricks/Changes @@ -1,4 +1,5 @@ pstricks.tex -------- +1.15 2006-12-19 - add support for more dot styles (from Etienne Riga) 1.14c 2006-04-29 - add option linecap for dashed lines 1.14b 2006-04-20 - fix a bug in \psset@linetype 1.14a 2006-02-06 - revert the changes for pslongbox (introduced bug) diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index f9fa9535fcf..ca6bde41f9b 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-2005 Herbert Voss +%% Copyright 2004-2006 Herbert Voss % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -20,8 +20,8 @@ % See the PSTricks User's Guide for description. % This uses the header file `pstricks.pro'. % -\def\fileversion{1.14c} -\def\filedate{2006/04/29} +\def\fileversion{1.15} +\def\filedate{2006/12/19} % \csname PSTricksLoaded\endcsname \let\PSTricksLoaded\endinput @@ -334,20 +334,16 @@ % \def\newgray#1#2{% \pst@checknum{#2}\pst@tempg - \@newcolor{#1}{\pst@tempg setgray}% -} + \@newcolor{#1}{\pst@tempg setgray}} \def\newrgbcolor#1#2{% \pst@expandafter\pst@getnumiii{#2} {} {} {} {}\@nil - \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi setrgbcolor}% -} + \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi setrgbcolor}} \def\newhsbcolor#1#2{% \pst@expandafter\pst@getnumiii{#2} {} {} {} {}\@nil - \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi sethsbcolor}% -} + \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi sethsbcolor}} \def\newcmykcolor#1#2{% \pst@expandafter\pst@getnumiv{#2} {} {} {} {} {}\@nil - \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi \pst@tempj setcmykcolor}% -} + \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi \pst@tempj setcmykcolor}} \newgray{black}{0} \newgray{darkgray}{.25} \newgray{gray}{.5} @@ -1467,7 +1463,7 @@ grestore}} \edef\psk@@dotsize{\pst@number\pst@dimg}% \let\psk@@@dotsize\pst@tempg \edef\psk@dotsize{% -/DS \psk@@dotsize \psk@@@dotsize CLW mul add 2 div def }} + /DS \psk@@dotsize \psk@@@dotsize CLW mul add 2 div def }} \psset@dotsize{2pt 2} \def\psset@dotscale#1{% \pst@getscale{#1}\psk@dotscale @@ -1542,48 +1538,49 @@ n { transform floor .5 add exch floor .5 add exch itransform Dot } repeat} \def\pst@gdot#1{/Dot { gsave T \psk@dotangle \psk@dotscale #1 grestore } def } \@namedef{psds@*}{\pst@gdot{0 0 DS \tx@SD}} \@namedef{psds@o}{% -/r2 DS CLW sub def -\pst@gdot{0 0 DS \tx@SD \pst@usecolor\psfillcolor 0 0 r2 \tx@SD}} + /r2 DS CLW sub def + \pst@gdot{0 0 DS \tx@SD \pst@usecolor\psfillcolor 0 0 r2 \tx@SD}} \@namedef{psds@square*}{% -/r1 DS .886 mul def -\pst@gdot{r1 \tx@SQ}} + /r1 DS .886 mul def + \pst@gdot{r1 \tx@SQ}} \@namedef{psds@square}{% -/r1 DS .886 mul def /r2 r1 CLW sub def -\pst@gdot{r1 \tx@SQ \pst@usecolor\psfillcolor r2 \tx@SQ}} + /r1 DS .886 mul def /r2 r1 CLW sub def + \pst@gdot{r1 \tx@SQ \pst@usecolor\psfillcolor r2 \tx@SQ}} \@namedef{psds@triangle*}{% -/y1 DS .778 mul neg def /x1 y1 1.732 mul neg def -\pst@gdot{x1 y1 \tx@ST}} + /y1 DS .778 mul neg def /x1 y1 1.732 mul neg def + \pst@gdot{x1 y1 \tx@ST}} \@namedef{psds@triangle}{% -/y1 DS .778 mul neg def /x1 y1 1.732 mul neg def -/y2 y1 CLW add def /x2 y2 1.732 mul neg def -\pst@gdot{x1 y1 \tx@ST \pst@usecolor\psfillcolor x2 y2 \tx@ST}} + /y1 DS .778 mul neg def /x1 y1 1.732 mul neg def + /y2 y1 CLW add def /x2 y2 1.732 mul neg def + \pst@gdot{x1 y1 \tx@ST \pst@usecolor\psfillcolor x2 y2 \tx@ST}} \@namedef{psds@pentagon*}{% -/r1 DS 1.149 mul def -\pst@gdot{r1 \tx@SP}} + /r1 DS 1.149 mul def + \pst@gdot{r1 \tx@SP}} \@namedef{psds@pentagon}{% -DS .93 mul dup 1.236 mul /r1 ED CLW sub 1.236 mul /r2 ED -\pst@gdot{r1 \tx@SP \pst@usecolor\psfillcolor r2 \tx@SP}} + DS .93 mul dup 1.236 mul /r1 ED CLW sub 1.236 mul /r2 ED + \pst@gdot{r1 \tx@SP \pst@usecolor\psfillcolor r2 \tx@SP}} \@namedef{psds@+}{% -/DS DS 1.253 mul def -\pst@gdot{DS 0 moveto DS neg 0 L stroke 0 DS moveto 0 DS neg L stroke}} + /DS DS 1.253 mul def + \pst@gdot{DS 0 moveto DS neg 0 L stroke 0 DS moveto 0 DS neg L stroke}} \@namedef{psds@|}{% -\psk@tbarsize CLW mul add 2 div /DS ED -\pst@gdot{0 DS moveto 0 DS neg L stroke}} + \psk@tbarsize CLW mul add 2 div /DS ED + \pst@gdot{0 DS moveto 0 DS neg L stroke}} % DG: end dead code? +% \def\psset@dotstyle#1{% \@ifundefined{psds@#1}% {\@pstrickserr{Dot style `#1' not defined}\@eha}% {\edef\psk@dotstyle{#1}}} \psset@dotstyle{*} +% \def\tx@FontDot{FontDot } \def\newpsfontdot#1[#2]#3#4{% \@namedef{psds@#1}{% /#3 \psk@@dotangle [#2] \tx@FontDot % DG/SR modification begin - Dec. 12, 1999 - Patch 14 %/Dot { moveto #4 show } bind def }} - /Dot { moveto gsave \psk@dotscale #4 show grestore } bind def - }% -} + /Dot { moveto gsave \psk@dotscale #4 show grestore } bind def +}} % DG/SR modification end \def\newpsfontdotH#1[#2]#3#4#5{% \@namedef{psds@#1}{% @@ -1600,8 +1597,8 @@ DS .93 mul dup 1.236 mul /r1 ED CLW sub 1.236 mul /r2 ED gsave \psk@dotscale #4 show grestore % DG/SR modification end } bind def - }% -} +}} +% \pstheader{pst-dots.pro} \newpsfontdot{*}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(b)} \newpsfontdotH{o}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(c)}{(b)} @@ -1632,21 +1629,57 @@ DS .93 mul dup 1.236 mul /r1 ED CLW sub 1.236 mul /r2 ED \newpsfontdot{asterisk}[2.43309 0.0 0.0 2.43309 -0.609489 -1.14477]{Times-Roman}{<2A>} \newpsfontdot{B+}[2.3 0.0 0.0 2.3 -0.6555 -0.5819]{Times-Bold}{<2B>} \newpsfontdot{Basterisk}[2.29358 0.0 0.0 2.29358 -0.576835 -1.08486]{Times-Bold}{<2A>} -\newpsfontdot{|}% +\newpsfontdot{|}[1.98413 0.0 0.0 1.38 -0.258929 -0.5]{Helvetica}{(|)} % DG/SR modification begin - Oct. 27, 1997 - Patch 7 %[1.98413 0.0 0.0 1.98413 -0.258929 -0.712302]{Helvetica}{(|)} -[1.98413 0.0 0.0 1.38 -0.258929 -0.5]{Helvetica}{(|)} % DG/SR modification end -\newpsfontdot{B|}% +\newpsfontdot{B|}[1.98413 0.0 0.0 1.38 -0.277778 -0.5]{Helvetica-Bold}{(|)}% % DG/SR modification begin - Oct. 27, 1997 - Patch 7 %[1.98413 0.0 0.0 1.98413 -0.277778 -0.78302]{Helvetica-Bold}{(|)} -[1.98413 0.0 0.0 1.38 -0.277778 -0.5]{Helvetica-Bold}{(|)} + % DG/SR modification end \iffalse \newpsfontdot{*}[2.77778 0.0 0.0 2.77778 -0.638889 -0.813889]{Symbol}{<B7>} \newpsfontdot{o}[3.33333 0.0 0.0 3.33333 -0.666667 -1.78167]{Symbol}{<B0>} \newpsfontdot{Bo}[4.69484 0.0 0.0 4.69484 -0.78169 -2.97418]{Times-Bold}{<CA>} \fi +% Etienne Riga +\newpsfontdot{Asterisk}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(k)} +\newpsfontdot{BoldAsterisk}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(K)} +\newpsfontdotH{SolidAsterisk}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(J)}{(b)} +\newpsfontdotH{Hexagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(h)}{(G)} +\newpsfontdotH{BoldHexagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(H)}{(G)} +\newpsfontdot{SolidHexagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(G)} +% +\newpsfontdot{Bullet}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(b)} +\newpsfontdotH{Circle}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(c)}{(b)} +\newpsfontdotH{BoldCircle}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(C)}{(b)} +%\newpsfontdot{SolidCircle}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(u)} +\newpsfontdotH{Triangle}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(t)}{(u)} +\newpsfontdotH{BoldTriangle}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(T)}{(u)} +\newpsfontdot{SolidTriangle}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(u)} +\newpsfontdotH{Square}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(s)}{(r)} +\newpsfontdotH{BoldSquare}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(S)}{(r)} +\newpsfontdot{SolidSquare}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(r)} +\newpsfontdotH{Pentagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(p)}{(q)} +\newpsfontdotH{BoldPentagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(P)}{(q)} +\newpsfontdot{SolidPentagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(q)} +\newpsfontdot{Add}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(a)} +\newpsfontdot{BoldAdd}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(A)} +\newpsfontdot{Mul}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(x)} +\newpsfontdot{BoldMul}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(X)} +\newpsfontdotH{Oplus}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(m)}{(b)} +\newpsfontdotH{BoldOplus}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(M)}{(b)} +\newpsfontdotH{SolidOplus}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(e)}{(b)} +\newpsfontdotH{Otimes}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(n)}{(b)} +\newpsfontdotH{BoldOtimes}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(N)}{(b)} +\newpsfontdotH{SolidOtimes}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(E)}{(b)} +\newpsfontdot{Bar}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(i)} +\newpsfontdot{BoldBar}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(I)} +\newpsfontdotH{Diamond}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(d)}{(l)} +\newpsfontdotH{BoldDiamond}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(D)}{(l)} +\newpsfontdot{SolidDiamond}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(l)} +%% \newdimen\pslinearc \def\psset@linearc#1{\pssetlength\pslinearc{#1}} \psset@linearc{0pt} diff --git a/Master/texmf-dist/tpm/pstricks.tpm b/Master/texmf-dist/tpm/pstricks.tpm index 4666ef6e2a4..1a0a284bbf3 100644 --- a/Master/texmf-dist/tpm/pstricks.tpm +++ b/Master/texmf-dist/tpm/pstricks.tpm @@ -3,7 +3,7 @@ <rdf:Description about="http://texlive.dante.de/texlive/Package/pstricks.zip"> <TPM:Name>pstricks</TPM:Name> <TPM:Type>Package</TPM:Type> - <TPM:Date>2006/08/12 16:54:19</TPM:Date> + <TPM:Date>2006/12/19 21:38:56</TPM:Date> <TPM:Version></TPM:Version> <TPM:Creator>rahtz</TPM:Creator> <TPM:Title>PostScript macros for TeX.</TPM:Title> @@ -21,10 +21,10 @@ contains bug-fixes and additions for pstricks (among others). [description copied from TeX Catalogue] </TPM:Description> <TPM:Author>Timothy Van Zandt</TPM:Author> - <TPM:Size>6424699</TPM:Size> + <TPM:Size>6894705</TPM:Size> <TPM:License></TPM:License> <TPM:Build/> - <TPM:RunFiles size="245359"> + <TPM:RunFiles size="249999"> texmf-dist/dvips/pstricks/Changes texmf-dist/dvips/pstricks/pst-blur.pro texmf-dist/dvips/pstricks/pst-dots.pro @@ -51,7 +51,7 @@ texmf-dist/tex/latex/pstricks/pstcol.sty texmf-dist/tex/latex/pstricks/pstricks.sty texmf-dist/tpm/pstricks.tpm </TPM:RunFiles> - <TPM:DocFiles size="6649346"> + <TPM:DocFiles size="6746102"> texmf-dist/doc/generic/pstricks/CHANGES texmf-dist/doc/generic/pstricks/Changes.doc texmf-dist/doc/generic/pstricks/README @@ -176,6 +176,8 @@ texmf-dist/doc/generic/pstricks/pstnews1-12.pdf texmf-dist/doc/generic/pstricks/pstnews1-12.tex texmf-dist/doc/generic/pstricks/pstnews1-14.pdf texmf-dist/doc/generic/pstricks/pstnews1-14.tex +texmf-dist/doc/generic/pstricks/pstnews1-15.pdf +texmf-dist/doc/generic/pstricks/pstnews1-15.tex texmf-dist/doc/generic/pstricks/pstnews97-15.pdf texmf-dist/doc/generic/pstricks/pstnews97-15.tex texmf-dist/doc/generic/pstricks/pstricks.bug diff --git a/Master/texmf/lists/pstricks b/Master/texmf/lists/pstricks index 4321cbfbd14..f57f4a1cf41 100644 --- a/Master/texmf/lists/pstricks +++ b/Master/texmf/lists/pstricks @@ -122,6 +122,8 @@ texmf-dist/doc/generic/pstricks/pstnews1-12.pdf texmf-dist/doc/generic/pstricks/pstnews1-12.tex texmf-dist/doc/generic/pstricks/pstnews1-14.pdf texmf-dist/doc/generic/pstricks/pstnews1-14.tex +texmf-dist/doc/generic/pstricks/pstnews1-15.pdf +texmf-dist/doc/generic/pstricks/pstnews1-15.tex texmf-dist/doc/generic/pstricks/pstnews97-15.pdf texmf-dist/doc/generic/pstricks/pstnews97-15.tex texmf-dist/doc/generic/pstricks/pstricks.bug |