# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1248531447 -7200
# Node ID 2246eadc1bb3f32ae7354a59d72e96bfa25c58f4
# Parent  4cd9c36b705ef6e29299d9e0b43fdbbec953d4fa
__go_draw_axes__.m: also use layer property for plot border

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-17  John W. Eaton  <jwe@octave.org>
+
+	* plot/__go_draw_axes__.m: Use "layer" property to decide whether
+	to send "set border front" or "set border layerdefault" to plot
+	stream.  Don't send "set border front" to plot stream for image data.
+
 	2009-07-21  Jaroslav Hajek  <highegg@gmail.com>
 
 	Version 3.2.2 released.
diff --git a/scripts/plot/__go_draw_axes__.m b/scripts/plot/__go_draw_axes__.m
--- a/scripts/plot/__go_draw_axes__.m
+++ b/scripts/plot/__go_draw_axes__.m
@@ -267,8 +267,13 @@
     ## appearance of tics, so it is used even if the grid is absent.
     if (strcmpi (axis_obj.layer, "top"))
       fputs (plot_stream, "set grid front;\n");
+      fputs (plot_stream, "set border front;\n");
     else
       fputs (plot_stream, "set grid layerdefault;\n");
+      ## FIXME -- the gnuplot help says that "layerdefault" should work
+      ## for set border too, but it fails for me with gnuplot 4.2.5.  So
+      ## use "back" instead.
+      fputs (plot_stream, "set border back;\n");
     endif
     if (! have_grid)
       fputs (plot_stream, "unset grid;\n");
@@ -369,7 +374,6 @@
 	    elseif (strcmpi (obj.cdatamapping, "direct"))
 	      cdatadirect = true;
 	    endif
-	    fputs (plot_stream, "set border front;\n");
 	    data_idx++;
 	    is_image_data(data_idx) = true;
 	    parametric(data_idx) = false;