markdown_convert 1.2.23__py3-none-any.whl → 1.2.26__py3-none-any.whl

markdown_convert/default.css

@@ -221,3 +221,9 @@ math {
   text-rendering: optimizeLegibility;
   font-family: "Latin Modern Math", "Cambria Math", serif;
 }
+
+/* Mermaid diagrams */
+div.mermaid {
+    display: flex;
+    justify-content: center;
+}

markdown_convert/modules/constants.py

@@ -20,4 +20,5 @@ MARKDOWN_EXTENSIONS = {
     "breaks": {"on_newline": True},
     "tables": True,
     "latex": True,
+    "mermaid": None,
 }

markdown_convert/modules/convert.py

@@ -4,7 +4,7 @@ Author: @julynx
 """
 
 import os
-import re
+import secrets
 import time
 from datetime import datetime
 from pathlib import Path
@@ -14,6 +14,7 @@ from playwright.sync_api import sync_playwright
 
 from .constants import MARKDOWN_EXTENSIONS
 from .resources import get_code_css_path, get_css_path, get_output_path
+from .transform import create_sections, render_mermaid_diagrams, create_html_document
 from .utils import drop_duplicates
 
 
@@ -24,6 +25,7 @@ def _generate_pdf_with_playwright(
     css_content=None,
     base_dir=None,
     dump_html=False,
+    nonce=None,
 ):
     """
     Generate a PDF from HTML content using Playwright.
