--- loncom/xml/lonxml.pm	2004/03/23 00:47:48	1.313
+++ loncom/xml/lonxml.pm	2014/06/21 20:58:12	1.531.2.15
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.313 2004/03/23 00:47:48 albertel Exp $
+# $Id: lonxml.pm,v 1.531.2.15 2014/06/21 20:58:12 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,31 +36,32 @@
 # 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
-#
+
+=pod
+
+=head1 NAME
+
+Apache::lonxml
+
+=head1 SYNOPSIS
+
+XML Parsing Module
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+
+=head1 SUBROUTINES
+
+=cut
+
+
 
 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();
@@ -70,7 +71,8 @@ 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) = @_;
@@ -100,16 +102,23 @@ use Apache::languagetags();
 use Apache::edit();
 use Apache::inputtags();
 use Apache::outputtags();
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::File();
 use Apache::loncommon();
 use Apache::lonfeedback();
 use Apache::lonmsg();
 use Apache::loncacc();
+use Apache::lonmaxima();
+use Apache::lonr();
 use Apache::lonlocal;
+use Apache::lonhtmlcommon();
+use Apache::functionplotresponse();
+use Apache::lonnavmaps();
+
+#====================================   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
@@ -135,17 +144,14 @@ $metamode = 0;
 # turns on and of run::evaluate actually derefencing var refs
 $evaluate = 1;
 
-# data structure for eidt mode, determines what tags can go into what other tags
+# data structure for edit mode, determines what tags can go into what other tags
 %insertlist=();
 
 # 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;
+# stores all Scrit Vars displays for later showing
+my @script_var_displays=();
 
 # a pointer the the Apache request object
 $Apache::lonxml::request='';
@@ -154,6 +160,16 @@ $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;
 
@@ -170,29 +186,46 @@ $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='';
-  if ($ENV{'browser.mathml'}) {
-      $output='<?xml version="1.0"?>'
-            .'<?xml-stylesheet type="text/css" href="/adm/MathML/mathml.css"?>'
-            .'<!DOCTYPE html SYSTEM "/adm/MathML/mathml.dtd" '
-            .'[<!ENTITY mathns "http://www.w3.org/1998/Math/MathML">]>'
-            .'<html xmlns:math="http://www.w3.org/1998/Math/MathML" ' 
-		.'xmlns="http://www.w3.org/TR/REC-html40">';
-  } else {
-      $output='<html>';
-  }
-  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 ($target,$parser)=@_;
     my $mode='xml';
     my $status='OPEN';
-    if ($Apache::lonhomework::parsing_a_problem) {
+    if ($Apache::lonhomework::parsing_a_problem ||
+	$Apache::lonhomework::parsing_a_task ) {
 	$mode='problem';
 	$status=$Apache::inputtags::status[-1]; 
     }
-    return &Apache::lonfeedback::list_discussion($mode,$status).'</html>';
+    my $discussion;
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+					   ['LONCAPA_INTERNAL_no_discussion']);
+    if (
+           (   (!exists($env{'form.LONCAPA_INTERNAL_no_discussion'})) 
+            || ($env{'form.LONCAPA_INTERNAL_no_discussion'} ne 'true')
+           ) 
+        && ($env{'form.inhibitmenu'} ne 'yes')
+       ) {
+        $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 '';
+    }
+
+    return $discussion;
 }
 
 sub tokeninputfield {
@@ -201,31 +234,31 @@ sub tokeninputfield {
     return (<<ENDINPUTFIELD)
 <script type="text/javascript">
     function updatetoken() {
-	var comp=new Array;
+        var comp=new Array;
         var barcode=unescape(document.tokeninput.barcode.value);
         comp=barcode.split('*');
         if (typeof(comp[0])!="undefined") {
-	    document.tokeninput.codeone.value=comp[0];
-	}
+            document.tokeninput.codeone.value=comp[0];
+        }
         if (typeof(comp[1])!="undefined") {
-	    document.tokeninput.codetwo.value=comp[1];
-	}
+            document.tokeninput.codetwo.value=comp[1];
+        }
         if (typeof(comp[2])!="undefined") {
             comp[2]=comp[2].toUpperCase();
-	    document.tokeninput.codethree.value=comp[2];
-	}
+            document.tokeninput.codethree.value=comp[2];
+        }
         document.tokeninput.barcode.value='';
-    }  
+    }
 </script>
-<form method="post" name="tokeninput">
+<form method="post" name="tokeninput" action="">
 <table border="2" bgcolor="#FFFFBB">
 <tr><th>DocID Checkin</th></tr>
 <tr><td>
 <table>
 <tr>
 <td>Scan in Barcode</td>
-<td><input type="text" size="22" name="barcode" 
-onChange="updatetoken()"/></td>
+<td><input type="text" size="22" name="barcode"
+onchange="updatetoken()"/></td>
 </tr>
 <tr><td><i>or</i> Type in DocID</td>
 <td>
@@ -233,8 +266,8 @@ onChange="updatetoken()"/></td>
 <b><font size="+2">*</font></b>
 <input type="text" size="5" name="codetwo" />
 <b><font size="+2">*</font></b>
-<input type="text" size="10" name="codethree" value="$defhost" 
-onChange="this.value=this.value.toUpperCase()" />
+<input type="text" size="10" name="codethree" value="$defhost"
+onchange="this.value=this.value.toUpperCase()" />
 </td></tr>
 </table>
 </td></tr>
@@ -247,14 +280,13 @@ ENDINPUTFIELD
 sub maketoken {
     my ($symb,$tuname,$tudom,$tcrsid)=@_;
     unless ($symb) {
-	$symb=&Apache::lonnet::symbread();
+        $symb=&Apache::lonnet::symbread();
     }
     unless ($tuname) {
-	$tuname=$ENV{'user.name'};
-        $tudom=$ENV{'user.domain'};
-        $tcrsid=$ENV{'request.course.id'};
+        $tuname=$env{'user.name'};
+        $tudom=$env{'user.domain'};
+        $tcrsid=$env{'request.course.id'};
     }
-
     return &Apache::lonnet::checkout($symb,$tuname,$tudom,$tcrsid);
 }
 
@@ -262,33 +294,27 @@ 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;
+        $tsymb=$symb;
     }
     unless ($tuname) {
-	$tuname=$name;
+        $tuname=$name;
         $tudom=$domain;
         $tcrsid=$courseid;
     }
 
