--- loncom/interface/lonhelp.pm 2002/07/26 19:58:52 1.3 +++ loncom/interface/lonhelp.pm 2004/05/17 22:08:56 1.15 @@ -31,10 +31,14 @@ package Apache::lonhelp; use strict; use Apache::Constants qw(:common :http); -use Apache::File; -use Apache::loncommon; -use tth; -use GDBM_File; +use Apache::File(); +use Apache::loncommon(); +use Apache::lonacc(); +use Apache::lontexconvert(); +use Apache::lonnavmaps; # for advancedUser +use Apache::lonlocal; +use tth(); +use GDBM_File(); # This sub takes the name of a label in, and converts it to something # that is a valid anchor name. @@ -49,24 +53,38 @@ sub processLabelName sub serveTex { my ($tex, $r) = @_; - + 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 +

$header
$bugs

HEADER $r->print($tex); + if (Apache::lonnavmaps::advancedUser()) { $r->print(< +
+
$footer
+ + +FOOTER +} else { + $r->print(< FOOTER } +} # Render takes a tex fragment, transforms it for TtH, and returns the # HTML equivalent @@ -83,7 +101,11 @@ sub render # LaTeX .aux files # absolute paths for use with help.loncapa.org $tex =~ s| \\ref\{([^}]*)\} - |'\\begin{html}' . @@ -99,8 +121,9 @@ sub render ' bordercolor="#000000"/>\\end{html}' |gxe; - $tex = tth::tth($tex); + $tex=&Apache::lontexconvert::converted(\$tex); + # Finish backslashes $tex =~ s/###BACKSLASH###/'\\'/ge; @@ -111,7 +134,7 @@ sub render # just duck the issue... $tex =~ s/Figure 0://g; - + $tex.=$Apache::lontexconvert::errorstring; untie %fragmentLabels; return $tex; @@ -124,20 +147,58 @@ sub handler my $docroot = $r->dir_config('lonDocRoot'); my $serverroot = $ENV{'HTTP_HOST'}; - my $filename = 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 # will be "not found", no matter what. - return 404 if ($filename !~ /\A[-0-9a-zA-z_'',.]+\Z/); + return HTTP_NOT_FOUND if ($filenames !~ /\A[-0-9a-zA-z_'',:.]+\Z/); + + &Apache::lonlocal::get_language_handle($r); + + # Join together the tex files, return HTTP_NOT_FOUND if any of + # them are not found + my $tex = ''; + # Since in insertlist.tab I want to specify multiple files, + # and insertlist.tab also uses commas, I need something else + # so replace : with , + $filenames =~ s/:/,/g; + my @files = split(/,/, $filenames); + + for my $filename (@files) { + 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')) + or return HTTP_NOT_FOUND; + $tex .= join('', <$file>); + } + + if ($ENV{'browser.mathml'}) { + &Apache::loncommon::content_type($r,'text/xml'); + &tth::ttminit(); + if ($ENV{'browser.unicode'}) { + &tth::ttmoptions('-L -u1'); + } else { + &tth::ttmoptions('-L -u0'); + } + } else { + &Apache::loncommon::content_type($r,"text/html"); + &tth::tthinit(); + if ($ENV{'browser.unicode'}) { + &tth::tthoptions('-L -u1'); + } else { + &tth::tthoptions('-L -u0'); + } + } - (my $file = Apache::File->new($docroot . "/adm/help/tex/".$filename.'.tex')) - or return 404; - my $tex = join('', <$file>); + $r->send_http_header; $tex = render($tex, $docroot, $serverroot); - $r->content_type("text/html"); serveTex($tex, $r); return OK;