markdown_convert 1.2.54__tar.gz → 1.2.56__tar.gz

{markdown_convert-1.2.54 → markdown_convert-1.2.56}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: markdown_convert
-Version: 1.2.54
+Version: 1.2.56
 Summary: Convert Markdown files to PDF from your command line.
 Project-URL: homepage, https://github.com/Julynx/markdown_convert
 Author-email: Julio Cabria <juliocabria@tutanota.com>
@@ -80,9 +80,25 @@ Simply run `markdown-convert file.md` to convert `file.md` to `file.pdf`.
 
 You can specify the following options:
 
-- `--mode=once|live`: Convert the markdown file once (default) or live.
-- `--css=[css_file_path]`: Use a custom CSS file.
-- `--out=[output_file_path]`: Specify the output file path.
+```text
+Usage:
+  markdown-convert [markdown_file_path] [options]
+
+Options:
+  --mode=once|live|debug
+    Convert the markdown file once (default) or live.
+    Use debug to preserve the intermediate html file.
+  --css=[css_file_path]
+    Use a custom CSS file.
+  --out=[output_file_path]
+    Specify the output file path.
+  --extras=[extra1,extra2,...]
+    Specify the extras to use. Uses all extras if not specified.
+    Supported extras:
+      fenced-code-blocks,header-ids,breaks,tables,latex,mermaid,
+      strike,admonitions,checkboxes,custom-spans,highlights,toc,
+      vega-lite
+```
 
 For example: `markdown-convert README.md --mode=live --css=style.css --out=output.pdf` will convert `README.md` to `output.pdf` using `style.css` and update the PDF live as you edit the Markdown file.
 

{markdown_convert-1.2.54 → markdown_convert-1.2.56}/README.md

@@ -57,9 +57,25 @@ Simply run `markdown-convert file.md` to convert `file.md` to `file.pdf`.
 
 You can specify the following options:
 
-- `--mode=once|live`: Convert the markdown file once (default) or live.
-- `--css=[css_file_path]`: Use a custom CSS file.
-- `--out=[output_file_path]`: Specify the output file path.
+```text
+Usage:
+  markdown-convert [markdown_file_path] [options]
+
+Options:
+  --mode=once|live|debug
+    Convert the markdown file once (default) or live.
+    Use debug to preserve the intermediate html file.
+  --css=[css_file_path]
+    Use a custom CSS file.
+  --out=[output_file_path]
+    Specify the output file path.
+  --extras=[extra1,extra2,...]
+    Specify the extras to use. Uses all extras if not specified.
+    Supported extras:
+      fenced-code-blocks,header-ids,breaks,tables,latex,mermaid,
+      strike,admonitions,checkboxes,custom-spans,highlights,toc,
+      vega-lite
+```
 
 For example: `markdown-convert README.md --mode=live --css=style.css --out=output.pdf` will convert `README.md` to `output.pdf` using `style.css` and update the PDF live as you edit the Markdown file.
 

{markdown_convert-1.2.54 → markdown_convert-1.2.56}/markdown_convert/__main__.py

@@ -9,7 +9,7 @@ from sys import exit as sys_exit
 
 from argsdict import args
 
-from .modules.constants import OPTIONS, OPTIONS_MODES, RED
+from .modules.constants import EXTRAS, OPTIONS, OPTIONS_MODES, RED
 from .modules.convert import convert, live_convert
 from .modules.resources import get_css_path, get_output_path, get_usage
 from .modules.utils import color
@@ -67,12 +67,29 @@ def main():
         except Exception as exc:
             raise IndexError(f"Invalid 'output_path' argument: {exc}") from exc
 
+        # Get the extras
+        extras = None
+        try:
+            if "--extras" in arg:
+                extras = arg["--extras"].split(",")
+                for extra in extras:
+                    if extra not in EXTRAS:
+                        raise ValueError(extra)
+        except Exception as exc:
+            raise IndexError(f"Invalid 'extras' argument: {exc}") from exc
+
         # Compile the markdown file
         print(f"\nGenerating PDF file from '{markdown_path}'...\n")
         if mode in ("once", "debug"):
