markdown_convert 1.2.38__tar.gz → 1.2.40__tar.gz

{markdown_convert-1.2.38 → markdown_convert-1.2.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: markdown_convert
-Version: 1.2.38
+Version: 1.2.40
 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>

{markdown_convert-1.2.38 → markdown_convert-1.2.40}/markdown_convert/default.css

@@ -1,15 +1,14 @@
 :root {
-  /* -- Standard margins */
-  --top-margin: 0.75em;
-  --bottom-margin: 0.5em;
-  --left-margin: 1.5em;
+  /* -- Header margins -- */
+  --top-margin: 1em;
+  --bottom-margin-small: 0.25em;
 
-  /* -- Small margins */
-  --left-margin-small: 1em;
-  --top-margin-small: 0.25em;
-  --bottom-margin-small: 0.15em;
+  /* -- Element margins -- */
+  --bottom-margin: 0.75em;
 
-  /* -- Big margins */
+  /* -- Nested element margins -- */
+  --left-margin: 1.5em;
+  --left-margin-small: 1em;
   --left-margin-big: 2em;
 }
 
@@ -28,39 +27,41 @@ body {
 }
 
 /* Headers and paragraphs */
-h1,
+h1 {
+  margin-top: 0;
+  margin-bottom: var(--bottom-margin-small);
+}
+
 h2,
 h3,
 h4,
 h5 {
-  color: #333;
-  font-weight: 600;
+  margin-top: var(--top-margin);
+  margin-bottom: var(--bottom-margin-small);
 }
 
-h1 {
+p {
   margin-top: 0;
   margin-bottom: var(--bottom-margin);
 }
 
+h1,
 h2,
 h3,
 h4,
-h5,
-p {
-  margin-top: var(--top-margin);
-  margin-bottom: 0;
+h5 {
+  color: #333;
+  font-weight: 600;
 }
 
 h1 {
   font-size: 2.2rem;
   border-bottom: 0.5px solid #999;
-  padding-bottom: var(--bottom-margin-small);
 }
 
 h2 {
   font-size: 1.8rem;
   border-bottom: 0.5px solid #999;
-  padding-bottom: var(--bottom-margin-small);
 }
 
 h3 {
@@ -90,22 +91,20 @@ a {
 ul,
 ol {
   font-size: 1rem;
-  padding: 0;
-  margin-top: var(--top-margin);
-  margin-right: 0;
+  margin-top: 0;
   margin-bottom: var(--bottom-margin);
-  margin-left: var(--left-margin-big);
+  margin-right: 0;
+  margin-left: var(--left-margin-small);
+  padding-left: var(--left-margin);
 }
 
 ul ol,
 ol ul,
 ol ol,
 ul ul {
-  margin-top: 0;
-}
-
-li {
-  margin-top: var(--top-margin-small);
+  margin-bottom: 0;
+  margin-left: 0;
+  padding-left:  var(--left-margin);
 }
 
 /* Code blocks */
@@ -114,10 +113,10 @@ pre {
   white-space: pre-wrap;
 }
 
-pre > code {
+pre>code {
   display: block;
   padding: 1em;
-  margin-top: var(--top-margin);
+  margin-top: 0;
   margin-bottom: var(--bottom-margin);
 }
 
@@ -143,26 +142,29 @@ h5 code {
 
 /* Quotes */
 blockquote {
-  margin-top: var(--top-margin);
+  margin-top: 0;
+  margin-bottom: var(--bottom-margin);
   margin-left: var(--left-margin);
   border-left: 4px solid #ccc;
   padding-left: 0.5em;
   color: #666;
 }
 
-blockquote > blockquote {
-  margin-left: var(--left-margin-small);
+blockquote>blockquote {
+  padding-left: var(--left-margin-small);
 }
 
-/* Figures */
 img {
+  max-width: 80vw;
+  max-height: 80vh;
+  width: auto;
+  height: auto;
   display: block;
   margin: 2em auto 1em auto;
-  max-width: 80%;
 }
 
 /* -- Figure footer */
-p > img + em {
+p>img+em {
   text-align: center;
   font-size: 1rem;
   font-style: italic;
@@ -176,7 +178,8 @@ table {
   font-size: 1rem;
   font-family: inherit;
   border-collapse: collapse;
-  margin-top: var(--top-margin);
+  margin-top: 0;
+  margin-bottom: var(--bottom-margin);
   text-align: left;
   width: 100%;
   table-layout: auto;
@@ -215,7 +218,7 @@ td {
   page-break-after: always;
 }
 
-.pagebreak + * {
+.pagebreak+* {
   margin-top: 0;
 }
 

markdown_convert-1.2.40/markdown_convert/modules/constants.py

@@ -0,0 +1,56 @@
+"""
+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,
+}
+
+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
+}

{markdown_convert-1.2.38 → markdown_convert-1.2.40}/markdown_convert/modules/convert.py

@@ -12,7 +12,7 @@ from pathlib import Path
 import markdown2
 from playwright.sync_api import sync_playwright
 
-from .constants import MARKDOWN_EXTENSIONS
+from .constants import MARKDOWN_EXTENSIONS, BROWSER_ARGS, CSP_TEMPLATE, PDF_PARAMS
 from .resources import get_code_css_path, get_css_path, get_output_path
 from .transform import (
     create_sections,
@@ -41,39 +41,17 @@ def _generate_pdf_with_playwright(
         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.
     """
-    # Generate a cryptographic nonce for the Mermaid script
+    if nonce is None:
+        raise ValueError("A nonce must be provided for CSP generation.")
 
-    # 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
+    csp = CSP_TEMPLATE.format(nonce=nonce)
+    full_html = create_html_document(html_content, css_content, csp)
 
     with sync_playwright() as playwright:
-        browser = playwright.chromium.launch(
-            headless=True,
-            args=[
-                "--disable-dev-shm-usage",
-                "--disable-extensions",
-                "--disable-plugins",
-                "--disable-gpu",
-                "--no-first-run",
-                "--no-default-browser-check",
-            ],
-        )
+        browser = playwright.chromium.launch(headless=True, args=BROWSER_ARGS)
         context = browser.new_context(
             java_script_enabled=True,
             permissions=[],
@@ -82,7 +60,6 @@ def _generate_pdf_with_playwright(
         )
         page = context.new_page()
 
-        # Handle loading based on presence of base_dir
         temp_html = None
         try:
             if base_dir:
@@ -93,16 +70,9 @@ def _generate_pdf_with_playwright(
                 page.set_content(full_html, wait_until="networkidle", timeout=30000)
 
             pdf_params = {
-                "format": "A4",
-                "print_background": True,
-                "margin": {
-                    "top": "20mm",
-                    "bottom": "20mm",
-                    "left": "20mm",
-                    "right": "20mm",
-                },
+                **PDF_PARAMS,
                 "path": output_path,
-            }  # Playwright ignores None paths
+            }
 
             pdf_bytes = page.pdf(**pdf_params)
             return None if output_path else pdf_bytes
@@ -317,7 +287,6 @@ class LiveConverter:
 
         try:
             while True:
-
                 markdown_modified = self.get_last_modified_date(self.md_path)
                 css_modified = self.get_last_modified_date(self.css_path)
 
@@ -325,7 +294,6 @@ class LiveConverter:
                     markdown_modified != self.md_last_modified
                     or css_modified != self.css_last_modified
                 ):
-
                     self.write_pdf()
 
                     self.md_last_modified = markdown_modified

{markdown_convert-1.2.38 → markdown_convert-1.2.40}/markdown_convert/modules/transform.py

@@ -21,13 +21,13 @@ def create_html_document(html_content, css_content, csp):
 <html>
 <head>
 <meta charset="UTF-8">
-<meta http-equiv="Content-Security-Policy" content="{csp}">
+<meta http-equiv="Content-Security-Policy" content="{csp or ''}">
 <style>
-{css_content}
+{css_content or ''}
 </style>
 </head>
 <body>
-{html_content}
+{html_content or ''}
 </body>
 </html>"""
 

{markdown_convert-1.2.38 → markdown_convert-1.2.40}/pyproject.toml

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

markdown_convert-1.2.38/markdown_convert/modules/constants.py

@@ -1,25 +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,
-}