summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-09-02 21:43:54 +0000
committerKarl Berry <karl@freefriends.org>2017-09-02 21:43:54 +0000
commitc76531e8391eccab09a2342e31650bdcca2649d2 (patch)
tree9434d57de23e8b7cc9a8794e8ec7e6cfd388b79d
parent16e3f020bd43ba396bbc4c25f36584ec85dace27 (diff)
pst-plot (2sep17)
git-svn-id: svn://tug.org/texlive/trunk@45199 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/Changes1
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdfbin1338443 -> 1339120 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex45
3 files changed, 32 insertions, 14 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-plot/Changes b/Master/texmf-dist/doc/generic/pst-plot/Changes
index c809c6b0e50..395b21036bf 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.84 2017-08-31 - fix for new introduced bug with \hbox
1.83 2017-08-29 - fix for real axes length and x|yLabels
- added two more optional arguments for boxplots
1.82 2017-07-13 - revert last change
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 98f42a08b85..c8aac1c3112 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 ad5abf57c55..2a6a6c00cb2 100644
--- a/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
+++ b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
@@ -23,8 +23,8 @@
\ifx\PSTFPloaded\endinput\else \input pst-fp.tex \fi
\ifx\MultidoLoaded\endinput\else \input multido.tex \fi
%
-\def\fileversion{1.83}
-\def\filedate{2017/08/29}
+\def\fileversion{1.84}
+\def\filedate{2017/08/31}
\message{ v\fileversion, \filedate\space (tvz,hv)}
%
\edef\TheAtCode{\the\catcode`\@}
@@ -2409,11 +2409,20 @@ D\space##1%
% \multido{\iB=#3+1,\rB=#3+\pst@tempA}{\pst@tempB}%
% {\uput{\psxlabelsep}[\pst@tempC]{\pst@xLabelsRot}(\rB,0)%\psxlabelsep)
% {\strut\pshlabel{\psPutXLabel{\iB}}}}%
- \edef\pst@Xstart{\pst@int{#3}}%
- \edef\pst@Xend{\pst@int{#4}}%
- \multido{\nA=0+1,\rA=\pst@Xstart+\psk@Dx}{%
- \numexpr\pst@Xend-\pst@Xstart+1}{\uput{\psxlabelsep}[\pst@tempC]{\pst@xLabelsRot}(\rA,0){%
- \strut\expandafter\pshlabel\expandafter{\psPutXLabel{\nA}}}}%
+% \edef\pst@Xstart{\pst@int{#3}}%
+% \edef\pst@Xend{\pst@int{#4}}%
+% \multido{\nA=0+1,\rA=\pst@Xstart+\psk@Dx}{%
+% \numexpr\pst@Xend-\pst@Xstart+1}{\uput{\psxlabelsep}[\pst@tempC]{\pst@xLabelsRot}(\rA,0){%
+% \strut\expandafter\pshlabel\expandafter{\psPutXLabel{\nA}}}}%
+ \pstFPsub\pst@pmtempa{#4}{#3}
+ \pstFPDiv\pst@pmtempb{\pst@pmtempa}{\psk@Dx}
+ \pstFPadd\pst@pmtempc{\pst@pmtempb}{-1}%
+ \pstFPadd\pst@pmtempd{\pst@pmtempb}{1}%
+ \ifdim\pst@pmtempb pt < \z@ \def\pst@pmtempe{\pst@int{\pst@pmtempc}}\else\def\pst@pmtempe{\pst@int{\pst@pmtempd}}\fi%
+ \multido{\nA=0+1,\rA=0+\psk@Dx}{\pst@pmtempe}{%
+ \ifdim \nA pt < \z@ \def\nB{-\nA} \else \def\nB{\nA} \fi
+ \uput{\psxlabelsep}[\pst@tempC]{\pst@xLabelsRot}(\rA,0){%
+ \strut\expandafter\pshlabel\expandafter{\psPutXLabel{\nB}}}}%
\SpecialLabelsDonetrue
\fi
\fi
@@ -2428,8 +2437,7 @@ D\space##1%
\vskip-\pst@xticksizeB\vskip-\psxlabelsep\vskip-1ex % 3
\fi
\ifnum\pst@cnta<\z@ \pst@dimb=-\pst@dimb\fi
-% \hbox to \z@{%
- \hbox to \hsize{% to prevent overfull hbox 20170626
+ \hbox to \z@{%
\ifshoworigin\hbox to \z@{\hss\pst@@@hlabel{\psk@Ox}\hss}\fi
\mmultido{\nA=\psk@Ox+\psk@Dx}{\pst@cnta}{%
\hskip\pst@dimb \hbox to \z@{\hss
@@ -2458,11 +2466,20 @@ D\space##1%
\fi
\fi
\else
- \edef\pst@Ystart{\pst@int{#3}}%
- \edef\pst@Yend{\pst@int{#4}}%
- \multido{\nA=0+1,\rA=\pst@Ystart+\psk@Dy}{\numexpr\pst@Yend-\pst@Ystart+1}{%
- \uput{\psylabelsep}[180]{\pst@yLabelsRot}(0,\rA){%
- \strut\expandafter\psvlabel\expandafter{\psPutYLabel{\nA}}}}%
+% \edef\pst@Ystart{\pst@int{#3}}%
+% \edef\pst@Yend{\pst@int{#4}}%
+% \multido{\nA=0+1,\rA=\pst@Ystart+\psk@Dy}{\numexpr\pst@Yend-\pst@Ystart+1}{%
+% \uput{\psylabelsep}[180]{\pst@yLabelsRot}(0,\rA){%
+% \strut\expandafter\psvlabel\expandafter{\psPutYLabel{\nA}}}}%
+ \pstFPsub\pst@pmtempa{#4}{#3}%
+ \pstFPDiv\pst@pmtempb{\pst@pmtempa}{\psk@Dy}%
+ \pstFPadd\pst@pmtempc{\pst@pmtempb}{-1}%
+ \pstFPadd\pst@pmtempd{\pst@pmtempb}{1}%
+ \ifdim\pst@pmtempb pt < \z@ \def\pst@pmtempe{\pst@int{\pst@pmtempc}}\else\def\pst@pmtempe{\pst@int{\pst@pmtempd}}\fi%
+ \multido{\nA=0+1,\rA=0+\psk@Dy}{\pst@pmtempe}{%
+ \ifdim \nA pt < \z@ \def\nB{-\nA}\else \def\nB{\nA}\fi
+ \uput{\psylabelsep}[180]{\pst@yLabelsRot}(0,\rA){%
+ \strut\expandafter\psvlabel\expandafter{\psPutYLabel{\nB}}}}%
\SpecialLabelsDonetrue
\fi
\fi