dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-05 13:59:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

MathJax: support euqation number

Browse Source 
http://docs.mathjax.org/en/latest/tex.html#automatic-equation-numbering
This commit is contained in:
Le Tan 2018-10-30 20:47:28 +08:00
parent a246b7abab
commit f3ff862cfb
6 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/resources/hoedown.js
View File

@ -85,7 +85,8 @@ var updateHtml = function(html) {
// MathJax may be not loaded for now. // MathJax may be not loaded for now.
if (VEnableMathjax && (typeof MathJax != "undefined")) { if (VEnableMathjax && (typeof MathJax != "undefined")) {
try { try {
MathJax.Hub.Queue(["Typeset", MathJax.Hub, contentDiv, postProcessMathJax]); MathJax.Hub.Queue(["resetEquationNumbers",MathJax.InputJax.TeX],
["Typeset", MathJax.Hub, contentDiv, postProcessMathJax]);
} catch (err) { } catch (err) {
content.setLog("err: " + err); content.setLog("err: " + err);
finishOneAsyncJob(); finishOneAsyncJob();

6
src/resources/markdown-it.js
View File

@ -169,7 +169,8 @@ var updateText = function(text) {
} }
try { try {
MathJax.Hub.Queue(["Typeset", MathJax.Hub, eles, postProcessMathJax]); MathJax.Hub.Queue(["resetEquationNumbers",MathJax.InputJax.TeX],
["Typeset", MathJax.Hub, eles, postProcessMathJax]);
} catch (err) { } catch (err) {
content.setLog("err: " + err); content.setLog("err: " + err);
finishOneAsyncJob(); finishOneAsyncJob();
@ -254,7 +255,8 @@ var handleMathjaxReady = function() {
} }
try { try {
MathJax.Hub.Queue(["Typeset", MathJax.Hub, eles, postProcessMathJaxWhenMathjaxReady]); MathJax.Hub.Queue(["resetEquationNumbers",MathJax.InputJax.TeX],
["Typeset", MathJax.Hub, eles, postProcessMathJaxWhenMathjaxReady]);
} catch (err) { } catch (err) {
content.setLog("err: " + err); content.setLog("err: " + err);
finishOneAsyncJob(); finishOneAsyncJob();

3
src/resources/marked.js
View File

@ -72,7 +72,8 @@ var updateText = function(text) {
// finishLoading logic. // finishLoading logic.
if (VEnableMathjax) { if (VEnableMathjax) {
try { try {
MathJax.Hub.Queue(["Typeset", MathJax.Hub, contentDiv, postProcessMathJax]); MathJax.Hub.Queue(["resetEquationNumbers",MathJax.InputJax.TeX],
["Typeset", MathJax.Hub, contentDiv, postProcessMathJax]);
} catch (err) { } catch (err) {
content.setLog("err: " + err); content.setLog("err: " + err);
finishOneAsyncJob(); finishOneAsyncJob();

3
src/resources/mathjax_preview.js
View File

@ -72,7 +72,8 @@ var previewMathJax = function(identifier, id, timeStamp, text, isHtml) {
} }
try { try {
MathJax.Hub.Queue(["Typeset", MathJax.Hub.Queue(["resetEquationNumbers",MathJax.InputJax.TeX],
["Typeset",
MathJax.Hub, MathJax.Hub,
p, p,
[postProcessMathJax, identifier, id, timeStamp, p, isBlock]]); [postProcessMathJax, identifier, id, timeStamp, p, isBlock]]);

3
src/resources/showdown.js
View File

@ -117,7 +117,8 @@ var updateText = function(text) {
// finishLoading logic. // finishLoading logic.
if (VEnableMathjax) { if (VEnableMathjax) {
try { try {
MathJax.Hub.Queue(["Typeset", MathJax.Hub, contentDiv, postProcessMathJax]); MathJax.Hub.Queue(["resetEquationNumbers",MathJax.InputJax.TeX],
["Typeset", MathJax.Hub, contentDiv, postProcessMathJax]);
} catch (err) { } catch (err) {
content.setLog("err: " + err); content.setLog("err: " + err);
finishOneAsyncJob(); finishOneAsyncJob();

43
src/utils/vutils.cpp
View File

@ -796,6 +796,9 @@ QString VUtils::generateHtmlTemplate(const QString &p_template,
" TeX: {\n" " TeX: {\n"
" Macros: {\n" " Macros: {\n"
" bm: [\"\\\\boldsymbol{#1}\", 1]\n" " bm: [\"\\\\boldsymbol{#1}\", 1]\n"
" },\n"
" equationNumbers: {\n"
" autoNumber: \"AMS\"\n"
" }\n" " }\n"
" },\n" " },\n"
" messageStyle: \"none\"});\n" " messageStyle: \"none\"});\n"
@ -884,29 +887,32 @@ QString VUtils::generateExportHtmlTemplate(const QString &p_renderBg,
QString extra; QString extra;
if (p_includeMathJax) { if (p_includeMathJax) {
extra += "<script type=\"text/x-mathjax-config\">\n" extra += "<script type=\"text/x-mathjax-config\">\n"
"MathJax.Hub.Config({\n" "MathJax.Hub.Config({\n"
"showProcessingMessages: false,\n" " showProcessingMessages: false,\n"
"messageStyle: \"none\",\n" " messageStyle: \"none\",\n"
"SVG: {\n" " SVG: {\n"
"minScaleAdjust: 100,\n" " minScaleAdjust: 100,\n"
"styles: {\n" " styles: {\n"
/* /*
FIXME: Using wkhtmltopdf, without 2em, the math formula will be very small. However, 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. with 2em, if there are Chinese characters in it, the font will be a mess.
*/ */
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
"\".MathJax_SVG\": {\n" " \".MathJax_SVG\": {\n"
"\"font-size\": \"2em !important\"\n" " \"font-size\": \"2em !important\"\n"
"}\n" " }\n"
#endif #endif
"}\n" " }\n"
"},\n" " },\n"
"TeX: {\n" " TeX: {\n"
" Macros: {\n" " Macros: {\n"
" bm: [\"\\\\boldsymbol{#1}\", 1]\n" " bm: [\"\\\\boldsymbol{#1}\", 1]\n"
" }\n" " },\n"
"}\n" " equationNumbers: {\n"
"});\n" " autoNumber: \"AMS\"\n"
" }\n"
" }\n"
"});\n"
"</script>\n"; "</script>\n";
QString mj = g_config->getMathjaxJavascript(); QString mj = g_config->getMathjaxJavascript();
@ -969,6 +975,9 @@ QString VUtils::generateMathJaxPreviewTemplate()
" TeX: {\n" " TeX: {\n"
" Macros: {\n" " Macros: {\n"
" bm: [\"\\\\boldsymbol{#1}\", 1]\n" " bm: [\"\\\\boldsymbol{#1}\", 1]\n"
" },\n"
" equationNumbers: {\n"
" autoNumber: \"AMS\"\n"
" }\n" " }\n"
" },\n" " },\n"
" messageStyle: \"none\"});\n" " messageStyle: \"none\"});\n"