From 53bdf42a5ec08846a83d9abc9cddf62dbd585953 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 1 Jan 2018 22:05:41 +0000 Subject: pstricks (1jan18) git-svn-id: svn://tug.org/texlive/trunk@46186 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/pstricks/pstricks.tex | 10 +++++----- Master/texmf-dist/tex/latex/pstricks/pst-doc.cls | 12 +++++------- Master/texmf-dist/tex/latex/pstricks/pstricks.sty | 14 +++++++++----- 3 files changed, 19 insertions(+), 17 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index 93dbb8c388a..14d9d975188 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -1,4 +1,4 @@ -%% $Id: pstricks.tex 698 2017-12-30 19:08:50Z herbert $ +%% $Id: pstricks.tex 700 2018-01-01 14:21:06Z herbert $ %% pstricks.tex %% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu. %% COPYRIGHT 2000-2003 by Denis Girou. @@ -28,11 +28,11 @@ \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax % -\if@check@engine +%\if@check@engine \ifx\c@lor@to@ps\@undefined \def\c@lor@to@ps{\PSTricks_Not_Configured_For_This_Format}% message for a pdflatex run \fi -\fi +%\fi \expandafter\ifx\csname @latexerr\endcsname\relax % do we have TeX? then @latexerr isn't defined \input pstricks-tex.def \fi @@ -78,8 +78,8 @@ \fi \let\pgfforeach\foreach % -\def\fileversion{2.80a} -\def\filedate{2017/12/30} +\def\fileversion{2.81} +\def\filedate{2018/01/01} \pst@addfams{pstricks} % %\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{} diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls b/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls index 526e5aade0c..15f71fd95b5 100644 --- a/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls +++ b/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls @@ -1,4 +1,4 @@ -% $Id: pst-doc.cls 680 2017-12-05 12:22:55Z herbert $ +% $Id: pst-doc.cls 444 2017-04-19 10:55:35Z herbert $ % %% %% The PSTricks Project @@ -26,8 +26,8 @@ \RequirePackage{amsmath, amssymb} \ifxetex \usepackage{unicode-math} - \usepackage{libertinus-otf} - \setmonofont[Scale=MatchLowercase,FakeStretch=0.92]{DejaVu Sans Mono} + \usepackage{libertinus} + \setmonofont[Scale=MatchLowercase,FakeStretch=0.92]{Anonymous Pro} \setmathfont{XITS Math} \else \RequirePackage[T1]{fontenc} @@ -35,7 +35,6 @@ %\RequirePackage[euler-digits]{eulervm} \RequirePackage{bera} %\RequirePackage[scaled=0.85]{luximono} - \RequirePackage[utf8]{inputenc} \fi \usepackage[includeheadfoot,lmargin=2cm,tmargin=1cm,bmargin=1.5cm,rmargin=1.5cm]{geometry} \RequirePackage{ifpdf} @@ -57,7 +56,7 @@ \pagenumbering{roman}} }{} \@ifundefined{mainmatter}{% - % scrpage benoetigt den folgenden switch + % scrpage2 benoetigt den folgenden switch % wenn \mainmatter definiert ist. \newif\if@mainmatter\@mainmattertrue \newcommand{\mainmatter}{% @@ -103,7 +102,6 @@ \RequirePackage{subfig} \RequirePackage{setspace} \RequirePackage{paralist} -\RequirePackage{biblatex} % \RequirePackage{fancyvrb} \newenvironment{Xverbatim}[2][]% @@ -192,7 +190,7 @@ xleftmargin=0pt,xrightmargin=0pt, \colorlet{pdffilecolor}{DOrange} \colorlet{stringcolor}{green!40!black!100} \colorlet{commencolor}{blue!0!black!100} -\RequirePackage[automark]{scrlayer-scrpage} +\RequirePackage[automark,nouppercase]{scrpage2} \pagestyle{scrheadings} \clearscrheadings diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty index 91ed143b210..fddb37756c0 100644 --- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty +++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty @@ -1,4 +1,4 @@ -% $Id: pstricks.sty 616 2017-10-04 16:14:42Z herbert $ +% $Id: pstricks.sty 680 2017-12-05 12:22:55Z herbert $ %% %% This is file `pstricks.sty'. %% @@ -17,7 +17,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{pstricks}[2017/09/17 v0.65 LaTeX wrapper for `PSTricks' (RN,HV)] +\ProvidesPackage{pstricks}[2017/11/27 v0.66 LaTeX wrapper for `PSTricks' (RN,HV)] % \def\documentclass{% \edef\@tempa{\jobname.tex }% @@ -39,10 +39,14 @@ % %---------------------------------DISTILLER -------------------------------- \newif\ifpst@distiller\pst@distillerfalse -\DeclareOption{distiller}{\pst@distillertrue} -% \newif\ifpst@psfonts \pst@psfontsfalse +\newif\if@check@engine \@check@enginetrue +\DeclareOption{distiller}{\pst@distillertrue\pst@psfontstrue} +% \DeclareOption{psfonts}{\pst@psfontstrue} +% +\DeclareOption{noEngineCheck}{\@check@enginefalse} +% %---------------------------------COLOR -------------------------------- \DeclareOption{monochrome}{% \AtBeginDocument{\special{ps: @@ -89,7 +93,7 @@ \ProvidesFile{pst-fp.tex}[\filedate\space v\fileversion\space `PST-fp' (hv)] \IfFileExists{pstricks.pro}{% \ProvidesFile{pstricks.pro} - [2017/12/08 v. 1.27, PostScript prologue file (hv)] + [2017/09/18 v. 1.27, 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)] -- cgit v1.2.3