summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-04-29 23:55:25 +0000
committerKarl Berry <karl@freefriends.org>2010-04-29 23:55:25 +0000
commitc363fffb022f472c5236db41aca7144f23f3f439 (patch)
treee2f478b3710ba424be023fa5a8cd5e478b49389d /Master
parent9af4047aaf9cd4ae3b94d2128e43e037b3547bec (diff)
pst-plot update (29apr10)
git-svn-id: svn://tug.org/texlive/trunk@18046 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/Changes1
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdfbin844903 -> 844911 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex10
-rw-r--r--Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex21
4 files changed, 12 insertions, 20 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-plot/Changes b/Master/texmf-dist/doc/generic/pst-plot/Changes
index 8bf5f579757..ec501e66371 100644
--- a/Master/texmf-dist/doc/generic/pst-plot/Changes
+++ b/Master/texmf-dist/doc/generic/pst-plot/Changes
@@ -1,4 +1,5 @@
----- pst-plot.tex
+1.15 2010-04-29 - fixed bug with double definition of tickstyle
1.14 2010-04-24 - allow labels=x|y|all|none for polar plots
1.13 2010-04-15 - for log labels take care the different font size
for base and exponent
diff --git a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf
index d1af2e8f31b..973bac227c2 100644
--- a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex
index 970ca59552b..6134e5ef2c7 100644
--- a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex
@@ -606,13 +606,13 @@ usual way. Only the additional value \Lkeyval{inner} is valid for
\Lkeyword{trigLabels} option, the macros \Lcs{pshlabel} and
\Lcs{psvlabel} shouldn't be redefined, because the package does
it itself internally in these cases. However, if you need a
-redefinition, then do it for \Lcs{pst@@hlabel} and
-\Lcs{pst@@vlabel} with
+redefinition, then do it for \Lcs{pst@@@hlabel} and
+\Lcs{pst@@@vlabel} with
\begin{lstlisting}[style=syntax]
\makeatletter
-\def\ps@@hlabel#1{...}
-\def\ps@@vlabel#1{...}
+\def\ps@@@hlabel#1{...}
+\def\ps@@@vlabel#1{...}
\makeatother
\end{lstlisting}
@@ -630,7 +630,7 @@ redefinition, then do it for \Lcs{pst@@hlabel} and
\endfoot
\bottomrule
\endlastfoot
-\Lkeyword{axesstyle} & \Lkeyval{none}|\Lkeyval{axes}|\Lkeyval{frame}|\Lkeyval{polar}
+\Lkeyword{axesstyle} & \Lkeyval{none}|\Lkeyval{axes}|\Lkeyval{frame}|\Lkeyval{polar}|\Lkeyval{inner}
& \Lkeyval{axes} &\pageref{axesstyle}\\
\Lkeyword{barwidth} & length & 0.25cm & \pageref{barwidth}\\ %ok
\Lkeyword{ChangeOrder} & boolean & \false & \pageref{changeorder}\\
diff --git a/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
index 7376d0df1e4..5102d8c6adc 100644
--- a/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
+++ b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
@@ -20,8 +20,8 @@
\ifx\PSTFPloaded\endinput\else \input pst-fp.tex \fi
\ifx\MultidoLoaded\endinput\else \input multido.tex \fi
%
-\def\fileversion{1.14}
-\def\filedate{2010/04/24}
+\def\fileversion{1.15}
+\def\filedate{2010/04/29}
\message{ v\fileversion, \filedate}
%
\edef\TheAtCode{\the\catcode`\@}
@@ -952,15 +952,6 @@ D\space##1%
\newdimen\pst@yticksizeB
\newdimen\pst@yticksizeC
%
-\define@key[psset]{pst-plot}{tickstyle}[full]{\pst@expandafter\psset@@tickstyle{#1}\@nil}
-\def\psset@@tickstyle#1#2\@nil{%
- \ifx#1f\let\psk@tickstyle\z@\else% 0=f)ull
- \ifx#1t\let\psk@tickstyle\@ne\else% 1=t)op
- \ifx#1b\let\psk@tickstyle\m@ne\else% 2=b)ottom
- \@pstrickserr{Bad tick style: `#1#2'}\@ehpa
- \fi\fi\fi}
-\psset[pst-plot]{tickstyle=full}
-%
\define@key[psset]{pst-plot}{ticks}[all]{\pst@expandafter\psset@@ticks{#1}\@nil\psk@ticks}
\def\psset@@ticks#1#2\@nil#3{%
\ifx#1a\let#3\z@\else% 0=a)ll
@@ -1388,14 +1379,14 @@ D\space##1%
% full= 0, top=1, bottom=-1, inner=2 => -1 0 1 2
\define@key[psset]{pst-plot}{tickstyle}[full]{\pst@expandafter\psset@@tickstyle{#1}\@nil}
\def\psset@@tickstyle#1#2\@nil{%
- \ifx#1f\let\psk@tickstyle\z@\else % full
- \ifx#1t\let\psk@tickstyle\@ne % top
+ \ifx#1f\let\psk@tickstyle\z@\else % 0=f)ull
+ \ifx#1t\let\psk@tickstyle\@ne % 1=t)op
\edef\psk@xticksize{0 \pst@number\pst@xticksizeB}%
\edef\psk@yticksize{0 \pst@number\pst@yticksizeB}%
- \else\ifx#1b\let\psk@tickstyle\m@ne % bottom
+ \else\ifx#1b\let\psk@tickstyle\m@ne % -1=b)ottom
\edef\psk@xticksize{\pst@number\pst@xticksizeA 0}%
\edef\psk@yticksize{\pst@number\pst@yticksizeA 0}%
- \else\ifx#1i\let\psk@tickstyle\tw@% % inner (for frame)
+ \else\ifx#1i\let\psk@tickstyle\tw@% % 2=i)nner (for frame)
\else\@pstrickserr{Bad tick style: `#1#2'}\@ehpa
\fi\fi\fi\fi}
\psset[pst-plot]{tickstyle=full}