--- loncom/xml/lonplot.pm 2012/07/24 11:02:58 1.164 +++ loncom/xml/lonplot.pm 2012/10/07 15:04:44 1.167 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Dynamic plot # -# $Id: lonplot.pm,v 1.164 2012/07/24 11:02:58 foxr Exp $ +# $Id: lonplot.pm,v 1.167 2012/10/07 15:04:44 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -132,7 +132,12 @@ my $real_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^[+-]?\d*\.?\d*([eE][+-]\d+)?$/}; my $pos_real_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^[+]?\d*\.?\d*([eE][+-]\d+)?$/}; -my $color_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^x[\da-fA-F]{6}$/}; +my $color_test; +if ($version < 4.6) { + $color_test = sub {$_[0]=~s/\s+//g;$_[0]=~s/^\#/x/;$_[0]=~/^x[\da-fA-F]{6}$/}; +} else { + $color_test = sub {$_[0]=~s/\s+//g;$_[0]=~s/^x/#/;$_[0]=~/^\#[\da-fA-F]{6}$/}; +} my $onoff_test = sub {$_[0]=~/^(on|off)$/}; my $key_pos_test = sub {$_[0]=~/^(top|bottom|right|left|outside|below| )+$/}; my $sml_test = sub {$_[0]=~/^(\d+|small|medium|large)$/}; @@ -1759,6 +1764,7 @@ sub generate_tics { sub write_gnuplot_file { my ($tmpdir,$filename,$target)= @_; my ($fontsize, $font_properties) = &get_font($target); + &Apache::lonnet::logthis("Fontsize: $fontsize"); my $gnuplot_input = ''; my $curve; # @@ -2091,7 +2097,7 @@ sub write_gnuplot_file { } # Write the output to a file. - &Apache::lonnet::logthis($gnuplot_input); # uncomment to log the gnuplot input. + # &Apache::lonnet::logthis($gnuplot_input); # uncomment to log the gnuplot input. open (my $fh, "> $tmpdir$filename.data"); binmode($fh, ':utf8'); print $fh $gnuplot_input;