marked 0.2.4 → 0.2.8

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2012, Christopher Jeffrey (https://github.com/chjj/)
+Copyright (c) 2011-2013, Christopher Jeffrey (https://github.com/chjj/)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -62,15 +62,20 @@ Along with implementing every markdown feature, marked also implements
 
 ## Options
 
-marked has 4 different switches which change behavior.
+marked has a few different switches which change behavior.
 
 - __pedantic__: Conform to obscure parts of `markdown.pl` as much as possible.
   Don't fix any of the original markdown bugs or poor behavior.
 - __gfm__: Enable github flavored markdown (enabled by default).
 - __sanitize__: Sanitize the output. Ignore any HTML that has been input.
 - __highlight__: A callback to highlight code blocks.
-
-None of the above are mutually exclusive/inclusive.
+- __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
 
@@ -78,12 +83,15 @@ None of the above are mutually exclusive/inclusive.
 // Set default options
 marked.setOptions({
   gfm: true,
+  tables: true,
+  breaks: false,
   pedantic: false,
   sanitize: true,
-  // callback for code highlighter
+  smartLists: true,
+  langPrefix: 'language-',
   highlight: function(code, lang) {
     if (lang === 'js') {
-      return javascriptHighlighter(code);
+      return highlighter.javascript(code);
     }
     return code;
   }
@@ -94,10 +102,17 @@ console.log(marked('i am using __markdown__.'));
 You also have direct access to the lexer and parser if you so desire.
 
 ``` js
-var tokens = marked.lexer(text);
+var tokens = marked.lexer(text, options);
 console.log(marked.parser(tokens));
 ```
 
+``` js
+var lexer = new marked.Lexer(options);
+var tokens = lexer.lex(text);
+console.log(tokens);
+console.log(lexer.rules);
+```
+
 ``` bash
 $ node
 > require('marked').lexer('> i am using marked.')
@@ -120,6 +135,6 @@ $ cat hello.html
 
 ## License
 
-Copyright (c) 2011-2012, Christopher Jeffrey. (MIT License)
+Copyright (c) 2011-2013, Christopher Jeffrey. (MIT License)
 
 See LICENSE for more info.

package/bin/marked

@@ -2,7 +2,7 @@
 
 /**
  * Marked CLI
- * Copyright (c) 2011-2012, Christopher Jeffrey (MIT License)
+ * Copyright (c) 2011-2013, Christopher Jeffrey (MIT License)
  */
 
 var fs = require('fs')
@@ -13,7 +13,7 @@ var fs = require('fs')
  * Man Page
  */
 
-var help = function() {
+function help() {
   var spawn = require('child_process').spawn;
 
   var options = {
@@ -26,29 +26,48 @@ var help = function() {
   spawn('man',
     [__dirname + '/../man/marked.1'],
     options);
-};
+}
 
 /**
  * Main
  */
 
-var main = function(argv) {
+function main(argv, callback) {
   var files = []
     , options = {}
-    , data = ''
     , input
     , output
     , arg
-    , tokens;
+    , tokens
+    , opt;
 
-  var getarg = function() {
+  function getarg() {
     var arg = argv.shift();
-    arg = arg.split('=');
-    if (arg.length > 1) {
-      argv.unshift(arg.slice(1).join('='));
+
+    if (arg.indexOf('--') === 0) {
+      // e.g. --opt
+      arg = arg.split('=');
+      if (arg.length > 1) {
+        // e.g. --opt=val
+        argv.unshift(arg.slice(1).join('='));
+      }
+      arg = arg[0];
+    } else if (arg[0] === '-') {
+      if (arg.length > 2) {
+        // e.g. -abc
+        argv = arg.substring(1).split('').map(function(ch) {
+          return '-' + ch;
+        }).concat(argv);
+        arg = argv.shift();
+      } else {
+        // e.g. -a
+      }
+    } else {
+      // e.g. foo
     }
-    return arg[0];
-  };
+
+    return arg;
+  }
 
   while (argv.length) {
     arg = getarg();
@@ -65,63 +84,102 @@ var main = function(argv) {
       case '--tokens':
         tokens = true;
         break;
-      case '--gfm':
-        options.gfm = true;
-        break;
-      case '--sanitize':
-        options.sanitize = true;
-        break;
-      case '--pedantic':
-        options.pedantic = true;
-        break;
       case '-h':
       case '--help':
         return help();
       default:
-        files.push(arg);
+        if (arg.indexOf('--') === 0) {
+          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[opt] = typeof marked.defaults[opt] !== 'boolean'
+              ? argv.shift()
+              : true;
+          }
+        } else {
+          files.push(arg);
+        }
         break;
     }
   }
 
-  if (!input) {
-    if (files.length <= 2) {
-      var stdin = process.stdin;
-
-      stdin.setEncoding('utf8');
-      stdin.resume();
-
-      stdin.on('data', function(text) {
-        data += text;
-      });
-
-      stdin.on('end', write);
-
-      return;
+  function getData(callback) {
+    if (!input) {
+      if (files.length <= 2) {
+        return getStdin(callback);
+      }
+      input = files.pop();
     }
-    input = files.pop();
+    return fs.readFile(input, 'utf8', callback);
   }
 
-  data = fs.readFileSync(input, 'utf8');
-  write();
-
-  function write() {
-    marked.setOptions(options);
+  return getData(function(err, data) {
+    if (err) return callback(err);
 
     data = tokens
-      ? JSON.stringify(marked.lexer(data), null, 2)
-      : marked(data);
+      ? JSON.stringify(marked.lexer(data, options), null, 2)
+      : marked(data, options);
 
     if (!output) {
       process.stdout.write(data + '\n');
-    } else {
-      fs.writeFileSync(output, data);
+      return callback();
     }
+
+    return fs.writeFile(output, data, callback);
+  });
+}
+
+/**
+ * Helpers
+ */
+
+function getStdin(callback) {
+  var stdin = process.stdin
+    , buff = '';
+
+  stdin.setEncoding('utf8');
+
+  stdin.on('data', function(data) {
+    buff += data;
+  });
+
+  stdin.on('error', function(err) {
+    return callback(err);
+  });
+
+  stdin.on('end', function() {
+    return callback(null, buff);
+  });
+
+  try {
+    stdin.resume();
+  } catch (e) {
+    callback(e);
   }
-};
+}
+
+function camelize(text) {
+  return text.replace(/(\w)-(\w)/g, function(_, a, b) {
+    return a + b.toUpperCase();
+  });
+}
+
+/**
+ * Expose / Entry Point
+ */
 
 if (!module.parent) {
   process.title = 'marked';
-  main(process.argv.slice());
+  main(process.argv.slice(), function(err, code) {
+    if (err) throw err;
+    return process.exit(code || 0);
+  });
 } else {
   module.exports = main;
 }