--- loncom/interface/lonhelp.pm 2003/09/22 04:14:04 1.10 +++ loncom/interface/lonhelp.pm 2005/03/22 16:49:02 1.17 @@ -36,6 +36,7 @@ use Apache::loncommon(); use Apache::lonacc(); use Apache::lontexconvert(); use Apache::lonnavmaps; # for advancedUser +use Apache::lonlocal; use tth(); use GDBM_File(); @@ -52,15 +53,18 @@ sub processLabelName sub serveTex { my ($tex, $r) = @_; - -$r->print(< + 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(< LON-CAPA Help

LON-CAPA Help

+ src="/adm/help/gif/lonhelpheader.gif"/>$header
$bugs HEADER @@ -70,8 +74,7 @@ HEADER $r->print(<
-
About - LON-CAPA help and More Help
+
$footer
FOOTER @@ -99,7 +102,11 @@ sub render # LaTeX .aux files # absolute paths for use with help.loncapa.org $tex =~ s| \\ref\{([^}]*)\} - |'\\begin{html}' . @@ -116,7 +123,7 @@ sub render |gxe; - $tex=&Apache::lontexconvert::converted(\$tex); + $tex=&Apache::lontexconvert::tth_converted(\$tex); # Finish backslashes $tex =~ s/###BACKSLASH###/'\\'/ge; @@ -141,8 +148,8 @@ sub handler my $docroot = $r->dir_config('lonDocRoot'); my $serverroot = $ENV{'HTTP_HOST'}; - my $filenames = substr ($ENV{'REQUEST_URI'} , - rindex($ENV{'REQUEST_URI'}, '/') + 1, -4); + 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 @@ -162,9 +169,10 @@ sub handler my @files = split(/,/, $filenames); for my $filename (@files) { - if (-e $docroot.'/adm/help/tex/'.$filename.'_'. - &Apache::lonlocal::current_language().'.tex') { - $filename.='_'.&Apache::lonlocal::current_language(); + if (-e $docroot.'/adm/help/tex/'. + &Apache::lonlocal::current_language().'/'. + $filename.'.tex') { + $filename=&Apache::lonlocal::current_language().'/'.$filename; } (my $file = Apache::File->new($docroot . '/adm/help/tex/'.$filename.'.tex')) @@ -172,9 +180,6 @@ sub handler $tex .= join('', <$file>); } - # get me my environment if it exists - &Apache::lonacc::handler($r); - if ($ENV{'browser.mathml'}) { &Apache::loncommon::content_type($r,'text/xml'); &tth::ttminit(); @@ -193,6 +198,7 @@ sub handler } } + $r->send_http_header; $tex = render($tex, $docroot, $serverroot); serveTex($tex, $r);