markdown_convert 1.2.39__py3-none-any.whl → 1.2.41__py3-none-any.whl

markdown_convert/__main__.py

@@ -5,7 +5,6 @@ CLI interface to convert markdown files to pdf.
 Author: @julynx
 """
 
-
 from sys import exit as sys_exit
 
 from argsdict import args
@@ -78,7 +77,6 @@ def main():
 
     # pylint: disable=W0718
     except Exception as err:
-
         asked_for_help = "--help" in arg or "-h" in arg
         show_usage = isinstance(err, (IndexError, ValueError)) or asked_for_help
 

markdown_convert/default.css

@@ -154,11 +154,13 @@ 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 */

markdown_convert/modules/constants.py

@@ -23,3 +23,34 @@ MARKDOWN_EXTENSIONS = {
     "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/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
@@ -240,7 +210,7 @@ def convert_text(markdown_text, css_text=None, *, extend_default_css=True):
         return _generate_pdf_with_playwright(
             html,
             None,
-            css_content=_get_css_content(css_sources),
+            css_content="\n".join(css_sources),
             nonce=nonce,
         )
 
@@ -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/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.39.dist-info → markdown_convert-1.2.41.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: markdown_convert
-Version: 1.2.39
+Version: 1.2.41
 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>
@@ -9,7 +9,7 @@ License-File: LICENSE
 Classifier: License :: OSI Approved :: GNU General Public License v2 (GPLv2)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Requires-Python: <3.15,>=3.9
+Requires-Python: <3.15,>=3.11
 Requires-Dist: argsdict==1.0.0
 Requires-Dist: beautifulsoup4>=4.14.3
 Requires-Dist: latex2mathml>=3.78.1

markdown_convert-1.2.41.dist-info/RECORD

@@ -0,0 +1,16 @@
+markdown_convert/__init__.py,sha256=ysW3pXsDGGK4PzZHcIBTpfVW58IkDUwHffDkf_GM6UU,303
+markdown_convert/__main__.py,sha256=w6sHfJcJQpMOERPqiNoKgoRM38YUwK22eGBmVkpZj1g,2807
+markdown_convert/code.css,sha256=Wt4FqFqJcpT-jwY3GN-o4ZRCCXU8DQj-9lqKdGiuoyw,4935
+markdown_convert/default.css,sha256=rIwRao7l7Rq6rkOaxVMfZ4yGQc2D68eJ7URLQ597GcY,3530
+markdown_convert/modules/__init__.py,sha256=PFPgiQhMXgyfjD8BkfLC_X8AR1jz-dCxfif2qmNofJs,65
+markdown_convert/modules/constants.py,sha256=eUeIFRxZerP3E0Rgp_Nsl0Q38IBELwca5UO3fbUcxRA,1280
+markdown_convert/modules/convert.py,sha256=02N_Iz4TLKWR1xseNv8hyCTujCJdYepWZlxjXw9tsj0,8876
+markdown_convert/modules/resources.py,sha256=tnW8JmCrJNBRbzOcaOVG6GX5jPC8Kzj3dA7gX0B935A,2488
+markdown_convert/modules/transform.py,sha256=p7J8LJKBjMA_EtUYIfXqw_Tc1eean7EbM6KW5Tv4AOs,3138
+markdown_convert/modules/utils.py,sha256=NX0WegM8e8MPKNNmweTujAWO8ZghdB8LSGDx20K2E44,655
+markdown_convert/modules/validate.py,sha256=XV_k7cHeifEKDaltF26tCmabs2-Me5msP3enI_eVwfA,1517
+markdown_convert-1.2.41.dist-info/METADATA,sha256=ATlu-Biqp5xWcJgxvd9YtO72VtglXtREg2T5JvN0pTw,3940
+markdown_convert-1.2.41.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+markdown_convert-1.2.41.dist-info/entry_points.txt,sha256=RCmzC7C0sX-SpzIP2Cr34rhg3lMd7BRx-exaZPfK8bU,68
+markdown_convert-1.2.41.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+markdown_convert-1.2.41.dist-info/RECORD,,

markdown_convert-1.2.39.dist-info/RECORD

@@ -1,16 +0,0 @@
-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=4S8lVclp-GMvpalFRS2Q-_7fDNhnweWE_UQDVbpTYng,3492
-markdown_convert/modules/__init__.py,sha256=PFPgiQhMXgyfjD8BkfLC_X8AR1jz-dCxfif2qmNofJs,65
-markdown_convert/modules/constants.py,sha256=_h6N0fhG9K1hQPmp3eYu53TfQnAPe7RtmMj-2FCD7VU,495
-markdown_convert/modules/convert.py,sha256=R1xIKW6UVGP7a6VK5C6qLK278wBlHZV9X6Y9q73mz_k,9843
-markdown_convert/modules/resources.py,sha256=tnW8JmCrJNBRbzOcaOVG6GX5jPC8Kzj3dA7gX0B935A,2488
-markdown_convert/modules/transform.py,sha256=uQbTtiSKDTXRs49OuDazpD2nSya4fpghzMS4BZ9zm_8,3120
-markdown_convert/modules/utils.py,sha256=NX0WegM8e8MPKNNmweTujAWO8ZghdB8LSGDx20K2E44,655
-markdown_convert/modules/validate.py,sha256=XV_k7cHeifEKDaltF26tCmabs2-Me5msP3enI_eVwfA,1517
-markdown_convert-1.2.39.dist-info/METADATA,sha256=OwYd5H8EW8YWWK2-Nx2CrCYDDssUwmw6A_hJXc2UlQ8,3939
-markdown_convert-1.2.39.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-markdown_convert-1.2.39.dist-info/entry_points.txt,sha256=RCmzC7C0sX-SpzIP2Cr34rhg3lMd7BRx-exaZPfK8bU,68
-markdown_convert-1.2.39.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-markdown_convert-1.2.39.dist-info/RECORD,,