diff options
29 files changed, 90 insertions, 68 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-docfull.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-docfull.pdf Binary files differnew file mode 100644 index 00000000000..6666f0a0244 --- /dev/null +++ b/Master/texmf-dist/doc/generic/pstricks/pst-docfull.pdf diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news.tex index bf1c79221f5..f9e40428f83 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news.tex 755 2013-03-09 08:48:58Z herbert $ +%% $Id: pst-news.tex 444 2017-04-19 10:55:35Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside]{pst-doc} \listfiles diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news15.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news15.tex index dbe7d6a6c81..c2369d7018b 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news15.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news15.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news15.tex 163 2015-07-26 07:20:23Z herbert $ +%% $Id: pst-news15.tex 444 2017-04-19 10:55:35Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside]{pst-doc} \listfiles diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news16.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news16.pdf Binary files differindex 04f57e851eb..59eb0df588d 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news16.pdf +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news16.pdf diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news16.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news16.tex index 4cead08047d..c55be6459c6 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news16.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news16.tex @@ -1,12 +1,15 @@ -%% $Id: pst-news15.tex 163 2015-07-26 07:20:23Z herbert $ -\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings - headexclude,footexclude,oneside]{pst-doc} +%% $Id: pst-news16.tex 446 2017-04-19 11:40:55Z herbert $ +\documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, + headinclude=false,footinclude=false,twoside]{pst-doc} \listfiles \let\Lfile\LFile \usepackage[utf8]{inputenc} -\usepackage{pst-node,pst-plot} +\let\pstricksFV\fileversion +\let\pstricksFD\filedate +\usepackage{pst-node} \let\pstnodeFV\fileversion \let\pstnodeFD\filedate +\usepackage{pst-plot} \usepackage{pst-solides3d} \usepackage{pst-node} \usepackage{pstricks-add} diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf Binary files differindex 37ee8889755..3dcc22bb7ca 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex index 60d0094b465..563c5943ec8 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex @@ -1,12 +1,16 @@ -%% $Id: pst-news15.tex 163 2015-07-26 07:20:23Z herbert $ -\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings - headexclude,footexclude,oneside]{pst-doc} +%% $Id: pst-news17.tex 444 2017-04-19 10:55:35Z herbert $ +\documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, + headinclude=false,footinclude=false,twoside]{pst-doc} \listfiles \let\Lfile\LFile \usepackage[utf8]{inputenc} -\usepackage{pst-node,pst-plot} +\usepackage{pstricks} +\let\pstricksFV\fileversion +\let\pstricksFD\filedate +\usepackage{pst-node} \let\pstnodeFV\fileversion \let\pstnodeFD\filedate +\usepackage{pst-plot} \usepackage{pst-solides3d} \usepackage{pst-node} \usepackage{pstricks-add} diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-quickref.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-quickref.pdf Binary files differnew file mode 100644 index 00000000000..24d8d07b21e --- /dev/null +++ b/Master/texmf-dist/doc/generic/pstricks/pst-quickref.pdf diff --git a/Master/texmf-dist/dvips/pstricks/pst-algparser.pro b/Master/texmf-dist/dvips/pstricks/pst-algparser.pro index 0d0b7238673..2f0e84aae0b 100644 --- a/Master/texmf-dist/dvips/pstricks/pst-algparser.pro +++ b/Master/texmf-dist/dvips/pstricks/pst-algparser.pro @@ -1,4 +1,4 @@ -% $Id: pst-algparser.pro 919 2014-05-19 18:42:47Z herbert $ +% $Id: pst-algparser.pro 446 2017-04-19 11:40:55Z herbert $ %% %% PostScript prologue for PSTricks algorithm parser %% Version 0.07, 2014/08/01 diff --git a/Master/texmf-dist/dvips/pstricks/pst-dots.pro b/Master/texmf-dist/dvips/pstricks/pst-dots.pro index f76b179c7ba..eb71f868671 100644 --- a/Master/texmf-dist/dvips/pstricks/pst-dots.pro +++ b/Master/texmf-dist/dvips/pstricks/pst-dots.pro @@ -1,4 +1,4 @@ -% $Id: pst-dots.pro 801 2013-07-09 18:10:41Z herbert $ +% $Id: pst-dots.pro 446 2017-04-19 11:40:55Z herbert $ % %% PostScript prologue for pstricks.tex. %% Version 2.02, 2009/06/16 diff --git a/Master/texmf-dist/dvips/pstricks/pstricks.pro b/Master/texmf-dist/dvips/pstricks/pstricks.pro index 6e7203099d5..ad932f84696 100644 --- a/Master/texmf-dist/dvips/pstricks/pstricks.pro +++ b/Master/texmf-dist/dvips/pstricks/pstricks.pro @@ -1,4 +1,4 @@ -% $Id: pstricks.pro 919 2014-05-19 18:42:47Z herbert $ +% $Id: pstricks.pro 446 2017-04-19 11:40:55Z herbert $ % %% PostScript prologue for pstricks.tex. %% Version 1.24, 2016/04/22 diff --git a/Master/texmf-dist/tex/generic/pstricks/config/distiller.cfg b/Master/texmf-dist/tex/generic/pstricks/config/distiller.cfg index 59c3e6e1e52..db654b14d73 100644 --- a/Master/texmf-dist/tex/generic/pstricks/config/distiller.cfg +++ b/Master/texmf-dist/tex/generic/pstricks/config/distiller.cfg @@ -1,4 +1,4 @@ -% $Id: distiller.cfg 183 2015-09-14 20:10:17Z herbert $ +% $Id: distiller.cfg 446 2017-04-19 11:40:55Z herbert $ %% BEGIN: distiller.con (for distiller driver) %% %% Configuration file for PSTricks diff --git a/Master/texmf-dist/tex/generic/pstricks/config/dvips.cfg b/Master/texmf-dist/tex/generic/pstricks/config/dvips.cfg index 65b78b51e4e..3b4f9b4653d 100644 --- a/Master/texmf-dist/tex/generic/pstricks/config/dvips.cfg +++ b/Master/texmf-dist/tex/generic/pstricks/config/dvips.cfg @@ -1,4 +1,4 @@ -% $Id: dvips.cfg 179 2015-09-11 09:58:42Z herbert $ +% $Id: dvips.cfg 446 2017-04-19 11:40:55Z herbert $ %% BEGIN: pstricks.con (for dvips driver) %% %% Configuration file for PSTricks diff --git a/Master/texmf-dist/tex/generic/pstricks/config/dvipsone.cfg b/Master/texmf-dist/tex/generic/pstricks/config/dvipsone.cfg index d28f1f7ea5d..965e635fd53 100644 --- a/Master/texmf-dist/tex/generic/pstricks/config/dvipsone.cfg +++ b/Master/texmf-dist/tex/generic/pstricks/config/dvipsone.cfg @@ -1,4 +1,4 @@ -% $Id: dvipsone.cfg 180 2015-09-11 12:10:43Z herbert $ +% $Id: dvipsone.cfg 446 2017-04-19 11:40:55Z herbert $ %% BEGIN pstricks.con (for DVIPSONE driver) %% %% Configuration file for PSTricks 97: must be renamed `pstricks.con' diff --git a/Master/texmf-dist/tex/generic/pstricks/config/gastex.cfg b/Master/texmf-dist/tex/generic/pstricks/config/gastex.cfg index d9ffb042956..b3549c8c562 100644 --- a/Master/texmf-dist/tex/generic/pstricks/config/gastex.cfg +++ b/Master/texmf-dist/tex/generic/pstricks/config/gastex.cfg @@ -1,4 +1,4 @@ -% $Id: gastex.cfg 183 2015-09-14 20:10:17Z herbert $ +% $Id: gastex.cfg 446 2017-04-19 11:40:55Z herbert $ %% BEGIN: pstricks.con (for xdvipdfmx driver) %% %% Configuration file for PSTricks diff --git a/Master/texmf-dist/tex/generic/pstricks/config/textures.cfg b/Master/texmf-dist/tex/generic/pstricks/config/textures.cfg index 588cc6591c6..48667d39502 100644 --- a/Master/texmf-dist/tex/generic/pstricks/config/textures.cfg +++ b/Master/texmf-dist/tex/generic/pstricks/config/textures.cfg @@ -1,4 +1,4 @@ -% $Id: textures.cfg 183 2015-09-14 20:10:17Z herbert $ +% $Id: textures.cfg 446 2017-04-19 11:40:55Z herbert $ %% BEGIN pstricks.con (for Textures 1.7 and 1.8 driver) %% %% Configuration file for PSTricks 97: must be renamed `pstricks.con' diff --git a/Master/texmf-dist/tex/generic/pstricks/config/vtex.cfg b/Master/texmf-dist/tex/generic/pstricks/config/vtex.cfg index 7205579c208..e4b71844047 100644 --- a/Master/texmf-dist/tex/generic/pstricks/config/vtex.cfg +++ b/Master/texmf-dist/tex/generic/pstricks/config/vtex.cfg @@ -1,4 +1,4 @@ -% $Id: vtex.cfg 183 2015-09-14 20:10:17Z herbert $ +% $Id: vtex.cfg 446 2017-04-19 11:40:55Z herbert $ %% BEGIN: pstricks.con (for VTeX) %% %% Configuration file for PSTricks 97 diff --git a/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg b/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg index b2a7e982466..181f18603e8 100644 --- a/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg +++ b/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg @@ -1,4 +1,4 @@ -% $Id: xdvipdfmx.cfg 180 2015-09-11 12:10:43Z herbert $ +% $Id: xdvipdfmx.cfg 446 2017-04-19 11:40:55Z herbert $ % %% BEGIN: pstricks.con (for xdvipdfmx driver) %% diff --git a/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex b/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex index de8050bdac4..2ea9cf11f4f 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 837 2013-10-22 07:53:07Z herbert $ +%% $Id: pst-fp.tex 446 2017-04-19 11:40:55Z herbert $ %% %% %% This is file `pst-fp.tex', diff --git a/Master/texmf-dist/tex/generic/pstricks/pst-key.tex b/Master/texmf-dist/tex/generic/pstricks/pst-key.tex index dc32ba57a51..8c1204bc172 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pst-key.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pst-key.tex @@ -1,4 +1,4 @@ -%% $Id: pst-key.tex 800 2013-07-09 18:01:00Z herbert $ +%% $Id: pst-key.tex 446 2017-04-19 11:40:55Z herbert $ %% %% This is file `pst-key.tex', %% generated with the docstrip utility. diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index edebe9db183..24722d45cbe 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -137,8 +137,8 @@ \@ifundefined{pgffor@emptyvalues}{\input pgffor.code.tex}{} \let\pgfforeach\foreach % -\def\fileversion{2.72} -\def\filedate{2017/04/06} +\def\fileversion{2.72b} +\def\filedate{2017/04/19} \catcode`\@=11\relax \pst@addfams{pstricks} % diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks97.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks97.tex index dde14c39444..e4b0a5a2c9a 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks97.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks97.tex @@ -1,4 +1,4 @@ -%% $Id: pst-fp.tex 259 2010-01-17 09:51:50Z herbert $ +%% $Id: pstricks97.tex 446 2017-04-19 11:40:55Z herbert $ %% BEGIN: pstricks.tex %% %% PostScript macros for Generic TeX: main input file for PSTricks 97. diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-all.sty b/Master/texmf-dist/tex/latex/pstricks/pst-all.sty index 6b17210bbd6..3c9d1a8ddbe 100644 --- a/Master/texmf-dist/tex/latex/pstricks/pst-all.sty +++ b/Master/texmf-dist/tex/latex/pstricks/pst-all.sty @@ -1,3 +1,4 @@ +% $Id: pst-all.sty 446 2017-04-19 11:40:55Z herbert $ %% %% This is file `pst-all.sty' %% diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls b/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls index 85015b16e53..15f71fd95b5 100644 --- a/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls +++ b/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls @@ -1,11 +1,11 @@ -% $Id: pst-doc.cls 532 2011-07-09 13:02:57Z herbert $ +% $Id: pst-doc.cls 444 2017-04-19 10:55:35Z herbert $ % %% %% The PSTricks Project %% %% ``pst-doc'' class for use with the PSTricks documentation. %% -%% Copyright (C) 2009-2011 Herbert Voss +%% Copyright (C) 2009-2017 Herbert Voss %% %% It may be distributed and/or modified under the conditions %% of the LaTeX Project Public License, either version 1.3 @@ -15,7 +15,7 @@ %% % \listfiles -\ProvidesClass{pst-doc}[2011/04/30 v 0.19 PSTricks documentation class (hv)] +\ProvidesClass{pst-doc}[2017/04/18 v 0.20 PSTricks documentation class (hv)] \DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}} \ProcessOptions\relax % @@ -23,10 +23,11 @@ % \RequirePackage[dvipsnames,x11names,svgnames,table]{xcolor} \RequirePackage{ifxetex} +\RequirePackage{amsmath, amssymb} \ifxetex - \usepackage{unicode.math} - \usepackage{libertine} - \usepackage[Scale=MatchLowercase,FakeStretch=0.92]{Anonymous Pro} + \usepackage{unicode-math} + \usepackage{libertinus} + \setmonofont[Scale=MatchLowercase,FakeStretch=0.92]{Anonymous Pro} \setmathfont{XITS Math} \else \RequirePackage[T1]{fontenc} @@ -85,14 +86,13 @@ \RequirePackage{pst-xkey} \RequirePackage{pstricks} \RequirePackage{xkvview} -\let\pstricksFV\fileversion -\let\pstricksFD\filedate +%\let\pstricksFV\fileversion +%\let\pstricksFD\filedate \RequirePackage{multido} \RequirePackage{lscape} \RequirePackage{graphicx} \RequirePackage{eso-pic} \definecolor{DOrange}{rgb}{1,.4,.2} -\RequirePackage{amsmath, amssymb} \RequirePackage{tabularx,ragged2e} \RequirePackage{booktabs} \RequirePackage[bottom,stable,ragged]{footmisc} @@ -470,39 +470,40 @@ xleftmargin=0pt,xrightmargin=0pt, \thispagestyle{empty}% \begin{titlepage} \ifpdf -\AddToShipoutPicture*{\includegraphics{pst-doc.pdf}} -\vspace*{0.3\textheight} -\parbox{17cm}{\sffamily\RaggedRight\bfseries\huge\@title}\\[5pt] -\parbox{15cm}{\sffamily\Large\@subtitle} + \AddToShipoutPicture*{\includegraphics{pst-doc.pdf}} + \vspace*{0.3\textheight} + \parbox{17cm}{\sffamily\RaggedRight\bfseries\huge\@title}\\[5pt] + \parbox{15cm}{\sffamily\Large\@subtitle} -\vspace{5cm} -\parbox{10cm}{\sffamily\@date} + \vspace{5cm} + \parbox{10cm}{\sffamily\@date} -\vfill -~\\ -\makebox[.5\textwidth]{\put(0,0){\bgImage}}\\ -~ + \vfill + ~\\ + \makebox[.5\textwidth]{\put(0,0){\bgImage}}\\ + ~ -\vfill -\parbox[b]{19cm}{\sffamily\RaggedRight + \vfill + \parbox[b]{19cm}{\sffamily\RaggedRight \ifx\@docauthor\empty~\else Documentation by\fi\hfill\makebox[7cm][l]{Package author(s):}\\ \ifx\@docauthor\empty~\else{\bfseries\tabular[t]{@{}l@{}}\@docauthor\endtabular}\fi\hfill\makebox[7cm][l]{% \bfseries\tabular[t]{@{}l@{}}\@author\endtabular}} \else -\begin{pspicture}(1.6in,0)(21,21.7) - \psframe[fillstyle=solid,linecolor=lightgray,fillcolor=lightgray,linestyle=solid](0,-5.75)(21.5,10) - \psframe[fillstyle=solid,linecolor=Orange!85!Red,fillcolor=Orange!85!Red,linestyle=solid](0,10)(21.5,10.5) - \psframe[fillstyle=solid,linecolor=Orange!85!Red,fillcolor=Orange!85!Red,linestyle=solid](0,21.1)(21.5,21.2) - \rput[lb](3,22){\Huge\sffamily\color{Orange!65!Red}\psscalebox{2}{\textbf{PSTricks}}} - \rput[lb](3,14.1){\parbox{17cm}{\sffamily\RaggedRight\bfseries\huge\@title}} - \rput[lb](3,12.6){\parbox{15cm}{\sffamily\Large\@subtitle}} - \rput[lb](3,7.6){\parbox{15cm}{\sffamily\@date}} - \rput[lb](3,-2.6){\parbox[b]{19cm}{\sffamily\RaggedRight - \ifx\@docauthor\empty~\else Documentation by\fi\hfill\makebox[7cm][l]{Package author(s):}\\ - \ifx\@docauthor\empty~\else{\bfseries\tabular[t]{@{}l@{}}\@docauthor\endtabular}\fi\hfill\makebox[7cm][l]{% - \bfseries\tabular[t]{@{}l@{}}\@author\endtabular}}} - \rput[C](11,4){\bgImage}% -\end{pspicture}% + \psset{unit=1cm} + \begin{pspicture}(1.6in,0)(23cm,21.7cm) + \psframe[fillstyle=solid,linecolor=lightgray,fillcolor=lightgray,linestyle=solid](0,-5.75)(23,10) + \psframe[fillstyle=solid,linecolor=Orange!85!Red,fillcolor=Orange!85!Red,linestyle=solid](0,10)(23,10.5) + \psframe[fillstyle=solid,linecolor=Orange!85!Red,fillcolor=Orange!85!Red,linestyle=solid](0,21.1)(23,21.2) + \rput[lb](3,22){\Huge\sffamily\color{Orange!65!Red}\psscalebox{2}{\textbf{PSTricks}}} + \rput[lb](3,14.1){\parbox{17cm}{\sffamily\RaggedRight\bfseries\huge\@title}} + \rput[lb](3,12.6){\parbox{15cm}{\sffamily\Large\@subtitle}} + \rput[lb](3,7.6){\parbox{15cm}{\sffamily\@date}} + \rput[lb](3,-2.6){\parbox[b]{19cm}{\sffamily\RaggedRight + \ifx\@docauthor\empty~\else Documentation by\fi\hfill\makebox[7cm][l]{Package author(s):}\\ + \ifx\@docauthor\empty~\else{\bfseries\tabular[t]{@{}l@{}}\@docauthor\endtabular}\fi\hfill\makebox[7cm][l]{% + \bfseries\tabular[t]{@{}l@{}}\@author\endtabular}}} + \rput[C](11,4){\bgImage}% + \end{pspicture}% \fi \end{titlepage} \setcounter{footnote}{0}% diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-key.sty b/Master/texmf-dist/tex/latex/pstricks/pst-key.sty index 74db6c70a9a..e1550d293e6 100644 --- a/Master/texmf-dist/tex/latex/pstricks/pst-key.sty +++ b/Master/texmf-dist/tex/latex/pstricks/pst-key.sty @@ -1,3 +1,4 @@ +% $Id: pst-key.sty 446 2017-04-19 11:40:55Z herbert $ \RequirePackage{pstricks} \ProvidesPackage{pst-key}[2004/07/15 package wrapper for pst-key.tex] \input{pst-key.tex} diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty b/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty index 7daaf9f0df8..a1bde247b6b 100644 --- a/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty +++ b/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty @@ -1,3 +1,4 @@ +% $Id: pst-platform.sty 446 2017-04-19 11:40:55Z herbert $ %% %% This is file `pst-platform.sty', %% diff --git a/Master/texmf-dist/tex/latex/pstricks/pstcol.sty b/Master/texmf-dist/tex/latex/pstricks/pstcol.sty index 2ba36d0b042..7a83dd1fd93 100644 --- a/Master/texmf-dist/tex/latex/pstricks/pstcol.sty +++ b/Master/texmf-dist/tex/latex/pstricks/pstcol.sty @@ -1,3 +1,4 @@ +% $Id: pstcol.sty 446 2017-04-19 11:40:55Z herbert $ %% %% pstcol.sty Copyright (C) 1994--1996 1999 David Carlisle %% 2004--2007 Herbert Voss <voss@perce.de> diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty index 71e462a98d6..c363a62f801 100644 --- a/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty +++ b/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty @@ -1,3 +1,4 @@ +% $Id: pstricks-pdf.sty 446 2017-04-19 11:40:55Z herbert $ %% %% This is file `pstricks-pdf.sty'. %% @@ -12,7 +13,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{pstricks-pdf}[2015/11/11 v0.01 wrapper for `pstricks.sty' (HV)] +\ProvidesPackage{pstricks-pdf}[2017/03/17 v0.01 creating pdf output (HV)] % \RequirePackage{ifpdf,xkeyval,pst-platform,ifluatex,ifxetex} @@ -110,12 +111,18 @@ \advance\c@app@runs\m@ne \repeat \app@convert{latex}{\jobname.\app@ext}{}% - \app@convert{dvips}{\app@jobname.dvi}{\app@jobname.ps}% + \ifxetex\else + \app@convert{dvips}{\app@jobname.dvi}{\app@jobname.ps}% + \fi \if@app@crop@ - \app@convert{pstopdf}{\app@jobname.ps}{\app@jobname.pdf}% + \ifxetex\else + \app@convert{pstopdf}{\app@jobname.ps}{\app@jobname.pdf}% + \fi \app@convert{pdfcrop}{\app@jobname.pdf}{\app@pics}% \else - \app@convert{pstopdf}{\app@jobname.ps}{\app@pics}% + \ifxetex\else + \app@convert{pstopdf}{\app@jobname.ps}{\app@pics}% + \fi \fi \IfFileExists{\app@pics} {\app@cleanup} @@ -128,14 +135,16 @@ \def\app@remove@container{\app@try@rm{\app@pics}} \def\app@cleanup{\app@try@rm{\app@rm@files}} \ifluatex - \def\app@cmd@latex#1#2{lualatex --output-format=dvi \app@latex@opts\space "\unexpanded{\let\APPmakepictures\empty\input} #1"} - \def\app@cmd@extralatex#1#2{lualatex --output-format=dvi \app@latex@opts\space "\unexpanded{\let\APPmakepictures\undefined\input} #1"} +% \def\app@cmd@latex#1#2{lualatex --output-format=dvi \app@latex@opts\space "\unexpanded{\let\APPmakepictures\empty\input} #1"} +% \def\app@cmd@extralatex#1#2{lualatex --output-format=dvi \app@latex@opts\space "\unexpanded{\let\APPmakepictures\undefined\input} #1"} + \def\app@cmd@latex#1#2{xelatex \app@latex@opts\space "\unexpanded{\AtBeginDocument{\pagestyle{empty}}\let\APPmakepictures\empty\input} #1"} + \def\app@cmd@extralatex#1#2{xelatex \app@latex@opts\space "\unexpanded{\AtBeginDocument{\pagestyle{empty}}\let\APPmakepictures\undefined\input} #1"} \else \def\app@cmd@latex#1#2{latex \app@latex@opts\space "\unexpanded{\let\APPmakepictures\empty\input} #1"} \def\app@cmd@extralatex#1#2{\@app@prog\space \app@latex@opts\space "\unexpanded{\let\APPmakepictures\undefined\input} #1"} + \def\app@cmd@dvips#1#2{dvips \app@dvips@opts\space -o "#2" "#1"} + \def\app@cmd@pstopdf#1#2{ps2pdf \app@pspdf@opts\space "#1" "#2"} \fi -\def\app@cmd@dvips#1#2{dvips \app@dvips@opts\space -o "#2" "#1"} -\def\app@cmd@pstopdf#1#2{ps2pdf \app@pspdf@opts\space "#1" "#2"} \def\app@cmd@pdfcrop#1#2{pdfcrop \app@pdfcrop@opts\space "#1" "#2"} \ifpdf \if@app@off@\else diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty index 3c4db535775..6d2703b2ba8 100644 --- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty +++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty @@ -1,3 +1,4 @@ +% $Id: pstricks.sty 446 2017-04-19 11:40:55Z herbert $ %% %% This is file `pstricks.sty'. %% |