pst-node (11dec17)

git-svn-id: svn://tug.org/texlive/trunk@46041 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 74 insertions, 32 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-node/Changes b/Master/texmf-dist/doc/generic/pst-node/Changes
index c33f007e8d5..aaa9d601caf 100644
--- a/Master/texmf-dist/doc/generic/pst-node/Changes
+++ b/Master/texmf-dist/doc/generic/pst-node/Changes
@@ -1,4 +1,5 @@
 ----- pst-node.tex
+1.40  2017-12-09 - added #1Last for \saveDataAsNodes
 1.39  2017-01-20 - fix for \Circlenode with +/+\dp\hbox
 1.38  2016-05-27 - revert fix for \Cnodeput. Problem was in pstricks.tex
 1.37  2016-05-26 - fixed bug with \Cnodeput 
diff --git a/Master/texmf-dist/doc/generic/pst-node/README b/Master/texmf-dist/doc/generic/pst-node/README
index 653298dfb5c..98bfbb39dae 100644
--- a/Master/texmf-dist/doc/generic/pst-node/README
+++ b/Master/texmf-dist/doc/generic/pst-node/README
@@ -16,3 +16,7 @@ http://www.dante.de/CTAN/graphics/pstricks/
 The documentation was build with a temporary file to
 insert the pages from the original documentation via
 the command \includepdf[pages=..]{pst-docfull}. 
+
+%% This program can be redistributed and/or modified under the terms
+%% of the LaTeX Project Public License Distributed from CTAN
+%% archives in directory macros/latex/base/lppl.txt.
diff --git a/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.bib b/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.bib
index ead359beff7..24773cb3c6b 100644
--- a/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.bib
+++ b/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.bib
@@ -6,9 +6,9 @@
   author	= {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Dennis Roegel and Herbert Vo\ss},
   title		= {The {\LaTeX} {G}raphics {C}ompanion},
   publisher	= {{Addison-Wesley Publishing Company}},
-  edition	= {second},
+  edition	= {2},
   year		= {2007},
-  address	= {Boston, Mass.}
+  location	= {Boston, Mass.}
 }
 
 @Article{girou:01:,
@@ -36,32 +36,62 @@
   Title          = {Post{S}cript richtig eingesetzt: vom {K}onzept zum
                    praktischen {E}insatz},
   Publisher      = {IWT},
-  Address        = {Vaterstetten},
+  location        = {Vaterstetten},
   year           = 1989,
 }
 
