summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-04-18 18:00:08 +0000
committerKarl Berry <karl@freefriends.org>2010-04-18 18:00:08 +0000
commit2a3c1268d60fe36756e4ea2329ff78730c0da3c8 (patch)
tree50cba2ead59ab8f9601f083bb24e338200ab0e6e /Master
parentbc232ef5ce98fef849827ece6ddabaa9bc0c062b (diff)
pst-plot 1.13 (16apr10)
git-svn-id: svn://tug.org/texlive/trunk@17899 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/Changes4
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdfbin842468 -> 844885 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex45
3 files changed, 34 insertions, 15 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-plot/Changes b/Master/texmf-dist/doc/generic/pst-plot/Changes
index 0a8b842fece..1f248816f99 100644
--- a/Master/texmf-dist/doc/generic/pst-plot/Changes
+++ b/Master/texmf-dist/doc/generic/pst-plot/Changes
@@ -1,4 +1,8 @@
----- pst-plot.tex
+1.13 2010-04-15 - for log labels take care the different font size
+ for base and exponent
+1.12 2010-04-05 - fix bug with axes style frame and linestyle
+ in macro \psxs@@axes
1.11 2010-03-15 - use always \psset[package]{...}
1.10 2010-02-11 - trigLabels also for the y axis
- first version with pst-xkey and own
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 9d167e09f7c..97bc10da373 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/tex/generic/pst-plot/pst-plot.tex b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
index 8a510f54294..2ec81a98c09 100644
--- a/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
+++ b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
@@ -15,12 +15,13 @@
\csname PSTplotLoaded\endcsname
\let\PSTplotLoaded\endinput
%
-\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey.tex \fi
-\ifx\PSTFPloaded\endinput\else \input pst-fp.tex \fi
-\ifx\MultidoLoaded\endinput\else \input multido.tex \fi
+\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi
+\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey.tex\fi
+\ifx\PSTFPloaded\endinput\else \input pst-fp.tex \fi
+\ifx\MultidoLoaded\endinput\else \input multido.tex \fi
%
-\def\fileversion{1.11}
-\def\filedate{2010/03/15}
+\def\fileversion{1.13}
+\def\filedate{2010/04/15}
\message{ v\fileversion, \filedate}
%
\edef\TheAtCode{\the\catcode`\@}
@@ -1122,14 +1123,16 @@ D\space##1%
\ifx\psk@xlogBase\@empty%
\pshlabel{\psk@labelFontSize\expandafter\@LabelComma##1..\@nil\psk@xlabelFactor}%
\else%
- \pshlabel{\psk@labelFontSize\psk@xlogBase\textsuperscript{\expandafter\@stripDecimals##1..\@nil}}%
+ \ifPst@mathLabel%
+ \pshlabel{\psk@labelFontSize\psk@xlogBase^{\expandafter\@stripDecimals##1..\@nil}}%
+ \else%
+ \pshlabel{\psk@labelFontSize\psk@xlogBase\textsuperscript{\expandafter\@stripDecimals##1..\@nil}}%
+ \fi
\fi%
\fi%
}%
\ifPst@mathLabel%
- \def\pshlabel##1{$\psk@labelFontSize##1$}\else%
- \def\pshlabel##1{\psk@labelFontSize##1}%
- \fi%
+ \def\pshlabel##1{$\psk@labelFontSize##1$}\else\def\pshlabel##1{\psk@labelFontSize##1}\fi%
\fi%
}%
%
@@ -1201,7 +1204,11 @@ D\space##1%
\ifx\psk@ylogBase\@empty%
\psvlabel{\expandafter\@LabelComma##1..\@nil\psk@ylabelFactor}%
\else%
- \psvlabel{\psk@ylogBase\textsuperscript{\expandafter\@stripDecimals##1..\@nil }}%
+ \ifPst@mathLabel%
+ \psvlabel{\psk@ylogBase^{\expandafter\@stripDecimals##1..\@nil }}%
+ \else
+ \psvlabel{\psk@ylogBase\textsuperscript{\expandafter\@stripDecimals##1..\@nil }}%
+ \fi%
\fi%
\fi%
}%
@@ -1240,7 +1247,7 @@ D\space##1%
\define@key[psset]{pst-plot}{ylabelFactor}[\relax]{\def\psk@ylabelFactor{#1}}
\define@key[psset]{pst-plot}{xlabelFactor}[\relax]{\def\psk@xlabelFactor{#1}}
\define@boolkey[psset]{pst-plot}[Pst@]{showOriginTick}[true]{}%
-\psset[pst-plot]{xlabelFactor=\relax,ylabelFactor=\relax}%
+\psset[pst-plot]{xlabelFactor=\relax,ylabelFactor=\relax,showOriginTick}%
%% #1 : optional arguments passed to psline
%% #2 : x value
@@ -1412,6 +1419,12 @@ D\space##1%
\define@key[psset]{pst-plot}{xsubtickwidth}[0.25\pslinewidth]{\pst@getlength{#1}\psk@xsubtickwidth}
\define@key[psset]{pst-plot}{ysubtickwidth}[0.25\pslinewidth]{\pst@getlength{#1}\psk@ysubtickwidth}
%
+\define@key[psset]{pst-plot}{labelOffset}[0pt]{%
+ \pst@getlength{#1}\psk@xlabelOffset%
+ \pst@getlength{#1}\psk@ylabelOffset}
+\define@key[psset]{pst-plot}{xlabelOffset}[0pt]{\pst@getlength{#1}\psk@xlabelOffset}
+\define@key[psset]{pst-plot}{ylabelOffset}[0pt]{\pst@getlength{#1}\psk@ylabelOffset}
+%
\define@key[psset]{pst-plot}{tickcolor}[black]{%
\pst@getcolor{#1}\psk@xtickcolor%
\pst@getcolor{#1}\psk@ytickcolor}
@@ -1450,7 +1463,7 @@ D\space##1%
%
\psset[pst-plot]{subticksize=0.75,subticks=1,tickcolor=black,ticklinestyle=solid,
subticklinestyle=solid,subtickcolor=gray,tickwidth=0.5\pslinewidth,
- subtickwidth=0.25\pslinewidth}
+ subtickwidth=0.25\pslinewidth,labelOffset=0pt}
%
\define@key[psset]{pst-plot}{nStep}[1]{\def\psk@nStep{#1}}
\define@key[psset]{pst-plot}{nStart}[0]{\def\psk@nStart{#1}}
@@ -1593,7 +1606,7 @@ D\space##1%
\fi%
\fi%
\let\pst@linetype\pst@arrowtype%
- \def\pst@tempA{none}%
+ \def\pst@tempA{axes}%
\pst@addarrowdef%
\addto@pscode{
/showOrigin \ifPst@showOriginTick true \else false \fi def % ticks for 0/0 ?
@@ -1605,9 +1618,9 @@ D\space##1%
/yEnd exch def /xEnd exch def
xEnd yEnd
\ifx\psk@axesstyle\pst@tempA
- pop pop % axesstyle = none (only ticks)
- \else
L % the line with arrows
+ \else
+ pop pop % axesstyle = none (only ticks) or frame (already drawn)
\fi
/yStart exch def
/xStart exch def
@@ -1864,6 +1877,7 @@ D\space##1%
%
% #1:Max/Min in pt from origin; #2:arrow; #3:min; #4:max
\def\pst@hlabels#1#2#3#4{%
+ \kern\psk@xlabelOffset pt % set the x offset?
\ifdim#1=\z@\else% % start from 0 ?
\ifx#2\empty\else\advance#1\ifdim#1>\z@-\fi7\pslinewidth\fi%
\pst@cnta=#1\relax% % Distance (in sp) to end.
@@ -1919,6 +1933,7 @@ D\space##1%
\def\pst@@vlabels{%
\psDEBUG[pst@@vlabels]{yticksizeC=\the\pst@yticksizeC}% for left labels we use \def\llap#1{\hb@xt@\z@{\hss#1}}
\vbox to\z@{%
+ \vbox to -\psk@ylabelOffset pt{}% the y label offset
\ifnum\pst@cnta>\z@ \pst@dima=-\pst@dima\fi% up or down label positions
\offinterlineskip%
\ifshoworigin%