Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support MathJaX v3 #1221

Merged
merged 6 commits into from
Mar 1, 2020
Merged

Support MathJaX v3 #1221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e57eb7a
Support MathJaX v3
Feb 24, 2020
5587ecf
Update configuration of MathJaX
Feb 26, 2020
55f3f51
Update config to export HTML
Feb 26, 2020
d41c0b8
Reset numbering
Feb 27, 2020
eea2ecd
Add scale option
Feb 29, 2020
be9ac34
Fix typo
Feb 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/resources/hoedown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,14 @@ var updateHtml = function(html) {
// finishLoading logic.
// MathJax may be not loaded for now.
if (VEnableMathjax && (typeof MathJax != "undefined")) {
try {
MathJax.Hub.Queue(["resetEquationNumbers",MathJax.InputJax.TeX],
["Typeset", MathJax.Hub, contentDiv, postProcessMathJax]);
} catch (err) {
content.setLog("err: " + err);
finishOneAsyncJob();
}
MathJax.texReset();
MathJax
.typesetPromise([contentDiv])
.then(postProcessMathJax)
.catch(function (err) {
content.setLog("err: " + err);
finishOneAsyncJob();
});
} else {
finishOneAsyncJob();
}
Expand Down
32 changes: 17 additions & 15 deletions src/resources/markdown-it.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,13 +195,14 @@ var updateText = function(text) {
eles.push(texToRender[i]);
}

try {
MathJax.Hub.Queue(["resetEquationNumbers",MathJax.InputJax.TeX],
["Typeset", MathJax.Hub, eles, postProcessMathJax]);
} catch (err) {
content.setLog("err: " + err);
finishOneAsyncJob();
}
MathJax.texReset();
MathJax
.typesetPromise(eles)
.then(postProcessMathJax)
.catch(function (err) {
content.setLog("err: " + err);
finishOneAsyncJob();
});
} else {
finishOneAsyncJob();
}
Expand Down Expand Up @@ -244,7 +245,7 @@ var handleMetaData = function() {
};

