loncom/xml/lonxml.pm - diff

Return to lonxml.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/lonxml.pm between versions 1.89 and 1.272

-version 1.89, 2001/06/09 12:32:42
+version 1.272, 2003/08/13 18:57:28
  Line 1
  # The LearningOnline Network with CAPA
  # XML Parser Module
  #
+ # $Id$
+ #
+ # 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,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::LCParser();
- use Safe;
+ use HTML::TreeBuilder();
- use Safe::Hole;
+ use HTML::Entities();
- use Math::Cephes qw(:trigs :hypers :bessels erf erfc);
+ use Safe();
- use Opcode;
+ use Safe::Hole();
+ use Math::Cephes();
+ use Math::Random();
+ use Opcode();
+ use POSIX qw(strftime);
  sub register {
-   my $space;
+   my ($space,@taglist) = @_;
-   my @taglist;
+   foreach my $temptag (@taglist) {
-   my $temptag;
+     push(@{ $Apache::lonxml::alltags{$temptag} },$space);
-   ($space,@taglist) = @_;
+   }
-   foreach $temptag (@taglist) {
+ }
-     $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::lontexconvert();
- use Apache::style;
+ use Apache::style();
- use Apache::run;
+ use Apache::run();
- use Apache::londefdef;
+ use Apache::londefdef();
- use Apache::scripttag;
+ use Apache::scripttag();
- use Apache::edit;
+ use Apache::edit();
- use Apache::lonnet;
+ use Apache::inputtags();
- use Apache::File;
+ use Apache::outputtags();
+ 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=();
- Line 67  $evaluate = 1;
+ Line 136  $evaluate = 1;
  # data structure for eidt mode, determines what tags can go into what other tags
  %insertlist=();
- #stores the list of active tag namespaces
+ # 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=1;
+ $Apache::lonxml::counter_changed=0;
+ #internal check on whether to look at style defs
+ $Apache::lonxml::usestyle=1;
+ #locations used to store the parameter string for style substitutions
+ $Apache::lonxml::style_values='';
+ $Apache::lonxml::style_end_values='';
  sub xmlbegin {
    my $output='';
    if ($ENV{'browser.mathml'}) {
- Line 86  sub xmlbegin {
+ Line 175  sub xmlbegin {
  }
  sub xmlend {
-     return '</html>';
+     my ($discussiononly,$symb)=@_;
- }
+     my $discussion='';
+     if ($ENV{'request.course.id'}) {
- sub fontsettings() {
+        my $crs='/'.$ENV{'request.course.id'};
-     my $headerstring='';
+        if ($ENV{'request.course.sec'}) {
-     if (($ENV{'browser.os'} eq 'mac') && (!$ENV{'browser.mathml'})) {
+           $crs.='_'.$ENV{'request.course.sec'};
-          $headerstring.=
+        }
-              '<meta Content-Type="text/html; charset=x-mac-roman">';
+        $crs=~s/\_/\//g;
+        my $seeid=&Apache::lonnet::allowed('rin',$crs);
+        unless ($symb) {
+            $symb=&Apache::lonnet::symbread();
+        }
+        if ($symb) {
+           my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
+                      $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ 		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+           if ($contrib{'version'}) {
+               unless ($discussiononly) {
+                  $discussion.=
+                   '<address><hr />';
+ 	     }
+               my $idx;
+               for ($idx=1;$idx<=$contrib{'version'};$idx++) {
+ 		my $hidden=($contrib{'hidden'}=~/\.$idx\./);
+ 		my $deleted=($contrib{'deleted'}=~/\.$idx\./);
+ 		unless ((($hidden) && (!$seeid)) || ($deleted)) {
+                  my $message=$contrib{$idx.':message'};
+                  $message=~s/\n/\<br \/\>/g;
+ 		 $message=&Apache::lontexconvert::msgtexconverted($message);
+                  if ($contrib{$idx.':attachmenturl'}) {
+                      my ($fname,$ft)
+                         =($contrib{$idx.':attachmenturl'}=~/\/(\w+)\.(\w+)$/);
+ 		     $message.='<p>Attachment: <a href="'.
+ 	       &Apache::lonnet::tokenwrapper($contrib{$idx.':attachmenturl'}).
+                      '"><tt>'.$fname.'.'.$ft.'</tt></a>';
+                  }
+                  if ($message) {
+                   if ($hidden) {
+ 		      $message='<font color="#888888">'.$message.'</font>';
+                   }
+                   my $screenname=&Apache::loncommon::screenname(
+                                $contrib{$idx.':sendername'},
+ 			       $contrib{$idx.':senderdomain'});
+                   my $plainname=&Apache::loncommon::nickname(
+                                $contrib{$idx.':sendername'},
+ 			       $contrib{$idx.':senderdomain'});
+                   my $sender='Anonymous';
+                   if ((!$contrib{$idx.':anonymous'}) || ($seeid)) {
+                       $sender=&Apache::loncommon::aboutmewrapper(
+                                $plainname,
+                                $contrib{$idx.':sendername'},
+                                $contrib{$idx.':senderdomain'}).' ('.
+                               $contrib{$idx.':sendername'}.' at '.
+ 		      $contrib{$idx.':senderdomain'}.')';
+                       if ($contrib{$idx.':anonymous'}) {
+ 			  $sender.=' [anonymous] '.
+                                      $screenname;
+                       }
+                       if ($seeid) {
+ 			  if ($hidden) {
+                              $sender.=' <a href="/adm/feedback?unhide='.
+ 				 $symb.':::'.$idx.'">Make Visible</a>';
+                           } else {
+                              $sender.=' <a href="/adm/feedback?hide='.
+ 				 $symb.':::'.$idx.'">Hide</a>';
+ 			  }
+                           $sender.=' <a href="/adm/feedback?deldisc='.
+ 				 $symb.':::'.$idx.'">Delete</a>';
+                       }
+                   } else {
+                       if ($screenname) {
+ 			  $sender='<i>'.$screenname.'</i>';
+                       }
+                   }
+ 		  $discussion.='<p><b>'.$sender.'</b> ('.
+                       localtime($contrib{$idx.':timestamp'}).
+                       '):<blockquote>'.$message.
+                       '</blockquote></p>';
+ 	        }
+                }
+               }
+               unless ($discussiononly) {
+                  $discussion.='</address>';
+ 	      }
+           }
+           if ($discussiononly) {
+ 	      $discussion.=(<<ENDDISCUSS);
+ <form action="/adm/feedback" method="post" name="mailform" enctype="multipart/form-data">
+ <input type="submit" name="discuss" value="Post Discussion" />
+ <input type="submit" name="anondiscuss" value="Post Anonymous Discussion" />
+ <input type="hidden" name="symb" value="$symb" />
+ <input type="hidden" name="sendit" value="true" />
+ <br />
+ <font size="1">Note: in anonymous discussion, your name is visible only to
+ course faculty</font><br />
+ <textarea name=comment cols=60 rows=10 wrap=hard></textarea>
+ <p>
+ Attachment (128 KB max size): <input type="file" name="attachment" />
+ </p>
+ </form>
+ ENDDISCUSS
+              $discussion.=&Apache::lonfeedback::generate_preview_button();
+           }
+        }
      }
-     return $headerstring;
+     return $discussion.($discussiononly?'':'</html>');
  }
- sub registerurl {
+ sub tokeninputfield {
-     if ($ENV{'REQUEST_URI'}!~/^\/(res\/)*adm\//) {
+     my $defhost=$Apache::lonnet::perlvar{'lonHostID'};
-         my $hwkadd='';
+     $defhost=~tr/a-z/A-Z/;
-         if ($ENV{'REQUEST_URI'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
+     return (<<ENDINPUTFIELD)
- 	    if (&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
+ <script type="text/javascript">
- 		$hwkadd.=(<<ENDSUBM);
+     function updatetoken() {
-                      menu.switchbutton
+ 	var comp=new Array;
-            (7,1,'subm.gif','view sub','missions',
+         var barcode=unescape(document.tokeninput.barcode.value);
-                 'gocmd("/adm/grades","submission")');
+         comp=barcode.split('*');
- ENDSUBM
+         if (typeof(comp[0])!="undefined") {
-             }
+ 	    document.tokeninput.codeone.value=comp[0];
- 	    if (&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) {
+ 	}
- 		$hwkadd.=(<<ENDGRDS);
+         if (typeof(comp[1])!="undefined") {
-                      menu.switchbutton
+ 	    document.tokeninput.codetwo.value=comp[1];
-            (7,2,'pgrd.gif','problem','grades',
+ 	}
-                 'gocmd("/adm/grades","viewgrades")');
+         if (typeof(comp[2])!="undefined") {
- ENDGRDS
+             comp[2]=comp[2].toUpperCase();
-             }
+ 	    document.tokeninput.codethree.value=comp[2];
- 	    if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
+ 	}
- 		$hwkadd.=(<<ENDPARM);
+         document.tokeninput.barcode.value='';
-                      menu.switchbutton
+     }
-            (7,3,'pparm.gif','problem','parms',
-                 'gocmd("/adm/parmset","set")');
- ENDPARM
-             }
- 	}
- 	return (<<ENDREGTHIS);
- <script language="JavaScript">
- // BEGIN LON-CAPA Internal
-     function LONCAPAreg() {
- 	  menu=window.open("","LONCAPAmenu");
-           menu.clearTimeout(menu.menucltim);
- 	  menu.currentURL=window.location.pathname;
-           menu.currentStale=0;
-           menu.clearbut(3,1);
-           menu.switchbutton
-        (8,1,'eval.gif','evaluate','this','gopost("/adm/evaluate",currentURL)');
-           menu.switchbutton
-     (8,2,'fdbk.gif','feedback','on this','gopost("/adm/feedback",currentURL)');
-           menu.switchbutton
-      (8,3,'prt.gif','prepare','printout','gopost("/adm/printout",currentURL)');
-           menu.switchbutton
-        (2,1,'back.gif','backward','','gopost("/adm/flip","back:"+currentURL)');
-           menu.switchbutton
-      (2,3,'forw.gif','forward','','gopost("/adm/flip","forward:"+currentURL)');
-           $hwkadd
-     }
-     function LONCAPAstale() {
- 	  menu=window.open("","LONCAPAmenu");
-           menu.currentStale=1;
-           menu.switchbutton
-             (3,1,'reload.gif','return','location','go(currentURL)');
-           menu.menucltim=menu.setTimeout(
-  'clearbut(2,1);clearbut(2,3);clearbut(7,1);clearbut(7,2);clearbut(7,3);'.
-  'clearbut(8,1);clearbut(8,2);clearbut(8,3);',
-);
-       }
- // END LON-CAPA Internal
  </script>
- ENDREGTHIS
+ <form method="post" name="tokeninput">
+ <table border="2" bgcolor="#FFFFBB">
-     } else {
+ <tr><th>DocID Checkin</th></tr>
-         return (<<ENDDONOTREGTHIS);
+ <tr><td>
+ <table>
- <script language="JavaScript">
+ <tr>
- // BEGIN LON-CAPA Internal
+ <td>Scan in Barcode</td>
+ <td><input type="text" size="22" name="barcode"
+ onChange="updatetoken()"/></td>
+ </tr>
+ <tr><td><i>or</i> Type in DocID</td>
+ <td>
+ <input type="text" size="5" name="codeone" />
+ <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()" />
+ </td></tr>
+ </table>
+ </td></tr>
+ <tr><td><input type="submit" value="Check in DocID" /></td></tr>
+ </table>
+ </form>
+ ENDINPUTFIELD
+ }
-     function LONCAPAreg() {
+ sub maketoken {
- 	  menu=window.open("","LONCAPAmenu");
+     my ($symb,$tuname,$tudom,$tcrsid)=@_;
-           menu.currentStale=1;
+     unless ($symb) {
-           menu.clearbut(2,1);
+ 	$symb=&Apache::lonnet::symbread();
-           menu.clearbut(2,3);
-           menu.clearbut(8,1);
-           menu.clearbut(8,2);
-           menu.clearbut(8,3);
-           if (menu.currentURL) {
-              menu.switchbutton
-               (3,1,'reload.gif','return','location','go(currentURL)');
-  	  } else {
- 	      menu.clearbut(3,1);
-           }
      }
+     unless ($tuname) {
-     function LONCAPAstale() {
+ 	$tuname=$ENV{'user.name'};
+         $tudom=$ENV{'user.domain'};
+         $tcrsid=$ENV{'request.course.id'};
      }
- // END LON-CAPA Internal
+     return &Apache::lonnet::checkout($symb,$tuname,$tudom,$tcrsid);
- </script>
+ }
- ENDDONOTREGTHIS
+ sub printtokenheader {
+     my ($target,$token,$tsymb,$tcrsid,$tudom,$tuname)=@_;
+     unless ($token) { return ''; }
+     my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+     unless ($tsymb) {
+ 	$tsymb=$symb;
+     }
+     unless ($tuname) {
+ 	$tuname=$name;
+         $tudom=$domain;
+         $tcrsid=$courseid;
      }
- }
- sub loadevents() {
+     my %reply=&Apache::lonnet::get('environment',
-     return 'LONCAPAreg();';
+               ['firstname','middlename','lastname','generation'],
+               $tudom,$tuname);
+     my $plainname=$reply{'firstname'}.' '.
+                   $reply{'middlename'}.' '.
+                   $reply{'lastname'}.' '.
+ 		  $reply{'generation'};
+     if ($target eq 'web') {
+         my %idhash=&Apache::lonnet::idrget($tudom,($tuname));
+ 	return
+  '<img align="right" src="/cgi-bin/barcode.png?encode='.$token.'" />'.
+                'Checked out for '.$plainname.
+                '<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 {
+         return $token;
+     }
  }
- sub unloadevents() {
+ sub fontsettings() {
-     return 'LONCAPAstale();';
+     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) {
-     &Apache::lonxml::debug("$temp -- $Apache::lonxml::alltags{$temp}");
+     &Apache::lonxml::debug("$temp -- ".
+ 		  join(',',@{ $Apache::lonxml::alltags{$temp} }));
    }
  }
  sub xmlparse {
+  my ($request,$target,$content_file_string,$safeinit,%style_for_target) = @_;
+  &setup_globals($request,$target);
+  &Apache::inputtags::initialize_inputtags();
+  &Apache::outputtags::initialize_outputtags();
+  &Apache::edit::initialize_edit();
+ #
+ # do we have a course style file?
+ #
-  my ($target,$content_file_string,$safeinit,%style_for_target) = @_;
+  if ($ENV{'request.course.id'} && $ENV{'request.state'} ne 'construct') {
-  if ($target eq 'meta') {
+      my $bodytext=
-    $Apache::lonxml::redirection = 0;
+ 	 $ENV{'course.'.$ENV{'request.course.id'}.'.default_xml_style'};
-    $Apache::lonxml::metamode = 1;
+      if ($bodytext) {
-    $Apache::lonxml::evaluate = 1;
+        my $location=&Apache::lonnet::filelocation('',$bodytext);
-    $Apache::lonxml::import = 0;
+        my $styletext=&Apache::lonnet::getfile($location);
-  } elsif ($target eq 'grade') {
+        if ($styletext ne '-1') {
-    &startredirection;
+           %style_for_target = (%style_for_target,
-    $Apache::lonxml::metamode = 0;
+                           &Apache::style::styleparser($target,$styletext));
-    $Apache::lonxml::evaluate = 1;
+        }
-    $Apache::lonxml::import = 1;
+     }
-  } elsif ($target eq 'modified') {
-    $Apache::lonxml::redirection = 0;
-    $Apache::lonxml::metamode = 0;
-    $Apache::lonxml::evaluate = 0;
-    $Apache::lonxml::import = 0;
-  } else {
-    $Apache::lonxml::redirection = 0;
-    $Apache::lonxml::metamode = 0;
-    $Apache::lonxml::evaluate = 1;
-    $Apache::lonxml::import = 1;
   }
-  #&printalltags();
+ #&printalltags();
   my @pars = ();
-  @Apache::lonxml::pwd=();
   my $pwd=$ENV{'request.filename'};
   $pwd =~ s:/[^/]*$::;
   &newparser(\@pars,\$content_file_string,$pwd);
-  my $currentstring = '';
-  my $finaloutput = '';
-  my $newarg = '';
-  my $result;
   my $safeeval = new Safe;
   my $safehole = new Safe::Hole;
- Line 253  sub xmlparse {
+ Line 442  sub xmlparse {
   ($target, my @tenta) = split('&&',$target);
   my @stack = ();
   my @parstack = ();
   &initdepth;
-  my $token;
-  while ( $#pars > -1 ) {
+  my $finaloutput = &inner_xmlparse($target,\@stack,\@parstack,\@pars,
-    while ($token = $pars[$#pars]->get_token) {
+ 				   $safeeval,\%style_for_target);
-      if (($token->[0] eq 'T') || ($token->[0] eq 'C') || ($token->[0] eq 'D') ) {
-        if ($metamode<1) { $result=$token->[1]; }
+  if ($ENV{'request.uri'}) {
-      } elsif ($token->[0] eq 'PI') {
+     &writeallows($ENV{'request.uri'});
-        if ($metamode<1) { $result=$token->[2]; }
-      } elsif ($token->[0] eq 'S') {
-        # 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);
- 	 }
-        } 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[$#stack] && ($#stack > -1)) {
- 	 &Apache::lonxml::warning("Unbalanced tags in resource $stack['-1']");
- 	 pop @stack;pop @parstack;&decreasedepth($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);
- 	 }
-        } else {
- 	 $result = &callsub("end_$token->[1]", $target, $token, \@stack,
- 			    \@parstack, \@pars,$safeeval, \%style_for_target);
-        }
-      } else {
-        &Apache::lonxml::error("Unknown token event :$token->[0]:$token->[1]:");
-      }
-      #evaluate variable refs in result
-      if ($result ne "") {
-        if ( $#parstack > -1 ) {
- 	 if ($Apache::lonxml::redirection) {
- 	   $Apache::lonxml::outputstack['-1'] .=
- 	     &Apache::run::evaluate($result,$safeeval,$parstack[$#parstack]);
- 	 } else {
- 	   $finaloutput .= &Apache::run::evaluate($result,$safeeval,
- 						  $parstack[$#parstack]);
- 	 }
-        } else {
- 	 $finaloutput .= &Apache::run::evaluate($result,$safeeval,'');
-        }
-        $result = '';
-      }
-      if ($token->[0] eq 'E') {
-        pop @stack;pop @parstack;&decreasedepth($token);
-      }
-    }
-    pop @pars;
-    pop @Apache::lonxml::pwd;
   }
+  if ($Apache::lonxml::counter_changed) { &store_counter() }
+  return $finaloutput;
+ }
- # if ($target eq 'meta') {
+ sub htmlclean {
- #   $finaloutput.=&endredirection;
+     my ($raw,$full)=@_;
- # }
-   if (($ENV{'QUERY_STRING'}) && ($target eq 'web')) {
+     my $tree = HTML::TreeBuilder->new;
-       $finaloutput=&afterburn($finaloutput);
+     $tree->ignore_unknown(0);
-   }
-  return $finaloutput;
+     $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;
  }
+ sub latex_special_symbols {
+     my ($string,$where)=@_;
+     if ($where eq 'header') {
+ 	$string =~ s/(\\|_|\^)/ /g;
+ 	$string =~ s/(\$|%|\#|&|\{|\})/\\$1/g;
+     } else {
+ 	$string=~s/\\ /\\char92 /g;
+ 	$string=~s/\^/\\char94 /g;
+ 	$string=~s/\~/\\char126 /g;
+ 	$string=~s/(&[^A-Za-z\#])/\\$1/g;
+ 	$string=~s/([^&])\#/$1\\#/g;
+ 	$string=~s/(\$|_|{|})/\\$1/g;
+ 	$string=~s/\\char92 /\\texttt{\\char92}/g;
+ 	$string=~s/(>|<)/\$$1\$/g; #more or less
+ 	if ($string=~m/\d%/) {$string =~ s/(\d)%/$1\\%/g;} #percent after digit
+ 	if ($string=~m/\s%/) {$string =~ s/(\s)%/$1\\%/g;} #percent after space
+ 	if ($string eq '%.') {$string = '\%.';} #percent at the end of statement
+     }
+     return $string;
+ }
- sub recurse {
+ sub inner_xmlparse {
+   my ($target,$stack,$parstack,$pars,$safeeval,$style_for_target)=@_;
-   my @innerstack = ();
+   my $finaloutput = '';
-   my @innerparstack = ();
+   my $result;
-   my ($newarg,$target,$safeeval,$style_for_target,@parstack) = @_;
+   my $token;
-   my @pat = ();
+   my $dontpop=0;
-   &newparser(\@pat,\$newarg);
+   while ( $#$pars > -1 ) {
-   my $tokenpat;
+     while ($token = $$pars['-1']->get_token) {
-   my $partstring = '';
+       if (($token->[0] eq 'T') || ($token->[0] eq 'C') ) {
-   my $output='';
+ 	if ($metamode<1) {
-   my $decls='';
+ 	    my $text=$token->[1];
-   while ( $#pat > -1 ) {
+ 	    if ($token->[0] eq 'C' && $target eq 'tex') {
-     while  ($tokenpat = $pat[$#pat]->get_token) {
+ 		$text = '';
-       if (($tokenpat->[0] eq 'T') || ($tokenpat->[0] eq 'C') || ($tokenpat->[0] eq 'D') ) {
+ #		$text = '%'.$text."\n";
- 	if ($metamode<1) { $partstring=$tokenpat->[1]; }
+ 	    }
-       } elsif ($tokenpat->[0] eq 'PI') {
+ 	    $result.=$text;
- 	if ($metamode<1) { $partstring=$tokenpat->[2]; }
+ 	}
-       } elsif ($tokenpat->[0] eq 'S') {
+       } elsif (($token->[0] eq 'D')) {
- 	push (@innerstack,$tokenpat->[1]);
+ 	if ($metamode<1 && $target eq 'web') {
- 	push (@innerparstack,&parstring($tokenpat));
+ 	    my $text=$token->[1];
- 	&increasedepth($tokenpat);
+ 	    $result.=$text;
- 	$partstring = &callsub("start_$tokenpat->[1]", $target, $tokenpat,
+ 	}
- 			       \@innerstack, \@innerparstack, \@pat,
+       } elsif ($token->[0] eq 'PI') {
- 			       $safeeval, $style_for_target);
+ 	if ($metamode<1 && $target eq 'web') {
-       } elsif ($tokenpat->[0] eq 'E') {
+ 	  $result=$token->[2];
- 	#clear out any tags that didn't end
+ 	}
- 	while ($tokenpat->[1] ne $innerstack[$#innerstack]
+       } elsif ($token->[0] eq 'S') {
- 	       && ($#innerstack > -1)) {
+ 	# add tag to stack
- 	  &Apache::lonxml::warning("Unbalanced tags in resource $innerstack['-1']");
+ 	push (@$stack,$token->[1]);
- 	  pop @innerstack;pop @innerparstack;&decreasedepth($tokenpat);
+ 	# add parameters list to another stack
- 	}
+ 	push (@$parstack,&parstring($token));
- 	$partstring = &callsub("end_$tokenpat->[1]", $target, $tokenpat,
+ 	&increasedepth($token);
- 			       \@innerstack, \@innerparstack, \@pat,
+ 	if ($Apache::lonxml::usestyle &&
- 			       $safeeval, $style_for_target);
+ 	    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);
+ 	    $Apache::lonxml::style_values=$$parstack[-1];
+ 	    $Apache::lonxml::style_end_values=$$parstack[-1];
+ 	} else {
+ 	  $result = &callsub("start_$token->[1]", $target, $token, $stack,
+ 			     $parstack, $pars, $safeeval, $style_for_target);
+ 	}
+       } elsif ($token->[0] eq 'E') {
+ 	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 end="'.$token->[1].'" />';
+ 	    &Apache::lonxml::newparser($pars,\$string);
+ 	    $Apache::lonxml::style_values=$Apache::lonxml::style_end_values;
+ 	    $Apache::lonxml::style_end_values='';
+ 	    $dontpop=1;
+ 	} else {
+ 	    #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;');
+ 		    last;
+ 		} else {
+ 		    &Apache::lonxml::warning('Found tag &lt;/'.$token->[1].'&gt; on line '.$token->[3].' when looking for &lt;/'.$$stack[-1].'&gt; in file');
+ 		    &end_tag($stack,$parstack,$token);
+ 		}
+ 	    }
+ 	    $result = &callsub("end_$token->[1]", $target, $token, $stack,
+ 			       $parstack, $pars,$safeeval, $style_for_target);
+ 	}
        } else {
- 	&Apache::lonxml::error("Unknown token event :$tokenpat->[0]:$tokenpat->[1]:");
+ 	&Apache::lonxml::error("Unknown token event :$token->[0]:$token->[1]:");
        }
-       #pass both the variable to the style tag, and the tag we
+       #evaluate variable refs in result
-       #are processing inside the <definedtag>
+       if ($result ne "") {
-       if ( $partstring ne "" ) {
+ 	  my $extras;
- 	if ( $#parstack > -1 ) {
+ 	  if (!$Apache::lonxml::usestyle) {
- 	  if ( $#innerparstack > -1 ) {
+ 	      $extras=$Apache::lonxml::style_values;
- 	    $decls= $parstack[$#parstack].$innerparstack[$#innerparstack];
- 	  } else {
- 	    $decls= $parstack[$#parstack];
  	  }
+ 	if ( $#$parstack > -1 ) {
+ 	  $result=&Apache::run::evaluate($result,$safeeval,$extras.$$parstack[-1]);
  	} else {
- 	  if ( $#innerparstack > -1 ) {
+ 	  $result= &Apache::run::evaluate($result,$safeeval,$extras);
- 	    $decls=$innerparstack[$#innerparstack];
- 	  } else {
- 	    $decls='';
- 	  }
  	}
- 	$output .= &Apache::run::evaluate($partstring,$safeeval,$decls);
- 	$partstring = '';
        }
-       if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack;
+       if (($token->[0] eq 'T') || ($token->[0] eq 'C') || ($token->[0] eq 'D') ) {
- 				 &decreasedepth($tokenpat);}
+ 	  #Style file definitions should be correct
+ 	  if ($target eq 'tex' && ($Apache::lonxml::usestyle)) {
+ 	      $result=&latex_special_symbols($result);
+ 	  }
+       }
+       # Encode any high ASCII characters
+       if (!$Apache::lonxml::prevent_entity_encode) {
+ 	$result=&HTML::Entities::encode($result,"\200-\377");
+       }
+       if ($Apache::lonxml::redirection) {
+ 	$Apache::lonxml::outputstack['-1'] .= $result;
+       } else {
+ 	$finaloutput.=$result;
+       }
+       $result = '';
+       if ($token->[0] eq 'E' && !$dontpop) {
+ 	&end_tag($stack,$parstack,$token);
+       }
+       $dontpop=0;
+     }
+     if ($#$pars > -1) {
+ 	pop @$pars;
+ 	pop @Apache::lonxml::pwd;
      }
-     pop @pat;
-     pop @Apache::lonxml::pwd;
    }
-   return $output;
+   # if ($target eq 'meta') {
+   #   $finaloutput.=&endredirection;
+   # }
+   if (($ENV{'QUERY_STRING'}) && ($target eq 'web')) {
+     $finaloutput=&afterburn($finaloutput);
+   }
+   return $finaloutput;
  }
  sub callsub {
- Line 414  sub callsub {
+ Line 629  sub callsub {
    {
      my $sub1;
      no strict 'refs';
-     if ($target eq 'edit' && $token->[0] eq 'S') {
-       $currentstring = &Apache::edit::tag_start($target,$token,$tagstack,
- 						$parstack,$parser,
- 						$safeeval,$style);
-     }
      my $tag=$token->[1];
-     my $space=$Apache::lonxml::alltags{$tag};
+ # get utterly rid of extended html tags
+     if ($tag=~/^x\-/i) { return ''; }
+     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]
      }
-     if ($space) {
-       #&Apache::lonxml::debug("Calling sub $sub in $space $metamode<br />\n");
+     my $deleted=0;
-       $sub1="$space\:\:$sub";
+     $Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter);
-       $Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter);
+     if (($token->[0] eq 'S') && ($target eq 'modified')) {
-       ($currentstring,$nodefault) = &$sub1($target,$token,$tagstack,
+       $deleted=&Apache::edit::handle_delete($space,$target,$token,$tagstack,
- 					   $parstack,$parser,$safeeval,
+ 					     $parstack,$parser,$safeeval,
- 					   $style);
+ 					     $style);
-     } else {
+     }
-       #&Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode<br />\n");
+     if (!$deleted) {
-       if ($metamode <1) {
+       if ($space) {
- 	if (defined($token->[4]) && ($metamode < 1)) {
+ 	#&Apache::lonxml::debug("Calling sub $sub in $space $metamode");
- 	  $currentstring = $token->[4];
+ 	$sub1="$space\:\:$sub";
- 	} else {
+ 	($currentstring,$nodefault) = &$sub1($target,$token,$tagstack,
- 	  $currentstring = $token->[2];
+ 					     $parstack,$parser,$safeeval,
+ 					     $style);
+       } else {
+ 	#&Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode");
+ 	if ($metamode <1) {
+ 	  if (defined($token->[4]) && ($metamode < 1)) {
+ 	    $currentstring = $token->[4];
+ 	  } else {
+ 	    $currentstring = $token->[2];
+ 	  }
  	}
        }
-     }
+       #    &Apache::lonxml::debug("nodefalt:$nodefault:");
- #    &Apache::lonxml::debug("nodefalt:$nodefault:");
+       if ($currentstring eq '' && $nodefault eq '') {
-     if ($currentstring eq '' && $nodefault eq '') {
+ 	if ($target eq 'edit') {
-       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') {
- 	if ($token->[0] eq 'S') {
+ 	    $currentstring = &Apache::edit::tag_start($target,$token);
- 	  $currentstring = &Apache::edit::tag_start($target,$token);
+ 	  } elsif ($token->[0] eq 'E') {
- 	} elsif ($token->[0] eq 'E') {
+ 	    $currentstring = &Apache::edit::tag_end($target,$token);
- 	  $currentstring = &Apache::edit::tag_end($target,$token);
+ 	  }
- 	}
+ 	} elsif ($target eq 'modified') {
-       } elsif ($target eq 'modified') {
+ 	  if ($token->[0] eq 'S') {
- 	if ($token->[0] eq 'S') {
+ 	    $currentstring = $token->[4];
- 	  $currentstring = $token->[4];
+ 	    $currentstring.=&Apache::edit::handle_insert();
- 	  $currentstring.=&Apache::edit::handle_insert();
+ 	  } elsif ($token->[0] eq 'E') {
- 	} else {
+ 	    $currentstring = $token->[2];
- 	  $currentstring = $token->[2];
+             $currentstring.=&Apache::edit::handle_insertafter($token->[1]);
+ 	  } else {
+ 	    $currentstring = $token->[2];
+ 	  }
  	}
        }
      }
- Line 466  sub callsub {
+ Line 690  sub callsub {
    return $currentstring;
  }
+ sub setup_globals {
+   my ($request,$target)=@_;
+   $Apache::lonxml::request=$request;
+   $Apache::lonxml::registered = 0;
+   $errorcount=0;
+   $warningcount=0;
+   $Apache::lonxml::default_homework_loaded=0;
+   $Apache::lonxml::usestyle=1;
+   &init_counter();
+   @Apache::lonxml::pwd=();
+   @Apache::lonxml::extlinks=();
+   if ($target eq 'meta') {
+     $Apache::lonxml::redirection = 0;
+     $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;
+     $Apache::lonxml::evaluate = 1;
+     $Apache::lonxml::import = 1;
+   } elsif ($target eq 'modified') {
+     $Apache::lonxml::redirection = 0;
+     $Apache::lonxml::metamode = 0;
+     $Apache::lonxml::evaluate = 0;
+     $Apache::lonxml::import = 0;
+   } elsif ($target eq 'edit') {
+     $Apache::lonxml::redirection = 0;
+     $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;
+     $Apache::lonxml::evaluate = 1;
+     $Apache::lonxml::import = 1;
+   }
+ }
  sub init_safespace {
    my ($target,$safeeval,$safehole,$safeinit) = @_;
    $safeeval->permit("entereval");
    $safeeval->permit(":base_math");
    $safeeval->permit("sort");
    $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(\&Math::Cephes::asin,$safeeval,'&asin');
- Line 494  sub init_safespace {
+ Line 769  sub init_safespace {
    $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');
+   $safehole->wrap(\&Math::Random::random_f,$safeeval,'&math_random_f');
+   $safehole->wrap(\&Math::Random::random_gamma,$safeeval,'&math_random_gamma');
+   $safehole->wrap(\&Math::Random::random_multivariate_normal,$safeeval,'&math_random_multivariate_normal');
+   $safehole->wrap(\&Math::Random::random_multinomial,$safeeval,'&math_random_multinomial');
+   $safehole->wrap(\&Math::Random::random_noncentral_chi_square,$safeeval,'&math_random_noncentral_chi_square');
+   $safehole->wrap(\&Math::Random::random_noncentral_f,$safeeval,'&math_random_noncentral_f');
+   $safehole->wrap(\&Math::Random::random_normal,$safeeval,'&math_random_normal');
+   $safehole->wrap(\&Math::Random::random_permutation,$safeeval,'&math_random_permutation');
+   $safehole->wrap(\&Math::Random::random_permuted_index,$safeeval,'&math_random_permuted_index');
+   $safehole->wrap(\&Math::Random::random_uniform,$safeeval,'&math_random_uniform');
+   $safehole->wrap(\&Math::Random::random_poisson,$safeeval,'&math_random_poisson');
+   $safehole->wrap(\&Math::Random::random_uniform_integer,$safeeval,'&math_random_uniform_integer');
+   $safehole->wrap(\&Math::Random::random_negative_binomial,$safeeval,'&math_random_negative_binomial');
+   $safehole->wrap(\&Math::Random::random_binomial,$safeeval,'&math_random_binomial');
+   $safehole->wrap(\&Math::Random::random_seed_from_phrase,$safeeval,'&random_seed_from_phrase');
+   $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');
  #need to inspect this class of ops
  # $safeeval->deny(":base_orig");
-   $safeinit .= ';$external::target='.$target.';';
+   $safeinit .= ';$external::target="'.$target.'";';
-   $safeinit .= ';$external::randomseed='.&Apache::lonnet::rndseed().';';
+   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);
  }
+ 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 eq -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, '');
- Line 515  sub endredirection {
+ Line 858  sub endredirection {
    pop @Apache::lonxml::outputstack;
  }
+ sub end_tag {
+   my ($tagstack,$parstack,$token)=@_;
+   pop(@$tagstack);
+   pop(@$parstack);
+   &decreasedepth($token);
+ }
  sub initdepth {
    @Apache::lonxml::depthcounter=();
    $Apache::lonxml::depth=-1;
- Line 541  sub decreasedepth {
+ Line 891  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);
- Line 549  sub decreasedepth {
+ Line 899  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 $depth=0;
   my $token;
   my $result='';
-  if ( $tag =~ m:^/: ) {
+  $tag='<'.$tag.'>';
-    my $tag=substr($tag,1);
+  while ($token = $$pars[-1]->get_token) {
- #   &Apache::lonxml::debug("have:$tag:");
+    if (($token->[0] eq 'T')||($token->[0] eq 'C')||($token->[0] eq 'D')) {
-    while (($depth >=0) && ($token = $pars->get_token)) {
+      $result.=$token->[1];
- #     &Apache::lonxml::debug("e token:$token->[0]:$depth:$token->[1]");
+    } elsif ($token->[0] eq 'PI') {
-      if (($token->[0] eq 'T')||($token->[0] eq 'C')||($token->[0] eq 'D')) {
+      $result.=$token->[2];
-        $result.=$token->[1];
+    } elsif ($token->[0] eq 'S') {
-      } elsif ($token->[0] eq 'PI') {
+      $result.=$token->[4];
-        $result.=$token->[2];
+    } elsif ($token->[0] eq 'E')  {
-      } elsif ($token->[0] eq 'S') {
+      $result.=$token->[2];
-        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);
-        }
-      }
     }
-  } else {
+    if ($result =~ /(.*)\Q$tag\E(.*)/s) {
-    while ($token = $pars->get_token) {
+      &Apache::lonxml::debug('Got a winner with leftovers ::'.$2);
- #     &Apache::lonxml::debug("s token:$token->[0]:$depth:$token->[1]");
+      &Apache::lonxml::debug('Result is :'.$1);
-      if (($token->[0] eq 'T')||($token->[0] eq 'C')||($token->[0] eq 'D')) {
+      $result=$1;
-        $result.=$token->[1];
+      my $redo=$tag.$2;
-      } elsif ($token->[0] eq 'PI') {
+      &Apache::lonxml::newparser($pars,\$redo);
-        $result.=$token->[2];
+      last;
-      } elsif ($token->[0] eq 'S') {
-        if ( $token->[1] eq $tag) {
- 	 $pars->unget_token($token); last;
-        } else {
- 	 $result.=$token->[4];
-        }
-      } elsif ($token->[0] eq 'E')  {
-        $result.=$token->[2];
-      }
     }
   }
- # &Apache::lonxml::debug("Exit:$result:");
   return $result
  }
+ sub increment_counter {
+     my ($increment) = @_;
+     if (defined($increment) && $increment gt 0) {
+ 	$Apache::lonxml::counter+=$increment;
+     } else {
+ 	$Apache::lonxml::counter++;
+     }
+     $Apache::lonxml::counter_changed=1;
+ }
+ sub init_counter {
+     if (defined($ENV{'form.counter'})) {
+ 	$Apache::lonxml::counter=$ENV{'form.counter'};
+ 	$Apache::lonxml::counter_changed=0;
+     } else {
+ 	$Apache::lonxml::counter=1;
+ 	$Apache::lonxml::counter_changed=1;
+     }
+ }
+ sub store_counter {
+     &Apache::lonnet::appenv(('form.counter' => $Apache::lonxml::counter));
+     return '';
+ }
+ sub get_all_text {
+     my($tag,$pars,$style)= @_;
+     &Apache::lonxml::debug("Got a ".ref($pars));
+     my $gotfullstack=1;
+     if (ref($pars) ne 'ARRAY') {
+ 	$gotfullstack=0;
+ 	$pars=[$pars];
+     }
+     &Apache::lonxml::debug("Got a ".ref($style));
+     if (ref($style) ne 'HASH') {
+ 	$style={};
+     } else {
+ 	&Apache::lonhomework::showhash(%$style);
+     }
+     my $depth=0;
+     my $token;
+     my $result='';
+     if ( $tag =~ m:^/: ) {
+ 	my $tag=substr($tag,1);
+ 	#&Apache::lonxml::debug("have:$tag:");
+ 	my $top_empty=0;
+ 	while (($depth >=0) && ($#$pars > -1) && (!$top_empty)) {
+ 	    while (($depth >=0) && ($token = $$pars[-1]->get_token)) {
+ 		#&Apache::lonxml::debug("e token:$token->[0]:$depth:$token->[1]:".$#$pars.":".$#Apache::lonxml::pwd);
+ 		if (($token->[0] eq 'T')||($token->[0] eq 'C')||($token->[0] eq 'D')) {
+ 		    $result.=$token->[1];
+ 		} elsif ($token->[0] eq 'PI') {
+ 		    $result.=$token->[2];
+ 		} elsif ($token->[0] eq 'S') {
+ 		    if ($token->[1] =~ /^$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; }
+ 		    $result.=$token->[4];
+ 		} elsif ($token->[0] eq 'E')  {
+ 		    if ( $token->[1] =~ /^$tag$/i) { $depth--; }
+ 		    #skip sending back the last end tag
+ 		    if ($depth == 0 && exists($$style{'/'.$token->[1]})) {
+ 			my $string=
+ 			    '<LONCAPA_INTERNAL_TURN_STYLE_OFF end="yes" />'.
+ 				$$style{'/'.$token->[1]}.
+ 				    $token->[2].
+ 					'<LONCAPA_INTERNAL_TURN_STYLE_ON />';
+ 			&Apache::lonxml::newparser($pars,\$string);
+ 			#&Apache::lonxml::debug("reParsing $string");
+ 			next;
+ 		    }
+ 		    if ($depth > -1) {
+ 			$result.=$token->[2];
+ 		    } else {
+ 			$$pars[-1]->unget_token($token);
+ 		    }
+ 		}
+ 	    }
+ 	    if (($depth >=0) && ($#$pars == 0) ) { $top_empty=1; }
+ 	    if (($depth >=0) && ($#$pars > 0) ) {
+ 		pop(@$pars);
+ 		pop(@Apache::lonxml::pwd);
+ 	    }
+ 	}
+ 	if ($top_empty && $depth >= 0) {
+ 	    #never found the end tag ran out of text, throw error send back blank
+ 	    &error('Never found end tag for &lt;'.$tag.
+ 		   '&gt; current string <pre>'.
+ 		   &HTML::Entities::encode($result).
+ 		   '</pre>');
+ 	    if ($gotfullstack) {
+ 		my $newstring='</'.$tag.'>'.$result;
+ 		&Apache::lonxml::newparser($pars,\$newstring);
+ 	    }
+ 	    $result='';
+ 	}
+     } else {
+ 	while ($#$pars > -1) {
+ 	    while ($token = $$pars[-1]->get_token) {
+ 		#&Apache::lonxml::debug("s token:$token->[0]:$depth:$token->[1]");
+ 		if (($token->[0] eq 'T')||($token->[0] eq 'C')||
+ 		    ($token->[0] eq 'D')) {
+ 		    $result.=$token->[1];
+ 		} elsif ($token->[0] eq 'PI') {
+ 		    $result.=$token->[2];
+ 		} elsif ($token->[0] eq 'S') {
+ 		    if ( $token->[1] =~ /^$tag$/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; }
+ 		} elsif ($token->[0] eq 'E')  {
+ 		    $result.=$token->[2];
+ 		}
+ 	    }
+ 	    if (($#$pars > 0) ) {
+ 		pop(@$pars);
+ 		pop(@Apache::lonxml::pwd);
+ 	    } else { last; }
+ 	}
+     }
+     #&Apache::lonxml::debug("Exit:$result:");
+     return $result
+ }
  sub newparser {
    my ($parser,$contentref,$dir) = @_;
-   push (@$parser,HTML::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]);
    } else {
      push (@Apache::lonxml::pwd, $dir);
    }
- #  &Apache::lonxml::debug("pwd:$#Apache::lonxml::pwd");
- #  &Apache::lonxml::debug("pwd:$Apache::lonxml::pwd[$#Apache::lonxml::pwd]");
  }
  sub parstring {
    my ($token) = @_;
    my $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\";"
+       $temp .= "my \$$_=\"$val\";";
      }
-   } @{$token->[3]};
+   }
    return $temp;
  }
  sub writeallows {
+     unless ($#extlinks>=0) { return; }
      my $thisurl='/res/'.&Apache::lonnet::declutter(shift);
+     if ($ENV{'httpref.'.$thisurl}) {
+ 	$thisurl=$ENV{'httpref.'.$thisurl};
+     }
      my $thisdir=$thisurl;
      $thisdir=~s/\/[^\/]+$//;
      my %httpref=();
-     map {
+     foreach (@extlinks) {
         $httpref{'httpref.'.
-  	        &Apache::lonnet::hreflocation($thisdir,$_)}=$thisurl;              } @extlinks;
+  	        &Apache::lonnet::hreflocation($thisdir,$_)}=$thisurl;
+     }
+     @extlinks=();
      &Apache::lonnet::appenv(%httpref);
  }
- Line 640  sub writeallows {
+ Line 1101  sub writeallows {
  #
  sub afterburn {
      my $result=shift;
-     map {
+     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-        my ($name, $value) = split(/=/,$_);
+ 					    ['highlight','anchor','link']);
-        $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'}));
      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'};
- Line 672  sub afterburn {
+ Line 1125  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
- Line 685  sub storefile {
+ Line 1138  sub storefile {
      if (my $fh=Apache::File->new('>'.$file)) {
  	print $fh $contents;
          $fh->close();
+         return 1;
+     } else {
+ 	&warning("Unable to save file $file");
+ 	return 0;
      }
  }
- sub inserteditinfo {
+ sub createnewhtml {
-       my ($result,$filecontents)=@_;
+   my $filecontents=(<<SIMPLECONTENT);
-       unless ($filecontents) {
- 	  $filecontents=(<<SIMPLECONTENT);
  <html>
  <head>
  <title>
- Line 705  sub inserteditinfo {
+ Line 1160  sub inserteditinfo {
  </body>
  </html>
  SIMPLECONTENT
-       }
+   return $filecontents;
-       my $editheader='<a href="#editsection">Edit below</a><hr />';
+ }
+ sub inserteditinfo {
+       my ($result,$filecontents)=@_;
+       $filecontents = &HTML::Entities::encode($filecontents);
+ #      my $editheader='<a href="#editsection">Edit below</a><hr />';
+       my $xml_help = Apache::loncommon::helpLatexCheatsheet();
+       my $titledisplay=&display_title();
+       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">
+ $xml_help
+ <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="savethisfile" value="Save this file" />
  </form>
+ $titledisplay
  ENDFOOTER
-       $result=~s/(\<body[^\>]*\>)/$1$editheader/is;
+ #      $result=~s/(\<body[^\>]*\>)/$1$editheader/is;
        $result=~s/(\<\/body\>)/$editfooter/is;
        return $result;
  }
- sub handler {
+ sub get_target {
-   my $request=shift;
+   my $viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
+   if ( $ENV{'request.state'} eq 'published') {
-   my $target='web';
+     if ( defined($ENV{'form.grade_target'})
+ 	 && ($viewgrades == 'F' )) {
-   $Apache::lonxml::debug=0;
+       return ($ENV{'form.grade_target'});
+     } elsif (defined($ENV{'form.grade_target'})) {
-   if ($ENV{'browser.mathml'}) {
+       if (($ENV{'form.grade_target'} eq 'web') ||
-     $request->content_type('text/xml');
+ 	  ($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 {
-     $request->content_type('text/html');
+     return 'web';
    }
+ }
-   $request->send_http_header;
+ sub handler {
-   return OK if $request->header_only;
+     my $request=shift;
+     my $target=&get_target();
+     $Apache::lonxml::debug=$ENV{'user.debug'};
+     if ($ENV{'browser.mathml'}) {
+ 	$request->content_type('text/xml');
+     } else {
+ 	$request->content_type('text/html');
+     }
+     &Apache::loncommon::no_cache($request);
+     $request->send_http_header;
+     return OK if $request->header_only;
-   my $file=&Apache::lonnet::filelocation("",$request->uri);
+     my $file=&Apache::lonnet::filelocation("",$request->uri);
  #
  # Edit action? Save file.
  #
-   unless ($ENV{'request.state'} eq 'published') {
+     unless ($ENV{'request.state'} eq 'published') {
-       if ($ENV{'form.savethisfile'}) {
+ 	if (($ENV{'form.savethisfile'}) || ($ENV{'form.attemptclean'})) {
- 	  &storefile($file,$ENV{'form.filecont'});
+ 	    if (&storefile($file,$ENV{'form.filecont'})) {
-       }
+ 		$request->print("<font COLOR=\"#0000FF\">Updated: ". strftime("%d %b %H:%M:%S",localtime())." </font>");
-   }
+ 	    }
-   my %mystyle;
+ 	}
-   my $result = '';
+     }
-   my $filecontents=&Apache::lonnet::getfile($file);
+     my %mystyle;
-   if ($filecontents == -1) {
+     my $result = '';
-     $result=(<<ENDNOTFOUND);
+     my $filecontents=&Apache::lonnet::getfile($file);
+     if ($filecontents eq -1) {
+ 	$result=(<<ENDNOTFOUND);
  <html>
  <head>
  <title>File not found</title>
- Line 763  sub handler {
+ Line 1265  sub handler {
  </html>
  ENDNOTFOUND
      $filecontents='';
-   } else {
+ 	if ($ENV{'request.state'} ne 'published') {
-     $result = &Apache::lonxml::xmlparse($target,$filecontents,'',%mystyle);
+ 	    $filecontents=&createnewhtml();
-   }
+ 	    $ENV{'form.editmode'}='Edit'; #force edit mode
+ 	}
+     } else {
+ 	unless ($ENV{'request.state'} eq 'published') {
+ 	    if ($ENV{'form.attemptclean'}) {
+ 		$filecontents=&htmlclean($filecontents,1);
+ 	    }
+ #
+ # 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);
+ 	}
+     }
  #
  # Edit action? Insert editing commands
  #
-   unless ($ENV{'request.state'} eq 'published') {
+     unless ($ENV{'request.state'} eq 'published') {
-       $result=&inserteditinfo($result,$filecontents);
+ 	if ($ENV{'form.editmode'} && (!($ENV{'form.viewmode'}))) {
-   }
+ 	    my $displayfile=$request->uri;
+ 	    $displayfile=~s/^\/[^\/]*//;
-   $request->print($result);
+ 	    $result='<html><body bgcolor="#FFFFFF"><h3>'.$displayfile.
+ 		'</h3></body></html>';
-   writeallows($request->uri);
+ 	    $result=&inserteditinfo($result,$filecontents);
-   return OK;
+ 	}
+     }
+     writeallows($request->uri);
+     $request->print($result);
+     return OK;
+ }
+ sub display_title {
+     my $result;
+     if ($ENV{'request.state'} eq 'construct') {
+ 	my $title=&Apache::lonnet::gettitle();
+ 	if (!defined($title) || $title eq '') {
+ 	    $title = $ENV{'request.filename'};
+ 	    $title = substr($title, rindex($title, '/') + 1);
+ 	}
+ 	$result = "<script type='text/javascript'>top.document.title = '$title - LON-CAPA Construction Space';</script>";
+     }
+     return $result;
  }
  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'};
+       my (undef,%users)=&Apache::lonfeedback::decide_receiver(undef,0,1,1,1);
-       foreach my $user (split /\,/, $users) {
+       my $declutter=&Apache::lonnet::declutter($ENV{'request.filename'});
- 	($user,my $domain) = split /:/, $user;
+       foreach (keys %users) {
- 	&Apache::lonmsg::user_normal_msg($user,$domain,"Error in $ENV{'request.filename'}",$_[0]);
+ 	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 {
-   if ($ENV{'request.state'} eq 'construct') {
+   $warningcount++;
-     print "<b>W</b>ARNING<b>:</b>".$_[0]."<br />\n";
+   if ($ENV{'form.grade_target'} ne 'tex') {
+       if ($ENV{'request.state'} eq 'construct' || $Apache::lonxml::debug) {
+         print "<b>W</b>ARNING<b>:</b>".join('<br />',@_)."<br />\n";
+       }
    }
  }
  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 {
- Line 831  sub register_insert {
+ Line 1420  sub register_insert {
      my $line = $data[$i];
      if ( $line =~ /^\#/ || $line =~ /^\s*\n/) { next; }
      if ( $line =~ /TABLE/ ) { last; }
-     my ($tag,$descrip,$function,$show) = split(/,/, $line);
+     my ($tag,$descrip,$color,$function,$show,$helpfile,$helpdesc) = split(/,/, $line);
-     $insertlist{"$tagnum.tag"} = $tag;
+     if ($tag) {
-     $insertlist{"$tagnum.description"} = $descrip;
+       $insertlist{"$tagnum.tag"} = $tag;
-     $insertlist{"$tagnum.function"} = $function;
+       $insertlist{"$tagnum.description"} = $descrip;
-     $insertlist{"$tagnum.show"}= $show;
+       $insertlist{"$tagnum.color"} = $color;
-     $tagnum++;
+       $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++;
+     }
    }
    $i++; #skipping TABLE line
    $tagnum = 0;
- Line 844  sub register_insert {
+ Line 1440  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);
- Line 854  sub register_insert {
+ Line 1450  sub register_insert {
      $tagnum++;
    }
  }
+ 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'};
+ }
+ # Returns a list containing the help file, and the description
+ sub helpinfo {
+   my ($token)=@_;
+   my $tagnum;
+   my $tag=$token->[1];
+   foreach my $namespace (reverse @Apache::lonxml::namespace) {
+     my $testtag=$namespace.'::'.$tag;
+     $tagnum=$insertlist{"$testtag.num"};
+     if (defined($tagnum)) { last; }
+   }
+   if (!defined ($tagnum)) { $tagnum=$Apache::lonxml::insertlist{"$tag.num"}; }
+   return ($insertlist{$tagnum.'.helpfile'}, $insertlist{$tagnum.'.helpdesc'});
+ }
+ # ----------------------------------------------------------------- whichuser
+ # returns a list of $symb, $courseid, $domain, $name that is correct for
+ # calls to lonnet functions for this setup.
+ # - 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'};
+     }
+   } 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);
+ }
 ;
  __END__

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

Removed from v.1.89
changed lines
	Added in v.1.272