summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-09-07 23:28:42 +0000
committerKarl Berry <karl@freefriends.org>2011-09-07 23:28:42 +0000
commitc76b8f9c98a91aa1c2df880181f5812621fde162 (patch)
treef3673eeab52c4b93271989dacfb287a2df9c2875
parent04715721fccfb5ac8a8cf97eeb15bc0052fd3b78 (diff)
pstricks (6sep11)
git-svn-id: svn://tug.org/texlive/trunk@23858 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Changes.dvips1
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Changes.generic2
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Changes.latex1
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Makefile91
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/PSTricks.bib19
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/README1
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-doc.cls5
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news11.pdfbin52095 -> 89829 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news11.tex85
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data4
-rw-r--r--Master/texmf-dist/dvips/pstricks/pst-algparser.pro2
-rw-r--r--Master/texmf-dist/dvips/pstricks/pstricks.pro34
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex46
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pstricks.sty23
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
15 files changed, 270 insertions, 45 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.dvips b/Master/texmf-dist/doc/generic/pstricks/Changes.dvips
index 494941b02dc..14ec1bfdf2b 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.dvips
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.dvips
@@ -1,4 +1,5 @@
---- pstricks.pro
+1.08 2011-07-09 - added sibroutine DotFill
1.07 2010-04-30 - take \psk@rot into account for \psellipse
- new helper function concatstring
1.06 2009-01-30 - cosmetic changes to the code
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
index a9ff2dd41cd..10ed3f489ff 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.generic
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
@@ -1,4 +1,6 @@
pstricks.tex --------
+2.23 2011-09-04 - change also \psx|ylabelsep for pst-plot
+2.22 2011-07-09 - added fillstyle dots
2.21 2011-06-07 - fix bug with a trailing space in \psForeach
2.20 2011-04-23 - load pst-tools.pro
2.19 2011-03-25 - fixed a bug with missing coordinates for pspicture
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.latex b/Master/texmf-dist/doc/generic/pstricks/Changes.latex
index dd42099b01e..eb8f7da39ca 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.latex
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.latex
@@ -1,4 +1,5 @@
pstricks.sty --------
+0.51 2011-08-01 - revert test for pdflatex / lualatex
0.50 2011-04-23 - message for pst-tools.pro
0.49 2011-03-26 - test for pdflatex/lualatex
0.48 2010-11-26 - cgode changes
diff --git a/Master/texmf-dist/doc/generic/pstricks/Makefile b/Master/texmf-dist/doc/generic/pstricks/Makefile
new file mode 100644
index 00000000000..b08010d4072
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pstricks/Makefile
@@ -0,0 +1,91 @@
+# `Makefile' for `pst-news.pdf', hv, 2007/03/17
+
+.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps
+
+PACKAGE = pst-news$(shell date +%y)
+
+MAIN = $(PACKAGE)
+
+BASE = pstricks
+
+LATEX = latex
+
+TDS = ~/PSTricks/PSTricks-TDS
+
+ARCHNAME = $(MAIN)-$(shell date +%y%m%d)
+
+ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Changes Makefile
+
+all : doc 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 -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 .blg .Roessler .bbl )
+ $(RM) $(addprefix $(MAIN), .dvi .ps)
+
+veryclean : clean
+ $(RM) $(addprefix $(MAIN), .pdf .bbl .blg)
+
+arch :
+ zip $(ARCHNAME).zip $(ARCHFILES)
+
+tds:
+#################### base #########################
+ cp -u ../config/* ../.base/config/
+#
+ cp -u Changes ../.base/doc/
+ cp -u pst-doc.* ../.base/doc/
+ cp -u PSTricks.bib* ../.base/doc/
+ cp -u pst-news* ../.base/doc/
+ cp -u pst-user* ../.base/doc/
+ cp -u *.sty ../.base/doc/
+ cp -u pstricks-* ../.base/doc/
+ cp -u test* ../.base/doc/
+ cp -u images/* ../.base/doc/images/
+#
+ cp -u ../dvips/* ../.base/dvips/
+ cp -u ../generic/* ../.base/generic/
+ cp -u ../latex/* ../.base/latex/
+ cp -u ../README ../.base/
+#
+#################### TDS #########################
+ cp -u Changes $(TDS)/doc/generic/$(BASE)/
+ cp -u README $(TDS)/doc/generic/$(BASE)/
+ cp -u $(MAIN).pdf $(TDS)/doc/generic/$(BASE)/
+#
+ cp -u ../latex/Changes $(TDS)/tex/latex/$(BASE)/
+ cp -u ../latex/$(BASE).sty $(TDS)/tex/latex/$(BASE)/
+#
+ cp -u ../generic/Changes $(TDS)/tex/generic/$(BASE)/
+ cp -u ../generic/$(BASE).tex $(TDS)/tex/generic/$(BASE)/
+#
+ cp -u ../dvips/Changes $(TDS)/dvips/$(BASE)/
+# cp -u ../dvips/$(BASE).pro $(TDS)/dvips/$(BASE)/
+# cp -u ../dvips/$(BASE)97.pro $(TDS)/dvips/$(BASE)/
+ cp -u ../dvips/*.pro $(TDS)/dvips/$(BASE)/
+#
+ cp -u Changes $(TDS)/source/$(BASE)/
+ cp -u $(MAIN).tex $(TDS)/source/$(BASE)/
+# cp -u $(MAIN).bib $(TDS)/source/$(BASE)/
+ cp -u Makefile $(TDS)/source/$(BASE)/
+
+# EOF
diff --git a/Master/texmf-dist/doc/generic/pstricks/PSTricks.bib b/Master/texmf-dist/doc/generic/pstricks/PSTricks.bib
index eeefc35e22e..acc2521249d 100644
--- a/Master/texmf-dist/doc/generic/pstricks/PSTricks.bib
+++ b/Master/texmf-dist/doc/generic/pstricks/PSTricks.bib
@@ -13,7 +13,7 @@
Title = {PSTricks Support for pdf},
Author = {Herbert Voss},
Organization = {},
- Address = {\url{http://PSTricks.de/pdf/pdfoutput.phtml}},
+ Address = {\url{http://PSTricks.tug.org/main.cgi?file=pdf/pdfoutput}},
Note = {},
year = 2002,
}
@@ -88,6 +88,15 @@
address = {Heidelberg/Hamburg}
}
+@Book{PSTricksE,
+ author = {Herbert Vo\ss},
+ title = {\texttt{PSTricks} -- {G}raphics for \LaTeX},
+ edition = {1.},
+ publisher = {UIT},
+ year = {2011},
+ address = {Cambridge/UK}
+}
+
@Book{LaTeXRef,
author = {Herbert Vo\ss},
title = {\LaTeX\ Referenz},
@@ -96,3 +105,11 @@
year = {2010},
address = {Heidelberg/Hamburg}
}
+@Book{LaTeXRefE,
+ author = {Herbert Vo\ss},
+ title = {\LaTeX\ Quick Reference},
+ edition = {1.},
+ publisher = {UIT},
+ year = {2011},
+ address = {Cambridge/UK}
+}
diff --git a/Master/texmf-dist/doc/generic/pstricks/README b/Master/texmf-dist/doc/generic/pstricks/README
new file mode 100644
index 00000000000..4c4f3b989f5
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pstricks/README
@@ -0,0 +1 @@
+The Makefile generates the pdf file for pst-newsYY
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-doc.cls b/Master/texmf-dist/doc/generic/pstricks/pst-doc.cls
index fd3afb633cc..fe4e58f029e 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-doc.cls
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-doc.cls
@@ -1,4 +1,4 @@
-% $Id: pst-doc.cls 489 2011-04-23 09:25:08Z herbert $
+% $Id: pst-doc.cls 532 2011-07-09 13:02:57Z herbert $
%
%%
%% The PSTricks Project
@@ -73,7 +73,10 @@ DIV13]{scrartcl}
\makeindex
\RequirePackage{calc}
\RequirePackage{babel}
+\RequirePackage{xkeyval}
+\RequirePackage{pst-xkey}
\RequirePackage{pstricks}
+\RequirePackage{xkvview}
\let\pstricksFV\fileversion
\let\pstricksFD\filedate
\RequirePackage{multido}
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news11.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news11.pdf
index b21d8dfb5b0..d2539fd5e08 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news11.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news11.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news11.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news11.tex
index 5a4bb7a2ab8..e92598feb39 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news11.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news11.tex
@@ -4,10 +4,10 @@
\listfiles
\let\Lfile\LFile
\usepackage[utf8]{inputenc}
-\usepackage{pstricks,pst-plot,xkvview}
-\let\pstplotFV\fileversion
-\let\pstplotFD\filedate
-\usepackage{pst-eucl,pst-func}
+\usepackage{pst-node}
+\usepackage{xkvview}
+\let\pstnodeFV\fileversion
+\let\pstnodeFD\filedate
\renewcommand\bgImage{\psscalebox{15}{\color{blue!20}2011}}
\def\textat{\char064}
\lstset{explpreset={pos=l,width=-99pt,overhang=0pt,hsep=\columnsep,vsep=\bigskipamount,rframe={}},
@@ -15,7 +15,7 @@
\begin{document}
%\psset{PstDebug=1}
-\title{\texttt{News -- 2010}\\ \Large new macros and bugfixes for the
+\title{\texttt{News -- 2011}\\ \Large new macros and bugfixes for the
basic package \nxLFile{pstricks}}
\author{Herbert Voß}
\date{\today}
@@ -83,26 +83,97 @@ However, the internal \TeX\ counter \Lctr{psLoopIndex} can be used for own purpo
\end{pspicture}
\end{LTXexample}
+\subsection{New fillstyle \texttt{dots}}
+Instead of using the package \LPack{pst-fill} one can now use the fill style \Lkeyval{dots}.
+The valid parameters are \Lkeyword{hatchsep} for the distance of two dots, \Lkeyword{hatchwidth}
+for the radius of the filled dot, and \Lkeyword{hatchcolor} for the dot color.
+
+\begin{LTXexample}[pos=t]
+\begin{pspicture}(-2,-2)(10,2)
+\pscircle[hatchcolor=gray,hatchsep=10pt,hatchwidth=3pt,fillstyle=dots]{2}
+\pscircle[hatchcolor=gray,hatchsep=10pt,hatchwidth=3pt,fillstyle=dots*](4,0){2}
+\psframe[hatchcolor=blue!30,linecolor=red,hatchsep=12pt,hatchwidth=4pt,
+ fillstyle=dots*](6,-2)(10,2)
+\end{pspicture}
+\end{LTXexample}
+
%--------------------------------------------------------------------------------------
\section{The PostScript header files}
\subsection{\nxLFile{pstricks.pro}}
%--------------------------------------------------------------------------------------
+There is a new subroutine \Lps{DotFill}:
+\begin{lstlisting}
+
+/DotFill {% on stack: dot radius
+ /dotRadius ED
+ abs CLW add /a ED
+ a 0 dtransform round exch round exch
+ 2 copy idtransform
+ exch Atan rotate
+ idtransform pop /a ED
+ .25 .25 itransform
+ pathbbox % llx lly urx ury of smallest bounding box
+ /y2 ED /x2 ED /y1 ED /x1 ED
+ y2 y1 sub a div 2 add cvi /Ny ED
+ x2 x1 sub a div 2 add cvi /Nx ED
+ clip
+ newpath
+ /yA y1 dotRadius add CLW add def
+ /xA0 x1 dotRadius add CLW add def
+ Ny {
+ /xA xA0 def
+ Nx {
+ newpath
+ xA yA dotRadius 0 360 arc
+ SolidDot { gsave fill grestore } if
+ stroke
+ xA a add /xA ED
+ } repeat
+ yA a add /yA ED
+ } repeat
+ grestore
+} def
+\end{lstlisting}
%--------------------------------------------------------------------------------------
-\subsection{\nxLFile{pst-algparser.pro}}
+%\subsection{\nxLFile{pst-algparser.pro}}
%--------------------------------------------------------------------------------------
-\section{\nxLcs{psforeach} and \nxLcs{psForeach}}
+%\section{\nxLcs{psforeach} and \nxLcs{psForeach}}
%--------------------------------------------------------------------------------------
\section{List of all optional arguments for \texttt{pstricks}}
+\makeatletter
\xkvview{family=pstricks,columns={key,type,default}}
+\makeatother
+
+
+\clearpage
+\part{Other packages}
+\section{\texttt{pst-node} -- version \pstnodeFV\ | \pstnodeFD}
+The command \Lcs{pnode} now knows an optional argument for an offset, which
+expects two values (x,y) separated by a comma:
+
+\begin{BDef}
+\Lcs{pnode}\OptArg*{\Largs{\Larga{offset}}}\Largr{\CAny}\Largb{\Larga{node name}}
+\end{BDef}
+\begin{LTXexample}[width=6cm]
+\begin{pspicture}[showgrid](0,-2)(6,2)
+\pnode{A}\psdot(A)\uput[90](A){A}
+\pnode[0,-2]{B}\psdot(B)\uput[90](B){B}
+\pnode(2,0){C}\psdot(C)\uput[90](C){C}
+\pnode[1,-2](2,0){D}\psdot(D)\uput[90](D){D}
+\pnode[2,2](3.5,0){E}\psdot(E)\uput[90](E){E}
+\end{pspicture}
+\end{LTXexample}
+
+\clearpage
\nocite{*}
\bibliographystyle{plain}
\bibliography{PSTricks}
diff --git a/Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data b/Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data
new file mode 100644
index 00000000000..8bd09389cc7
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data
@@ -0,0 +1,4 @@
+some nonsense in this line ---time forcex forcey
+0 0.2
+1 1
+2 4
diff --git a/Master/texmf-dist/dvips/pstricks/pst-algparser.pro b/Master/texmf-dist/dvips/pstricks/pst-algparser.pro
index b42cd0b5144..c9009a9f623 100644
--- a/Master/texmf-dist/dvips/pstricks/pst-algparser.pro
+++ b/Master/texmf-dist/dvips/pstricks/pst-algparser.pro
@@ -1,4 +1,4 @@
-% $Id: pst-algparser.pro 350 2010-06-18 05:18:55Z herbert $
+% $Id: pst-algparser.pro 532 2011-07-09 13:02:57Z herbert $
%%
%% PostScript prologue for PSTricks algorithm parser
%% Version 0.03, 2011/06/03
diff --git a/Master/texmf-dist/dvips/pstricks/pstricks.pro b/Master/texmf-dist/dvips/pstricks/pstricks.pro
index bf29b527ca0..7f7f985e95f 100644
--- a/Master/texmf-dist/dvips/pstricks/pstricks.pro
+++ b/Master/texmf-dist/dvips/pstricks/pstricks.pro
@@ -1,7 +1,7 @@
-% $Id: pstricks.pro 489 2011-04-23 09:25:08Z herbert $
+% $Id: pstricks.pro 532 2011-07-09 13:02:57Z herbert $
%
%% PostScript prologue for pstricks.tex.
-%% Version 1.07, 2009/04/30
+%% Version 1.08, 2011/07/09
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives
@@ -173,6 +173,36 @@ tx@Dict begin
grestore
pop pop } def
%
+/DotFill {% on stack: dot radius
+ /dotRadius ED
+ abs CLW add /a ED
+ a 0 dtransform round exch round exch
+ 2 copy idtransform
+ exch Atan rotate
+ idtransform pop /a ED
+ .25 .25 itransform
+ pathbbox % llx lly urx ury of smallest bounding box
+ /y2 ED /x2 ED /y1 ED /x1 ED
+ y2 y1 sub a div 2 add cvi /Ny ED
+ x2 x1 sub a div 2 add cvi /Nx ED
+ clip
+ newpath
+ /yA y1 dotRadius add CLW add def
+ /xA0 x1 dotRadius add CLW add def
+ Ny {
+ /xA xA0 def
+ Nx {
+ newpath
+ xA yA dotRadius 0 360 arc
+ SolidDot { gsave fill grestore } if
+ stroke
+ xA a add /xA ED
+ } repeat
+ yA a add /yA ED
+ } repeat
+ grestore
+} def
+%
/PenroseFill {% on stack: scaling factor
dup dup scale
1 exch div round /penroseFactor ED
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 157db5fb99a..9330cc4bab0 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -59,15 +59,17 @@
\endgroup
\def\endtabular{\crcr\egroup\egroup $\egroup}
\fi
+\catcode`\@=\PstAtCode\relax
%
% now we have all commands defined, for TeX and LaTeX
%
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey.tex \fi
-\pst@addfams{pstricks}
\ifx\PSTFPloaded\endinput\else \input pst-fp.tex\fi
%
-\def\fileversion{2.21}
-\def\filedate{2011/06/07}
+\def\fileversion{2.23}
+\def\filedate{2011/09/04}
+\catcode`\@=11\relax
+\pst@addfams{pstricks}
%
% stolen from latex.ltx to make it TeX compatible
\newcount\psLoopIndex
@@ -1121,6 +1123,7 @@
\psset[pstricks]{fsOrigin={0,0},fsAngle=137.50775}
%
\def\tx@LineFill{LineFill }
+\def\tx@DotFill{DotFill }
\def\tx@PenroseFill{PenroseFill }
\def\tx@TruchetFill{TruchetFill }
%
@@ -1164,6 +1167,17 @@
\pst@checknum{#1}\psk@psscale}
\psset[pstricks]{psscale=1}
%
+\def\pst@dotFill{%
+ gsave
+ \pst@number\pslinewidth SLW
+ \pst@usecolor\pshatchcolor
+% /DotLineColor { \pst@usecolor\pslinecolor } def
+ \psk@hatchsep
+ \psk@hatchwidth
+ \tx@DotFill }
+\def\psfs@dots{\pst@fill{ /SolidDot false def \pst@dotFill }}
+\@namedef{psfs@dots*}{\pst@fill{ /SolidDot true def \pst@dotFill }}
+%
\def\pst@penroseFill{%
gsave % restore in PenroseFill
\pst@number\pslinewidth SLW
@@ -3282,7 +3296,7 @@ pop
% the angle in the parameter equation is not proportional to the real angle!
% phi=atan(b*tan(angle)/a)+floor(angle/180+0.5)*180
\pst@tempc
- \ifPst@correctAngle
+ \ifPst@correctAngle
cvi 90 mod 0 eq { \pst@tempc }
{ rx ry \tx@UserCoor exch \pst@tempc tan mul exch atan
\pst@tempc 180 div .5 add floor 180 mul sub } ifelse
@@ -3338,17 +3352,21 @@ pop
rx ry scale
0 0 moveto
0 0 1
- \pst@tempc
+ \pst@tempc % start angle
\ifPst@correctAngle
cvi 90 mod 0 eq { \pst@tempc }
- { rx ry \tx@UserCoor exch \pst@tempc tan mul exch atan
- \pst@tempc 180 div .5 add floor 180 mul sub } ifelse
+ { rx abs ry abs sub cvi 0 eq { \pst@tempc }{ rx ry
+ \tx@UserCoor exch \pst@tempc tan mul exch atan
+ \pst@tempc 180 div 0.5 add floor
+ 180 mul sub } ifelse } ifelse
\fi
- \pst@tempd
+ \pst@tempd % end angle
\ifPst@correctAngle
cvi 90 mod 0 eq { \pst@tempd }
- { rx ry \tx@UserCoor exch \pst@tempd tan mul exch atan
- \pst@tempd 180 div .5 add floor 180 mul sub } ifelse
+ { rx abs ry abs sub cvi 0 eq { \pst@tempd } { rx ry
+ \tx@UserCoor exch \pst@tempd tan mul exch atan
+ \pst@tempd 180 div 0.5 add floor
+ 180 mul sub } ifelse } ifelse
\fi
\ifcase\psarc@type arc \or arcn \fi
closepath
@@ -3768,8 +3786,14 @@ pop
\def\Cput{\def\pst@par{}\pst@object{Cput}}
\def\Cput@i{\@fixedradiustrue\cput@ii}
\newdimen\pslabelsep
-\define@key[psset]{pstricks}{labelsep}[5pt]{\pssetlength\pslabelsep{#1}}
+\define@key[psset]{pstricks}{labelsep}[5pt]{%
+ \pssetlength\pslabelsep{#1}%
+ \ifx\PSTplotLoaded\endinput% Set labels for pst-plot, if laoded
+ \let\psxlabelsep\pslabelsep%
+ \let\psylabelsep\pslabelsep%
+ \fi}
\psset[pstricks]{labelsep=5pt}
+%
\define@key[psset]{pstricks}{refangle}[0]{\pst@expandafter\psset@@refangle{#1}\@nil}
\def\psset@@refangle#1\@nil{%
\def\next##1@#1=##2"##3@##4\@nil{%
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
index a4929534c78..f6d9bb48080 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
@@ -16,7 +16,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pstricks}
- [2011/04/23 v0.50 LaTeX wrapper for `PSTricks' (RN,HV)]
+ [2011/08/201 v0.51 LaTeX wrapper for `PSTricks' (RN,HV)]
%
\def\documentclass{%
\edef\@tempa{\jobname.tex }%
@@ -67,27 +67,6 @@
\fi
\fi
-\RequirePackage{ifpdf,ifluatex}
-
-\AtBeginDocument{%
- \ifpdf
- \ifluatex
- \def\pst@tempA{lualatex}
- \else
- \def\pst@tempA{pdflatex}
- \fi
- \@ifpackageloaded{pst-pdf}{}{%
- \@latex@error{%
- You have run the document with pdflatex, but PSTricks\MessageBreak
- requires latex->dvips->ps2pdf or alternatively the use\MessageBreak
- of the package `auto-pst-pdf'. Then you can run\MessageBreak
- \space\space`\pst@tempA\space -shell-escape <file>' (TeX Live)
- \MessageBreak or\MessageBreak
- \space\space`\pst@tempA\space -enable-write18 <file>' (MikTeX)}%
- {See also the PSTricks web pages http://PSTricks.tug.org}}%
- \fi
-}
-
\@ifundefined{PSTricksLoaded}
{%
\let\saved@scalebox\scalebox
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 129dcd2912a..74b81e6a2ab 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -434,6 +434,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'l2a', "die 'skipping, another old detex, requires compilation'",
'lamstex', "die 'skipping, old'",
'lamstex-index', "die 'skipping, old'",
+ 'labtable', "die 'skipping, nonfree w32 application'",
'latex-help-texinfo', "die 'skipping, use latex2e-help-texinfo'",
'latex-make', "die 'skipping, subprograms seem problematic'",
'latex_maker', "die 'skipping, we must not usurp two-character cmd name'",