impletement supply an option for user to switch for the inline MathJa…

…x expression #283
rhiokim · Feb 9, 2014 · d7c6373 · d7c6373
1 parent e79c9a8
commit d7c6373
Show file tree

Hide file tree

Showing 10 changed files with 137 additions and 21 deletions.
diff --git a/src/js/app/core/InlineLexer.js b/src/js/app/core/InlineLexer.js
@@ -0,0 +1,80 @@
+define([
+  ], 
+  function() {
+    var marked = require("marked");
+    var options = store.get('Markdown') || {};
+
+    var InlineLexer = marked.InlineLexer;
+
+    var customRules = {
+        stronghighlight: /^==([^=]+)==/,
+        underline: /^_([^_]+)_/
+    };
+
+    var inlineMathRegEx = /^ *(split)([\s\S]*?[^\$])\1(?!\$)/;
+    if (options.dollarSign) {
+      customRules.math = replace(inlineMathRegEx)
+        ('split', /\${3,3}|\${1,1}/)
+        ();
+    }
+
+
+    function replace(regex, opt) {
+      regex = regex.source;
+      opt = opt || '';
+      return function self(name, val) {
+        if (!name) return new RegExp(regex, opt);
+        val = val.source || val;
+        val = val.replace(/(^|[^\[])\^/g, '$1');
+        regex = regex.replace(name, val);
+        return self;
+      };
+    }
+
+    function merge(obj) {
+      var i = 1
+        , target
+        , key;
+
+      for (; i < arguments.length; i++) {
+        target = arguments[i];
+        for (key in target) {
+          if (Object.prototype.hasOwnProperty.call(target, key)) {
+            obj[key] = target[key];
+          }
+        }
+      }
+
+      return obj;
+    }
+
+    InlineLexer.rules.normal = merge({}, InlineLexer.rules.normal, customRules);
+    InlineLexer.rules.gfm = merge({}, InlineLexer.rules.gfm, customRules);
+    InlineLexer.rules.breaks = merge({}, InlineLexer.rules.breaks, customRules);
+
+    window.ee.on('preferences.markdown.change', function(options) {
+      var rules = InlineLexer.rules;
+
+      if (options.dollarSign) {
+        customRules.math = replace(inlineMathRegEx)
+          ('split', /\${3,3}|\${1,1}/)
+          ();
+      } else {
+        customRules.math = replace(inlineMathRegEx)
+          ('split', /\${3,3}/)
+          ();
+      }
+
+      if (options.gfm) {
+        InlineLexer.rules.gfm = merge({}, rules.gfm, customRules);
+      }
+
+      if (options.breaks) {
+        InlineLexer.rules.breaks = merge({}, rules.breaks, customRules);
+      }
+
+      window.ee.emit('preferences.markdown.change.after');
+    });
+
+    return InlineLexer;
+});
diff --git a/src/js/app/core/Lexer.js b/src/js/app/core/Lexer.js
@@ -12,18 +12,14 @@ define([
     var lexer = new marked.Lexer(defaults);
 
     var customRules = {
+        math: /^ *(\${2,2}) *([\s\S]+?)\s*\1 *(?:\n+|$)/,
         oembed: /^@\[(inside)\]\(href\)/,
         toc: /^\[\s*(TOC|toc)(?:\s+['"]([\s\S]*?)['"])?\s*\] *(?:\n+|$)/
     }
 
     var _inside = /(?:\[[^\]]*\]|[^\[\]]|\](?=[^\[]*\]))*/;
     var _href = /\s*<?([\s\S]*?)>?(?:\s+['"]([\s\S]*?)['"])?\s*/;
 
-    customRules.oembed = replace(customRules.oembed)
-      ('inside', _inside)
-      ('href', _href)
-      ();
-
     function replace(regex, opt) {
       regex = regex.source;
       opt = opt || '';
@@ -53,7 +49,19 @@ define([
   	  return obj;
   	}
 
+    customRules.oembed = replace(customRules.oembed)
+      ('inside', _inside)
+      ('href', _href)
+      ();
+
+    lexer.rules.paragraph = replace(lexer.rules.paragraph)
+      ('math', customRules.math)
+      ();
+
     lexer.rules = merge({}, lexer.rules, customRules);
+    lexer.rules.pedantic = merge({}, lexer.rules.pedantic, customRules);
+    lexer.rules.gfm = merge({}, lexer.rules.gfm, customRules);
+    lexer.rules.tables = merge({}, lexer.rules.tables, customRules);
 
     window.ee.on('preferences.markdown.change', function(options) {
       var blocks = marked.Lexer.rules;

diff --git a/src/js/app/core/Parser.js b/src/js/app/core/Parser.js
@@ -1,12 +1,14 @@
 define([
-    'core/Lexer'
+    'core/Lexer',
+    'core/InlineLexer'
   ],
-  function(Lexer) {
+  function(Lexer, InlineLexer) {
 
     var gui = require('nw.gui'),
         win = gui.Window.get();
 
     var marked = require("marked");
+    marked.InlineLexer = InlineLexer;
 
     var parse = function(src) {
       var tokens = Lexer.lex(src);

diff --git a/src/js/app/core/Renderer.js b/src/js/app/core/Renderer.js
@@ -40,14 +40,16 @@ define([
 		}
 
 		renderer.math = function(text, block) {
-			if (block) {
+			if (block === '$$') {
 				return '<p class="mathjax">$$'
 					+ text
 					+ '$$</p>';
 			} else {
-				return '<span class="mathjax">$$$'
+				return '<span class="mathjax">'
+					+ block
 					+ text
-					+ '$$$</span>';
+					+ block
+					+ '</span>';
 			}
 		}
 

diff --git a/src/js/app/math/Math.js b/src/js/app/math/Math.js
@@ -18,9 +18,9 @@ define([], function() {
 
   loadJs(global.PATHS.js + '/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML', function() {
     MathJax.Hub.Config({
-      showProcessingMessages: true,
+      showProcessingMessages: false,
       tex2jax: {
-        inlineMath: [ ['$$$','$$$'], ["\\(","\\)"] ],
+        inlineMath: [ ['$$$','$$$'], ['$','$'], ["\\(","\\)"] ],
         displayMath: [ ['$$','$$'], ["\\[","\\]"] ],
       	processEscapes: true
       }

diff --git a/src/js/preferences/tabs/Backup.js b/src/js/preferences/tabs/Backup.js
@@ -62,6 +62,7 @@ define([
       delete config.Window;
       delete config.Helper;
       delete config.Markdown.gfm;
+      delete config.Markdown.emoji;
       delete config.Markdown.highlight;
       delete config.Markdown.langPrefix;
       delete config.Markdown.headerPrefix;

diff --git a/src/js/preferences/tabs/Markdown.js b/src/js/preferences/tabs/Markdown.js
@@ -30,6 +30,7 @@ define([
 				'click input[name=breaks]': 'enableBreaks',	
 				'click input[name=smartLists]': 'enableSmartLists',	
 				'click input[name=smartypants]': 'enableSmartyPants',	
+				'click input[name=dollarSign]': 'enableDollarSign',	
 				'click input[name=mathjax]': 'enableMathjax',
 				'click button[name=apply]': 'clickApply',
 				'click button[name=default]': 'clickDefault'
@@ -51,6 +52,7 @@ define([
 				this.$('input[name=smartLists]').prop('checked', opt.smartLists);
 				this.$('input[name=smartypants]').prop('checked', opt.smartypants);
 				this.$('input[name=mathjax]').prop('checked', opt.mathjax);
+				this.$('input[name=dollarSign]').prop('checked', opt.dollarSign);
 			},
 
 			reset: function() {
@@ -121,6 +123,13 @@ define([
 				options.set('mathjax', bool);
 
       	_gaq.push('haroopad.preferences', 'markdown option', 'mathjax:'+bool);
+			},
+
+			enableDollarSign: function(e) {
+				var bool = $(e.target).is(':checked');
+				options.set('dollarSign', bool);
+
+      	_gaq.push('haroopad.preferences', 'markdown option', 'use single dollar sign:'+bool);
 			}
 		});
 

diff --git a/src/js/preferences/tabs/Markdown.opt.js b/src/js/preferences/tabs/Markdown.opt.js
@@ -14,7 +14,8 @@ define([
 				highlight: null,
 				langPrefix: '',
 				headerPrefix: '',
-				mathjax: false
+				mathjax: false,
+				dollarSign: false
 			},
 
 			initialize: function() {

diff --git a/src/node_modules/marked/lib/marked.js b/src/node_modules/marked/lib/marked.js
diff --git a/src/preferences.html b/src/preferences.html
@@ -480,6 +480,17 @@ <h5 data-i18n="markdown.etc">ETC</h5>
                   <input type="checkbox" value="" name="mathjax">
                   <span data-i18n="markdown.enable-math">Use Mathematics Expression</span> [<a href="http://mathjax.org">?</a>]
                 </label>
+
+
+                <h5 data-i18n="markdown.math">Math Expression options</h5>
+                <label class="checkbox">
+                  <input type="checkbox" value="" name="mathjax">
+                  <span data-i18n="markdown.enable-math">Use Mathematics Expression</span> [<a href="http://mathjax.org">?</a>]
+                </label>
+                <label class="checkbox">
+                  <input type="checkbox" value="" name="dollarSign">
+                  <span data-i18n="markdown.enable-dollar-sign">Use $ Sign for Inline Expression</span>
+                </label>
               </p>
             </div>