[BACK]Return to lonxml.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/lonxml.pm between versions 1.543 and 1.546

version 1.543, 2013/09/21 14:33:13 version 1.546, 2014/02/06 17:14:33
Line 144  $metamode = 0; Line 144  $metamode = 0;
 # turns on and of run::evaluate actually derefencing var refs  # turns on and of run::evaluate actually derefencing var refs
 $evaluate = 1;  $evaluate = 1;
   
 # data structure for eidt mode, determines what tags can go into what other tags  # data structure for edit mode, determines what tags can go into what other tags
 %insertlist=();  %insertlist=();
   
 # stores the list of active tag namespaces  # stores the list of active tag namespaces
Line 306  sub xmlparse { Line 306  sub xmlparse {
  &clean_safespace($safeeval);   &clean_safespace($safeeval);
   
  if (@script_var_displays) {   if (@script_var_displays) {
      my $scriptoutput = join('',@script_var_displays);       if ($finaloutput =~ m{</body>\s*</html>\s*$}s) {
      $finaloutput=~s{(</body>\s*</html>)\s*$}{$scriptoutput$1}s;           my $scriptoutput = join('',@script_var_displays);
            $finaloutput=~s{(</body>\s*</html>)\s*$}{$scriptoutput$1}s;
        } else {
            $finaloutput .= join('',@script_var_displays);
        }
      undef(@script_var_displays);       undef(@script_var_displays);
  }   }
  &init_state();   &init_state();
Line 651  sub init_safespace { Line 655  sub init_safespace {
   my ($target,$safeeval,$safehole,$safeinit) = @_;    my ($target,$safeeval,$safehole,$safeinit) = @_;
   $safeeval->reval('use LaTeX::Table;');    $safeeval->reval('use LaTeX::Table;');
   $safeeval->deny_only(':dangerous');    $safeeval->deny_only(':dangerous');
   $safeeval->reval('use Math::Complex;');    $safeeval->reval('use LONCAPA::LCMathComplex;');
   $safeeval->permit_only(":default");    $safeeval->permit_only(":default");
   $safeeval->permit("entereval");    $safeeval->permit("entereval");
   $safeeval->permit(":base_math");    $safeeval->permit(":base_math");
Line 1359  sub do_registered_ssi { Line 1363  sub do_registered_ssi {
   
 sub add_script_result {  sub add_script_result {
     my ($display) = @_;      my ($display) = @_;
     push(@script_var_displays, $display);      if ($display ne '') {
           push(@script_var_displays, $display);
       }
 }  }
   
 #  #
Line 2287  sub description { Line 2293  sub description {
 sub helpinfo {  sub helpinfo {
     my ($token)=@_;      my ($token)=@_;
     my $tag = &get_tag($token);      my $tag = &get_tag($token);
     return ($insertlist{$tag.'.helpfile'}, $insertlist{$tag.'.helpdesc'});      return ($insertlist{$tag.'.helpfile'}, &mt($insertlist{$tag.'.helpdesc'}));
 }  }
   
 sub get_tag {  sub get_tag {
Removed from v.1.543  
changed lines
  Added in v.1.546

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