--- loncom/xml/lonplot.pm	2001/12/28 21:56:16	1.25
+++ loncom/xml/lonplot.pm	2001/12/31 17:30:09	1.27
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Dynamic plot
 #
-# $Id: lonplot.pm,v 1.25 2001/12/28 21:56:16 matthew Exp $
+# $Id: lonplot.pm,v 1.27 2001/12/31 17:30:09 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,7 +26,7 @@
 # http://www.lon-capa.org/
 #
 # 12/15/01 Matthew
-# 12/17 12/18 12/19 12/20 12/21 12/27 12/28 Matthew
+# 12/17 12/18 12/19 12/20 12/21 12/27 12/28 12/30 Matthew
 package Apache::lonplot;
 
 use strict;
@@ -288,7 +288,7 @@ sub start_plot {
 	    ($token,$parstack,$safeeval,keys(%plot_defaults));
 	if ($constructtag) {
 	    $result = &Apache::edit::rebuild_tag($token);
-	    $result.= &Apache::edit::handle_insert();
+#	    $result.= &Apache::edit::handle_insert();
 	}
     }
     return $result;
@@ -367,8 +367,7 @@ sub start_title {
 	$result.=&Apache::edit::tag_start($target,$token,'Plot Title');
 	my $text=&Apache::lonxml::get_all_text("/title",$$parser[-1]);
 	$result.='</td></tr><tr><td colspan="3">'.
-	    &Apache::edit::editfield('',$text,'',20,1).
-	    &Apache::edit::end_table();
+	    &Apache::edit::editfield('',$text,'',20,1);
     } elsif ($target eq 'modified') {
 	my $text=$$parser[-1]->get_text("/function");
 	$result.=&Apache::edit::modifiedfield($token);
@@ -381,6 +380,7 @@ sub end_title {
     my $result = '';
     if ($target eq 'web') {
     } elsif ($target eq 'edit') {
+	$result.=&Apache::edit::tag_end($target,$token);
     }
     return $result;
 }
@@ -394,8 +394,7 @@ sub start_xlabel {
 	$result.=&Apache::edit::tag_start($target,$token,'Plot Xlabel');
 	my $text=&Apache::lonxml::get_all_text("/xlabel",$$parser[-1]);
 	$result.='</td></tr><tr><td colspan="3">'.
-	    &Apache::edit::editfield('',$text,'',20,1).
-	    &Apache::edit::end_table();
+	    &Apache::edit::editfield('',$text,'',20,1);
     } elsif ($target eq 'modified') {
 	my $text=$$parser[-1]->get_text("/function");
 	$result.=&Apache::edit::modifiedfield($token);
@@ -408,6 +407,7 @@ sub end_xlabel {
     my $result = '';
     if ($target eq 'web') {
     } elsif ($target eq 'edit') {
+	$result.=&Apache::edit::tag_end($target,$token);
     }
     return $result;
 }
@@ -422,8 +422,7 @@ sub start_ylabel {
 	$result .= &Apache::edit::tag_start($target,$token,'Plot Ylabel');
 	my $text = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]);
 	$result .= '</td></tr><tr><td colspan="3">'.
-	    &Apache::edit::editfield('',$text,'',20,1).
-	    &Apache::edit::end_table();
+	    &Apache::edit::editfield('',$text,'',20,1);
     } elsif ($target eq 'modified') {
 	my $text=$$parser[-1]->get_text("/function");
 	$result.=&Apache::edit::modifiedfield($token);
@@ -436,6 +435,7 @@ sub end_ylabel {
     my $result = '';
     if ($target eq 'web') {
     } elsif ($target eq 'edit') {
+	$result.=&Apache::edit::tag_end($target,$token);
     }
     return $result;
 }
@@ -459,8 +459,7 @@ sub start_label {
 	$result .= &edit_attributes($target,$token,\%label_defaults);
 	my $text = &Apache::lonxml::get_all_text("/label",$$parser[-1]);
 	$result .= '</td></tr><tr><td colspan="3">'.
-	    &Apache::edit::editfield('',$text,'',20,1).
-	    &Apache::edit::end_table();
+	    &Apache::edit::editfield('',$text,'',20,1);
     } elsif ($target eq 'modified') {
 	my $constructtag=&Apache::edit::get_new_args
 	    ($token,$parstack,$safeeval,keys(%label_defaults));
@@ -496,7 +495,7 @@ sub start_curve {
 		    $tagstack->[-1]);
 	push (@curves,\%curve);
     } elsif ($target eq 'edit') {
-	$result .= &Apache::edit::tag_start($target,$token,'Plot Curve');
+	$result .= &Apache::edit::tag_start($target,$token,'Curve');
 	$result .= &edit_attributes($target,$token,\%curve_defaults);
     } elsif ($target eq 'modified') {
 	my $constructtag=&Apache::edit::get_new_args
@@ -536,9 +535,7 @@ sub start_function {
 	$result .= &Apache::edit::tag_start($target,$token,'Curve Function');
 	my $text = &Apache::lonxml::get_all_text("/function",$$parser[-1]);
 	$result .= '</td></tr><tr><td colspan="3">'.
-	    &Apache::edit::editfield('',$text,'',20,1).
-	    &Apache::edit::end_table();
-
+	    &Apache::edit::editfield('',$text,'',20,1);
     } elsif ($target eq 'modified') {
 	# Why do I do this?
 	my $text=$$parser[-1]->get_text("/function");
@@ -552,6 +549,7 @@ sub end_function {
     my $result = '';
     if ($target eq 'web') {
     } elsif ($target eq 'edit') {
+	$result .= &Apache::edit::end_table();
     }
     return $result;
 }
@@ -599,8 +597,7 @@ sub start_data {
 	$result .= &Apache::edit::tag_start($target,$token,'Curve Data');
 	my $text = &Apache::lonxml::get_all_text("/data",$$parser[-1]);
 	$result .= '</td></tr><tr><td colspan="3">'.
-	    &Apache::edit::editfield('',$text,'',20,1).
-	    &Apache::edit::end_table();
+	    &Apache::edit::editfield('',$text,'',20,1);
     } elsif ($target eq 'modified') {
 	my $text=$$parser[-1]->get_text("/data");
 	$result.=&Apache::edit::modifiedfield($token);
@@ -613,6 +610,7 @@ sub end_data {
     my $result = '';
     if ($target eq 'web') {
     } elsif ($target eq 'edit') {
+	$result .= &Apache::edit::end_table();
     }
     return $result;
 }
@@ -824,7 +822,7 @@ sub insert_plot {
     #  plot attributes
     $result .= '<plot ';
     foreach my $attr (%plot_defaults) {
-	$result .= '     '.$attr.' "'.$plot_defaults{$attr}->{'default'}.
+	$result .= '     '.$attr.'="'.$plot_defaults{$attr}->{'default'}.
 	    "\"\n";
     }
     $result .= ">\n";
@@ -847,7 +845,7 @@ sub insert_key {
     my $result;
     $result .= '    <key ';
     foreach my $attr (%key_defaults) {
-	$result .= '         '.$attr.' "'.$key_defaults{$attr}->{'default'}.
+	$result .= '         '.$attr.'="'.$key_defaults{$attr}->{'default'}.
 	    "\"\n";
     }
     $result .= "   />\n";
@@ -858,7 +856,7 @@ sub insert_axis{
     my $result;
     $result .= '    <axis ';
     foreach my $attr (%axis_defaults) {
-	$result .= '         '.$attr.' "'.$axis_defaults{$attr}->{'default'}.
+	$result .= '         '.$attr.'="'.$axis_defaults{$attr}->{'default'}.
 	    "\"\n";
     }
     $result .= "   />\n";
@@ -869,7 +867,7 @@ sub insert_label {
     my $result;
     $result .= '    <label ';
     foreach my $attr (%label_defaults) {
-	$result .= '         '.$attr.' "'.
+	$result .= '         '.$attr.'="'.
 	    $label_defaults{$attr}->{'default'}."\"\n";
     }
     $result .= "   ></label>\n";
@@ -880,7 +878,7 @@ sub insert_curve {
     my $result;
     $result .= '    <curve ';
     foreach my $attr (%curve_defaults) {
-	$result .= '         '.$attr.' "'.
+	$result .= '         '.$attr.'="'.
 	    $curve_defaults{$attr}->{'default'}."\"\n";
     }
     $result .= "    >\n";