--- loncom/xml/lontexconvert.pm 2006/01/27 23:55:15 1.69
+++ loncom/xml/lontexconvert.pm 2006/05/17 22:08:08 1.73
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# TeX Conversion Module
#
-# $Id: lontexconvert.pm,v 1.69 2006/01/27 23:55:15 albertel Exp $
+# $Id: lontexconvert.pm,v 1.73 2006/05/17 22:08:08 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -42,10 +42,7 @@ 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;
@@ -70,17 +67,6 @@ sub init_tth {
}
}
-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,7 +123,20 @@ ENDCONV
$errorstring) {
&Apache::lonnet::logthis("Trying to kill myself");
$Apache::lontexconvert::messedup=1;
- $Apache::lonxml::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;
}
@@ -180,7 +179,7 @@ sub jsMath_converted {
''."\n".
- ''."\n";
+ ''."\n";
}
sub jsMath_process {
return '' if !$jsMath_sent_header;
@@ -188,6 +187,16 @@ sub jsMath_converted {
}
}
+sub init_math_support {
+ &init_tth();
+ &Apache::lontexconvert::jsMath_reset();
+ 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);
@@ -217,20 +226,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 {