upstream/ipython Commit - r8568:881ad26e

Refactored to JS standards. Fixed Attribution....

Aron Ahmadia -

r8568:881ad26e

parent child

IPython/frontend/html/notebook/static/js/mathjaxutils.js

0 +23 -19

                     };
                 };
-                // Some magic for deferring mathematical expressions to MathJaX
+                // Some magic for deferring mathematical expressions to MathJax
-                // Some of the code here is adapted with permission from Stack Exchange Inc.
+                // by hiding them from the Markdown parser.
+                // Some of the code here is adapted with permission from Davide Cervone
+                // under the terms of the Apache2 license governing the MathJax project.
+                // Other minor modifications are also due to StackExchange and are used with
+                // permission.
                 var inline = "$"; // the inline math delimiter
                 var blocks, start, end, last, braces; // used in searching for math
                 //  Clear the current math positions and store the index of the
                 //    math, then push the math string onto the storage array.
                 //  The preProcess function is called on all blocks if it has been passed in
-                function processMath(i, j, preProcess) {
+                var process_math = function (i, j, pre_process) {
                     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 >
                         j--;
                     }
                     blocks[i] = "@@" + math.length + "@@"; // replace the current block text with a unique tag to find later
-                    if (preProcess)
+                    if (pre_process)
-                        block = preProcess(block);
+                        block = pre_process(block);
                     math.push(block);
                     start = end = last = null;
                 }
                 //  Don't allow math to pass through a double linebreak
                 //    (which will be a paragraph).
                 //
-                function removeMath(text) {
+                var remove_math = function (text) {
                     start = end = last = null; // for tracking math delimiters
                     math = []; // stores math strings for later
                     //     `$foo` and `$bar` are varibales.  -->  <code>$foo ` and `$bar</code> are variables.
                     var hasCodeSpans = /`/.test(text),
-                        deTilde;
+                        de_tilde;
                     if (hasCodeSpans) {
                         text = text.replace(/~/g, "~T").replace(/(^|[^\\])(`+)([^\n]*?[^`\n])\2(?!`)/gm, function (wholematch) {
                             return wholematch.replace(/\$/g, "~D");
                         });
-                        deTilde = function (text) { return text.replace(/~([TD])/g, function (wholematch, character) { return { T: "~", D: "$" }[character]; }) };
+                        de_tilde = function (text) { return text.replace(/~([TD])/g, function (wholematch, character) { return { T: "~", D: "$" }[character]; }) };
                     } else {
-                        deTilde = function (text) { return text; };
+                        de_tilde = function (text) { return text; };
                     }
                     blocks = IPython.utils.regex_split(text.replace(/\r\n?/g, "\n"),MATHSPLIT);
                                     last = i
                                 }
                                 else {
-                                    processMath(start, i, deTilde)
+                                    process_math(start, i, de_tilde)
                                 }
                             }
                             else if (block.match(/\n.*\n/)) {
                                 if (last) {
                                     i = last;
-                                    processMath(start, i, deTilde)
+                                    process_math(start, i, de_tilde)
                                 }
                                 start = end = last = null;
                                 braces = 0;
                         }
                     }
                     if (last) {
-                        processMath(start, last, deTilde)
+                        process_math(start, last, de_tilde)
                     }
-                    return deTilde(blocks.join(""));
+                    return de_tilde(blocks.join(""));
                 }
                 //
                 //  Put back the math strings that were saved,
                 //    and clear the math array (no need to keep it around).
                 //
-                function replaceMath(text) {
+                var replace_math = function (text) {
                     text = text.replace(/@@(\d+)@@/g, function (match, n) {
                         return math[n]
                     });
                     return text;
                 }
-                function queueRender() {
+                var queue_render = function () {
                     // see https://groups.google.com/forum/?fromgroups=#!topic/mathjax-users/cpwy5eCH1ZQ
                     MathJax.Hub.Queue(
                       ["resetEquationNumbers",MathJax.InputJax.TeX],
                 return {
                     init : init,
-                    processMath : processMath,
+                    process_math : process_math,
-                    removeMath : removeMath,
+                    remove_math : remove_math,
-                    replaceMath : replaceMath,
+                    replace_math : replace_math,
-                    queueRender : queueRender
+                    queue_render : queue_render
                 };
             }(IPython));

IPython/frontend/html/notebook/static/js/textcell.js

0 +3 -3

                         var text = this.get_text();
                         if (text === "") { text = this.placeholder; }
-                        text = IPython.mathjaxutils.removeMath(text)
+                        text = IPython.mathjaxutils.remove_math(text)
                         var html = IPython.markdown_converter.makeHtml(text);
-                        html = IPython.mathjaxutils.replaceMath(html)
+                        html = IPython.mathjaxutils.replace_math(html)
                         try {
                             this.set_rendered(html);
                             return '<code class="prettyprint">' + code + '</code>';
                         });
-                        IPython.mathjaxutils.queueRender()
+                        IPython.mathjaxutils.queue_render()
                         this.rendered = true;
                     }
                 };

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages