# HG changeset patch
# User Stefan Mahr <dac922@gmx.de>
# Date 1395172744 -3600
# Node ID 0dae39867b2bd83492ae0093ace01e497983f5b2
# Parent  6a8cd989c69a21524ebfc9cb6603e945a891c5f3
cleanup of tic and ticlabel code

* scripts/plot/util/private/__go_draw_axes__.m (do_tics_1):
  Reorder manual and automatic tic mode and save two string
  comparisons.

diff -r 6a8cd989c69a -r 0dae39867b2b scripts/plot/util/private/__go_draw_axes__.m
--- a/scripts/plot/util/private/__go_draw_axes__.m	Sun Mar 02 02:29:52 2014 +0100
+++ b/scripts/plot/util/private/__go_draw_axes__.m	Tue Mar 18 20:59:04 2014 +0100
@@ -2145,41 +2145,38 @@
     num_mtics = 5;
   endif
   colorspec = get_text_colorspec (color, mono);
-  if (strcmpi (ticmode, "manual") || strcmpi (labelmode, "manual"))
+  fprintf (plot_stream, "set format %s \"%s\";\n", ax, fmt);
+  if (strcmpi (ticmode, "manual"))
     if (isempty (tics))
       fprintf (plot_stream, "unset %stics;\nunset m%stics;\n", ax, ax);
       return
     endif
-    if (strcmpi (ticmode, "manual"))
-      fprintf (plot_stream, "set format %s \"%s\";\n", ax, fmt);
-      fprintf (plot_stream, "set %stics %s %s %s %s (", ax, tickdir,
-               ticklength, axispos, mirror);
-      fprintf (plot_stream, " %.15g,", tics(1:end-1));
-      fprintf (plot_stream, " %.15g) %s;\n", tics(end), fontspec);
-    endif
-    if (strcmpi (labelmode, "manual"))
-      k = 1;
-      ntics = numel (tics);
-      nlabels = numel (labels);
-      fprintf (plot_stream, "set %stics add %s %s %s %s (", ax,
-               tickdir, ticklength, axispos, mirror);
-      labels = strrep (labels, "%", "%%");
-      for i = 1:ntics
-        fprintf (plot_stream, " \"%s\" %.15g", labels{k++}, tics(i));
-        if (i < ntics)
-          fputs (plot_stream, ", ");
-        endif
-        if (k > nlabels)
-          k = 1;
-        endif
-      endfor
-      fprintf (plot_stream, ") %s %s;\n", colorspec, fontspec);
-    endif
+    fprintf (plot_stream, "set %stics %s %s %s %s (", ax, tickdir,
+             ticklength, axispos, mirror);
+    fprintf (plot_stream, " %.15g,", tics(1:end-1));
+    fprintf (plot_stream, " %.15g) %s;\n", tics(end), fontspec);
   else
-    fprintf (plot_stream, "set format %s \"%s\";\n", ax, fmt);
     fprintf (plot_stream, "set %stics %s %s %s %s %s %s;\n", ax,
              tickdir, ticklength, axispos, mirror, colorspec, fontspec);
   endif
+  if (strcmpi (labelmode, "manual"))
+    k = 1;
+    ntics = numel (tics);
+    nlabels = numel (labels);
+    fprintf (plot_stream, "set %stics add %s %s %s %s (", ax,
+             tickdir, ticklength, axispos, mirror);
+    labels = strrep (labels, "%", "%%");
+    for i = 1:ntics
+      fprintf (plot_stream, " \"%s\" %.15g", labels{k++}, tics(i));
+      if (i < ntics)
+        fputs (plot_stream, ", ");
+      endif
+      if (k > nlabels)
+        k = 1;
+      endif
+    endfor
+    fprintf (plot_stream, ") %s %s;\n", colorspec, fontspec);
+  endif
   if (strcmp (mtics, "on"))
     fprintf (plot_stream, "set m%stics %d;\n", ax, num_mtics);
   else