summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Changes1
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Changes.generic3
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-doc.cls11
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news10.pdfbin275762 -> 276474 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news10.tex16
-rw-r--r--Master/texmf-dist/dvips/pstricks/pstricks.pro2
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex101
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds67
8 files changed, 111 insertions, 90 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes b/Master/texmf-dist/doc/generic/pstricks/Changes
index bd20916eba8..bc99d21eb73 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes
@@ -1,3 +1,4 @@
+2010-05-15 - extensions to pst-doc.cls v 0.15
2010-01-04 - extensions to pst-doc.cls v 0.14
2009-12-08 - extensions to pst-doc.cls
v 0.11 (package paralist)
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
index 3c4c5c81a28..8293a2c41c1 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.07 2010-05-24 - fix bug with uput and node setting (ms)
+2.06 2010-04-27 - fix bug with trailing space in \pst@isnum
2.05 2010-04-26 - fix bug with missing \psk@rot for Ellipse
2.04 2010-04-24 - take \psk@rot into account for \psellipse (hv)
- new version of \pst@divide (ms)
@@ -90,6 +92,7 @@ pstricks.tex --------
1.06 2005-02-24 fix spurious blank in doublestroke (hv)
pst-fp.tex ----------- (hv)
+ v 0.06 2010-05-14 delete catcode change of @
v 0.05 2010-01-17 add \pst@Int
add \pst@int
v 0.04 2009-11-24 add \pstFPadd
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-doc.cls b/Master/texmf-dist/doc/generic/pstricks/pst-doc.cls
index 7092709bab3..c44d5983d24 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 298 2010-03-13 08:46:53Z herbert $
+% $Id: pst-doc.cls 327 2010-05-24 15:54:43Z herbert $
%
%%
%% The PSTricks Project
@@ -15,7 +15,7 @@
%%
%
\listfiles
-\ProvidesClass{pst-doc}[2010/01/04 v 0.14 PSTricks documentation class (hv)]
+\ProvidesClass{pst-doc}[2010/05/15 v 0.15 PSTricks documentation class (hv)]
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}}
\ProcessOptions\relax
%
@@ -300,6 +300,13 @@
\def\Lkeyset@i#1=#2\@nil{\texttt{#1=#2}%
\index{#1@\texttt{#1}}\index{Keyword!#1@\texttt{#1}}
\index{#2@\texttt{#2}}\index{Value!#2@\texttt{#2}}}
+%
+\def\xLKeyset#1{\expandafter\xLKeyset@i#1\@nil}% without using the right value of =
+\def\xLKeyset@i#1=#2\@nil{\index{#1@\texttt{#1}}\index{Keyword!#1@\texttt{#1}}}
+\def\LKeyset#1{\expandafter\LKeyset@i#1\@nil}
+\def\LKeyset@i#1=#2\@nil{\texttt{#1=#2}%
+ \index{#1@\texttt{#1}}\index{Keyword!#1@\texttt{#1}}}
+%
\newcommand\Larg [1]{{\normalfont\itshape#1\/}}
\newcommand\Larga[1]{$\langle$\Larg{#1}$\rangle$}% angles
\newcommand\Largb[1]{\lcb\Larg{#1}\rcb} % curly brace
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news10.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news10.pdf
index f46de193fc9..06c0916ace6 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news10.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news10.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news10.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news10.tex
index aaec792c227..0b03716b562 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news10.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news10.tex
@@ -4,7 +4,7 @@
\listfiles
\let\Lfile\LFile
\usepackage[utf8]{inputenc}
-\usepackage{pst-plot}
+\usepackage{pstricks,pst-plot,xkvview}
\let\pstplotFV\fileversion
\let\pstplotFD\filedate
\usepackage{pst-eucl,pst-func}
@@ -60,7 +60,7 @@ No changes
To rotate an ellipse the already existing keyword \Lkeyword{rot} can be
used. This is easier than using the \Lcs{rput} command and its optional
argument for rotating.
-
+\xLkeyword{rot}\xLkeyword{vlines}\xLkeyword{linecolor}
\begin{LTXexample}[width=6cm,wide=true]
\psset{unit=0.25}
\begin{pspicture}(-1,5)(20,18)
@@ -84,13 +84,13 @@ argument for rotating.
\end{pspicture}
\end{LTXexample}
-\subsection{Macro \nxLcs{psellipticarc}}
+\subsection{Macro \nxLcs{psellipticarc}}\xLcs{psellipticarc}
In a circle the angle is proportional to the bow: $b=r\alpha$. In an
elliptic arc this is no more the case, which is the reason why angles are
internally corrected by PSTricks, to get the same arc lengthts for
different radii:
-\xLcs{psellipticarc}
+\xLcs{psellipticarc}\xLkeyword{
\begin{LTXexample}[width=6cm]
\psset{unit=0.5cm}
\begin{pspicture}(-5.5,-5.5)(5.5,5.5)%
@@ -737,6 +737,14 @@ why it moved from the base into the contrib sections, where all packages uses \L
The package \LPack{pst-plot} now uses the advanced key handling from \LPack{xkeyval}. The reason
why it moved from the base into the contrib sections, where all packages uses \LPack{xkeyval}.
+
+\clearpage
+\section{List of all optional arguments for \texttt{pstricks}}
+
+\xkvview{family=pstricks,columns={key,type,default}}
+
+
+
\nocite{*}
\bibliographystyle{plain}
\bibliography{PSTricks}
diff --git a/Master/texmf-dist/dvips/pstricks/pstricks.pro b/Master/texmf-dist/dvips/pstricks/pstricks.pro
index ae1517ef5ab..18aeacb6052 100644
--- a/Master/texmf-dist/dvips/pstricks/pstricks.pro
+++ b/Master/texmf-dist/dvips/pstricks/pstricks.pro
@@ -1,4 +1,4 @@
-% $Id: pstricks.pro 266 2010-01-22 14:45:23Z herbert $
+% $Id: pstricks.pro 327 2010-05-24 15:54:43Z herbert $
%
%% PostScript prologue for pstricks.tex.
%% Version 1.07, 2009/04/30
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index e46fe6e679b..52d3f97566e 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -65,8 +65,8 @@
\pst@addfams{pstricks}
\ifx\PSTFPloaded\endinput\else \input pst-fp.tex\fi
%
-\def\fileversion{2.05}
-\def\filedate{2010/04/26}
+\def\fileversion{2.07}
+\def\filedate{2010/05/24}
%
% stolen from latex.ltx to make it TeX compatible
\newcount\psLoopIndex
@@ -246,15 +246,14 @@
\fi%
}
\def\pst@getydimdim#1 #2 #3\@nil{%
- \def\pst@tempA{#2}
+ \def\pst@tempA{#2}%
\ifx\pst@tempA\@empty
- \pssetylength\pst@dimn{#1}
- \pst@dimm=\z@
+ \pssetylength\pst@dimn{#1}%
+ \pst@dimm=\z@%
\else
\pssetylength\pst@dimm{#1}%
\pssetylength\pst@dimn{#2}%
- \fi%
-}
+ \fi}
%
% A modulo macro for integer values
% \pst@mod{34}{6}\value ==> \value is 4
@@ -1987,10 +1986,8 @@
\newpsfontdotH{Bpentagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(P)}{(q)}
\newpsfontdot{pentagon*}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(q)}
% DG/SR modification begin - Mar. 18, 1997 and Dec. 16, 1999 - Patch 14
-%\newpsfontdot{diamond*}%
-%[1.9 0.0 0.0 1.9 -0.4598 -0.70775]{Symbol}{<E0>}
-%\newpsfontdot{diamond}%
-%[2.3 0.0 0.0 2.3 -0.8533 -0.5336]{Symbol}{<A8>}
+%\newpsfontdot{diamond*}[1.9 0.0 0.0 1.9 -0.4598 -0.70775]{Symbol}{<E0>}
+%\newpsfontdot{diamond}[2.3 0.0 0.0 2.3 -0.8533 -0.5336]{Symbol}{<A8>}
% D.G. modification begin - Jan. 17, 2000
\newpsfontdotH{diamond}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(d)}{(l)}
\newpsfontdotH{Bdiamond}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(D)}{(l)}
@@ -2071,7 +2068,7 @@
}
\def\psline@ii{%
\ifx\pslinestyle\psls@@symbol\addto@pscode{ \psls@symbol SymbolLine }%
- \else
+ \else%
\addto@pscode{
\pst@cp % current point
\psline@iii % arc and lineto type
@@ -2080,7 +2077,7 @@
\fi%
\end@OpenObj%
}
-\def\psline@iii{%
+\def\psline@iii{
\ifdim\pslinearc>\z@
/r \pst@number\pslinearc def
/Lineto { \tx@Arcto } def
@@ -2093,24 +2090,25 @@
%
\def\pst@isnum#1{\pst@isnum@i\zap@space#1 \@empty\@nil}%
\def\pst@isnum@i#1\@nil{%
- \if!\ifnum9<1#1!\else_\fi
- \expandafter\@firstoftwo
- \else
- \expandafter\@secondoftwo
- \fi
-}
+ \if!\ifnum9<1#1!\else_\fi%
+ \expandafter\@firstoftwo%
+ \else%
+ \expandafter\@secondoftwo%
+ \fi}
+%
\def\psset@@symbol#1#2#3#4\@nil{%
\ifx\relax#4\relax\def\psk@symbol{(#1)}%
- \else
+ \else%
\pst@isnum{#1#2#3}{%
- \pst@cnta='#1#2#3\relax
- \ifnum\pst@cnta>'377\relax
- \@pstrickserr{Number too large!}\@ehpb
- \else
+ \pst@cnta='#1#2#3\relax%
+ \ifnum\pst@cnta>'377\relax%
+ \@pstrickserr{Number too large!}\@ehpb%
+ \else%
\def\psk@symbol{(\@backslashchar#1#2#3)}%
\fi%
- }{\@pstrickserr{Not a number!}\@ehpb}
+}{\@pstrickserr{Not a number!}\@ehpb}%
\fi}
+%
\define@key[psset]{pstricks}{symbol}[a]{\expandafter\psset@@symbol#1!!\@nil}
\psset[pstricks]{symbol=a}
%
@@ -3474,23 +3472,21 @@ pop
\pst@rotate\psk@rot\pst@hbox%
\psput@{#1}\pst@hbox%
\endgroup%
- \ignorespaces%
-}
+ \ignorespaces}
+%
\def\multirput{%
\def\pst@par{}%
- \pst@ifstar{\@ifnextchar[{\multirput@i}{\multirput@ii}}%
-}
+ \pst@ifstar{\@ifnextchar[{\multirput@i}{\multirput@ii}}}
\def\multirput@i[#1]{\addto@par{ref={#1}}\multirput@ii}
\def\multirput@ii{\@ifnextchar({\multirput@iv}{\multirput@iii}}
\def\multirput@iii#1{\addto@par{rot={#1}}\multirput@iv}
\def\multirput@iv(#1){%
- \@ifnextchar({\multirput@v(#1)}{\multirput@v(\z@,\z@)(#1)}%
-}
+ \@ifnextchar({\multirput@v(#1)}{\multirput@v(\z@,\z@)(#1)}}
\def\multirput@v(#1,#2)(#3,#4)#5{%
- \pst@makebox{\multirput@vi(#1,#2)(#3,#4){#5}}%
-}
+ \pst@makebox{\multirput@vi(#1,#2)(#3,#4){#5}}}
\def\multirput@vi(#1,#2)(#3,#4)#5{%
- \pst@killglue
+ \pst@killglue%
+ \global\psLoopIndex=\@ne\relax
\begingroup
\use@par
\if@star\pst@starbox\fi
@@ -3501,7 +3497,6 @@ pop
\pssetxlength\pst@dimc{#3}%
\pssetylength\pst@dimd{#4}%
\pst@cntg=#5\relax
- \pst@cnth=\@ne
\leavevmode
\loop
\vbox to \z@{%
@@ -3509,12 +3504,12 @@ pop
\hbox to \z@{\kern\pst@dima\copy\pst@hbox\hss}%
\vskip\pst@dimb%
}%
- \ifnum\pst@cntg>\pst@cnth
+ \ifnum\pst@cntg>\psLoopIndex
\advance\pst@dima\pst@dimc
\advance\pst@dimb\pst@dimd
- \advance\pst@cnth\@ne
+ \global\advance\psLoopIndex by \@ne
\repeat
- \endgroup
+ \endgroup
\ignorespaces%
}
\newif\if@fixedradius
@@ -3546,15 +3541,31 @@ pop
\psset[pstricks]{labelsep=5pt}
\define@key[psset]{pstricks}{refangle}[0]{\pst@expandafter\psset@@refangle{#1}\@nil}
\def\psset@@refangle#1\@nil{%
- \def\ps@next##1@#1=##2"##3@##4\@nil{%
+ \def\next##1@#1=##2"##3@##4\@nil{%
\ifx\relax##2%
\pst@getangle{#1}\psk@refangle
\def\psk@uputref{}%
\else
\def\psk@refangle{##2 }%
\def\psk@uputref{##3}%
- \fi}%
- \expandafter\ps@next\pst@refangletable @#1=\relax"@\@nil}
+ \fi%
+ \pst@Verb{ gsave STV CP T /ps@refangle \psk@refangle\space def grestore }}%ADDED (MJS)
+%
+\expandafter\next\pst@refangletable @#1=\relax"@\@nil}
+% Fix \uput@vii
+\def\uput@vii#1#2{%
+ \edef\pst@coor{%
+ \pst@number\pslabelsep
+ #2%
+ \pst@number{\wd\pst@hbox}%
+ \pst@number{\ht\pst@hbox}%
+ \pst@number{\dp\pst@hbox}%
+ ps@refangle % CHANGED (MJS) FROM \psk@refangle\space
+ \ifx\psk@rot\@empty\else\psk@rot\space sub \fi
+ \tx@Uput #1}%
+ \setbox\pst@hbox=\hbox to\z@{\hss\vbox to\z@{\vss\box\pst@hbox\vss}\hss}%
+ \setbox\pst@hbox=\psput@special\pst@hbox
+ \ifx\psk@rot\@empty\else\pst@rotate\psk@rot\pst@hbox\fi}
%
\def\pst@refangletable{%
@r=0"20%
@@ -3593,17 +3604,19 @@ pop
\ifx\psk@rot\@empty\expandafter\uput@viii\psk@uputref%
\else\uput@vii\tx@UUput{}\fi%
\fi}
+% Fix \uput@vii
\def\uput@vii#1#2{%
\edef\pst@coor{
\pst@number\pslabelsep
- #2%
+ #2
\pst@number{\wd\pst@hbox}
\pst@number{\ht\pst@hbox}
\pst@number{\dp\pst@hbox}
- \psk@refangle\space \ifx\psk@rot\@empty\else\psk@rot\space sub \fi
+ ps@refangle % CHANGED (MJS) FROM \psk@refangle\space
+ \ifx\psk@rot\@empty\else\psk@rot\space sub \fi
\tx@Uput #1}%
\setbox\pst@hbox=\hbox to\z@{\hss\vbox to\z@{\vss\box\pst@hbox\vss}\hss}%
- \setbox\pst@hbox=\psput@special\pst@hbox%
+ \setbox\pst@hbox=\psput@special\pst@hbox
\ifx\psk@rot\@empty\else\pst@rotate\psk@rot\pst@hbox\fi}
%
\def\uput@viii#1#2{%
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index b12a2d20c97..ec19b0516c3 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -2781,46 +2781,35 @@ sub MAKEseminar {
}
sub MAKExypic {
-# this simply copies source files as per INSTALL instructions
- chdir($packagedir) || die ("ERROR: cannot open directory");
- &runjob("mkdir -p $DEST/fonts/source/$Foundry/xypic");
- &runjob("mkdir -p $DEST/fonts/type1/$Foundry/xypic");
- &runjob("mkdir -p $DEST/fonts/tfm/$Foundry/xypic");
- &runjob("mkdir -p $DEST/fonts/pk/cx/$Foundry/xypic");
- &runjob("mkdir -p $DEST/tex/generic/xypic");
- &runjob("mkdir -p $DEST/dvips/xypic");
- &runjob("mkdir -p $DEST/doc/generic/xypic");
- &runjob("mkdir -p $DEST/source/generic/xypic");
- &runjob("$CP texinputs/* $DEST/tex/generic/xypic");
- &runjob("$CP texfonts/* $DEST/fonts/tfm/$Foundry/xypic");
- &runjob("$CP mfinputs/* $DEST/fonts/source/$Foundry/xypic");
- &runjob("$CP src/* $DEST/doc/generic/xypic");
- &runjob("$CP type1/* $DEST/fonts/type1/$Foundry/xypic");
- &runjob("$CP ps/* $DEST/dvips/xypic");
- &runjob("$CP doc/*.* $DEST/doc/generic/xypic");
- &runjob("$CP [A-Z]* $DEST/doc/generic/xypic");
- open (TMP,">$DEST/texmf-dist/dvips/xypic/config.xyp");
+ # Copy source files as per INSTALL instructions.
+ &xchdir ($packagedir);
+ &SYSTEM ("mkdir -p $DEST/doc/generic/xypic");
+ &SYSTEM ("$CP [A-Z]* $DEST/doc/generic/xypic/");
+ &SYSTEM ("$CP doc/*.* $DEST/doc/generic/xypic");
+ &SYSTEM ("$CP support/ $DEST/doc/generic/xypic"); # copy dir as dir
+ #
+ &SYSTEM ("mkdir -p $DEST/tex/generic/xypic");
+ &SYSTEM ("$CP texinputs/* $DEST/tex/generic/xypic/");
+ #
+ &SYSTEM ("mkdir -p $DEST/fonts/tfm/$Foundry/xypic");
+ &SYSTEM ("$CP texfonts/* $DEST/fonts/tfm/$Foundry/xypic/");
+ #
+ &SYSTEM ("mkdir -p $DEST/fonts/afm/$Foundry/xypic");
+ &SYSTEM ("$CP texfonts/* $DEST/fonts/afm/$Foundry/xypic/");
+ #
+ &SYSTEM ("mkdir -p $DEST/fonts/source/$Foundry/xypic");
+ &SYSTEM ("$CP mfinputs/* $DEST/fonts/source/$Foundry/xypic/");
+ #
+ &SYSTEM ("mkdir -p $DEST/fonts/type1/$Foundry/xypic");
+ &SYSTEM ("$CP type1/* $DEST/fonts/type1/$Foundry/xypic/");
+ &SYSTEM ("$CP pfm/* $DEST/fonts/type1/$Foundry/xypic/");
+ #
+ &SYSTEM ("mkdir -p $DEST/dvips/xypic");
+ &SYSTEM ("$CP ps/* $DEST/dvips/xypic/");
+ #
+ open (TMP,">$DEST/texmf-dist/dvips/xypic/config.xyp");
print TMP "p +xypic.map";
- close(TMP);
-# do the PK files
- chdir("pkfonts");
- &buildfilelist;
- for (@filenames) {
- if (-d $_) {
- chdir $_;
- s/cx([0-9]*)//;
- $dpi=$1;
- opendir(DIR,'.');
- @ffontnames =grep(!/^\.\.?$/,readdir(DIR));
- closedir(DIR);
- for (@ffontnames) {
-($FileBase,$Filepath,$Filesuffix) = fileparse($_,"\.[A-z0-9]*");
- &SYSTEM("mkdir -p $DEST/fonts/pk/cx/$Foundry/xypic/dpi$dpi");
- &SYSTEM("$MV $_ $DEST/fonts/pk/cx/$Foundry/xypic/dpi$dpi/$FileBase.pk");
- }
- chdir '..';
- }
- }
+ close (TMP);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-07 01:58:25 +0000