loncom/xml/lonxml.pm - diff

Return to lonxml.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/lonxml.pm between versions 1.240 and 1.484.2.2

-version 1.240, 2003/02/26 17:52:14
+version 1.484.2.2, 2008/10/24 19:36:40
  Line 36
  # The C source of the Code may not be distributed by the Licensee
  # to any other parties under any circumstances.
  #
- # last modified 06/26/00 by Alexander Sakharuk
- # 11/6 Gerd Kortemeyer
- # 6/1/1 Gerd Kortemeyer
- # 2/21,3/13 Guy
- # 3/29,5/4 Gerd Kortemeyer
- # 5/26 Gerd Kortemeyer
- # 5/27 H. K. Ng
- # 6/2,6/3,6/8,6/9 Gerd Kortemeyer
- # 6/12,6/13 H. K. Ng
- # 6/16 Gerd Kortemeyer
- # 7/27 H. K. Ng
- # 8/7,8/9,8/10,8/11,8/15,8/16,8/17,8/18,8/20,8/23,8/24 Gerd Kortemeyer
- # Guy Albertelli
- # 9/26 Gerd Kortemeyer
- # Dec Guy Albertelli
- # YEAR=2002
- # 1/1 Gerd Kortemeyer
- # 1/2 Matthew Hall
- # 1/3 Gerd Kortemeyer
- #
  package Apache::lonxml;
  use vars
- qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate %insertlist @namespace $prevent_entity_encode $errorcount $warningcount);
+ qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate %insertlist @namespace $errorcount $warningcount);
  use strict;
+ use LONCAPA;
  use HTML::LCParser();
  use HTML::TreeBuilder();
  use HTML::Entities();
- Line 69  use Safe::Hole();
+ Line 51  use Safe::Hole();
  use Math::Cephes();
  use Math::Random();
  use Opcode();
