--- loncom/xml/lontexconvert.pm 2001/05/03 21:28:53 1.1
+++ 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=<<END;
-<script language="JavaScript">
- if (window.location.pathname!="/res/adm/pages/menu.html") {
- menu=window.open("","LONCAPAmenu");
- menu.currentURL=window.location.href;
- }
-</script>
-END
if ($ENV{'browser.mathml'}) {
&tth::ttminit();
- return '<?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">'
- ."<head>$addhead</head>"
- ."\n";
} else {
&tth::tthinit();
- my $headerstring='<html>';
- if ($ENV{'browser.os'} eq 'mac') {
- $headerstring.="<head>\n"
- .'<meta Content-Type="text/html; charset=x-mac-roman">'
- ."\n$addhead</head>\n";
- }
- else {
- $headerstring.="<head>$addhead</head>";
- }
- return $headerstring."\n";
}
+ return &Apache::lonxml::xmlbegin().
+ &Apache::lonxml::fontsettings().
+ "\n<head>\n".
+ &Apache::lonxml::registerurl().
+ "\n</head>\n";
}
# ================================================================== Conversion
@@ -77,7 +58,7 @@ sub footer {
&Apache::lonmsg::author_res_msg($ENV{'request.filename'},$errorstring);
}
# -------------------------------------------------------------------- End Body
- $xmlstring.='</html>';
+ $xmlstring.=&Apache::lonxml::xmlend();
return $xmlstring;
}