--- loncom/xml/lonplot.pm	2003/02/07 22:03:21	1.81
+++ loncom/xml/lonplot.pm	2004/09/13 13:34:06	1.103
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Dynamic plot
 #
-# $Id: lonplot.pm,v 1.81 2003/02/07 22:03:21 albertel Exp $
+# $Id: lonplot.pm,v 1.103 2004/09/13 13:34:06 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,22 +25,28 @@
 #
 # http://www.lon-capa.org/
 #
-# 12/15/01 Matthew
-# 12/17 12/18 12/19 12/20 12/21 12/27 12/28 12/30 12/31 Matthew
-# 01/01/02 Matthew
-# 01/02 01/03 01/04 01/07 01/08 01/09 Matthew
-# 01/21 02/05 02/06 2/28Matthew
 
 package Apache::lonplot;
 
 use strict;
+use warnings FATAL=>'all';
+no warnings 'uninitialized';
 use Apache::File;
 use Apache::response;
 use Apache::lonxml;
 use Apache::edit;
 
+use vars qw/$weboutputformat $versionstring/;
+
 BEGIN {
-  &Apache::lonxml::register('Apache::lonplot',('gnuplot'));
+    &Apache::lonxml::register('Apache::lonplot',('gnuplot'));
+    #
+    # Determine the version of GNUPLOT
+    $weboutputformat = 'gif';
+    $versionstring = `gnuplot --version 2>/dev/null`;
+    if ($versionstring =~ /^gnuplot 4/) {
+        $weboutputformat = 'png';
+    }
 }
 
 ## 
@@ -112,39 +118,12 @@ my $words_test     = sub {$_[0]=~s/\s+/
 ##                                                               ##
 ###################################################################
 my @gnuplot_edit_order = 
-    qw/alttag bgcolor fgcolor height width font transparent grid samples border align/;
+    qw/alttag bgcolor fgcolor height width font transparent grid samples 
+    border align texwidth texfont plottype lmargin rmargin tmargin bmargin 
+    major_ticscale minor_ticscale/;
 
-my $gnuplot_help_text = <<"ENDPLOTHELP";
-<p>
-The <b>gnuplot</b> tag allows an author to design a plot which can
-be created on the fly.  This is intended for use in homework problems
-where each student needs to see a distinct plot.  It can be used in
-conjunction with a <b>script</b> tag to generate random plots.
-</p><p>
-A <b>gnuplot</b> tag can contain the following sub-tags:
-</p>
-<dl>
-<dt> Plot Label
-    <dd> Allows you to place text at a given (x,y) coordinate on the plot.
-<dt> Plot Title
-    <dd> The title of the plot
-<dt> Plot Xlabel
-    <dd> The label on the horizontal axis of the plot
-<dt> Plot Ylabel
-    <dd> The label on the vertical axis of the plot
-<dt> Plot Axes
-    <dd> allows specification of the x and y ranges displayed in the plot
-<dt> Plot Key
-    <dd> Lists the functions displayed in the plot.
-<dt> Plot Curve
-    <dd> Sets the data used in the plot.
-<dt> Plot Tics
-    <dd> Allows specification of the x and y coordinate 'tics' on the axes.
-This is mostly used to adjust the grid lines when a grid is displayed.
-</dl>
-If you are having trouble with your plot, please read the help
-available on Plot Curve.
-ENDPLOTHELP
+my $margin_choices = ['default',
+                      qw{0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20}];
 
 my %gnuplot_defaults = 
     (
@@ -221,7 +200,70 @@ my %gnuplot_defaults =
 	 description => 'alignment for image in html',
 	 edit_type   => 'choice',
 	 choices     => ['left','right','center']
-	 } 
+	 },
+     texwidth     => {
+         default     => '93',
+         test        => $int_test,
+         description => 'Width of plot when printed (mm)',
+         edit_type   => 'entry',
+         size        => '5'
+         },
+     texfont     => {
+         default     => '22',
+         test        => $int_test,
+         description => 'Font size to use in TeX output (pts):',
+         edit_type   => 'choice',
+         choices     => [qw/8 10 12 14 16 18 20 22 24 26 28 30 32 34 36/],
+         },
+     plottype  => {
+	 default     => 'Cartesian',
+	 test        => sub {$_[0]=~/^(Polar|Cartesian)$/},
+	 description => 'Plot type:',
+	 edit_type   => 'choice',
+         choices     => ['Cartesian','Polar']
+         },
+     lmargin   => {
+	 default     => 'default',
+	 test        => sub {$_[0]=~/^(default|\d+)$/},
+	 description => 'Left margin width (pts):',
+	 edit_type   => 'choice',
+         choices     => $margin_choices,
+         },
+     rmargin   => {
+	 default     => 'default',
+	 test        => sub {$_[0]=~/^(default|\d+)$/},
+	 description => 'Right margin width (pts):',
+	 edit_type   => 'choice',
+         choices     => $margin_choices,
+         },
+     tmargin   => {
+	 default     => 'default',
+	 test        => sub {$_[0]=~/^(default|\d+)$/},
+	 description => 'Top margin width (pts):',
+	 edit_type   => 'choice',
+         choices     => $margin_choices,
+         },
+     bmargin   => {
+	 default     => 'default',
+	 test        => sub {$_[0]=~/^(default|\d+)$/},
+	 description => 'Bottm margin width (pts):',
+	 edit_type   => 'choice',
+         choices     => $margin_choices,
+         },
+     major_ticscale  => {
+         default     => '1',
+         test        => $real_test,
+         description => 'Size of major tic marks (plot coordinates)',
+         edit_type   => 'entry',
+         size        => '5'
+         },
+     minor_ticscale  => {
+         default     => '0.5',
+         test        => $real_test,
+         description => 'Size of minor tic mark (plot coordinates)',
+         edit_type   => 'entry',
+         size        => '5'
+         },
      );
 
 my %key_defaults = 
