9 files changed, 91 insertions, 10 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes b/Master/texmf-dist/doc/generic/pstricks/Changes
index 4c43f30360e..c0b01626623 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes
@@ -1,3 +1,4 @@
+2015-06-29  - new news2015 
 2014-08-28  - updated news2014 
 2014-07-28  - updated news2014 
 2013-12-09  - updated news2009 and news2013
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
index 71eceb3a96d..6a1270906c6 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.generic
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
@@ -2,6 +2,7 @@ pstricks.tex --------
 versions like 2.47a have only changes in other files, but not
 in this main package.
 
+2.61  2015-06-28  - added optional arguments precode and postcode
 2.60  2014-10-25  - make it compatible for using it with ConTeXt
 2.57  2014-08-27  - take option correctAngle into account for \psellipticwedge
 2.56  2014-07-31  - added gridstyleA and fixed bug with Ellipse and move
diff --git a/Master/texmf-dist/doc/generic/pstricks/README b/Master/texmf-dist/doc/generic/pstricks/README
index b08d78e57c1..993cb771801 100644
--- a/Master/texmf-dist/doc/generic/pstricks/README
+++ b/Master/texmf-dist/doc/generic/pstricks/README
@@ -1,4 +1,4 @@
-PSTricks 2015
+PSTricks 2014
 
 -----------------------------------------------------------------------
 PSTricks is the original work of Timothy van Zandt <tvz@econ.insead.fr>
@@ -9,7 +9,7 @@ and Sebastian Rahtz <sebastian.rahtz@computing-services.oxford.ac.uk>
 PSTricks 2004 is edited by Herbert Voss <hvoss@tug.org>
 and Rolf Niepraschk <Rolf.Niepraschk@ptb.de>
 
-PSTricks 2005-\today is edited by Herbert Voss <hvoss@tug.org>
+PSTricks 2005-2014 is edited by Herbert Voss <hvoss@tug.org>
 
 -----------------------------------------------------------------------
 For more informations go to http://tug.org/PSTricks _and_ read the
@@ -105,4 +105,4 @@ The informations to subscribe to this list and to consult the archives can
 be found on the Web page.
 
 --
-Denis Girou, Sebastian Rahtz and Herbert Voss (updated August 27, 2014)
+Denis Girou, Sebastian Rahtz and Herbert Voss (updated Novermber 03, 2010)
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news14.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news14.pdf
index 9f5f7531f96..736504dc193 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news14.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news14.pdf
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news15.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news15.pdf
new file mode 100644
index 00000000000..7d8065da0c0
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news15.pdf
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news15.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news15.tex
new file mode 100644
index 00000000000..c0a058f3b1f
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news15.tex
@@ -0,0 +1,70 @@
+%% $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-solides3d}
+\usepackage{xkvview}
+\renewcommand\bgImage{\psscalebox{15}{\color{blue!20}\the\year}}
+\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 -- \the\year}\\ \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{PostScript code}
+Additionally to the macro \Lcs{pstVerb} there are now the keywords
+\Lkeyword{precode} and \Lkeyword{postscode} which can be used by other
+packages to paste PostScript code before and after the macros.
+
+\begin{LTXexample}[pos=t]
+\psset{viewpoint=40 35 10 rtp2xyz,Decran=40,lightsrc=viewpoint,unit=0.5}
+\begin{pspicture}(-6,-6)(6,6)
+\defFunction{cercle1}(t)
+  {4 t cos mul 2 sub rZ cos mul 4 t sin mul rZ sin mul add} %
+  {4 t cos mul 2 sub rZ sin mul neg 4 t sin mul rZ cos mul add}%
+  {4 t sin mul}%
+\psforeach{\iA}{0,20,..,360}{%
+  \psSolid[object=courbe,
+    precode=/rZ \iA\space def,
+    r=0,range=0 360,resolution=360,function=cercle1]}
+\end{pspicture}
+\end{LTXexample}
+
+
+\clearpage
+\nocite{*}
+\bibliographystyle{plain}
+\bibliography{PSTricks}
+
+\printindex
+
+
+\end{document}
+
+
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/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index c3585f72c56..9f662edb996 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -116,8 +116,8 @@
 \input pgffor.code.tex
 \let\pgfforeach\foreach
 %
-\def\fileversion{2.60}
-\def\filedate{2014/10/25}
+\def\fileversion{2.61}
+\def\filedate{2015/06/28}
 \catcode`\@=11\relax
 \pst@addfams{pstricks}
 %
@@ -839,6 +839,11 @@
 }
 \SpecialCoor% set to special read of coors, angles and lengths
 %
+\define@key[psset]{}{precode}{\def\pst@prepscode{#1 }}
+\define@key[psset]{}{postcode}{\def\pst@postpscode{#1 }}
+\psset{precode={},postcode={}}% For use in other packages
+%
+%
 \begingroup
 \catcode`\|=13
 \catcode`\;=13
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
index 03434925b16..d34dd775288 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
@@ -74,11 +74,11 @@
      \ifpdf    \else\setbeamertemplate{navigation symbols}{}   \fi
      \AtEndOfPackage{\RequirePackage{auto-pst-pdf}}}
     {\AtBeginDocument{%
-      \@ifundefined{shorthandoff}           % we have no babel until now
-        { \usepackage{auto-pst-pdf}}
-        { \shorthandoff{"}
-          \usepackage{auto-pst-pdf}
-          \shorthandon{"}}}}
+        {\@ifundefined{shorthandoff}           % we have no babel until now
+          { \typeout{noshorthand}\usepackage{auto-pst-pdf}}
+          { \@ifundefined{bbl@active@"}{}{\shorthandoff{"}}
+            \usepackage{auto-pst-pdf}
+            \@ifundefined{bbl@active@"}{}{\shorthandon{"}}}}}}
 \fi
 %
 \ifpst@ovl \RequirePackage{pst-ovl}\fi