summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Changes.generic6
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Changes.latex1
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news13.pdfbin68823 -> 81845 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news13.tex44
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data4
-rw-r--r--Master/texmf-dist/dvips/pstricks/pstricks.pro8
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex54
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pstricks.sty12
8 files changed, 106 insertions, 23 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
index 41de55f98f1..16ebf27bc2a 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.generic
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
@@ -1,7 +1,11 @@
pstricks.tex --------
+2.43 2013-05-12 - allow option ! to the labelsep of \uput
+2.42 2013-04-26 - add option + for coordinates to allow
+ (+{x} {f(x)}) both in algebraic notation where
+ x must be expanded to a value.
2.41 2013-04-17 - add option for using the pgf PS functions.
in some cases they are missing. They are
- defined in pst-tools.pro which os loaded
+ defined in pst-tools.pro which is loaded
by default.
2.40 2013-04-05 - fix for showgrid=top. Uses now the
same units as showgrid=bottom
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.latex b/Master/texmf-dist/doc/generic/pstricks/Changes.latex
index c3c3b50a6da..2f4b4086208 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.56 2013-05-21 - add option monochrome
0.55 2013-04-05 - pass option pdfcrop=--hres to auto-pst-pdf
0.54 2013-04-05 - revert setting of the fillcolor, see 0.33
0.53 2012-08-24 - update version number for pro files
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf
index 72999d1a031..b1535760548 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news13.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news13.tex
index 82570b8a406..5eafc5e809e 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news13.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news13.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-news13.tex 767 2013-04-17 21:38:48Z herbert $
+%% $Id: pst-news13.tex 781 2013-05-21 08:25:07Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\listfiles
@@ -29,6 +29,26 @@ basic package \nxLFile{pstricks}}
\part{\texttt{pstricks} -- package}
%--------------------------------------------------------------------------------------
+\section{\texttt{pstricks.sty}}
+%--------------------------------------------------------------------------------------
+
+There is a new optional argument \Lkeyword{monochrome} to convert all RGB and CMYK colors
+into grayscale. The equations are:
+
+\subsection{RGB to gray}
+\[ \text{gray} = 0.07 \text{red} + 0.71 \text{green} + 0.21 \text{blue} \]
+
+\subsection{CMYK to gray}
+\begin{align*}
+ c &= c (1 - k) + k\\
+ m &= m (1 - k) + k\\
+ y &= y (1 - k) + k\\
+ r, g, b &= (1 - c), (1 - m), (1 - y)\\
+ \text{gray} &= 0.299 r + 0.587 g + 0.114 b
+\end{align*}
+
+
+%--------------------------------------------------------------------------------------
\section{\texttt{pstricks.tex} (\pstricksFV -- \pstricksFD)}
%--------------------------------------------------------------------------------------
There is a new optional argument \Lkeyword{pgffunctions} for the environment \Lenv{pspicture}.
@@ -38,6 +58,28 @@ package which uses pgf macros.
\lstinline|\begin{pspicture}[pgffunctions,...](...)(...)|
+\subsection{labelsep}
+The \Lkeyword{labelsep} is the first -- optional -- argument of \Lcs{uput}.
+It is now possible to use the PostScript notation for this \emph{length}, eg \verb|{! 45 sin 3 mul}|.
+Then the unit which is active when \Lcs{uput} is active is used. With a unit the PS notation
+ist not allowed and leads to an error!
+
+
+
+\subsection{Coordinates}
+Additionally to the special pair of coordinates \verb|(*x f(x))| where $x$ must be a value in
+PostScript notation and $f(x)$ in algebaric noatation, there is now a \verb|(+{x}, {f(x)})|.
+Both expressions must be in algebraic notation and \verb|{x}| must expand to a value
+or an expression which uses known system or user defined PostScript functions.
+
+\begin{LTXexample}[width=5cm]
+\begin{pspicture}[showgrid](3,2)
+\pnode(+{sqrt(Pi)},{1.5*(sin(x)^2+cos(x)^2)}){A}
+\psdot(A)
+\psline[arrowscale=1.5]{->}(A)
+\end{pspicture}
+\end{LTXexample}
+
\subsection{Fillstyle \texttt{dots}}
A fix for the fill style \Lkeyval{dots} to make it work again:
diff --git a/Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data b/Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data
new file mode 100644
index 00000000000..8bd09389cc7
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data
@@ -0,0 +1,4 @@
+some nonsense in this line ---time forcex forcey
+0 0.2
+1 1
+2 4
diff --git a/Master/texmf-dist/dvips/pstricks/pstricks.pro b/Master/texmf-dist/dvips/pstricks/pstricks.pro
index 78cd0fd8b96..dd54e313202 100644
--- a/Master/texmf-dist/dvips/pstricks/pstricks.pro
+++ b/Master/texmf-dist/dvips/pstricks/pstricks.pro
@@ -1,4 +1,4 @@
-% $Id: pstricks.pro 755 2013-03-09 08:48:58Z herbert $
+% $Id: pstricks.pro 781 2013-05-21 08:25:07Z herbert $
%
%% PostScript prologue for pstricks.tex.
%% Version 1.15, 2012/10/18
@@ -16,7 +16,7 @@ systemdict /.setshapealpha known not {/.setshapealpha { pop } def } if
%
/tx@Dict 200 dict def % the main PSTricks dictionary
tx@Dict begin
-/ADict 25 dict def % The arrow dictionaray
+/ADict 25 dict def % The arrow dictionary
/CM { matrix currentmatrix } bind def
/SLW /setlinewidth load def
/CLW /currentlinewidth load def
@@ -56,6 +56,10 @@ tx@Dict begin
%
/RadtoDeg { 180 mul Pi div } bind def % convert from radian to degrees
/DegtoRad { Pi mul 180 div } bind def % viceversa
+
+/startGlobal { true setglobal globaldict begin } bind def
+/endGlobal { end false setglobal } bind def
+
%----------------- hv end---------------------------
/PathLength@ { /z z y y1 sub x x1 sub Pyth add def /y1 y def /x1 x def } def
%
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 18412f54e62..bae2c3ba6ef 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -103,8 +103,8 @@
\input pgffor.code.tex
\let\pgfforeach\foreach
%
-\def\fileversion{2.41}
-\def\filedate{2013/04/17}
+\def\fileversion{2.43}
+\def\filedate{2013/05/12}
\catcode`\@=11\relax
\pst@addfams{pstricks}
%
@@ -795,22 +795,25 @@
\catcode`\!=13
\catcode`\*=13
\catcode`\>=13
+\catcode`\+=13
\gdef\pst@activecoor{%
\def|{\string|}%
\def;{\string;}%
\def!{\string!}%
\def*{\string*}% algebraic expression hv 2007-11-17
\def>{\string>}%
+ \def+{\string+}% pure algebaric 2013-04-23
}
\endgroup
% \pst@C@@rType = 0 cartesian (x,y)
% = 1 polar (r;phi)
% = 2 PS (! x y)
% = 3 mixed ((x,y)|(x,y))
-% = 4 algebraic (*x f(x))
+% = 4 algebraic (*x f(x)) x in PostScript notation
% = 5 node (A)
% = 6 special node ([...]A)
% = 7 node (>A)
+% = 8 algebraic (+x,f(x)) _both_ algebraic
\def\pst@CheckCoorType#1|#2|#3\@nil{%
\ifx#3|\relax
\global\pst@C@@rType=3\relax
@@ -837,11 +840,15 @@
\else
\ifx#1*\relax% algebraic PostScript code: x f(x)
\global\pst@C@@rType=4\relax%
- \else
- \ifx#4;\relax% polar coordinates
- \global\pst@C@@rType=1\relax%
- \else
- \global\pst@C@@rType=0\relax%
+ \else
+ \ifx#1+\relax% algebraic PostScript code: x, (f(x)
+ \global\pst@C@@rType=8\relax%
+ \else
+ \ifx#4;\relax% polar coordinates
+ \global\pst@C@@rType=1\relax%
+ \else
+ \global\pst@C@@rType=0\relax%
+ \fi
\fi
\fi
\fi
@@ -872,14 +879,18 @@
\ifx#1!\relax% PostScript code: x y
\def\ps@next{\raw@coor}%
\else
- \ifx#1*\relax% algebraic PostScript code: x f(x)
+ \ifx#1*\relax% PostScript/algebraic code: x f(x)
\def\ps@next{\alg@coor}%
- \else
- \def\ps@next{\special@@@coor#1}%
- \fi
- \fi
- \fi\fi
- \fi
+ \else
+ \ifx#1+\relax% algebraic code: x,f(x)
+ \def\ps@next{\algalg@coor}%
+ \else%
+ \def\ps@next{\special@@@coor#1}%
+ \fi%
+ \fi%
+ \fi%
+ \fi\fi%
+ \fi%
\ps@next%
}
\def\special@@@coor#1;#2;#3\@nil{%
@@ -927,9 +938,15 @@
\def\alg@coor#1;#2\@nil{\expandafter\alg@@@coor#1}
\def\alg@@@coor#1 #2{% algebraic PostScript code
\edef\pst@coor{%
-% #1 /yArg exch def /x exch def
/x #1 def
-% /yArg load 200 string cvs /Arg exch def
+ /Func (#2) AlgParser cvx def
+ x Func
+ \pst@number\psyunit mul exch \pst@number\psxunit mul exch }}
+%
+\def\algalg@coor#1;#2\@nil{\expandafter\algalg@@@coor#1}
+\def\algalg@@@coor#1,#2{% algebraic algebraic code
+ \edef\pst@coor{%
+ /x (#1) AlgParser cvx def
/Func (#2) AlgParser cvx def
x Func
\pst@number\psyunit mul exch \pst@number\psxunit mul exch }}
@@ -4005,7 +4022,8 @@ pop
%
\def\uput@vii#1#2{%
\edef\pst@coor{%
- \pst@number\pslabelsep % \ifdim\pslabelsep<\z@ neg \fi
+ \ifPst@SpecialLength \pst@SpecialLength \else \pst@number\pslabelsep \fi
+% \pst@number\pslabelsep % \ifdim\pslabelsep<\z@ neg \fi
#2
\pst@number{\wd\pst@hbox}%
\pst@number{\ht\pst@hbox}%
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
index 5b7d6c4dbe9..87c8e2c6e4d 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
@@ -15,7 +15,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{pstricks}[2013/04/05 v0.54 LaTeX wrapper for `PSTricks' (RN,HV)]
+\ProvidesPackage{pstricks}[2013/05/21 v0.56 LaTeX wrapper for `PSTricks' (RN,HV)]
%
\def\documentclass{%
\edef\@tempa{\jobname.tex }%
@@ -166,6 +166,16 @@
/ca \psk@shapealpha /CA \psk@opacityalpha /SetTransparency pdfmark >%
}
%---------------------------------COLOR --------------------------------
+\DeclareOption{monochrome}{%
+ \AtBeginDocument{\special{ps:
+ /setrgbcolor { 0.07 mul exch 0.71 mul add exch 0.21 mul add setgray } def
+ /setcmykcolor{ 4 dict begin
+ /k ED /y ED /m ED /c ED
+ 1 1 k sub c mul k add sub 0.29 mul
+ 1 1 k sub m mul k add sub 0.587 mul add
+ 1 1 k sub y mul k add sub 0.114 mul add
+ end setgray } def }}}
+
\DeclareOption*{%
\PassOptionsToPackage\CurrentOption{\pst@ColorPackage}}
\ProcessOptions\relax