Index: docs/gnuplot.doc
===================================================================
RCS file: /cvsroot/gnuplot/gnuplot/docs/gnuplot.doc,v
retrieving revision 1.198
diff -u -r1.198 gnuplot.doc
--- docs/gnuplot.doc	22 Dec 2003 05:13:18 -0000	1.198
+++ docs/gnuplot.doc	26 Dec 2003 22:47:04 -0000
@@ -8049,7 +8049,7 @@
                  {  autofreq
                   | <incr>
                   | <start>, <incr> {,<end>}
-                  | ({"<label>"} <pos> {,{"<label>"} <pos>}...) }
+                  | ({"<label>"} <pos> {<level>} {,{"<label>"}...) }
                  { font "name{,<size>}" }
                  { textcolor <colorspec> }
        unset xtics
@@ -8103,22 +8103,28 @@
  Make tics at 1, 100, 1e4, 1e6, 1e8.
        set logscale x; set xtics 1,100,1e8
 
- The explicit ("<label>" <pos>, ...) form allows arbitrary tic positions or
- non-numeric tic labels.  A set of tics is a set of positions, each with its
- own optional label.  Note that the label is a string enclosed by quotes.  It
- may be a constant string, such as "hello", may contain formatting information
- for converting the position into its label, such as "%3f clients", or may be
- empty, "".  See `set format` for more information.  If no string is given,
- the default label (numerical) is used.  In this form, the tics do not need to
- be listed in numerical order.
+ The explicit ("<label>" <pos> <level>, ...) form allows arbitrary tic
+ positions or non-numeric tic labels.  In this form, the tics do not
+ need to be listed in numerical order.  Each tic has a 
+ position, optionally with a label.  Note that the label is
+ a string enclosed by quotes.  It may be a constant string, such as
+ "hello", may contain formatting information for converting the
+ position into its label, such as "%3f clients", or may be empty, "".
+ See `set format` for more information.  If no string is given, the
+ default label (numerical) is used.
+
+ An explicit tic mark has a third parameter, the "level".  The default
+ is level 0, a major tic.  A level of 1 generates a minor tic.  If the
+ level is specified, then the label must also be supplied.
 
  Examples:
        set xtics ("low" 0, "medium" 50, "high" 100)
        set xtics (1,2,4,8,16,32,64,128,256,512,1024)
        set ytics ("bottom" 0, "" 10, "top" 20)
+       set ytics ("bottom" 0, "" 10 1, "top" 20)
 
  In the second example, all tics are labelled.  In the third, only the end
- tics are labelled.
+ tics are labelled.  In the fourth, the unlabeled tic is a minor tic.
 
  However they are specified, tics will only be plotted when in range.
 
Index: src/axis.c
===================================================================
RCS file: /cvsroot/gnuplot/gnuplot/src/axis.c,v
retrieving revision 1.37
diff -u -r1.37 axis.c
--- src/axis.c	13 Nov 2003 08:37:57 -0000	1.37
+++ src/axis.c	26 Dec 2003 22:47:16 -0000
@@ -563,12 +563,16 @@
     /* order of magnitude of argument: */
     double power = dbl_raise(10.0, floor(log10(arg))); 
     double xnorm = arg / power;	/* approx number of decades */
+    /* we expect 1 <= xnorm <= 10 */
     double posns = guide / xnorm; /* approx number of tic posns per decade */
+    /* with guide=20, we expect 2 <= posns <= 20 */
     double tics;
 
     /* FIXME HBB 20020220: Looking at these, I would normally expect
      * to see posns*tics to be always about the same size. But we
      * rather suddenly drop from 2.0 to 1.0 at tic step 0.5. Why? */
+    /* JRV 20021117: fixed this by changing next to last threshold
+       from 1 to 2.  However, with guide=20, this doesn't matter. */
     if (posns > 40)
 	tics = 0.05;		/* eg 0, .05, .10, ... */
     else if (posns > 20)
@@ -577,7 +581,7 @@
 	tics = 0.2;		/* eg 0,0.2,0.4,... */
     else if (posns > 4)
 	tics = 0.5;		/* 0,0.5,1, */
-    else if (posns > 1)
+    else if (posns > 2)
 	tics = 1;		/* 0,1,2,.... */
     else if (posns > 0.5)
 	tics = 2;		/* 0, 2, 4, 6 */
