diff options
author | Karl Berry <karl@freefriends.org> | 2017-05-18 21:42:25 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-05-18 21:42:25 +0000 |
commit | 87c2d6a46902b860addfaf01e8177c933f0f3b0e (patch) | |
tree | dde57ab7602dae25b45544a69e5b03db5c0d6a73 /Master/texmf-dist/tex | |
parent | d633c2d1792e8990aaaef8cdd2543a561c63407f (diff) |
pstricks (18may17)
git-svn-id: svn://tug.org/texlive/trunk@44408 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/pst-fp.tex | 21 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/pstricks.tex | 15 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pstricks/pst-doc.cls | 4 |
3 files changed, 24 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex b/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex index 2ea9cf11f4f..97e189f99f9 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 446 2017-04-19 11:40:55Z herbert $ +%% $Id: pst-fp.tex 451 2017-05-11 12:32:06Z herbert $ %% %% %% This is file `pst-fp.tex', @@ -121,12 +121,12 @@ \def\pstFP@swallow#1\relax{} % \def\ifpstFP@zero#1{% - \ifnum% - \expandafter\ifnum\csname pstFP@#1ia\endcsname=0 0\else1\fi% - \expandafter\ifnum\csname pstFP@#1ib\endcsname=0 0\else1\fi% - \expandafter\ifnum\csname pstFP@#1fa\endcsname=0 0\else1\fi% + \ifnum + \expandafter\ifnum\csname pstFP@#1ia\endcsname=0 0\else1\fi + \expandafter\ifnum\csname pstFP@#1ib\endcsname=0 0\else1\fi + \expandafter\ifnum\csname pstFP@#1fa\endcsname=0 0\else1\fi \expandafter\ifnum\csname pstFP@#1fb\endcsname=0 0\else1\fi% - =0\relax% + =0\relax } % %read value @@ -485,7 +485,8 @@ \fi% \global\let\pstFP@tmp\pstFP@tmp% }% - \let#1\pstFP@tmp% + \pstFPstripZeros\pstFP@tmp{#1}% +% \let#1\pstFP@tmp% } @@ -581,7 +582,8 @@ \global\let\pstFP@tmp=\pstFP@tmp% % }% - \let#1\pstFP@tmp% + \pstFPstripZeros\pstFP@tmp{#1}% +% \let#1\pstFP@tmp% } %multiply two values @@ -705,7 +707,8 @@ \else\typeout{pstFPmul: Overflow}\fi% \else\typeout{pstFPmul: Overflow}\fi% \global\let\pstFP@tmp\pstFP@tmp}% - \let#1\pstFP@tmp% + \pstFPstripZeros\pstFP@tmp{#1}% +% \let#1\pstFP@tmp% } % \catcode`\@=\PstAtCode\relax diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index 24722d45cbe..2fb3ec886c0 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -18,14 +18,17 @@ \csname PSTricksLoaded\endcsname \let\PSTricksLoaded\endinput % -%% !! loading additional TeX packages see line 112 !! -%% !! loading config file pstricks.con line 476 !! -%% !! loading pro files line 489 !! -%% !! fileversion and date see line 119 !! +%% !! loading additional TeX packages see line 105/136 !! +%% !! loading config file pstricks.con line 491 !! +%% !! loading pro files line 515 !! +%% !! fileversion and date see line 143 !! % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax % +\ifx\c@lor@to@ps\@undefined + \def\c@lor@to@ps{\PSTricks_Not_Configured_For_This_Format}% message for a pdflatex run +\fi \expandafter\ifx\csname @latexerr\endcsname\relax % do we have LaTeX? then it is false \newwrite\@unused \def\typeout#1{\immediate\write\@unused{#1}}% @@ -137,8 +140,8 @@ \@ifundefined{pgffor@emptyvalues}{\input pgffor.code.tex}{} \let\pgfforeach\foreach % -\def\fileversion{2.72b} -\def\filedate{2017/04/19} +\def\fileversion{2.73} +\def\filedate{2017/05/18} \catcode`\@=11\relax \pst@addfams{pstricks} % diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls b/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls index 15f71fd95b5..7166d95c1ea 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 444 2017-04-19 10:55:35Z herbert $ +% $Id: pst-doc.cls 461 2017-05-18 10:17:06Z herbert $ % %% %% The PSTricks Project @@ -35,6 +35,7 @@ %\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} @@ -102,6 +103,7 @@ \RequirePackage{subfig} \RequirePackage{setspace} \RequirePackage{paralist} +\RequirePackage{biblatex} % \RequirePackage{fancyvrb} \newenvironment{Xverbatim}[2][]% |