--- loncom/xml/lontexconvert.pm 2005/08/16 16:29:53 1.68
+++ loncom/xml/lontexconvert.pm 2006/09/05 17:33:11 1.76
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# TeX Conversion Module
#
-# $Id: lontexconvert.pm,v 1.68 2005/08/16 16:29:53 albertel Exp $
+# $Id: lontexconvert.pm,v 1.76 2006/09/05 17:33:11 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -42,45 +42,39 @@ package Apache::lontexconvert;
use strict;
use tth();
use vars qw($errorstring);
-use Apache();
-use Apache::lonmsg();
-use Apache::lonxml();
-use Apache::lonmenu();
+#use Apache::lonxml();
use Apache::lonlocal;
use Apache::lonnet;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+
# ====================================================================== Header
sub init_tth {
my $options=$env{'course.'.$env{'request.course.id'}.'.tthoptions'};
+ if ($options =~ /\S/) {
+ $options = ' '.$options;
+ } else {
+ undef($options);
+ }
if ($env{'browser.mathml'}) {
&tth::ttminit();
if ($env{'browser.unicode'}) {
- &tth::ttmoptions('-L -u1 '.$options);
+ &tth::ttmoptions('-L -u1'.$options);
} else {
- &tth::ttmoptions('-L -u0 '.$options);
+ &tth::ttmoptions('-L -u0'.$options);
}
} else {
&tth::tthinit();
if ($env{'browser.unicode'}) {
- &tth::tthoptions('-L -u1 '.$options);
+ &tth::tthoptions('-L -u1'.$options);
} else {
- &tth::tthoptions('-L -u0 '.$options);
+ &tth::tthoptions('-L -u0'.$options);
}
}
}
-sub header {
- $errorstring='';
- my $time=time;
- &init_tth();
- return &Apache::lonxml::xmlbegin().
- "\n\n".
- &Apache::lonxml::fontsettings().
- &Apache::lonmenu::registerurl(undef,'tex').
- "\n\n";
-}
-
# ================================================================== Conversion
$Apache::lontexconvert::messedup=0;
@@ -137,8 +131,20 @@ ENDCONV
$errorstring) {
&Apache::lonnet::logthis("Trying to kill myself");
$Apache::lontexconvert::messedup=1;
- my $request=Apache->request();
- $request->child_terminate();
+ if (ref($Apache::lonxml::request)) {
+ $Apache::lonxml::request->child_terminate();
+ } else {
+ my $request;
+ eval { $request=Apache->request; };
+ if (!$request) {
+ eval { $request=Apache2::RequestUtil->request; };
+ }
+ if ($request) {
+ $request->child_terminate();
+ } else {
+ &Apache::lonnet::logthis("Unable to find a request to do child_terminate on");
+ }
+ }
}
return $xmlstring;
}
@@ -170,25 +176,39 @@ sub jsMath_converted {
}
{
- my $jsMath_sent_header;
+ my @jsMath_sent_header;
sub jsMath_reset {
- $jsMath_sent_header=0;
+ undef(@jsMath_sent_header);
+ }
+ sub jsMath_push {
+ push(@jsMath_sent_header,0);
}
sub jsMath_header {
- return '' if $jsMath_sent_header;
- $jsMath_sent_header=1;
+ return '' if $jsMath_sent_header[-1];
+ $jsMath_sent_header[-1]=1;
return
''."\n".
- ''."\n";
+ ''."\n";
}
sub jsMath_process {
- return '' if !$jsMath_sent_header;
+ my $state = pop(@jsMath_sent_header);
+ return '' if !$state;
return '';
}
}
+sub init_math_support {
+ &init_tth();
+ &Apache::lontexconvert::jsMath_push();
+ if ($env{'environment.texengine'} eq 'jsMath' ||
+ $env{'form.texengine'} eq 'jsMath' ) {
+ return &Apache::lontexconvert::jsMath_header();
+ }
+ return;
+}
+
sub mimetex_converted {
my $texstring=shift;
my $displaystyle=&displaystyle($texstring);
@@ -198,7 +218,7 @@ sub mimetex_converted {
if ($displaystyle) {
$$texstring='\\displaystyle \\Large '.$$texstring;
}
- my $result='.')
';
+ my $result='.')
';
if ($displaystyle) {
$result=''.$result.'';
}
@@ -218,20 +238,6 @@ sub converted {
return &tth_converted($string);
}
-# ====================================================================== Footer
-
-sub footer {
- my $xmlstring='';
- if ($env{'request.state'} eq 'construct') {
- $xmlstring.=''.$errorstring.'';
- } else {
- &Apache::lonmsg::author_res_msg($env{'request.filename'},$errorstring);
- }
-# -------------------------------------------------------------------- End Body
- $xmlstring.=&Apache::lonxml::xmlend();
- return $xmlstring;
-}
-
# ------------------------------------------------------------ Message display
sub to_convert {