@@ -613,7 +617,7 @@
     /* FIXME HBB 20010831: disabling this might allow short log axis
      * to receive better ticking... */
     if (axis_array[axis].log && tic < 1.0)
-	tic = 1.0;
+	  tic = 1.0;
 
     if (axis_array[axis].is_timedata)
 	return quantize_time_tics(axis, tic, xr, guide);
@@ -889,11 +893,11 @@
 		gstrftime(label, 24, mark->label ? mark->label : ticfmt[axis], mark->position);
 	    else
 		gprintf(label, sizeof(label), mark->label ? mark->label : ticfmt[axis], log10_base, mark->position);
-
-	    (*callback) (axis, internal, label, lgrd);
+	    /* use NULL instead of label for minitic */
+	    (*callback) (axis, internal, mark->level?NULL:label, lgrd);
 	}
 
-	return;			/* NO MINITICS FOR USER-DEF TICS */
+	return;
 	/*}}} */
     }
 
Index: src/axis.h
===================================================================
RCS file: /cvsroot/gnuplot/gnuplot/src/axis.h,v
retrieving revision 1.33
diff -u -r1.33 axis.h
--- src/axis.h	9 Dec 2003 02:49:23 -0000	1.33
+++ src/axis.h	26 Dec 2003 22:47:22 -0000
@@ -96,6 +96,7 @@
 typedef struct ticmark {
     double position;		/* where on axis is this */
     char *label;		/* optional (format) string label */
+    int level;			/* 0=major tic, 1=minor tic */
     struct ticmark *next;	/* linked list */
 } ticmark;
 
Index: src/set.c
===================================================================
RCS file: /cvsroot/gnuplot/gnuplot/src/set.c,v
retrieving revision 1.125
diff -u -r1.125 set.c
--- src/set.c	22 Dec 2003 05:13:19 -0000	1.125
+++ src/set.c	26 Dec 2003 22:47:31 -0000
@@ -147,7 +147,8 @@
 static void set_xyzlabel __PROTO((label_struct * label));
 static void load_tics __PROTO((AXIS_INDEX axis));
 static void load_tic_user __PROTO((AXIS_INDEX axis));
-static void add_tic_user __PROTO((AXIS_INDEX, char * label, double position)); 
+static void add_tic_user __PROTO((AXIS_INDEX, char * label, double position,
+				  int level)); 
 static void load_tic_series __PROTO((AXIS_INDEX axis));
 static void load_offsets __PROTO((double *a, double *b, double *c, double *d));
 static void parse_colorspec __PROTO((struct t_colorspec *tc, int option));
@@ -3874,7 +3875,7 @@
 
 /* load TIC_USER definition */
 /* (tic[,tic]...)
- * where tic is ["string"] value
+ * where tic is ["string"] value [level]
  * Left paren is already scanned off before entry.
  */
 static void
@@ -3893,7 +3894,8 @@
     axis_array[axis].ticdef.def.user = NULL;
 
     while (!END_OF_COMMAND) {
-	/* syntax is  (  ['format'] value[, ...] )
+      int ticlevel=0;
+	/* syntax is  (  ['format'] value [level] [, ...] )
 	 * but for timedata, the value itself is a string, which
 	 * complicates things somewhat
 	 */
@@ -3910,8 +3912,15 @@
 	/* in any case get the value */
 	GET_NUM_OR_TIME(ticposition, axis);
 
+	if (!END_OF_COMMAND && 
+	    !equals(c_token, ",") && 
+	    !equals(c_token, ")")) {
+	  struct value value;
+	  ticlevel = (int) real(const_express(&value)); /* tic level */
+	}
+
 	/* add to list */
-	add_tic_user(axis, ticlabel, ticposition);
+	add_tic_user(axis, ticlabel, ticposition, ticlevel);
 
 	/* expect "," or ")" here */
 	if (!END_OF_COMMAND && equals(c_token, ","))
@@ -3933,10 +3942,11 @@
  */
 /* HBB 20020911: added 'static' */
 static void
-add_tic_user(axis,label,position)
+add_tic_user(axis,label,position,level)
     AXIS_INDEX axis;
     double position;
     char *label;
+    int level;
 {
     struct ticmark *tic;		/* new ticmark */
 
@@ -3948,6 +3958,7 @@
     } else
 	tic->label = NULL;
     tic->position = position;
+    tic->level = level;
 
     /* Insert this tic at head of tic list for this axis */
     tic->next = axis_array[axis].ticdef.def.user;