Merge branch 'gh-pages' into more-tests

browser/bundle.js

@@ -122,8 +122,8 @@
 		}
 		, link: function(href, title, text) {
 			var arr = [href]
-			if (title) {
-				arr.unshift(title)
+			if (text) {
+				arr.unshift(text)
 			}
 			return '[' + arr.join('|') + ']'
 		}
@@ -141,7 +141,6 @@
 			return body + '\n'
 		}
 		, image: function(href, title, text) {
-			console.log(77777, href)
 			return '!' + href + '!'
 		}
 		, table: function(header, body) {

index.js

@@ -18,7 +18,9 @@ var rawRenderer = marked.Renderer
 
 var langArr = 'actionscript3 bash csharp coldfusion cpp css delphi diff erlang groovy java javafx javascript perl php none powershell python ruby scala sql vb html/xml'.split(/\s+/)
 var langMap = {
-	shell: 'bash'
+	shell: 'bash', 
+	html: 'html', 
+	xml: 'xml'
 }
 for (var i = 0, x; x = langArr[i++];) {
 	langMap[x] = x
@@ -57,6 +59,7 @@ _.extend(Renderer.prototype, rawRenderer.prototype, {
 	}
 	, link: function(href, title, text) {
 		var arr = [href]
+
 		if (title) {
 			arr.push(title)
 		}
@@ -105,7 +108,10 @@ _.extend(Renderer.prototype, rawRenderer.prototype, {
 	}
 	, code: function(code, lang) {
 		// {code:language=java|borderStyle=solid|theme=RDark|linenumbers=true|collapse=true}
-		lang = langMap[lang] || ''
+		if(lang) {
+			lang = lang.toLowerCase()
+		}
+		lang = langMap[lang] || 'none'
 		var param = {
 			language: lang,
 			borderStyle: 'solid',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "markdown2confluence",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "convert markdown to confluence markup",
   "main": "index.js",
   "scripts": {

readme.md

@@ -5,6 +5,7 @@ markdown2confluence
 [![NPM version][npm-image]][npm-url]
 [![Downloads][downloads-image]][downloads-url]
 [![Dependency Status][david-image]][david-url]
+
 [npm-image]: https://img.shields.io/npm/v/markdown2confluence.svg?style=flat-square
 [npm-url]: https://npmjs.org/package/markdown2confluence
 [downloads-image]: http://img.shields.io/npm/dm/markdown2confluence.svg?style=flat-square