-            convert(markdown_path, css_path, output_path, dump_html=mode == "debug")
+            convert(
+                markdown_path,
+                css_path,
+                output_path,
+                dump_html=mode == "debug",
+                extras=extras,
+            )
         else:
-            live_convert(markdown_path, css_path, output_path)
+            live_convert(markdown_path, css_path, output_path, extras=extras)
 
         sys_exit(0)
 

{markdown_convert-1.2.54 → markdown_convert-1.2.56}/markdown_convert/default.css

@@ -135,6 +135,10 @@ ul ul {
   padding-left: var(--left-margin);
 }
 
+li:has(ul, ol) p {
+  margin-bottom: 0;
+}
+
 /* Code blocks */
 pre {
   padding: 0;

{markdown_convert-1.2.54 → markdown_convert-1.2.56}/markdown_convert/modules/autoinstall.py

@@ -18,7 +18,7 @@ def ensure_chromium(loud=True):
     """
     with sync_playwright() as playwright:
         if is_browser_installed(playwright.chromium):
-            return
+            return True
 
         if loud:
             print(

markdown_convert-1.2.56/markdown_convert/modules/constants.py

@@ -0,0 +1,152 @@
+"""
+This module contains the constants used in the markdown_convert package.
+Author: @julynx
+"""
+
+from .extras import (
+    CheckboxExtra,
+    CustomSpanExtra,
+    HighlightExtra,
+    TocExtra,
+    VegaExtra,
+)
+
+RED = "31"
+GREEN = "32"
+YELLOW = "33"
+BLUE = "34"
+MAGENTA = "35"
+CYAN = "36"
+
+OPTIONS = (
+    "markdown_file_path",
+    "--mode",
+    "--css",
+    "--out",
+    "--extras",
+    "-h",
+    "--help",
+)
+
+OPTIONS_MODES = ("once", "live", "debug")
+
+EXTRAS = {
+    "fenced-code-blocks": {
+        "provided-by": "markdown2",
+        "args": None,
+    },
+    "header-ids": {
+        "provided-by": "markdown2",
+        "args": True,
+    },
+    "breaks": {
+        "provided-by": "markdown2",
+        "args": {"on_newline": True},
+    },
+    "tables": {
+        "provided-by": "markdown2",
+        "args": True,
+    },
+    "latex": {
+        "provided-by": "markdown2",
+        "args": True,
+    },
+    "mermaid": {
+        "provided-by": "markdown2",
+        "args": None,
+    },
+    "strike": {
+        "provided-by": "markdown2",
+        "args": None,
+    },
+    "admonitions": {
+        "provided-by": "markdown2",
+        "args": None,
+    },
+    "checkboxes": {
+        "provided-by": "markdown-convert",
+        "args": CheckboxExtra,
+    },
+    "custom-spans": {
+        "provided-by": "markdown-convert",
+        "args": CustomSpanExtra,
+    },
+    "highlights": {
+        "provided-by": "markdown-convert",
+        "args": HighlightExtra,
+    },
+    "toc": {
+        "provided-by": "markdown-convert",
+        "args": TocExtra,
+    },
+    "vega-lite": {
+        "provided-by": "markdown-convert",
+        "args": VegaExtra,
+    },
+}
+
+BROWSER_ARGS = [
+    "--disable-dev-shm-usage",
+    "--disable-extensions",
+    "--disable-plugins",
+    "--disable-gpu",
+    "--no-first-run",
+    "--no-default-browser-check",
+]
+
+CSP_TEMPLATE = (
+    "default-src 'none'; "
+    "script-src 'nonce-{nonce}' https://cdn.jsdelivr.net; "  # <- Script for Mermaid diagrams
+    "script-src-elem 'nonce-{nonce}' https://cdn.jsdelivr.net; "
+    "style-src 'unsafe-inline'; "
+    "img-src data: https: file:; "
+    "font-src data: https:; "
+    "connect-src https://cdn.jsdelivr.net;"
+)
+
+PDF_PARAMS = {
+    "format": "A4",
+    "print_background": True,
+    "margin": {
+        "top": "20mm",
+        "bottom": "20mm",
+        "left": "20mm",
+        "right": "20mm",
+    },
+    "path": None,  # <- Replace with actual output path when used
+}
+
+
+def resolve_extras(extras_list=None):
+    """
+    Resolve the extras to be used in the conversion.
+
+    Args:
+        extras_list (list=None): List of extras to use. If None, all extras are used.
+
+    Returns:
+        dict: A dictionary containing the keys "markdown2_extras" and "markdown_convert_extras"
+    """
+    if extras_list is None:
+        selected_extras = EXTRAS
+    else:
+        selected_extras = {
+            key: value for key, value in EXTRAS.items() if key in extras_list
+        }
+
+    markdown2_extras = {
+        extra: config["args"]
+        for extra, config in selected_extras.items()
+        if config["provided-by"] == "markdown2"
+    }
+
+    markdown_convert_extras = {
+        config["args"]
+        for _, config in selected_extras.items()
+        if config["provided-by"] == "markdown-convert"
+    }
+
+    return {
+        "markdown2_extras": markdown2_extras,
+        "markdown_convert_extras": markdown_convert_extras,
+    }

{markdown_convert-1.2.54 → markdown_convert-1.2.56}/markdown_convert/modules/convert.py

@@ -15,8 +15,8 @@ from .autoinstall import ensure_chromium
 from .constants import (
     BROWSER_ARGS,
     CSP_TEMPLATE,
-    MARKDOWN_EXTENSIONS,
     PDF_PARAMS,
+    resolve_extras,
 )
 from .overrides import markdown2
 from .resources import get_code_css_path, get_css_path, get_output_path
@@ -26,92 +26,16 @@ from .transform import (
     render_extra_features,
     render_mermaid_diagrams,
 )
-from .utils import drop_duplicates
-
-
-def _generate_pdf_with_playwright(
-    html_content,
-    output_path,
-    *,
-    css_content=None,
-    base_dir=None,
-    dump_html=False,
-    nonce=None,
-):
-    """
-    Generate a PDF from HTML content using Playwright.
-
-    Args:
-        html_content (str): HTML content to convert.
-        output_path (str): Path to save the PDF file.
-        css_content (str, optional): CSS content to inject.
-        base_dir (Path, optional): Base directory for resolving relative paths in HTML.
-        dump_html (bool, optional): Whether to dump the HTML content to a file.
-        nonce (str, optional): Nonce for Content Security Policy.
-    """
-    if nonce is None:
-        raise ValueError("A nonce must be provided for CSP generation.")
-
-    # This prevents arbitrary JavaScript injection while allowing Mermaid to work
-    csp = CSP_TEMPLATE.format(nonce=nonce)
-    full_html = create_html_document(html_content, css_content, csp)
-
-    ensure_chromium()
-    with sync_playwright() as playwright:
-        browser = playwright.chromium.launch(headless=True, args=BROWSER_ARGS)
-        context = browser.new_context(
-            java_script_enabled=True,
-            permissions=[],
-            geolocation=None,
-            accept_downloads=False,
-        )
-        page = context.new_page()
-
-        temp_html = None
-        try:
-            if base_dir:
-                temp_html = base_dir / f".temp_{os.getpid()}.html"
-                temp_html.write_text(full_html, encoding="utf-8")
-                page.goto(temp_html.as_uri(), wait_until="networkidle", timeout=30000)
-            else:
-                page.set_content(full_html, wait_until="networkidle", timeout=30000)
-
-            pdf_params = {
-                **PDF_PARAMS,
-                "path": output_path,
-            }
-
-            pdf_bytes = page.pdf(**pdf_params)
-            return None if output_path else pdf_bytes
-
-        finally:
-            browser.close()
-            if temp_html and temp_html.exists() and not dump_html:
-                temp_html.unlink()
-
-
-def _get_css_content(css_sources):
-    """
-    Get the CSS content from a list of CSS file paths.
-
-    Args:
-        css_sources (list): List of CSS file paths.
-    Returns:
-        str: Combined CSS content.
-    """
-    css_buffer = ""
-    for css_file in css_sources:
-        css_buffer += Path(css_file).read_text(encoding="utf-8") + "\n"
-    return css_buffer
 
 
 def convert(
-    markdown_path,
-    css_path=None,
+    markdown_path: Path,
+    css_path: Path = None,
     output_path=None,
     *,
     extend_default_css=True,
     dump_html=False,
+    extras=None,
 ):
     """
     Convert a markdown file to a pdf file.
@@ -122,42 +46,40 @@ def convert(
         output_path (str=None): Path to the output file.
         extend_default_css (bool=True): Extend the default CSS file.
         dump_html (bool=False): Dump the intermediate HTML to a file.
+        extras (list=None): List of extras to use.
     """
-    if css_path is None:
-        css_path = get_css_path()
+    markdown_text = (
+        Path(markdown_path).read_text(encoding="utf-8")
+        if markdown_path and Path(markdown_path).exists()
+        else None
+    )
+    css_text = (
+        Path(css_path).read_text(encoding="utf-8")
+        if css_path and Path(css_path).exists()
+        else None
+    )
 
     if output_path is None:
         output_path = get_output_path(markdown_path, None)
 
-    if extend_default_css:
-        css_sources = [get_code_css_path(), get_css_path(), css_path]
-    else:
-        css_sources = [get_code_css_path(), css_path]
-
-    css_sources = drop_duplicates(css_sources)
-
-    try:
-        nonce = secrets.token_urlsafe(16)
-        html = markdown2.markdown_path(markdown_path, extras=MARKDOWN_EXTENSIONS)
-        html = create_sections(html)
-        html = render_mermaid_diagrams(html, nonce=nonce)
-        html = render_extra_features(html)
-
-        _generate_pdf_with_playwright(
-            html,
-            output_path,
-            css_content=_get_css_content(css_sources),
-            base_dir=Path(markdown_path).resolve().parent,
-            dump_html=dump_html,
-            nonce=nonce,
-        )
-
-    except Exception as exc:
-        raise RuntimeError(exc) from exc
+    convert_text(
+        markdown_text,
+        css_text=css_text,
+        output_path=output_path,
+        base_dir=Path(markdown_path).resolve().parent,
+        extend_default_css=extend_default_css,
+        dump_html=dump_html,
+        extras=extras,
+    )
 
 
 def live_convert(
-    markdown_path, css_path=None, output_path=None, *, extend_default_css=True
+    markdown_path,
+    css_path=None,
+    output_path=None,
+    *,
+    extend_default_css=True,
+    extras=None,
 ):
     """
     Convert a markdown file to a pdf file and watch for changes.
@@ -167,6 +89,7 @@ def live_convert(
         css_path (str=None): Path to the CSS file.
         output_path (str=None): Path to the output file.
         extend_default_css (bool=True): Extend the default CSS file.
+        extras (list=None): List of extras to use.
     """
     if css_path is None:
         css_path = get_css_path()
@@ -180,27 +103,41 @@ def live_convert(
         output_path,
         extend_default_css=extend_default_css,
         loud=True,
+        extras=extras,
     )
     live_converter.observe()
 
 
-def convert_text(markdown_text, css_text=None, *, extend_default_css=True):
+def convert_text(
+    markdown_text,
+    css_text=None,
+    output_path=None,
+    *,
+    base_dir=None,
+    extend_default_css=True,
+    dump_html=False,
+    extras=None,
+):
     """
     Convert markdown text to a pdf file.
 
     Args:
         markdown_text (str): Markdown text.
         css_text (str=None): CSS text.
+        output_path (str=None): Path to the output file.
+        base_dir (Path=None): Base directory for resolving relative paths.
         extend_default_css (bool=True): Extend the default CSS file.
+        dump_html (bool=False): Dump the intermediate HTML to a file.
+        extras (list=None): List of extras to use.
 
     Returns:
-        PDF file as bytes.
+        PDF file as bytes if output_path is None, else None.
     """
     default_css = Path(get_css_path()).read_text(encoding="utf-8")
     code_css = Path(get_code_css_path()).read_text(encoding="utf-8")
 
     if css_text is None:
-        css_text = default_css
+        css_text = ""
 
     if extend_default_css:
         css_sources = [code_css, default_css, css_text]
@@ -209,15 +146,19 @@ def convert_text(markdown_text, css_text=None, *, extend_default_css=True):
 
     try:
         nonce = secrets.token_urlsafe(16)
-        html = markdown2.markdown(markdown_text, extras=MARKDOWN_EXTENSIONS)
+        extras = resolve_extras(extras)
+        html = markdown2.markdown(markdown_text, extras=extras["markdown2_extras"])
         html = create_sections(html)
-        html = render_mermaid_diagrams(html, nonce=nonce)
-        html = render_extra_features(html)
+        if "mermaid" in extras["markdown2_extras"]:
+            html = render_mermaid_diagrams(html, nonce=nonce)
+        html = render_extra_features(html, extras=extras["markdown_convert_extras"])
 
         return _generate_pdf_with_playwright(
             html,
-            None,
+            output_path,
             css_content="\n".join(css_sources),
+            base_dir=base_dir,
+            dump_html=dump_html,
             nonce=nonce,
         )
 
@@ -238,6 +179,7 @@ class LiveConverter:
         *,
         extend_default_css=True,
         loud=False,
+        extras=None,
     ):
         """
         Initialize the LiveConverter class.
@@ -247,12 +189,14 @@ class LiveConverter:
             css_path (str): Path to the CSS file.
             output_path (str): Path to the output file.
             extend_default_css (bool): Extend the default CSS file.
+            extras (list=None): List of extras to use.
         """
         self.md_path = Path(markdown_path).absolute()
         self.css_path = Path(css_path).absolute()
         self.output_path = output_path
         self.extend_default_css = extend_default_css
         self.loud = loud
+        self.extras = extras
 
         self.md_last_modified = None
         self.css_last_modified = None
@@ -278,6 +222,7 @@ class LiveConverter:
             self.css_path,
             self.output_path,
             extend_default_css=self.extend_default_css,
+            extras=self.extras,
         )
         if self.loud:
             print(f"- PDF file updated: {datetime.now()}", flush=True)
@@ -311,3 +256,69 @@ class LiveConverter:
         except KeyboardInterrupt:
             if self.loud:
                 print("\nInterrupted by user.\n", flush=True)
+
+
+def _generate_pdf_with_playwright(
+    html_content,
+    output_path,
+    *,
+    css_content=None,
+    base_dir=None,
+    dump_html=False,
+    nonce=None,
+):
+    """
+    Generate a PDF from HTML content using Playwright.
+
+    Args:
+        html_content (str): HTML content to convert.
+        output_path (str): Path to save the PDF file.
+        css_content (str, optional): CSS content to inject.
+        base_dir (Path, optional): Base directory for resolving relative paths in HTML.
+        dump_html (bool, optional): Whether to dump the HTML content to a file.
+        nonce (str, optional): Nonce for Content Security Policy.
+    """
+    if nonce is None:
+        raise ValueError("A nonce must be provided for CSP generation.")
+
+    # This prevents arbitrary JavaScript injection while allowing Mermaid to work
+    csp = CSP_TEMPLATE.format(nonce=nonce)
+    full_html = create_html_document(html_content, css_content, csp)
+
+    ensure_chromium()
+    with sync_playwright() as playwright:
+        browser = playwright.chromium.launch(headless=True, args=BROWSER_ARGS)
+        context = browser.new_context(
+            java_script_enabled=True,
+            permissions=[],
+            geolocation=None,
+            accept_downloads=False,
+        )
+        page = context.new_page()
+
+        temp_html = None
+        try:
+            if base_dir:
+                temp_file = (
+                    f"{Path(output_path).stem}.html"
+                    if output_path
+                    else f".temp_{os.getpid()}.html"
+                )
+                temp_html = base_dir / temp_file
+                temp_html.write_text(full_html, encoding="utf-8")
+                page.goto(temp_html.as_uri(), wait_until="networkidle", timeout=30000)
+            else:
+                page.set_content(full_html, wait_until="networkidle", timeout=30000)
+
+            pdf_params = {
+                **PDF_PARAMS,
+                "path": output_path,
+            }
+
+            pdf_bytes = page.pdf(**pdf_params)
+            return None if output_path else pdf_bytes
+
+        finally:
+            browser.close()
+            if temp_html and temp_html.exists() and not dump_html:
+                temp_html.unlink()

{markdown_convert-1.2.54 → markdown_convert-1.2.56}/markdown_convert/modules/extras.py

@@ -6,7 +6,7 @@ render_extra_features from transform.py
 import json
 import re
 
-import vl_convert as vlc
+import vl_convert
 from bs4 import BeautifulSoup, Tag
 from ruamel.yaml import YAML
 
@@ -23,7 +23,8 @@ class ExtraFeature:
     pattern = r""
     run_before_stash = False
 
-    def replace(self, match, html):
+    @staticmethod
+    def replace(match, html):
         """
         Replaces the matched pattern with the rendered extra feature.
 
@@ -47,6 +48,7 @@ class CheckboxExtra(ExtraFeature):
 
     pattern = r"(?P<checkbox>\[\s\]|\[x\])"
 
+    @staticmethod
     def replace(match, html):
         """
         Render a tag for a checkbox.
@@ -67,6 +69,7 @@ class HighlightExtra(ExtraFeature):
 
     pattern = r"==(?P<content>.*?)=="
 
+    @staticmethod
     def replace(match, html):
         """
         Render a tag for a highlight.
@@ -87,6 +90,7 @@ class CustomSpanExtra(ExtraFeature):
 
     pattern = r"(?P<cls>[a-zA-Z0-9_-]+)\{\{\s*(?P<content>.*?)\s*\}\}"
 
+    @staticmethod
     def replace(match, html):
         """
         Render a tag for a custom span.
@@ -108,6 +112,7 @@ class TocExtra(ExtraFeature):
 
     pattern = r"\[TOC(?:\s+depth=(?P<depth>\d+))?\]"
 
+    @staticmethod
     def replace(match, html):
         """
         Render a tag for a table of contents
@@ -176,16 +181,17 @@ class VegaExtra(ExtraFeature):
     )
     run_before_stash = True
 
+    @staticmethod
     def replace(match, html):
         """
-        Render a tag for a vega lite diagram from JSON or YAML.
+        Render a tag for a vega-lite diagram from JSON or YAML.
 
         Args:
-            match (re.Match): Element identified as a vega lite diagram.
+            match (re.Match): Element identified as a vega-lite diagram.
             html (str): The full HTML content.
 
         Returns:
-            str: SVG tag representing the vega lite diagram.
+            str: SVG tag representing the vega-lite diagram.
         """
         content = match.group("content")
         spec = None
@@ -204,7 +210,7 @@ class VegaExtra(ExtraFeature):
             return match.group(0)
 
         try:
-            tag = vlc.vegalite_to_svg(spec)
+            tag = vl_convert.vegalite_to_svg(spec)
             return f"<div class='vega-lite'>{tag}</div>"
         except Exception as exc:
             print(f"WARNING: Failed to convert Vega-Lite spec to SVG: {exc}")
@@ -225,12 +231,12 @@ def apply_extras(extras: set[ExtraFeature], html, before_stash=False):
             continue
 
         # Loop until the pattern no longer matches
+        new_html = html
         while re.search(extra.pattern, html, flags=re.DOTALL):
-            new_html = html
             try:
                 new_html = re.sub(
                     extra.pattern,
-                    lambda match: extra.replace(match, html=html),
+                    lambda match, ext=extra: ext.replace(match, html=html),
                     html,
                     flags=re.DOTALL,
                 )
@@ -238,7 +244,6 @@ def apply_extras(extras: set[ExtraFeature], html, before_stash=False):
                 print(
                     f"WARNING: An exception occurred while trying to apply an extra:\n{exc}"
                 )
-                pass
 
             # Safety break:
             if new_html == html:

{markdown_convert-1.2.54 → markdown_convert-1.2.56}/markdown_convert/modules/resources.py

@@ -13,7 +13,7 @@ except ImportError:
     # Fallback for older Python versions
     from importlib_resources import files
 
-from .constants import BLUE, CYAN, GREEN, OPTIONS, OPTIONS_MODES, YELLOW
+from .constants import BLUE, CYAN, EXTRAS, GREEN, OPTIONS, OPTIONS_MODES, YELLOW
 from .utils import color
 
 
@@ -72,6 +72,31 @@ def get_usage():
     Returns:
         str: The usage message.
     """
+
+    def _wrap_by_length(items: list, max_len=20, indent="  "):
+        if not items:
+            return ""
+
+        lines = []
+        current_line = []
+        current_length = 0
+
+        for item in items:
+            item_len = len(item) + (1 if current_line else 0)
+
+            if current_length + item_len > max_len and current_line:
+                lines.append(",".join(current_line) + ",")
+                current_line = [item]
+                current_length = len(item)
+            else:
+                current_line.append(item)
+                current_length += item_len
+
+        if current_line:
+            lines.append(",".join(current_line))
+
+        return indent + f"\n{indent}".join(lines)
+
     commd = (
         f"{color(GREEN, 'markdown-convert')} "
         f"[{color(YELLOW, OPTIONS[0])}] [{color(BLUE, 'options')}]"
@@ -84,6 +109,8 @@ def get_usage():
         f"{color(BLUE, OPTIONS[2])}{color(CYAN, '=')}[{color(CYAN, 'css_file_path')}]"
     )
     option_three = f"{color(BLUE, OPTIONS[3])}{color(CYAN, '=')}[{color(CYAN, 'output_file_path')}]"
+    option_four = f"{color(BLUE, OPTIONS[4])}{color(CYAN, '=')}[{color(CYAN, 'extra1,extra2,...')}]"
+    extras_str = _wrap_by_length(list(EXTRAS.keys()), max_len=60, indent="      ")
 
     usage = (
         "\n"
@@ -93,9 +120,13 @@ def get_usage():
         "Options:\n"
         f"  {option_one}\n"
         "    Convert the markdown file once (default) or live.\n"
+        "    Use debug to preserve the intermediate html file.\n"
         f"  {option_two}\n"
         "    Use a custom CSS file.\n"
         f"  {option_three}\n"
         "    Specify the output file path.\n"
+        f"  {option_four}\n"
+        "    Specify the extras to use. Uses all extras if not specified.\n"
+        f"    Supported extras:\n{extras_str}\n"
     )
     return usage

{markdown_convert-1.2.54 → markdown_convert-1.2.56}/markdown_convert/modules/transform.py

@@ -6,15 +6,7 @@ import re
 
 from bs4 import BeautifulSoup
 
-from .extras import (
-    apply_extras,
-    ExtraFeature,
-    CheckboxExtra,
-    CustomSpanExtra,
-    HighlightExtra,
-    TocExtra,
-    VegaExtra,
-)
+from .extras import ExtraFeature, apply_extras
 
 
 def create_html_document(html_content, css_content, csp):
@@ -82,6 +74,7 @@ def render_mermaid_diagrams(html, *, nonce):
   import mermaid from 'https://cdn.jsdelivr.net/npm/mermaid@11/dist/mermaid.esm.min.mjs';
   mermaid.initialize({{
     startOnLoad: true,
+    securityLevel: 'strict',
     theme: 'default',
     themeVariables: {{}},
     fontFamily: 'arial, verdana, sans-serif'
@@ -95,16 +88,7 @@ def render_mermaid_diagrams(html, *, nonce):
     return html
 
 
-def render_extra_features(
-    html,
-    extras: set[ExtraFeature] = (
-        CheckboxExtra,
-        CustomSpanExtra,
-        HighlightExtra,
-        TocExtra,
-        VegaExtra,
-    ),
-):
+def render_extra_features(html, extras: set[ExtraFeature]):
     """
     Renders extra features by protecting specific tags, applying regex
     transformations, and restoring the protected content.

{markdown_convert-1.2.54 → markdown_convert-1.2.56}/markdown_convert/modules/utils.py

@@ -23,16 +23,3 @@ def color(color_code, text):
         return text
 
     return f"\033[{color_code}m{text}\033[0m"
-
-
-def drop_duplicates(lst):
-    """
-    Drops duplicates from the given list.
-
-    Args:
-        lst: List to remove duplicates from.
-
-    Returns:
-        List without duplicates.
-    """
-    return list(dict.fromkeys(lst))

{markdown_convert-1.2.54 → markdown_convert-1.2.56}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "markdown_convert"
-version = "1.2.54"
+version = "1.2.56"
 description = "Convert Markdown files to PDF from your command line."
 authors = [
     { name = "Julio Cabria", email = "juliocabria@tutanota.com" },

markdown_convert-1.2.54/markdown_convert/modules/constants.py

@@ -1,57 +0,0 @@
-"""
-This module contains the constants used in the markdown_convert package.
-Author: @julynx
-"""
-
-RED = "31"
-GREEN = "32"
-YELLOW = "33"
-BLUE = "34"
-MAGENTA = "35"
-CYAN = "36"
-
-OPTIONS = ("markdown_file_path", "--mode", "--css", "--out", "-h", "--help")
-
-OPTIONS_MODES = ("once", "live", "debug")
-
-MARKDOWN_EXTENSIONS = {
-    "fenced-code-blocks": None,
-    "header-ids": True,
-    "breaks": {"on_newline": True},
-    "tables": True,
-    "latex": True,
-    "mermaid": None,
-    "strike": None,
-    "admonitions": None,
-}
-
-BROWSER_ARGS = [
-    "--disable-dev-shm-usage",
-    "--disable-extensions",
-    "--disable-plugins",
-    "--disable-gpu",
-    "--no-first-run",
-    "--no-default-browser-check",
-]
-
-CSP_TEMPLATE = (
-    "default-src 'none'; "
-    "script-src 'nonce-{nonce}' https://cdn.jsdelivr.net; "  # <- Script for Mermaid diagrams
-    "script-src-elem 'nonce-{nonce}' https://cdn.jsdelivr.net; "
-    "style-src 'unsafe-inline'; "
-    "img-src data: https: file:; "
-    "font-src data: https:; "
-    "connect-src https://cdn.jsdelivr.net;"
-)
-
-PDF_PARAMS = {
-    "format": "A4",
-    "print_background": True,
-    "margin": {
-        "top": "20mm",
-        "bottom": "20mm",
-        "left": "20mm",
-        "right": "20mm",
-    },
-    "path": None,  # <- Replace with actual output path when used
-}