--- loncom/xml/lontexconvert.pm 2003/10/07 17:52:29 1.26 +++ loncom/xml/lontexconvert.pm 2003/10/18 15:53:00 1.27 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # TeX Conversion Module # -# $Id: lontexconvert.pm,v 1.26 2003/10/07 17:52:29 www Exp $ +# $Id: lontexconvert.pm,v 1.27 2003/10/18 15:53:00 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -138,19 +138,20 @@ sub to_convert { sub smiley { my $expression=shift; if ($ENV{'browser.imagesuppress'} eq 'on') { return $expression; } - my %smileys=('\:\-*\)' => 'smiley', - '8\-*\)' => 'coolsmile', - '8\-*I' => 'coolindiff', - ':\-*\(' => 'frowny', - '\:\-*(o|O|\(\))' => 'shocked', - '\;\-*\)' => 'wink', - '\:\-*P' => 'baeh', + my %smileys=('\:\-\)' => 'smiley', + '8\-\)' => 'coolsmile', + '8\-(I|\|)' => 'coolindiff', + ':\-(I|\|)' => 'neutral', + '\:\-(o|O|\(\))' => 'shocked', + ':\-\(' => 'frowny', + '\;\-\)' => 'wink', + '\:\-P' => 'baeh', '\:\-(\\\|\\/)' => 'hrrm', - '\:\-*D' => 'bigsmile', - '\:\-*C' => 'angry', - '\:(\'|\`)\-*\(' => 'cry', - '\:\-*(X|\#)' => 'lipsrsealed', - '\:\-*S' => 'huh'); + '\:\-D' => 'bigsmile', + '\:\-C' => 'angry', + '\:(\'|\`)\-\(' => 'cry', + '\:\-(X|\#)' => 'lipsrsealed', + '\:\-S' => 'huh'); my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'}; foreach (keys %smileys) { $expression=~s/$_/\/gs;