@@ -274,43 +316,51 @@ my %label_defaults =
      }
      );
 
-my @tic_edit_order = ('location','mirror','start','increment','end');
+my @tic_edit_order = ('location','mirror','start','increment','end',
+                      'minorfreq');
 my %tic_defaults =
     (
      location => {
 	 default => 'border', 
 	 test => sub {$_[0]=~/^(border|axis)$/},
-	 description => 'Location of tick marks',
+	 description => 'Location of major tic marks',
 	 edit_type   => 'choice',
 	 choices     => ['border','axis']
 	 },
      mirror => {
 	 default => 'on', 
 	 test => $onoff_test,
-	 description => 'mirror ticks on opposite axis?',
+	 description => 'mirror tics on opposite axis?',
 	 edit_type   => 'onoff'
 	 },
      start => {
 	 default => '-10.0',
 	 test => $real_test,
-	 description => 'Start ticks at',
+	 description => 'Start major tics at',
 	 edit_type   => 'entry',
 	 size        => '10'
 	 },
      increment => {
 	 default => '1.0',
 	 test => $real_test,
-	 description => 'Place a tick every',
+	 description => 'Place a major tic every',
 	 edit_type   => 'entry',
 	 size        => '10'
 	 },
      end => {
 	 default => ' 10.0',
 	 test => $real_test,
-	 description => 'Stop ticks at ',
+	 description => 'Stop major tics at ',
 	 edit_type   => 'entry',
 	 size        => '10'
 	 },
+     minorfreq => {
+	 default => '0',
+	 test => $int_test,
+	 description => 'Number of minor tics per major tic mark',
+	 edit_type   => 'entry',
+	 size        => '10'
+	 },         
      );
 
 my @axis_edit_order = ('color','xmin','xmax','ymin','ymax');
