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

CommonMark code block class names #1265

Merged
merged 1 commit into from
May 11, 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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/USING_ADVANCED.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ console.log(myMarked('I am using __markdown__.'));
|headerIds |`boolean` |`true` |v0.4.0 |If true, include an `id` attribute when emitting headings (h1, h2, h3, etc).|
|headerPrefix|`string` |`''` |??? |A string to prefix the `id` attribute when emitting headings (h1, h2, h3, etc).|
|highlight |`function`|`null` |??? |A function to highlight code blocks, see <a href="#highlight">Asynchronous highlighting</a>.|
|langPrefix |`string` |`'lang-'`|??? |A string to prefix the className in a `<code>` block. Useful for syntax highlighting.|
|langPrefix |`string` |`'language-'`|??? |A string to prefix the className in a `<code>` block. Useful for syntax highlighting.|
|mangle |`boolean` |`true` |??? |??? |
|pedantic |`boolean` |`false` |??? |If true, conform to the original `markdown.pl` as much as possible. Don't fix original markdown bugs or behavior. Turns off and overrides `gfm`.|
|renderer |`object` |`new Renderer()`|???|An object containing functions to render tokens to HTML. See [extensibility](USING_PRO.md) for more details.|
Expand Down
2 changes: 1 addition & 1 deletion lib/marked.js
Original file line number Diff line number Diff line change
Expand Up @@ -1470,7 +1470,7 @@ marked.getDefaults = function () {
headerIds: true,
headerPrefix: '',
highlight: null,
langPrefix: 'lang-',
langPrefix: 'language-',
mangle: true,
pedantic: false,
renderer: new Renderer(),
Expand Down
14 changes: 7 additions & 7 deletions test/new/gfm_code.html
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<pre><code class="lang-js">var a = &#39;hello&#39;;
<pre><code class="language-js">var a = &#39;hello&#39;;
console.log(a + &#39; world&#39;);</code></pre>
<pre><code class="lang-bash">echo &quot;hello, ${WORLD}&quot;</code></pre>
<pre><code class="lang-longfence">Q: What do you call a tall person who sells stolen goods?</code></pre>
<pre><code class="lang-ManyTildes">A longfence!</code></pre>
<pre><code class="language-bash">echo &quot;hello, ${WORLD}&quot;</code></pre>
<pre><code class="language-longfence">Q: What do you call a tall person who sells stolen goods?</code></pre>
<pre><code class="language-ManyTildes">A longfence!</code></pre>
<p>How about an empty code block?</p>
<pre><code class="lang-js"></code></pre>
<pre><code class="language-js"></code></pre>
<p>How about a code block with only an empty line?</p>
<pre><code class="lang-js">
<pre><code class="language-js">
</code></pre>

<p>With some trailing empty lines:</p>
<pre><code>ciao


</code></pre>
</code></pre>
6 changes: 3 additions & 3 deletions test/new/gfm_code_hr_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@ <h2 id="foo">foo</h2>
<li><p>foo:</p>
<ol>
<li><p>foo <code>bar</code> bar:</p>
<pre><code class="lang-erb"> some code here
<pre><code class="language-erb"> some code here
</code></pre>
</li>
<li><p>foo <code>bar</code> bar:</p>
<pre><code class="lang-erb"> foo
<pre><code class="language-erb"> foo
---
bar
---
foo
bar</code></pre>
</li>
<li><p>foo <code>bar</code> bar:</p>
<pre><code class="lang-html"> ---
<pre><code class="language-html"> ---
foo
foo
---
Expand Down
2 changes: 1 addition & 1 deletion test/specs/commonmark/commonmark-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ describe('CommonMark 0.28 Fenced code blocks', function() {
var section = 'Fenced code blocks';

// var shouldPassButFails = [];
var shouldPassButFails = [93, 95, 96, 97, 101, 102, 106, 108, 111, 112, 113];
var shouldPassButFails = [93, 95, 96, 97, 101, 102, 106, 108, 112];

var willNotBeAttemptedByCoreTeam = [];

Expand Down