From 90b24a23c320d1720bf1c3d93c1619f95a71d0f6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 3 Aug 2014 16:54:33 +0000 Subject: pstricks git-svn-id: svn://tug.org/texlive/trunk@34813 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/generic/pstricks/pstricks.tex | 39 +++++++++++++--------- 1 file changed, 23 insertions(+), 16 deletions(-) (limited to 'Master/texmf-dist/tex/generic/pstricks') diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index 8c56d1f3af2..57fbc03fa1b 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -109,8 +109,8 @@ \input pgffor.code.tex \let\pgfforeach\foreach % -\def\fileversion{2.55} -\def\filedate{2014/07/28} +\def\fileversion{2.56} +\def\filedate{2014/07/31} \catcode`\@=11\relax \pst@addfams{pstricks} % @@ -1968,11 +1968,14 @@ \def\cuse@par##1{{\use@par##1}}% \the\pst@customdefs% \setbox\pst@hbox=\hbox{#1}% - \psk@fillstyle% - \pst@stroke% - \end@SpecialObj% + \psk@fillstyle + \pst@stroke + \end@SpecialObj + \let\pst@ifcustom\iffalse } % +\let\pst@ifcustom\iffalse +% \def\begin@CustomObj{% \begingroup% \use@par% @@ -3512,10 +3515,10 @@ pop \def\psellipticarc@iv(#1)(#2)#3#4{% % \addbefore@par{correctAngle=false} \begin@OpenObj% - \pst@getcoor{#1}\pst@tempa% origin - \pst@getcoor{#2}\pst@tempb% a b - \pst@getangle{#3}\pst@tempc% start angle - \pst@getangle{#4}\pst@tempd% end angle + \pst@getcoor{#1}\pst@tempa % origin + \pst@getcoor{#2}\pst@tempb % a b + \pst@getangle{#3}\pst@tempc % start angle + \pst@getangle{#4}\pst@tempd % end angle \addto@pscode{ \psellipticarc@definearg \psellipticarc@draw \ifPst@variableLW \pst@flattenpath \fi @@ -3613,13 +3616,15 @@ pop xOrig yOrig T \ifx\psk@rot\@empty \else \psk@rot\space rotate \fi rx ry scale - 0 0 moveto - exch dup dup % end start start start - cos exch sin moveto % end start - exch % start end -% \if@star 0 0 moveto \fi % for filling + \pst@ifcustom\else + 0 0 moveto + exch dup dup % end start start start + cos exch sin moveto % end start + exch % start end + \fi +%% \if@star 0 0 moveto \fi % for filling \if@psarcn arcn \else arc \fi -% \if@star 0 0 moveto \fi +%% \if@star 0 0 moveto \fi mtrx setmatrix% } \def\psellipticarc@showpoints{% @@ -3765,6 +3770,7 @@ pop \showpointsfalse% \end@ClosedObj% } +\def\tx@ellipse#1{ \ifx\psk@rot\@empty 0 \else \psk@rot \fi #1 Ellipse } \def\tx@Ellipse{ \ifx\psk@rot\@empty 0 \else \psk@rot \fi Ellipse } % \def\psellipse{\def\pst@par{}\pst@object{psellipse}} @@ -3781,7 +3787,7 @@ pop dup 4 -1 roll sub neg 3 1 roll sub \fi \pst@tempa - \tx@Ellipse + \tx@ellipse{true} \ifPst@variableLW \pst@flattenpath \fi closepath }% @@ -4253,6 +4259,7 @@ pop % % ----------- hv 20120219 ------------------- \newpsstyle{gridstyle}{subgriddiv=0,gridcolor=lightgray,griddots=10,gridlabels=8pt} +\newpsstyle{gridstyleA}{subgriddiv=5,gridcolor=red!30,subgridcolor=green!20!black!10,gridlabels=0pt} %\define@boolkey[psset]{pstricks}[]{showgrid}[true]{} \newif\ifshowgrid \newdimen\sh@wgridXunit -- cgit v1.2.3