Merge remote-tracking branch 'origin/master' into reorganize-grammars

bin/marked

@@ -184,14 +184,22 @@ function camelize(text) {
   });
 }
 
+function handleError(err) {
+  if (err.code === 'ENOENT') {
+    console.error(`marked: output to ${err.path}: No such directory`);
+    return process.exit(1);
+  }
+  throw err;
+}
+
 /**
  * Expose / Entry Point
  */
 
 if (!module.parent) {
   process.title = 'marked';
   main(process.argv.slice(), function(err, code) {
-    if (err) throw err;
+    if (err) return handleError(err);
     return process.exit(code || 0);
   });
 } else {

docs/AUTHORS.md

@@ -89,8 +89,6 @@ Marked takes an encompassing approach to its community. As such, you can think o
         <div>Contributor</div>
         <small>Regent of the Regex; Master of Marked</small>
       </td>
-     </tr>
-	 <tr>
       <td align="center" valign="top">
         <a href="https://github.com/karenyavine">
           <img width="100" height="100" src="https://github.com/karenyavine.png?s=150">
@@ -100,6 +98,8 @@ Marked takes an encompassing approach to its community. As such, you can think o
         <div>Contributor</div>
         <small>Snyk's Security Saint</small>
       </td>
+     </tr>
+     <tr>
       <td align="center" valign="top">
         <a href="https://github.com/KostyaTretyak">
           <img width="100" height="100" src="https://github.com/KostyaTretyak.png?s=150">
@@ -118,6 +118,17 @@ Marked takes an encompassing approach to its community. As such, you can think o
         <div>Contributor</div>
         <small>Defibrillator</small>
       </td>
+      <td align="center" width="20%" valign="top">
+        <a href="https://github.com/mccraveiro">
+          <img width="100" height="100" src="https://github.com/mccraveiro.png?s=150">
+        </a>
+        <br>
+        <a href="https://github.com/mccraveiro">Mateus Craveiro</a>
+        <div>Contributor</div>
+        <small>Defibrillator</small>
+      </td>
+      <td align="center" width="20%" valign="top">
+      </td>
      </tr>
   </tbody>
 </table>

lib/marked.js

@@ -19,7 +19,7 @@ var block = {
   heading: /^ *(#{1,6}) +([^\n]+?) *(?:#+ *)?(?:\n+|$)/,
   nptable: noop,
   blockquote: /^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,
-  list: /^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,
+  list: /^( {0,3})(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,
   html: '^ {0,3}(?:' // optional indentation
     + '<(script|pre|style)[\\s>][\\s\\S]*?(?:</\\1>[^\\n]*\\n+|$)' // (1)
     + '|comment[^\\n]*(\\n+|$)' // (2)
@@ -46,8 +46,8 @@ block.def = edit(block.def)
   .replace('title', block._title)
   .getRegex();
 
-block.bullet = /(?:[*+-]|\d+\.)/;
-block.item = /^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/;
+block.bullet = /(?:[*+-]|\d{1,9}\.)/;
+block.item = /^( *)(bull) ?[^\n]*(?:\n(?!\1bull ?)[^\n]*)*/;
 block.item = edit(block.item, 'gm')
   .replace(/bull/g, block.bullet)
   .getRegex();
@@ -349,7 +349,7 @@ Lexer.prototype.token = function(src, top) {
         // Remove the list item's bullet
         // so it is seen as the next token.
         space = item.length;
-        item = item.replace(/^ *([*+-]|\d+\.) +/, '');
+        item = item.replace(/^ *([*+-]|\d+\.) */, '');
 
         // Outdent whatever the
         // list item contains. Hacky.
@@ -362,9 +362,10 @@ Lexer.prototype.token = function(src, top) {
 
         // Determine whether the next list item belongs here.
         // Backpedal if it does not belong in this list.
-        if (this.options.smartLists && i !== l - 1) {
+        if (i !== l - 1) {
           b = block.bullet.exec(cap[i + 1])[0];
-          if (bull !== b && !(bull.length > 1 && b.length > 1)) {
+          if (bull.length > 1 ? b.length === 1
+            : (b.length > 1 || (this.options.smartLists && b !== bull))) {
             src = cap.slice(i + 1).join('\n') + src;
             i = l - 1;
           }
@@ -547,7 +548,7 @@ var inline = {
   link: /^!?\[(label)\]\(href(?:\s+(title))?\s*\)/,
   reflink: /^!?\[(label)\]\[(?!\s*\])((?:\\[\[\]]?|[^\[\]\\])+)\]/,
   nolink: /^!?\[(?!\s*\])((?:\[[^\[\]]*\]|\\[\[\]]|[^\[\]])*)\](?:\[\])?/,
-  strong: /^__([^\s])__(?!_)|^\*\*([^\s])\*\*(?!\*)|^__([^\s][\s\S]*?[^\s])__(?!_)|^\*\*([^\s][\s\S]*?[^\s])\*\*(?!\*)/,
+  strong: /^__([^\s_])__(?!_)|^\*\*([^\s*])\*\*(?!\*)|^__([^\s][\s\S]*?[^\s])__(?!_)|^\*\*([^\s][\s\S]*?[^\s])\*\*(?!\*)/,
   em: /^_([^\s_])_(?!_)|^\*([^\s*"<\[])\*(?!\*)|^_([^\s][\s\S]*?[^\s_])_(?!_|[^\spunctuation])|^_([^\s_][\s\S]*?[^\s])_(?!_|[^\spunctuation])|^\*([^\s"<\[][\s\S]*?[^\s*])\*(?!\*)|^\*([^\s*"<\[][\s\S]*?[^\s])\*(?!\*)/,
   code: /^(`+)([^`]|[^`][\s\S]*?[^`])\1(?!`)/,
   br: /^( {2,}|\\)\n(?!\s*$)/,
@@ -697,7 +698,7 @@ InlineLexer.prototype.output = function(src) {
     // escape
     if (cap = this.rules.escape.exec(src)) {
       src = src.substring(cap[0].length);
-      out += cap[1];
+      out += escape(cap[1]);
       continue;
     }
 
@@ -959,13 +960,13 @@ Renderer.prototype.html = function(html) {
   return html;
 };
 
-Renderer.prototype.heading = function(text, level, raw) {
+Renderer.prototype.heading = function(text, level, raw, slugger) {
   if (this.options.headerIds) {
     return '<h'
       + level
       + ' id="'
       + this.options.headerPrefix
-      + raw.toLowerCase().replace(/[^\w]+/g, '-')
+      + slugger.slug(raw)
       + '">'
       + text
       + '</h'
@@ -1114,6 +1115,7 @@ function Parser(options) {
   this.options.renderer = this.options.renderer || new Renderer();
   this.renderer = this.options.renderer;
   this.renderer.options = this.options;
+  this.slugger = new Slugger();
 }
 
 /**
@@ -1192,7 +1194,8 @@ Parser.prototype.tok = function() {
       return this.renderer.heading(
         this.inline.output(this.token.text),
         this.token.depth,
-        unescape(this.inlineText.output(this.token.text)));
+        unescape(this.inlineText.output(this.token.text)),
+        this.slugger);
     }
     case 'code': {
       return this.renderer.code(this.token.text,
@@ -1278,9 +1281,48 @@ Parser.prototype.tok = function() {
     case 'text': {
       return this.renderer.paragraph(this.parseText());
     }
+    default: {
+      var errMsg = 'Token with "' + this.token.type + '" type was not found.';
+      if (this.options.silent) {
+        console.log(errMsg);
+      } else {
+        throw new Error(errMsg);
+      }
+    }
   }
 };
 
+/**
+ * Slugger generates header id
+ */
+
+function Slugger () {
+  this.seen = {};
+}
+
+/**
+ * Convert string to unique id
+ */
+
+Slugger.prototype.slug = function (value) {
+  var slug = value
+    .toLowerCase()
+    .trim()
+    .replace(/[\u2000-\u206F\u2E00-\u2E7F\\'!"#$%&()*+,./:;<=>?@[\]^`{|}~]/g, '')
+    .replace(/\s/g, '-');
+
+  if (this.seen.hasOwnProperty(slug)) {
+    var originalSlug = slug;
+    do {
+      this.seen[originalSlug]++;
+      slug = originalSlug + '-' + this.seen[originalSlug];
+    } while (this.seen.hasOwnProperty(slug));
+  }
+  this.seen[slug] = 0;
+
+  return slug;
+};
+
 /**
  * Helpers
  */
@@ -1615,6 +1657,8 @@ marked.lexer = Lexer.lex;
 marked.InlineLexer = InlineLexer;
 marked.inlineLexer = InlineLexer.output;
 
+marked.Slugger = Slugger;
+
 marked.parse = marked;
 
 if (typeof module !== 'undefined' && typeof exports === 'object') {

man/marked.1.txt

@@ -81,7 +81,7 @@ CONFIGURATION
 
 
 BUGS
-       Please report any bugs to https://github.com/chjj/marked.
+       Please report any bugs to https://github.com/markedjs/marked.
 
 
 LICENSE

package.json

@@ -2,7 +2,7 @@
   "name": "marked",
   "description": "A markdown parser built for speed",
   "author": "Christopher Jeffrey",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "main": "./lib/marked.js",
   "bin": "./bin/marked",
   "man": "./man/marked.1",

test/new/adjacent_lists.html

@@ -0,0 +1,9 @@
+<ul>
+<li>This should be</li>
+<li>An unordered list</li>
+</ul>
+
+<ol>
+<li>This should be</li>
+<li>An unordered list</li>
+</ol>

test/new/adjacent_lists.md

@@ -0,0 +1,5 @@
+* This should be
+* An unordered list
+
+1. This should be
+2. An unordered list

test/new/cm_blockquotes.html

@@ -11,7 +11,7 @@ <h3 id="example-192">Example 192</h3>
 <p>The spaces after the <code>&gt;</code> characters can be omitted:</p>
 
 <blockquote>
-<h1 id="foo">Foo</h1>
+<h1 id="bar">Bar</h1>
 <p>bar
 baz</p>
 </blockquote>
@@ -21,7 +21,7 @@ <h3 id="example-193">Example 193</h3>
 <p>The <code>&gt;</code> characters can be indented 1-3 spaces:</p>
 
 <blockquote>
-<h1 id="foo">Foo</h1>
+<h1 id="baz">Baz</h1>
 <p>bar
 baz</p>
 </blockquote>
@@ -30,7 +30,7 @@ <h3 id="example-194">Example 194</h3>
 
 <p>Four spaces gives us a code block:</p>
 
-<pre><code>&gt; # Foo
+<pre><code>&gt; # Qux
 &gt; bar
 &gt; baz</code></pre>
 
@@ -39,7 +39,7 @@ <h3 id="example-195">Example 195</h3>
 <p>The Laziness clause allows us to omit the <code>&gt;</code> before paragraph continuation text:</p>
 
 <blockquote>
-<h1 id="foo">Foo</h1>
+<h1 id="quux">Quux</h1>
 <p>bar
 baz</p>
 </blockquote>

test/new/cm_blockquotes.md

@@ -8,31 +8,31 @@
 
 The spaces after the `>` characters can be omitted:
 
-># Foo
+># Bar
 >bar
 > baz
 
 ### Example 193
 
 The `>` characters can be indented 1-3 spaces:
 
-   > # Foo
+   > # Baz
    > bar
  > baz
 
 ### Example 194
 
 Four spaces gives us a code block:
 
-    > # Foo
+    > # Qux
     > bar
     > baz
 
 ### Example 195
 
 The Laziness clause allows us to omit the `>` before paragraph continuation text:
 
-> # Foo
+> # Quux
 > bar
 baz
 

test/new/escaped_angles.html

@@ -1 +1 @@
-<p>></p>
+<p>&gt;</p>

test/new/pedantic_heading_interrupts_paragraph.html

@@ -2,4 +2,4 @@
 <h1 id="how-are-you">how are you</h1>
 
 <p>paragraph before head with equals</p>
-<h1 id="how-are-you">how are you</h1>
+<h1 id="how-are-you-again">how are you again</h1>

test/new/pedantic_heading_interrupts_paragraph.md

@@ -6,5 +6,5 @@ paragraph before head with hash
 #how are you
 
 paragraph before head with equals
-how are you
+how are you again
 ===========

test/new/toplevel_paragraphs.md

@@ -1,3 +1,6 @@
+---
+gfm: true
+---
 hello world
     text after spaces
     text after spaces

test/original/backslash_escapes.html

@@ -20,7 +20,7 @@
 
 <p>Right paren: )</p>
 
-<p>Greater-than: ></p>
+<p>Greater-than: &gt;</p>
 
 <p>Hash: #</p>