var postProcessMathJaxWhenMathjaxReady = function() {
var all = MathJax.Hub.getAllJax();
var all = Array.from(MathJax.startup.document.math);
for (var i = 0; i < all.length; ++i) {
var node = all[i].SourceElement().parentNode;
if (VRemoveMathjaxScript) {
Expand Down Expand Up @@ -281,11 +282,12 @@ var handleMathjaxReady = function() {
eles.push(texToRender[i]);
}

try {
MathJax.Hub.Queue(["resetEquationNumbers",MathJax.InputJax.TeX],
["Typeset", MathJax.Hub, eles, postProcessMathJaxWhenMathjaxReady]);
} catch (err) {
content.setLog("err: " + err);
finishOneAsyncJob();
}
MathJax.texReset();
MathJax
.typesetPromise(eles)
.then(postProcessMathJaxWhenMathjaxReady)
.catch(function (err) {
content.setLog("err: " + err);
finishOneAsyncJob();
});
};
9 changes: 8 additions & 1 deletion src/resources/markdown_template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,14 @@
<script src="qrc:/utils/highlightjs/highlight.pack.js"></script>
<script src="qrc:/utils/clipboard.js/clipboard.min.js"></script>
<!-- EXTRA_PLACE_HOLDER -->
<script src="JS_PLACE_HOLDER" defer></script>
<script>
MathJax = {
tex: {
inlineMath: [['$', '$'], ['\\(', '\\)']]
}
};
</script>
<script src="JS_PLACE_HOLDER" defer id="MathJax-script"></script>
<script src="qrc:/resources/common.js" defer></script>
<script src="qrc:/resources/view_image.js" defer></script>
<script src="qrc:/resources/markdown_template.js" defer></script>
Expand Down
2 changes: 1 addition & 1 deletion src/resources/markdown_template.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1385,7 +1385,7 @@ var getHtmlWithInlineStyles = function(container) {
// Will be called after MathJax rendering finished.
// Make <pre><code>math</code></pre> to <p>math</p>
var postProcessMathJax = function() {
var all = MathJax.Hub.getAllJax();
var all = Array.from(MathJax.startup.document.math);
for (var i = 0; i < all.length; ++i) {
var node = all[i].SourceElement().parentNode;
if (VRemoveMathjaxScript) {
Expand Down
15 changes: 8 additions & 7 deletions src/resources/marked.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,14 @@ var updateText = function(text) {
// If you add new logics after handling MathJax, please pay attention to
// finishLoading logic.
if (VEnableMathjax) {
try {
MathJax.Hub.Queue(["resetEquationNumbers",MathJax.InputJax.TeX],
["Typeset", MathJax.Hub, contentDiv, postProcessMathJax]);
} catch (err) {
content.setLog("err: " + err);
finishOneAsyncJob();
}
MathJax.texReset();
MathJax
.typesetPromise([contentDiv])
.then(postProcessMathJax)
.catch(function (err) {
content.setLog("err: " + err);
finishOneAsyncJob();
});
} else {
finishOneAsyncJob();
}
Expand Down
25 changes: 11 additions & 14 deletions src/resources/mathjax_preview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,19 +71,16 @@ var previewMathJax = function(identifier, id, timeStamp, text, isHtml) {
if (text.indexOf('$$') !== -1) {
isBlock = true;
}

try {
MathJax.Hub.Queue(["resetEquationNumbers",MathJax.InputJax.TeX],
["Typeset",
MathJax.Hub,
p,
[postProcessMathJax, identifier, id, timeStamp, p, isBlock]]);
} catch (err) {
content.setLog("err: " + err);
content.mathjaxResultReady(identifier, id, timeStamp, 'png', '');
contentDiv.removeChild(p);
delete p;
}
MathJax
.typesetPromise([p])
.then(function () {
postProcessMathJax(identifier, id, timeStamp, p, isBlock);
}).catch(function (err) {
content.setLog("err: " + err);
content.mathjaxResultReady(identifier, id, timeStamp, 'png', '');
contentDiv.removeChild(p);
delete p;
});
};

var postProcessMathJax = function(identifier, id, timeStamp, container, isBlock) {
Expand All @@ -93,7 +90,7 @@ var postProcessMathJax = function(identifier, id, timeStamp, container, isBlock)
return;
}

var hei = (isBlock ? container.clientHeight * 1.5 : container.clientHeight * 1.6) + 5;
var hei = container.clientHeight * 1.5 + (isBlock ? 20 : 5);
domtoimage.toPng(container, { height: hei }).then(function (dataUrl) {
var png = dataUrl.substring(dataUrl.indexOf(',') + 1);
content.mathjaxResultReady(identifier, id, timeStamp, 'png', png);
Expand Down
12 changes: 11 additions & 1 deletion src/resources/mathjax_preview_template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,17 @@
<link rel="stylesheet" type="text/css" href="CSS_PLACE_HOLDER">
<script src="qrc:/resources/qwebchannel.js"></script>
<!-- EXTRA_PLACE_HOLDER -->
<script src="JS_PLACE_HOLDER" async></script>
<script>
MathJax = {
tex: {
inlineMath: [['$', '$'], ['\\(', '\\)']]
},
chtml: {
scale: 1 // http://docs.mathjax.org/en/latest/options/output/index.html#options-common-to-all-output-processors
}
};
</script>
<script src="JS_PLACE_HOLDER" defer id="MathJax-script"></script>
<script src="qrc:/utils/dom-to-image/dom-to-image.js" defer></script>
<script src="qrc:/resources/common.js" defer></script>
<script src="qrc:/resources/mathjax_preview.js" defer></script>
Expand Down
15 changes: 8 additions & 7 deletions src/resources/showdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,13 +134,14 @@ var updateText = function(text) {
// If you add new logics after handling MathJax, please pay attention to
// finishLoading logic.
if (VEnableMathjax) {
try {
MathJax.Hub.Queue(["resetEquationNumbers",MathJax.InputJax.TeX],
["Typeset", MathJax.Hub, contentDiv, postProcessMathJax]);
} catch (err) {
content.setLog("err: " + err);
finishOneAsyncJob();
}
MathJax.texReset();
MathJax
.typesetPromise([contentDiv])
.then(postProcessMathJax)
.catch(function (err) {
content.setLog("err: " + err);
finishOneAsyncJob();
});
} else {
finishOneAsyncJob();
}
Expand Down
2 changes: 1 addition & 1 deletion src/resources/vnote.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ custom_export=
markdownit_opt=html,break,linkify,metadata

; Location and configuration for Mathjax
mathjax_javascript=https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/MathJax.js?config=TeX-MML-AM_HTMLorMML
mathjax_javascript=https://cdnjs.cloudflare.com/ajax/libs/mathjax/3.0.1/es5/tex-mml-chtml.js

; Styles to be removed when copied
; style1,style2,style3
Expand Down
108 changes: 43 additions & 65 deletions src/utils/vutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,23 +788,24 @@ QString VUtils::generateHtmlTemplate(const QString &p_template,
mj.replace(reg, QString("\\1%1").arg("TeX-MML-AM_SVG"));
}

extraFile += "<script type=\"text/x-mathjax-config\">"
"MathJax.Hub.Config({\n"
" tex2jax: {inlineMath: [['$','$'], ['\\\\(','\\\\)']],\n"
"processEscapes: true,\n"
"processClass: \"tex2jax_process|language-mathjax|lang-mathjax\"},\n"
" showProcessingMessages: false,\n"
" skipStartupTypeset: " + QString("%1,\n").arg(mathjaxTypeSetOnLoad ? "false" : "true") +
" TeX: {\n"
" Macros: {\n"
" bm: [\"\\\\boldsymbol{#1}\", 1]\n"
" },\n"
" equationNumbers: {\n"
" autoNumber: \"AMS\"\n"
" }\n"
" },\n"
" messageStyle: \"none\"});\n"
"MathJax.Hub.Register.StartupHook(\"End\", function() { handleMathjaxReady(); });\n"
extraFile += "<script>"
"MathJax = {\n"
" tex: {\n"
" inlineMath: [['$','$'], ['\\\\(','\\\\)']],\n"
" processEscapes: true,\n"
" tags: 'ams'\n"
" },\n"
" options: {\n"
" processHtmlClass: 'tex2jax_process|language-mathjax|lang-mathjax'\n"
" },\n"
" startup: {\n"
" typeset: " + QString("%1,\n").arg(mathjaxTypeSetOnLoad ? "true" : "false") +
" ready: function() {\n"
" MathJax.startup.defaultReady();\n"
" MathJax.startup.promise.then(handleMathjaxReady);\n"
" }\n"
" }\n"
"}"
"</script>\n"
"<script type=\"text/javascript\" async src=\"" + mj + "\"></script>\n" +
"<script>var VEnableMathjax = true;</script>\n";
Expand Down Expand Up @@ -898,39 +899,22 @@ QString VUtils::generateExportHtmlTemplate(const QString &p_renderBg,
QString templ = VNote::generateExportHtmlTemplate(g_config->getRenderBackgroundColor(p_renderBg));
QString extra;
if (p_includeMathJax) {
extra += "<script type=\"text/x-mathjax-config\">\n"
"MathJax.Hub.Config({\n"
" showProcessingMessages: false,\n"
" messageStyle: \"none\",\n"
" SVG: {\n"
" minScaleAdjust: 100,\n"
" styles: {\n"
/*
FIXME: Using wkhtmltopdf, without 2em, the math formula will be very small. However,
with 2em, if there are Chinese characters in it, the font will be a mess.
*/
#if defined(Q_OS_WIN)
" \".MathJax_SVG\": {\n"
" \"font-size\": \"2em !important\"\n"
" }\n"
#endif
" }\n"
" },\n"
" TeX: {\n"
" Macros: {\n"
" bm: [\"\\\\boldsymbol{#1}\", 1]\n"
" },\n"
" equationNumbers: {\n"
" autoNumber: \"AMS\"\n"
" }\n"
" }\n"
"});\n"
extra += "<script>"
"MathJax = {\n"
" tex: {\n"
" inlineMath: [['$','$'], ['\\\\(','\\\\)']],\n"
" processEscapes: true,\n"
" tags: 'ams'\n"
" },\n"
" options: {\n"
" processHtmlClass: 'tex2jax_process|language-mathjax|lang-mathjax'\n"
" }\n"
"}"
"</script>\n";

QString mj = g_config->getMathjaxJavascript();
// Chante MathJax to be rendered as SVG.
QRegExp reg("(Mathjax\\.js\\?config=)\\S+", Qt::CaseInsensitive);
mj.replace(reg, QString("\\1%1").arg("TeX-MML-AM_SVG"));
QRegExp reg("tex-mml-chtml\\.js\\S+", Qt::CaseInsensitive);
mj.replace(reg, QString("tex-mml-svg.js"));

extra += "<script type=\"text/javascript\" async src=\"" + mj + "\"></script>\n";
}
Expand Down Expand Up @@ -996,26 +980,20 @@ QString VUtils::generateMathJaxPreviewTemplate()
"<script src=\"qrc" + VNote::c_flowchartJsFile + "\"></script>\n";

// MathJax.
extraFile += "<script type=\"text/x-mathjax-config\">"
"MathJax.Hub.Config({\n"
" tex2jax: {inlineMath: [['$','$'], ['\\\\(','\\\\)']],\n"
"processEscapes: true,\n"
"processClass: \"tex2jax_process|language-mathjax|lang-mathjax\"},\n"
" \"HTML-CSS\": {\n"
" scale: " + mathjaxScale + "\n"
" },\n"
" showProcessingMessages: false,\n"
" TeX: {\n"
" Macros: {\n"
" bm: [\"\\\\boldsymbol{#1}\", 1]\n"
" },\n"
" equationNumbers: {\n"
" autoNumber: \"AMS\"\n"
" }\n"
" },\n"
" messageStyle: \"none\"});\n"
extraFile += "<script>"
"MathJax = {\n"
" tex: {\n"
" inlineMath: [['$','$'], ['\\\\(','\\\\)']],\n"
" processEscapes: true,\n"
" tags: 'ams'\n"
" },\n"
" options: {\n"
" processHtmlClass: 'tex2jax_process|language-mathjax|lang-mathjax'\n"
" }\n"
"}"
"</script>\n";


extraFile += "<script src=\"qrc" + VNote::c_wavedromThemeFile + "\"></script>\n" +
"<script src=\"qrc" + VNote::c_wavedromJsFile + "\"></script>\n";

Expand Down