Merge branch 'main' into main

jupyter · Jan 30, 2025 · eda0794 · eda0794
2 parents cf5b6e8 + 2ba5858
commit eda0794
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,29 @@
 
 <!-- <START NEW CHANGELOG ENTRY> -->
 
+## 7.16.6
+
+([Full Changelog](https://github.com/jupyter/nbconvert/compare/v7.16.5...01c6ab25ec81277ab4d8585747f904c89a8c02b0))
+
+### Bugs fixed
+
+- Prevent leading whitespace in markdown code blocks from being stripped [#2203](https://github.com/jupyter/nbconvert/pull/2203) ([@peytondmurray](https://github.com/peytondmurray))
+- Fix bullet list parsing in markdown [#2177](https://github.com/jupyter/nbconvert/pull/2177) ([@douglas-raillard-arm](https://github.com/douglas-raillard-arm))
+- Fix crash when running with optimization [#2160](https://github.com/jupyter/nbconvert/pull/2160) ([@QuLogic](https://github.com/QuLogic))
+
+### Maintenance and upkeep improvements
+
+- remove any twitter mention [#2206](https://github.com/jupyter/nbconvert/pull/2206) ([@Carreau](https://github.com/Carreau))
+- Update base.tex.j2 for macro compatibility with newer versions of Pandoc [#2196](https://github.com/jupyter/nbconvert/pull/2196) ([@PetalAdrift](https://github.com/PetalAdrift))
+
+### Contributors to this release
+
+([GitHub contributors page for this release](https://github.com/jupyter/nbconvert/graphs/contributors?from=2025-01-02&to=2025-01-28&type=c))
+
+[@Carreau](https://github.com/search?q=repo%3Ajupyter%2Fnbconvert+involves%3ACarreau+updated%3A2025-01-02..2025-01-28&type=Issues) | [@douglas-raillard-arm](https://github.com/search?q=repo%3Ajupyter%2Fnbconvert+involves%3Adouglas-raillard-arm+updated%3A2025-01-02..2025-01-28&type=Issues) | [@gabemorris12](https://github.com/search?q=repo%3Ajupyter%2Fnbconvert+involves%3Agabemorris12+updated%3A2025-01-02..2025-01-28&type=Issues) | [@krassowski](https://github.com/search?q=repo%3Ajupyter%2Fnbconvert+involves%3Akrassowski+updated%3A2025-01-02..2025-01-28&type=Issues) | [@PetalAdrift](https://github.com/search?q=repo%3Ajupyter%2Fnbconvert+involves%3APetalAdrift+updated%3A2025-01-02..2025-01-28&type=Issues) | [@peytondmurray](https://github.com/search?q=repo%3Ajupyter%2Fnbconvert+involves%3Apeytondmurray+updated%3A2025-01-02..2025-01-28&type=Issues) | [@QuLogic](https://github.com/search?q=repo%3Ajupyter%2Fnbconvert+involves%3AQuLogic+updated%3A2025-01-02..2025-01-28&type=Issues)
+
+<!-- <END NEW CHANGELOG ENTRY> -->
+
 ## 7.16.5
 
 ([Full Changelog](https://github.com/jupyter/nbconvert/compare/v7.16.4...18e10f6484afdfee39105248c28abe5ef0835b22))
@@ -29,8 +52,6 @@
 
 [@bollwyvl](https://github.com/search?q=repo%3Ajupyter%2Fnbconvert+involves%3Abollwyvl+updated%3A2024-04-29..2025-01-02&type=Issues) | [@fcollonval](https://github.com/search?q=repo%3Ajupyter%2Fnbconvert+involves%3Afcollonval+updated%3A2024-04-29..2025-01-02&type=Issues) | [@krassowski](https://github.com/search?q=repo%3Ajupyter%2Fnbconvert+involves%3Akrassowski+updated%3A2024-04-29..2025-01-02&type=Issues) | [@pre-commit-ci](https://github.com/search?q=repo%3Ajupyter%2Fnbconvert+involves%3Apre-commit-ci+updated%3A2024-04-29..2025-01-02&type=Issues) | [@stuaxo](https://github.com/search?q=repo%3Ajupyter%2Fnbconvert+involves%3Astuaxo+updated%3A2024-04-29..2025-01-02&type=Issues) | [@t-makaro](https://github.com/search?q=repo%3Ajupyter%2Fnbconvert+involves%3At-makaro+updated%3A2024-04-29..2025-01-02&type=Issues) | [@takluyver](https://github.com/search?q=repo%3Ajupyter%2Fnbconvert+involves%3Atakluyver+updated%3A2024-04-29..2025-01-02&type=Issues) | [@thomasjm](https://github.com/search?q=repo%3Ajupyter%2Fnbconvert+involves%3Athomasjm+updated%3A2024-04-29..2025-01-02&type=Issues) | [@timkpaine](https://github.com/search?q=repo%3Ajupyter%2Fnbconvert+involves%3Atimkpaine+updated%3A2024-04-29..2025-01-02&type=Issues) | [@xiacunshun](https://github.com/search?q=repo%3Ajupyter%2Fnbconvert+involves%3Axiacunshun+updated%3A2024-04-29..2025-01-02&type=Issues)
 
-<!-- <END NEW CHANGELOG ENTRY> -->
-
 ## 7.16.4
 
 ([Full Changelog](https://github.com/jupyter/nbconvert/compare/v7.16.3...71fde294f623083f364bf68e14f07459dee952e6))
@@ -1613,7 +1634,6 @@ raw template
 {%- endblock in_prompt -%}
     """
 
-
 exporter_attr = AttrExporter()
 output_attr, _ = exporter_attr.from_notebook_node(nb)
 assert "raw template" in output_attr

diff --git a/nbconvert/_version.py b/nbconvert/_version.py
@@ -4,7 +4,7 @@
 from typing import List
 
 # Version string must appear intact for versioning
-__version__ = "7.16.5"
+__version__ = "7.16.6"
 
 # Build up version_info tuple for backwards compatibility
 pattern = r"(?P<major>\d+).(?P<minor>\d+).(?P<patch>\d+)(?P<rest>.*)"

diff --git a/nbconvert/filters/markdown.py b/nbconvert/filters/markdown.py
@@ -36,7 +36,10 @@ def markdown2html_mistune(source: str) -> str:
 ]
 
 
-def markdown2latex(source, markup="markdown", extra_args=None):
+_MARKDOWN_FMT = "markdown+lists_without_preceding_blankline"
+
+
+def markdown2latex(source, markup=_MARKDOWN_FMT, extra_args=None):
     """
     Convert a markdown string to LaTeX via pandoc.
 
@@ -65,7 +68,7 @@ def markdown2html_pandoc(source, extra_args=None):
     Convert a markdown string to HTML via pandoc.
     """
     extra_args = extra_args or ["--mathjax"]
-    return convert_pandoc(source, "markdown", "html", extra_args=extra_args)
+    return convert_pandoc(source, _MARKDOWN_FMT, "html", extra_args=extra_args)
 
 
 def markdown2asciidoc(source, extra_args=None):
@@ -80,7 +83,7 @@ def markdown2asciidoc(source, extra_args=None):
         atx_args = ["--markdown-headings=atx"]
 
     extra_args = extra_args or atx_args
-    asciidoc = convert_pandoc(source, "markdown", "asciidoc", extra_args=extra_args)
+    asciidoc = convert_pandoc(source, _MARKDOWN_FMT, "asciidoc", extra_args=extra_args)
     # workaround for https://github.com/jgm/pandoc/issues/3068
     if "__" in asciidoc:
         asciidoc = re.sub(r"\b__([\w \n-]+)__([:,.\n\)])", r"_\1_\2", asciidoc)
@@ -111,4 +114,4 @@ def markdown2rst(source, extra_args=None):
     out : string
         Output as returned by pandoc.
     """
-    return convert_pandoc(source, "markdown", "rst", extra_args=extra_args)
+    return convert_pandoc(source, _MARKDOWN_FMT, "rst", extra_args=extra_args)