--- loncom/xml/lonxml.pm 2001/03/30 01:42:23 1.67 +++ 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='' + .'' + .']>' + .''; + } else { + $output=''; + } + return $output; +} + +sub xmlend { + return ''; +} + +sub registerurl { + return (< + if (window.location.pathname!="/res/adm/pages/menu.html") { + menu=window.open("","LONCAPAmenu"); + menu.currentURL=window.location.pathname; + menu.currentStale=0; + } + +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; @@ -255,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
\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
\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
\n"); + &Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode
\n"); if ($metamode <1) { if (defined($token->[4]) && ($metamode < 1)) { $currentstring .= $token->[4]; @@ -462,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 { @@ -483,10 +523,6 @@ sub handler { return OK if $request->header_only; - if ($target eq 'web') { - $request->print(&Apache::lontexconvert::header()); - $request->print(''."\n"); - } my $file=&Apache::lonnet::filelocation("",$request->uri); my %mystyle; @@ -499,20 +535,12 @@ sub handler { $result = &Apache::lonxml::xmlparse($target,$filecontents,'',%mystyle); } - if ($target eq 'tex') { -# $request->print('\end{document}'."\n"); - } elsif ($target eq 'web') { - $request->print(''); - $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]."
\n"; @@ -549,3 +577,5 @@ sub warning { 1; __END__ + +