markdown_convert 1.2.52__tar.gz → 1.2.53__tar.gz

{markdown_convert-1.2.52 → markdown_convert-1.2.53}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: markdown_convert
-Version: 1.2.52
+Version: 1.2.53
 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.52 → markdown_convert-1.2.53}/markdown_convert/default.css

@@ -517,7 +517,8 @@ math {
 }
 
 /* Vega-Lite charts*/
-.vega-lite {
+div.vega-lite,
+div.vega {
   display: flex;
   justify-content: center;
   align-items: center;

{markdown_convert-1.2.52 → markdown_convert-1.2.53}/markdown_convert/modules/convert.py

@@ -9,7 +9,6 @@ import time
 from datetime import datetime
 from pathlib import Path
 
-import markdown2
 from playwright.sync_api import sync_playwright
 
 from .autoinstall import ensure_chromium
@@ -19,6 +18,7 @@ from .constants import (
     MARKDOWN_EXTENSIONS,
     PDF_PARAMS,
 )
+from .overrides import markdown2
 from .resources import get_code_css_path, get_css_path, get_output_path
 from .transform import (
     create_html_document,

{markdown_convert-1.2.52 → markdown_convert-1.2.53}/markdown_convert/modules/extras.py

@@ -3,10 +3,12 @@ Extras are defined as helper functions called by
 render_extra_features from transform.py
 """
 
+import json
+import re
+
 import vl_convert as vlc
+from bs4 import BeautifulSoup, Tag
 from ruamel.yaml import YAML
-from bs4 import Tag, BeautifulSoup
-import re
 
 
 class ExtraFeature:
@@ -162,28 +164,51 @@ class TocExtra(ExtraFeature):
 
 class VegaExtra(ExtraFeature):
     """
-    Extra feature for rendering Vega-Lite diagrams from YAML.
+    Extra feature for rendering Vega-Lite diagrams from JSON or YAML.
     """
 
-    pattern = r"(?s)<pre><code>\$schema: https://vega\.github\.io(?P<content>.*?)</code></pre>"
+    pattern = (
+        r"<pre[^>]*>"
+        r"<code[^>]*class=[\"'][^\"]*language-vega[^\"]*[\"'][^>]*>"
+        r"(?P<content>.*?)"
+        r"</code>"
+        r"</pre>"
+    )
     run_before_stash = True
 
     def replace(match, html):
         """
-        Render a tag for a vega lite diagram YAML.
+        Render a tag for a vega lite diagram from JSON or YAML.
 
         Args:
-            match (re.Match): Element identified as a vega lite diagram YAML.
+            match (re.Match): Element identified as a vega lite diagram.
             html (str): The full HTML content.
 
         Returns:
             str: SVG tag representing the vega lite diagram.
         """
-        schema_line = "$schema: https://vega.github.io"
-        yaml = YAML()
-        spec = yaml.load(schema_line + match.group("content"))
-        tag = vlc.vegalite_to_svg(spec)
-        return f"<div class='vega-lite'>{tag}</div>"
+        content = match.group("content")
+        spec = None
+
+        try:
+            spec = json.loads(content)
+        except (json.JSONDecodeError, TypeError):
+            try:
+                yaml = YAML(typ="safe")
+                spec = yaml.load(content)
+            except Exception as exc:
+                print(f"WARNING: Failed to parse Vega-Lite spec: {exc}")
+                return match.group(0)
+
+        if spec is None:
+            return match.group(0)
+
+        try:
+            tag = vlc.vegalite_to_svg(spec)
+            return f"<div class='vega-lite'>{tag}</div>"
+        except Exception as exc:
+            print(f"WARNING: Failed to convert Vega-Lite spec to SVG: {exc}")
+            return match.group(0)
 
 
 def apply_extras(extras: set[ExtraFeature], html, before_stash=False):

markdown_convert-1.2.53/markdown_convert/modules/overrides.py

@@ -0,0 +1,36 @@
+"""
+Overrides for markdown2.
+"""
+
+import markdown2
+
+
+def tags(self, lexer_name: str) -> tuple[str, str]:
+    """
+    Overrides markdown2.FencedCodeBlocks.tags
+
+    Provides support for the fenced code blocks language attribute without
+    the need to have the highlightjs-lang extension enabled.
+    """
+    pre_class = self.md._html_class_str_from_tag("pre")
+    if lexer_name:
+        code_class = f' class="{lexer_name} language-{lexer_name}"'
+    else:
+        code_class = self.md._html_class_str_from_tag("code")
+    return (f"<pre{pre_class}><code{code_class}>", "</code></pre>")
+
+
+def _convert_double_match(self, match):
+    """
+    Overrides markdown2.Latex._convert_double_match
+
+    Fixes bug #674 of latex macros that start with backslash n not being
+    properly rendered.
+    """
+    return self.converter.convert(match.group(1).replace("\n", " "), display="block")
+
+
+# Apply overrides on module import and expose markdown2
+markdown2.FencedCodeBlocks.tags = tags
+markdown2.Latex._convert_double_match = _convert_double_match
+__all__ = ["markdown2"]

{markdown_convert-1.2.52 → markdown_convert-1.2.53}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "markdown_convert"
-version = "1.2.52"
+version = "1.2.53"
 description = "Convert Markdown files to PDF from your command line."
 authors = [
     { name = "Julio Cabria", email = "juliocabria@tutanota.com" },
@@ -50,6 +50,7 @@ include = [
     "markdown_convert/modules/utils.py",
     "markdown_convert/modules/validate.py",
     "markdown_convert/modules/autoinstall.py",
+    "markdown_convert/modules/overrides.py",
 ]
 
 [tool.hatch.build.targets.wheel]
@@ -68,6 +69,7 @@ include = [
     "markdown_convert/modules/utils.py",
     "markdown_convert/modules/validate.py",
     "markdown_convert/modules/autoinstall.py",
+    "markdown_convert/modules/overrides.py",
 ]
 
 [dependency-groups]