diff options
author | Karl Berry <karl@freefriends.org> | 2013-09-18 22:21:57 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-09-18 22:21:57 +0000 |
commit | 5ad7dc311f361321a959e40505240a7d1b5e5cd2 (patch) | |
tree | b0ab8e4fffb365b2c8e2b6ad6aa90a17b7f28dc6 /Master | |
parent | 8ac45c5be673550f6acde3143493cb92d34b04a7 (diff) |
pst-node (18sep13)
git-svn-id: svn://tug.org/texlive/trunk@31694 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-node/Changes | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-node/more_docs/Makefile | 53 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.bib (renamed from Master/texmf-dist/doc/generic/pst-node/more_docs/psmatrix-docDE.bib) | 0 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.pdf (renamed from Master/texmf-dist/doc/generic/pst-node/more_docs/psmatrix-docDE.pdf) | bin | 207607 -> 207607 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.tex (renamed from Master/texmf-dist/doc/generic/pst-node/more_docs/psmatrix-docDE.tex) | 0 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-node/pst-node-doc.pdf | bin | 548107 -> 548122 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/generic/pst-node/Makefile | 99 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pst-node/pst-node.tex | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pst-node/pst-node97.tex (renamed from Master/texmf-dist/doc/generic/pst-node/pst-node97.tex) | 0 | ||||
-rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 63 |
10 files changed, 39 insertions, 186 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-node/Changes b/Master/texmf-dist/doc/generic/pst-node/Changes index 2e391b1bf39..ee5be9abfb3 100644 --- a/Master/texmf-dist/doc/generic/pst-node/Changes +++ b/Master/texmf-dist/doc/generic/pst-node/Changes @@ -1,7 +1,9 @@ ----- pst-node.tex +1.30 2013-09-17 - use \expandafter with \nodexn for the first argument 1.29 2013-07-13 - fix bug with missing angle in special node coordinates - fix for fnpnodes (argument must be in {}) + - fix typo in the documentation 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 diff --git a/Master/texmf-dist/doc/generic/pst-node/more_docs/Makefile b/Master/texmf-dist/doc/generic/pst-node/more_docs/Makefile deleted file mode 100644 index 54dff4a12f4..00000000000 --- a/Master/texmf-dist/doc/generic/pst-node/more_docs/Makefile +++ /dev/null @@ -1,53 +0,0 @@ - -# `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.bib b/Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.bib index f2a5d82e847..f2a5d82e847 100644 --- a/Master/texmf-dist/doc/generic/pst-node/more_docs/psmatrix-docDE.bib +++ b/Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.bib diff --git a/Master/texmf-dist/doc/generic/pst-node/more_docs/psmatrix-docDE.pdf b/Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.pdf Binary files differindex bef4b6ce1f2..bef4b6ce1f2 100644 --- a/Master/texmf-dist/doc/generic/pst-node/more_docs/psmatrix-docDE.pdf +++ b/Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.pdf diff --git a/Master/texmf-dist/doc/generic/pst-node/more_docs/psmatrix-docDE.tex b/Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.tex index 8317ba5f809..8317ba5f809 100644 --- a/Master/texmf-dist/doc/generic/pst-node/more_docs/psmatrix-docDE.tex +++ b/Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.tex 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 7e3bf7948ef..81b855418b8 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/source/generic/pst-node/Makefile b/Master/texmf-dist/source/generic/pst-node/Makefile deleted file mode 100644 index 6eefe58c02d..00000000000 --- a/Master/texmf-dist/source/generic/pst-node/Makefile +++ /dev/null @@ -1,99 +0,0 @@ - -# `Makefile' for `pst-node-doc.pdf', hv, 2010/01/22 - -.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps - -PACKAGE = pst-node - -MAIN = $(PACKAGE)-doc - -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 ctan clean - -doc: $(MAIN).pdf - -$(MAIN).pdf : $(MAIN).ps - GS_OPTIONS=-dAutoRotatePages=/None ps2pdf $< -# echo "\documentclass[a4paper]{article}" > temp.tex -# echo "\usepackage{pdfpages}" >> temp.tex -# echo "\begin{document}" >> temp.tex -# echo "\includepdf[pages=1-4]{pst-node-doc}" >> temp.tex -# echo "\includepdf[pages=6-32]{pst-docfull}" >> temp.tex -# echo "\includepdf[pages=5-]{pst-node-doc}" >> temp.tex -# echo "\end{document}" >> temp.tex -# pdflatex temp -# mv temp.pdf pst-node-doc.pdf - -$(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) - -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/ -# - cp -u Changes $(TDS)/doc/generic/$(PACKAGE)/ - cp -u README $(TDS)/doc/generic/$(PACKAGE)/ - cp -u $(MAIN).pdf $(TDS)/doc/generic/$(PACKAGE)/ -# - cp -u Changes $(TDS)/tex/latex/$(PACKAGE)/ - cp -u $(PACKAGE).sty $(TDS)/tex/latex/$(PACKAGE)/ -# - cp -u Changes $(TDS)/tex/generic/$(PACKAGE)/ - cp -u $(PACKAGE).tex $(TDS)/tex/generic/$(PACKAGE)/ - cp -u $(PACKAGE)97.tex $(TDS)/tex/generic/$(PACKAGE)/ -# - cp -u Changes $(TDS)/dvips/$(PACKAGE)/ - cp -u $(PACKAGE).pro $(TDS)/dvips/$(PACKAGE)/ - cp -u $(PACKAGE)97.pro $(TDS)/dvips/$(PACKAGE)/ -# - cp -u Changes $(TDS)/source/$(PACKAGE)/ - cp -u $(MAIN).tex $(TDS)/source/$(PACKAGE)/ - cp -u $(MAIN).bib $(TDS)/source/$(PACKAGE)/ - cp -u Makefile $(TDS)/source/$(PACKAGE)/ - - -# EOF 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 fe30a091034..51118e48a61 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 807 2013-07-13 11:27:34Z herbert $ +% $Id: pst-node.tex 824 2013-09-17 18:19:38Z 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.29} -\def\filedate{2013/07/13} +\def\fileversion{1.30} +\def\filedate{2013/09/17} \message{ v\fileversion, \filedate} % \edef\TheAtCode{\the\catcode`\@} @@ -1479,7 +1479,7 @@ tx@NodeDict \pst@tempg known % \def\nodexn#1#2{% %#1=node expression | #2=node name -\hasparen#1(\@nil% +\expandafter\hasparen#1(\@nil%%% hv 20130917 use \expandafter \if@paren%it's an expression \pnode(0,0){@TMP0}% \pst@argcnt=0% diff --git a/Master/texmf-dist/doc/generic/pst-node/pst-node97.tex b/Master/texmf-dist/tex/generic/pst-node/pst-node97.tex index 5df456f3d0b..5df456f3d0b 100644 --- a/Master/texmf-dist/doc/generic/pst-node/pst-node97.tex +++ b/Master/texmf-dist/tex/generic/pst-node/pst-node97.tex diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 200c67226e8..2fe1dfe19a6 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -4514,39 +4514,42 @@ sub MAKEbeebe { # pstricks packages usually support both plain and latex. # sub MAKEpst { - print "\t SPECIAL pst $package starts\n"; - # pst-laboObj.tex and pst-fp.sty need special cases: - $standardtex = qq!^(($package(Obj)?)|pst-fp)\.(tex|sty)!; - $whichformat='generic'; - $whichdocformat='generic'; - $specialsourcefmt{$package}='generic'; - $specialsource{$package} = "Makefile|$standardsource"; - &setup; - &xchdir("$DEST/doc/$whichdocformat/$package"); - &buildfilelist; + print "\t SPECIAL pst $package starts\n"; + # pst-laboObj.tex and pst-fp.sty need special cases: + $standardtex = qq!^(($package(Obj)?)|pst-fp)\.(tex|sty)!; + $whichformat='generic'; + $whichdocformat='generic'; + $specialsourcefmt{$package}='generic'; + $specialsource{$package} = "Makefile|$standardsource"; + &setup; + &xchdir("$DEST/doc/$whichdocformat/$package"); + &buildfilelist; - $inspatt=$standardins if ! $inspatt; - &runins($inspatt); - &buildfilelist; - &dosource; - &dotex; - &dotype1; - &killfiles ($standardclean); - &killfiles ($moreclean{$package}, "more") if $moreclean{$package}; + $inspatt=$standardins if ! $inspatt; + &runins($inspatt); + &buildfilelist; + &dosource; + &dotex; + &dotype1; + &killfiles ($standardclean); + &killfiles ($moreclean{$package}, "more") if $moreclean{$package}; - &xmkdir ("$DEST/tex/latex/$package"); - - my @plain = glob ("tex/*"); - &SYSTEM("$MV @plain $DEST/tex/generic/$package") if @plain; - - my @sty = glob ("$DEST/tex/generic/$package/*sty"); - push (@sty, "latex/*"); # in case the source has a subdir - &SYSTEM("$MV @sty $DEST/tex/latex/$package") if @sty; - - my @cfg = glob ("$DEST/doc/generic/$package/*cfg"); - @cfg = () if $package eq "pst-pad"; # its showexpl.cfg is for the doc - &SYSTEM("$MV @cfg $DEST/tex/latex/$package") if @cfg; + my @cfg = glob ("$DEST/doc/generic/$package/*cfg"); + @cfg = () if $package eq "pst-pad"; # its showexpl.cfg is for the doc + &mv_with_mkdir (@cfg, "$DEST/tex/latex/$package") if @cfg; + my @dvips = glob ("dvips/*"); + &mv_with_mkdir (@dvips, "$DEST/dvips/$package") if @dvips; + + my @plain = glob ("tex/*"); + &mv_with_mkdir (@plain, "$DEST/tex/generic/$package") if @plain; + + my @sty = glob ("$DEST/tex/generic/$package/*sty"); + push (@sty, "latex/*"); # in case the source has a subdir + &mv_with_mkdir (@sty, "$DEST/tex/latex/$package") if @sty; + + &SYSTEM("$MV doc/* .") if -d "doc"; + my $postaction = $posthook{$package}; eval ($postaction) if $postaction; } |