-@Manual{multido,
+@ctan{multido,
   Title          = {\texttt{multido.tex} - a loop macro, that supports fixed-point addition},
   Author         = {{Timothy Van} Zandt},
-  Organization   = {},
-  Address        = {\url{CTAN:/macros/generic/multido.tex}},
-  Note           = {},
-  year           = 1997
+  Organization   = {CTAN},
+  url        = {/macros/generic/multido/},
+  year           = 2010,
+version = {1.42},
 }
 
 @Book{PSTricks2,
   author	= {Herbert Vo\ss{}},
   title		= {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
-  edition	= {6},
-  publisher	= {DANTE -- lehmanns media},
-  year		= {2010},
-  address	= {Heidelberg/Berlin}
+  edition	= {7},
+  publisher	= {DANTE and Lehmanns Media},
+  year		= {2016},
+  location	= {Heidelberg and Berlin}
 }
 
-@Book{PSTricks2-UIT,
-  author	= {Herbert Vo\ss},
-  title		= {PSTricks -- Graphics for \LaTeX},
+@Book{PSTricksE,
+  author	= {Herbert Vo\ss{}},
+  title		= {\texttt{PSTricks} -- {G}raphics and {P}ost{S}cript for \LaTeX},
+  edition	= {1},
   publisher	= {UIT},
   year		= {2011},
-  address	= {Cambridge/UK}
+  location	= {Cambridge -- UK}
 }
+
+@Book{LTXquick,
+  author	= {Herbert Vo\ss{}},
+  title		= {{\LaTeX} quick reference},
+  edition	= {1},
+  publisher	= {UIT},
+  year		= {2012},
+  location	= {Cambridge -- UK}
+}
+
+@Book{presentations,
+  author	= {Herbert Vo\ss},
+  title		= {Presentations with \LaTeX},
+  edition	= {2},
+  publisher	= {DANTE and  Lehmanns Media},
+  year		= {2017},
+  location	= {Heidelberg and Berlin}
+}
+
+
+@Book{tbt,
+  author	= {Victor Eijkhout},
+  title		= {\TeX\ by Topic -- {A} \TeX{}nician Reference},
+  edition	= {1},
+  publisher	= {DANTE and Lehmanns Media},
+  year		= {2014},
+  location	= {Heidelberg and Berlin}
+}
+
diff --git a/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.pdf b/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.pdf
index 2c43f6652a2..6c01a9da9ec 100644
--- a/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.pdf
diff --git a/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.tex b/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.tex
index 63d6c4ca04b..33b37d39f6f 100644
--- a/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.tex
@@ -1,6 +1,6 @@
-%% $Id: pst-node-doc.tex 295 2016-05-02 19:11:36Z herbert $
-\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
-    headexclude,footexclude,oneside]{pst-doc}
+%% $Id: pst-node-doc.tex 684 2017-12-09 19:05:01Z herbert $
+\documentclass[fontsize=11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,smallheadings,
+    headinclude=false,footinclude=false,oneside]{pst-doc}
 \listfiles
 
 \input{pst-node}
@@ -43,6 +43,9 @@
     (-1,-.55)(-1,.5)(-.8,.5)(-.8,.65)(-.2,.65)(-.2,.5)(1,.5)(1,-.55)
    \endpspicture}
 
+\addbibresource{\jobname.bib}
+
+
 \lstset{explpreset={pos=l,width=-99pt,overhang=0pt,hsep=\columnsep,vsep=\bigskipamount,rframe={}}}
 
 \begin{document}
@@ -2653,7 +2656,8 @@ with only two particular arrow shapes---those arrows specified with either
 
 The macro \Lcs{saveDataAsNodes} allows to read $x|y$ values from an external data file
 and save the coordinates in nodes named \texttt{<Nodeprefix>i>} where $i$ is the nodecounter,
-starting at 0.
+starting at 0. The last loop index is saved in the counter \Lctr{psLoopIndex} and the last
+node is saved as \nxLenv{<Nodeprefix>Last}
 
 
 \begin{filecontents*}{node.data}
@@ -2674,9 +2678,10 @@ starting at 0.
   \saveDataAsNodes{node.data}{N}
   \psset{radius=2.5mm,arrows=->,arrowscale=1.5,nodesep=2.7mm,linewidth=1.3pt}
   \Cnodeput[linecolor=red]{0}(N0){foo}{0}
-  \multido{\iA=1+1,\iB=0+1}{\numexpr\the\psLoopIndex-1}{%
+  \multido{\iA=1+1,\iB=0+1}{\the\psLoopIndex}{%
     \Cnodeput{0}(N\iA){foo}{\iA}\ncline{N\iB}{N\iA}}
   \ncline[linecolor=blue,linestyle=dashed]{N8}{N3}
+  \ncline[linecolor=red,linestyle=dashed]{N0}{NLast}
 \end{pspicture}
 \end{LTXexample}
 
@@ -2688,11 +2693,8 @@ starting at 0.
 \xkvview{family=pst-node,columns={key,type,default}}
 
 \nocite{*}
-\bgroup
 \RaggedRight
-\bibliographystyle{plain}
-\bibliography{pst-node-doc}
-\egroup
+\printbibliography
 
 \printindex
 
diff --git a/Master/texmf-dist/dvips/pst-node/pst-node.pro b/Master/texmf-dist/dvips/pst-node/pst-node.pro
index c0f9f9d1f44..ebd6844ca10 100644
--- a/Master/texmf-dist/dvips/pst-node/pst-node.pro
+++ b/Master/texmf-dist/dvips/pst-node/pst-node.pro
@@ -1,4 +1,4 @@
-% $Id: pst-node.pro 40 2014-07-25 06:46:27Z herbert $
+% $Id: pst-node.pro 395 2017-03-21 09:24:38Z herbert $
 %%
 %% PostScript prologue for pst-node.tex.
 %% Version 1.15, 2014/01/27.
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 9704763806b..4b633725c26 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 373 2017-01-20 14:30:39Z herbert $
+% $Id: pst-node.tex 683 2017-12-09 18:52:02Z herbert $
 %%
 %% BEGIN pst-node.tex
 %%
@@ -6,7 +6,7 @@
 %% This uses the header file `pst-node.pro'.
 %%
 %% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu.
-%% COPYRIGHT 2009-2015 by Herbert Voss, hvoss tug.org.
+%% COPYRIGHT 2009-2018 by Herbert Voss, hvoss tug.org.
 %%
 %% This program can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License Distributed from CTAN
@@ -18,8 +18,8 @@
 \ifx\PSTricksLoaded\endinput\else\input pstricks.tex \fi\relax
 \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
 %
-\def\fileversion{1.39}
-\def\filedate{2017/01/20}
+\def\fileversion{1.40}
+\def\filedate{2017/12/09}
 \message{ v\fileversion, \filedate}
 %
 \edef\TheAtCode{\the\catcode`\@}
@@ -1981,12 +1981,17 @@ xarray cindex get yarray cindex get PtSub /dy1 exch def /dx1 exch def dx1 dy1 Py
   \loop
     \read7 to \@Data
     \ifeof7\else
-      \ifx\@Data\@empty\else\pnode(!\@Data){#2\the\psLoopIndex}%
+      \ifx\@Data\@empty
+      \else
+        \pnode(!\@Data){#2\the\psLoopIndex}%
         \typeout{#2\the\psLoopIndex -> \@Data}%
 	\advance\psLoopIndex by 1
+        \let\@oldData\@Data
       \fi
   \repeat
   \closein7
+  \advance\psLoopIndex by -1
+  \pnode(!\@oldData){#2Last}%  
 }
 %
 \catcode`\@=\TheAtCode\relax
diff --git a/Master/texmf-dist/tex/latex/pst-node/pst-node.sty b/Master/texmf-dist/tex/latex/pst-node/pst-node.sty
index f88f2b648dc..3fa6ea02032 100644
--- a/Master/texmf-dist/tex/latex/pst-node/pst-node.sty
+++ b/Master/texmf-dist/tex/latex/pst-node/pst-node.sty
@@ -4,7 +4,7 @@
 %%
 %% IMPORTANT NOTICE:
 %%
-%% pstricks.sty Copyright (C) 2004-2012 Herbert Voss <voss@perce.de>
+%% pst-node.sty Copyright (C) 2004-2017 Herbert Voss <voss@perce.de>
 %%                                 Rolf Niepraschk <Rolf.Niepraschk@ptb.de>
 %%
 %% This package may be distributed under the terms of the LaTeX Project