diff options
author | Karl Berry <karl@freefriends.org> | 2015-11-15 23:37:54 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-11-15 23:37:54 +0000 |
commit | f771dc12c829ca2d5e42481634c17e4b7911c11e (patch) | |
tree | 32d2f60150f96275ac13577c077decfda6cee751 /Master/texmf-dist/tex | |
parent | d5f3f2797f68ca073d6712cb735908cdf8b1fbc5 (diff) |
pstricks (15nov15)
git-svn-id: svn://tug.org/texlive/trunk@38858 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/pstricks.tex | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pstricks/pstricks.sty | 50 |
2 files changed, 27 insertions, 27 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index 447da532c3a..fcafe181116 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.64a} -\def\filedate{2015/11/11} +\def\fileversion{2.64b} +\def\filedate{2015/14/11} \catcode`\@=11\relax \pst@addfams{pstricks} % diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty index 195e12d54bf..8720b0b42b9 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}[2015/11/11 v0.61 LaTeX wrapper for `PSTricks' (RN,HV)] +\ProvidesPackage{pstricks}[2015/11/14 v0.62 LaTeX wrapper for `PSTricks' (RN,HV)] % \def\documentclass{% \edef\@tempa{\jobname.tex }% @@ -63,6 +63,30 @@ \DeclareOption*{\PassOptionsToPackage\CurrentOption{\pst@ColorPackage}} \ProcessOptions\relax +\RequirePackage{\pst@ColorPackage} +% +\@ifundefined{PSTricksLoaded} +{% + \let\saved@scalebox\scalebox + \input{pstricks}% + \ProvidesFile{pstricks.tex}[\filedate\space v\fileversion\space `PSTricks' (tvz,hv)] + \input{pst-fp.tex} + \ProvidesFile{pst-fp.tex}[\filedate\space v\fileversion\space `PST-fp' (hv)] + \IfFileExists{pstricks.pro}{% + \ProvidesFile{pstricks.pro} + [2012/10/16 v. 1.15, PostScript prologue file (hv)] + \@addtofilelist{pstricks.pro}}{}% + \IfFileExists{pst-algparser.pro}{% + \ProvidesFile{pst-algparser.pro}[2011/10/31 v. 0.04, PostScript prologue file (hv)] + \@addtofilelist{pst-algparser.pro}}{}% + \IfFileExists{pst-tools.pro}{% + \ProvidesFile{pst-tools.pro}[2012/01/01 v. 0.02, PostScript prologue file (hv)] + \@addtofilelist{pst-tools.pro}}{}% + \IfFileExists{pst-dots.pro}{% + \ProvidesFile{pst-dots.pro}[2006/12/19 v. 2.00, PostScript prologue file (hv)] + \@addtofilelist{pst-dots.pro}}{}% +}{} +% \ifpst@distiller \pst@def{setTransparency}< [ /ca \psk@opacityalpha @@ -92,30 +116,6 @@ /ca \psk@shapealpha /CA \psk@opacityalpha /SetTransparency pdfmark >% \fi % -\RequirePackage{\pst@ColorPackage} -% -\@ifundefined{PSTricksLoaded} -{% - \let\saved@scalebox\scalebox - \input{pstricks}% - \ProvidesFile{pstricks.tex}[\filedate\space v\fileversion\space `PSTricks' (tvz,hv)] - \input{pst-fp.tex} - \ProvidesFile{pst-fp.tex}[\filedate\space v\fileversion\space `PST-fp' (hv)] - \IfFileExists{pstricks.pro}{% - \ProvidesFile{pstricks.pro} - [2012/10/16 v. 1.15, PostScript prologue file (hv)] - \@addtofilelist{pstricks.pro}}{}% - \IfFileExists{pst-algparser.pro}{% - \ProvidesFile{pst-algparser.pro}[2011/10/31 v. 0.04, PostScript prologue file (hv)] - \@addtofilelist{pst-algparser.pro}}{}% - \IfFileExists{pst-tools.pro}{% - \ProvidesFile{pst-tools.pro}[2012/01/01 v. 0.02, PostScript prologue file (hv)] - \@addtofilelist{pst-tools.pro}}{}% - \IfFileExists{pst-dots.pro}{% - \ProvidesFile{pst-dots.pro}[2006/12/19 v. 2.00, PostScript prologue file (hv)] - \@addtofilelist{pst-dots.pro}}{}% -}{} -% \@ifpackageloaded{xcolor}{% \@ifpackagelater{xcolor}{2004/05/02}% {% |