From 2090fd499841e0cf01e31991d9503f1ea2adaffe Mon Sep 17 00:00:00 2001
From: Vitaly Puzrin <vitaly@rcdesign.ru>
Date: Sun, 4 Jan 2015 09:01:16 +0300
Subject: [PATCH] del -> strikethrough

---
 lib/parser_inline.js                             |  2 +-
 lib/renderer.js                                  |  8 ++++----
 lib/rules_inline/{del.js => strikethrough.js}    |  7 ++++---
 .../markdown-it/{del.txt => strikethrough.txt}   | 16 ++++++++--------
 4 files changed, 17 insertions(+), 16 deletions(-)
 rename lib/rules_inline/{del.js => strikethrough.js} (93%)
 rename test/fixtures/markdown-it/{del.txt => strikethrough.txt} (75%)

diff --git a/lib/parser_inline.js b/lib/parser_inline.js
index 58b85a4..71f6b09 100644
--- a/lib/parser_inline.js
+++ b/lib/parser_inline.js
@@ -17,7 +17,7 @@ var _rules = [
   [ 'newline',         require('./rules_inline/newline') ],
   [ 'escape',          require('./rules_inline/escape') ],
   [ 'backtick',        require('./rules_inline/backtick') ],
-  [ 'del',             require('./rules_inline/del') ],
+  [ 'strikethrough',   require('./rules_inline/strikethrough') ],
   [ 'emphasis',        require('./rules_inline/emphasis') ],
   [ 'link',            require('./rules_inline/link') ],
   [ 'image',           require('./rules_inline/image') ],
diff --git a/lib/renderer.js b/lib/renderer.js
index 0ee5c0e..8793942 100644
--- a/lib/renderer.js
+++ b/lib/renderer.js
@@ -201,11 +201,11 @@ rules.em_close = function (/* tokens, idx, options, env */) {
 };
 
 
-rules.del_open = function (/* tokens, idx, options, env */) {
-  return '<del>';
+rules.s_open = function (/* tokens, idx, options, env */) {
+  return '<s>';
 };
-rules.del_close = function (/* tokens, idx, options, env */) {
-  return '</del>';
+rules.s_close = function (/* tokens, idx, options, env */) {
+  return '</s>';
 };
 
 
diff --git a/lib/rules_inline/del.js b/lib/rules_inline/strikethrough.js
similarity index 93%
rename from lib/rules_inline/del.js
rename to lib/rules_inline/strikethrough.js
index 4e35a08..13dad16 100644
--- a/lib/rules_inline/del.js
+++ b/lib/rules_inline/strikethrough.js
@@ -29,7 +29,8 @@ function scanDelims(state, start) {
   };
 }
 
-module.exports = function(state, silent) {
+
+module.exports = function strikethrough(state, silent) {
   var startCount,
       count,
       tagCount,
@@ -91,9 +92,9 @@ module.exports = function(state, silent) {
   state.pos = start + 2;
 
   // Earlier we checked !silent, but this implementation does not need it
-  state.push({ type: 'del_open', level: state.level++ });
+  state.push({ type: 's_open', level: state.level++ });
   state.md.inline.tokenize(state);
-  state.push({ type: 'del_close', level: --state.level });
+  state.push({ type: 's_close', level: --state.level });
 
   state.pos = state.posMax + 2;
   state.posMax = max;
diff --git a/test/fixtures/markdown-it/del.txt b/test/fixtures/markdown-it/strikethrough.txt
similarity index 75%
rename from test/fixtures/markdown-it/del.txt
rename to test/fixtures/markdown-it/strikethrough.txt
index 65e7933..83b3617 100644
--- a/test/fixtures/markdown-it/del.txt
+++ b/test/fixtures/markdown-it/strikethrough.txt
@@ -1,32 +1,32 @@
 .
 ~~Strikeout~~
 .
-<p><del>Strikeout</del></p>
+<p><s>Strikeout</s></p>
 .
 
 .
 x ~~~~foo~~ bar~~
 .
-<p>x <del><del>foo</del> bar</del></p>
+<p>x <s><s>foo</s> bar</s></p>
 .
 
 .
 x ~~foo ~~bar~~~~
 .
-<p>x <del>foo <del>bar</del></del></p>
+<p>x <s>foo <s>bar</s></s></p>
 .
 
 .
 x ~~~~foo~~~~
 .
-<p>x <del><del>foo</del></del></p>
+<p>x <s><s>foo</s></s></p>
 .
 
 # Disabled since we moved subsripts to plugins
 #.
 #x ~~~foo~~~
 #.
-#<p>x <del><sub>foo</sub></del></p>
+#<p>x <s><sub>foo</sub></s></p>
 #.
 
 Strikeouts have the same priority as emphases:
@@ -37,7 +37,7 @@ Strikeouts have the same priority as emphases:
 ~~**test~~**
 .
 <p><strong>~~test</strong>~~</p>
-<p><del>**test</del>**</p>
+<p><s>**test</s>**</p>
 .
 
 Strikeouts have the same priority as emphases with respect to links:
@@ -64,13 +64,13 @@ Nested strikeouts:
 .
 ~~foo ~~bar~~ baz~~
 .
-<p><del>foo <del>bar</del> baz</del></p>
+<p><s>foo <s>bar</s> baz</s></p>
 .
 
 .
 ~~f **o ~~o b~~ a** r~~
 .
-<p><del>f <strong>o <del>o b</del> a</strong> r</del></p>
+<p><s>f <strong>o <s>o b</s> a</strong> r</s></p>
 .
 
 Should not have a whitespace between text and "~~":