PyPI - markdown_convert - Versions diffs - 1.2.17__tar.gz → 1.2.18__tar.gz - Mend

markdown_convert 1.2.17tar.gz → 1.2.18tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

{markdown_convert-1.2.17 → markdown_convert-1.2.18}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: markdown_convert
-Version: 1.2.17
+Version: 1.2.18
 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.18/markdown_convert/default.css ADDED Viewed

@@ -0,0 +1,223 @@
+:root {
+  /* -- Standard margins */
+  --top-margin: 0.5em;
+  --bottom-margin: 0.5em;
+  --left-margin: 1.5em;
+  /* -- Small margins */
+  --left-margin-small: 1em;
+  /* -- Big margins */
+  --left-margin-big: 2em;
+}
+/* Document */
+html {
+  font-size: 12px;
+}
+body {
+  margin: 0;
+  padding: 0;
+  font-family: "Segoe UI", "Ubuntu", "DejaVu Sans", "Liberation Sans", "Arial",
+    "sans-serif";
+  color: #333;
+}
+/* Headers and paragraphs */
+h1,
+h2,
+h3,
+h4,
+h5 {
+  color: #333;
+  font-weight: 600;
+}
+h1 {
+  margin-top: 0;
+  margin-bottom: var(--bottom-margin);
+}
+h2,
+h3,
+h4,
+h5,
+p {
+  margin-top: var(--top-margin);
+  margin-bottom: 0;
+}
+h1 {
+  font-size: 2.4rem;
+}
+h2 {
+  font-size: 2rem;
+}
+h3 {
+  font-size: 1.6rem;
+}
+h4 {
+  font-size: 1.4rem;
+}
+h5 {
+  font-size: 1.2rem;
+}
+p {
+  font-size: 1rem;
+}
+/* Links */
+a {
+  color: #09f;
+  margin: 0;
+  vertical-align: baseline;
+}
+/* Lists */
+ul,
+ol {
+  font-size: 1rem;
+  padding: 0;
+  margin-top: var(--top-margin);
+  margin-right: 0;
+  margin-bottom: var(--bottom-margin);
+  margin-left: var(--left-margin-big);
+}
+ul ol,
+ol ul,
+ol ol,
+ul ul {
+  margin-top: 0;
+}
+li {
+  margin-top: var(--top-margin);
+}
+/* Code blocks */
+pre {
+  padding: 0;
+  white-space: pre-wrap;
+}
+code {
+  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;
+  padding-right: 0.4em;
+  display: inline-block;
+  border-radius: 0.3em;
+  line-height: 1.5;
+}
+h1 code,
+h2 code,
+h3 code,
+h4 code,
+h5 code {
+  font-size: 0.8em;
+}
+/* Quotes */
+blockquote {
+  margin-top: var(--top-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);
+}
+/* Figures */
+img {
+  display: block;
+  margin: 2em auto 1em auto;
+  max-width: 80%;
+}
+/* -- Figure footer */
+p > img + em {
+  text-align: center;
+  font-size: 1rem;
+  font-style: italic;
+  color: #666;
+  display: block;
+  margin: 1em auto 2em;
+}
+/* Tables */
+table {
+  font-size: 1rem;
+  font-family: inherit;
+  border-collapse: collapse;
+  margin-top: var(--top-margin);
+  text-align: left;
+  table-layout: auto;
+}
+thead {
+  background-color: #eee;
+}
+tbody {
+  color: #666;
+}
+th,
+td {
+  padding: 0.5em 0.75em;
+  border: 1px solid #ccc;
+  white-space: nowrap;
+}
+col {
+  width: auto;
+}
+/* Page breaks */
+.pagebreak {
+  clear: both;
+  page-break-after: always;
+}
+.pagebreak + * {
+  margin-top: 0;
+}
+section,
+ol,
+ul,
+table,
+blockquote,
+code,
+p,
+h1,
+h2,
+h3,
+h4,
+h5 {
+  page-break-inside: avoid;
+}
+/* Increase vertical padding for math elements with display=block */
+math[display="block"] {
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+math {
+  text-rendering: optimizeLegibility;
+  font-family: "Latin Modern Math", "Cambria Math", serif;
+}

{markdown_convert-1.2.17 → markdown_convert-1.2.18}/markdown_convert/modules/constants.py RENAMED Viewed

@@ -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-1.2.17 → markdown_convert-1.2.18}/markdown_convert/modules/convert.py RENAMED Viewed

