Merge branch 'develop'

closes #75

markdownify/main.py

@@ -3,7 +3,8 @@
 import argparse
 import sys
 
-from markdownify import markdownify
+from markdownify import markdownify, ATX, ATX_CLOSED, UNDERLINED, \
+    SPACES, BACKSLASH, ASTERISK, UNDERSCORE
 
 
 def main(argv=sys.argv[1:]):
@@ -28,16 +29,23 @@ 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',
-                        choices=('ATX', 'ATX_CLOSED', 'SETEXT', 'UNDERLINED'),
+    parser.add_argument('--heading-style', default=UNDERLINED,
+                        choices=(ATX, ATX_CLOSED, 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='',
                         help="Define the chars that surround '<sup>'.")
+    parser.add_argument('--newline-style', default=SPACES,
+                        choices=(SPACES, BACKSLASH),
+                        help="Defines the style of <br> conversions: two spaces "
+                        "or backslash at the and of the line thet should break.")
     parser.add_argument('--code-language', default='',
                         help="Defines the language that should be assumed for all "
                         "'<pre>' sections.")

setup.py

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

shell.nix

@@ -0,0 +1,10 @@
+{ pkgs ? import <nixpkgs> {} }:
+pkgs.mkShell {
+  name = "python-shell";
+  buildInputs = with pkgs; [
+    python38
+    python38Packages.tox
+    python38Packages.setuptools
+    python38Packages.virtualenv
+  ];
+}

tox.ini

@@ -2,13 +2,14 @@
 envlist = py38
 
 [testenv]
+passenv = PYTHONPATH
 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