From 874c1ebfa412e05459bdb4016910dbbc6eef11bf Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 16 Nov 2017 22:14:00 +0000 Subject: pst-plot (16nov17) git-svn-id: svn://tug.org/texlive/trunk@45830 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/pst-plot/Changes | 1 + .../doc/generic/pst-plot/pst-plot-doc.pdf | Bin 1341687 -> 1341464 bytes .../doc/generic/pst-plot/pst-plot-doc.tex | 5 +- .../texmf-dist/tex/generic/pst-plot/pst-plot.tex | 78 +++++++++++---------- 4 files changed, 45 insertions(+), 39 deletions(-) diff --git a/Master/texmf-dist/doc/generic/pst-plot/Changes b/Master/texmf-dist/doc/generic/pst-plot/Changes index f4cfe7c4740..b956516be5e 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.86 2017-11-16 - fix for trailing spaces in x|ylabelPos 1.85 2017-11-12 - try to prevent overfull hbox for the x axis used \hbox to 0pt [...\hss} - fix bug with wrong \use@par setting for \psaxes@vii 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 c3f94a50cf7..18d8a4aaccd 100644 Binary files a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf and b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf 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 8123f5fd4a9..795b8768635 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 @@ -1,4 +1,4 @@ -% $Id: pst-plot-doc.tex 641 2017-11-13 18:56:40Z herbert $ +% $Id: pst-plot-doc.tex 648 2017-11-16 12:02:14Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside,dvipsnames,svgnames]{pst-doc} \listfiles @@ -65,7 +65,8 @@ Rolf Niepraschk; Martin Paech; Alan Ristow; Christine Römer; -Arnaud Schmittbuhl +Arnaud Schmittbuhl; +Uwe Siart \end{abstract} \clearpage 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 1a2608d9c95..0961c05fd45 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 641 2017-11-13 18:56:40Z herbert $ +% $Id: pst-plot.tex 647 2017-11-16 10:35:12Z herbert $ %% %% BEGIN 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.85} -\def\filedate{2017/11/12} +\def\fileversion{1.86} +\def\filedate{2017/11/16} \message{ v\fileversion, \filedate\space (tvz,hv)} % \edef\TheAtCode{\the\catcode`\@} @@ -1312,32 +1312,34 @@ D\space##1% \@nameuse{Pst@xAxis#1}\@nameuse{Pst@yAxis#1}}% \psset[pst-plot]{xAxis,yAxis}% % -\define@key[psset]{pst-plot}{xlabelPos}[b]{\pst@expandafter\psset@@xlabelPos{#1}\@nil} -\define@key[psset]{pst-plot}{ylabelPos}[l]{\pst@expandafter\psset@@ylabelPos{#1}\@nil} +\define@key[psset]{pst-plot}{xlabelPos}[b]{\pst@expandafter\psset@@xlabelPos#1\@nil} +\define@key[psset]{pst-plot}{ylabelPos}[l]{\pst@expandafter\psset@@ylabelPos#1\@nil} \def\psset@@xlabelPos#1#2\@nil{% - \ifx#1t - \def\psk@xlabelPos{\tw@}% 2=top - \pst@xticksizeC=\pst@xticksizeB% + \ifx#1t\relax + \let\psk@xlabelPos\tw@% 2=top + \pst@xticksizeC=\pst@xticksizeB \else - \ifx#1a - \def\psk@xlabelPos{\@ne}% 1=axis - \pst@xticksizeC=\z@% + \ifx#1a\relax + \let\psk@xlabelPos\@ne % 1=axis + \pst@xticksizeC=\z@ \else \def\psk@xlabelPos{\z@}% 0=bottom - \pst@xticksizeC=\pst@xticksizeA% - \fi\fi}% + \pst@xticksizeC=\pst@xticksizeA + \fi\fi +} \def\psset@@ylabelPos#1#2\@nil{% - \ifx#1r + \ifx#1r\relax \def\psk@ylabelPos{\tw@}% 2=right - \pst@yticksizeC=\pst@yticksizeB% + \pst@yticksizeC=\pst@yticksizeB \else - \ifx#1a + \ifx#1a\relax \def\psk@ylabelPos{\@ne}% 1=axis - \pst@yticksizeC=\z@% + \pst@yticksizeC=\z@ \else \def\psk@ylabelPos{\z@}% 0=left - \pst@yticksizeC=\pst@yticksizeA% - \fi\fi} + \pst@yticksizeC=\pst@yticksizeA + \fi\fi +} \psset[pst-plot]{xlabelPos=b, ylabelPos=l}% % \define@key[psset]{pst-plot}{xyDecimals}[{}]{\def\psk@xDecimals{#1}\def\psk@yDecimals{#1}} @@ -1776,11 +1778,11 @@ D\space##1% \pst@xticksizeB=\the\pst@dimn% first > second value \fi% \edef\psk@xticksize{\pst@number\pst@xticksizeA \pst@number\pst@xticksizeB}% - \ifnum\psk@xlabelPos<\z@\relax % top - \pst@xticksizeC=\pst@dimn% - \else% + \ifnum\psk@xlabelPos<\z@\relax% top + \pst@xticksizeC=\pst@dimn + \else \pst@xticksizeC=\pst@dimm% bottom - \fi% + \fi } \def\set@yticksize#1{% \pst@expandafter\pst@getxdimdim{#1} {} {}\@nil% x-unit! @@ -1980,8 +1982,10 @@ D\space##1% \def\psaxes@vii(#1,#2)(#3,#4)(#5,#6){% \pst@killglue \begingroup - \ifdim\pst@dimc<\z@\relax \ifdim\pst@dimd<\z@\relax % axes show to left and down - \addbefore@par{xlabelPos=top,ylabelPos=right}\fi\fi + \ifdim\pst@dimc<\z@\relax + \ifdim\pst@dimd<\z@\relax % axes show to left and down + \addbefore@par{xlabelPos=t,ylabelPos=r}% + \fi\fi \use@par% now the same with an optional unit=... in par \pssetxlength\pst@dimc{#5}% ur-x \pssetylength\pst@dimd{#6}% ur-y @@ -2404,8 +2408,8 @@ D\space##1% \fi \else \ifnum\psk@xlabelPos=\tw@ \def\pst@tempC{90}\else\def\pst@tempC{-90}\fi - \pstFPsub\pst@pmtempa{#4}{#3} - \pstFPDiv\pst@pmtempb{\pst@pmtempa}{\psk@Dx} + \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@ @@ -2424,10 +2428,10 @@ D\space##1% % Knows \pst@dimb and \pst@cnta \def\pst@@hlabels{% \setbox\z@=\vbox{% save all in a box - \ifcase\psk@xlabelPos % 0 - \vskip-\pst@xticksizeA\vskip\psxlabelsep\or % 1 - \vskip-1ex\vskip-\pslabelsep\or % 2 - \vskip-\pst@xticksizeB\vskip-\psxlabelsep\vskip-1ex % 3 + \ifcase\psk@xlabelPos + \vskip-\pst@xticksizeA\vskip\psxlabelsep\or% 1 + \vskip-1ex\vskip-\pslabelsep\or% 2 + \vskip-\pst@xticksizeB\vskip-\psxlabelsep\vskip-1ex% 3 \fi \ifnum\pst@cnta<\z@ \pst@dimb=-\pst@dimb\fi \hbox to \z@{% @@ -2452,7 +2456,7 @@ D\space##1% \pst@cnta=#1\relax % % Distance (in sp) to end. \divide\pst@cnta\psk@dy\relax% % Number of ticks/labels \ifnum\pst@cnta=\z@\else - \pst@dima=\psk@dy sp % Space between ticks. + \pst@dima=\psk@dy sp% % Space between ticks. \ifodd\number\psk@labels\else\ifPst@yAxis\pst@@vlabels\fi \fi \showoriginfalse @@ -2463,7 +2467,7 @@ D\space##1% \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% + \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=#3+\psk@Dy}{\pst@pmtempe}{% \ifdim \nA pt < \z@ \def\nB{-\nA}\else \def\nB{\nA}\fi \uput{\psylabelsep}[180]{\pst@yLabelsRot}(0,\rA){% @@ -2484,9 +2488,9 @@ D\space##1% \offinterlineskip \ifshoworigin \vbox to \z@{\vss\hbox to\z@{% - \ifcase\psk@ylabelPos% + \ifcase\psk@ylabelPos \hss\pst@@@vlabel{\psk@Oy}\hskip\psylabelsep\hskip-\pst@yticksizeA\or% - \hskip\pslabelsep\hss\pst@@@vlabel{\psk@Oy}\hss\or % right labels + \hskip\pslabelsep\hss\pst@@@vlabel{\psk@Oy}\hss\or% % right labels \hskip\pst@yticksizeB\hskip\psylabelsep\pst@@@vlabel{\psk@Oy}% \fi}\vss}% \fi @@ -2495,9 +2499,9 @@ D\space##1% \vbox to \z@{% \vss\hbox to\z@{% \ifcase\psk@ylabelPos % and also check for -0 - \hss\ifdim\nA pt=\z@ \ifshoworigin\pst@@@vlabel{0}\fi\else\pst@@@vlabel{\nA}\fi% + \hss\ifdim\nA pt=\z@ \ifshoworigin\pst@@@vlabel{0}\fi\else\pst@@@vlabel{\nA}\fi \hskip\psylabelsep\hskip-\pst@yticksizeA\or% top = 1 - \hss\ifdim\nA pt=\z@ \ifshoworigin\pst@@@vlabel{0}\fi\else\pst@@@vlabel{\nA}\fi% + \hss\ifdim\nA pt=\z@ \ifshoworigin\pst@@@vlabel{0}\fi\else\pst@@@vlabel{\nA}\fi \ifdim\psylabelsep=\z@\hss\else\kern-\psylabelsep\fi\or% right=2 \hskip\pst@yticksizeB\hskip\psylabelsep \ifdim\nA pt=\z@ \ifshoworigin\pst@@@vlabel{0}\fi\else\pst@@@vlabel{\nA}\fi% bottom -- cgit v1.2.3