From 12c661f7617926c32c1286816370db1630547f88 Mon Sep 17 00:00:00 2001
From: Aron Ahmadia <aron@ahmadia.net>
Date: Thu, 25 Oct 2012 21:21:24 +0100
Subject: [PATCH 1/4] Improved MathJax, missing callback workaround

MathJax.InputJax.TeX.resetEquationNumbers is supposed to be available,
but isn't consistently loaded before the notebook fires off its first
re-render request.  The code edits in mathjaxutils.js fix this issue.

Additionally, there was some init code in mathjaxutils.js that has been
properly excised to the html templates.

Removed some orphan rendering code so that all typesetting now goes
through mathjaxutils.js

Finally, removed an extra cell in the demo notebook.
---
 .../frontend/html/notebook/static/js/cell.js  |  8 ---
 .../html/notebook/static/js/mathjaxutils.js   | 20 +++----
 .../html/notebook/static/js/textcell.js       | 59 +++++++++----------
 .../html/notebook/templates/notebook.html     | 15 +++++
 .../Typesetting Math Using MathJax.ipynb      |  8 ---
 5 files changed, 51 insertions(+), 59 deletions(-)

diff --git a/IPython/frontend/html/notebook/static/js/cell.js b/IPython/frontend/html/notebook/static/js/cell.js
index 4dbb9e6e6..ade8f9daa 100644
--- a/IPython/frontend/html/notebook/static/js/cell.js
+++ b/IPython/frontend/html/notebook/static/js/cell.js
@@ -51,14 +51,6 @@ var IPython = (function (IPython) {
     };
 
 
-    // typeset with MathJax if MathJax is available
-    Cell.prototype.typeset = function () {
-        if (window.MathJax){
-            MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
-        }
-    };
-
-
     Cell.prototype.select = function () {
         this.element.addClass('ui-widget-content ui-corner-all');
         this.selected = true;
diff --git a/IPython/frontend/html/notebook/static/js/mathjaxutils.js b/IPython/frontend/html/notebook/static/js/mathjaxutils.js
index 2dea85e65..b8df58afa 100644
--- a/IPython/frontend/html/notebook/static/js/mathjaxutils.js
+++ b/IPython/frontend/html/notebook/static/js/mathjaxutils.js
@@ -16,18 +16,6 @@ IPython.mathjaxutils = (function (IPython) {
     var init = function () {
         if (window.MathJax) { 
             // MathJax loaded
-            MathJax.Hub.Config({
-                TeX: { equationNumbers: { autoNumber: "AMS", useLabelIds: true } },
-                tex2jax: {
-                    inlineMath: [ ['$','$'], ["\\(","\\)"] ],
-                    displayMath: [ ['$$','$$'], ["\\[","\\]"] ],
-                    processEnvironments: true
-                },
-                displayAlign: 'left', // Change this to 'center' to center equations.
-                "HTML-CSS": {
-                    styles: {'.MathJax_Display': {"margin": 0}}
-                }
-            });
         } else if (window.mathjax_url != "") {
             // Don't have MathJax, but should. Show dialog.
             var dialog = $('<div></div>')
@@ -225,8 +213,14 @@ IPython.mathjaxutils = (function (IPython) {
 
     var queue_render = function () {
         // see https://groups.google.com/forum/?fromgroups=#!topic/mathjax-users/cpwy5eCH1ZQ
+        var jax = MathJax.Hub.getAllJax();
+
         MathJax.Hub.Queue( 
-          ["resetEquationNumbers",MathJax.InputJax.TeX], 
+           function () { 
+                if (MathJax.InputJax.TeX.resetEquationNumbers) { 
+                MathJax.InputJax.TeX.resetEquationNumbers(); 
+            } 
+          },
           ["PreProcess",MathJax.Hub], 
           ["Reprocess",MathJax.Hub] 
           ); 
diff --git a/IPython/frontend/html/notebook/static/js/textcell.js b/IPython/frontend/html/notebook/static/js/textcell.js
index 8b46bbef0..809776bcf 100644
--- a/IPython/frontend/html/notebook/static/js/textcell.js
+++ b/IPython/frontend/html/notebook/static/js/textcell.js
@@ -221,37 +221,36 @@ var IPython = (function (IPython) {
         if (this.rendered === false) {
             var text = this.get_text();
             if (text === "") { text = this.placeholder; }
-
-            text = IPython.mathjaxutils.remove_math(text)
-            var html = IPython.markdown_converter.makeHtml(text);
-            html = IPython.mathjaxutils.replace_math(html)
-
-            try {
-                this.set_rendered(html);
-            } catch (e) {
-                console.log("Error running Javascript in Markdown:");
-                console.log(e);
-                this.set_rendered($("<div/>").addClass("js-error").html(
-                    "Error rendering Markdown!<br/>" + e.toString())
-                );
+            else {
+                text = IPython.mathjaxutils.remove_math(text)
+                var html = IPython.markdown_converter.makeHtml(text);
+                html = IPython.mathjaxutils.replace_math(html)
+                try {
+                    this.set_rendered(html);
+                } catch (e) {
+                    console.log("Error running Javascript in Markdown:");
+                    console.log(e);
+                    this.set_rendered($("<div/>").addClass("js-error").html(
+                        "Error rendering Markdown!<br/>" + e.toString())
+                    );
+                }
+                this.element.find('div.text_cell_input').hide();
+                this.element.find("div.text_cell_render").show();
+                var code_snippets = this.element.find("pre > code");
+                code_snippets.replaceWith(function () {
+                    var code = $(this).html();
+                    /* Substitute br for newlines and &nbsp; for spaces
+                       before highlighting, since prettify doesn't
+                       preserve those on all browsers */
+                    code = code.replace(/(\r\n|\n|\r)/gm, "<br/>");
+                    code = code.replace(/ /gm, '&nbsp;');
+                    code = prettyPrintOne(code);
+
+                    return '<code class="prettyprint">' + code + '</code>';
+                });
+
+                IPython.mathjaxutils.queue_render()
             }
-            this.typeset()
-            this.element.find('div.text_cell_input').hide();
-            this.element.find("div.text_cell_render").show();
-            var code_snippets = this.element.find("pre > code");
-            code_snippets.replaceWith(function () {
-                var code = $(this).html();
-                /* Substitute br for newlines and &nbsp; for spaces
-                   before highlighting, since prettify doesn't
-                   preserve those on all browsers */
-                code = code.replace(/(\r\n|\n|\r)/gm, "<br/>");
-                code = code.replace(/ /gm, '&nbsp;');
-                code = prettyPrintOne(code);
-
-                return '<code class="prettyprint">' + code + '</code>';
-            });
-
-            IPython.mathjaxutils.queue_render()
             this.rendered = true;
         }
     };
diff --git a/IPython/frontend/html/notebook/templates/notebook.html b/IPython/frontend/html/notebook/templates/notebook.html
index 7eea6e8b7..865e4390f 100644
--- a/IPython/frontend/html/notebook/templates/notebook.html
+++ b/IPython/frontend/html/notebook/templates/notebook.html
@@ -2,6 +2,21 @@
 {% block stylesheet %}
 
 {% if mathjax_url %}
+<script type="text/x-mathjax-config">
+    MathJax.Hub.Config({
+        TeX: { equationNumbers: { autoNumber: "AMS", useLabelIds: true } },
+        tex2jax: {
+            inlineMath: [ ['$','$'], ["\\(","\\)"] ],
+            displayMath: [ ['$$','$$'], ["\\[","\\]"] ],
+            processEnvironments: true
+        },
+        displayAlign: 'left', // Change this to 'center' to center equations.
+        "HTML-CSS": {
+            styles: {'.MathJax_Display': {"margin": 0}}
+        }
+        });
+</script>
+
 <script type="text/javascript" src="{{mathjax_url}}?config=TeX-AMS_HTML" charset="utf-8"></script>
 {% end %}
 <script type="text/javascript">
diff --git a/docs/examples/notebooks/Typesetting Math Using MathJax.ipynb b/docs/examples/notebooks/Typesetting Math Using MathJax.ipynb
index 3595add8e..6a05b7880 100644
--- a/docs/examples/notebooks/Typesetting Math Using MathJax.ipynb	
+++ b/docs/examples/notebooks/Typesetting Math Using MathJax.ipynb	
@@ -331,14 +331,6 @@
       "x=4\n",
       "$$"
      ]
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [],
-     "language": "python",
-     "metadata": {},
-     "outputs": []
     }
    ],
    "metadata": {}

From 4620ce834828b7d5accfdf65e3ce2bbf4269723c Mon Sep 17 00:00:00 2001
From: Aron Ahmadia <aron@ahmadia.net>
Date: Mon, 29 Oct 2012 20:13:30 +0000
Subject: [PATCH 2/4] Remove Equation References/Numbering, Fix Bugs

Equation References and Numbering are not going to be trivial to add,
so the code has been removed for now.  Important fixes include
no-MathJax support (previously, the code was failing), and the
generation of unique ids for the rendering content in each cell,
tremendously speeding up MathJax rendering.

I am still not rendering placeholder text.
---
 .../frontend/html/notebook/static/js/cell.js  |  3 +
 .../html/notebook/static/js/mathjaxutils.js   | 30 +++----
 .../html/notebook/static/js/textcell.js       | 14 +++-
 .../html/notebook/templates/notebook.html     |  3 +-
 .../Typesetting Math Using MathJax.ipynb      | 82 +------------------
 5 files changed, 27 insertions(+), 105 deletions(-)

diff --git a/IPython/frontend/html/notebook/static/js/cell.js b/IPython/frontend/html/notebook/static/js/cell.js
index ade8f9daa..6afc85256 100644
--- a/IPython/frontend/html/notebook/static/js/cell.js
+++ b/IPython/frontend/html/notebook/static/js/cell.js
@@ -50,6 +50,9 @@ var IPython = (function (IPython) {
         });
     };
 
+    // prototype typeset method does nothing, see TextCell typeset
+    Cell.prototype.typeset = function () {
+    };
 
     Cell.prototype.select = function () {
         this.element.addClass('ui-widget-content ui-corner-all');
diff --git a/IPython/frontend/html/notebook/static/js/mathjaxutils.js b/IPython/frontend/html/notebook/static/js/mathjaxutils.js
index b8df58afa..91026161d 100644
--- a/IPython/frontend/html/notebook/static/js/mathjaxutils.js
+++ b/IPython/frontend/html/notebook/static/js/mathjaxutils.js
@@ -14,7 +14,7 @@ IPython.namespace('IPython.mathjaxutils');
 IPython.mathjaxutils = (function (IPython) {
 
     var init = function () {
-        if (window.MathJax) { 
+        if (window.MathJax) {
             // MathJax loaded
         } else if (window.mathjax_url != "") {
             // Don't have MathJax, but should. Show dialog.
@@ -76,7 +76,6 @@ IPython.mathjaxutils = (function (IPython) {
     var inline = "$"; // the inline math delimiter
     var blocks, start, end, last, braces; // used in searching for math
     var math; // stores math until pagedown (Markdown parser) is done
-    var HUB = MathJax.Hub;
 
     // MATHSPLIT contains the pattern for math delimiters and special symbols
     // needed for searching for math in the text input.   
@@ -90,6 +89,7 @@ IPython.mathjaxutils = (function (IPython) {
     //    math, then push the math string onto the storage array.
     //  The preProcess function is called on all blocks if it has been passed in
     var process_math = function (i, j, pre_process) {
+        var HUB = MathJax.Hub;
         var block = blocks.slice(i, j + 1).join("").replace(/&/g, "&amp;") // use HTML entity for &
         .replace(/</g, "&lt;") // use HTML entity for <
         .replace(/>/g, "&gt;") // use HTML entity for >
@@ -115,6 +115,10 @@ IPython.mathjaxutils = (function (IPython) {
     //    (which will be a paragraph).
     //
     var remove_math = function (text) {
+        if (!window.MathJax) {
+            return text;
+        }
+
         start = end = last = null; // for tracking math delimiters
         math = []; // stores math strings for later
         
@@ -204,6 +208,10 @@ IPython.mathjaxutils = (function (IPython) {
     //    and clear the math array (no need to keep it around).
     //  
     var replace_math = function (text) {
+        if (!window.MathJax) {
+            return text;
+        }
+
         text = text.replace(/@@(\d+)@@/g, function (match, n) {
             return math[n]
         });
@@ -211,27 +219,11 @@ IPython.mathjaxutils = (function (IPython) {
         return text;
     }
 
-    var queue_render = function () {
-        // see https://groups.google.com/forum/?fromgroups=#!topic/mathjax-users/cpwy5eCH1ZQ
-        var jax = MathJax.Hub.getAllJax();
-
-        MathJax.Hub.Queue( 
-           function () { 
-                if (MathJax.InputJax.TeX.resetEquationNumbers) { 
-                MathJax.InputJax.TeX.resetEquationNumbers(); 
-            } 
-          },
-          ["PreProcess",MathJax.Hub], 
-          ["Reprocess",MathJax.Hub] 
-          ); 
-    }
-
     return {
         init : init,
         process_math : process_math,
         remove_math : remove_math,
-        replace_math : replace_math,
-        queue_render : queue_render
+        replace_math : replace_math
     };
 
 }(IPython));
\ No newline at end of file
diff --git a/IPython/frontend/html/notebook/static/js/textcell.js b/IPython/frontend/html/notebook/static/js/textcell.js
index 809776bcf..a64480b57 100644
--- a/IPython/frontend/html/notebook/static/js/textcell.js
+++ b/IPython/frontend/html/notebook/static/js/textcell.js
@@ -39,9 +39,11 @@ var IPython = (function (IPython) {
             extraKeys: {"Tab": "indentMore","Shift-Tab" : "indentLess"},
             onKeyEvent: $.proxy(this.handle_codemirror_keyevent,this)
         });
+        this.cell_id = IPython.utils.uuid();
         // The tabindex=-1 makes this div focusable.
+        // id is a unique cell_id necessary for updating MathJax intelligently
         var render_area = $('<div/>').addClass('text_cell_render border-box-sizing').
-            addClass('rendered_html').attr('tabindex','-1');
+            addClass('rendered_html').attr('tabindex','-1').attr('id',this.cell_id);
         cell.append(input_area).append(render_area);
         this.element = cell;
     };
@@ -77,6 +79,13 @@ var IPython = (function (IPython) {
         return false;
     };
 
+    TextCell.prototype.typeset = function () {
+        if (window.MathJax){
+            var cell_math = document.getElementById(this.cell_id);
+            MathJax.Hub.Queue(["Typeset",MathJax.Hub,cell_math]);
+        }
+    };
+
 
     TextCell.prototype.select = function () {
         IPython.Cell.prototype.select.apply(this);
@@ -248,8 +257,7 @@ var IPython = (function (IPython) {
 
                     return '<code class="prettyprint">' + code + '</code>';
                 });
-
-                IPython.mathjaxutils.queue_render()
+                this.typeset()
             }
             this.rendered = true;
         }
diff --git a/IPython/frontend/html/notebook/templates/notebook.html b/IPython/frontend/html/notebook/templates/notebook.html
index 865e4390f..bb712c63f 100644
--- a/IPython/frontend/html/notebook/templates/notebook.html
+++ b/IPython/frontend/html/notebook/templates/notebook.html
@@ -4,7 +4,6 @@
 {% if mathjax_url %}
 <script type="text/x-mathjax-config">
     MathJax.Hub.Config({
-        TeX: { equationNumbers: { autoNumber: "AMS", useLabelIds: true } },
         tex2jax: {
             inlineMath: [ ['$','$'], ["\\(","\\)"] ],
             displayMath: [ ['$$','$$'], ["\\[","\\]"] ],
@@ -17,7 +16,7 @@
         });
 </script>
 
-<script type="text/javascript" src="{{mathjax_url}}?config=TeX-AMS_HTML" charset="utf-8"></script>
+<script type="text/javascript" src="{{mathjax_url}}?config=TeX-AMS_HTML-full" charset="utf-8"></script>
 {% end %}
 <script type="text/javascript">
 // MathJax disabled, set as null to distingish from *missing* MathJax,
diff --git a/docs/examples/notebooks/Typesetting Math Using MathJax.ipynb b/docs/examples/notebooks/Typesetting Math Using MathJax.ipynb
index 6a05b7880..cc193275a 100644
--- a/docs/examples/notebooks/Typesetting Math Using MathJax.ipynb	
+++ b/docs/examples/notebooks/Typesetting Math Using MathJax.ipynb	
@@ -162,87 +162,7 @@
       "\n",
       "---\n",
       "\n",
-      "These equation reference examples are adapted from an [example page in the MathJax documentation](http://cdn.mathjax.org/mathjax/latest/test/sample-eqrefs.html).  Note that it's okay to reference equations across cells.  Click inside this cell to see the source.\n",
-      "\n",
-      "## Labeled equations and references\n",
-      "\n",
-      "Here is a labeled equation:\n",
-      "\\begin{equation}\n",
-      "x+1\\over\\sqrt{1-x^2}\\label{ref1}\n",
-      "\\end{equation}\n",
-      "\n",
-      "with a reference to ref1: \\ref{ref1},\n",
-      "and another numbered one with no label:\n",
-      "\\begin{equation}\n",
-      "x+1\\over\\sqrt{1-x^2}\n",
-      "\\end{equation}"
-     ]
-    },
-    {
-     "cell_type": "markdown",
-     "metadata": {},
-     "source": [
-      "## \\nonumber and equation*\n",
-      "\n",
-      "This one uses \\nonumber:\n",
-      "\\begin{equation}\n",
-      "x+1\\over\\sqrt{1-x^2}\\nonumber\n",
-      "\\end{equation}\n",
-      "\n",
-      "Here's one with the equation* environment:\n",
-      "\\begin{equation*}\n",
-      "x+1\\over\\sqrt{1-x^2}\n",
-      "\\end{equation*}"
-     ]
-    },
-    {
-     "cell_type": "markdown",
-     "metadata": {},
-     "source": [
-      "## Forward references\n",
-      "\n",
-      "This is a forward reference [\\ref{ref2}] and another \\eqref{ref2} for the \n",
-      "following equation:\n",
-      "\n",
-      "\\begin{equation}\n",
-      "x+1\\over\\sqrt{1-x^2}\\label{ref2}\n",
-      "\\end{equation}\n",
-      "\n",
-      "More math:\n",
-      "\\begin{equation}\n",
-      "x+1\\over\\sqrt{1-x^2}\n",
-      "\\end{equation}"
-     ]
-    },
-    {
-     "cell_type": "markdown",
-     "metadata": {},
-     "source": [
-      "### References inline and in environments\n",
-      "\n",
-      "Here is a ref inside math: $\\ref{ref2}+1$ and text after it.\n",
-      "\n",
-      "\\begin{align} \n",
-      "x& = y_1-y_2+y_3-y_5+y_8-\\dots \n",
-      "&& \\text{by \\eqref{ref1}}\\\\ \n",
-      "& = y'\\circ y^* && \\text{(by \\eqref{ref3})}\\\\ \n",
-      "& = y(0) y' && \\text {by Axiom 1.} \n",
-      "\\end{align} \n",
-      "\n",
-      "### Missing references\n",
-      "Here's a bad ref [\\ref{ref4}] to a nonexistent label.\n",
-      "\n",
-      "### Numbering align environments\n",
-      "An alignment:\n",
-      "\\begin{align}\n",
-      "a&=b\\label{ref3}\\cr\n",
-      "&=c+d\n",
-      "\\end{align}\n",
-      "and a starred one:\n",
-      "\\begin{align*}\n",
-      "a&=b\\cr\n",
-      "&=c+d\n",
-      "\\end{align*}"
+      "Equation numbering and referencing will be available in a future version of IPython."
      ]
     },
     {

From 5863b6fd7f2ac4d89cfb69757960a215eb51d1af Mon Sep 17 00:00:00 2001
From: Aron Ahmadia <aron@ahmadia.net>
Date: Mon, 29 Oct 2012 21:22:18 +0000
Subject: [PATCH 3/4] undid unique ids, used jQuery

---
 IPython/frontend/html/notebook/static/js/textcell.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/IPython/frontend/html/notebook/static/js/textcell.js b/IPython/frontend/html/notebook/static/js/textcell.js
index a64480b57..e597a91ee 100644
--- a/IPython/frontend/html/notebook/static/js/textcell.js
+++ b/IPython/frontend/html/notebook/static/js/textcell.js
@@ -39,11 +39,10 @@ var IPython = (function (IPython) {
             extraKeys: {"Tab": "indentMore","Shift-Tab" : "indentLess"},
             onKeyEvent: $.proxy(this.handle_codemirror_keyevent,this)
         });
-        this.cell_id = IPython.utils.uuid();
         // The tabindex=-1 makes this div focusable.
         // id is a unique cell_id necessary for updating MathJax intelligently
         var render_area = $('<div/>').addClass('text_cell_render border-box-sizing').
-            addClass('rendered_html').attr('tabindex','-1').attr('id',this.cell_id);
+            addClass('rendered_html').attr('tabindex','-1');
         cell.append(input_area).append(render_area);
         this.element = cell;
     };
@@ -81,7 +80,7 @@ var IPython = (function (IPython) {
 
     TextCell.prototype.typeset = function () {
         if (window.MathJax){
-            var cell_math = document.getElementById(this.cell_id);
+            var cell_math = this.element.get(0);
             MathJax.Hub.Queue(["Typeset",MathJax.Hub,cell_math]);
         }
     };

From cf0254bc31713dd6bf8a3475ecabcf6ee974244a Mon Sep 17 00:00:00 2001
From: Aron Ahmadia <aron@ahmadia.net>
Date: Thu, 1 Nov 2012 09:11:13 +0000
Subject: [PATCH 4/4] Finalizing fixes to MathJax enhancements

* Cell.prototype.typeset functionality restored
* MathJax configuration files back in .js, delayedStartup
* Renamed HUB to hub
* Removed vestigial comment
* Restored Markdown Cell placeholder render functionality
---
 .../frontend/html/notebook/static/js/cell.js  |  5 +-
 .../html/notebook/static/js/mathjaxutils.js   | 16 ++++-
 .../html/notebook/static/js/textcell.js       | 62 ++++++++-----------
 .../html/notebook/templates/notebook.html     | 16 +----
 4 files changed, 45 insertions(+), 54 deletions(-)

diff --git a/IPython/frontend/html/notebook/static/js/cell.js b/IPython/frontend/html/notebook/static/js/cell.js
index 6afc85256..be63097d7 100644
--- a/IPython/frontend/html/notebook/static/js/cell.js
+++ b/IPython/frontend/html/notebook/static/js/cell.js
@@ -50,8 +50,11 @@ var IPython = (function (IPython) {
         });
     };
 
-    // prototype typeset method does nothing, see TextCell typeset
     Cell.prototype.typeset = function () {
+        if (window.MathJax){
+            var cell_math = this.element.get(0);
+            MathJax.Hub.Queue(["Typeset",MathJax.Hub,cell_math]);
+        }
     };
 
     Cell.prototype.select = function () {
diff --git a/IPython/frontend/html/notebook/static/js/mathjaxutils.js b/IPython/frontend/html/notebook/static/js/mathjaxutils.js
index 91026161d..7c7cb1a58 100644
--- a/IPython/frontend/html/notebook/static/js/mathjaxutils.js
+++ b/IPython/frontend/html/notebook/static/js/mathjaxutils.js
@@ -16,6 +16,18 @@ IPython.mathjaxutils = (function (IPython) {
     var init = function () {
         if (window.MathJax) {
             // MathJax loaded
+            MathJax.Hub.Config({
+                tex2jax: {
+                    inlineMath: [ ['$','$'], ["\\(","\\)"] ],
+                    displayMath: [ ['$$','$$'], ["\\[","\\]"] ],
+                    processEnvironments: true
+                },
+                displayAlign: 'left', // Change this to 'center' to center equations.
+                "HTML-CSS": {
+                    styles: {'.MathJax_Display': {"margin": 0}}
+                }
+            });
+            MathJax.Hub.Configured();
         } else if (window.mathjax_url != "") {
             // Don't have MathJax, but should. Show dialog.
             var dialog = $('<div></div>')
@@ -89,12 +101,12 @@ IPython.mathjaxutils = (function (IPython) {
     //    math, then push the math string onto the storage array.
     //  The preProcess function is called on all blocks if it has been passed in
     var process_math = function (i, j, pre_process) {
-        var HUB = MathJax.Hub;
+        var hub = MathJax.Hub;
         var block = blocks.slice(i, j + 1).join("").replace(/&/g, "&amp;") // use HTML entity for &
         .replace(/</g, "&lt;") // use HTML entity for <
         .replace(/>/g, "&gt;") // use HTML entity for >
         ;
-        if (HUB.Browser.isMSIE) {
+        if (hub.Browser.isMSIE) {
             block = block.replace(/(%[^\n]*)\n/g, "$1<br/>\n")
         }
         while (j > i) {
diff --git a/IPython/frontend/html/notebook/static/js/textcell.js b/IPython/frontend/html/notebook/static/js/textcell.js
index e597a91ee..bab05de54 100644
--- a/IPython/frontend/html/notebook/static/js/textcell.js
+++ b/IPython/frontend/html/notebook/static/js/textcell.js
@@ -40,7 +40,6 @@ var IPython = (function (IPython) {
             onKeyEvent: $.proxy(this.handle_codemirror_keyevent,this)
         });
         // The tabindex=-1 makes this div focusable.
-        // id is a unique cell_id necessary for updating MathJax intelligently
         var render_area = $('<div/>').addClass('text_cell_render border-box-sizing').
             addClass('rendered_html').attr('tabindex','-1');
         cell.append(input_area).append(render_area);
@@ -78,13 +77,6 @@ var IPython = (function (IPython) {
         return false;
     };
 
-    TextCell.prototype.typeset = function () {
-        if (window.MathJax){
-            var cell_math = this.element.get(0);
-            MathJax.Hub.Queue(["Typeset",MathJax.Hub,cell_math]);
-        }
-    };
-
 
     TextCell.prototype.select = function () {
         IPython.Cell.prototype.select.apply(this);
@@ -229,35 +221,33 @@ var IPython = (function (IPython) {
         if (this.rendered === false) {
             var text = this.get_text();
             if (text === "") { text = this.placeholder; }
-            else {
-                text = IPython.mathjaxutils.remove_math(text)
-                var html = IPython.markdown_converter.makeHtml(text);
-                html = IPython.mathjaxutils.replace_math(html)
-                try {
-                    this.set_rendered(html);
-                } catch (e) {
-                    console.log("Error running Javascript in Markdown:");
-                    console.log(e);
-                    this.set_rendered($("<div/>").addClass("js-error").html(
-                        "Error rendering Markdown!<br/>" + e.toString())
-                    );
-                }
-                this.element.find('div.text_cell_input').hide();
-                this.element.find("div.text_cell_render").show();
-                var code_snippets = this.element.find("pre > code");
-                code_snippets.replaceWith(function () {
-                    var code = $(this).html();
-                    /* Substitute br for newlines and &nbsp; for spaces
-                       before highlighting, since prettify doesn't
-                       preserve those on all browsers */
-                    code = code.replace(/(\r\n|\n|\r)/gm, "<br/>");
-                    code = code.replace(/ /gm, '&nbsp;');
-                    code = prettyPrintOne(code);
-
-                    return '<code class="prettyprint">' + code + '</code>';
-                });
-                this.typeset()
+            text = IPython.mathjaxutils.remove_math(text)
+            var html = IPython.markdown_converter.makeHtml(text);
+            html = IPython.mathjaxutils.replace_math(html)
+            try {
+                this.set_rendered(html);
+            } catch (e) {
+                console.log("Error running Javascript in Markdown:");
+                console.log(e);
+                this.set_rendered($("<div/>").addClass("js-error").html(
+                    "Error rendering Markdown!<br/>" + e.toString())
+                );
             }
+            this.element.find('div.text_cell_input').hide();
+            this.element.find("div.text_cell_render").show();
+            var code_snippets = this.element.find("pre > code");
+            code_snippets.replaceWith(function () {
+                var code = $(this).html();
+                /* Substitute br for newlines and &nbsp; for spaces
+                   before highlighting, since prettify doesn't
+                   preserve those on all browsers */
+                code = code.replace(/(\r\n|\n|\r)/gm, "<br/>");
+                code = code.replace(/ /gm, '&nbsp;');
+                code = prettyPrintOne(code);
+
+                return '<code class="prettyprint">' + code + '</code>';
+            });
+            this.typeset()
             this.rendered = true;
         }
     };
diff --git a/IPython/frontend/html/notebook/templates/notebook.html b/IPython/frontend/html/notebook/templates/notebook.html
index bb712c63f..1868e72e1 100644
--- a/IPython/frontend/html/notebook/templates/notebook.html
+++ b/IPython/frontend/html/notebook/templates/notebook.html
@@ -2,21 +2,7 @@
 {% block stylesheet %}
 
 {% if mathjax_url %}
-<script type="text/x-mathjax-config">
-    MathJax.Hub.Config({
-        tex2jax: {
-            inlineMath: [ ['$','$'], ["\\(","\\)"] ],
-            displayMath: [ ['$$','$$'], ["\\[","\\]"] ],
-            processEnvironments: true
-        },
-        displayAlign: 'left', // Change this to 'center' to center equations.
-        "HTML-CSS": {
-            styles: {'.MathJax_Display': {"margin": 0}}
-        }
-        });
-</script>
-
-<script type="text/javascript" src="{{mathjax_url}}?config=TeX-AMS_HTML-full" charset="utf-8"></script>
+<script type="text/javascript" src="{{mathjax_url}}?config=TeX-AMS_HTML-full&delayStartupUntil=configured" charset="utf-8"></script>
 {% end %}
 <script type="text/javascript">
 // MathJax disabled, set as null to distingish from *missing* MathJax,