summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-10-20 22:00:10 +0000
committerKarl Berry <karl@freefriends.org>2013-10-20 22:00:10 +0000
commit981e20a02434edda9867f29554a6aaa1bceaea6a (patch)
tree981dee437539926d8748a1425a425273066b10c0
parentf4d96694b3a55642f9176423a040d4312b599959 (diff)
pstricks (20oct13)
git-svn-id: svn://tug.org/texlive/trunk@31955 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Changes.latex2
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news13.pdfbin98219 -> 98318 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/README.cfg (renamed from Master/texmf-dist/tex/generic/pstricks/config/README)0
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pst-fp.tex2
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex3
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pstricks.sty12
6 files changed, 12 insertions, 7 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.latex b/Master/texmf-dist/doc/generic/pstricks/Changes.latex
index ccb8925f523..ccfc1bd25b6 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.latex
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.latex
@@ -1,4 +1,6 @@
pstricks.sty --------
+0.58 2013-10-20 - fix for \usepackage[pdf]{pstricks} when using
+ documentclass beamer
0.57 2013-05-22 - add option grayscale
0.56 2013-05-21 - add option monochrome
0.55 2013-04-05 - pass option pdfcrop=--hres to auto-pst-pdf
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf
index b8a10937c8a..2f63b9f4280 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/tex/generic/pstricks/config/README b/Master/texmf-dist/tex/generic/pstricks/config/README.cfg
index 3814ed7302c..3814ed7302c 100644
--- a/Master/texmf-dist/tex/generic/pstricks/config/README
+++ b/Master/texmf-dist/tex/generic/pstricks/config/README.cfg
diff --git a/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex b/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex
index 03252b6454e..c8c6686255b 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex
@@ -47,7 +47,7 @@
\def\pst@@Int#1.#2\@nil{#1}
%
-\def\pstFPMul#1#2#3{\pstFP@callc\pstFP@mul#1{#2}{#3}% % #1 := int(#2/#3)
+\def\pstFPMul#1#2#3{\pstFP@callc\pstFP@mul#1{#2}{#3}% % #1 := int(#2*#3)
\edef#1{\pst@int{#1}}}%
\def\pstFPDiv#1#2#3{\pstFP@callc\pstFP@div#1{#2}{#3}% % #1 := int(#2/#3)
\edef#1{\pst@int{#1}}}%
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 1919c78facd..471bd5a6385 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -1051,7 +1051,8 @@
\def\psk@origin{}
%
\define@boolkey[psset]{pstricks}[Pst@]{algebraic}[true]{}
-\psset[pstricks]{algebraic=false}
+\psset%[pstricks]
+{algebraic=false}
%
\define@boolkey[psset]{pstricks}[]{swapaxes}[true]{% \if@pst
\@nameuse{@pst#1}%
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
index d67969527d4..aabf143beb2 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
@@ -5,7 +5,7 @@
%%
%% pstricks.sty Copyright (C) 1997 Timothy Van Zandt
%% pstcol.sty Copyright (C) 1994-1996 1999 David Carlisle
-%% pstricks.sty Copyright (C) 2004-2013 Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
+%% pstricks.sty Copyright (C) 2004-2014 Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
%% Herbert Voss <hvoss@tug.org>
%%
%% This package may be distributed under the terms of the LaTeX Project
@@ -15,7 +15,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{pstricks}[2013/05/22 v0.57 LaTeX wrapper for `PSTricks' (RN,HV)]
+\ProvidesPackage{pstricks}[2013/10/20 v0.58 LaTeX wrapper for `PSTricks' (RN,HV)]
%
\def\documentclass{%
\edef\@tempa{\jobname.tex }%
@@ -56,10 +56,12 @@
\ProcessOptions\relax
\ifpst@PDF
- \typeout{>>> Loading package auto-pst-pdf <<<}%
\@ifclassloaded{beamer}%
- {\usepackage{auto-pst-pdf}}%
- {\AtBeginDocument{\usepackage{auto-pst-pdf}}}%
+ {\typeout{>>> Loading package auto-pst-pdf for beamer <<<}%
+ \AtEndOfPackage{\RequirePackage{auto-pst-pdf}}
+ \ifpdf\else\setbeamertemplate{navigation symbols}{}\fi}%
+ {\typeout{>>> Loading package auto-pst-pdf <<<}%
+ \AtBeginDocument{\usepackage{auto-pst-pdf}}}%
\def\app@pdfcrop@opts{--hres}%%% hv 20130405
\ifnum\pdfshellescape=\@ne\else
\PackageWarningNoLine{pstricks}{%