diff options
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/Changes.dvips | 1 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/Changes.generic | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/pst-news14.pdf | bin | 69936 -> 69691 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/pst-news14.tex | 2 | ||||
-rw-r--r-- | Master/texmf-dist/dvips/pstricks/pstricks.pro | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/pstricks.tex | 39 |
6 files changed, 33 insertions, 19 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.dvips b/Master/texmf-dist/doc/generic/pstricks/Changes.dvips index f17bfea1a91..c1e4a37a63f 100644 --- a/Master/texmf-dist/doc/generic/pstricks/Changes.dvips +++ b/Master/texmf-dist/doc/generic/pstricks/Changes.dvips @@ -1,4 +1,5 @@ ---- pstricks.pro +1.23 2014-07-31 - fixed bug with Ellipse and move to start point 1.22 2014-03-12 - added cubic spline stuff (Christoph Bersch) 1.21 2013-11-28 - deleted the overlay stuff 1.20 2013-11-26 - fix for Rand diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic index 15517993aa8..49cf40f06b4 100644 --- a/Master/texmf-dist/doc/generic/pstricks/Changes.generic +++ b/Master/texmf-dist/doc/generic/pstricks/Changes.generic @@ -3,6 +3,8 @@ versions like 2.47a have only changes in other files, but not in this main package. +2.56 2014-07-31 - added gridstyleA and fixed bug with Ellipse and move + to start point 2.55 2014-07-28 - added \psellipseAB: draw an ellipse between two given points 2.54a 2014-05-19 - fixed introduced bug in pst-algparser.pro 2.54 2014-05-19 - allow circle and ellipse in \pscustom with moving diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news14.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news14.pdf Binary files differindex a0430f11c5f..4785da550b5 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news14.pdf +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news14.pdf diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news14.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news14.tex index 98e7be4f304..9707ad4e0d3 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news14.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news14.tex @@ -159,7 +159,7 @@ needs some tricky internal commands and may not work in all cases. \subsection{\nxLcs{Special Coor}} The Macro \Lcs{SpecialCoor} for scanning special coodinate expressions is now enabled by -default. You can enable it with \Lcs{NormalCoor}. +default. You can disable it with \Lcs{NormalCoor}. \clearpage \nocite{*} diff --git a/Master/texmf-dist/dvips/pstricks/pstricks.pro b/Master/texmf-dist/dvips/pstricks/pstricks.pro index 79c9aafe674..553dca0d1d7 100644 --- a/Master/texmf-dist/dvips/pstricks/pstricks.pro +++ b/Master/texmf-dist/dvips/pstricks/pstricks.pro @@ -1,7 +1,7 @@ % $Id: pstricks.pro 919 2014-05-19 18:42:47Z herbert $ % %% PostScript prologue for pstricks.tex. -%% Version 1.23, 2014/05/15 +%% Version 1.23, 2014/07/31 %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN archives @@ -1037,13 +1037,17 @@ gsave mul neg d } def % +% +/isbool { type (booleantype) cvn eq } def +% /Ellipse { + dup isbool { /MoveToStart ED }{ /MoveToStart false def }ifelse % false or true /rotAngle ED /mtrx CM def T rotAngle rotate scale - 0 0 moveto 1 0 rmoveto % move to the start position + MoveToStart { 0 0 moveto 1 0 rmoveto } if % move to the start position 0 0 1 5 3 roll arc mtrx setmatrix } def 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 |