--- loncom/xml/lonplot.pm	2007/08/03 06:08:06	1.124
+++ loncom/xml/lonplot.pm	2007/08/03 20:48:01	1.126
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Dynamic plot
 #
-# $Id: lonplot.pm,v 1.124 2007/08/03 06:08:06 albertel Exp $
+# $Id: lonplot.pm,v 1.126 2007/08/03 20:48:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -206,9 +206,9 @@ my %gnuplot_defaults =
      font         => {
 	 default     => '9',
 	 test        => $sml_test,
-	 description => 'Size of font to use',
+	 description => 'Font size to use in web output (pts)',
 	 edit_type   => 'choice',
-	 choices     => [['5','5 (small)'],'7',['9','9 (medium)'],'10','12',['15','15 (large)']]
+	 choices     => [['5','5 (small)'],'6','7','8',['9','9 (medium)'],'10',['11','11 (large)'],'12','15']
 	 },
      fontface     => {
         default     => 'sans-serif',
@@ -501,7 +501,7 @@ my %curve_defaults =
 	 choices     => [keys(%linestyles)]
 	 },
      linewidth => {
-         default     => 4,
+         default     => 2,
          test        => $int_test,
          description => 'Line width (may not apply to all line styles)',
          edit_type   => 'choice',
@@ -713,7 +713,7 @@ sub get_font {
 	} elsif ( $Apache::lonplot::plot{'font'} eq 'medium') {
 	    $size = '9';
 	} elsif ( $Apache::lonplot::plot{'font'} eq 'large') {
-	    $size = '15';
+	    $size = '11';
 	} else {
 	    $size = '9';
 	}
@@ -1236,14 +1236,17 @@ sub write_gnuplot_file {
     $gnuplot_input .= "set samples $Apache::lonplot::plot{'samples'}\n";
     # title, xlabel, ylabel
     # titles
+    my $extra_space_x = ($xtics{'location'} eq 'axis') ? ' 0, -0.5 ' : '';
+    my $extra_space_y = ($ytics{'location'} eq 'axis') ? ' -0.5, 0 ' : '';
+
     if ($target eq 'tex') {
-	$gnuplot_input .= "set title  \"$title\"  font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($title)) ;
-	$gnuplot_input .= "set xlabel \"$xlabel\" font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($xlabel));
-	$gnuplot_input .= "set ylabel \"$ylabel\" font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($ylabel));
+	$gnuplot_input .= "set title  \"$title\"          font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($title)) ;
+	$gnuplot_input .= "set xlabel \"$xlabel\" $extra_space_x font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($xlabel));
+	$gnuplot_input .= "set ylabel \"$ylabel\" $extra_space_y font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($ylabel));
     } else {
-        $gnuplot_input .= "set title  \"$title\"  \n" if (defined($title)) ;
-        $gnuplot_input .= "set xlabel \"$xlabel\" \n" if (defined($xlabel));
-        $gnuplot_input .= "set ylabel \"$ylabel\" \n" if (defined($ylabel));
+        $gnuplot_input .= "set title  \"$title\"          \n" if (defined($title)) ;
+        $gnuplot_input .= "set xlabel \"$xlabel\" $extra_space_x \n" if (defined($xlabel));
+        $gnuplot_input .= "set ylabel \"$ylabel\" $extra_space_y \n" if (defined($ylabel));
     }
     # tics
     if (%xtics) {