Skip to content
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.

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

Fix typographic substitution in (pre|code|kbd|script) blocks when smartypants=true #1335

Merged
merged 3 commits into from
Sep 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 11 additions & 1 deletion lib/marked.js
Original file line number Diff line number Diff line change
Expand Up @@ -730,6 +730,12 @@ InlineLexer.prototype.output = function(src) {
} else if (this.inLink && /^<\/a>/i.test(cap[0])) {
this.inLink = false;
}
if (!this.inRawBlock && /^<(pre|code|kbd|script)(\s|>)/i.test(cap[0])) {
this.inRawBlock = true;
} else if (this.inRawBlock && /^<\/(pre|code|kbd|script)(\s|>)/i.test(cap[0])) {
this.inRawBlock = false;
}

src = src.substring(cap[0].length);
out += this.options.sanitize
? this.options.sanitizer
Expand Down Expand Up @@ -820,7 +826,11 @@ InlineLexer.prototype.output = function(src) {
// text
if (cap = this.rules.text.exec(src)) {
src = src.substring(cap[0].length);
out += this.renderer.text(escape(this.smartypants(cap[0])));
if (this.inRawBlock) {
out += this.renderer.text(cap[0]);
} else {
out += this.renderer.text(escape(this.smartypants(cap[0])));
}
continue;
}

Expand Down
11 changes: 11 additions & 0 deletions test/new/smartypants_code.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<pre>&amp;</pre>
<p><code>--foo</code>
<kbd>---foo</kbd></p>
<script>--foo</script>

<p>Ensure that text such as custom tags that happen to
begin with the same letters as the above tags don’t
match and thus benefit from Smartypants-ing.</p>

<p><script-custom>–foo</script-custom>
<code>--foo</code> &lt;codebar –foo codebar&gt;</p>
15 changes: 15 additions & 0 deletions test/new/smartypants_code.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
smartypants: true
description: SmartyPants does not modify characters within <pre>, <code>, <kbd>, or <script> tag blocks.
spec: https://daringfireball.net/projects/smartypants/
---
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just trying to be helpful by linking to the "spec" that explains why.

<pre>&amp;</pre>
<code>--foo</code>
<kbd>---foo</kbd>
<script>--foo</script>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was pleasantly surprised by the form the test suite takes: adding a specification was so easy, good work Team Marked.

😍


Ensure that text such as custom tags that happen to
begin with the same letters as the above tags don't
match and thus benefit from Smartypants-ing.
<script-custom>--foo</script-custom>
`--foo` <codebar --foo codebar>