pstricks (27dec13)

git-svn-id: svn://tug.org/texlive/trunk@32515 c570f23f-e606-0410-a88d-b1316a301751

13 files changed, 108 insertions, 148 deletions

diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.dvips b/Master/texmf-dist/doc/generic/pstricks/Changes.dvips
index b7e32c7c354..9cb27ba7e92 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.dvips
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.dvips
@@ -60,7 +60,3 @@
 ---- pstricks97.pro
 Version 97 patch 3, 98/06/01
 
-
----- pst-ovl.pro
-0.03  2013-12-21  - use own dict tx@ovlDict 
-0.02  2013-11-28  - moved the function into tx@Dict 
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
index ca4d296730d..172f216e398 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.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 
 2.49  2013-12-09  - added \reversepath 
@@ -182,5 +183,3 @@ pst-fp.tex ----------- (hv)
  v 0.02  2009-04-02 initial version
 
 
-pst-ovl.tex ----------- (hv)
- v 0.02  2013-11-28  move functions into tx@Dict dictionary
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.latex b/Master/texmf-dist/doc/generic/pstricks/Changes.latex
index 4f536c5b1fc..f909ad4d5d9 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.latex
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.latex
@@ -1,3 +1,6 @@
+Main version number is that of pstricks.tex
+
+
 pstricks.sty --------
 0.60  2013-12-12  - test, if babel was loaded for \shorthandoff
 0.59  2013-10-21  - fix for introduced bug with ifpdf
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf
index 211b89dd7d0..4d632be6398 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news14.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news14.pdf
new file mode 100644
index 00000000000..c1ef8b7df13
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news14.pdf
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news14.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news14.tex
new file mode 100644
index 00000000000..097e1dd31db
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news14.tex
@@ -0,0 +1,77 @@
+%% $Id: pst-news13.tex 856 2013-12-09 10:34:40Z herbert $
+\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
+    headexclude,footexclude,oneside]{pst-doc}
+\listfiles
+\let\Lfile\LFile
+\usepackage[utf8]{inputenc}
+\usepackage{pst-node}
+\let\pstnodeFV\fileversion
+\let\pstnodeFD\filedate
+\usepackage{pst-plot}
+\usepackage{xkvview}
+\renewcommand\bgImage{\psscalebox{15}{\color{blue!20}2013}}
+\def\textat{\char064}
+\lstset{explpreset={pos=l,width=-99pt,overhang=0pt,hsep=\columnsep,vsep=\bigskipamount,rframe={}},
+    escapechar=?}
+\begin{document}
+
+%\psset{PstDebug=1}
+\title{\texttt{News -- 2014}\\ \Large new macros and bugfixes for the
+basic package \nxLFile{pstricks}}
+\author{Herbert Voß}
+\date{\today}
+
+\maketitle
+
+\clearpage
+\tableofcontents
+
+\clearpage
+\part{\texttt{pstricks} -- package}
+
+%--------------------------------------------------------------------------------------
+\section{\texttt{pstricks.sty}}
+%--------------------------------------------------------------------------------------
+
+
+%--------------------------------------------------------------------------------------
+\section{\texttt{pstricks.tex} (\pstricksFV -- \pstricksFD)}
+%--------------------------------------------------------------------------------------
+
+\subsection{New macro \nxLcs{psRing}}
+
+\begin{BDef}
+\LcsStar{psRing}\OptArgs\Largr{\CAny}\OptArg{\Largs{start,end}}\Largb{Inner Radius}\Largb{Outer Radius}
+\end{BDef}
+
+
+\begin{LTXexample}[width=5cm]
+\begin{pspicture}[showgrid](4,4)
+  \psRing(2,2){0.3}{0.8}
+  \psRing*[opacity=0.5](2,2){1}{2}
+\psdot(2,2)
+\end{pspicture}
+\end{LTXexample}
+
+
+\begin{LTXexample}[width=5cm]
+\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}
+\end{LTXexample}
+
+
+\clearpage
+\nocite{*}
+\bibliographystyle{plain}
+\bibliography{PSTricks}
+
+\printindex
+
+
+\end{document}
+
+
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news14.tmp b/Master/texmf-dist/doc/generic/pstricks/pst-news14.tmp
new file mode 100644
index 00000000000..a2635dc14c6
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news14.tmp
@@ -0,0 +1,6 @@
+\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
new file mode 100644
index 00000000000..ab294aba248
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news14.toc
@@ -0,0 +1,5 @@
+\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/dvips/pstricks/pst-ovl.pro b/Master/texmf-dist/dvips/pstricks/pst-ovl.pro
deleted file mode 100644
index fd780d9ae16..00000000000
--- a/Master/texmf-dist/dvips/pstricks/pst-ovl.pro
+++ /dev/null
@@ -1,30 +0,0 @@
-% $Id: pst-ovl.pro 856 2013-12-09 10:34:40Z herbert $
-%
-%% PostScript prologue for pst-ovl.tex.
-%% Version 0.03, 2013/12/21
-%%
-%% This program can be redistributed and/or modified under the terms
-%% of the LaTeX Project Public License Distributed from CTAN archives
-%% in directory macros/latex/base/lppl.txt.
-%
-%
-/tx@ovlDict 10 dict def 
-tx@ovlDict begin
-%
-/BeginOL { 
-  dup (all) eq exch TheOL eq or 
-    { IfVisible not { Visible /IfVisible true def } if } 
-    { IfVisible { Invisible /IfVisible false def } if } ifelse 
-} def
-%
-/InitOL { 
-  /OLUnit [ 3000 3000 matrix defaultmatrix dtransform ] cvx def
-  /Visible { CP OLUnit idtransform T moveto } def 
-  /Invisible { CP OLUnit neg exch neg exch idtransform T moveto } def 
-  /BOL { BeginOL } def
-  /IfVisible true def 
-} def
-%
-end
-%
-% END pst-ovl.pro
diff --git a/Master/texmf-dist/tex/generic/pstricks/pst-ovl.tex b/Master/texmf-dist/tex/generic/pstricks/pst-ovl.tex
deleted file mode 100644
index 6ac70b3e9eb..00000000000
--- a/Master/texmf-dist/tex/generic/pstricks/pst-ovl.tex
+++ /dev/null
@@ -1,80 +0,0 @@
-%% $Id: pst-ovl.tex 856 2013-12-09 10:34:40Z herbert $
-%%
-%%
-%% This is file `pst-ovl.tex',
-%%
-%% IMPORTANT NOTICE:
-%%
-%% Package `pst-ovl.tex'
-%%
-%% Herbert Voss <hvoss@tug.org>
-%%
-%% This program can be redistributed and/or modified under the terms
-%% of the LaTeX Project Public License Distributed from CTAN archives
-%% in directory macros/latex/base/lppl.txt.
-%%
-%% DESCRIPTION:
-%%   `pst-ovl' is a PSTricks related package for  
-%%    overlay support
-%%
-\csname PSTovlloaded\endcsname
-\let\PSTovlloaded\endinput
-%
-% Requires main PSTricks
-\ifx\PSTricksLoaded\endinput\else\input pstricks \fi
-%
-\def\fileversion{0.03}
-\def\filedate{2013/12/21}
-\message{`pst-ovl' v\fileversion, \filedate\space (hv)}
-%
-\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
-%
-\pstheader{pst-ovl.pro}
-%
-\def\tx@BeginOL{ tx@ovlDict begin BeginOL }
-\def\tx@InitOL{ tx@ovlDict begin InitOL }
-%
-\def\pst@initoverlay#1{\pst@Verb{ \tx@InitOL /TheOL (#1) def end}}
-\def\AltOverlayMode{
-  \def\pst@initoverlay##1{%
-    \pst@Verb{
-      \tx@InitOL
-      /Visible { initclip } def
-      /Invisible {
-        CP newpath OLUnit itransform moveto clip newpath moveto
-      } def
-      /TheOL (##1) def end }}}
-%
-\def\pst@overlay#1{%
-  \edef\curr@overlay{#1}%
-  \pst@Verb{ tx@ovlDict begin (#1) BOL end }%
-  \aftergroup\pst@endoverlay}
-%
-\def\pst@endoverlay{\pst@Verb{ tx@ovlDict begin (\curr@overlay) BOL end }}
-\def\curr@overlay{all}
-%
-\newbox\theoverlaybox
-%
-\def\overlaybox{%
-  \global\setbox\theoverlaybox=\hbox\bgroup
-  \begingroup
-  \let\psoverlay\pst@overlay
-  \def\overlaybox{%
-    \@pstrickserr{Overlays cannot be nested}\@eha}%
-  \def\putoverlaybox{%
-    \@pstrickserr{You must end the overlay box
-         before using \string\putoverlaybox}}%
-  \psoverlay{main}%
-  \ignorespaces}
-%
-\def\endoverlaybox{\endgroup\egroup}
-\def\putoverlaybox#1{%
-  \hbox{\pst@initoverlay{#1}\copy\theoverlaybox}}
-%
-\def\psoverlay{\@pstrickserr{\string\psoverlay\space
-  can only be used after \string\overlaybox}}
-%
-\catcode`\@=\PstAtCode\relax
-%
-%% END: pst-ovl.tex
-\endinput
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstPlain.tex b/Master/texmf-dist/tex/generic/pstricks/pstPlain.tex
deleted file mode 100644
index 243413cede7..00000000000
--- a/Master/texmf-dist/tex/generic/pstricks/pstPlain.tex
+++ /dev/null
@@ -1,5 +0,0 @@
-%\input pst-xkey
-\input pstricks
-This is a test
-\bye
-
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index c16e8f4d8e0..d4a80896378 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -110,8 +110,8 @@
 \input pgffor.code.tex
 \let\pgfforeach\foreach
 %
-\def\fileversion{2.49b}
-\def\filedate{2013/12/21}
+\def\fileversion{2.49c}
+\def\filedate{2013/12/27}
 \catcode`\@=11\relax
 \pst@addfams{pstricks}
 %
@@ -3641,18 +3641,25 @@ pop
 %
 \def\psRing{\def\pst@par{}\pst@object{psRing}}%% hv 20130405
 \def\psRing@i{\@ifnextchar({\psRing@ii}{\psRing@ii(0,0)}}
-\def\psRing@ii(#1)#2#3{%   origin, inner radius, outer radius
-  \begin@ClosedObj
+\def\psRing@ii(#1){%
   \pst@@getcoor{#1}%
-  \pssetlength\pst@dimc{#2}%
-  \pssetlength\pst@dimd{#3}%
+  \@ifnextchar[{\psRing@iii}{\psRing@iii[0,360]}}
+\def\psRing@iii[#1,#2]#3#4{%   origin, inner radius, outer radius
+  \begin@ClosedObj
+  \pssetlength\pst@dimc{#3}%
+  \pssetlength\pst@dimd{#4}%
+  \pst@getangle{#1}\pst@tempa
+  \pst@getangle{#2}\pst@tempb
   \def\pst@linetype{4}%
   \addto@pscode{
-    \pst@coor translate newpath
+    \pst@coor translate 
     \pst@number\pst@dimc \psk@dimen CLW mul sub /InnerRadius ED
     \pst@number\pst@dimd \psk@dimen CLW mul sub /OuterRadius ED
-    0 0 InnerRadius 0 360 arc OuterRadius 0 moveto
-    0 0 OuterRadius 0 0.0001 arcn 
+    InnerRadius 0 moveto newpath
+    0 0 InnerRadius \pst@tempa\space \pst@tempb\space arc 
+    OuterRadius \pst@tempb\space PtoC 
+    \pst@tempb\space \pst@tempa\space sub abs 360 eq { moveto }{ lineto } ifelse % whole circle or not??
+    0 0 OuterRadius \pst@tempb\space \pst@tempa\space arcn 
     closepath
   }%
   \showpointsfalse
diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-ovl.sty b/Master/texmf-dist/tex/latex/pstricks/pst-ovl.sty
deleted file mode 100644
index 2fe72766af8..00000000000
--- a/Master/texmf-dist/tex/latex/pstricks/pst-ovl.sty
+++ /dev/null
@@ -1,18 +0,0 @@
-%% $Id: pst-ovl.sty 800 2013-07-09 18:01:00Z herbert $
-%% 
-%% pst-ovl.sty Copyright (C) 2013 Herbert Voss <hvoss@tug.org>
-%%
-\NeedsTeXFormat{LaTeX2e}
-
-\ProvidesPackage{pst-ovl}
-          [2013/07/08 v0.01 LaTeX wrapper for `pst-ovl' (HV)]
-\input{pst-ovl}
-\ProvidesFile{pst-ovl.tex}
-          [2013/07/08 v0.01 overlay macros `pst-ovl' (HV)]
-\IfFileExists{pst-ovl.pro}{%
-      \ProvidesFile{pst-ovl.pro}%
-        [2013/12/21,  PostScript prologue file (hv)]
-        \@addtofilelist{pst-ovl.pro}}{}%
-
-\endinput
-%%