loncom/xml/lontexconvert.pm - diff

Return to lontexconvert.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/lontexconvert.pm between versions 1.64 and 1.65

version 1.64, 2005/03/01 03:21:05	version 1.65, 2005/04/07 06:56:27
Line 47 use Apache::lonmsg();	Line 47 use Apache::lonmsg();
use Apache::lonxml();	use Apache::lonxml();
use Apache::lonmenu();	use Apache::lonmenu();
use Apache::lonlocal;	use Apache::lonlocal;
	use Apache::lonnet;

# ====================================================================== Header	# ====================================================================== Header

sub init_tth {	sub init_tth {
my $options=$ENV{'course.'.$ENV{'request.course.id'}.'.tthoptions'};	my $options=$env{'course.'.$env{'request.course.id'}.'.tthoptions'};
if ($ENV{'browser.mathml'}) {	if ($env{'browser.mathml'}) {
&tth::ttminit();	&tth::ttminit();
if ($ENV{'browser.unicode'}) {	if ($env{'browser.unicode'}) {
&tth::ttmoptions('-L -u1 '.$options);	&tth::ttmoptions('-L -u1 '.$options);
} else {	} else {
&tth::ttmoptions('-L -u0 '.$options);	&tth::ttmoptions('-L -u0 '.$options);
}	}
} else {	} else {
&tth::tthinit();	&tth::tthinit();
if ($ENV{'browser.unicode'}) {	if ($env{'browser.unicode'}) {
&tth::tthoptions('-L -u1 '.$options);	&tth::tthoptions('-L -u1 '.$options);
} else {	} else {
&tth::tthoptions('-L -u0 '.$options);	&tth::tthoptions('-L -u0 '.$options);
Line 99 sub convert_real {	Line 100 sub convert_real {
die &mt("TeX unconverted due to errors");	die &mt("TeX unconverted due to errors");
};	};
&Apache::lonxml::start_alarm();	&Apache::lonxml::start_alarm();
if ($ENV{'browser.mathml'}) {	if ($env{'browser.mathml'}) {
$xmlstring=&tth::ttm($$texstring);	$xmlstring=&tth::ttm($$texstring);
$xmlstring=~s/\<math\>/\<math xmlns=\"\&mathns\;\"\>/g;	$xmlstring=~s/\<math\>/\<math xmlns=\"\&mathns\;\"\>/g;
$xmlstring=~s/\<br\>/\<br\/\>/g;	$xmlstring=~s/\<br\>/\<br\/\>/g;
Line 184 sub mimetex_converted {	Line 185 sub mimetex_converted {
}	}

sub converted {	sub converted {
if ($ENV{'environment.texengine'} eq 'tth') {	if ($env{'environment.texengine'} eq 'tth') {
return &tth_converted;	return &tth_converted;
} elsif ($ENV{'environment.texengine'} eq 'jsMath') {	} elsif ($env{'environment.texengine'} eq 'jsMath') {
return &jsMath_converted;	return &jsMath_converted;
} elsif ($ENV{'environment.texengine'} eq 'mimetex') {	} elsif ($env{'environment.texengine'} eq 'mimetex') {
return &mimetex_converted;	return &mimetex_converted;
}	}
return &tth_converted;	return &tth_converted;
Line 198 sub converted {	Line 199 sub converted {

sub footer {	sub footer {
my $xmlstring='';	my $xmlstring='';
if ($ENV{'request.state'} eq 'construct') {	if ($env{'request.state'} eq 'construct') {
$xmlstring.='<address>'.$errorstring.'</address>';	$xmlstring.='<address>'.$errorstring.'</address>';
} else {	} else {
&Apache::lonmsg::author_res_msg($ENV{'request.filename'},$errorstring);	&Apache::lonmsg::author_res_msg($env{'request.filename'},$errorstring);
}	}
# -------------------------------------------------------------------- End Body	# -------------------------------------------------------------------- End Body
$xmlstring.=&Apache::lonxml::xmlend();	$xmlstring.=&Apache::lonxml::xmlend();
Line 220 sub to_convert {	Line 221 sub to_convert {

sub smiley {	sub smiley {
my $expression=shift;	my $expression=shift;
if ($ENV{'browser.imagesuppress'} eq 'on') { return $expression; }	if ($env{'browser.imagesuppress'} eq 'on') { return $expression; }
my %smileys=('\:\-\)' => 'smiley',	my %smileys=('\:\-\)' => 'smiley',
'8\-\)' => 'coolsmile',	'8\-\)' => 'coolsmile',
'8\-(I\|\\|)' => 'coolindiff',	'8\-(I\|\\|)' => 'coolindiff',

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.64
changed lines
	Added in v.1.65