From 24d47d7c6814aa862ff6ab73fec1aaba55a9c587 Mon Sep 17 00:00:00 2001
From: Estevao Soares dos Santos <estevao.santos@gmail.com>
Date: Sat, 28 Jan 2017 23:54:28 +0000
Subject: [PATCH] fix(strikethrough): allow escapinging tilde char

Since tilde is now used as a magic markdown character,
in strikethrough syntax, we need to enable escaping it.

Closes #331
---
 dist/showdown.js                              | Bin 78005 -> 78006 bytes
 dist/showdown.js.map                          | Bin 228524 -> 228525 bytes
 dist/showdown.min.js                          | Bin 32170 -> 32171 bytes
 dist/showdown.min.js.map                      | Bin 34829 -> 34829 bytes
 src/subParsers/encodeBackslashEscapes.js      |   2 +-
 .../#331.allow-escaping-of-tilde.html         |   1 +
 test/features/#331.allow-escaping-of-tilde.md |   1 +
 test/node/testsuite.features.js               |   2 ++
 8 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 test/features/#331.allow-escaping-of-tilde.html
 create mode 100644 test/features/#331.allow-escaping-of-tilde.md

diff --git a/dist/showdown.js b/dist/showdown.js
index bfbd1441cc45d475e9c80e86d515939ff93bfd01..ef48514910b40182c1aeb92db2eed843b9dfc885 100644
GIT binary patch
delta 16
Ycmdn`kY(FLmJNX$80$6%Zb)eW07nc5{r~^~

delta 27
jcmdn?kY(#bmJNX$SYkEx(<d){tUo#Jrqt&78^jv`wTBGS

diff --git a/dist/showdown.js.map b/dist/showdown.js.map
index 827e8f5018d628266679537b7833be66ddc50c99..d50dbdd903813f32f02a403bfcf10f9b4f59fbe0 100644
GIT binary patch
delta 49
zcmV-10M7rc`3<f44S=)(j!c)M4FMIG5H|u9ld%2|0XLV?Faaos@Js=x@Js@#0e-je
H_5!?x`AHPQ

delta 42
zcmV+_0M-Ak`3<c34S=)(j!cuOF(8*fOaU1IHJ8ya0Vs#?OaZ6xOaiL6@%93|g@RlX
AY5)KL

diff --git a/dist/showdown.min.js b/dist/showdown.min.js
index 032659c3fb897785e97560c7dba86e5e7717f064..1ce09ffb1fa4e39b4a541ae2d1227145d6645f14 100644
GIT binary patch
delta 32
ocmZ4Wn{oAT#tkby80#k2dudMY^W>jg;LbYvK`!g&*B<*#0QKVzc>n+a

delta 26
icmZ4en{m}|#tkbyCO3F#PVV>QpIqS1y7{@s5fcEc{|p!a

diff --git a/dist/showdown.min.js.map b/dist/showdown.min.js.map
index c92d706197516963a69e53cc6a3bb65db90a8f29..278be22f1b82ac3af572c26f0d96ce03cc2ffa3d 100644
GIT binary patch
delta 45
zcmeC3z|=c|X+v+&<aa4-Vre?Aj*h|3I{uE1{;4`9PL9EOt{F~~{YxY_9}4m|1pso}
B54ZpT

delta 45
zcmeC3z|=c|X+v+&<PTYFVre?Aj*h|3I{uE1{;4`9PL9Djt{F~~{YxY_9}4m|1psr?
B5552Z

diff --git a/src/subParsers/encodeBackslashEscapes.js b/src/subParsers/encodeBackslashEscapes.js
index ee2cce2..890f86b 100644
--- a/src/subParsers/encodeBackslashEscapes.js
+++ b/src/subParsers/encodeBackslashEscapes.js
@@ -12,6 +12,6 @@
 showdown.subParser('encodeBackslashEscapes', function (text) {
   'use strict';
   text = text.replace(/\\(\\)/g, showdown.helper.escapeCharactersCallback);
-  text = text.replace(/\\([`*_{}\[\]()>#+-.!])/g, showdown.helper.escapeCharactersCallback);
+  text = text.replace(/\\([`*_{}\[\]()>#+-.!~])/g, showdown.helper.escapeCharactersCallback);
   return text;
 });
diff --git a/test/features/#331.allow-escaping-of-tilde.html b/test/features/#331.allow-escaping-of-tilde.html
new file mode 100644
index 0000000..3fa7c62
--- /dev/null
+++ b/test/features/#331.allow-escaping-of-tilde.html
@@ -0,0 +1 @@
+<p>~~test~~</p>
\ No newline at end of file
diff --git a/test/features/#331.allow-escaping-of-tilde.md b/test/features/#331.allow-escaping-of-tilde.md
new file mode 100644
index 0000000..95c5b05
--- /dev/null
+++ b/test/features/#331.allow-escaping-of-tilde.md
@@ -0,0 +1 @@
+\~~test~~
\ No newline at end of file
diff --git a/test/node/testsuite.features.js b/test/node/testsuite.features.js
index 505cafc..a8a81ed 100644
--- a/test/node/testsuite.features.js
+++ b/test/node/testsuite.features.js
@@ -57,6 +57,8 @@ describe('makeHtml() features testsuite', function () {
       converter = new showdown.Converter({encodeEmails: false});
     } else if (testsuite[i].name === '#330.simplifiedAutoLink-drops-character-before-and-after-linked-mail') {
       converter = new showdown.Converter({encodeEmails: false, simplifiedAutoLink: true});
+    } else if (testsuite[i].name === '#331.allow-escaping-of-tilde') {
+      converter = new showdown.Converter({strikethrough: true});
     } else {
       converter = new showdown.Converter();
     }