--- loncom/xml/lonxml.pm 2001/03/29 20:47:06 1.66
+++ loncom/xml/lonxml.pm 2001/05/04 15:29:32 1.68
@@ -5,7 +5,7 @@
# 11/6 Gerd Kortemeyer
# 6/1/1 Gerd Kortemeyer
# 2/21,3/13 Guy
-# 3/29 Gerd Kortemeyer
+# 3/29,5/4 Gerd Kortemeyer
package Apache::lonxml;
use vars
@@ -17,6 +17,38 @@ use Safe::Hole;
use Opcode;
use Apache::Constants qw(:common);
+
+sub xmlbegin {
+ my $output='';
+ if ($ENV{'browser.mathml'}) {
+ $output='<?xml version="1.0"?>'
+ .'<?xml-stylesheet type="text/css" href="/adm/MathML/mathml.css"?>'
+ .'<!DOCTYPE html SYSTEM "/adm/MathML/mathml.dtd" '
+ .'[<!ENTITY mathns "http://www.w3.org/1998/Math/MathML">]>'
+ .'<html xmlns:math="http://www.w3.org/1998/Math/MathML" '
+ .'xmlns="http://www.w3.org/TR/REC-html40">';
+ } else {
+ $output='<html>';
+ }
+ return $output;
+}
+
+sub xmlend {
+ return '</html>';
+}
+
+sub registerurl {
+ return (<<ENDSCRIPT);
+<script language="JavaScript">
+ if (window.location.pathname!="/res/adm/pages/menu.html") {
+ menu=window.open("","LONCAPAmenu");
+ menu.currentURL=window.location.pathname;
+ menu.currentStale=0;
+ }
+</script>
+ENDSCRIPT
+}
+
sub register {
my $space;
my @taglist;
@@ -34,7 +66,6 @@ sub printalltags {
}
}
use Apache::style;
-use Apache::lontexconvert;
use Apache::run;
use Apache::londefdef;
use Apache::scripttag;
@@ -171,9 +202,15 @@ sub xmlparse {
# if ($target eq 'meta') {
# $finaloutput.=&endredirection;
# }
+
+ if (($ENV{'QUERY_STRING'}) && ($target eq 'web')) {
+ $finaloutput=&afterburn($finaloutput);
+ }
+
return $finaloutput;
}
+
sub recurse {
my @innerstack = ();
@@ -249,14 +286,21 @@ sub callsub {
$currentstring = &Apache::edit::tag_start($target,$token,$parstack,$parser,
$safeeval,$style);
}
- if (my $space=$Apache::lonxml::alltags{$token->[1]}) {
-# &Apache::lonxml::debug("Calling sub $sub in $space $metamode<br />\n");
+ my $tag=$token->[1];
+ my $space=$Apache::lonxml::alltags{$tag};
+ if (!$space) {
+ $tag=~tr/A-Z/a-z/;
+ $sub=~tr/A-Z/a-z/;
+ $space=$Apache::lonxml::alltags{$tag}
+ }
+ if ($space) {
+ &Apache::lonxml::debug("Calling sub $sub in $space $metamode<br />\n");
$sub1="$space\:\:$sub";
$Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter);
$currentstring .= &$sub1($target,$token,$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<br />\n");
if ($metamode <1) {
if (defined($token->[4]) && ($metamode < 1)) {
$currentstring .= $token->[4];
@@ -456,9 +500,11 @@ ENDSCRIPT
sub handler {
my $request=shift;
-
+
my $target='web';
+
$Apache::lonxml::debug=0;
+
if ($ENV{'browser.mathml'}) {
$request->content_type('text/xml');
} else {
@@ -477,10 +523,6 @@ sub handler {
return OK if $request->header_only;
- if ($target eq 'web') {
- $request->print(&Apache::lontexconvert::header());
- $request->print('<body bgcolor="#FFFFFF">'."\n");
- }
my $file=&Apache::lonnet::filelocation("",$request->uri);
my %mystyle;
@@ -492,27 +534,13 @@ sub handler {
} else {
$result = &Apache::lonxml::xmlparse($target,$filecontents,'',%mystyle);
}
-#
-# Afterburner
-#
- if ($ENV{'QUERY_STRING'}) {
- $result=&afterburn($result);
- }
- $request->print($result);
-
- if ($target eq 'tex') {
-# $request->print('\end{document}'."\n");
- } elsif ($target eq 'web') {
- $request->print('</body>');
- $request->print(&Apache::lontexconvert::footer());
- }
+ $request->print($result);
writeallows($request->uri);
return OK;
}
-$Apache::lonxml::debug=0;
sub debug {
if ($Apache::lonxml::debug eq 1) {
print "DEBUG:".$_[0]."<br />\n";
@@ -549,3 +577,5 @@ sub warning {
1;
__END__
+
+