Add -tickformat axis option, rename -command option to -tickformatcommand

2 files changed, 48 insertions, 32 deletions

diff --git a/doc/graph.html b/doc/graph.html
index 412c817..70f1e6f 100644
--- a/doc/graph.html
+++ b/doc/graph.html
@@ -438,23 +438,6 @@
                      Sets the color of the axis and tick labels.  The  default
                      is black.
 
-              <B>-command</B> <I>prefix</I>
-                     Specifies a Tcl command to be invoked when formatting the
-                     axis tick labels. <I>Prefix</I> is a string containing the  name
-                     of  a Tcl proc and any extra arguments for the procedure.
-                     This command is invoked for each major tick on the  axis.
-                     Two additional arguments are passed to the procedure: the
-                     pathname of the widget and the current the numeric  value
-                     of  the  tick.   The procedure returns the formatted tick
-                     label.  If "" is returned, no label will appear  next  to
-                     the  tick.  You can get the standard tick labels again by
-                     setting <I>prefix</I> to "".  The default is "".
-
-                     Please note that this  procedure  is  invoked  while  the
-                     graph  is  redrawn.  You may query configuration options.
-                     But  do  not  them,  because  this  can  have  unexpected
-                     results.
-
               <B>-descending</B> <I>boolean</I>
                      Indicates whether the values along the axis are monotoni-
                      cally increasing or decreasing.  If <I>boolean</I> is true,  the
@@ -542,6 +525,31 @@
                      Specifies the font for axis tick labels. The  default  is
                      *-Courier-Bold-R-Normal-*-100-*.
 
+              <B>-tickformat</B> <I>formatStr</I>
+                     Specifies a printf-like description to format teh axis
+                     tick labels.  You can get the standard tick labels again by
+                     setting <I>formatStr</I> to "".  The default is "".
+
+              <B>-tickformatcommand</B>, <B>-command</B> <I>prefix</I>
+                     Specifies a Tcl command to be invoked when formatting the
+                     axis tick labels. <I>Prefix</I> is a string containing the  name
+                     of  a Tcl proc and any extra arguments for the procedure.
+                     This command is invoked for each major tick on the  axis.
+                     Two additional arguments are passed to the procedure: the
+                     pathname of the widget and the current the numeric  value
+                     of  the  tick.   The procedure returns the formatted tick
+                     label.  If "" is returned, no label will appear  next  to
+                     the  tick.  You can get the standard tick labels again by
+                     setting <I>prefix</I> to "".  The default is "".
+
+                     The numeric value for the tick might change when using the
+                     <B>-logscale</B> and <B>-tickformat</B> options.
+
+                     Please note that this  procedure  is  invoked  while  the
+                     graph  is  redrawn.  You may query configuration options.
+                     But  do  not  them,  because  this  can  have  unexpected
+                     results.
+
               <B>-ticklength</B> <I>pixels</I>
                      Sets the length of major and minor ticks (minor ticks are
                      half the length of major ticks). If <I>pixels</I> is  less  than
diff --git a/doc/graph.n b/doc/graph.n
index 72df726..fbbbb9b 100644
--- a/doc/graph.n
+++ b/doc/graph.n
@@ -686,21 +686,6 @@ the element is always the first tag in the list.  The default value is
 Sets the color of the axis and tick labels.
 The default is \f(CWblack\fR.
 .TP
-\fB\-command \fIprefix\fR
-Specifies a Tcl command to be invoked when formatting the axis tick
-labels. \fIPrefix\fR is a string containing the name of a Tcl proc and
-any extra arguments for the procedure.  This command is invoked for each
-major tick on the axis.  Two additional arguments are passed to the
-procedure: the pathname of the widget and the current the numeric
-value of the tick.  The procedure returns the formatted tick label.  If
-\f(CW""\fR is returned, no label will appear next to the tick.  You can
-get the standard tick labels again by setting \fIprefix\fR to
-\f(CW""\fR.  The default is \f(CW""\fR.
-.sp 1
-Please note that this procedure is invoked while the graph is redrawn.
-You may query configuration options.  But do not them, because this
-can have unexpected results.
-.TP
 \fB\-descending \fIboolean\fR 
 Indicates whether the values along the axis are monotonically increasing or
 decreasing.  If \fIboolean\fR is true, the axis values will be
@@ -810,6 +795,29 @@ displayed.  The default is \f(CW2\fR.
 Specifies the font for axis tick labels. The default is
 \f(CW*-Courier-Bold-R-Normal-*-100-*\fR.
 .TP
+\fB\-tickformat\fR \fIformatStr\fR
+Specifies a printf-like description to format teh axis
+tick labels.  You can get the standard tick labels again by
+setting \fIformatStr\fR to \f(CW""\fR.  The default is \f(CW""\fR.
+.TP
+\fB\-tickformatcommand\fR, \fB\-command \fIprefix\fR
+Specifies a Tcl command to be invoked when formatting the axis tick
+labels. \fIPrefix\fR is a string containing the name of a Tcl proc and
+any extra arguments for the procedure.  This command is invoked for each
+major tick on the axis.  Two additional arguments are passed to the
+procedure: the pathname of the widget and the current the numeric
+value of the tick.  The procedure returns the formatted tick label.  If
+\f(CW""\fR is returned, no label will appear next to the tick.  You can
+get the standard tick labels again by setting \fIprefix\fR to
+\f(CW""\fR.  The default is \f(CW""\fR.
+.sp 1
+The numeric value for the tick might change when using the
+\fB\-logscale\fR and \fB\-tickformat\fR options.
+.sp 1
+Please note that this procedure is invoked while the graph is redrawn.
+You may query configuration options.  But do not them, because this
+can have unexpected results.
+.TP
 \fB\-ticklength \fIpixels\fR
 Sets the length of major and minor ticks (minor ticks are half the
 length of major ticks). If \fIpixels\fR is less than zero, the axis