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

[faziophi]

faziophi		Tue Dec 22 05:08:04 2009 EDT

  Modified files:              
    /loncom/xml	lontexconvert.pm 
  Log:
  Bugs 2295 and 6155, related to 6155.  Disallowing smileys that could conflict
  with URLs and mathematical expressions.
  
  
Index: loncom/xml/lontexconvert.pm
diff -u loncom/xml/lontexconvert.pm:1.99 loncom/xml/lontexconvert.pm:1.100
--- loncom/xml/lontexconvert.pm:1.99	Wed Dec  9 23:02:43 2009
+++ loncom/xml/lontexconvert.pm	Tue Dec 22 05:08:04 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # TeX Conversion Module
 #
-# $Id: lontexconvert.pm,v 1.99 2009/12/09 23:02:43 faziophi Exp $
+# $Id: lontexconvert.pm,v 1.100 2009/12/22 05:08:04 faziophi Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -337,14 +337,14 @@
     if ($env{'browser.imagesuppress'} eq 'on') { return $expression; }
     my %smileys=(
     	 '\:\-*\)' => 'face-smile.png',
-		 '8\-*\)'  => 'face-cool.png',
-		 '8\-*(I|\|)'   => 'face-glasses.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',
+		 '\:\-(\\\|\\/)' => 'face-uncertain.png',
 		 '\:\-*D'  => 'face-smile-big.png',
 		 '\:\-*(C|\@)'  => 'face-angry.png',
 		 '\:(\'|\`)\-*\(' => 'face-crying.png',