--- loncom/xml/lontexconvert.pm	2011/02/10 20:07:00	1.98.2.1
+++ loncom/xml/lontexconvert.pm	2011/02/10 19:28:29	1.105
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # TeX Conversion Module
 #
-# $Id: lontexconvert.pm,v 1.98.2.1 2011/02/10 20:07:00 raeburn Exp $
+# $Id: lontexconvert.pm,v 1.105 2011/02/10 19:28:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -251,8 +251,8 @@ sub mimetex_valign {
     my $socket;
     &Apache::lonxml::start_alarm();
     my $socket = IO::Socket::INET->new(PeerAddr => $hostname,
-                                       PeerPort => 'http(80)',
-                                       Proto    => 'tcp');
+                                        PeerPort => 'http(80)',
+                                        Proto    => 'tcp');
     if ($socket) {
         my $headreq = "HEAD $path HTTP/1.0\r\n\r\n";
         print $socket $headreq;
@@ -313,6 +313,7 @@ sub converted {
 
 sub to_convert {
     my ($string) = @_;
+    &init_tth();
     $string=~s/\<br\s*\/?\>/ /gs;
 #    $string=~s/\s/ /gs;
     $string=&HTML::Entities::decode($string);
@@ -321,24 +322,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;
 }
@@ -346,7 +360,6 @@ sub smiley {
 sub msgtexconverted {
     my ($message,$email) = @_;
     $errorstring='';
-    &init_tth();
     my $outmessage='';
     my $tex=0;
     foreach my $fragment (split(/(?:\&lt\;|\<)\/*m\s*(?:\&gt\;|\>)/i,$message)) {
@@ -367,15 +380,16 @@ sub msgtexconverted {
     foreach my $fragment (split(/(?:\&lt\;|\<)\/*algebra\s*(?:\&gt\;|\>)/i,
 				$message)) {
 	if ($tex) {
+        my $algebra = &algebra($fragment, 'web', undef, undef, undef, undef, 'tth');
 	    if ($email) {
-		$outmessage.='</pre><tt>'.&algebra($fragment,'web').'</tt><pre>';
+		$outmessage.='</pre><tt>'.$algebra.'</tt><pre>';
 		$tex=0;
 	    } else {
-		$outmessage.=&algebra($fragment,'web');
+		$outmessage.=$algebra;
 		$tex=0;
 	    }
 	} else {
-            $outmessage.=$fragment;
+        $outmessage.=$fragment;
 	    $tex=1;
 	}
     }
@@ -388,9 +402,9 @@ sub msgtexconverted {
 
 sub algebra {
     use AlgParser;
-
-    my ($string,$target,$style,$parstack,$safeeval)=@_;
+    my ($string,$target,$style,$parstack,$safeeval,$tth)=@_;
     my $parser = new AlgParserWithImplicitExpand;
+    if ($tth eq 'tth') {&init_tth();}
     $string=&prepare_algebra($string);
     my $ret = $parser->parse($string);
     my $result='['.&mt('Algebra unconverted due to previous errors').']';
@@ -503,20 +517,20 @@ Header
 
 =item mimetex_valign()
 
- Makes a HEAD call to /cgi-bin/mimetex.cgi via IO:: to retrieve the
+ Makes a HEAD call to /cgi-bin/mimetex.cgi via IO:: to retrieve the 
  vertical alignment, before the subsequent call to mimetex_converted()
  which generates the <img> tag and the corresponding image.
 
  Input: 1.  $esc_texstring (escaped TeX to be rendered by mimetex).
- Output: 1. $valign - number of pixels: positive or negative integer
+ Output: 1. $valign - number of pixels: positive or negative integer 
             which will be included in <img> tag for mimetex image to
             support vertical alignment of image within a line of text.
 
- If a server is running SSL, and Apache rewrite rules are in place
- to rewrite requests for http to https, modification will most likely
- be needed for pass through for HEAD requests for /cgi-bin/mimetex.cgi.
+ If a server is running SSL, and Apache rewrite rules are in place 
+ to rewrite requests for http to https, modification will most likely 
+ be needed for pass through for HEAD requests for /cgi-bin/mimetex.cgi. 
 
- Example rewrite rules which rewrite all http traffic to https,
+ Example rewrite rules which rewrite all http traffic to https, 
  except HEAD requests for /cgi-bin/mimetex.cgi are:
 
  <IfModule mod_rewrite.c>
@@ -525,7 +539,7 @@ Header
 
      RewriteCond %{HTTPS} off
      RewriteCond %{HTTP:Host} (.*)
-     RewriteCond %{REQUEST_METHOD} !HEAD
+     RewriteCond %{REQUEST_METHOD} !HEAD 
      RewriteRule ^/(.*) https://%1/$1 [R=301,L]
 
      RewriteCond %{HTTPS} off