summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-05-19 22:07:36 +0000
committerKarl Berry <karl@freefriends.org>2014-05-19 22:07:36 +0000
commitdf1c0578d12dbfc05d52fa0c9e05678461a8f8e1 (patch)
treea76505d196e84144a20949e0f3d1b176ff590200 /Master/texmf-dist
parentfbcca9aeebcca4c5935747e39d330ae7b9233eed (diff)
pstricks (19may14)
git-svn-id: svn://tug.org/texlive/trunk@34126 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Changes.generic2
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news14.pdfbin65878 -> 66239 bytes
-rw-r--r--Master/texmf-dist/dvips/pstricks/pst-algparser.pro7
-rw-r--r--Master/texmf-dist/dvips/pstricks/pstricks.pro9
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex86
5 files changed, 60 insertions, 44 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
index 9ae872195c8..809ba408ef4 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.54 2014-05-19 - allow circle and ellipse in \pscustom with moving
+ the currentpoint to the start point and not the center.
2.53a 2014-03-30 - changes in pst-algparser.pro
2.53 2014-03-12 - added cubic splines
2.52 2014-03-01 - allow rot=.. for all elliptic macros
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news14.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news14.pdf
index 1ee07cc9a07..dd223f86e3e 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news14.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news14.pdf
Binary files differ
diff --git a/Master/texmf-dist/dvips/pstricks/pst-algparser.pro b/Master/texmf-dist/dvips/pstricks/pst-algparser.pro
index edd71c773fa..60e5c28263c 100644
--- a/Master/texmf-dist/dvips/pstricks/pst-algparser.pro
+++ b/Master/texmf-dist/dvips/pstricks/pst-algparser.pro
@@ -1,7 +1,7 @@
% $Id: pst-algparser.pro 902 2014-03-30 16:23:33Z herbert $
%%
%% PostScript prologue for PSTricks algorithm parser
-%% Version 0.05, 2014/03/30
+%% Version 0.06, 2014/05/19
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives
@@ -9,6 +9,8 @@
%%
%%-----------------------------------------------------------------------------%
%
+%currentdict /Pi known not { /Pi 3.14159265359 def } if
+%
/AlgParser { tx@AlgToPs begin AlgToPs end } def % Dominique Rodriguez
%
/tx@CoreAnalyzerDict 100 dict def tx@CoreAnalyzerDict begin
@@ -304,7 +306,8 @@ end
%% (name) ->
/TrigoFunc {
dup (cos) eq 1 index (sin) eq or exch (tan) eq or
- { /ExpressionVector ExpressionVector aload length Pi /div cvx 180 /mul cvx 5 -1 roll 4 add
+ { /ExpressionVector ExpressionVector aload length 3.1415926 /div cvx 180 /mul cvx 5 -1 roll 4 add
+ array astore def
array astore def
} if
} def
diff --git a/Master/texmf-dist/dvips/pstricks/pstricks.pro b/Master/texmf-dist/dvips/pstricks/pstricks.pro
index 39c0e6e180c..856d7b24958 100644
--- a/Master/texmf-dist/dvips/pstricks/pstricks.pro
+++ b/Master/texmf-dist/dvips/pstricks/pstricks.pro
@@ -1,7 +1,7 @@
% $Id: pstricks.pro 902 2014-03-30 16:23:33Z herbert $
%
%% PostScript prologue for pstricks.tex.
-%% Version 1.22, 2014/02/20
+%% Version 1.23, 2014/05/15
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives
@@ -54,7 +54,8 @@ tx@Dict begin
3 1 roll % yB-yA xA xB
sub % yB-yA xA-xB
Pyth } def
-/PtoC { 2 copy cos mul 3 1 roll sin mul } def % Polar to Cartesian
+/PtoC { 2 copy cos mul 3 1 roll sin mul } def % Polar to Cartesian
+/PtoCab { dup cos 4 -1 roll mul 3 1 roll sin mul } def % Polar to Cartesian (Ellipse) a b phi-> x y
%/Rand { rand 4294967295 div } def % a real random number
/Rand { rand 2147483447 div } def % a real random number between 0 and 1
%----------------- hv added 20050516 ---------------
@@ -1041,7 +1042,9 @@ gsave
/mtrx CM def
T
rotAngle rotate
- scale 0 0 1 5 3 roll arc
+ scale
+ 0 0 moveto 1 0 rmoveto % 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 84d7b33278b..1844d583585 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -27,9 +27,9 @@
\catcode`\@=11\relax
%
\expandafter\ifx\csname @latexerr\endcsname\relax% do we have LaTeX?
- \def\typeout#1{\immediate\write\@unused{#1}}
+ \def\typeout#1{\immediate\write\@unused{#1}}%
\alloc@7\write\chardef\sixt@@n\@unused
- \typeout{we are running tex and have to define some LaTeX commands ...}
+ \typeout{we are running tex and have to define some LaTeX commands ...}%
\long\def\@ifundefined#1#2#3{\expandafter\ifx\csname
#1\endcsname\relax#2\else#3\fi}
\def\@namedef#1{\expandafter\def\csname #1\endcsname}
@@ -109,8 +109,8 @@
\input pgffor.code.tex
\let\pgfforeach\foreach
%
-\def\fileversion{2.53a}
-\def\filedate{2014/03/30}
+\def\fileversion{2.54}
+\def\filedate{2014/05/19}
\catcode`\@=11\relax
\pst@addfams{pstricks}
%
@@ -536,7 +536,7 @@
\def\pst@@checknum{%
\@ifnextchar-%
{\let\pst@num\tw@\expandafter\pst@@@checknum\@gobble}%
- {\@ifnextchar!%
+ {\@ifnextchar !%
{\def\pst@num{3}\pst@@@@@checknum}
{\let\pst@num\@ne\pst@@@checknum}}%
}
@@ -975,7 +975,7 @@
\edef\pst@coor{\pst@number\pst@dimb \pst@angle \tx@PtoC }%
}
%
-\def\raw@coor{\@ifnextchar!\raw@@coor\raw@@@coor}
+\def\raw@coor{\@ifnextchar !\raw@@coor\raw@@@coor}
\def\raw@@coor!#1;#2\@nil{% PostScript code without using \tx@ScreenCoor
\edef\pst@coor{#1 }}
\def\raw@@@coor#1;#2\@nil{% PostScript code
@@ -1015,7 +1015,7 @@
\def\Node@coor{\node@coor}
%
\def\special@angle#1#2)#3\@nil{%
- \ifx!#1\relax
+ \ifx !#1\relax
\edef\pst@angle{#2\space \pst@angleunit}%
\else\ifx(#1\relax
\pst@@getcoor{#2}%
@@ -1027,7 +1027,7 @@
%
\def\special@length#1#2\@nil#3{%
\psDEBUG[special@length]{ #1|#2|#3 }%
- \ifx!#1\relax
+ \ifx !#1\relax
\edef\pst@SpecialLength{ #2 \pst@number\psunit mul }%
\Pst@SpecialLengthtrue%
\psDEBUG[special@length]{ Special length: \pst@SpecialLength}%
@@ -3507,43 +3507,45 @@ pop
\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
+ \addto@pscode{
+ \psellipticarc@definearg \psellipticarc@draw
\ifPst@variableLW \pst@flattenpath \fi
}%
\ifshowpoints
- \addto@pscode{
- gsave
- xOrig yOrig T % set origin to ellipse origin
- rx ry scale % now we draw a circle :-)
- 1 \pst@tempc % start angle
- \ifPst@correctAngle
- cvi 90 mod 0 eq { \pst@tempc }
- { rx abs ry abs sub cvi 0 eq { \pst@tempc }{ rx ry
- \tx@UserCoor exch \pst@tempc tan mul exch atan
- \pst@tempc 180 div 0.5 add floor
- 180 mul sub } ifelse } ifelse
- \fi
- PtoC moveto
- 0 0 lineto
- 1 \pst@tempd % end angle
- \ifPst@correctAngle
- cvi 90 mod 0 eq { \pst@tempd }
- { rx ry \tx@UserCoor exch \pst@tempd tan mul exch atan
- \pst@tempd 180 div .5 add floor 180 mul sub } ifelse
- \fi
- PtoC lineto
-% \ifcase\psarc@type arc \or arcn \fi
- CLW 2 div SLW
- [ 1 1 \tx@UserCoor ] 0 setdash
- stroke
- grestore
+ \addto@pscode{
+ gsave
+ xOrig yOrig T % set origin to ellipse origin
+ \ifx\psk@rot\@empty \else \psk@rot\space rotate \fi
+ rx ry scale % now we draw a circle :-)
+ 1 \pst@tempc % start angle
+ \ifPst@correctAngle
+ cvi 90 mod 0 eq { \pst@tempc }
+ { rx abs ry abs sub cvi 0 eq { \pst@tempc }{ rx ry
+ \tx@UserCoor exch \pst@tempc tan mul exch atan
+ \pst@tempc 180 div 0.5 add floor
+ 180 mul sub } ifelse } ifelse
+ \fi
+ PtoC moveto
+ 0 0 lineto
+ 1 \pst@tempd % end angle
+ \ifPst@correctAngle
+ cvi 90 mod 0 eq { \pst@tempd }
+ { rx ry \tx@UserCoor exch \pst@tempd tan mul exch atan
+ \pst@tempd 180 div .5 add floor 180 mul sub } ifelse
+ \fi
+ PtoC lineto
+ % \ifcase\psarc@type arc \or arcn \fi
+ CLW 2 div SLW
+ [ 1 1 \tx@UserCoor ] 0 setdash
+ stroke
+ grestore
}
- \showpointsfalse%
+ \showpointsfalse%
\fi
\end@OpenObj%
}
\def\psellipticarc@definearg{%
- \ifx\psk@rot\@empty \else \psk@rot\space rotate \fi
+% \ifx\psk@rot\@empty \else \psk@rot\space rotate \fi
\pst@tempa /yOrig ED /xOrig ED % Origin
\pst@tempb % radii. Now adjust:
\ifdim\psk@dimen\p@=\z@\else
@@ -3600,7 +3602,12 @@ pop
\fi
/mtrx CM def
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
\if@psarcn arcn \else arc \fi
% \if@star 0 0 moveto \fi
@@ -3647,9 +3654,10 @@ pop
\pssetlength\pst@dimc{#2}%
\def\pst@linetype{4}%
\addto@pscode{
- \pst@coor
- \ifPst@SpecialLength \pst@SpecialLength \else \pst@number\pst@dimc \fi
+ \pst@coor 2 copy moveto
+ \ifPst@SpecialLength \pst@SpecialLength \else \pst@number\pst@dimc \fi
\psk@dimen CLW mul sub
+ dup 0 rmoveto
0 360 arc
\ifPst@variableLW \pst@flattenpath \fi
closepath