From 5a4cacc47908b4f0bbe0030bf1732807f911c084 Mon Sep 17 00:00:00 2001
From: agusmakmun <summon.agus@gmail.com>
Date: Fri, 13 Jan 2017 08:11:35 +0700
Subject: [PATCH] support ~~strikethrough~~ and ++underscores++

---
 README.rst                                 |  1 +
 draceditor/__init__.py                     |  2 +-
 draceditor/extensions/del_ins.py           | 51 ++++++++++++++++++++++
 draceditor/settings.py                     |  1 +
 draceditor/static/js/draceditor.js         |  2 +-
 draceditor/templates/draceditor/guide.html | 16 ++++++-
 upload.sh                                  |  2 +
 7 files changed, 72 insertions(+), 3 deletions(-)
 create mode 100644 draceditor/extensions/del_ins.py

diff --git a/README.rst b/README.rst
index 37bdf0b7b..63d414e02 100644
--- a/README.rst
+++ b/README.rst
@@ -126,6 +126,7 @@ to get ``IMGUR_CLIENT_ID`` and ``IMGUR_API_KEY``.
 
         # Custom markdown extensions.
         'draceditor.extensions.urlize',
+        'draceditor.extensions.del_ins', # ~~strikethrough~~ and ++underscores++
         'draceditor.extensions.mention', # require for mention
         'draceditor.extensions.emoji',   # require for emoji
     ]
diff --git a/draceditor/__init__.py b/draceditor/__init__.py
index 2f37ac21d..e8524a37a 100644
--- a/draceditor/__init__.py
+++ b/draceditor/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
-__VERSION__ = '1.1.4'
+__VERSION__ = '1.1.5'
 __AUTHOR__ = 'Agus Makmun (Summon Agus)'
 __AUTHOR_EMAIL__ = 'agus@python.web.id'
diff --git a/draceditor/extensions/del_ins.py b/draceditor/extensions/del_ins.py
new file mode 100644
index 000000000..467d83d5b
--- /dev/null
+++ b/draceditor/extensions/del_ins.py
@@ -0,0 +1,51 @@
+#! /usr/bin/env python
+
+
+'''
+Del/Ins Extension for Python-Markdown
+=====================================
+Wraps the inline content with ins/del tags.
+Usage
+-----
+    >>> import markdown
+    >>> src = """This is ++added content++ and this is ~~deleted content~~""" 
+    >>> html = markdown.markdown(src, ['del_ins'])
+    >>> print(html)
+    <p>This is <ins>added content</ins> and this is <del>deleted content</del>
+    </p>
+Dependencies
+------------
+* [Markdown 2.0+](http://www.freewisdom.org/projects/python-markdown/)
+Copyright
+---------
+2011, 2012 [The active archives contributors](http://activearchives.org/)
+All rights reserved.
+This software is released under the modified BSD License. 
+See LICENSE.md for details.
+'''
+
+
+import markdown
+from markdown.inlinepatterns import SimpleTagPattern
+
+
+DEL_RE = r"(\~\~)(.+?)(\~\~)"
+INS_RE = r"(\+\+)(.+?)(\+\+)"
+
+
+class DelInsExtension(markdown.extensions.Extension):
+    """Adds del_ins extension to Markdown class."""
+
+    def extendMarkdown(self, md, md_globals):
+        """Modifies inline patterns."""
+        md.inlinePatterns.add('del', SimpleTagPattern(DEL_RE, 'del'), '<not_strong')
+        md.inlinePatterns.add('ins', SimpleTagPattern(INS_RE, 'ins'), '<not_strong')
+
+
+def makeExtension(configs={}):
+    return DelInsExtension(configs=dict(configs))
+
+
+if __name__ == "__main__":
+    import doctest
+    doctest.testmod()
\ No newline at end of file
diff --git a/draceditor/settings.py b/draceditor/settings.py
index 990957e5e..7e77df637 100644
--- a/draceditor/settings.py
+++ b/draceditor/settings.py
@@ -41,6 +41,7 @@
 
         # Custom markdown extensions.
         'draceditor.extensions.urlize',
+        'draceditor.extensions.del_ins',  # ~~strikethrough~~ and ++underscores++
         'draceditor.extensions.mention',  # to parse markdown mention
         'draceditor.extensions.emoji',    # to parse markdown emoji
     ]
diff --git a/draceditor/static/js/draceditor.js b/draceditor/static/js/draceditor.js
index ebde224ec..fb655edac 100644
--- a/draceditor/static/js/draceditor.js
+++ b/draceditor/static/js/draceditor.js
@@ -1,5 +1,5 @@
 /**
- * Name         : DracEditor v1.1.4
+ * Name         : DracEditor v1.1.5
  * Created by   : Agus Makmun (Summon Agus)
  * Release date : 5-Jan-2017
  * Official     : https://dracos-linux.org
diff --git a/draceditor/templates/draceditor/guide.html b/draceditor/templates/draceditor/guide.html
index 09113b5f9..01b9834d0 100644
--- a/draceditor/templates/draceditor/guide.html
+++ b/draceditor/templates/draceditor/guide.html
@@ -43,6 +43,20 @@
           <td>Command+B</td>
           <td><strong>Bold</strong></td>
         </tr>
+        <tr>
+          <td>++Underscores++</td>
+          <td>&mdash;</td>
+          <td>&mdash;</td>
+          <td>&mdash;</td>
+          <td><ins>Underscores</ins></td>
+        </tr>
+        <tr>
+          <td>~~Strikethrough~~</td>
+          <td>&mdash;</td>
+          <td>&mdash;</td>
+          <td>&mdash;</td>
+          <td><del>Strikethrough</del></td>
+        </tr>
         <tr>
           <td># Heading 1</td>
           <td>Heading 1<br> =========</td>
@@ -52,7 +66,7 @@
         </tr>
         <tr>
           <td>## Heading 2</td>
-          <td>Heading 2<br> ---------</td>
+          <td>Heading 2<br> -----------</td>
           <td>Ctrl+Alt+2</td>
           <td>Command+Option+2</td>
           <td><h2>Heading 2</h2></td>
diff --git a/upload.sh b/upload.sh
index e7107b486..9acd065d6 100755
--- a/upload.sh
+++ b/upload.sh
@@ -4,6 +4,8 @@
 # ./upload.sh pypi
 if [ "$1" == "pypi" ]; then
     python setup.py sdist upload -r pypi
+    cd ../organization/dracos-markdown-editor
+    git fetch upstream && git merge upstream/master && git push
 fi
 
 if [ "$1" == "git" ]; then