mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-12 11:45:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactored to JS standards. Fixed Attribution.

Browse Source 
thisStyle      --> this_style.
function foo() --> var foo = function()

StackExchange improperly attributed for Davide Cervone's
Markdown+MathJax handling.  This has been fixed.

Ref:
http://stackoverflow.com/a/11231030/122022
http://www.math.union.edu/~dpvc/transfer/mathjax/mathjax-editing.js
This commit is contained in:
Aron Ahmadia 2012-10-13 14:29:17 +03:00
parent 2ec0115f77
commit 8d3fbe5901
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
IPython/frontend/html/notebook/static/js/mathjaxutils.js
View File

@ -78,8 +78,12 @@ IPython.mathjaxutils = (function (IPython) {
}; };
}; };
// 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 inline = "$"; // the inline math delimiter
var blocks, start, end, last, braces; // used in searching for math var blocks, start, end, last, braces; // used in searching for math
@ -97,7 +101,7 @@ IPython.mathjaxutils = (function (IPython) {
// Clear the current math positions and store the index of the // Clear the current math positions and store the index of the
// math, then push the math string onto the storage array. // math, then push the math string onto the storage array.
// The preProcess function is called on all blocks if it has been passed in // 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, "&") // use HTML entity for & var block = blocks.slice(i, j + 1).join("").replace(/&/g, "&") // use HTML entity for &
.replace(/</g, "&lt;") // use HTML entity for < .replace(/</g, "&lt;") // use HTML entity for <
.replace(/>/g, "&gt;") // use HTML entity for > .replace(/>/g, "&gt;") // use HTML entity for >
@ -110,8 +114,8 @@ IPython.mathjaxutils = (function (IPython) {
j--; j--;
} }
blocks[i] = "@@" + math.length + "@@"; // replace the current block text with a unique tag to find later 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); math.push(block);
start = end = last = null; start = end = last = null;
} }
@ -122,7 +126,7 @@ IPython.mathjaxutils = (function (IPython) {
// Don't allow math to pass through a double linebreak // Don't allow math to pass through a double linebreak
// (which will be a paragraph). // (which will be a paragraph).
// //
function removeMath(text) { var remove_math = function (text) {
start = end = last = null; // for tracking math delimiters start = end = last = null; // for tracking math delimiters
math = []; // stores math strings for later math = []; // stores math strings for later
@ -133,14 +137,14 @@ IPython.mathjaxutils = (function (IPython) {
// `$foo` and `$bar` are varibales. --> <code>$foo ` and `$bar</code> are variables. // `$foo` and `$bar` are varibales. --> <code>$foo ` and `$bar</code> are variables.
var hasCodeSpans = /`/.test(text), var hasCodeSpans = /`/.test(text),
deTilde; de_tilde;
if (hasCodeSpans) { if (hasCodeSpans) {
text = text.replace(/~/g, "~T").replace(/(^|[^\\])(`+)([^\n]*?[^`\n])\2(?!`)/gm, function (wholematch) { text = text.replace(/~/g, "~T").replace(/(^|[^\\])(`+)([^\n]*?[^`\n])\2(?!`)/gm, function (wholematch) {
return wholematch.replace(/\$/g, "~D"); 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 { } else {
deTilde = function (text) { return text; }; de_tilde = function (text) { return text; };
} }
blocks = IPython.utils.regex_split(text.replace(/\r\n?/g, "\n"),MATHSPLIT); blocks = IPython.utils.regex_split(text.replace(/\r\n?/g, "\n"),MATHSPLIT);
@ -166,13 +170,13 @@ IPython.mathjaxutils = (function (IPython) {
last = i last = i
} }
else { else {
processMath(start, i, deTilde) process_math(start, i, de_tilde)
} }
} }
else if (block.match(/\n.*\n/)) { else if (block.match(/\n.*\n/)) {
if (last) { if (last) {
i = last; i = last;
processMath(start, i, deTilde) process_math(start, i, de_tilde)
} }
start = end = last = null; start = end = last = null;
braces = 0; braces = 0;
@ -202,16 +206,16 @@ IPython.mathjaxutils = (function (IPython) {
} }
} }
if (last) { 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, // Put back the math strings that were saved,
// and clear the math array (no need to keep it around). // 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) { text = text.replace(/@@(\d+)@@/g, function (match, n) {
return math[n] return math[n]
}); });
@ -219,7 +223,7 @@ IPython.mathjaxutils = (function (IPython) {
return text; return text;
} }
function queueRender() { var queue_render = function () {
// see https://groups.google.com/forum/?fromgroups=#!topic/mathjax-users/cpwy5eCH1ZQ // see https://groups.google.com/forum/?fromgroups=#!topic/mathjax-users/cpwy5eCH1ZQ
MathJax.Hub.Queue( MathJax.Hub.Queue(
["resetEquationNumbers",MathJax.InputJax.TeX], ["resetEquationNumbers",MathJax.InputJax.TeX],
@ -230,10 +234,10 @@ IPython.mathjaxutils = (function (IPython) {
return { return {
init : init, 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));

6
IPython/frontend/html/notebook/static/js/textcell.js
View File

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