Merge branch 'master' of https://github.com/markedjs/marked into gfm-strike

Author: Tom Theisen

.travis.yml

@@ -1,6 +1,10 @@
 language: node_js
 
 jobs:
+  fast_finish: true
+  allow_failures:
+    - stage: security scan 🔐
+
   include:
     - stage: unit tests 👩🏽‍💻
       script: npm run test:unit
@@ -13,10 +17,6 @@ jobs:
     - node_js: lts/*
     - node_js: node
 
-    - stage: security scan 🔐
-      script: npm run test:redos
-      node_js: lts/*
-
     - stage: lint ✨
       script: npm run test:lint
       node_js: lts/*
@@ -35,6 +35,10 @@ jobs:
       node_js: lts/*
       if: branch = master AND type = push
 
+    - stage: security scan 🔐
+      script: npm run test:redos
+      node_js: lts/*
+
 cache:
   directories:
     - node_modules

bin/marked

@@ -20,7 +20,7 @@ function help() {
     cwd: process.cwd(),
     env: process.env,
     setsid: false,
-    customFds: [0, 1, 2]
+    stdio: 'inherit'
   };
 
   spawn('man', [path.resolve(__dirname, '/../man/marked.1')], options)

docs/USING_ADVANCED.md

@@ -43,7 +43,7 @@ console.log(myMarked('I am using __markdown__.'));
 |:-----------|:---------|:--------|:--------|:-------------|
 |baseUrl     |`string`  |`null`   |???      |A prefix url for any relative link. |  
 |breaks      |`boolean` |`false`  |???      |If true, use GFM [hard](https://github.github.com/gfm/#hard-line-breaks) and [soft](https://github.github.com/gfm/#soft-line-breaks) line breaks. Requires `gfm` be `true`.|
-|gfm         |`boolean` |`true`   |???      |If trie. use approved [GitHub Flavored Markdown (GFM) specification](https://github.github.com/gfm/).|
+|gfm         |`boolean` |`true`   |???      |If true, use approved [GitHub Flavored Markdown (GFM) specification](https://github.github.com/gfm/).|
 |headerIds   |`boolean` |`true`   |v0.4.0   |If true, include an `id` attribute when emitting headings (h1, h2, h3, etc).|
 |headerPrefix|`string`  |`''`     |???      |A string to prefix the `id` attribute when emitting headings (h1, h2, h3, etc).|
 |highlight   |`function`|`null`   |???      |A function to highlight code blocks, see <a href="#highlight">Asynchronous highlighting</a>.|

lib/marked.js

@@ -33,7 +33,7 @@ var block = {
   def: /^ {0,3}\[(label)\]: *\n? *<?([^\s>]+)>?(?:(?: +\n? *| *\n *)(title))? *(?:\n+|$)/,
   table: noop,
   lheading: /^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,
-  paragraph: /^([^\n]+(?:\n?(?!hr|heading|lheading| {0,3}>|<\/?(?:tag)(?: +|\\n|\/?>)|<(?:script|pre|style|!--))[^\n]+)+)/,
+  paragraph: /^([^\n]+(?:\n(?!hr|heading|lheading| {0,3}>|<\/?(?:tag)(?: +|\n|\/?>)|<(?:script|pre|style|!--))[^\n]+)*)/,
   text: /^[^\n]+/
 };