Merge pull request #2439 from Textualize/new-markdown-parser

New markdown parser

Author: willmcgugan

.github/workflows/pythonpackage.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11.0"]
     defaults:
       run:
         shell: bash

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Changed
+
+- Switch Markdown parsing from commonmark to markdown-it-py https://github.com/Textualize/rich/pull/2439
+
 ## [13.1.0] - 2023-01-14
 
 ### Fixed

poetry.lock

@@ -29,9 +29,8 @@ include = ["rich/py.typed"]
 python = ">=3.7.0"
 typing-extensions = { version = ">=4.0.0, <5.0", python = "<3.9" }
 pygments = "^2.6.0"
-commonmark = "^0.9.0"
 ipywidgets = { version = "^7.5.1", optional = true }
-
+markdown-it-py = "^2.1.0"
 
 [tool.poetry.extras]
 jupyter = ["ipywidgets"]
@@ -57,7 +56,7 @@ strict = true
 enable_error_code = ["ignore-without-code", "redundant-expr", "truthy-bool"]
 
 [[tool.mypy.overrides]]
-module = ["pygments.*", "IPython.*", "commonmark.*", "ipywidgets.*"]
+module = ["pygments.*", "IPython.*", "ipywidgets.*"]
 ignore_missing_imports = true
 
 [tool.pytest.ini_options]

pyproject.toml

@@ -138,10 +138,11 @@
     "tree.line": Style(),
     "markdown.paragraph": Style(),
     "markdown.text": Style(),
-    "markdown.emph": Style(italic=True),
+    "markdown.em": Style(italic=True),
+    "markdown.emph": Style(italic=True),  # For commonmark backwards compatibility
     "markdown.strong": Style(bold=True),
-    "markdown.code": Style(bgcolor="black", color="bright_white"),
-    "markdown.code_block": Style(dim=True, color="cyan", bgcolor="black"),
+    "markdown.code": Style(bold=True, color="cyan", bgcolor="black"),
+    "markdown.code_block": Style(color="cyan", bgcolor="black"),
     "markdown.block_quote": Style(color="magenta"),
     "markdown.list": Style(color="cyan"),
     "markdown.item": Style(),
@@ -157,7 +158,8 @@
     "markdown.h6": Style(italic=True),
     "markdown.h7": Style(italic=True, dim=True),
     "markdown.link": Style(color="bright_blue"),
-    "markdown.link_url": Style(color="blue"),
+    "markdown.link_url": Style(color="blue", underline=True),
+    "markdown.s": Style(strike=True),
     "iso8601.date": Style(color="blue"),
     "iso8601.time": Style(color="magenta"),
     "iso8601.timezone": Style(color="yellow"),