summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/numericplots/NumericPlots_labels.tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/numericplots/NumericPlots_labels.tex')
-rw-r--r--Master/texmf-dist/tex/latex/numericplots/NumericPlots_labels.tex41
1 files changed, 15 insertions, 26 deletions
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){%