+ use POSIX qw(strftime);
+ use Time::HiRes qw( gettimeofday tv_interval );
+ use Symbol();
  sub register {
    my ($space,@taglist) = @_;
- Line 94  use Apache::style();
+ Line 79  use Apache::style();
  use Apache::run();
  use Apache::londefdef();
  use Apache::scripttag();
+ use Apache::languagetags();
  use Apache::edit();
- use Apache::lonnet();
+ use Apache::inputtags();
+ use Apache::outputtags();
+ use Apache::lonnet;
  use Apache::File();
  use Apache::loncommon();
  use Apache::lonfeedback();
  use Apache::lonmsg();
  use Apache::loncacc();
+ use Apache::lonmaxima();
+ use Apache::lonlocal;
+ #====================================   Main subroutine: xmlparse
- #==================================================   Main subroutine: xmlparse
  #debugging control, to turn on debugging modify the correct handler
  $Apache::lonxml::debug=0;
  # keeps count of the number of warnings and errors generated in a parse
- Line 135  $evaluate = 1;
+ Line 127  $evaluate = 1;
  # stores the list of active tag namespaces
  @namespace=();
- # if 0 all high ASCII characters will be encoded into HTML Entities
+ # stores all Scrit Vars displays for later showing
- $prevent_entity_encode=0;
+ my @script_var_displays=();
- # has the dynamic menu been updated to know about this resource
- $Apache::lonxml::registered=0;
  # a pointer the the Apache request object
  $Apache::lonxml::request='';
- Line 148  $Apache::lonxml::request='';
+ Line 137  $Apache::lonxml::request='';
  $Apache::lonxml::counter=1;
  $Apache::lonxml::counter_changed=0;
+ # Part counter hash.   In analysis mode, the
+ # problems can use this to record which parts increment the counter
+ # by how much.  The counter subs will maintain this hash via
+ # their optional part parameters.  Note that the assumption is that
+ # analysis is done in one request and therefore it is not necessary to
+ # save this information request-to-request.
+ %Apache::lonxml::counters_per_part = ();
  #internal check on whether to look at style defs
  $Apache::lonxml::usestyle=1;
- sub xmlbegin {
+ #locations used to store the parameter string for style substitutions
-   my $output='';
+ $Apache::lonxml::style_values='';
-   if ($ENV{'browser.mathml'}) {
+ $Apache::lonxml::style_end_values='';
-       $output='<?xml version="1.0"?>'
-             .'<?xml-stylesheet type="text/css" href="/adm/MathML/mathml.css"?>'
+ #array of ssi calls that need to occur after we are done parsing
-             .'<!DOCTYPE html SYSTEM "/adm/MathML/mathml.dtd" '
+ @Apache::lonxml::ssi_info=();
-             .'[<!ENTITY mathns "http://www.w3.org/1998/Math/MathML">]>'
-             .'<html xmlns:math="http://www.w3.org/1998/Math/MathML" '
+ #should we do the postag variable interpolation
- 		.'xmlns="http://www.w3.org/TR/REC-html40">';
+ $Apache::lonxml::post_evaluate=1;
-   } else {
-       $output='<html>';
+ #a header message to emit in the case of any generated warning or errors
-   }
+ $Apache::lonxml::warnings_error_header='';
-   return $output;
+ #  Control whether or not LaTeX symbols should be substituted for their
+ #  \ style equivalents...this may be turned off e.g. in an verbatim
+ #  environment.
+ $Apache::lonxml::substitute_LaTeX_symbols = 1; # Starts out on.
+ sub enable_LaTeX_substitutions {
+     $Apache::lonxml::substitute_LaTeX_symbols = 1;
+ }
+ sub disable_LaTeX_substitutions {
+     $Apache::lonxml::substitute_LaTeX_symbols = 0;
  }
  sub xmlend {
-     my ($discussiononly,$symb)=@_;
+     my ($target,$parser)=@_;
-     my $discussion='';
+     my $mode='xml';
-     if ($ENV{'request.course.id'}) {
+     my $status='OPEN';
-        my $crs='/'.$ENV{'request.course.id'};
+     if ($Apache::lonhomework::parsing_a_problem ||
-        if ($ENV{'request.course.sec'}) {
+ 	$Apache::lonhomework::parsing_a_task ) {
-           $crs.='_'.$ENV{'request.course.sec'};
+ 	$mode='problem';
-        }
+ 	$status=$Apache::inputtags::status[-1];
-        $crs=~s/\_/\//g;
+     }
-        my $seeid=&Apache::lonnet::allowed('rin',$crs);
+     my $discussion;
-        unless ($symb) {
+     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-            $symb=&Apache::lonnet::symbread();
+ 					   ['LONCAPA_INTERNAL_no_discussion']);
-        }
+     if (! exists($env{'form.LONCAPA_INTERNAL_no_discussion'}) ||
-        if ($symb) {
+         $env{'form.LONCAPA_INTERNAL_no_discussion'} ne 'true') {
-           my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
+         $discussion=&Apache::lonfeedback::list_discussion($mode,$status);
-                      $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+     }
- 		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+     if ($target eq 'tex') {
-           if ($contrib{'version'}) {
+ 	$discussion.='<tex>\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\end{document}</tex>';
-               unless ($discussiononly) {
+ 	&Apache::lonxml::newparser($parser,\$discussion,'');
-                  $discussion.=
+ 	return '';
-                   '<address><hr />';
- 	     }
-               my $idx;
-               for ($idx=1;$idx<=$contrib{'version'};$idx++) {
- 		my $hidden=($contrib{'hidden'}=~/\.$idx\./);
- 		my $deleted=($contrib{'deleted'}=~/\.$idx\./);
- 		unless ((($hidden) && (!$seeid)) || ($deleted)) {
-                  my $message=$contrib{$idx.':message'};
-                  $message=~s/\n/\<br \/\>/g;
- 		 $message=&Apache::lontexconvert::msgtexconverted($message);
-                  if ($message) {
-                   if ($hidden) {
- 		      $message='<font color="#888888">'.$message.'</font>';
-                   }
-                   my $screenname=&Apache::loncommon::screenname(
-                                $contrib{$idx.':sendername'},
- 			       $contrib{$idx.':senderdomain'});
-                   my $plainname=&Apache::loncommon::nickname(
-                                $contrib{$idx.':sendername'},
- 			       $contrib{$idx.':senderdomain'});
-                   my $sender='Anonymous';
-                   if ((!$contrib{$idx.':anonymous'}) || ($seeid)) {
-                       $sender=&Apache::loncommon::aboutmewrapper(
-                                $plainname,
-                                $contrib{$idx.':sendername'},
-                                $contrib{$idx.':senderdomain'}).' ('.
-                               $contrib{$idx.':sendername'}.' at '.
- 		      $contrib{$idx.':senderdomain'}.')';
-                       if ($contrib{$idx.':anonymous'}) {
- 			  $sender.=' [anonymous] '.
-                                      $screenname;
-                       }
-                       if ($seeid) {
- 			  if ($hidden) {
-                              $sender.=' <a href="/adm/feedback?unhide='.
- 				 $symb.':::'.$idx.'">Make Visible</a>';
-                           } else {
-                              $sender.=' <a href="/adm/feedback?hide='.
- 				 $symb.':::'.$idx.'">Hide</a>';
- 			  }
-                           $sender.=' <a href="/adm/feedback?deldisc='.
- 				 $symb.':::'.$idx.'">Delete</a>';
-                       }
-                   } else {
-                       if ($screenname) {
- 			  $sender='<i>'.$screenname.'</i>';
-                       }
-                   }
- 		  $discussion.='<p><b>'.$sender.'</b> ('.
-                       localtime($contrib{$idx.':timestamp'}).
-                       '):<blockquote>'.$message.
-                       '</blockquote></p>';
- 	        }
-                }
-               }
-               unless ($discussiononly) {
-                  $discussion.='</address>';
- 	      }
-           }
-           if ($discussiononly) {
- 	      $discussion.=(<<ENDDISCUSS);
- <form action="/adm/feedback" method="post" name="mailform">
- <input type="submit" name="discuss" value="Post Discussion" />
- <input type="submit" name="anondiscuss" value="Post Anonymous Discussion" />
- <input type="hidden" name="symb" value="$symb" />
- <input type="hidden" name="sendit" value="true" />
- <br />
- <font size="1">Note: in anonymous discussion, your name is visible only to
- course faculty</font><br />
- <textarea name=comment cols=60 rows=10 wrap=hard></textarea>
- </form>
- ENDDISCUSS
-              $discussion.=&Apache::lonfeedback::generate_preview_button();
-           }
-        }
      }
-     return $discussion.($discussiononly?'':'</html>');
+     return $discussion;
  }
  sub tokeninputfield {
- Line 321  sub maketoken {
+ Line 256  sub maketoken {
  	$symb=&Apache::lonnet::symbread();
      }
      unless ($tuname) {
- 	$tuname=$ENV{'user.name'};
+ 	$tuname=$env{'user.name'};
-         $tudom=$ENV{'user.domain'};
+         $tudom=$env{'user.domain'};
-         $tcrsid=$ENV{'request.course.id'};
+         $tcrsid=$env{'request.course.id'};
      }
      return &Apache::lonnet::checkout($symb,$tuname,$tudom,$tcrsid);
- Line 333  sub printtokenheader {
+ Line 268  sub printtokenheader {
      my ($target,$token,$tsymb,$tcrsid,$tudom,$tuname)=@_;
      unless ($token) { return ''; }
-     my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+     my ($symb,$courseid,$domain,$name) = &Apache::lonnet::whichuser();
      unless ($tsymb) {
  	$tsymb=$symb;
      }
- Line 343  sub printtokenheader {
+ Line 278  sub printtokenheader {
          $tcrsid=$courseid;
      }
-     my %reply=&Apache::lonnet::get('environment',
+     my $plainname=&Apache::loncommon::plainname($tuname,$tudom);
-               ['firstname','middlename','lastname','generation'],
-               $tudom,$tuname);
-     my $plainname=$reply{'firstname'}.' '.
-                   $reply{'middlename'}.' '.
-                   $reply{'lastname'}.' '.
- 		  $reply{'generation'};
      if ($target eq 'web') {
          my %idhash=&Apache::lonnet::idrget($tudom,($tuname));
  	return
   '<img align="right" src="/cgi-bin/barcode.png?encode='.$token.'" />'.
-                'Checked out for '.$plainname.
+                &mt('Checked out for').' '.$plainname.
-                '<br />User: '.$tuname.' at '.$tudom.
+                '<br />'.&mt('User').': '.$tuname.' at '.$tudom.
- 	       '<br />ID: '.$idhash{$tuname}.
+ 	       '<br />'.&mt('ID').': '.$idhash{$tuname}.
- 	       '<br />CourseID: '.$tcrsid.
+ 	       '<br />'.&mt('CourseID').': '.$tcrsid.
- 	       '<br />Course: '.$ENV{'course.'.$tcrsid.'.description'}.
+ 	       '<br />'.&mt('Course').': '.$env{'course.'.$tcrsid.'.description'}.
-                '<br />DocID: '.$token.
+                '<br />'.&mt('DocID').': '.$token.
-                '<br />Time: '.localtime().'<hr />';
+                '<br />'.&mt('Time').': '.&Apache::lonlocal::locallocaltime().'<hr />';
      } else {
          return $token;
      }
  }
- sub fontsettings() {
-     my $headerstring='';
-     if (($ENV{'browser.os'} eq 'mac') && (!$ENV{'browser.mathml'})) {
-          $headerstring.=
-              '<meta Content-Type="text/html; charset=x-mac-roman">';
-     }
-     return $headerstring;
- }
  sub printalltags {
    my $temp;
    foreach $temp (sort keys %Apache::lonxml::alltags) {
- Line 389  sub xmlparse {
+ Line 309  sub xmlparse {
   &setup_globals($request,$target);
   &Apache::inputtags::initialize_inputtags();
+  &Apache::bridgetask::initialize_bridgetask();
   &Apache::outputtags::initialize_outputtags();
   &Apache::edit::initialize_edit();
+  &Apache::londefdef::initialize_londefdef();
  #
  # do we have a course style file?
  #
-  if ($ENV{'request.course.id'} && $ENV{'request.state'} ne 'construct') {
+  if ($env{'request.course.id'} && $env{'request.state'} ne 'construct') {
       my $bodytext=
- 	 $ENV{'course.'.$ENV{'request.course.id'}.'.default_xml_style'};
+ 	 $env{'course.'.$env{'request.course.id'}.'.default_xml_style'};
       if ($bodytext) {
-        my $location=&Apache::lonnet::filelocation('',$bodytext);
+ 	 foreach my $file (split(',',$bodytext)) {
-        my $styletext=&Apache::lonnet::getfile($location);
+ 	     my $location=&Apache::lonnet::filelocation('',$file);
-        if ($styletext ne '-1') {
+ 	     my $styletext=&Apache::lonnet::getfile($location);
-           %style_for_target = (%style_for_target,
+ 	     if ($styletext ne '-1') {
-                           &Apache::style::styleparser($target,$styletext));
+ 		 %style_for_target = (%style_for_target,
-        }
+ 				      &Apache::style::styleparser($target,$styletext));
-     }
+ 	     }
+ 	 }
+      }
+  } elsif ($env{'construct.style'}
+ 	  && ($env{'request.state'} eq 'construct')) {
+      my $location=&Apache::lonnet::filelocation('',$env{'construct.style'});
+      my $styletext=&Apache::lonnet::getfile($location);
+      if ($styletext ne '-1') {
+ 	 %style_for_target = (%style_for_target,
+ 			      &Apache::style::styleparser($target,$styletext));
+      }
   }
+ #&printalltags();
-  #&printalltags();
   my @pars = ();
-  my $pwd=$ENV{'request.filename'};
+  my $pwd=$env{'request.filename'};
   $pwd =~ s:/[^/]*$::;
   &newparser(\@pars,\$content_file_string,$pwd);
- Line 423  sub xmlparse {
+ Line 355  sub xmlparse {
   my @stack = ();
   my @parstack = ();
-  &initdepth;
+  &initdepth();
+  &init_alarm();
   my $finaloutput = &inner_xmlparse($target,\@stack,\@parstack,\@pars,
- 				   $safeeval,\%style_for_target);
+ 				   $safeeval,\%style_for_target,1);
-  if ($ENV{'request.uri'}) {
-     &writeallows($ENV{'request.uri'});
+  if (@stack) {
+      &warning(&mt('At end of file some tags were still left unclosed:').
+ 	      ' <tt>&lt;'.join('&gt;</tt>, <tt>&lt;',reverse(@stack)).
+ 	      '&gt;</tt>');
   }
+  if ($env{'request.uri'}) {
+     &writeallows($env{'request.uri'});
+  }
+  &do_registered_ssi();
   if ($Apache::lonxml::counter_changed) { &store_counter() }
-  return $finaloutput;
- }
- sub htmlclean {
-     my ($raw,$full)=@_;
-     my $tree = HTML::TreeBuilder->new;
-     $tree->ignore_unknown(0);
-     $tree->parse($raw);
+  &clean_safespace($safeeval);
-     my $output= $tree->as_HTML(undef,' ');
+  if (@script_var_displays) {
+      $finaloutput .= join('',@script_var_displays);
-     $output=~s/\<(br|hr|img|meta|allow)(.*?)\>/\<$1$2 \/\>/gis;
+      undef(@script_var_displays);
-     $output=~s/\<\/(br|hr|img|meta|allow)\>//gis;
+  }
-     unless ($full) {
+  &init_state();
-        $output=~s/\<[\/]*(body|head|html)\>//gis;
+  if ($env{'form.return_only_error_and_warning_counts'}) {
-     }
+      if ($env{'request.filename'}=~/\.(html|htm|xml)$/i) {
+         my $error=&verify_html($content_file_string);
-     $tree = $tree->delete;
+         if ($error) { $errorcount++; }
+      }
-     return $output;
+      return "$errorcount:$warningcount";
+  }
+  return $finaloutput;
  }
  sub latex_special_symbols {
-     my ($current_token,$stack,$parstack,$where)=@_;
+     my ($string,$where)=@_;
+     #
+     #  If e.g. in verbatim mode, then don't substitute.
+     #  but return original string.
+     #
+     if (!($Apache::lonxml::substitute_LaTeX_symbols)) {
+ 	return $string;
+     }
      if ($where eq 'header') {
- 	$current_token =~ s/(\\|_|\^)/ /g;
+ 	$string =~ s/\\/\$\\backslash\$/g; # \  -> $\backslash$ per LaTex line by line pg  10.
- 	$current_token =~ s/(\$|%|\#|&|\{|\})/\\$1/g;
+ 	$string =~ s/(\$|%|\{|\})/\\$1/g;
+ 	$string=&Apache::lonprintout::character_chart($string);
+ 	# any & or # leftover should be safe to just escape
+         $string=~s/([^\\])\&/$1\\\&/g;
+         $string=~s/([^\\])\#/$1\\\#/g;
+ 	$string =~ s/_/\\_/g;              # _ -> \_
+ 	$string =~ s/\^/\\\^{}/g;          # ^ -> \^{}
      } else {
- 	$current_token=~s/\\ /\\char92 /g;
+ 	$string=~s/\\/\\ensuremath{\\backslash}/g;
- 	$current_token=~s/\^/\\char94 /g;
+ 	$string=~s/\\\%|\%/\\\%/g;
- 	$current_token=~s/\~/\\char126 /g;
+ 	$string=~s/\\{|{/\\{/g;
- 	$current_token=~s/(&[^a-z\#])/\\$1/g;
+ 	$string=~s/\\}|}/\\}/g;
- 	$current_token=~s/([^&])\#/$1\\#/g;
+ 	$string=~s/\\ensuremath\\{\\backslash\\}/\\ensuremath{\\backslash}/g;
- 	$current_token=~s/(\$|_|{|})/\\$1/g;
+ 	$string=~s/\\\$|\$/\\\$/g;
- 	$current_token=~s/\\char92 /\\texttt{\\char92}/g;
+ 	$string=~s/\\\_|\_/\\\_/g;
- 	$current_token=~s/(>|<)/\$$1\$/g; #more or less
+         $string=~s/([^\\]|^)(\~|\^)/$1\\$2\\strut /g;
- 	if ($current_token=~m/\d%/) {$current_token =~ s/(\d)%/$1\\%/g;} #percent after digit
+ 	$string=~s/(>|<)/\\ensuremath\{$1\}/g; #more or less
- 	if ($current_token=~m/\s%/) {$current_token =~ s/(\s)%/$1\\%/g;} #persent after space
+ 	$string=&Apache::lonprintout::character_chart($string);
+ 	# any & or # leftover should be safe to just escape
+ 	$string=~s/\\\&|\&/\\\&/g;
+ 	$string=~s/\\\#|\#/\\\#/g;
+         $string=~s/\|/\$\\mid\$/g;
+ #single { or } How to escape?
      }
-     return $current_token;
+     return $string;
  }
  sub inner_xmlparse {
-   my ($target,$stack,$parstack,$pars,$safeeval,$style_for_target)=@_;
+   my ($target,$stack,$parstack,$pars,$safeeval,$style_for_target,$start)=@_;
    my $finaloutput = '';
    my $result;
    my $token;
+   my $dontpop=0;
+   my $startredirection = $Apache::lonxml::redirection;
    while ( $#$pars > -1 ) {
      while ($token = $$pars['-1']->get_token) {
-       if (($token->[0] eq 'T') || ($token->[0] eq 'C') || ($token->[0] eq 'D') ) {
+       if (($token->[0] eq 'T') || ($token->[0] eq 'C') ) {
  	if ($metamode<1) {
  	    my $text=$token->[1];
  	    if ($token->[0] eq 'C' && $target eq 'tex') {
- Line 491  sub inner_xmlparse {
+ Line 444  sub inner_xmlparse {
  	    }
  	    $result.=$text;
  	}
+       } elsif (($token->[0] eq 'D')) {
+ 	if ($metamode<1 && $target eq 'web') {
+ 	    my $text=$token->[1];
+ 	    $result.=$text;
+ 	}
        } elsif ($token->[0] eq 'PI') {
- 	if ($metamode<1) {
+ 	if ($metamode<1 && $target eq 'web') {
  	  $result=$token->[2];
  	}
        } elsif ($token->[0] eq 'S') {
- Line 507  sub inner_xmlparse {
+ Line 465  sub inner_xmlparse {
  	    my $string=$$style_for_target{$token->[1]}.
  	      '<LONCAPA_INTERNAL_TURN_STYLE_ON />';
  	    &Apache::lonxml::newparser($pars,\$string);
+ 	    $Apache::lonxml::style_values=$$parstack[-1];
+ 	    $Apache::lonxml::style_end_values=$$parstack[-1];
  	} else {
  	  $result = &callsub("start_$token->[1]", $target, $token, $stack,
  			     $parstack, $pars, $safeeval, $style_for_target);
  	}
        } elsif ($token->[0] eq 'E') {
- 	#clear out any tags that didn't end
- 	while ($token->[1] ne $$stack['-1'] && ($#$stack > -1)) {
- 	  my $lasttag=$$stack[-1];
- 	  if ($token->[1] =~ /^$lasttag$/i) {
- 	    &Apache::lonxml::warning('Using tag &lt;/'.$token->[1].'&gt; as end tag to &lt;'.$$stack[-1].'&gt;');
- 	    last;
- 	  } else {
- 	    &Apache::lonxml::warning('Found tag &lt;/'.$token->[1].'&gt; when looking for &lt;/'.$$stack[-1].'&gt; in file');
- 	    &end_tag($stack,$parstack,$token);
- 	  }
- 	}
  	if ($Apache::lonxml::usestyle &&
  	    exists($$style_for_target{'/'."$token->[1]"})) {
  	    $Apache::lonxml::usestyle=0;
  	    my $string=$$style_for_target{'/'.$token->[1]}.
- 	      '<LONCAPA_INTERNAL_TURN_STYLE_ON />';
+ 	      '<LONCAPA_INTERNAL_TURN_STYLE_ON end="'.$token->[1].'" />';
  	    &Apache::lonxml::newparser($pars,\$string);
+ 	    $Apache::lonxml::style_values=$Apache::lonxml::style_end_values;
+ 	    $Apache::lonxml::style_end_values='';
+ 	    $dontpop=1;
  	} else {
- 	  $result = &callsub("end_$token->[1]", $target, $token, $stack,
+ 	    #clear out any tags that didn't end
- 			     $parstack, $pars,$safeeval, $style_for_target);
+ 	    while ($token->[1] ne $$stack['-1'] && ($#$stack > -1)) {
+ 		my $lasttag=$$stack[-1];
+ 		if ($token->[1] =~ /^\Q$lasttag\E$/i) {
+ 		    &Apache::lonxml::warning(&mt('Using tag [_1] on line [_2] as end tag to [_3]','&lt;/'.$token->[1].'&gt;','.$token->[3].','&lt;'.$$stack[-1].'&gt;'));
+ 		    last;
+ 		} else {
+                     &Apache::lonxml::warning(&mt('Found tag [_1] on line [_2] when looking for [_3] in file.','&lt;/'.$token->[1].'&gt;',$token->[3],'&lt;/'.$$stack[-1].'&gt;'));
+ 		    &end_tag($stack,$parstack,$token);
+ 		}
+ 	    }
+ 	    $result = &callsub("end_$token->[1]", $target, $token, $stack,
+ 			       $parstack, $pars,$safeeval, $style_for_target);
  	}
        } else {
  	&Apache::lonxml::error("Unknown token event :$token->[0]:$token->[1]:");
        }
        #evaluate variable refs in result
-       if ($result ne "") {
+       if ($Apache::lonxml::post_evaluate &&$result ne "") {
- 	if ( $#$parstack > -1 ) {
+ 	  my $extras;
- 	  $result=&Apache::run::evaluate($result,$safeeval,$$parstack[-1]);
+ 	  if (!$Apache::lonxml::usestyle) {
- 	} else {
+ 	      $extras=$Apache::lonxml::style_values;
- 	  $result= &Apache::run::evaluate($result,$safeeval,'');
+ 	  }
- 	}
+           if ($token->[1] ne 'translated') {
+ 	      if ( $#$parstack > -1 ) {
+ 	          $result=&Apache::run::evaluate($result,$safeeval,$extras.$$parstack[-1]);
+ 	      } else {
+ 	          $result=&Apache::run::evaluate($result,$safeeval,$extras);
+ 	      }
+           }
        }
+       $Apache::lonxml::post_evaluate=1;
        if (($token->[0] eq 'T') || ($token->[0] eq 'C') || ($token->[0] eq 'D') ) {
- 	if ($target eq 'tex') {
+ 	  #Style file definitions should be correct
- 	    $result=&latex_special_symbols($result,$stack,$parstack);
+ 	  if ($target eq 'tex' && ($Apache::lonxml::usestyle)) {
- 	}
+ 	      $result=&latex_special_symbols($result);
+ 	  }
        }
-       # Encode any high ASCII characters
-       if (!$Apache::lonxml::prevent_entity_encode) {
- 	$result=&HTML::Entities::encode($result,"\200-\377");
-       }
        if ($Apache::lonxml::redirection) {
  	$Apache::lonxml::outputstack['-1'] .= $result;
        } else {
- Line 562  sub inner_xmlparse {
+ Line 529  sub inner_xmlparse {
        }
        $result = '';
-       if ($token->[0] eq 'E') {
+       if ($token->[0] eq 'E' && !$dontpop) {
  	&end_tag($stack,$parstack,$token);
        }
+       $dontpop=0;
      }
      if ($#$pars > -1) {
  	pop @$pars;
- Line 576  sub inner_xmlparse {
+ Line 544  sub inner_xmlparse {
    #   $finaloutput.=&endredirection;
    # }
+   if ( $start && $target eq 'grade') { &endredirection(); }
+   if ( $Apache::lonxml::redirection > $startredirection) {
+       while ($Apache::lonxml::redirection > $startredirection) {
+ 	  $finaloutput .= &endredirection();
+       }
+   }
    if (($ENV{'QUERY_STRING'}) && ($target eq 'web')) {
      $finaloutput=&afterburn($finaloutput);
    }
    return $finaloutput;
  }
+ ##
+ ## Looks to see if there is a subroutine defined for this tag.  If so, call it,
+ ## otherwise do not call it as we do not know what it is.
+ ##
  sub callsub {
    my ($sub,$target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
    my $currentstring='';
- Line 601  sub callsub {
+ Line 578  sub callsub {
      }
      my $deleted=0;
-     $Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter);
      if (($token->[0] eq 'S') && ($target eq 'modified')) {
        $deleted=&Apache::edit::handle_delete($space,$target,$token,$tagstack,
  					     $parstack,$parser,$safeeval,
- Line 615  sub callsub {
+ Line 591  sub callsub {
  					     $parstack,$parser,$safeeval,
  					     $style);
        } else {
+           if ($target eq 'tex') {
+               # throw away tag name
+               return '';
+           }
  	#&Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode");
  	if ($metamode <1) {
  	  if (defined($token->[4]) && ($metamode < 1)) {
- Line 633  sub callsub {
+ Line 613  sub callsub {
  	  } elsif ($token->[0] eq 'E') {
  	    $currentstring = &Apache::edit::tag_end($target,$token);
  	  }
- 	} elsif ($target eq 'modified') {
+ 	}
+       }
+       if ($target eq 'modified' && $nodefault eq '') {
+ 	  if ($currentstring eq '') {
+ 	      if ($token->[0] eq 'S') {
+ 		  $currentstring = $token->[4];
+ 	      } elsif ($token->[0] eq 'E') {
+ 		  $currentstring = $token->[2];
+ 	      } else {
+ 		  $currentstring = $token->[2];
+ 	      }
+ 	  }
  	  if ($token->[0] eq 'S') {
- 	    $currentstring = $token->[4];
+ 	      $currentstring.=&Apache::edit::handle_insert();
- 	    $currentstring.=&Apache::edit::handle_insert();
  	  } elsif ($token->[0] eq 'E') {
- 	    $currentstring = $token->[2];
+ 	      $currentstring.=&Apache::edit::handle_insertafter($token->[1]);
-             $currentstring.=&Apache::edit::handle_insertafter($token->[1]);
- 	  } else {
- 	    $currentstring = $token->[2];
  	  }
- 	}
        }
      }
      use strict 'refs';
- Line 651  sub callsub {
+ Line 637  sub callsub {
    return $currentstring;
  }
+ {
+     my %state;
+     sub init_state {
+ 	undef(%state);
+     }
+     sub set_state {
+ 	my ($key,$value) = @_;
+ 	$state{$key} = $value;
+ 	return $value;
+     }
+     sub get_state {
+ 	my ($key) = @_;
+ 	return $state{$key};
+     }
+ }
  sub setup_globals {
    my ($request,$target)=@_;
    $Apache::lonxml::request=$request;
-   $Apache::lonxml::registered = 0;
    $errorcount=0;
    $warningcount=0;
    $Apache::lonxml::default_homework_loaded=0;
    $Apache::lonxml::usestyle=1;
    &init_counter();
+   &clear_bubble_lines_for_part();
+   &init_state();
+   &set_state('target',$target);
    @Apache::lonxml::pwd=();
    @Apache::lonxml::extlinks=();
+   @script_var_displays=();
+   @Apache::lonxml::ssi_info=();
+   $Apache::lonxml::post_evaluate=1;
+   $Apache::lonxml::warnings_error_header='';
+   $Apache::lonxml::substitute_LaTeX_symbols = 1;
    if ($target eq 'meta') {
      $Apache::lonxml::redirection = 0;
      $Apache::lonxml::metamode = 1;
- Line 673  sub setup_globals {
+ Line 684  sub setup_globals {
      $Apache::lonxml::evaluate = 1;
      $Apache::lonxml::import = 1;
    } elsif ($target eq 'grade') {
-     &startredirection;
+     &startredirection(); #ended in inner_xmlparse on exit
      $Apache::lonxml::metamode = 0;
      $Apache::lonxml::evaluate = 1;
      $Apache::lonxml::import = 1;
- Line 702  sub setup_globals {
+ Line 713  sub setup_globals {
  sub init_safespace {
    my ($target,$safeeval,$safehole,$safeinit) = @_;
+   $safeeval->deny_only(':dangerous');
+   $safeeval->reval('use Math::Complex;');
+   $safeeval->permit_only(":default");
    $safeeval->permit("entereval");
    $safeeval->permit(":base_math");
    $safeeval->permit("sort");
+   $safeeval->permit("time");
+   $safeeval->permit("caller");
+   $safeeval->deny("rand");
+   $safeeval->deny("srand");
    $safeeval->deny(":base_io");
    $safehole->wrap(\&Apache::scripttag::xmlparse,$safeeval,'&xmlparse');
+   $safehole->wrap(\&Apache::outputtags::multipart,$safeeval,'&multipart');
    $safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');
+   $safehole->wrap(\&Apache::chemresponse::chem_standard_order,$safeeval,
+ 		  '&chem_standard_order');
+   $safehole->wrap(\&Apache::response::check_status,$safeeval,'&check_status');
+   $safehole->wrap(\&Apache::response::implicit_multiplication,$safeeval,'&implicit_multiplication');
+   $safehole->wrap(\&Apache::lonmaxima::maxima_eval,$safeeval,'&maxima_eval');
+   $safehole->wrap(\&Apache::lonmaxima::maxima_check,$safeeval,'&maxima_check');
+   $safehole->wrap(\&Apache::lonmaxima::maxima_cas_formula_fix,$safeeval,
+ 		  '&maxima_cas_formula_fix');
+   $safehole->wrap(\&Apache::caparesponse::capa_formula_fix,$safeeval,
+ 		  '&capa_formula_fix');
+   $safehole->wrap(\&Apache::lonlocal::locallocaltime,$safeeval,
+                   '&locallocaltime');
    $safehole->wrap(\&Math::Cephes::asin,$safeeval,'&asin');
    $safehole->wrap(\&Math::Cephes::acos,$safeeval,'&acos');
    $safehole->wrap(\&Math::Cephes::atan,$safeeval,'&atan');
- Line 752  sub init_safespace {
+ Line 786  sub init_safespace {
    $safehole->wrap(\&Math::Cephes::stdtr ,$safeeval,'&stdtr' );
    $safehole->wrap(\&Math::Cephes::stdtri,$safeeval,'&stdtri');
+   $safehole->wrap(\&Math::Cephes::Matrix::mat,$safeeval,'&mat');
+   $safehole->wrap(\&Math::Cephes::Matrix::new,$safeeval,
+ 		  '&Math::Cephes::Matrix::new');
+   $safehole->wrap(\&Math::Cephes::Matrix::coef,$safeeval,
+ 		  '&Math::Cephes::Matrix::coef');
+   $safehole->wrap(\&Math::Cephes::Matrix::clr,$safeeval,
+ 		  '&Math::Cephes::Matrix::clr');
+   $safehole->wrap(\&Math::Cephes::Matrix::add,$safeeval,
+ 		  '&Math::Cephes::Matrix::add');
+   $safehole->wrap(\&Math::Cephes::Matrix::sub,$safeeval,
+ 		  '&Math::Cephes::Matrix::sub');
+   $safehole->wrap(\&Math::Cephes::Matrix::mul,$safeeval,
+ 		  '&Math::Cephes::Matrix::mul');
+   $safehole->wrap(\&Math::Cephes::Matrix::div,$safeeval,
+ 		  '&Math::Cephes::Matrix::div');
+   $safehole->wrap(\&Math::Cephes::Matrix::inv,$safeeval,
+ 		  '&Math::Cephes::Matrix::inv');
+   $safehole->wrap(\&Math::Cephes::Matrix::transp,$safeeval,
+ 		  '&Math::Cephes::Matrix::transp');
+   $safehole->wrap(\&Math::Cephes::Matrix::simq,$safeeval,
+ 		  '&Math::Cephes::Matrix::simq');
+   $safehole->wrap(\&Math::Cephes::Matrix::mat_to_vec,$safeeval,
+ 		  '&Math::Cephes::Matrix::mat_to_vec');
+   $safehole->wrap(\&Math::Cephes::Matrix::vec_to_mat,$safeeval,
+ 		  '&Math::Cephes::Matrix::vec_to_mat');
+   $safehole->wrap(\&Math::Cephes::Matrix::check,$safeeval,
+ 		  '&Math::Cephes::Matrix::check');
+   $safehole->wrap(\&Math::Cephes::Matrix::check,$safeeval,
+ 		  '&Math::Cephes::Matrix::check');
  #  $safehole->wrap(\&Math::Cephes::new_fract,$safeeval,'&new_fract');
  #  $safehole->wrap(\&Math::Cephes::radd,$safeeval,'&radd');
  #  $safehole->wrap(\&Math::Cephes::rsub,$safeeval,'&rsub');
- Line 780  sub init_safespace {
+ Line 844  sub init_safespace {
    $safehole->wrap(\&Math::Random::random_set_seed_from_phrase,$safeeval,'&random_set_seed_from_phrase');
    $safehole->wrap(\&Math::Random::random_get_seed,$safeeval,'&random_get_seed');
    $safehole->wrap(\&Math::Random::random_set_seed,$safeeval,'&random_set_seed');
+   $safehole->wrap(\&Apache::loncommon::languages,$safeeval,'&languages');
+   $safehole->wrap(\&Apache::lonxml::error,$safeeval,'&LONCAPA_INTERNAL_ERROR');
+   $safehole->wrap(\&Apache::lonxml::debug,$safeeval,'&LONCAPA_INTERNAL_DEBUG');
+   $safehole->wrap(\&Apache::lonnet::logthis,$safeeval,'&LONCAPA_INTERNAL_LOGTHIS');
+   $safehole->wrap(\&Apache::inputtags::finalizeawards,$safeeval,'&LONCAPA_INTERNAL_FINALIZEAWARDS');
+   $safehole->wrap(\&Apache::caparesponse::get_sigrange,$safeeval,'&LONCAPA_INTERNAL_get_sigrange');
+ #  use Data::Dumper;
+ #  $safehole->wrap(\&Data::Dumper::Dumper,$safeeval,'&LONCAPA_INTERNAL_Dumper');
  #need to inspect this class of ops
  # $safeeval->deny(":base_orig");
+   $safeeval->permit("require");
    $safeinit .= ';$external::target="'.$target.'";';
-   my $rndseed;
-   my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
-   $rndseed=&Apache::lonnet::rndseed($symb,$courseid,$domain,$name);
-   $safeinit .= ';$external::randomseed='.$rndseed.';';
    &Apache::run::run($safeinit,$safeeval);
+   &initialize_rndseed($safeeval);
+ }
+ sub clean_safespace {
+     my ($safeeval) = @_;
+     delete_package_recurse($safeeval->{Root});
+ }
+ sub delete_package_recurse {
+      my ($package) = @_;
+      my @subp;
+      {
+ 	 no strict 'refs';
+ 	 while (my ($key,$val) = each(%{*{"$package\::"}})) {
+ 	     if (!defined($val)) { next; }
+ 	     local (*ENTRY) = $val;
+ 	     if (defined *ENTRY{HASH} && $key =~ /::$/ &&
+ 		 $key ne "main::" && $key ne "<none>::")
+ 	     {
+ 		 my ($p) = $package ne "main" ? "$package\::" : "";
+ 		 ($p .= $key) =~ s/::$//;
+ 		 push(@subp,$p);
+ 	     }
+ 	 }
+      }
+      foreach my $p (@subp) {
+ 	 delete_package_recurse($p);
+      }
+      Symbol::delete_package($package);
+ }
+ sub initialize_rndseed {
+     my ($safeeval)=@_;
+     my $rndseed;
+     my ($symb,$courseid,$domain,$name) = &Apache::lonnet::whichuser();
+     $rndseed=&Apache::lonnet::rndseed($symb,$courseid,$domain,$name);
+     my $safeinit = '$external::randomseed="'.$rndseed.'";';
+     &Apache::lonxml::debug("Setting rndseed to $rndseed");
+     &Apache::run::run($safeinit,$safeeval);
  }
  sub default_homework_load {
      my ($safeeval)=@_;
      &Apache::lonxml::debug('Loading default_homework');
      my $default=&Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/default_homework.lcpm');
-     if ($default == -1) {
+     if ($default eq -1) {
  	&Apache::lonxml::error("<b>Unable to find <i>default_homework.lcpm</i></b>");
      } else {
  	&Apache::run::run($default,$safeeval);
- Line 803  sub default_homework_load {
+ Line 910  sub default_homework_load {
      }
  }
+ {
+     my $alarm_depth;
+     sub init_alarm {
+ 	alarm(0);
+ 	$alarm_depth=0;
+     }
+     sub start_alarm {
+ 	if ($alarm_depth<1) {
+ 	    my $old=alarm($Apache::lonnet::perlvar{'lonScriptTimeout'});
+ 	    if ($old) {
+ 		&Apache::lonxml::error("Cancelled an alarm of $old, this shouldn't occur.");
+ 	    }
+ 	}
+ 	$alarm_depth++;
+     }
+     sub end_alarm {
+ 	$alarm_depth--;
+ 	if ($alarm_depth<1) { alarm(0); }
+     }
+ }
+ my $metamode_was;
  sub startredirection {
-   $Apache::lonxml::redirection++;
+     if (!$Apache::lonxml::redirection) {
-   push (@Apache::lonxml::outputstack, '');
+ 	$metamode_was=$Apache::lonxml::metamode;
+     }
+     $Apache::lonxml::metamode=0;
+     $Apache::lonxml::redirection++;
+     push (@Apache::lonxml::outputstack, '');
  }
  sub endredirection {
-   if (!$Apache::lonxml::redirection) {
+     if (!$Apache::lonxml::redirection) {
-     &Apache::lonxml::error("Endredirection was called, before a startredirection, perhaps you have unbalanced tags. Some debuging information:".join ":",caller);
+ 	&Apache::lonxml::error("Endredirection was called before a startredirection, perhaps you have unbalanced tags. Some debugging information:".join ":",caller);
-     return '';
+ 	return '';
-   }
+     }
-   $Apache::lonxml::redirection--;
+     $Apache::lonxml::redirection--;
-   pop @Apache::lonxml::outputstack;
+     if (!$Apache::lonxml::redirection) {
+ 	$Apache::lonxml::metamode=$metamode_was;
+     }
+     pop @Apache::lonxml::outputstack;
+ }
+ sub in_redirection {
+     return ($Apache::lonxml::redirection > 0)
  }
  sub end_tag {
- Line 826  sub end_tag {
+ Line 966  sub end_tag {
  sub initdepth {
    @Apache::lonxml::depthcounter=();
-   $Apache::lonxml::depth=-1;
+   undef($Apache::lonxml::last_depth_count);
-   $Apache::lonxml::olddepth=-1;
  }
+ my @timers;
+ my $lasttime;
+ # @Apache::lonxml::depthcounter -> count of tags that exist so
+ #                                  far at each level
+ # $Apache::lonxml::last_depth_count -> when ascending, need to
+ # remember the count for the level below the current level (for
+ # example going from 1_2 -> 1 -> 1_3 need to remember the 2 )
  sub increasedepth {
    my ($token) = @_;
-   $Apache::lonxml::depth++;
+   push(@Apache::lonxml::depthcounter,$Apache::lonxml::last_depth_count+1);
-   $Apache::lonxml::depthcounter[$Apache::lonxml::depth]++;
+   undef($Apache::lonxml::last_depth_count);
-   if ($Apache::lonxml::depthcounter[$Apache::lonxml::depth]==1) {
+   my $time;
-     $Apache::lonxml::olddepth=$Apache::lonxml::depth;
+   if ($Apache::lonxml::debug eq "1") {
-   }
+       push(@timers,[&gettimeofday()]);
-   my $curdepth=join('_',@Apache::lonxml::depthcounter);
+       $time=&tv_interval($lasttime);
-   &Apache::lonxml::debug("s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n");
+       $lasttime=[&gettimeofday()];
+   }
+   my $spacing='  'x($#Apache::lonxml::depthcounter);
+   $Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter);
+ #  &Apache::lonxml::debug("s$spacing$Apache::lonxml::depth : $Apache::lonxml::olddepth : $Apache::lonxml::curdepth : $token->[1] : $time");
  #print "<br />s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n";
  }
  sub decreasedepth {
    my ($token) = @_;
-   $Apache::lonxml::depth--;
+   if (  $#Apache::lonxml::depthcounter == -1) {
-   if ($Apache::lonxml::depth<$Apache::lonxml::olddepth-1) {
+       &Apache::lonxml::warning(&mt("Missing tags, unable to properly run file."));
-     $#Apache::lonxml::depthcounter--;
-     $Apache::lonxml::olddepth=$Apache::lonxml::depth+1;
    }
-   if (  $Apache::lonxml::depth < -1) {
+   $Apache::lonxml::last_depth_count = pop(@Apache::lonxml::depthcounter);
-     &Apache::lonxml::warning("Missing tags, unable to properly run file.");
-     $Apache::lonxml::depth='-1';
+   my ($timer,$time);
-   }
+   if ($Apache::lonxml::debug eq "1") {
-   my $curdepth=join('_',@Apache::lonxml::depthcounter);
+       $timer=pop(@timers);
-   &Apache::lonxml::debug("e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n");
+       $time=&tv_interval($lasttime);
+       $lasttime=[&gettimeofday()];
+   }
+   my $spacing='  'x($#Apache::lonxml::depthcounter);
+   $Apache::lonxml::curdepth = join('_',@Apache::lonxml::depthcounter);
+ #  &Apache::lonxml::debug("e$spacing$Apache::lonxml::depth : $Apache::lonxml::olddepth : $Apache::lonxml::curdepth : $token->[1] : $time : ".&tv_interval($timer));
  #print "<br />e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n";
  }
+ sub get_id {
+     my ($parstack,$safeeval)=@_;
+     my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
+     if ($env{'request.state'} eq 'construct' && $id =~ /([._]|[^\w\d\s[:punct:]])/) {
+ 	&error(&mt("ID &quot;[_1]&quot; contains invalid characters, IDs are only allowed to contain letters, numbers, spaces and -",'<tt>'.$id.'</tt>'));
+     }
+     if ($id =~ /^\s*$/) { $id = $Apache::lonxml::curdepth; }
+     return $id;
+ }
  sub get_all_text_unbalanced {
  #there is a copy of this in lonpublisher.pm
-  my($tag,$pars)= @_;
+     my($tag,$pars)= @_;
-  my $token;
+     my $token;
-  my $result='';
+     my $result='';
-  $tag='<'.$tag.'>';
+     $tag='<'.$tag.'>';
-  while ($token = $$pars[-1]->get_token) {
+     while ($token = $$pars[-1]->get_token) {
-    if (($token->[0] eq 'T')||($token->[0] eq 'C')||($token->[0] eq 'D')) {
+ 	if (($token->[0] eq 'T')||($token->[0] eq 'C')||($token->[0] eq 'D')) {
-      $result.=$token->[1];
+ 	    if ($token->[0] eq 'T' && $token->[2]) {
-    } elsif ($token->[0] eq 'PI') {
+ 		$result.='<![CDATA['.$token->[1].']]>';
-      $result.=$token->[2];
+ 	    } else {
-    } elsif ($token->[0] eq 'S') {
+ 		$result.=$token->[1];
-      $result.=$token->[4];
+ 	    }
-    } elsif ($token->[0] eq 'E')  {
+ 	} elsif ($token->[0] eq 'PI') {
-      $result.=$token->[2];
+ 	    $result.=$token->[2];
-    }
+ 	} elsif ($token->[0] eq 'S') {
-    if ($result =~ /(.*)\Q$tag\E(.*)/s) {
+ 	    $result.=$token->[4];
-      &Apache::lonxml::debug('Got a winner with leftovers ::'.$2);
+ 	} elsif ($token->[0] eq 'E')  {
-      &Apache::lonxml::debug('Result is :'.$1);
+ 	    $result.=$token->[2];
-      $result=$1;
+ 	}
-      my $redo=$tag.$2;
+ 	if ($result =~ /\Q$tag\E/is) {
-      &Apache::lonxml::newparser($pars,\$redo);
+ 	    ($result,my $redo)=$result =~ /(.*)\Q$tag\E(.*)/is;
-      last;
+ 	    #&Apache::lonxml::debug('Got a winner with leftovers ::'.$2);
-    }
+ 	    #&Apache::lonxml::debug('Result is :'.$1);
-  }
+ 	    $redo=$tag.$redo;
-  return $result
+ 	    &Apache::lonxml::newparser($pars,\$redo);
+ 	    last;
+ 	}
+     }
+     return $result
  }
+ #########################################################################
+ #                                                                       #
+ #           bubble line counter management                              #
+ #                                                                       #
+ #########################################################################
+ =pod
+ For bubble grading mode and exam bubble printing mode, the tracking of
+ the current 'bubble line number' is stored in the %env element
+ 'form.counter', and is modifed and handled by the following routines.
+ The value of it is stored in $Apache:lonxml::counter when live and
+ stored back to env after done.
+ =item &increment_counter($increment);
+ Increments the internal counter environment variable a specified amount
+ Optional Arguments:
+   $increment - amount to increment by (defaults to 1)
+                Also 1 if the value is negative or zero.
+   $part_response - A concatenation of the part and response id
+                    identifying exactly what is being 'answered'.
+ =cut
  sub increment_counter {
-     $Apache::lonxml::counter++;
+     my ($increment, $part_response) = @_;
+     if ($env{'form.grade_noincrement'}) { return; }
+     if (!defined($increment) || $increment le 0) {
+ 	$increment = 1;
+     }
+     $Apache::lonxml::counter += $increment;
+     # If the caller supplied the response_id parameter,
+     # Maintain its counter.. creating if necessary.
+     if (defined($part_response)) {
+ 	if (!defined($Apache::lonxml::counters_per_part{$part_response})) {
+ 	    $Apache::lonxml::counters_per_part{$part_response} = 0;
+ 	}
+ 	$Apache::lonxml::counters_per_part{$part_response} += $increment;
+ 	my $new_value = $Apache::lonxml::counters_per_part{$part_response};
+     }
      $Apache::lonxml::counter_changed=1;
  }
+ =pod
+ =item &init_counter($increment);
+ Initialize the internal counter environment variable
+ =cut
  sub init_counter {
-     if (defined($ENV{'form.counter'})) {
+     if ($env{'request.state'} eq 'construct') {
- 	$Apache::lonxml::counter=$ENV{'form.counter'};
+ 	$Apache::lonxml::counter=1;
+ 	$Apache::lonxml::counter_changed=1;
+     } elsif (defined($env{'form.counter'})) {
+ 	$Apache::lonxml::counter=$env{'form.counter'};
+ 	$Apache::lonxml::counter_changed=0;
      } else {
  	$Apache::lonxml::counter=1;
- 	&store_counter();
+ 	$Apache::lonxml::counter_changed=1;
      }
-     $Apache::lonxml::counter_changed=0;
  }
  sub store_counter {
-     &Apache::lonnet::appenv(('form.counter' => $Apache::lonxml::counter));
+     &Apache::lonnet::appenv({'form.counter' => $Apache::lonxml::counter});
+     $Apache::lonxml::counter_changed=0;
      return '';
  }
+ {
+     my $state;
+     sub clear_problem_counter {
+ 	undef($state);
+ 	&Apache::lonnet::delenv('form.counter');
+ 	&Apache::lonxml::init_counter();
+ 	&Apache::lonxml::store_counter();
+     }
+     sub remember_problem_counter {
+ 	&Apache::lonnet::transfer_profile_to_env(undef,undef,1);
+ 	$state = $env{'form.counter'};
+     }
+     sub restore_problem_counter {
+ 	if (defined($state)) {
+ 	    &Apache::lonnet::appenv({'form.counter' => $state});
+ 	}
+     }
+     sub get_problem_counter {
+ 	if ($Apache::lonxml::counter_changed) { &store_counter() }
+ 	&Apache::lonnet::transfer_profile_to_env(undef,undef,1);
+ 	return $env{'form.counter'};
+     }
+ }
+ =pod
+ =item  bubble_lines_for_part(part_response)
+ Returns the number of lines required to get a response for
+ $part_response (this is just $Apache::lonxml::counters_per_part{$part_response}
+ =cut
+ sub bubble_lines_for_part {
+     my ($part_response) = @_;
+     if (!defined($Apache::lonxml::counters_per_part{$part_response})) {
+ 	return 0;
+     } else {
+ 	return $Apache::lonxml::counters_per_part{$part_response};
+     }
+ }
+ =pod
+ =item clear_bubble_lines_for_part
+ Clears the hash of bubble lines per part.  If a caller
+ needs to analyze several resources this should be called between
+ resources to reset the hash for each problem being analyzed.
+ =cut
+ sub clear_bubble_lines_for_part {
+     undef(%Apache::lonxml::counters_per_part);
+ }
+ =pod
+ =item set_bubble_lines(part_response, value)
+ If there is a problem part, that for whatever reason
+ requires bubble lines that are not
+ the same as the counter increment, it can call this sub during
+ analysis to set its hash value explicitly.
+ =cut
+ sub set_bubble_lines {
+     my ($part_response, $value) = @_;
+     $Apache::lonxml::counters_per_part{$part_response} = $value;
+ }
+ =pod
+ =item get_bubble_line_hash
+ Returns the current bubble line hash.  This is assumed to
+ be small so we return a copy
+ =cut
+ sub get_bubble_line_hash {
+     return %Apache::lonxml::counters_per_part;
+ }
+ #--------------------------------------------------
  sub get_all_text {
-  my($tag,$pars)= @_;
+     my($tag,$pars,$style)= @_;
-  &Apache::lonxml::debug("Got a ".ref($pars));
+     my $gotfullstack=1;
-  my $gotfullstack=1;
+     if (ref($pars) ne 'ARRAY') {
-  if (ref($pars) ne 'ARRAY') {
+ 	$gotfullstack=0;
-      $gotfullstack=0;
+ 	$pars=[$pars];
-      $pars=[$pars];
+     }
-  }
+     if (ref($style) ne 'HASH') {
-  my $depth=0;
+ 	$style={};
-  my $token;
+     }
-  my $result='';
+     my $depth=0;
-  if ( $tag =~ m:^/: ) {
+     my $token;
-    my $tag=substr($tag,1);
+     my $result='';
-    #&Apache::lonxml::debug("have:$tag:");
+     if ( $tag =~ m:^/: ) {
-    my $top_empty=0;
+ 	my $tag=substr($tag,1);
-    while (($depth >=0) && ($#$pars > -1) && (!$top_empty)) {
+ 	#&Apache::lonxml::debug("have:$tag:");
-      while (($depth >=0) && ($token = $$pars[-1]->get_token)) {
+ 	my $top_empty=0;
-        #&Apache::lonxml::debug("e token:$token->[0]:$depth:$token->[1]:".$#$pars.":".$#Apache::lonxml::pwd);
+ 	while (($depth >=0) && ($#$pars > -1) && (!$top_empty)) {
-        if (($token->[0] eq 'T')||($token->[0] eq 'C')||($token->[0] eq 'D')) {
+ 	    while (($depth >=0) && ($token = $$pars[-1]->get_token)) {
- 	 $result.=$token->[1];
+ 		#&Apache::lonxml::debug("e token:$token->[0]:$depth:$token->[1]:".$#$pars.":".$#Apache::lonxml::pwd);
-        } elsif ($token->[0] eq 'PI') {
+ 		if (($token->[0] eq 'T')||($token->[0] eq 'C')||($token->[0] eq 'D')) {
- 	 $result.=$token->[2];
+ 		    if ($token->[2]) {
-        } elsif ($token->[0] eq 'S') {
+ 			$result.='<![CDATA['.$token->[1].']]>';
- 	 if ($token->[1] =~ /^$tag$/i) { $depth++; }
+ 		    } else {
- 	 $result.=$token->[4];
+ 			$result.=$token->[1];
-        } elsif ($token->[0] eq 'E')  {
+ 		    }
- 	 if ( $token->[1] =~ /^$tag$/i) { $depth--; }
+ 		} elsif ($token->[0] eq 'PI') {
- 	 #skip sending back the last end tag
+ 		    $result.=$token->[2];
- 	 if ($depth > -1) { $result.=$token->[2]; } else {
+ 		} elsif ($token->[0] eq 'S') {
- 	   $$pars[-1]->unget_token($token);
+ 		    if ($token->[1] =~ /^\Q$tag\E$/i) { $depth++; }
- 	 }
+ 		    if ($token->[1] =~ /^LONCAPA_INTERNAL_TURN_STYLE_ON$/) { $Apache::lonxml::usestyle=1; }
-        }
+ 		    if ($token->[1] =~ /^LONCAPA_INTERNAL_TURN_STYLE_OFF$/) { $Apache::lonxml::usestyle=0; }
-      }
+ 		    $result.=$token->[4];
-      if (($depth >=0) && ($#$pars == 0) ) { $top_empty=1; }
+ 		} elsif ($token->[0] eq 'E')  {
-      if (($depth >=0) && ($#$pars > 0) ) {
+ 		    if ( $token->[1] =~ /^\Q$tag\E$/i) { $depth--; }
-        pop(@$pars);
+ 		    #skip sending back the last end tag
-        pop(@Apache::lonxml::pwd);
+ 		    if ($depth == 0 && exists($$style{'/'.$token->[1]}) && $Apache::lonxml::usestyle) {
-      }
+ 			my $string=
-    }
+ 			    '<LONCAPA_INTERNAL_TURN_STYLE_OFF end="yes" />'.
-    if ($top_empty && $depth >= 0) {
+ 				$$style{'/'.$token->[1]}.
-        #never found the end tag ran out of text, throw error send back blank
+ 				    $token->[2].
-        &error('Never found end tag for &lt;'.$tag.'&gt;');
+ 					'<LONCAPA_INTERNAL_TURN_STYLE_ON />';
-        if ($gotfullstack) {
+ 			&Apache::lonxml::newparser($pars,\$string);
- 	   my $newstring='</'.$tag.'>'.$result;
+ 			#&Apache::lonxml::debug("reParsing $string");
- 	   &Apache::lonxml::newparser($pars,\$newstring);
+ 			next;
-        }
+ 		    }
-        $result='';
+ 		    if ($depth > -1) {
-    }
+ 			$result.=$token->[2];
-  } else {
+ 		    } else {
-      while ($#$pars > -1) {
+ 			$$pars[-1]->unget_token($token);
- 	 while ($token = $$pars[-1]->get_token) {
+ 		    }
- 	     #&Apache::lonxml::debug("s token:$token->[0]:$depth:$token->[1]");
+ 		}
- 	     if (($token->[0] eq 'T')||($token->[0] eq 'C')||
+ 	    }
- 		 ($token->[0] eq 'D')) {
+ 	    if (($depth >=0) && ($#$pars == 0) ) { $top_empty=1; }
- 		 $result.=$token->[1];
+ 	    if (($depth >=0) && ($#$pars > 0) ) {
- 	     } elsif ($token->[0] eq 'PI') {
+ 		pop(@$pars);
- 		 $result.=$token->[2];
+ 		pop(@Apache::lonxml::pwd);
- 	     } elsif ($token->[0] eq 'S') {
+ 	    }
- 		 if ( $token->[1] =~ /^$tag$/i) {
+ 	}
- 		     $$pars[-1]->unget_token($token); last;
+ 	if ($top_empty && $depth >= 0) {
- 		 } else {
+ 	    #never found the end tag ran out of text, throw error send back blank
- 		     $result.=$token->[4];
+ 	    &error('Never found end tag for &lt;'.$tag.
- 		 }
+ 		   '&gt; current string <pre>'.
- 	     } elsif ($token->[0] eq 'E')  {
+ 		   &HTML::Entities::encode($result,'<>&"').
- 		 $result.=$token->[2];
+ 		   '</pre>');
- 	     }
+ 	    if ($gotfullstack) {
- 	 }
+ 		my $newstring='</'.$tag.'>'.$result;
- 	 if (($#$pars > 0) ) {
+ 		&Apache::lonxml::newparser($pars,\$newstring);
- 	     pop(@$pars);
+ 	    }
- 	     pop(@Apache::lonxml::pwd);
+ 	    $result='';
- 	 } else { last; }
+ 	}
-      }
+     } else {
-  }
+ 	while ($#$pars > -1) {
-  if ($result =~ m|<LONCAPA_INTERNAL_TURN_STYLE_ON />|) {
+ 	    while ($token = $$pars[-1]->get_token) {
-      $Apache::lonxml::usestyle=1;
+ 		#&Apache::lonxml::debug("s token:$token->[0]:$depth:$token->[1]");
-  }
+ 		if (($token->[0] eq 'T')||($token->[0] eq 'C')||
-  #&Apache::lonxml::debug("Exit:$result:");
+ 		    ($token->[0] eq 'D')) {
-  return $result
+ 		    if ($token->[2]) {
+ 			$result.='<![CDATA['.$token->[1].']]>';
+ 		    } else {
+ 			$result.=$token->[1];
+ 		    }
+ 		} elsif ($token->[0] eq 'PI') {
+ 		    $result.=$token->[2];
+ 		} elsif ($token->[0] eq 'S') {
+ 		    if ( $token->[1] =~ /^\Q$tag\E$/i) {
+ 			$$pars[-1]->unget_token($token); last;
+ 		    } else {
+ 			$result.=$token->[4];
+ 		    }
+ 		    if ($token->[1] =~ /^LONCAPA_INTERNAL_TURN_STYLE_ON$/) { $Apache::lonxml::usestyle=1; }
+ 		    if ($token->[1] =~ /^LONCAPA_INTERNAL_TURN_STYLE_OFF$/) { $Apache::lonxml::usestyle=0; }
+ 		} elsif ($token->[0] eq 'E')  {
+ 		    $result.=$token->[2];
+ 		}
+ 	    }
+ 	    if (($#$pars > 0) ) {
+ 		pop(@$pars);
+ 		pop(@Apache::lonxml::pwd);
+ 	    } else { last; }
+ 	}
+     }
+     #&Apache::lonxml::debug("Exit:$result:");
+     return $result
  }
  sub newparser {
    my ($parser,$contentref,$dir) = @_;
    push (@$parser,HTML::LCParser->new($contentref));
-   $$parser['-1']->xml_mode('1');
+   $$parser[-1]->xml_mode(1);
+   $$parser[-1]->marked_sections(1);
    if ( $dir eq '' ) {
      push (@Apache::lonxml::pwd, $Apache::lonxml::pwd[$#Apache::lonxml::pwd]);
    } else {
      push (@Apache::lonxml::pwd, $dir);
    }
- #  &Apache::lonxml::debug("pwd:$#Apache::lonxml::pwd");
- #  &Apache::lonxml::debug("pwd:$Apache::lonxml::pwd[$#Apache::lonxml::pwd]");
  }
  sub parstring {
-   my ($token) = @_;
+     my ($token) = @_;
-   my $temp='';
+     my (@vars,@values);
-   foreach (@{$token->[3]}) {
+     foreach my $attr (@{$token->[3]}) {
-     unless ($_=~/\W/) {
+ 	if ($attr!~/\W/) {
-       my $val=$token->[2]->{$_};
+ 	    my $val=$token->[2]->{$attr};
-       $val =~ s/([\%\@\\\"\'])/\\$1/g;
+ 	    $val =~ s/([\%\@\\\"\'])/\\$1/g;
-       #if ($val =~ m/^[\%\@]/) { $val="\\".$val; }
+ 	    $val =~ s/(\$[^\{a-zA-Z_])/\\$1/g;
-       $temp .= "my \$$_=\"$val\";"
+ 	    $val =~ s/(\$)$/\\$1/;
+ 	    #if ($val =~ m/^[\%\@]/) { $val="\\".$val; }
+ 	    push(@vars,"\$$attr");
+ 	    push(@values,"\"$val\"");
+ 	}
      }
-   }
+     my $var_init =
-   return $temp;
+ 	(@vars) ? 'my ('.join(',',@vars).') = ('.join(',',@values).');'
+ 	        : '';
+     return $var_init;
+ }
+ sub extlink {
+     my ($res,$exact)=@_;
+     if (!$exact) {
+ 	$res=&Apache::lonnet::hreflocation($Apache::lonxml::pwd[-1],$res);
+     }
+     push(@Apache::lonxml::extlinks,$res)
  }
  sub writeallows {
      unless ($#extlinks>=0) { return; }
-     my $thisurl='/res/'.&Apache::lonnet::declutter(shift);
+     my $thisurl = &Apache::lonnet::clutter(shift);
-     if ($ENV{'httpref.'.$thisurl}) {
+     if ($env{'httpref.'.$thisurl}) {
- 	$thisurl=$ENV{'httpref.'.$thisurl};
+ 	$thisurl=$env{'httpref.'.$thisurl};
      }
      my $thisdir=$thisurl;
      $thisdir=~s/\/[^\/]+$//;
      my %httpref=();
      foreach (@extlinks) {
         $httpref{'httpref.'.
-  	        &Apache::lonnet::hreflocation($thisdir,$_)}=$thisurl;
+  	        &Apache::lonnet::hreflocation($thisdir,&unescape($_))}=$thisurl;
      }
      @extlinks=();
-     &Apache::lonnet::appenv(%httpref);
+     &Apache::lonnet::appenv(\%httpref);
+ }
+ sub register_ssi {
+     my ($url,%form)=@_;
+     push (@Apache::lonxml::ssi_info,{'url'=>$url,'form'=>\%form});
+     return '';
+ }
+ sub do_registered_ssi {
+     foreach my $info (@Apache::lonxml::ssi_info) {
+ 	my %form=%{ $info->{'form'}};
+ 	my $url=$info->{'url'};
+ 	&Apache::lonnet::ssi($url,%form);
+     }
+ }
+ sub add_script_result {
+     my ($display) = @_;
+     push(@script_var_displays, $display);
  }
  #
- Line 1037  sub afterburn {
+ Line 1415  sub afterburn {
      my $result=shift;
      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
  					    ['highlight','anchor','link']);
-     if ($ENV{'form.highlight'}) {
+     if ($env{'form.highlight'}) {
-        foreach (split(/\,/,$ENV{'form.highlight'})) {
+        foreach (split(/\,/,$env{'form.highlight'})) {
             my $anchorname=$_;
  	   my $matchthis=$anchorname;
             $matchthis=~s/\_+/\\s\+/g;
-            $result=~s/($matchthis)/\<font color=\"red\"\>$1\<\/font\>/gs;
+            $result=~s/(\Q$matchthis\E)/\<font color=\"red\"\>$1\<\/font\>/gs;
         }
      }
-     if ($ENV{'form.link'}) {
+     if ($env{'form.link'}) {
-        foreach (split(/\,/,$ENV{'form.link'})) {
+        foreach (split(/\,/,$env{'form.link'})) {
             my ($anchorname,$linkurl)=split(/\>/,$_);
  	   my $matchthis=$anchorname;
             $matchthis=~s/\_+/\\s\+/g;
-            $result=~s/($matchthis)/\<a href=\"$linkurl\"\>$1\<\/a\>/gs;
+            $result=~s/(\Q$matchthis\E)/\<a href=\"$linkurl\"\>$1\<\/a\>/gs;
         }
      }
-     if ($ENV{'form.anchor'}) {
+     if ($env{'form.anchor'}) {
-         my $anchorname=$ENV{'form.anchor'};
+         my $anchorname=$env{'form.anchor'};
  	my $matchthis=$anchorname;
          $matchthis=~s/\_+/\\s\+/g;
-         $result=~s/($matchthis)/\<a name=\"$anchorname\"\>$1\<\/a\>/s;
+         $result=~s/(\Q$matchthis\E)/\<a name=\"$anchorname\"\>$1\<\/a\>/s;
          $result.=(<<"ENDSCRIPT");
  <script type="text/javascript">
      document.location.hash='$anchorname';
- Line 1069  ENDSCRIPT
+ Line 1447  ENDSCRIPT
  sub storefile {
      my ($file,$contents)=@_;
+     &Apache::lonnet::correct_line_ends(\$contents);
      if (my $fh=Apache::File->new('>'.$file)) {
  	print $fh $contents;
          $fh->close();
+         return 1;
      } else {
-       &warning("Unable to save file $file");
+ 	&warning(&mt('Unable to save file [_1]','<tt>'.$file.'</tt>'));
+ 	return 0;
      }
  }
  sub createnewhtml {
-   my $filecontents=(<<SIMPLECONTENT);
+     my $title=&mt('Title of document goes here');
+     my $body=&mt('Body of document goes here');
+     my $filecontents=(<<SIMPLECONTENT);
  <html>
  <head>
- <title>
+ <title>$title</title>
-                            Title of Document Goes Here
- </title>
  </head>
  <body bgcolor="#FFFFFF">
+ $body
-                            Body of Document Goes Here
  </body>
  </html>
  SIMPLECONTENT
+     return $filecontents;
+ }
+ sub createnewsty {
+   my $filecontents=(<<SIMPLECONTENT);
+ <definetag name="">
+     <render>
+        <web></web>
+        <tex></tex>
+     </render>
+ </definetag>
+ SIMPLECONTENT
    return $filecontents;
  }
+ sub verify_html {
+     my ($filecontents)=@_;
+     if ($filecontents!~/(?:\<|\&lt\;)(?:html|xml)[^\<]*(?:\>|\&gt\;)/is) {
+        return &mt('File does not have [_1] or [_2] starting tag','&lt;html&gt;','&lt;xml&gt;');
+     }
+     if ($filecontents!~/(?:\<|\&lt\;)\/(?:html|xml)(?:\>|\&gt\;)/is) {
+        return &mt('File does not have [_1] or [_2] ending tag','&lt;html&gt;','&lt;xml&gt;');
+     }
+     if ($filecontents!~/(?:\<|\&lt\;)(?:body|frameset)[^\<]*(?:\>|\&gt\;)/is) {
+        return &mt('File does not have [_1] or [_2] starting tag','&lt;body&gt;','&lt;frameset&gt;');
+     }
+     if ($filecontents!~/(?:\<|\&lt\;)\/(?:body|frameset)[^\<]*(?:\>|\&gt\;)/is) {
+        return &mt('File does not have [_1] or [_2] ending tag','&lt;body&gt;','&lt;frameset&gt;');
+     }
+     return '';
+ }
+ sub renderingoptions {
+     my %langchoices=('' => '');
+     foreach (&Apache::loncommon::languageids()) {
+         if (&Apache::loncommon::supportedlanguagecode($_)) {
+             $langchoices{&Apache::loncommon::supportedlanguagecode($_)}
+                        = &Apache::loncommon::plainlanguagedescription($_);
+         }
+     }
+     return
+        '<span class="LC_nobreak">'.
+        &mt('Language:').' '.
+        &Apache::loncommon::select_form($env{'form.languages'},'languages',
+                                                      %langchoices).'
+      </span>
+      <span class="LC_nobreak">'.
+        &mt('Math Rendering:').' '.
+        &Apache::loncommon::select_form($env{'form.texengine'},'texengine',
+                                                      ('' => '',
+                                                       'tth' => 'tth (TeX to HTML)',
+                                                       'jsMath' => 'jsMath',
+                                                       'mimetex' => 'mimetex (Convert to Images)')).'
+      </span>';
+ }
  sub inserteditinfo {
-       my ($result,$filecontents)=@_;
+       my ($filecontents, $filetype, $filename)=@_;
-       $filecontents = &HTML::Entities::encode($filecontents);
+       $filecontents = &HTML::Entities::encode($filecontents,'<>&"');
- #      my $editheader='<a href="#editsection">Edit below</a><hr />';
+       my $xml_help = '';
-       my $xml_help = '<table><tr><td>'.
+       my $initialize='';
- 	  &Apache::loncommon::help_open_topic("Greek_Symbols",'Greek Symbols',
+       my $textarea_id = 'filecont';
- 					      undef,undef,600)
+       my ($add_to_onload, $add_to_onresize);
- 	      .'</td><td>'.
+       $initialize=&Apache::lonhtmlcommon::spellheader();
-           &Apache::loncommon::help_open_topic("Other_Symbols",'Other Symbols',
+       if ($filetype eq 'html'
- 					      undef,undef,600)
+ 	  && (!&Apache::lonhtmlcommon::htmlareablocked() &&
- 	      .'</td></tr></table>';
+ 	      &Apache::lonhtmlcommon::htmlareabrowser())) {
-       my $buttons=(<<BUTTONS);
+ 	  $textarea_id .= '___Frame';
- <input type="submit" name="attemptclean"
+ 	  my $lang = &Apache::lonhtmlcommon::htmlarea_lang();
-        value="Save and then attempt to clean HTML" />
+ 	  $initialize.=(<<FULLPAGE);
- <input type="submit" name="savethisfile" value="Save this" />
+ <script type="text/javascript">
- <input type="submit" name="viewmode" value="View" />
+ lonca
- BUTTONS
+     function initDocument() {
+         var oFCKeditor = new FCKeditor('filecont');
+ 	oFCKeditor.Config['CustomConfigurationsPath'] = '/fckeditor/loncapaconfig.js'  ;
+ 	oFCKeditor.Config['FullPage'] = true
+ 	oFCKeditor.Config['AutoDetectLanguage'] = false;
+         oFCKeditor.Config['DefaultLanguage'] = "$lang";
+ 	oFCKeditor.ReplaceTextarea();
+     }
+     function check_if_dirty(editor) {
+ 	if (editor.IsDirty()) {
+ 	    unClean();
+ 	}
+     }
+     function FCKeditor_OnComplete(editor) {
+ 	editor.Events.AttachEvent("OnSelectionChange",check_if_dirty);
+ 	resize_textarea('$textarea_id','LC_aftertextarea');
+     }
+ </script>
+ FULLPAGE
+       } else {
+ 	  $initialize.=(<<FULLPAGE);
+ <script type="text/javascript">
+     function initDocument() {
+ 	resize_textarea('$textarea_id','LC_aftertextarea');
+     }
+ </script>
+ FULLPAGE
+       }
+       $add_to_onload = 'initDocument();';
+       $add_to_onresize = "resize_textarea('$textarea_id','LC_aftertextarea');";
+       if ($filetype eq 'html') {
+ 	  $xml_help=&Apache::loncommon::helpLatexCheatsheet();
+       }
+       my $titledisplay=&display_title();
+       my %lt=&Apache::lonlocal::texthash('st' => 'Save and Edit',
+ 					 'vi' => 'Save and View',
+ 					 'dv' => 'Discard Edits and View',
+ 					 'un' => 'undo',
+ 					 'ed' => 'Edit');
+       my $spelllink .=&Apache::lonhtmlcommon::spelllink('xmledit','filecont');
+       my $textarea_events = &Apache::edit::element_change_detection();
+       my $form_events     = &Apache::edit::form_change_detection();
+       my $htmlerror=&verify_html($filecontents);
+       if ($htmlerror) {
+          $htmlerror='<span class="LC_error">'.$htmlerror.'</span>';
+       }
        my $editfooter=(<<ENDFOOTER);
- <hr />
+ $initialize
  <a name="editsection" />
- <form method="post">
+ <form $form_events method="post" name="xmledit">
- $xml_help
+   <div class="LC_edit_problem_editxml_header">
- <input type="hidden" name="editmode" value="Edit" />
+     <table class="LC_edit_problem_header_title"><tr><td>
- $buttons<br />
+         $filename
- <textarea cols="80" rows="40" name="filecont">$filecontents</textarea>
+       </td><td align="right">
- <br />$buttons
+         $xml_help
- <br />
+       </td></tr>
+     </table>
+     <div class="LC_edit_problem_discards">
+       <input type="submit" name="discardview" accesskey="d" value="$lt{'dv'}" />
+       <input type="submit" name="Undo" accesskey="u" value="$lt{'un'}" />
+       $spelllink $htmlerror
+     </div>
+     <div class="LC_edit_problem_saves">
+       <input type="submit" name="savethisfile" accesskey="s" value="$lt{'st'}" />
+       <input type="submit" name="viewmode" accesskey="v" value="$lt{'vi'}" />
+     </div>
+   </div>
+   <textarea $textarea_events style="width:100%" cols="80" rows="44" name="filecont" id="filecont">$filecontents</textarea>
+   <div id="LC_aftertextarea">
+     <br />
+     $titledisplay
+   </div>
  </form>
+ </body>
  ENDFOOTER
- #      $result=~s/(\<body[^\>]*\>)/$1$editheader/is;
+       return ($editfooter,$add_to_onload,$add_to_onresize);;
-       $result=~s/(\<\/body\>)/$editfooter/is;
-       return $result;
  }
  sub get_target {
-   my $viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
+   my $viewgrades=&Apache::lonnet::allowed('vgr',$env{'request.course.id'});
-   if ( $ENV{'request.state'} eq 'published') {
+   if ( $env{'request.state'} eq 'published') {
-     if ( defined($ENV{'form.grade_target'})
+     if ( defined($env{'form.grade_target'})
  	 && ($viewgrades == 'F' )) {
-       return ($ENV{'form.grade_target'});
+       return ($env{'form.grade_target'});
-     } elsif (defined($ENV{'form.grade_target'})) {
+     } elsif (defined($env{'form.grade_target'})) {
-       if (($ENV{'form.grade_target'} eq 'web') ||
+       if (($env{'form.grade_target'} eq 'web') ||
- 	  ($ENV{'form.grade_target'} eq 'tex') ) {
+ 	  ($env{'form.grade_target'} eq 'tex') ) {
- 	return $ENV{'form.grade_target'}
+ 	return $env{'form.grade_target'}
        } else {
  	return 'web';
        }
      } else {
        return 'web';
      }
-   } elsif ($ENV{'request.state'} eq 'construct') {
+   } elsif ($env{'request.state'} eq 'construct') {
-     if ( defined($ENV{'form.grade_target'})) {
+     if ( defined($env{'form.grade_target'})) {
-       return ($ENV{'form.grade_target'});
+       return ($env{'form.grade_target'});
      } else {
        return 'web';
      }
- Line 1158  sub get_target {
+ Line 1652  sub get_target {
  }
  sub handler {
-   my $request=shift;
+     my $request=shift;
-   my $target=&get_target();
+     my $target=&get_target();
-   $Apache::lonxml::debug=0;
+     $Apache::lonxml::debug=$env{'user.debug'};
-   if ($ENV{'browser.mathml'}) {
+     &Apache::loncommon::content_type($request,'text/html');
-     $request->content_type('text/xml');
+     &Apache::loncommon::no_cache($request);
-   } else {
+     if ($env{'request.state'} eq 'published') {
-     $request->content_type('text/html');
+ 	$request->set_last_modified(&Apache::lonnet::metadata($request->uri,
-   }
+ 							      'lastrevisiondate'));
-   &Apache::loncommon::no_cache($request);
+     }
-   $request->send_http_header;
+     $request->send_http_header;
-   return OK if $request->header_only;
+     return OK if $request->header_only;
-   my $file=&Apache::lonnet::filelocation("",$request->uri);
+     my $file=&Apache::lonnet::filelocation("",$request->uri);
+     my $filetype;
+     if ($file =~ /\.sty$/) {
+ 	$filetype='sty';
+     } else {
+ 	$filetype='html';
+     }
  #
  # Edit action? Save file.
  #
-   unless ($ENV{'request.state'} eq 'published') {
+     if (!($env{'request.state'} eq 'published')) {
-       if (($ENV{'form.savethisfile'}) || ($ENV{'form.attemptclean'})) {
+ 	if ($env{'form.savethisfile'} || $env{'form.viewmode'} || $env{'form.Undo'}) {
- 	  &storefile($file,$ENV{'form.filecont'});
+ 	    my $html_file=&Apache::lonnet::getfile($file);
-       }
+ 	    my $error = &Apache::lonhomework::handle_save_or_undo($request, \$html_file, \$env{'form.filecont'});
-   }
+             if ($env{'form.savethisfile'}) {
-   my %mystyle;
+                 $env{'form.editmode'}='Edit'; #force edit mode
-   my $result = '';
+             }
-   my $filecontents=&Apache::lonnet::getfile($file);
+ 	}
-   if ($filecontents == -1) {
-     $result=(<<ENDNOTFOUND);
- <html>
- <head>
- <title>File not found</title>
- </head>
- <body bgcolor="#FFFFFF">
- <b>File not found: $file</b>
- </body>
- </html>
- ENDNOTFOUND
-     $filecontents='';
-     if ($ENV{'request.state'} ne 'published') {
-       $filecontents=&createnewhtml();
-       $ENV{'form.editmode'}='Edit'; #force edit mode
-     }
-   } else {
-     unless ($ENV{'request.state'} eq 'published') {
-       if ($ENV{'form.attemptclean'}) {
- 	$filecontents=&htmlclean($filecontents,1);
-       }
      }
-     if (!$ENV{'form.editmode'} || $ENV{'form.viewmode'}) {
+     my %mystyle;
-       $result = &Apache::lonxml::xmlparse($request,$target,$filecontents,
+     my $result = '';
- 					  '',%mystyle);
+     my $filecontents=&Apache::lonnet::getfile($file);
+     if ($filecontents eq -1) {
+ 	my $start_page=&Apache::loncommon::start_page('File Error');
+ 	my $end_page=&Apache::loncommon::end_page();
+ 	my $fnf=&mt('File not found');
+ 	$result=(<<ENDNOTFOUND);
+ $start_page
+ <b>$fnf: $file</b>
+ $end_page
+ ENDNOTFOUND
+         $filecontents='';
+ 	if ($env{'request.state'} ne 'published') {
+ 	    if ($filetype eq 'sty') {
+ 		$filecontents=&createnewsty();
+ 	    } else {
+ 		$filecontents=&createnewhtml();
+ 	    }
+ 	    $env{'form.editmode'}='Edit'; #force edit mode
+ 	}
+     } else {
+ 	unless ($env{'request.state'} eq 'published') {
+ 	    if ($filecontents=~/BEGIN LON-CAPA Internal/) {
+ 		&Apache::lonxml::error(&mt('This file appears to be a rendering of a LON-CAPA resource. If this is correct, this resource will act very oddly and incorrectly.'));
+ 	    }
+ #
+ # we are in construction space, see if edit mode forced
+             &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ 						    ['editmode']);
+ 	}
+ 	if (!$env{'form.editmode'} || $env{'form.viewmode'} || $env{'form.discardview'}) {
+ 	    &Apache::structuretags::reset_problem_globals();
+ 	    $result = &Apache::lonxml::xmlparse($request,$target,$filecontents,
+ 						'',%mystyle);
+ 	    # .html files may contain <problem> or <Task> need to clean
+ 	    # up if it did
+ 	    &Apache::structuretags::reset_problem_globals();
+ 	    &Apache::lonhomework::finished_parsing();
+ 	    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ 						    ['rawmode']);
+ 	    if ($env{'form.rawmode'}) { $result = $filecontents; }
+ 	    if ($filetype eq 'sty') {
+ 		my $controls =
+ 		    ($env{'request.state'} eq 'construct') ? &Apache::londefdef::edit_controls()
+ 		                                           : '';
+ 		my %options = ('bgcolor' => '#FFFFFF');
+ 		$result =
+ 		    &Apache::loncommon::start_page(undef,undef,\%options).
+ 		    $controls.
+ 		    $result.
+ 		    &Apache::loncommon::end_page();
+ 	    }
+ 	}
      }
-   }
  #
  # Edit action? Insert editing commands
  #
-   unless ($ENV{'request.state'} eq 'published') {
+     unless ($env{'request.state'} eq 'published') {
-     if ($ENV{'form.editmode'} && (!($ENV{'form.viewmode'}))) {
+ 	if ($env{'form.editmode'} && (!($env{'form.viewmode'})) && (!($env{'form.discardview'})))
- 	my $displayfile=$request->uri;
+ 	{
-         $displayfile=~s/^\/[^\/]*//;
+ 	    my $displayfile=$request->uri;
-       $result='<html><body bgcolor="#FFFFFF"><h3>'.$displayfile.
+ 	    $displayfile=~s/^\/[^\/]*//;
-               '</h3></body></html>';
-       $result=&inserteditinfo($result,$filecontents);
+ 	    my ($edit_info, $add_to_onload, $add_to_onresize)=
+ 		&inserteditinfo($filecontents,$filetype,$displayfile);
+ 	    my %options =
+ 		('add_entries' =>
+                    {'onresize' => $add_to_onresize,
+ 		    'onload'   => $add_to_onload,   });
+ 	    if ($env{'environment.remote'} ne 'off') {
+ 		$options{'bgcolor'}   = '#FFFFFF';
+ 		$options{'only_body'} = 1;
+ 	    }
+ 	    my $js =
+ 		&Apache::edit::js_change_detection().
+ 		&Apache::loncommon::resize_textarea_js();
+ 	    my $start_page = &Apache::loncommon::start_page(undef,$js,
+ 							    \%options);
+ 	    $result=$start_page.
+ 		&Apache::lonxml::message_location().
+ 		$edit_info.
+ 		&Apache::loncommon::end_page();
+ 	}
      }
-   }
+     if ($filetype eq 'html') { &writeallows($request->uri); }
-   writeallows($request->uri);
+     &Apache::lonxml::add_messages(\$result);
+     $request->print($result);
-   $request->print($result);
+     return OK;
+ }
-   return OK;
+ sub display_title {
+     my $result;
+     if ($env{'request.state'} eq 'construct') {
+ 	my $title=&Apache::lonnet::gettitle();
+ 	if (!defined($title) || $title eq '') {
+ 	    $title = $env{'request.filename'};
+ 	    $title = substr($title, rindex($title, '/') + 1);
+ 	}
+         $result = "<script type='text/javascript'>top.document.title = '$title - LON-CAPA "
+                   .&mt('Construction Space')."';</script>";
+     }
+     return $result;
  }
  sub debug {
-   if ($Apache::lonxml::debug eq 1) {
+     if ($Apache::lonxml::debug eq "1") {
-     $|=1;
+ 	$|=1;
-     print('<font size="-2"<pre>DEBUG:'.&HTML::Entities::encode($_[0])."</pre></font>\n");
+ 	my $request=$Apache::lonxml::request;
-   }
+ 	if (!$request) {
+ 	    eval { $request=Apache->request; };
+ 	}
+ 	if (!$request) {
+ 	    eval { $request=Apache2::RequestUtil->request; };
+ 	}
+ 	$request->print('<font size="-2"><pre>DEBUG:'.&HTML::Entities::encode($_[0],'<>&"')."</pre></font>\n");
+ 	#&Apache::lonnet::logthis($_[0]);
+     }
+ }
+ sub show_error_warn_msg {
+     if ($env{'request.filename'} eq '/home/httpd/html/res/lib/templates/simpleproblem.problem' &&
+ 	&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+ 	return 1;
+     }
+     return (($Apache::lonxml::debug eq 1) ||
+ 	    ($env{'request.state'} eq 'construct') ||
+ 	    ($Apache::lonhomework::browse eq 'F'
+ 	     &&
+ 	     $env{'form.show_errors'} eq 'on'));
  }
  sub error {
-   $errorcount++;
+     my @errors = @_;
-   if (($Apache::lonxml::debug eq 1) || ($ENV{'request.state'} eq 'construct') ) {
-     # If printing in construction space, put the error inside <pre></pre>
+     $errorcount++;
-     print "<b>ERROR:</b>".join("\n",@_)."\n";
-   } else {
+     if (defined($Apache::inputtags::part)) {
-     print "<b>An Error occured while processing this resource. The instructor has been notified.</b> <br />";
+ 	if ( @Apache::inputtags::response ) {
-     #notify author
+ 	    push(@errors,
-     &Apache::lonmsg::author_res_msg($ENV{'request.filename'},join('<br />',@_));
+ 		 &mt("This error occurred while processing response [_1] in part [_2]",
-     #notify course
+ 		     $Apache::inputtags::response[-1],
-     if ( $ENV{'request.course.id'} ) {
+ 		     $Apache::inputtags::part));
-       my (undef,%users)=&Apache::lonfeedback::decide_receiver(undef,0,1,1,1);
+ 	} else {
-       my $declutter=&Apache::lonnet::declutter($ENV{'request.filename'});
+ 	    push(@errors,
-       foreach (keys %users) {
+ 		 &mt("This error occurred while processing part [_1]",
- 	my ($user,$domain) = split(/:/, $_);
+ 		     $Apache::inputtags::part));
- 	&Apache::lonmsg::user_normal_msg($user,$domain,
+ 	}
-         "Error [$declutter]",join('<br />',@_));
-       }
      }
-     #FIXME probably shouldn't have me get everything forever.
+     if ( &show_error_warn_msg() ) {
-     &Apache::lonmsg::user_normal_msg('albertel','msu',"Error in $ENV{'request.filename'}",join('<br />',@_));
+ 	# If printing in construction space, put the error inside <pre></pre>
-     #&Apache::lonmsg::user_normal_msg('albertel','103',"Error in $ENV{'request.filename'}",$_[0]);
+ 	push(@Apache::lonxml::error_messages,
-   }
+ 	     $Apache::lonxml::warnings_error_header
+              .'<div class="LC_error">'
+              .'<b>'.&mt('ERROR:').' </b>'.join("<br />\n",@errors)
+              ."</div>\n");
+ 	$Apache::lonxml::warnings_error_header='';
+     } else {
+ 	my $errormsg;
+ 	my ($symb)=&Apache::lonnet::symbread();
+ 	if ( !$symb ) {
+ 	    #public or browsers
+ 	    $errormsg=&mt("An error occurred while processing this resource. The author has been notified.");
+ 	}
+ 	my $host=$Apache::lonnet::perlvar{'lonHostID'};
+ 	push(@errors,
+         &mt("The error occurred on host [_1]",
+              "<tt>$host</tt>"));
+ 	my $msg = join('<br />', @errors);
+ 	#notify author
+ 	&Apache::lonmsg::author_res_msg($env{'request.filename'},$msg);
+ 	#notify course
+ 	if ( $symb && $env{'request.course.id'} ) {
+ 	    my $cnum=$env{'course.'.$env{'request.course.id'}.'.num'};
+ 	    my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
+ 	    my (undef,%users)=&Apache::lonmsg::decide_receiver(undef,0,1,1,1);
+ 	    my $declutter=&Apache::lonnet::declutter($env{'request.filename'});
+             my $baseurl = &Apache::lonnet::clutter($declutter);
+ 	    my @userlist;
+ 	    foreach (keys %users) {
+ 		my ($user,$domain) = split(/:/, $_);
+ 		push(@userlist,"$user\@$domain");
+ 		my $key=$declutter.'_'.$user.'_'.$domain;
+ 		my %lastnotified=&Apache::lonnet::get('nohist_xmlerrornotifications',
+ 						      [$key],
+ 						      $cdom,$cnum);
+ 		my $now=time;
+ 		if ($now-$lastnotified{$key}>86400) {
+                     my $title = &Apache::lonnet::gettitle($symb);
+                     my $sentmessage;
+ 		    &Apache::lonmsg::user_normal_msg($user,$domain,
+ 		        "Error [$title]",$msg,'',$baseurl,'','',
+                         \$sentmessage,$symb,$title,1);
+ 		    &Apache::lonnet::put('nohist_xmlerrornotifications',
+ 					 {$key => $now},
+ 					 $cdom,$cnum);
+ 		}
+ 	    }
+ 	    if ($env{'request.role.adv'}) {
+ 		$errormsg=&mt("An error occurred while processing this resource. The course personnel ([_1]) and the author have been notified.",join(', ',@userlist));
+ 	    } else {
+ 		$errormsg=&mt("An error occurred while processing this resource. The instructor has been notified.");
+ 	    }
+ 	}
+ 	push(@Apache::lonxml::error_messages,"<b>$errormsg</b> <br />");
+     }
  }
  sub warning {
-   $warningcount++;
+     $warningcount++;
-   if ($ENV{'request.state'} eq 'construct') {
-     print "<b>W</b>ARNING<b>:</b>".join('<br />',@_)."<br />\n";
+     if ($env{'form.grade_target'} ne 'tex') {
-   }
+ 	if ( &show_error_warn_msg() ) {
+ 	    push(@Apache::lonxml::warning_messages,
+ 		 $Apache::lonxml::warnings_error_header
+                 .'<div class="LC_warning">'
+                 .&mt('[_1]W[_2]ARNING','<b>','</b>')."<b>:</b> ".join('<br />',@_)
+                 ."</div>\n"
+                 );
+ 	    $Apache::lonxml::warnings_error_header='';
+ 	}
+     }
+ }
+ sub info {
+     if ($env{'form.grade_target'} ne 'tex'
+ 	&& $env{'request.state'} eq 'construct') {
+ 	push(@Apache::lonxml::info_messages,join('<br />',@_)."<br />\n");
+     }
+ }
+ sub message_location {
+     return '__LONCAPA_INTERNAL_MESSAGE_LOCATION__';
+ }
+ sub add_messages {
+     my ($msg)=@_;
+     my $result=join(' ',
+ 		    @Apache::lonxml::info_messages,
+ 		    @Apache::lonxml::error_messages,
+ 		    @Apache::lonxml::warning_messages);
+     undef(@Apache::lonxml::info_messages);
+     undef(@Apache::lonxml::error_messages);
+     undef(@Apache::lonxml::warning_messages);
+     $$msg=~s/__LONCAPA_INTERNAL_MESSAGE_LOCATION__/$result/;
+     $$msg=~s/__LONCAPA_INTERNAL_MESSAGE_LOCATION__//g;
  }
  sub get_param {
- Line 1280  sub get_param {
+ Line 1949  sub get_param {
      if ( ! $context ) { $context = -1; }
      my $args ='';
      if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; }
+     if ( ! $Apache::lonxml::usestyle ) {
+ 	$args=$Apache::lonxml::style_values.$args;
+     }
      if ( ! $args ) { return undef; }
      if ( $case_insensitive ) {
- 	if ($args =~ s/(my \$)(\Q$param\E)(=\")/$1.lc($2).$3/ei) {
+ 	if ($args =~ s/(my (?:.*))(\$\Q$param\E[,\)])/$1.lc($2)/ei) {
  	    return &Apache::run::run("{$args;".'return $'.$param.'}',
                                       $safeeval); #'
  	} else {
  	    return undef;
  	}
      } else {
- 	if ( $args =~ /my \$\Q$param\E=\"/ ) {
+ 	if ( $args =~ /my .*\$\Q$param\E[,\)]/ ) {
  	    return &Apache::run::run("{$args;".'return $'.$param.'}',
                                       $safeeval); #'
  	} else {
- Line 1303  sub get_param_var {
+ Line 1975  sub get_param_var {
    if ( ! $context ) { $context = -1; }
    my $args ='';
    if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; }
+   if ( ! $Apache::lonxml::usestyle ) {
+       $args=$Apache::lonxml::style_values.$args;
+   }
    &Apache::lonxml::debug("Args are $args param is $param");
    if ($case_insensitive) {
-       if (! ($args=~s/(my \$)(\Q$param\E)(=\")/$1.lc($2).$3/ei)) {
+       if (! ($args=~s/(my (?:.*))(\$\Q$param\E[,\)])/$1.lc($2)/ei)) {
  	  return undef;
        }
-   } elsif ( $args !~ /my \$\Q$param\E=\"/ ) { return undef; }
+   } elsif ( $args !~ /my .*\$\Q$param\E[,\)]/ ) { return undef; }
    my $value=&Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #'
    &Apache::lonxml::debug("first run is $value");
-   if ($value =~ /^[\$\@\%]\w+$/) {
+   if ($value =~ /^[\$\@\%][a-zA-Z_]\w*$/) {
        &Apache::lonxml::debug("doing second");
        my @result=&Apache::run::run("return $value",$safeeval,1);
        if (!defined($result[0])) {
- Line 1324  sub get_param_var {
+ Line 1999  sub get_param_var {
    }
  }
- sub register_insert {
+ sub register_insert_xml {
-   my @data = split /\n/, &Apache::lonnet::getfile('/home/httpd/lonTabs/insertlist.tab');
+     my $parser = HTML::LCParser->new($Apache::lonnet::perlvar{'lonTabDir'}
-   my $i;
+ 				     .'/insertlist.xml');
-   my $tagnum=0;
+     my ($tagnum,$in_help)=(0,0);
-   my @order;
+     my @alltags;
-   for ($i=0;$i < $#data; $i++) {
+     my $tag;
-     my $line = $data[$i];
+     while (my $token = $parser->get_token()) {
-     if ( $line =~ /^\#/ || $line =~ /^\s*\n/) { next; }
+ 	if ($token->[0] eq 'S') {
-     if ( $line =~ /TABLE/ ) { last; }
+ 	    my $key;
-     my ($tag,$descrip,$color,$function,$show) = split(/,/, $line);
+ 	    if      ($token->[1] eq 'tag') {
-     if ($tag) {
+ 		$tag = $token->[2]{'name'};
-       $insertlist{"$tagnum.tag"} = $tag;
+ 		$insertlist{"$tagnum.tag"} = $tag;
-       $insertlist{"$tagnum.description"} = $descrip;
+ 		$insertlist{"$tag.num"}   = $tagnum;
-       $insertlist{"$tagnum.color"} = $color;
+ 		push(@alltags,$tag);
-       $insertlist{"$tagnum.function"} = $function;
+ 	    } elsif ($in_help && $token->[1] eq 'file') {
-       if (!defined($show)) { $show='yes'; }
+ 		$key = $tag.'.helpfile';
-       $insertlist{"$tagnum.show"}= $show;
+ 	    } elsif ($in_help && $token->[1] eq 'description') {
-       $insertlist{"$tag.num"}=$tagnum;
+ 		$key = $tag.'.helpdesc';
-       $tagnum++;
+ 	    } elsif ($token->[1] eq 'description' ||
+ 		     $token->[1] eq 'color'       ||
+ 		     $token->[1] eq 'show'          ) {
+ 		$key = $tag.'.'.$token->[1];
+ 	    } elsif ($token->[1] eq 'insert_sub') {
+ 		$key = $tag.'.function';
+ 	    } elsif ($token->[1] eq 'help') {
+ 		$in_help=1;
+ 	    } elsif ($token->[1] eq 'allow') {
+ 		$key = $tag.'.allow';
+ 	    }
+ 	    if (defined($key)) {
+ 		$insertlist{$key} = $parser->get_text();
+ 		$insertlist{$key} =~ s/(^\s*|\s*$ )//gx;
+ 	    }
+ 	} elsif ($token->[0] eq 'E') {
+ 	    if      ($token->[1] eq 'tag') {
+ 		undef($tag);
+ 		$tagnum++;
+ 	    } elsif ($token->[1] eq 'help') {
+ 		undef($in_help);
+ 	    }
+ 	}
      }
-   }
-   $i++; #skipping TABLE line
+     # parse the allows and ignore tags set to <show>no</show>
-   $tagnum = 0;
+     foreach my $tag (@alltags) {
-   for (;$i < $#data;$i++) {
+         next if (!exists($insertlist{"$tag.allow"}));
-     my $line = $data[$i];
+ 	my $allow =  $insertlist{"$tag.allow"};
-     my ($mnemonic,@which) = split(/ +/,$line);
+        	foreach my $element (split(',',$allow)) {
-     my $tag = $insertlist{"$tagnum.tag"};
+ 	    $element =~ s/(^\s*|\s*$ )//gx;
-     for (my $j=0;$j <=$#which;$j++) {
+ 	    if (!exists($insertlist{"$element.show"})
-       if ( $which[$j] eq 'Y' ) {
+                 || $insertlist{"$element.show"} ne 'no') {
- 	if ($insertlist{"$j.show"} ne 'no') {
+ 		push(@{ $insertlist{$tag.'.which'} },$element);
- 	  push(@{ $insertlist{"$tag.which"} },$j);
+ 	    }
  	}
-       }
      }
-     $tagnum++;
+ }
-   }
+ sub register_insert {
+     return &register_insert_xml(@_);
+ #    &dump_insertlist('2');
+ }
+ sub dump_insertlist {
+     my ($ext) = @_;
+     open(XML,">/tmp/insertlist.xml.$ext");
+     print XML ("<insertlist>");
+     my $i=0;
+     while (exists($insertlist{"$i.tag"})) {
+ 	my $tag = $insertlist{"$i.tag"};
+ 	print XML ("
+ \t<tag name=\"$tag\">");
+ 	if (defined($insertlist{"$tag.description"})) {
+ 	    print XML ("
+ \t\t<description>".$insertlist{"$tag.description"}."</description>");
+ 	}
+ 	if (defined($insertlist{"$tag.color"})) {
+ 	    print XML ("
+ \t\t<color>".$insertlist{"$tag.color"}."</color>");
+ 	}
+ 	if (defined($insertlist{"$tag.function"})) {
+ 	    print XML ("
+ \t\t<insert_sub>".$insertlist{"$tag.function"}."</insert_sub>");
+ 	}
+ 	if (defined($insertlist{"$tag.show"})
+ 	    && $insertlist{"$tag.show"} ne 'yes') {
+ 	    print XML ("
+ \t\t<show>".$insertlist{"$tag.show"}."</show>");
+ 	}
+ 	if (defined($insertlist{"$tag.helpfile"})) {
+ 	    print XML ("
+ \t\t<help>
+ \t\t\t<file>".$insertlist{"$tag.helpfile"}."</file>");
+ 	    if ($insertlist{"$tag.helpdesc"} ne '') {
+ 		print XML ("
+ \t\t\t<description>".$insertlist{"$tag.helpdesc"}."</description>");
+ 	    }
+ 	    print XML ("
+ \t\t</help>");
+ 	}
+ 	if (defined($insertlist{"$tag.which"})) {
+ 	    print XML ("
+ \t\t<allow>".join(',',sort(@{ $insertlist{"$tag.which"} }))."</allow>");
+ 	}
+ 	print XML ("
+ \t</tag>");
+ 	$i++;
+     }
+     print XML ("\n</insertlist>\n");
+     close(XML);
  }
  sub description {
-   my ($token)=@_;
+     my ($token)=@_;
-   my $tagnum;
+     my $tag = &get_tag($token);
-   my $tag=$token->[1];
+     return $insertlist{$tag.'.description'};
-   foreach my $namespace (reverse @Apache::lonxml::namespace) {
-     my $testtag=$namespace.'::'.$tag;
-     $tagnum=$insertlist{"$testtag.num"};
-     if (defined($tagnum)) { last; }
-   }
-   if (!defined ($tagnum)) { $tagnum=$Apache::lonxml::insertlist{"$tag.num"}; }
-   return $insertlist{$tagnum.'.description'};
  }
- # ----------------------------------------------------------------- whichuser
+ # Returns a list containing the help file, and the description
- # returns a list of $symb, $courseid, $domain, $name that is correct for
+ sub helpinfo {
- # calls to lonnet functions for this setup.
+     my ($token)=@_;
- # - looks for form.grade_ parameters
+     my $tag = &get_tag($token);
- sub whichuser {
+     return ($insertlist{$tag.'.helpfile'}, $insertlist{$tag.'.helpdesc'});
-   my ($symb,$courseid,$domain,$name);
+ }
-   if (defined($ENV{'form.grade_symb'})) {
-     my $tmp_courseid=$ENV{'form.grade_courseid'};
+ sub get_tag {
-     my $allowed=&Apache::lonnet::allowed('mgr',$tmp_courseid);
+     my ($token)=@_;
-     if ($allowed) {
+     my $tagnum;
-       $symb=$ENV{'form.grade_symb'};
+     my $tag=$token->[1];
-       $courseid=$ENV{'form.grade_courseid'};
+     foreach my $namespace (reverse(@Apache::lonxml::namespace)) {
-       $domain=$ENV{'form.grade_domain'};
+ 	my $testtag = $namespace.'::'.$tag;
-       $name=$ENV{'form.grade_username'};
+ 	$tagnum = $insertlist{"$testtag.num"};
+ 	last if (defined($tagnum));
      }
-   } else {
+     if (!defined($tagnum)) {
-     $symb=&Apache::lonnet::symbread();
+ 	$tagnum = $Apache::lonxml::insertlist{"$tag.num"};
-     $courseid=$ENV{'request.course.id'};
+     }
-     $domain=$ENV{'user.domain'};
+     return $insertlist{"$tagnum.tag"};
-     $name=$ENV{'user.name'};
-   }
-   return ($symb,$courseid,$domain,$name);
  }
 ;

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

Removed from v.1.240
changed lines
	Added in v.1.484.2.2