summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex9
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pstricks.sty10
2 files changed, 12 insertions, 7 deletions
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