--- loncom/xml/lontexconvert.pm 2004/01/28 17:16:27 1.29 +++ loncom/xml/lontexconvert.pm 2005/02/11 16:46:38 1.43 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # TeX Conversion Module # -# $Id: lontexconvert.pm,v 1.29 2004/01/28 17:16:27 albertel Exp $ +# $Id: lontexconvert.pm,v 1.43 2005/02/11 16:46:38 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,18 +36,17 @@ # The C source of the Code may not be distributed by the Licensee # to any other parties under any circumstances. # -# 05/29/00,05/30,10/11,10/20 Gerd Kortemeyer -# 5/4 Gerd Kortemeyer package Apache::lontexconvert; use strict; -use tth; +use tth(); use vars qw($errorstring); use Apache(); -use Apache::lonmsg; -use Apache::lonxml; -use Apache::lonmenu; +use Apache::lonmsg(); +use Apache::lonxml(); +use Apache::lonmenu(); +use Apache::lonlocal; # ====================================================================== Header @@ -68,56 +67,77 @@ sub init_tth { &tth::tthoptions('-L -u0 '.$options); } } - &Apache::lonnet::logthis("caled and use $options"); - &Apache::lonnet::logthis("caller ".join(':',caller(0))); - } sub header { - $errorstring=''; - my $time=time; - &init_tth(); - return &Apache::lonxml::xmlbegin(). - &Apache::lonxml::fontsettings(). - "\n
\n". - &Apache::lonmenu::registerurl(undef,'tex'). - "\n\n"; + $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; -sub converted { - my $texstring=shift; - my $xmlstring='[UNDISPLAYABLE]'; - if ($Apache::lontexconvert::messedup) { - return '[TeX Unconverted Due To Previous Errors]'; - } - eval(<<'ENDCONV'); - { + +# we need this routine because &converted can get called from inside +# of the safespace (through &xmlparse('