Skip to content

Allow HTML declarations with lowercase letters and without whitespace #469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wleeaf wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −7
Open

Allow HTML declarations with lowercase letters and without whitespace #469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion commonmark/src/main/java/org/commonmark/internal/HtmlBlockParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class HtmlBlockParser extends AbstractBlockParser {
},
{Pattern.compile("^<!--"), Pattern.compile("-->")},
{Pattern.compile("^<[?]"), Pattern.compile("\\?>")},
{Pattern.compile("^<![A-Z]"), Pattern.compile(">")},
{Pattern.compile("^<![A-Za-z]"), Pattern.compile(">")},
{Pattern.compile("^<!\\[CDATA\\["), Pattern.compile("\\]\\]>")},
{
Pattern.compile(
Expand Down
3 changes: 0 additions & 3 deletions commonmark/src/main/java/org/commonmark/internal/inline/HtmlInlineParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,6 @@ private boolean tryDeclaration(Scanner scanner) {
return false;
}
scanner.match(asciiLetter);
if (scanner.whitespace() <= 0) {
return false;
}
if (scanner.find('>') >= 0) {
scanner.next();
return true;
Expand Down
6 changes: 3 additions & 3 deletions commonmark/src/test/java/org/commonmark/test/HtmlInlineParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public void afterFailedAttempt() {
assertRendering("inline <?? <?php ?>", "<p>inline &lt;?? <?php ?></p>\n");
assertRendering(
"inline <![x]]> <![CDATA[a]]>", "<p>inline &lt;![x]]&gt; <![CDATA[a]]></p>\n");
assertRendering("inline <!foo> <!bar baz>", "<p>inline &lt;!foo&gt; <!bar baz></p>\n");
assertRendering("inline <!1> <!bar baz>", "<p>inline &lt;!1&gt; <!bar baz></p>\n");
}

@Test
Expand All @@ -45,12 +45,12 @@ public void unterminatedConstructDoesNotAffectLaterParagraph() {

@Test
public void declaration() {
// Whitespace is mandatory
assertRendering("inline <!FOO>", "<p>inline &lt;!FOO&gt;</p>\n");
assertRendering("inline <!FOO>", "<p>inline <!FOO></p>\n");
assertRendering("inline <!FOO >", "<p>inline <!FOO ></p>\n");
assertRendering("inline <!FOO 'bar'>", "<p>inline <!FOO 'bar'></p>\n");

// Lowercase
assertRendering("inline <!foo bar>", "<p>inline <!foo bar></p>\n");
assertRendering("inline <!foo>", "<p>inline <!foo></p>\n");
}
}
6 changes: 6 additions & 0 deletions commonmark/src/test/java/org/commonmark/test/SpecialInputTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@ public void surrogatePairInLinkDestination() {
assertRendering("[title](\uD834\uDD1E)", "<p><a href=\"\uD834\uDD1E\">title</a></p>\n");
}

@Test
public void htmlBlockDeclarationWithLowercaseLetter() {
assertRendering("<!doctype html>", "<!doctype html>\n");
assertRendering("<!x\nfoo>\nbar", "<!x\nfoo>\n<p>bar</p>\n");
}

@Test
public void indentedCodeBlockWithMixedTabsAndSpaces() {
assertRendering(" foo\n\tbar", "<pre><code>foo\nbar\n</code></pre>\n");
Expand Down