Merge tag/2.4.13 from upstream

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,27 @@
+---
+name: Bug report
+about: Report a parsing error, unexpected output and other bugs
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Attach a minimal markdown snippet that causes the bug to occur. This should be placed inside a fenced code block to escape GitHub's formatting.
+
+If your snippet contains fenced code blocks then you can escape them by adding more backticks to the enclosing block. See the [this GitHub article](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/creating-and-highlighting-code-blocks#fenced-code-blocks) for an example.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Debug info**
+Version of library being used:
+
+Any extras being used:
+
+**Additional context**
+Add any other context about the problem here.

.github/workflows/python.yaml

@@ -6,10 +6,14 @@ on:
     branches: [ master ]
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [pypy3, 3.5, 3.6, 3.7, 3.8, 3.9]
+        python-version: ["3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
+        os:
+          - ubuntu-20.04
+          - macos-latest
+          - windows-latest
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}
@@ -19,7 +23,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install Pygments>=2.5.2
+          pip install .[all]
       - name: Test
         run: |
           make testone

CHANGES.md

@@ -1,8 +1,125 @@
 # python-markdown2 Changelog
 
-## python-markdown2 2.4.2 (not yet released)
+## python-markdown2 2.4.13
+
+- [pull #559] Allow cuddled tables (#557)
+- [pull #560] Fix `markdown-in-html` not always splitting HTML tags into separate lines (#558)
+- [pull #564] Fix incomplete comments in safe mode not being escaped (#563)
+- [pull #566] Fix crash in `markdown-in-html` extra (#565)
+
+
+## python-markdown2 2.4.12
+
+- [pull #547] Update `markdown-in-html` extra to handle markdown on same line as HTML (#546)
+- [pull #550] Fix tables with trailing whitespace not being recognized (#549)
+- [pull #545] Fix multiple instances of strong emphasis (`**`) in one line (#541)
+- [pull #556] Fix incorrect parsing of links after square brackets (#552)
+
+## python-markdown2 2.4.11
+
+- [pull #524] Fix angles being escaped in style blocks (issue #523)
+- [pull #527] Fix base64 images being corrupted in safe mode (issue #526)
+- [pull #529] Add `breaks` extra with ability to hard break on backslashes (issue #525)
+- [pull #532] Fix #493 persisting when `code-friendly` extra enabled
+- [pull #535] Update `_slugify` to use utf-8 encoding (issue #534)
+- [pull #536] Maintain order of appearance in footnotes
+- [pull #538] Include HTML headers in TOC
+- [pull #540] Add mechanism to prevent header ID counter resetting (issue #530)
+
+## python-markdown2 2.4.10
+
+- [pull #520] Allow more relative links in safe mode (issue #517)
+- [pull #521] Always restore hashed HTML blocks (issue #185)
+- [pull #522] Add `middle-word-em` extra
+
+
+## python-markdown2 2.4.9
+
+- [pull #500] Add `<thead>` tag to html-classes extra
+- [pull #501] Fix link patterns extra matching against internal hashes
+- [pull #502] Replace deprecated `optparse` with `argparse`
+- [pull #506] Fix `_uniform_outdent` failing with empty strings (issue #505)
+- [pull #509] Fix HTML elements not unhashing correctly (issue 508)
+- [pull #511] Remove deprecated `imp` module (issue #510)
+- [pull #512] Allow link patterns to be passed via extras dict
+- [pull #513] Fix relative links not working in safe mode (issue #254)
+
+
+## python-markdown2 2.4.8
+
+- [pull #499] Fix images not being procesed correctly (#498)
+
+
+## python-markdown2 2.4.7
+
+- [pull #483] Fix hashing nested HTML blocks
+- [pull #486] Fix backslash being unable to escape raw HTML tags
+- [pull #482] Add support for telegram spoiler in extras
+- [pull #485] mermaid support
+- [pull #487] Fix escaping ampersands in hrefs
+- [pull #490] Fix indented codeblocks inside fences (#489)
+- [pull #490] Remove `code-color` extra
+
+
+## python-markdown2 2.4.6
+
+- [pull #477] Feature wavedrom support
+- [pull #480] Fix mixing ordered and un-ordered lists combining into single list type
+
+
+## python-markdown2 2.4.5
+
+- [pull #466] Add optional dependencies to `setup.py`
+
+
+## python-markdown2 2.4.4
+
+- [pull #439] Fix TypeError if html-classes extra is None
+- [pull #441] Remove Python2 support
+- [pull #445] Replace `<strike>` with `<s>` in strike extra
+- [pull #446] Fix link patterns extra applying within links
+- [pull #443] create proper entry point
+- [pull #449] Codespans inside link text issue344
+- [pull #451] Underline and HTML comments
+- [pull #453] Links with brackets
+- [pull #454] Fix emacs local variable one-liners
+- [pull #457] Example of the current mixed-paragraph mode behavior in lists
+- [pull #455] Fix code block indentation in lists
+- [pull #434] Fix filter bypass leading to XSS (#362)
+- [pull #464] Fix html-classes extra not applying to code spans
+- [pull #462] Fix pygments block matching
+- [pull #462] Fix pyshell blocks in blockquotes
+- [pull #463] Fix multilevel lists
+- [pull #468] Remove `_uniform_outdent_limit` function
+- [pull #470] Add support for ordered lists that don't start at 1. (#469)
+- [pull #472] Fix `AssertionError` with lazy numbered lists (issue #471)
+- [pull #475] Add `<ul>` and `<ol>` tags to html-classes extra (#352)
+- [pull #473] XSS test and fix
+
+
+## python-markdown2 2.4.3
+
+- [pull #413] Fix meta indentation
+- [pull #414] Fix code surrounded by blank lines inside blockquote fenced code blocks
+- [pull #417] Fix inline code pipe symbol within tables (issue #399)
+- [pull #418] Fix code block parsing error (issue #327)
+- [pull #419] Fix hr block created when not supposed to (issue #400)
+- [pull #421] Fix backslashes removed by adjacent code blocks (issues #369 and #412)
+- [pull #420] Fix md5-* in resulting HTML when several code blocks follow one by one (issue #355)
+- [pull #422] Fix excessive `<br>` tags in lists using break-on-newline extra (issue #394)
+- [pull #424] Standardize key and value definitions for metadata extra (issue #423)
+- [pull #427] Fix fenced code blocks breaking lists (issue #426)
+- [pull #429] Fix catastrophic backtracking (Regex DoS) in pyshell blocks.
+- [pull #431] Fix incorrect indentation of fenced code blocks within lists
+- [pull #436] RST admonitions
+- [pull #430] Improve error message if link_patterns forgotten
+- [pull #437] fix compatibility with pygments 2.12
+
+
+## python-markdown2 2.4.2
 
 - [pull #408] Fix for fenced code blocks issue #396
+- [pull #410] Be more strict on auto linking urls, RE DOS fix
 
 
 ## python-markdown2 2.4.1

CONTRIBUTORS.txt

@@ -50,3 +50,12 @@ André Nasturas (github.com/andrenasturas)
 Denis Kasak (github.com/dkasak)
 Maximilian Hils (github.com/mhils)
 BarkeH (github.com/BarkeH)
+cav71 (github.com/cav71)
+Crozzers (github.com/Crozzers)
+Bastian Venthur (https://github.com/venthur), removed Python2 support
+gitbra (github.com/gitbra)
+Łukasz Langa (github.com/ambv)
+Max Omdal (github.com/momja)
+Kishore (github.com/jk6521)
+Ircama (github.com/Ircama)
+Ankit Mahato (github.com/animator)

README.md

@@ -13,7 +13,7 @@ was written to closely match the behaviour of the original Perl-implemented
 Markdown.pl. Markdown2 also comes with a number of extensions (called
 "extras") for things like syntax coloring, tables, header-ids. See the
 "Extra Syntax" section below. "markdown2" supports all Python versions
-2.6+ or 3.3+ (and pypy and jython, though I don't frequently test those).
+3.5+ (and pypy and jython, though I don't frequently test those).
 
 There is another [Python
 markdown.py](https://python-markdown.github.io/). However, at
@@ -33,6 +33,7 @@ for updates to python-markdown2.
 To install it in your Python installation run *one* of the following:
 
     pip install markdown2
+    pip install markdown2[all]  # to install all optional dependencies (eg: Pygments for code syntax highlighting)
     pypm install markdown2      # if you use ActivePython (activestate.com/activepython)
     easy_install markdown2      # if this is the best you have
     python setup.py install
@@ -48,14 +49,14 @@ As a module:
 ```python
 >>> import markdown2
 >>> markdown2.markdown("*boo!*")  # or use `html = markdown_path(PATH)`
-u'<p><em>boo!</em></p>\n'
+'<p><em>boo!</em></p>\n'
 
 >>> from markdown2 import Markdown
 >>> markdowner = Markdown()
 >>> markdowner.convert("*boo!*")
-u'<p><em>boo!</em></p>\n'
+'<p><em>boo!</em></p>\n'
 >>> markdowner.convert("**boom!**")
-u'<p><strong>boom!</strong></p>\n'
+'<p><strong>boom!</strong></p>\n'
 ```
 As a script (CLI):
 ```shell
@@ -88,7 +89,7 @@ as a script:
 ```shell
 >>> import markdown2
 >>> markdown2.markdown("*boo!*", extras=["footnotes"])
-u'<p><em>boo!</em></p>\n'
+'<p><em>boo!</em></p>\n'
 ```
 There are a number of currently implemented extras for tables, footnotes,
 syntax coloring of `<pre>`-blocks, auto-linking patterns, table of contents,

TODO.txt

@@ -1,4 +1,3 @@
-- py3: py2.4 test (broken?)
 - add "smarty-pants" extra to wiki
 - add "html-classes" extra to wiki
 - more on the "code-color" extra wiki page