From 44376c98a6543220ca702536b7f618f7cc62168f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 23 Sep 2017 23:06:08 +0000 Subject: pstricks (23sep17) git-svn-id: svn://tug.org/texlive/trunk@45389 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/pstricks/pst-fp.tex | 21 ++-- .../texmf-dist/tex/generic/pstricks/pstricks.tex | 113 ++++++++------------- 2 files changed, 54 insertions(+), 80 deletions(-) (limited to 'Master/texmf-dist/tex/generic/pstricks') diff --git a/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex b/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex index 2d4e748193a..2ea9cf11f4f 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 465 2017-05-22 17:50:57Z herbert $ +%% $Id: pst-fp.tex 446 2017-04-19 11:40:55Z 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,8 +485,7 @@ \fi% \global\let\pstFP@tmp\pstFP@tmp% }% -% \pstFPstripZeros\pstFP@tmp{#1}% - \let#1\pstFP@tmp + \let#1\pstFP@tmp% } @@ -582,8 +581,7 @@ \global\let\pstFP@tmp=\pstFP@tmp% % }% -% \pstFPstripZeros\pstFP@tmp{#1}% - \let#1\pstFP@tmp + \let#1\pstFP@tmp% } %multiply two values @@ -707,8 +705,7 @@ \else\typeout{pstFPmul: Overflow}\fi% \else\typeout{pstFPmul: Overflow}\fi% \global\let\pstFP@tmp\pstFP@tmp}% -% \pstFPstripZeros\pstFP@tmp{#1}% - \let#1\pstFP@tmp + \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 6f2e964c58a..24722d45cbe 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -18,17 +18,14 @@ \csname PSTricksLoaded\endcsname \let\PSTricksLoaded\endinput % -%% !! 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 !! +%% !! 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 !! % \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}}% @@ -83,7 +80,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,8 +94,7 @@ \expandafter\@fornoop \else #4\relax\expandafter\@tforloop\fi#2\@@#3{#4}} \long\def\@break@tfor#1\@@#2#3{\csname fi\endcsname\csname fi\endcsname} - %\ifx\pst@psfontstrue\@undefined \let\ifpst@psfonts\iffalse\fi % is defined in pstricks.sty -\fi +\fi% \catcode`\@=\PstAtCode\relax % % now we have all commands defined, for TeX and LaTeX @@ -136,19 +132,16 @@ \catcode`\@=\PstAtCode\relax \ifx\PSTFPloaded\endinput\else \input pst-fp.tex\fi % -\catcode`\@=11\relax \@ifundefined{pgfutil@empty}{\input pgfutil-common.tex}{} \@ifundefined{pgkeys@empty}{\input pgfkeys.code.tex}{} \@ifundefined{pgffor@emptyvalues}{\input pgffor.code.tex}{} \let\pgfforeach\foreach % -\def\fileversion{2.76} -\def\filedate{2017/09/17} +\def\fileversion{2.72b} +\def\filedate{2017/04/19} +\catcode`\@=11\relax \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{} @@ -631,7 +624,7 @@ \gdef\pslbrace[{ ] \gdef\psrbrace[} ] \endgroup -% + \pstVerb{ /pssetRGBcolor /setrgbcolor load def /pssetCMYKcolor /setcmykcolor load def @@ -642,8 +635,8 @@ %\expandafter\edef\csname color@#1\endcsname{#2}% \expandafter\edef\csname\string\color@#1\endcsname{#2}% hv 1.14 2005-12-17 \ignorespaces} -% -\def\pst@color#1{\def\pst@currentcolor{#1}\pstVerb{#1}\aftergroup\pst@endcolor}% +\def\pst@color#1{% + \def\pst@currentcolor{#1}\pstVerb{#1}\aftergroup\pst@endcolor}% \def\pst@endcolor{\pstVerb{\pst@currentcolor}} \def\pst@currentcolor{0 setgray} \def\altcolormode{% @@ -685,8 +678,8 @@ \def\pst@usecolor#1{\csname\string\color@#1\endcsname\space} % \def\newgray#1#2{% - \pst@checknum{#2}\pst@tempg - \@newcolor{#1}{\pst@tempg setgray}}% + \pst@checknum{#2}\pst@tempg + \@newcolor{#1}{\pst@tempg setgray}} \def\newrgbcolor#1#2{% \pst@expandafter\pst@getnumiii{#2} {} {} {} {}\@nil \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi setrgbcolor}} @@ -707,18 +700,6 @@ \newrgbcolor{yellow}{1 1 0} \newrgbcolor{cyan}{0 1 1} \newrgbcolor{magenta}{1 0 1} - -\@ifundefined{xglobal}% do we have xcolor loaded? - {\@newcolor{randomgray}{Rand setgray}% - \@newcolor{randomrgb}{Rand Rand Rand setrgbcolor}% - \@newcolor{randomcmyk}{Rand Rand Rand Rand setcmykcolor}% - \@newcolor{randomhsb}{Rand Rand Rand sethsbcolor}% - }{% - \definecolor[ps]{randomgray}{gray}{Rand}% - \definecolor[ps]{randomrgb}{rgb}{Rand Rand Rand}% - \definecolor[ps]{randomcmyk}{cmyk}{Rand Rand Rand Rand}% - \definecolor[ps]{randomhsb}{hsb}{Rand Rand Rand}% - } % \define@boolkey[psset]{pstricks}[Pst@]{draft}[true]{} \define@key[psset]{pstricks}{bgcolor}{\def\pst@bgcolor{#1}}% background for pspicture @@ -851,12 +832,10 @@ \def\@degrees[#1]{% \pst@checknum{#1}\pst@tempg \edef\pst@angleunit{360 \pst@tempg div mul }% - \pstVerb{tx@Dict begin startGlobal /pst@angleunit {\pst@angleunit} def endGlobal end}% \ignorespaces} % -\def\radians{\def\pst@angleunit{57.2956 mul }}% -\def\pst@angleunit{}% -\pstVerb{tx@Dict begin startGlobal /pst@angleunit {\pst@angleunit} def endGlobal end}% +\def\radians{\def\pst@angleunit{57.2956 mul }} +\def\pst@angleunit{} % \def\SpecialCoor{% \def\pst@@getcoor##1{% @@ -1090,16 +1069,18 @@ \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 + \Pst@SpecialLengthtrue% + \psDEBUG[special@length]{ Special length: \pst@SpecialLength}% \else \let\@psunit\psunit \afterassignment\pstunit@off - #3 #1#2\@psunit - \Pst@SpecialLengthfalse - \fi -} + #3 #1#2\@psunit% + \Pst@SpecialLengthfalse% + \psDEBUG[special@length]{ Normal length: \the#3 }% + \fi} % \def\Cartesian{% \def\cartesian@coor##1,##2,##3\@nil{% @@ -1124,14 +1105,14 @@ \def\psk@origin{} % \define@boolkey[psset]{pstricks}[Pst@]{algebraic}[true]{} -\psset{algebraic=false} +\psset%[pstricks] +{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]{} @@ -2460,33 +2441,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]{StandardSymL}{} -%\newpsfontdot{diamond}[2.3 0.0 0.0 2.3 -0.8533 -0.5336]{StandardSymL}{} +%\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}{} % 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]{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}{(|)} +\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}{(|)} % DG/SR modification begin - Oct. 27, 1997 - Patch 7 -%[1.98413 0.0 0.0 1.98413 -0.258929 -0.712302]{NimbusSanL-Regu}{(|)} +%[1.98413 0.0 0.0 1.98413 -0.258929 -0.712302]{Helvetica}{(|)} % DG/SR modification end -\newpsfontdot{B|}[1.98413 0.0 0.0 1.38 -0.277778 -0.5]{NimbusSanL-Bold}{(|)}% +\newpsfontdot{B|}[1.98413 0.0 0.0 1.38 -0.277778 -0.5]{Helvetica-Bold}{(|)}% % DG/SR modification begin - Oct. 27, 1997 - Patch 7 -%[1.98413 0.0 0.0 1.98413 -0.277778 -0.78302]{NimbusSanL-Bold}{(|)} +%[1.98413 0.0 0.0 1.98413 -0.277778 -0.78302]{Helvetica-Bold}{(|)} % DG/SR modification end \iffalse -\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}{} +\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}{} \fi % Etienne Riga \newpsfontdot{Asterisk}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(k)} @@ -2866,12 +2847,8 @@ \pst@cntg=#1\relax\edef\psk@subgriddiv{\the\pst@cntg}} \psset[pstricks]{subgriddiv=5} % -\define@key[psset]{pstricks}{gridfont}[NimbusSanL-Regu]{\def\psk@gridfont{/#1 }}% hv 2007-11-13 -\ifpst@psfonts - \psset[pstricks]{gridfont=Helvetica}% -\else - \psset[pstricks]{gridfont=NimbusSanL-Regu}% -\fi +\define@key[psset]{pstricks}{gridfont}[Helvetica]{\def\psk@gridfont{/#1 }}% hv 2007-11-13 +\psset[pstricks]{gridfont=Helvetica} % \define@key[psset]{pstricks}{gridlabels}[10pt]{\pst@getlength{#1}\psk@gridlabels} \psset[pstricks]{gridlabels=10pt} -- cgit v1.2.3