--- loncom/xml/lonxml.pm 2003/04/11 16:03:26 1.248 +++ loncom/xml/lonxml.pm 2003/05/16 20:51:25 1.254 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # XML Parser Module # -# $Id: lonxml.pm,v 1.248 2003/04/11 16:03:26 albertel Exp $ +# $Id: lonxml.pm,v 1.254 2003/05/16 20:51:25 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -560,9 +560,10 @@ sub inner_xmlparse { } } if (($token->[0] eq 'T') || ($token->[0] eq 'C') || ($token->[0] eq 'D') ) { - if ($target eq 'tex') { - $result=&latex_special_symbols($result,$stack,$parstack); - } + #Style file definitions should be correct + if ($target eq 'tex' && ($Apache::lonxml::usestyle)) { + $result=&latex_special_symbols($result,$stack,$parstack); + } } # Encode any high ASCII characters @@ -721,6 +722,7 @@ sub init_safespace { $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'); @@ -802,6 +804,7 @@ sub init_safespace { 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); } @@ -1126,6 +1129,7 @@ sub inserteditinfo { &Apache::loncommon::help_open_topic("Other_Symbols",'Other Symbols', undef,undef,600) .''; + my $titledisplay=&display_title(); my $buttons=(< @@ -1143,6 +1147,7 @@ $buttons

$buttons
+$titledisplay ENDFOOTER # $result=~s/(\]*\>)/$1$editheader/is; $result=~s/(\<\/body\>)/$editfooter/is; @@ -1249,11 +1254,25 @@ ENDNOTFOUND 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 = ""; + } + return $result; +} + sub debug { if ($Apache::lonxml::debug eq 1) { $|=1;