diff options
author | Karl Berry <karl@freefriends.org> | 2017-01-22 22:33:54 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-01-22 22:33:54 +0000 |
commit | 60a21cad39ca930406807ef85e67b5b3f8407b2a (patch) | |
tree | d4c3be4ec386943fdcf65c51bf5089f2482b100f /Master/texmf-dist/tex/generic | |
parent | 7cda0d30f06435970225300d27b2643a1efc83e3 (diff) |
pst-node (22jan17)
git-svn-id: svn://tug.org/texlive/trunk@43015 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
-rw-r--r-- | Master/texmf-dist/tex/generic/pst-node/pst-node.tex | 77 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pst-node/pst-node97.tex | 5 |
2 files changed, 42 insertions, 40 deletions
diff --git a/Master/texmf-dist/tex/generic/pst-node/pst-node.tex b/Master/texmf-dist/tex/generic/pst-node/pst-node.tex index 2bcddd7d126..9704763806b 100644 --- a/Master/texmf-dist/tex/generic/pst-node/pst-node.tex +++ b/Master/texmf-dist/tex/generic/pst-node/pst-node.tex @@ -1,4 +1,4 @@ -% $Id: pst-node.tex 68 2014-08-07 10:16:26Z herbert $ +% $Id: pst-node.tex 373 2017-01-20 14:30:39Z herbert $ %% %% BEGIN pst-node.tex %% @@ -18,8 +18,8 @@ \ifx\PSTricksLoaded\endinput\else\input pstricks.tex \fi\relax \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi % -\def\fileversion{1.36} -\def\filedate{2016/04/24} +\def\fileversion{1.39} +\def\filedate{2017/01/20} \message{ v\fileversion, \filedate} % \edef\TheAtCode{\the\catcode`\@} @@ -148,8 +148,8 @@ \def\pst@nodealign{% \pst@dimg=\ht\pst@hbox -\advance\pst@dimg-\dp\pst@hbox -\divide\pst@dimg2 +\advance\pst@dimg by -\dp\pst@hbox +\divide\pst@dimg by \tw@ \lower\pst@dimg} % \def\tx@InitPnode{InitPnode } @@ -195,10 +195,7 @@ \fi \pscircle@do(#1){#2}% \pst@newnode{#3}{11}{\pst@coor \pst@number\pst@dimc}{\tx@InitCnode}% -%% % DG/SR modification begin - Jul. 30, 1997 - Patch 2 -%% %\ifPst@nodealign \kern\pst@dimc\egroup \fi}% \ifPst@nodealign\kern\pst@dimc\fi% -%% % DG/SR modification end }% \ignorespaces} % @@ -210,32 +207,36 @@ \def\cnodeput@i{\@ifnextchar({\cnodeput@iii}{\cnodeput@ii}} \def\cnodeput@ii#1{% \addto@par{rot={#1}}% - \@ifnextchar({\cnodeput@iii}{\cnodeput@iii(\z@,\z@)}} + \@ifnextchar({\cnodeput@iii}{\cnodeput@iii(\z@,\z@)}% +} \def\cnodeput@iii(#1)#2{% \pst@killglue \@fixedradiusfalse \def\pst@nodehook{\cnodeput@iv{#2}}% - \pst@makebox{\cput@v{#1}}} + \pst@makebox{\cput@v{#1}}% +} \def\cnodeput@iv#1{% \pst@newnode{#1}{11}{\pscirclebox@iv \pst@number\pslinewidth add}{\tx@InitCnode}% - \global\let\pst@nodehook\relax} -% + \global\let\pst@nodehook\relax + \ignorespaces +} \def\Cnodeput{\pst@object{Cnodeput}} \def\Cnodeput@i{\@ifnextchar({\Cnodeput@iii}{\Cnodeput@ii}} \def\Cnodeput@ii#1{% -\addto@par{rot={#1}}% -\@ifnextchar({\Cnodeput@iii}{\Cnodeput@iii(\z@,\z@)}} + \addto@par{rot={#1}}% + \@ifnextchar({\Cnodeput@iii}{\Cnodeput@iii(\z@,\z@)}} \def\Cnodeput@iii(#1)#2{% -\pst@killglue -\@fixedradiustrue -\def\pst@nodehook{\Cnodeput@iv{#2}}% -\pst@makebox{\cput@v{#1}}} + \pst@killglue + \@fixedradiustrue + \def\pst@nodehook{\Cnodeput@iv{#2}}% + \pst@makebox{\cput@v{#1}}% +} \def\Cnodeput@iv#1{% -\pst@newnode{#1}{11}{% -\pst@number{\wd\pst@hbox} 2 div \pst@number\pst@dima % x y -\pst@number\pst@dimb \pst@number\pslinewidth \psk@dimen .5 sub mul sub }% r -{\tx@InitCnode}% -\global\let\pst@nodehook\relax} + \pst@newnode{#1}{11}{% + \pst@number{\wd\pst@hbox} 2 div \pst@number\pst@dima % x y + \pst@number\pst@dimb \pst@number\pslinewidth \psk@dimen .5 sub mul sub }% r + {\tx@InitCnode}% + \global\let\pst@nodehook\relax} % \def\circlenode{\pst@object{circlenode}} \def\circlenode@i#1{\pst@makebox{\circlenode@ii{#1}}} @@ -257,21 +258,21 @@ \def\Circlenode@i#1{\pst@makebox{\Circlenode@ii{#1}}} \def\Circlenode@ii#1{% \begingroup -\pst@useboxpar -\pst@dima=\ht\pst@hbox -\advance\pst@dima\dp\pst@hbox -\divide\pst@dima\tw@ -\pssetlength\pst@dimb\psk@radius -\setbox\pst@hbox=\hbox{% -\Cnodeput@iv{#1}% -\pscircle(.5\wd\pst@hbox,\pst@dima){\pst@dimb}% -\box\pst@hbox}% -\ifPst@nodealign \psboxseptrue \fi -\ifpsboxsep \psCirclebox@sep \fi -\leavevmode -\ifPst@nodealign\pst@nodealign\fi -\box\pst@hbox -\endgroup} + \pst@useboxpar + \pst@dima=\ht\pst@hbox + \advance\pst@dima by -\dp\pst@hbox + \divide\pst@dima by \tw@ + \pssetlength\pst@dimb\psk@radius + \setbox\pst@hbox=\hbox{% + \Cnodeput@iv{#1}% + \pscircle(.5\wd\pst@hbox,\pst@dima){\pst@dimb}% + \box\pst@hbox}% + \ifPst@nodealign \psboxseptrue \fi + \ifpsboxsep \psCirclebox@sep \fi + \leavevmode + \ifPst@nodealign\pst@nodealign\fi + \box\pst@hbox + \endgroup} \def\tx@GetRnodePos{GetRnodePos } \def\tx@InitRnode{InitRnode } % diff --git a/Master/texmf-dist/tex/generic/pst-node/pst-node97.tex b/Master/texmf-dist/tex/generic/pst-node/pst-node97.tex index 5df456f3d0b..1c6c95478b0 100644 --- a/Master/texmf-dist/tex/generic/pst-node/pst-node97.tex +++ b/Master/texmf-dist/tex/generic/pst-node/pst-node97.tex @@ -1,3 +1,4 @@ +% $Id: pst-node97.tex 129 2014-10-09 14:15:40Z herbert $ %% BEGIN: pst-node.tex %% Generated on <1993/3/12> from `pst-node.doc'. %% For use with the PostScript header file `pst-node.pro'. @@ -27,11 +28,11 @@ \csname PSTnodesLoaded\endcsname \let\PSTnodesLoaded\endinput \ifx\PSTricksLoaded\endinput\else -\def\next{\input pstricks.tex}\expandafter\next +\def\next{\input pstricks97.tex}\expandafter\next \fi \edef\TheAtCode{\the\catcode`\@} \catcode`\@=11 -\pstheader{pst-node.pro} +\pstheader{pst-node97.pro} \def\pst@nodedict{tx@NodeDict begin } \def\pst@getnode#1#2{% \pst@expandafter\pst@@getnode{#1} * \@nil{#1}#2} |