summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Changes.generic12
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Changes.latex1
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-doc.cls6
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news10.pdfbin258906 -> 275762 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news10.tex60
-rw-r--r--Master/texmf-dist/dvips/pstricks/pstricks.pro9
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex86
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pstricks.sty27
8 files changed, 165 insertions, 36 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
index e1b7ebf1df8..3c4c5c81a28 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.generic
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
@@ -1,4 +1,9 @@
pstricks.tex --------
+2.05 2010-04-26 - fix bug with missing \psk@rot for Ellipse
+2.04 2010-04-24 - take \psk@rot into account for \psellipse (hv)
+ - new version of \pst@divide (ms)
+2.03 2010-04-12 - add keyword correctAngle=true to get an
+ elliptic arc with correct bow length
2.02 2010-02-23 - fix a spurious blank in \NormalCoor
2.01 2010-02-15 - fix problem with nonlinear angles for
\psellipticarc
@@ -84,6 +89,13 @@ pstricks.tex --------
orientation (hv)
1.06 2005-02-24 fix spurious blank in doublestroke (hv)
+pst-fp.tex ----------- (hv)
+ v 0.05 2010-01-17 add \pst@Int
+ add \pst@int
+ v 0.04 2009-11-24 add \pstFPadd
+ v 0.03 2009-11-14 add \pstFPmul
+ v 0.02 2009-04-02 initial version
+
xdvipdfmx.con ------
0.01 2007-03-11 - first CTAN version, must be renamed to pstricks.con
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.latex b/Master/texmf-dist/doc/generic/pstricks/Changes.latex
index 53adc28b400..5c2ab69dec0 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.latex
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.latex
@@ -1,4 +1,5 @@
pstricks.sty --------
+0.44 2010-04-24 - change version number of pstricks.pro
0.43 2010-03-20 - rename \pst@tempa to \pat@sty@tempa to prevent
problems with pst-fill
0.42 2010-03-16 - load pst-fp only once by pstricks-tex
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-doc.cls b/Master/texmf-dist/doc/generic/pstricks/pst-doc.cls
index 553a6901711..7092709bab3 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-doc.cls
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-doc.cls
@@ -1,4 +1,4 @@
-% $Id: pst-doc.cls 282 2010-02-09 21:05:55Z herbert $
+% $Id: pst-doc.cls 298 2010-03-13 08:46:53Z herbert $
%
%%
%% The PSTricks Project
@@ -111,13 +111,13 @@
\definecolor{colIdentifier}{rgb}{0,0,0}
\definecolor{colComments}{rgb}{1,0,0}
\definecolor{colString}{rgb}{0,0.5,0}
-\newcommand\ON{%
+\providecommand\ON{%
\gdef\lst@alloverstyle##1{%
\fboxrule=0pt
\fboxsep=0pt
\fcolorbox{Black!15}{Black!15}{\bfseries\strut##1}%
}}
-\newcommand\OFF{%
+\providecommand\OFF{%
\xdef\lst@alloverstyle##1{##1}%
}
\lstset{%
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news10.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news10.pdf
index a98d282b185..f46de193fc9 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news10.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news10.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news10.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news10.tex
index 30d3493ce24..aaec792c227 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news10.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news10.tex
@@ -55,6 +55,35 @@ No changes
\section{\texttt{pstricks.tex} (\pstricksFV -- \pstricksFD)}
%--------------------------------------------------------------------------------------
+\subsection{Macro \nxLcs{psellipse}}
+
+To rotate an ellipse the already existing keyword \Lkeyword{rot} can be
+used. This is easier than using the \Lcs{rput} command and its optional
+argument for rotating.
+
+\begin{LTXexample}[width=6cm,wide=true]
+\psset{unit=0.25}
+\begin{pspicture}(-1,5)(20,18)
+\psclip{\psellipse[linecolor=red,
+ rot=-12.606](5.821,10.04)(6.633,5.103)}
+ \psellipse[linecolor=blue,fillstyle=vlines,
+ rot=39.29](13.141,11.721)(6.8,5.4)
+\endpsclip
+\psellipse[linecolor=blue,rot=39.29](13.1,11.7)(6.8,5.4)
+\end{pspicture}
+
+\begin{pspicture}(-1,5)(20,18)
+\psellipse[linecolor=blue,rot=-39.29,
+ fillstyle=vlines](13.1,11.7)(6.8,5.4)
+\psclip{\psellipse[linecolor=red,rot=12.6,
+ fillstyle=vlines](5.8,10)(6.6,5.1)}
+ \psellipse*[linecolor=white,rot=-39.29](13.1,11.7)(6.8,5.4)
+\endpsclip
+\psellipse[linecolor=blue,rot=-39.29](13.1,11.7)(6.8,5.4)
+\psellipse[linecolor=red,rot=12.6](5.8,10)(6.6,5.1)
+\end{pspicture}
+\end{LTXexample}
+
\subsection{Macro \nxLcs{psellipticarc}}
In a circle the angle is proportional to the bow: $b=r\alpha$. In an
elliptic arc this is no more the case, which is the reason why angles are
@@ -98,6 +127,37 @@ different radii:
\psset{unit=1cm}
+If you do not want the angle correction, then use the keyword setting \Lkeyword{correctAngle}=\false:
+
+\begin{LTXexample}[width=6cm]
+\psset{unit=0.5cm}
+\begin{pspicture}(-5.5,-5.5)(5.5,5.5)%
+\psset{linewidth=0.4pt,linejoin=1,
+ correctAngle=false}
+\psline(5,0)(0,0)(5,-5)
+\psellipticarc(0,0)(1,3){0}{315}%
+\psset{linecolor=red}
+\psellipticarc(0,0)(3,1){22}{222}%
+\psline(3;22)\psline(3;222)
+\end{pspicture}%
+\end{LTXexample}
+
+\begin{LTXexample}[width=6cm]
+\psset{unit=0.5cm}
+\begin{pspicture}(-5.5,-5.5)(5.5,5.5)%
+\psset{linewidth=0.4pt,linejoin=1,
+ correctAngle=false}
+\psline(5,0)(0,0)(5,-5)
+\psellipticarc*(0,0)(1,3){0}{315}%
+\psset{linecolor=red}
+\psellipticarc*(0,0)(3,1){22}{222}%
+\psline(3;22)\psline(3;222)
+\end{pspicture}%
+\end{LTXexample}
+
+
+
+
\subsection{Option \nxLkeyword{algebraic}}
The option \Lkeyword{algebraic} moved from the other packages into
the main package \LPack{pstricks} to get rid of the dependencies.
diff --git a/Master/texmf-dist/dvips/pstricks/pstricks.pro b/Master/texmf-dist/dvips/pstricks/pstricks.pro
index 19096f3f05c..0857c09b072 100644
--- a/Master/texmf-dist/dvips/pstricks/pstricks.pro
+++ b/Master/texmf-dist/dvips/pstricks/pstricks.pro
@@ -736,7 +736,14 @@ tx@Dict begin
mul neg d
} def
%
-/Ellipse { /mtrx CM def T scale 0 0 1 5 3 roll arc mtrx setmatrix } def
+/Ellipse {
+ /rotAngle ED
+ /mtrx CM def
+ T
+ rotAngle rotate
+ scale 0 0 1 5 3 roll arc
+ mtrx setmatrix
+} def
%
/ArcAdjust { %%%% Vincent Guirardel
% given a target length (targetLength) and an initial angle (angle0) [in the stack],
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 8ce8757e7b6..e46fe6e679b 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -65,8 +65,8 @@
\pst@addfams{pstricks}
\ifx\PSTFPloaded\endinput\else \input pst-fp.tex\fi
%
-\def\fileversion{2.02}
-\def\filedate{2010/02/23}
+\def\fileversion{2.05}
+\def\filedate{2010/04/26}
%
% stolen from latex.ltx to make it TeX compatible
\newcount\psLoopIndex
@@ -112,10 +112,10 @@
\repeat%
\psforeach@ii{#1}{\pst@tempa}{#5}}
%
-\long\def\psForeach#1#2#3{%
+\long\def\psForeach#1#2#3{% without grouping the contents
\global\psLoopIndex=0\relax
\if$\ifnum9<1#2$ \else \fi \psforeach@ii{#1}{#2}{#3}
- \else \expandafter\psForeach@i#2,..,,..,\@nil{#1}{#3}\fi}
+ \else \expandafter\psForeach@i#2,..,,..,\@nil{#1}{#3}\fi}
\long\def\psForeach@i#1,#2,..,#3,..,#4\@nil#5#6{%
\ifx\relax#3\relax\psForeach@ii{#5}{#1,#2}{#6}
\else\psForeach@iii{#5}{#1}{#2}{#3}{#6}\fi}
@@ -349,6 +349,35 @@
\fi
% ----- the old pst@pyth end -----
%
+%------ new version \pst@divide ̣-------- by Michael Sharpe
+\def\pst@divide#1#2#3{%
+ \pst@@divide{#1}{#2}%
+ \advance\pst@dimg \pst@cnta pt%
+ \pst@dimtonum\pst@dimg{#3}%
+}
+\def\pst@@divide#1#2{%
+ \pst@dimg=#1\relax%
+ \pst@dimh=#2\relax%
+ \pst@cnth=\pst@dimh%
+ \pst@cntg=\pst@dimg%
+ \pst@cnta=\pst@cntg%
+ \divide\pst@cnta\pst@cnth%
+ \advance\pst@dimg -\pst@cnta\pst@dimh%
+ \pst@cntm=67108863\relax %2^26 -1
+ \pst@@@divide\pst@@@divide\pst@@@divide\pst@@@divide%
+ \divide\pst@dimg\pst@cnth%
+}%
+\def\pst@@@divide{%
+ \ifnum%
+ \ifnum\pst@dimg<\z@-\fi\pst@dimg<\pst@cntm%
+ \multiply\pst@dimg\sixt@@n%
+ \else%
+ \divide\pst@cnth\sixt@@n%
+ \fi%
+}%
+%
+%-------------- the old version ----------
+\iffalse
\def\pst@divide#1#2#3{%
\pst@@divide{#1}{#2}%
\pst@dimtonum\pst@dimg{#3}%
@@ -369,6 +398,9 @@
\divide\pst@cntg\sixt@@n
\fi%
}
+\fi
+%-------------- end old vesrion ---------------
+%
\def\pst@configerr#1{%
\@pstrickserr{\string#1 not defined in pstricks.con}\@ehpc}
%
@@ -379,7 +411,7 @@
\def\pstheader#1{\pst@configerr\pstheader}
\def\pstdriver{\pst@configerr\pstdriver}
\@ifundefined{pstcustomize}%
-{\def\pstcustomize{\endinput\let\pstcustomize\relax}}{}
+ {\def\pstcustomize{\endinput\let\pstcustomize\relax}}{}
%
\input pstricks.con % local config file
%
@@ -423,6 +455,12 @@
%--------------------------------------- PS stuff end -----------------------------
%
\def\pst@number#1{\pst@@dimtonum#1\space}
+%
+%-----------------------% hv 20100413
+\def\pst@strip@dot#1{\expandafter\pst@strip@dot@i#1..\@nil}
+\def\pst@strip@dot@i#1.#2.#3\@nil{%
+ \ifnum1#2>10\relax #1.#2\else#1\fi}
+%-----------------------% hv 20100413
\def\pst@checknum#1#2{%
\edef\ps@next{#1}%
\ifx\ps@next\@empty\let\pst@num\z@%
@@ -433,7 +471,7 @@
\def#2{0 }%
\else%
\edef#2{\ifnum\pst@num=\tw@-\fi\the\pst@cntg.%
- \expandafter\@gobble\the\pst@cnth\space}%
+ \expandafter\@gobble\the\pst@cnth\space}%
\fi}
\def\pst@@checknum{%
\@ifnextchar-%
@@ -444,8 +482,8 @@
\def\pst@@@checknum#1.#2.#3\@nil{%
\afterassignment\pst@@@@checknum\pst@cntg=0#1\relax\@nil%
\afterassignment\pst@@@@checknum\pst@cnth=1#2\relax\@nil}
-\def\pst@@@@checknum#1\relax\@nil{%
-\ifx\@nil#1\@nil\else\let\pst@num\z@\fi}
+\def\pst@@@@checknum#1\relax\@nil{\ifx\@nil#1\@nil\else\let\pst@num\z@\fi}
+%
\def\pst@getnumii#1 #2 #3\@nil{%
\pst@checknum{#1}\pst@tempg%
\pst@checknum{#2}\pst@temph}
@@ -458,6 +496,7 @@
\pst@checknum{#2}\pst@temph%
\pst@checknum{#3}\pst@tempi%
\pst@checknum{#4}\pst@tempj}
+%
\def\pst@getdimnum#1 #2 #3\@nil{%
\pssetlength\pst@dimg{#1}%
\pst@checknum{#2}\pst@tempg%
@@ -3017,6 +3056,9 @@ pop
\def\psellipticarc{\def\pst@par{}\pst@object{psellipticarc}}
\def\psellipticarc@i{\let\if@psarcn\iffalse\psellipticarc@ii}
%
+\define@boolkey[psset]{pstricks}[Pst@]{correctAngle}[true]{}
+\psset{correctAngle=true}
+
\let\if@psarcn\iffalse
\def\psellipticarc@ii{\pst@getarrows\psellipticarc@iii}
\def\psellipticarc@iii(#1){%
@@ -3044,19 +3086,25 @@ pop
% \pst@tempc
% the angle in the parameter equation is not proportional to the real angle!
% phi=atan(b*tan(angle)/a)+floor(angle/180+0.5)*180
- \pst@tempc cvi 90 mod 0 eq { \pst@tempc }
- { rx ry \tx@UserCoor exch \pst@tempc tan mul exch atan
- \pst@tempc 180 div .5 add floor 180 mul sub } ifelse
+ \pst@tempc
+ \ifPst@correctAngle
+ cvi 90 mod 0 eq { \pst@tempc }
+ { rx ry \tx@UserCoor exch \pst@tempc tan mul exch atan
+ \pst@tempc 180 div .5 add floor 180 mul sub } ifelse
+ \fi
\psk@arcsepA 2 div
ArcAdjust
def
/angleB
/d { \if@psarcn add \else sub \fi } def
% \pst@tempd
- \pst@tempd 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
- \psk@arcsepB 2 div ArcAdjust def
+ \pst@tempd
+ \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
+ \psk@arcsepB 2 div ArcAdjust def
\ifshowpoints\psellipticarc@showpoints\fi
\ifx\psk@arrowA\@empty
\ifnum\psk@liftpen=2
@@ -3185,14 +3233,16 @@ pop
\showpointsfalse%
\end@ClosedObj%
}
-\def\tx@Ellipse{Ellipse }
+\def\tx@Ellipse{
+ \ifx\psk@rot\@empty 0 \else \psk@rot \fi
+ Ellipse }
\def\psellipse{\def\pst@par{}\pst@object{psellipse}}
\def\psellipse@i(#1){\@ifnextchar({\psellipse@ii(#1)}{\psellipse@ii(0,0)(#1)}}
\def\psellipse@ii(#1)(#2){%
\begin@ClosedObj
\pst@getcoor{#1}\pst@tempa
\pst@@getcoor{#2}%
- \addto@pscode{%
+ \addto@pscode{
0 360
\pst@coor
\ifdim\psk@dimen\p@=\z@\else
@@ -3201,7 +3251,7 @@ pop
\fi
\pst@tempa
\tx@Ellipse
- closepath%
+ closepath
}%
\def\pst@linetype{2}%
\end@ClosedObj%
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
index 7d7e66621f8..5c1a55dc384 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
@@ -16,7 +16,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pstricks}
- [2010/03/20 v0.43 LaTeX wrapper for `PSTricks' (RN,HV)]
+ [2008/11/26 v0.40 LaTeX wrapper for `PSTricks' (RN,HV)]
%
\def\documentclass{%
\edef\@tempa{\jobname.tex }%
@@ -39,12 +39,12 @@
\DeclareOption{plain}{%
\ifpst@OldVersion
\def\psDEBUG[#1]#2{}%
- \def\pst@sty@tempa{pstricks97.tex}%
+ \def\pst@tempa{pstricks97.tex}%
\else
- \def\pst@sty@tempa{pstricks.tex}%
+ \def\pst@tempa{pstricks.tex}%
\fi
- \input{\pst@sty@tempa}%
- \ProvidesFile{\pst@sty@tempa}%
+ \input{\pst@tempa}%
+ \ProvidesFile{\pst@tempa}%
[\filedate\space v\fileversion\space `PSTricks' (tvz)]%
\endinput
}
@@ -58,20 +58,19 @@
\let\saved@scalebox\scalebox
\ifpst@OldVersion
\def\psDEBUG[#1]#2{}
- \def\pst@sty@tempa{pstricks97.tex}%
+ \def\pst@tempa{pstricks97.tex}%
\else
- \def\pst@sty@tempa{pstricks.tex}
+ \def\pst@tempa{pstricks.tex}
\fi
- \input{\pst@sty@tempa}%
- \ProvidesFile{\pst@sty@tempa}
+ \input{\pst@tempa}%
+ \ProvidesFile{\pst@tempa}
[\filedate\space v\fileversion\space `PSTricks' (tvz,hv)]
-% \input{pst-fp.tex}% all done by pstricks.tex itself
- \IfFileExists{pst-fp.tex}{%
- \ProvidesFile{pst-fp.tex}[2010/01/17 v0.05 `pst-fp' (hv)]
- \@addtofilelist{pst-fp.tex}}{}%
+ \input{pst-fp.tex}
+ \ProvidesFile{pst-fp.tex}
+ [\filedate\space v\fileversion\space `PST-fp' (hv)]
\IfFileExists{pstricks.pro}{%
\ProvidesFile{pstricks.pro}
- [2009/01/30 v. 1.06, PostScript prologue file (hv)]
+ [2010/04/24 v. 1.07, PostScript prologue file (hv)]
\@addtofilelist{pstricks.pro}}{}%
\IfFileExists{pst-dots.pro}{%
\ProvidesFile{pst-dots.pro}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 10:58:00 +0000