From 981e20a02434edda9867f29554a6aaa1bceaea6a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 20 Oct 2013 22:00:10 +0000 Subject: pstricks (20oct13) git-svn-id: svn://tug.org/texlive/trunk@31955 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/generic/pstricks/Changes.latex | 2 + .../texmf-dist/doc/generic/pstricks/pst-news13.pdf | Bin 98219 -> 98318 bytes .../texmf-dist/tex/generic/pstricks/config/README | 45 --------------------- .../tex/generic/pstricks/config/README.cfg | 45 +++++++++++++++++++++ Master/texmf-dist/tex/generic/pstricks/pst-fp.tex | 2 +- .../texmf-dist/tex/generic/pstricks/pstricks.tex | 3 +- Master/texmf-dist/tex/latex/pstricks/pstricks.sty | 12 +++--- 7 files changed, 57 insertions(+), 52 deletions(-) delete mode 100644 Master/texmf-dist/tex/generic/pstricks/config/README create mode 100644 Master/texmf-dist/tex/generic/pstricks/config/README.cfg (limited to 'Master') 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 Binary files a/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf and b/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf differ diff --git a/Master/texmf-dist/tex/generic/pstricks/config/README b/Master/texmf-dist/tex/generic/pstricks/config/README deleted file mode 100644 index 3814ed7302c..00000000000 --- a/Master/texmf-dist/tex/generic/pstricks/config/README +++ /dev/null @@ -1,45 +0,0 @@ -This directory contains the special PSTricks config files for -the different platforms. By default the dvips config file is -already in your current TeX distribution as pstricks.con. -If you use another platform then you have to replace the current -pstricks.con by one of the following cfg files: - -- PostScript header files - --- If you use the Y&Y's "dvipsone" DVI to PostScript converter, -you have to rename config.cfg to generic/pstricks.con and to move -all the files of the "dvips" subdirectory to the TeX input folder. - --- If you use the MicroPress "VTeX" DVI to PostScript converter, -you have to rename config/vtex.cfg to generic/pstricks.con and to move -all the files of the "dvips" subdirectory to the TeX input folder. - --- If you use XeTeX, you have to rename config/xdvipdfmx.cfg to - generic/pstricks.con - --- If you use the "textures" (version 1.7/1.8 or 2.0) DVI to PostScript - converter (for Macintosh), you should proceed as follows: - * create a new folder PSTricks (for instance) as a subfolder in - Textures' TeX inputs folder, - * copy the "generic", "dvips", "latex" and "contrib" subfolders - from the "pstricks" folder to the newly created "PSTricks" folder, - * open the "generic" folder and remove the file pstricks.con, - then rename the file textures.cfg to pstricks.con, - * open the "dvips" folder and change the following line in the file - pstricks.pro (courtesy Michael J. Sharpe ): - /STV { SDict begin normalscale end STP } def - by - /STV { Mag 72.27 72 div mul dup neg scale STP } def - It was also reported that the `pst-text' package (to put text - along paths) doesn't work with the "textures" driver. - Textures's users must also look at the page kindly maintained - by Michael Sharpe: http://math.ucsd.edu/~msharpe/pst-textures.html - --- If you use another driver than these four ones, you have to adapt -a pstricks.con file for it, if the one for "dvips" doesn't work for it. -You can also look at the instructions of the old obsolete/src/pstricks.con -file. And if nothing work, ask for help on the PSTricks mailing list, -hopping that somebody on the list has the same configuration than you ... - --- -2010-01-22 hv \ No newline at end of file diff --git a/Master/texmf-dist/tex/generic/pstricks/config/README.cfg b/Master/texmf-dist/tex/generic/pstricks/config/README.cfg new file mode 100644 index 00000000000..3814ed7302c --- /dev/null +++ b/Master/texmf-dist/tex/generic/pstricks/config/README.cfg @@ -0,0 +1,45 @@ +This directory contains the special PSTricks config files for +the different platforms. By default the dvips config file is +already in your current TeX distribution as pstricks.con. +If you use another platform then you have to replace the current +pstricks.con by one of the following cfg files: + +- PostScript header files + +-- If you use the Y&Y's "dvipsone" DVI to PostScript converter, +you have to rename config.cfg to generic/pstricks.con and to move +all the files of the "dvips" subdirectory to the TeX input folder. + +-- If you use the MicroPress "VTeX" DVI to PostScript converter, +you have to rename config/vtex.cfg to generic/pstricks.con and to move +all the files of the "dvips" subdirectory to the TeX input folder. + +-- If you use XeTeX, you have to rename config/xdvipdfmx.cfg to + generic/pstricks.con + +-- If you use the "textures" (version 1.7/1.8 or 2.0) DVI to PostScript + converter (for Macintosh), you should proceed as follows: + * create a new folder PSTricks (for instance) as a subfolder in + Textures' TeX inputs folder, + * copy the "generic", "dvips", "latex" and "contrib" subfolders + from the "pstricks" folder to the newly created "PSTricks" folder, + * open the "generic" folder and remove the file pstricks.con, + then rename the file textures.cfg to pstricks.con, + * open the "dvips" folder and change the following line in the file + pstricks.pro (courtesy Michael J. Sharpe ): + /STV { SDict begin normalscale end STP } def + by + /STV { Mag 72.27 72 div mul dup neg scale STP } def + It was also reported that the `pst-text' package (to put text + along paths) doesn't work with the "textures" driver. + Textures's users must also look at the page kindly maintained + by Michael Sharpe: http://math.ucsd.edu/~msharpe/pst-textures.html + +-- If you use another driver than these four ones, you have to adapt +a pstricks.con file for it, if the one for "dvips" doesn't work for it. +You can also look at the instructions of the old obsolete/src/pstricks.con +file. And if nothing work, ask for help on the PSTricks mailing list, +hopping that somebody on the list has the same configuration than you ... + +-- +2010-01-22 hv \ No newline at end of file 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 +%% pstricks.sty Copyright (C) 2004-2014 Rolf Niepraschk %% Herbert Voss %% %% 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}{% -- cgit v1.2.3