summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-01-22 23:08:34 +0000
committerKarl Berry <karl@freefriends.org>2014-01-22 23:08:34 +0000
commit887addec67791772af50974d5d9b89817f939102 (patch)
tree846b015d1ff648938cac1b733d96bc1f90e0986b /Master
parent1d327a27116c168598d1f7a40d299139a38ca792 (diff)
pstricks-add (22jan14)
git-svn-id: svn://tug.org/texlive/trunk@32760 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/pstricks-add/Changes5
-rw-r--r--Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdfbin5108590 -> 5108604 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex82
-rw-r--r--Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex11
4 files changed, 50 insertions, 48 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks-add/Changes b/Master/texmf-dist/doc/generic/pstricks-add/Changes
index 77fa2f6de97..34630794747 100644
--- a/Master/texmf-dist/doc/generic/pstricks-add/Changes
+++ b/Master/texmf-dist/doc/generic/pstricks-add/Changes
@@ -1,4 +1,4 @@
-%% $Id: Changes 866 2014-01-04 08:38:01Z herbert $
+%% $Id: Changes 873 2014-01-22 14:18:25Z herbert $
%%
pstricks-add.pro -----------
0.23 2009-12-17 - add RGBtoGRAY and WavelengthToGRAY
@@ -38,7 +38,8 @@ pstricks-add.sty ----------- (hv)
v. 0.11 2007-09-04 add a message for loading the prolouge file pstrick-add.pro
-pstricks-add.tex ----------- (Dominik Rodriguez/hv)
+pstricks-add.tex ----------- (hv)
+ v 3.65 2014-01-21 - added \ignorespaces for \psStartPoint
v 3.64 2014-01-03 - fix for \psCircleTangent
v 3.63 2013-12-14 - added \ignorespaces in \psRelNode
v 3.62 2013-11-13 - added \noVerticalLines
diff --git a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf
index 16d2fdd809a..b9fa858d8f4 100644
--- a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex
index 070660a92ba..84b89f1d00d 100644
--- a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex
+++ b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex
@@ -1,4 +1,4 @@
-%% $Id: pstricks-add-doc.tex 848 2013-11-14 21:30:42Z herbert $
+%% $Id: pstricks-add-doc.tex 874 2014-01-22 14:25:35Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\listfiles
@@ -3415,14 +3415,14 @@ as starting values for another equation.
x dup mul 2 div 180 mul sin %% dy/dt
}
\psplotDiffEqn[GetFinalState,
- whichabs=0,whichord=1,linecolor=blue,method=rk4,%SaveFinalState,
+ whichabs=0,whichord=1,linecolor=blue,method=rk4,%FinalState,
plotpoints=10,showpoints=true]{1}{2}{0 0}{
pop pop
x dup mul 2 div 180 mul cos %% dx/dt
x dup mul 2 div 180 mul sin %% dy/dt
}
\psplotDiffEqn[GetFinalState,
- whichabs=0,whichord=1,linecolor=cyan,method=rk4,%SaveFinalState,
+ whichabs=0,whichord=1,linecolor=cyan,method=rk4,%FinalState,
plotpoints=19,showpoints=true]{2}{3}{0 0 }{
pop pop
x dup mul 2 div 180 mul cos %% dx/dt
@@ -3446,14 +3446,14 @@ as starting values for another equation.
x dup mul 2 div 180 mul sin %% dy/dt
}
\psplotDiffEqn[GetFinalState,
- whichabs=0,whichord=1,linecolor=blue,method=rk4,%SaveFinalState,
+ whichabs=0,whichord=1,linecolor=blue,method=rk4,%FinalState,
plotpoints=10,showpoints=true]{1}{2}{0 0}{
pop pop
x dup mul 2 div 180 mul cos %% dx/dt
x dup mul 2 div 180 mul sin %% dy/dt
}
\psplotDiffEqn[GetFinalState,
- whichabs=0,whichord=1,linecolor=cyan,method=rk4,%SaveFinalState,
+ whichabs=0,whichord=1,linecolor=cyan,method=rk4,%FinalState,
plotpoints=19,showpoints=true]{2}{3}{0 0 }{
pop pop
x dup mul 2 div 180 mul cos %% dx/dt
@@ -4588,10 +4588,10 @@ taken into account by the scaling value.
The macros described below allow you to place tick and other marks along an arbitrary
parametric curve with placement rules similar to those used by \Lcs{psaxes} in
the \LPack{pst-plot} package. You have to define a metric function along the curve to
-govern tick placement. That function can be a specified function of {\tt x,y} which
+govern tick placement. That function can be a specified function of \texttt{x,y} which
should increase along the curve, or it can be an function whose increment is a specified
-positive function of {\tt x, y, dx, dy, ds} where the last term is the arc-length element
-that you could specify alternately as {\tt dx dup mul dy dup mul add sqrt}.
+positive function of \texttt{x, y, dx, dy, ds} where the last term is the arc-length element
+that you could specify alternately as \texttt{dx dup mul dy dup mul add sqrt}.
% start new material
@@ -4601,13 +4601,13 @@ In addition, a new command \Lcs{Put} is proposed, expanding as appropriate to \L
\LcsStar{Put}\OptArgs\OptArg*{\Largb{<ref>}}\Largr{<position>}\Largb{<stuff>}
\end{BDef}
-where the optional {\tt *} blanks the background, the optional \OptArgs\ may be used to specify a rotation
+where the optional \texttt{*} blanks the background, the optional \OptArgs\ may be used to specify a rotation
using any form acceptable to \Lcs{SpecialCoor} (eg, \nxLkeyword{rot=45} or \Lkeyword{rot}\verb|={(1,1)}|
or \Lkeyword{rot}\verb|=(P)|, and \Larg{ref} takes one of
-two forms: \verb=(a)= a refpt such as {\tt Bl}, in which case \Lcs{rput} is called; (b) a polar form of offset
+two forms: \verb=(a)= a refpt such as \texttt{Bl}, in which case \Lcs{rput} is called; (b) a polar form of offset
(eg, \verb=7pt;30=, or \verb=;(P)= --- in the latter case, \Ldim{pslabelsep} is substituted for the missing
-radius), in which case a modified form of \Lcs{uput} is called. The idea of \Lcs{Put} is to allow {\tt position},
-{\tt ref} and {\tt rot} to be specified in any of the forms acceptable to \Lcs{SpecialCoor} and to do so with
+radius), in which case a modified form of \Lcs{uput} is called. The idea of \Lcs{Put} is to allow \texttt{position},
+\texttt{ref} and \texttt{rot} to be specified in any of the forms acceptable to \Lcs{SpecialCoor} and to do so with
the same output no matter what form is used. The cost of this consistency is that \Lcs{Put} can lead to results
that differ from \Lcs{uput} in some special cases.
@@ -4624,18 +4624,18 @@ to run the macro \Lcs{pscurvepoints}. For example,
\pscurvepoints[plotpoints=20]{0}{6}{t t t mul 12 div}{Pt}%
\end{verbatim}
makes a virtual (ie, data only---nothing is rendered) polyline with 20 vertices approximating
-the curve $x(t)=t, y(t)=t^2/12$, $0\le t\le 6$. The last argument {\tt Pt} is the root name
-given to the data arrays. PostScript arrays will be created with the following names: {\tt Pt.X, Pt.Y}
-for the coordinates of the vertices, {\tt PtDelta.X, PtDelta.Y} for the increments between the
-vertices (using, eg, {\tt PtDelta.X[2]=Pt.X[2]-Pt.X[1]}) and {\tt PtNormal.X, PtNormal.Y} for
-a vector normal to {\tt PtDelta.X, PtDelta.Y} in the visual, not mathematical, sense.
-(Both senses are the same if the scales on the axes are identical.) The {\tt Normal} is
+the curve $x(t)=t, y(t)=t^2/12$, $0\le t\le 6$. The last argument \texttt{Pt} is the root name
+given to the data arrays. PostScript arrays will be created with the following names: \texttt{Pt.X, Pt.Y}
+for the coordinates of the vertices, \texttt{PtDelta.X, PtDelta.Y} for the increments between the
+vertices (using, eg, \texttt{PtDelta.X[2]=Pt.X[2]-Pt.X[1]}) and \texttt{PtNormal.X, PtNormal.Y} for
+a vector normal to \texttt{PtDelta.X, PtDelta.Y} in the visual, not mathematical, sense.
+(Both senses are the same if the scales on the axes are identical.) The \texttt{Normal} is
always constructed so as to point ``upward'' (ie, to your left) as you traverse the curve
-in the positive direction. The PostScript variable {\tt unitratio} provides the ratio of
-the unit on the y axis to that on x axis, and {\tt unitratiosq} is its square. All of
-these PostScript objects are stored in the main {\tt pstricks} dictionary \Lps{tx@Dict}
-which should be automatically made available when using many {\tt pstricks} macros.
-If {\tt gs} returns you an error message like
+in the positive direction. The PostScript variable \texttt{unitratio} provides the ratio of
+the unit on the y axis to that on x axis, and \texttt{unitratiosq} is its square. All of
+these PostScript objects are stored in the main \texttt{pstricks} dictionary \Lps{tx@Dict}
+which should be automatically made available when using many \texttt{pstricks} macros.
+If \texttt{gs} returns you an error message like
\begin{verbatim}
Error: /undefined in Pt.X
\end{verbatim}
@@ -4649,29 +4649,29 @@ With this preparation, the main tick-making macro may be run. For example,
\begin{verbatim}
\pspolylineticks{Pt}{ dx dy add 3 div }{1}{2}%
\end{verbatim}
-looks for data arrays made using \Lcs{pscurvepoints} with the root name {\tt Pt}. The next argument,
-{\tt dx dy add 3 div}, specifies the (PostScript) function of increments that should be used to
+looks for data arrays made using \Lcs{pscurvepoints} with the root name \texttt{Pt}. The next argument,
+\texttt{dx dy add 3 div}, specifies the (PostScript) function of increments that should be used to
construct the metric. If the keyword \verb|metricInitValue| is defined, eg, with
\Lcs{psset}\Largb{\Lkeyword{metricInitValue}=2.5}, it is used as the initial value of the metric,
otherwise it is defined to be 0. In the previous example, the increment function is always
positive, and care should be taken to guarantee this is so or the results will not be meaningful.
-(If we wanted to use arc-length, the function would have been {\tt ds}, assuming equal scales on
+(If we wanted to use arc-length, the function would have been \texttt{ds}, assuming equal scales on
the axes.) The last two arguments determine the index of the first tick and the number of ticks.
Tick numbering begins with index 0, so the example says to drop the first tick and draw the
next 2 ticks. In this example, where all keywords take their default values, ticks are
potentially located at values on the curve where the metric takes a positive integer value.
In the arc-length example, the tick with index 0 is at the beginning of the curve, and subsequent
ticks are at unit distance, measured along the curve. At each index where a tick is drawn, a
-\Lcs{pnode} is created: In this example, you create nodes {\tt PtTick1, PtTick2} on the curve
+\Lcs{pnode} is created: In this example, you create nodes \texttt{PtTick1, PtTick2} on the curve
where the ticks are located. This is handy for placing labels using, eg, \Lcs{Put}. In
-addition, PostScript data arrays (in this example, {\tt PtTickN.X, PtTickN.Y} of the normals
-at these nodes are stored in the dictionary {\tt TDict}. More importantly, the tangent and
-normal vectors at {\tt PtTick0} etc are constructed as nodes with names {\tt PtTangent0, PtNormal0}
+addition, PostScript data arrays (in this example, \texttt{PtTickN.X, PtTickN.Y} of the normals
+at these nodes are stored in the dictionary \texttt{TDict}. More importantly, the tangent and
+normal vectors at \texttt{PtTick0} etc are constructed as nodes with names \texttt{PtTangent0, PtNormal0}
etc. See the last example below for typical usage.
-The shape of the ticks is governed by the keywords \Lkeyword{ticksize} (default value {\tt -4pt 4pt})
+The shape of the ticks is governed by the keywords \Lkeyword{ticksize} (default value \texttt{-4pt 4pt})
and \Lkeyword{tickwidth} (default value \verb|.5\linewidth|.) With the default settings, ticks
- are drawn perpendicular the the curve extending {\tt 4pt} to each side. The line
+ are drawn perpendicular the the curve extending \texttt{4pt} to each side. The line
\begin{verbatim}
\pspolylineticks[ticksize=-6pt 6pt]{Pt}{ dx dy add 3 div }{1}{2}%
\end{verbatim}
@@ -4679,9 +4679,9 @@ would draw longer ticks than the default.
Placement of the ticks is governed by the keywords \Lkeyword{Ds} and \Lkeyword{Os}, whose meaning for the
curve is similar to (but not the same as) the meanings of \Lkeyword{Dx} and \Lkeyword{Ox} with respect to the x axis.
-That is, if {\tt Ds=2} and {\tt Os=0}, ticks will be drawn where the metric takes
+That is, if \texttt{Ds=2} and \texttt{Os=0}, ticks will be drawn where the metric takes
values 0, 2, 4 and so on. More generally, ticks are placed where the metric takes
-value {\tt Os, Os+Ds, Os+2*Ds,...}, as long as those positions are on the curve. If \Lkeyword{Os}
+value \texttt{Os, Os+Ds, Os+2*Ds,...}, as long as those positions are on the curve. If \Lkeyword{Os}
has an empty value as a result, say, of \verb|\psset{Os=}|, then \Lkeyword{Os} is set internally
to the initial metric value. If \Lkeyword{Ds} has an empty value, it is set internally to the
final metric value less the initial metric value, divided by 10.
@@ -4717,7 +4717,7 @@ the the range of indices for the Tick related arrays.
\subsection{Examples}
The examples in this section make use of very recent (as of May, 2010) versions
of \LPack{pstricks} and related packages.
-%If the {\tt pst-grapha} package is not available on CTAN, download it from
+%If the \texttt{pst-grapha} package is not available on CTAN, download it from
%\begin{verbatim}
%http://math.ucsd.edu/~msharpe/pst-grapha.dmg
%\end{verbatim}
@@ -4847,7 +4847,7 @@ for the ellipse is the area swept out by the radial line from the focus $(\epsil
starting from $(a,0)$ around to an arbitrary location $(x,y)$, where $y>0$, as this quantity
is proportional to the time elapsed since perihelion. A routine calculation gives the following formula:
\[A=\frac{ab}{2}\arccos\bigg(\frac{x}{a}\bigg)-\frac{\epsilon a y}{2}.\]
-Remembering that PostScript's {\tt acos} gives its result in degrees, not radians, we have the
+Remembering that PostScript's \texttt{acos} gives its result in degrees, not radians, we have the
following, drawn for the case $a=4$, $b=3$.
\begin{LTXexample}[pos=t]
@@ -4916,13 +4916,13 @@ If you get PostScript errors when you process your file, the most likely culpri
function you specified to define the metric. There are some things to look out for:
\begin{itemize}
\item If \Lkeyword{metricFunction}, the function you specify in PostScript code must
-involve only {\tt x} and {\tt y}, and must leave exactly one real value on the stack as a result of
-substituting specific values for {\tt x} and {\tt y}. The function must be strictly increasing on the curve.
+involve only \texttt{x} and \texttt{y}, and must leave exactly one real value on the stack as a result of
+substituting specific values for \texttt{x} and \texttt{y}. The function must be strictly increasing on the curve.
\item If \Lkeyword{metricFunction}=\false (the default), the function you specify in PostScript
-code must involve only the variables {\tt x}, {\tt y}, {\tt dx}, {\tt dy}, {\tt ds} (where {\tt ds}
-is defined to be the arc-length element {\tt dx dup mul dy dup mul add sqrt}, and must leave exactly
+code must involve only the variables \texttt{x}, \texttt{y}, \texttt{dx}, \texttt{dy}, \texttt{ds} (where \texttt{ds}
+is defined to be the arc-length element \texttt{dx dup mul dy dup mul add sqrt}, and must leave exactly
one strictly positive real value on the stack when specific values are substituted for those variables.
-The constant function {\tt 1} gives equal weight to each segment in the curve, so in effect it gives
+The constant function \texttt{1} gives equal weight to each segment in the curve, so in effect it gives
you the original parametrization, up to a constant factor.
\item If the function you specify in \Lcs{parametricplot} and \Lcs{pscurvepoints} is \Lkeyword{algebraic},
make sure you follow precisely the syntax it understands. In complex cases, PostScript may be the safer solution.
diff --git a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
index 5521824f448..8baba237afa 100644
--- a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
+++ b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
@@ -1,4 +1,4 @@
-%% $Id: pstricks-add.tex 866 2014-01-04 08:38:01Z herbert $
+%% $Id: pstricks-add.tex 874 2014-01-22 14:25:35Z herbert $
%%
%% This is file `pstricks-add.tex',
%%
@@ -30,8 +30,8 @@
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
\ifx\PSTmathLoaded\endinput\else \input pst-math \fi
%
-\def\fileversion{3.64}
-\def\filedate{2014/01/03}
+\def\fileversion{3.65}
+\def\filedate{2014/01/21}
\message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)}
%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -1599,7 +1599,7 @@ a add
\ifPst@saveData /Pst@data (\psk@filename) (w) file def \fi
/x #1 def % first value
/x1 #2 def % last value
- \ifPst@GetFinalState \Begin@SaveFinalState /y SaveFinalState def
+ \ifPst@GetFinalState \Begin@SaveFinalState /y FinalState def
\else /y [ #3 ] def \fi % values for t=0
/ylength y length def % number of elements in #3
/addvect {
@@ -2268,12 +2268,13 @@ a add
\pstVerb{tx@Dict begin
\pst@tempA
\pst@number\psyunit div /cp.Y exch def
- \pst@number\psxunit div /cp.X exch def end }}
+ \pst@number\psxunit div /cp.X exch def end }\ignorespaces}
%
\def\psVector{\pst@object{psVector}}
\def\psVector@i(#1){%
\pst@killglue%
\addbefore@par{arrows=->,arrowsize=6pt}%
+% \addto@par{showpoints=false}%
\pst@getcoor{#1}\pst@tempCoor%
\begingroup
\use@par%