loncom/homework/default_homework.lcpm - diff

Return to default_homework.lcpm CVS log

Up to [LON-CAPA] / loncom / homework

version 1.95, 2005/03/28 19:20:54	version 1.96, 2005/03/29 17:57:51
Line 529 sub format {	Line 529 sub format {

sub chemparse {	sub chemparse {
my ($reaction) = @_;	my ($reaction) = @_;
my @tokens = split(/(\s\+\|\->\|<=>)/,$reaction);	my @tokens = split(/(\s\+\|\->\|<=>\|<\-\|\.)/,$reaction);
my $formula = '';	my $formula = '';
foreach my $token (@tokens) {	foreach my $token (@tokens) {
if ($token eq '->' ) {	if ($token eq '->' ) {
$formula .= '<m>\ensuremath{\rightarrow}</m> ';	$formula .= '<m>\ensuremath{\rightarrow}</m> ';
next;	next;
}	}
	if ($token eq '<-' ) {
	$formula .= '<m>\ensuremath{\leftarrow}</m> ';
	next;
	}
if ($token eq '<=>') {	if ($token eq '<=>') {
if ($external::target eq 'web' &&	if ($external::target eq 'web' &&
&EXT('request.browser.unicode')) {	&EXT('request.browser.unicode')) {
Line 546 sub chemparse {	Line 550 sub chemparse {
}	}
next;	next;
}	}
$token =~ /^\s(\d(?:&frac\d\d)?)(.*)/;	if ($token eq '.') {
	$formula =~ s/(\&nbsp\;\| )$//;
	$formula .= '·';
	next;
	}
	$token =~ /^\s([\d\|\/](?:&frac\d\d)?)(.*)/;
$formula .= $1 if ($1 ne '1'); # stoichiometric coefficient	$formula .= $1 if ($1 ne '1'); # stoichiometric coefficient

my $molecule = $2;	my $molecule = $2;
Line 558 sub chemparse {	Line 567 sub chemparse {
$molecule =~ s/\s*//g;	$molecule =~ s/\s*//g;
# forced space	# forced space
$molecule =~ s/_/ /g;	$molecule =~ s/_/ /g;
	$molecule =~ s/-/−/g;
$formula .= $molecule.' ';	$formula .= $molecule.' ';
}	}
# get rid of trailing space	# get rid of trailing space