--- loncom/xml/lontexconvert.pm	2009/08/12 20:31:08	1.97
+++ loncom/xml/lontexconvert.pm	2009/12/22 05:08:04	1.100
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # TeX Conversion Module
 #
-# $Id: lontexconvert.pm,v 1.97 2009/08/12 20:31:08 www Exp $
+# $Id: lontexconvert.pm,v 1.100 2009/12/22 05:08:04 faziophi Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -316,6 +316,8 @@ sub converted {
 	return &jsMath_converted($string);
     } elsif ($mode =~ /mimetex/i) {
 	return &mimetex_converted($string);
+    } elsif ($mode =~ /raw/i) {
+        return $$string;
     }
     return &tth_converted($string);
 }
@@ -333,23 +335,37 @@ sub to_convert {
 sub smiley {
     my $expression=shift;
     if ($env{'browser.imagesuppress'} eq 'on') { return $expression; }
-    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');
+    my %smileys=(
+    	 '\:\-*\)' => 'face-smile.png',
+		 '8\-\)'  => 'face-cool.png',
+		 '8\-(I|\|)'   => 'face-glasses.png',
+		 ':\-*(I|\|)'   => 'face-plain.png',
+		 '\:\-(o|O|\(\))' => 'face-surprise.png',
+		 ':\-*\('  => 'face-sad.png',
+		 '\;\-*\)' => 'face-wink.png',
+		 '\:\-*(P|p)'  => 'face-raspberry.png',
+		 '\:\-(\\\|\\/)' => 'face-uncertain.png',
+		 '\:\-*D'  => 'face-smile-big.png',
+		 '\:\-*(C|\@)'  => 'face-angry.png',
+		 '\:(\'|\`)\-*\(' => 'face-crying.png',
+		 '\:\-*(X|x|\#)' => 'face-quiet.png',
+		 '\:\-*(s|S)' => 'face-uncertain.png',
+		 '\:\-*\$' => 'face-embarrassed.png',
+		 '\:\-*\*' => 'face-kiss.png',
+		 '\+O\(' => 'face-sick.png',
+		 '(\&lt\;3|\(heart\))' => 'heart.png',
+		 '\(rose\)' => 'rose.png',
+		 '\(pizza\)' => 'food-pizza.png',
+		 '\(cake\)' => 'food-cake.png',
+		 '\(ninja\)' => 'face-ninja.png',
+		 '\(pirate\)' => 'face-pirate.png',
+		 '\((agree|yes)\)' => 'opinion-agree.png',
+		 '\((disagree|nay)\)' => 'opinion-disagree.png',
+		 '(o|O)\-*\)' => 'face-angel.png',
+		 );
     my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'};
     foreach my $smiley (keys(%smileys)) {
-	$expression=~s/$smiley/\<img src="$iconpath\/$smileys{$smiley}.gif" \/\>/gs; 
+	$expression=~s/$smiley/\<img src="$iconpath\/$smileys{$smiley}" \/\>/gs; 
     }
     return $expression;
 }