--- loncom/xml/lonxml.pm	2003/08/07 19:31:16	1.266.2.1
+++ loncom/xml/lonxml.pm	2004/10/05 20:18:29	1.341
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.266.2.1 2003/08/07 19:31:16 albertel Exp $
+# $Id: lonxml.pm,v 1.341 2004/10/05 20:18:29 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,30 +36,11 @@
 # 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 @htmlareafields);
 use strict;
 use HTML::LCParser();
 use HTML::TreeBuilder();
@@ -69,7 +50,8 @@ use Safe::Hole();
 use Math::Cephes();
 use Math::Random();
 use Opcode();
-
+use POSIX qw(strftime);
+use Time::HiRes qw( gettimeofday tv_interval );
 
 sub register {
   my ($space,@taglist) = @_;
@@ -95,6 +77,7 @@ use Apache::style();
 use Apache::run();
 use Apache::londefdef();
 use Apache::scripttag();
+use Apache::languagetags();
 use Apache::edit();
 use Apache::inputtags();
 use Apache::outputtags();
@@ -104,6 +87,7 @@ use Apache::loncommon();
 use Apache::lonfeedback();
 use Apache::lonmsg();
 use Apache::loncacc();
+use Apache::lonlocal;
 
 #==================================================   Main subroutine: xmlparse  
 #debugging control, to turn on debugging modify the correct handler
@@ -138,9 +122,6 @@ $evaluate = 1;
 # stores the list of active tag namespaces
 @namespace=();
 
-# if 0 all high ASCII characters will be encoded into HTML Entities
-$prevent_entity_encode=0;
-
 # has the dynamic menu been updated to know about this resource
 $Apache::lonxml::registered=0;
 
@@ -158,8 +139,18 @@ $Apache::lonxml::usestyle=1;
 $Apache::lonxml::style_values='';
 $Apache::lonxml::style_end_values='';
 
+#array of ssi calls that need to occur after we are done parsing
+@Apache::lonxml::ssi_info=();
+
+#should we do the postag variable interpolation
+$Apache::lonxml::post_evaluate=1;
+
+#a header message to emit in the case of any generated warning or errors
+$Apache::lonxml::warnings_error_header='';
+
 sub xmlbegin {
   my $output='';
+  @htmlareafields=();
   if ($ENV{'browser.mathml'}) {
       $output='<?xml version="1.0"?>'
             .'<?xml-stylesheet type="text/css" href="/adm/MathML/mathml.css"?>'
@@ -174,113 +165,21 @@ sub xmlbegin {
 }
 
 sub xmlend {
-    my ($discussiononly,$symb)=@_;
-    my $discussion='';
-    if ($ENV{'request.course.id'}) {
-       my $crs='/'.$ENV{'request.course.id'};
-       if ($ENV{'request.course.sec'}) {
-          $crs.='_'.$ENV{'request.course.sec'};
-       }                 
-       $crs=~s/\_/\//g;
-       my $seeid=&Apache::lonnet::allowed('rin',$crs);
-       unless ($symb) {
-           $symb=&Apache::lonnet::symbread();
-       }
-       if ($symb) {
-          my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
-                     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-          if ($contrib{'version'}) {
-              unless ($discussiononly) {
-                 $discussion.=
-                  '<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 ($contrib{$idx.':attachmenturl'}) {
-                     my ($fname,$ft)
-                        =($contrib{$idx.':attachmenturl'}=~/\/(\w+)\.(\w+)$/);
-		     $message.='<p>Attachment: <a href="'.
-	       &Apache::lonnet::tokenwrapper($contrib{$idx.':attachmenturl'}).
-                     '"><tt>'.$fname.'.'.$ft.'</tt></a>';
-                 }
-                 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" enctype="multipart/form-data">
-<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>
-<p>
-Attachment (128 KB max size): <input type="file" name="attachment" />
-</p>
-</form>
-ENDDISCUSS
-             $discussion.=&Apache::lonfeedback::generate_preview_button();
-          }
-       }
+    my ($target,$parser)=@_;
+    my $mode='xml';
+    my $status='OPEN';
+    if ($Apache::lonhomework::parsing_a_problem) {
+	$mode='problem';
+	$status=$Apache::inputtags::status[-1]; 
+    }
+    my $discussion=&Apache::lonfeedback::list_discussion($mode,$status);    
+    if ($target eq 'tex') {
+	$discussion.='<tex>\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\end{document}</tex>';
+	&Apache::lonxml::newparser($parser,\$discussion,'');
+	return '';
+    } else {
+	return $discussion.'</html>';
     }
-    return $discussion.($discussiononly?'':'</html>');
 }
 
 sub tokeninputfield {
@@ -372,13 +271,13 @@ sub printtokenheader {
         my %idhash=&Apache::lonnet::idrget($tudom,($tuname));
 	return 
  '<img align="right" src="/cgi-bin/barcode.png?encode='.$token.'" />'.
-               'Checked out for '.$plainname.
-               '<br />User: '.$tuname.' at '.$tudom.
-	       '<br />ID: '.$idhash{$tuname}.
-	       '<br />CourseID: '.$tcrsid.
-	       '<br />Course: '.$ENV{'course.'.$tcrsid.'.description'}.
-               '<br />DocID: '.$token.
-               '<br />Time: '.localtime().'<hr />';
+               &mt('Checked out for').' '.$plainname.
+               '<br />'.&mt('User').': '.$tuname.' at '.$tudom.
+	       '<br />'.&mt('ID').': '.$idhash{$tuname}.
+	       '<br />'.&mt('CourseID').': '.$tcrsid.
+	       '<br />'.&mt('Course').': '.$ENV{'course.'.$tcrsid.'.description'}.
+               '<br />'.&mt('DocID').': '.$token.
+               '<br />'.&mt('Time').': '.&Apache::lonlocal::locallocaltime().'<hr />';
     } else {
         return $token;
     }
@@ -411,6 +310,7 @@ sub xmlparse {
  &Apache::inputtags::initialize_inputtags();
  &Apache::outputtags::initialize_outputtags();
  &Apache::edit::initialize_edit();
+ &Apache::londefdef::initialize_londefdef();
 
 #
 # do we have a course style file?
@@ -420,13 +320,22 @@ sub xmlparse {
      my $bodytext=
 	 $ENV{'course.'.$ENV{'request.course.id'}.'.default_xml_style'};
      if ($bodytext) {
-       my $location=&Apache::lonnet::filelocation('',$bodytext);
-       my $styletext=&Apache::lonnet::getfile($location);
+	 foreach my $file (split(',',$bodytext)) {
+	     my $location=&Apache::lonnet::filelocation('',$file);
+	     my $styletext=&Apache::lonnet::getfile($location);
+	     if ($styletext ne '-1') {
+		 %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();
  my @pars = ();
@@ -451,6 +360,7 @@ sub xmlparse {
  if ($ENV{'request.uri'}) {
     &writeallows($ENV{'request.uri'});
  }
+ &do_registered_ssi();
  if ($Apache::lonxml::counter_changed) { &store_counter() }
  return $finaloutput;
 }
@@ -477,23 +387,33 @@ sub htmlclean {
 }
 
 sub latex_special_symbols {
-    my ($current_token,$stack,$parstack,$where)=@_;
+    my ($string,$where)=@_;
     if ($where eq 'header') {
-	$current_token =~ s/(\\|_|\^)/ /g;
-	$current_token =~ s/(\$|%|\#|&|\{|\})/\\$1/g;
+	$string =~ s/(\\|_|\^)/ /g;
+	$string =~ s/(\$|%|\{|\})/\\$1/g;
+	$string =~ s/_/ /g;
+	$string=&Apache::lonprintout::character_chart($string);
+	# any & or # leftover should be safe to just escape
+        $string=~s/([^\\])\&/$1\\\&/g;
+        $string=~s/([^\\])\#/$1\\\#/g;
     } else {
-	$current_token=~s/\\ /\\char92 /g;
-	$current_token=~s/\^/\\char94 /g;
-	$current_token=~s/\~/\\char126 /g;
-	$current_token=~s/(&[^A-Za-z\#])/\\$1/g;
-	$current_token=~s/([^&])\#/$1\\#/g;
-	$current_token=~s/(\$|_|{|})/\\$1/g;
-	$current_token=~s/\\char92 /\\texttt{\\char92}/g;
-	$current_token=~s/(>|<)/\$$1\$/g; #more or less
-	if ($current_token=~m/\d%/) {$current_token =~ s/(\d)%/$1\\%/g;} #percent after digit
-	if ($current_token=~m/\s%/) {$current_token =~ s/(\s)%/$1\\%/g;} #persent after space
+	$string=~s/\\/\\ensuremath{\\backslash}/g;
+	$string=~s/([^\\]|^)\%/$1\\\%/g;
+	$string=~s/([^\\]|^)\$/$1\\\$/g;
+	$string=~s/([^\\])\_/$1\\_/g;
+	$string=~s/\$\$/\$\\\$/g;
+	$string=~s/\_\_/\_\\\_/g;
+	$string=~s/\#\#/\#\\\#/g;
+        $string=~s/([^\\]|^)(\~|\^)/$1\\$2\\strut /g;
+	$string=~s/(>|<)/\\ensuremath\{$1\}/g; #more or less
+	$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/\|/\$\\mid\$/g;
+#single { or } How to escape?
     }
-    return $current_token;
+    return $string;
 }
 
 sub inner_xmlparse {
@@ -554,7 +474,7 @@ sub inner_xmlparse {
 	    #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) {
+		if ($token->[1] =~ /^\Q$lasttag\E$/i) {
 		    &Apache::lonxml::warning('Using tag &lt;/'.$token->[1].'&gt; on line '.$token->[3].' as end tag to &lt;'.$$stack[-1].'&gt;');
 		    last;
 		} else {
@@ -569,7 +489,7 @@ sub inner_xmlparse {
 	&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 "") {
 	  my $extras;
 	  if (!$Apache::lonxml::usestyle) {
 	      $extras=$Apache::lonxml::style_values;
@@ -580,17 +500,15 @@ sub inner_xmlparse {
 	  $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') ) {
 	  #Style file definitions should be correct
 	  if ($target eq 'tex' && ($Apache::lonxml::usestyle)) {
-	      $result=&latex_special_symbols($result,$stack,$parstack);
+	      $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 {
@@ -620,6 +538,10 @@ sub inner_xmlparse {
   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='';
@@ -652,6 +574,10 @@ 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)) {
@@ -692,6 +618,7 @@ sub setup_globals {
   my ($request,$target)=@_;
   $Apache::lonxml::request=$request;
   $Apache::lonxml::registered = 0;
+  @Apache::lonxml::htmlareafields=();
   $errorcount=0;
   $warningcount=0;
   $Apache::lonxml::default_homework_loaded=0;
@@ -699,6 +626,9 @@ sub setup_globals {
   &init_counter();
   @Apache::lonxml::pwd=();
   @Apache::lonxml::extlinks=();
+  @Apache::lonxml::ssi_info=();
+  $Apache::lonxml::post_evaluate=1;
+  $Apache::lonxml::warnings_error_header='';
   if ($target eq 'meta') {
     $Apache::lonxml::redirection = 0;
     $Apache::lonxml::metamode = 1;
@@ -742,11 +672,14 @@ sub init_safespace {
   $safeeval->permit("entereval");
   $safeeval->permit(":base_math");
   $safeeval->permit("sort");
+  $safeeval->permit("time");
   $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(\&Math::Cephes::asin,$safeeval,'&asin');
   $safehole->wrap(\&Math::Cephes::acos,$safeeval,'&acos');
   $safehole->wrap(\&Math::Cephes::atan,$safeeval,'&atan');
@@ -818,16 +751,21 @@ 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::lonxml::error,$safeeval,'&LONCAPA_INTERNAL_ERROR');
+  $safehole->wrap(\&Apache::lonxml::debug,$safeeval,'&LONCAPA_INTERNAL_DEBUG');
+  $safehole->wrap(\&Apache::caparesponse::get_sigrange,$safeeval,'&LONCAPA_INTERNAL_get_sigrange');
 
 #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.';';
+  $safeinit .= ';$external::randomseed="'.$rndseed.'";';
   &Apache::lonxml::debug("Setting rndseed to $rndseed");
   &Apache::run::run($safeinit,$safeeval);
+
 }
 
 sub default_homework_load {
@@ -842,18 +780,26 @@ sub default_homework_load {
     }
 }
 
+my $metamode_was;
 sub startredirection {
-  $Apache::lonxml::redirection++;
-  push (@Apache::lonxml::outputstack, '');
+    if (!$Apache::lonxml::redirection) {
+	$metamode_was=$Apache::lonxml::metamode;
+    }
+    $Apache::lonxml::metamode=0;
+    $Apache::lonxml::redirection++;
+    push (@Apache::lonxml::outputstack, '');
 }
 
 sub endredirection {
-  if (!$Apache::lonxml::redirection) {
-    &Apache::lonxml::error("Endredirection was called, before a startredirection, perhaps you have unbalanced tags. Some debuging information:".join ":",caller);
-    return '';
-  }
-  $Apache::lonxml::redirection--;
-  pop @Apache::lonxml::outputstack;
+    if (!$Apache::lonxml::redirection) {
+	&Apache::lonxml::error("Endredirection was called, before a startredirection, perhaps you have unbalanced tags. Some debuging information:".join ":",caller);
+	return '';
+    }
+    $Apache::lonxml::redirection--;
+    if (!$Apache::lonxml::redirection) {
+	$Apache::lonxml::metamode=$metamode_was;
+    }
+    pop @Apache::lonxml::outputstack;
 }
 
 sub end_tag {
@@ -869,6 +815,8 @@ sub initdepth {
   $Apache::lonxml::olddepth=-1;
 }
 
+my @timers;
+my $lasttime;
 sub increasedepth {
   my ($token) = @_;
   $Apache::lonxml::depth++;
@@ -876,8 +824,15 @@ sub increasedepth {
   if ($Apache::lonxml::depthcounter[$Apache::lonxml::depth]==1) {
     $Apache::lonxml::olddepth=$Apache::lonxml::depth;
   }
+  my $time;
+  if ($Apache::lonxml::debug eq "1") {
+      push(@timers,[&gettimeofday()]);
+      $time=&tv_interval($lasttime);
+      $lasttime=[&gettimeofday()];
+  }
+  my $spacing='  'x($Apache::lonxml::depth-1);
   my $curdepth=join('_',@Apache::lonxml::depthcounter);
-  &Apache::lonxml::debug("s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n");
+  &Apache::lonxml::debug("s$spacing$Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1] : $time : \n");
 #print "<br />s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n";
 }
 
@@ -889,40 +844,47 @@ sub decreasedepth {
     $Apache::lonxml::olddepth=$Apache::lonxml::depth+1;
   }
   if (  $Apache::lonxml::depth < -1) {
-    &Apache::lonxml::warning("Missing tags, unable to properly run file.");
+    &Apache::lonxml::warning(&mt("Missing tags, unable to properly run file."));
     $Apache::lonxml::depth='-1';
   }
+  my ($timer,$time);
+  if ($Apache::lonxml::debug eq "1") {
+      $timer=pop(@timers);
+      $time=&tv_interval($lasttime);
+      $lasttime=[&gettimeofday()];
+  }
+  my $spacing='  'x$Apache::lonxml::depth;
   my $curdepth=join('_',@Apache::lonxml::depthcounter);
-  &Apache::lonxml::debug("e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n");
+  &Apache::lonxml::debug("e$spacing$Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1] : $time : ".&tv_interval($timer)."\n");
 #print "<br />e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n";
 }
 
 sub get_all_text_unbalanced {
 #there is a copy of this in lonpublisher.pm
- my($tag,$pars)= @_;
- my $token;
- my $result='';
- $tag='<'.$tag.'>';
- while ($token = $$pars[-1]->get_token) {
-   if (($token->[0] eq 'T')||($token->[0] eq 'C')||($token->[0] eq 'D')) {
-     $result.=$token->[1];
-   } elsif ($token->[0] eq 'PI') {
-     $result.=$token->[2];
-   } elsif ($token->[0] eq 'S') {
-     $result.=$token->[4];
-   } elsif ($token->[0] eq 'E')  {
-     $result.=$token->[2];
-   }
-   if ($result =~ /(.*)\Q$tag\E(.*)/s) {
-     &Apache::lonxml::debug('Got a winner with leftovers ::'.$2);
-     &Apache::lonxml::debug('Result is :'.$1);
-     $result=$1;
-     my $redo=$tag.$2;
-     &Apache::lonxml::newparser($pars,\$redo);
-     last;
-   }
- }
- return $result
+    my($tag,$pars)= @_;
+    my $token;
+    my $result='';
+    $tag='<'.$tag.'>';
+    while ($token = $$pars[-1]->get_token) {
+	if (($token->[0] eq 'T')||($token->[0] eq 'C')||($token->[0] eq 'D')) {
+	    $result.=$token->[1];
+	} elsif ($token->[0] eq 'PI') {
+	    $result.=$token->[2];
+	} elsif ($token->[0] eq 'S') {
+	    $result.=$token->[4];
+	} elsif ($token->[0] eq 'E')  {
+	    $result.=$token->[2];
+	}
+	if ($result =~ /\Q$tag\E/is) {
+	    ($result,my $redo)=$result =~ /(.*)\Q$tag\E(.*)/is;
+	    #&Apache::lonxml::debug('Got a winner with leftovers ::'.$2);
+	    #&Apache::lonxml::debug('Result is :'.$1);
+	    $redo=$tag.$redo;
+	    &Apache::lonxml::newparser($pars,\$redo);
+	    last;
+	}
+    }
+    return $result
 }
 
 sub increment_counter {
@@ -951,83 +913,101 @@ sub store_counter {
 }
 
 sub get_all_text {
- my($tag,$pars)= @_;
- &Apache::lonxml::debug("Got a ".ref($pars));
- my $gotfullstack=1;
- if (ref($pars) ne 'ARRAY') {
-     $gotfullstack=0;
-     $pars=[$pars];
- }
- my $depth=0;
- my $token;
- my $result='';
- if ( $tag =~ m:^/: ) { 
-   my $tag=substr($tag,1); 
-   #&Apache::lonxml::debug("have:$tag:");
-   my $top_empty=0;
-   while (($depth >=0) && ($#$pars > -1) && (!$top_empty)) {
-     while (($depth >=0) && ($token = $$pars[-1]->get_token)) {
-       #&Apache::lonxml::debug("e token:$token->[0]:$depth:$token->[1]:".$#$pars.":".$#Apache::lonxml::pwd);
-       if (($token->[0] eq 'T')||($token->[0] eq 'C')||($token->[0] eq 'D')) {
-	 $result.=$token->[1];
-       } elsif ($token->[0] eq 'PI') {
-	 $result.=$token->[2];
-       } elsif ($token->[0] eq 'S') {
-	 if ($token->[1] =~ /^$tag$/i) { $depth++; }
-	 $result.=$token->[4];
-       } elsif ($token->[0] eq 'E')  {
-	 if ( $token->[1] =~ /^$tag$/i) { $depth--; }
-	 #skip sending back the last end tag
-	 if ($depth > -1) { $result.=$token->[2]; } else {
-	   $$pars[-1]->unget_token($token);
-	 }
-       }
-     }
-     if (($depth >=0) && ($#$pars == 0) ) { $top_empty=1; }
-     if (($depth >=0) && ($#$pars > 0) ) {
-       pop(@$pars);
-       pop(@Apache::lonxml::pwd);
-     }
-   }
-   if ($top_empty && $depth >= 0) {
-       #never found the end tag ran out of text, throw error send back blank
-       &error('Never found end tag for &lt;'.$tag.'&gt;');
-       if ($gotfullstack) {
-	   my $newstring='</'.$tag.'>'.$result;
-	   &Apache::lonxml::newparser($pars,\$newstring);
-       }
-       $result='';
-   }
- } else {
-     while ($#$pars > -1) {
-	 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')) {
-		 $result.=$token->[1];
-	     } elsif ($token->[0] eq 'PI') {
-		 $result.=$token->[2];
-	     } elsif ($token->[0] eq 'S') {
-		 if ( $token->[1] =~ /^$tag$/i) {
-		     $$pars[-1]->unget_token($token); last;
-		 } else {
-		     $result.=$token->[4];
-		 }
-	     } elsif ($token->[0] eq 'E')  {
-		 $result.=$token->[2];
-	     }
-	 }
-	 if (($#$pars > 0) ) {
-	     pop(@$pars);
-	     pop(@Apache::lonxml::pwd);
-	 } else { last; }
-     }
- }
- if ($result =~ m|<LONCAPA_INTERNAL_TURN_STYLE_ON />|) {
-     $Apache::lonxml::usestyle=1;
- }
- #&Apache::lonxml::debug("Exit:$result:");
- return $result
+    my($tag,$pars,$style)= @_;
+    my $gotfullstack=1;
+    if (ref($pars) ne 'ARRAY') {
+	$gotfullstack=0;
+	$pars=[$pars];
+    }
+    if (ref($style) ne 'HASH') {
+	$style={};
+    }
+    my $depth=0;
+    my $token;
+    my $result='';
+    if ( $tag =~ m:^/: ) { 
+	my $tag=substr($tag,1); 
+	#&Apache::lonxml::debug("have:$tag:");
+	my $top_empty=0;
+	while (($depth >=0) && ($#$pars > -1) && (!$top_empty)) {
+	    while (($depth >=0) && ($token = $$pars[-1]->get_token)) {
+		#&Apache::lonxml::debug("e token:$token->[0]:$depth:$token->[1]:".$#$pars.":".$#Apache::lonxml::pwd);
+		if (($token->[0] eq 'T')||($token->[0] eq 'C')||($token->[0] eq 'D')) {
+		    $result.=$token->[1];
+		} elsif ($token->[0] eq 'PI') {
+		    $result.=$token->[2];
+		} elsif ($token->[0] eq 'S') {
+		    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];
+		} elsif ($token->[0] eq 'E')  {
+		    if ( $token->[1] =~ /^\Q$tag\E$/i) { $depth--; }
+		    #skip sending back the last end tag
+		    if ($depth == 0 && exists($$style{'/'.$token->[1]}) && $Apache::lonxml::usestyle) {
+			my $string=
+			    '<LONCAPA_INTERNAL_TURN_STYLE_OFF end="yes" />'.
+				$$style{'/'.$token->[1]}.
+				    $token->[2].
+					'<LONCAPA_INTERNAL_TURN_STYLE_ON />';
+			&Apache::lonxml::newparser($pars,\$string);
+			#&Apache::lonxml::debug("reParsing $string");
+			next;
+		    }
+		    if ($depth > -1) {
+			$result.=$token->[2];
+		    } else {
+			$$pars[-1]->unget_token($token);
+		    }
+		}
+	    }
+	    if (($depth >=0) && ($#$pars == 0) ) { $top_empty=1; }
+	    if (($depth >=0) && ($#$pars > 0) ) {
+		pop(@$pars);
+		pop(@Apache::lonxml::pwd);
+	    }
+	}
+	if ($top_empty && $depth >= 0) {
+	    #never found the end tag ran out of text, throw error send back blank
+	    &error('Never found end tag for &lt;'.$tag.
+		   '&gt; current string <pre>'.
+		   &HTML::Entities::encode($result,'<>&"').
+		   '</pre>');
+	    if ($gotfullstack) {
+		my $newstring='</'.$tag.'>'.$result;
+		&Apache::lonxml::newparser($pars,\$newstring);
+	    }
+	    $result='';
+	}
+    } else {
+	while ($#$pars > -1) {
+	    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')) {
+		    $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 {
@@ -1048,8 +1028,9 @@ sub parstring {
     unless ($_=~/\W/) {
       my $val=$token->[2]->{$_};
       $val =~ s/([\%\@\\\"\'])/\\$1/g;
+      $val =~ s/^(\$\d)/\\$1/;
       #if ($val =~ m/^[\%\@]/) { $val="\\".$val; }
-      $temp .= "my \$$_=\"$val\";"
+      $temp .= "my \$$_=\"$val\";";
     }
   }
   return $temp;
@@ -1072,6 +1053,19 @@ sub writeallows {
     &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);
+    }
+}
 #
 # Afterburner handles anchors, highlights and links
 #
@@ -1084,7 +1078,7 @@ sub afterburn {
            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'}) {
@@ -1092,14 +1086,14 @@ sub afterburn {
            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'}) {
         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';
@@ -1111,57 +1105,102 @@ 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("Unable to save file $file");
+	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);
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml/11/DTD/xhtml11.dtd">
 <html>
 <head>
-<title>
-                           Title of Document Goes Here
-</title>
+<title>$title</title>
 </head>
 <body bgcolor="#FFFFFF">
-
-                           Body of Document Goes Here
-
+$body
 </body>
 </html>
 SIMPLECONTENT
+    return $filecontents;
+}
+
+sub createnewsty {
+  my $filecontents=(<<SIMPLECONTENT);
+<definetag name="">
+    <render>
+       <web></web>
+       <tex></tex>
+    </render>
+</definetag>
+SIMPLECONTENT
   return $filecontents;
 }
 
 
 sub inserteditinfo {
-      my ($result,$filecontents)=@_;
-      $filecontents = &HTML::Entities::encode($filecontents);
+      my ($result,$filecontents,$filetype)=@_;
+      $filecontents = &HTML::Entities::encode($filecontents,'<>&"');
 #      my $editheader='<a href="#editsection">Edit below</a><hr />';
-      my $xml_help = Apache::loncommon::helpLatexCheatsheet();
+      my $xml_help = '';
+      my $initialize='';
+      if ($filetype eq 'html') {
+	  my $addbuttons=&Apache::lonhtmlcommon::htmlareaaddbuttons();
+	  $initialize=&Apache::lonhtmlcommon::htmlareaheaders().
+	      &Apache::lonhtmlcommon::spellheader().(<<FULLPAGE);
+<script type="text/javascript">
+$addbuttons
+
+    HTMLArea.loadPlugin("FullPage");
+
+    function initDocument() {
+	var editor=new HTMLArea("filecont",config);
+	editor.registerPlugin(FullPage);
+	editor.generate();
+    }
+</script>
+FULLPAGE
+          $result=~s/\<body([^\>]*)\>/\<body onload="initDocument()" $1\>/i;
+	  $xml_help=&Apache::loncommon::helpLatexCheatsheet();
+      }
+      my $cleanbut = '';
+      if ($filetype eq 'html') {
+	  $cleanbut='<input type="submit" name="attemptclean" value="'.
+	      &mt('Save and then attempt to clean HTML').'" />';
+      }
       my $titledisplay=&display_title();
+      my %lt=&Apache::lonlocal::texthash('st' => 'Save this',
+					 'vi' => 'View',
+					 'ed' => 'Edit');
       my $buttons=(<<BUTTONS);
-<input type="submit" name="attemptclean" 
-       value="Save and then attempt to clean HTML" />
-<input type="submit" name="savethisfile" value="Save this" />
-<input type="submit" name="viewmode" value="View" />
+$cleanbut
+<input type="submit" name="savethisfile" accesskey="s"  value="$lt{'st'}" />
+<input type="submit" name="viewmode" accesskey="v" value="$lt{'vi'}" />
 BUTTONS
+      $buttons.=&Apache::lonhtmlcommon::spelllink('xmledit','filecont');
+      $buttons.=&Apache::lonhtmlcommon::htmlareaselectactive('filecont');
       my $editfooter=(<<ENDFOOTER);
+$initialize
 <hr />
 <a name="editsection" />
-<form method="post">
+<form method="post" name="xmledit">
 $xml_help
-<input type="hidden" name="editmode" value="Edit" />
+<input type="hidden" name="editmode" value="$lt{'ed'}" />
 $buttons<br />
-<textarea cols="80" rows="40" name="filecont">$filecontents</textarea>
+<textarea cols="80" rows="44" name="filecont" id="filecont">$filecontents</textarea>
 <br />$buttons
 <br />
 </form>
 $titledisplay
+</body>
 ENDFOOTER
 #      $result=~s/(\<body[^\>]*\>)/$1$editheader/is;
       $result=~s/(\<\/body\>)/$editfooter/is;
@@ -1203,9 +1242,9 @@ sub handler {
     $Apache::lonxml::debug=$ENV{'user.debug'};
     
     if ($ENV{'browser.mathml'}) {
-	$request->content_type('text/xml');
+	&Apache::loncommon::content_type($request,'text/xml');
     } else {
-	$request->content_type('text/html');
+	&Apache::loncommon::content_type($request,'text/html');
     }
     &Apache::loncommon::no_cache($request);
     $request->send_http_header;
@@ -1214,31 +1253,48 @@ sub handler {
 
 
     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{'form.savethisfile'}) || ($ENV{'form.attemptclean'})) {
-	    &storefile($file,$ENV{'form.filecont'});
+	    if (&storefile($file,$ENV{'form.filecont'})) {
+		&Apache::lonxml::info("<font COLOR=\"#0000FF\">".
+				      &mt('Updated').": ".
+				      &Apache::lonlocal::locallocaltime(time).
+				      " </font>");
+	    } 
 	}
     }
     my %mystyle;
     my $result = '';
     my $filecontents=&Apache::lonnet::getfile($file);
     if ($filecontents eq -1) {
+	my $bodytag=&Apache::loncommon::bodytag('File Error');
+	my $fnf=&mt('File not found');
 	$result=(<<ENDNOTFOUND);
 <html>
 <head>
-<title>File not found</title>
+<title>$fnf</title>
 </head>
-<body bgcolor="#FFFFFF">
-<b>File not found: $file</b>
+$bodytag
+<b>$fnf: $file</b>
 </body>
 </html>
 ENDNOTFOUND
     $filecontents='';
 	if ($ENV{'request.state'} ne 'published') {
-	    $filecontents=&createnewhtml();
+	    if ($filetype eq 'sty') {
+		$filecontents=&createnewsty();
+	    } else {
+		$filecontents=&createnewhtml();
+	    }
 	    $ENV{'form.editmode'}='Edit'; #force edit mode
 	}
     } else {
@@ -1264,15 +1320,17 @@ ENDNOTFOUND
 	if ($ENV{'form.editmode'} && (!($ENV{'form.viewmode'}))) {
 	    my $displayfile=$request->uri;
 	    $displayfile=~s/^\/[^\/]*//;
-	    $result='<html><body bgcolor="#FFFFFF"><h3>'.$displayfile.
+	    $result='<html><body bgcolor="#FFFFFF">'.
+		&Apache::lonxml::message_location().'<h3>'.
+		$displayfile.
 		'</h3></body></html>';
-	    $result=&inserteditinfo($result,$filecontents);
+	    $result=&inserteditinfo($result,$filecontents,$filetype);
 	}
     }
+    if ($filetype eq 'html') { writeallows($request->uri); }
+	
     
-    writeallows($request->uri);
-    
-
+    &Apache::lonxml::add_messages(\$result);
     $request->print($result);
     
     return OK;
@@ -1292,46 +1350,90 @@ sub display_title {
 }
 
 sub debug {
-  if ($Apache::lonxml::debug eq 1) {
-    $|=1;
-    print('<font size="-2"<pre>DEBUG:'.&HTML::Entities::encode($_[0])."</pre></font>\n");
-  }
+    if ($Apache::lonxml::debug eq "1") {
+	$|=1;
+	my $request=$Apache::lonxml::request;
+	if (!$request) { $request=Apache->request; }
+	$request->print('<font size="-2"><pre>DEBUG:'.&HTML::Entities::encode($_[0],'<>&"')."</pre></font>\n");
+#	&Apache::lonnet::logthis($_[0]);
+    }
 }
 
 sub error {
-  $errorcount++;
-  if (($Apache::lonxml::debug eq 1) || ($ENV{'request.state'} eq 'construct') ) {
-    # If printing in construction space, put the error inside <pre></pre>
-    print "<b>ERROR:</b>".join("\n",@_)."\n";
-  } else {
-    print "<b>An Error occured while processing this resource. The instructor has been notified.</b> <br />";
-    #notify author
-    &Apache::lonmsg::author_res_msg($ENV{'request.filename'},join('<br />',@_));
-    #notify course
-    if ( $ENV{'request.course.id'} ) {
-      my (undef,%users)=&Apache::lonfeedback::decide_receiver(undef,0,1,1,1);
-      my $declutter=&Apache::lonnet::declutter($ENV{'request.filename'});
-      foreach (keys %users) {
-	my ($user,$domain) = split(/:/, $_);
-	&Apache::lonmsg::user_normal_msg($user,$domain,
-        "Error [$declutter]",join('<br />',@_));
-      }
+    $errorcount++;
+    if (($Apache::lonxml::debug eq 1) || ($ENV{'request.state'} eq 'construct') ) {
+	# If printing in construction space, put the error inside <pre></pre>
+	push(@Apache::lonxml::error_messages,
+	     $Apache::lonxml::warnings_error_header.
+	     "<b>ERROR:</b>".join("<br />\n",@_)."<br />\n");
+	$Apache::lonxml::warnings_error_header='';
+    } else {
+	my $errormsg;
+	my ($symb)=&Apache::lonnet::symbread();
+	if ( !$symb ) {
+	    #public or browsers
+	    $errormsg=&mt("An error occured while processing this resource. The author has been notified.");
+	} 
+	#notify author
+	&Apache::lonmsg::author_res_msg($ENV{'request.filename'},join('<br />',@_));
+	#notify course
+	if ( $symb && $ENV{'request.course.id'} ) {
+	    my (undef,%users)=&Apache::lonfeedback::decide_receiver(undef,0,1,1,1);
+	    my $declutter=&Apache::lonnet::declutter($ENV{'request.filename'});
+	    my @userlist;
+	    foreach (keys %users) {
+		my ($user,$domain) = split(/:/, $_);
+		push(@userlist,"$user\@$domain");
+		&Apache::lonmsg::user_normal_msg($user,$domain,
+						 "Error [$declutter]",join('<br />',@_));
+	    }
+	    if ($ENV{'request.role.adv'}) {
+		$errormsg=&mt("An error occured while processing this resource. The course personnel ([_1]) and the author have been notified.",join(', ',@userlist));
+	    } else {
+		$errormsg=&mt("An error occured while processing this resource. The instructor has been notified.");
+	    }
+	}
+	push(@Apache::lonxml::error_messages,"<b>$errormsg</b> <br />");
     }
-
-    #FIXME probably shouldn't have me get everything forever.
-    &Apache::lonmsg::user_normal_msg('albertel','msu',"Error in $ENV{'request.filename'}",join('<br />',@_));
-    #&Apache::lonmsg::user_normal_msg('albertel','103',"Error in $ENV{'request.filename'}",$_[0]);
-  }
 }
 
 sub warning {
-  $warningcount++;
+    $warningcount++;
   
-  if ($ENV{'form.grade_target'} ne 'tex') {
-      if ($ENV{'request.state'} eq 'construct' || $Apache::lonxml::debug) {
-        print "<b>W</b>ARNING<b>:</b>".join('<br />',@_)."<br />\n";
-      }
-  }
+    if ($ENV{'form.grade_target'} ne 'tex') {
+	if ($ENV{'request.state'} eq 'construct' || $Apache::lonxml::debug) {
+	    my $request=$Apache::lonxml::request;
+	    if (!$request) { $request=Apache->request; }
+	    push(@Apache::lonxml::warning_messages,
+		 $Apache::lonxml::warnings_error_header.
+		 "<b>W</b>ARNING<b>:</b>".join('<br />',@_)."<br />\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 {
@@ -1339,6 +1441,9 @@ 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) {
@@ -1362,6 +1467,9 @@ 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)) {
@@ -1370,7 +1478,7 @@ sub get_param_var {
   } 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])) {
@@ -1392,7 +1500,7 @@ sub register_insert {
     my $line = $data[$i];
     if ( $line =~ /^\#/ || $line =~ /^\s*\n/) { next; }
     if ( $line =~ /TABLE/ ) { last; }
-    my ($tag,$descrip,$color,$function,$show) = split(/,/, $line);
+    my ($tag,$descrip,$color,$function,$show,$helpfile,$helpdesc) = split(/,/, $line);
     if ($tag) {
       $insertlist{"$tagnum.tag"} = $tag;
       $insertlist{"$tagnum.description"} = $descrip;
@@ -1400,6 +1508,8 @@ sub register_insert {
       $insertlist{"$tagnum.function"} = $function;
       if (!defined($show)) { $show='yes'; }
       $insertlist{"$tagnum.show"}= $show;
+      $insertlist{"$tagnum.helpfile"} = $helpfile;
+      $insertlist{"$tagnum.helpdesc"} = $helpdesc;
       $insertlist{"$tag.num"}=$tagnum;
       $tagnum++;
     }
@@ -1434,6 +1544,20 @@ sub description {
   return $insertlist{$tagnum.'.description'};
 }
 
+# Returns a list containing the help file, and the description
+sub helpinfo {
+  my ($token)=@_;
+  my $tagnum;
+  my $tag=$token->[1];
+  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.'.helpfile'}, $insertlist{$tagnum.'.helpdesc'});
+}
+
 # ----------------------------------------------------------------- whichuser
 # returns a list of $symb, $courseid, $domain, $name that is correct for
 # calls to lonnet functions for this setup.