mirror of
https://github.com/showdownjs/showdown.git
synced 2024-03-22 13:30:55 +08:00
Estevão Soares dos Santos
parent
1dcaa4490e
commit
aa12eabf1d
|
|
@ -327,6 +327,7 @@ showdown.Converter = function (converterOptions) {
|
|||
text = showdown.subParser('makehtml.hashCodeTags')(text, options, globals);
|
||||
text = showdown.subParser('makehtml.stripLinkDefinitions')(text, options, globals);
|
||||
text = showdown.subParser('makehtml.blockGamut')(text, options, globals);
|
||||
text = showdown.subParser('makehtml.paragraphs')(text, options, globals);
|
||||
text = showdown.subParser('makehtml.unhashHTMLSpans')(text, options, globals);
|
||||
text = showdown.subParser('makehtml.unescapeSpecialChars')(text, options, globals);
|
||||
|
||||
|
|
|
|||
|
|
@ -548,6 +548,31 @@ showdown.helper.isAbsolutePath = function (path) {
|
|||
return /(^([a-z]+:)?\/\/)|(^#)/i.test(path);
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* Polyfill method for trimStart
|
||||
* @param {string} text
|
||||
* @returns {string}
|
||||
*/
|
||||
showdown.helper.trimStart = function (text) {
|
||||
return (!String.prototype.trimStart) ?
|
||||
text.replace(/^[\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028\u2029\uFEFF]+/, '') :
|
||||
text.trimStart();
|
||||
};
|
||||
|
||||
/**
|
||||
* Polyfill method for trimEnd
|
||||
* @param {string} text
|
||||
* @returns {string}
|
||||
*/
|
||||
showdown.helper.trimEnd = function (text) {
|
||||
return (!String.prototype.trimEnd) ?
|
||||
text.replace(/[\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028\u2029\uFEFF]+$/, '') :
|
||||
text.trimEnd();
|
||||
};
|
||||
|
||||
|
||||
|
||||
showdown.helper.URLUtils = function (url, baseURL) {
|
||||
const pattern2 = /^([^:\/?#]+:)?(?:\/\/(?:([^:@\/?#]*)(?::([^:@\/?#]*))?@)?(([^:\/?#]*)(?::(\d*))?))?([^?#]*)(\?[^#]*)?(#[\s\S]*)?/;
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ showdown.subParser('makehtml.blockGamut', function (text, options, globals) {
|
|||
|
||||
// we parse blockquotes first so that we can have headings and hrs
|
||||
// inside blockquotes
|
||||
text = showdown.subParser('makehtml.blockquote')(text, options, globals);
|
||||
text = showdown.subParser('makehtml.heading')(text, options, globals);
|
||||
|
||||
// Do Horizontal Rules:
|
||||
|
|
@ -32,13 +31,13 @@ showdown.subParser('makehtml.blockGamut', function (text, options, globals) {
|
|||
text = showdown.subParser('makehtml.list')(text, options, globals);
|
||||
text = showdown.subParser('makehtml.codeBlock')(text, options, globals);
|
||||
text = showdown.subParser('makehtml.table')(text, options, globals);
|
||||
text = showdown.subParser('makehtml.blockquote')(text, options, globals);
|
||||
|
||||
// We already ran _HashHTMLBlocks() before, in Markdown(), but that
|
||||
// was to escape raw HTML in the original Markdown source. This time,
|
||||
// we're escaping the markup we've just created, so that we don't wrap
|
||||
// <p> tags around block-level tags.
|
||||
text = showdown.subParser('makehtml.hashHTMLBlocks')(text, options, globals);
|
||||
text = showdown.subParser('makehtml.paragraphs')(text, options, globals);
|
||||
|
||||
let afterEvent = new showdown.Event('makehtml.blockGamut.onEnd', text);
|
||||
afterEvent
|
||||
|
|
|
|||
|
|
@ -24,9 +24,6 @@ showdown.subParser('makehtml.blockquote', function (text, options, globals) {
|
|||
startEvent = globals.converter.dispatch(startEvent);
|
||||
text = startEvent.output;
|
||||
|
||||
// add a couple extra lines after the text and endtext mark
|
||||
text = text + '\n\n';
|
||||
|
||||
let pattern = /(^ {0,3}>[ \t]?.+\n(.+\n)*\n*)+/gm;
|
||||
|
||||
if (options.splitAdjacentBlockquotes) {
|
||||
|
|
@ -37,11 +34,8 @@ showdown.subParser('makehtml.blockquote', function (text, options, globals) {
|
|||
let otp,
|
||||
attributes = {},
|
||||
wholeMatch = bq;
|
||||
// attacklab: hack around Konqueror 3.5.4 bug:
|
||||
// "----------bug".replace(/^-/g,"") == "bug"
|
||||
|
||||
bq = bq.replace(/^[ \t]*>[ \t]?/gm, ''); // trim one level of quoting
|
||||
// attacklab: clean up hack
|
||||
bq = bq.replace(/¨0/g, '');
|
||||
bq = bq.replace(/^[ \t]+$/gm, ''); // trim whitespace-only lines
|
||||
|
||||
let captureStartEvent = new showdown.Event('makehtml.blockquote.onCapture', bq);
|
||||
|
|
@ -65,6 +59,7 @@ showdown.subParser('makehtml.blockquote', function (text, options, globals) {
|
|||
bq = captureStartEvent.matches.blockquote;
|
||||
bq = showdown.subParser('makehtml.githubCodeBlock')(bq, options, globals);
|
||||
bq = showdown.subParser('makehtml.blockGamut')(bq, options, globals); // recurse
|
||||
bq = showdown.subParser('makehtml.paragraphs')(bq, options, globals);
|
||||
bq = bq.replace(/(^|\n)/g, '$1 ');
|
||||
// These leading spaces screw with <pre> content, so we need to fix that:
|
||||
bq = bq.replace(/(\s*<pre>[^\r]+?<\/pre>)/gm, function (wm, m1) {
|
||||
|
|
|
|||
|
|
@ -29,8 +29,14 @@ showdown.subParser('makehtml.encodeBackslashEscapes', function (text, options, g
|
|||
startEvent = globals.converter.dispatch(startEvent);
|
||||
text = startEvent.output;
|
||||
|
||||
text = text.replace(/\\(\\)/g, showdown.helper.escapeCharactersCallback);
|
||||
text = text.replace(/\\([`*_{}\[\]()>#+.!~=|:-])/g, showdown.helper.escapeCharactersCallback);
|
||||
text = text
|
||||
.replace(/\\(\\)/g, showdown.helper.escapeCharactersCallback)
|
||||
.replace(/\\([!#%'()*+,\-.\/:;=?@\[\]\\^_`{|}~])/g, showdown.helper.escapeCharactersCallback)
|
||||
.replace(/\\¨D/g, '¨D') // escape $ (which was already escaped as ¨D) (charcode is 36)
|
||||
.replace(/\\&/g, '&') // escape &
|
||||
.replace(/\\"/g, '"') // escaping "
|
||||
.replace(/\\</g, '<') // escaping <
|
||||
.replace(/\\>/g, '>'); // escaping <
|
||||
|
||||
let afterEvent = new showdown.Event('makehtml.encodeBackslashEscapes.onEnd', text);
|
||||
afterEvent
|
||||
|
|
|
|||
|
|
@ -25,9 +25,156 @@
|
|||
showdown.subParser('makehtml.heading', function (text, options, globals) {
|
||||
'use strict';
|
||||
|
||||
let startEvent = new showdown.Event('makehtml.heading.onStart', text);
|
||||
startEvent
|
||||
.setOutput(text)
|
||||
._setGlobals(globals)
|
||||
._setOptions(options);
|
||||
startEvent = globals.converter.dispatch(startEvent);
|
||||
text = startEvent.output;
|
||||
|
||||
let setextRegexH1 = /^( {0,3}([^ \t\n]+.*\n)(.+\n)?(.+\n)?)( {0,3}=+[ \t]*)$/gm,
|
||||
setextRegexH2 = /^( {0,3}([^ \t\n]+.*\n)(.+\n)?(.+\n)?)( {0,3}(-+)[ \t]*)$/gm,
|
||||
atxRegex = (options.requireSpaceBeforeHeadingText) ? /^ {0,3}(#{1,6})[ \t]+(.+?)(?:[ \t]+#+)?[ \t]*$/gm : /^ {0,3}(#{1,6})[ \t]*(.+?)[ \t]*#*[ \t]*$/gm;
|
||||
|
||||
text = text.replace(setextRegexH1, function (wholeMatch, headingText, line1, line2, line3, line4) {
|
||||
return parseSetextHeading(setextRegexH2, options.headerLevelStart, wholeMatch, headingText, line1, line2, line3, line4);
|
||||
});
|
||||
|
||||
text = text.replace(setextRegexH2, function (wholeMatch, headingText, line1, line2, line3, line4) {
|
||||
return parseSetextHeading(setextRegexH2, options.headerLevelStart + 1, wholeMatch, headingText, line1, line2, line3, line4);
|
||||
});
|
||||
|
||||
text = text.replace(atxRegex, function (wholeMatch, m1, m2) {
|
||||
let headingLevel = options.headerLevelStart - 1 + m1.length,
|
||||
headingText = (options.customizedHeaderId) ? m2.replace(/\s?{([^{]+?)}\s*$/, '') : m2,
|
||||
id = (options.noHeaderId) ? null : showdown.subParser('makehtml.heading.id')(m2, options, globals);
|
||||
return parseHeader(setextRegexH2, wholeMatch, headingText, headingLevel, id);
|
||||
});
|
||||
|
||||
let afterEvent = new showdown.Event('makehtml.heading.onEnd', text);
|
||||
afterEvent
|
||||
.setOutput(text)
|
||||
._setGlobals(globals)
|
||||
._setOptions(options);
|
||||
afterEvent = globals.converter.dispatch(afterEvent);
|
||||
return afterEvent.output;
|
||||
|
||||
|
||||
|
||||
function parseSetextHeading (pattern, headingLevel, wholeMatch, headingText, line1, line2, line3, line4) {
|
||||
|
||||
// count lines
|
||||
let count = headingText.trim().split('\n').length;
|
||||
let prepend = '';
|
||||
let nPrepend;
|
||||
const hrCheckRgx = /^ {0,3}[-_*]([-_*] ?){2,}$/;
|
||||
|
||||
// one liner edge cases
|
||||
if (count === 1) {
|
||||
// hr
|
||||
// let's find the hr edge case first
|
||||
if (showdown.helper.trimEnd(line1).match(hrCheckRgx)) {
|
||||
// it's the edge case, so it's a false positive
|
||||
prepend = showdown.subParser('makehtml.horizontalRule')(line1, options, globals);
|
||||
if (prepend !== line1) {
|
||||
// it's an oneliner list
|
||||
return prepend.trim() + '\n' + line4;
|
||||
}
|
||||
}
|
||||
|
||||
// now check if it's an unordered list
|
||||
if (line1.match(/^ {0,3}[-*+][ \t]/)) {
|
||||
|
||||
prepend = showdown.subParser('makehtml.blockGamut')(line1, options, globals);
|
||||
if (prepend !== line1) {
|
||||
// it's an oneliner list
|
||||
return prepend.trim() + '\n' + line4;
|
||||
}
|
||||
}
|
||||
|
||||
// no edge case let's proceed as usual
|
||||
} else {
|
||||
let multilineText = '';
|
||||
|
||||
// multiline is a bit trickier
|
||||
// first we must take care of the edge cases of:
|
||||
// case1: | case2:
|
||||
// --- | ---
|
||||
// foo | foo
|
||||
// --- | bar
|
||||
// | ---
|
||||
//
|
||||
if (showdown.helper.trimEnd(line1).match(hrCheckRgx)) {
|
||||
nPrepend = showdown.subParser('makehtml.horizontalRule')(line1, options, globals);
|
||||
if (nPrepend !== line1) {
|
||||
line1 = '';
|
||||
// we add the parsed block to prepend
|
||||
prepend = nPrepend.trim();
|
||||
// and remove the line from the headingText, so it doesn't appear repeated
|
||||
headingText = line2 + ((line3) ? line3 : '');
|
||||
}
|
||||
}
|
||||
|
||||
// now we take care of these cases:
|
||||
// case1: | case2:
|
||||
// foo | foo
|
||||
// *** | ***
|
||||
// --- | bar
|
||||
// | ---
|
||||
//
|
||||
if (showdown.helper.trimEnd(line2).match(hrCheckRgx)) {
|
||||
// This case sucks, because the first line could be anything!!!
|
||||
// first let's make sure it's a hr
|
||||
nPrepend = showdown.subParser('makehtml.horizontalRule')(line2, options, globals);
|
||||
if (nPrepend !== line2) {
|
||||
line2 = nPrepend;
|
||||
// it is, so now we must parse line1 also
|
||||
if (line1) {
|
||||
line1 = showdown.subParser('makehtml.blockGamut')(line1, options, globals);
|
||||
line1 = showdown.subParser('makehtml.paragraphs')(line1, options, globals);
|
||||
line1 = line1.trim() + '\n';
|
||||
prepend = line1;
|
||||
// and clear line1
|
||||
line1 = '';
|
||||
}
|
||||
// we add the parsed blocks to prepend
|
||||
prepend += line2.trim() + '\n';
|
||||
line2 = '';
|
||||
// and remove the lines from the headingText, so it doesn't appear repeated
|
||||
headingText = (line3) ? line3 : '';
|
||||
}
|
||||
}
|
||||
|
||||
// all edge cases should be treated now
|
||||
multilineText = line1 + line2 + ((line3) ? line3 : '');
|
||||
|
||||
nPrepend = showdown.subParser('makehtml.blockGamut')(multilineText, options, globals);
|
||||
//console.log(nPrepend);
|
||||
if (nPrepend !== multilineText) {
|
||||
// we found a block, so it should take precedence
|
||||
prepend += nPrepend;
|
||||
headingText = '';
|
||||
}
|
||||
}
|
||||
|
||||
// trim stuff
|
||||
headingText = headingText.trim();
|
||||
|
||||
// let's check if heading is empty
|
||||
// after looking for blocks, heading text might be empty which is a false positive
|
||||
if (!headingText) {
|
||||
return prepend + line4;
|
||||
}
|
||||
|
||||
// after this, we're pretty sure it's a heading so let's proceed
|
||||
let id = (options.noHeaderId) ? null : showdown.subParser('makehtml.heading.id')(headingText, options, globals);
|
||||
return prepend + parseHeader(pattern, wholeMatch, headingText, headingLevel, id);
|
||||
}
|
||||
|
||||
function parseHeader (pattern, wholeMatch, headingText, headingLevel, headingId) {
|
||||
let captureStartEvent = new showdown.Event('makehtml.heading.onCapture', headingText),
|
||||
otp;
|
||||
otp;
|
||||
|
||||
captureStartEvent
|
||||
.setOutput(null)
|
||||
|
|
@ -50,7 +197,7 @@ showdown.subParser('makehtml.heading', function (text, options, globals) {
|
|||
} else {
|
||||
headingText = captureStartEvent.matches.heading;
|
||||
let spanGamut = showdown.subParser('makehtml.spanGamut')(headingText, options, globals),
|
||||
attributes = captureStartEvent.attributes;
|
||||
attributes = captureStartEvent.attributes;
|
||||
otp = '<h' + headingLevel + showdown.helper._populateAttributes(attributes) + '>' + spanGamut + '</h' + headingLevel + '>';
|
||||
}
|
||||
|
||||
|
|
@ -65,45 +212,6 @@ showdown.subParser('makehtml.heading', function (text, options, globals) {
|
|||
return showdown.subParser('makehtml.hashBlock')(otp, options, globals);
|
||||
}
|
||||
|
||||
let startEvent = new showdown.Event('makehtml.heading.onStart', text);
|
||||
startEvent
|
||||
.setOutput(text)
|
||||
._setGlobals(globals)
|
||||
._setOptions(options);
|
||||
startEvent = globals.converter.dispatch(startEvent);
|
||||
text = startEvent.output;
|
||||
|
||||
let setextRegexH1 = (options.smoothLivePreview) ? /^(.+[ \t]*\n)(.+[ \t]*\n)?(.+[ \t]*\n)?={2,}[ \t]*\n+/gm : /^( {0,3}[^ \t\n].+[ \t]*\n)(.+[ \t]*\n)?(.+[ \t]*\n)? {0,3}=+[ \t]*$/gm,
|
||||
setextRegexH2 = (options.smoothLivePreview) ? /^(.+[ \t]*\n)(.+[ \t]*\n)?(.+[ \t]*\n)?-{2,}[ \t]*\n+/gm : /^( {0,3}[^ \t\n].+[ \t]*\n)(.+[ \t]*\n)?(.+[ \t]*\n)? {0,3}-+[ \t]*$/gm,
|
||||
atxRegex = (options.requireSpaceBeforeHeadingText) ? /^ {0,3}(#{1,6})[ \t]+(.+?)(?:[ \t]+#+)?[ \t]*$/gm : /^ {0,3}(#{1,6})[ \t]*(.+?)[ \t]*#*[ \t]*$/gm;
|
||||
|
||||
text = text.replace(setextRegexH1, function (wholeMatch, line1, line2, line3) {
|
||||
let headingText = line1.trim() + ((line2) ? '\n' + line2.trim() : '') + ((line3) ? '\n' + line3.trim() : '');
|
||||
let id = (options.noHeaderId) ? null : showdown.subParser('makehtml.heading.id')(headingText, options, globals);
|
||||
return parseHeader(setextRegexH1, wholeMatch, headingText, options.headerLevelStart, id);
|
||||
});
|
||||
|
||||
text = text.replace(setextRegexH2, function (wholeMatch, line1, line2, line3) {
|
||||
let headingText = line1.trim() + ((line2) ? '\n' + line2.trim() : '') + ((line3) ? '\n' + line3.trim() : '');
|
||||
let id = (options.noHeaderId) ? null : showdown.subParser('makehtml.heading.id')(headingText, options, globals);
|
||||
return parseHeader(setextRegexH2, wholeMatch, headingText, options.headerLevelStart + 1, id);
|
||||
});
|
||||
|
||||
text = text.replace(atxRegex, function (wholeMatch, m1, m2) {
|
||||
let headingLevel = options.headerLevelStart - 1 + m1.length,
|
||||
headingText = (options.customizedHeaderId) ? m2.replace(/\s?{([^{]+?)}\s*$/, '') : m2,
|
||||
id = (options.noHeaderId) ? null : showdown.subParser('makehtml.heading.id')(m2, options, globals);
|
||||
return parseHeader(setextRegexH2, wholeMatch, headingText, headingLevel, id);
|
||||
});
|
||||
|
||||
|
||||
let afterEvent = new showdown.Event('makehtml.heading.onEnd', text);
|
||||
afterEvent
|
||||
.setOutput(text)
|
||||
._setGlobals(globals)
|
||||
._setOptions(options);
|
||||
afterEvent = globals.converter.dispatch(afterEvent);
|
||||
return afterEvent.output;
|
||||
});
|
||||
|
||||
showdown.subParser('makehtml.heading.id', function (m, options, globals) {
|
||||
|
|
|
|||
|
|
@ -22,34 +22,50 @@ showdown.subParser('makehtml.horizontalRule', function (text, options, globals)
|
|||
|
||||
|
||||
// parses: --- and - - -
|
||||
const rgx1 = /^ {0,3}( ?-){3,}[ \t]*$/gm;
|
||||
const rgx1 = /^ {0,2}( ?-){3,}[ \t]*$/gm;
|
||||
text = text.replace(rgx1, function (wholeMatch) {
|
||||
return parse(rgx1, wholeMatch);
|
||||
});
|
||||
// parses: -\t-\t-
|
||||
const rgx2 = /^ {0,3}(\t?-){3,}[ \t]*$/gm;
|
||||
const rgx2 = /^ {0,3}-(\t?-){2,}[ \t]*$/gm;
|
||||
text = text.replace(rgx2, function (wholeMatch) {
|
||||
return parse(rgx2, wholeMatch);
|
||||
});
|
||||
|
||||
const rgx3 = /^ {0,3}( ?\*){3,}[ \t]*$/gm;
|
||||
const rgx3 = /^ {0,2}( ?\*){3,}[ \t]*$/gm;
|
||||
text = text.replace(rgx3, function (wholeMatch) {
|
||||
return parse(rgx3, wholeMatch);
|
||||
});
|
||||
const rgx4 = /^ {0,3}(\t?\*){3,}[ \t]*$/gm;
|
||||
const rgx4 = /^ {0,3}\*(\t?\*){2,}[ \t]*$/gm;
|
||||
text = text.replace(rgx4, function (wholeMatch) {
|
||||
return parse(rgx4, wholeMatch);
|
||||
});
|
||||
|
||||
const rgx5 = /^ {0,3}( ?\*){3,}[ \t]*$/gm;
|
||||
|
||||
const rgx5 = /^ {0,2}( ?_){3,}[ \t]*$/gm;
|
||||
text = text.replace(rgx5, function (wholeMatch) {
|
||||
return parse(rgx5, wholeMatch);
|
||||
});
|
||||
const rgx6 = /^ {0,3}(\t?\*){3,}[ \t]*$/gm;
|
||||
const rgx6 = /^ {0,3}_(\t?_){2,}[ \t]*$/gm;
|
||||
text = text.replace(rgx6, function (wholeMatch) {
|
||||
return parse(rgx6, wholeMatch);
|
||||
});
|
||||
|
||||
// super weird horizontal rule
|
||||
|
||||
const rgx7 = /^ {0,3}(- *){2,}-[ \t]*$/gm;
|
||||
text = text.replace(rgx7, function (wholeMatch) {
|
||||
return parse(rgx7, wholeMatch);
|
||||
});
|
||||
const rgx8 = /^ {0,3}(\* *){2,}\*[ \t]*$/gm;
|
||||
text = text.replace(rgx8, function (wholeMatch) {
|
||||
return parse(rgx8, wholeMatch);
|
||||
});
|
||||
const rgx9 = /^ {0,3}(_ *){2,}_[ \t]*$/gm;
|
||||
text = text.replace(rgx9, function (wholeMatch) {
|
||||
return parse(rgx9, wholeMatch);
|
||||
});
|
||||
|
||||
let afterEvent = new showdown.Event('makehtml.horizontalRule.onEnd', text);
|
||||
afterEvent
|
||||
.setOutput(text)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
<h1 id="some-header">some header</h1>
|
||||
<h1 id="some-header-with--chars">some header with &+$,/:;=?@\"#{}|^~[]`\*()%.!' chars</h1>
|
||||
<h1 id="some-header-with--chars">some header with &+$,/:;=?@"#{}|^~[]`\*()%.!' chars</h1>
|
||||
<h1 id="another-header--with--chars">another header > with < chars</h1>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# some header
|
||||
|
||||
# some header with &+$,/:;=?@\"#{}|^~[]`\\*()%.!' chars
|
||||
# some header with &+$,/:;=?@"#{}|^~[]`\\*()%.!' chars
|
||||
|
||||
# another header > with < chars
|
||||
|
|
|
|||
|
|
@ -239,20 +239,16 @@ This is a second.
|
|||
</code></pre>
|
||||
<p>You can also embed blockquotes in a list.</p>
|
||||
<ul>
|
||||
<li>Green</li>
|
||||
<li><p>Green
|
||||
> What is this? It is embedded blockquote. Mix 'em and match 'em.</p></li>
|
||||
<li><p>Blue</p></li>
|
||||
<li><p>Red</p>
|
||||
<pre><code>* Green
|
||||
> What is this? It is embedded blockquote. Mix 'em and match 'em.
|
||||
* Blue
|
||||
* Red
|
||||
</code></pre></li>
|
||||
</ul>
|
||||
<blockquote>
|
||||
<p>What is this? It is embedded blockquote. Mix 'em and match 'em.</p>
|
||||
<ul>
|
||||
<li>Blue</li>
|
||||
<li>Red</li>
|
||||
</ul>
|
||||
</blockquote>
|
||||
<pre><code> * Green
|
||||
> What is this? It is embedded blockquote. Mix 'em and match 'em.
|
||||
* Blue
|
||||
* Red
|
||||
</code></pre>
|
||||
<p>You can also embed code blocks in a list.</p>
|
||||
<ul>
|
||||
<li><p>Green</p>
|
||||
|
|
@ -264,7 +260,7 @@ This is a second.
|
|||
</code></pre></li>
|
||||
<li><p>Blue</p></li>
|
||||
<li><p>Red</p>
|
||||
<pre><code>* Green
|
||||
<pre><code>* Green
|
||||
|
||||
Try this code:
|
||||
|
||||
|
|
@ -314,9 +310,7 @@ Pipe | $1 | eleven
|
|||
| `help()` | Display the __help__ window. |
|
||||
| `destroy()` | **Destroy your computer!** |
|
||||
</code></pre>
|
||||
<ul>
|
||||
<li>- -</li>
|
||||
</ul>
|
||||
<hr />
|
||||
<h2 id="codeandsyntaxhighlighting">Code and Syntax highlighting</h2>
|
||||
<p>Pre-formatted code blocks are used for writing about programming or markup source code. Rather than forming normal paragraphs, the code block linesare interpreted literally. Markdown wraps a code block in both <code><pre></code> and <code><code></code> tags.</p>
|
||||
<p>To produce a code block in Markdown, indent every line of the block by at least 4 spaces or 1 tab. For :</p>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<blockquote>
|
||||
<p>a blockquote</p>
|
||||
<h1 id="followedbyanheading">followed by an heading</h1>
|
||||
</blockquote>
|
||||
<h1 id="followedbyaheading">followed by a heading</h1>
|
||||
|
|
@ -1,2 +1,2 @@
|
|||
> a blockquote
|
||||
# followed by an heading
|
||||
# followed by a heading
|
||||
|
|
|
|||
|
|
@ -0,0 +1,9 @@
|
|||
<pre><code>foo
|
||||
bar
|
||||
</code></pre>
|
||||
<hr />
|
||||
<pre><code>foo
|
||||
bar
|
||||
baz
|
||||
</code></pre>
|
||||
<hr />
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
foo
|
||||
bar
|
||||
---
|
||||
|
||||
|
||||
|
||||
foo
|
||||
bar
|
||||
baz
|
||||
---
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
<pre><code>foo
|
||||
</code></pre>
|
||||
<hr />
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
foo
|
||||
---
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
<pre><code>foo
|
||||
</code></pre>
|
||||
<hr />
|
||||
<pre><code>foo
|
||||
bar
|
||||
</code></pre>
|
||||
<hr />
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
```
|
||||
foo
|
||||
```
|
||||
---
|
||||
|
||||
|
||||
```
|
||||
foo
|
||||
bar
|
||||
```
|
||||
---
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
<ul>
|
||||
<li>foo</li>
|
||||
</ul>
|
||||
<hr />
|
||||
<ul>
|
||||
<li>foo</li>
|
||||
<li>bar</li>
|
||||
<li>baz</li>
|
||||
</ul>
|
||||
<hr />
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
- foo
|
||||
---
|
||||
|
||||
- foo
|
||||
- bar
|
||||
- baz
|
||||
---
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<hr />
|
||||
<h2 id="foo">foo</h2>
|
||||
<p>foo</p>
|
||||
<hr />
|
||||
<h2 id="bar">bar</h2>
|
||||
<p>foo</p>
|
||||
<hr />
|
||||
<hr />
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
---
|
||||
foo
|
||||
---
|
||||
|
||||
|
||||
foo
|
||||
***
|
||||
bar
|
||||
---
|
||||
|
||||
|
||||
foo
|
||||
***
|
||||
---
|
||||
|
|
@ -24,12 +24,13 @@ describe('makeHtml() commonmark testsuite', function () {
|
|||
case 'Setext headings_92': // lazy continuation is needed for compatibility
|
||||
case 'Setext headings_93': // lazy continuation is needed for compatibility
|
||||
case 'Setext headings_94': // lazy continuation is needed for compatibility
|
||||
case 'Thematic breaks_43': // malformed input of test case
|
||||
case 'Thematic breaks_61': // hr inside lists does not make sense
|
||||
//case 'Setext headings_101': // does not make sense because it's inconsistent with own spec. But I dunno?!? this one is weird
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
if (testsuite[section][i].name === 'ATX headings_79') {
|
||||
continue;
|
||||
case 'Setext headings_91': //it's failing because the testcase converts " to " even though it's not supposed to
|
||||
testsuite[section][i].expected = testsuite[section][i].expected.replace(/"/g, '"')
|
||||
break;
|
||||
}
|
||||
it(name, assertion(testsuite[section][i], converter, true));
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user