marked 0.2.7 → 0.2.8

package/README.md

@@ -72,6 +72,10 @@ marked has a few different switches which change behavior.
 - __tables__: Enable GFM tables. This is enabled by default. (Requires the
   `gfm` option in order to be enabled).
 - __breaks__: Enable GFM line breaks. Disabled by default.
+- __smartLists__: Use smarter list behavior than the original markdown.
+  Disabled by default. May eventually be default with the old behavior
+  moved into `pedantic`.
+- __langPrefix__: Set the prefix for code block classes. Defaults to `lang-`.
 
 ## Usage
 
@@ -83,6 +87,8 @@ marked.setOptions({
   breaks: false,
   pedantic: false,
   sanitize: true,
+  smartLists: true,
+  langPrefix: 'language-',
   highlight: function(code, lang) {
     if (lang === 'js') {
       return highlighter.javascript(code);

package/bin/marked

@@ -38,7 +38,8 @@ function main(argv, callback) {
     , input
     , output
     , arg
-    , tokens;
+    , tokens
+    , opt;
 
   function getarg() {
     var arg = argv.shift();
@@ -88,12 +89,18 @@ function main(argv, callback) {
         return help();
       default:
         if (arg.indexOf('--') === 0) {
-          arg = arg.substring(2);
-          if (arg.indexOf('no-') === 0) {
-            arg = arg.substring(3);
-            options[arg] = false;
+          opt = camelize(arg.replace(/^--(no-)?/, ''));
+          if (!marked.defaults.hasOwnProperty(opt)) {
+            continue;
+          }
+          if (arg.indexOf('--no-') === 0) {
+            options[opt] = typeof marked.defaults[opt] !== 'boolean'
+              ? null
+              : false;
           } else {
-            options[arg] = true;
+            options[opt] = typeof marked.defaults[opt] !== 'boolean'
+              ? argv.shift()
+              : true;
           }
         } else {
           files.push(arg);
@@ -157,6 +164,12 @@ function getStdin(callback) {
   }
 }
 
+function camelize(text) {
+  return text.replace(/(\w)-(\w)/g, function(_, a, b) {
+    return a + b.toUpperCase();
+  });
+}
+
 /**
  * Expose / Entry Point
  */

package/lib/marked.js

@@ -21,9 +21,9 @@ var block = {
   blockquote: /^( *>[^\n]+(\n[^\n]+)*\n*)+/,
   list: /^( *)(bull) [\s\S]+?(?:hr|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,
   html: /^ *(?:comment|closed|closing) *(?:\n{2,}|\s*$)/,
-  def: /^ *\[([^\]]+)\]: *([^\s]+)(?: +["(]([^\n]+)[")])? *(?:\n+|$)/,
+  def: /^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +["(]([^\n]+)[")])? *(?:\n+|$)/,
   table: noop,
-  paragraph: /^([^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+\n*/,
+  paragraph: /^((?:[^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+)\n*/,
   text: /^[^\n]+/
 };
 
@@ -144,6 +144,8 @@ Lexer.prototype.token = function(src, top) {
     , next
     , loose
     , cap
+    , bull
+    , b
     , item
     , space
     , i
@@ -281,6 +283,11 @@ Lexer.prototype.token = function(src, top) {
       // Get each top-level item.
       cap = cap[0].match(this.rules.item);
 
+      // Get bullet.
+      if (this.options.smartLists) {
+        bull = block.bullet.exec(cap[0])[0];
+      }
+
       next = false;
       l = cap.length;
       i = 0;
@@ -302,6 +309,16 @@ Lexer.prototype.token = function(src, top) {
             : item.replace(/^ {1,4}/gm, '');
         }
 
+        // Determine whether the next list item belongs here.
+        // Backpedal if it does not belong in this list.
+        if (this.options.smartLists && i !== l - 1) {
+          b = block.bullet.exec(cap[i+1])[0];
+          if (bull !== b && !(bull[1] === '.' && b[1] === '.')) {
+            src = cap.slice(i + 1).join('\n') + src;
+            i = l - 1;
+          }
+        }
+
         // Determine whether item is loose or not.
         // Use: /(^|\n)(?! )[^\n]+\n\n(?!\s*$)/
         // for discount behavior.
@@ -394,7 +411,9 @@ Lexer.prototype.token = function(src, top) {
       src = src.substring(cap[0].length);
       this.tokens.push({
         type: 'paragraph',
-        text: cap[0]
+        text: cap[1][cap[1].length-1] === '\n'
+          ? cap[1].slice(0, -1)
+          : cap[1]
       });
       continue;
     }
@@ -424,7 +443,7 @@ Lexer.prototype.token = function(src, top) {
  */
 
 var inline = {
-  escape: /^\\([\\`*{}\[\]()#+\-.!_>|])/,
+  escape: /^\\([\\`*{}\[\]()#+\-.!_>])/,
   autolink: /^<([^ >]+(@|:\/)[^ >]+)>/,
   url: noop,
   tag: /^<!--[\s\S]*?-->|^<\/?\w+(?:"[^"]*"|'[^']*'|[^'">])*?>/,
@@ -433,7 +452,7 @@ var inline = {
   nolink: /^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]/,
   strong: /^__([\s\S]+?)__(?!_)|^\*\*([\s\S]+?)\*\*(?!\*)/,
   em: /^\b_((?:__|[\s\S])+?)_\b|^\*((?:\*\*|[\s\S])+?)\*(?!\*)/,
-  code: /^(`+)([\s\S]*?[^`])\1(?!`)/,
+  code: /^(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/,
   br: /^ {2,}\n(?!\s*$)/,
   del: noop,
   text: /^[\s\S]+?(?=[\\<!\[_*`]| {2,}\n|$)/
@@ -471,9 +490,9 @@ inline.pedantic = merge({}, inline.normal, {
  */
 
 inline.gfm = merge({}, inline.normal, {
-  escape: replace(inline.escape)('])', '~])')(),
-  url: /^(https?:\/\/[^\s]+[^.,:;"')\]\s])/,
-  del: /^~{2,}([\s\S]+?)~{2,}/,
+  escape: replace(inline.escape)('])', '~|])')(),
+  url: /^(https?:\/\/[^\s<]+[^<.,:;"')\]\s])/,
+  del: /^~~(?=\S)([\s\S]*?\S)~~/,
   text: replace(inline.text)
     (']|', '~]|')
     ('|', '|https?://|')
@@ -524,8 +543,8 @@ InlineLexer.rules = inline;
  * Static Lexing/Compiling Method
  */
 
-InlineLexer.output = function(src, links, opt) {
-  var inline = new InlineLexer(links, opt);
+InlineLexer.output = function(src, links, options) {
+  var inline = new InlineLexer(links, options);
   return inline.output(src);
 };
 
@@ -828,7 +847,8 @@ Parser.prototype.tok = function() {
 
       return '<pre><code'
         + (this.token.lang
-        ? ' class="lang-'
+        ? ' class="'
+        + this.options.langPrefix
         + this.token.lang
         + '"'
         : '')
@@ -993,11 +1013,14 @@ function merge(obj) {
 
 function marked(src, opt) {
   try {
+    if (opt) opt = merge({}, marked.defaults, opt);
     return Parser.parse(Lexer.lex(src, opt), opt);
   } catch (e) {
     e.message += '\nPlease report this to https://github.com/chjj/marked.';
     if ((opt || marked.defaults).silent) {
-      return 'An error occured:\n' + e.message;
+      return '<p>An error occured:</p><pre>'
+        + escape(e.message + '', true)
+        + '</pre>';
     }
     throw e;
   }
@@ -1009,7 +1032,7 @@ function marked(src, opt) {
 
 marked.options =
 marked.setOptions = function(opt) {
-  marked.defaults = opt;
+  merge(marked.defaults, opt);
   return marked;
 };
 
@@ -1019,8 +1042,10 @@ marked.defaults = {
   breaks: false,
   pedantic: false,
   sanitize: false,
+  smartLists: false,
   silent: false,
-  highlight: null
+  highlight: null,
+  langPrefix: 'lang-'
 };
 
 /**
@@ -1038,7 +1063,7 @@ marked.inlineLexer = InlineLexer.output;
 
 marked.parse = marked;
 
-if (typeof module !== 'undefined') {
+if (typeof exports === 'object') {
   module.exports = marked;
 } else if (typeof define === 'function' && define.amd) {
   define(function() { return marked; });

package/man/marked.1

@@ -1,15 +1,16 @@
 .ds q \N'34'
-.TH marked 1
+.TH marked 1 "2013-01-05" "v0.2.7" "marked.js"
 
 .SH NAME
 marked \- a javascript markdown parser
 
 .SH SYNOPSIS
 .B marked
-[\-o output] [\-i input] [\-\-help]
+[\-o \fI<output>\fP] [\-i \fI<input>\fP] [\-\-help]
 [\-\-tokens] [\-\-pedantic] [\-\-gfm]
 [\-\-breaks] [\-\-tables] [\-\-sanitize]
-[\-\-silent] [input]
+[\-\-smart\-lists] [\-\-lang\-prefix \fI<prefix>\fP]
+[\-\-no\-etc...] [\-\-silent] [\fIfilename\fP]
 
 .SH DESCRIPTION
 .B marked
@@ -28,10 +29,10 @@ marked --output="hello world.html" -i in.md --no-breaks
 
 .SH OPTIONS
 .TP
-.BI \-o,\ \-\-output\ [output]
+.BI \-o,\ \-\-output\ [\fIoutput\fP]
 Specify file output. If none is specified, write to stdout.
 .TP
-.BI \-i,\ \-\-input\ [input]
+.BI \-i,\ \-\-input\ [\fIinput\fP]
 Specify file input, otherwise use last argument as input file. If no input file
 is specified, read from stdin.
 .TP
@@ -54,6 +55,12 @@ Enable GFM tables. Only works with the gfm option.
 .BI \-\-sanitize
 Sanitize output. Ignore any HTML input.
 .TP
+.BI \-\-smart\-lists
+Use smarter list behavior than the original markdown.
+.TP
+.BI \-\-lang\-prefix\ [\fIprefix\fP]
+Set the prefix for code block classes.
+.TP
 .BI \-\-no\-sanitize,\ \-no-etc...
 The inverse of any of the marked options above.
 .TP
@@ -74,8 +81,8 @@ For configuring and running programmatically.
 Please report any bugs to https://github.com/chjj/marked.
 
 .SH LICENSE
-Copyright (c) 2011-2013, Christopher Jeffrey (MIT License)
+Copyright (c) 2011-2013, Christopher Jeffrey (MIT License).
 
-.SH SEE ALSO
+.SH "SEE ALSO"
 .BR markdown(1),
 .BR node.js(1)

package/package.json

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