remarked
Advanced tools
Comparing version 0.1.3 to 0.1.4
@@ -18,4 +18,4 @@ # {%= name %} {%= badge('fury') %} | ||
var markdown = require('remarked'); | ||
console.log(markdown('I am using **markdown**.')); | ||
//=> <p>I am using <strong>markdown</strong>.</p> | ||
console.log(markdown('I am using **remarked**.')); | ||
//=> <p>I am using <strong>remarked</strong>.</p> | ||
``` | ||
@@ -45,3 +45,3 @@ | ||
console.log(remarked('I am using **markdown**.')); | ||
console.log(remarked('I am using **remarked**.')); | ||
``` | ||
@@ -48,0 +48,0 @@ |
#!/usr/bin/env node | ||
var argv = require('minimist').process.argv.slice(); | ||
/** | ||
@@ -6,0 +4,0 @@ * Remarked CLI |
{ | ||
"name": "remarked", | ||
"version": "0.1.3", | ||
"version": "0.1.4", | ||
"description": "Markdown parser and lexer. A fork of marked.js maintained for Assemble.", | ||
"ignore": [ | ||
@@ -5,0 +6,0 @@ "test", |
{ | ||
"name": "remarked", | ||
"description": "Markdown parser and lexer. This is a fork of marked.js maintained for Assemble.", | ||
"version": "0.1.3", | ||
"description": "Markdown parser and lexer. A fork of marked.js maintained for Assemble.", | ||
"version": "0.1.4", | ||
"repo": "jonschlinkert/remarked", | ||
@@ -6,0 +6,0 @@ "keywords": [ |
@@ -8,3 +8,3 @@ ### Renderer | ||
```js | ||
var renderer = new marked.Renderer(); | ||
var renderer = new remarked.Renderer(); | ||
``` | ||
@@ -17,5 +17,5 @@ | ||
#### Customize renderers | ||
#### Custom renderers | ||
The renderer option allows you to render tokens in a custom manor. | ||
Don't like how remarked generates HTML? Use custom renderers to generate whatever output you want. | ||
@@ -27,4 +27,4 @@ **Example** | ||
```javascript | ||
var marked = require('marked'); | ||
var renderer = new marked.Renderer(); | ||
var remarked = require('remarked'); | ||
var renderer = new remarked.Renderer(); | ||
@@ -42,3 +42,3 @@ renderer.heading = function (text, level) { | ||
console.log(marked('# heading+', { renderer: renderer })); | ||
console.log(remarked('# heading+', { renderer: renderer })); | ||
``` | ||
@@ -45,0 +45,0 @@ |
@@ -15,14 +15,14 @@ /*! | ||
module.exports = { | ||
breaks: false, | ||
gfm: true, | ||
tables: true, | ||
breaks: false, | ||
highlight: null, | ||
langPrefix: 'lang-', | ||
pedantic: false, | ||
renderer: new Renderer, | ||
sanitize: false, | ||
silent: false, | ||
smartLists: false, | ||
silent: false, | ||
highlight: null, | ||
langPrefix: 'lang-', | ||
smartypants: false, | ||
renderer: new Renderer, | ||
tables: true, | ||
xhtml: false | ||
}; |
@@ -42,3 +42,3 @@ /*! | ||
// Emphasis | ||
inline.em = /^\b_((?:__|[\s\S])+?)_\b|^\*((?:\*\*|[\s\S])+?)\*(?!\*)/; | ||
inline.em = /^\b_([\s\S]*?[^_\s])_\b|^\*((?:\*\*|[\s\S])+?)\*(?!\*)/; | ||
inline.strong = /^__([\s\S]+?)__(?!_)|^\*\*([\s\S]+?)\*\*(?!\*)/; | ||
@@ -45,0 +45,0 @@ |
@@ -114,2 +114,3 @@ /*! | ||
} | ||
// code | ||
@@ -121,6 +122,9 @@ if (cap = this.rules.code.exec(src)) { | ||
type: 'code', | ||
text: !this._options.pedantic ? cap.replace(/\n+$/, '') : cap | ||
text: !this._options.pedantic | ||
? cap.replace(/\n+$/, '') | ||
: cap | ||
}); | ||
continue; | ||
} | ||
// fences (gfm) | ||
@@ -136,2 +140,3 @@ if (cap = this.rules.fences.exec(src)) { | ||
} | ||
// heading | ||
@@ -147,5 +152,7 @@ if (cap = this.rules.heading.exec(src)) { | ||
} | ||
// table no leading pipe (gfm) | ||
if (top && (cap = this.rules.nptable.exec(src))) { | ||
src = src.substring(cap[0].length); | ||
item = { | ||
@@ -171,2 +178,3 @@ type: 'table', | ||
} | ||
this.tokens.push(item); | ||
@@ -199,5 +207,7 @@ continue; | ||
src = src.substring(cap[0].length); | ||
this.tokens.push({ | ||
type: 'blockquote_start' | ||
}); | ||
cap = cap[0].replace(/^ *> ?/gm, ''); | ||
@@ -294,3 +304,5 @@ | ||
this.tokens.push({ | ||
type: this._options.sanitize ? 'paragraph' : 'html', | ||
type: this._options.sanitize | ||
? 'paragraph' | ||
: 'html', | ||
pre: cap[1] === 'pre' || cap[1] === 'script' || cap[1] === 'style', | ||
@@ -333,3 +345,5 @@ text: cap[0] | ||
for (i = 0; i < item.cells.length; i += 1) { | ||
item.cells[i] = item.cells[i].replace(/^ *\| *| *\| *$/g, '').split(/ *\| */); | ||
item.cells[i] = item.cells[i] | ||
.replace(/^ *\| *| *\| *$/g, '') | ||
.split(/ *\| */); | ||
} | ||
@@ -345,3 +359,5 @@ this.tokens.push(item); | ||
type: 'paragraph', | ||
text: cap[1].charAt(cap[1].length - 1) === '\n' ? cap[1].slice(0, -1) : cap[1] | ||
text: cap[1].charAt(cap[1].length - 1) === '\n' | ||
? cap[1].slice(0, -1) | ||
: cap[1] | ||
}); | ||
@@ -353,2 +369,3 @@ continue; | ||
if (cap = this.rules.text.exec(src)) { | ||
// Top-level should never reach here. | ||
@@ -355,0 +372,0 @@ src = src.substring(cap[0].length); |
@@ -225,2 +225,3 @@ /*! | ||
src = src.substring(cap[0].length); | ||
// options.smartypants? | ||
@@ -232,2 +233,3 @@ if (this._options.smartypants) { | ||
} | ||
continue; | ||
@@ -276,8 +278,8 @@ } | ||
return str | ||
.replace(/--/g, '\u2014') | ||
.replace(/(^|[-\u2014\/(\[{"\s])'/g, '$1\u2018') | ||
.replace(/'/g, '\u2019') | ||
.replace(/(^|[-\u2014\/(\[{\u2018\s])"/g, '$1\u201c') | ||
.replace(/"/g, '\u201d') | ||
.replace(/\.{3}/g, '\u2026'); | ||
.replace(/--/g, '\u2014') // em-dashes | ||
.replace(/(^|[-\u2014\/(\[{"\s])'/g, '$1\u2018') // opening singles | ||
.replace(/'/g, '\u2019') // closing singles & apostrophes | ||
.replace(/(^|[-\u2014\/(\[{\u2018\s])"/g, '$1\u201c') // opening doubles | ||
.replace(/"/g, '\u201d') // closing doubles | ||
.replace(/\.{3}/g, '\u2026'); // ellipses | ||
}; | ||
@@ -284,0 +286,0 @@ |
@@ -210,2 +210,5 @@ /*! | ||
Renderer.prototype.strong = function (text) { | ||
if (!text) { | ||
return ''; | ||
} | ||
return '<strong>' + text + '</strong>'; | ||
@@ -225,3 +228,6 @@ }; | ||
Renderer.prototype.em = function (text) { | ||
return '<em>' + text + '</em>'; | ||
if (text.length > 0) { | ||
return '<em>' + text + '</em>'; | ||
} | ||
return ''; | ||
}; | ||
@@ -228,0 +234,0 @@ |
{ | ||
"name": "remarked", | ||
"description": "Markdown parser and lexer. This is a fork of marked.js maintained for Assemble.", | ||
"version": "0.1.3", | ||
"description": "Markdown parser and lexer. A fork of marked.js maintained for Assemble.", | ||
"version": "0.1.4", | ||
"homepage": "https://github.com/jonschlinkert/remarked", | ||
@@ -10,2 +10,3 @@ "author": { | ||
}, | ||
"license": "MIT", | ||
"repository": { | ||
@@ -18,8 +19,2 @@ "type": "git", | ||
}, | ||
"licenses": [ | ||
{ | ||
"type": "MIT", | ||
"url": "https://github.com/jonschlinkert/remarked/blob/master/LICENSE-MIT" | ||
} | ||
], | ||
"bin": { | ||
@@ -29,2 +24,3 @@ "deps": "./bin/remarked.js" | ||
"keywords": [ | ||
"code", | ||
"compile", | ||
@@ -34,6 +30,25 @@ "compiler", | ||
"documentation", | ||
"fences", | ||
"flavored", | ||
"gfm", | ||
"github", | ||
"html", | ||
"js", | ||
"javascript", | ||
"node.js", | ||
"lex", | ||
"lexer", | ||
"markdown", | ||
"marked", | ||
"markup", | ||
"parse", | ||
"parser" | ||
"parser", | ||
"processing", | ||
"processor", | ||
"render", | ||
"renderer", | ||
"table", | ||
"tables", | ||
"text", | ||
"tokenizer" | ||
], | ||
@@ -54,3 +69,2 @@ "main": "index.js", | ||
"highlight.js": "^8.0.0", | ||
"js-beautify": "^1.5.1", | ||
"lodash": "^2.4.1", | ||
@@ -61,7 +75,5 @@ "mocha": "~1.18.2", | ||
"dependencies": { | ||
"minimist": "^0.2.0", | ||
"regexp-special-chars": "^0.1.0", | ||
"strings": "^0.4.1", | ||
"template": "^0.2.1" | ||
} | ||
} | ||
} |
# remarked [![NPM version](https://badge.fury.io/js/remarked.png)](http://badge.fury.io/js/remarked) | ||
> Markdown parser and lexer. This is a fork of marked.js maintained for Assemble. | ||
> Markdown parser and lexer. A fork of marked.js maintained for Assemble. | ||
@@ -22,4 +22,4 @@ ## Install | ||
var markdown = require('remarked'); | ||
console.log(markdown('I am using **markdown**.')); | ||
//=> <p>I am using <strong>markdown</strong>.</p> | ||
console.log(markdown('I am using **remarked**.')); | ||
//=> <p>I am using <strong>remarked</strong>.</p> | ||
``` | ||
@@ -49,3 +49,3 @@ | ||
console.log(remarked('I am using **markdown**.')); | ||
console.log(remarked('I am using **remarked**.')); | ||
``` | ||
@@ -74,4 +74,4 @@ | ||
Copyright (c) 2014 Jon Schlinkert, contributors. | ||
Released under the MIT license | ||
> Based on marked <https://github.com/chjj/marked> | ||
@@ -83,2 +83,2 @@ > Copyright (c) 2011-2014, Christopher Jeffrey, contributors. | ||
_This file was generated by [verb-cli](https://github.com/assemble/verb-cli) on July 03, 2014._ | ||
_This file was generated by [verb-cli](https://github.com/assemble/verb-cli) on July 04, 2014._ |
@@ -19,3 +19,2 @@ #!/usr/bin/env node | ||
/** | ||
@@ -27,3 +26,4 @@ * Load Tests | ||
var dir = __dirname + '/fixtures', | ||
files = {}, list, file, i, l; | ||
files = {}, | ||
list, file, i, l; | ||
@@ -59,3 +59,2 @@ list = fs | ||
function _flags(flags) { | ||
@@ -74,3 +73,2 @@ return flags.forEach(function (key) { | ||
function runTests(engine, options) { | ||
@@ -106,3 +104,2 @@ if (typeof engine !== 'function') { | ||
flags = filename.split('.').slice(1, -1); | ||
@@ -160,3 +157,5 @@ if (flags.length) { | ||
console.log('%d/%d tests completed successfully.', complete, len); | ||
if (failed) {console.log('%d/%d tests failed.', failed, len);} | ||
if (failed) { | ||
console.log('%d/%d tests failed.', failed, len); | ||
} | ||
@@ -184,4 +183,8 @@ // Tests currently failing. | ||
fs.readdirSync(__dirname + '/new').forEach(function (name) { | ||
if (path.extname(name) === '.html') {return;} | ||
if (name === 'main.text') {return;} | ||
if (path.extname(name) === '.html') { | ||
return; | ||
} | ||
if (name === 'main.text') { | ||
return; | ||
} | ||
delete files[name]; | ||
@@ -421,3 +424,2 @@ }); | ||
function getarg() { | ||
@@ -493,3 +495,2 @@ var arg = argv.shift(); | ||
/** | ||
@@ -496,0 +497,0 @@ * Main |
@@ -11,20 +11,6 @@ /** | ||
var expect = require('chai').expect; | ||
var pretty = require('js-beautify').html; | ||
var remarked = require('../'); | ||
var helper = require('./helpers/utils'); | ||
var normalize = helper.stripSpaces; | ||
var prettify = !!~process.argv.indexOf('foo'); | ||
var arr = ['one', 'two', 'three']; | ||
!!~arr.indexOf('two') | ||
// var value; | ||
// for (var index in process.argv) { | ||
// var str = process.argv[index]; | ||
// if (str.indexOf("--apiKey") == 0) { | ||
// value = str.substr(9); | ||
// } | ||
// } | ||
/** | ||
@@ -31,0 +17,0 @@ * Def |
@@ -20,15 +20,3 @@ /** | ||
describe('emphasis', function () { | ||
describe('nested_em', function () { | ||
it('should convert nested_em', function () { | ||
var testfile = 'nested_em'; | ||
var fixture = helper.readFile(testfile + '.md'); | ||
var actual = remarked(fixture); | ||
helper.writeActual(testfile, actual); | ||
var expected = helper.readFile(testfile + '.html'); | ||
expect(normalize(actual)).to.equal(normalize(expected)); | ||
}); | ||
}); | ||
describe('em and strong', function () { | ||
describe('strong_and_em_together', function () { | ||
@@ -35,0 +23,0 @@ it('should convert strong_and_em_together', function () { |
271648
2
9
213
3323
- Removedminimist@^0.2.0
- Removedstrings@^0.4.1
- Removedarray-flatten@0.0.2(transitive)
- Removedarray-union@0.1.0(transitive)
- Removedarray-uniq@0.1.1(transitive)
- Removedclone@0.1.19(transitive)
- Removedclone-array@0.1.2(transitive)
- Removedclone-object@0.1.0(transitive)
- Removedclone-shallow@0.1.1(transitive)
- Removedfrep@0.2.3(transitive)
- Removedis-empty@0.0.1(transitive)
- Removedisobject@0.1.1(transitive)
- Removedminimist@0.2.4(transitive)
- Removedreplacements@0.1.3(transitive)
- Removedstrings@0.4.2(transitive)
- Removedxtend@3.0.0(transitive)