--- loncom/xml/lontexconvert.pm 2001/05/03 22:54:12 1.2 +++ loncom/xml/lontexconvert.pm 2001/05/04 17:38:22 1.3 @@ -3,6 +3,7 @@ # # 05/29/00,05/30,10/11,10/20 Gerd Kortemeyer # 05/03/2001 Scott Harrison +# 5/4 Gerd Kortemeyer package Apache::lontexconvert; @@ -10,43 +11,23 @@ use strict; use tth; use vars qw($errorstring); use Apache::lonmsg; +use Apache::lonxml; # ====================================================================== Header sub header { $errorstring=''; my $time=time; - my $addhead=< - if (window.location.pathname!="/res/adm/pages/menu.html") { - menu=window.open("","LONCAPAmenu"); - menu.currentURL=window.location.pathname; - } - -END if ($ENV{'browser.mathml'}) { &tth::ttminit(); - return '' - .'' - .']>' - .'' - ."$addhead" - ."\n"; } else { &tth::tthinit(); - my $headerstring=''; - if ($ENV{'browser.os'} eq 'mac') { - $headerstring.="\n" - .'' - ."\n$addhead\n"; - } - else { - $headerstring.="$addhead"; - } - return $headerstring."\n"; } + return &Apache::lonxml::xmlbegin(). + &Apache::lonxml::fontsettings(). + "\n\n". + &Apache::lonxml::registerurl(). + "\n\n"; } # ================================================================== Conversion @@ -77,7 +58,7 @@ sub footer { &Apache::lonmsg::author_res_msg($ENV{'request.filename'},$errorstring); } # -------------------------------------------------------------------- End Body - $xmlstring.=''; + $xmlstring.=&Apache::lonxml::xmlend(); return $xmlstring; }