summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-09-18 23:40:26 +0000
committerKarl Berry <karl@freefriends.org>2012-09-18 23:40:26 +0000
commitbc26712b3009a6da7880bf1718125a08c03f05c2 (patch)
tree953f6c6921cc752d8367eed5c401f637b21d7cfe /Master
parentb8bba40d8f2548af807f7de6206adff564669857 (diff)
pst-node 1.23 (18sep12)
git-svn-id: svn://tug.org/texlive/trunk@27722 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/pst-node/Changes5
-rw-r--r--Master/texmf-dist/doc/generic/pst-node/pst-node-doc.pdfbin533416 -> 540986 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-node/pst-node-doc.tex42
-rw-r--r--Master/texmf-dist/dvips/pst-node/pst-node.pro8
-rw-r--r--Master/texmf-dist/tex/generic/pst-node/pst-node.tex24
-rw-r--r--Master/texmf-dist/tex/latex/pst-node/pst-node.sty10
6 files changed, 67 insertions, 22 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-node/Changes b/Master/texmf-dist/doc/generic/pst-node/Changes
index 2c5d5d0facb..2d302430faa 100644
--- a/Master/texmf-dist/doc/generic/pst-node/Changes
+++ b/Master/texmf-dist/doc/generic/pst-node/Changes
@@ -1,4 +1,7 @@
----- pst-node.tex
+1.24 2012-09-18 - fix introduced bug with \pst@thenode
+1.23 2012-09-15 - add global defined N-<name>.x and N-<name>.y
+ for user nodes
1.22 2012-02-12 - fix introduced bug for \rnode with
commented out the \pst@boxpar
1.21 2011-11-21 - fix bug for xelatex and scaling
@@ -24,11 +27,13 @@
----- pst-node.sty
+1.01 2012-09-18 - update package versions (hv)
1.00 2011-06-05 - make ancient variant 97 available (hv)
2008-12-12 first version (hv)
----- pst-node.pro
+1.14 2012-09-18 - add subroutines for global dict
1.13 2011-11-21 - fix bug for xelatex and scaling
1.12 2010-04-30 - small changes to the code
1.11 2010-04-22 - added function /concatstringarray (ms)
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 ded72621665..d4c4bbea71b 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
Binary files differ
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 040b66746c4..269ac5a0995 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,4 +1,4 @@
-%% $Id: pst-node-doc.tex 568 2011-08-20 08:15:04Z herbert $
+%% $Id: pst-node-doc.tex 703 2012-09-15 18:54:16Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\listfiles
@@ -1546,7 +1546,7 @@ characters, like umlauts or an active \PS\ character, like \texttt{(}.
\clearpage
%--------------------------------------------------------------------------------------
-\section{Relative nodes with \nxLcs{psGetNodeCenter}}
+\section{Relative nodes with \nxLcs{psGetNodeCenter} or \texttt{N-<name>.x|y}}
%--------------------------------------------------------------------------------------
\begin{BDef}
@@ -1559,7 +1559,9 @@ the PostScript level. It defines the two variables \Larg{node.x}
and \Larg{node.y} which can be used to define relative nodes. The
following example defines the node \verb+MyNode+ and a second one
relative to the first one, with 4 units left and 4 units up.
-\Larg{node} must be an existing node name.
+\Larg{node} must be an existing node name. Nodes are saved in an own
+dictionary with the current transformation matrix, which is reset when
+using the macro \Lcs{psGetNodeCenter}.
\begin{LTXexample}[width=5cm]
\begin{pspicture}[showgrid=true,arrowscale=2](5,5)
@@ -1583,7 +1585,39 @@ relative to the first one, with 4 units left and 4 units up.
\end{pspicture}
\end{LTXexample}
-\clearpage
+
+The coordinates of the nodes are also saved in user coordinates in global defined names
+\texttt{N-<name>.x} and \texttt{N-<name>.y}. The forgoing examples can be simplified if you
+do not need the resetting of the transformation matrix:
+
+
+
+\begin{LTXexample}[width=5cm]
+\begin{pspicture}[showgrid=true,arrowscale=2](5,5)
+\pnode(4.5,0.5){MyNode}
+\psdot(MyNode)
+\pnode(! N-MyNode.x 4 sub N-MyNode.y 4 add){MySecondNode}
+\psdot(MySecondNode)
+\ncline[linecolor=red]{<->}{MyNode}{MySecondNode}
+\end{pspicture}
+\end{LTXexample}
+
+
+\bigskip
+In the following example it doesn't work because the relative node setting via \Lcs{rput}
+is not taken into account.
+
+\begin{LTXexample}[width=5cm]
+\begin{pspicture}[showgrid=true](5,5)
+\rput(1.5,0.5){\trinode{CN}{NodeA}}
+\rput(3.5,2.5){\trinode{EN}{NodeB}}
+\pnode(! N-CN.x 2 add N-CN.y 1 add ){MyCNode}
+\ncline[linecolor=red]{<->}{MyCNode}{EN}
+\ncline[linecolor=blue]{<->}{CN}{EN}
+\end{pspicture}
+\end{LTXexample}
+
+
%--------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/dvips/pst-node/pst-node.pro b/Master/texmf-dist/dvips/pst-node/pst-node.pro
index 25ea992f2c1..f3fdc8525d4 100644
--- a/Master/texmf-dist/dvips/pst-node/pst-node.pro
+++ b/Master/texmf-dist/dvips/pst-node/pst-node.pro
@@ -1,17 +1,19 @@
-% $Id: pst-node.pro 645 2012-02-12 09:09:51Z herbert $
+% $Id: pst-node.pro 704 2012-09-18 12:37:45Z herbert $
%%
%% PostScript prologue for pst-node.tex.
-%% Version 1.13, 2011/11/21.
+%% Version 1.14, 2012/09/18.
%%
%% 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.
%
-/tx@NodeDict 400 dict def tx@NodeDict begin
tx@Dict begin % from main pstricks dict
/T /translate load def
/CP /currentpoint load def
+ /startGlobal { true setglobal globaldict begin } bind def
+ /endGlobal { end false setglobal } bind def
end
+/tx@NodeDict 400 dict def tx@NodeDict begin
/NewNode { % on stack: { x y } boolean N@name type InitXnode
gsave
NodeScale % a bugfix for xelatex, it's empty for dvips
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 15d6e56ce9b..d9932789a6c 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 645 2012-02-12 09:09:51Z herbert $
+% $Id: pst-node.tex 705 2012-09-18 12:39:00Z herbert $
%% BEGIN pst-node.tex
%%
%% Nodes with PSTricks.
@@ -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/10 by Herbert Voss, hvoss tug.org.
+%% COPYRIGHT 2009-2012 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.22}
-\def\filedate{2012/02/12}
+\def\fileversion{1.24}
+\def\filedate{2012/09/18}
\message{ v\fileversion, \filedate}
%
\edef\TheAtCode{\the\catcode`\@}
@@ -54,14 +54,17 @@
%
% bug fix for xelatex, dvipdfmx uses the wrong scaling
\def\tx@NewNode{/NodeScale {\ifx\pstnodescale\@undefined \else\pstnodescale \fi} def NewNode }
+%
\def\pst@newnode#1#2#3#4{%
-% DG/SR modification begin - Nov. 9, 2000 - Patch 11
\pst@killglue
-% DG/SR modification end
\leavevmode
\pst@getnode{#1}\pst@thenode
-%\typeout{====\pst@thenode}%
-\pst@Verb{%
+\pst@Verb{
+ \ifx\relax#3\relax 0 0 \else #3 \tx@UserCoor \fi
+% startGlobal
+ /N-#1.y\space exch def
+ /N-#1.x\space exch def
+% endGlobal
\pst@nodedict
{#3}
\ifx\psk@name\relax false \else \psk@name true \fi
@@ -71,9 +74,10 @@
\tx@NewNode
end }%
%
-\global\let\psk@name\relax
-\pstree@nodehook
+\global\let\psk@name\relax%
+\pstree@nodehook%
\global\let\pstree@nodehook\relax}
+%
\let\pstree@nodehook\relax
\define@boolkey[psset]{pst-node}[Pst@]{nodealign}[true]{}
\psset[pst-node]{nodealign=false}
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 821e14da13f..39a5b320b63 100644
--- a/Master/texmf-dist/tex/latex/pst-node/pst-node.sty
+++ b/Master/texmf-dist/tex/latex/pst-node/pst-node.sty
@@ -1,10 +1,10 @@
-% $Id: pst-node.sty 510 2011-06-05 07:08:38Z herbert $
+% $Id: pst-node.sty 703 2012-09-15 18:54:16Z herbert $
%%
%% This is file `pst-node.sty'.
%%
%% IMPORTANT NOTICE:
%%
-%% pstricks.sty Copyright (C) 2004-2011 Herbert Voss <voss@perce.de>
+%% pstricks.sty Copyright (C) 2004-2012 Herbert Voss <voss@perce.de>
%% Rolf Niepraschk <Rolf.Niepraschk@ptb.de>
%%
%% This package may be distributed under the terms of the LaTeX Project
@@ -14,7 +14,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pst-node}
- [2011/06/05 v1.00 LaTeX wrapper for `pst-node' (HV)]
+ [2012/09/18 v1.01 LaTeX wrapper for `pst-node' (HV)]
%
\newif\ifpst@OldVersion\pst@OldVersionfalse
\DeclareOption{97}{\pst@OldVersiontrue}
@@ -35,10 +35,10 @@
\ProvidesPackage{pst-node}[2010/04/22 package wrapper for pst-node.tex]
\input{pst-node.tex}
\ProvidesFile{pst-node.tex}
- [\filedate\space \fileversion\space `pst-node' (tvz)]
+ [\filedate\space \fileversion\space `pst-node' (tvz,hv)]
\IfFileExists{pst-node.pro}{%
\ProvidesFile{pst-node.pro}
- [2010/04/30 v. 1.12, PostScript prologue file (hv)]
+ [2011/09/18 v. 1.14, PostScript prologue file (hv)]
\@addtofilelist{pst-node.pro}}{}%
\fi
\endinput