-    my %reply=&Apache::lonnet::get('environment',
-              ['firstname','middlename','lastname','generation'],
-              $tudom,$tuname);
-    my $plainname=$reply{'firstname'}.' '. 
-                  $reply{'middlename'}.' '.
-                  $reply{'lastname'}.' '.
-		  $reply{'generation'};
+    my $plainname=&Apache::loncommon::plainname($tuname,$tudom);
 
     if ($target eq 'web') {
         my %idhash=&Apache::lonnet::idrget($tudom,($tuname));
-	return 
+        return
  '<img align="right" src="/cgi-bin/barcode.png?encode='.$token.'" />'.
                &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('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 {
@@ -296,18 +322,6 @@ sub printtokenheader {
     }
 }
 
-sub fontsettings() {
-    my $headerstring='';
-    if (($ENV{'browser.os'} eq 'mac') && (!$ENV{'browser.mathml'})) { 
-	$headerstring.=
-	    '<meta Content-Type="text/html; charset=x-mac-roman">';
-    } elsif (!$ENV{'browser.mathml'} && $ENV{'browser.unicode'}) {
-	$headerstring.=
-	    '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
-    }
-    return $headerstring;
-}
-
 sub printalltags {
   my $temp;
   foreach $temp (sort keys %Apache::lonxml::alltags) {
@@ -321,6 +335,7 @@ 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();
@@ -329,28 +344,31 @@ sub xmlparse {
 # 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);
-       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'});
+	 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));
-      }
+     if ($styletext ne '-1') {
+	 %style_for_target = (%style_for_target,
+			      &Apache::style::styleparser($target,$styletext));
+     }
  }
 #&printalltags();
  my @pars = ();
- my $pwd=$ENV{'request.filename'};
+ my $pwd=$env{'request.filename'};
  $pwd =~ s:/[^/]*$::;
  &newparser(\@pars,\$content_file_string,$pwd);
 
@@ -363,73 +381,89 @@ 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)=@_;
+ &clean_safespace($safeeval);
 
-    my $tree = HTML::TreeBuilder->new;
-    $tree->ignore_unknown(0);
-
-    $tree->parse($raw);
-
-    my $output= $tree->as_HTML(undef,' ');
-
-    $output=~s/\<(br|hr|img|meta|allow)(.*?)\>/\<$1$2 \/\>/gis;
-    $output=~s/\<\/(br|hr|img|meta|allow)\>//gis;
-    unless ($full) {
-       $output=~s/\<[\/]*(body|head|html)\>//gis;
-    }
-
-    $tree = $tree->delete;
-
-    return $output;
+ if (@script_var_displays) {
+     if ($finaloutput =~ m{</body>\s*</html>\s*$}s) {
+         my $scriptoutput = join('',@script_var_displays);
+         $finaloutput=~s{(</body>\s*</html>)\s*$}{$scriptoutput$1}s;
+     } else {
+         $finaloutput .= join('',@script_var_displays);
+     }
+     undef(@script_var_displays);
+ }
+ &init_state();
+ if ($env{'form.return_only_error_and_warning_counts'}) {
+     if ($env{'request.filename'}=~/\.(html|htm|xml)$/i) { 
+        my $error=&verify_html($content_file_string);
+        if ($error) { $errorcount++; }
+     }
+     return "$errorcount:$warningcount";
+ }
+ return $finaloutput;
 }
 
 sub latex_special_symbols {
     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') {
-	$string =~ s/(\\|_|\^)/ /g;
+	$string =~ s/\\/\$\\backslash\$/g; # \  -> $\backslash$ per LaTex line by line pg  10.
 	$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;
+	$string =~ s/_/\\_/g;              # _ -> \_
+	$string =~ s/\^/\\\^{}/g;          # ^ -> \^{} 
     } else {
 	$string=~s/\\/\\ensuremath{\\backslash}/g;
-	$string=~s/([^\\]|^)\%/$1\\\%/g;
-	$string=~s/([^\\]|^)(\$|_)/$1\\$2/g;
-	$string=~s/\$\$/\$\\\$/g;
-	$string=~s/\#\#/\#\\\#/g;
+	$string=~s/\\\%|\%/\\\%/g;
+	$string=~s/\\{|{/\\{/g;
+	$string=~s/\\}|}/\\}/g;
+	$string=~s/\\ensuremath\\{\\backslash\\}/\\ensuremath{\\backslash}/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/\\\&|\&/\\\&/g;
+	$string=~s/\\\#|\#/\\\#/g;
+        $string=~s/\|/\$\\mid\$/g;
 #single { or } How to escape?
     }
     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') ) {
@@ -482,11 +516,11 @@ 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) {
-		    &Apache::lonxml::warning('Using tag &lt;/'.$token->[1].'&gt; on line '.$token->[3].' as end tag to &lt;'.$$stack[-1].'&gt;');
+		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('Found tag &lt;/'.$token->[1].'&gt; on line '.$token->[3].' when looking for &lt;/'.$$stack[-1].'&gt; in file');
+                    &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);
 		}
 	    }
@@ -502,11 +536,11 @@ sub inner_xmlparse {
 	  if (!$Apache::lonxml::usestyle) {
 	      $extras=$Apache::lonxml::style_values;
 	  }
-	if ( $#$parstack > -1 ) {
-	  $result=&Apache::run::evaluate($result,$safeeval,$extras.$$parstack[-1]);
-	} else {
-	  $result= &Apache::run::evaluate($result,$safeeval,$extras);
-	}
+	  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;
 
@@ -517,10 +551,6 @@ sub inner_xmlparse {
 	  }
       }
 
-      # 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 {
@@ -543,13 +573,26 @@ 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);
+  }
+  if ($target eq 'modified') {
+# if modfied, handle startpart and endpart
+     $finaloutput=~s/\<startpartmarker[^\>]*\>(.*)\<endpartmarker[^\>]*\>/<part>$1<\/part>/gs;
   }	    
   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='';
@@ -568,7 +611,6 @@ 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,
@@ -582,6 +624,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)) {
@@ -600,17 +646,23 @@ 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]);
-	  } else {
-	    $currentstring = $token->[2];
+	      $currentstring.=&Apache::edit::handle_insertafter($token->[1]);
 	  }
-	}
       }
     }
     use strict 'refs';
@@ -618,20 +670,43 @@ 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::internal_error=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;
@@ -643,7 +718,7 @@ 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;
@@ -672,15 +747,44 @@ sub setup_globals {
 
 sub init_safespace {
   my ($target,$safeeval,$safehole,$safeinit) = @_;
+  $safeeval->reval('use LaTeX::Table;');
+  $safeeval->deny_only(':dangerous');
+  $safeeval->reval('use LONCAPA::LCMathComplex;');
+  $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::lonr::r_eval,$safeeval,'&r_eval');
+  $safehole->wrap(\&Apache::lonr::Rentry,$safeeval,'&Rentry');
+  $safehole->wrap(\&Apache::lonr::Rarray,$safeeval,'&Rarray');
+  $safehole->wrap(\&Apache::lonr::r_check,$safeeval,'&r_check');
+  $safehole->wrap(\&Apache::lonr::r_cas_formula_fix,$safeeval,
+                  '&r_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');
@@ -724,6 +828,36 @@ 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');
@@ -752,46 +886,74 @@ 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');
+  $safehole->wrap(\&Apache::functionplotresponse::fpr_val,$safeeval,'&fpr_val');
+  $safehole->wrap(\&Apache::functionplotresponse::fpr_f,$safeeval,'&fpr_f');
+  $safehole->wrap(\&Apache::functionplotresponse::fpr_dfdx,$safeeval,'&fpr_dfdx');
+  $safehole->wrap(\&Apache::functionplotresponse::fpr_d2fdx2,$safeeval,'&fpr_d2fdx2');
+  $safehole->wrap(\&Apache::functionplotresponse::fpr_vectorcoords,$safeeval,'&fpr_vectorcoords');
+  $safehole->wrap(\&Apache::functionplotresponse::fpr_objectcoords,$safeeval,'&fpr_objectcoords');
+  $safehole->wrap(\&Apache::functionplotresponse::fpr_vectorlength,$safeeval,'&fpr_vectorlength');
+  $safehole->wrap(\&Apache::functionplotresponse::fpr_vectorangle,$safeeval,'&fpr_vectorangle');
 
+#  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::lonxml::debug("Setting rndseed to $rndseed");
   &Apache::run::run($safeinit,$safeeval);
+  &initialize_rndseed($safeeval);
+}
 
