--- loncom/interface/lonhelp.pm 2004/01/15 03:18:19 1.14 +++ loncom/interface/lonhelp.pm 2005/07/12 15:53:48 1.19 @@ -37,6 +37,7 @@ use Apache::lonacc(); use Apache::lontexconvert(); use Apache::lonnavmaps; # for advancedUser use Apache::lonlocal; +use Apache::lonnet; use tth(); use GDBM_File(); @@ -53,11 +54,12 @@ sub processLabelName sub serveTex { my ($tex, $r) = @_; + my $html=&Apache::lonxml::xmlbegin(); my $bugs=&Apache::loncommon::help_open_bug('Documentation'); my $header=&mt('LON-CAPA Help'); my $footer=&mt('About LON-CAPA help and More Help'); -$r->print(< + $r->print(< LON-CAPA Help @@ -69,7 +71,7 @@ HEADER $r->print($tex); - if (Apache::lonnavmaps::advancedUser()) { + if (&Apache::lonnavmaps::advancedUser()) { $r->print(<
@@ -77,13 +79,13 @@ $r->print(< FOOTER -} else { + } else { $r->print(< FOOTER -} + } } # Render takes a tex fragment, transforms it for TtH, and returns the @@ -101,7 +103,11 @@ sub render # LaTeX .aux files # absolute paths for use with help.loncapa.org $tex =~ s| \\ref\{([^}]*)\} - |'\\begin{html}' . @@ -118,7 +124,7 @@ sub render |gxe; - $tex=&Apache::lontexconvert::converted(\$tex); + $tex=&Apache::lontexconvert::tth_converted(\$tex); # Finish backslashes $tex =~ s/###BACKSLASH###/'\\'/ge; @@ -145,7 +151,7 @@ sub handler my $filenames = &Apache::lonnet::unescape(substr ($ENV{'REQUEST_URI'} , rindex($ENV{'REQUEST_URI'}, '/') + 1, -4)); - + # Security check on the file; the whole filename must consist # of nothing but alphanums, ' ,, or ., or the file # will be "not found", no matter what. @@ -175,10 +181,10 @@ sub handler $tex .= join('', <$file>); } - if ($ENV{'browser.mathml'}) { + if ($env{'browser.mathml'}) { &Apache::loncommon::content_type($r,'text/xml'); &tth::ttminit(); - if ($ENV{'browser.unicode'}) { + if ($env{'browser.unicode'}) { &tth::ttmoptions('-L -u1'); } else { &tth::ttmoptions('-L -u0'); @@ -186,7 +192,7 @@ sub handler } else { &Apache::loncommon::content_type($r,"text/html"); &tth::tthinit(); - if ($ENV{'browser.unicode'}) { + if ($env{'browser.unicode'}) { &tth::tthoptions('-L -u1'); } else { &tth::tthoptions('-L -u0');