Merge branch 'master' into addStyleSanitization-#1437

shared/naturalcrit/markdown.js

@@ -2,6 +2,7 @@
 const _ = require('lodash');
 const Marked = require('marked');
 const MarkedExtendedTables = require('marked-extended-tables');
+const { markedSmartypantsLite: MarkedSmartypantsLite } = require('marked-smartypants-lite');
 const { gfmHeadingId: MarkedGFMHeadingId } = require('marked-gfm-heading-id');
 const renderer = new Marked.Renderer();
 
@@ -237,49 +238,10 @@ const definitionLists = {
 	}
 };
 
-const MarkedSmartyPantsLite = ()=>{
-	return {
-		tokenizer : {
-			inlineText(src) {
-				// don't escape inlineText
-				const cap = this.rules.inline.text.exec(src);
-
-				/* istanbul ignore next */
-				if(!cap) {
-					// should never happen
-					return;
-				}
-
-				const text = cap[0]
-					// em-dashes
-					.replace(/---/g, '\u2014')
-					// en-dashes
-					.replace(/--/g, '\u2013')
-					// opening singles
-					.replace(/(^|[-\u2014/(\[{"\s])'/g, '$1\u2018')
-					// closing singles & apostrophes
-					.replace(/'/g, '\u2019')
-					// opening doubles
-					.replace(/(^|[-\u2014/(\[{\u2018\s])"/g, '$1\u201c')
-					// closing doubles
-					.replace(/"/g, '\u201d')
-					// ellipses
-					.replace(/\.{3}/g, '\u2026');
-
-				return {
-					type : 'text',
-					raw  : cap[0],
-					text : text
-				};
-			}
-		}
-	};
-};
-
 Marked.use({ extensions: [mustacheSpans, mustacheDivs, mustacheInjectInline, definitionLists] });
 Marked.use(mustacheInjectBlock);
 Marked.use({ renderer: renderer, mangle: false });
-Marked.use(MarkedExtendedTables(), MarkedGFMHeadingId(), MarkedSmartyPantsLite());
+Marked.use(MarkedExtendedTables(), MarkedGFMHeadingId(), MarkedSmartypantsLite());
 
 //Fix local links in the Preview iFrame to link inside the frame
 renderer.link = function (href, title, text) {