diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e957eb0fa..2afe04061 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -130,3 +130,18 @@ jobs: - name: Publish Docker image if: github.ref == 'refs/heads/main' run: docker push witiko/markdown --all-tags + automerge: + name: Automatically merge pull request + needs: + - test-and-publish + runs-on: ubuntu-latest + if: github.event_name == 'pull_request' + steps: + - name: Automatically merge pull request + uses: plm9606/automerge_actions@1.2.3 + with: + label-name: automerge + reviewers-number: 0 + merge-method: merge + auto-delete: true + github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/markdown.dtx b/markdown.dtx index c92ac6d94..ac4449a60 100644 --- a/markdown.dtx +++ b/markdown.dtx @@ -6456,7 +6456,7 @@ defaultOptions.shiftHeadings = 0 % \fi % \begin{markdown} % -% \Valitem[\textasciicircum{} \$]{slice}{the beginning and the end of a slice} +% \Valitem[\textasciicircum{} \\$]{slice}{the beginning and the end of a slice} % : Two space-separated selectors that specify the slice of a document that will be processed, whereas the remainder of the document will be ignored. @@ -19482,7 +19482,7 @@ parsers.fourspaces = P(" ") parsers.any = P(1) parsers.fail = parsers.any - 1 -parsers.escapable = S("\\`*_{}[]()+_.!<>#-~:^@;") +parsers.escapable = S("!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~") parsers.anyescaped = parsers.backslash / "" * parsers.escapable + parsers.any @@ -19739,9 +19739,10 @@ parsers.leader = parsers.space^-3 -- content in balanced brackets, parentheses, or quotes: parsers.bracketed = P{ parsers.lbracket - * ((parsers.anyescaped - (parsers.lbracket - + parsers.rbracket - + parsers.blankline^2) + * (( parsers.backslash / "" * parsers.rbracket + + parsers.any - (parsers.lbracket + + parsers.rbracket + + parsers.blankline^2) ) + V(1))^0 * parsers.rbracket } @@ -19769,7 +19770,8 @@ parsers.tag = parsers.lbracket * Cs((parsers.alphanumeric^1 + parsers.bracketed + parsers.inticks - + (parsers.anyescaped + + ( parsers.backslash / "" * parsers.rbracket + + parsers.any - (parsers.rbracket + parsers.blankline^2)))^0) * parsers.rbracket diff --git a/tests/testfiles/CommonMark_0.26/README.md b/tests/testfiles/CommonMark_0.30/README.md similarity index 100% rename from tests/testfiles/CommonMark_0.26/README.md rename to tests/testfiles/CommonMark_0.30/README.md diff --git a/tests/testfiles/CommonMark_0.30/backslash-escapes.test b/tests/testfiles/CommonMark_0.30/backslash-escapes.test new file mode 100644 index 000000000..8615e0bd9 --- /dev/null +++ b/tests/testfiles/CommonMark_0.30/backslash-escapes.test @@ -0,0 +1,25 @@ +<<< +\!\"\#\$\%\&\'\(\)\*\+\,\-\.\/\:\;\<\=\>\?\@\[\\\]\^\_\`\{\|\}\~ + +\→\a\ \3\φ\« +>>> +documentBegin +hash +dollarSign +percentSign +ampersand +backslash +circumflex +underscore +leftBrace +pipe +rightBrace +tilde +interblockSeparator +backslash +backslash +backslash +backslash +backslash +backslash +documentEnd diff --git a/tests/testfiles/CommonMark_0.26/fenced-code.test b/tests/testfiles/CommonMark_0.30/fenced-code.test similarity index 100% rename from tests/testfiles/CommonMark_0.26/fenced-code.test rename to tests/testfiles/CommonMark_0.30/fenced-code.test diff --git a/tests/testfiles/PHP_Markdown/php-specific-bugs.test b/tests/testfiles/PHP_Markdown/php-specific-bugs.test index 95f98500b..e9adb57cf 100644 --- a/tests/testfiles/PHP_Markdown/php-specific-bugs.test +++ b/tests/testfiles/PHP_Markdown/php-specific-bugs.test @@ -29,11 +29,11 @@ codeSpan: /e codeSpan: (underscore)UnslashQuotes interblockSeparator interblockSeparator -headingOne: Header "quoted(backslash)" again (backslash)"" +headingOne: Header "quoted" again (backslash)"" interblockSeparator -headingTwo: Header "quoted(backslash)" again (backslash)"" +headingTwo: Header "quoted" again (backslash)"" interblockSeparator -headingThree: Header "quoted(backslash)" again (backslash)"" +headingThree: Header "quoted" again (backslash)"" interblockSeparator codeSpan: (underscore)Detab interblockSeparator diff --git a/tests/testfiles/lunamark-markdown/no-hybrid.test b/tests/testfiles/lunamark-markdown/no-hybrid.test index 324b9b768..38f8a9809 100644 --- a/tests/testfiles/lunamark-markdown/no-hybrid.test +++ b/tests/testfiles/lunamark-markdown/no-hybrid.test @@ -32,7 +32,6 @@ dollarSign ulItemEnd ulItem backslash -backslash percentSign ulItemEnd ulItem diff --git a/tests/testfiles/lunamark-markdown/no-tex-comments.test b/tests/testfiles/lunamark-markdown/no-tex-comments.test index acd1e6d20..4ec704bb1 100644 --- a/tests/testfiles/lunamark-markdown/no-tex-comments.test +++ b/tests/testfiles/lunamark-markdown/no-tex-comments.test @@ -12,7 +12,7 @@ documentBegin codeSpan: texComments interblockSeparator emphasis: emphasi(percentSign) this is a comment zed text -emphasis: emphasi(backslash)(percentSign) another one zed text +emphasis: emphasi(percentSign) another one zed text interblockSeparator emphasis: end of (backslash) a line documentEnd