From 45f9f608d39289131548a0e1d7962617cf3c028e Mon Sep 17 00:00:00 2001 From: Qrius Date: Wed, 23 Apr 2025 14:25:05 +0200 Subject: Prepare deb packaging, switch markdown dependency --- src/skaldpress/__init__.py | 3 ++- src/smp/__init__.py | 1 - src/smp/builtins.py | 16 +++++++--------- 3 files changed, 9 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/skaldpress/__init__.py b/src/skaldpress/__init__.py index f00b84f..a89b06b 100644 --- a/src/skaldpress/__init__.py +++ b/src/skaldpress/__init__.py @@ -1,4 +1,5 @@ -__version__ = "0.0.1" +__version__ = "3.0.0" + # import skaldpress.smp_macros # # __all__ = [ diff --git a/src/smp/__init__.py b/src/smp/__init__.py index 898e683..4cfc534 100644 --- a/src/smp/__init__.py +++ b/src/smp/__init__.py @@ -1,4 +1,3 @@ -__version__ = "0.0.1" import smp.macro_processor import smp.builtins diff --git a/src/smp/builtins.py b/src/smp/builtins.py index a9e1977..e4a3429 100644 --- a/src/smp/builtins.py +++ b/src/smp/builtins.py @@ -5,11 +5,8 @@ import urllib.request import urllib.error import urllib.parse import datetime -import markdown -from markdown.extensions.tables import TableExtension -from markdown.extensions.fenced_code import FencedCodeExtension +from markdown_it import MarkdownIt from skaldpress.metadata_parser import extract_parse_yaml_metadata -from gfm import AutolinkExtension, TaskListExtension # type: ignore from typing import Any @@ -172,11 +169,12 @@ def smp_builtin_format_time(macro_processor, format, time): def smp_builtin_html_from_markdown(macro_processor, text, extensions=list()): text = macro_processor.process_input(text) - extensions.append(TableExtension()) - extensions.append(FencedCodeExtension()) - extensions.append(AutolinkExtension()) - extensions.append(TaskListExtension(max_depth=2)) - return markdown.markdown(text, extensions=extensions) + md = ( + MarkdownIt("commonmark", {"breaks": True, "html": True}) + .enable("table") + .enable("list") + ) + return md.render(text) def _smp_builtin_template_content(): -- cgit v1.2.3