[LON-CAPA-cvs] cvs: loncom /xml lontexconvert.pm

[faziophi]

faziophi		Tue Jan 26 01:16:30 2010 EDT

  Modified files:              
    /loncom/xml	lontexconvert.pm 
  Log:
  Bug 6189
      Too smiley
  
  -- Requires all emoticons to have noses, where applicable.
  
  
  
Index: loncom/xml/lontexconvert.pm
diff -u loncom/xml/lontexconvert.pm:1.100 loncom/xml/lontexconvert.pm:1.101
--- loncom/xml/lontexconvert.pm:1.100	Tue Dec 22 05:08:04 2009
+++ loncom/xml/lontexconvert.pm	Tue Jan 26 01:16:30 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # TeX Conversion Module
 #
-# $Id: lontexconvert.pm,v 1.100 2009/12/22 05:08:04 faziophi Exp $
+# $Id: lontexconvert.pm,v 1.101 2010/01/26 01:16:30 faziophi Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -339,19 +339,19 @@
     	 '\:\-*\)' => 'face-smile.png',
 		 '8\-\)'  => 'face-cool.png',
 		 '8\-(I|\|)'   => 'face-glasses.png',
-		 ':\-*(I|\|)'   => 'face-plain.png',
+		 '\:\-(I|\|)'   => 'face-plain.png',
 		 '\:\-(o|O|\(\))' => 'face-surprise.png',
-		 ':\-*\('  => 'face-sad.png',
-		 '\;\-*\)' => 'face-wink.png',
-		 '\:\-*(P|p)'  => 'face-raspberry.png',
+		 ':\-\('  => 'face-sad.png',
+		 '\;\-\)' => 'face-wink.png',
+		 '\:\-(P|p)'  => 'face-raspberry.png',
 		 '\:\-(\\\|\\/)' => 'face-uncertain.png',
-		 '\:\-*D'  => 'face-smile-big.png',
-		 '\:\-*(C|\@)'  => 'face-angry.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',
+		 '\:\-(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',
@@ -361,7 +361,7 @@
 		 '\(pirate\)' => 'face-pirate.png',
 		 '\((agree|yes)\)' => 'opinion-agree.png',
 		 '\((disagree|nay)\)' => 'opinion-disagree.png',
-		 '(o|O)\-*\)' => 'face-angel.png',
+		 '(o|O)\-\)' => 'face-angel.png',
 		 );
     my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'};
     foreach my $smiley (keys(%smileys)) {