-  my $subroutine=<<'EVALUATESUB';
-sub __LC_INTERNAL_EVALUATE__ {
-    my ($__LC__a,$__LC__b,$__LC__c)=@_;
-    my $__LC__prefix;
-    while(1){
-	{ 
-	    use strict;
-	    no strict "vars";
-	    if (eval(defined(eval($__LC__a.$__LC__b)))) {
-		return $__LC__prefix.eval($__LC__a.$__LC__b.$__LC__c);
-	    }
-	}
-	$__LC__prefix.=substr($__LC__a,0,1,"");
-	if ($__LC__a!~/^(\$|&|\#)/) { last; }
-    }
-    return $__LC__prefix.$__LC__a.$__LC__b.$__LC__c;
+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);
 }
-EVALUATESUB
-    $safeeval->permit("require");
-    $safeeval->reval($subroutine);
-    $safeeval->deny("require");
+
+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');
+    my $default=&Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonIncludes'}.
+                                         '/default_homework.lcpm');
     if ($default eq -1) {
 	&Apache::lonxml::error("<b>Unable to find <i>default_homework.lcpm</i></b>");
     } else {
@@ -800,18 +962,51 @@ 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++;
-  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 debugging information:".join ":",caller);
+	return '';
+    }
+    $Apache::lonxml::redirection--;
+    if (!$Apache::lonxml::redirection) {
+	$Apache::lonxml::metamode=$metamode_was;
+    }
+    pop @Apache::lonxml::outputstack;
+}
+sub in_redirection {
+    return ($Apache::lonxml::redirection > 0)
 }
 
 sub end_tag {
@@ -823,79 +1018,160 @@ sub end_tag {
 
 sub initdepth {
   @Apache::lonxml::depthcounter=();
-  $Apache::lonxml::depth=-1;
-  $Apache::lonxml::olddepth=-1;
+  undef($Apache::lonxml::last_depth_count);
 }
 
+
+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++;
-  $Apache::lonxml::depthcounter[$Apache::lonxml::depth]++;
-  if ($Apache::lonxml::depthcounter[$Apache::lonxml::depth]==1) {
-    $Apache::lonxml::olddepth=$Apache::lonxml::depth;
-  }
-  my $curdepth=join('_',@Apache::lonxml::depthcounter);
-  &Apache::lonxml::debug("s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n");
+  push(@Apache::lonxml::depthcounter,$Apache::lonxml::last_depth_count+1);
+  undef($Apache::lonxml::last_depth_count);
+  my $time;
+  if ($Apache::lonxml::debug eq "1") {
+      push(@timers,[&gettimeofday()]);
+      $time=&tv_interval($lasttime);
+      $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::depth<$Apache::lonxml::olddepth-1) {
-    $#Apache::lonxml::depthcounter--;
-    $Apache::lonxml::olddepth=$Apache::lonxml::depth+1;
+  if (  $#Apache::lonxml::depthcounter == -1) {
+      &Apache::lonxml::warning(&mt("Missing tags, unable to properly run file."));
   }
-  if (  $Apache::lonxml::depth < -1) {
-    &Apache::lonxml::warning(&mt("Missing tags, unable to properly run file."));
-    $Apache::lonxml::depth='-1';
-  }
-  my $curdepth=join('_',@Apache::lonxml::depthcounter);
-  &Apache::lonxml::debug("e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n");
+  $Apache::lonxml::last_depth_count = pop(@Apache::lonxml::depthcounter);
+
+  my ($timer,$time);
+  if ($Apache::lonxml::debug eq "1") {
+      $timer=pop(@timers);
+      $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 [_1] 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 $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')) {
+	    if ($token->[0] eq 'T' && $token->[2]) {
+		$result.='<![CDATA['.$token->[1].']]>';
+	    } else {
+		$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
+
 }
 
+#########################################################################
+#                                                                       #
+#           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, $part_response);
+
+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 {
-    my ($increment) = @_;
-    if (defined($increment) && $increment gt 0) {
-	$Apache::lonxml::counter+=$increment;
-    } else {
-	$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'})) {
-	$Apache::lonxml::counter=$ENV{'form.counter'};
+    if ($env{'request.state'} eq 'construct') {
+	$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;
@@ -904,10 +1180,104 @@ sub init_counter {
 }
 
 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,$style)= @_;
     my $gotfullstack=1;
@@ -929,16 +1299,20 @@ sub get_all_text {
 	    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];
+		    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] =~ /^$tag$/i) { $depth++; }
-		    if ($token->[1] =~ /^LONCAPA_INTERNAL_TURN_STYLE_ON$/i) { $Apache::lonxml::usestyle=1; }
-		    if ($token->[1] =~ /^LONCAPA_INTERNAL_TURN_STYLE_OFF$/i) { $Apache::lonxml::usestyle=0; }
+		    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] =~ /^$tag$/i) { $depth--; }
+		    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=
@@ -967,7 +1341,7 @@ sub get_all_text {
 	    #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).
+		   &HTML::Entities::encode($result,'<>&"').
 		   '</pre>');
 	    if ($gotfullstack) {
 		my $newstring='</'.$tag.'>'.$result;
@@ -981,17 +1355,21 @@ sub get_all_text {
 		#&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];
+		    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] =~ /^$tag$/i) {
+		    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$/i) { $Apache::lonxml::usestyle=1; }
-		    if ($token->[1] =~ /^LONCAPA_INTERNAL_TURN_STYLE_OFF$/i) { $Apache::lonxml::usestyle=0; }
+		    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];
 		}
