diff options
author | Karl Berry <karl@freefriends.org> | 2013-04-05 23:09:13 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-04-05 23:09:13 +0000 |
commit | e871cf60fc09d3490d03edd318214ae79c60d646 (patch) | |
tree | a3977606c5895d40689faa5aebe393462174329d /Master/texmf-dist/tex | |
parent | 79133778bb4e0c49a8d9e75ad97fc37e9ef976fa (diff) |
pstricks (5apr13)
git-svn-id: svn://tug.org/texlive/trunk@29678 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/pstricks.tex | 38 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pstricks/pstricks.sty | 7 |
2 files changed, 36 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index 736f34701d9..7625b3afb98 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -103,8 +103,8 @@ \input pgffor.code.tex \let\pgfforeach\foreach % -\def\fileversion{2.39} -\def\filedate{2013/04/04} +\def\fileversion{2.40} +\def\filedate{2013/04/05} \catcode`\@=11\relax \pst@addfams{pstricks} % @@ -3572,6 +3572,26 @@ pop \def\psCircle@i{\@ifnextchar({\psCircle@ii}{\psCircle@ii(0,0)}} \def\psCircle@ii(#1){\pscircle@do(#1){\psk@radius}} % +\def\psRing{\def\pst@par{}\pst@object{psRing}}%% hv 20130405 +\def\psRing@i{\@ifnextchar({\psRing@ii}{\psRing@ii(0,0)}} +\def\psRing@ii(#1)#2#3{% origin, inner radius, outer radius + \begin@ClosedObj + \pst@@getcoor{#1}% + \pssetlength\pst@dimc{#2}% + \pssetlength\pst@dimd{#3}% + \def\pst@linetype{4}% + \addto@pscode{ + \pst@coor translate newpath + \pst@number\pst@dimc \psk@dimen CLW mul sub /InnerRadius ED + \pst@number\pst@dimd \psk@dimen CLW mul sub /OuterRadius ED + 0 0 InnerRadius 0 360 arc OuterRadius 0 moveto + 0 0 OuterRadius 0 0.0001 arcn + closepath + }% + \showpointsfalse + \end@ClosedObj + \ignorespaces} +% \def\pswedge{\pst@object{pswedge}} \def\pswedge@i{\@ifnextchar({\pswedge@ii}{\pswedge@ii(0,0)}} \def\pswedge@ii(#1)#2#3#4{% @@ -4058,14 +4078,21 @@ pop \newpsstyle{gridstyle}{subgriddiv=0,gridcolor=lightgray,griddots=10,gridlabels=8pt} %\define@boolkey[psset]{pstricks}[]{showgrid}[true]{} \newif\ifshowgrid +\newdimen\sh@wgridXunit +\newdimen\sh@wgridYunit \define@key[psset]{pstricks}{showgrid}[b]{\expandafter\pst@@showgrid#1!!\@nil} \def\pst@@showgrid#1#2#3\@nil{% hv 20130403 - \ifx#1b\showgridtrue\def\showgridp@s{0}\else% bottom + \def\showgridp@s{0}% + \ifx#1b\showgridtrue\else% bottom \ifx#1f\showgridfalse\else% \ifx#1t% - \ifx#2r\showgridtrue\def\showgridp@s{0}\else% true->bottom + \ifx#2r\showgridtrue\else% true->bottom \showgridtrue\def\showgridp@s{1}\fi% top \fi\fi\fi% + \ifnum\showgridp@s>0 + \sh@wgridXunit=\psxunit% + \sh@wgridYunit=\psyunit% + \fi% } \psset[pstricks]{showgrid=false} % @@ -4121,7 +4148,8 @@ pop \def\pic@coor{(0,0)(0,0)(10,10)} %\newdimen\pst@shift \def\endpspicture{% - \ifshowgrid\ifnum\showgridp@s>0\psgrid[style=gridstyle]\fi\fi% + \ifshowgrid\ifnum\showgridp@s>0 + \psgrid[xunit=\sh@wgridXunit,yunit=\sh@wgridYunit,style=gridstyle]\fi\fi% \pst@killglue % \global\pst@shift=\pst@shift% in fact of the following endgroup \endgroup diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty index 2afb9f5e503..eef59f7a85d 100644 --- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty +++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty @@ -5,7 +5,7 @@ %% %% pstricks.sty Copyright (C) 1997 Timothy Van Zandt %% pstcol.sty Copyright (C) 1994-1996 1999 David Carlisle -%% pstricks.sty Copyright (C) 2004-2011 Rolf Niepraschk <Rolf.Niepraschk@gmx.de> +%% pstricks.sty Copyright (C) 2004-2013 Rolf Niepraschk <Rolf.Niepraschk@gmx.de> %% Herbert Voss <hvoss@tug.org> %% %% This package may be distributed under the terms of the LaTeX Project @@ -15,8 +15,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{pstricks} - [2012/08/24 v0.53 LaTeX wrapper for `PSTricks' (RN,HV)] +\ProvidesPackage{pstricks}[2013/04/05 v0.54 LaTeX wrapper for `PSTricks' (RN,HV)] % \def\documentclass{% \edef\@tempa{\jobname.tex }% @@ -257,7 +256,7 @@ \renewcommand*\cyan{\color{cyan}} % \AtBeginDocument{% - \psset{fillcolor=white}% hv 0.33 +% \psset{fillcolor=white}% hv 0.33 \let\pst@endcolor=\relax% % \let\pst@color=\relax% % LaTeX used `\color@endgroup' instead. RN 2004-05-06 |