@@ -35,22 +37,55 @@ def _generate_pdf_with_playwright(
         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.
     """
+    # Generate a cryptographic nonce for the Mermaid script
+
+    # Content Security Policy using nonce to whitelist only the Mermaid initialization script
+    # This prevents arbitrary JavaScript injection while allowing Mermaid to work
+    csp = (
+        "default-src 'none'; "
+        f"script-src 'nonce-{nonce}' https://cdn.jsdelivr.net; "
+        f"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;"
+    )
+
+    # Wrap HTML content with CSP and CSS
+    if css_content:
+        full_html = create_html_document(html_content, css_content, csp)
+    else:
+        full_html = html_content
+
     with sync_playwright() as playwright:
-        browser = playwright.chromium.launch(headless=True)
-        page = browser.new_page()
+        browser = playwright.chromium.launch(
+            headless=True,
+            args=[
+                "--disable-dev-shm-usage",
+                "--disable-extensions",
+                "--disable-plugins",
+                "--disable-gpu",
+                "--no-first-run",
+                "--no-default-browser-check",
+            ],
+        )
+        context = browser.new_context(
+            java_script_enabled=True,
+            permissions=[],
+            geolocation=None,
+            accept_downloads=False,
+        )
+        page = context.new_page()
 
         # Handle loading based on presence of base_dir
         temp_html = None
         try:
             if base_dir:
                 temp_html = base_dir / f".temp_{os.getpid()}.html"
-                temp_html.write_text(html_content, encoding="utf-8")
-                page.goto(temp_html.as_uri(), wait_until="networkidle")
+                temp_html.write_text(full_html, encoding="utf-8")
+                page.goto(temp_html.as_uri(), wait_until="networkidle", timeout=30000)
             else:
-                page.set_content(html_content, wait_until="networkidle")
-
-            if css_content:
-                page.add_style_tag(content=css_content)
+                page.set_content(full_html, wait_until="networkidle", timeout=30000)
 
             pdf_params = {
                 "format": "A4",
@@ -88,23 +123,6 @@ def _get_css_content(css_sources):
     return css_buffer
 
 
-def _create_sections(html):
-    """
-    Creates h2 sections, from the first h2 to the next h2, wrapping them in <section> tags
-    using regular expressions.
-    Args:
-        html (str): HTML content.
-    Returns:
-        HTML content with sections wrapped in <section> tags.
-    """
-    pattern = re.compile(r"(<h2.*?>.*?</h2>)(.*?)(?=(<h2.*?>|$))", re.DOTALL)
-
-    def wrap_section(match):
-        return f"<section>\n{match.group(1)}\n{match.group(2)}\n</section>\n"
-
-    return pattern.sub(wrap_section, html)
-
-
 def convert(
     markdown_path,
     css_path=None,
@@ -137,8 +155,10 @@ def convert(
     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 = create_sections(html)
+        html = render_mermaid_diagrams(html, nonce=nonce)
 
         _generate_pdf_with_playwright(
             html,
@@ -146,6 +166,7 @@ def convert(
             css_content=_get_css_content(css_sources),
             base_dir=Path(markdown_path).resolve().parent,
             dump_html=dump_html,
+            nonce=nonce,
         )
 
     except Exception as exc:
@@ -204,13 +225,16 @@ def convert_text(markdown_text, css_text=None, *, extend_default_css=True):
         css_sources = [code_css, css_text]
 
     try:
+        nonce = secrets.token_urlsafe(16)
         html = markdown2.markdown(markdown_text, extras=MARKDOWN_EXTENSIONS)
-        html = _create_sections(html)
+        html = create_sections(html)
+        html = render_mermaid_diagrams(html, nonce=nonce)
 
         return _generate_pdf_with_playwright(
             html,
             None,
             css_content=_get_css_content(css_sources),
+            nonce=nonce,
         )
 
     except Exception as exc:

markdown_convert/modules/transform.py

@@ -0,0 +1,69 @@
+"""
+Module for transforming HTML content.
+"""
+
+import re
+
+
+def create_html_document(html_content, css_content, csp):
+    """
+    Creates a complete HTML document with the given content, CSS, and Content Security Policy.
+    Args:
+        html_content (str): The HTML content to include in the body.
+        css_content (str): The CSS styles to include in the head.
+        csp (str): The Content Security Policy string.
+    Returns:
+        str: A complete HTML document as a string.
+    """
+    return f"""<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<meta http-equiv="Content-Security-Policy" content="{csp}">
+<style>
+{css_content}
+</style>
+</head>
+<body>
+{html_content}
+</body>
+</html>"""
+
+
+def create_sections(html):
+    """
+    Creates h2 sections, from the first h2 to the next h2, wrapping them in <section> tags
+    using regular expressions.
+    Args:
+        html (str): HTML content.
+    Returns:
+        HTML content with sections wrapped in <section> tags.
+    """
+    pattern = re.compile(r"(<h2.*?>.*?</h2>)(.*?)(?=(<h2.*?>|$))", re.DOTALL)
+
+    def wrap_section(match):
+        return f"<section>\n{match.group(1)}\n{match.group(2)}\n</section>\n"
+
+    return pattern.sub(wrap_section, html)
+
+
+def render_mermaid_diagrams(html, *, nonce):
+    """
+    Renders Mermaid diagrams in the HTML content.
+
+    Args:
+        html (str): HTML content.
+    Returns:
+        str: HTML content with rendered Mermaid diagrams.
+    """
+    mermaid_script = f"""
+<script type="module" nonce="{nonce}">
+  import mermaid from 'https://cdn.jsdelivr.net/npm/mermaid@10/dist/mermaid.esm.min.mjs';
+  mermaid.initialize({{ startOnLoad: true }});
+</script>
+"""
+
+    if '<div class="mermaid">' in html:
+        html = mermaid_script + html
+
+    return html

{markdown_convert-1.2.23.dist-info → markdown_convert-1.2.26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: markdown_convert
-Version: 1.2.23
+Version: 1.2.26
 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>
@@ -50,6 +50,7 @@ Unlike other similar tools, `markdown-convert`:
 - Comes with a sensible default CSS stylesheet out of the box.
 - Supports:
   - **LaTeX math equations:** `$...$` for inline and `$$...$$` for block equations.
+  - **Mermaid diagrams:** ` ```mermaid ...``` ` code blocks get rendered as diagrams.
   - **Syntax highlighting for code blocks:** Applied automatically based on the specified language.
   - **Live conversion:** `markdown-convert file.md --mode=live` updates the PDF every time the Markdown file changes.
   - **Custom CSS** `markdown-convert file.md --css=style.css` extends the default CSS with your own stylesheet.

{markdown_convert-1.2.23.dist-info → markdown_convert-1.2.26.dist-info}/RECORD

@@ -1,15 +1,16 @@
 markdown_convert/__init__.py,sha256=ysW3pXsDGGK4PzZHcIBTpfVW58IkDUwHffDkf_GM6UU,303
 markdown_convert/__main__.py,sha256=hO7AO0GnzPMPNqls8r5aF2C-7l9aFHDf1m8mXSy1GBE,2809
 markdown_convert/code.css,sha256=Wt4FqFqJcpT-jwY3GN-o4ZRCCXU8DQj-9lqKdGiuoyw,4935
-markdown_convert/default.css,sha256=sTIJmfRWOe8SVwlhzw9CSXD44TUtgfjKCHJjf6u2O8U,2877
+markdown_convert/default.css,sha256=ycMjgZXTjuD8fsQGHDtSRUBdWk_bMpehz_-bvGhyKhA,2965
 markdown_convert/modules/__init__.py,sha256=PFPgiQhMXgyfjD8BkfLC_X8AR1jz-dCxfif2qmNofJs,65
-markdown_convert/modules/constants.py,sha256=Pdm-yoTuvUQbqWiufiydTeuA5ysSF_ZuAafRBrnXPt8,454
-markdown_convert/modules/convert.py,sha256=MPr6CM-KNtfHEnPv0sVegOd26mlmG_v49C55MYXjW_M,8718
+markdown_convert/modules/constants.py,sha256=3pHREdede6XhR-Jlp_SSm1hg0CtJNApdL-T7Rs-G_Bk,475
+markdown_convert/modules/convert.py,sha256=a3WfnWxATHqqLsMG3WUYmfdGIF3-ZFifUqDCM044WV4,9725
 markdown_convert/modules/resources.py,sha256=tnW8JmCrJNBRbzOcaOVG6GX5jPC8Kzj3dA7gX0B935A,2488
+markdown_convert/modules/transform.py,sha256=Z_htEa4D9xoFJwoXl-ik8UXumfkc14wQrTcIC6QQ2dw,1756
 markdown_convert/modules/utils.py,sha256=NX0WegM8e8MPKNNmweTujAWO8ZghdB8LSGDx20K2E44,655
 markdown_convert/modules/validate.py,sha256=XV_k7cHeifEKDaltF26tCmabs2-Me5msP3enI_eVwfA,1517
-markdown_convert-1.2.23.dist-info/METADATA,sha256=llxbzt0ME2aa4n_mucnYoLgFyxkWytJlrnhMIRjLOwg,3797
-markdown_convert-1.2.23.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-markdown_convert-1.2.23.dist-info/entry_points.txt,sha256=RCmzC7C0sX-SpzIP2Cr34rhg3lMd7BRx-exaZPfK8bU,68
-markdown_convert-1.2.23.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-markdown_convert-1.2.23.dist-info/RECORD,,
+markdown_convert-1.2.26.dist-info/METADATA,sha256=lC5zl2KUuQavkQjL2Q6VmKjN3yTKsYgfbTSFI8G9xYE,3883
+markdown_convert-1.2.26.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+markdown_convert-1.2.26.dist-info/entry_points.txt,sha256=RCmzC7C0sX-SpzIP2Cr34rhg3lMd7BRx-exaZPfK8bU,68
+markdown_convert-1.2.26.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+markdown_convert-1.2.26.dist-info/RECORD,,