@@ -4,6 +4,7 @@ Author: @julynx
 """
 import os
+import re
 import time
 from datetime import datetime
 from pathlib import Path
@@ -11,12 +12,12 @@ 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):
     """
     Generate a PDF from HTML content using Playwright.
     """
@@ -24,6 +25,8 @@ def _generate_pdf_with_playwright(html_content, output_path):
         browser = p.chromium.launch(headless=True)
         page = browser.new_page()
         page.set_content(html_content)
+        if css_content:
+            page.add_style_tag(content=css_content)
         # Wait for any potential resources to load
         page.wait_for_load_state("networkidle")
@@ -48,23 +51,37 @@ def _generate_pdf_with_playwright(html_content, output_path):
         return pdf_bytes
-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 +117,17 @@ def convert(
     try:
         html = markdown2.markdown_path(md_path, extras=MD_EXTENSIONS)
-        html = _embed_css_in_html(html, css_sources)
+        html = _create_sections(html)
         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)
+        _generate_pdf_with_playwright(
+            html,
+            output_path,
+            css_content=_get_css_content(css_sources),
+        )
     except Exception as exc:
         raise RuntimeError(exc) from exc
@@ -129,7 +150,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 +184,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 +201,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 +261,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 → markdown_convert-1.2.18}/pyproject.toml RENAMED Viewed

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

markdown_convert-1.2.17/markdown_convert/default.css DELETED Viewed

@@ -1,379 +0,0 @@
-/* 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;
-  --left-margin: 1.5em;
-  /* -- Small margins */
-  --left-margin-small: 1em;
-  /* -- Big margins */
-  --left-margin-big: 2em;
-  --bottom-margin-big: 0.5em;
-}
-/* Document */
-html {
-  font-size: 10px;
-}
-body {
-  margin: 0;
-  padding: 0;
-  font-family: "Cantarell Web", "Cantarell", sans-serif;
-  color: #333;
-}
-/* Headers and paragraphs */
-h1,
-h2,
-h3,
-h4,
-h5 {
-  color: #333;
-  font-weight: 400;
-}
-h1 {
-  margin-top: 0;
-  margin-bottom: var(--bottom-margin-big);
-}
-h2,
-h3,
-h4,
-h5,
-p {
-  margin-top: var(--top-margin);
-  margin-bottom: 0;
-}
-h1 {
-  font-size: 4.8rem;
-}
-h2 {
-  font-size: 3.6rem;
-}
-h3 {
-  font-size: 2.4rem;
-}
-h4 {
-  font-size: 1.8rem;
-}
-h5 {
-  font-size: 1.4rem;
-}
-p {
-  font-size: 1.2rem;
-}
-/* Links */
-a {
-  color: #09f;
-  margin: 0;
-  vertical-align: baseline;
-}
-/* Lists */
-ul,
-ol {
-  font-size: 1.2rem;
-  padding: 0;
-  margin-top: var(--top-margin);
-  margin-right: 0;
-  margin-bottom: var(--bottom-margin);
-  margin-left: var(--left-margin-big);
-}
-ul ol,
-ol ul,
-ol ol,
-ul ul {
-  margin-top: 0;
-}
-li {
-  margin-top: 0.5rem;
-}
-/* Code blocks */
-pre {
-  padding: 0;
-  white-space: pre-wrap;
-}
-code {
-  font-family: "JetBrains Mono", "Courier New", Courier, monospace;
-  font-size: 1rem;
-  background-color: #eee;
-  padding-left: 0.4em;
-  padding-right: 0.4em;
-  display: inline-block;
-  border-radius: 0.3em;
-  line-height: 1.5;
-}
-h1 code,
-h2 code,
-h3 code,
-h4 code,
-h5 code {
-  font-size: 0.8em;
-}
-/* Quotes */
-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 {
-  margin-left: var(--left-margin-small);
-}
-/* Figures */
-img {
-  display: block;
-  margin: 2em auto 1em auto;
-  max-width: 80%;
-}
-/* -- Figure footer */
-p>img+em {
-  text-align: center;
-  font-size: 1rem;
-  font-style: italic;
-  color: #666;
-  display: block;
-  margin: 1em auto 2em;
-}
-/* Tables */
-table {
-  font-size: 1rem;
-  border-collapse: collapse;
-  margin-top: var(--top-margin);
-  text-align: left;
-  table-layout: auto;
-}
-thead {
-  background-color: #eee;
-}
-tbody {
-  color: #666;
-}
-th,
-td {
-  padding: 0.5em 0.75em;
-  border: 1px solid #ccc;
-  white-space: nowrap;
-}
-col {
-  width: auto;
-}
-/* Page breaks */
-.pagebreak {
-  clear: both;
-  page-break-after: always;
-}
-.pagebreak+* {
-  margin-top: 0;
-}
-li,
-table,
-blockquote,
-code,
-p,
-h1,
-h2,
-h3,
-h4,
-h5 {
-  page-break-inside: avoid;
-}
-/* Increase vertical padding for math elements with display=block */
-math[display="block"] {
-  margin-top: 1em;
-  margin-bottom: 1em;
-}