Switch to markdown (not 2) and pymdown-extensions

jmaupetit · Jan 23, 2024 · 67e05cb · 67e05cb
1 parent ae2b84b
commit 67e05cb
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 15 deletions.
diff --git a/md2pdf/cli.py b/md2pdf/cli.py
@@ -6,7 +6,7 @@
 
 import click
 
-from md2pdf.core import md2pdf
+from .core import md2pdf
 
 logger = logging.getLogger(__name__)
 

diff --git a/md2pdf/conf.py b/md2pdf/conf.py
@@ -1,3 +1,8 @@
 """Configuration for md2pdf."""
 
-MARKDOWN_EXTRAS: list = ["cuddled-lists", "tables", "footnotes"]
+MARKDOWN_EXTRAS: list = [
+    "markdown.extensions.tables",
+    "pymdownx.magiclink",
+    "pymdownx.betterem",
+    "pymdownx.superfences",
+]
diff --git a/md2pdf/core.py b/md2pdf/core.py
@@ -5,7 +5,7 @@
 
 import frontmatter
 from jinja2 import Template
-from markdown2 import markdown
+from markdown import markdown
 from weasyprint import CSS, HTML
 
 from .conf import MARKDOWN_EXTRAS
@@ -57,7 +57,7 @@ def md2pdf(
         # Render the template
         raw = Template(template).render(context)
 
-    raw_html = markdown(raw, extras=extras)
+    raw_html = markdown(raw, extensions=extras)
 
     # Weasyprint HTML object
     if base_url is None:

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -41,11 +41,12 @@ md2pdf = "md2pdf.__main__:cli.cli"
 [tool.poetry.dependencies]
 python = "^3.8"
 weasyprint = "^60.2"
-markdown2 = "^2.4.12"
 click = "^8.1.7"
 pygments = "^2.17.2"
 python-frontmatter = "^1.1.0"
 jinja2 = "^3.1.3"
+markdown = "^3.5.2"
+pymdown-extensions = "^10.7"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.4.4"