summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news17.pdfbin71878 -> 74061 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news17.tex26
-rw-r--r--Master/texmf-dist/dvips/pstricks/pstricks.pro19
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex40
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pstricks.sty8
5 files changed, 58 insertions, 35 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf
index d2cb77ea8cc..cc24dc4df95 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex
index b371be4040d..1fe12771d6a 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 545 2017-09-12 18:45:32Z herbert $
+%% $Id: pst-news17.tex 554 2017-09-17 19:04:49Z herbert $
\documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
headinclude=false,footinclude=false,twoside]{pst-doc}
\listfiles
@@ -35,11 +35,16 @@ basic package \nxLFile{pstricks}}
\clearpage
\part{\texttt{pstricks} -- package}
-\iffalse
%--------------------------------------------------------------------------------------
\section{\texttt{pstricks.sty} -- \texttt{pstricks-pdf.sty}}
%--------------------------------------------------------------------------------------
+
+There is now a new optional argument for the package: \Loption{psfonts}. If it is
+enabled PSTricks will use the original PostScript fonts like Helvetica, Times, \ldots.
+The default is to use the URW fonts (Nimbus Roman, Nimbus Sans, \ldots) which are embedded by default!
+The PostScript fonts are only embedded if present on your system.
+\iffalse
%--------------------------------------------------------------------------------------
\section{\texttt{pstricks-pdf.sty}}
%--------------------------------------------------------------------------------------
@@ -52,13 +57,16 @@ Internally \Lprog{lualatex} starts \Lprog{xelatex} for creating the environments
\fi
%--------------------------------------------------------------------------------------
-\section{\texttt{pstricks.tex} (v. 2.75 -- 2017/08/24)}
+\section{\texttt{pstricks.tex} (v. 2.76 -- 2017/09/17)}
%--------------------------------------------------------------------------------------
+
+
\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
+This version of PSTricks uses the Ghostscript fonts from URW instead of the
+original base 14 fonts of PostScript. For example: instead 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.
+This is not the default for the PostScript fonts. You change this setting with the optional
+argument to \LPack{pstricks.sty}.
\subsection{Error message}
@@ -185,6 +193,7 @@ PostScript function \texttt{PtoC} (Polat to Cartesian -- $(r,\phi)\rightarrow (x
Now there is a \texttt{PtoC360} for the old definition and a \texttt{PtoC} which now takes
the setting of \Lcs{pst@angleunit} into account.
+\bigskip
\begin{LTXexample}[pos=t]
\degrees[16]
\begin{pspicture}[showgrid](-2,-2)(2,2)
@@ -192,6 +201,11 @@ the setting of \Lcs{pst@angleunit} into account.
\end{pspicture}
\end{LTXexample}
+The command \Lcs{framed} was build by clockwise line sequence. Now it is the
+other way round to get the same behaviour as for all other commands
+with closed lines.
+
+
\clearpage
diff --git a/Master/texmf-dist/dvips/pstricks/pstricks.pro b/Master/texmf-dist/dvips/pstricks/pstricks.pro
index 60a9afcafbe..809044919a9 100644
--- a/Master/texmf-dist/dvips/pstricks/pstricks.pro
+++ b/Master/texmf-dist/dvips/pstricks/pstricks.pro
@@ -1,7 +1,7 @@
-% $Id: pstricks.pro 446 2017-04-19 11:40:55Z herbert $
+% $Id: pstricks.pro 554 2017-09-17 19:04:49Z herbert $
%
%% PostScript prologue for pstricks.tex.
-%% Version 1.25, 2017/09/12
+%% Version 1.26, 2017/09/17
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives
@@ -840,10 +840,14 @@ gsave
%
/Rect {
x1 y1 y2 add 2 div moveto
+% x1 y2 lineto
+% x2 y2 lineto
+% x2 y1 lineto
+% x1 y1 lineto
+ x1 y1 lineto % counter clockwise path
+ x2 y1 lineto
+ x2 y2 lineto
x1 y2 lineto
- x2 y2 lineto
- x2 y1 lineto
- x1 y1 lineto
closepath
} def
%
@@ -977,7 +981,10 @@ gsave
/w x2 x1 sub 0 gt { 1 } { -1 } ifelse def
b 0 gt {
/z1 b 4 div CLW 2 div add def
-% /Helvetica findfont b scalefont setfont
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Helvetica findfont b scalefont setfont
+% is set in pstricks.tex
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
/b b .95 mul CLW 2 div add def } if
systemdict /setstrokeadjust known
{ true setstrokeadjust /t { } def }
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index a57d3f85376..6f2e964c58a 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -18,7 +18,7 @@
\csname PSTricksLoaded\endcsname
\let\PSTricksLoaded\endinput
%
-%% !! loading additional TeX packages see line 105/136 !!
+%% !! loading additional TeX packages see line 105/140 !!
%% !! loading config file pstricks.con line 491 !!
%% !! loading pro files line 515 !!
%% !! fileversion and date see line 143 !!
@@ -83,7 +83,7 @@
\else\ifx\@tempc\@tempe \let\@tempd\@tempa \else \let\@tempd\@tempb \fi
\fi
\@tempd%
- }
+ }%
\begingroup
\def\:{\global\let\@sptoken= } \:
\def\:{\@xifnch} \expandafter\gdef\: {\futurelet\@tempc\@ifnch}
@@ -97,7 +97,8 @@
\expandafter\@fornoop \else
#4\relax\expandafter\@tforloop\fi#2\@@#3{#4}}
\long\def\@break@tfor#1\@@#2#3{\csname fi\endcsname\csname fi\endcsname}
-\fi%
+ %\ifx\pst@psfontstrue\@undefined \let\ifpst@psfonts\iffalse\fi % is defined in pstricks.sty
+\fi
\catcode`\@=\PstAtCode\relax
%
% now we have all commands defined, for TeX and LaTeX
@@ -141,8 +142,8 @@
\@ifundefined{pgffor@emptyvalues}{\input pgffor.code.tex}{}
\let\pgfforeach\foreach
%
-\def\fileversion{2.75a}
-\def\filedate{2017/09/12}
+\def\fileversion{2.76}
+\def\filedate{2017/09/17}
\pst@addfams{pstricks}
%
%\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{}
@@ -515,9 +516,6 @@
\@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}
@@ -1092,18 +1090,16 @@
\fi\fi}
%
\def\special@length#1#2\@nil#3{%
- \psDEBUG[special@length]{ #1|#2|#3 }%
\ifx !#1\relax
\edef\pst@SpecialLength{ #2 \pst@number\psunit mul }%
- \Pst@SpecialLengthtrue%
- \psDEBUG[special@length]{ Special length: \pst@SpecialLength}%
+ \Pst@SpecialLengthtrue
\else
\let\@psunit\psunit
\afterassignment\pstunit@off
- #3 #1#2\@psunit%
- \Pst@SpecialLengthfalse%
- \psDEBUG[special@length]{ Normal length: \the#3 }%
- \fi}
+ #3 #1#2\@psunit
+ \Pst@SpecialLengthfalse
+ \fi
+}
%
\def\Cartesian{%
\def\cartesian@coor##1,##2,##3\@nil{%
@@ -1128,14 +1124,14 @@
\def\psk@origin{}
%
\define@boolkey[psset]{pstricks}[Pst@]{algebraic}[true]{}
-\psset%[pstricks]
-{algebraic=false}
+\psset{algebraic=false}
%
-\define@boolkey[psset]{pstricks}[]{swapaxes}[true]{% \if@pst
+\define@boolkey[psset]{pstricks}[]{swapaxes}[true]{% \if@pst
\@nameuse{@pst#1}%
\if@pst\def\psk@swapaxes{-90 rotate -1 1 scale }%
\else\def\psk@swapaxes{}%
- \fi}
+ \fi
+}
\psset[pstricks]{swapaxes=false}
%
\define@boolkey[psset]{pstricks}[]{showpoints}[true]{}
@@ -2871,7 +2867,11 @@
\psset[pstricks]{subgriddiv=5}
%
\define@key[psset]{pstricks}{gridfont}[NimbusSanL-Regu]{\def\psk@gridfont{/#1 }}% hv 2007-11-13
-\psset[pstricks]{gridfont=NimbusSanL-Regu}
+\ifpst@psfonts
+ \psset[pstricks]{gridfont=Helvetica}%
+\else
+ \psset[pstricks]{gridfont=NimbusSanL-Regu}%
+\fi
%
\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 2a4b86e7b63..9cb20210519 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 545 2017-09-12 18:45:32Z herbert $
+% $Id: pstricks.sty 554 2017-09-17 19:04:49Z herbert $
%%
%% This is file `pstricks.sty'.
%%
@@ -17,7 +17,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{pstricks}[2017/07/16 v0.64 LaTeX wrapper for `PSTricks' (RN,HV)]
+\ProvidesPackage{pstricks}[2017/09/17 v0.65 LaTeX wrapper for `PSTricks' (RN,HV)]
%
\def\documentclass{%
\edef\@tempa{\jobname.tex }%
@@ -40,7 +40,9 @@
%---------------------------------DISTILLER --------------------------------
\newif\ifpst@distiller\pst@distillerfalse
\DeclareOption{distiller}{\pst@distillertrue}
-
+%
+\newif\ifpst@psfonts\pst@psfontsfalse
+\DeclareOption{psfonts}{\pst@psfontstrue}
%---------------------------------COLOR --------------------------------
\DeclareOption{monochrome}{%
\AtBeginDocument{\special{ps: