From 6843aa7cc8bd8ee738ecebdd014e551dbfc110fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Sch=C3=A4fer?= <florian@schaeferban.de>
Date: Fri, 2 Jan 2015 14:23:46 +0100
Subject: [PATCH 1/4] Enable file extension .json for grammar files

---
 script/convert-grammars | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/script/convert-grammars b/script/convert-grammars
index 7f3a0ee9..af6f50dc 100755
--- a/script/convert-grammars
+++ b/script/convert-grammars
@@ -44,7 +44,7 @@ class DirectoryPackage
         path.split('/')[-2] == 'Syntaxes'
       when '.tmlanguage'
         true
-      when '.cson'
+      when '.cson', '.json'
         path.split('/')[-2] == 'grammars'
       else
         false
@@ -148,7 +148,7 @@ def load_grammar(path)
   case File.extname(path.downcase)
   when '.plist', '.tmlanguage'
     Plist::parse_xml(path)
-  when '.cson'
+  when '.cson', '.json'
     cson = `"#{CSONC}" "#{path}"`
     raise "Failed to convert CSON grammar '#{path}': #{$?.to_s}" unless $?.success?
     JSON.parse(cson)

From e8e82a1ca3cd45fbb31e323625c4cf0bb529c550 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Sch=C3=A4fer?= <florian@schaeferban.de>
Date: Fri, 2 Jan 2015 14:27:22 +0100
Subject: [PATCH 2/4] Add grammar for CartoCSS

---
 .gitmodules                | 3 +++
 grammars.yml               | 2 ++
 lib/linguist/languages.yml | 3 ++-
 vendor/grammars/carto-atom | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)
 create mode 160000 vendor/grammars/carto-atom

diff --git a/.gitmodules b/.gitmodules
index 5c0588bc..fe68f3d7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -531,3 +531,6 @@
 [submodule "vendor/grammars/sass-textmate-bundle"]
 	path = vendor/grammars/sass-textmate-bundle
 	url = https://github.com/nathos/sass-textmate-bundle
+[submodule "vendor/grammars/carto-atom"]
+	path = vendor/grammars/carto-atom
+	url = https://github.com/yohanboniface/carto-atom
diff --git a/grammars.yml b/grammars.yml
index 8bfbf4dc..222859f1 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -136,6 +136,8 @@ vendor/grammars/c.tmbundle:
 - source.c.platform
 vendor/grammars/capnproto.tmbundle:
 - source.capnp
+vendor/grammars/carto-atom:
+- source.css.mss
 vendor/grammars/ceylon-sublimetext:
 - module.ceylon
 - source.ceylon
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 9005eabb..d8cd6824 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -450,12 +450,13 @@ Cap'n Proto:
   ace_mode: text
 
 CartoCSS:
+  type: programming
   aliases:
   - Carto
   extensions:
   - .mss
   ace_mode: text
-  tm_scope: none
+  tm_scope: source.css.mss
 
 Ceylon:
   type: programming
diff --git a/vendor/grammars/carto-atom b/vendor/grammars/carto-atom
new file mode 160000
index 00000000..2ec5a892
--- /dev/null
+++ b/vendor/grammars/carto-atom
@@ -0,0 +1 @@
+Subproject commit 2ec5a892ed06c6c8cddb890ed52465a19ea68f9f

From 417171cfe168da0381b9f7869b18706bc2e0349b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=2E=20Sch=C3=A4fer?= <florian@schaeferban.de>
Date: Tue, 6 Jan 2015 21:51:59 +0100
Subject: [PATCH 3/4] Don't pass JSON-files through csonc

---
 script/convert-grammars | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/script/convert-grammars b/script/convert-grammars
index af6f50dc..4b16dff4 100755
--- a/script/convert-grammars
+++ b/script/convert-grammars
@@ -148,10 +148,12 @@ def load_grammar(path)
   case File.extname(path.downcase)
   when '.plist', '.tmlanguage'
     Plist::parse_xml(path)
-  when '.cson', '.json'
+  when '.cson'
     cson = `"#{CSONC}" "#{path}"`
     raise "Failed to convert CSON grammar '#{path}': #{$?.to_s}" unless $?.success?
     JSON.parse(cson)
+  when '.json'
+    JSON.parse(File.read(path))
   else
     raise "Invalid document type #{path}"
   end

From 83dfd408e911651ebf55547d304ec1f88f1f2b05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=2E=20Sch=C3=A4fer?= <florian@schaeferban.de>
Date: Tue, 6 Jan 2015 22:38:00 +0100
Subject: [PATCH 4/4] Update carto-grammar to current version (2ec5a89)

---
 vendor/grammars/carto-atom | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/grammars/carto-atom b/vendor/grammars/carto-atom
index 2ec5a892..8086625a 160000
--- a/vendor/grammars/carto-atom
+++ b/vendor/grammars/carto-atom
@@ -1 +1 @@
-Subproject commit 2ec5a892ed06c6c8cddb890ed52465a19ea68f9f
+Subproject commit 8086625aa5deac4ccd7374644b89e715deec2f7f