@@ -353,37 +403,6 @@ my %axis_defaults =
 	 }
      );
 
-my $curve_help_text = <<"ENDCURVEHELP";
-The <b>curve</b> tag is where you set the data to be plotted by gnuplot.
-There are two ways of entering the information:
-<dl>
-    <dt> Curve Data
-    <dd> Using a <b>data</b> tag you can specify the numbers used to produce 
-the plot.  
-<p>
-By default, two <b>data</b> tags will be available in a plot.  The
-first will specify X coordinates of the data and the second will
-give the Y coordinates of the data.  When working with a linestyle that 
-requires more than two data sets, inserting another <b>data</b> tag is
-required.  Unfortunately, you must make sure the <b>data</b> tags appear
-in the order gnuplot expects the data.
-</p><p>
-Specifying the data should usually be done with a perl variable or array, 
-such as \@Xdata and \@Ydata.  You may also specify numerical data seperated 
-by commas.  Again, the order of the <b>data</b> tags is important.  The
-first tag will be the X data and the second will be the Y data.
-</p>
-    <dt> Curve Function
-    <dd> The <b>function</b> tag allows you to specify the curve to be 
-plotted as a formula that gnuplot can understand.  <b>Be careful using this
-tag.</b>  It is surprisingly easy to give gnuplot a function it cannot deal
-with properly.  Be explicit: 2*sin(2*3.141592*x/4) will work but
-2sin(2*3.141592x/4) will not.  If you do not receive any errors in the
-gnuplot data but still do not have an image produced, it is likely there
-is an error in your <b>function</b> tag.
-</dl>
-ENDCURVEHELP
-
 my @curve_edit_order = ('color','name','linestyle','pointtype','pointsize');
 
 my %curve_defaults = 
@@ -441,10 +460,10 @@ my %curve_defaults =
 my (%plot,%key,%axis,$title,$xlabel,$ylabel,@labels,@curves,%xtics,%ytics);
 
 sub start_gnuplot {
-    %plot    = ();      %key     = ();      %axis   = (); 
-    $title   = undef;   $xlabel  = undef;   $ylabel = undef;
-    $#labels = -1;      $#curves = -1;
-    %xtics    = ();      %ytics    = ();
+    undef(%plot);   undef(%key);    undef(%axis);
+    undef($title);  undef($xlabel); undef($ylabel);
+    undef(@labels); undef(@curves);
+    undef(%xtics);  undef(%ytics);
     #
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
@@ -457,8 +476,6 @@ sub start_gnuplot {
 			$tagstack->[-1]);
     } elsif ($target eq 'edit') {
 	$result .= &Apache::edit::tag_start($target,$token,'GnuPlot');
-	$result .= &make_javascript();
-	$result .= &help_win($gnuplot_help_text);
 	$result .= &edit_attributes($target,$token,\%gnuplot_defaults,
 				    \@gnuplot_edit_order);
     } elsif ($target eq 'modified') {
@@ -480,7 +497,7 @@ sub end_gnuplot {
     my $randnumber;
     # need to call rand everytime start_script would evaluate, as the
     # safe space rand number generator and the global rand generator 
-    # are not seperate
+    # are not separate
     if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
 	$target eq 'answer') {
       $randnumber=int(rand(1000));
@@ -498,15 +515,16 @@ sub end_gnuplot {
 	## return image tag for the plot
 	if ($target eq 'web') {
 	    $result .= <<"ENDIMAGE";
-<img src    = "/cgi-bin/plot.gif?file=$filename.data&output=gif" 
+<img src    = "/cgi-bin/plot.gif?file=$filename.data&output=$weboutputformat" 
      width  = "$plot{'width'}"
      height = "$plot{'height'}"
      align  = "$plot{'align'}"
      alt    = "$plot{'alttag'}" />
 ENDIMAGE
         } elsif ($target eq 'tex') {
-	    &Apache::lonnet::ssi("/cgi-bin/plot.gif?file=$filename.data&output=eps");
-	    $result = '\graphicspath{{/home/httpd/perl/tmp/}}\includegraphics{'.&Apache::lonnet::unescape($filename).'.eps}';
+	    #might be inside the safe space, register the URL for later
+	    &Apache::lonxml::register_ssi("/cgi-bin/plot.gif?file=$filename.data&output=eps");
+	    $result = '\graphicspath{{/home/httpd/perl/tmp/}}\includegraphics[width='.$plot{'texwidth'}.' mm]{'.&Apache::lonnet::unescape($filename).'.eps}';
 	}
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::tag_end($target,$token);
@@ -626,9 +644,8 @@ sub start_title {
 	    &Apache::edit::start_spanning_row().
 	    &Apache::edit::editline('',$text,'',60);
     } elsif ($target eq 'modified') {
-	my $text=$$parser[-1]->get_text("/title");
 	$result.=&Apache::edit::rebuild_tag($token);
-	$result.=&Apache::edit::modifiedfield($token);
+	$result.=&Apache::edit::modifiedfield("/title",$parser);
     }
     return $result;
 }
@@ -660,9 +677,8 @@ sub start_xlabel {
 	    &Apache::edit::start_spanning_row().
 	    &Apache::edit::editline('',$text,'',60);
     } elsif ($target eq 'modified') {
-	my $text=$$parser[-1]->get_text("/xlabel");
 	$result.=&Apache::edit::rebuild_tag($token);	
-	$result.=&Apache::edit::modifiedfield($token);
+	$result.=&Apache::edit::modifiedfield("/xlabel",$parser);
     }
     return $result;
 }
@@ -695,9 +711,8 @@ sub start_ylabel {
 	    &Apache::edit::start_spanning_row().
 	    &Apache::edit::editline('',$text,'',60);
     } elsif ($target eq 'modified') {
-	my $text=$$parser[-1]->get_text("/ylabel");
 	$result.=&Apache::edit::rebuild_tag($token);
-	$result.=&Apache::edit::modifiedfield($token);
+	$result.=&Apache::edit::modifiedfield("/ylabel",$parser);
     }
     return $result;
 }
