--- loncom/xml/lonplot.pm	2007/08/03 05:56:00	1.121
+++ loncom/xml/lonplot.pm	2007/08/03 17:44:35	1.125
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Dynamic plot
 #
-# $Id: lonplot.pm,v 1.121 2007/08/03 05:56:00 albertel Exp $
+# $Id: lonplot.pm,v 1.125 2007/08/03 17:44:35 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -127,8 +127,9 @@ my $words_test     = sub {$_[0]=~s/\s+/
 ##                                                               ##
 ###################################################################
 my @gnuplot_edit_order = 
-    qw/alttag bgcolor fgcolor height width fontface font transparent grid samples 
-    border align texwidth texfont plotcolor plottype gridtype lmargin rmargin
+    qw/alttag bgcolor fgcolor height width texwidth fontface font texfont
+    transparent grid samples 
+    border align plotcolor plottype gridtype lmargin rmargin
     tmargin bmargin major_ticscale minor_ticscale boxwidth gridlayer fillstyle
     pattern solid/;
 
@@ -205,7 +206,7 @@ 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)']]
 	 },
@@ -702,6 +703,7 @@ my %font_properties =
      );
 
 sub get_font {
+    my ($target) = @_;
     my ($size, $selected_font);
 
     if ( $Apache::lonplot::plot{'font'} =~ /^(small|medium|large)/) {
@@ -716,8 +718,12 @@ sub get_font {
 	    $size = '9';
 	}
     } else {
+	$size = $Apache::lonplot::plot{'font'};
 	$selected_font = $font_properties{$Apache::lonplot::plot{'fontface'}};
     }
+    if ($target eq 'tex' && defined($Apache::lonplot::plot{'texfont'})) {
+	$size = $Apache::lonplot::plot{'texfont'};
+    }
     return ($size, $selected_font);
 }
 
@@ -1115,10 +1121,9 @@ sub get_attributes{
 ##------------------------------------------------------- write_gnuplot_file
 sub write_gnuplot_file {
     my ($tmpdir,$filename,$target)= @_;
-    my ($fontsize, $font_properties) =  &get_font();
+    my ($fontsize, $font_properties) =  &get_font($target);
     my $gnuplot_input = '';
     my $curve;
-    my $pt = $Apache::lonplot::plot{'texfont'};
     #
     # Check to be sure we do not have any empty curves
     my @curvescopy;
@@ -1231,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'}.",".$pt."pt\"\n" if (defined($title)) ;
-	$gnuplot_input .= "set xlabel \"$xlabel\" font \"".$font_properties->{'printname'}.",".$pt."pt\"\n" if (defined($xlabel));
-	$gnuplot_input .= "set ylabel \"$ylabel\" font \"".$font_properties->{'printname'}.",".$pt."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) {    
@@ -1282,7 +1290,7 @@ sub write_gnuplot_file {
 	$gnuplot_input .= 'set label "'.$label->{'text'}.'" at '.
 	    $label->{'xpos'}.','.$label->{'ypos'}.' '.$label->{'justify'};
         if ($target eq 'tex') {
-	    $gnuplot_input .=' font "'.$font_properties->{'printname'}.','.$pt.'pt"' ;
+	    $gnuplot_input .=' font "'.$font_properties->{'printname'}.','.$fontsize.'pt"' ;
         }
         $gnuplot_input .= $/;
     }