summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-05-05 22:01:58 +0000
committerKarl Berry <karl@freefriends.org>2012-05-05 22:01:58 +0000
commit4c56a7f771b8c9fabb57b8def881a6c6785e5699 (patch)
tree67ace5cf3da0ddba9b8d5cd000de7ec7b9cfffa9 /Master/texmf-dist
parent3f76fb1e46581e09148781915e7e7868671e46f9 (diff)
pst-plot (5may12)
git-svn-id: svn://tug.org/texlive/trunk@26218 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/Changes2
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdfbin1170691 -> 1171001 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex9
-rw-r--r--Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex29
4 files changed, 26 insertions, 14 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-plot/Changes b/Master/texmf-dist/doc/generic/pst-plot/Changes
index 6be68897dc2..e066af0af18 100644
--- a/Master/texmf-dist/doc/generic/pst-plot/Changes
+++ b/Master/texmf-dist/doc/generic/pst-plot/Changes
@@ -1,4 +1,6 @@
----- pst-plot.tex
+1.42 2012-05-03 - another fix for loglines
+1.41 2012-05-02 - fix for loglines
1.40 2012-03-14 - do not use etex extensions
1.39 2012-03-13 - fixed bug for xLabels/yLabels
1.38 2012-02-23 - added \strut for the x/y axis user labels
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 79fb8fda740..759f3c3d1d6 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 ee1080d5b29..fabb93149c6 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
@@ -58,6 +58,7 @@ Manuel Luque;
Jens-Uwe Morawski;
Tobias N\"ahring;
Rolf Niepraschk;
+Martin Paech;
Alan Ristow;
Christine R\"omer;
Arnaud Schmittbuhl
@@ -2029,7 +2030,7 @@ sense, because it is the same as \verb+[sub]ticklines=0+
\psset{unit=4cm}
\pspicture(-0.15,-0.15)(2.5,1)
\psaxes[axesstyle=frame,logLines=y,xticksize=0 1,xsubticksize=1,ylogBase=10,
- tickcolor=red,subtickcolor=blue,tickwidth=1pt,subticks=20,xsubticks=10,
+ tickcolor=red,subtickcolor=blue,tickwidth=1pt,subticks=9,xsubticks=10,
xticklinestyle=dashed,xsubticklinestyle=dashed](2.5,1)
\endpspicture
\end{LTXexample}
@@ -2052,7 +2053,7 @@ It can be changed, when \emph{after} the option \Lkeyword{logLines} the ticksize
\psaxes[subticks=5,xylogBase=10,logLines=all](5,5)
\endpspicture\hspace{1cm}
\pspicture(-1,-1)(5,5)
- \psaxes[subticks=10,axesstyle=frame,xylogBase=10,logLines=all,
+ \psaxes[subticks=9,axesstyle=frame,xylogBase=10,logLines=all,
ticksize=0 5pt,tickstyle=inner](5,5)
\endpspicture
\end{LTXexample}
@@ -2061,7 +2062,7 @@ It can be changed, when \emph{after} the option \Lkeyword{logLines} the ticksize
\psset{unit=4cm}
\pspicture(-0.15,-0.15)(2.5,2)
\psaxes[axesstyle=frame,logLines=y,xticksize=max,xsubticksize=1,ylogBase=10,
- tickcolor=red,subtickcolor=blue,tickwidth=1pt,subticks=20,xsubticks=10](2.5,2)
+ tickcolor=red,subtickcolor=blue,tickwidth=1pt,subticks=9,xsubticks=10](2.5,2)
\endpspicture
\end{LTXexample}
@@ -2069,7 +2070,7 @@ It can be changed, when \emph{after} the option \Lkeyword{logLines} the ticksize
\psset{unit=4}
\pspicture(-0.5,-0.3)(3,1.2)
\psaxes[axesstyle=frame,tickstyle=inner,logLines=x,xlogBase=10,Dy=0.5,tickcolor=red,
- subtickcolor=blue,tickwidth=1pt,ysubticks=5,xsubticks=10](3,1)
+ subtickcolor=blue,tickwidth=1pt,ysubticks=5,xsubticks=9](3,1)
\endpspicture
\end{LTXexample}
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 b53b1b82a89..0f75e67e95c 100644
--- a/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
+++ b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
@@ -1,4 +1,4 @@
-% $Id: pst-plot.tex 669 2012-03-14 19:33:54Z herbert $
+% $Id: pst-plot.tex 687 2012-05-03 12:06:21Z herbert $
%% BEGIN pst-plot.tex
%%
%% plotting functions and data with PSTricks.
@@ -20,8 +20,8 @@
\ifx\PSTFPloaded\endinput\else \input pst-fp.tex \fi
\ifx\MultidoLoaded\endinput\else \input multido.tex \fi
%
-\def\fileversion{1.40}
-\def\filedate{2012/03/14}
+\def\fileversion{1.42}
+\def\filedate{2012/05/03}
\message{ v\fileversion, \filedate\space (tvz,hv)}
%
\edef\TheAtCode{\the\catcode`\@}
@@ -1743,6 +1743,7 @@ D\space##1%
/maxTickline \ifis@yAxis \pst@number#3 \else \pst@number#4 \fi def
/dT \ifis@yAxis \psk@dy \else \psk@dx \fi\space abs % added abs 2006-07-07
65536 div viceversa { neg } if def % div to get pt instead of sp
+ /DT \ifis@yAxis \psk@Dy \else \psk@Dx \fi\space abs viceversa { neg } if def
/subTNo \ifis@yAxis\psk@ysubticks\else\psk@xsubticks\fi \space def
subTNo 0 gt { /dsubT dT subTNo div def}{ /dsubT 0 def } ifelse % deltaSubTick
\ifis@yAxis \psk@yticksize \else \psk@xticksize \fi
@@ -1786,13 +1787,17 @@ D\space##1%
%\iffalse
% start ticks ---------------------------------------------------------
% showOrigin { 0 }{ dT } ifelse
- 0 dT MaxValue 1 add { % the positive part of the axes
+ 0 dT MaxValue 1 add { % the positive part of the axes, step unit is pt
/cntTick exch def % the index
logLines { % log lines?
gsave
- 1 10 subTNo div 9.99 { % do not write a line for 1
+ 1 1 DT {
+ 1 sub /OffSet exch def
+% 1 10 subTNo div 9.99 { % do not write a line for 1
+ 10 subTNo 1 add div dup 10 { % do not write a line for 1
/dx exch def % save index
- /x cntTick dT dx log mul add def %
+% /x cntTick dT dx log mul add def %
+ /x dx log OffSet add \ifis@yAxis\pst@number\psyunit\else\pst@number\psxunit\fi\space mul cntTick add def %
x abs MaxValue abs le { % out of range?
\ifis@yAxis
\ifPst@maxyTicks true \else false \fi
@@ -1804,7 +1809,7 @@ D\space##1%
{ x tickstart STsize mul #5 moveto
x tickend STsize mul #5 lineto } ifelse
} if
- } for
+ } for } for
subTwidth SLW subTColor % set line width and subtick color
subLSstroke
grestore % restore main tick status
@@ -1863,9 +1868,13 @@ D\space##1%
/cntTick exch def
logLines { % log lines?
gsave
- 1 10 subTNo div 9.99 { % do not write a line for 1
+ 1 1 DT cvi {
+ 1 sub /OffSet exch def
+ 10 subTNo 1 add div dup 10 { % do not write a line for 1
+% 1 10 subTNo div 9.99 { % do not write a line for 1
/dx exch def % save index
- /x cntTick dT dx log mul add def %
+% /x cntTick dT dx log mul add def %
+ /x dx log OffSet add \ifis@yAxis\pst@number\psyunit\else\pst@number\psxunit\fi\space mul cntTick add def
x abs MinValue abs le { % out of range?
\ifis@yAxis
\ifPst@maxyTicks true \else false \fi
@@ -1877,7 +1886,7 @@ D\space##1%
{ x tickstart STsize mul #5 moveto
x tickend STsize mul #5 lineto } ifelse
} if
- } for
+ } for } for
/dsubT 0 def
subTwidth SLW subTColor % set line width and subtick color
subLSstroke