--- loncom/xml/lonxml.pm	2001/08/23 22:12:24	1.126
+++ loncom/xml/lonxml.pm	2003/02/12 22:04:34	1.230
@@ -1,56 +1,115 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
+# $Id: lonxml.pm,v 1.230 2003/02/12 22:04:34 albertel Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
+# Copyright for TtHfunc and TtMfunc by Ian Hutchinson. 
+# TtHfunc and TtMfunc (the "Code") may be compiled and linked into 
+# binary executable programs or libraries distributed by the 
+# Michigan State University (the "Licensee"), but any binaries so 
+# distributed are hereby licensed only for use in the context
+# of a program or computational system for which the Licensee is the 
+# primary author or distributor, and which performs substantial 
+# additional tasks beyond the translation of (La)TeX into HTML.
+# 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/10 Scott Harrison
 # 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 Gerd Kortemeyer
+# 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);
+qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate %insertlist @namespace $prevent_entity_encode $errorcount $warningcount);
 use strict;
-use HTML::TokeParser;
-use HTML::TreeBuilder;
-use Safe;
-use Safe::Hole;
-use Math::Cephes qw(:trigs :hypers :bessels erf erfc);
-use Math::Random qw(:all);
-use Opcode;
+use HTML::LCParser();
+use HTML::TreeBuilder();
+use HTML::Entities();
+use Safe();
+use Safe::Hole();
+use Math::Cephes();
+use Math::Random();
+use Opcode();
 
 sub register {
-  my $space;
-  my @taglist;
-  my $temptag;
-  ($space,@taglist) = @_;
-  foreach $temptag (@taglist) {
-    $Apache::lonxml::alltags{$temptag}=$space;
+  my ($space,@taglist) = @_;
+  foreach my $temptag (@taglist) {
+    push(@{ $Apache::lonxml::alltags{$temptag} },$space);
   }
 }
 
+sub deregister {
+  my ($space,@taglist) = @_;
+  foreach my $temptag (@taglist) {
+    my $tempspace = $Apache::lonxml::alltags{$temptag}[-1];
+    if ($tempspace eq $space) {
+      pop(@{ $Apache::lonxml::alltags{$temptag} });
+    }
+  }
+  #&printalltags();
+}
+
 use Apache::Constants qw(:common);
-use Apache::lontexconvert;
-use Apache::style;
-use Apache::run;
-use Apache::londefdef;
-use Apache::scripttag;
-use Apache::edit;
-use Apache::lonnet;
-use Apache::File;
+use Apache::lontexconvert();
+use Apache::style();
+use Apache::run();
+use Apache::londefdef();
+use Apache::scripttag();
+use Apache::edit();
+use Apache::lonnet();
+use Apache::File();
+use Apache::loncommon();
+use Apache::lonfeedback();
+use Apache::lonmsg();
+use Apache::loncacc();
 
 #==================================================   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
+$warningcount=0;
+$errorcount=0;
+
 #path to the directory containing the file currently being processed
 @pwd=();
 
@@ -76,9 +135,22 @@ $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;
 
+# a pointer the the Apache request object
+$Apache::lonxml::request='';
+
+# a problem number counter, and check on ether it is used
+$Apache::lonxml::counter=4;
+$Apache::lonxml::counter_changed=0;
+
+#internal check on whether to look at style defs
+$Apache::lonxml::usestyle=1;
+
 sub xmlbegin {
   my $output='';
   if ($ENV{'browser.mathml'}) {
@@ -95,6 +167,7 @@ sub xmlbegin {
 }
 
 sub xmlend {
+    my ($discussiononly,$symb)=@_;
     my $discussion='';
     if ($ENV{'request.course.id'}) {
        my $crs='/'.$ENV{'request.course.id'};
@@ -103,30 +176,48 @@ sub xmlend {
        }                 
        $crs=~s/\_/\//g;
        my $seeid=&Apache::lonnet::allowed('rin',$crs);
-       my $symb=&Apache::lonnet::symbread();
+       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'}) {
-              $discussion.=
-                  '<address><hr /><h2>Course Discussion of Resource</h2>';
+              unless ($discussiononly) {
+                 $discussion.=
+                  '<address><hr />';
+	     }
               my $idx;
               for ($idx=1;$idx<=$contrib{'version'};$idx++) {
 		my $hidden=($contrib{'hidden'}=~/\.$idx\./);
-		unless (($hidden) && (!$seeid)) {
+		my $deleted=($contrib{'deleted'}=~/\.$idx\./);
+		unless ((($hidden) && (!$seeid)) || ($deleted)) {
                  my $message=$contrib{$idx.':message'};
                  $message=~s/\n/\<br \/\>/g;
+		 $message=&Apache::lontexconvert::msgtexconverted($message);
                  if ($message) {
                   if ($hidden) {
 		      $message='<font color="#888888">'.$message.'</font>';
                   }
+                  my $screenname=&Apache::loncommon::screenname(
+                               $contrib{$idx.':sendername'},
+			       $contrib{$idx.':senderdomain'});
+                  my $plainname=&Apache::loncommon::nickname(
+                               $contrib{$idx.':sendername'},
+			       $contrib{$idx.':senderdomain'});
+
                   my $sender='Anonymous';
                   if ((!$contrib{$idx.':anonymous'}) || ($seeid)) {
-                      $sender=$contrib{$idx.':sendername'}.' at '.
-		      $contrib{$idx.':senderdomain'};
+                      $sender=&Apache::loncommon::aboutmewrapper(
+                               $plainname,
+                               $contrib{$idx.':sendername'},
+                               $contrib{$idx.':senderdomain'}).' ('.
+                              $contrib{$idx.':sendername'}.' at '.
+		      $contrib{$idx.':senderdomain'}.')';
                       if ($contrib{$idx.':anonymous'}) {
-			  $sender.=' (anonymous)';
+			  $sender.=' [anonymous] '.
+                                     $screenname;
                       }
                       if ($seeid) {
 			  if ($hidden) {
@@ -135,8 +226,14 @@ sub xmlend {
                           } 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'}).
@@ -145,18 +242,35 @@ sub xmlend {
 	        }
                } 
               }
-              $discussion.='</address>';
+              unless ($discussiononly) {
+                 $discussion.='</address>';
+	      }
+          }
+          if ($discussiononly) {
+	      $discussion.=(<<ENDDISCUSS);
+<form action="/adm/feedback" method="post" name="mailform">
+<input type="submit" name="discuss" value="Post Discussion" />
+<input type="submit" name="anondiscuss" value="Post Anonymous Discussion" />
+<input type="hidden" name="symb" value="$symb" />
+<input type="hidden" name="sendit" value="true" />
+<br />
+<font size="1">Note: in anonymous discussion, your name is visible only to
+course faculty</font><br />
+<textarea name=comment cols=60 rows=10 wrap=hard></textarea>
+</form>
+ENDDISCUSS
+             $discussion.=&Apache::lonfeedback::generate_preview_button();
           }
        }
     }
-    return $discussion.'</html>';
+    return $discussion.($discussiononly?'':'</html>');
 }
 
 sub tokeninputfield {
     my $defhost=$Apache::lonnet::perlvar{'lonHostID'};
     $defhost=~tr/a-z/A-Z/;
     return (<<ENDINPUTFIELD)
-<script>
+<script type="text/javascript">
     function updatetoken() {
 	var comp=new Array;
         var barcode=unescape(document.tokeninput.barcode.value);
@@ -216,16 +330,17 @@ sub maketoken {
 }
 
 sub printtokenheader {
-    my ($target,$token,$symb,$tuname,$tudom,$tcrsid)=@_;
+    my ($target,$token,$tsymb,$tcrsid,$tudom,$tuname)=@_;
     unless ($token) { return ''; }
 
-    unless ($symb) {
-	$symb=&Apache::lonnet::symbread();
+    my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+    unless ($tsymb) {
+	$tsymb=$symb;
     }
     unless ($tuname) {
-	$tuname=$ENV{'user.name'};
-        $tudom=$ENV{'user.domain'};
-        $tcrsid=$ENV{'request.course.id'};
+	$tuname=$name;
+        $tudom=$domain;
+        $tcrsid=$courseid;
     }
 
     my %reply=&Apache::lonnet::get('environment',
@@ -237,11 +352,14 @@ sub printtokenheader {
 		  $reply{'generation'};
 
     if ($target eq 'web') {
+        my %idhash=&Apache::lonnet::idrget($tudom,($tuname));
 	return 
- '<img align="right" src="/cgi-bin/barcode.gif?encode='.$token.'" />'.
+ '<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 />';
     } else {
@@ -258,76 +376,172 @@ sub fontsettings() {
     return $headerstring;
 }
 
+
+##
+## switchmenu - modeled on lonmenu::switchmenu, but better. 
+## Helper function for registerurl
+##
+sub switchmenu {
+    my ($row,$col,$imgsrc,$texttop,$textbot,$action,$description)=@_;
+    return(<<ENDSMENU);
+    menu.switchbutton($row,$col,'$imgsrc','$texttop','$textbot','$action','$description');
+ENDSMENU
+}
+
 sub registerurl {
     my $forcereg=shift;
-    if ($Apache::lonxml::registered) { return ''; }
+    my $target = shift;
+    my $result = '';
+    
+    if ($target eq 'edit') {
+        $result .="<script type=\"text/javascrtipt\">\n".
+            "if (typeof menu != 'undefined') {menu.currentURL=null;}\n".
+            &Apache::loncommon::browser_and_searcher_javascript().
+                "\n</script>\n";
+    }
+    if ((($ENV{'request.publicaccess'}) || 
+         (!&Apache::lonnet::is_on_map($ENV{'REQUEST_URI'}))) &&
+        (!$forcereg)) {
+	return $result.
+         '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>';
+    }
+    if ($Apache::lonxml::registered && !$forcereg) { return ''; }
     $Apache::lonxml::registered=1;
+    my $reopen=&Apache::lonmenu::reopenmenu();
+    my $newmail='';
+    if (&Apache::lonmsg::newmail()) { 
+       $newmail='menu.setstatus("you have","messages");';
+    }
+    my $timesync='menu.syncclock(1000*'.time.');';
     if (($ENV{'REQUEST_URI'}!~/^\/(res\/)*adm\//) || ($forcereg)) {
         my $hwkadd='';
-        if ($ENV{'REQUEST_URI'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
+        if ($ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
 	    if (&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
 		$hwkadd.=(<<ENDSUBM);
-                     menu.switchbutton
-           (7,1,'subm.gif','view sub','missions',
-                'gocmd("/adm/grades","submission")');
+                     menu.switchbutton(7,1,'subm.gif','view sub','missions','gocmd("/adm/grades","submission")',
+                     'View user submissions for this assessment resource');
 ENDSUBM
             }
 	    if (&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) {
 		$hwkadd.=(<<ENDGRDS);
-                     menu.switchbutton
-           (7,2,'pgrd.gif','problem','grades',
-                'gocmd("/adm/grades","viewgrades")');
+                     menu.switchbutton(7,2,'pgrd.gif','problem','grades','gocmd("/adm/grades","gradingmenu")',
+                     'Modify user grades for this assessment resource');
 ENDGRDS
             }
 	    if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
 		$hwkadd.=(<<ENDPARM);
-                     menu.switchbutton
-           (7,3,'pparm.gif','problem','parms',
-                'gocmd("/adm/parmset","set")');
+                     menu.switchbutton(7,3,'pparm.gif','problem','parms','gocmd("/adm/parmset","set")',
+                     'Modify deadlines, etc, for this assessment resource');
 ENDPARM
             }
 	}
-	return (<<ENDREGTHIS);
+        ###
+        ### Determine whether or not to display the 'cstr' button for this
+        ### resource
+        ###
+        my $editbutton = '';
+        if ($ENV{'user.author'}) {
+            if ($ENV{'request.role'}=~/^(ca|au)/) {
+                # Set defaults for authors
+                my ($top,$bottom) = ('con-','struct');
+                my $action = "go('/priv/".$ENV{'user.name'}."');";
+                my $cadom  = $ENV{'request.role.domain'};
+                my $caname = $ENV{'user.name'};
+                my $desc = "Enter my resource construction space";
+                # Set defaults for co-authors
+                if ($ENV{'request.role'} =~ /^ca/) { 
+                    ($cadom,$caname)=($ENV{'request.role'}=~/(\w+)\/(\w+)$/);
+                    ($top,$bottom) = ('co con-','struct');
+                    $action = 'go("/priv/'.$caname.'");';
+                    $desc = "Enter construction space as co-author";
+                }
+                # Check that we are on the correct machine
+                my $home = &Apache::lonnet::homeserver($caname,$cadom);
+                if ($home eq $Apache::lonnet::perlvar{'lonHostID'}) {
+                    $editbutton=&switchmenu
+                        (6,1,$top,,$bottom,$action,$desc);
+                }
+            }
+            ##
+            ## Determine if user can edit url.
+            ##
+            my $cfile='';
+            my $cfuname='';
+            my $cfudom='';
+            if ($ENV{'request.filename'}) {
+                my $file=&Apache::lonnet::declutter($ENV{'request.filename'});
+                $file=~s/^(\w+)\/(\w+)/\/priv\/$2/;
+                # Chech that the user has permission to edit this resource
+                ($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$1);
+                if (defined($cfudom)) {
+                    if (&Apache::lonnet::homeserver($cfuname,$cfudom) 
+                        eq $Apache::lonnet::perlvar{'lonHostID'}) {
+                        $cfile=$file;
+                    }
+                }
+            }        
+            # Finally, turn the button on or off
+            if ($cfile) {
+                $editbutton=&switchmenu
+                    (6,1,'cstr.gif','edit','resource',
+                     'go("'.$cfile.'");',"Edit this resource");
+            } elsif ($editbutton eq '') {
+                $editbutton = '    menu.clearbut(6,1);';
+            }
+        }
+        ###
+        ###
+	$result = (<<ENDREGTHIS);
      
 <script language="JavaScript">
 // BEGIN LON-CAPA Internal
 
     function LONCAPAreg() {
-	  menu=window.open("","LONCAPAmenu");
+	  menu=$reopen;
           menu.clearTimeout(menu.menucltim);
+          $timesync
+          $newmail
 	  menu.currentURL=window.location.pathname;
+          menu.reloadURL=window.location.pathname;
+          menu.currentSymb="$ENV{'request.symb'}";
+          menu.reloadSymb="$ENV{'request.symb'}";
           menu.currentStale=0;
           menu.clearbut(3,1);
           menu.switchbutton
-       (6,3,'catalog.gif','catalog','info','catalog_info()');
+       (6,3,'catalog.gif','catalog','info','catalog_info()','Show catalog information');
           menu.switchbutton
-       (8,1,'eval.gif','evaluate','this','gopost("/adm/evaluate",currentURL)');
+       (8,1,'eval.gif','evaluate','this','gopost("/adm/evaluate",currentURL)','Provide my evaluation of this resource');
           menu.switchbutton
-    (8,2,'fdbk.gif','feedback','on this','gopost("/adm/feedback",currentURL)');
+    (8,2,'fdbk.gif','feedback','discuss','gopost("/adm/feedback",currentURL)','Provide feedback messages or contribute to the course discussion about this resource');
           menu.switchbutton
-     (8,3,'prt.gif','prepare','printout','gopost("/adm/printout",currentURL)');
+     (8,3,'prt.gif','prepare','printout','gopost("/adm/printout",currentURL)','Prepare a printable document');
           menu.switchbutton
-       (2,1,'back.gif','backward','','gopost("/adm/flip","back:"+currentURL)');
+       (2,1,'back.gif','backward','','gopost("/adm/flip","back:"+currentURL)','Go to the previous resource in the course sequence');
           menu.switchbutton
-     (2,3,'forw.gif','forward','','gopost("/adm/flip","forward:"+currentURL)');
+     (2,3,'forw.gif','forward','','gopost("/adm/flip","forward:"+currentURL)','Go to the next resource in the course sequence');
           menu.switchbutton
-                            (9,1,'sbkm.gif','set','bookmark','set_bookmark()');
+                            (9,1,'sbkm.gif','set','bookmark','set_bookmark()','Set a bookmark for this resource');
           menu.switchbutton
-                         (9,2,'vbkm.gif','view','bookmark','edit_bookmarks()');
+                         (9,2,'vbkm.gif','view','bookmark','edit_bookmarks()','Use or edit my bookmark collection');
           menu.switchbutton
-                               (9,3,'anot.gif','anno-','tations','annotate()');
+                               (9,3,'anot.gif','anno-','tations','annotate()','Make notes and annotations about this resource');
           $hwkadd
+          $editbutton
     }
 
     function LONCAPAstale() {
-	  menu=window.open("","LONCAPAmenu");
+	  menu=$reopen
           menu.currentStale=1;
-          //menu.clearbut(7,1);
-          //menu.clearbut(7,2);
-          //menu.clearbut(7,3);
+          if (menu.reloadURL!='' && menu.reloadURL!= null) { 
+             menu.switchbutton
+             (3,1,'reload.gif','return','location','go(reloadURL)','Return to the last known location in the course sequence');
+	  }
+          menu.clearbut(7,1);
+          menu.clearbut(7,2);
+          menu.clearbut(7,3);
           menu.menucltim=menu.setTimeout(
  'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+
- 'clearbut(9,1);clearbut(9,2);clearbut(9,3);clearbut(6,3)',
+ 'clearbut(9,1);clearbut(9,2);clearbut(9,3);clearbut(6,3);clearbut(6,1)',
 			  2000);
 
       }
@@ -337,13 +551,14 @@ ENDPARM
 ENDREGTHIS
 
     } else {
-        return (<<ENDDONOTREGTHIS);
+        $result = (<<ENDDONOTREGTHIS);
 
 <script language="JavaScript">
 // BEGIN LON-CAPA Internal
 
     function LONCAPAreg() {
-	  menu=window.open("","LONCAPAmenu");
+	  menu=$reopen
+          $timesync
           menu.currentStale=1;
           menu.clearbut(2,1);
           menu.clearbut(2,3);
@@ -364,8 +579,8 @@ ENDREGTHIS
 // END LON-CAPA Internal
 </script>
 ENDDONOTREGTHIS
-
     }
+    return $result;
 }
 
 sub loadevents() {
@@ -379,14 +594,32 @@ sub unloadevents() {
 sub printalltags {
   my $temp;
   foreach $temp (sort keys %Apache::lonxml::alltags) {
-    &Apache::lonxml::debug("$temp -- $Apache::lonxml::alltags{$temp}");
+    &Apache::lonxml::debug("$temp -- ".
+		  join(',',@{ $Apache::lonxml::alltags{$temp} }));
   }
 }
 
 sub xmlparse {
- my ($target,$content_file_string,$safeinit,%style_for_target) = @_;
+ my ($request,$target,$content_file_string,$safeinit,%style_for_target) = @_;
+
+ &setup_globals($request,$target);
+#
+# do we have a course style file?
+#
+
+ if ($ENV{'request.course.id'} && $ENV{'request.state'} ne 'construct') {
+     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);
+       if ($styletext ne '-1') {
+          %style_for_target = (%style_for_target,
+                          &Apache::style::styleparser($target,$styletext));
+       }
+    }
+ }
 
- &setup_globals($target);
  #&printalltags();
  my @pars = ();
  my $pwd=$ENV{'request.filename'};
@@ -400,7 +633,7 @@ sub xmlparse {
 
  ($target, my @tenta) = split('&&',$target);
 
- my @stack = (); 
+ my @stack = ();
  my @parstack = ();
  &initdepth;
 
@@ -409,6 +642,7 @@ sub xmlparse {
  if ($ENV{'request.uri'}) {
     &writeallows($ENV{'request.uri'});
  }
+ if ($Apache::lonxml::counter_changed) { &store_counter() }
  return $finaloutput;
 }
 
@@ -417,12 +651,12 @@ sub htmlclean {
 
     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)(.*?)\>/\<$1$2 \/\>/gis;
     $output=~s/\<\/(br|hr|img|meta|allow)\>//gis;
     unless ($full) {
        $output=~s/\<[\/]*(body|head|html)\>//gis;
@@ -433,6 +667,28 @@ sub htmlclean {
     return $output;
 }
 
+sub latex_special_symbols {
+    my ($current_token,$stack,$parstack,$where)=@_;
+    if ($where=='header') {
+      $current_token =~ s/_/ /g;
+      $current_token =~ s/\^/ /g;
+      $current_token =~ s/&/\\&/g;
+    } else {
+     $current_token=~s/\\ /\\char92 /g;
+     $current_token=~s/\^/\\char94 /g;
+     $current_token=~s/\~/\\char126 /g;
+     $current_token=~s/(&[^a-z\#])/\\$1/g;
+     $current_token=~s/([^&])\#/$1\\#/g;
+     $current_token=~s/(\$|_|{|})/\\$1/g;
+     $current_token=~s/\\char92 /\\texttt{\\char92}/g;
+     $current_token=~s/>/\$>\$/g; #more
+     $current_token=~s/</\$<\$/g; #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
+    }
+    return $current_token;
+}
+
 sub inner_xmlparse {
   my ($target,$stack,$parstack,$pars,$safeeval,$style_for_target)=@_;
   my $finaloutput = '';
@@ -442,49 +698,51 @@ sub inner_xmlparse {
     while ($token = $$pars['-1']->get_token) {
       if (($token->[0] eq 'T') || ($token->[0] eq 'C') || ($token->[0] eq 'D') ) {
 	if ($metamode<1) {
-	  $result=$token->[1];
+	    my $text=$token->[1];
+	    if ($token->[0] eq 'C' && $target eq 'tex') {
+		$text = '%'.$text."\n";
+	    }
+	    $result.=$text;
 	}
       } elsif ($token->[0] eq 'PI') {
 	if ($metamode<1) {
 	  $result=$token->[2];
 	}
       } elsif ($token->[0] eq 'S') {
-	# add tag to stack 	    
+	# add tag to stack
 	push (@$stack,$token->[1]);
 	# add parameters list to another stack
 	push (@$parstack,&parstring($token));
-	&increasedepth($token);       
-	if (exists $$style_for_target{$token->[1]}) {
-	  if ($Apache::lonxml::redirection) {
-	    $Apache::lonxml::outputstack['-1'] .=  
-	      &recurse($$style_for_target{$token->[1]},$target,$safeeval,
-		       $style_for_target,@$parstack);
-	  } else {
-	    $finaloutput .= &recurse($$style_for_target{$token->[1]},$target,
-				     $safeeval,$style_for_target,@$parstack);
-	  }
+	&increasedepth($token);
+	if ($Apache::lonxml::usestyle &&
+	    exists($$style_for_target{$token->[1]})) {
+	    $Apache::lonxml::usestyle=0;
+	    my $string=$$style_for_target{$token->[1]}.
+	      '<LONCAPA_INTERNAL_TURN_STYLE_ON />';
+	    &Apache::lonxml::newparser($pars,\$string);
 	} else {
 	  $result = &callsub("start_$token->[1]", $target, $token, $stack,
 			     $parstack, $pars, $safeeval, $style_for_target);
-	}              
+	}
       } elsif ($token->[0] eq 'E') {
 	#clear out any tags that didn't end
 	while ($token->[1] ne $$stack['-1'] && ($#$stack > -1)) {
-	  &Apache::lonxml::warning("Unbalanced tags in resource $$stack['-1']");
-	  &end_tag($stack,$parstack,$token);
-	}
-		
-	if (exists $$style_for_target{'/'."$token->[1]"}) {
-	  if ($Apache::lonxml::redirection) {
-	    $Apache::lonxml::outputstack['-1'] .=  
-	      &recurse($$style_for_target{'/'."$token->[1]"},
-		       $target,$safeeval,$style_for_target,@$parstack);
+	  my $lasttag=$$stack[-1];
+	  if ($token->[1] =~ /^$lasttag$/i) {
+	    &Apache::lonxml::warning('Using tag &lt;/'.$token->[1].'&gt; as end tag to &lt;'.$$stack[-1].'&gt;');
+	    last;
 	  } else {
-	    $finaloutput .= &recurse($$style_for_target{'/'."$token->[1]"},
-				     $target,$safeeval,$style_for_target,
-				     @$parstack);
+	    &Apache::lonxml::warning('Found tag &lt;/'.$token->[1].'&gt; when looking for &lt;/'.$$stack[-1].'&gt; in file');
+	    &end_tag($stack,$parstack,$token);
 	  }
-		    
+	}
+
+	if ($Apache::lonxml::usestyle &&
+	    exists($$style_for_target{'/'."$token->[1]"})) {
+	    $Apache::lonxml::usestyle=0;
+	    my $string=$$style_for_target{'/'.$token->[1]}.
+	      '<LONCAPA_INTERNAL_TURN_STYLE_ON />';
+	    &Apache::lonxml::newparser($pars,\$string);
 	} else {
 	  $result = &callsub("end_$token->[1]", $target, $token, $stack,
 			     $parstack, $pars,$safeeval, $style_for_target);
@@ -495,100 +753,49 @@ sub inner_xmlparse {
       #evaluate variable refs in result
       if ($result ne "") {
 	if ( $#$parstack > -1 ) {
-	  if ($Apache::lonxml::redirection) {
-	    $Apache::lonxml::outputstack['-1'] .= 
-	      &Apache::run::evaluate($result,$safeeval,$$parstack['-1']);
-	  } else {
-	    $finaloutput .= &Apache::run::evaluate($result,$safeeval,
-						   $$parstack['-1']);
-	  }
+	  $result=&Apache::run::evaluate($result,$safeeval,$$parstack[-1]);
 	} else {
-	  $finaloutput .= &Apache::run::evaluate($result,$safeeval,'');
+	  $result= &Apache::run::evaluate($result,$safeeval,'');
+	}
+      }
+      if (($token->[0] eq 'T') || ($token->[0] eq 'C') || ($token->[0] eq 'D') ) {
+	if ($target eq 'tex') {
+	    $result=&latex_special_symbols($result,$stack,$parstack);
 	}
-	$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 {
+	$finaloutput.=$result;
+      }
+      $result = '';
+
       if ($token->[0] eq 'E') { 
 	&end_tag($stack,$parstack,$token);
       }
+    }	
+    if ($#$pars > -1) {
+	pop @$pars;
+	pop @Apache::lonxml::pwd;
     }
-    pop @$pars;
-    pop @Apache::lonxml::pwd;
   }
 
   # if ($target eq 'meta') {
   #   $finaloutput.=&endredirection;
   # }
 
+
   if (($ENV{'QUERY_STRING'}) && ($target eq 'web')) {
     $finaloutput=&afterburn($finaloutput);
-  }
+  }	    
   return $finaloutput;
 }
 
-sub recurse {
-  my @innerstack = (); 
-  my @innerparstack = ();
-  my ($newarg,$target,$safeeval,$style_for_target,@parstack) = @_;
-  my @pat = ();
-  &newparser(\@pat,\$newarg);
-  my $tokenpat;
-  my $partstring = '';
-  my $output='';
-  my $decls='';
-  while ( $#pat > -1 ) {
-    while  ($tokenpat = $pat[$#pat]->get_token) {
-      if (($tokenpat->[0] eq 'T') || ($tokenpat->[0] eq 'C') || ($tokenpat->[0] eq 'D') ) {
-	if ($metamode<1) { $partstring=$tokenpat->[1]; }
-      } elsif ($tokenpat->[0] eq 'PI') {
-	if ($metamode<1) { $partstring=$tokenpat->[2]; }
-      } elsif ($tokenpat->[0] eq 'S') {
-	push (@innerstack,$tokenpat->[1]);
-	push (@innerparstack,&parstring($tokenpat));
-	&increasedepth($tokenpat);
-	$partstring = &callsub("start_$tokenpat->[1]", $target, $tokenpat,
-			       \@innerstack, \@innerparstack, \@pat,
-			       $safeeval, $style_for_target);
-      } elsif ($tokenpat->[0] eq 'E') {
-	#clear out any tags that didn't end
-	while ($tokenpat->[1] ne $innerstack[$#innerstack] 
-	       && ($#innerstack > -1)) {
-	  &Apache::lonxml::warning("Unbalanced tags in resource $innerstack['-1']");
-	  &end_tag(\@innerstack,\@innerparstack,$tokenpat);
-	}
-	$partstring = &callsub("end_$tokenpat->[1]", $target, $tokenpat,
-			       \@innerstack, \@innerparstack, \@pat,
-			       $safeeval, $style_for_target);
-      } else {
-	&Apache::lonxml::error("Unknown token event :$tokenpat->[0]:$tokenpat->[1]:");
-      }
-      #pass both the variable to the style tag, and the tag we 
-      #are processing inside the <definedtag>
-      if ( $partstring ne "" ) {
-	if ( $#parstack > -1 ) { 
-	  if ( $#innerparstack > -1 ) { 
-	    $decls= $parstack[$#parstack].$innerparstack[$#innerparstack];
-	  } else {
-	    $decls= $parstack[$#parstack];
-	  }
-	} else {
-	  if ( $#innerparstack > -1 ) { 
-	    $decls=$innerparstack[$#innerparstack];
-	  } else {
-	    $decls='';
-	  }
-	}
-	$output .= &Apache::run::evaluate($partstring,$safeeval,$decls);
-	$partstring = '';
-      }
-      if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack;
-				 &decreasedepth($tokenpat);}
-    }
-    pop @pat;
-    pop @Apache::lonxml::pwd;
-  }
-  return $output;
-}
-
 sub callsub {
   my ($sub,$target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $currentstring='';
@@ -597,11 +804,11 @@ sub callsub {
     my $sub1;
     no strict 'refs';
     my $tag=$token->[1];
-    my $space=$Apache::lonxml::alltags{$tag};
+    my $space=$Apache::lonxml::alltags{$tag}[-1];
     if (!$space) {
-	$tag=~tr/A-Z/a-z/;
+     	$tag=~tr/A-Z/a-z/;
 	$sub=~tr/A-Z/a-z/;
-	$space=$Apache::lonxml::alltags{$tag}
+	$space=$Apache::lonxml::alltags{$tag}[-1]
     }
 
     my $deleted=0;
@@ -613,13 +820,13 @@ sub callsub {
     }
     if (!$deleted) {
       if ($space) {
-	#&Apache::lonxml::debug("Calling sub $sub in $space $metamode<br />\n");
+	#&Apache::lonxml::debug("Calling sub $sub in $space $metamode");
 	$sub1="$space\:\:$sub";
 	($currentstring,$nodefault) = &$sub1($target,$token,$tagstack,
 					     $parstack,$parser,$safeeval,
 					     $style);
       } else {
-	#&Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode<br />\n");
+	#&Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode");
 	if ($metamode <1) {
 	  if (defined($token->[4]) && ($metamode < 1)) {
 	    $currentstring = $token->[4];
@@ -631,7 +838,7 @@ sub callsub {
       #    &Apache::lonxml::debug("nodefalt:$nodefault:");
       if ($currentstring eq '' && $nodefault eq '') {
 	if ($target eq 'edit') {
-	  &Apache::lonxml::debug("doing default edit for $token->[1]");
+	  #&Apache::lonxml::debug("doing default edit for $token->[1]");
 	  if ($token->[0] eq 'S') {
 	    $currentstring = &Apache::edit::tag_start($target,$token);
 	  } elsif ($token->[0] eq 'E') {
@@ -641,6 +848,9 @@ sub callsub {
 	  if ($token->[0] eq 'S') {
 	    $currentstring = $token->[4];
 	    $currentstring.=&Apache::edit::handle_insert();
+	  } elsif ($token->[0] eq 'E') {
+	    $currentstring = $token->[2];
+            $currentstring.=&Apache::edit::handle_insertafter($token->[1]);
 	  } else {
 	    $currentstring = $token->[2];
 	  }
@@ -653,8 +863,14 @@ sub callsub {
 }
 
 sub setup_globals {
-  my ($target)=@_;
+  my ($request,$target)=@_;
+  $Apache::lonxml::request=$request;
   $Apache::lonxml::registered = 0;
+  $errorcount=0;
+  $warningcount=0;
+  $Apache::lonxml::default_homework_loaded=0;
+  $Apache::lonxml::usestyle=1;
+  &init_counter();
   @Apache::lonxml::pwd=();
   @Apache::lonxml::extlinks=();
   if ($target eq 'meta') {
@@ -662,6 +878,11 @@ sub setup_globals {
     $Apache::lonxml::metamode = 1;
     $Apache::lonxml::evaluate = 1;
     $Apache::lonxml::import = 0;
+  } elsif ($target eq 'answer') {
+    $Apache::lonxml::redirection = 0;
+    $Apache::lonxml::metamode = 1;
+    $Apache::lonxml::evaluate = 1;
+    $Apache::lonxml::import = 1;
   } elsif ($target eq 'grade') {
     &startredirection;
     $Apache::lonxml::metamode = 0;
@@ -677,6 +898,11 @@ sub setup_globals {
     $Apache::lonxml::metamode = 0;
     $Apache::lonxml::evaluate = 0;
     $Apache::lonxml::import = 0;
+  } elsif ($target eq 'analyze') {
+    $Apache::lonxml::redirection = 0;
+    $Apache::lonxml::metamode = 0;
+    $Apache::lonxml::evaluate = 1;
+    $Apache::lonxml::import = 1;
   } else {
     $Apache::lonxml::redirection = 0;
     $Apache::lonxml::metamode = 0;
@@ -713,6 +939,37 @@ sub init_safespace {
   $safehole->wrap(\&Math::Cephes::y1,$safeeval,'&y1');
   $safehole->wrap(\&Math::Cephes::yn,$safeeval,'&yn');
   $safehole->wrap(\&Math::Cephes::yv,$safeeval,'&yv');
+  
+  $safehole->wrap(\&Math::Cephes::bdtr  ,$safeeval,'&bdtr'  );
+  $safehole->wrap(\&Math::Cephes::bdtrc ,$safeeval,'&bdtrc' );
+  $safehole->wrap(\&Math::Cephes::bdtri ,$safeeval,'&bdtri' );
+  $safehole->wrap(\&Math::Cephes::btdtr ,$safeeval,'&btdtr' );
+  $safehole->wrap(\&Math::Cephes::chdtr ,$safeeval,'&chdtr' );
+  $safehole->wrap(\&Math::Cephes::chdtrc,$safeeval,'&chdtrc');
+  $safehole->wrap(\&Math::Cephes::chdtri,$safeeval,'&chdtri');
+  $safehole->wrap(\&Math::Cephes::fdtr  ,$safeeval,'&fdtr'  );
+  $safehole->wrap(\&Math::Cephes::fdtrc ,$safeeval,'&fdtrc' );
+  $safehole->wrap(\&Math::Cephes::fdtri ,$safeeval,'&fdtri' );
+  $safehole->wrap(\&Math::Cephes::gdtr  ,$safeeval,'&gdtr'  );
+  $safehole->wrap(\&Math::Cephes::gdtrc ,$safeeval,'&gdtrc' );
+  $safehole->wrap(\&Math::Cephes::nbdtr ,$safeeval,'&nbdtr' );
+  $safehole->wrap(\&Math::Cephes::nbdtrc,$safeeval,'&nbdtrc');
+  $safehole->wrap(\&Math::Cephes::nbdtri,$safeeval,'&nbdtri');
+  $safehole->wrap(\&Math::Cephes::ndtr  ,$safeeval,'&ndtr'  );
+  $safehole->wrap(\&Math::Cephes::ndtri ,$safeeval,'&ndtri' );
+  $safehole->wrap(\&Math::Cephes::pdtr  ,$safeeval,'&pdtr'  );
+  $safehole->wrap(\&Math::Cephes::pdtrc ,$safeeval,'&pdtrc' );
+  $safehole->wrap(\&Math::Cephes::pdtri ,$safeeval,'&pdtri' );
+  $safehole->wrap(\&Math::Cephes::stdtr ,$safeeval,'&stdtr' );
+  $safehole->wrap(\&Math::Cephes::stdtri,$safeeval,'&stdtri');
+
+#  $safehole->wrap(\&Math::Cephes::new_fract,$safeeval,'&new_fract');
+#  $safehole->wrap(\&Math::Cephes::radd,$safeeval,'&radd');
+#  $safehole->wrap(\&Math::Cephes::rsub,$safeeval,'&rsub');
+#  $safehole->wrap(\&Math::Cephes::rmul,$safeeval,'&rmul');
+#  $safehole->wrap(\&Math::Cephes::rdiv,$safeeval,'&rdiv');
+#  $safehole->wrap(\&Math::Cephes::euclid,$safeeval,'&euclid');
+
   $safehole->wrap(\&Math::Random::random_beta,$safeeval,'&math_random_beta');
   $safehole->wrap(\&Math::Random::random_chi_square,$safeeval,'&math_random_chi_square');
   $safehole->wrap(\&Math::Random::random_exponential,$safeeval,'&math_random_exponential');
@@ -745,6 +1002,18 @@ sub init_safespace {
   &Apache::run::run($safeinit,$safeeval);
 }
 
+sub default_homework_load {
+    my ($safeeval)=@_;
+    &Apache::lonxml::debug('Loading default_homework');
+    my $default=&Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/default_homework.lcpm');
+    if ($default == -1) {
+	&Apache::lonxml::error("<b>Unable to find <i>default_homework.lcpm</i></b>");
+    } else {
+	&Apache::run::run($default,$safeeval);
+	$Apache::lonxml::default_homework_loaded=1;
+    }
+}
+
 sub startredirection {
   $Apache::lonxml::redirection++;
   push (@Apache::lonxml::outputstack, '');
@@ -792,7 +1061,7 @@ sub decreasedepth {
     $Apache::lonxml::olddepth=$Apache::lonxml::depth+1;
   }
   if (  $Apache::lonxml::depth < -1) {
-    &Apache::lonxml::warning("Unbalanced tags in resource");   
+    &Apache::lonxml::warning("Missing tags, unable to properly run file.");
     $Apache::lonxml::depth='-1';
   }
   my $curdepth=join('_',@Apache::lonxml::depthcounter);
@@ -800,57 +1069,137 @@ sub decreasedepth {
 #print "<br />e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n";
 }
 
-sub get_all_text {
+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
+}
 
+sub increment_counter {
+    $Apache::lonxml::counter++;
+    $Apache::lonxml::counter_changed=1;
+}
+
+sub init_counter {
+    if (defined($ENV{'form.counter'})) {
+	$Apache::lonxml::counter=$ENV{'form.counter'};
+    } elsif (not defined($Apache::lonxml::counter)) {
+	$Apache::lonxml::counter=1;
+	&store_counter();
+    }
+    $Apache::lonxml::counter_changed=0;
+}
+
+sub store_counter {
+    &Apache::lonnet::appenv(('form.counter' => $Apache::lonxml::counter));
+    return '';
+}
+
+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:");
-   while (($depth >=0) && ($token = $pars->get_token)) {
-#     &Apache::lonxml::debug("e 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] eq $tag) { $depth++; }
-       $result.=$token->[4];
-     } elsif ($token->[0] eq 'E')  {
-       if ( $token->[1] eq $tag) { $depth--; }
-       #skip sending back the last end tag
-       if ($depth > -1) { $result.=$token->[2]; } else {
-	 $pars->unget_token($token);
+   #&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);
+     }
    }
- } else {
-   while ($token = $pars->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] eq $tag) { 
-	 $pars->unget_token($token); last;
-       } else {
-	 $result.=$token->[4];
+   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);
        }
-     } elsif ($token->[0] eq 'E')  {
-       $result.=$token->[2];
-     }
+       $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:");
+ #&Apache::lonxml::debug("Exit:$result:");
  return $result
 }
 
 sub newparser {
   my ($parser,$contentref,$dir) = @_;
-  push (@$parser,HTML::TokeParser->new($contentref));
+  push (@$parser,HTML::LCParser->new($contentref));
   $$parser['-1']->xml_mode('1');
   if ( $dir eq '' ) {
     push (@Apache::lonxml::pwd, $Apache::lonxml::pwd[$#Apache::lonxml::pwd]);
@@ -864,14 +1213,14 @@ sub newparser {
 sub parstring {
   my ($token) = @_;
   my $temp='';
-  map {
+  foreach (@{$token->[3]}) {
     unless ($_=~/\W/) {
       my $val=$token->[2]->{$_};
-      $val =~ s/([\%\@\\])/\\$1/g;
+      $val =~ s/([\%\@\\\"])/\\$1/g;
       #if ($val =~ m/^[\%\@]/) { $val="\\".$val; }
       $temp .= "my \$$_=\"$val\";"
     }
-  } @{$token->[3]};
+  }
   return $temp;
 }
 
@@ -884,10 +1233,10 @@ sub writeallows {
     my $thisdir=$thisurl;
     $thisdir=~s/\/[^\/]+$//;
     my %httpref=();
-    map {
+    foreach (@extlinks) {
        $httpref{'httpref.'.
  	        &Apache::lonnet::hreflocation($thisdir,$_)}=$thisurl;
-    } @extlinks;
+    }
     @extlinks=();
     &Apache::lonnet::appenv(%httpref);
 }
@@ -897,31 +1246,23 @@ sub writeallows {
 #
 sub afterburn {
     my $result=shift;
-    map {
-       my ($name, $value) = split(/=/,$_);
-       $value =~ tr/+/ /;
-       $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
-       if (($name eq 'highlight')||($name eq 'anchor')||($name eq 'link')) {
-           unless ($ENV{'form.'.$name}) {
-              $ENV{'form.'.$name}=$value;
-	   }
-       }
-    } (split(/&/,$ENV{'QUERY_STRING'}));
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+					    ['highlight','anchor','link']);
     if ($ENV{'form.highlight'}) {
-        map {
+       foreach (split(/\,/,$ENV{'form.highlight'})) {
            my $anchorname=$_;
 	   my $matchthis=$anchorname;
            $matchthis=~s/\_+/\\s\+/g;
            $result=~s/($matchthis)/\<font color=\"red\"\>$1\<\/font\>/gs;
-       } split(/\,/,$ENV{'form.highlight'});
+       }
     }
     if ($ENV{'form.link'}) {
-        map {
+       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;
-       } split(/\,/,$ENV{'form.link'});
+       }
     }
     if ($ENV{'form.anchor'}) {
         my $anchorname=$ENV{'form.anchor'};
@@ -929,7 +1270,7 @@ sub afterburn {
         $matchthis=~s/\_+/\\s\+/g;
         $result=~s/($matchthis)/\<a name=\"$anchorname\"\>$1\<\/a\>/s;
         $result.=(<<"ENDSCRIPT");
-<script>
+<script type="text/javascript">
     document.location.hash='$anchorname';
 </script>
 ENDSCRIPT
@@ -942,13 +1283,13 @@ sub storefile {
     if (my $fh=Apache::File->new('>'.$file)) {
 	print $fh $contents;
         $fh->close();
+    } else {
+      &warning("Unable to save file $file");
     }
 }
 
-sub inserteditinfo {
-      my ($result,$filecontents)=@_;
-      unless ($filecontents) {
-	  $filecontents=(<<SIMPLECONTENT);
+sub createnewhtml {
+  my $filecontents=(<<SIMPLECONTENT);
 <html>
 <head>
 <title>
@@ -962,28 +1303,67 @@ sub inserteditinfo {
 </body>
 </html>
 SIMPLECONTENT
-      }
-      my $editheader='<a href="#editsection">Edit below</a><hr />';
+  return $filecontents;
+}
+
+
+sub inserteditinfo {
+      my ($result,$filecontents)=@_;
+      $filecontents = &HTML::Entities::encode($filecontents);
+#      my $editheader='<a href="#editsection">Edit below</a><hr />';
+      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" />
+BUTTONS
       my $editfooter=(<<ENDFOOTER);
 <hr />
 <a name="editsection" />
 <form method="post">
+<input type="hidden" name="editmode" value="Edit" />
+$buttons<br />
 <textarea cols="80" rows="40" name="filecont">$filecontents</textarea>
+<br />$buttons
 <br />
-<input type="submit" name="attemptclean" 
-       value="Save and then attempt to clean HTML" />
-<input type="submit" name="savethisfile" value="Save this" />
 </form>
 ENDFOOTER
-      $result=~s/(\<body[^\>]*\>)/$1$editheader/is;
+#      $result=~s/(\<body[^\>]*\>)/$1$editheader/is;
       $result=~s/(\<\/body\>)/$editfooter/is;
       return $result;
 }
 
+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'})
+	 && ($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'}
+      } else {
+	return 'web';
+      }
+    } else {
+      return 'web';
+    }
+  } elsif ($ENV{'request.state'} eq 'construct') {
+    if ( defined($ENV{'form.grade_target'})) {
+      return ($ENV{'form.grade_target'});
+    } else {
+      return 'web';
+    }
+  } else {
+    return 'web';
+  }
+}
+
 sub handler {
   my $request=shift;
 
-  my $target='web';
+  my $target=&get_target();
 
   $Apache::lonxml::debug=0;
 
@@ -992,9 +1372,9 @@ sub handler {
   } else {
     $request->content_type('text/html');
   }
-  
+  &Apache::loncommon::no_cache($request);
   $request->send_http_header;
-  
+
   return OK if $request->header_only;
 
 
@@ -1008,7 +1388,7 @@ sub handler {
       }
   }
   my %mystyle;
-  my $result = ''; 
+  my $result = '';
   my $filecontents=&Apache::lonnet::getfile($file);
   if ($filecontents == -1) {
     $result=(<<ENDNOTFOUND);
@@ -1022,69 +1402,129 @@ sub handler {
 </html>
 ENDNOTFOUND
     $filecontents='';
+    if ($ENV{'request.state'} ne 'published') {
+      $filecontents=&createnewhtml();
+      $ENV{'form.editmode'}='Edit'; #force edit mode
+    }
   } else {
-      unless ($ENV{'request.state'} eq 'published') {
-         if ($ENV{'form.attemptclean'}) {
-	    $filecontents=&htmlclean($filecontents,1);
-         }
+    unless ($ENV{'request.state'} eq 'published') {
+      if ($ENV{'form.attemptclean'}) {
+	$filecontents=&htmlclean($filecontents,1);
       }
-    $result = &Apache::lonxml::xmlparse($target,$filecontents,'',%mystyle);
+    }
+    if (!$ENV{'form.editmode'} || $ENV{'form.viewmode'}) {
+      $result = &Apache::lonxml::xmlparse($request,$target,$filecontents,
+					  '',%mystyle);
+    }
   }
 
 #
 # 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"><h3>'.$displayfile.
+              '</h3></body></html>';
       $result=&inserteditinfo($result,$filecontents);
+    }
   }
-  
+
   writeallows($request->uri);
 
   $request->print($result);
 
   return OK;
 }
- 
+
 sub debug {
   if ($Apache::lonxml::debug eq 1) {
-    print("DEBUG:".$_[0]."<br />\n");
+    $|=1;
+    print('<font size="-2"<pre>DEBUG:'.&HTML::Entities::encode($_[0])."</pre></font>\n");
   }
 }
 
 sub error {
+  $errorcount++;
   if (($Apache::lonxml::debug eq 1) || ($ENV{'request.state'} eq 'construct') ) {
-    print "<b>ERROR:</b>".$_[0]."<br />\n";
+    # 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'},$_[0]);
+    &Apache::lonmsg::author_res_msg($ENV{'request.filename'},join('<br />',@_));
     #notify course
     if ( $ENV{'request.course.id'} ) {
-      my $users=$ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'};
-      foreach my $user (split /\,/, $users) {
-	($user,my $domain) = split /:/, $user;
-	&Apache::lonmsg::user_normal_msg($user,$domain,"Error in $ENV{'request.filename'}",$_[0]);
+      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 />',@_));
       }
     }
 
     #FIXME probably shouldn't have me get everything forever.
-    &Apache::lonmsg::user_normal_msg('albertel','msu',"Error in $ENV{'request.filename'}",$_[0]);
+    &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++;
   if ($ENV{'request.state'} eq 'construct') {
-    print "<b>W</b>ARNING<b>:</b>".$_[0]."<br />\n";
+    print "<b>W</b>ARNING<b>:</b>".join('<br />',@_)."<br />\n";
   }
 }
 
 sub get_param {
-  my ($param,$parstack,$safeeval,$context) = @_;
+    my ($param,$parstack,$safeeval,$context,$case_insensitive) = @_;
+    if ( ! $context ) { $context = -1; }
+    my $args ='';
+    if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; }
+    if ( ! $args ) { return undef; }
+    if ( $case_insensitive ) {
+	if ($args =~ s/(my \$)(\Q$param\E)(=\")/$1.lc($2).$3/ei) {
+	    return &Apache::run::run("{$args;".'return $'.$param.'}',
+                                     $safeeval); #'
+	} else {
+	    return undef;
+	}
+    } else {
+	if ( $args =~ /my \$\Q$param\E=\"/ ) {
+	    return &Apache::run::run("{$args;".'return $'.$param.'}',
+                                     $safeeval); #'
+	} else {
+	    return undef;
+	}
+    }
+}
+
+sub get_param_var {
+  my ($param,$parstack,$safeeval,$context,$case_insensitive) = @_;
   if ( ! $context ) { $context = -1; }
   my $args ='';
   if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; }
-  return &Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #'
+  &Apache::lonxml::debug("Args are $args param is $param");
+  if ($case_insensitive) {
+      if (! ($args=~s/(my \$)(\Q$param\E)(=\")/$1.lc($2).$3/ei)) {
+	  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+$/) {
+      &Apache::lonxml::debug("doing second");
+      my @result=&Apache::run::run("return $value",$safeeval,1);
+      if (!defined($result[0])) {
+	  return $value
+      } else {
+	  if (wantarray) { return @result; } else { return $result[0]; }
+      }
+  } else {
+    return $value;
+  }
 }
 
 sub register_insert {
@@ -1097,13 +1537,16 @@ sub register_insert {
     if ( $line =~ /^\#/ || $line =~ /^\s*\n/) { next; }
     if ( $line =~ /TABLE/ ) { last; }
     my ($tag,$descrip,$color,$function,$show) = split(/,/, $line);
-    $insertlist{"$tagnum.tag"} = $tag;
-    $insertlist{"$tagnum.description"} = $descrip;
-    $insertlist{"$tagnum.color"} = $color;
-    $insertlist{"$tagnum.function"} = $function;
-    $insertlist{"$tagnum.show"}= $show;
-    $insertlist{"$tag.num"}=$tagnum;
-    $tagnum++;
+    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{"$tag.num"}=$tagnum;
+      $tagnum++;
+    }
   }
   $i++; #skipping TABLE line
   $tagnum = 0;
@@ -1111,7 +1554,7 @@ sub register_insert {
     my $line = $data[$i];
     my ($mnemonic,@which) = split(/ +/,$line);
     my $tag = $insertlist{"$tagnum.tag"};
-    for (my $j=0;$j <$#which;$j++) {
+    for (my $j=0;$j <=$#which;$j++) {
       if ( $which[$j] eq 'Y' ) {
 	if ($insertlist{"$j.show"} ne 'no') {
 	  push(@{ $insertlist{"$tag.which"} },$j);
@@ -1124,7 +1567,15 @@ sub register_insert {
 
 sub description {
   my ($token)=@_;
-  return $insertlist{$insertlist{"$token->[1].num"}.'.description'};
+  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'};
 }
 
 # ----------------------------------------------------------------- whichuser
@@ -1132,10 +1583,7 @@ sub description {
 # calls to lonnet functions for this setup.
 # - looks for form.grade_ parameters
 sub whichuser {
-  my $symb=&Apache::lonnet::symbread();
-  my $courseid=$ENV{'request.course.id'};
-  my $domain=$ENV{'user.domain'};
-  my $name=$ENV{'user.name'};
+  my ($symb,$courseid,$domain,$name);
   if (defined($ENV{'form.grade_symb'})) {
     my $tmp_courseid=$ENV{'form.grade_courseid'};
     my $allowed=&Apache::lonnet::allowed('mgr',$tmp_courseid);
@@ -1145,6 +1593,11 @@ sub whichuser {
       $domain=$ENV{'form.grade_domain'};
       $name=$ENV{'form.grade_username'};
     }
+  } else {
+    $symb=&Apache::lonnet::symbread();
+    $courseid=$ENV{'request.course.id'};
+    $domain=$ENV{'user.domain'};
+    $name=$ENV{'user.name'};
   }
   return ($symb,$courseid,$domain,$name);
 }