Diff for /loncom/xml/lonplot.pm between versions 1.2 and 1.3

version 1.2, 2001/12/18 15:33:47 version 1.3, 2001/12/18 16:06:01
Line 25 Line 25
 #  #
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 # 2/21 Guy  # 12/15/01 Matthew
   # 12/18 Matthew
 package Apache::lonplot;  package Apache::lonplot;
 use strict;  use strict;
 use Apache::response;  use Apache::response;
Line 148  sub end_plot { Line 149  sub end_plot {
 sub start_key {  sub start_key {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     &get_attributes(\%key,\%key_defaults,$parstack,$safeeval,'key');      &get_attributes(\%key,\%key_defaults,$parstack,$safeeval,$tagstack);
     return $result;      return $result;
 }  }
   
Line 200  sub end_ylabel { Line 201  sub end_ylabel {
 sub start_label {  sub start_label {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     my $label = &newhashref();      my %label;
     &get_attributes($label,\%label_defaults,$parstack,$safeeval,'label');      &get_attributes($label,\%label_defaults,$parstack,$safeeval,$tagstack);
     $label->{'text'} = &Apache::lonxml::get_all_text("/label",$$parser[-1]);      $label->{'text'} = &Apache::lonxml::get_all_text("/label",$$parser[-1]);
     push(@labels,$label);      push(@labels,\%label);
     return $result;      return $result;
 }  }
   
Line 217  sub end_label { Line 218  sub end_label {
 sub start_curve {  sub start_curve {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     my $curve = &newhashref();      my %curve;
     &get_attributes($curve,\%curve_defaults,$parstack,$safeeval,'curve');      &get_attributes($curve,\%curve_defaults,$parstack,$safeeval,$tagstack);
     push (@curves,$curve);      push (@curves,$curve);
           
     &Apache::lonxml::register('Apache::plot',('function','data'));      &Apache::lonxml::register('Apache::plot',('function','data'));
Line 268  sub end_data { Line 269  sub end_data {
 sub start_axis {  sub start_axis {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     &get_attributes(\%axis,\%label_defaults,$parstack,$safeeval,'axis');      &get_attributes(\%axis,\%label_defaults,$parstack,$safeeval,$tagstack);
     return $result;      return $result;
 }  }
   
Line 279  sub end_axis { Line 280  sub end_axis {
 }  }
   
 ##------------------------------------------------------------------- misc  ##------------------------------------------------------------------- misc
 sub newhashref{  
     my %hash;  
     return \%hash;  
 }  
   
 sub get_attributes{  sub get_attributes{
     %values   = %{shift};      %values   = %{shift};
     %defaults = %{shift};      %defaults = %{shift};

Removed from v.1.2  
changed lines
  Added in v.1.3


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>