importpython-markdown 0.1.1__tar.gz → 0.1.2__tar.gz

{importpython_markdown-0.1.1/src/importpython_markdown.egg-info → importpython_markdown-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: importpython-markdown
-Version: 0.1.1
+Version: 0.1.2
 Summary: Runnable Python examples in Markdown, via importpython.org.
 Author-email: "Nicholas H.Tollervey" <ntoll@ntoll.org>
 License: MIT

{importpython_markdown-0.1.1 → importpython_markdown-0.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "importpython-markdown"
-version = "0.1.1"
+version = "0.1.2"
 description = "Runnable Python examples in Markdown, via importpython.org."
 readme = "README.md"
 license = { text = "MIT" }

{importpython_markdown-0.1.1 → importpython_markdown-0.1.2}/src/importpython_markdown/__init__.py

@@ -14,8 +14,11 @@ time in the element's own vocabulary, so an authoring mistake is
 a loud build failure rather than a silent page.
 
 The emitted markup follows the element's contract exactly: each
-part is a bare ``<pre>``, a direct child of the element, in the
-order the author wrote it.
+part is a ``<pre>`` holding one ``<code>``, the pre a direct
+child of the element, in the order the author wrote it. The
+element reads a ``<pre><code>`` pair and a bare ``<pre>``
+identically; the inner ``<code>`` is for the surrounding theme,
+whose block styling and copy button expect it.
 """
 
 import html
@@ -374,22 +377,29 @@ class ImportPythonPreprocessor(Preprocessor):
             )
             return inner.convert("\n".join(piece["text"])) + "\n"
         text, lit = self.paint("\n".join(piece["text"]), piece)
+        # One code element inside every pre, highlighted or not:
+        # MkDocs-family themes hang block styling and the copy
+        # button on pre > code, and the element reads both shapes
+        # identically. No newline before the text - a pre swallows
+        # one after its own tag, a code does not - so textContent
+        # stays byte-identical to the bare-pre form.
+        text = f"<code>{text}\n</code>"
         if piece["part"] == "file":
             title = html.escape(piece["title"])
-            return f'<pre{lit} title="{title}">\n{text}\n</pre>\n'
+            return f'<pre{lit} title="{title}">{text}</pre>\n'
         if piece["part"] in ("config", "body"):
             role = piece["part"]
-            return f'<pre{lit} data-role="{role}">\n{text}\n</pre>\n'
-        return f"<pre{lit}>\n{text}\n</pre>\n"
+            return f'<pre{lit} data-role="{role}">{text}</pre>\n'
+        return f"<pre{lit}>{text}</pre>\n"
 
     def paint(self, code, piece):
         """
         Highlight a part's code as Pygments spans with no wrapper
-        of any kind, so the pre stays a bare direct child and its
-        textContent stays exactly the code. The class="highlight"
-        the coloured path adds is what lets a Material or
-        Zensical site's existing Pygments stylesheet colour these
-        blocks, palettes and all, with no CSS of ours.
+        of any kind - render_piece adds the one code element both
+        paths share, and the pre stays the direct child. The 
+        class="highlight" the coloured path adds is what lets a
+        Material or Zensical site's existing Pygments stylesheet
+        colour these blocks, palettes and all, with no CSS of ours.
 
         The language comes from the fence, or a file's name, with
         json and html assumed for config and body; an unknown or

{importpython_markdown-0.1.1 → importpython_markdown-0.1.2/src/importpython_markdown.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: importpython-markdown
-Version: 0.1.1
+Version: 0.1.2
 Summary: Runnable Python examples in Markdown, via importpython.org.
 Author-email: "Nicholas H.Tollervey" <ntoll@ntoll.org>
 License: MIT

{importpython_markdown-0.1.1 → importpython_markdown-0.1.2}/tests/test_extension.py

@@ -91,7 +91,7 @@ def test_close_gate_inside_inner_fence_is_content():
         "```\nprint('hi')\n```\n!#\n"
     )
     assert out.count("<import-python") == 1
-    assert ">\n!#\n</pre>" in out
+    assert "<code>!#\n</code></pre>" in out
 
 
 def test_attributes_pass_through_escaped():
@@ -213,18 +213,28 @@ def test_script_injection_can_be_turned_off():
     assert "embed.js" not in out
 
 
-def test_highlighting_is_spans_in_a_bare_pre():
+def test_highlighting_is_spans_in_a_pre_code_pair():
     """
-    Intent: colour arrives as Pygments spans inside the bare pre
-    direct child, marked class="highlight" so a site's existing
-    Pygments stylesheet applies - never a wrapper element, which
-    would hide the pre from the element.
+    Intent: every part is a pre holding one code element - the
+    shape MkDocs-family themes hang block styling and the copy
+    button on, and one the element reads identically to a bare
+    pre. Colour is Pygments spans inside the code, the pre
+    marked class="highlight" so a site's existing stylesheet
+    applies - never a wrapper outside the pre, which would hide
+    it from the element. With highlighting off the code element
+    remains, so theme styling never depends on Pygments.
     """
     out = render("#!mpy\n\n```python\nprint(1)\n```\n!#\n")
-    assert '<pre class="highlight">' in out
+    assert '<pre class="highlight"><code>' in out
     assert '<span class="nb">print</span>' in out
+    assert "</code></pre>" in out
     assert "<div" not in out
-    assert "<code" not in out
+    plain = render(
+        "#!mpy\n\n```python\nprint(1)\n```\n!#\n",
+        highlight=False,
+    )
+    assert "<pre><code>print(1)\n</code></pre>" in plain
+    assert "<span" not in plain
 
 
 def test_file_language_guessed_from_its_name():