mirror of
https://github.com/showdownjs/showdown.git
synced 2024-03-22 13:30:55 +08:00
chore(all): code style change
This commit is contained in:
Estevão Soares dos Santos
parent
4a0e05900c
commit
8b000b134a
|
|
@ -10,7 +10,7 @@ module.exports = function (grunt) {
|
||||||
concat: {
|
concat: {
|
||||||
options: {
|
options: {
|
||||||
sourceMap: true,
|
sourceMap: true,
|
||||||
banner: ";/*! <%= pkg.name %> <%= grunt.template.today('dd-mm-yyyy') %> */\n(function(){\n 'use strict';\n",
|
banner: ";/*! <%= pkg.name %> <%= grunt.template.today('dd-mm-yyyy') %> */\n(function(){\n",
|
||||||
footer: "}).call(this)"
|
footer: "}).call(this)"
|
||||||
},
|
},
|
||||||
dist: {
|
dist: {
|
||||||
|
|
|
||||||
250
src/angular.js
vendored
250
src/angular.js
vendored
|
|
@ -6,145 +6,145 @@
|
||||||
//Check if AngularJs and Showdown is defined and only load ng-Showdown if both are present
|
//Check if AngularJs and Showdown is defined and only load ng-Showdown if both are present
|
||||||
if (typeof angular !== 'undefined' && typeof showdown !== 'undefined') {
|
if (typeof angular !== 'undefined' && typeof showdown !== 'undefined') {
|
||||||
|
|
||||||
(function (module, showdown) {
|
(function (module, showdown) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
module
|
module.provider('$showdown', provider).directive('sdModelToHtml',
|
||||||
.provider('$showdown', provider)
|
['$showdown', markdownToHtmlDirective]).filter('sdStripHtml',
|
||||||
.directive('sdModelToHtml', ['$showdown', markdownToHtmlDirective])
|
stripHtmlFilter);
|
||||||
.filter('sdStripHtml', stripHtmlFilter);
|
|
||||||
|
/**
|
||||||
|
* Angular Provider
|
||||||
|
* Enables configuration of showdown via angular.config and Dependency Injection into controllers, views
|
||||||
|
* directives, etc... This assures the directives and filters provided by the library itself stay consistent
|
||||||
|
* with the user configurations.
|
||||||
|
* If the user wants to use a different configuration in a determined context, he can use the "classic" Showdown
|
||||||
|
* object instead.
|
||||||
|
*/
|
||||||
|
function provider() {
|
||||||
|
|
||||||
|
// Configuration parameters for Showdown
|
||||||
|
var config = {
|
||||||
|
extensions: [],
|
||||||
|
stripHtml: true
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets a configuration option
|
||||||
|
*
|
||||||
|
* @param {string} key Config parameter key
|
||||||
|
* @param {string} value Config parameter value
|
||||||
|
*/
|
||||||
|
/* jshint validthis: true */
|
||||||
|
this.setOption = function (key, value) {
|
||||||
|
config[key] = value;
|
||||||
|
|
||||||
|
return this;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the value of the configuration parameter specified by key
|
||||||
|
*
|
||||||
|
* @param {string} key The config parameter key
|
||||||
|
* @returns {string|null} Returns the value of the config parameter. (or null if the config parameter is not set)
|
||||||
|
*/
|
||||||
|
this.getOption = function (key) {
|
||||||
|
if (config.hasOwnProperty(key)) {
|
||||||
|
return config.key;
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Loads a Showdown Extension
|
||||||
|
*
|
||||||
|
* @param {string} extensionName The name of the extension to load
|
||||||
|
*/
|
||||||
|
this.loadExtension = function (extensionName) {
|
||||||
|
config.extensions.push(extensionName);
|
||||||
|
|
||||||
|
return this;
|
||||||
|
};
|
||||||
|
|
||||||
|
function SDObject() {
|
||||||
|
var converter = new showdown.Converter(config);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Angular Provider
|
* Converts a markdown text into HTML
|
||||||
* Enables configuration of showdown via angular.config and Dependency Injection into controllers, views
|
*
|
||||||
* directives, etc... This assures the directives and filters provided by the library itself stay consistent
|
* @param {string} markdown The markdown string to be converted to HTML
|
||||||
* with the user configurations.
|
* @returns {string} The converted HTML
|
||||||
* If the user wants to use a different configuration in a determined context, he can use the "classic" Showdown
|
|
||||||
* object instead.
|
|
||||||
*/
|
*/
|
||||||
function provider() {
|
this.makeHtml = function (markdown) {
|
||||||
|
return converter.makeHtml(markdown);
|
||||||
// Configuration parameters for Showdown
|
};
|
||||||
var config = {
|
|
||||||
extensions: [],
|
|
||||||
stripHtml: true
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets a configuration option
|
|
||||||
*
|
|
||||||
* @param {string} key Config parameter key
|
|
||||||
* @param {string} value Config parameter value
|
|
||||||
*/ /* jshint validthis: true */
|
|
||||||
this.setOption = function (key, value) {
|
|
||||||
config[key] = value;
|
|
||||||
|
|
||||||
return this;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the value of the configuration parameter specified by key
|
|
||||||
*
|
|
||||||
* @param {string} key The config parameter key
|
|
||||||
* @returns {string|null} Returns the value of the config parameter. (or null if the config parameter is not set)
|
|
||||||
*/
|
|
||||||
this.getOption = function (key) {
|
|
||||||
if (config.hasOwnProperty(key)) {
|
|
||||||
return config.key;
|
|
||||||
} else {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Loads a Showdown Extension
|
|
||||||
*
|
|
||||||
* @param {string} extensionName The name of the extension to load
|
|
||||||
*/
|
|
||||||
this.loadExtension = function (extensionName) {
|
|
||||||
config.extensions.push(extensionName);
|
|
||||||
|
|
||||||
return this;
|
|
||||||
};
|
|
||||||
|
|
||||||
function SDObject() {
|
|
||||||
var converter = new showdown.Converter(config);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Converts a markdown text into HTML
|
|
||||||
*
|
|
||||||
* @param {string} markdown The markdown string to be converted to HTML
|
|
||||||
* @returns {string} The converted HTML
|
|
||||||
*/
|
|
||||||
this.makeHtml = function (markdown) {
|
|
||||||
return converter.makeHtml(markdown);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Strips a text of it's HTML tags
|
|
||||||
*
|
|
||||||
* @param {string} text
|
|
||||||
* @returns {string}
|
|
||||||
*/
|
|
||||||
this.stripHtml = function (text) {
|
|
||||||
return String(text).replace(/<[^>]+>/gm, '');
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// The object returned by service provider
|
|
||||||
this.$get = function () {
|
|
||||||
return new SDObject();
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* AngularJS Directive to Md to HTML transformation
|
* Strips a text of it's HTML tags
|
||||||
*
|
*
|
||||||
* Usage example:
|
* @param {string} text
|
||||||
* <div sd-md-to-html-model="markdownText" ></div>
|
* @returns {string}
|
||||||
*
|
|
||||||
* @param $showdown
|
|
||||||
* @returns {*}
|
|
||||||
*/
|
*/
|
||||||
function markdownToHtmlDirective($showdown) {
|
this.stripHtml = function (text) {
|
||||||
|
return String(text).replace(/<[^>]+>/gm, '');
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
var link = function (scope, element) {
|
// The object returned by service provider
|
||||||
scope.$watch('model', function (newValue) {
|
this.$get = function () {
|
||||||
var val;
|
return new SDObject();
|
||||||
if (typeof newValue === 'string') {
|
};
|
||||||
val = $showdown.makeHtml(newValue);
|
}
|
||||||
} else {
|
|
||||||
val = typeof newValue;
|
|
||||||
}
|
|
||||||
element.html(val);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
return {
|
/**
|
||||||
restrict: 'A',
|
* AngularJS Directive to Md to HTML transformation
|
||||||
link: link,
|
*
|
||||||
scope: {
|
* Usage example:
|
||||||
model: '=sdModelToHtml'
|
* <div sd-md-to-html-model="markdownText" ></div>
|
||||||
}
|
*
|
||||||
};
|
* @param $showdown
|
||||||
|
* @returns {*}
|
||||||
|
*/
|
||||||
|
function markdownToHtmlDirective($showdown) {
|
||||||
|
|
||||||
|
var link = function (scope, element) {
|
||||||
|
scope.$watch('model', function (newValue) {
|
||||||
|
var val;
|
||||||
|
if (typeof newValue === 'string') {
|
||||||
|
val = $showdown.makeHtml(newValue);
|
||||||
|
} else {
|
||||||
|
val = typeof newValue;
|
||||||
|
}
|
||||||
|
element.html(val);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
return {
|
||||||
|
restrict: 'A',
|
||||||
|
link: link,
|
||||||
|
scope: {
|
||||||
|
model: '=sdModelToHtml'
|
||||||
}
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* AngularJS Filter to Strip HTML tags from text
|
* AngularJS Filter to Strip HTML tags from text
|
||||||
*
|
*
|
||||||
* @returns {Function}
|
* @returns {Function}
|
||||||
*/
|
*/
|
||||||
function stripHtmlFilter() {
|
function stripHtmlFilter() {
|
||||||
return function (text) {
|
return function (text) {
|
||||||
return String(text).replace(/<[^>]+>/gm, '');
|
return String(text).replace(/<[^>]+>/gm, '');
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
})(angular.module('showdown', []), showdown);
|
})(angular.module('showdown', []), showdown);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
/** TODO Since this library is opt out, maybe we should not throw an error so we can concatenate this
|
/** TODO Since this library is opt out, maybe we should not throw an error so we can concatenate this
|
||||||
script with the main lib */
|
script with the main lib */
|
||||||
// throw new Error("ng-showdown was not loaded because one of it's dependencies (AngularJS or Showdown) wasn't met");
|
// throw new Error("ng-showdown was not loaded because one of it's dependencies (AngularJS or Showdown) wasn't met");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,50 +3,56 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function isString(a) {
|
function isString(a) {
|
||||||
return (typeof a === 'string' || a instanceof String);
|
'use strict';
|
||||||
|
return (typeof a === 'string' || a instanceof String);
|
||||||
}
|
}
|
||||||
|
|
||||||
function forEach(obj, callback) {
|
function forEach(obj, callback) {
|
||||||
if (typeof obj.forEach === 'function') {
|
'use strict';
|
||||||
obj.forEach(callback);
|
if (typeof obj.forEach === 'function') {
|
||||||
} else {
|
obj.forEach(callback);
|
||||||
var i, len = obj.length;
|
} else {
|
||||||
for (i = 0; i < len; i++) {
|
var i, len = obj.length;
|
||||||
callback(obj[i], i, obj);
|
for (i = 0; i < len; i++) {
|
||||||
}
|
callback(obj[i], i, obj);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function isArray(a) {
|
function isArray(a) {
|
||||||
return a.constructor === Array;
|
'use strict';
|
||||||
|
return a.constructor === Array;
|
||||||
}
|
}
|
||||||
|
|
||||||
function isUndefined(value) {
|
function isUndefined(value) {
|
||||||
return typeof value === 'undefined';
|
'use strict';
|
||||||
|
return typeof value === 'undefined';
|
||||||
}
|
}
|
||||||
|
|
||||||
var escapeCharactersCallback = function (wholeMatch, m1) {
|
var escapeCharactersCallback = function (wholeMatch, m1) {
|
||||||
var charCodeToEscape = m1.charCodeAt(0);
|
'use strict';
|
||||||
return '~E' + charCodeToEscape + 'E';
|
var charCodeToEscape = m1.charCodeAt(0);
|
||||||
|
return '~E' + charCodeToEscape + 'E';
|
||||||
};
|
};
|
||||||
|
|
||||||
var escapeCharacters = function (text, charsToEscape, afterBackslash) {
|
var escapeCharacters = function (text, charsToEscape, afterBackslash) {
|
||||||
// First we have to escape the escape characters so that
|
'use strict';
|
||||||
// we can build a character class out of them
|
// First we have to escape the escape characters so that
|
||||||
var regexString = '([' + charsToEscape.replace(/([\[\]\\])/g, '\\$1') + '])';
|
// we can build a character class out of them
|
||||||
|
var regexString = '([' + charsToEscape.replace(/([\[\]\\])/g, '\\$1') + '])';
|
||||||
|
|
||||||
if (afterBackslash) {
|
if (afterBackslash) {
|
||||||
regexString = '\\\\' + regexString;
|
regexString = '\\\\' + regexString;
|
||||||
}
|
}
|
||||||
|
|
||||||
var regex = new RegExp(regexString, 'g');
|
var regex = new RegExp(regexString, 'g');
|
||||||
text = text.replace(regex, escapeCharactersCallback);
|
text = text.replace(regex, escapeCharactersCallback);
|
||||||
|
|
||||||
return text;
|
return text;
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!showdown.hasOwnProperty('helper')) {
|
if (!showdown.hasOwnProperty('helper')) {
|
||||||
showdown.helper = {};
|
showdown.helper = {};
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -6,15 +6,15 @@ var root = this;
|
||||||
|
|
||||||
// CommonJS/nodeJS Loader
|
// CommonJS/nodeJS Loader
|
||||||
if (typeof module !== 'undefined' && module.exports) {
|
if (typeof module !== 'undefined' && module.exports) {
|
||||||
module.exports = showdown;
|
module.exports = showdown;
|
||||||
}
|
}
|
||||||
// AMD Loader
|
// AMD Loader
|
||||||
else if (typeof define === 'function' && define.amd) {
|
else if (typeof define === 'function' && define.amd) {
|
||||||
define('showdown', function () {
|
define('showdown', function () {
|
||||||
return showdown;
|
return showdown;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
// Regular Browser loader
|
// Regular Browser loader
|
||||||
else {
|
else {
|
||||||
root.showdown = showdown;
|
root.showdown = showdown;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
183
src/showdown.js
183
src/showdown.js
|
|
@ -6,8 +6,8 @@
|
||||||
var showdown = {},
|
var showdown = {},
|
||||||
parsers = {},
|
parsers = {},
|
||||||
globalOptions = {
|
globalOptions = {
|
||||||
omitExtraWLInCodeBlocks: false,
|
omitExtraWLInCodeBlocks: false,
|
||||||
prefixHeaderId: false
|
prefixHeaderId: false
|
||||||
};
|
};
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
|
|
@ -19,7 +19,6 @@ var showdown = {},
|
||||||
*/
|
*/
|
||||||
showdown.helper = {};
|
showdown.helper = {};
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
// API
|
// API
|
||||||
//
|
//
|
||||||
|
|
@ -29,16 +28,19 @@ showdown.extensions = {};
|
||||||
|
|
||||||
//Public methods
|
//Public methods
|
||||||
showdown.setOption = function (key, value) {
|
showdown.setOption = function (key, value) {
|
||||||
globalOptions[key] = value;
|
'use strict';
|
||||||
return this;
|
globalOptions[key] = value;
|
||||||
|
return this;
|
||||||
};
|
};
|
||||||
|
|
||||||
showdown.getOption = function (key) {
|
showdown.getOption = function (key) {
|
||||||
return globalOptions[key];
|
'use strict';
|
||||||
|
return globalOptions[key];
|
||||||
};
|
};
|
||||||
|
|
||||||
showdown.getOptions = function () {
|
showdown.getOptions = function () {
|
||||||
return globalOptions;
|
'use strict';
|
||||||
|
return globalOptions;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -51,17 +53,18 @@ showdown.getOptions = function () {
|
||||||
* @returns {*}
|
* @returns {*}
|
||||||
*/
|
*/
|
||||||
showdown.subParser = function (name, func) {
|
showdown.subParser = function (name, func) {
|
||||||
if (showdown.helper.isString(name)) {
|
'use strict';
|
||||||
if (typeof func !== 'undefined') {
|
if (showdown.helper.isString(name)) {
|
||||||
parsers[name] = func;
|
if (typeof func !== 'undefined') {
|
||||||
} else {
|
parsers[name] = func;
|
||||||
if (parsers.hasOwnProperty(name)) {
|
} else {
|
||||||
return parsers[name];
|
if (parsers.hasOwnProperty(name)) {
|
||||||
} else {
|
return parsers[name];
|
||||||
throw Error('SubParser named ' + name + ' not registered!');
|
} else {
|
||||||
}
|
throw Error('SubParser named ' + name + ' not registered!');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -70,85 +73,85 @@ showdown.subParser = function (name, func) {
|
||||||
* @returns {{makeHtml: Function}}
|
* @returns {{makeHtml: Function}}
|
||||||
*/
|
*/
|
||||||
showdown.Converter = function (converterOptions) {
|
showdown.Converter = function (converterOptions) {
|
||||||
|
'use strict';
|
||||||
|
|
||||||
converterOptions = converterOptions || {};
|
converterOptions = converterOptions || {};
|
||||||
|
|
||||||
var options = globalOptions,
|
var options = globalOptions,
|
||||||
parserOrder = [
|
parserOrder = [
|
||||||
'detab',
|
'detab',
|
||||||
'stripBlankLines',
|
'stripBlankLines',
|
||||||
//runLanguageExtensions,
|
//runLanguageExtensions,
|
||||||
'githubCodeBlocks',
|
'githubCodeBlocks',
|
||||||
'hashHTMLBlocks',
|
'hashHTMLBlocks',
|
||||||
'stripLinkDefinitions',
|
'stripLinkDefinitions',
|
||||||
'blockGamut',
|
'blockGamut',
|
||||||
'unescapeSpecialChars'
|
'unescapeSpecialChars'
|
||||||
];
|
];
|
||||||
|
|
||||||
// Merge options
|
// Merge options
|
||||||
if (typeof converterOptions === 'object') {
|
if (typeof converterOptions === 'object') {
|
||||||
for (var opt in converterOptions) {
|
for (var opt in converterOptions) {
|
||||||
if (converterOptions.hasOwnProperty(opt)) {
|
if (converterOptions.hasOwnProperty(opt)) {
|
||||||
options[opt] = converterOptions[opt];
|
options[opt] = converterOptions[opt];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var makeHtml = function (text) {
|
||||||
|
|
||||||
|
//check if text is not falsy
|
||||||
|
if (!text) {
|
||||||
|
return text;
|
||||||
}
|
}
|
||||||
|
|
||||||
var makeHtml = function (text) {
|
var globals = {
|
||||||
|
gHtmlBlocks: [],
|
||||||
//check if text is not falsy
|
gUrls: {},
|
||||||
if (!text) {
|
gTitles: {},
|
||||||
return text;
|
gListLevel: 0,
|
||||||
}
|
hashLinkCounts: {}
|
||||||
|
|
||||||
var globals = {
|
|
||||||
gHtmlBlocks: [],
|
|
||||||
gUrls: {},
|
|
||||||
gTitles: {},
|
|
||||||
gListLevel: 0,
|
|
||||||
hashLinkCounts: {}
|
|
||||||
};
|
|
||||||
|
|
||||||
// attacklab: Replace ~ with ~T
|
|
||||||
// This lets us use tilde as an escape char to avoid md5 hashes
|
|
||||||
// The choice of character is arbitrary; anything that isn't
|
|
||||||
// magic in Markdown will work.
|
|
||||||
text = text.replace(/~/g, '~T');
|
|
||||||
|
|
||||||
// attacklab: Replace $ with ~D
|
|
||||||
// RegExp interprets $ as a special character
|
|
||||||
// when it's in a replacement string
|
|
||||||
text = text.replace(/\$/g, '~D');
|
|
||||||
|
|
||||||
// Standardize line endings
|
|
||||||
text = text.replace(/\r\n/g, '\n'); // DOS to Unix
|
|
||||||
text = text.replace(/\r/g, '\n'); // Mac to Unix
|
|
||||||
|
|
||||||
// Make sure text begins and ends with a couple of newlines:
|
|
||||||
text = '\n\n' + text + '\n\n';
|
|
||||||
|
|
||||||
// Run all registered parsers
|
|
||||||
for (var i = 0; i < parserOrder.length; ++i) {
|
|
||||||
var name = parserOrder[i];
|
|
||||||
text = parsers[name](text, options, globals);
|
|
||||||
}
|
|
||||||
|
|
||||||
// attacklab: Restore dollar signs
|
|
||||||
text = text.replace(/~D/g, '$$');
|
|
||||||
|
|
||||||
// attacklab: Restore tildes
|
|
||||||
text = text.replace(/~T/g, '~');
|
|
||||||
|
|
||||||
// Run output modifiers
|
|
||||||
//showdown.forEach(g_output_modifiers, function (x) {
|
|
||||||
// text = _ExecuteExtension(x, text);
|
|
||||||
//});
|
|
||||||
|
|
||||||
return text;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// attacklab: Replace ~ with ~T
|
||||||
|
// This lets us use tilde as an escape char to avoid md5 hashes
|
||||||
|
// The choice of character is arbitrary; anything that isn't
|
||||||
|
// magic in Markdown will work.
|
||||||
|
text = text.replace(/~/g, '~T');
|
||||||
|
|
||||||
return {
|
// attacklab: Replace $ with ~D
|
||||||
makeHtml: makeHtml
|
// RegExp interprets $ as a special character
|
||||||
};
|
// when it's in a replacement string
|
||||||
|
text = text.replace(/\$/g, '~D');
|
||||||
|
|
||||||
|
// Standardize line endings
|
||||||
|
text = text.replace(/\r\n/g, '\n'); // DOS to Unix
|
||||||
|
text = text.replace(/\r/g, '\n'); // Mac to Unix
|
||||||
|
|
||||||
|
// Make sure text begins and ends with a couple of newlines:
|
||||||
|
text = '\n\n' + text + '\n\n';
|
||||||
|
|
||||||
|
// Run all registered parsers
|
||||||
|
for (var i = 0; i < parserOrder.length; ++i) {
|
||||||
|
var name = parserOrder[i];
|
||||||
|
text = parsers[name](text, options, globals);
|
||||||
|
}
|
||||||
|
|
||||||
|
// attacklab: Restore dollar signs
|
||||||
|
text = text.replace(/~D/g, '$$');
|
||||||
|
|
||||||
|
// attacklab: Restore tildes
|
||||||
|
text = text.replace(/~T/g, '~');
|
||||||
|
|
||||||
|
// Run output modifiers
|
||||||
|
//showdown.forEach(g_output_modifiers, function (x) {
|
||||||
|
// text = _ExecuteExtension(x, text);
|
||||||
|
//});
|
||||||
|
|
||||||
|
return text;
|
||||||
|
};
|
||||||
|
|
||||||
|
return {
|
||||||
|
makeHtml: makeHtml
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -6,131 +6,130 @@
|
||||||
* Turn Markdown link shortcuts into XHTML <a> tags.
|
* Turn Markdown link shortcuts into XHTML <a> tags.
|
||||||
*/
|
*/
|
||||||
showdown.subParser('anchors', function (text, config, globals) {
|
showdown.subParser('anchors', function (text, config, globals) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var writeAnchorTag = function (wholeMatch, m1, m2, m3, m4, m5, m6, m7) {
|
var writeAnchorTag = function (wholeMatch, m1, m2, m3, m4, m5, m6, m7) {
|
||||||
if (showdown.helper.isUndefined(m7)) {
|
if (showdown.helper.isUndefined(m7)) {
|
||||||
m7 = '';
|
m7 = '';
|
||||||
|
}
|
||||||
|
wholeMatch = m1;
|
||||||
|
var linkText = m2,
|
||||||
|
linkId = m3.toLowerCase(),
|
||||||
|
url = m4,
|
||||||
|
title = m7;
|
||||||
|
|
||||||
|
if (!url) {
|
||||||
|
if (!linkId) {
|
||||||
|
// lower-case and turn embedded newlines into spaces
|
||||||
|
linkId = linkText.toLowerCase().replace(/ ?\n/g, ' ');
|
||||||
|
}
|
||||||
|
url = '#' + linkId;
|
||||||
|
|
||||||
|
if (!showdown.helper.isUndefined(globals.gUrls[linkId])) {
|
||||||
|
url = globals.gUrls[linkId];
|
||||||
|
if (!showdown.helper.isUndefined(globals.gTitles[linkId])) {
|
||||||
|
title = globals.gTitles[linkId];
|
||||||
}
|
}
|
||||||
wholeMatch = m1;
|
} else {
|
||||||
var linkText = m2,
|
if (wholeMatch.search(/\(\s*\)$/m) > -1) {
|
||||||
linkId = m3.toLowerCase(),
|
// Special case for explicit empty url
|
||||||
url = m4,
|
url = '';
|
||||||
title = m7;
|
} else {
|
||||||
|
return wholeMatch;
|
||||||
if (!url) {
|
|
||||||
if (!linkId) {
|
|
||||||
// lower-case and turn embedded newlines into spaces
|
|
||||||
linkId = linkText.toLowerCase().replace(/ ?\n/g, ' ');
|
|
||||||
}
|
|
||||||
url = '#' + linkId;
|
|
||||||
|
|
||||||
if (!showdown.helper.isUndefined(globals.gUrls[linkId])) {
|
|
||||||
url = globals.gUrls[linkId];
|
|
||||||
if (!showdown.helper.isUndefined(globals.gTitles[linkId])) {
|
|
||||||
title = globals.gTitles[linkId];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if (wholeMatch.search(/\(\s*\)$/m) > -1) {
|
|
||||||
// Special case for explicit empty url
|
|
||||||
url = '';
|
|
||||||
} else {
|
|
||||||
return wholeMatch;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
url = showdown.helper.escapeCharacters(url, '*_');
|
url = showdown.helper.escapeCharacters(url, '*_');
|
||||||
var result = '<a href="' + url + '"';
|
var result = '<a href="' + url + '"';
|
||||||
|
|
||||||
if (title !== '' && title !== null) {
|
if (title !== '' && title !== null) {
|
||||||
title = title.replace(/"/g, '"');
|
title = title.replace(/"/g, '"');
|
||||||
title = showdown.helper.escapeCharacters(title, '*_');
|
title = showdown.helper.escapeCharacters(title, '*_');
|
||||||
result += ' title="' + title + '"';
|
result += ' title="' + title + '"';
|
||||||
}
|
}
|
||||||
|
|
||||||
result += '>' + linkText + '</a>';
|
result += '>' + linkText + '</a>';
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
};
|
};
|
||||||
|
|
||||||
// First, handle reference-style links: [link text] [id]
|
// First, handle reference-style links: [link text] [id]
|
||||||
/*
|
/*
|
||||||
text = text.replace(/
|
text = text.replace(/
|
||||||
( // wrap whole match in $1
|
( // wrap whole match in $1
|
||||||
\[
|
\[
|
||||||
(
|
(
|
||||||
(?:
|
(?:
|
||||||
\[[^\]]*\] // allow brackets nested one level
|
\[[^\]]*\] // allow brackets nested one level
|
||||||
|
|
|
|
||||||
[^\[] // or anything else
|
[^\[] // or anything else
|
||||||
)*
|
)*
|
||||||
)
|
)
|
||||||
\]
|
\]
|
||||||
|
|
||||||
[ ]? // one optional space
|
[ ]? // one optional space
|
||||||
(?:\n[ ]*)? // one optional newline followed by spaces
|
(?:\n[ ]*)? // one optional newline followed by spaces
|
||||||
|
|
||||||
\[
|
\[
|
||||||
(.*?) // id = $3
|
(.*?) // id = $3
|
||||||
\]
|
\]
|
||||||
)()()()() // pad remaining backreferences
|
)()()()() // pad remaining backreferences
|
||||||
/g,_DoAnchors_callback);
|
/g,_DoAnchors_callback);
|
||||||
*/
|
*/
|
||||||
text = text.replace(/(\[((?:\[[^\]]*\]|[^\[\]])*)\][ ]?(?:\n[ ]*)?\[(.*?)\])()()()()/g, writeAnchorTag);
|
text = text.replace(/(\[((?:\[[^\]]*\]|[^\[\]])*)\][ ]?(?:\n[ ]*)?\[(.*?)\])()()()()/g, writeAnchorTag);
|
||||||
|
|
||||||
//
|
//
|
||||||
// Next, inline-style links: [link text](url "optional title")
|
// Next, inline-style links: [link text](url "optional title")
|
||||||
//
|
//
|
||||||
|
|
||||||
/*
|
/*
|
||||||
text = text.replace(/
|
text = text.replace(/
|
||||||
( // wrap whole match in $1
|
( // wrap whole match in $1
|
||||||
\[
|
\[
|
||||||
(
|
(
|
||||||
(?:
|
(?:
|
||||||
\[[^\]]*\] // allow brackets nested one level
|
\[[^\]]*\] // allow brackets nested one level
|
||||||
|
|
|
|
||||||
[^\[\]] // or anything else
|
[^\[\]] // or anything else
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
\]
|
\]
|
||||||
\( // literal paren
|
\( // literal paren
|
||||||
[ \t]*
|
[ \t]*
|
||||||
() // no id, so leave $3 empty
|
() // no id, so leave $3 empty
|
||||||
<?(.*?)>? // href = $4
|
<?(.*?)>? // href = $4
|
||||||
[ \t]*
|
[ \t]*
|
||||||
( // $5
|
( // $5
|
||||||
(['"]) // quote char = $6
|
(['"]) // quote char = $6
|
||||||
(.*?) // Title = $7
|
(.*?) // Title = $7
|
||||||
\6 // matching quote
|
\6 // matching quote
|
||||||
[ \t]* // ignore any spaces/tabs between closing quote and )
|
[ \t]* // ignore any spaces/tabs between closing quote and )
|
||||||
)? // title is optional
|
)? // title is optional
|
||||||
\)
|
\)
|
||||||
)
|
)
|
||||||
/g,writeAnchorTag);
|
/g,writeAnchorTag);
|
||||||
*/
|
*/
|
||||||
text = text.replace(/(\[((?:\[[^\]]*\]|[^\[\]])*)\]\([ \t]*()<?(.*?(?:\(.*?\).*?)?)>?[ \t]*((['"])(.*?)\6[ \t]*)?\))/g, writeAnchorTag);
|
text = text.replace(/(\[((?:\[[^\]]*\]|[^\[\]])*)\]\([ \t]*()<?(.*?(?:\(.*?\).*?)?)>?[ \t]*((['"])(.*?)\6[ \t]*)?\))/g,
|
||||||
|
writeAnchorTag);
|
||||||
|
|
||||||
//
|
//
|
||||||
// Last, handle reference-style shortcuts: [link text]
|
// Last, handle reference-style shortcuts: [link text]
|
||||||
// These must come last in case you've also got [link test][1]
|
// These must come last in case you've also got [link test][1]
|
||||||
// or [link test](/foo)
|
// or [link test](/foo)
|
||||||
//
|
//
|
||||||
|
|
||||||
/*
|
/*
|
||||||
text = text.replace(/
|
text = text.replace(/
|
||||||
( // wrap whole match in $1
|
( // wrap whole match in $1
|
||||||
\[
|
\[
|
||||||
([^\[\]]+) // link text = $2; can't contain '[' or ']'
|
([^\[\]]+) // link text = $2; can't contain '[' or ']'
|
||||||
\]
|
\]
|
||||||
)()()()()() // pad rest of backreferences
|
)()()()()() // pad rest of backreferences
|
||||||
/g, writeAnchorTag);
|
/g, writeAnchorTag);
|
||||||
*/
|
*/
|
||||||
text = text.replace(/(\[([^\[\]]+)\])()()()()()/g, writeAnchorTag);
|
text = text.replace(/(\[([^\[\]]+)\])()()()()()/g, writeAnchorTag);
|
||||||
|
|
||||||
return text;
|
|
||||||
|
|
||||||
|
return text;
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -3,31 +3,29 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
showdown.subParser('autoLinks', function (text) {
|
showdown.subParser('autoLinks', function (text) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
text = text.replace(/<((https?|ftp|dict):[^'">\s]+)>/gi, "<a href=\"$1\">$1</a>");
|
text = text.replace(/<((https?|ftp|dict):[^'">\s]+)>/gi, "<a href=\"$1\">$1</a>");
|
||||||
|
|
||||||
// Email addresses: <address@domain.foo>
|
// Email addresses: <address@domain.foo>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
text = text.replace(/
|
text = text.replace(/
|
||||||
<
|
<
|
||||||
(?:mailto:)?
|
(?:mailto:)?
|
||||||
(
|
(
|
||||||
[-.\w]+
|
[-.\w]+
|
||||||
\@
|
\@
|
||||||
[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+
|
[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+
|
||||||
)
|
)
|
||||||
>
|
>
|
||||||
/gi, _DoAutoLinks_callback());
|
/gi, _DoAutoLinks_callback());
|
||||||
*/
|
*/
|
||||||
text = text.replace(/<(?:mailto:)?([-.\w]+\@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)>/gi,
|
text = text.replace(/<(?:mailto:)?([-.\w]+\@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)>/gi, function (wholeMatch, m1) {
|
||||||
function (wholeMatch, m1) {
|
var unescapedStr = showdown.subParser('unescapeSpecialChars')(m1);
|
||||||
var unescapedStr = showdown.subParser('unescapeSpecialChars')(m1);
|
return showdown.subParser('encodeEmailAddress')(unescapedStr);
|
||||||
return showdown.subParser('encodeEmailAddress')(unescapedStr);
|
});
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
return text;
|
return text;
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -7,27 +7,27 @@
|
||||||
* tags like paragraphs, headers, and list items.
|
* tags like paragraphs, headers, and list items.
|
||||||
*/
|
*/
|
||||||
showdown.subParser('blockGamut', function (text, options, globals) {
|
showdown.subParser('blockGamut', function (text, options, globals) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
text = showdown.subParser('headers')(text, options, globals);
|
text = showdown.subParser('headers')(text, options, globals);
|
||||||
|
|
||||||
// Do Horizontal Rules:
|
// Do Horizontal Rules:
|
||||||
var key = showdown.subParser('hashBlock')('<hr />', options, globals);
|
var key = showdown.subParser('hashBlock')('<hr />', options, globals);
|
||||||
text = text.replace(/^[ ]{0,2}([ ]?\*[ ]?){3,}[ \t]*$/gm, key);
|
text = text.replace(/^[ ]{0,2}([ ]?\*[ ]?){3,}[ \t]*$/gm, key);
|
||||||
text = text.replace(/^[ ]{0,2}([ ]?\-[ ]?){3,}[ \t]*$/gm, key);
|
text = text.replace(/^[ ]{0,2}([ ]?\-[ ]?){3,}[ \t]*$/gm, key);
|
||||||
text = text.replace(/^[ ]{0,2}([ ]?\_[ ]?){3,}[ \t]*$/gm, key);
|
text = text.replace(/^[ ]{0,2}([ ]?\_[ ]?){3,}[ \t]*$/gm, key);
|
||||||
|
|
||||||
text = showdown.subParser('lists')(text, options, globals);
|
text = showdown.subParser('lists')(text, options, globals);
|
||||||
text = showdown.subParser('codeBlocks')(text, options, globals);
|
text = showdown.subParser('codeBlocks')(text, options, globals);
|
||||||
text = showdown.subParser('blockQuotes')(text, options, globals);
|
text = showdown.subParser('blockQuotes')(text, options, globals);
|
||||||
|
|
||||||
// We already ran _HashHTMLBlocks() before, in Markdown(), but that
|
// We already ran _HashHTMLBlocks() before, in Markdown(), but that
|
||||||
// was to escape raw HTML in the original Markdown source. This time,
|
// 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
|
// we're escaping the markup we've just created, so that we don't wrap
|
||||||
// <p> tags around block-level tags.
|
// <p> tags around block-level tags.
|
||||||
text = showdown.subParser('hashHTMLBlocks')(text, options, globals);
|
text = showdown.subParser('hashHTMLBlocks')(text, options, globals);
|
||||||
text = showdown.subParser('paragraphs')(text, options, globals);
|
text = showdown.subParser('paragraphs')(text, options, globals);
|
||||||
|
|
||||||
return text;
|
return text;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,48 +3,45 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
showdown.subParser('blockQuotes', function (text, options, globals) {
|
showdown.subParser('blockQuotes', function (text, options, globals) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
/*
|
/*
|
||||||
text = text.replace(/
|
text = text.replace(/
|
||||||
( // Wrap whole match in $1
|
( // Wrap whole match in $1
|
||||||
(
|
(
|
||||||
^[ \t]*>[ \t]? // '>' at the start of a line
|
^[ \t]*>[ \t]? // '>' at the start of a line
|
||||||
.+\n // rest of the first line
|
.+\n // rest of the first line
|
||||||
(.+\n)* // subsequent consecutive lines
|
(.+\n)* // subsequent consecutive lines
|
||||||
\n* // blanks
|
\n* // blanks
|
||||||
)+
|
)+
|
||||||
)
|
)
|
||||||
/gm, function(){...});
|
/gm, function(){...});
|
||||||
*/
|
*/
|
||||||
|
|
||||||
text = text.replace(/((^[ \t]*>[ \t]?.+\n(.+\n)*\n*)+)/gm,
|
text = text.replace(/((^[ \t]*>[ \t]?.+\n(.+\n)*\n*)+)/gm, function (wholeMatch, m1) {
|
||||||
function (wholeMatch, m1) {
|
var bq = m1;
|
||||||
var bq = m1;
|
|
||||||
|
|
||||||
// attacklab: hack around Konqueror 3.5.4 bug:
|
// attacklab: hack around Konqueror 3.5.4 bug:
|
||||||
// "----------bug".replace(/^-/g,"") == "bug"
|
// "----------bug".replace(/^-/g,"") == "bug"
|
||||||
bq = bq.replace(/^[ \t]*>[ \t]?/gm, '~0'); // trim one level of quoting
|
bq = bq.replace(/^[ \t]*>[ \t]?/gm, '~0'); // trim one level of quoting
|
||||||
|
|
||||||
// attacklab: clean up hack
|
// attacklab: clean up hack
|
||||||
bq = bq.replace(/~0/g, '');
|
bq = bq.replace(/~0/g, '');
|
||||||
|
|
||||||
bq = bq.replace(/^[ \t]+$/gm, ''); // trim whitespace-only lines
|
bq = bq.replace(/^[ \t]+$/gm, ''); // trim whitespace-only lines
|
||||||
bq = showdown.subParser('blockGamut')(bq, options, globals); // recurse
|
bq = showdown.subParser('blockGamut')(bq, options, globals); // recurse
|
||||||
|
|
||||||
bq = bq.replace(/(^|\n)/g, '$1 ');
|
bq = bq.replace(/(^|\n)/g, '$1 ');
|
||||||
// These leading spaces screw with <pre> content, so we need to fix that:
|
// These leading spaces screw with <pre> content, so we need to fix that:
|
||||||
bq = bq.replace(
|
bq = bq.replace(/(\s*<pre>[^\r]+?<\/pre>)/gm, function (wholeMatch, m1) {
|
||||||
/(\s*<pre>[^\r]+?<\/pre>)/gm,
|
var pre = m1;
|
||||||
function (wholeMatch, m1) {
|
// attacklab: hack around Konqueror 3.5.4 bug:
|
||||||
var pre = m1;
|
pre = pre.replace(/^ /mg, '~0');
|
||||||
// attacklab: hack around Konqueror 3.5.4 bug:
|
pre = pre.replace(/~0/g, '');
|
||||||
pre = pre.replace(/^ /mg, '~0');
|
return pre;
|
||||||
pre = pre.replace(/~0/g, '');
|
});
|
||||||
return pre;
|
|
||||||
});
|
|
||||||
|
|
||||||
return showdown.subParser('hashBlock')('<blockquote>\n' + bq + '\n</blockquote>', options, globals);
|
return showdown.subParser('hashBlock')('<blockquote>\n' + bq + '\n</blockquote>', options, globals);
|
||||||
});
|
});
|
||||||
return text;
|
return text;
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -6,43 +6,41 @@
|
||||||
* Process Markdown `<pre><code>` blocks.
|
* Process Markdown `<pre><code>` blocks.
|
||||||
*/
|
*/
|
||||||
showdown.subParser('codeBlocks', function (text, options, globals) {
|
showdown.subParser('codeBlocks', function (text, options, globals) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
/*
|
/*
|
||||||
text = text.replace(text,
|
text = text.replace(text,
|
||||||
/(?:\n\n|^)
|
/(?:\n\n|^)
|
||||||
( // $1 = the code block -- one or more lines, starting with a space/tab
|
( // $1 = the code block -- one or more lines, starting with a space/tab
|
||||||
(?:
|
(?:
|
||||||
(?:[ ]{4}|\t) // Lines must start with a tab or a tab-width of spaces - attacklab: g_tab_width
|
(?:[ ]{4}|\t) // Lines must start with a tab or a tab-width of spaces - attacklab: g_tab_width
|
||||||
.*\n+
|
.*\n+
|
||||||
)+
|
)+
|
||||||
)
|
)
|
||||||
(\n*[ ]{0,3}[^ \t\n]|(?=~0)) // attacklab: g_tab_width
|
(\n*[ ]{0,3}[^ \t\n]|(?=~0)) // attacklab: g_tab_width
|
||||||
/g,function(){...});
|
/g,function(){...});
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// attacklab: sentinel workarounds for lack of \A and \Z, safari\khtml bug
|
// attacklab: sentinel workarounds for lack of \A and \Z, safari\khtml bug
|
||||||
text += '~0';
|
text += '~0';
|
||||||
|
|
||||||
text = text.replace(/(?:\n\n|^)((?:(?:[ ]{4}|\t).*\n+)+)(\n*[ ]{0,3}[^ \t\n]|(?=~0))/g,
|
text = text.replace(/(?:\n\n|^)((?:(?:[ ]{4}|\t).*\n+)+)(\n*[ ]{0,3}[^ \t\n]|(?=~0))/g,
|
||||||
function (wholeMatch, m1, m2) {
|
function (wholeMatch, m1, m2) {
|
||||||
var codeblock = m1,
|
var codeblock = m1, nextChar = m2;
|
||||||
nextChar = m2;
|
|
||||||
|
|
||||||
codeblock = showdown.subParser('outdent')(codeblock);
|
codeblock = showdown.subParser('outdent')(codeblock);
|
||||||
codeblock = showdown.subParser('encodeCode')(codeblock);
|
codeblock = showdown.subParser('encodeCode')(codeblock);
|
||||||
codeblock = showdown.subParser('detab')(codeblock);
|
codeblock = showdown.subParser('detab')(codeblock);
|
||||||
codeblock = codeblock.replace(/^\n+/g, ''); // trim leading newlines
|
codeblock = codeblock.replace(/^\n+/g, ''); // trim leading newlines
|
||||||
codeblock = codeblock.replace(/\n+$/g, ''); // trim trailing whitespace
|
codeblock = codeblock.replace(/\n+$/g, ''); // trim trailing whitespace
|
||||||
|
|
||||||
codeblock = '<pre><code>' + codeblock + '\n</code></pre>';
|
codeblock = '<pre><code>' + codeblock + '\n</code></pre>';
|
||||||
|
|
||||||
return showdown.subParser('hashBlock')(codeblock, options, globals) + nextChar;
|
return showdown.subParser('hashBlock')(codeblock, options, globals) + nextChar;
|
||||||
}
|
});
|
||||||
);
|
|
||||||
|
|
||||||
// attacklab: strip sentinel
|
// attacklab: strip sentinel
|
||||||
text = text.replace(/~0/, '');
|
text = text.replace(/~0/, '');
|
||||||
|
|
||||||
return text;
|
return text;
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -28,30 +28,29 @@
|
||||||
* ... type <code>`bar`</code> ...
|
* ... type <code>`bar`</code> ...
|
||||||
*/
|
*/
|
||||||
showdown.subParser('codeSpans', function (text) {
|
showdown.subParser('codeSpans', function (text) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
/*
|
/*
|
||||||
text = text.replace(/
|
text = text.replace(/
|
||||||
(^|[^\\]) // Character before opening ` can't be a backslash
|
(^|[^\\]) // Character before opening ` can't be a backslash
|
||||||
(`+) // $2 = Opening run of `
|
(`+) // $2 = Opening run of `
|
||||||
( // $3 = The code block
|
( // $3 = The code block
|
||||||
[^\r]*?
|
[^\r]*?
|
||||||
[^`] // attacklab: work around lack of lookbehind
|
[^`] // attacklab: work around lack of lookbehind
|
||||||
)
|
)
|
||||||
\2 // Matching closer
|
\2 // Matching closer
|
||||||
(?!`)
|
(?!`)
|
||||||
/gm, function(){...});
|
/gm, function(){...});
|
||||||
*/
|
*/
|
||||||
|
|
||||||
text = text.replace(/(^|[^\\])(`+)([^\r]*?[^`])\2(?!`)/gm,
|
text = text.replace(/(^|[^\\])(`+)([^\r]*?[^`])\2(?!`)/gm, function (wholeMatch, m1, m2, m3) {
|
||||||
function (wholeMatch, m1, m2, m3) {
|
var c = m3;
|
||||||
var c = m3;
|
c = c.replace(/^([ \t]*)/g, ''); // leading whitespace
|
||||||
c = c.replace(/^([ \t]*)/g, ''); // leading whitespace
|
c = c.replace(/[ \t]*$/g, ''); // trailing whitespace
|
||||||
c = c.replace(/[ \t]*$/g, ''); // trailing whitespace
|
c = showdown.subParser('encodeCode')(c);
|
||||||
c = showdown.subParser('encodeCode')(c);
|
return m1 + '<code>' + c + '</code>';
|
||||||
return m1 + '<code>' + c + '</code>';
|
});
|
||||||
});
|
|
||||||
|
|
||||||
return text;
|
return text;
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -6,33 +6,30 @@
|
||||||
* Convert all tabs to spaces
|
* Convert all tabs to spaces
|
||||||
*/
|
*/
|
||||||
showdown.subParser('detab', function (text) {
|
showdown.subParser('detab', function (text) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
// expand first n-1 tabs
|
// expand first n-1 tabs
|
||||||
text = text.replace(/\t(?=\t)/g, ' '); // g_tab_width
|
text = text.replace(/\t(?=\t)/g, ' '); // g_tab_width
|
||||||
|
|
||||||
// replace the nth with two sentinels
|
// replace the nth with two sentinels
|
||||||
text = text.replace(/\t/g, '~A~B');
|
text = text.replace(/\t/g, '~A~B');
|
||||||
|
|
||||||
// use the sentinel to anchor our regex so it doesn't explode
|
// use the sentinel to anchor our regex so it doesn't explode
|
||||||
text = text.replace(/~B(.+?)~A/g,
|
text = text.replace(/~B(.+?)~A/g, function (wholeMatch, m1) {
|
||||||
function (wholeMatch, m1) {
|
var leadingText = m1, numSpaces = 4 - leadingText.length % 4; // g_tab_width
|
||||||
var leadingText = m1,
|
|
||||||
numSpaces = 4 - leadingText.length % 4; // g_tab_width
|
|
||||||
|
|
||||||
// there *must* be a better way to do this:
|
// there *must* be a better way to do this:
|
||||||
for (var i = 0; i < numSpaces; i++) {
|
for (var i = 0; i < numSpaces; i++) {
|
||||||
leadingText += ' ';
|
leadingText += ' ';
|
||||||
}
|
}
|
||||||
|
|
||||||
return leadingText;
|
return leadingText;
|
||||||
}
|
});
|
||||||
);
|
|
||||||
|
|
||||||
// clean up sentinels
|
// clean up sentinels
|
||||||
text = text.replace(/~A/g, ' '); // g_tab_width
|
text = text.replace(/~A/g, ' '); // g_tab_width
|
||||||
text = text.replace(/~B/g, '');
|
text = text.replace(/~B/g, '');
|
||||||
|
|
||||||
return text;
|
return text;
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -6,13 +6,13 @@
|
||||||
* Smart processing for ampersands and angle brackets that need to be encoded.
|
* Smart processing for ampersands and angle brackets that need to be encoded.
|
||||||
*/
|
*/
|
||||||
showdown.subParser('encodeAmpsAndAngles', function (text) {
|
showdown.subParser('encodeAmpsAndAngles', function (text) {
|
||||||
'use strict';
|
'use strict';
|
||||||
// Ampersand-encoding based entirely on Nat Irons's Amputator MT plugin:
|
// Ampersand-encoding based entirely on Nat Irons's Amputator MT plugin:
|
||||||
// http://bumppo.net/projects/amputator/
|
// http://bumppo.net/projects/amputator/
|
||||||
text = text.replace(/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/g, '&');
|
text = text.replace(/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/g, '&');
|
||||||
|
|
||||||
// Encode naked <'s
|
// Encode naked <'s
|
||||||
text = text.replace(/<(?![a-z\/?\$!])/gi, '<');
|
text = text.replace(/<(?![a-z\/?\$!])/gi, '<');
|
||||||
|
|
||||||
return text;
|
return text;
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,8 @@
|
||||||
* as an optimization for Firefox. This function gets called a LOT.
|
* as an optimization for Firefox. This function gets called a LOT.
|
||||||
*/
|
*/
|
||||||
showdown.subParser('encodeBackslashEscapes', function (text) {
|
showdown.subParser('encodeBackslashEscapes', function (text) {
|
||||||
'use strict';
|
'use strict';
|
||||||
text = text.replace(/\\(\\)/g, showdown.helper.escapeCharactersCallback);
|
text = text.replace(/\\(\\)/g, showdown.helper.escapeCharactersCallback);
|
||||||
text = text.replace(/\\([`*_{}\[\]()>#+-.!])/g, showdown.helper.escapeCharactersCallback);
|
text = text.replace(/\\([`*_{}\[\]()>#+-.!])/g, showdown.helper.escapeCharactersCallback);
|
||||||
return text;
|
return text;
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -8,26 +8,26 @@
|
||||||
* and lose their special Markdown meanings.
|
* and lose their special Markdown meanings.
|
||||||
*/
|
*/
|
||||||
showdown.subParser('encodeCode', function (text) {
|
showdown.subParser('encodeCode', function (text) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
// Encode all ampersands; HTML entities are not
|
// Encode all ampersands; HTML entities are not
|
||||||
// entities within a Markdown code span.
|
// entities within a Markdown code span.
|
||||||
text = text.replace(/&/g, '&');
|
text = text.replace(/&/g, '&');
|
||||||
|
|
||||||
// Do the angle bracket song and dance:
|
// Do the angle bracket song and dance:
|
||||||
text = text.replace(/</g, '<');
|
text = text.replace(/</g, '<');
|
||||||
text = text.replace(/>/g, '>');
|
text = text.replace(/>/g, '>');
|
||||||
|
|
||||||
// Now, escape characters that are magic in Markdown:
|
// Now, escape characters that are magic in Markdown:
|
||||||
text = showdown.helper.escapeCharacters(text, '*_{}[]\\', false);
|
text = showdown.helper.escapeCharacters(text, '*_{}[]\\', false);
|
||||||
|
|
||||||
// jj the line above breaks this:
|
// jj the line above breaks this:
|
||||||
//---
|
//---
|
||||||
//* Item
|
//* Item
|
||||||
// 1. Subitem
|
// 1. Subitem
|
||||||
// special char: *
|
// special char: *
|
||||||
// ---
|
// ---
|
||||||
|
|
||||||
return text;
|
return text;
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@
|
||||||
* Created by Estevao on 12-01-2015.
|
* Created by Estevao on 12-01-2015.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Input: an email address, e.g. "foo@example.com"
|
* Input: an email address, e.g. "foo@example.com"
|
||||||
*
|
*
|
||||||
|
|
@ -19,42 +18,38 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
showdown.subParser('encodeEmailAddress', function (addr) {
|
showdown.subParser('encodeEmailAddress', function (addr) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var encode = [
|
var encode = [
|
||||||
function (ch) {
|
function (ch) {
|
||||||
return '&#' + ch.charCodeAt(0) + ';';
|
return '&#' + ch.charCodeAt(0) + ';';
|
||||||
},
|
}, function (ch) {
|
||||||
function (ch) {
|
return '&#x' + ch.charCodeAt(0).toString(16) + ';';
|
||||||
return '&#x' + ch.charCodeAt(0).toString(16) + ';';
|
}, function (ch) {
|
||||||
},
|
return ch;
|
||||||
function (ch) {
|
}
|
||||||
return ch;
|
];
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
addr = 'mailto:' + addr;
|
addr = 'mailto:' + addr;
|
||||||
|
|
||||||
addr = addr.replace(/./g, function (ch) {
|
addr = addr.replace(/./g, function (ch) {
|
||||||
if (ch === '@') {
|
if (ch === '@') {
|
||||||
// this *must* be encoded. I insist.
|
// this *must* be encoded. I insist.
|
||||||
ch = encode[Math.floor(Math.random() * 2)](ch);
|
ch = encode[Math.floor(Math.random() * 2)](ch);
|
||||||
} else if (ch !== ':') {
|
} else if (ch !== ':') {
|
||||||
// leave ':' alone (to spot mailto: later)
|
// leave ':' alone (to spot mailto: later)
|
||||||
var r = Math.random();
|
var r = Math.random();
|
||||||
// roughly 10% raw, 45% hex, 45% dec
|
// roughly 10% raw, 45% hex, 45% dec
|
||||||
ch = (
|
ch = (
|
||||||
r > 0.9 ? encode[2](ch) :
|
r > 0.9 ? encode[2](ch) : r > 0.45 ? encode[1](ch) : encode[0](ch)
|
||||||
r > 0.45 ? encode[1](ch) :
|
);
|
||||||
encode[0](ch)
|
}
|
||||||
);
|
return ch;
|
||||||
}
|
});
|
||||||
return ch;
|
|
||||||
});
|
|
||||||
|
|
||||||
addr = '<a href="' + addr + '">' + addr + '</a>';
|
addr = '<a href="' + addr + '">' + addr + '</a>';
|
||||||
addr = addr.replace(/">.+:/g, '">'); // strip the mailto: from the visible part
|
addr = addr.replace(/">.+:/g, '">'); // strip the mailto: from the visible part
|
||||||
|
|
||||||
return addr;
|
return addr;
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -7,17 +7,17 @@
|
||||||
* don't conflict with their use in Markdown for code, italics and strong.
|
* don't conflict with their use in Markdown for code, italics and strong.
|
||||||
*/
|
*/
|
||||||
showdown.subParser('escapeSpecialCharsWithinTagAttributes', function (text) {
|
showdown.subParser('escapeSpecialCharsWithinTagAttributes', function (text) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
// Build a regex to find HTML tags and comments. See Friedl's
|
// Build a regex to find HTML tags and comments. See Friedl's
|
||||||
// "Mastering Regular Expressions", 2nd Ed., pp. 200-201.
|
// "Mastering Regular Expressions", 2nd Ed., pp. 200-201.
|
||||||
var regex = /(<[a-z\/!$]("[^"]*"|'[^']*'|[^'">])*>|<!(--.*?--\s*)+>)/gi;
|
var regex = /(<[a-z\/!$]("[^"]*"|'[^']*'|[^'">])*>|<!(--.*?--\s*)+>)/gi;
|
||||||
|
|
||||||
text = text.replace(regex, function (wholeMatch) {
|
text = text.replace(regex, function (wholeMatch) {
|
||||||
var tag = wholeMatch.replace(/(.)<\/?code>(?=.)/g, '$1`');
|
var tag = wholeMatch.replace(/(.)<\/?code>(?=.)/g, '$1`');
|
||||||
tag = showdown.helper.escapeCharacters(tag, '\\`*_');
|
tag = showdown.helper.escapeCharacters(tag, '\\`*_');
|
||||||
return tag;
|
return tag;
|
||||||
});
|
});
|
||||||
|
|
||||||
return text;
|
return text;
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -13,34 +13,30 @@
|
||||||
* ```
|
* ```
|
||||||
*/
|
*/
|
||||||
showdown.subParser('githubCodeBlocks', function (text, options, globals) {
|
showdown.subParser('githubCodeBlocks', function (text, options, globals) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
text += '~0';
|
text += '~0';
|
||||||
|
|
||||||
text = text.replace(/(?:^|\n)```(.*)\n([\s\S]*?)\n```/g,
|
text = text.replace(/(?:^|\n)```(.*)\n([\s\S]*?)\n```/g, function (wholeMatch, m1, m2) {
|
||||||
function (wholeMatch, m1, m2) {
|
var language = m1, codeblock = m2, end = '\n';
|
||||||
var language = m1,
|
|
||||||
codeblock = m2,
|
|
||||||
end = '\n';
|
|
||||||
|
|
||||||
if (options.omitExtraWLInCodeBlocks) {
|
if (options.omitExtraWLInCodeBlocks) {
|
||||||
end = '';
|
end = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
codeblock = showdown.subParser('encodeCode')(codeblock);
|
codeblock = showdown.subParser('encodeCode')(codeblock);
|
||||||
codeblock = showdown.subParser('detab')(codeblock);
|
codeblock = showdown.subParser('detab')(codeblock);
|
||||||
codeblock = codeblock.replace(/^\n+/g, ''); // trim leading newlines
|
codeblock = codeblock.replace(/^\n+/g, ''); // trim leading newlines
|
||||||
codeblock = codeblock.replace(/\n+$/g, ''); // trim trailing whitespace
|
codeblock = codeblock.replace(/\n+$/g, ''); // trim trailing whitespace
|
||||||
|
|
||||||
codeblock = '<pre><code' + (language ? ' class="' + language + '"' : '') + '>' + codeblock + end + '</code></pre>';
|
codeblock = '<pre><code' + (language ? ' class="' + language + '"' : '') + '>' + codeblock + end + '</code></pre>';
|
||||||
|
|
||||||
return showdown.subParser('hashBlock')(codeblock, options, globals);
|
return showdown.subParser('hashBlock')(codeblock, options, globals);
|
||||||
}
|
});
|
||||||
);
|
|
||||||
|
|
||||||
// attacklab: strip sentinel
|
// attacklab: strip sentinel
|
||||||
text = text.replace(/~0/, '');
|
text = text.replace(/~0/, '');
|
||||||
|
|
||||||
return text;
|
return text;
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
showdown.subParser('hashBlock', function (text, options, globals) {
|
showdown.subParser('hashBlock', function (text, options, globals) {
|
||||||
'use strict';
|
'use strict';
|
||||||
text = text.replace(/(^\n+|\n+$)/g, '');
|
text = text.replace(/(^\n+|\n+$)/g, '');
|
||||||
return '\n\n~K' + (globals.gHtmlBlocks.push(text) - 1) + 'K\n\n';
|
return '\n\n~K' + (globals.gHtmlBlocks.push(text) - 1) + 'K\n\n';
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -3,21 +3,21 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
showdown.subParser('hashElement', function (text, options, globals) {
|
showdown.subParser('hashElement', function (text, options, globals) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
return function (wholeMatch, m1) {
|
return function (wholeMatch, m1) {
|
||||||
var blockText = m1;
|
var blockText = m1;
|
||||||
|
|
||||||
// Undo double lines
|
// Undo double lines
|
||||||
blockText = blockText.replace(/\n\n/g, '\n');
|
blockText = blockText.replace(/\n\n/g, '\n');
|
||||||
blockText = blockText.replace(/^\n/, '');
|
blockText = blockText.replace(/^\n/, '');
|
||||||
|
|
||||||
// strip trailing blank lines
|
// strip trailing blank lines
|
||||||
blockText = blockText.replace(/\n+$/g, '');
|
blockText = blockText.replace(/\n+$/g, '');
|
||||||
|
|
||||||
// Replace the element text with a marker ("~KxK" where x is its key)
|
// Replace the element text with a marker ("~KxK" where x is its key)
|
||||||
blockText = '\n\n~K' + (globals.gHtmlBlocks.push(blockText) - 1) + 'K\n\n';
|
blockText = '\n\n~K' + (globals.gHtmlBlocks.push(blockText) - 1) + 'K\n\n';
|
||||||
|
|
||||||
return blockText;
|
return blockText;
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -3,129 +3,135 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
showdown.subParser('hashHTMLBlocks', function (text, options, globals) {
|
showdown.subParser('hashHTMLBlocks', function (text, options, globals) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
// attacklab: Double up blank lines to reduce lookaround
|
// attacklab: Double up blank lines to reduce lookaround
|
||||||
text = text.replace(/\n/g, '\n\n');
|
text = text.replace(/\n/g, '\n\n');
|
||||||
|
|
||||||
// Hashify HTML blocks:
|
// Hashify HTML blocks:
|
||||||
// We only want to do this for block-level HTML tags, such as headers,
|
// We only want to do this for block-level HTML tags, such as headers,
|
||||||
// lists, and tables. That's because we still want to wrap <p>s around
|
// lists, and tables. That's because we still want to wrap <p>s around
|
||||||
// "paragraphs" that are wrapped in non-block-level tags, such as anchors,
|
// "paragraphs" that are wrapped in non-block-level tags, such as anchors,
|
||||||
// phrase emphasis, and spans. The list of tags we're looking for is
|
// phrase emphasis, and spans. The list of tags we're looking for is
|
||||||
// hard-coded:
|
// hard-coded:
|
||||||
//var block_tags_a = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|ins|del|style|section|header|footer|nav|article|aside';
|
//var block_tags_a =
|
||||||
//var block_tags_b = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|style|section|header|footer|nav|article|aside';
|
// 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|ins|del|style|section|header|footer|nav|article|aside';
|
||||||
|
// var block_tags_b =
|
||||||
|
// 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|style|section|header|footer|nav|article|aside';
|
||||||
|
|
||||||
// First, look for nested blocks, e.g.:
|
// First, look for nested blocks, e.g.:
|
||||||
// <div>
|
// <div>
|
||||||
// <div>
|
// <div>
|
||||||
// tags for inner block must be indented.
|
// tags for inner block must be indented.
|
||||||
// </div>
|
// </div>
|
||||||
// </div>
|
// </div>
|
||||||
//
|
//
|
||||||
// The outermost tags must start at the left margin for this to match, and
|
// The outermost tags must start at the left margin for this to match, and
|
||||||
// the inner nested divs must be indented.
|
// the inner nested divs must be indented.
|
||||||
// We need to do this before the next, more liberal match, because the next
|
// We need to do this before the next, more liberal match, because the next
|
||||||
// match will start at the first `<div>` and stop at the first `</div>`.
|
// match will start at the first `<div>` and stop at the first `</div>`.
|
||||||
|
|
||||||
// attacklab: This regex can be expensive when it fails.
|
// attacklab: This regex can be expensive when it fails.
|
||||||
/*
|
/*
|
||||||
var text = text.replace(/
|
var text = text.replace(/
|
||||||
( // save in $1
|
( // save in $1
|
||||||
^ // start of line (with /m)
|
^ // start of line (with /m)
|
||||||
<($block_tags_a) // start tag = $2
|
<($block_tags_a) // start tag = $2
|
||||||
\b // word break
|
\b // word break
|
||||||
// attacklab: hack around khtml/pcre bug...
|
// attacklab: hack around khtml/pcre bug...
|
||||||
[^\r]*?\n // any number of lines, minimally matching
|
[^\r]*?\n // any number of lines, minimally matching
|
||||||
</\2> // the matching end tag
|
</\2> // the matching end tag
|
||||||
[ \t]* // trailing spaces/tabs
|
[ \t]* // trailing spaces/tabs
|
||||||
(?=\n+) // followed by a newline
|
(?=\n+) // followed by a newline
|
||||||
) // attacklab: there are sentinel newlines at end of document
|
) // attacklab: there are sentinel newlines at end of document
|
||||||
/gm,function(){...}};
|
/gm,function(){...}};
|
||||||
*/
|
*/
|
||||||
text = text.replace(/^(<(p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|ins|del)\b[^\r]*?\n<\/\2>[ \t]*(?=\n+))/gm, showdown.subParser('hashElement')(text, options, globals));
|
text = text.replace(/^(<(p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|ins|del)\b[^\r]*?\n<\/\2>[ \t]*(?=\n+))/gm,
|
||||||
|
showdown.subParser('hashElement')(text, options, globals));
|
||||||
|
|
||||||
//
|
//
|
||||||
// Now match more liberally, simply from `\n<tag>` to `</tag>\n`
|
// Now match more liberally, simply from `\n<tag>` to `</tag>\n`
|
||||||
//
|
//
|
||||||
|
|
||||||
/*
|
/*
|
||||||
var text = text.replace(/
|
var text = text.replace(/
|
||||||
( // save in $1
|
( // save in $1
|
||||||
^ // start of line (with /m)
|
^ // start of line (with /m)
|
||||||
<($block_tags_b) // start tag = $2
|
<($block_tags_b) // start tag = $2
|
||||||
\b // word break
|
\b // word break
|
||||||
// attacklab: hack around khtml/pcre bug...
|
// attacklab: hack around khtml/pcre bug...
|
||||||
[^\r]*? // any number of lines, minimally matching
|
[^\r]*? // any number of lines, minimally matching
|
||||||
</\2> // the matching end tag
|
</\2> // the matching end tag
|
||||||
[ \t]* // trailing spaces/tabs
|
[ \t]* // trailing spaces/tabs
|
||||||
(?=\n+) // followed by a newline
|
(?=\n+) // followed by a newline
|
||||||
) // attacklab: there are sentinel newlines at end of document
|
) // attacklab: there are sentinel newlines at end of document
|
||||||
/gm,function(){...}};
|
/gm,function(){...}};
|
||||||
*/
|
*/
|
||||||
text = text.replace(/^(<(p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|style|section|header|footer|nav|article|aside)\b[^\r]*?<\/\2>[ \t]*(?=\n+)\n)/gm, showdown.subParser('hashElement')(text, options, globals));
|
text = text.replace(/^(<(p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|style|section|header|footer|nav|article|aside)\b[^\r]*?<\/\2>[ \t]*(?=\n+)\n)/gm,
|
||||||
|
showdown.subParser('hashElement')(text, options, globals));
|
||||||
|
|
||||||
// Special case just for <hr />. It was easier to make a special case than
|
// Special case just for <hr />. It was easier to make a special case than
|
||||||
// to make the other regex more complicated.
|
// to make the other regex more complicated.
|
||||||
|
|
||||||
/*
|
/*
|
||||||
text = text.replace(/
|
text = text.replace(/
|
||||||
( // save in $1
|
( // save in $1
|
||||||
\n\n // Starting after a blank line
|
\n\n // Starting after a blank line
|
||||||
[ ]{0,3}
|
[ ]{0,3}
|
||||||
(<(hr) // start tag = $2
|
(<(hr) // start tag = $2
|
||||||
\b // word break
|
\b // word break
|
||||||
([^<>])*? //
|
([^<>])*? //
|
||||||
\/?>) // the matching end tag
|
\/?>) // the matching end tag
|
||||||
[ \t]*
|
[ \t]*
|
||||||
(?=\n{2,}) // followed by a blank line
|
(?=\n{2,}) // followed by a blank line
|
||||||
)
|
)
|
||||||
/g,showdown.subParser('hashElement')(text, options, globals));
|
/g,showdown.subParser('hashElement')(text, options, globals));
|
||||||
*/
|
*/
|
||||||
text = text.replace(/(\n[ ]{0,3}(<(hr)\b([^<>])*?\/?>)[ \t]*(?=\n{2,}))/g, showdown.subParser('hashElement')(text, options, globals));
|
text = text.replace(/(\n[ ]{0,3}(<(hr)\b([^<>])*?\/?>)[ \t]*(?=\n{2,}))/g,
|
||||||
|
showdown.subParser('hashElement')(text, options, globals));
|
||||||
|
|
||||||
// Special case for standalone HTML comments:
|
// Special case for standalone HTML comments:
|
||||||
|
|
||||||
/*
|
/*
|
||||||
text = text.replace(/
|
text = text.replace(/
|
||||||
( // save in $1
|
( // save in $1
|
||||||
\n\n // Starting after a blank line
|
\n\n // Starting after a blank line
|
||||||
[ ]{0,3} // attacklab: g_tab_width - 1
|
[ ]{0,3} // attacklab: g_tab_width - 1
|
||||||
<!
|
<!
|
||||||
(--[^\r]*?--\s*)+
|
(--[^\r]*?--\s*)+
|
||||||
>
|
>
|
||||||
[ \t]*
|
[ \t]*
|
||||||
(?=\n{2,}) // followed by a blank line
|
(?=\n{2,}) // followed by a blank line
|
||||||
)
|
)
|
||||||
/g,showdown.subParser('hashElement')(text, options, globals));
|
/g,showdown.subParser('hashElement')(text, options, globals));
|
||||||
*/
|
*/
|
||||||
text = text.replace(/(\n\n[ ]{0,3}<!(--[^\r]*?--\s*)+>[ \t]*(?=\n{2,}))/g, showdown.subParser('hashElement')(text, options, globals));
|
text = text.replace(/(\n\n[ ]{0,3}<!(--[^\r]*?--\s*)+>[ \t]*(?=\n{2,}))/g,
|
||||||
|
showdown.subParser('hashElement')(text, options, globals));
|
||||||
|
|
||||||
// PHP and ASP-style processor instructions (<?...?> and <%...%>)
|
// PHP and ASP-style processor instructions (<?...?> and <%...%>)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
text = text.replace(/
|
text = text.replace(/
|
||||||
(?:
|
(?:
|
||||||
\n\n // Starting after a blank line
|
\n\n // Starting after a blank line
|
||||||
)
|
)
|
||||||
( // save in $1
|
( // save in $1
|
||||||
[ ]{0,3} // attacklab: g_tab_width - 1
|
[ ]{0,3} // attacklab: g_tab_width - 1
|
||||||
(?:
|
(?:
|
||||||
<([?%]) // $2
|
<([?%]) // $2
|
||||||
[^\r]*?
|
[^\r]*?
|
||||||
\2>
|
\2>
|
||||||
)
|
)
|
||||||
[ \t]*
|
[ \t]*
|
||||||
(?=\n{2,}) // followed by a blank line
|
(?=\n{2,}) // followed by a blank line
|
||||||
)
|
)
|
||||||
/g,showdown.subParser('hashElement')(text, options, globals));
|
/g,showdown.subParser('hashElement')(text, options, globals));
|
||||||
*/
|
*/
|
||||||
text = text.replace(/(?:\n\n)([ ]{0,3}(?:<([?%])[^\r]*?\2>)[ \t]*(?=\n{2,}))/g, showdown.subParser('hashElement')(text, options, globals));
|
text = text.replace(/(?:\n\n)([ ]{0,3}(?:<([?%])[^\r]*?\2>)[ \t]*(?=\n{2,}))/g,
|
||||||
|
showdown.subParser('hashElement')(text, options, globals));
|
||||||
// attacklab: Undo double lines (see comment at top of this function)
|
|
||||||
text = text.replace(/\n\n/g, '\n');
|
|
||||||
return text;
|
|
||||||
|
|
||||||
|
// attacklab: Undo double lines (see comment at top of this function)
|
||||||
|
text = text.replace(/\n\n/g, '\n');
|
||||||
|
return text;
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -3,77 +3,77 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
showdown.subParser('headers', function (text, options, globals) {
|
showdown.subParser('headers', function (text, options, globals) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var prefixHeader = options.prefixHeaderId;
|
var prefixHeader = options.prefixHeaderId;
|
||||||
|
|
||||||
// Set text-style headers:
|
// Set text-style headers:
|
||||||
// Header 1
|
// Header 1
|
||||||
// ========
|
// ========
|
||||||
//
|
//
|
||||||
// Header 2
|
// Header 2
|
||||||
// --------
|
// --------
|
||||||
//
|
//
|
||||||
text = text.replace(/^(.+)[ \t]*\n=+[ \t]*\n+/gm,
|
text = text.replace(/^(.+)[ \t]*\n=+[ \t]*\n+/gm, function (wholeMatch, m1) {
|
||||||
function (wholeMatch, m1) {
|
return showdown.subParser('hashBlock')('<h1 id="' + headerId(m1) + '">' + showdown.subParser('spanGamut')(m1,
|
||||||
return showdown.subParser('hashBlock')('<h1 id="' + headerId(m1) + '">' +
|
options,
|
||||||
showdown.subParser('spanGamut')(m1, options, globals) + '</h1>', options, globals);
|
globals) + '</h1>',
|
||||||
});
|
options, globals);
|
||||||
|
});
|
||||||
|
|
||||||
text = text.replace(/^(.+)[ \t]*\n-+[ \t]*\n+/gm,
|
text = text.replace(/^(.+)[ \t]*\n-+[ \t]*\n+/gm, function (matchFound, m1) {
|
||||||
function (matchFound, m1) {
|
return showdown.subParser('hashBlock')('<h2 id="' + headerId(m1) + '">' + showdown.subParser('spanGamut')(m1,
|
||||||
return showdown.subParser('hashBlock')('<h2 id="' + headerId(m1) + '">' +
|
options,
|
||||||
showdown.subParser('spanGamut')(m1, options, globals) + '</h2>', options, globals);
|
globals) + '</h2>',
|
||||||
});
|
options, globals);
|
||||||
|
});
|
||||||
|
|
||||||
// atx-style headers:
|
// atx-style headers:
|
||||||
// # Header 1
|
// # Header 1
|
||||||
// ## Header 2
|
// ## Header 2
|
||||||
// ## Header 2 with closing hashes ##
|
// ## Header 2 with closing hashes ##
|
||||||
// ...
|
// ...
|
||||||
// ###### Header 6
|
// ###### Header 6
|
||||||
//
|
//
|
||||||
|
|
||||||
/*
|
/*
|
||||||
text = text.replace(/
|
text = text.replace(/
|
||||||
^(\#{1,6}) // $1 = string of #'s
|
^(\#{1,6}) // $1 = string of #'s
|
||||||
[ \t]*
|
[ \t]*
|
||||||
(.+?) // $2 = Header text
|
(.+?) // $2 = Header text
|
||||||
[ \t]*
|
[ \t]*
|
||||||
\#* // optional closing #'s (not counted)
|
\#* // optional closing #'s (not counted)
|
||||||
\n+
|
\n+
|
||||||
/gm, function() {...});
|
/gm, function() {...});
|
||||||
*/
|
*/
|
||||||
|
|
||||||
text = text.replace(/^(\#{1,6})[ \t]*(.+?)[ \t]*\#*\n+/gm,
|
text = text.replace(/^(\#{1,6})[ \t]*(.+?)[ \t]*\#*\n+/gm, function (wholeMatch, m1, m2) {
|
||||||
function (wholeMatch, m1, m2) {
|
var span = showdown.subParser('spanGamut')(m2, options,
|
||||||
var span = showdown.subParser('spanGamut')(m2, options, globals),
|
globals), header = '<h' + m1.length + ' id="' + headerId(m2) + '">' + span + '</h' + m1.length + '>';
|
||||||
header = '<h' + m1.length + ' id="' + headerId(m2) + '">' + span + '</h' + m1.length + '>';
|
|
||||||
|
|
||||||
return showdown.subParser('hashBlock')(header, options, globals);
|
return showdown.subParser('hashBlock')(header, options, globals);
|
||||||
});
|
});
|
||||||
|
|
||||||
function headerId(m) {
|
function headerId(m) {
|
||||||
var title,
|
var title, escapedId = m.replace(/[^\w]/g, '').toLowerCase();
|
||||||
escapedId = m.replace(/[^\w]/g, '').toLowerCase();
|
|
||||||
|
|
||||||
if (globals.hashLinkCounts[escapedId]) {
|
if (globals.hashLinkCounts[escapedId]) {
|
||||||
title = escapedId + '-' + (globals.hashLinkCounts[escapedId]++);
|
title = escapedId + '-' + (globals.hashLinkCounts[escapedId]++);
|
||||||
} else {
|
} else {
|
||||||
title = escapedId;
|
title = escapedId;
|
||||||
globals.hashLinkCounts[escapedId] = 1;
|
globals.hashLinkCounts[escapedId] = 1;
|
||||||
}
|
|
||||||
|
|
||||||
// Prefix id to prevent causing inadvertent pre-existing style matches.
|
|
||||||
if (prefixHeader === true) {
|
|
||||||
prefixHeader = 'section';
|
|
||||||
}
|
|
||||||
|
|
||||||
if (showdown.helper.isString(prefixHeader)) {
|
|
||||||
return prefixHeader + title;
|
|
||||||
}
|
|
||||||
return title;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return text;
|
// Prefix id to prevent causing inadvertent pre-existing style matches.
|
||||||
|
if (prefixHeader === true) {
|
||||||
|
prefixHeader = 'section';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (showdown.helper.isString(prefixHeader)) {
|
||||||
|
return prefixHeader + title;
|
||||||
|
}
|
||||||
|
return title;
|
||||||
|
}
|
||||||
|
|
||||||
|
return text;
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -2,108 +2,100 @@
|
||||||
* Created by Estevao on 11-01-2015.
|
* Created by Estevao on 11-01-2015.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Turn Markdown image shortcuts into <img> tags.
|
* Turn Markdown image shortcuts into <img> tags.
|
||||||
*/
|
*/
|
||||||
showdown.subParser('images', function (text, options, globals) {
|
showdown.subParser('images', function (text, options, globals) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var writeImageTag = function (wholeMatch, m1, m2, m3, m4, m5, m6, m7) {
|
var writeImageTag = function (wholeMatch, m1, m2, m3, m4, m5, m6, m7) {
|
||||||
|
|
||||||
wholeMatch = m1;
|
wholeMatch = m1;
|
||||||
var altText = m2,
|
var altText = m2, linkId = m3.toLowerCase(), url = m4, title = m7, gUrls = globals.gUrls, gTitles = globals.gTitles;
|
||||||
linkId = m3.toLowerCase(),
|
|
||||||
url = m4,
|
|
||||||
title = m7,
|
|
||||||
gUrls = globals.gUrls,
|
|
||||||
gTitles = globals.gTitles;
|
|
||||||
|
|
||||||
if (!title) {
|
if (!title) {
|
||||||
title = '';
|
title = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (url === '' || url === null) {
|
||||||
|
if (linkId === '' || linkId === null) {
|
||||||
|
// lower-case and turn embedded newlines into spaces
|
||||||
|
linkId = altText.toLowerCase().replace(/ ?\n/g, ' ');
|
||||||
|
}
|
||||||
|
url = '#' + linkId;
|
||||||
|
|
||||||
|
if (typeof gUrls[linkId] !== 'undefined') {
|
||||||
|
url = gUrls[linkId];
|
||||||
|
if (typeof gTitles[linkId] !== 'undefined') {
|
||||||
|
title = gTitles[linkId];
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
return wholeMatch;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (url === '' || url === null) {
|
altText = altText.replace(/"/g, '"');
|
||||||
if (linkId === '' || linkId === null) {
|
url = showdown.helper.escapeCharacters(url, '*_');
|
||||||
// lower-case and turn embedded newlines into spaces
|
var result = '<img src="' + url + '" alt="' + altText + '"';
|
||||||
linkId = altText.toLowerCase().replace(/ ?\n/g, ' ');
|
|
||||||
}
|
|
||||||
url = '#' + linkId;
|
|
||||||
|
|
||||||
if (typeof gUrls[linkId] !== 'undefined') {
|
// attacklab: Markdown.pl adds empty title attributes to images.
|
||||||
url = gUrls[linkId];
|
// Replicate this bug.
|
||||||
if (typeof gTitles[linkId] !== 'undefined') {
|
|
||||||
title = gTitles[linkId];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
return wholeMatch;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
altText = altText.replace(/"/g, '"');
|
//if (title != "") {
|
||||||
url = showdown.helper.escapeCharacters(url, '*_');
|
title = title.replace(/"/g, '"');
|
||||||
var result = '<img src="' + url + '" alt="' + altText + '"';
|
title = escapeCharacters(title, '*_');
|
||||||
|
result += ' title="' + title + '"';
|
||||||
|
//}
|
||||||
|
|
||||||
// attacklab: Markdown.pl adds empty title attributes to images.
|
result += ' />';
|
||||||
// Replicate this bug.
|
|
||||||
|
|
||||||
//if (title != "") {
|
return result;
|
||||||
title = title.replace(/"/g, '"');
|
};
|
||||||
title = escapeCharacters(title, '*_');
|
|
||||||
result += ' title="' + title + '"';
|
|
||||||
//}
|
|
||||||
|
|
||||||
result += ' />';
|
// First, handle reference-style labeled images: ![alt text][id]
|
||||||
|
/*
|
||||||
|
text = text.replace(/
|
||||||
|
( // wrap whole match in $1
|
||||||
|
!\[
|
||||||
|
(.*?) // alt text = $2
|
||||||
|
\]
|
||||||
|
|
||||||
return result;
|
[ ]? // one optional space
|
||||||
};
|
(?:\n[ ]*)? // one optional newline followed by spaces
|
||||||
|
|
||||||
|
\[
|
||||||
|
(.*?) // id = $3
|
||||||
|
\]
|
||||||
|
)()()()() // pad rest of backreferences
|
||||||
|
/g,writeImageTag);
|
||||||
|
*/
|
||||||
|
text = text.replace(/(!\[(.*?)\][ ]?(?:\n[ ]*)?\[(.*?)\])()()()()/g, writeImageTag);
|
||||||
|
|
||||||
// First, handle reference-style labeled images: ![alt text][id]
|
// Next, handle inline images: 
|
||||||
/*
|
// Don't forget: encode * and _
|
||||||
text = text.replace(/
|
/*
|
||||||
( // wrap whole match in $1
|
text = text.replace(/
|
||||||
!\[
|
( // wrap whole match in $1
|
||||||
(.*?) // alt text = $2
|
!\[
|
||||||
\]
|
(.*?) // alt text = $2
|
||||||
|
\]
|
||||||
|
\s? // One optional whitespace character
|
||||||
|
\( // literal paren
|
||||||
|
[ \t]*
|
||||||
|
() // no id, so leave $3 empty
|
||||||
|
<?(\S+?)>? // src url = $4
|
||||||
|
[ \t]*
|
||||||
|
( // $5
|
||||||
|
(['"]) // quote char = $6
|
||||||
|
(.*?) // title = $7
|
||||||
|
\6 // matching quote
|
||||||
|
[ \t]*
|
||||||
|
)? // title is optional
|
||||||
|
\)
|
||||||
|
)
|
||||||
|
/g,writeImageTag);
|
||||||
|
*/
|
||||||
|
text = text.replace(/(!\[(.*?)\]\s?\([ \t]*()<?(\S+?)>?[ \t]*((['"])(.*?)\6[ \t]*)?\))/g, writeImageTag);
|
||||||
|
|
||||||
[ ]? // one optional space
|
return text;
|
||||||
(?:\n[ ]*)? // one optional newline followed by spaces
|
|
||||||
|
|
||||||
\[
|
|
||||||
(.*?) // id = $3
|
|
||||||
\]
|
|
||||||
)()()()() // pad rest of backreferences
|
|
||||||
/g,writeImageTag);
|
|
||||||
*/
|
|
||||||
text = text.replace(/(!\[(.*?)\][ ]?(?:\n[ ]*)?\[(.*?)\])()()()()/g, writeImageTag);
|
|
||||||
|
|
||||||
// Next, handle inline images: 
|
|
||||||
// Don't forget: encode * and _
|
|
||||||
/*
|
|
||||||
text = text.replace(/
|
|
||||||
( // wrap whole match in $1
|
|
||||||
!\[
|
|
||||||
(.*?) // alt text = $2
|
|
||||||
\]
|
|
||||||
\s? // One optional whitespace character
|
|
||||||
\( // literal paren
|
|
||||||
[ \t]*
|
|
||||||
() // no id, so leave $3 empty
|
|
||||||
<?(\S+?)>? // src url = $4
|
|
||||||
[ \t]*
|
|
||||||
( // $5
|
|
||||||
(['"]) // quote char = $6
|
|
||||||
(.*?) // title = $7
|
|
||||||
\6 // matching quote
|
|
||||||
[ \t]*
|
|
||||||
)? // title is optional
|
|
||||||
\)
|
|
||||||
)
|
|
||||||
/g,writeImageTag);
|
|
||||||
*/
|
|
||||||
text = text.replace(/(!\[(.*?)\]\s?\([ \t]*()<?(\S+?)>?[ \t]*((['"])(.*?)\6[ \t]*)?\))/g, writeImageTag);
|
|
||||||
|
|
||||||
return text;
|
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -3,13 +3,11 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
showdown.subParser('italicsAndBold', function (text) {
|
showdown.subParser('italicsAndBold', function (text) {
|
||||||
'use strict';
|
'use strict';
|
||||||
// <strong> must go first:
|
// <strong> must go first:
|
||||||
text = text.replace(/(\*\*|__)(?=\S)([^\r]*?\S[*_]*)\1/g,
|
text = text.replace(/(\*\*|__)(?=\S)([^\r]*?\S[*_]*)\1/g, '<strong>$2</strong>');
|
||||||
'<strong>$2</strong>');
|
|
||||||
|
|
||||||
text = text.replace(/(\*|_)(?=\S)([^\r]*?\S)\1/g,
|
text = text.replace(/(\*|_)(?=\S)([^\r]*?\S)\1/g, '<em>$2</em>');
|
||||||
'<em>$2</em>');
|
|
||||||
|
|
||||||
return text;
|
return text;
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -6,145 +6,141 @@
|
||||||
* Form HTML ordered (numbered) and unordered (bulleted) lists.
|
* Form HTML ordered (numbered) and unordered (bulleted) lists.
|
||||||
*/
|
*/
|
||||||
showdown.subParser('lists', function (text, options, globals) {
|
showdown.subParser('lists', function (text, options, globals) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Process the contents of a single ordered or unordered list, splitting it
|
* Process the contents of a single ordered or unordered list, splitting it
|
||||||
* into individual list items.
|
* into individual list items.
|
||||||
* @param listStr
|
* @param listStr
|
||||||
* @returns {string|*}
|
* @returns {string|*}
|
||||||
*/
|
*/
|
||||||
var processListItems = function (listStr) {
|
var processListItems = function (listStr) {
|
||||||
// The $g_list_level global keeps track of when we're inside a list.
|
// The $g_list_level global keeps track of when we're inside a list.
|
||||||
// Each time we enter a list, we increment it; when we leave a list,
|
// Each time we enter a list, we increment it; when we leave a list,
|
||||||
// we decrement. If it's zero, we're not in a list anymore.
|
// we decrement. If it's zero, we're not in a list anymore.
|
||||||
//
|
//
|
||||||
// We do this because when we're not inside a list, we want to treat
|
// We do this because when we're not inside a list, we want to treat
|
||||||
// something like this:
|
// something like this:
|
||||||
//
|
//
|
||||||
// I recommend upgrading to version
|
// I recommend upgrading to version
|
||||||
// 8. Oops, now this line is treated
|
// 8. Oops, now this line is treated
|
||||||
// as a sub-list.
|
// as a sub-list.
|
||||||
//
|
//
|
||||||
// As a single paragraph, despite the fact that the second line starts
|
// As a single paragraph, despite the fact that the second line starts
|
||||||
// with a digit-period-space sequence.
|
// with a digit-period-space sequence.
|
||||||
//
|
//
|
||||||
// Whereas when we're inside a list (or sub-list), that line will be
|
// Whereas when we're inside a list (or sub-list), that line will be
|
||||||
// treated as the start of a sub-list. What a kludge, huh? This is
|
// treated as the start of a sub-list. What a kludge, huh? This is
|
||||||
// an aspect of Markdown's syntax that's hard to parse perfectly
|
// an aspect of Markdown's syntax that's hard to parse perfectly
|
||||||
// without resorting to mind-reading. Perhaps the solution is to
|
// without resorting to mind-reading. Perhaps the solution is to
|
||||||
// change the syntax rules such that sub-lists must start with a
|
// change the syntax rules such that sub-lists must start with a
|
||||||
// starting cardinal number; e.g. "1." or "a.".
|
// starting cardinal number; e.g. "1." or "a.".
|
||||||
|
|
||||||
globals.gListLevel++;
|
globals.gListLevel++;
|
||||||
|
|
||||||
// trim trailing blank lines:
|
// trim trailing blank lines:
|
||||||
listStr = listStr.replace(/\n{2,}$/, '\n');
|
listStr = listStr.replace(/\n{2,}$/, '\n');
|
||||||
|
|
||||||
// attacklab: add sentinel to emulate \z
|
// attacklab: add sentinel to emulate \z
|
||||||
listStr += '~0';
|
listStr += '~0';
|
||||||
|
|
||||||
/*
|
|
||||||
list_str = list_str.replace(/
|
|
||||||
(\n)? // leading line = $1
|
|
||||||
(^[ \t]*) // leading whitespace = $2
|
|
||||||
([*+-]|\d+[.]) [ \t]+ // list marker = $3
|
|
||||||
([^\r]+? // list item text = $4
|
|
||||||
(\n{1,2}))
|
|
||||||
(?= \n* (~0 | \2 ([*+-]|\d+[.]) [ \t]+))
|
|
||||||
/gm, function(){...});
|
|
||||||
*/
|
|
||||||
listStr = listStr.replace(/(\n)?(^[ \t]*)([*+-]|\d+[.])[ \t]+([^\r]+?(\n{1,2}))(?=\n*(~0|\2([*+-]|\d+[.])[ \t]+))/gm,
|
|
||||||
function (wholeMatch, m1, m2, m3, m4) {
|
|
||||||
var item = showdown.subParser('outdent')(m4, options, globals);
|
|
||||||
//m1 - LeadingLine
|
|
||||||
|
|
||||||
if (m1 || (item.search(/\n{2,}/) > -1)) {
|
|
||||||
item = showdown.subParser('blockGamut')(item, options, globals);
|
|
||||||
} else {
|
|
||||||
// Recursion for sub-lists:
|
|
||||||
item = showdown.subParser('lists')(item, options, globals);
|
|
||||||
item = item.replace(/\n$/, ''); // chomp(item)
|
|
||||||
item = showdown.subParser('spanGamut')(item, options, globals);
|
|
||||||
}
|
|
||||||
|
|
||||||
return '<li>' + item + '</li>\n';
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
// attacklab: strip sentinel
|
|
||||||
listStr = listStr.replace(/~0/g, '');
|
|
||||||
|
|
||||||
globals.gListLevel--;
|
|
||||||
return listStr;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
// attacklab: add sentinel to hack around khtml/safari bug:
|
|
||||||
// http://bugs.webkit.org/show_bug.cgi?id=11231
|
|
||||||
text += '~0';
|
|
||||||
|
|
||||||
// Re-usable pattern to match any entirel ul or ol list:
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
var whole_list = /
|
list_str = list_str.replace(/
|
||||||
( // $1 = whole list
|
(\n)? // leading line = $1
|
||||||
( // $2
|
(^[ \t]*) // leading whitespace = $2
|
||||||
[ ]{0,3} // attacklab: g_tab_width - 1
|
([*+-]|\d+[.]) [ \t]+ // list marker = $3
|
||||||
([*+-]|\d+[.]) // $3 = first list item marker
|
([^\r]+? // list item text = $4
|
||||||
[ \t]+
|
(\n{1,2}))
|
||||||
)
|
(?= \n* (~0 | \2 ([*+-]|\d+[.]) [ \t]+))
|
||||||
[^\r]+?
|
/gm, function(){...});
|
||||||
( // $4
|
|
||||||
~0 // sentinel for workaround; should be $
|
|
||||||
|
|
|
||||||
\n{2,}
|
|
||||||
(?=\S)
|
|
||||||
(?! // Negative lookahead for another list item marker
|
|
||||||
[ \t]*
|
|
||||||
(?:[*+-]|\d+[.])[ \t]+
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)/g
|
|
||||||
*/
|
*/
|
||||||
var wholeList = /^(([ ]{0,3}([*+-]|\d+[.])[ \t]+)[^\r]+?(~0|\n{2,}(?=\S)(?![ \t]*(?:[*+-]|\d+[.])[ \t]+)))/gm;
|
listStr = listStr.replace(/(\n)?(^[ \t]*)([*+-]|\d+[.])[ \t]+([^\r]+?(\n{1,2}))(?=\n*(~0|\2([*+-]|\d+[.])[ \t]+))/gm,
|
||||||
|
function (wholeMatch, m1, m2, m3, m4) {
|
||||||
|
var item = showdown.subParser('outdent')(m4, options, globals);
|
||||||
|
//m1 - LeadingLine
|
||||||
|
|
||||||
if (globals.gListLevel) {
|
if (m1 || (item.search(/\n{2,}/) > -1)) {
|
||||||
text = text.replace(wholeList, function (wholeMatch, m1, m2) {
|
item = showdown.subParser('blockGamut')(item, options, globals);
|
||||||
var list = m1,
|
} else {
|
||||||
listType = (m2.search(/[*+-]/g) > -1) ? 'ul' : 'ol';
|
// Recursion for sub-lists:
|
||||||
|
item = showdown.subParser('lists')(item, options, globals);
|
||||||
|
item = item.replace(/\n$/, ''); // chomp(item)
|
||||||
|
item = showdown.subParser('spanGamut')(item, options, globals);
|
||||||
|
}
|
||||||
|
|
||||||
// Turn double returns into triple returns, so that we can make a
|
return '<li>' + item + '</li>\n';
|
||||||
// paragraph for the last item in a list, if necessary:
|
});
|
||||||
list = list.replace(/\n{2,}/g, '\n\n\n');
|
|
||||||
|
|
||||||
var result = processListItems(list);
|
|
||||||
|
|
||||||
// Trim any trailing whitespace, to put the closing `</$list_type>`
|
|
||||||
// up on the preceding line, to get it past the current stupid
|
|
||||||
// HTML block parser. This is a hack to work around the terrible
|
|
||||||
// hack that is the HTML block parser.
|
|
||||||
result = result.replace(/\s+$/, '');
|
|
||||||
result = '<' + listType + '>' + result + '</' + listType + '>\n';
|
|
||||||
return result;
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
wholeList = /(\n\n|^\n?)(([ ]{0,3}([*+-]|\d+[.])[ \t]+)[^\r]+?(~0|\n{2,}(?=\S)(?![ \t]*(?:[*+-]|\d+[.])[ \t]+)))/g;
|
|
||||||
|
|
||||||
text = text.replace(wholeList, function(wholeMatch,m1,m2,m3) {
|
|
||||||
|
|
||||||
// Turn double returns into triple returns, so that we can make a
|
|
||||||
// paragraph for the last item in a list, if necessary:
|
|
||||||
var list = m2.replace(/\n{2,}/g, '\n\n\n'),
|
|
||||||
listType = (m3.search(/[*+-]/g) > -1) ? 'ul' : 'ol',
|
|
||||||
result = processListItems(list);
|
|
||||||
|
|
||||||
return m1 + '<' + listType + '>\n' + result + '</' + listType + '>\n';
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// attacklab: strip sentinel
|
// attacklab: strip sentinel
|
||||||
text = text.replace(/~0/, '');
|
listStr = listStr.replace(/~0/g, '');
|
||||||
|
|
||||||
return text;
|
globals.gListLevel--;
|
||||||
|
return listStr;
|
||||||
|
};
|
||||||
|
|
||||||
|
// attacklab: add sentinel to hack around khtml/safari bug:
|
||||||
|
// http://bugs.webkit.org/show_bug.cgi?id=11231
|
||||||
|
text += '~0';
|
||||||
|
|
||||||
|
// Re-usable pattern to match any entirel ul or ol list:
|
||||||
|
|
||||||
|
/*
|
||||||
|
var whole_list = /
|
||||||
|
( // $1 = whole list
|
||||||
|
( // $2
|
||||||
|
[ ]{0,3} // attacklab: g_tab_width - 1
|
||||||
|
([*+-]|\d+[.]) // $3 = first list item marker
|
||||||
|
[ \t]+
|
||||||
|
)
|
||||||
|
[^\r]+?
|
||||||
|
( // $4
|
||||||
|
~0 // sentinel for workaround; should be $
|
||||||
|
|
|
||||||
|
\n{2,}
|
||||||
|
(?=\S)
|
||||||
|
(?! // Negative lookahead for another list item marker
|
||||||
|
[ \t]*
|
||||||
|
(?:[*+-]|\d+[.])[ \t]+
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)/g
|
||||||
|
*/
|
||||||
|
var wholeList = /^(([ ]{0,3}([*+-]|\d+[.])[ \t]+)[^\r]+?(~0|\n{2,}(?=\S)(?![ \t]*(?:[*+-]|\d+[.])[ \t]+)))/gm;
|
||||||
|
|
||||||
|
if (globals.gListLevel) {
|
||||||
|
text = text.replace(wholeList, function (wholeMatch, m1, m2) {
|
||||||
|
var list = m1, listType = (m2.search(/[*+-]/g) > -1) ? 'ul' : 'ol';
|
||||||
|
|
||||||
|
// Turn double returns into triple returns, so that we can make a
|
||||||
|
// paragraph for the last item in a list, if necessary:
|
||||||
|
list = list.replace(/\n{2,}/g, '\n\n\n');
|
||||||
|
|
||||||
|
var result = processListItems(list);
|
||||||
|
|
||||||
|
// Trim any trailing whitespace, to put the closing `</$list_type>`
|
||||||
|
// up on the preceding line, to get it past the current stupid
|
||||||
|
// HTML block parser. This is a hack to work around the terrible
|
||||||
|
// hack that is the HTML block parser.
|
||||||
|
result = result.replace(/\s+$/, '');
|
||||||
|
result = '<' + listType + '>' + result + '</' + listType + '>\n';
|
||||||
|
return result;
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
wholeList = /(\n\n|^\n?)(([ ]{0,3}([*+-]|\d+[.])[ \t]+)[^\r]+?(~0|\n{2,}(?=\S)(?![ \t]*(?:[*+-]|\d+[.])[ \t]+)))/g;
|
||||||
|
|
||||||
|
text = text.replace(wholeList, function (wholeMatch, m1, m2, m3) {
|
||||||
|
|
||||||
|
// Turn double returns into triple returns, so that we can make a
|
||||||
|
// paragraph for the last item in a list, if necessary:
|
||||||
|
var list = m2.replace(/\n{2,}/g,
|
||||||
|
'\n\n\n'), listType = (m3.search(/[*+-]/g) > -1) ? 'ul' : 'ol', result = processListItems(list);
|
||||||
|
|
||||||
|
return m1 + '<' + listType + '>\n' + result + '</' + listType + '>\n';
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// attacklab: strip sentinel
|
||||||
|
text = text.replace(/~0/, '');
|
||||||
|
|
||||||
|
return text;
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -6,14 +6,14 @@
|
||||||
* Remove one level of line-leading tabs or spaces
|
* Remove one level of line-leading tabs or spaces
|
||||||
*/
|
*/
|
||||||
showdown.subParser('outdent', function (text) {
|
showdown.subParser('outdent', function (text) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
// attacklab: hack around Konqueror 3.5.4 bug:
|
// attacklab: hack around Konqueror 3.5.4 bug:
|
||||||
// "----------bug".replace(/^-/g,"") == "bug"
|
// "----------bug".replace(/^-/g,"") == "bug"
|
||||||
text = text.replace(/^(\t|[ ]{1,4})/gm, '~0'); // attacklab: g_tab_width
|
text = text.replace(/^(\t|[ ]{1,4})/gm, '~0'); // attacklab: g_tab_width
|
||||||
|
|
||||||
// attacklab: clean up hack
|
// attacklab: clean up hack
|
||||||
text = text.replace(/~0/g, '');
|
text = text.replace(/~0/g, '');
|
||||||
|
|
||||||
return text;
|
return text;
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -6,42 +6,40 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
showdown.subParser('paragraphs', function (text, options, globals) {
|
showdown.subParser('paragraphs', function (text, options, globals) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
// Strip leading and trailing lines:
|
// Strip leading and trailing lines:
|
||||||
text = text.replace(/^\n+/g, '');
|
text = text.replace(/^\n+/g, '');
|
||||||
text = text.replace(/\n+$/g, '');
|
text = text.replace(/\n+$/g, '');
|
||||||
|
|
||||||
var grafs = text.split(/\n{2,}/g),
|
var grafs = text.split(/\n{2,}/g), grafsOut = [];
|
||||||
grafsOut = [];
|
|
||||||
|
|
||||||
/** Wrap <p> tags. */
|
/** Wrap <p> tags. */
|
||||||
var end = grafs.length;
|
var end = grafs.length;
|
||||||
for (var i = 0; i < end; i++) {
|
for (var i = 0; i < end; i++) {
|
||||||
var str = grafs[i];
|
var str = grafs[i];
|
||||||
|
|
||||||
// if this is an HTML marker, copy it
|
// if this is an HTML marker, copy it
|
||||||
if (str.search(/~K(\d+)K/g) >= 0) {
|
if (str.search(/~K(\d+)K/g) >= 0) {
|
||||||
grafsOut.push(str);
|
grafsOut.push(str);
|
||||||
}
|
} else if (str.search(/\S/) >= 0) {
|
||||||
else if (str.search(/\S/) >= 0) {
|
str = showdown.subParser('spanGamut')(str, options, globals);
|
||||||
str = showdown.subParser('spanGamut')(str, options, globals);
|
str = str.replace(/^([ \t]*)/g, '<p>');
|
||||||
str = str.replace(/^([ \t]*)/g, '<p>');
|
str += '</p>';
|
||||||
str += '</p>';
|
grafsOut.push(str);
|
||||||
grafsOut.push(str);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/** Unhashify HTML blocks */
|
/** Unhashify HTML blocks */
|
||||||
end = grafsOut.length;
|
end = grafsOut.length;
|
||||||
for (i = 0; i < end; i++) {
|
for (i = 0; i < end; i++) {
|
||||||
// if this is a marker for an html block...
|
// if this is a marker for an html block...
|
||||||
while (grafsOut[i].search(/~K(\d+)K/) >= 0) {
|
while (grafsOut[i].search(/~K(\d+)K/) >= 0) {
|
||||||
var blockText = globals.gHtmlBlocks[RegExp.$1];
|
var blockText = globals.gHtmlBlocks[RegExp.$1];
|
||||||
blockText = blockText.replace(/\$/g, '$$$$'); // Escape any dollar signs
|
blockText = blockText.replace(/\$/g, '$$$$'); // Escape any dollar signs
|
||||||
grafsOut[i] = grafsOut[i].replace(/~K\d+K/, blockText);
|
grafsOut[i] = grafsOut[i].replace(/~K\d+K/, blockText);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return grafsOut.join('\n\n');
|
return grafsOut.join('\n\n');
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -7,28 +7,27 @@
|
||||||
* tags like paragraphs, headers, and list items.
|
* tags like paragraphs, headers, and list items.
|
||||||
*/
|
*/
|
||||||
showdown.subParser('spanGamut', function (text, options, globals) {
|
showdown.subParser('spanGamut', function (text, options, globals) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
|
text = showdown.subParser('codeSpans')(text, options, globals);
|
||||||
|
text = showdown.subParser('escapeSpecialCharsWithinTagAttributes')(text, options, globals);
|
||||||
|
text = showdown.subParser('encodeBackslashEscapes')(text, options, globals);
|
||||||
|
|
||||||
text = showdown.subParser('codeSpans')(text, options, globals);
|
// Process anchor and image tags. Images must come first,
|
||||||
text = showdown.subParser('escapeSpecialCharsWithinTagAttributes')(text, options, globals);
|
// because ![foo][f] looks like an anchor.
|
||||||
text = showdown.subParser('encodeBackslashEscapes')(text, options, globals);
|
text = showdown.subParser('images')(text, options, globals);
|
||||||
|
text = showdown.subParser('anchors')(text, options, globals);
|
||||||
|
|
||||||
// Process anchor and image tags. Images must come first,
|
// Make links out of things like `<http://example.com/>`
|
||||||
// because ![foo][f] looks like an anchor.
|
// Must come after _DoAnchors(), because you can use < and >
|
||||||
text = showdown.subParser('images')(text, options, globals);
|
// delimiters in inline links like [this](<url>).
|
||||||
text = showdown.subParser('anchors')(text, options, globals);
|
text = showdown.subParser('autoLinks')(text, options, globals);
|
||||||
|
text = showdown.subParser('encodeAmpsAndAngles')(text, options, globals);
|
||||||
|
text = showdown.subParser('italicsAndBold')(text, options, globals);
|
||||||
|
|
||||||
// Make links out of things like `<http://example.com/>`
|
// Do hard breaks:
|
||||||
// Must come after _DoAnchors(), because you can use < and >
|
text = text.replace(/ +\n/g, ' <br />\n');
|
||||||
// delimiters in inline links like [this](<url>).
|
|
||||||
text = showdown.subParser('autoLinks')(text, options, globals);
|
|
||||||
text = showdown.subParser('encodeAmpsAndAngles')(text, options, globals);
|
|
||||||
text = showdown.subParser('italicsAndBold')(text, options, globals);
|
|
||||||
|
|
||||||
// Do hard breaks:
|
return text;
|
||||||
text = text.replace(/ +\n/g, ' <br />\n');
|
|
||||||
|
|
||||||
return text;
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,6 @@
|
||||||
* contorted like /[ \t]*\n+/
|
* contorted like /[ \t]*\n+/
|
||||||
*/
|
*/
|
||||||
showdown.subParser('stripBlankLines', function (text) {
|
showdown.subParser('stripBlankLines', function (text) {
|
||||||
'use strict';
|
'use strict';
|
||||||
return text.replace(/^[ \t]+$/mg, '');
|
return text.replace(/^[ \t]+$/mg, '');
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -28,30 +28,30 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
showdown.subParser('stripLinkDefinitions', function (text, options, globals) {
|
showdown.subParser('stripLinkDefinitions', function (text, options, globals) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
// attacklab: sentinel workarounds for lack of \A and \Z, safari\khtml bug
|
// attacklab: sentinel workarounds for lack of \A and \Z, safari\khtml bug
|
||||||
text += '~0';
|
text += '~0';
|
||||||
|
|
||||||
text = text.replace(/^[ ]{0,3}\[(.+)]:[ \t]*\n?[ \t]*<?(\S+?)>?[ \t]*\n?[ \t]*(?:(\n*)["(](.+?)[")][ \t]*)?(?:\n+|(?=~0))/gm,
|
text = text.replace(/^[ ]{0,3}\[(.+)]:[ \t]*\n?[ \t]*<?(\S+?)>?[ \t]*\n?[ \t]*(?:(\n*)["(](.+?)[")][ \t]*)?(?:\n+|(?=~0))/gm,
|
||||||
function (wholeMatch, m1, m2, m3, m4) {
|
function (wholeMatch, m1, m2, m3, m4) {
|
||||||
m1 = m1.toLowerCase();
|
m1 = m1.toLowerCase();
|
||||||
globals.gUrls[m1] = showdown.subParser('encodeAmpsAndAngles')(m2); // Link IDs are case-insensitive
|
globals.gUrls[m1] = showdown.subParser('encodeAmpsAndAngles')(m2); // Link IDs are
|
||||||
if (m3) {
|
// case-insensitive
|
||||||
// Oops, found blank lines, so it's not a title.
|
if (m3) {
|
||||||
// Put back the parenthetical statement we stole.
|
// Oops, found blank lines, so it's not a title.
|
||||||
return m3 + m4;
|
// Put back the parenthetical statement we stole.
|
||||||
} else if (m4) {
|
return m3 + m4;
|
||||||
globals.gTitles[m1] = m4.replace(/"/g, '"');
|
} else if (m4) {
|
||||||
}
|
globals.gTitles[m1] = m4.replace(/"/g, '"');
|
||||||
|
}
|
||||||
|
|
||||||
// Completely remove the definition from the text
|
// Completely remove the definition from the text
|
||||||
return '';
|
return '';
|
||||||
}
|
});
|
||||||
);
|
|
||||||
|
|
||||||
// attacklab: strip sentinel
|
// attacklab: strip sentinel
|
||||||
text = text.replace(/~0/, '');
|
text = text.replace(/~0/, '');
|
||||||
|
|
||||||
return text;
|
return text;
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -6,13 +6,11 @@
|
||||||
* Swap back in all the special characters we've hidden.
|
* Swap back in all the special characters we've hidden.
|
||||||
*/
|
*/
|
||||||
showdown.subParser('unescapeSpecialChars', function (text) {
|
showdown.subParser('unescapeSpecialChars', function (text) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
text = text.replace(/~E(\d+)E/g,
|
text = text.replace(/~E(\d+)E/g, function (wholeMatch, m1) {
|
||||||
function (wholeMatch, m1) {
|
var charCodeToReplace = parseInt(m1);
|
||||||
var charCodeToReplace = parseInt(m1);
|
return String.fromCharCode(charCodeToReplace);
|
||||||
return String.fromCharCode(charCodeToReplace);
|
});
|
||||||
}
|
return text;
|
||||||
);
|
|
||||||
return text;
|
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<p>This is <a href="http://example.com/" title="Optional Title Here">an example</a> reference-style link.
|
<p>This is <a href="http://example.com/" title="Optional Title Here">an example</a> reference-style link.
|
||||||
This is <a href="http://example.com/" title="Optional Title Here">another</a> reference-style link.
|
This is <a href="http://example.com/" title="Optional Title Here">another</a> reference-style link.
|
||||||
This is <a href="http://example.com/" title="Optional Title Here">a third</a> reference-style link.
|
This is <a href="http://example.com/" title="Optional Title Here">a third</a> reference-style link.
|
||||||
This is <a href="http://example.com/" title="Optional Title Here">a fourth</a> reference-style link.</p>
|
This is <a href="http://example.com/" title="Optional Title Here">a fourth</a> reference-style link.</p>
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
<blockquote>
|
<blockquote>
|
||||||
<h2 id="thisisaheader">This is a header.</h2>
|
<h2 id="thisisaheader">This is a header.</h2>
|
||||||
|
|
||||||
<ol>
|
<ol>
|
||||||
<li>This is the first list item.</li>
|
<li>This is the first list item.</li>
|
||||||
<li>This is the second list item.</li>
|
<li>This is the second list item.</li>
|
||||||
</ol>
|
</ol>
|
||||||
|
|
||||||
<p>Here's some example code:</p>
|
<p>Here's some example code:</p>
|
||||||
|
|
||||||
<pre><code>return shell_exec("echo $input | $markdown_script");
|
<pre><code>return shell_exec("echo $input | $markdown_script");
|
||||||
</code></pre>
|
</code></pre>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<blockquote>
|
<blockquote>
|
||||||
<p>This is a multi line blockquote test</p>
|
<p>This is a multi line blockquote test</p>
|
||||||
|
|
||||||
<p>With more than one line.</p>
|
<p>With more than one line.</p>
|
||||||
</blockquote>
|
</blockquote>
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<ul>
|
<ul>
|
||||||
<li><p>Bird</p></li>
|
<li><p>Bird</p></li>
|
||||||
<li><p>Magic</p></li>
|
<li><p>Magic</p></li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
<p>text <strong>with bold sentence</strong> in middle</p>
|
<p>text <strong>with bold sentence</strong> in middle</p>
|
||||||
|
|
||||||
<p>text with <strong>bold text that
|
<p>text with <strong>bold text that
|
||||||
spans across multiple</strong> lines</p>
|
spans across multiple</strong> lines</p>
|
||||||
|
|
||||||
<p>underscored_word</p>
|
<p>underscored_word</p>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
<p>It happened in 1986. What a great season.</p>
|
<p>It happened in 1986. What a great season.</p>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<pre><code>function MyFunc(a) {
|
<pre><code>function MyFunc(a) {
|
||||||
// ...
|
// ...
|
||||||
}
|
}
|
||||||
</code></pre>
|
</code></pre>
|
||||||
|
|
||||||
<p>That is some code!</p>
|
<p>That is some code!</p>
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
<p>Define a function in javascript:</p>
|
<p>Define a function in javascript:</p>
|
||||||
|
|
||||||
<pre><code>function MyFunc(a) {
|
<pre><code>function MyFunc(a) {
|
||||||
var s = '`';
|
var s = '`';
|
||||||
}
|
}
|
||||||
</code></pre>
|
</code></pre>
|
||||||
|
|
||||||
<p>And some HTML</p>
|
<p>And some HTML</p>
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
<pre><code>code can go here
|
<pre><code>code can go here
|
||||||
this is rendered on a second line
|
this is rendered on a second line
|
||||||
</code></pre>
|
</code></pre>
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
<hr />
|
<hr/>
|
||||||
|
|
||||||
<hr />
|
<hr/>
|
||||||
|
|
||||||
<hr />
|
<hr/>
|
||||||
|
|
||||||
<hr />
|
<hr/>
|
||||||
|
|
||||||
<hr />
|
<hr/>
|
||||||
|
|
|
||||||
|
|
@ -13,10 +13,11 @@
|
||||||
<aside>ignore me</aside>
|
<aside>ignore me</aside>
|
||||||
|
|
||||||
<article>read
|
<article>read
|
||||||
me</article>
|
me
|
||||||
|
</article>
|
||||||
|
|
||||||
<aside>
|
<aside>
|
||||||
ignore me
|
ignore me
|
||||||
</aside>
|
</aside>
|
||||||
|
|
||||||
<p>the end</p>
|
<p>the end</p>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<p><img src="/path/to/img.jpg" alt="Alt text" title="" /></p>
|
<p><img src="/path/to/img.jpg" alt="Alt text" title=""/></p>
|
||||||
|
|
||||||
<p><img src="/path/to/img.jpg" alt="Alt text" title="Optional title" /></p>
|
<p><img src="/path/to/img.jpg" alt="Alt text" title="Optional title"/></p>
|
||||||
|
|
||||||
<p><img src="url/to/image" alt="Alt text" title="Optional title attribute" /></p>
|
<p><img src="url/to/image" alt="Alt text" title="Optional title attribute"/></p>
|
||||||
|
|
|
||||||
|
|
@ -1 +1,2 @@
|
||||||
<p>Search the web at <a href="http://google.com/">Google</a> or <a href="http://daringfireball.net/">Daring Fireball</a>.</p>
|
<p>Search the web at <a href="http://google.com/">Google</a> or <a href="http://daringfireball.net/">Daring Fireball</a>.
|
||||||
|
</p>
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
<p>Hello.this_is_a_variable
|
<p>Hello.this_is_a_variable
|
||||||
and.this.is.another_one</p>
|
and.this.is.another_one</p>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
<style>
|
<style>
|
||||||
p { line-height: 20px; }
|
p {
|
||||||
|
line-height: 20px;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<p>An exciting sentence.</p>
|
<p>An exciting sentence.</p>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<blockquote>
|
<blockquote>
|
||||||
<p>This is a multi line blockquote test</p>
|
<p>This is a multi line blockquote test</p>
|
||||||
|
|
||||||
<p>With more than one line.</p>
|
<p>With more than one line.</p>
|
||||||
</blockquote>
|
</blockquote>
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,9 @@
|
||||||
<ul>
|
<ul>
|
||||||
<li><p>A list item with a blockquote:</p>
|
<li><p>A list item with a blockquote:</p>
|
||||||
|
|
||||||
<blockquote>
|
<blockquote>
|
||||||
<p>This is a blockquote
|
<p>This is a blockquote
|
||||||
inside a list item.</p>
|
inside a list item.</p>
|
||||||
</blockquote></li>
|
</blockquote>
|
||||||
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
<ul>
|
<ul>
|
||||||
<li><p>A list item with code:</p>
|
<li><p>A list item with code:</p>
|
||||||
|
|
||||||
<pre><code>alert('Hello world!');
|
<pre><code>alert('Hello world!');
|
||||||
</code></pre></li>
|
</code></pre>
|
||||||
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<ol>
|
<ol>
|
||||||
<li><p>This is a major bullet point.</p>
|
<li><p>This is a major bullet point.</p>
|
||||||
|
|
||||||
<p>That contains multiple paragraphs.</p></li>
|
<p>That contains multiple paragraphs.</p></li>
|
||||||
<li><p>And another line</p></li>
|
<li><p>And another line</p></li>
|
||||||
</ol>
|
</ol>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
<ul>
|
<ul>
|
||||||
<li>This line spans
|
<li>This line spans
|
||||||
more than one line and is lazy</li>
|
more than one line and is lazy
|
||||||
<li>Similar to this line</li>
|
</li>
|
||||||
|
<li>Similar to this line</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
<blockquote>
|
<blockquote>
|
||||||
<p>This is a multi line blockquote test</p>
|
<p>This is a multi line blockquote test</p>
|
||||||
|
|
||||||
<blockquote>
|
<blockquote>
|
||||||
<p>And nesting!</p>
|
<p>And nesting!</p>
|
||||||
</blockquote>
|
</blockquote>
|
||||||
|
|
||||||
<p>With more than one line.</p>
|
<p>With more than one line.</p>
|
||||||
</blockquote>
|
</blockquote>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<ol>
|
<ol>
|
||||||
<li>Red</li>
|
<li>Red</li>
|
||||||
<li>Green</li>
|
<li>Green</li>
|
||||||
<li>Blue</li>
|
<li>Blue</li>
|
||||||
</ol>
|
</ol>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<ol>
|
<ol>
|
||||||
<li>Red</li>
|
<li>Red</li>
|
||||||
<li>Green</li>
|
<li>Green</li>
|
||||||
<li>Blue</li>
|
<li>Blue</li>
|
||||||
</ol>
|
</ol>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<ol>
|
<ol>
|
||||||
<li>Red</li>
|
<li>Red</li>
|
||||||
<li>Green</li>
|
<li>Green</li>
|
||||||
<li>Blue</li>
|
<li>Blue</li>
|
||||||
</ol>
|
</ol>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<ul>
|
<ul>
|
||||||
<li>Red</li>
|
<li>Red</li>
|
||||||
<li>Green</li>
|
<li>Green</li>
|
||||||
<li>Blue</li>
|
<li>Blue</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<ul>
|
<ul>
|
||||||
<li>Red</li>
|
<li>Red</li>
|
||||||
<li>Green</li>
|
<li>Green</li>
|
||||||
<li>Blue</li>
|
<li>Blue</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<ul>
|
<ul>
|
||||||
<li>Red</li>
|
<li>Red</li>
|
||||||
<li>Green</li>
|
<li>Green</li>
|
||||||
<li>Blue</li>
|
<li>Blue</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
||||||
|
|
@ -1 +1,2 @@
|
||||||
<p>There's an <a href="http://en.memory-alpha.org/wiki/Darmok_(episode)">episode</a> of Star Trek: The Next Generation</p>
|
<p>There's an <a href="http://en.memory-alpha.org/wiki/Darmok_(episode)">episode</a> of Star Trek: The Next Generation
|
||||||
|
</p>
|
||||||
|
|
|
||||||
|
|
@ -3,95 +3,83 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
(function () {
|
(function () {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
require('source-map-support').install();
|
require('source-map-support').install();
|
||||||
require('chai').should();
|
require('chai').should();
|
||||||
|
|
||||||
var fs = require('fs'),
|
var fs = require('fs'), showdown = require('../../../dist/showdown.js'), converter = new showdown.Converter(), cases = fs.readdirSync('test/cases/').filter(filter()).map(map('test/cases/')), issues = fs.readdirSync('test/issues/').filter(filter()).map(map('test/issues/'));
|
||||||
showdown = require('../../../dist/showdown.js'),
|
|
||||||
converter = new showdown.Converter(),
|
|
||||||
cases = fs
|
|
||||||
.readdirSync('test/cases/')
|
|
||||||
.filter(filter())
|
|
||||||
.map(map('test/cases/')),
|
|
||||||
issues = fs
|
|
||||||
.readdirSync('test/issues/')
|
|
||||||
.filter(filter())
|
|
||||||
.map(map('test/issues/'));
|
|
||||||
|
|
||||||
//Tests
|
//Tests
|
||||||
describe('Converter.makeHtml() simple testcases', function () {
|
describe('Converter.makeHtml() simple testcases', function () {
|
||||||
for (var i = 0; i < cases.length; ++i) {
|
for (var i = 0; i < cases.length; ++i) {
|
||||||
it(cases[i].name, assertion(cases[i]));
|
it(cases[i].name, assertion(cases[i]));
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('Converter.makeHtml() issues testcase', function () {
|
|
||||||
for (var i = 0; i < issues.length; ++i) {
|
|
||||||
it(issues[i].name, assertion(issues[i]));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
function filter() {
|
|
||||||
return function(file) {
|
|
||||||
var ext = file.slice(-3);
|
|
||||||
return (ext === '.md');
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
});
|
||||||
|
|
||||||
function map(dir) {
|
describe('Converter.makeHtml() issues testcase', function () {
|
||||||
return function(file) {
|
for (var i = 0; i < issues.length; ++i) {
|
||||||
var name = file.replace('.md', ''),
|
it(issues[i].name, assertion(issues[i]));
|
||||||
htmlPath = dir + name + '.html',
|
|
||||||
html = fs.readFileSync(htmlPath, 'utf8'),
|
|
||||||
mdPath = dir + name + '.md',
|
|
||||||
md = fs.readFileSync(mdPath, 'utf8');
|
|
||||||
|
|
||||||
return {
|
|
||||||
name: name,
|
|
||||||
input: md,
|
|
||||||
expected: html
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
});
|
||||||
|
|
||||||
//Normalize input/output
|
|
||||||
function normalize(testCase) {
|
|
||||||
|
|
||||||
// Normalize line returns
|
function filter() {
|
||||||
testCase.expected = testCase.expected.replace(/\r/g, '');
|
return function (file) {
|
||||||
testCase.actual = testCase.actual.replace(/\r/g, '');
|
var ext = file.slice(-3);
|
||||||
|
return (ext === '.md');
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
// Ignore all leading/trailing whitespace
|
function map(dir) {
|
||||||
testCase.expected = testCase.expected.split('\n').map(function (x) {
|
return function (file) {
|
||||||
return x.trim();
|
var name = file.replace('.md', ''), htmlPath = dir + name + '.html', html = fs.readFileSync(htmlPath,
|
||||||
}).join('\n');
|
'utf8'), mdPath = dir + name + '.md', md = fs.readFileSync(mdPath,
|
||||||
testCase.actual = testCase.actual.split('\n').map(function (x) {
|
'utf8');
|
||||||
return x.trim();
|
|
||||||
}).join('\n');
|
|
||||||
|
|
||||||
// Remove extra lines
|
return {
|
||||||
testCase.expected = testCase.expected.trim();
|
name: name,
|
||||||
|
input: md,
|
||||||
|
expected: html
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
// Convert whitespace to a visible character so that it shows up on error reports
|
//Normalize input/output
|
||||||
testCase.expected = testCase.expected.replace(/ /g, '·');
|
function normalize(testCase) {
|
||||||
testCase.expected = testCase.expected.replace(/\n/g, '•\n');
|
|
||||||
testCase.actual = testCase.actual.replace(/ /g, '·');
|
|
||||||
testCase.actual = testCase.actual.replace(/\n/g, '•\n');
|
|
||||||
|
|
||||||
return testCase;
|
// Normalize line returns
|
||||||
|
testCase.expected = testCase.expected.replace(/\r/g, '');
|
||||||
|
testCase.actual = testCase.actual.replace(/\r/g, '');
|
||||||
|
|
||||||
}
|
// Ignore all leading/trailing whitespace
|
||||||
|
testCase.expected = testCase.expected.split('\n').map(function (x) {
|
||||||
|
return x.trim();
|
||||||
|
}).join('\n');
|
||||||
|
testCase.actual = testCase.actual.split('\n').map(function (x) {
|
||||||
|
return x.trim();
|
||||||
|
}).join('\n');
|
||||||
|
|
||||||
function assertion(testCase) {
|
// Remove extra lines
|
||||||
return function () {
|
testCase.expected = testCase.expected.trim();
|
||||||
testCase.actual = converter.makeHtml(testCase.input);
|
|
||||||
testCase = normalize(testCase);
|
|
||||||
|
|
||||||
// Compare
|
// Convert whitespace to a visible character so that it shows up on error reports
|
||||||
testCase.actual.should.equal(testCase.expected);
|
testCase.expected = testCase.expected.replace(/ /g, '·');
|
||||||
};
|
testCase.expected = testCase.expected.replace(/\n/g, '•\n');
|
||||||
}
|
testCase.actual = testCase.actual.replace(/ /g, '·');
|
||||||
|
testCase.actual = testCase.actual.replace(/\n/g, '•\n');
|
||||||
|
|
||||||
|
return testCase;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
function assertion(testCase) {
|
||||||
|
return function () {
|
||||||
|
testCase.actual = converter.makeHtml(testCase.input);
|
||||||
|
testCase = normalize(testCase);
|
||||||
|
|
||||||
|
// Compare
|
||||||
|
testCase.actual.should.equal(testCase.expected);
|
||||||
|
};
|
||||||
|
}
|
||||||
})();
|
})();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user