@@ -737,8 +752,7 @@ sub start_label {
 	&Apache::edit::get_new_args
 	    ($token,$parstack,$safeeval,keys(%label_defaults));
 	$result.=&Apache::edit::rebuild_tag($token);
-	my $text=$$parser[-1]->get_text("/label");
-	$result.=&Apache::edit::modifiedfield($token);
+	$result.=&Apache::edit::modifiedfield("/label",$parser);
     }
     return $result;
 }
@@ -766,7 +780,6 @@ sub start_curve {
 	push (@curves,\%curve);
     } elsif ($target eq 'edit') {
 	$result .= &Apache::edit::tag_start($target,$token,'Curve');
-	$result .= &help_win($curve_help_text);
 	$result .= &edit_attributes($target,$token,\%curve_defaults,
                                     \@curve_edit_order);
     } elsif ($target eq 'modified') {
@@ -798,7 +811,11 @@ sub start_function {
     my $result='';
     if ($target eq 'web' || $target eq 'tex') {
 	if (exists($curves[-1]->{'data'})) {
-	    &Apache::lonxml::warning('Use of <function> precludes use of <data>.  The <data> will be omitted in favor of the <function> declaration.');
+	    &Apache::lonxml::warning
+                ('Use of the <b>curve function</b> tag precludes use of '.
+                 ' the <b>curve data</b> tag.  '.
+                 'The curve data tag will be omitted in favor of the '.
+                 'curve function declaration.');
 	    delete $curves[-1]->{'data'} ;
 	}
         my $function = &Apache::lonxml::get_all_text("/function",$parser);
@@ -812,8 +829,7 @@ sub start_function {
 	    &Apache::edit::editline('',$text,'',60);
     } elsif ($target eq 'modified') {
 	$result.=&Apache::edit::rebuild_tag($token);
-	my $text=$$parser[-1]->get_text("/function");
-	$result.=&Apache::edit::modifiedfield($token);
+	$result.=&Apache::edit::modifiedfield("/function",$parser);
     }
     return $result;
 }
@@ -834,9 +850,11 @@ sub start_data {
     my $result='';
     if ($target eq 'web' || $target eq 'tex') {
 	if (exists($curves[-1]->{'function'})) {
-	    &Apache::lonxml::warning('Use of <data> precludes use of .'.
-	    '<function>.  The <function> will be omitted in favor of '.
-            'the <data> declaration.');
+	    &Apache::lonxml::warning
+                ('Use of the <b>curve function</b> tag precludes use of '.
+                 ' the <b>curve data</b> tag.  '.
+                 'The curve function tag will be omitted in favor of the '.
+                 'curve data declaration.');
 	    delete($curves[-1]->{'function'});
 	}
 	my $datatext = &Apache::lonxml::get_all_text("/data",$parser);
@@ -853,21 +871,21 @@ sub start_data {
 	my @data;
 	if ($datatext =~ /,/) { # comma deliminated
 	    @data = split /,/,$datatext;
-	} else { # Assume it's space seperated.
+	} else { # Assume it's space separated.
 	    @data = split / /,$datatext;
 	}
 	for (my $i=0;$i<=$#data;$i++) {
 	    # Check that it's non-empty
 	    if (! defined($data[$i])) {
 		&Apache::lonxml::warning(
-		    'undefined <data> value.  Replacing with '.
+		    'undefined curve data value.  Replacing with '.
 		    ' pi/e = 1.15572734979092');
 		$data[$i] = 1.15572734979092;
 	    }
 	    # Check that it's a number
 	    if (! &$real_test($data[$i]) & ! &$int_test($data[$i])) {
 		&Apache::lonxml::warning(
-		    'Bad <data> value of '.$data[$i].'  Replacing with '.
+		    'Bad curve data value of '.$data[$i].'  Replacing with '.
 		    ' pi/e = 1.15572734979092');
 		$data[$i] = 1.15572734979092;
 	    }
@@ -888,8 +906,7 @@ sub start_data {
 	    &Apache::edit::editline('',$text,'',60);
     } elsif ($target eq 'modified') {
 	$result.=&Apache::edit::rebuild_tag($token);
-	my $text=$$parser[-1]->get_text("/data");
-	$result.=&Apache::edit::modifiedfield($token);
+	$result.=&Apache::edit::modifiedfield("/data",$parser);
     }
     return $result;
 }
@@ -955,8 +972,13 @@ sub set_defaults {
 sub get_attributes{
     my ($values,$defaults,$parstack,$safeeval,$tag) = @_;
     foreach my $attr (keys(%{$defaults})) {
-	$values->{$attr} = 
-	    &Apache::lonxml::get_param($attr,$parstack,$safeeval);
+	if ($attr eq 'texwidth' || $attr eq 'texfont') {
+	    $values->{$attr} = 
+		&Apache::lonxml::get_param($attr,$parstack,$safeeval,undef,1);
+	} else {
+	    $values->{$attr} = 
+		&Apache::lonxml::get_param($attr,$parstack,$safeeval);
+	}
 	if ($values->{$attr} eq '' | !defined($values->{$attr})) {
 	    $values->{$attr} = $defaults->{$attr}->{'default'};
 	    next;
@@ -977,6 +999,25 @@ sub write_gnuplot_file {
     my ($tmpdir,$filename,$target)= @_;
     my $gnuplot_input = '';
     my $curve;
+    my $pt = $plot{'texfont'};
+    #
+    # Check to be sure we do not have any empty curves
+    my @curvescopy;
+    foreach my $curve (@curves) {
+        if (exists($curve->{'function'})) {
+            if ($curve->{'function'} !~ /^\s*$/) {
+                push(@curvescopy,$curve);
+            }
+        } elsif (exists($curve->{'data'})) {
+            foreach my $data (@{$curve->{'data'}}) {
+                if (scalar(@$data) > 0) {
+                    push(@curvescopy,$curve);
+                    last;
+                }
+            }
+        }
+    }
+    @curves = @curvescopy;
     # Collect all the colors
     my @Colors;
     push @Colors, $plot{'bgcolor'};
@@ -989,7 +1030,7 @@ sub write_gnuplot_file {
     }
     # set term
     if ($target eq 'web') {
-	$gnuplot_input .= 'set term gif ';
+	$gnuplot_input .= 'set term '.$weboutputformat .' ';
 	$gnuplot_input .= 'transparent ' if ($plot{'transparent'} eq 'on');
 	$gnuplot_input .= $plot{'font'} . ' ';
 	$gnuplot_input .= 'size '.$plot{'width'}.','.$plot{'height'}.' ';
@@ -997,10 +1038,32 @@ sub write_gnuplot_file {
 	# set output
 	$gnuplot_input .= "set output\n";
     } elsif ($target eq 'tex') {
-	$gnuplot_input .= "set term postscript eps monochrome solid\n";
+	$gnuplot_input .= "set term postscript eps monochrome solid \"Helvetica\" $pt \n";
 	$gnuplot_input .= "set output \"/home/httpd/perl/tmp/".
 	    &Apache::lonnet::unescape($filename).".eps\"\n";
     }
+    # cartesian or polar?
+    if (lc($plot{'plottype'}) eq 'polar') {
+        $gnuplot_input .= 'set polar'.$/;
+    } else {
+        # Assume Cartesian
+    }
+    # margin
+    if (lc($plot{'lmargin'}) ne 'default') {
+        $gnuplot_input .= 'set lmargin '.$plot{'lmargin'}.$/;
+    }
+    if (lc($plot{'rmargin'}) ne 'default') {
+        $gnuplot_input .= 'set rmargin '.$plot{'rmargin'}.$/;
+    }
+    if (lc($plot{'tmargin'}) ne 'default') {
+        $gnuplot_input .= 'set tmargin '.$plot{'tmargin'}.$/;
+    }
+    if (lc($plot{'bmargin'}) ne 'default') {
+        $gnuplot_input .= 'set bmargin '.$plot{'bmargin'}.$/;
+    }
+    # tic scales
+    $gnuplot_input .= 'set ticscale '.
+        $plot{'major_ticscale'}.' '.$plot{'minor_ticscale'}.$/;
     # grid
     $gnuplot_input .= 'set grid'.$/ if ($plot{'grid'} eq 'on');
     # border
@@ -1011,9 +1074,15 @@ sub write_gnuplot_file {
     $gnuplot_input .= "set samples $plot{'samples'}\n";
     # title, xlabel, ylabel
     # titles
-    $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));
+    if ($target eq 'tex') {
+        $gnuplot_input .= "set title  \"$title\" font \"Helvetica,".$pt."pt\"\n"  if (defined($title)) ;
+        $gnuplot_input .= "set xlabel \"$xlabel\" font \"Helvetica,".$pt."pt\" \n" if (defined($xlabel));
+        $gnuplot_input .= "set ylabel \"$ylabel\" font \"Helvetica,".$pt."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));
+    }
     # tics
     if (%xtics) {    
 	$gnuplot_input .= "set xtics $xtics{'location'} ";
@@ -1021,6 +1090,9 @@ sub write_gnuplot_file {
 	$gnuplot_input .= "$xtics{'start'}, ";
 	$gnuplot_input .= "$xtics{'increment'}, ";
 	$gnuplot_input .= "$xtics{'end'}\n";
+        if ($xtics{'minorfreq'} != 0) {
+            $gnuplot_input .= "set mxtics ".$xtics{'minorfreq'}."\n";
+        } 
     }
     if (%ytics) {    
 	$gnuplot_input .= "set ytics $ytics{'location'} ";
@@ -1028,6 +1100,9 @@ sub write_gnuplot_file {
 	$gnuplot_input .= "$ytics{'start'}, ";
 	$gnuplot_input .= "$ytics{'increment'}, ";
         $gnuplot_input .= "$ytics{'end'}\n";
+        if ($ytics{'minorfreq'} != 0) {
+            $gnuplot_input .= "set mytics ".$ytics{'minorfreq'}."\n";
+        } 
     }
     # axis
     if (%axis) {
@@ -1048,7 +1123,11 @@ sub write_gnuplot_file {
     my $label;
     foreach $label (@labels) {
 	$gnuplot_input .= 'set label "'.$label->{'text'}.'" at '.
-	    $label->{'xpos'}.','.$label->{'ypos'}.' '.$label->{'justify'}.$/ ;
+	    $label->{'xpos'}.','.$label->{'ypos'}.' '.$label->{'justify'};
+        if ($target eq 'tex') {
+            $gnuplot_input .=' font "Helvetica,'.$pt.'pt"' ;
+        }
+        $gnuplot_input .= $/;
     }
     if ($target eq 'tex') {
         $gnuplot_input .="set size 1,".$plot{'height'}/$plot{'width'}*1.38;
@@ -1135,7 +1214,7 @@ sub check_inputs {
     my $curve;
     foreach $curve (@curves) {
 	if (!defined($curve->{'function'})&&!defined($curve->{'data'})){
-	    &Apache::lonxml::warning("One of the curves specified did not contain any <data> or <function> declarations\n");
+	    &Apache::lonxml::warning("One of the curves specified did not contain any curve data or curve function declarations\n");
 	    return '';
 	}
     }
@@ -1159,10 +1238,10 @@ sub edit_attributes {
 		($description,$attr,$token,
 		 $defaults->{$attr}->{'size'});
 	} elsif ($defaults->{$attr}->{'edit_type'} eq 'choice') {
-	    $result .= &Apache::edit::select_arg
+	    $result .= &Apache::edit::select_or_text_arg
 		($description,$attr,$defaults->{$attr}->{'choices'},$token);
 	} elsif ($defaults->{$attr}->{'edit_type'} eq 'onoff') {
-	    $result .= &Apache::edit::select_arg
+	    $result .= &Apache::edit::select_or_text_arg
 		($description,$attr,['on','off'],$token);
 	}
 	$result .= '<br />';
@@ -1282,40 +1361,6 @@ sub insert_data {
 }
 
 ##----------------------------------------------------------------------
-# Javascript functions to display help for tags
-
-sub make_javascript {
-    my $helpwindowwidth  = 400;
-    my $helpwindowheight = 400;
-    my $result = '';
-    $result.=<<"ENDFUNCTION";
-<script language="JavaScript">
-function openWin(text)
-{
-  newWin = open("", "new_W", "width=$helpwindowwidth,height=$helpwindowheight,resizable=1,scrollbars=1");
-  newWin.document.open("text/html", "replace");
-  newWin.document.writeln(text);
-  newWin.document.writeln('<center><a href=\"javascript:window.close()\">close this window</a></center>');
-  newWin.document.close();
-}
-</script>
-ENDFUNCTION
-    return $result;
-}
-
-sub help_win {
-    my ($helptext)=@_;
-    $helptext =~ s/\n/ /g;
-    $helptext =~ s/\'/\\\'/g;
-    my $result = '';
-    $result.=<<"ENDWIN";
-<table width="100%"><tr><td align="right">
-<a href="javascript:openWin('$helptext')">help</a>
-</td></tr></table><hr />
-ENDWIN
-    return $result;
-}
-##----------------------------------------------------------------------
 1;
 __END__