From 456506ae0755c40002b59b0e8d43070e6739f68d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 11 Jun 2010 00:32:09 +0000 Subject: pst-node update (10jun10) git-svn-id: svn://tug.org/texlive/trunk@18880 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/pst-node/Changes | 1 + .../doc/generic/pst-node/more_docs/Makefile | 53 +++++++++++++++++++++ .../generic/pst-node/more_docs/psmatrix-docDE.pdf | Bin 221969 -> 207607 bytes .../generic/pst-node/more_docs/psmatrix-docDE.tex | 4 +- .../doc/generic/pst-node/pst-node-doc.pdf | Bin 286633 -> 286320 bytes .../doc/generic/pst-node/pst-node-doc.tex | 2 +- .../texmf-dist/tex/generic/pst-node/pst-node.tex | 50 +++++++++++++------ 7 files changed, 93 insertions(+), 17 deletions(-) create mode 100644 Master/texmf-dist/doc/generic/pst-node/more_docs/Makefile (limited to 'Master') diff --git a/Master/texmf-dist/doc/generic/pst-node/Changes b/Master/texmf-dist/doc/generic/pst-node/Changes index 479aba36645..b66bb5219e2 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.13 2010-06-06 - changed all *put macros for using pst@refangle 1.12 2010-04-30 - moved concatstring into the base pstricks.pro - fixed bug with nbput (ms) 1.11 2010-04-22 - modified version of \shownode (ms) diff --git a/Master/texmf-dist/doc/generic/pst-node/more_docs/Makefile b/Master/texmf-dist/doc/generic/pst-node/more_docs/Makefile new file mode 100644 index 00000000000..54dff4a12f4 --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-node/more_docs/Makefile @@ -0,0 +1,53 @@ + +# `Makefile' for `pst-node-doc.pdf', hv, 2010/01/22 + +.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps + +PACKAGE = psmatrix + +MAIN = $(PACKAGE)-docDE + +LATEX = latex + +ARCHNAME = $(MAIN)-$(shell date +%y%m%d) + +ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Changes Makefile + +TDS = ~/PSTricks/PSTricks-TDS + +all : doc clean +# clean +doc: $(MAIN).pdf + +$(MAIN).pdf : $(MAIN).ps + GS_OPTIONS=-dAutoRotatePages=/None ps2pdf $< + +$(MAIN).ps : $(MAIN).dvi + dvips $< + +$(MAIN).dvi : $(MAIN).tex + $(LATEX) $< + $(LATEX) $< + if ! test -f $(basename $<).glo ; then touch $(basename $<).glo; fi + if ! test -f $(basename $<).idx ; then touch $(basename $<).idx; fi + makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \ + $(basename $<).glo + makeindex -s pst-doc.ist -t $(basename $<).ilg -o $(basename $<).ind \ + $(basename $<).idx + bibtex $(basename $<) + $(LATEX) $< + $(LATEX) $< + +clean : + $(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out ) + $(RM) $(addprefix $(MAIN), .dvi .ps .blg .bbl) + rm temp* + +veryclean : clean + $(RM) $(addprefix $(MAIN), .pdf .bbl .blg) + +arch : + zip $(ARCHNAME).zip $(ARCHFILES) + + +# EOF diff --git a/Master/texmf-dist/doc/generic/pst-node/more_docs/psmatrix-docDE.pdf b/Master/texmf-dist/doc/generic/pst-node/more_docs/psmatrix-docDE.pdf index 0c45acff4ae..bef4b6ce1f2 100644 Binary files a/Master/texmf-dist/doc/generic/pst-node/more_docs/psmatrix-docDE.pdf and b/Master/texmf-dist/doc/generic/pst-node/more_docs/psmatrix-docDE.pdf differ diff --git a/Master/texmf-dist/doc/generic/pst-node/more_docs/psmatrix-docDE.tex b/Master/texmf-dist/doc/generic/pst-node/more_docs/psmatrix-docDE.tex index 0f74e8be6b1..8317ba5f809 100644 --- a/Master/texmf-dist/doc/generic/pst-node/more_docs/psmatrix-docDE.tex +++ b/Master/texmf-dist/doc/generic/pst-node/more_docs/psmatrix-docDE.tex @@ -10,7 +10,7 @@ \usepackage{pst-node,pst-grad,pstricks-add,pst-blur,float} \def\tab#1{\tabular{@{}l@{}}#1\endtabular} -\def\OptEinh{\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{[Einheit]}}\kern1pt} +\def\OptEinh{\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{Einheit}}\kern1pt} \let\myFV\fileversion @@ -49,7 +49,7 @@ \lstset{basicstyle=\ttfamily\footnotesize} \begin{document} -\author{Timothy van Zandt} +\author{Timothy van Zandt\\Herbert Vo\ss} \docauthor{Christine R\"omer} \date{\today} \title{Schematische \"Ubersichten mit \texttt{psmatrix}} 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 49fb95ab13c..cdeb13b1199 100644 Binary files a/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.pdf and b/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.pdf 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 c96035e847c..415e8094119 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 @@ -41,7 +41,7 @@ \begin{document} \title{\texttt{pst-node}\\Nodes and node connections% \\\small v.\pstFV} -\docauthor{Michael Sharpe\\Herbert Vo\ss} +%\docauthor{Michael Sharpe\\Herbert Vo\ss} \author{Timothy Van Zandt\\Michael Sharpe\\Herbert Vo\ss} \date{\today} 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 217630d9864..e233f5ab5d5 100644 --- a/Master/texmf-dist/tex/generic/pst-node/pst-node.tex +++ b/Master/texmf-dist/tex/generic/pst-node/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.11} -\def\filedate{2010/04/22} +\def\fileversion{1.13} +\def\filedate{2010/06/06} \message{ v\fileversion, \filedate} % \edef\TheAtCode{\the\catcode`\@} @@ -717,6 +717,7 @@ tx@Dict begin \psline@iii pop end \global\let\pst@tempg\psk@rot \endgroup \let\psk@nrot\pst@tempg} +% \def\psset@@nrot:#1\@nil{% \psset@@rot#1\@nil \edef\psk@rot{NAngle \ifx\psk@rot\@empty\else\psk@rot add \fi}} @@ -755,17 +756,21 @@ tx@Dict begin \psline@iii pop end \def\naput{\pst@object{naput}} \def\naput@i{\pst@killglue\pst@makebox{\naput@ii{NAngle 90 add}}} \def\naput@ii#1{% -\begingroup -\use@par -\if@star\pst@starbox\fi -\def\psk@refangle{#1 }% -\let\psk@rot\psk@nrot -\uput@vii -{exch pop add a \tx@PtoC h1 add exch w1 add exch }% -{tx@Dict /NCLW known { NCLW add } if }% -\ncput@iii -\endgroup -\pst@shortput} + \begingroup + \use@par + \if@star\pst@starbox\fi + \def\psk@refangle{#1 }% + \let\psk@rot\psk@nrot + \pst@Verb{ + gsave STV CP T /ps@refangle {#1 } def + /ps@rot { \psk@rot } def grestore }%ADDED (MJS) + \uput@vii + {exch pop add a \tx@PtoC h1 add exch w1 add exch }% + {tx@Dict /NCLW known { NCLW add } if }% + \ncput@iii + \endgroup + \pst@shortput} +% \def\nbput{\pst@object{nbput}} \def\nbput@i{\pst@killglue\pst@makebox{\naput@ii{NAngle 90 sub}}} \define@key[psset]{pst-node}{tpos}[0.5]{% @@ -952,7 +957,8 @@ tx@Dict begin \psline@iii pop end \if@star\pst@starbox\fi \Rput@vi \pst@makesmall\pst@hbox -\pst@rotate\psk@nrot\pst@hbox +\ifx\psk@rot\@empty\else\pst@rotate{ps@rot }\pst@hbox\fi% (MJS) +%\pst@rotate\psk@nrot\pst@hbox \ncput@iii \endgroup \pst@shortput} @@ -1500,6 +1506,21 @@ end }}% \expandafter\psline\@tmp}% \ignorespaces}% % +\def\shownode(#1){%display node user coords in console + \pst@killglue% + \pstVerb{ + gsave tx@Dict begin /tmpar [(Node #1: ) <28> () (, ) () <29>] def % + /str 10 string def + STV CP T \psGetNodeCenter{#1}\space + tmpar 2 #1.x str cvs put + /str 10 string def + tmpar 4 #1.y str cvs put + tx@NodeDict /N@#1 known { tmpar concatstringarray = }{(Node #1: (NOT KNOWN)) = } ifelse + end + grestore }% + \ignorespaces}% +% +\iffalse \def\shownode(#1){%display node user coords in console \pstVerb{ tx@Dict begin { STV CP T } exec % set scaling tx@NodeDict /N@#1 known { @@ -1510,6 +1531,7 @@ end }}% {(Node #1: (NOT KNOWN)) = } ifelse end }}% +\fi % % Use to construct a sequence of nodes % Eg, \pnodes{P}(0,1)(2;5)(3,4) defines nodes P0, P1, P2 with respective locations -- cgit v1.2.3