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.7 and 1.15.2.1

version 1.7, 2002/07/30 12:42:13	version 1.15.2.1, 2003/03/17 16:52:28
Line 37	Line 37
# to any other parties under any circumstances.	# to any other parties under any circumstances.
#	#
# 05/29/00,05/30,10/11,10/20 Gerd Kortemeyer	# 05/29/00,05/30,10/11,10/20 Gerd Kortemeyer
# 05/03/2001 Scott Harrison
# 5/4 Gerd Kortemeyer	# 5/4 Gerd Kortemeyer

package Apache::lontexconvert;	package Apache::lontexconvert;
Line 55 sub header {	Line 54 sub header {
my $time=time;	my $time=time;
if ($ENV{'browser.mathml'}) {	if ($ENV{'browser.mathml'}) {
&tth::ttminit();	&tth::ttminit();
	if ($ENV{'browser.unicode'}) {
	&tth::ttmoptions('-L -u1');
	} else {
	&tth::ttmoptions('-L -u0');
	}
} else {	} else {
&tth::tthinit();	&tth::tthinit();
	if ($ENV{'browser.unicode'}) {
	&tth::tthoptions('-L -u1');
	} else {
	&tth::tthoptions('-L -u0');
	}
}	}
return &Apache::lonxml::xmlbegin().	return &Apache::lonxml::xmlbegin().
&Apache::lonxml::fontsettings().	&Apache::lonxml::fontsettings().
Line 68 sub header {	Line 77 sub header {
# ================================================================== Conversion	# ================================================================== Conversion

sub converted {	sub converted {
my $texstring=shift;	my $texstring=shift;
my $xmlstring;	my $xmlstring='[UNDISPLAYABLE]';
	eval(<<'ENDCONV');
	{
	local $SIG{SEGV}=sub { die; };
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;
$xmlstring=~s/\<p\>/\<p\>\<\/p\>/g;	$xmlstring=~s/\<p\>/\<p\>\<\/p\>/g;
$errorstring.=&tth::ttmerror();	$errorstring.=&tth::ttmerror();
} else {	} else {
$xmlstring=&tth::tth($$texstring);	$xmlstring=&tth::tth($$texstring);
$errorstring.=&tth::ttherror();	$errorstring.=&tth::ttherror();
	}
}	}
	ENDCONV
return $xmlstring;	return $xmlstring;
}	}

Line 99 sub footer {	Line 113 sub footer {

# ------------------------------------------------------------ Message display	# ------------------------------------------------------------ Message display

	sub to_convert {
	my ($string) = @_;
	$string=~s/\<br\s*\/?\>/ /g;
	$string=&HTML::Entities::decode($string);
	return &converted(\$string);
	}

sub msgtexconverted {	sub msgtexconverted {
my $message=shift;	my $message=shift;

if ($ENV{'browser.mathml'}) {	if ($ENV{'browser.mathml'}) {
&tth::ttminit();	&tth::ttminit();
&tth::ttmoptions("-L");	if ($ENV{'browser.unicode'}) {
	&tth::ttmoptions('-L -u1');
	} else {
	&tth::ttmoptions('-L -u0');
	}
} else {	} else {
&tth::tthinit();	&tth::tthinit();
&tth::tthoptions("-L");	if ($ENV{'browser.unicode'}) {
	&tth::tthoptions('-L -u1');
	} else {
	&tth::tthoptions('-L -u0');
	}
}	}
$message=~s/(\$.+?\$)/&converted(\$1)/ge;	$message=~s/(\$\$.+?\$\$)/&to_convert($1)/ge;
$message=~s/(\\\[.+?\\\])/&converted(\$1)/ge;	$message=~s/(\$.+?\$)/&to_convert($1)/ge;
return $message;	$message=~s/(\\$.+?\\$)/&to_convert($1)/ge;
	$message=~s/(\\\[.+?\\\])/&to_convert($1)/ge;
	return $message.$errorstring;
}	}

1;	1;

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

Removed from v.1.7
changed lines
	Added in v.1.15.2.1