--- loncom/interface/lonpreferences.pm	2012/05/13 19:11:13	1.196.4.2
+++ loncom/interface/lonpreferences.pm	2012/05/25 23:51:44	1.196.4.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.196.4.2 2012/05/13 19:11:13 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.196.4.4 2012/05/25 23:51:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -227,6 +227,7 @@ sub texenginechanger {
 		     'tth' => 'tth (TeX to HTML)',
 		     #'ttm' => 'TeX to MathML',
 		     'jsMath' => 'jsMath',
+                     'MathJax' => 'MathJax',
 		     'mimetex' => 'mimetex (Convert to Images)',
                      'raw' => 'Raw (Screen Reader)'
                      );
@@ -236,12 +237,14 @@ sub texenginechanger {
                $texengine,
                'texengine',
                \%mathchoices);
+    my $MathJax_start=&Apache::lontexconvert::MathJax_header();
     my $jsMath_start=&Apache::lontexconvert::jsMath_header();
     my %lt=&Apache::lonlocal::texthash(
       'headline' => 'Change how math is displayed',
       'preftxt'  => 'Preferred method to display math',
       'change'   => 'Save',
       'exmpl'    => 'Examples',
+      'mathjax'  => 'MathJax:',
       'jsmath'   => 'jsMath:',
       'tth'      => 'tth (TeX to HTML):',
       'mimetex'  => 'mimetex (Convert to Images):',
@@ -276,6 +279,14 @@ $lt{'preftxt'}: $selectionbox
 <hr />
 $lt{'exmpl'}
 
+<h3>$lt{'mathjax'}</h3>
+</script>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=MathJax" width="400" height="120"></iframe>
+</p>
+<p>
+MathJax provides rendered equations whose source code can be extracted in TeX and MathML formats by right clicking the equation.
+</p>
+
 <h3>$lt{'jsmath'}</h3> 
 <p>
 $jsMath_start
@@ -673,7 +684,7 @@ sub icon_options {
 sub icon_previews {
      my %icon_text = (
                       annotate => 'Notes',
-                      wishlist => 'Wishlist',
+                      wishlist => 'Stored Links',
                       catalog  => 'Info',
                       evaluate => 'Evaluate',
                       feedback => 'Communicate',
@@ -681,7 +692,7 @@ sub icon_previews {
                      );
     my %inlinetools = (
         printout => "s&8&3&prt.png&$icon_text{'printout'}&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document",
-        wishlist => "s&9&1&wishlist-link.png&$icon_text{'wishlist'}&wishlistlink[_2]&set_wishlistlink()&Set a link for this resource to wishlist",
+        wishlist => "s&9&1&wishlist-link.png&$icon_text{'wishlist'}&wishlistlink[_2]&set_wishlistlink()&Set a link for this resource in your personal Stored Links repository",
         evaluate => "s&8&1&eval.png&$icon_text{'evaluate'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource",
         feedback => "s&8&2&fdbk.png&$icon_text{'feedback'}&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource",
         annotate => "s&9&3&anot.png&$icon_text{'annotate'}&tations[_1]&annotate()&Make notes and annotations about this resource",