summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-09-19 22:07:02 +0000
committerKarl Berry <karl@freefriends.org>2017-09-19 22:07:02 +0000
commit1fed9c611dac053f39781da462cb70f542c11d61 (patch)
tree0606a72f12c406c0ef4a15b9b9b811badd217acb /Master/texmf-dist/tex/generic
parentccc2cbfd8a25a4aba8860c2caf490881bcc2a8a3 (diff)
pstricks (19sep17)
git-svn-id: svn://tug.org/texlive/trunk@45343 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex40
1 files changed, 20 insertions, 20 deletions
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}