markdown_convert 1.2.17__py3-none-any.whl → 1.2.19__py3-none-any.whl

markdown_convert/default.css

@@ -1,171 +1,7 @@
-/* Font imports */
-/* -- Cantarell Web */
-@font-face {
-  font-family: "Cantarell Web";
-  font-style: italic;
-  font-weight: 400;
-  font-display: swap;
-  src: url(https://fonts.gstatic.com/s/cantarell/v17/B50LF7ZDq37KMUvlO015iZJnNKuiLA.woff2) format("woff2");
-  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
-    U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-
-@font-face {
-  font-family: "Cantarell Web";
-  font-style: italic;
-  font-weight: 400;
-  font-display: swap;
-  src: url(https://fonts.gstatic.com/s/cantarell/v17/B50LF7ZDq37KMUvlO015iZJpNKs.woff2) format("woff2");
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
-    U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
-    U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-
-@font-face {
-  font-family: "Cantarell Web";
-  font-style: italic;
-  font-weight: 700;
-  font-display: swap;
-  src: url(https://fonts.gstatic.com/s/cantarell/v17/B50WF7ZDq37KMUvlO015iZrSEb6TDYsmgQ.woff2) format("woff2");
-  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
-    U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-
-@font-face {
-  font-family: "Cantarell Web";
-  font-style: italic;
-  font-weight: 700;
-  font-display: swap;
-  src: url(https://fonts.gstatic.com/s/cantarell/v17/B50WF7ZDq37KMUvlO015iZrSEb6dDYs.woff2) format("woff2");
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
-    U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
-    U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-
-@font-face {
-  font-family: "Cantarell Web";
-  font-style: normal;
-  font-weight: 400;
-  font-display: swap;
-  src: url(https://fonts.gstatic.com/s/cantarell/v17/B50NF7ZDq37KMUvlO015gqJrLK8.woff2) format("woff2");
-  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
-    U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-
-@font-face {
-  font-family: "Cantarell Web";
-  font-style: normal;
-  font-weight: 400;
-  font-display: swap;
-  src: url(https://fonts.gstatic.com/s/cantarell/v17/B50NF7ZDq37KMUvlO015jKJr.woff2) format("woff2");
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
-    U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
-    U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-
-@font-face {
-  font-family: "Cantarell Web";
-  font-style: normal;
-  font-weight: 700;
-  font-display: swap;
-  src: url(https://fonts.gstatic.com/s/cantarell/v17/B50IF7ZDq37KMUvlO01xN4d-HY6fFY8.woff2) format("woff2");
-  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
-    U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-
-@font-face {
-  font-family: "Cantarell Web";
-  font-style: normal;
-  font-weight: 700;
-  font-display: swap;
-  src: url(https://fonts.gstatic.com/s/cantarell/v17/B50IF7ZDq37KMUvlO01xN4d-E46f.woff2) format("woff2");
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
-    U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
-    U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-
-/* -- JetBrains Mono */
-@font-face {
-  font-family: "JetBrains Mono";
-  src: url("https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff2/JetBrainsMono-Bold-Italic.woff2") format("woff2"),
-    url("https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff/JetBrainsMono-Bold-Italic.woff") format("woff");
-  font-weight: 700;
-  font-style: italic;
-  font-display: swap;
-}
-
-@font-face {
-  font-family: "JetBrains Mono";
-  src: url("https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff2/JetBrainsMono-Bold.woff2") format("woff2"),
-    url("https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff/JetBrainsMono-Bold.woff") format("woff");
-  font-weight: 700;
-  font-style: normal;
-  font-display: swap;
-}
-
-@font-face {
-  font-family: "JetBrains Mono";
-  src: url("https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff2/JetBrainsMono-ExtraBold-Italic.woff2") format("woff2"),
-    url("https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff/JetBrainsMono-ExtraBold-Italic.woff") format("woff");
-  font-weight: 800;
-  font-style: italic;
-  font-display: swap;
-}
-
-@font-face {
-  font-family: "JetBrains Mono";
-  src: url("https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff2/JetBrainsMono-ExtraBold.woff2") format("woff2"),
-    url("https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff/JetBrainsMono-ExtraBold.woff") format("woff");
-  font-weight: 800;
-  font-style: normal;
-  font-display: swap;
-}
-
-@font-face {
-  font-family: "JetBrains Mono";
-  src: url("https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff2/JetBrainsMono-Italic.woff2") format("woff2"),
-    url("https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff/JetBrainsMono-Italic.woff") format("woff");
-  font-weight: 400;
-  font-style: italic;
-  font-display: swap;
-}
-
-@font-face {
-  font-family: "JetBrains Mono";
-  src: url("https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff2/JetBrainsMono-Medium-Italic.woff2") format("woff2"),
-    url("https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff/JetBrainsMono-Medium-Italic.woff") format("woff");
-  font-weight: 500;
-  font-style: italic;
-  font-display: swap;
-}
-
-@font-face {
-  font-family: "JetBrains Mono";
-  src: url("https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff2/JetBrainsMono-Medium.woff2") format("woff2"),
-    url("https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff/JetBrainsMono-Medium.woff") format("woff");
-  font-weight: 500;
-  font-style: normal;
-  font-display: swap;
-}
-
-@font-face {
-  font-family: "JetBrains Mono";
-  src: url("https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff2/JetBrainsMono-Regular.woff2") format("woff2"),
-    url("https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff/JetBrainsMono-Regular.woff") format("woff");
-  font-weight: 400;
-  font-style: normal;
-  font-display: swap;
-}
-
-/* Print media css */
-@page {
-  size: A4;
-  margin: 2.54cm;
-}
-
 :root {
   /* -- Standard margins */
-  --top-margin: 1em;
+  --top-margin: 0.5em;
+  --bottom-margin: 0.5em;
   --left-margin: 1.5em;
 
   /* -- Small margins */
@@ -173,18 +9,18 @@
 
   /* -- Big margins */
   --left-margin-big: 2em;
-  --bottom-margin-big: 0.5em;
 }
 
 /* Document */
 html {
-  font-size: 10px;
+  font-size: 12px;
 }
 
 body {
   margin: 0;
   padding: 0;
-  font-family: "Cantarell Web", "Cantarell", sans-serif;
+  font-family: "Segoe UI", "Ubuntu", "DejaVu Sans", "Liberation Sans", "Arial",
+    "sans-serif";
   color: #333;
 }
 
@@ -195,12 +31,12 @@ h3,
 h4,
 h5 {
   color: #333;
-  font-weight: 400;
+  font-weight: 600;
 }
 
 h1 {
   margin-top: 0;
-  margin-bottom: var(--bottom-margin-big);
+  margin-bottom: var(--bottom-margin);
 }
 
 h2,
@@ -213,27 +49,27 @@ p {
 }
 
 h1 {
-  font-size: 4.8rem;
+  font-size: 2.4rem;
 }
 
 h2 {
-  font-size: 3.6rem;
+  font-size: 2rem;
 }
 
 h3 {
-  font-size: 2.4rem;
+  font-size: 1.6rem;
 }
 
 h4 {
-  font-size: 1.8rem;
+  font-size: 1.4rem;
 }
 
 h5 {
-  font-size: 1.4rem;
+  font-size: 1.2rem;
 }
 
 p {
-  font-size: 1.2rem;
+  font-size: 1rem;
 }
 
 /* Links */
@@ -246,7 +82,7 @@ a {
 /* Lists */
 ul,
 ol {
-  font-size: 1.2rem;
+  font-size: 1rem;
   padding: 0;
   margin-top: var(--top-margin);
   margin-right: 0;
@@ -262,7 +98,7 @@ ul ul {
 }
 
 li {
-  margin-top: 0.5rem;
+  margin-top: var(--top-margin);
 }
 
 /* Code blocks */
@@ -272,7 +108,8 @@ pre {
 }
 
 code {
-  font-family: "JetBrains Mono", "Courier New", Courier, monospace;
+  font-family: "JetBrains Mono", "Consolas", "Ubuntu Mono", "DejaVu Sans Mono",
+    "Liberation Mono", "Courier New", monospace;
   font-size: 1rem;
   background-color: #eee;
   padding-left: 0.4em;
@@ -294,13 +131,12 @@ h5 code {
 blockquote {
   margin-top: var(--top-margin);
   margin-left: var(--left-margin);
-  max-width: 30em;
   border-left: 4px solid #ccc;
   padding-left: 0.5em;
   color: #666;
 }
 
-blockquote>blockquote {
+blockquote > blockquote {
   margin-left: var(--left-margin-small);
 }
 
@@ -312,7 +148,7 @@ img {
 }
 
 /* -- Figure footer */
-p>img+em {
+p > img + em {
   text-align: center;
   font-size: 1rem;
   font-style: italic;
@@ -324,6 +160,7 @@ p>img+em {
 /* Tables */
 table {
   font-size: 1rem;
+  font-family: inherit;
   border-collapse: collapse;
   margin-top: var(--top-margin);
   text-align: left;
@@ -355,11 +192,13 @@ col {
   page-break-after: always;
 }
 
-.pagebreak+* {
+.pagebreak + * {
   margin-top: 0;
 }
 
-li,
+section,
+ol,
+ul,
 table,
 blockquote,
 code,
@@ -376,4 +215,9 @@ h5 {
 math[display="block"] {
   margin-top: 1em;
   margin-bottom: 1em;
-}
+}
+
+math {
+  text-rendering: optimizeLegibility;
+  font-family: "Latin Modern Math", "Cambria Math", serif;
+}

markdown_convert/modules/constants.py

@@ -16,8 +16,8 @@ OPTIONS_MODES = ("once", "live", "debug")
 
 MD_EXTENSIONS = {
     "fenced-code-blocks": None,
-    "header-ids": None,
+    "header-ids": True,
     "breaks": {"on_newline": True},
-    "tables": None,
+    "tables": True,
     "latex": True,
 }

markdown_convert/modules/convert.py

@@ -4,6 +4,7 @@ Author: @julynx
 """
 
 import os
+import re
 import time
 from datetime import datetime
 from pathlib import Path
@@ -11,60 +12,92 @@ from pathlib import Path
 import markdown2
 from playwright.sync_api import sync_playwright
 
-from .resources import get_css_path, get_code_css_path, get_output_path
-from .utils import drop_duplicates
 from .constants import MD_EXTENSIONS
+from .resources import get_code_css_path, get_css_path, get_output_path
+from .utils import drop_duplicates
 
 
-def _generate_pdf_with_playwright(html_content, output_path):
+def _generate_pdf_with_playwright(
+    html_content,
+    output_path,
+    *,
+    css_content=None,
+    base_dir=None,
+    dump_html=False,
+):
     """
     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.
     """
     with sync_playwright() as p:
         browser = p.chromium.launch(headless=True)
         page = browser.new_page()
-        page.set_content(html_content)
-        # Wait for any potential resources to load
-        page.wait_for_load_state("networkidle")
-
-        pdf_params = {
-            "format": "A4",
-            "print_background": True,
-            "margin": {
-                "top": "20mm",
-                "bottom": "20mm",
-                "left": "20mm",
-                "right": "20mm",
-            },
-        }
-
-        if output_path:
-            page.pdf(path=output_path, **pdf_params)
-            browser.close()
-            return None
 
-        pdf_bytes = page.pdf(**pdf_params)
-        browser.close()
-        return pdf_bytes
+        # 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")
+            else:
+                page.set_content(html_content, wait_until="networkidle")
+
+            if css_content:
+                page.add_style_tag(content=css_content)
+
+            pdf_params = {
+                "format": "A4",
+                "print_background": True,
+                "margin": {"top": "20mm", "bottom": "20mm", "left": "20mm", "right": "20mm"},
+                "path": output_path,
+            }  # Playwright ignores None paths
+
+            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 _embed_css_in_html(html, css_sources):
+def _get_css_content(css_sources):
     """
-    Embed CSS styles into HTML content.
+    Get the CSS content from a list of CSS file paths.
 
     Args:
-        html (str): HTML content.
         css_sources (list): List of CSS file paths.
-
     Returns:
-        HTML content with embedded CSS styles.
+        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
 
-    style_tag = f"<style>\n{css_buffer}\n</style>\n"
-    return f"<!DOCTYPE html>\n<html>\n<head>\n{style_tag}</head>\n<body>\n{html}\n</body>\n</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 convert(
@@ -100,13 +133,15 @@ def convert(
 
     try:
         html = markdown2.markdown_path(md_path, extras=MD_EXTENSIONS)
-        html = _embed_css_in_html(html, css_sources)
-
-        if dump_html:
-            html_dump_path = Path(output_path).with_suffix(".html")
-            html_dump_path.write_text(html, encoding="utf-8")
-
-        _generate_pdf_with_playwright(html, output_path)
+        html = _create_sections(html)
+
+        _generate_pdf_with_playwright(
+            html,
+            output_path,
+            css_content=_get_css_content(css_sources),
+            base_dir=Path(md_path).resolve().parent,
+            dump_html=dump_html,
+        )
 
     except Exception as exc:
         raise RuntimeError(exc) from exc
@@ -129,7 +164,11 @@ def live_convert(md_path, css_path=None, output_path=None, *, extend_default_css
         output_path = get_output_path(md_path, None)
 
     live_converter = LiveConverter(
-        md_path, css_path, output_path, extend_default_css=extend_default_css, loud=True
+        md_path,
+        css_path,
+        output_path,
+        extend_default_css=extend_default_css,
+        loud=True,
     )
     live_converter.observe()
 
@@ -159,9 +198,13 @@ def convert_text(md_text, css_text=None, *, extend_default_css=True):
 
     try:
         html = markdown2.markdown(md_text, extras=MD_EXTENSIONS)
-        html = _embed_css_in_html(html, css_sources)
+        html = _create_sections(html)
 
-        return _generate_pdf_with_playwright(html, None)
+        return _generate_pdf_with_playwright(
+            html,
+            None,
+            css_content=_get_css_content(css_sources),
+        )
 
     except Exception as exc:
         raise RuntimeError(exc) from exc
@@ -172,9 +215,7 @@ class LiveConverter:
     Class to convert a markdown file to a pdf file and watch for changes.
     """
 
-    def __init__(
-        self, md_path, css_path, output_path, *, extend_default_css=True, loud=False
-    ):
+    def __init__(self, md_path, css_path, output_path, *, extend_default_css=True, loud=False):
         """
         Initialize the LiveConverter class.
 
@@ -234,10 +275,7 @@ class LiveConverter:
                 md_modified = self.get_last_modified_date(self.md_path)
                 css_modified = self.get_last_modified_date(self.css_path)
 
-                if (
-                    md_modified != self.md_last_modified
-                    or css_modified != self.css_last_modified
-                ):
+                if md_modified != self.md_last_modified or css_modified != self.css_last_modified:
 
                     self.write_pdf()
 

{markdown_convert-1.2.17.dist-info → markdown_convert-1.2.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: markdown_convert
-Version: 1.2.17
+Version: 1.2.19
 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.17.dist-info → markdown_convert-1.2.19.dist-info}/RECORD

@@ -1,14 +1,14 @@
 markdown_convert/__main__.py,sha256=zKgFcnxlXTRsR6AYhTdGEvQea2TVyLYeIxJSMksCMR0,2767
 markdown_convert/code.css,sha256=Wt4FqFqJcpT-jwY3GN-o4ZRCCXU8DQj-9lqKdGiuoyw,4935
-markdown_convert/default.css,sha256=BNAwHnnZzH8m9VinbL8T-C8GGpJj4cTIAFbUss-PzUg,8775
+markdown_convert/default.css,sha256=sTIJmfRWOe8SVwlhzw9CSXD44TUtgfjKCHJjf6u2O8U,2877
 markdown_convert/modules/__init__.py,sha256=PFPgiQhMXgyfjD8BkfLC_X8AR1jz-dCxfif2qmNofJs,65
-markdown_convert/modules/constants.py,sha256=rBRrz0Ctc46o4aKO7eERGyacsdJ4a-CXCUCEhYaQi2Q,448
-markdown_convert/modules/convert.py,sha256=2jzc2nwM9-qFuwHzdyU292cFl3rORvGtcqcJh7UXCQg,7120
+markdown_convert/modules/constants.py,sha256=Yd7o0OGwliYcmBGrwoeckagc9E8p1l-zXQx_P4CuiK4,448
+markdown_convert/modules/convert.py,sha256=cU-wATfsM5Y8WFklkw7NIa2KSrMpc50aZecO4rewua8,8346
 markdown_convert/modules/resources.py,sha256=aMDbM7Oab8A3nRN1tc1uNkmz8JfUdLJR6rF3ZR0IElo,2384
 markdown_convert/modules/utils.py,sha256=NX0WegM8e8MPKNNmweTujAWO8ZghdB8LSGDx20K2E44,655
 markdown_convert/modules/validate.py,sha256=cerfQ5Qt8gBQbh-NZ57zLmDfg-Vnyo0zsEFb8RUzVCQ,1487
-markdown_convert-1.2.17.dist-info/METADATA,sha256=rsJKjyzaXixUixmXQjN18mz8k0bAVn9vaLGuJ_I7glI,2935
-markdown_convert-1.2.17.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-markdown_convert-1.2.17.dist-info/entry_points.txt,sha256=RCmzC7C0sX-SpzIP2Cr34rhg3lMd7BRx-exaZPfK8bU,68
-markdown_convert-1.2.17.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-markdown_convert-1.2.17.dist-info/RECORD,,
+markdown_convert-1.2.19.dist-info/METADATA,sha256=1eUFWi99qEWcCrGq4Z_Wa4S67PXa9prHTHjGB7xPTus,2935
+markdown_convert-1.2.19.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+markdown_convert-1.2.19.dist-info/entry_points.txt,sha256=RCmzC7C0sX-SpzIP2Cr34rhg3lMd7BRx-exaZPfK8bU,68
+markdown_convert-1.2.19.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+markdown_convert-1.2.19.dist-info/RECORD,,