--- loncom/interface/lonhelp.pm 2006/05/30 12:46:09 1.27 +++ loncom/interface/lonhelp.pm 2006/06/30 03:50:02 1.29 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonhelp.pm,v 1.27 2006/05/30 12:46:09 www Exp $ +# $Id: lonhelp.pm,v 1.29 2006/06/30 03:50:02 albertel Exp $ # # .tex help system web server handler # @@ -164,9 +164,9 @@ sub listmatches { $line=~s/\{//gs; $line=~s/\}//gs; $line=~s/\\/ /gs; - $line=~s/(\Q$term\E)/\$1\<\/b\>/gsi; $line=~s/\/\>\;/gs; + $line=~s/(\Q$term\E)/\$1\<\/b\>/gsi; $quote.='
...'.$line.'...'; } } @@ -191,9 +191,9 @@ sub handler { my $serverroot = $ENV{'HTTP_HOST'}; &Apache::lonlocal::get_language_handle($r); + &Apache::loncommon::content_type($r,"text/html"); my $text=''; if ($env{'form.searchterm'}=~/\w/) { - &Apache::loncommon::content_type($r,"text/html"); ($text,my $matches)=&listmatches($docroot,$env{'form.searchterm'},&Apache::lonlocal::current_language().'/'); if ($matches) { my ($englishresult,$englishmatches)=&listmatches($docroot,$env{'form.searchterm'}); @@ -233,24 +233,7 @@ sub handler { 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'); - } - } + $text = &render($tex, $docroot, $serverroot); }