--- loncom/interface/lonhelp.pm 2002/07/08 20:47:41 1.2 +++ loncom/interface/lonhelp.pm 2003/07/29 15:06:47 1.7 @@ -31,10 +31,12 @@ 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 tth(); +use GDBM_File(); # This sub takes the name of a label in, and converts it to something # that is a valid anchor name. @@ -56,6 +58,8 @@ $r->print(<LON-CAPA Help +

LON-CAPA Help

HEADER @@ -63,6 +67,9 @@ HEADER $r->print(< +
+
About + LON-CAPA help and More Help
FOOTER @@ -90,19 +97,29 @@ sub render '\\end{html}' |gxe; + # Backslashes + $tex =~ s|\\textbackslash|###BACKSLASH###|g; + # Figures leftover without captions $tex =~ s| \\includegraphics(\[[^]]*\])*\{([^}]*)\} | '\\begin{html}\\end{html}' |gxe; - $tex = tth::tth($tex); + + $tex=&Apache::lontexconvert::converted(\$tex); + + # Finish backslashes + $tex =~ s/###BACKSLASH###/'\\'/ge; + + # Fix the pretty quotes + $tex =~ s/('')|(``)/"/g; #" to get emacs syntax highlighter happy # For some reason all captions come out as "Figure 0:", so # just duck the issue... $tex =~ s/Figure 0://g; - + $tex.=$Apache::lontexconvert::errorstring; untie %fragmentLabels; return $tex; @@ -115,20 +132,53 @@ sub handler my $docroot = $r->dir_config('lonDocRoot'); my $serverroot = $ENV{'HTTP_HOST'}; - my $filename = substr ($ENV{'REQUEST_URI'} , + my $filenames = 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/); + + # 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) { + (my $file = Apache::File->new($docroot + . '/adm/help/tex/'.$filename.'.tex')) + or return HTTP_NOT_FOUND; + $tex .= join('', <$file>); + } + + # get me my environment if it exists + &Apache::lonacc::handler($r); + + if ($ENV{'browser.mathml'}) { + $r->content_type('text/xml'); + &tth::ttminit(); + if ($ENV{'browser.unicode'}) { + &tth::ttmoptions('-L -u1'); + } else { + &tth::ttmoptions('-L -u0'); + } + } else { + $r->content_type("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>); $tex = render($tex, $docroot, $serverroot); - $r->content_type("text/html"); serveTex($tex, $r); return OK;