feat(ellipsis): add auto-ellipsis support

Three dots `...` are now converted automatically into an ellipsis
showdownjs · Oct 24, 2017 · 25f1978 · 25f1978
1 parent 084b819
commit 25f1978
Show file tree

Hide file tree

Showing 10 changed files with 71 additions and 5 deletions.
diff --git a/dist/showdown.js b/dist/showdown.js
diff --git a/dist/showdown.js.map b/dist/showdown.js.map
diff --git a/dist/showdown.min.js b/dist/showdown.min.js
diff --git a/dist/showdown.min.js.map b/dist/showdown.min.js.map
diff --git a/src/subParsers/ellipsis.js b/src/subParsers/ellipsis.js
@@ -0,0 +1,11 @@
+showdown.subParser('ellipsis', function (text, options, globals) {
+  'use strict';
+
+  text = globals.converter._dispatch('ellipsis.before', text, options, globals);
+
+  text = text.replace(/\.\.\./g, '…');
+
+  text = globals.converter._dispatch('ellipsis.after', text, options, globals);
+
+  return text;
+});
diff --git a/src/subParsers/spanGamut.js b/src/subParsers/spanGamut.js
@@ -24,6 +24,7 @@ showdown.subParser('spanGamut', function (text, options, globals) {
   text = showdown.subParser('underline')(text, options, globals);
   text = showdown.subParser('italicsAndBold')(text, options, globals);
   text = showdown.subParser('strikethrough')(text, options, globals);
+  text = showdown.subParser('ellipsis')(text, options, globals);
 
   // we need to hash HTML tags inside spans
   text = showdown.subParser('hashHTMLSpans')(text, options, globals);

diff --git a/test/cases/ellipsis.html b/test/cases/ellipsis.html
@@ -0,0 +1,19 @@
+<p>ellipsis in text…</p>
+<p>…</p>
+<ol>
+    <li>foo…</li>
+    <li>bar</li>
+</ol>
+<blockquote>
+    <p>ellipsis in blockquote…</p>
+</blockquote>
+<pre><code>ellipsis in code...
+</code></pre>
+<pre><code>ellipsis in code...
+</code></pre>
+<h1 id="ellipsisinheader">ellipsis in header…</h1>
+<p>1…</p>
+<ol>
+    <li>..</li>
+</ol>
+<p>1…</p>
diff --git a/test/cases/ellipsis.md b/test/cases/ellipsis.md
@@ -0,0 +1,22 @@
+ellipsis in text...
+
+...
+
+1. foo...
+2. bar
+
+> ellipsis in blockquote...
+
+```
+ellipsis in code...
+```
+
+    ellipsis in code...
+
+# ellipsis in header...
+
+1...
+
+1. ..
+
+1...
diff --git a/test/features/disableForced4SpacesIndentedSublists.html b/test/features/disableForced4SpacesIndentedSublists.html
@@ -2,7 +2,7 @@
   <li>foo<ul>
     <li>bar</li></ul></li>
 </ul>
-<p>...</p>
+<hr />
 <ul>
   <li>baz<ol>
     <li>bazinga</li></ol></li>

diff --git a/test/features/disableForced4SpacesIndentedSublists.md b/test/features/disableForced4SpacesIndentedSublists.md
@@ -1,7 +1,7 @@
 * foo
   * bar
 
-...
+---
 
 * baz
   1. bazinga