From ce2494e9b5215a7d1712e91eaad8427e776895c8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 25 Aug 2017 22:24:25 +0000 Subject: pstricks (25aug17) git-svn-id: svn://tug.org/texlive/trunk@45127 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/generic/pstricks/pst-news17.pdf | Bin 60668 -> 63413 bytes .../texmf-dist/doc/generic/pstricks/pst-news17.tex | 10 +++- .../texmf-dist/dvips/pstricks/pstricks-fonts.pro | 59 +++++++++++++++++++++ .../texmf-dist/tex/generic/pstricks/pstricks.tex | 46 +++++++++------- Master/texmf-dist/tex/latex/pstricks/pstricks.sty | 12 ++++- 5 files changed, 104 insertions(+), 23 deletions(-) create mode 100644 Master/texmf-dist/dvips/pstricks/pstricks-fonts.pro diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf index 597b6372a03..a2f6659f141 100644 Binary files a/Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf and b/Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf differ diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex index aa7991c65ff..cdeca0b1657 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news17.tex 461 2017-05-18 10:17:06Z herbert $ +%% $Id: pst-news17.tex 476 2017-06-15 19:44:19Z herbert $ \documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, headinclude=false,footinclude=false,twoside]{pst-doc} \listfiles @@ -52,8 +52,14 @@ Internally \Lprog{lualatex} starts \Lprog{xelatex} for creating the environments \fi %-------------------------------------------------------------------------------------- -\section{\texttt{pstricks.tex} (v. 2.74 -- 2017/06/15)} +\section{\texttt{pstricks.tex} (v. 2.75 -- 2017/08/24)} %-------------------------------------------------------------------------------------- +\subsection{PostScript Fonts} +This version of PSTricks uses the Ghostscript fonts from URW instaed of the +original base 14 fonts of PostScript. For example: instaed of Helvetica we use +NimbusSanL-Regu. The URW fonts are always embedded in the created ps or pdf output. +This is not the default for the PostScript fonts. + \subsection{Error message} Using PSTricks with \Lprog{pdflatex} will work only when using package diff --git a/Master/texmf-dist/dvips/pstricks/pstricks-fonts.pro b/Master/texmf-dist/dvips/pstricks/pstricks-fonts.pro new file mode 100644 index 00000000000..9b171371fc9 --- /dev/null +++ b/Master/texmf-dist/dvips/pstricks/pstricks-fonts.pro @@ -0,0 +1,59 @@ +% $Id: pstricks.pro 446 2017-04-19 11:40:55Z herbert $ +% +%% PostScript prologue for pstricks.tex. +%% Version 1.24, 2016/04/22 +%% +%% This program can be redistributed and/or modified under the terms +%% of the LaTeX Project Public License Distributed from CTAN archives +%% in directory macros/latex/base/lppl.txt. +% +% +%true setglobal globaldict begin + +%n021003l.pfa:/FontName /NimbusRomNo9L-Regu def +%n021004l.pfa:/FontName /NimbusRomNo9L-Medi def +%n021023l.pfa:/FontName /NimbusRomNo9L-ReguItal def +%n021024l.pfa:/FontName /NimbusRomNo9L-MediItal def + +/Times-Roman (NimbusRomNo9L-Regu) cvn def +/Times-Roman-Bold (NimbusRomNo9L-Medi) cvn def +/Times-Italic (NimbusRomNo9L-ReguItal) cvn def +/Times-BoldItalic (NimbusRomNo9L-MediItal) cvn def + +%n019003l.pfa:/FontName /NimbusSanL-Regu def +%n019004l.pfa:/FontName /NimbusSanL-Bold def +%n019023l.pfa:/FontName /NimbusSanL-ReguItal def +%n019024l.pfa:/FontName /NimbusSanL-BoldItal def +%n019043l.pfa:/FontName /NimbusSanL-ReguCond def +%n019044l.pfa:/FontName /NimbusSanL-BoldCond def +%n019063l.pfa:/FontName /NimbusSanL-ReguCondItal def +%n019064l.pfa:/FontName /NimbusSanL-BoldCondItal def + +/Helvetica /NimbusSanL-Regu def +/Helvetica-Bold /NimbusSanL-Bold def +/Helvetica-Oblique /NimbusSanL-ReguItal def +/Helvetica-BoldOblique /NimbusSanL-BoldItal def + +%n022003l.pfa:/FontName /NimbusMonL-Regu cvn def +%n022004l.pfa:/FontName /NimbusMonL-Bold cvn def +%n022023l.pfa:/FontName /NimbusMonL-ReguObli cvn def +%n022024l.pfa:/FontName /NimbusMonL-BoldObli cvn def + +/Courier (NimbusMonL-Regu) cvn def +/Courier-Bold (NimbusMonL-Bold) cvn def +/Courier-Oblique (NimbusMonL-ReguObli) cvn def +/Courier-BoldOblique (NimbusMonL-BoldObli) cvn def + +%s050000l.pfa:/FontName /StandardSymL def + +/Symbol (StandardSymL) cvn def + +%p052003l.pfa:/FontName /URWPalladioL-Roma def +%p052004l.pfa:/FontName /URWPalladioL-Bold def +%p052023l.pfa:/FontName /URWPalladioL-Ital def +%p052024l.pfa:/FontName /URWPalladioL-BoldItal def +%z003034l.pfa:/FontName /URWChanceryL-MediItal def + +%end false setglobal +% +% end of file diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index 14af68d5e9c..846c4a86fea 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -141,10 +141,13 @@ \@ifundefined{pgffor@emptyvalues}{\input pgffor.code.tex}{} \let\pgfforeach\foreach % -\def\fileversion{2.74} -\def\filedate{2017/06/15} +\def\fileversion{2.75} +\def\filedate{2017/08/24} \pst@addfams{pstricks} % +%\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{} +%\psset{useURWfonts} +% % stolen from latex.ltx to make it TeX compatible \newcount\psLoopIndex \def\@fornoop#1\@@#2#3{} @@ -512,6 +515,9 @@ \@ifundefined{pst@def}{\def\pst@def#1<#2>{\@namedef{tx@#1}{#2 }}}{} \@ifundefined{pst@ATH}{\def\pst@ATH<#1>{}}{} % +%\ifPst@useURWfonts +% \pstheader{pstricks-fonts.pro} +%\fi \pstheader{pstricks.pro} \pstheader{pst-algparser.pro} \pstheader{pst-tools.pro} @@ -2456,33 +2462,33 @@ \newpsfontdotH{Bpentagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(P)}{(q)} \newpsfontdot{pentagon*}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(q)} % DG/SR modification begin - Mar. 18, 1997 and Dec. 16, 1999 - Patch 14 -%\newpsfontdot{diamond*}[1.9 0.0 0.0 1.9 -0.4598 -0.70775]{Symbol}{} -%\newpsfontdot{diamond}[2.3 0.0 0.0 2.3 -0.8533 -0.5336]{Symbol}{} +%\newpsfontdot{diamond*}[1.9 0.0 0.0 1.9 -0.4598 -0.70775]{StandardSymL}{} +%\newpsfontdot{diamond}[2.3 0.0 0.0 2.3 -0.8533 -0.5336]{StandardSymL}{} % D.G. modification begin - Jan. 17, 2000 \newpsfontdotH{diamond}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(d)}{(l)} \newpsfontdotH{Bdiamond}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(D)}{(l)} \newpsfontdot{diamond*}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(l)} % DG/SR modification end -\newpsfontdot{oplus}[1.44928 0.0 0.0 1.44928 -0.562319 -0.478261]{Symbol}{} -\newpsfontdot{otimes}[1.44928 0.0 0.0 1.44928 -0.562319 -0.475362]{Symbol}{} -\newpsfontdot{x}[1.8 0.0 0.0 1.8 -0.495 -0.4788]{Symbol}{} -\newpsfontdot{+}[2.3 0.0 0.0 2.3 -0.6486 -0.5819]{Times-Roman}{<2B>} -\newpsfontdot{asterisk}[2.43309 0.0 0.0 2.43309 -0.609489 -1.14477]{Times-Roman}{<2A>} -\newpsfontdot{B+}[2.3 0.0 0.0 2.3 -0.6555 -0.5819]{Times-Bold}{<2B>} -\newpsfontdot{Basterisk}[2.29358 0.0 0.0 2.29358 -0.576835 -1.08486]{Times-Bold}{<2A>} -\newpsfontdot{|}[1.98413 0.0 0.0 1.38 -0.258929 -0.5]{Helvetica}{(|)} +\newpsfontdot{oplus}[1.44928 0.0 0.0 1.44928 -0.562319 -0.478261]{StandardSymL}{} +\newpsfontdot{otimes}[1.44928 0.0 0.0 1.44928 -0.562319 -0.475362]{StandardSymL}{} +\newpsfontdot{x}[1.8 0.0 0.0 1.8 -0.495 -0.4788]{StandardSymL}{} +\newpsfontdot{+}[2.3 0.0 0.0 2.3 -0.6486 -0.5819]{NimbusRomNo9L-Regu}{<2B>} +\newpsfontdot{asterisk}[2.43309 0.0 0.0 2.43309 -0.609489 -1.14477]{NimbusRomNo9L-Regu}{<2A>} +\newpsfontdot{B+}[2.3 0.0 0.0 2.3 -0.6555 -0.5819]{NimbusRomNo9L-Bold}{<2B>} +\newpsfontdot{Basterisk}[2.29358 0.0 0.0 2.29358 -0.576835 -1.08486]{NimbusRomNo9L-Bold}{<2A>} +\newpsfontdot{|}[1.98413 0.0 0.0 1.38 -0.258929 -0.5]{NimbusSanL-Regu}{(|)} % DG/SR modification begin - Oct. 27, 1997 - Patch 7 -%[1.98413 0.0 0.0 1.98413 -0.258929 -0.712302]{Helvetica}{(|)} +%[1.98413 0.0 0.0 1.98413 -0.258929 -0.712302]{NimbusSanL-Regu}{(|)} % DG/SR modification end -\newpsfontdot{B|}[1.98413 0.0 0.0 1.38 -0.277778 -0.5]{Helvetica-Bold}{(|)}% +\newpsfontdot{B|}[1.98413 0.0 0.0 1.38 -0.277778 -0.5]{NimbusSanL-Bold}{(|)}% % DG/SR modification begin - Oct. 27, 1997 - Patch 7 -%[1.98413 0.0 0.0 1.98413 -0.277778 -0.78302]{Helvetica-Bold}{(|)} +%[1.98413 0.0 0.0 1.98413 -0.277778 -0.78302]{NimbusSanL-Bold}{(|)} % DG/SR modification end \iffalse -\newpsfontdot{*}[2.77778 0.0 0.0 2.77778 -0.638889 -0.813889]{Symbol}{} -\newpsfontdot{o}[3.33333 0.0 0.0 3.33333 -0.666667 -1.78167]{Symbol}{} -\newpsfontdot{Bo}[4.69484 0.0 0.0 4.69484 -0.78169 -2.97418]{Times-Bold}{} +\newpsfontdot{*}[2.77778 0.0 0.0 2.77778 -0.638889 -0.813889]{StandardSymL}{} +\newpsfontdot{o}[3.33333 0.0 0.0 3.33333 -0.666667 -1.78167]{StandardSymL}{} +\newpsfontdot{Bo}[4.69484 0.0 0.0 4.69484 -0.78169 -2.97418]{NimbusRomNo9L-Bold}{} \fi % Etienne Riga \newpsfontdot{Asterisk}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(k)} @@ -2862,8 +2868,8 @@ \pst@cntg=#1\relax\edef\psk@subgriddiv{\the\pst@cntg}} \psset[pstricks]{subgriddiv=5} % -\define@key[psset]{pstricks}{gridfont}[Helvetica]{\def\psk@gridfont{/#1 }}% hv 2007-11-13 -\psset[pstricks]{gridfont=Helvetica} +\define@key[psset]{pstricks}{gridfont}[NimbusSanL-Regu]{\def\psk@gridfont{/#1 }}% hv 2007-11-13 +\psset[pstricks]{gridfont=NimbusSanL-Regu} % \define@key[psset]{pstricks}{gridlabels}[10pt]{\pst@getlength{#1}\psk@gridlabels} \psset[pstricks]{gridlabels=10pt} diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty index 6d2703b2ba8..28e511fb174 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 446 2017-04-19 11:40:55Z herbert $ +% $Id: pstricks.sty 474 2017-06-15 16:40:57Z herbert $ %% %% This is file `pstricks.sty'. %% @@ -65,6 +65,16 @@ \DeclareOption*{\PassOptionsToPackage\CurrentOption{\pst@ColorPackage}} \ProcessOptions\relax +\RequirePackage{iftex} +\RequirePackage{shellesc} +%\ifPDFTeX +% \ifpdfshellescape\else +% \@latex@error +% {You are running `\jobname.tex' with pdflatex and without option `--shell-escape' ,\MessageBreak +% you need package auto-pst-pdf and that option!}% +% {Alternatively use xelatex or latex->dvips->ps2pdf} +% \fi +%\fi \RequirePackage{\pst@ColorPackage} % \@ifundefined{PSTricksLoaded} -- cgit v1.2.3