', '(click anywhere to close)', XHTML);
+ elem.style = 'font-size:0.8em; padding-top:1em; color:#014';
+ div.appendChild(elem);
+ body.insertBefore(div, body.firstChild);
+ }
+
+ // setup onload function
+ if (typeof window.addEventListener == 'function') {
+ // gecko, safari, konqueror and standard
+ window.addEventListener('load', init, false);
+ } else if (typeof document.addEventListener == 'function') {
+ // opera 7
+ document.addEventListener('load', init, false);
+ } else if (typeof window.attachEvent == 'function') {
+ // win/ie
+ window.attachEvent('onload', init);
+ } else {
+ // mac/ie5 and anything else that gets this far
+ // if there's an existing onload function
+ if (typeof window.onload == 'function') {
+ // store it
+ var existing = onload;
+ // add new onload handler
+ window.onload = function() {
+ existing(); // call existing onload function
+ init(); // call init onload function
+ };
+ } else {
+ window.onload = init;
+ }
+ }
+}
+
+// expose some functions to outside
+AM.render = render;
+AM.am2tex = am2tex;
+})();
+
+if (typeof module !== 'undefined')
+ module.exports = asciimath
diff --git a/js/diagramflowseq.js b/js/diagramflowseq.js
index 74f8ed4..1cf7326 100644
--- a/js/diagramflowseq.js
+++ b/js/diagramflowseq.js
@@ -127,7 +127,7 @@ function drawAllMermaid() {
}
}
-function renderKatex(srcMath, isDisplay) {
+function renderKatex(srcMath, isDisplay, useAM) {
const unEscape = function (html) {
return html
.replace(/&/g, '&')
@@ -139,7 +139,11 @@ function renderKatex(srcMath, isDisplay) {
};
let repMath = "";
srcMath = unEscape(srcMath);
+
try {
+ if (useAM && renderKatex.AMenabled) {
+ srcMath = asciimath.am2tex(srcMath, isDisplay);
+ }
repMath = katex.renderToString(srcMath, {displayMode: isDisplay});
}
catch(err) {
@@ -151,7 +155,7 @@ function renderKatex(srcMath, isDisplay) {
function replaceMathString(src) {
var out = src;
- var pattern = /(\$`)((?:\\.|[\s\S])+?)(`\$)|(\${1,2})((?:\\.|[\s\S])+?)\4|(\\\[)((?:\\.|[\s\S])+?)(\\])|(\\\()((?:\\.|[\s\S])+?)(\\\))/g;
+ var pattern = /(\$`)((?:\\.|[\s\S])+?)(`\$)|(\${1,2})((?:\\.|[\s\S])+?)\4|(\\\[)((?:\\.|[\s\S])+?)(\\])|(\\\()((?:\\.|[\s\S])+?)(\\\))|(``)([^]+?)(``)/g;
var mc = null;
var codeBegin = src.search('
');
var codeEnd = src.search('');
@@ -162,6 +166,7 @@ function replaceMathString(src) {
} else {
var srcMath = "";
var isDisplay = false;
+ var useAM = false;
if (mc[1]) { //match $` `$
isDisplay = false;
srcMath = mc[2];
@@ -174,15 +179,20 @@ function replaceMathString(src) {
} else if (mc[9]) { //match \\( \\)
isDisplay = false;
srcMath = mc[10];
+ } else if (mc[12]) { //match ``
+ isDisplay = false;
+ srcMath = mc[13];
+ useAM = true;
}
- var repMath = renderKatex(srcMath, isDisplay);
+ var repMath = renderKatex(srcMath, isDisplay, useAM);
if (repMath && repMath.length !== 0) {
out = out.replace(mc[0], repMath);
}
}
}
- return out.replace(/\\
/g, '')
}
function prepareSpecialCode(lang, code) {
@@ -202,6 +212,8 @@ function prepareSpecialCode(lang, code) {
}
} else if (lang === "math") {
retStr = renderKatex(code, true);
+ } else if (lang === "asciimath" || lang === "AM") {
+ retStr = renderKatex(code, true, true);
} else if (lang === "mermaid") {
var mermiadId = genNextMermaidDivId();
retStr = '' + code + '
\n';
@@ -212,29 +224,20 @@ function prepareSpecialCode(lang, code) {
function isStartMultiMath(src) {
var pattern = /^(\s*)(\${2})|^(\s*)(\\\[)/g;
var npt = /(\${2})((?:\\.|[\s\S])+?)\1|(\\\[)((?:\\.|[\s\S])+?)(\\])/g;
- var mc = null;
- var ret = false;
- if (null != (mc = pattern.exec(src)) && null == npt.exec(src)) {
- ret = true;
- }
- return ret;
+ return pattern.test(src) && !npt.test(src);
}
function isEndMultiMath(src) {
- var pattern = /(\${2})(\s*)$|(\\])(\s*)$/g;
- var mc = null;
- var ret = false;
- if (null != (mc = pattern.exec(src))) {
- ret = true;
- }
- return ret;
+ var pattern = /(\${2})(\s*)$|(\\])(\s*)$|(``)(\s*)$/g;
+ return pattern.test(src);
}
-function prepareDiagram(data) {
+function prepareDiagram(data, AMenabled) {
+ renderKatex.AMenabled = AMenabled
var lines = data.split('\n');
var retStr = "";
var curStatus = "";
- var preLangs = ["flow", "sequence", "puml", "math", "mermaid"];
+ var preLangs = ["flow", "sequence", "puml", "math", "mermaid", "asciimath", "AM"];
var lang = "";
var tmpCode = "";
var isInCode = function () {
@@ -250,7 +253,7 @@ function prepareDiagram(data) {
return preLangs.indexOf(lang) != -1;
}
var isStartCode = function(src) {
- var pattern = /^(`{3,})(\w*)/g;
+ var pattern = /^\s*(`{3,})(\w*)/g;
var mc = null;
var ret = false;
if (null != (mc = pattern.exec(src))) {
@@ -260,13 +263,8 @@ function prepareDiagram(data) {
return ret;
}
var isEndCode = function(src) {
- var pattern = /^(`{3,})(\w*)/g;
- var mc = null;
- var ret = false;
- if (null != (mc = pattern.exec(src))) {
- ret = true;
- }
- return ret;
+ var pattern = /^\s*(`{3,})(\w*)/g;
+ return pattern.test(src)
}
resetDivId();
diff --git a/js/markdownify.js b/js/markdownify.js
index 7dd29a1..c132e2a 100644
--- a/js/markdownify.js
+++ b/js/markdownify.js
@@ -73,12 +73,12 @@
// Onload, take the DOM of the page, get the markdown formatted text out and
// apply the converter.
function makeHtml(data) {
- storage.get(['supportMath', 'katex', 'toc'], function(items) {
+ storage.get(['supportMath', 'katex', 'toc', 'asciimath'], function(items) {
// Convert MarkDown to HTML
var preHtml = data;
if (items.katex) {
config.markedOptions.katex = true;
- preHtml = diagramFlowSeq.prepareDiagram(preHtml);
+ preHtml = diagramFlowSeq.prepareDiagram(preHtml, items.asciimath);
}
if (items.toc) {
@@ -233,7 +233,7 @@
});
}
- storage.get(['exclude_exts', 'disable_markdown', 'katex', 'html'], function(items) {
+ storage.get(['exclude_exts', 'disable_markdown', 'katex', 'html', 'asciimath'], function(items) {
if (items.disable_markdown) {
return;
}
@@ -284,11 +284,11 @@
} else {
stopAutoReload();
}
- } else if(key == 'disable_markdown') {
- location.reload();
- } else if(key == 'supportMath') {
- location.reload();
- } else if(key == 'katex') {
+ } else if(key === 'disable_markdown'
+ || key === 'supportMath'
+ || key === 'katex'
+ || key === 'asciimath'
+ ) {
location.reload();
}
}
diff --git a/js/options.js b/js/options.js
index 0c116c8..5154694 100644
--- a/js/options.js
+++ b/js/options.js
@@ -15,23 +15,15 @@ function message(text, type) {
}, 3000);
}
-storage.get(['katex', 'html', 'toc'], function(items) {
- if(items.katex) {
- $('#katex').prop('checked', 'checked');
- } else {
- $('#katex').removeProp('checked');
- }
- if(items.toc) {
- $('#toc').prop('checked', 'checked');
- } else {
- $('#toc').removeProp('checked');
- }
-
- if(items.html) {
- $('#html').prop('checked', 'checked');
- } else {
- $('#html').removeProp('checked');
- }
+var options = ['katex', 'html', 'toc', 'asciimath']
+storage.get(options, function(items) {
+ options.forEach(function(key) {
+ if (items[key]) {
+ $('#' + key).prop('checked', 'checked');
+ } else {
+ $('#' + key).removeProp('checked');
+ }
+ });
});
// auto-reload
@@ -48,21 +40,37 @@ $('#html').change(function() {
storage.set({'html' : 1});
} else {
storage.remove('html');
- $('#katex').removeProp('checked');
storage.remove('katex');
+ storage.remove('asciimath');
+ $('#katex').prop('checked', false);
+ $('#asciimath').prop('checked', false);
}
});
$('#katex').change(function() {
if($(this).prop('checked')) {
storage.set({'katex' : 1});
- $('#html').prop('checked', 'checked');
storage.set({'html' : 1});
+ $('#html').prop('checked', true);
} else {
storage.remove('katex');
+ storage.remove('asciimath');
+ $('#asciimath').prop('checked', false);
}
});
+$('#asciimath').change(function() {
+ if($(this).prop('checked')) {
+ storage.set({'html' : 1});
+ storage.set({'katex' : 1});
+ storage.set({'asciimath': 1});
+ $('#html').prop('checked', true);
+ $('#katex').prop('checked', true);
+ } else {
+ storage.remove('asciimath');
+ }
+})
+
$('#auto-reload').change(function() {
if($(this).prop('checked')) {
storage.set({'auto_reload' : 1});
diff --git a/manifest.json b/manifest.json
index 83448a5..0c7a8ad 100644
--- a/manifest.json
+++ b/manifest.json
@@ -47,6 +47,7 @@
"js/flowchart.min.js",
"js/diagramflowseq.js",
"js/katex.min.js",
+ "js/asciimath.js",
"js/rawdeflate.js",
"js/platumlencode.js",
"js/mermaid.min.js"
diff --git a/options.html b/options.html
index 8e31100..24b9c99 100644
--- a/options.html
+++ b/options.html
@@ -18,7 +18,21 @@ MarkDown Preview Plus Options
Miscs