diff options
| -rw-r--r-- | Master/texmf-dist/doc/generic/pst-node/Changes | 1 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/generic/pst-node/pst-node-doc.pdf | bin | 550870 -> 545669 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/generic/pst-node/pst-node-doc.tex | 72 | ||||
| -rw-r--r-- | Master/texmf-dist/dvips/pst-node/pst-node.pro | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/source/generic/pst-node/Makefile | 17 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/pst-node/pst-node.tex | 19 |
6 files changed, 97 insertions, 16 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-node/Changes b/Master/texmf-dist/doc/generic/pst-node/Changes index 68f5aa8e2a5..a591474db02 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.28 2013-07-10 - added \pnodes (plural) for multiple node definition 1.27 2013-04-12 - added macro \Cnodeput which takes radius=... into account 1.26 2013-04-09 - added macros \psncurve and \psnccurve 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 Binary files differindex e7a18003617..226cba9ab34 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 d990afaa9a3..8c8d864c7f2 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 765 2013-04-09 15:32:28Z herbert $ +%% $Id: pst-node-doc.tex 766 2013-04-12 14:21:05Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside]{pst-doc} \listfiles @@ -125,6 +125,8 @@ But don't restrict yourself to these more obvious uses. For example: \ncarc[nodesep=8pt]{->}{A}{file} \end{lstlisting} + + \section{Nodes}\label{S-nodes} Nodes have a name. a boundary and a center. @@ -341,7 +343,7 @@ syntax:\footnote{% The node connections can be used with \Lcs{pscustom}. The beginning of the node connection is attached to the current point by a straight line, as with \Lcs{psarc}.}$^,$\footnote{% -See page \protect\pageref{S-SpecialCoor} if you want to use the nodes as +See page \pageref{S-SpecialCoor} if you want to use the nodes as coordinates in other PSTricks macros.} \begin{BDef} @@ -542,6 +544,8 @@ Now watch what happens when we change \Lkeyword{angleA}: \end{pspicture} \end{LTXexample} + + \Lcs{ncangle} is also a good way to join nodes by a right angle, with just two line segments, as in this example: @@ -985,6 +989,8 @@ Here are the details for each node connection: \end{center} + + Here is an example: \begin{LTXexample}[width=5cm] @@ -1181,6 +1187,9 @@ Here is how I used \Lcs{nput} to mark an angle in a previous example: \section{Mathematical diagrams and graphs}\label{S-psmatrix} + + + For some applications, such as mathematical diagrams and graphs, it is useful to arrange nodes on a grid. You can do this with alignment environments, such as \TeX's \Lcs{halign} primitive, \LaTeX's \Lenv{tabular} environment, and \AmS-\TeX's @@ -1284,6 +1293,8 @@ a node for the empty entries by setting the \LKeyword{emnode=type} parameter. + + You can change parameters for a single entry by starting this entry with the parameter changes, enclosed in square brackets. Note that the changes affect the way the node is made, but not contents of the entry (use \Lcs{psset} for @@ -1435,6 +1446,8 @@ label. E.\,g., \end{pspicture} \end{LTXexample} + + puts the label upright on the page, with right side located .4 centimeters ``above'' the position 0.5 of the node connection (above if the node connection points to the right). However, the \Lcs{aput} and \Lcs{bput} commands @@ -1514,6 +1527,31 @@ Here is another: \clearpage \part{New commands} +\section{Nodes} + +\begin{BDef} +\Lcs{pnodes}\OptArg\Largr{coors}\Largb{name}\Largr{coors}\Largb{name}\ldots\\ +\Lcs{pnodes}\Largb{name}\Largr{coors}\Largr{coors}\ldots +\end{BDef} + +This command is identical to \Lcs{pnode} if it doesn't start with a node name. In this +case it works in another way. See page~\pageref{pnodes} for more information. Instead of +writing + +\begin{verbatim} +\pnode(3,1){A} +\pnode(2,4){B} +\end{verbatim} + +one can also define the nodes in a short way: +\begin{verbatim} +\pnodes(3,1){A}(2,4){B} +\end{verbatim} + +If an optional argument for the offset is used, then it is passes to all nodes. + + + \section{Setting bounding box nodes with \nxLcs{psDefBoxNodes}} \begin{BDef} @@ -1982,6 +2020,9 @@ followed by an index---eg, P0 P1 P2 ... P5 is a node sequence with root name P. easy to define such node sequences using the \Lcs{multido} macro, or using one of a number of macros in this section. + + + \subsection{Node expressions} A number of macros in the package (eg, \Lcs{psxline}) permit the use of node expressions, by which is meant an expression like @@ -2089,6 +2130,9 @@ For example, \begin{BDef} \Lcs{curvepnodes}\Largb{tmin}\Largb{tmax}\Largb{expr. in t}\Largb{nodeRoot} \end{BDef} + + + Uses current setting of plotpoints (default 50) to define a node sequence of points along the curve. Eg, \begin{verbatim} \curvepnodes[plotpoints=100]{0}{1}{t+t^2 | Ex(-t)}{P} @@ -2169,7 +2213,7 @@ get a PostScript error if the node you specify is undefined. \end{BDef} is useful in writing pstricks macros, where there is a list of parenthesized coordinates to be read and turned into a node sequence, following which \verb|<next command>| is followed. - +\label{pnodes} \begin{BDef} \Lcs{pnodes}\Largb{P}\Largr{1,2}\Largr{2;3}\ldots \end{BDef} @@ -2184,6 +2228,8 @@ turn a list of coordinates into a node sequence P0 P1 ... \psline[linewidth=1pt]{->}(P3)(P4)(P5)(P6)(P7)(P8) \end{verbatim} + + \begin{LTXexample}[width=.35\textwidth] \begin{pspicture}[showgrid=true,algebraic](-.5,-.5)(2.5,2) \pnodes{P}(.1,.1)(1;10)(*2 {x^2/4})(0,1.4) @@ -2324,6 +2370,9 @@ line from \verb|<basept>+<nodexpr1>| to \verb|<basept>+<nodexpr2>|. is the most complicated macro in the collection. It has two forms. + + + \begin{verbatim} \polyIntersections{<Name1>}{<Name2>}(A)(B)(1,2)(3;30)(6,5)... \end{verbatim} @@ -2426,12 +2475,13 @@ assuming \verb|P0...Pn| to be previously defined nodes. \end{LTXexample} \vspace{1pc} +\iffalse \begin{LTXexample}[width=.375\textwidth] \begin{pspicture}[showgrid=true](-.5,-.5)(3.5,3) -\def\fn{x+sin(2*x)} -\psplot[algebraic]{0}{3.14}{\fn} -\fnpnodes[algebraic]{0}{3.14}{\fn}{P} -\pnode(.6,.8){A}\pnode(1.5,1.1){B} +\def\func{x+sin(2*x)} +\psplot[algebraic]{0}{3.14}{\func} +\fnpnodes[algebraic]{0}{3.14}{\func}{P} +\pnode(.6,.8){A} \pnode(1.5,1.1){B} \polyIntersections{N1}{N2}(A)(B){P}{49} \psdots(A)(B) \uput[-90](A){A}\uput[-90](B){B} @@ -2442,11 +2492,14 @@ assuming \verb|P0...Pn| to be previously defined nodes. \uput[70](N1){N1}\uput[170](N2){N2} \end{pspicture} \end{LTXexample} +\fi + \vspace{1pc} \begin{BDef} \Lcs{ArrowNotch}\Largb{<NodeName>}\Largb{<nodeindex>}\Largb{<direction>}\Largb{<Notch>} \end{BDef} + takes as inputs the root name of the node sequence, the index at which the arrow tip is to be drawn, and the direction (one of \verb+>,<+) of the arrow. It then constructs the notch as a node with name \verb|<Notch>|. The arrowhead may then be @@ -2477,8 +2530,11 @@ with only two particular arrow shapes---those arrows specified with either \psparametricplot[algebraic,arrows=<->]{PiDiv2 neg}{Pi}{\fn} \end{pspicture} \end{LTXexample} + \vspace{1pc} + + \begin{LTXexample}[width=.375\textwidth] \def\fn{1.5+1.5*cos(t) | 1+sin(t)} \psset{linewidth=2pt,arrowscale=3} @@ -2494,6 +2550,8 @@ with only two particular arrow shapes---those arrows specified with either \end{pspicture} \end{LTXexample} + + \clearpage \section{List of all optional arguments for \texttt{pst-node}} diff --git a/Master/texmf-dist/dvips/pst-node/pst-node.pro b/Master/texmf-dist/dvips/pst-node/pst-node.pro index 5fccc62cffc..92501b0ee55 100644 --- a/Master/texmf-dist/dvips/pst-node/pst-node.pro +++ b/Master/texmf-dist/dvips/pst-node/pst-node.pro @@ -10,8 +10,8 @@ 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 +% /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 diff --git a/Master/texmf-dist/source/generic/pst-node/Makefile b/Master/texmf-dist/source/generic/pst-node/Makefile index 7b32ad752bd..6eefe58c02d 100644 --- a/Master/texmf-dist/source/generic/pst-node/Makefile +++ b/Master/texmf-dist/source/generic/pst-node/Makefile @@ -15,8 +15,8 @@ ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Chan TDS = ~/PSTricks/PSTricks-TDS -all : doc clean -#tds +all : doc ctan clean + doc: $(MAIN).pdf $(MAIN).pdf : $(MAIN).ps @@ -58,6 +58,19 @@ veryclean : clean arch : zip $(ARCHNAME).zip $(ARCHFILES) +ctan: + cp -u *.sty .ctan/$(PACKAGE)/ + cp -u *.tex .ctan/$(PACKAGE)/ + cp -u *.pro .ctan/$(PACKAGE)/ + cp -u more_docs/* .ctan/$(PACKAGE)/more_docs/ +# rm -fr .ctan/$(PACKAGE)/.svn +# + cp -u Changes .ctan/$(PACKAGE)/ + cp -u README .ctan/$(PACKAGE)/ + cp -u $(MAIN).pdf .ctan/$(PACKAGE)/ + cp -u $(MAIN).bib .ctan/$(PACKAGE)/ + cp -u Makefile .ctan/$(PACKAGE)/ + tds: cp -u *.sty ~/Links/texmf-local-latex/$(PACKAGE)/ cp -u *.pro ~/Links/dvips-local/ 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 62187a683f1..dc73d051cff 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 765 2013-04-09 15:32:28Z herbert $ +% $Id: pst-node.tex 766 2013-04-12 14:21:05Z herbert $ %% BEGIN pst-node.tex %% %% Nodes with PSTricks. @@ -18,8 +18,8 @@ \ifx\PSTricksLoaded\endinput\else\input pstricks.tex \fi\relax \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi % -\def\fileversion{1.27} -\def\filedate{2013/04/12} +\def\fileversion{1.28} +\def\filedate{2013/07/10} \message{ v\fileversion, \filedate} % \edef\TheAtCode{\the\catcode`\@} @@ -66,6 +66,7 @@ \ifPst@saveNodeCoors \ifx\relax#3\relax 0 0 \else #3 \tx@UserCoor \fi % startGlobal +% \tx@UserCoor /N-#1.y\space exch def /N-#1.x\space exch def % endGlobal @@ -77,7 +78,8 @@ #2 {#4} \tx@NewNode - end }% + end +}% % \global\let\psk@name\relax% \pstree@nodehook% @@ -109,6 +111,13 @@ \pst@newnode{#2}{10}{\pst@coor}{\tx@InitPnode}% \ignorespaces} % +\def\pnodes{\@ifnextchar[{\pnodes@i}{\pnodes@i[0,0]}} +\def\pnodes@i[#1]{\@ifnextchar({\psnodes@ii[#1]}{\pnodes@ii}} +\def\psnodes@ii[#1](#2)#3{% + \pnode[#1](#2){#3}% + \@ifnextchar({\psnodes@ii[#1]}{}% +} +% \def\tx@InitCnode{InitCnode } \def\cnode{\pst@object{cnode}} \def\cnode@i{\@ifnextchar({\cnode@ii}{\cnode@ii(0,0)}} @@ -1607,7 +1616,7 @@ end }}% % Use to construct a sequence of nodes % Eg, \pnodes{P}(0,1)(2;5)(3,4) defines nodes P0, P1, P2 with respective locations % and a macro \Pnodecount containing the highest index created -\def\pnodes#1{\getnodelist{#1}{}} +\def\pnodes@ii#1{\getnodelist{#1}{}} % \def\getnodelist#1#2{% \pst@args=0 \relax% |