Merge remote-tracking branch 'upstream/master'

src/languages/riotjs.coffee

@@ -0,0 +1,26 @@
+module.exports = {
+
+  name: "Riot.js"
+  description: "Riot.js HTML based templating language"
+  namespace: "html"
+  fallback: ['html', 'mustache']
+
+  ###
+  Supported Grammars
+  ###
+  grammars: [
+    "Riot.js"
+  ]
+
+  ###
+  Supported extensions
+  ###
+  extensions: [
+    'tag'
+  ]
+
+  defaultBeautifier: "Pretty Diff"
+
+  options: []
+
+}

src/languages/xml.coffee

@@ -9,14 +9,14 @@ module.exports = {
   Supported Grammars
   ###
   grammars: [
-    "XML", "XSD", "XSL", "JSP"
+    "SLD", "XML", "XHTML", "XSD", "XSL", "JSP"
   ]
 
   ###
   Supported extensions
   ###
   extensions: [
-    'xml', 'xsd', 'xsl', 'jsp'
+    'sld', 'xml', 'xhtml', 'xsd', 'xsl', 'jsp'
   ]
 
   defaultBeautifier: "Pretty Diff"

src/languages/xtemplate.coffee

@@ -0,0 +1,25 @@
+module.exports = {
+
+  name: "XTemplate"
+  namespace: "html"
+  fallback: ['html','mustache']
+
+  ###
+  Supported Grammars
+  ###
+  grammars: [
+    "XTemplate"
+  ]
+
+  ###
+  Supported extensions
+  ###
+  extensions: [
+    "xtemplate"
+  ]
+
+  defaultBeautifier: "Pretty Diff"
+
+  options: []
+
+}