summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/pstricks
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-11-11 23:11:45 +0000
committerKarl Berry <karl@freefriends.org>2015-11-11 23:11:45 +0000
commit1d9414683ac75b19a10ac34fce703ebe7706e459 (patch)
tree860e31afcb9f8af9fccc79095119e15d6aeb3f26 /Master/texmf-dist/tex/latex/pstricks
parente5b087f9942a47a32c980275973792871b99f57f (diff)
pstricks (11nov15)
git-svn-id: svn://tug.org/texlive/trunk@38821 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/pstricks')
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pst-doc.cls18
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty28
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pstricks.sty204
3 files changed, 94 insertions, 156 deletions
diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls b/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls
index fe4e58f029e..8b3df60d05b 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls
+++ b/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls
@@ -23,12 +23,16 @@
DIV13]{scrartcl}
%
\RequirePackage[dvipsnames,x11names,svgnames,table]{xcolor}
-\RequirePackage[T1]{fontenc}
+\RequirePackage{ifxetex}
+\ifxetex
+\else
+ \RequirePackage[T1]{fontenc}
+ \RequirePackage{textcomp}
+ %\RequirePackage[euler-digits]{eulervm}
+ \RequirePackage{bera}
+ %\RequirePackage[scaled=0.85]{luximono}
+\fi
\RequirePackage{ifpdf}
-\RequirePackage{textcomp}
-%\RequirePackage[euler-digits]{eulervm}
-\RequirePackage{bera}
-%\RequirePackage[scaled=0.85]{luximono}
% Define commands that don't eat spaces.
\RequirePackage{xspace}
\makeatletter
@@ -261,13 +265,13 @@ xleftmargin=0pt,xrightmargin=0pt,
% Inhalte von List of Figures
\IfPackageLoaded{subfig}{\setcounter{lofdepth}{1} %1 = nur figures, 2 = figures + subfigures
}
-\RequirePackage[colorlinks=true,
+\RequirePackage[colorlinks,
urlcolor=pdfurlcolor,
filecolor=pdffilecolor,
linkcolor=pdflinkcolor,
breaklinks,
linktocpage=true]{hyperref}
-\ifpdf
+\ifxetex
\else
\RequirePackage{breakurl}
\fi
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty
new file mode 100644
index 00000000000..e3907c28d7e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty
@@ -0,0 +1,28 @@
+%%
+%% This is file `pstricks-pdf.sty'.
+%%
+%% IMPORTANT NOTICE:
+%%
+%% pstricks-pdf.sty Copyright (C) 2016 Herbert Voss <hvoss@tug.org>
+%%
+%% This package may be distributed under the terms of the LaTeX Project
+%% Public License, as described in lppl.txt in the base LaTeX distribution.
+%% Either version 1.0 or, at your option, any later version.
+%%
+
+\NeedsTeXFormat{LaTeX2e}
+
+\ProvidesPackage{pstricks-pdf}[2015/11/11 v0.01 wrapper for `pstricks.sty' (HV)]
+%
+\DeclareOption*{%
+ \PassOptionsToPackage\CurrentOption{auto-pst-pdf}%
+ \PassOptionsToPackage\CurrentOption{pstricks}}%
+\ProcessOptions\relax
+%
+\RequirePackage{auto-pst-pdf}%
+\def\app@pdfcrop@opts{--hres}%%% hv 20130405
+\@ifclassloaded{beamer}{\ifpdf\else\setbeamertemplate{navigation symbols}\fi}{}%
+\RequirePackage{pstricks}
+%
+%%
+%% End of file `pstricks-pdf.sty'.
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
index d34dd775288..195e12d54bf 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-2014 Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
+%% pstricks.sty Copyright (C) 2004-2016 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/12/12 v0.60 LaTeX wrapper for `PSTricks' (RN,HV)]
+\ProvidesPackage{pstricks}[2015/11/11 v0.61 LaTeX wrapper for `PSTricks' (RN,HV)]
%
\def\documentclass{%
\edef\@tempa{\jobname.tex }%
@@ -32,128 +32,38 @@
\fi
}
%
-\newif\ifpst@OldVersion\pst@OldVersionfalse
-\DeclareOption{97}{\pst@OldVersiontrue}
-%
-\newif\ifpst@ovl \pst@ovlfalse
-\DeclareOption{overlays}{\global\pst@ovltrue}
+\def\pst@ColorPackage{xcolor}
+\DeclareOption{noxcolor}{\def\pst@ColorPackage{color}}
%
-\newif\ifpst@loadPDF \pst@loadPDFfalse
-\DeclareOption{pdf}{\global\pst@loadPDFtrue}
-%------------------------------------ PLAIN --------------------------------
+%---------------------------------DISTILLER --------------------------------
+\newif\ifpst@distiller\pst@distillerfalse
+\DeclareOption{distiller}{\pst@distillertrue}
-\DeclareOption{plain}{%
- \ifpst@OldVersion
- \def\psDEBUG[#1]#2{}%
- \def\pst@tempa{pstricks97.tex}%
- \else
- \def\pst@tempa{pstricks.tex}%
- \fi
- \input{\pst@tempa}%
- \ProvidesFile{\pst@tempa}[\filedate\space v\fileversion\space `PSTricks' (tvz)]%
- \endinput
-}
-%
-\DeclareOption*{\OptionNotUsed}
-%
+%---------------------------------COLOR --------------------------------
+\DeclareOption{monochrome}{%
+ \AtBeginDocument{\special{ps:
+ /setrgbcolor { add add 0 gt {1}{0} ifelse setgray } def
+ /setcmykcolor{ 4 dict begin
+ /k ED /y ED /m ED /c ED
+ 1 1 k sub c mul k add sub 0.29 mul
+ 1 1 k sub m mul k add sub 0.587 mul add
+ 1 1 k sub y mul k add sub 0.114 mul add
+ end 0 gt {1}{0} ifelse setgray } def }}}
+
+\DeclareOption{grayscale}{%
+ \AtBeginDocument{\special{ps:
+ /setrgbcolor { 0.07 mul exch 0.71 mul add exch 0.21 mul add setgray } def
+ /setcmykcolor{ 4 dict begin
+ /k ED /y ED /m ED /c ED
+ 1 1 k sub c mul k add sub 0.29 mul
+ 1 1 k sub m mul k add sub 0.587 mul add
+ 1 1 k sub y mul k add sub 0.114 mul add
+ end setgray } def }}}
+
+\DeclareOption*{\PassOptionsToPackage\CurrentOption{\pst@ColorPackage}}
\ProcessOptions\relax
-%
-\RequirePackage{ifpdf}
-%
-\ifpst@loadPDF
- \ifnum\pdfshellescape=\@ne\else
- \PackageWarningNoLine{pstricks}{%
-************************************ \MessageBreak
- Option pdf needs a "pdflatex -shell-escape <file>" \MessageBreak
- or a "pdflatex -enable-write18 <file>" \MessageBreak
- (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{%
- {\@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
-%
-\@ifundefined{PSTricksLoaded}
-{%
- \let\saved@scalebox\scalebox
- \ifpst@OldVersion
- \def\psDEBUG[#1]#2{}
- \def\pst@tempa{pstricks97.tex}%
- \else
- \def\pst@tempa{pstricks.tex}
- \fi
- \input{\pst@tempa}%
- \ProvidesFile{\pst@tempa}
- [\filedate\space v\fileversion\space `PSTricks' (tvz,hv)]
- \ifpst@OldVersion
- \IfFileExists{pstricks97.pro}{%
- \ProvidesFile{pstricks97.pro}%
- [1998/06/01 v. 97 patch 3, PostScript prologue file (hv)]
- \@addtofilelist{pstricks97.pro}}{}%
- \IfFileExists{pst-dots97.pro}{%
- \ProvidesFile{pst-dots97.pro}
- [1999/12/16 v. 97 patch 1, PostScript prologue file (hv)]
- \@addtofilelist{pst-dots97.pro}}{}%
- \else
- \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}}{}%
- \fi
- {%
- \let\psscalebox\scalebox
- \let\psscaleboxto\scaleboxto
- }{}
- \let\scalebox\saved@scalebox
-}{}
-%
-%
-\IfFileExists{xcolor.sty}{%
- \def\pst@ColorPackage{xcolor}
-% \PassOptionsToPackage{override}{xcolor}
-}{\def\pst@ColorPackage{color}}%
-%------------------------------------ DIA --------------------------------
-\newif\ifpst@DIA\pst@DIAfalse
-\DeclareOption{DIA}{\pst@DIAtrue}
-%------------------------------ color or xcolor --------------------------
-\DeclareOption{noxcolor}{\def\pst@ColorPackage{color}}
-%------------------------------------ VTeX --------------------------------
-\DeclareOption{vtex}{%
- \pst@def{setTransparency}< >
- \pst@def{setStrokeTransparency}< >
- \pst@def{setBlendmode}< >%
- \PassOptionsToPackage{vtex}{\pst@ColorPackage}%
-}
-%---------------------------------DISTILLER --------------------------------
-\newif\ifpst@distiller\pst@distillerfalse
-\DeclareOption{distiller}{%
- \pst@distillertrue%
+\ifpst@distiller
\pst@def{setTransparency}<
[ /ca \psk@opacityalpha
/CA \psk@opacityalpha /SetTransparency pdfmark >
@@ -180,34 +90,32 @@
/Luminosity % 15
\else /Normal \fi
/ca \psk@shapealpha /CA \psk@opacityalpha /SetTransparency pdfmark >%
-}
-%---------------------------------COLOR --------------------------------
-\DeclareOption{monochrome}{%
- \AtBeginDocument{\special{ps:
- /setrgbcolor { add add 0 gt {1}{0} ifelse setgray } def
- /setcmykcolor{ 4 dict begin
- /k ED /y ED /m ED /c ED
- 1 1 k sub c mul k add sub 0.29 mul
- 1 1 k sub m mul k add sub 0.587 mul add
- 1 1 k sub y mul k add sub 0.114 mul add
- end 0 gt {1}{0} ifelse setgray } def }}}
-
-\DeclareOption{grayscale}{%
- \AtBeginDocument{\special{ps:
- /setrgbcolor { 0.07 mul exch 0.71 mul add exch 0.21 mul add setgray } def
- /setcmykcolor{ 4 dict begin
- /k ED /y ED /m ED /c ED
- 1 1 k sub c mul k add sub 0.29 mul
- 1 1 k sub m mul k add sub 0.587 mul add
- 1 1 k sub y mul k add sub 0.114 mul add
- end setgray } def }}}
-
-\DeclareOption*{%
- \PassOptionsToPackage\CurrentOption{\pst@ColorPackage}}
-\ProcessOptions\relax
-
+\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}%
{%
@@ -299,6 +207,4 @@
% LaTeX used `\color@endgroup' instead. RN 2004-05-06
}
%
-\endinput
-%%
%% End of file `pstricks.sty'.