summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-10-22 23:54:17 +0000
committerKarl Berry <karl@freefriends.org>2013-10-22 23:54:17 +0000
commit2245beb21ba2d7c9658279dcbcdba4494bfaef18 (patch)
treef5423f45ba0d398b7a8005db47fd8bed2eb8780f /Master
parentbf02d931996c41df96e6ee5fa5c44160a0bb77e6 (diff)
pstricks
git-svn-id: svn://tug.org/texlive/trunk@31964 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Changes.latex1
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news13.pdfbin98318 -> 98318 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pst-fp.tex2
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pstricks.sty37
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check2
5 files changed, 22 insertions, 20 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.latex b/Master/texmf-dist/doc/generic/pstricks/Changes.latex
index ccfc1bd25b6..4e19988c249 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.latex
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.latex
@@ -1,4 +1,5 @@
pstricks.sty --------
+0.59 2013-10-21 - fix for introduced bug with ifpdf
0.58 2013-10-20 - fix for \usepackage[pdf]{pstricks} when using
documentclass beamer
0.57 2013-05-22 - add option grayscale
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf
index 2f63b9f4280..8ac4c06840c 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/pst-fp.tex b/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex
index c8c6686255b..de8050bdac4 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-fp.tex 800 2013-07-09 18:01:00Z herbert $
+%% $Id: pst-fp.tex 837 2013-10-22 07:53:07Z herbert $
%%
%%
%% This is file `pst-fp.tex',
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
index aabf143beb2..ca6c42fec94 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
@@ -15,7 +15,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{pstricks}[2013/10/20 v0.58 LaTeX wrapper for `PSTricks' (RN,HV)]
+\ProvidesPackage{pstricks}[2013/10/21 v0.59 LaTeX wrapper for `PSTricks' (RN,HV)]
%
\def\documentclass{%
\edef\@tempa{\jobname.tex }%
@@ -34,10 +34,12 @@
%
\newif\ifpst@OldVersion\pst@OldVersionfalse
\DeclareOption{97}{\pst@OldVersiontrue}
-\newif\ifpst@ovl\pst@ovlfalse
+%
+\newif\ifpst@ovl \pst@ovlfalse
\DeclareOption{overlays}{\global\pst@ovltrue}
-\newif\ifpst@PDF\pst@PDFfalse
-\DeclareOption{pdf}{\global\pst@PDFtrue}
+%
+\newif\ifpst@loadPDF \pst@loadPDFfalse
+\DeclareOption{pdf}{\global\pst@loadPDFtrue}
%------------------------------------ PLAIN --------------------------------
\DeclareOption{plain}{%
\ifpst@OldVersion
@@ -50,19 +52,14 @@
\ProvidesFile{\pst@tempa}[\filedate\space v\fileversion\space `PSTricks' (tvz)]%
\endinput
}
-
+%
\DeclareOption*{\OptionNotUsed}
-
+%
\ProcessOptions\relax
-
-\ifpst@PDF
- \@ifclassloaded{beamer}%
- {\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
+%
+\RequirePackage{ifpdf}
+%
+\ifpst@loadPDF
\ifnum\pdfshellescape=\@ne\else
\PackageWarningNoLine{pstricks}{%
************************************ \MessageBreak
@@ -71,12 +68,14 @@
(if you are using MikTeX) \MessageBreak
************************************}
\fi
+ \def\app@pdfcrop@opts{--hres}%%% hv 20130405
+ \@ifclassloaded{beamer}{%
+ \ifpdf \else\setbeamertemplate{navigation symbols}{} \fi
+ \AtEndOfPackage{\RequirePackage{auto-pst-pdf}}}
+ {\AtBeginDocument{\usepackage{auto-pst-pdf}}}
\fi
%
-\ifpst@ovl
- \typeout{>>> Loading package pst-ovl <<<}%
- \RequirePackage{pst-ovl}
-\fi
+\ifpst@ovl \RequirePackage{pst-ovl}\fi
%
\@ifundefined{PSTricksLoaded}
{%
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 1be03489e00..d8ff8daab31 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -566,6 +566,7 @@ my @TLP_no_check = (
"guide-to-latex", # not on CTAN, book examples, ok
"hyperref-docsrc", # not on CTAN, awaiting hyperref doc volunteer
"ifluatex", # part of oberdiek
+ "jadetex", # too old to owrry about
"jmn", # part of context
"kluwer", # not on CTAN, old LPPL, not worth pursuing or removing
"kpathsea", # binary
@@ -609,6 +610,7 @@ my @TLP_no_check = (
"texdoc", # binary
"texinfo", # tl-update-auto
"texlive.infra", # binary
+ "texsis", # too old to worry about
"texware", # binary
"texworks", # binary
"tie", # binary