mirror of
https://github.com/showdownjs/showdown.git
synced 2024-03-22 13:30:55 +08:00
a2259c063b
Paragraphed lists with sublists were being parsed incorrectly due to workaround realted with simpleLineBreaks. This commit fixes this. Closes #397
47 lines
1.9 KiB
JavaScript
47 lines
1.9 KiB
JavaScript
/**
|
|
* These are all the transformations that occur *within* block-level
|
|
* tags like paragraphs, headers, and list items.
|
|
*/
|
|
showdown.subParser('spanGamut', function (text, options, globals) {
|
|
'use strict';
|
|
|
|
text = globals.converter._dispatch('spanGamut.before', text, options, globals);
|
|
text = showdown.subParser('codeSpans')(text, options, globals);
|
|
text = showdown.subParser('escapeSpecialCharsWithinTagAttributes')(text, options, globals);
|
|
text = showdown.subParser('encodeBackslashEscapes')(text, options, globals);
|
|
|
|
// Process anchor and image tags. Images must come first,
|
|
// because ![foo][f] looks like an anchor.
|
|
text = showdown.subParser('images')(text, options, globals);
|
|
text = showdown.subParser('anchors')(text, options, globals);
|
|
|
|
// Make links out of things like `<http://example.com/>`
|
|
// Must come after anchors, because you can use < and >
|
|
// delimiters in inline links like [this](<url>).
|
|
text = showdown.subParser('autoLinks')(text, options, globals);
|
|
text = showdown.subParser('italicsAndBold')(text, options, globals);
|
|
text = showdown.subParser('strikethrough')(text, options, globals);
|
|
text = showdown.subParser('simplifiedAutoLinks')(text, options, globals);
|
|
|
|
// we need to hash HTML tags inside spans
|
|
text = showdown.subParser('hashHTMLSpans')(text, options, globals);
|
|
|
|
// now we encode amps and angles
|
|
text = showdown.subParser('encodeAmpsAndAngles')(text, options, globals);
|
|
|
|
// Do hard breaks
|
|
if (options.simpleLineBreaks) {
|
|
// GFM style hard breaks
|
|
// only add line breaks if the text does not contain a block (special case for lists)
|
|
if (!/\n\n¨K/.test(text)) {
|
|
text = text.replace(/\n+/g, '<br />\n');
|
|
}
|
|
} else {
|
|
// Vanilla hard breaks
|
|
text = text.replace(/ +\n/g, '<br />\n');
|
|
}
|
|
|
|
text = globals.converter._dispatch('spanGamut.after', text, options, globals);
|
|
return text;
|
|
});
|