From 9ea4f698ce68c7ab6720c2b097588e8fe75b80bb Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 16 Jan 2014 23:09:52 +0000 Subject: pstricks (16jan14) git-svn-id: svn://tug.org/texlive/trunk@32691 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/generic/pstricks/Changes.generic | 2 + .../texmf-dist/doc/generic/pstricks/pst-news14.pdf | Bin 30769 -> 50710 bytes .../texmf-dist/doc/generic/pstricks/pst-news14.tex | 41 +++++++++++++++++++-- .../texmf-dist/doc/generic/pstricks/pst-news14.tmp | 6 --- .../texmf-dist/doc/generic/pstricks/pst-news14.toc | 5 --- .../texmf-dist/tex/generic/pstricks/pstricks.tex | 33 +++++++++++++---- 6 files changed, 65 insertions(+), 22 deletions(-) delete mode 100644 Master/texmf-dist/doc/generic/pstricks/pst-news14.tmp delete mode 100644 Master/texmf-dist/doc/generic/pstricks/pst-news14.toc (limited to 'Master') diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic index 172f216e398..a3539e1c86d 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.50 2014-01-16 - added experimental fillstyle oefill, the inverse of eofill + - allow PostScript notation for \pst@checknum 2.49c 2013-12-27 - moved overlay functions into an own package 2.49b 2013-12-21 - moved overlay functions into an own dictionary 2.49a 2013-12-09 - changes in pstricks.sty diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news14.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news14.pdf index c1ef8b7df13..ef75cb88557 100644 Binary files a/Master/texmf-dist/doc/generic/pstricks/pst-news14.pdf and b/Master/texmf-dist/doc/generic/pstricks/pst-news14.pdf differ diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news14.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news14.tex index 097e1dd31db..255267180d3 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news14.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news14.tex @@ -9,7 +9,7 @@ \let\pstnodeFD\filedate \usepackage{pst-plot} \usepackage{xkvview} -\renewcommand\bgImage{\psscalebox{15}{\color{blue!20}2013}} +\renewcommand\bgImage{\psscalebox{15}{\color{blue!20}2014}} \def\textat{\char064} \lstset{explpreset={pos=l,width=-99pt,overhang=0pt,hsep=\columnsep,vsep=\bigskipamount,rframe={}}, escapechar=?} @@ -30,18 +30,53 @@ basic package \nxLFile{pstricks}} \part{\texttt{pstricks} -- package} %-------------------------------------------------------------------------------------- -\section{\texttt{pstricks.sty}} +%\section{\texttt{pstricks.sty}} %-------------------------------------------------------------------------------------- %-------------------------------------------------------------------------------------- \section{\texttt{pstricks.tex} (\pstricksFV -- \pstricksFD)} %-------------------------------------------------------------------------------------- +\subsection{PostScript notation for numbers} +Optional arguments which expects a real number can now have a preceeding ! character for +a PostScript notation which is directly passed to PostScript. The user has take care that +such a number isn't use before in another \TeX\ macro. In such a case it gives an error. + +\begin{LTXexample}[width=5cm] +\pstVerb{ 1234321 srand } +\begin{pspicture}[showgrid](-2,-2)(2,2) +\psframe*[linecolor=blue,opacity=!Rand](2,2) +\psframe*[linecolor=red,opacity=!Rand](-1,-1)(1,1) +\psframe*[linecolor=green,opacity=!Rand](-2,-2)(0,0) +\end{pspicture} +\end{LTXexample} + + +\subsection{Fillstyle \texttt{eofill}} + +It is an experimental fillstyle. PostScript knows only the \Lkeyval{eofill} and the other way round +needs some tricky internal commands and may not work in all cases. + +\begin{LTXexample}[pos=t] +\begin{pspicture}[linewidth=2pt](12,4) +\pscustom[linestyle=none,fillstyle=eofill,fillcolor=blue!40]{% + \psellipse(4,2)(2,2)\psellipse(2,2)(2,2)} +\psellipse[linecolor=red](4,2)(2,2) +\psellipse[linecolor=green](2,2)(2,2) +% +\pscustom[linestyle=none,fillstyle=oefill,fillcolor=blue!40]{% + \psellipse(10,2)(2,2)\psellipse(8,2)(2,2)} +\psellipse[linecolor=red](10,2)(2,2) +\psellipse[linecolor=green](8,2)(2,2) +\end{pspicture} +\end{LTXexample} + + \subsection{New macro \nxLcs{psRing}} \begin{BDef} -\LcsStar{psRing}\OptArgs\Largr{\CAny}\OptArg{\Largs{start,end}}\Largb{Inner Radius}\Largb{Outer Radius} +\LcsStar{psRing}\OptArgs\Largr{\CAny}\OptArg{start,end}\Largb{Inner Radius}\Largb{Outer Radius} \end{BDef} diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news14.tmp b/Master/texmf-dist/doc/generic/pstricks/pst-news14.tmp deleted file mode 100644 index a2635dc14c6..00000000000 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news14.tmp +++ /dev/null @@ -1,6 +0,0 @@ -\begin{pspicture}[showgrid](4,4) - \psRing[linecolor=red](2,2)[30,60]{1}{2} - \psRing[opacity=0.5,fillstyle=solid, - fillcolor=red](2,2)[60,30]{1}{2} -\psdot(2,2) -\end{pspicture} diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news14.toc b/Master/texmf-dist/doc/generic/pstricks/pst-news14.toc deleted file mode 100644 index ab294aba248..00000000000 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news14.toc +++ /dev/null @@ -1,5 +0,0 @@ -\select@language {english} -\contentsline {part}{\numberline {I}\texttt {pstricks} -- package}{3}{part.1} -\contentsline {section}{\numberline {1}\texttt {pstricks.sty}}{3}{section.1} -\contentsline {section}{\numberline {2}\texttt {pstricks.tex} (2.49b-- 2013/12/21)}{3}{section.2} -\contentsline {subsection}{\numberline {2.1}New macro \texttt {\textbackslash psRing}}{3}{subsection.2.1} diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index d4a80896378..b8bb470cd83 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -81,7 +81,6 @@ % \in@{,#2,}{,#3,}% \begingroup\edef\x{\endgroup\noexpand\in@{,#2,}}\x{,#3,}% %\expandafter\in@\expandafter{\expandafter,#2,}{,#3,}% --- hv 2012-04-27 -%\typeout{=====>foo<=====}% \ifin@ \ifXKV@pl \XKV@addtomacro@n\XKV@tempa\@firstoftwo @@ -110,8 +109,8 @@ \input pgffor.code.tex \let\pgfforeach\foreach % -\def\fileversion{2.49c} -\def\filedate{2013/12/27} +\def\fileversion{2.50} +\def\filedate{2014/01/16} \catcode`\@=11\relax \pst@addfams{pstricks} % @@ -522,24 +521,32 @@ \ifx\ps@next\@empty\let\pst@num\z@% \else\expandafter\pst@@checknum\ps@next..\@nil% \fi% - \ifnum\pst@num=\z@ + \ifcase\pst@num% 0 \@pstrickserr{Bad number: `#1'. 0 substituted.}\@ehpa% \def#2{0 }% - \else% + \or% 1 + \edef#2{\ifnum\pst@num=\tw@-\fi\the\pst@cntg.% + \expandafter\@gobble\the\pst@cnth\space}% + \or% 2 \edef#2{\ifnum\pst@num=\tw@-\fi\the\pst@cntg.% \expandafter\@gobble\the\pst@cnth\space}% + \or% 3 + \edef#2{\pst@tempA\space}% \fi} \def\pst@@checknum{% \@ifnextchar-% {\let\pst@num\tw@\expandafter\pst@@@checknum\@gobble}% - {\let\pst@num\@ne\pst@@@checknum}% + {\@ifnextchar!% + {\def\pst@num{3}\pst@@@@@checknum} + {\let\pst@num\@ne\pst@@@checknum}}% } -% \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#2.#3\@nil{\def\pst@tempA{#2}}% PostScript Notation with ! +% \def\pst@getnumii#1 #2 #3\@nil{% \pst@checknum{#1}\pst@tempg% \ifx\relax#2\relax\let\pst@temph\pst@tempg\else\pst@checknum{#2}\pst@temph\fi} @@ -1214,7 +1221,15 @@ %--------------------------------- hv 2007-09-09 begin --------------------- % transparency needs a run through latex -> dvips -> ps2pdf14(!) % -\define@key[psset]{pstricks}{fillcolor}[white]{\pst@getcolor{#1}\psfillcolor} +\def\e@fill@inverse{oefill} +\define@key[psset]{pstricks}{fillcolor}[white]{% + \ifx\psk@fillstylename\e@fill@inverse + \pst@getcolor{#1}\psk@oefillcolor + \pst@getcolor{white}\psfillcolor + \else \pst@getcolor{white}\psk@oefillcolor + \pst@getcolor{#1}\psfillcolor + \fi} + \psset[pstricks]{fillcolor=white} \define@key[psset]{pstricks}{strokeopacity}[1]{\pst@checknum{#1}\psk@strokeopacityalpha }% for lines \psset[pstricks]{strokeopacity=1} @@ -1243,6 +1258,7 @@ \def\psfs@none{} \def\psfs@solid{\pst@fill{\pst@usecolor\psfillcolor \tx@setTransparency fill }} \def\psfs@eofill{\pst@fill{\pst@usecolor\psfillcolor \tx@setTransparency eofill}} +\def\psfs@oefill{\pst@fill{\pst@usecolor\psk@oefillcolor \tx@setTransparency fill } \psfs@eofill} \def\psfs@shape{\pst@fill{\pst@usecolor\psfillcolor \tx@setBlendmode fill }} \def\psfs@spiral{\pst@fill{\pst@fsOrigin \pst@usecolor\psfillcolor clip newpath 0 .1 500 { dup dup sqrt 4 div 0 360 arc fill \pst@fsAngle rotate } for }} @@ -1337,6 +1353,7 @@ \@namedef{psfs@truchet*}{\psfs@solid \psfs@truchet} % \define@key[psset]{pstricks}{fillstyle}[none]{% + \def\psk@fillstylename{#1}% needed for inverse eofill \edef\pst@tempg{#1}\def\pst@temph{none}% \ifx\pst@tempg\pst@temph \let\psk@fillstyle\relax -- cgit v1.2.3