summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Changes1
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Changes.generic1
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news14.pdfbin66336 -> 69936 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news14.tex22
-rw-r--r--Master/texmf-dist/dvips/pstricks/pst-algparser.pro2
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex43
6 files changed, 64 insertions, 5 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes b/Master/texmf-dist/doc/generic/pstricks/Changes
index a6aa1618933..a97be59d9fb 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes
@@ -1,3 +1,4 @@
+2014-07-28 - updated news2014
2013-12-09 - updated news2009 and news2013
2013-11-26 - updated news2013
2013-04-17 - updated news2013
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
index 76fe4595e1f..15517993aa8 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.generic
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
@@ -3,6 +3,7 @@ versions like 2.47a have only changes in other files, but not
in this main package.
+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
the currentpoint to the start point and not the center.
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news14.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news14.pdf
index 38fa0a01146..a0430f11c5f 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/doc/generic/pstricks/pst-news14.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news14.tex
index 74c92823641..98e7be4f304 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news14.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news14.tex
@@ -74,6 +74,28 @@ needs some tricky internal commands and may not work in all cases.
\end{pspicture}
\end{LTXexample}
+\subsection{New macro \nxLcs{psellipseAB}}
+
+\begin{BDef}
+\LcsStar{psellipseAB}\OptArgs\Largr{\CAny}\Largb{half radius}
+\end{BDef}
+
+
+\begin{LTXexample}[width=7cm]
+\begin{pspicture}[showgrid=true](7,7)%% showgrid=true
+\pnodes{a}(0.5,0)(2.5,1.8)(5.5,2.5)(6.25,3)(7,5)
+\pnodes{b}(0,1)(2,3)(5,4)(5.5,5)(6,7)
+\pscurve[arrowscale=2,linewidth=1.2pt]{->}(a0)(a1)(a2)(a3)(a4)
+\pscurve[arrowscale=2,linewidth=1.2pt]{->}(b0)(b1)(b2)(b3)(b4)
+\psellipseAB(a0)(b0){0.1}
+\psellipseAB[fillcolor=red!40,fillstyle=solid](a1)(b1){0.15}
+\psellipseAB(a2)(b2){0.2}
+\psellipseAB[fillcolor=blue!40,fillstyle=solid](a3)(b3){0.25}
+\uput[135](b1){$dS_1$}\uput[135](b2){$dS_2$}
+\end{pspicture}
+\end{LTXexample}
+
+
\subsection{New macro \nxLcs{psRing}}
diff --git a/Master/texmf-dist/dvips/pstricks/pst-algparser.pro b/Master/texmf-dist/dvips/pstricks/pst-algparser.pro
index 7fac21adbf9..6e131dc8d06 100644
--- a/Master/texmf-dist/dvips/pstricks/pst-algparser.pro
+++ b/Master/texmf-dist/dvips/pstricks/pst-algparser.pro
@@ -353,7 +353,7 @@ end %tx@CoreAnalyzerDict
%%increase ^^ for each function added
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% algExpr variable -> PSVector
-/Derive {%
+/Derive {
10240 string 3 1 roll 0 3 1 roll
/Variable exch def
tx@CoreAnalyzerDict begin InitParser AnalyzeListOfE end
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 7f9bd3fff10..8c56d1f3af2 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.54a}
-\def\filedate{2014/05/19}
+\def\fileversion{2.55}
+\def\filedate{2014/07/28}
\catcode`\@=11\relax
\pst@addfams{pstricks}
%
@@ -1213,8 +1213,17 @@
/Multiply \or
/HardLight \or
/Darken \or
- /Ligten \or
- /Difference
+ /Lighten \or
+ /Difference\or
+ /ColorDodge\or
+ /ColorBurn\or
+ /SoftLight\or
+ /Hue\or
+ /Saturation\or
+ /Luminosity\or
+ /Overlay\or
+ /Exclusion\or
+ /Color
\else
/Normal
\fi
@@ -3779,6 +3788,32 @@ pop
\def\pst@linetype{2}%
\end@ClosedObj%
}
+\def\psellipseAB{\def\pst@par{}\pst@object{psellipseAB}}
+\def\psellipseAB@i(#1)(#2)#3{%
+ \begin@ClosedObj
+ \pst@getcoor{#1}\pst@tempa
+ \pst@getcoor{#2}\pst@tempb
+ \addto@pscode{
+ 0 360
+ #3 \pst@number\psxunit mul
+ \pst@tempa /yA ED /xA ED
+ \pst@tempb /yB ED /xB ED
+ xA xB sub dup mul
+ yA yB sub dup mul add sqrt 2 div
+ \ifdim\psk@dimen\p@=\z@\else
+ \psk@dimen CLW mul
+ dup 4 -1 roll sub neg 3 1 roll sub
+ \fi
+ xA xB add 2 div yA yB add 2 div
+ translate 0 0
+ xB xA sub yA yB sub atan
+ Ellipse % on stack is rotate coordinates
+ \ifPst@variableLW \pst@flattenpath \fi
+ closepath
+ }%
+ \def\pst@linetype{2}%
+ \end@ClosedObj
+}
\def\multips{\@ifnextchar({\def\pst@par{}\multips@ii}{\multips@i}}
\def\multips@i#1{\def\pst@par{rot=#1}\multips@ii}
\def\multips@ii(#1){\@ifnextchar({\multips@iii(#1)}{\multips@iii(\z@,\z@)(#1)}}