summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-09-19 23:15:08 +0000
committerKarl Berry <karl@freefriends.org>2013-09-19 23:15:08 +0000
commit7d20726c049fe3f539dfc3458a5f542d182eafaa (patch)
tree1208ba74ec623bdfa764d300bb84df1b1e99b5d8 /Master/texmf-dist
parent046a18fe7e999f75ad01f2992df59bafd8396d5e (diff)
numericplots (19sep13)
git-svn-id: svn://tug.org/texlive/trunk@31701 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/numericplots/NumericPlots.pdfbin369286 -> 370947 bytes
-rw-r--r--Master/texmf-dist/doc/latex/numericplots/README.TEXLIVE2
-rw-r--r--Master/texmf-dist/doc/latex/numericplots/src/FurtherExamples.tex5
-rw-r--r--Master/texmf-dist/doc/latex/numericplots/src/MultiplePlots.tex8
-rw-r--r--Master/texmf-dist/doc/latex/numericplots/src/NumericPlotsDoc.tex4
-rw-r--r--Master/texmf-dist/doc/latex/numericplots/src/TechnicalDetails.tex2
-rw-r--r--Master/texmf-dist/doc/latex/numericplots/src/examples/furtherEx_TickLabels.tex4
-rw-r--r--Master/texmf-dist/doc/latex/numericplots/src/examples/multiplots_exampleIII.tex24
-rw-r--r--Master/texmf-dist/doc/latex/numericplots/src/history.tex9
-rw-r--r--Master/texmf-dist/doc/latex/numericplots/src/keys_NumericDataPlot.tex6
-rw-r--r--Master/texmf-dist/tex/latex/numericplots/NumericPlots.sty138
-rw-r--r--Master/texmf-dist/tex/latex/numericplots/NumericPlots_labels.tex41
12 files changed, 151 insertions, 92 deletions
diff --git a/Master/texmf-dist/doc/latex/numericplots/NumericPlots.pdf b/Master/texmf-dist/doc/latex/numericplots/NumericPlots.pdf
index 2262e0fe0ff..8537acb7dbf 100644
--- a/Master/texmf-dist/doc/latex/numericplots/NumericPlots.pdf
+++ b/Master/texmf-dist/doc/latex/numericplots/NumericPlots.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/numericplots/README.TEXLIVE b/Master/texmf-dist/doc/latex/numericplots/README.TEXLIVE
index 65bb109fd44..83fe98d6c6a 100644
--- a/Master/texmf-dist/doc/latex/numericplots/README.TEXLIVE
+++ b/Master/texmf-dist/doc/latex/numericplots/README.TEXLIVE
@@ -11,7 +11,7 @@ If questions or concerns, email tex-live@tug.org.
dspace2struct.m
export2latex.m
LatexFilterMinMax.m
- struct2latexcampaign.m
+ genlatexnames.m
dspace2latex.m
export2pst.m
LatexFilterHull.m
diff --git a/Master/texmf-dist/doc/latex/numericplots/src/FurtherExamples.tex b/Master/texmf-dist/doc/latex/numericplots/src/FurtherExamples.tex
index 1ef2e94ab2c..14ba60b0909 100644
--- a/Master/texmf-dist/doc/latex/numericplots/src/FurtherExamples.tex
+++ b/Master/texmf-dist/doc/latex/numericplots/src/FurtherExamples.tex
@@ -183,7 +183,7 @@ Here, some features of the pst-plot command \verb|listplot| are illustrated. Wit
\subsection{Custom Grid}
-To plot a custom grid (grid-lines are not äquidistant) the following procedure
+To plot a custom grid (grid-lines are not equidistant) the following procedure
may be used if working with Matlab:
Add the following code after export2latex (XTick is a vector containing the
@@ -293,8 +293,9 @@ with linejoin=1.
-\subsection{Customized Tick Labels}
+\subsection{Customized Tick Labels}\label{sec:CustomTickLabels}
+A common task is to plot a graph without numeric tick labels but with selected customized labels. This is easily accomplished by setting the option \verb|NoTickLabel| when plotting the axis and adding the customized labels with the commands \verb|PutTickLabelXaxis| and \verb|PutTickLabelYaxis|. Note that when setting \verb|NoTickLabel| for an axis, the option \verb|ax| has to be set in each call of \verb|PutTickLabelXaxis| and \verb|PutTickLabelYaxis| according to the axis one wishes to place the label at. This is also required if only the lower x-axis or left y-axis are plotted and tick labelled.
\begin{minipage}[T]{0.5\linewidth}
\lstinputlisting[linerange=5-12]{examples/furtherEx_TickLabels}
diff --git a/Master/texmf-dist/doc/latex/numericplots/src/MultiplePlots.tex b/Master/texmf-dist/doc/latex/numericplots/src/MultiplePlots.tex
index de2b8a42dc7..9985b8614eb 100644
--- a/Master/texmf-dist/doc/latex/numericplots/src/MultiplePlots.tex
+++ b/Master/texmf-dist/doc/latex/numericplots/src/MultiplePlots.tex
@@ -35,3 +35,11 @@ An example with different y-axes on the left and on the right side:
\lstinputlisting{examples/multiplots_exampleII}
\input{examples/multiplots_exampleII}
+
+
+It is also possible to rotate the labels of the axes (LabelRot and LabelRefPt
+have to be set after AxisStyle!):
+
+\lstinputlisting[firstline=12, lastline=20]{examples/multiplots_exampleIII}
+
+\input{examples/multiplots_exampleIII}
diff --git a/Master/texmf-dist/doc/latex/numericplots/src/NumericPlotsDoc.tex b/Master/texmf-dist/doc/latex/numericplots/src/NumericPlotsDoc.tex
index 16d0e53afec..8ce4b122bdd 100644
--- a/Master/texmf-dist/doc/latex/numericplots/src/NumericPlotsDoc.tex
+++ b/Master/texmf-dist/doc/latex/numericplots/src/NumericPlotsDoc.tex
@@ -61,7 +61,7 @@
\definecolor{NumericPlotsCommands}{RGB}{0, 102, 153}
\usepackage{listings}
\lstset{language=[latex]tex,tabsize=2,basicstyle=\small\ttfamily,%
- numbers=left, numberstyle=\tiny,%
+ numbers=none, numberstyle=\tiny,%
breaklines=true, breakatwhitespace=false,%
emptylines=*1,%
columns=flexible,%
@@ -71,7 +71,7 @@
NDPput,putExpX,putExpY,%
putN,putNE,putE,putSE,putS,putSW,putW,putNW,%
PutTickLabelYaxis,PutTickLabelXaxis,%
- NDPhline, NDPvline, NDPline, NDPhbox NDPvbox, NDPbox,%
+ NDPhline, NDPvline, NDPline, NDPhbox, NDPvbox, NDPbox,%
LegendDefinition, LegLine,%
StdLabelOption,StdTickLabelOption,%
multilistplot, testframe}%
diff --git a/Master/texmf-dist/doc/latex/numericplots/src/TechnicalDetails.tex b/Master/texmf-dist/doc/latex/numericplots/src/TechnicalDetails.tex
index f60ba99e253..9b5bdb7df1e 100644
--- a/Master/texmf-dist/doc/latex/numericplots/src/TechnicalDetails.tex
+++ b/Master/texmf-dist/doc/latex/numericplots/src/TechnicalDetails.tex
@@ -24,7 +24,7 @@
The following example shows some possibilities to format the axis labels and the
tick labels. The example is not intended to be pretty nor useful in any other
-way than just showing some labels.
+way than just showing some labels. More examples of customized tick labels are listed in Sec.~\ref{sec:CustomTickLabels}.
\input{examples/LabelsNTickLabels}
diff --git a/Master/texmf-dist/doc/latex/numericplots/src/examples/furtherEx_TickLabels.tex b/Master/texmf-dist/doc/latex/numericplots/src/examples/furtherEx_TickLabels.tex
index 79f047b1336..4b42a10ca74 100644
--- a/Master/texmf-dist/doc/latex/numericplots/src/examples/furtherEx_TickLabels.tex
+++ b/Master/texmf-dist/doc/latex/numericplots/src/examples/furtherEx_TickLabels.tex
@@ -5,10 +5,10 @@
\plotxAxis[NoTickLabel]{x-axis label}
\plotyAxis[NoLabel, NoTickLabel]{y-axis label}
- \PutTickLabelXaxis[x=1.2]{test}
+ \PutTickLabelXaxis[x=1.2, ax=lower]{test}
\PutTickLabelXaxis[x=1.1, ax=upper]{test1}
- \PutTickLabelYaxis[y=80]{test}
+ \PutTickLabelYaxis[y=80, ax=left]{test}
\PutTickLabelYaxis[y=100, ax=right]{test1}
diff --git a/Master/texmf-dist/doc/latex/numericplots/src/examples/multiplots_exampleIII.tex b/Master/texmf-dist/doc/latex/numericplots/src/examples/multiplots_exampleIII.tex
new file mode 100644
index 00000000000..5be87bb1b14
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/numericplots/src/examples/multiplots_exampleIII.tex
@@ -0,0 +1,24 @@
+\newpsstyle{Database}{linecolor=LineColorA, linestyle=none, dotstyle=*,
+showpoints=true, dotsize=5pt}
+\newpsstyle{Result}{linecolor=LineColorB, linestyle=none, dotstyle=+,
+showpoints=true, dotsize=10pt}
+
+\begin{NumericDataPlot}{\textwidth}{0.25\textheight}
+
+ % --- definition of the axis and the grid ---
+ \setxAxis{xMin=2, xMax=17, Dx=4}
+ \setyAxis{yMin=20, yMax=70, Dy=20}
+
+ % plot the axis of the lower left corner
+ \plotxAxis[LabelRot=15]{Stichnummer}
+ \plotyAxis[LabelRot=30, LabelRefPt=tr]{$F_{roll}$ in $\si{\mega\newton}$}
+
+ \listplot[style=Database]{\DataA}
+
+ % define a second y-axis
+ \setyAxis{yMin=40, yMax=90, Dy=20}
+ \plotyAxis[AxisStyle=Right, NoGrid, LabelRot=90]{$F_{roll}$}
+
+ \listplot[style=Result]{\DataA}
+
+\end{NumericDataPlot} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/numericplots/src/history.tex b/Master/texmf-dist/doc/latex/numericplots/src/history.tex
index 888f2840a10..50fa0fca5c6 100644
--- a/Master/texmf-dist/doc/latex/numericplots/src/history.tex
+++ b/Master/texmf-dist/doc/latex/numericplots/src/history.tex
@@ -159,4 +159,13 @@ height parameter to set the object height. Now, the given height parameter is co
\begin{itemize}
\item changed implementation of subgrids for logarithmic axes
\end{itemize}
+ \item 04.06.2013
+ \begin{itemize}
+ \item corrected and added documentation concerning the use of \verb|PutTickLabelXaxis| and \verb|PutTickLabelYaxis| for customized tick labels
+ \end{itemize}
+ \item 18.09.2013
+ \begin{itemize}
+ \item corrected error ocurring for xLog and yLog labels. In some occasions
+ Latex wrote $10^{-0}$ instead of $10^{0}$.
+ \end{itemize}
\end{itemize}
diff --git a/Master/texmf-dist/doc/latex/numericplots/src/keys_NumericDataPlot.tex b/Master/texmf-dist/doc/latex/numericplots/src/keys_NumericDataPlot.tex
index c7abbaee6b5..0d685e92058 100644
--- a/Master/texmf-dist/doc/latex/numericplots/src/keys_NumericDataPlot.tex
+++ b/Master/texmf-dist/doc/latex/numericplots/src/keys_NumericDataPlot.tex
@@ -45,15 +45,17 @@ Rot&NumericDataPlot&put&ordinary&0\\
LabelPos&NumericDataPlot&putxLabel&command&[none]\\
LabelOption&NumericDataPlot&putxLabel&command&[none]\\
LabelOrientation&NumericDataPlot&putxLabel&command&[none]\\
+LabelRot&NumericDataPlot&putxLabel&command&[none]\\
+LabelRefPt&NumericDataPlot&putxLabel&command&[none]\\
LabelPos&NumericDataPlot&putyLabel&command&[none]\\
LabelOption&NumericDataPlot&putyLabel&command&[none]\\
LabelOrientation&NumericDataPlot&putyLabel&command&[none]\\
+LabelRot&NumericDataPlot&putyLabel&command&[none]\\
+LabelRefPt&NumericDataPlot&putyLabel&command&[none]\\
LabelSep&NumericDataPlot&putxLabel&ordinary&\origXLabelSep \\
LabelSep&NumericDataPlot&putyLabel&ordinary&\origYLabelSep \\
ax&NumericDataPlot&putxLabel&choice&[none]\\
ax&NumericDataPlot&putyLabel&choice&[none]\\
-LabelRefPt&NumericDataPlot&putxLabel&ordinary&[none]\\
-LabelRefPt&NumericDataPlot&putyLabel&ordinary&[none]\\
x&NumericDataPlot&putxTickLabel&ordinary&[none]\\
y&NumericDataPlot&putyTickLabel&ordinary&[none]\\
TickLabelRefPt&NumericDataPlot&putxTickLabel&ordinary&[none]\\
diff --git a/Master/texmf-dist/tex/latex/numericplots/NumericPlots.sty b/Master/texmf-dist/tex/latex/numericplots/NumericPlots.sty
index babea7d8338..ac10d4ae09c 100644
--- a/Master/texmf-dist/tex/latex/numericplots/NumericPlots.sty
+++ b/Master/texmf-dist/tex/latex/numericplots/NumericPlots.sty
@@ -141,7 +141,17 @@
\define@boolkey[NumericDataPlot]{Axis}{xLog}[true]{
\ifNumericDataPlot@Axis@xLog
\renewcommand{\LogxAxis}{log}
- \renewcommand{\LogxAxisLabel}[1]{$10^{##1}$}
+ \renewcommand{\LogxAxisLabel}[1]{
+ \ifthenelse{##1<1}{
+ \ifthenelse{##1>-1}{%
+ $10^{0}$%
+ }{%
+ $10^{##1}$%
+ }}%
+ {%
+ $10^{##1}$%
+ }%
+ }%
\else
\renewcommand{\LogxAxis}{}
\renewcommand{\LogxAxisLabel}[1]{$##1$}
@@ -151,7 +161,17 @@
\define@boolkey[NumericDataPlot]{Axis}{yLog}[true]{
\ifNumericDataPlot@Axis@yLog
\renewcommand{\LogyAxis}{log}
- \renewcommand{\LogyAxisLabel}[1]{$10^{##1}$}
+ \renewcommand{\LogyAxisLabel}[1]{
+ \ifthenelse{##1<1}{
+ \ifthenelse{##1>-1}{%
+ $10^{0}$%
+ }{%
+ $10^{##1}$%
+ }}%
+ {%
+ $10^{##1}$%
+ }%
+ }%
\else
\renewcommand{\LogyAxis}{}
\renewcommand{\LogyAxisLabel}[1]{$##1$}
@@ -341,10 +361,11 @@
\FPround{\NumDataPlotxMax}{\NumDataPlotxMax}{3}
\FPln{\NumDataPlotBuffer}{\NumDataPlotxMin}
\FPdiv{\NumDataPlotxMin}{\NumDataPlotBuffer}{\NumDataPlotLnTen}
- \FPround{\NumDataPlotxMin}{\NumDataPlotxMin}{3}
+ \FPround{\NumDataPlotxMin}{\NumDataPlotxMin}{3}
\renewcommand{\NumDataPlotDx}{1}
- \FPadd{\NumDataPlotBuffer}{\NumDataPlotxMin}{0.5}
- \FPtrunc{\NumDataPlotxO}{\NumDataPlotBuffer}{0}
+ \FPtrunc{\NumDataPlotBuffer}{\NumDataPlotxMin}{0}
+ \FPadd{\NumDataPlotxO}{\NumDataPlotBuffer}{1}
+ \FPround{\NumDataPlotxO}{\NumDataPlotBuffer}{0}
\fi
\FPsub{\NumDataPlotxRange}{\NumDataPlotxMax}{\NumDataPlotxMin}
@@ -456,7 +477,7 @@
\PutTickLabelXaxis[#1,x=\n]{\LogxAxisLabel{\n}}
}
% plot tick at origin
- \PutTickLabelXaxis[#1,x=\NumDataPlotxO]{\LogxAxisLabel{\NumDataPlotxO}}
+ \PutTickLabelXaxis[#1,x=\NumDataPlotxO]{\LogxAxisLabel{\NumDataPlotxO}}
}
\newcommand{\xLogSubGrid}[1]{
@@ -474,7 +495,9 @@
\fi
}
-\newcommand{\plotxGrid}{
+\newcommand{\plotxGrid}[1][NoGrid=false]{
+ \setkeys*[NumericDataPlot]{xAxis}{#1}
+
% plot gridline on right side of the origin
\mmultido{\n=\xCoordOrig+\NumDataPlotdx}{\TicksXRight}{
\plotxGridLine{\n}
@@ -498,51 +521,51 @@
\setrmkeys*[NumericDataPlot]{putxTickLabel}
\setrmkeys[NumericDataPlot]{xAxis}
- % plot grid, ticks and ticklabels
- \plotxGrid{}
-
+ % plot grid, ticks and ticklabels
+ \plotxGrid[#1]
- % plot lower axis
- \ifthenelse{\boolean{PlotLowerAxis}}
- {
- \psline{C-C}%
- (\NumDataPlotxCoordMin, \NumDataPlotyCoordMin)%
- (\NumDataPlotxCoordMax, \NumDataPlotyCoordMin)
- \ifNumericDataPlot@xAxis@NoTickLabel
- \else
- \plotxTickLabels{ax=lower,#1}
- \fi
- % plot label
- \ifNumericDataPlot@xAxis@NoLabel
- \else
- \PutLabelXaxis[ax=lower,#1]{#2}
- \fi
- %plot upper axis (boxed)
- \ifthenelse{\boolean{PlotUpperAxis}}{
- % plot upper axis
- \psline{C-C}%
- (\NumDataPlotxCoordMin,\NumDataPlotyCoordMax)%
- (\NumDataPlotxCoordMax,\NumDataPlotyCoordMax)
- }{}
- }{
- % plot upper axis (only upper axis)
- \ifthenelse{\boolean{PlotUpperAxis}}{
- % plot upper axis
- \psline{C-C}%
- (\NumDataPlotxCoordMin,\NumDataPlotyCoordMax)%
- (\NumDataPlotxCoordMax, \NumDataPlotyCoordMax)
- % plot ticklabels
- \ifNumericDataPlot@xAxis@NoTickLabel
- \else
- \plotxTickLabels{ax=upper,#1}
- \fi
- % plot label
- \ifNumericDataPlot@xAxis@NoLabel
- \else
- \PutLabelXaxis[ax=upper,#1]{#2}
- \fi
- }{}
- }
+
+ % plot lower axis
+ \ifthenelse{\boolean{PlotLowerAxis}}
+ {
+ \psline{C-C}%
+ (\NumDataPlotxCoordMin, \NumDataPlotyCoordMin)%
+ (\NumDataPlotxCoordMax, \NumDataPlotyCoordMin)
+ \ifNumericDataPlot@xAxis@NoTickLabel
+ \else
+ \plotxTickLabels{ax=lower,#1}
+ \fi
+ % plot label
+ \ifNumericDataPlot@xAxis@NoLabel
+ \else
+ \PutLabelXaxis[ax=lower,#1]{#2}
+ \fi
+ %plot upper axis (boxed)
+ \ifthenelse{\boolean{PlotUpperAxis}}{
+ % plot upper axis
+ \psline{C-C}%
+ (\NumDataPlotxCoordMin,\NumDataPlotyCoordMax)%
+ (\NumDataPlotxCoordMax,\NumDataPlotyCoordMax)
+ }{}
+ }{
+ % plot upper axis (only upper axis)
+ \ifthenelse{\boolean{PlotUpperAxis}}{
+ % plot upper axis
+ \psline{C-C}%
+ (\NumDataPlotxCoordMin,\NumDataPlotyCoordMax)%
+ (\NumDataPlotxCoordMax, \NumDataPlotyCoordMax)
+ % plot ticklabels
+ \ifNumericDataPlot@xAxis@NoTickLabel
+ \else
+ \plotxTickLabels{ax=upper,#1}
+ \fi
+ % plot label
+ \ifNumericDataPlot@xAxis@NoLabel
+ \else
+ \PutLabelXaxis[ax=upper,#1]{#2}
+ \fi
+ }{}
+ }
}
\newcommand{\repeatxAxis}{\plotxAxis[NoLabel, NoTickLabel]{}}
@@ -587,13 +610,14 @@
\ifNumericDataPlot@Axis@yLog
\FPln{\NumDataPlotBuffer}{\NumDataPlotyMax}
\FPdiv{\NumDataPlotyMax}{\NumDataPlotBuffer}{\NumDataPlotLnTen}
- \FPround{\NumDataPlotyMax}{\NumDataPlotyMax}{6}
+ \FPround{\NumDataPlotyMax}{\NumDataPlotyMax}{6}
\FPln{\NumDataPlotBuffer}{\NumDataPlotyMin}
\FPdiv{\NumDataPlotyMin}{\NumDataPlotBuffer}{\NumDataPlotLnTen}
\FPround{\NumDataPlotyMin}{\NumDataPlotyMin}{6}
\renewcommand{\NumDataPlotDy}{1}
- \FPadd{\NumDataPlotBuffer}{\NumDataPlotyMin}{0.5}
- \FPtrunc{\NumDataPlotyO}{\NumDataPlotBuffer}{0}
+ \FPtrunc{\NumDataPlotBuffer}{\NumDataPlotyMin}{0}
+ \FPadd{\NumDataPlotyO}{\NumDataPlotBuffer}{1}
+ \FPround{\NumDataPlotyO}{\NumDataPlotyO}{0}
\fi
\FPsub{\NumDataPlotyRange}{\NumDataPlotyMax}{\NumDataPlotyMin}
@@ -704,7 +728,9 @@
\fi
}
-\newcommand{\plotyGrid}{
+\newcommand{\plotyGrid}[1][NoGrid=false]{
+ \setkeys*[NumericDataPlot]{yAxis}{#1}
+
% plot gridline on right side of the origin
\mmultido{\n=\yCoordOrig+\NumDataPlotdy}{\TicksYRight}{
\plotyGridLine{\n}
@@ -746,7 +772,7 @@
\setrmkeys[NumericDataPlot]{yAxis}
% plot grid
- \plotyGrid
+ \plotyGrid[#1]
% plot left axis
\ifthenelse{\boolean{PlotLeftAxis}}
diff --git a/Master/texmf-dist/tex/latex/numericplots/NumericPlots_labels.tex b/Master/texmf-dist/tex/latex/numericplots/NumericPlots_labels.tex
index e0d6e518485..f581eaf7e65 100644
--- a/Master/texmf-dist/tex/latex/numericplots/NumericPlots_labels.tex
+++ b/Master/texmf-dist/tex/latex/numericplots/NumericPlots_labels.tex
@@ -11,10 +11,10 @@
\newcommand{\NumDataPlotBaseline}{0}
\newcommand{\NumDataPlotDistance}{1}
-\newcommand{\xLabelRefPt}{t}
-\newcommand{\yLabelRefPt}{r}
-\newcommand{\xLabelRot}{0}
-\newcommand{\yLabelRot}{90}
+% \newcommand{\xLabelRefPt}{t}
+% \newcommand{\yLabelRefPt}{r}
+% \newcommand{\xLabelRot}{0}
+% \newcommand{\yLabelRot}{90}
@@ -23,10 +23,10 @@
% ------------------------------------------------------------------------------
\define@cmdkeys[NumericDataPlot]{putxLabel}[NumDataPlotx]{
- LabelPos, LabelOption, LabelOrientation
+ LabelPos, LabelOption, LabelOrientation, LabelRot, LabelRefPt
}
\define@cmdkeys[NumericDataPlot]{putyLabel}[NumDataPloty]{
- LabelPos, LabelOption, LabelOrientation
+ LabelPos, LabelOption, LabelOrientation, LabelRot, LabelRefPt
}
\define@key[NumericDataPlot]{putxLabel}{LabelSep}[\origXLabelSep]{\setlength{\xLabelSep}{#1}}
@@ -35,13 +35,11 @@
\define@choicekey+[NumericDataPlot]{putxLabel}{ax}[\val\nrPutAxis]
{lower,upper}{
\ifcase\nrPutAxis\relax
- \renewcommand{\xLabelRot}{0}
- \renewcommand{\xLabelRefPt}{t}
- \renewcommand{\NumDataPlotBaseline}{\NumDataPlotyCoordMin}
+ \setkeys[NumericDataPlot]{putxLabel}{LabelRot=0, LabelRefPt=t}%
+ \renewcommand{\NumDataPlotBaseline}{\NumDataPlotyCoordMin}
\renewcommand{\NumDataPlotDistance}{-1}
\or
- \renewcommand{\xLabelRot}{0}
- \renewcommand{\xLabelRefPt}{b}
+ \setkeys[NumericDataPlot]{putxLabel}{LabelRot=0, LabelRefPt=b}%
\renewcommand{\NumDataPlotBaseline}{\NumDataPlotyCoordMax}
\renewcommand{\NumDataPlotDistance}{1}
\fi
@@ -52,13 +50,11 @@
\define@choicekey+[NumericDataPlot]{putyLabel}{ax}[\val\nrPutAxis]
{left,right}{
\ifcase\nrPutAxis\relax
- \renewcommand{\yLabelRot}{90}
- \renewcommand{\yLabelRefPt}{b}
+ \setkeys[NumericDataPlot]{putyLabel}{LabelRot=90, LabelRefPt=b}%
\renewcommand{\NumDataPlotBaseline}{\NumDataPlotxCoordMin}
\renewcommand{\NumDataPlotDistance}{-1}
\or
- \renewcommand{\yLabelRot}{270}
- \renewcommand{\yLabelRefPt}{b}
+ \setkeys[NumericDataPlot]{putyLabel}{LabelRot=270, LabelRefPt=b}%
\renewcommand{\NumDataPlotBaseline}{\NumDataPlotxCoordMax}
\renewcommand{\NumDataPlotDistance}{1}
\fi
@@ -66,13 +62,6 @@
\PackageWarning{NumericPlots}
{Axis #1 not defined. Use left or right.}
}
-% the LabelRefPt keys
-\define@key[NumericDataPlot]{putxLabel}{LabelRefPt}{
- \renewcommand{\xLabelRefPt}{#1}
-}
-\define@key[NumericDataPlot]{putyLabel}{LabelRefPt}{
- \renewcommand{\yLabelRefPt}{#1}
-}
\newcommand\CheckIfColumntypeDefined[1]{%
\providebool{tpl@coltype@#1}
@@ -116,8 +105,8 @@
\FPmul{\NumDataPlotBuffer}{\NumDataPlotBuffer}{\NumDataPlotDistance}%
\FPadd{\NumDataPlotBuffer}{\NumDataPlotBuffer}{\NumDataPlotBaseline}%
%
- \rput[\xLabelRefPt]%
- {\xLabelRot}%
+ \rput[\NumDataPlotxLabelRefPt]%
+ {\NumDataPlotxLabelRot}%
(!\NumDataPlotxCoordRange\space \NumDataPlotxLabelPos\space mul %
\NumDataPlotxCoordMin\space add \NumDataPlotBuffer\space){%
\makeXLabel{#2}%
@@ -145,8 +134,8 @@
\FPmul{\NumDataPlotBuffer}{\NumDataPlotBuffer}{\NumDataPlotDistance}%
\FPadd{\NumDataPlotBuffer}{\NumDataPlotBuffer}{\NumDataPlotBaseline}%
%
- \rput[\yLabelRefPt]%
- {\yLabelRot}%
+ \rput[\NumDataPlotyLabelRefPt]%
+ {\NumDataPlotyLabelRot}%
(!\NumDataPlotBuffer\space %
\NumDataPlotyCoordRange\space \NumDataPlotyLabelPos\space mul %
\NumDataPlotyCoordMin\space add){%