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.8 and 1.12

version 1.8, 2002/09/16 19:29:06	version 1.12, 2002/10/28 20:40:25
Line 68 sub header {	Line 68 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 104 sub footer {

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

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

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

	#FIXME this crap needs to go but right now the -L option might be
	#ignored if this isn;t the first time the tth engine is used
	#thus the \\document class crap, it makes sure we init the LaTeX stuff
if ($ENV{'browser.mathml'}) {	if ($ENV{'browser.mathml'}) {
&tth::ttminit();	&tth::ttminit();
&tth::ttmoptions("-L");	&tth::ttmoptions("-L");
Line 108 sub msgtexconverted {	Line 123 sub msgtexconverted {
&tth::tthinit();	&tth::tthinit();
&tth::tthoptions("-L");	&tth::tthoptions("-L");
}	}
$message=~s/(\$\$.+?\$\$)/&converted(\$1)/ge;	$message=~s/(\$\$.+?\$\$)/&to_convert("\\documentclass{article}".$1)/ge;
$message=~s/(\$.+?\$)/&converted(\$1)/ge;	$message=~s/(\$.+?\$)/&to_convert("\\documentclass{article}".$1)/ge;
$message=~s/(\\\[.+?\\\])/&converted(\$1)/ge;	$message=~s/(\\$.+?\\$)/&to_convert("\\documentclass{article}".$1)/ge;
	$message=~s/(\\\[.+?\\\])/&to_convert("\\documentclass{article}".$1)/ge;
return $message.$errorstring;	return $message.$errorstring;
}	}

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

Removed from v.1.8
changed lines
	Added in v.1.12