@@ -1009,7 +1387,8 @@ sub get_all_text {
 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 {
@@ -1018,34 +1397,48 @@ sub newparser {
 }
 
 sub parstring {
-  my ($token) = @_;
-  my $temp='';
-  foreach (@{$token->[3]}) {
-    unless ($_=~/\W/) {
-      my $val=$token->[2]->{$_};
-      $val =~ s/([\%\@\\\"\'])/\\$1/g;
-      #if ($val =~ m/^[\%\@]/) { $val="\\".$val; }
-      $temp .= "my \$$_=\"$val\";";
+    my ($token) = @_;
+    my (@vars,@values);
+    foreach my $attr (@{$token->[3]}) {
+	if ($attr!~/\W/) {
+	    my $val=$token->[2]->{$attr};
+	    $val =~ s/([\%\@\\\"\'])/\\$1/g;
+	    $val =~ s/(\$[^\{a-zA-Z_])/\\$1/g;
+	    $val =~ s/(\$)$/\\$1/;
+	    #if ($val =~ m/^[\%\@]/) { $val="\\".$val; }
+	    push(@vars,"\$$attr");
+	    push(@values,"\"$val\"");
+	}
+    }
+    my $var_init = 
+	(@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);
     }
-  }
-  return $temp;
+    push(@Apache::lonxml::extlinks,$res)	 
 }
 
 sub writeallows {
     unless ($#extlinks>=0) { return; }
-    my $thisurl='/res/'.&Apache::lonnet::declutter(shift);
-    if ($ENV{'httpref.'.$thisurl}) {
-	$thisurl=$ENV{'httpref.'.$thisurl};
+    my $thisurl = &Apache::lonnet::clutter(shift);
+    if ($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 {
@@ -1061,6 +1454,14 @@ sub do_registered_ssi {
 	&Apache::lonnet::ssi($url,%form);
     }
 }
+
+sub add_script_result {
+    my ($display) = @_;
+    if ($display ne '') {
+        push(@script_var_displays, $display);
+    }
+}
+
 #
 # Afterburner handles anchors, highlights and links
 #
@@ -1068,27 +1469,27 @@ sub afterburn {
     my $result=shift;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 					    ['highlight','anchor','link']);
-    if ($ENV{'form.highlight'}) {
-       foreach (split(/\,/,$ENV{'form.highlight'})) {
+    if ($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'}) {
-       foreach (split(/\,/,$ENV{'form.link'})) {
+    if ($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'}) {
-        my $anchorname=$ENV{'form.anchor'};
+    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';
@@ -1106,27 +1507,25 @@ sub storefile {
         $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 of Document Goes Here
-</title>
+<title>$title</title>
 </head>
 <body bgcolor="#FFFFFF">
-
-                           Body of Document Goes Here
-
+$body
 </body>
 </html>
 SIMPLECONTENT
-  return $filecontents;
+    return $filecontents;
 }
 
 sub createnewsty {
@@ -1141,66 +1540,216 @@ SIMPLECONTENT
   return $filecontents;
 }
 
+sub createnewjs {
+    my $filecontents=(<<SIMPLECONTENT);
+<script type="text/javascript" language="Javascript">
+
+</script>
+SIMPLECONTENT
+    return $filecontents;
+}
+
+sub verify_html {
+    my ($filecontents)=@_;
+    my ($is_html,$is_xml);
+    if ($filecontents =~/(?:\<|\&lt\;)\?xml[^\<]*\?(?:\>|\&gt\;)/is) {
+        $is_xml = 1;
+    } elsif ($filecontents =~/(?:\<|\&lt\;)html(?:\s+[^\<]+|\s*)(?:\>|\&gt\;)/is) {
+        $is_html = 1;
+    }
+    unless ($is_xml || $is_html) {
+        return &mt('File does not have [_1] or [_2] starting tag','&lt;html&gt;','&lt;?xml ?&gt;');
+    }
+    if ($is_html) {
+        if ($filecontents!~/(?:\<|\&lt\;)\/html(?:\>|\&gt\;)/is) {
+            return &mt('File does not have [_1] ending tag','&lt;html&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($_);
+        }
+    }
+    my $output;
+    unless ($env{'form.forceedit'}) {
+       $output .=
+           '<span class="LC_nobreak">'.
+           &mt('Language:').' '.
+           &Apache::loncommon::select_form(
+               $env{'form.languages'},
+               'languages',
+               {&Apache::lonlocal::texthash(%langchoices)}).
+           '</span>';
+    }
+    $output .=
+     ' <span class="LC_nobreak">'.
+       &mt('Math Rendering:').' '.
+       &Apache::loncommon::select_form(
+           $env{'form.texengine'},
+           'texengine',
+           {&Apache::lonlocal::texthash
+               (''        => '',
+                'tth'     => 'tth (TeX to HTML)',
+                'MathJax' => 'MathJax',
+  		'jsMath'  => 'jsMath',
+                'mimetex' => 'mimetex (Convert to Images)')}).
+     '</span>';
+    return $output;
+}
 
 sub inserteditinfo {
-      my ($result,$filecontents,$filetype)=@_;
-      $filecontents = &HTML::Entities::encode($filecontents);
-#      my $editheader='<a href="#editsection">Edit below</a><hr />';
+      my ($filecontents,$filetype,$filename,$symb,$itemtitle,$folderpath,$uri,$action) = @_;
+      $filecontents = &HTML::Entities::encode($filecontents,'<>&"');
       my $xml_help = '';
+      my $initialize='';
+      my $textarea_id = 'filecont';
+      my ($dragmath_button,$deps_button);
+      my ($add_to_onload, $add_to_onresize);
+      $initialize=&Apache::lonhtmlcommon::spellheader();
+      if (($filetype eq 'html') && (&Apache::lonhtmlcommon::htmlareabrowser())) {
+	  my $lang = &Apache::lonhtmlcommon::htmlarea_lang();
+          my %textarea_args = (
+                                fullpage => 'true',
+                                dragmath => 'math',
+                              );
+          $initialize .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args); 
+      }
+      $initialize .= (<<FULLPAGE);
+<script type="text/javascript">
+// <![CDATA[
+    function initDocument() {
+	resize_textarea('$textarea_id','LC_aftertextarea');
+    }
+// ]]>
+</script>
+FULLPAGE
+      my $textareaclass;
       if ($filetype eq 'html') {
-	  $xml_help=Apache::loncommon::helpLatexCheatsheet();
+          my $context;
+          if ($env{'request.course.id'}) {
+              my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+              my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+              if ($uri =~ m{^\Q/uploaded/$cdom/$cnum/portfolio/syllabus/\E}) {
+                  $context = 'syllabus';
+                  $deps_button = &Apache::lonhtmlcommon::dependencies_button()."\n";
+                  $initialize .=
+                      &Apache::lonhtmlcommon::dependencycheck_js(undef,&mt('Syllabus'),
+                                                                 $uri,undef,
+                                                                 "/public/$cdom/$cnum/syllabus").
+                      "\n";
+                  if (&Apache::lonhtmlcommon::htmlareabrowser()) {
+                      $textareaclass = 'class="LC_richDefaultOn"';
+                  }
+              }
+          }
+          unless ($context eq 'syllabus') {
+              if ($symb || $folderpath) {
+                  $deps_button = &Apache::lonhtmlcommon::dependencies_button()."\n";
+                  $initialize .=
+                      &Apache::lonhtmlcommon::dependencycheck_js($symb,$itemtitle,
+                                                                 undef,$folderpath,$uri)."\n";
+              }
+          }
+          $dragmath_button = '<span id="math_filecont">'.&Apache::lonhtmlcommon::dragmath_button('filecont',1).'</span>';
+          $initialize .= "\n".&Apache::lonhtmlcommon::dragmath_js('EditMathPopup');
       }
-      my $cleanbut = '';
+      $add_to_onload = 'initDocument();';
+      $add_to_onresize = "resize_textarea('$textarea_id','LC_aftertextarea');";
+
       if ($filetype eq 'html') {
-	  $cleanbut='<input type="submit" name="attemptclean" value="'.
-	      &mt('Save and then attempt to clean HTML').'" />';
+          my $not_author;
+          if ($uri =~ m{^/uploaded/}) {
+              $not_author = 1;
+          }
+	  $xml_help=&Apache::loncommon::helpLatexCheatsheet(undef,undef,$not_author);
       }
+
       my $titledisplay=&display_title();
-      my %lt=&Apache::lonlocal::texthash('st' => 'Save this',
-					 'vi' => 'View',
+      my %lt=&Apache::lonlocal::texthash('st' => 'Save and Edit',
+					 'vi' => 'Save and View',
+					 'dv' => 'Discard Edits and View',
+					 'un' => 'undo',
 					 'ed' => 'Edit');
-      my $buttons=(<<BUTTONS);
-$cleanbut
-<input type="submit" name="savethisfile" accesskey="s"  value="$lt{'st'}" />
-<input type="submit" name="viewmode" accesskey="v" value="$lt{'vi'}" />
-BUTTONS
+      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;
+      if ($filetype eq 'html') {
+          $htmlerror=&verify_html($filecontents);
+          if ($htmlerror) {
+              $htmlerror='<span class="LC_error">'.$htmlerror.'</span>';
+          }
+          if (&Apache::lonhtmlcommon::htmlareabrowser()) {
+              unless ($textareaclass) {
+                  $textareaclass = 'class="LC_richDefaultOff"';
+              }
+          }
+      }
+      my $undo;
+      unless ($uri =~ m{^/uploaded/}) {
+          $undo = '<input type="submit" name="Undo" accesskey="u" value="'.$lt{'un'}.'" />'."\n";
+      }
       my $editfooter=(<<ENDFOOTER);
-<hr />
+$initialize
 <a name="editsection" />
-<form method="post">
-$xml_help
-<input type="hidden" name="editmode" value="$lt{'ed'}" />
-$buttons<br />
-<textarea cols="80" rows="40" name="filecont">$filecontents</textarea>
-<br />$buttons
-<br />
+<form $form_events method="post" name="xmledit" action="$action">
+  <div class="LC_edit_problem_editxml_header">
+    <table class="LC_edit_problem_header_title"><tr><td>
+        $filename
+      </td><td align="right">
+        $xml_help
+      </td></tr>
+    </table>
+    <div class="LC_edit_problem_discards">
+      <input type="submit" name="discardview" accesskey="d" value="$lt{'dv'}" />
+      $undo $htmlerror $deps_button $dragmath_button
+    </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" $textareaclass>$filecontents</textarea><br />$spelllink
+  <div id="LC_aftertextarea">
+    <br />
+    $titledisplay
+  </div>
 </form>
-$titledisplay
 ENDFOOTER
-#      $result=~s/(\<body[^\>]*\>)/$1$editheader/is;
-      $result=~s/(\<\/body\>)/$editfooter/is;
-      return $result;
+      return ($editfooter,$add_to_onload,$add_to_onresize);;
 }
 
 sub get_target {
-  my $viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
-  if ( $ENV{'request.state'} eq 'published') {
-    if ( defined($ENV{'form.grade_target'})
+  my $viewgrades=&Apache::lonnet::allowed('vgr',$env{'request.course.id'});
+  if ( $env{'request.state'} eq 'published') {
+    if ( defined($env{'form.grade_target'})
 	 && ($viewgrades == 'F' )) {
-      return ($ENV{'form.grade_target'});
-    } elsif (defined($ENV{'form.grade_target'})) {
-      if (($ENV{'form.grade_target'} eq 'web') ||
-	  ($ENV{'form.grade_target'} eq 'tex') ) {
-	return $ENV{'form.grade_target'}
+      return ($env{'form.grade_target'});
+    } elsif (defined($env{'form.grade_target'})) {
+      if (($env{'form.grade_target'} eq 'web') ||
+	  ($env{'form.grade_target'} eq 'tex') ) {
+	return $env{'form.grade_target'}
       } else {
 	return 'web';
       }
     } else {
       return 'web';
     }
-  } elsif ($ENV{'request.state'} eq 'construct') {
-    if ( defined($ENV{'form.grade_target'})) {
-      return ($ENV{'form.grade_target'});
+  } elsif ($env{'request.state'} eq 'construct') {
+    if ( defined($env{'form.grade_target'})) {
+      return ($env{'form.grade_target'});
     } else {
       return 'web';
     }
@@ -1211,100 +1760,246 @@ sub get_target {
 
 sub handler {
     my $request=shift;
-    
+
     my $target=&get_target();
+    $Apache::lonxml::debug=$env{'user.debug'};
     
-    $Apache::lonxml::debug=$ENV{'user.debug'};
-    
-    if ($ENV{'browser.mathml'}) {
-	&Apache::loncommon::content_type($request,'text/xml');
-    } else {
-	&Apache::loncommon::content_type($request,'text/html');
-    }
+    &Apache::loncommon::content_type($request,'text/html');
     &Apache::loncommon::no_cache($request);
+    if ($env{'request.state'} eq 'published') {
+	$request->set_last_modified(&Apache::lonnet::metadata($request->uri,
+							      'lastrevisiondate'));
+    }
+    # Embedded Flash movies from Camtasia served from https will not display in IE
+    #   if XML config file has expired from cache.    
+    if ($ENV{'SERVER_PORT'} == 443) {
+        if ($request->uri =~ /\.xml$/) {
+            my ($httpbrowser,$clientbrowser) =
+                &Apache::loncommon::decode_user_agent($request);
+            if ($clientbrowser =~ /^explorer$/i) {
+                delete $request->headers_out->{'Cache-control'};
+                delete $request->headers_out->{'Pragma'};
+                my $expiration = time + 60;
+                my $date=strftime("%a, %d %b %Y %H:%M:%S GMT",gmtime($expiration));
+                $request->headers_out->set("Expires" => $date);
+            }
+        }
+    }
     $request->send_http_header;
     
     return OK if $request->header_only;
 
 
     my $file=&Apache::lonnet::filelocation("",$request->uri);
-    my $filetype;
-    if ($file =~ /\.sty$/) {
-	$filetype='sty';
+    my ($filetype,$breadcrumbtext);
+    if ($file =~ /\.(sty|css|js|txt|tex)$/) {
+	$filetype=$1;
     } else {
 	$filetype='html';
     }
+    unless ($env{'request.uri'}) {
+        $env{'request.uri'}=$request->uri;
+        &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                                ['todocs']);
+    }
+    my ($cdom,$cnum);
+    if ($env{'request.course.id'}) {
+        $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        if ($filetype eq 'html') {
+            if ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/portfolio/syllabus/\E.+$}) {
+                if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+                    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                                            ['editmode']);
+                }
+            }
+        }
+    }
+    if ($filetype eq 'sty') {
+        $breadcrumbtext = 'Style File Editor';
+    } elsif ($filetype eq 'js') {
+        $breadcrumbtext = 'Javascript Editor';
+    } elsif ($filetype eq 'css') {
+        $breadcrumbtext = 'CSS Editor';
+    } elsif ($filetype eq 'txt') {
+        $breadcrumbtext = 'Text Editor';
+    } elsif ($filetype eq 'tex') {
+        $breadcrumbtext = 'TeX Editor';
+    } else {
+        $breadcrumbtext = 'HTML Editor';
+    }
+
 #
 # Edit action? Save file.
 #
-    unless ($ENV{'request.state'} eq 'published') {
-	if (($ENV{'form.savethisfile'}) || ($ENV{'form.attemptclean'})) {
-	    if (&storefile($file,$ENV{'form.filecont'})) {
-		&Apache::lonxml::info("<font COLOR=\"#0000FF\">".
-				      &mt('Updated').": ".
-				      &Apache::lonlocal::locallocaltime(time).
-				      " </font>");
-	    } 
+    if (!($env{'request.state'} eq 'published')) {
+	if ($env{'form.savethisfile'} || $env{'form.viewmode'} || $env{'form.Undo'}) {
+	    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'}) {
+                $env{'form.editmode'}='Edit'; #force edit mode
+            }
 	}
     }
     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');
+	my $start_page=&Apache::loncommon::start_page('File Error');
+	my $end_page=&Apache::loncommon::end_page();
+        my $errormsg='<p class="LC_error">'
+                    .&mt('File not found: [_1]'
+                        ,'<span class="LC_filename">'.$file.'</span>')
+                    .'</p>';
 	$result=(<<ENDNOTFOUND);
-<html>
-<head>
-<title>$fnf</title>
-</head>
-$bodytag
-<b>$fnf: $file</b>
-</body>
-</html>
+$start_page
+$errormsg
+$end_page
 ENDNOTFOUND
-    $filecontents='';
-	if ($ENV{'request.state'} ne 'published') {
+        $filecontents='';
+	if ($env{'request.state'} ne 'published') {
 	    if ($filetype eq 'sty') {
 		$filecontents=&createnewsty();
-	    } else {
+            } elsif ($filetype eq 'js') {
+                $filecontents=&createnewjs();
+            } elsif ($filetype ne 'css' && $filetype ne 'txt' && $filetype ne 'tex') {
 		$filecontents=&createnewhtml();
 	    }
-	    $ENV{'form.editmode'}='Edit'; #force edit mode
+	    $env{'form.editmode'}='Edit'; #force edit mode
 	}
     } else {
-	unless ($ENV{'request.state'} eq 'published') {
-	    if ($ENV{'form.attemptclean'}) {
-		$filecontents=&htmlclean($filecontents,1);
+	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'}) {
-	    $result = &Apache::lonxml::xmlparse($request,$target,$filecontents,
-						'',%mystyle);
+            &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+						    ['editmode']);
 	}
+	if (!$env{'form.editmode'} || $env{'form.viewmode'} || $env{'form.discardview'}) {
+            if ($filetype eq 'html' || $filetype eq 'sty') {
+	        &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();
+            } elsif ($filetype eq 'tex') {
+                $result = &Apache::lontexconvert::converted(\$filecontents,
+                              $env{'form.texengine'});
+                if ($env{'form.return_only_error_and_warning_counts'}) {
+                    $result = "$errorcount:$warningcount";
+                }
+            } else {
+                $result = $filecontents;
+            }
+	    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+						    ['rawmode']);
+	    if ($env{'form.rawmode'}) { $result = $filecontents; }
+            if (($filetype ne 'html') && 
+                (!$env{'form.return_only_error_and_warning_counts'})) {
+                my $nochgview = 1;
+                my $controls = '';
+                    if ($env{'request.state'} eq 'construct') {
+                        $controls = &Apache::loncommon::head_subbox(
+                                        &Apache::loncommon::CSTR_pageheader()
+                                       .&Apache::londefdef::edit_controls($nochgview));
+                    }
+                if ($filetype ne 'sty' && $filetype ne 'tex') {
+                    $result =~ s/</&lt;/g;
+                    $result =~ s/>/&gt;/g;
+                    $result = '<table class="LC_sty_begin">'.
+                              '<tr><td><b><pre>'.$result.
+                              '</pre></b></td></tr></table>';
+                }
+                my $brcrum;
+                if ($env{'request.state'} eq 'construct') {
+                    $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
+                                'text' => 'Authoring Space'},
+                               {'href' => '',
+                                'text' => $breadcrumbtext}];
+                } else {
+                    $brcrum = ''; # FIXME: Where are we?
+                }
+                my %options = ('bread_crumbs' => $brcrum,
+                               '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') {
-	if ($ENV{'form.editmode'} && (!($ENV{'form.viewmode'}))) {
-	    my $displayfile=$request->uri;
-	    $displayfile=~s/^\/[^\/]*//;
-	    $result='<html><body bgcolor="#FFFFFF">'.
-		&Apache::lonxml::message_location().'<h3>'.
-		$displayfile.
-		'</h3></body></html>';
-	    $result=&inserteditinfo($result,$filecontents,$filetype);
-	}
+    unless ($env{'request.state'} eq 'published') {
+	if ($env{'form.editmode'} && (!($env{'form.viewmode'})) && (!($env{'form.discardview'})))
+	{
+            my ($displayfile,$url,$symb,$itemtitle,$action);
+	    $displayfile=$request->uri;
+            if ($request->uri =~ m{^/uploaded/}) {
+                if ($env{'request.course.id'}) {
+                    if ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/supplemental/\E}) {
+                        &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                                                ['folderpath','title']);
+                    } elsif ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/portfolio/syllabus/\E(.+)$}) {
+                        my $filename = $1;
+                        if ($1 eq 'loncapa.html') {
+                            $displayfile = &mt('Syllabus (minimal template)');
+                            $action = $request->uri.'?forceedit=1';
+                        } else {
+                            $displayfile = &mt('Syllabus file: [_1]',$1);
+                        }
+                        $itemtitle = &mt('Syllabus');
+                    }
+                }
+                unless ($itemtitle) {
+                    ($symb,$itemtitle,$displayfile) = 
+                        &get_courseupload_hierarchy($request->uri,
+                                                    $env{'form.folderpath'},
+                                                    $env{'form.title'});
+                }
+            } else {
+	        $displayfile=~s/^\/[^\/]*//;
+            }
+
+	    my ($edit_info, $add_to_onload, $add_to_onresize)=
+		&inserteditinfo($filecontents,$filetype,$displayfile,$symb,
+                                $itemtitle,$env{'form.folderpath'},$request->uri,$action);
+
+	    my %options = 
+		('add_entries' =>
+                   {'onresize'     => $add_to_onresize,
+                    'onload'       => $add_to_onload,   });
+            my $header;
+            if ($env{'request.state'} eq 'construct') {
+                $options{'bread_crumbs'} = [{
+                            'href' => &Apache::loncommon::authorspace($request->uri),
+                            'text' => 'Authoring Space'},
+                           {'href' => '',
+                            'text' => $breadcrumbtext}];
+                $header = &Apache::loncommon::head_subbox(
+                              &Apache::loncommon::CSTR_pageheader());
+            }
+	    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
+                     .$header
+                     .&Apache::lonxml::message_location()
+                     .$edit_info
+                     .&Apache::loncommon::end_page();
+        }
     }
-    if ($filetype eq 'html') { writeallows($request->uri); }
-	
-    
+    if ($filetype eq 'html') { &writeallows($request->uri); }
+
     &Apache::lonxml::add_messages(\$result);
     $request->print($result);
     
@@ -1313,72 +2008,182 @@ ENDNOTFOUND
 
 sub display_title {
     my $result;
-    if ($ENV{'request.state'} eq 'construct') {
+    if ($env{'request.state'} eq 'construct') {
 	my $title=&Apache::lonnet::gettitle();
 	if (!defined($title) || $title eq '') {
-	    $title = $ENV{'request.filename'};
+	    $title = $env{'request.filename'};
 	    $title = substr($title, rindex($title, '/') + 1);
 	}
-	$result = "<script type='text/javascript'>top.document.title = '$title - LON-CAPA Construction Space';</script>";
+        $result = "<script type='text/javascript'>top.document.title = '$title - LON-CAPA "
+                  .&mt('Authoring Space')."';</script>";
     }
     return $result;
 }
 
+sub get_courseupload_hierarchy {
+    my ($url,$folderpath,$title) = @_;
+    my ($symb,$itemtitle,$displaypath);
+    if ($env{'request.course.id'}) {
+        if ($folderpath =~ /^supplemental/) {
+            my @folders = split(/\&/,$folderpath);
+            my @pathitems;
+            while (@folders) {
+                my $folder=shift(@folders);
+                my $foldername=shift(@folders);
+                $foldername =~ s/\:(\d*)\:(\w*)\:(\w*):(\d*)\:?(\d*)$//;
+                push(@pathitems,&unescape($foldername));
+            }
+            if ($title) {
+                push(@pathitems,&unescape($title));
+            }
+            $displaypath = join(' &raquo; ',@pathitems);
+        } else {
+            $symb = &Apache::lonnet::symbread($url);
+            my ($map,$id,$res)=&Apache::lonnet::decode_symb($symb);
+            my $navmap=Apache::lonnavmaps::navmap->new;
+            if (ref($navmap)) {
+                my $res = $navmap->getBySymb($symb);
+                if (ref($res)) {
+                    my @pathitems =
+                        &Apache::loncommon::get_folder_hierarchy($navmap,$map,1);
+                    $itemtitle = $res->compTitle();
+                    push(@pathitems,$itemtitle);
+                    $displaypath = join(' &raquo; ',@pathitems);
+                }
+            }
+        }
+    }
+    return ($symb,$itemtitle,$displaypath);
+}
+
 sub debug {
     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");
+	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 
+         $Apache::lonnet::perlvar{'lonDocRoot'}.'/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 $request=$Apache::lonxml::request;
-  if (!$request) { $request=Apache->request; }
-  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 {
-      push(@Apache::lonxml::error_messages,
-	   "<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 />',@_));
-      }
+    my @errors = @_;
+
+    $errorcount++;
+
+    $Apache::lonxml::internal_error=1;
+
+    if (defined($Apache::inputtags::part)) {
+	if ( @Apache::inputtags::response ) {
+	    push(@errors,
+		 &mt("This error occurred while processing response [_1] in part [_2]",
+		     $Apache::inputtags::response[-1],
+		     $Apache::inputtags::part));
+	} else {
+	    push(@errors,
+		 &mt("This error occurred while processing part [_1]",
+		     $Apache::inputtags::part));
+	}
+    }
+
+    if ( &show_error_warn_msg() ) {
+	# If printing in construction space, put the error inside <pre></pre>
+	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,"<span class=\"LC_warning\">$errormsg</span><br />");
     }
-  }
 }
 
 sub warning {
     $warningcount++;
   
-    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; }
+    if ($env{'form.grade_target'} ne 'tex') {
+	if ( &show_error_warn_msg() ) {
 	    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
+                .'<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') {
+    if ($env{'form.grade_target'} ne 'tex' 
+	&& $env{'request.state'} eq 'construct') {
 	push(@Apache::lonxml::info_messages,join('<br />',@_)."<br />\n");
     }
 }
@@ -1401,23 +2206,28 @@ sub add_messages {
 }
 
 sub get_param {
-    my ($param,$parstack,$safeeval,$context,$case_insensitive) = @_;
+    my ($param,$parstack,$safeeval,$context,$case_insensitive, $noelide) = @_;
     if ( ! $context ) { $context = -1; }
     my $args ='';
     if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; }
     if ( ! $Apache::lonxml::usestyle ) {
 	$args=$Apache::lonxml::style_values.$args;
     }
+
+    if ($noelide) {
+        $args =~ s/'\$/'\\\$/g;
+    }
+
     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 {
@@ -1436,13 +2246,13 @@ sub get_param_var {
   }
   &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])) {
@@ -1455,109 +2265,247 @@ sub get_param_var {
   }
 }
 
-sub register_insert {
-  my @data = split /\n/, &Apache::lonnet::getfile('/home/httpd/lonTabs/insertlist.tab');
-  my $i;
-  my $tagnum=0;
-  my @order;
-  for ($i=0;$i < $#data; $i++) {
-    my $line = $data[$i];
-    if ( $line =~ /^\#/ || $line =~ /^\s*\n/) { next; }
-    if ( $line =~ /TABLE/ ) { last; }
-    my ($tag,$descrip,$color,$function,$show,$helpfile,$helpdesc) = split(/,/, $line);
-    if ($tag) {
-      $insertlist{"$tagnum.tag"} = $tag;
-      $insertlist{"$tagnum.description"} = $descrip;
-      $insertlist{"$tagnum.color"} = $color;
-      $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++;
+sub register_insert_xml {
+    my $parser = HTML::LCParser->new($Apache::lonnet::perlvar{'lonTabDir'}
+				     .'/insertlist.xml');
+    my ($tagnum,$in_help)=(0,0);
+    my @alltags;
+    my $tag;
+    while (my $token = $parser->get_token()) {
+	if ($token->[0] eq 'S') {
+	    my $key;
+	    if ($token->[1] eq 'tag') {
+		$tag = $token->[2]{'name'};
+                if (defined($tag)) {
+		    $insertlist{$tagnum.'.tag'} = $tag;
+		    $insertlist{$tag.'.num'}   = $tagnum;
+		    push(@alltags,$tag);
+                }
+	    } elsif ($in_help && $token->[1] eq 'file') {
+		$key = $tag.'.helpfile';
+	    } elsif ($in_help && $token->[1] eq 'description') {
+		$key = $tag.'.helpdesc';
+	    } 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
-  $tagnum = 0;
-  for (;$i < $#data;$i++) {
-    my $line = $data[$i];
-    my ($mnemonic,@which) = split(/ +/,$line);
-    my $tag = $insertlist{"$tagnum.tag"};
-    for (my $j=0;$j <=$#which;$j++) {
-      if ( $which[$j] eq 'Y' ) {
-	if ($insertlist{"$j.show"} ne 'no') {
-	  push(@{ $insertlist{"$tag.which"} },$j);
+    
+    # parse the allows and ignore tags set to <show>no</show>
+    foreach my $tag (@alltags) {	
+        next if (!exists($insertlist{$tag.'.allow'}));
+	my $allow =  $insertlist{$tag.'.allow'};
+       	foreach my $element (split(',',$allow)) {
+	    $element =~ s/(^\s*|\s*$ )//gx;
+	    if (!exists($insertlist{$element.'.show'})
+                || $insertlist{$element.'.show'} ne 'no') {
+		push(@{ $insertlist{$tag.'.which'} },$element);
+	    }
 	}
-      }
     }
-    $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 $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.'.description'};
+    my ($token)=@_;
+    my $tag = &get_tag($token);
+    return $insertlist{$tag.'.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'});
+    my ($token)=@_;
+    my $tag = &get_tag($token);
+    return ($insertlist{$tag.'.helpfile'}, &mt($insertlist{$tag.'.helpdesc'}));
 }
 
-# ----------------------------------------------------------------- whichuser
-# returns a list of $symb, $courseid, $domain, $name that is correct for
-# calls to lonnet functions for this setup.
-# - looks for form.grade_ parameters
-sub whichuser {
-  my ($passedsymb)=@_;
-  my ($symb,$courseid,$domain,$name,$publicuser);
-  if (defined($ENV{'form.grade_symb'})) {
-    my $tmp_courseid=$ENV{'form.grade_courseid'};
-    my $allowed=&Apache::lonnet::allowed('vgr',$tmp_courseid);
-    if ($allowed) {
-      $symb=$ENV{'form.grade_symb'};
-      $courseid=$ENV{'form.grade_courseid'};
-      $domain=$ENV{'form.grade_domain'};
-      $name=$ENV{'form.grade_username'};
+sub get_tag {
+    my ($token)=@_;
+    my $tagnum;
+    my $tag=$token->[1];
+    foreach my $namespace (reverse(@Apache::lonxml::namespace)) {
+	my $testtag = $namespace.'::'.$tag;
+	$tagnum = $insertlist{"$testtag.num"};
+	last if (defined($tagnum));
     }
-  } else {
-      if (!$passedsymb) {
-          $symb=&Apache::lonnet::symbread();
-      } else {
-          $symb=$passedsymb;
-      }
-      $courseid=$ENV{'request.course.id'};
-      $domain=$ENV{'user.domain'};
-      $name=$ENV{'user.name'};
-      if ($name eq 'public' && $domain eq 'public') {
-	  if (!defined($ENV{'form.username'})) {
-	      $ENV{'form.username'}.=time.rand(10000000);
-	  }
-	  $name.=$ENV{'form.username'};
-      }
-  }
-  return ($symb,$courseid,$domain,$name,$publicuser);
+    if (!defined($tagnum)) {
+	$tagnum = $Apache::lonxml::insertlist{"$tag.num"};
+    }
+    return $insertlist{"$tagnum.tag"};
+}
+
+############################################################
+#                                           PDF-FORM-METHODS
+
+=pod
+
+=item &print_pdf_radiobutton(fieldname, value)
+
+Returns a latexline to generate a PDF-Form-Radiobutton.
+Note: Radiobuttons with equal names are automaticly grouped 
+      in a selection-group.
+
+$fieldname: PDF internalname of the radiobutton(group)
+$value:     Value of radiobutton
+
+=cut
+sub print_pdf_radiobutton {
+    my ($fieldname, $value) = @_;
+    return '\radioButton[\symbolchoice{circle}]{'
+           .$fieldname.'}{10bp}{10bp}{'.$value.'}';
+}
+
+
+=pod
+
+=item &print_pdf_start_combobox(fieldname)
+
+Starts a latexline to generate a PDF-Form-Combobox with text.
+
+$fieldname: PDF internal name of the Combobox
+
+=cut
+sub print_pdf_start_combobox {
+    my $result;
+    my ($fieldName) = @_;
+    $result .= '\begin{tabularx}{\textwidth}{p{2.5cm}X}'."\n";
+    $result .= '\comboBox[]{'.$fieldName.'}{2.3cm}{14bp}{'; # 
+
+    return $result;
+}
+
+
+=pod
+
+=item &print_pdf_add_combobox_option(options)
+
+Generates a latexline to add Options to a PDF-Form-ComboBox.
+
+$option: PDF internal name of the Combobox-Option
+
+=cut
+sub print_pdf_add_combobox_option {
+
+    my $result;
+    my ($option) = @_;  
+
+    $result .= '('.$option.')';
+    
+    return $result;
+}
+
+
+=pod
+
+=item &print_pdf_end_combobox(text) {
+
+Returns latexcode to end a PDF-Form-Combobox with text.
+
+=cut
+sub print_pdf_end_combobox {
+    my $result;
+    my ($text) = @_;
+
+    $result .= '}&'.$text."\\\\\n";
+    $result .= '\end{tabularx}' . "\n";
+    $result .= '\hspace{2mm}' . "\n";
+    return $result;
+}
+
+
+=pod
+
+=item &print_pdf_hiddenField(fieldname, user, domain)
+
+Returns a latexline to generate a PDF-Form-hiddenField with userdata.
+
+$fieldname label for hiddentextfield
+$user:    name of user
+$domain:  domain of user
+
+=cut
+sub print_pdf_hiddenfield {
+    my $result;
+    my ($fieldname, $user, $domain) = @_;
+
+    $result .= '\textField [\F{\FHidden}\F{-\FPrint}\V{'.$domain.'&'.$user.'}]{'.$fieldname.'}{0in}{0in}'."\n";
+
+    return $result;
 }
 
 1;
 __END__
 
-