Merge branch 'develop'

Author: AlexVonB

markdownify/main.py

@@ -28,12 +28,15 @@ def main(argv=sys.argv[1:]):
     parser.add_argument('--default-title', action='store_false',
                         help="A boolean to enable setting the title of a link to its "
                         "href, if no title is given.")
-    parser.add_argument('--heading-style',
+    parser.add_argument('--heading-style', default='UNDERLINED',
                         choices=('ATX', 'ATX_CLOSED', 'SETEXT', 'UNDERLINED'),
                         help="Defines how headings should be converted.")
     parser.add_argument('-b', '--bullets', default='*+-',
                         help="A string of bullet styles to use; the bullet will "
                         "alternate based on nesting level.")
+    parser.add_argument('--strong-em-symbol', default='ASTERISK',
+                        choices=('ASTERISK', 'UNDERSCORE'),
+                        help="Use * or _ to convert strong and italics text"),
     parser.add_argument('--sub-symbol', default='',
                         help="Define the chars that surround '<sub>'.")
     parser.add_argument('--sup-symbol', default='',

setup.py

@@ -9,7 +9,7 @@
 pkgmeta = {
     '__title__': 'markdownify',
     '__author__': 'Matthew Tretter',
-    '__version__': '0.11.4',
+    '__version__': '0.11.5',
 }
 
 read = lambda filepath: codecs.open(filepath, 'r', 'utf-8').read()

tox.ini

@@ -3,12 +3,12 @@ envlist = py38
 
 [testenv]
 deps =
-	flake8
 	pytest
+	flake8
 	restructuredtext_lint
 	Pygments
 commands =
-	flake8 --ignore=E501,W503 markdownify tests
 	pytest
+	flake8 --ignore=E501,W503 markdownify tests
 	restructuredtext-lint README.rst