Merge branch 'integration'

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "support/expresso"]
 	path = support/expresso
-	url = git://github.com/visionmedia/expresso.git
+	url = git://github.com/visionmedia/expresso.git
+[submodule "support/markdown"]
+	path = support/markdown
+	url = http://github.com/evilstreak/markdown-js.git

Makefile

@@ -11,10 +11,10 @@ uninstall:
 	rm -f $(LIB_PREFIX)/jade.js
 
 test:
-	@./support/expresso/bin/expresso -I lib test/*.js
+	@./support/expresso/bin/expresso -I lib -I support/markdown/lib test/*.js
 
 test-cov:
-	@./support/expresso/bin/expresso -I lib --cov test/*.js
+	@./support/expresso/bin/expresso -I lib -I support/markdown/lib --cov test/*.js
 
 api.html: lib/jade.js
 	@dox --title "Jade" \

Readme.md

@@ -17,9 +17,9 @@
   - supports [Express JS](http://expressjs.com)
   - no tag prefix
   - filters
-    - :sass
-    - :less
-    - :markdown
+    - :sass must have [sass.js](http://github.com/visionmedia/sass.js) installed
+    - :less must have [less.js](http://github.com/cloudhead/less.js) installed
+    - :markdown must have [markdown-js](http://github.com/evilstreak/markdown-js) installed
     - :cdata
     - :javascript
 

lib/jade.js

@@ -114,7 +114,7 @@ var filters = exports.filters = {
 
     markdown: function(str){
         str = str.replace(/\\n/g, '\n');
-        return require('markdown').parse(str).replace(/\n/g, '\\n');
+        return require('markdown').toHTML(str).replace(/\n/g, '\\n').replace(/'/g,''');
     }
 };
 

test/filters.test.js

@@ -32,7 +32,7 @@ module.exports = {
 
     'test :markdown filter': function(assert){
         assert.equal(
-            '<h1>foo</h1>\n\n<ul>\n<li>bar</li>\n<li>baz</li>\n</ul>\n',
+            '<h1>foo</h1>\n\n<ul><li>bar</li><li>baz</li></ul>',
             render(':markdown\n  | #foo\n  | - bar\n  | - baz'))
     },