From 97cd1e38860f229b55ddd04120be46df025e2cc3 Mon Sep 17 00:00:00 2001
From: MattDMo <mattdmo@pigimal.com>
Date: Wed, 17 Dec 2014 11:49:54 -0500
Subject: [PATCH 01/42] Reorganized Sublime files, added more extensions. Moved
 those in JSON to JavaScript, as comments are allowed, and added several.
 Added 2 to XML.

---
 lib/linguist/languages.yml | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 9db36b22..a56f53d9 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1372,13 +1372,6 @@ JSON:
   extensions:
   - .json
   - .lock
-  - .sublime-keymap
-  - .sublime-mousemap
-  - .sublime-project
-  - .sublime-settings
-  - .sublime-workspace
-  - .sublime_metrics
-  - .sublime_session
   filenames:
   - .jshintrc
   - composer.lock
@@ -1462,6 +1455,19 @@ JavaScript:
   - .pac
   - .sjs
   - .ssjs
+  - .sublime-build
+  - .sublime-commands
+  - .sublime-completions
+  - .sublime-keymap
+  - .sublime-macro
+  - .sublime-menu
+  - .sublime_metrics
+  - .sublime-mousemap
+  - .sublime-project
+  - .sublime_session
+  - .sublime-settings
+  - .sublime-theme
+  - .sublime-workspace
   - .xsjs
   - .xsjslib
   filenames:
@@ -3099,6 +3105,8 @@ XML:
   - .rss
   - .scxml
   - .srdf
+  - .stTheme
+  - .sublime-snippet
   - .svg
   - .targets
   - .tmCommand

From f4208cb27d545aabb2b815ba833bc2f06195b6d0 Mon Sep 17 00:00:00 2001
From: Joaquin Casares <joaquin@datastax.com>
Date: Fri, 19 Dec 2014 17:51:59 -0600
Subject: [PATCH 02/42] Add support for cql and ddl files

---
 lib/linguist/languages.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index d69b072a..4b0049b1 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -2615,6 +2615,8 @@ SQL:
   - .tab
   - .udf
   - .viw
+  - .cql
+  - .ddl
 
 STON:
   type: data

From 0bbccc1bc1f989271dd9f951d87a90b19b0196f0 Mon Sep 17 00:00:00 2001
From: Joaquin Casares <joaquin@datastax.com>
Date: Mon, 22 Dec 2014 16:48:22 -0600
Subject: [PATCH 03/42] Properly order extensions

---
 lib/linguist/languages.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 4b0049b1..4aaa1c21 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -2611,12 +2611,12 @@ SQL:
   ace_mode: sql
   extensions:
   - .sql
+  - .cql
+  - .ddl
   - .prc
   - .tab
   - .udf
   - .viw
-  - .cql
-  - .ddl
 
 STON:
   type: data

From 509b35a19f5e707a0827a431c9e56d6f491ab8c1 Mon Sep 17 00:00:00 2001
From: Adam Roben <adam@roben.org>
Date: Tue, 30 Dec 2014 07:43:32 -0500
Subject: [PATCH 04/42] Opt in to container-based Travis CI builds

This should speed up our builds by providing lower latency, better
caching, and more resources on the build machine. See
http://docs.travis-ci.com/user/workers/container-based-infrastructure/.
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index e49ae8a6..0bb60273 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+sudo: false
 before_install:
   - git fetch origin master:master
   - git fetch origin v2.0.0:v2.0.0

From 84235478ef65c4e3d5746a00aa1e48fc260a713f Mon Sep 17 00:00:00 2001
From: Adam Roben <adam@roben.org>
Date: Tue, 30 Dec 2014 07:55:42 -0500
Subject: [PATCH 05/42] Download and install libicu-dev without using sudo

We tell apt-get to download it to vendor/apt and then install it into a
vendor/icu directory.

We should be able to just specify --with-icu-dir, but apparently Ruby
2.0 (but not 1.9 or 2.1 or 2.2) has a bug that requires us to use
--with-icu-include/--with-icu-lib instead. Otherwise it can't find the
ICU libraries.
---
 .travis.yml       |  3 ++-
 script/vendor-deb | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100755 script/vendor-deb

diff --git a/.travis.yml b/.travis.yml
index 0bb60273..5fc60617 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,8 @@ before_install:
   - git fetch origin v2.0.0:v2.0.0
   - git fetch origin test/attributes:test/attributes
   - git fetch origin test/master:test/master
-  - sudo apt-get install libicu-dev -y
+  - script/vendor-deb libicu48 libicu-dev
+  - bundle config build.charlock_holmes --with-icu-include=$(pwd)/vendor/debs/include --with-icu-lib=$(pwd)/vendor/debs/lib
   - git submodule init
   - git submodule sync --quiet
   - script/fast-submodule-update
diff --git a/script/vendor-deb b/script/vendor-deb
new file mode 100755
index 00000000..ebad3e76
--- /dev/null
+++ b/script/vendor-deb
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -ex
+
+cd "$(dirname "$0")/.."
+
+mkdir -p vendor/apt vendor/debs
+
+(cd vendor/apt && apt-get --assume-yes download "$@")
+
+for deb in vendor/apt/*.deb; do
+  ar p $deb data.tar.gz | tar -vzxC vendor/debs --strip-components=2
+done

From d42ad45423fdabc3b167d6ebaa3d70ff09a39de2 Mon Sep 17 00:00:00 2001
From: Adam Roben <adam@roben.org>
Date: Tue, 30 Dec 2014 10:00:39 -0500
Subject: [PATCH 06/42] Turn on the bundler cache

This should allow us to skip installing gems in most builds, shaving off
~40 seconds.
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 5fc60617..2eec3572 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,3 +18,4 @@ notifications:
   disabled: true
 git:
   submodules: false
+cache: bundler

From 3149d1232b331e580c36d57918aa1059cf044706 Mon Sep 17 00:00:00 2001
From: MattDMo <mattdmo@pigimal.com>
Date: Mon, 5 Jan 2015 13:36:57 -0500
Subject: [PATCH 07/42] Moved .sublime_metrics after .sublime-mousemap due to
 failing Travis test

---
 lib/linguist/languages.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index a56f53d9..a4a7e960 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1461,8 +1461,8 @@ JavaScript:
   - .sublime-keymap
   - .sublime-macro
   - .sublime-menu
-  - .sublime_metrics
   - .sublime-mousemap
+  - .sublime_metrics
   - .sublime-project
   - .sublime_session
   - .sublime-settings

From e99f6edb56239373b88ac4a1c282ef72c224a118 Mon Sep 17 00:00:00 2001
From: MattDMo <mattdmo@pigimal.com>
Date: Mon, 5 Jan 2015 13:41:58 -0500
Subject: [PATCH 08/42] Put .sublime_* after .sublime-*

---
 lib/linguist/languages.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index a4a7e960..2d470f20 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1462,12 +1462,12 @@ JavaScript:
   - .sublime-macro
   - .sublime-menu
   - .sublime-mousemap
-  - .sublime_metrics
   - .sublime-project
-  - .sublime_session
   - .sublime-settings
   - .sublime-theme
   - .sublime-workspace
+  - .sublime_metrics
+  - .sublime_session
   - .xsjs
   - .xsjslib
   filenames:

From 5ad9deb19942af766040e69de248c1e9bb58fbb6 Mon Sep 17 00:00:00 2001
From: Joaquin Casares <joaquin@datastax.com>
Date: Mon, 5 Jan 2015 13:50:54 -0600
Subject: [PATCH 09/42] Added sample files

---
 samples/SQL/videodb.cql | 85 +++++++++++++++++++++++++++++++++++++++++
 samples/SQL/videodb.ddl | 85 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 170 insertions(+)
 create mode 100644 samples/SQL/videodb.cql
 create mode 100644 samples/SQL/videodb.ddl

diff --git a/samples/SQL/videodb.cql b/samples/SQL/videodb.cql
new file mode 100644
index 00000000..ffa3170e
--- /dev/null
+++ b/samples/SQL/videodb.cql
@@ -0,0 +1,85 @@
+CREATE KEYSPACE videodb WITH REPLICATION = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };
+
+use videodb;
+
+// Basic entity table
+// Object mapping ?
+CREATE TABLE users (
+   username varchar,
+   firstname varchar,
+   lastname varchar,
+   email varchar,
+   password varchar,
+   created_date timestamp,
+   total_credits int,
+   credit_change_date timeuuid,
+   PRIMARY KEY (username)
+);
+
+// One-to-many entity table
+CREATE TABLE videos (
+   videoid uuid,
+   videoname varchar,
+   username varchar,
+   description varchar, 
+   tags list<varchar>,
+   upload_date timestamp,
+   PRIMARY KEY (videoid)
+);
+
+// One-to-many from the user point of view
+// Also know as a lookup table
+CREATE TABLE username_video_index (
+   username varchar,
+   videoid uuid,
+   upload_date timestamp,
+   videoname varchar,
+   PRIMARY KEY (username, videoid)
+);
+
+// Counter table
+CREATE TABLE video_rating (
+   videoid uuid,
+   rating_counter counter,
+   rating_total counter,
+   PRIMARY KEY (videoid)
+);
+
+// Creating index tables for tab keywords
+CREATE TABLE tag_index (
+   tag varchar, 
+   videoid uuid,
+   timestamp timestamp,
+   PRIMARY KEY (tag, videoid)
+);
+
+// Comments as a many-to-many 
+// Looking from the video side to many users
+CREATE TABLE comments_by_video (
+   videoid uuid,
+   username varchar,
+   comment_ts timestamp,
+   comment varchar,
+   PRIMARY KEY (videoid,comment_ts,username)
+) WITH CLUSTERING ORDER BY (comment_ts DESC, username ASC);
+
+// looking from the user side to many videos
+CREATE TABLE comments_by_user (
+   username varchar,
+   videoid uuid,
+   comment_ts timestamp,
+   comment varchar,
+   PRIMARY KEY (username,comment_ts,videoid)
+) WITH CLUSTERING ORDER BY (comment_ts DESC, videoid ASC);
+
+
+// Time series wide row with reverse comparator
+CREATE TABLE video_event (
+   videoid uuid,
+   username varchar,
+   event varchar,
+   event_timestamp timeuuid,
+   video_timestamp bigint,
+   PRIMARY KEY ((videoid,username), event_timestamp,event)
+) WITH CLUSTERING ORDER BY (event_timestamp DESC,event ASC);
+
diff --git a/samples/SQL/videodb.ddl b/samples/SQL/videodb.ddl
new file mode 100644
index 00000000..ffa3170e
--- /dev/null
+++ b/samples/SQL/videodb.ddl
@@ -0,0 +1,85 @@
+CREATE KEYSPACE videodb WITH REPLICATION = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };
+
+use videodb;
+
+// Basic entity table
+// Object mapping ?
+CREATE TABLE users (
+   username varchar,
+   firstname varchar,
+   lastname varchar,
+   email varchar,
+   password varchar,
+   created_date timestamp,
+   total_credits int,
+   credit_change_date timeuuid,
+   PRIMARY KEY (username)
+);
+
+// One-to-many entity table
+CREATE TABLE videos (
+   videoid uuid,
+   videoname varchar,
+   username varchar,
+   description varchar, 
+   tags list<varchar>,
+   upload_date timestamp,
+   PRIMARY KEY (videoid)
+);
+
+// One-to-many from the user point of view
+// Also know as a lookup table
+CREATE TABLE username_video_index (
+   username varchar,
+   videoid uuid,
+   upload_date timestamp,
+   videoname varchar,
+   PRIMARY KEY (username, videoid)
+);
+
+// Counter table
+CREATE TABLE video_rating (
+   videoid uuid,
+   rating_counter counter,
+   rating_total counter,
+   PRIMARY KEY (videoid)
+);
+
+// Creating index tables for tab keywords
+CREATE TABLE tag_index (
+   tag varchar, 
+   videoid uuid,
+   timestamp timestamp,
+   PRIMARY KEY (tag, videoid)
+);
+
+// Comments as a many-to-many 
+// Looking from the video side to many users
+CREATE TABLE comments_by_video (
+   videoid uuid,
+   username varchar,
+   comment_ts timestamp,
+   comment varchar,
+   PRIMARY KEY (videoid,comment_ts,username)
+) WITH CLUSTERING ORDER BY (comment_ts DESC, username ASC);
+
+// looking from the user side to many videos
+CREATE TABLE comments_by_user (
+   username varchar,
+   videoid uuid,
+   comment_ts timestamp,
+   comment varchar,
+   PRIMARY KEY (username,comment_ts,videoid)
+) WITH CLUSTERING ORDER BY (comment_ts DESC, videoid ASC);
+
+
+// Time series wide row with reverse comparator
+CREATE TABLE video_event (
+   videoid uuid,
+   username varchar,
+   event varchar,
+   event_timestamp timeuuid,
+   video_timestamp bigint,
+   PRIMARY KEY ((videoid,username), event_timestamp,event)
+) WITH CLUSTERING ORDER BY (event_timestamp DESC,event ASC);
+

From 14740e8a89ef13f8fbf6ee9689518ec23fe1023f Mon Sep 17 00:00:00 2001
From: Paul Chaignon <paul.chaignon@gmail.com>
Date: Tue, 6 Jan 2015 11:57:28 +0100
Subject: [PATCH 10/42] Grammar for HTTP

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

diff --git a/.gitmodules b/.gitmodules
index a4ef61fa..eb5b0c01 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -532,3 +532,6 @@
 [submodule "vendor/grammars/sublime-bsv"]
 	path = vendor/grammars/sublime-bsv
 	url = https://github.com/thotypous/sublime-bsv
+[submodule "vendor/grammars/Sublime-HTTP"]
+	path = vendor/grammars/Sublime-HTTP
+	url = https://github.com/httpspec/sublime-highlighting
diff --git a/grammars.yml b/grammars.yml
index ebbea52c..a8305007 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -66,6 +66,8 @@ vendor/grammars/Stata.tmbundle:
 - source.stata
 vendor/grammars/Sublime-Coq:
 - source.coq
+vendor/grammars/Sublime-HTTP:
+- source.httpspec
 vendor/grammars/Sublime-Inform:
 - source.Inform7
 vendor/grammars/Sublime-Lasso:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 7890be55..e2c6df86 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1211,7 +1211,7 @@ HTTP:
   type: data
   extensions:
   - .http
-  tm_scope: none
+  tm_scope: source.httpspec
   ace_mode: text
 
 Hack:
diff --git a/vendor/grammars/Sublime-HTTP b/vendor/grammars/Sublime-HTTP
new file mode 160000
index 00000000..f5a4c381
--- /dev/null
+++ b/vendor/grammars/Sublime-HTTP
@@ -0,0 +1 @@
+Subproject commit f5a4c3819d2b1d7bb9376c255ac78f94b6564b54

From 2c2c4740a89402e755cc7f8eed278e70fa3c5a0b Mon Sep 17 00:00:00 2001
From: Adam Roben <adam@roben.org>
Date: Tue, 6 Jan 2015 10:09:53 -0500
Subject: [PATCH 11/42] Update all grammar submodules
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was performed via `git submodule update --remote`.

* vendor/grammars/Agda.tmbundle 784f435...68a218c (1):
  > Merge pull request #1 from aroben/patch-1

* vendor/grammars/IDL-Syntax 9473b7f...3baeaea (1):
  > Merge pull request #3 from aroben/patch-1

* vendor/grammars/NimLime 7a2fb4e...9cef4b6 (4):
  > Updated command names
  > Updated generated documentation
  > renamed more from nimrod to nim
  > Renamed several files

* vendor/grammars/SCSS.tmbundle d6188e5...4147502 (1):
  > Merge pull request #181 from redgluten/master

* vendor/grammars/Sublime-VimL 6ab7e19...366fdc6 (1):
  > Merge pull request #2 from yous/fix-single-quoted-string

* vendor/grammars/factor 2dc5590...2453a78 (38):
  > json.writer: make sure we make hex values two digits zero padded.
  > json.writer: support escaping unicode > 0x10000.  Thanks @jonenst!
  > mason.git: fix status check.
  > compiler.cfg.*: new unit test vocabs
  > compiler.cfg.*: more docs
  > compiler.cfg.*: refactoring away the compute-global-sets word
  > compiler.cfg.*: docs and more tests
  > compiler.cfg.stacks.local: refactoring making stack-changes and height-changes take and return stuff instead of using variables and the make building
  > compiler.cfg.parallel-copy: docs
  > compiler.cfg.stacks.height: these words are unused
  > compiler.cfg.*: more compiler docs
  > compiler.cfg.stacks.finalize: initial docs
  > io.launcher: fix stack effects.
  > io.launcher: fix docs for with-process-reader and with-process-writer.
  > io.launcher: add versions of with-process that preserve process and status.
  > mason.git: fix use.
  > mason.git: fix for rename.
  > io.launcher: cleanup public interface, make some things private or internal.
  > gopher: set 1 minute timeout by default.
  > brainfuck: cleanup tests.
  > json.writer: don't escape spaces, thats weird.
  > unix: some using cleanups.
  > python: rename startup/shutdown hooks.
  > math.extras: adding the Möbius function.
  > alien.c-types: move definitions of stdint.h from unix.types.
  > gopher: use contents now that it works.
  > io.ports: Make buffered-port not have a length because of Linux virtual files and TCP sockets. Related to issues #1256 and #1259.
  > tools.deploy.backend: add word for deleting cached staging images.
  > command-line: save the executable in a variable so that people don't use (command-line) directly if possible.
  > bootstrap: fix this use of (command-line).
  > tools.deploy.shaker: set the rest of the args to preserve current behavior.
  > vm: store full command-line including executable first argument.
  > gopher: fix bug where empty lines weren't printed properly in menus.
  > gopher: simplify.
  > gopher: change gopher-text to use split1.
  > io.encodings.detect: simplify prolog-tag.
  > gopher: add way to get result without converting to objects.
  > tools.disassembler: allow disassemble of compose and curry.

* vendor/grammars/fsharpbinding af755c8...d097476 (24):
  > Merge pull request #909 from cbowdon/issue877-vim-73-support
  > Merge pull request #913 from 7sharp9/Move_GetColourizations_toBg
  > Merge pull request #912 from 7sharp9/TryFind_opt
  > Merge pull request #911 from 7sharp9/FoldingParser
  > Merge pull request #908 from 7sharp9/TooltipOverhaul_AutoParamFix
  > Merge pull request #907 from 7sharp9/Movegetdefinestomodule
  > Merge pull request #906 from 7sharp9/tooltipfixforclosures
  > Merge pull request #905 from 7sharp9/ResolverProvider_singletimeout
  > Merge pull request #904 from fsharp/revert-903-ResolverProvider_singletimeout
  > Merge pull request #903 from 7sharp9/ResolverProvider_singletimeout
  > Merge pull request #902 from 7sharp9/ParameterCompletion_gatherTimeout
  > Merge pull request #901 from 7sharp9/Changed_invalidate_project
  > Merge pull request #900 from 7sharp9/Syntaxmode_removeextraoperation
  > Merge pull request #899 from 7sharp9/tooltips_ensureTimout
  > Merge pull request #898 from 7sharp9/pathextension_useAddRange
  > Merge pull request #897 from 7sharp9/resolverprovider_ensuretimout
  > Merge pull request #896 from 7sharp9/completion_ensuretimout
  > Merge pull request #895 from cbowdon/894-Vim-fix-for-no-completions-stacktrace
  > Merge pull request #890 from wangzq/gotodecl
  > Merge pull request #893 from 7sharp9/fixfortooltipvaltypes
  > Merge pull request #892 from 7sharp9/fixforprojecttypechecking
  > Added correct indentation
  > Merge pull request #891 from 7sharp9/ImproveImplementInterface
  > Merge pull request #888 from VincentDondain/master

* vendor/grammars/haxe-sublime-bundle 58cad47...e2613bb (4):
  > fixed goto definition / find type
  > clean
  > adaptations for toplevel completion
  > first test

* vendor/grammars/language-gfm c6df027...7b62290 (7):
  > Prepare 0.59.0 release
  > scoped-properties -> settings
  > Prepare 0.58.0 release
  > Merge pull request #67 from davidcelis/master
  > Prepare 0.57.0 release
  > Prepare 0.56.0 release
  > Merge pull request #64 from atom/mb-new-cpp-scope-name

* vendor/grammars/language-javascript 15dc5d1...6690feb (5):
  > Prepare 0.52.0 release
  > Merge pull request #82 from Hurtak/feature/snippets-for
  > Merge pull request #80 from Hurtak/feature/snippets-querySelector
  > Merge pull request #79 from Hurtak/feature/snippets-switch-indentation-fix
  > Merge pull request #81 from Hurtak/feature/snippets-iife

* vendor/grammars/language-python 476a353...f518e49 (5):
  > Prepare 0.28.0 release
  > Use trailing scope name
  > Merge pull request #48 from msabramo/patch-1
  > Prepare 0.27.0 release
  > Add pattern for nonlocal keyword

* vendor/grammars/language-sass 064a8b5...33efa33 (2):
  > Prepare 0.29.0 release
  > Allow + and - in selector argument

* vendor/grammars/language-shellscript e2d62af...cbec163 (2):
  > Prepare 0.11.0 release
  > Merge pull request #4 from hd-deman/patch-1

* vendor/grammars/latex.tmbundle 682c4b7...52b2251 (42):
  > Replaced `python` with `python2.7` in shebangs
  > Make the preferences compatible with Python 3
  > Handle manual spacing in “Reformat” (Table)
  > Fix: Reformatting of table containing empty cells
  > Use more descriptive variable names in `format`
  > Add documentation to `reformat`
  > Fix doctest in `refresh_viewer`
  > Add tests for `reformat`
  > Ignore “exit discard” status in `cramtests`
  > Remove print statements from `reformat` function
  > Fix: Close log window option ignored
  > Automatically scroll to bottom in “HTML Output”
  > Handle “\” signs in the notification window
  > Fix missing logname in default error message
  > Extend list of auxiliary files
  > Remove unused code from `latex_watch`
  > Display default message in notification window
  > Sort error messages by line number
  > Do not store duplicate error messages anymore
  > Close notification window on cleanup
  > Improve reopening of closed notification windows
  > Improve rewrap code in `texparser`
  > Improve readability of verbose log output
  > Only parse log file if there were changes
  > Remove unnecessary function call in “LaTeX Watch”
  > Properly close file in `guess_tex_engine`
  > Handle log messages containing double quotes
  > Left justify severity in notification window
  > Handle manual closing of notification window
  > Add additional information to notification window
  > Remove unused code from `texparser`
  > Close notification when typesetting succeeds
  > Add support for notifications to “LaTeX Watch”
  > Update bundle preference values instantly
  > Make “Reformat” (Table) compatible with Ruby 2
  > Ignore escaped ampersand `\&` in “Format” (Table)
  > Remove warnings reported by `RuboCop`
  > Format code for “Reformat” (Table)
  > Move code for “Reformat” into separate script
  > Save “Reformat” command with TextMate 2
  > Remove unused import
  > Use explicit import in “Itemize Lines In Selection”

* vendor/grammars/mercury-tmlanguage b5a4fd6...eaef0b0 (8):
  > Add require_* and some, all keywords
  > Highlight %f format specifiers, `` as op
  > Correct implementation of '''', """" and 0'<char>
  > README.md: Mention GitHub grammar compatability
  > README.md: add resources and demonstration
  > reformatted whitespace; added foreign mods; missing keywords
  > Highlight variables, determ decls, more pragmas
  > no highlighting of variables, function names, type names, inst's, etc.

* vendor/grammars/sublime-mask 2f59519...632ff3c (4):
  > v0.8.7
  > v0.8.7
  > + expression in component nodes
  < v0.8.6

* vendor/grammars/swift.tmbundle 81a0164...3c7eac5 (9):
  > Use constant scope for booleans
  > Use storage scope instead of keyword
  > Correct typo in include
  > Revamp string literal matching
  > Improve punctuation scopes
  > Allow for functions without a body
  > Add simple folding markers for swift
  > Improved matching of capture specifiers
  > Add Support for UInt, Int[8|16|32|64] & Float80
---
 vendor/grammars/Agda.tmbundle        | 2 +-
 vendor/grammars/IDL-Syntax           | 2 +-
 vendor/grammars/NimLime              | 2 +-
 vendor/grammars/SCSS.tmbundle        | 2 +-
 vendor/grammars/Sublime-VimL         | 2 +-
 vendor/grammars/factor               | 2 +-
 vendor/grammars/fsharpbinding        | 2 +-
 vendor/grammars/haxe-sublime-bundle  | 2 +-
 vendor/grammars/language-gfm         | 2 +-
 vendor/grammars/language-javascript  | 2 +-
 vendor/grammars/language-python      | 2 +-
 vendor/grammars/language-sass        | 2 +-
 vendor/grammars/language-shellscript | 2 +-
 vendor/grammars/latex.tmbundle       | 2 +-
 vendor/grammars/mercury-tmlanguage   | 2 +-
 vendor/grammars/sublime-mask         | 2 +-
 vendor/grammars/swift.tmbundle       | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/vendor/grammars/Agda.tmbundle b/vendor/grammars/Agda.tmbundle
index 784f435f..68a218c4 160000
--- a/vendor/grammars/Agda.tmbundle
+++ b/vendor/grammars/Agda.tmbundle
@@ -1 +1 @@
-Subproject commit 784f435f09c126f6a070f751c678dd9dfd88c969
+Subproject commit 68a218c489c809655f74164f83b78d359a82989a
diff --git a/vendor/grammars/IDL-Syntax b/vendor/grammars/IDL-Syntax
index 9473b7fa..3baeaeaf 160000
--- a/vendor/grammars/IDL-Syntax
+++ b/vendor/grammars/IDL-Syntax
@@ -1 +1 @@
-Subproject commit 9473b7faaf709740d08d84823f9e86b2ad585f62
+Subproject commit 3baeaeafac9e30e8a4b0789105641e0b59da32a9
diff --git a/vendor/grammars/NimLime b/vendor/grammars/NimLime
index 7a2fb4e7..9cef4b65 160000
--- a/vendor/grammars/NimLime
+++ b/vendor/grammars/NimLime
@@ -1 +1 @@
-Subproject commit 7a2fb4e73a293a009224c35fc421006869344439
+Subproject commit 9cef4b6547da06a85122a087b325022dccb5e09e
diff --git a/vendor/grammars/SCSS.tmbundle b/vendor/grammars/SCSS.tmbundle
index d6188e57..41475020 160000
--- a/vendor/grammars/SCSS.tmbundle
+++ b/vendor/grammars/SCSS.tmbundle
@@ -1 +1 @@
-Subproject commit d6188e579f0808d843e75728e6bd77a170a0d0ac
+Subproject commit 41475020634fc07b5c03ff0dfaee64c2491fa32b
diff --git a/vendor/grammars/Sublime-VimL b/vendor/grammars/Sublime-VimL
index 6ab7e19a..366fdc64 160000
--- a/vendor/grammars/Sublime-VimL
+++ b/vendor/grammars/Sublime-VimL
@@ -1 +1 @@
-Subproject commit 6ab7e19a579c1842999a23db697851599a570915
+Subproject commit 366fdc64e3655207a0b2672f630d7167e6aac2c3
diff --git a/vendor/grammars/factor b/vendor/grammars/factor
index 2dc55909..2453a785 160000
--- a/vendor/grammars/factor
+++ b/vendor/grammars/factor
@@ -1 +1 @@
-Subproject commit 2dc5590966a6212d1911eaba63d698e1c8b04e73
+Subproject commit 2453a785f73429786583684cf729625c7cf7b04b
diff --git a/vendor/grammars/fsharpbinding b/vendor/grammars/fsharpbinding
index af755c8b..d0974762 160000
--- a/vendor/grammars/fsharpbinding
+++ b/vendor/grammars/fsharpbinding
@@ -1 +1 @@
-Subproject commit af755c8b01ddb9bd5abebb74f318f6a9183c55e4
+Subproject commit d097476208bfa11a961734907d190b78bc5af5fb
diff --git a/vendor/grammars/haxe-sublime-bundle b/vendor/grammars/haxe-sublime-bundle
index 58cad478..e2613bb1 160000
--- a/vendor/grammars/haxe-sublime-bundle
+++ b/vendor/grammars/haxe-sublime-bundle
@@ -1 +1 @@
-Subproject commit 58cad4780c3ce19a5219dfa38d25556f800ac726
+Subproject commit e2613bb12598d4ae2de5ba57af890ce910195fce
diff --git a/vendor/grammars/language-gfm b/vendor/grammars/language-gfm
index c6df027b..7b62290a 160000
--- a/vendor/grammars/language-gfm
+++ b/vendor/grammars/language-gfm
@@ -1 +1 @@
-Subproject commit c6df027b075654b5faadd8965b9bdc39276e3a45
+Subproject commit 7b62290a08d635e98f7bc2c8cb8f51e97b0d3935
diff --git a/vendor/grammars/language-javascript b/vendor/grammars/language-javascript
index 15dc5d1d..6690feb3 160000
--- a/vendor/grammars/language-javascript
+++ b/vendor/grammars/language-javascript
@@ -1 +1 @@
-Subproject commit 15dc5d1d8675ba7b2f6af77adf3e373e54a994d0
+Subproject commit 6690feb3a0aedb191e3c28b7a7a3961c24245b6f
diff --git a/vendor/grammars/language-python b/vendor/grammars/language-python
index 476a3535..f518e495 160000
--- a/vendor/grammars/language-python
+++ b/vendor/grammars/language-python
@@ -1 +1 @@
-Subproject commit 476a353595caca2105c5984466390333036d0f11
+Subproject commit f518e495f6bb13124d44cfc2366c424dc58859ac
diff --git a/vendor/grammars/language-sass b/vendor/grammars/language-sass
index 064a8b5a..33efa33e 160000
--- a/vendor/grammars/language-sass
+++ b/vendor/grammars/language-sass
@@ -1 +1 @@
-Subproject commit 064a8b5a870afad877e06ce9774c1ef974471f6a
+Subproject commit 33efa33e10eb4fd1f93295ba1e7e756217f03dec
diff --git a/vendor/grammars/language-shellscript b/vendor/grammars/language-shellscript
index e2d62af1..cbec163c 160000
--- a/vendor/grammars/language-shellscript
+++ b/vendor/grammars/language-shellscript
@@ -1 +1 @@
-Subproject commit e2d62af11a07f6d65b1664456d85e747a31ac4b4
+Subproject commit cbec163cc1640f46f2d5ba145f5cb2cace8e3405
diff --git a/vendor/grammars/latex.tmbundle b/vendor/grammars/latex.tmbundle
index 682c4b72..52b2251a 160000
--- a/vendor/grammars/latex.tmbundle
+++ b/vendor/grammars/latex.tmbundle
@@ -1 +1 @@
-Subproject commit 682c4b725c9504bf3c8c1d4efdd954a8d23800bc
+Subproject commit 52b2251aab30577f4b3b3cc8997fb3c7d0e798ce
diff --git a/vendor/grammars/mercury-tmlanguage b/vendor/grammars/mercury-tmlanguage
index b5a4fd6e..eaef0b06 160000
--- a/vendor/grammars/mercury-tmlanguage
+++ b/vendor/grammars/mercury-tmlanguage
@@ -1 +1 @@
-Subproject commit b5a4fd6e400cef468dad18d92df65268a6d4a3e9
+Subproject commit eaef0b0643b2cea0d7d26056f2dd264c5a652be9
diff --git a/vendor/grammars/sublime-mask b/vendor/grammars/sublime-mask
index 2f59519f..632ff3c6 160000
--- a/vendor/grammars/sublime-mask
+++ b/vendor/grammars/sublime-mask
@@ -1 +1 @@
-Subproject commit 2f59519ffdccfb15c63668951847f1c96b6e07c0
+Subproject commit 632ff3c6f58d4cbf0863db79c22f4f64ed229b25
diff --git a/vendor/grammars/swift.tmbundle b/vendor/grammars/swift.tmbundle
index 81a01641..3c7eac54 160000
--- a/vendor/grammars/swift.tmbundle
+++ b/vendor/grammars/swift.tmbundle
@@ -1 +1 @@
-Subproject commit 81a01641457d544a3a16bb5410e5cafef2148ceb
+Subproject commit 3c7eac54457aa8f953fa5263cb34ec4dc9555217

From d258d146b8de4a3dffb630dd4a97042d5e9b069b Mon Sep 17 00:00:00 2001
From: Adam Roben <adam@roben.org>
Date: Tue, 6 Jan 2015 12:41:00 -0500
Subject: [PATCH 12/42] Move before_install steps to a separate script

---
 .travis.yml                  | 11 +----------
 script/travis/before_install | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 10 deletions(-)
 create mode 100755 script/travis/before_install

diff --git a/.travis.yml b/.travis.yml
index 2eec3572..4d0c2351 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,5 @@
 sudo: false
-before_install:
-  - git fetch origin master:master
-  - git fetch origin v2.0.0:v2.0.0
-  - git fetch origin test/attributes:test/attributes
-  - git fetch origin test/master:test/master
-  - script/vendor-deb libicu48 libicu-dev
-  - bundle config build.charlock_holmes --with-icu-include=$(pwd)/vendor/debs/include --with-icu-lib=$(pwd)/vendor/debs/lib
-  - git submodule init
-  - git submodule sync --quiet
-  - script/fast-submodule-update
+before_install: script/travis/before_install
 rvm:
   - 1.9.3
   - 2.0.0
diff --git a/script/travis/before_install b/script/travis/before_install
new file mode 100755
index 00000000..3604b14d
--- /dev/null
+++ b/script/travis/before_install
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -ex
+
+git fetch origin master:master
+git fetch origin v2.0.0:v2.0.0
+git fetch origin test/attributes:test/attributes
+git fetch origin test/master:test/master
+
+script/vendor-deb libicu48 libicu-dev
+bundle config build.charlock_holmes --with-icu-include=$(pwd)/vendor/debs/include --with-icu-lib=$(pwd)/vendor/debs/lib
+
+git submodule init
+git submodule sync --quiet
+script/fast-submodule-update

From d82e4801ffa7fdebdd78d7a67bdb674bcc88fdeb Mon Sep 17 00:00:00 2001
From: Adam Roben <adam@roben.org>
Date: Tue, 6 Jan 2015 12:44:39 -0500
Subject: [PATCH 13/42] Use --with-icu-dir everywhere but Ruby 2.0

--with-icu-dir is broken on Ruby 2.0 due to
https://bugs.ruby-lang.org/issues/8074. Specifying
--with-icu-include/--with-icu-lib is broken on Ruby 2.1 and newer due to
https://github.com/bundler/bundler/pull/3338. So now we use
--with-icu-dir everywhere but Ruby 2.0.
---
 script/travis/before_install | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/script/travis/before_install b/script/travis/before_install
index 3604b14d..d7274654 100755
--- a/script/travis/before_install
+++ b/script/travis/before_install
@@ -8,7 +8,14 @@ git fetch origin test/attributes:test/attributes
 git fetch origin test/master:test/master
 
 script/vendor-deb libicu48 libicu-dev
-bundle config build.charlock_holmes --with-icu-include=$(pwd)/vendor/debs/include --with-icu-lib=$(pwd)/vendor/debs/lib
+if ruby -e 'exit RUBY_VERSION >= "2.0" && RUBY_VERSION < "2.1"'; then
+  # Workaround for https://bugs.ruby-lang.org/issues/8074. We can't use this
+  # solution on all versions of Ruby due to
+  # https://github.com/bundler/bundler/pull/3338.
+  bundle config build.charlock_holmes --with-icu-include=$(pwd)/vendor/debs/include --with-icu-lib=$(pwd)/vendor/debs/lib
+else
+  bundle config build.charlock_holmes --with-icu-dir=$(pwd)/vendor/debs
+fi
 
 git submodule init
 git submodule sync --quiet

From 188e579df7ef2c34615a311312851759dc8bc7a5 Mon Sep 17 00:00:00 2001
From: Adam Roben <adam@roben.org>
Date: Tue, 6 Jan 2015 12:56:08 -0500
Subject: [PATCH 14/42] Use a single `git fetch` invocation in CI

---
 script/travis/before_install | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/script/travis/before_install b/script/travis/before_install
index d7274654..442f6718 100755
--- a/script/travis/before_install
+++ b/script/travis/before_install
@@ -2,10 +2,8 @@
 
 set -ex
 
-git fetch origin master:master
-git fetch origin v2.0.0:v2.0.0
-git fetch origin test/attributes:test/attributes
-git fetch origin test/master:test/master
+# Fetch all commits/refs needed to run our tests.
+git fetch origin master:master v2.0.0:v2.0.0 test/attributes:test/attributes test/master:test/master
 
 script/vendor-deb libicu48 libicu-dev
 if ruby -e 'exit RUBY_VERSION >= "2.0" && RUBY_VERSION < "2.1"'; then

From a2e99e8ddb27957d8dbc268669b79c9edc9d133e Mon Sep 17 00:00:00 2001
From: Patrik Affentranger <patrik@thefrontiergroup.com.au>
Date: Tue, 6 Jan 2015 13:13:45 -0500
Subject: [PATCH 15/42] Switch Sass grammar to nathos/sass-textmate-bundle

This provides better highlighting in many cases than the previous
grammar. See https://github.com/github/linguist/pull/1852.
---
 .gitmodules                          | 6 +++---
 grammars.yml                         | 5 ++---
 vendor/grammars/language-sass        | 1 -
 vendor/grammars/sass-textmate-bundle | 1 +
 4 files changed, 6 insertions(+), 7 deletions(-)
 delete mode 160000 vendor/grammars/language-sass
 create mode 160000 vendor/grammars/sass-textmate-bundle

diff --git a/.gitmodules b/.gitmodules
index a4ef61fa..1fff9e4b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -82,9 +82,6 @@
 [submodule "vendor/grammars/language-python"]
 	path = vendor/grammars/language-python
 	url = https://github.com/atom/language-python
-[submodule "vendor/grammars/language-sass"]
-	path = vendor/grammars/language-sass
-	url = https://github.com/atom/language-sass
 [submodule "vendor/grammars/language-shellscript"]
 	path = vendor/grammars/language-shellscript
 	url = https://github.com/atom/language-shellscript
@@ -532,3 +529,6 @@
 [submodule "vendor/grammars/sublime-bsv"]
 	path = vendor/grammars/sublime-bsv
 	url = https://github.com/thotypous/sublime-bsv
+[submodule "vendor/grammars/sass-textmate-bundle"]
+	path = vendor/grammars/sass-textmate-bundle
+	url = https://github.com/nathos/sass-textmate-bundle
diff --git a/grammars.yml b/grammars.yml
index ebbea52c..d695e95d 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -260,9 +260,6 @@ vendor/grammars/language-python:
 - source.python
 - source.regexp.python
 - text.python.traceback
-vendor/grammars/language-sass:
-- source.css.scss
-- source.sass
 vendor/grammars/language-shellscript:
 - source.shell
 - text.shell-session
@@ -374,6 +371,8 @@ vendor/grammars/ruby.tmbundle:
 vendor/grammars/sas.tmbundle:
 - source.SASLog
 - source.sas
+vendor/grammars/sass-textmate-bundle:
+- source.sass
 vendor/grammars/scala.tmbundle:
 - source.sbt
 - source.scala
diff --git a/vendor/grammars/language-sass b/vendor/grammars/language-sass
deleted file mode 160000
index 33efa33e..00000000
--- a/vendor/grammars/language-sass
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 33efa33e10eb4fd1f93295ba1e7e756217f03dec
diff --git a/vendor/grammars/sass-textmate-bundle b/vendor/grammars/sass-textmate-bundle
new file mode 160000
index 00000000..8444f979
--- /dev/null
+++ b/vendor/grammars/sass-textmate-bundle
@@ -0,0 +1 @@
+Subproject commit 8444f9796e7610f7f930e9ed7cae3093d5ce7805

From 78a0030d4606a2259e64db388e883abd10610419 Mon Sep 17 00:00:00 2001
From: Adam Roben <adam@roben.org>
Date: Mon, 22 Dec 2014 17:20:25 -0500
Subject: [PATCH 16/42] download-grammars -> convert-grammars

Downloading is only a small part of what this script does. The main
thing it does is convert grammars to JSON.
---
 CONTRIBUTING.md                                | 2 +-
 Rakefile                                       | 2 +-
 script/{download-grammars => convert-grammars} | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename script/{download-grammars => convert-grammars} (100%)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 69081657..b6b682f6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -23,7 +23,7 @@ Great! You'll need to:
 0. Add an entry for your language to [`languages.yml`][languages].
 0. Add a grammar for your language. Please only add grammars that have a license that permits redistribution.
     0. Add your grammar as a submodule: `git submodule add https://github.com/JaneSmith/MyGrammar vendor/grammars/MyGrammar`.
-    0. Add your grammar to [`grammars.yml`][grammars] by running `script/download-grammars --add vendor/grammars/MyGrammar`.
+    0. Add your grammar to [`grammars.yml`][grammars] by running `script/convert-grammars --add vendor/grammars/MyGrammar`.
 0. Add samples for your language to the [samples directory][samples].
 
 In addition, if your new language defines an extension that's already listed in [`languages.yml`][languages] (such as `.foo`) then sometimes a few more steps will need to be taken:
diff --git a/Rakefile b/Rakefile
index 068af0bb..b38486c0 100644
--- a/Rakefile
+++ b/Rakefile
@@ -48,7 +48,7 @@ end
 
 task :build_grammars_gem do
   rm_rf "grammars"
-  sh "script/download-grammars"
+  sh "script/convert-grammars"
   sh "gem", "build", "github-linguist-grammars.gemspec"
 end
 
diff --git a/script/download-grammars b/script/convert-grammars
similarity index 100%
rename from script/download-grammars
rename to script/convert-grammars

From ada6f6882a7b9e239231ef6e1c813d84e8843c07 Mon Sep 17 00:00:00 2001
From: Adam Roben <adam@roben.org>
Date: Mon, 22 Dec 2014 16:35:01 -0500
Subject: [PATCH 17/42] Test that grammars.yml lists the right scopes for each
 submodule

convert-grammars now supports a few flags that we can use to make it
dump out the YAML just for the local grammar submodules. We can then
compare this to the YAML that's actually in grammars.yml to check that
they're the same. If they aren't, grammars.yml needs to be updated.
This will help catch mistakes like using the wrong scope name.
---
 script/convert-grammars | 60 ++++++++++++++++++++++++++++++++++-------
 test/test_grammars.rb   | 13 +++++++++
 2 files changed, 63 insertions(+), 10 deletions(-)

diff --git a/script/convert-grammars b/script/convert-grammars
index 3792f451..4f67edd5 100755
--- a/script/convert-grammars
+++ b/script/convert-grammars
@@ -2,6 +2,7 @@
 
 require 'json'
 require 'net/http'
+require 'optparse'
 require 'plist'
 require 'set'
 require 'tmpdir'
@@ -13,6 +14,13 @@ GRAMMARS_PATH = File.join(ROOT, "grammars")
 SOURCES_FILE = File.join(ROOT, "grammars.yml")
 CSONC = File.join(ROOT, "node_modules", ".bin", "csonc")
 
+$options = {
+  :add => false,
+  :install => true,
+  :output => SOURCES_FILE,
+  :remote => true,
+}
+
 class SingleFile
   def initialize(path)
     @path = path
@@ -148,8 +156,9 @@ def load_grammar(path)
   end
 end
 
-def install_grammar(tmp_dir, source, all_scopes)
+def load_grammars(tmp_dir, source, all_scopes)
   is_url = source.start_with?("http:", "https:")
+  return [] if is_url && !$options[:remote]
   is_single_file = source.end_with?('.tmLanguage', '.plist')
 
   p = if !is_url
@@ -172,9 +181,7 @@ def install_grammar(tmp_dir, source, all_scopes)
 
   raise "Unsupported source: #{source}" unless p
 
-  installed = []
-
-  p.fetch(tmp_dir).each do |path|
+  p.fetch(tmp_dir).map do |path|
     grammar = load_grammar(path)
     scope = grammar['scopeName']
 
@@ -184,9 +191,17 @@ def install_grammar(tmp_dir, source, all_scopes)
       "  Previous package: #{all_scopes[scope]}"
       next
     end
-
-    File.write(File.join(GRAMMARS_PATH, "#{scope}.json"), JSON.pretty_generate(grammar))
     all_scopes[scope] = p.url
+    grammar
+  end
+end
+
+def install_grammars(grammars)
+  installed = []
+
+  grammars.each do |grammar|
+    scope = grammar['scopeName']
+    File.write(File.join(GRAMMARS_PATH, "#{scope}.json"), JSON.pretty_generate(grammar))
     installed << scope
   end
 
@@ -206,7 +221,8 @@ def run_thread(queue, all_scopes)
       dir = "#{tmpdir}/#{index}"
       Dir.mkdir(dir)
 
-      install_grammar(dir, source, all_scopes)
+      grammars = load_grammars(dir, source, all_scopes)
+      install_grammars(grammars) if $options[:install]
     end
   end
 end
@@ -232,9 +248,9 @@ def main(sources)
 
   all_scopes = {}
 
-  if ARGV[0] == '--add'
+  if $options[:add]
     Dir.mktmpdir do |tmpdir|
-      install_grammar(tmpdir, ARGV[1], all_scopes)
+      install_grammar(tmpdir, ARGV[0], all_scopes)
     end
     generate_yaml(all_scopes, sources)
   else
@@ -252,12 +268,36 @@ def main(sources)
   end
 end
 
+OptionParser.new do |opts|
+  opts.banner = "Usage: #{$0} [options]"
+
+  opts.on("--add GRAMMAR", "Add a new grammar. GRAMMAR may be a file path or URL.") do |a|
+    $options[:add] = a
+  end
+
+  opts.on("--[no-]install", "Install grammars into grammars/ directory.") do |i|
+    $options[:install] = i
+  end
+
+  opts.on("--output FILE", "Write output to FILE. Use - for stdout.") do |o|
+    $options[:output] = o == "-" ? $stdout : o
+  end
+
+  opts.on("--[no-]remote", "Download remote grammars.") do |r|
+    $options[:remote] = r
+  end
+end.parse!
+
 sources = File.open(SOURCES_FILE) do |file|
   YAML.load(file)
 end
 
 yaml = main(sources)
 
-File.write(SOURCES_FILE, YAML.dump(yaml))
+if $options[:output].is_a?(IO)
+  $options[:output].write(YAML.dump(yaml))
+else
+  File.write($options[:output], YAML.dump(yaml))
+end
 
 $stderr.puts("Done")
diff --git a/test/test_grammars.rb b/test/test_grammars.rb
index 57483348..871ba195 100644
--- a/test/test_grammars.rb
+++ b/test/test_grammars.rb
@@ -36,4 +36,17 @@ class TestGrammars < Minitest::Test
 
     assert nonexistent_submodules.empty? && unlisted_submodules.empty?, message
   end
+
+  def test_local_scopes_are_in_sync
+    actual = YAML.load(`"#{File.join(ROOT, "script", "convert-grammars")}" --output - --no-install --no-remote 2>/dev/null`)
+    assert_predicate $?, :success?
+
+    # We're not checking remote grammars. That can take a long time and make CI
+    # flaky if network conditions are poor.
+    @grammars.delete_if { |k, v| k.start_with?("http:", "https:") }
+
+    @grammars.each do |k, v|
+      assert_equal v, actual[k], "The scopes listed for #{k} in grammars.yml don't match the scopes found in that repository"
+    end
+  end
 end

From 5fa85f268ff849caf5c63350449f0d0894c0efe6 Mon Sep 17 00:00:00 2001
From: Adam Roben <adam@roben.org>
Date: Mon, 22 Dec 2014 17:28:25 -0500
Subject: [PATCH 18/42] Ruby 1.9 compatibility

---
 test/test_grammars.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test_grammars.rb b/test/test_grammars.rb
index 871ba195..0ea12081 100644
--- a/test/test_grammars.rb
+++ b/test/test_grammars.rb
@@ -39,7 +39,7 @@ class TestGrammars < Minitest::Test
 
   def test_local_scopes_are_in_sync
     actual = YAML.load(`"#{File.join(ROOT, "script", "convert-grammars")}" --output - --no-install --no-remote 2>/dev/null`)
-    assert_predicate $?, :success?
+    assert $?.success?, "script/convert-grammars failed"
 
     # We're not checking remote grammars. That can take a long time and make CI
     # flaky if network conditions are poor.

From a4286ba950e6b09dffbfa0e03a150f3a93f8a527 Mon Sep 17 00:00:00 2001
From: Adam Roben <adam@roben.org>
Date: Tue, 30 Dec 2014 07:31:00 -0500
Subject: [PATCH 19/42] Show stderr output when running convert-grammars

This will let us see why it's failing.
---
 test/test_grammars.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test_grammars.rb b/test/test_grammars.rb
index 0ea12081..a80e690d 100644
--- a/test/test_grammars.rb
+++ b/test/test_grammars.rb
@@ -38,7 +38,7 @@ class TestGrammars < Minitest::Test
   end
 
   def test_local_scopes_are_in_sync
-    actual = YAML.load(`"#{File.join(ROOT, "script", "convert-grammars")}" --output - --no-install --no-remote 2>/dev/null`)
+    actual = YAML.load(`"#{File.join(ROOT, "script", "convert-grammars")}" --output - --no-install --no-remote`)
     assert $?.success?, "script/convert-grammars failed"
 
     # We're not checking remote grammars. That can take a long time and make CI

From 581dc36c47a95ed01c0beae55b74e63ad12dfbab Mon Sep 17 00:00:00 2001
From: Adam Roben <adam@roben.org>
Date: Tue, 30 Dec 2014 07:36:28 -0500
Subject: [PATCH 20/42] Ruby 1.9 compatibility for convert-grammars

---
 script/convert-grammars | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/convert-grammars b/script/convert-grammars
index 4f67edd5..e03acd71 100755
--- a/script/convert-grammars
+++ b/script/convert-grammars
@@ -233,7 +233,7 @@ def generate_yaml(all_scopes, base)
     out[value] << key
   end
 
-  yaml = yaml.sort.to_h
+  yaml = Hash[yaml.sort]
   yaml.each { |k, v| v.sort! }
   yaml
 end

From 917bc48348406c07c07a008881330db4aee63fa7 Mon Sep 17 00:00:00 2001
From: Adam Roben <adam@roben.org>
Date: Tue, 6 Jan 2015 13:31:26 -0500
Subject: [PATCH 21/42] Use File.directory? to test for local directories

Some of our submodules end in ".tmLanguage", which we used to think
meant it was a file rather than a directory.
---
 script/convert-grammars | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/script/convert-grammars b/script/convert-grammars
index e03acd71..5ed47a61 100755
--- a/script/convert-grammars
+++ b/script/convert-grammars
@@ -159,15 +159,14 @@ end
 def load_grammars(tmp_dir, source, all_scopes)
   is_url = source.start_with?("http:", "https:")
   return [] if is_url && !$options[:remote]
-  is_single_file = source.end_with?('.tmLanguage', '.plist')
 
   p = if !is_url
-        if is_single_file
-          SingleFile.new(source)
-        else
+        if File.directory?(source)
           DirectoryPackage.new(source)
+        else
+          SingleFile.new(source)
         end
-      elsif is_single_file
+      elsif source.end_with?('.tmLanguage', '.plist')
         SingleGrammar.new(source)
       elsif source.start_with?('https://github.com')
         GitHubPackage.new(source)

From 8f3779c94c3139da5a98d24f1e53753127a3aa74 Mon Sep 17 00:00:00 2001
From: Adam Roben <adam@roben.org>
Date: Tue, 6 Jan 2015 13:32:28 -0500
Subject: [PATCH 22/42] Update grammars.yml to match submodules

I should have done this in 2c2c4740a89402e755cc7f8eed278e70fa3c5a0b.
---
 grammars.yml               | 7 ++++---
 lib/linguist/languages.yml | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/grammars.yml b/grammars.yml
index d695e95d..8bfbf4dc 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -47,9 +47,9 @@ vendor/grammars/LiveScript.tmbundle:
 vendor/grammars/NSIS:
 - source.nsis
 vendor/grammars/NimLime:
-- source.nimrod
-- source.nimrod_filter
-- source.nimrodcfg
+- source.nim
+- source.nim_filter
+- source.nimcfg
 vendor/grammars/PHP-Twig.tmbundle:
 - text.html.twig
 vendor/grammars/RDoc.tmbundle:
@@ -259,6 +259,7 @@ vendor/grammars/language-javascript:
 vendor/grammars/language-python:
 - source.python
 - source.regexp.python
+- text.python.console
 - text.python.traceback
 vendor/grammars/language-shellscript:
 - source.shell
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 7890be55..9005eabb 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1891,6 +1891,7 @@ Nimrod:
   - .nim
   - .nimrod
   ace_mode: text
+  tm_scope: source.nim
 
 Ninja:
   type: data

From 7edddec9209a615532ed34d3664e1fd2a0cd74fc Mon Sep 17 00:00:00 2001
From: Adam Roben <adam@roben.org>
Date: Tue, 6 Jan 2015 13:39:18 -0500
Subject: [PATCH 23/42] Make convert-grammars a little quieter

No need to say "Done" at the end. We're obviously done; the script is
exiting.
---
 script/convert-grammars | 2 --
 1 file changed, 2 deletions(-)

diff --git a/script/convert-grammars b/script/convert-grammars
index 5ed47a61..a9b2bfea 100755
--- a/script/convert-grammars
+++ b/script/convert-grammars
@@ -298,5 +298,3 @@ if $options[:output].is_a?(IO)
 else
   File.write($options[:output], YAML.dump(yaml))
 end
-
-$stderr.puts("Done")

From 95bb5a1ae4de7395e4500cf6b5f2b5166d077e21 Mon Sep 17 00:00:00 2001
From: Adam Roben <adam@roben.org>
Date: Tue, 6 Jan 2015 10:21:34 -0500
Subject: [PATCH 24/42] Switch to the master branch of tenbits/sublime-mask

The master branch contains a license while the release branch does not.
Other than that they're nearly identical.
---
 .gitmodules                  | 1 -
 vendor/grammars/sublime-mask | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 1fff9e4b..5c0588bc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -503,7 +503,6 @@
 [submodule "vendor/grammars/sublime-mask"]
 	path = vendor/grammars/sublime-mask
 	url = https://github.com/tenbits/sublime-mask
-	branch = release
 [submodule "vendor/grammars/sublime_cobol"]
 	path = vendor/grammars/sublime_cobol
 	url = https://bitbucket.org/bitlang/sublime_cobol
diff --git a/vendor/grammars/sublime-mask b/vendor/grammars/sublime-mask
index 632ff3c6..6f12d284 160000
--- a/vendor/grammars/sublime-mask
+++ b/vendor/grammars/sublime-mask
@@ -1 +1 @@
-Subproject commit 632ff3c6f58d4cbf0863db79c22f4f64ed229b25
+Subproject commit 6f12d2841d008fb02eee912485cebcad7151d4f0

From f477f811df7530e96d085e66a485fe9280e149f5 Mon Sep 17 00:00:00 2001
From: Adam Roben <adam@roben.org>
Date: Tue, 6 Jan 2015 10:03:23 -0500
Subject: [PATCH 25/42] Extract TestGrammars#submodule_paths method

---
 test/test_grammars.rb | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/test/test_grammars.rb b/test/test_grammars.rb
index a80e690d..ae24caf6 100644
--- a/test/test_grammars.rb
+++ b/test/test_grammars.rb
@@ -14,12 +14,11 @@ class TestGrammars < Minitest::Test
   end
 
   def test_submodules_are_in_sync
-    submodules = `git config --list --file "#{File.join(ROOT, ".gitmodules")}"`.lines.grep(/\.path=/).map { |line| line.chomp.split("=", 2).last }
     # Strip off paths inside the submodule so that just the submodule path remains.
     listed_submodules = @grammars.keys.grep(/vendor\/grammars/).map { |source| source[%r{vendor/grammars/[^/]+}] }
 
-    nonexistent_submodules = listed_submodules - submodules
-    unlisted_submodules = submodules - listed_submodules
+    nonexistent_submodules = listed_submodules - submodule_paths
+    unlisted_submodules = submodule_paths - listed_submodules
 
     message = ""
     unless nonexistent_submodules.empty?
@@ -49,4 +48,10 @@ class TestGrammars < Minitest::Test
       assert_equal v, actual[k], "The scopes listed for #{k} in grammars.yml don't match the scopes found in that repository"
     end
   end
+
+  private
+
+  def submodule_paths
+    @submodule_paths ||= `git config --list --file "#{File.join(ROOT, ".gitmodules")}"`.lines.grep(/\.path=/).map { |line| line.chomp.split("=", 2).last }
+  end
 end

From 4614287a5539c7e600d01fd95a99a406a0aaea05 Mon Sep 17 00:00:00 2001
From: Adam Roben <adam@roben.org>
Date: Tue, 6 Jan 2015 10:03:40 -0500
Subject: [PATCH 26/42] Test that all grammar submodules have an appropriate
 license

We require all grammars to have a license that permits redistribution. A
few existing grammars have been grandfathered in without a license (and
we're working to remedy that), but no new grammars should be added
without a license.
---
 test/test_grammars.rb | 78 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/test/test_grammars.rb b/test/test_grammars.rb
index ae24caf6..9c6a6a88 100644
--- a/test/test_grammars.rb
+++ b/test/test_grammars.rb
@@ -3,6 +3,15 @@ require_relative "./helper"
 class TestGrammars < Minitest::Test
   ROOT = File.expand_path("../..", __FILE__)
 
+  # These grammars have no license but have been grandfathered in. New grammars
+  # must have a license that allows redistribution.
+  UNLICENSED_GRAMMARS_WHITELIST = %w[
+    vendor/grammars/Scalate.tmbundle
+    vendor/grammars/Sublime-Lasso
+    vendor/grammars/Sublime-REBOL
+    vendor/grammars/x86-assembly-textmate-bundle
+  ].freeze
+
   def setup
     @grammars = YAML.load(File.read(File.join(ROOT, "grammars.yml")))
   end
@@ -49,9 +58,78 @@ class TestGrammars < Minitest::Test
     end
   end
 
+  def test_submodules_have_licenses
+    categories = submodule_paths.group_by do |submodule|
+      files = Dir[File.join(ROOT, submodule, "*")]
+      license = files.find { |path| File.basename(path) =~ /\blicense\b/i } || files.find { |path| File.basename(path) =~ /\bcopying\b/i }
+      if license.nil?
+        if readme = files.find { |path| File.basename(path) =~ /\Areadme\b/i }
+          license = readme if File.read(readme) =~ /\blicense\b/i
+        end
+      end
+      if license.nil?
+        :unlicensed
+      elsif classify_license(license)
+        :licensed
+      else
+        :unrecognized
+      end
+    end
+
+    unlicensed = categories[:unlicensed] || []
+    unrecognized = categories[:unrecognized] || []
+    disallowed_unlicensed = unlicensed - UNLICENSED_GRAMMARS_WHITELIST
+    disallowed_unrecognized = unrecognized - UNLICENSED_GRAMMARS_WHITELIST
+    extra_whitelist_entries = UNLICENSED_GRAMMARS_WHITELIST - (unlicensed | unrecognized)
+
+    message = ""
+    if disallowed_unlicensed.any?
+      message << "The following grammar submodules don't seem to have a license. All grammars must have a license that permits redistribution.\n"
+      message << disallowed_unlicensed.sort.join("\n")
+    end
+    if disallowed_unrecognized.any?
+      message << "\n\n" unless message.empty?
+      message << "The following grammar submodules have an unrecognized license. Please update #{__FILE__} to recognize the license.\n"
+      message << disallowed_unrecognized.sort.join("\n")
+    end
+    if extra_whitelist_entries.any?
+      message << "\n\n" unless message.empty?
+      message << "The following grammar submodules are listed in UNLICENSED_GRAMMARS_WHITELIST but either have a license (yay!)\n"
+      message << "or have been removed from the repository. Please remove them from the whitelist.\n"
+      message << extra_whitelist_entries.sort.join("\n")
+    end
+
+    assert disallowed_unlicensed.empty? && disallowed_unrecognized.empty? && extra_whitelist_entries.empty?, message
+  end
+
   private
 
   def submodule_paths
     @submodule_paths ||= `git config --list --file "#{File.join(ROOT, ".gitmodules")}"`.lines.grep(/\.path=/).map { |line| line.chomp.split("=", 2).last }
   end
+
+  def classify_license(path)
+    content = File.read(path)
+    if content.include?("Apache License") && content.include?("2.0")
+      "Apache 2.0"
+    elsif content.include?("GNU") && content =~ /general/i && content =~ /public/i
+      if content =~ /version 2/i
+        "GPLv2"
+      elsif content =~ /version 3/i
+        "GPLv3"
+      end
+    elsif content.include?("GPL") && content.include?("http://www.gnu.org/licenses/gpl.html")
+      "GPLv3"
+    elsif content.include?("Creative Commons")
+      "CC"
+    elsif content.include?("tidy-license.txt") || content.include?("If not otherwise specified (see below)")
+      "textmate"
+    elsif content =~ /^\s*[*-]\s+Redistribution/ || content.include?("Redistributions of source code")
+      "BSD"
+    elsif content.include?("Permission is hereby granted") || content =~ /\bMIT\b/
+      "MIT"
+    elsif content.include?("unlicense.org")
+      "unlicense"
+    end
+  end
 end

From 71f0cafc7894bcdb5a6a5b47cd163d8dffc3fae0 Mon Sep 17 00:00:00 2001
From: Adam Roben <adam@roben.org>
Date: Tue, 6 Jan 2015 13:45:06 -0500
Subject: [PATCH 27/42] Update all submodules

This was done via `git submodule update --remote`.

Since Scalate.tmbundle now has a license we can remove it from the
whitelist.

* vendor/grammars/NimLime 9cef4b6...a7067c6 (1):
  > Added 'nim' to tmpl sublimetext highlighting

* vendor/grammars/Scalate.tmbundle 4f85314...0307535 (1):
  > Merge pull request #3 from aroben/patch-1

* vendor/grammars/fsharpbinding d097476...99d2e9a (2):
  > Merge pull request #917 from 7sharp9/CleanMacProjects
  > Merge pull request #916 from 7sharp9/ToolTipsLessBlocky

* vendor/grammars/language-clojure d649d9f...bae6eee (2):
  > Prepare 0.10.0 release
  > Rename scoped-properties/ to settings/

* vendor/grammars/language-coffee-script c6e8d33...d86c896 (2):
  > Prepare 0.39.0 release
  > Rename scoped-properties/ to settings/

* vendor/grammars/language-gfm 7b62290...6af44a0 (2):
  > Remove unneeded newline
  > Merge pull request #65 from braver/line-break

* vendor/grammars/language-javascript 6690feb...5157519 (2):
  > Prepare 0.53.0 release
  > Rename scoped-properties/ to settings/

* vendor/grammars/language-python f518e49...46072e3 (2):
  > Prepare 0.29.0 release
  > Rename scoped-properties/ to settings/

* vendor/grammars/language-shellscript cbec163...9839719 (2):
  > Prepare 0.12.0 release
  > Rename scoped-properties/ to settings/

* vendor/grammars/language-yaml eddd079...ce8b441 (2):
  > Prepare 0.22.0 release
  > Rename scoped-properties/ to settings/
---
 test/test_grammars.rb                  | 1 -
 vendor/grammars/NimLime                | 2 +-
 vendor/grammars/Scalate.tmbundle       | 2 +-
 vendor/grammars/fsharpbinding          | 2 +-
 vendor/grammars/language-clojure       | 2 +-
 vendor/grammars/language-coffee-script | 2 +-
 vendor/grammars/language-gfm           | 2 +-
 vendor/grammars/language-javascript    | 2 +-
 vendor/grammars/language-python        | 2 +-
 vendor/grammars/language-shellscript   | 2 +-
 vendor/grammars/language-yaml          | 2 +-
 11 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/test/test_grammars.rb b/test/test_grammars.rb
index 9c6a6a88..7afbea32 100644
--- a/test/test_grammars.rb
+++ b/test/test_grammars.rb
@@ -6,7 +6,6 @@ class TestGrammars < Minitest::Test
   # These grammars have no license but have been grandfathered in. New grammars
   # must have a license that allows redistribution.
   UNLICENSED_GRAMMARS_WHITELIST = %w[
-    vendor/grammars/Scalate.tmbundle
     vendor/grammars/Sublime-Lasso
     vendor/grammars/Sublime-REBOL
     vendor/grammars/x86-assembly-textmate-bundle
diff --git a/vendor/grammars/NimLime b/vendor/grammars/NimLime
index 9cef4b65..a7067c60 160000
--- a/vendor/grammars/NimLime
+++ b/vendor/grammars/NimLime
@@ -1 +1 @@
-Subproject commit 9cef4b6547da06a85122a087b325022dccb5e09e
+Subproject commit a7067c605b893585c056d32a20a1b953f100e138
diff --git a/vendor/grammars/Scalate.tmbundle b/vendor/grammars/Scalate.tmbundle
index 4f85314f..0307535a 160000
--- a/vendor/grammars/Scalate.tmbundle
+++ b/vendor/grammars/Scalate.tmbundle
@@ -1 +1 @@
-Subproject commit 4f85314fca2ebe3641c678010489b80e81acb8ea
+Subproject commit 0307535add076965c8cd438d0f4109bec7d68d2d
diff --git a/vendor/grammars/fsharpbinding b/vendor/grammars/fsharpbinding
index d0974762..99d2e9a5 160000
--- a/vendor/grammars/fsharpbinding
+++ b/vendor/grammars/fsharpbinding
@@ -1 +1 @@
-Subproject commit d097476208bfa11a961734907d190b78bc5af5fb
+Subproject commit 99d2e9a53924ae5ba850985f3df1dc8c11cb6731
diff --git a/vendor/grammars/language-clojure b/vendor/grammars/language-clojure
index d649d9f5..bae6eee8 160000
--- a/vendor/grammars/language-clojure
+++ b/vendor/grammars/language-clojure
@@ -1 +1 @@
-Subproject commit d649d9f5b227722f5a35fd0e9430cb14325b8e83
+Subproject commit bae6eee8557c2158592ac485a7168ccd10fc6dfb
diff --git a/vendor/grammars/language-coffee-script b/vendor/grammars/language-coffee-script
index c6e8d337..d86c8963 160000
--- a/vendor/grammars/language-coffee-script
+++ b/vendor/grammars/language-coffee-script
@@ -1 +1 @@
-Subproject commit c6e8d33715fe883da8411b7149cfb3eb76d23698
+Subproject commit d86c8963dcee0ab811da05a175b2218045d0c124
diff --git a/vendor/grammars/language-gfm b/vendor/grammars/language-gfm
index 7b62290a..6af44a08 160000
--- a/vendor/grammars/language-gfm
+++ b/vendor/grammars/language-gfm
@@ -1 +1 @@
-Subproject commit 7b62290a08d635e98f7bc2c8cb8f51e97b0d3935
+Subproject commit 6af44a08718668035f45270898389ae4fc8eeb8b
diff --git a/vendor/grammars/language-javascript b/vendor/grammars/language-javascript
index 6690feb3..51575193 160000
--- a/vendor/grammars/language-javascript
+++ b/vendor/grammars/language-javascript
@@ -1 +1 @@
-Subproject commit 6690feb3a0aedb191e3c28b7a7a3961c24245b6f
+Subproject commit 515751937df1d397b495e4a92fec5a0933994cdb
diff --git a/vendor/grammars/language-python b/vendor/grammars/language-python
index f518e495..46072e32 160000
--- a/vendor/grammars/language-python
+++ b/vendor/grammars/language-python
@@ -1 +1 @@
-Subproject commit f518e495f6bb13124d44cfc2366c424dc58859ac
+Subproject commit 46072e32e3060eb8e2fea98a106a86db89acc842
diff --git a/vendor/grammars/language-shellscript b/vendor/grammars/language-shellscript
index cbec163c..98397197 160000
--- a/vendor/grammars/language-shellscript
+++ b/vendor/grammars/language-shellscript
@@ -1 +1 @@
-Subproject commit cbec163cc1640f46f2d5ba145f5cb2cace8e3405
+Subproject commit 9839719721e3fb67c2df8461b2b296e6ff027e7f
diff --git a/vendor/grammars/language-yaml b/vendor/grammars/language-yaml
index eddd0793..ce8b4414 160000
--- a/vendor/grammars/language-yaml
+++ b/vendor/grammars/language-yaml
@@ -1 +1 @@
-Subproject commit eddd079347ee6854d37887168daff4a32688d8c2
+Subproject commit ce8b441467852f766a34d22ba6661099496e22e4

From ab1b603c7855f5f356609dc8d4b2433745acbdb3 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:06:55 +0100
Subject: [PATCH 28/42] Require thread-gem and solve problem with visibility of
 variable p in convert-grammars
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* The `thread`-gem is required for the script, because otherwise Ruby throws an error that `Queue` in line 259 is an uninitialized constant
* The variable `p` was previously in the same method with the status message saying `OK ‹path› ‹converted scopes›`. But `p` is now defined in load_grammars() and thus not visible when showing the OK-message in install_grammars(). This was solved by adding a path-parameter to install_grammars().
---
 script/convert-grammars | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/script/convert-grammars b/script/convert-grammars
index a9b2bfea..7f3a0ee9 100755
--- a/script/convert-grammars
+++ b/script/convert-grammars
@@ -5,6 +5,7 @@ require 'net/http'
 require 'optparse'
 require 'plist'
 require 'set'
+require 'thread'
 require 'tmpdir'
 require 'uri'
 require 'yaml'
@@ -195,7 +196,7 @@ def load_grammars(tmp_dir, source, all_scopes)
   end
 end
 
-def install_grammars(grammars)
+def install_grammars(grammars, path)
   installed = []
 
   grammars.each do |grammar|
@@ -204,7 +205,7 @@ def install_grammars(grammars)
     installed << scope
   end
 
-  $stderr.puts("OK #{p.url} (#{installed.join(', ')})")
+  $stderr.puts("OK #{path} (#{installed.join(', ')})")
 end
 
 def run_thread(queue, all_scopes)
@@ -221,7 +222,7 @@ def run_thread(queue, all_scopes)
       Dir.mkdir(dir)
 
       grammars = load_grammars(dir, source, all_scopes)
-      install_grammars(grammars) if $options[:install]
+      install_grammars(grammars, source) if $options[:install]
     end
   end
 end

From 3ace4c57f78115db1c85977e33ad774bd1d56ec0 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:51:08 +0100
Subject: [PATCH 29/42] Allow British-English LICENCE-files

---
 test/test_grammars.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/test_grammars.rb b/test/test_grammars.rb
index 7afbea32..0bfb642c 100644
--- a/test/test_grammars.rb
+++ b/test/test_grammars.rb
@@ -60,10 +60,10 @@ class TestGrammars < Minitest::Test
   def test_submodules_have_licenses
     categories = submodule_paths.group_by do |submodule|
       files = Dir[File.join(ROOT, submodule, "*")]
-      license = files.find { |path| File.basename(path) =~ /\blicense\b/i } || files.find { |path| File.basename(path) =~ /\bcopying\b/i }
+      license = files.find { |path| File.basename(path) =~ /\blicen[cs]e\b/i } || files.find { |path| File.basename(path) =~ /\bcopying\b/i }
       if license.nil?
         if readme = files.find { |path| File.basename(path) =~ /\Areadme\b/i }
-          license = readme if File.read(readme) =~ /\blicense\b/i
+          license = readme if File.read(readme) =~ /\blicen[cs]e\b/i
         end
       end
       if license.nil?

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 30/42] 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 31/42] 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 32/42] 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 33/42] 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

From 5b0565388180ac86576a3d8fe33f309d94b82fb0 Mon Sep 17 00:00:00 2001
From: Adam Roben <adam@roben.org>
Date: Wed, 7 Jan 2015 10:30:51 -0500
Subject: [PATCH 34/42] Bump to v4.2.6

---
 lib/linguist/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/linguist/version.rb b/lib/linguist/version.rb
index bce0aef5..3f330f79 100644
--- a/lib/linguist/version.rb
+++ b/lib/linguist/version.rb
@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "4.2.5"
+  VERSION = "4.2.6"
 end

From 71885b8a79fc3662ebebb80ec3107f05fb329b22 Mon Sep 17 00:00:00 2001
From: Lars Brinkhoff <lars@nocrew.org>
Date: Thu, 8 Jan 2015 13:00:29 +0100
Subject: [PATCH 35/42] Add missing ^ in Frege heuristic regexp.

---
 lib/linguist/heuristics.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/linguist/heuristics.rb b/lib/linguist/heuristics.rb
index 97c1015a..5e603f23 100644
--- a/lib/linguist/heuristics.rb
+++ b/lib/linguist/heuristics.rb
@@ -175,7 +175,7 @@ module Linguist
     disambiguate "Frege", "Forth", "Text" do |data|
       if /^(: |also |new-device|previous )/.match(data)
         Language["Forth"]
-      elsif /\s*(import|module|package|data|type) /.match(data)
+      elsif /^\s*(import|module|package|data|type) /.match(data)
         Language["Frege"]
       else
         Language["Text"]

From 6fef6b578af789646e038482fac9cdb042a81e08 Mon Sep 17 00:00:00 2001
From: Adam Roben <adam@roben.org>
Date: Thu, 8 Jan 2015 10:49:01 -0500
Subject: [PATCH 36/42] Fix script/convert-grammars --add

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

diff --git a/script/convert-grammars b/script/convert-grammars
index 4b16dff4..7c45a7c8 100755
--- a/script/convert-grammars
+++ b/script/convert-grammars
@@ -250,9 +250,10 @@ def main(sources)
 
   all_scopes = {}
 
-  if $options[:add]
+  if source = $options[:add]
     Dir.mktmpdir do |tmpdir|
-      install_grammar(tmpdir, ARGV[0], all_scopes)
+      grammars = load_grammars(tmpdir, source, all_scopes)
+      install_grammars(grammars, source) if $options[:install]
     end
     generate_yaml(all_scopes, sources)
   else

From e95314f07247fd91e644645a08c5864574572a81 Mon Sep 17 00:00:00 2001
From: Adam Roben <adam@roben.org>
Date: Thu, 8 Jan 2015 10:49:54 -0500
Subject: [PATCH 37/42] Recognize WTFPL-licensed grammars

---
 test/test_grammars.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/test_grammars.rb b/test/test_grammars.rb
index 0bfb642c..f010b79b 100644
--- a/test/test_grammars.rb
+++ b/test/test_grammars.rb
@@ -129,6 +129,8 @@ class TestGrammars < Minitest::Test
       "MIT"
     elsif content.include?("unlicense.org")
       "unlicense"
+    elsif content.include?("http://www.wtfpl.net/txt/copying/")
+      "WTFPL"
     end
   end
 end

From 9be941acc8eb80c9bbff4cb32cf8ce0d99d808fa Mon Sep 17 00:00:00 2001
From: Lucas Bajolet <r4pass@hotmail.com>
Date: Thu, 8 Jan 2015 10:50:48 -0500
Subject: [PATCH 38/42] Added support for the nit language in grammars.yml,
 updated languages.yml for .nit source files highlighting

Signed-off-by: Lucas Bajolet <r4pass@hotmail.com>
---
 .gitmodules                 | 3 +++
 grammars.yml                | 2 ++
 lib/linguist/languages.yml  | 2 +-
 vendor/grammars/Sublime-Nit | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)
 create mode 160000 vendor/grammars/Sublime-Nit

diff --git a/.gitmodules b/.gitmodules
index fe68f3d7..f5f88347 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -534,3 +534,6 @@
 [submodule "vendor/grammars/carto-atom"]
 	path = vendor/grammars/carto-atom
 	url = https://github.com/yohanboniface/carto-atom
+[submodule "vendor/grammars/Sublime-Nit"]
+	path = vendor/grammars/Sublime-Nit
+	url = https://github.com/R4PaSs/Sublime-Nit
diff --git a/grammars.yml b/grammars.yml
index 222859f1..aa547ead 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -74,6 +74,8 @@ vendor/grammars/Sublime-Logos:
 - source.logos
 vendor/grammars/Sublime-Loom:
 - source.loomscript
+vendor/grammars/Sublime-Nit:
+- source.nit
 vendor/grammars/Sublime-QML:
 - source.qml
 vendor/grammars/Sublime-REBOL:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 46d77f0a..fff416c7 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1912,7 +1912,7 @@ Nit:
   color: "#0d8921"
   extensions:
   - .nit
-  tm_scope: none
+  tm_scope: source.nit
   ace_mode: text
 
 Nix:
diff --git a/vendor/grammars/Sublime-Nit b/vendor/grammars/Sublime-Nit
new file mode 160000
index 00000000..7d8b3503
--- /dev/null
+++ b/vendor/grammars/Sublime-Nit
@@ -0,0 +1 @@
+Subproject commit 7d8b3503923edb3dd0fa0f8e0684dd33e7897446

From 163ea9ecdd403ad4b798ee4ddf84464ae0c6ab35 Mon Sep 17 00:00:00 2001
From: Lucas Bajolet <r4pass@hotmail.com>
Date: Tue, 2 Dec 2014 10:32:05 -0500
Subject: [PATCH 39/42] Added a few samples for the Nit language

Signed-off-by: Lucas Bajolet <r4pass@hotmail.com>
---
 samples/Nit/file.nit   | 798 +++++++++++++++++++++++++++++++++++++++++
 samples/Nit/meetup.nit | 376 +++++++++++++++++++
 2 files changed, 1174 insertions(+)
 create mode 100644 samples/Nit/file.nit
 create mode 100644 samples/Nit/meetup.nit

diff --git a/samples/Nit/file.nit b/samples/Nit/file.nit
new file mode 100644
index 00000000..889526fc
--- /dev/null
+++ b/samples/Nit/file.nit
@@ -0,0 +1,798 @@
+# This file is part of NIT ( http://www.nitlanguage.org ).
+#
+# Copyright 2004-2008 Jean Privat <jean@pryen.org>
+# Copyright 2008 Floréal Morandat <morandat@lirmm.fr>
+# Copyright 2008 Jean-Sébastien Gélinas <calestar@gmail.com>
+#
+# This file is free software, which comes along with NIT.  This software is
+# distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+# without  even  the implied warranty of  MERCHANTABILITY or  FITNESS FOR A 
+# PARTICULAR PURPOSE.  You can modify it is you want,  provided this header
+# is kept unaltered, and a notification of the changes is added.
+# You  are  allowed  to  redistribute it and sell it, alone or is a part of
+# another product.
+
+# File manipulations (create, read, write, etc.)
+module file
+
+intrude import stream
+intrude import ropes
+import string_search
+import time
+
+in "C Header" `{
+	#include <dirent.h>
+	#include <string.h>
+	#include <sys/types.h>
+	#include <sys/stat.h>
+	#include <unistd.h>
+	#include <stdio.h>
+	#include <poll.h>
+	#include <errno.h>
+`}
+
+# File Abstract Stream
+abstract class FStream
+	super IOS
+	# The path of the file.
+	var path: nullable String = null
+
+	# The FILE *.
+	private var file: nullable NativeFile = null
+
+	fun file_stat: FileStat do return _file.file_stat
+
+	# File descriptor of this file
+	fun fd: Int do return _file.fileno
+end
+
+# File input stream
+class IFStream
+	super FStream
+	super BufferedIStream
+	super PollableIStream
+	# Misc
+
+	# Open the same file again.
+	# The original path is reused, therefore the reopened file can be a different file.
+	fun reopen
+	do
+		if not eof and not _file.address_is_null then close
+		_file = new NativeFile.io_open_read(path.to_cstring)
+		if _file.address_is_null then
+			last_error = new IOError("Error: Opening file at '{path.as(not null)}' failed with '{sys.errno.strerror}'")
+			end_reached = true
+			return
+		end
+		end_reached = false
+		_buffer_pos = 0
+		_buffer.clear
+	end
+
+	redef fun close
+	do
+		if _file.address_is_null then return
+		var i = _file.io_close
+		_buffer.clear
+		end_reached = true
+	end
+
+	redef fun fill_buffer
+	do
+		var nb = _file.io_read(_buffer.items, _buffer.capacity)
+		if nb <= 0 then
+			end_reached = true
+			nb = 0
+		end
+		_buffer.length = nb
+		_buffer_pos = 0
+	end
+	# End of file?
+	redef var end_reached: Bool = false
+
+	# Open the file at `path` for reading.
+	init open(path: String)
+	do
+		self.path = path
+		prepare_buffer(10)
+		_file = new NativeFile.io_open_read(path.to_cstring)
+		if _file.address_is_null then
+			last_error = new IOError("Error: Opening file at '{path}' failed with '{sys.errno.strerror}'")
+			end_reached = true
+		end
+	end
+
+	init from_fd(fd: Int) do
+		self.path = ""
+		prepare_buffer(10)
+		_file = fd_to_stream(fd, read_only)
+		if _file.address_is_null then
+			last_error = new IOError("Error: Converting fd {fd} to stream failed with '{sys.errno.strerror}'")
+			end_reached = true
+		end
+	end
+end
+
+# File output stream
+class OFStream
+	super FStream
+	super OStream
+	
+	redef fun write(s)
+	do
+		if last_error != null then return
+		if not _is_writable then
+			last_error = new IOError("Cannot write to non-writable stream")
+			return
+		end
+		if s isa FlatText then
+			write_native(s.to_cstring, s.length)
+		else
+			for i in s.substrings do write_native(i.to_cstring, i.length)
+		end
+	end
+
+	redef fun close
+	do
+		if _file.address_is_null then
+			last_error = new IOError("Cannot close non-existing write stream")
+			_is_writable = false
+			return
+		end
+		var i = _file.io_close
+		_is_writable = false
+	end
+	redef var is_writable = false
+	
+	# Write `len` bytes from `native`.
+	private fun write_native(native: NativeString, len: Int)
+	do
+		if last_error != null then return
+		if not _is_writable then
+			last_error = new IOError("Cannot write to non-writable stream")
+			return
+		end
+		if _file.address_is_null then
+			last_error = new IOError("Writing on a null stream")
+			_is_writable = false
+			return
+		end
+		var err = _file.io_write(native, len)
+		if err != len then
+			# Big problem
+			last_error = new IOError("Problem in writing : {err} {len} \n")
+		end
+	end
+	
+	# Open the file at `path` for writing.
+	init open(path: String)
+	do
+		_file = new NativeFile.io_open_write(path.to_cstring)
+		if _file.address_is_null then
+			last_error = new IOError("Error: Opening file at '{path}' failed with '{sys.errno.strerror}'")
+			self.path = path
+			is_writable = false
+		end
+		self.path = path
+		_is_writable = true
+	end
+
+	# Creates a new File stream from a file descriptor
+	init from_fd(fd: Int) do
+		self.path = ""
+		_file = fd_to_stream(fd, wipe_write)
+		_is_writable = true
+		 if _file.address_is_null then
+			 last_error = new IOError("Error: Opening stream from file descriptor {fd} failed with '{sys.errno.strerror}'")
+			_is_writable = false
+		end
+	end
+end
+
+redef interface Object
+
+	private fun read_only: NativeString do return "r".to_cstring
+
+	private fun wipe_write: NativeString do return "w".to_cstring
+
+	private fun fd_to_stream(fd: Int, mode: NativeString): NativeFile `{
+		return fdopen(fd, mode);
+	`}
+
+	# returns first available stream to read or write to
+	# return null on interruption (possibly a signal)
+	protected fun poll( streams : Sequence[FStream] ) : nullable FStream
+	do
+		var in_fds = new Array[Int]
+		var out_fds = new Array[Int]
+		var fd_to_stream = new HashMap[Int,FStream]
+		for s in streams do
+			var fd = s.fd
+			if s isa IFStream then in_fds.add( fd )
+			if s isa OFStream then out_fds.add( fd )
+
+			fd_to_stream[fd] = s
+		end
+
+		var polled_fd = intern_poll( in_fds, out_fds )
+
+		if polled_fd == null then
+			return null
+		else
+			return fd_to_stream[polled_fd]
+		end
+	end
+
+	private fun intern_poll(in_fds: Array[Int], out_fds: Array[Int]) : nullable Int is extern import Array[Int].length, Array[Int].[], Int.as(nullable Int) `{
+		int in_len, out_len, total_len;
+		struct pollfd *c_fds;
+		sigset_t sigmask;
+		int i;
+		int first_polled_fd = -1;
+		int result;
+
+		in_len = Array_of_Int_length( in_fds );
+		out_len = Array_of_Int_length( out_fds );
+		total_len = in_len + out_len;
+		c_fds = malloc( sizeof(struct pollfd) * total_len );
+
+		/* input streams */
+		for ( i=0; i<in_len; i ++ ) {
+			int fd;
+			fd = Array_of_Int__index( in_fds, i );
+
+			c_fds[i].fd = fd;
+			c_fds[i].events = POLLIN;
+		}
+
+		/* output streams */
+		for ( i=0; i<out_len; i ++ ) {
+			int fd;
+			fd = Array_of_Int__index( out_fds, i );
+
+			c_fds[i].fd = fd;
+			c_fds[i].events = POLLOUT;
+		}
+
+		/* poll all fds, unlimited timeout */
+		result = poll( c_fds, total_len, -1 );
+
+		if ( result > 0 ) {
+			/* analyse results */
+			for ( i=0; i<total_len; i++ )
+				if ( c_fds[i].revents & c_fds[i].events || /* awaited event */
+					 c_fds[i].revents & POLLHUP ) /* closed */
+				{
+					first_polled_fd = c_fds[i].fd;
+					break;
+				}
+
+			return Int_as_nullable( first_polled_fd );
+		}
+		else if ( result < 0 )
+			fprintf( stderr, "Error in Stream:poll: %s\n", strerror( errno ) );
+
+		return null_Int();
+	`}
+end
+
+###############################################################################
+
+class Stdin
+	super IFStream
+
+	init do
+		_file = new NativeFile.native_stdin
+		path = "/dev/stdin"
+		prepare_buffer(1)
+	end
+
+	redef fun poll_in: Bool is extern "file_stdin_poll_in"
+end
+
+class Stdout
+	super OFStream
+	init do
+		_file = new NativeFile.native_stdout
+		path = "/dev/stdout"
+		_is_writable = true
+	end
+end
+
+class Stderr
+	super OFStream
+	init do
+		_file = new NativeFile.native_stderr
+		path = "/dev/stderr"
+		_is_writable = true
+	end
+end
+
+###############################################################################
+
+redef class Streamable
+	# Like `write_to` but take care of creating the file
+	fun write_to_file(filepath: String)
+	do
+		var stream = new OFStream.open(filepath)
+		write_to(stream)
+		stream.close
+	end
+end
+
+redef class String
+	# return true if a file with this names exists
+	fun file_exists: Bool do return to_cstring.file_exists
+
+	# The status of a file. see POSIX stat(2).
+	fun file_stat: FileStat do return to_cstring.file_stat
+
+	# The status of a file or of a symlink. see POSIX lstat(2).
+	fun file_lstat: FileStat do return to_cstring.file_lstat
+
+	# Remove a file, return true if success
+	fun file_delete: Bool do return to_cstring.file_delete
+
+	# Copy content of file at `self` to `dest`
+	fun file_copy_to(dest: String)
+	do
+		var input = new IFStream.open(self)
+		var output = new OFStream.open(dest)
+
+		while not input.eof do
+			var buffer = input.read(1024)
+			output.write buffer
+		end
+
+		input.close
+		output.close
+	end
+
+	# Remove the trailing extension `ext`.
+	#
+	# `ext` usually starts with a dot but could be anything.
+	#
+	#     assert "file.txt".strip_extension(".txt")  == "file"
+	#     assert "file.txt".strip_extension("le.txt")  == "fi"
+	#     assert "file.txt".strip_extension("xt")  == "file.t"
+	#
+	# if `ext` is not present, `self` is returned unmodified.
+	#
+	#     assert "file.txt".strip_extension(".tar.gz")  == "file.txt"
+	fun strip_extension(ext: String): String
+	do
+		if has_suffix(ext) then
+			return substring(0, length - ext.length)
+		end
+		return self
+	end
+
+	# Extract the basename of a path and remove the extension
+	#
+	#     assert "/path/to/a_file.ext".basename(".ext")         == "a_file"
+	#     assert "path/to/a_file.ext".basename(".ext")          == "a_file"
+	#     assert "path/to".basename(".ext")                     == "to"
+	#     assert "path/to/".basename(".ext")                    == "to"
+	#     assert "path".basename("")                        == "path"
+	#     assert "/path".basename("")                       == "path"
+	#     assert "/".basename("")                           == "/"
+	#     assert "".basename("")                            == ""
+	fun basename(ext: String): String
+	do
+		var l = length - 1 # Index of the last char
+		while l > 0 and self.chars[l] == '/' do l -= 1 # remove all trailing `/`
+		if l == 0 then return "/"
+		var pos = chars.last_index_of_from('/', l)
+		var n = self
+		if pos >= 0 then
+			n = substring(pos+1, l-pos)
+		end
+		return n.strip_extension(ext)
+	end
+
+	# Extract the dirname of a path
+	#
+	#     assert "/path/to/a_file.ext".dirname         == "/path/to"
+	#     assert "path/to/a_file.ext".dirname          == "path/to"
+	#     assert "path/to".dirname                     == "path"
+	#     assert "path/to/".dirname                    == "path"
+	#     assert "path".dirname                        == "."
+	#     assert "/path".dirname                       == "/"
+	#     assert "/".dirname                           == "/"
+	#     assert "".dirname                            == "."
+	fun dirname: String
+	do
+		var l = length - 1 # Index of the last char
+		while l > 0 and self.chars[l] == '/' do l -= 1 # remove all trailing `/`
+		var pos = chars.last_index_of_from('/', l)
+		if pos > 0 then
+			return substring(0, pos)
+		else if pos == 0 then
+			return "/"
+		else
+			return "."
+		end
+	end
+
+	# Return the canonicalized absolute pathname (see POSIX function `realpath`)
+	fun realpath: String do
+		var cs = to_cstring.file_realpath
+		var res = cs.to_s_with_copy
+		# cs.free_malloc # FIXME memory leak
+		return res
+	end
+
+	# Simplify a file path by remove useless ".", removing "//", and resolving ".."
+	# ".." are not resolved if they start the path
+	# starting "/" is not removed
+	# trainling "/" is removed
+	#
+	# Note that the method only wonrk on the string:
+	#  * no I/O access is performed
+	#  * the validity of the path is not checked
+	#
+	#     assert "some/./complex/../../path/from/../to/a////file//".simplify_path	     ==  "path/to/a/file"
+	#     assert "../dir/file".simplify_path       ==  "../dir/file"
+	#     assert "dir/../../".simplify_path        ==  ".."
+	#     assert "dir/..".simplify_path            ==  "."
+	#     assert "//absolute//path/".simplify_path ==  "/absolute/path"
+	#     assert "//absolute//../".simplify_path   ==  "/"
+	fun simplify_path: String
+	do
+		var a = self.split_with("/")
+		var a2 = new Array[String]
+		for x in a do
+			if x == "." then continue
+			if x == "" and not a2.is_empty then continue
+			if x == ".." and not a2.is_empty and a2.last != ".." then
+				a2.pop
+				continue
+			end
+			a2.push(x)
+		end
+		if a2.is_empty then return "."
+		if a2.length == 1 and a2.first == "" then return "/"
+		return a2.join("/")
+	end
+
+	# Correctly join two path using the directory separator.
+	#
+	# Using a standard "{self}/{path}" does not work in the following cases:
+	#
+	# * `self` is empty.
+	# * `path` ends with `'/'`.
+	# * `path` starts with `'/'`.
+	#
+	# This method ensures that the join is valid.
+	#
+	#     assert "hello".join_path("world")   == "hello/world"
+	#     assert "hel/lo".join_path("wor/ld") == "hel/lo/wor/ld"
+	#     assert "".join_path("world")        == "world"
+	#     assert "hello".join_path("/world")  == "/world"
+	#     assert "hello/".join_path("world")  == "hello/world"
+	#     assert "hello/".join_path("/world") == "/world"
+	#
+	# Note: You may want to use `simplify_path` on the result.
+	#
+	# Note: This method works only with POSIX paths.
+	fun join_path(path: String): String
+	do
+		if path.is_empty then return self
+		if self.is_empty then return path
+		if path.chars[0] == '/' then return path
+		if self.last == '/' then return "{self}{path}"
+		return "{self}/{path}"
+	end
+
+	# Convert the path (`self`) to a program name.
+	#
+	# Ensure the path (`self`) will be treated as-is by POSIX shells when it is
+	# used as a program name. In order to do that, prepend `./` if needed.
+	#
+	#     assert "foo".to_program_name == "./foo"
+	#     assert "/foo".to_program_name == "/foo"
+	#     assert "".to_program_name == "./" # At least, your shell will detect the error.
+	fun to_program_name: String do
+		if self.has_prefix("/") then
+			return self
+		else
+			return "./{self}"
+		end
+	end
+
+	# Alias for `join_path`
+	#
+	#     assert "hello" / "world"      ==  "hello/world"
+	#     assert "hel/lo" / "wor/ld"    ==  "hel/lo/wor/ld"
+	#     assert "" / "world"           ==  "world"
+	#     assert "/hello" / "/world"    ==  "/world"
+	#
+	# This operator is quite useful for chaining changes of path.
+	# The next one being relative to the previous one.
+	#
+	#     var a = "foo"
+	#     var b = "/bar"
+	#     var c = "baz/foobar"
+	#     assert a/b/c == "/bar/baz/foobar"
+	fun /(path: String): String do return join_path(path)
+
+	# Returns the relative path needed to go from `self` to `dest`.
+	#
+	#     assert "/foo/bar".relpath("/foo/baz") == "../baz"
+	#     assert "/foo/bar".relpath("/baz/bar") == "../../baz/bar"
+	#
+	# If `self` or `dest` is relative, they are considered relatively to `getcwd`.
+	#
+	# In some cases, the result is still independent of the current directory:
+	#
+	#     assert "foo/bar".relpath("..") == "../../.."
+	#
+	# In other cases, parts of the current directory may be exhibited:
+	#
+	#     var p = "../foo/bar".relpath("baz")
+	#     var c = getcwd.basename("")
+	#     assert p == "../../{c}/baz"
+	#
+	# For path resolution independent of the current directory (eg. for paths in URL),
+	# or to use an other starting directory than the current directory,
+	# just force absolute paths:
+	#
+	#     var start = "/a/b/c/d"
+	#     var p2 = (start/"../foo/bar").relpath(start/"baz")
+	#     assert p2 == "../../d/baz"
+	#
+	#
+	# Neither `self` or `dest` has to be real paths or to exist in directories since
+	# the resolution is only done with string manipulations and without any access to
+	# the underlying file system.
+	#
+	# If `self` and `dest` are the same directory, the empty string is returned:
+	#
+	#     assert "foo".relpath("foo") == ""
+	#     assert "foo/../bar".relpath("bar") == ""
+	#
+	# The empty string and "." designate both the current directory:
+	#
+	#     assert "".relpath("foo/bar")  == "foo/bar"
+	#     assert ".".relpath("foo/bar") == "foo/bar"
+	#     assert "foo/bar".relpath("")  == "../.."
+	#     assert "/" + "/".relpath(".") == getcwd
+	fun relpath(dest: String): String
+	do
+		var cwd = getcwd
+		var from = (cwd/self).simplify_path.split("/")
+		if from.last.is_empty then from.pop # case for the root directory
+		var to = (cwd/dest).simplify_path.split("/")
+		if to.last.is_empty then to.pop # case for the root directory
+
+		# Remove common prefixes
+		while not from.is_empty and not to.is_empty and from.first == to.first do
+			from.shift
+			to.shift
+		end
+
+		# Result is going up in `from` with ".." then going down following `to`
+		var from_len = from.length
+		if from_len == 0 then return to.join("/")
+		var up = "../"*(from_len-1) + ".."
+		if to.is_empty then return up
+		var res = up + "/" + to.join("/")
+		return res
+	end
+
+	# Create a directory (and all intermediate directories if needed)
+	fun mkdir
+	do
+		var dirs = self.split_with("/")
+		var path = new FlatBuffer
+		if dirs.is_empty then return
+		if dirs[0].is_empty then
+			# it was a starting /
+			path.add('/')
+		end
+		for d in dirs do
+			if d.is_empty then continue
+			path.append(d)
+			path.add('/')
+			path.to_s.to_cstring.file_mkdir
+		end
+	end
+
+	# Delete a directory and all of its content, return `true` on success
+	#
+	# Does not go through symbolic links and may get stuck in a cycle if there
+	# is a cycle in the filesystem.
+	fun rmdir: Bool
+	do
+		var ok = true
+		for file in self.files do
+			var file_path = self.join_path(file)
+			var stat = file_path.file_lstat
+			if stat.is_dir then
+				ok = file_path.rmdir and ok
+			else
+				ok = file_path.file_delete and ok
+			end
+			stat.free
+		end
+
+		# Delete the directory itself
+		if ok then to_cstring.rmdir
+
+		return ok
+	end
+
+	# Change the current working directory
+	#
+	#     "/etc".chdir
+	#     assert getcwd == "/etc"
+	#     "..".chdir
+	#     assert getcwd == "/"
+	#
+	# TODO: errno
+	fun chdir do to_cstring.file_chdir
+
+	# Return right-most extension (without the dot)
+	#
+	# Only the last extension is returned.
+	# There is no special case for combined extensions.
+	#
+	#     assert "file.txt".file_extension      == "txt"
+	#     assert "file.tar.gz".file_extension   == "gz"
+	#
+	# For file without extension, `null` is returned.
+	# Hoever, for trailing dot, `""` is returned.
+	#
+	#     assert "file".file_extension          == null
+	#     assert "file.".file_extension         == ""
+	#
+	# The starting dot of hidden files is never considered.
+	#
+	#     assert ".file.txt".file_extension     == "txt"
+	#     assert ".file".file_extension         == null
+	fun file_extension: nullable String
+	do
+		var last_slash = chars.last_index_of('.')
+		if last_slash > 0 then
+			return substring( last_slash+1, length )
+		else
+			return null
+		end
+	end
+
+	# returns files contained within the directory represented by self
+	fun files : Set[ String ] is extern import HashSet[String], HashSet[String].add, NativeString.to_s, String.to_cstring, HashSet[String].as(Set[String]) `{
+		char *dir_path;
+		DIR *dir;
+
+		dir_path = String_to_cstring( recv );
+		if ((dir = opendir(dir_path)) == NULL)
+		{
+			perror( dir_path );
+			exit( 1 );
+		}
+		else
+		{
+			HashSet_of_String results;
+			String file_name;
+			struct dirent *de;
+
+			results = new_HashSet_of_String();
+
+			while ( ( de = readdir( dir ) ) != NULL )
+				if ( strcmp( de->d_name, ".." ) != 0 &&
+					strcmp( de->d_name, "." ) != 0 )
+				{
+					file_name = NativeString_to_s( strdup( de->d_name ) );
+					HashSet_of_String_add( results, file_name );
+				}
+
+			closedir( dir );
+			return HashSet_of_String_as_Set_of_String( results );
+		}
+	`}
+end
+
+redef class NativeString
+	private fun file_exists: Bool is extern "string_NativeString_NativeString_file_exists_0"
+	private fun file_stat: FileStat is extern "string_NativeString_NativeString_file_stat_0"
+	private fun file_lstat: FileStat `{
+		struct stat* stat_element;
+		int res;
+		stat_element = malloc(sizeof(struct stat));
+		res = lstat(recv, stat_element);
+		if (res == -1) return NULL;
+		return stat_element;
+	`}
+	private fun file_mkdir: Bool is extern "string_NativeString_NativeString_file_mkdir_0"
+	private fun rmdir: Bool `{ return rmdir(recv); `}
+	private fun file_delete: Bool is extern "string_NativeString_NativeString_file_delete_0"
+	private fun file_chdir is extern "string_NativeString_NativeString_file_chdir_0"
+	private fun file_realpath: NativeString is extern "file_NativeString_realpath"
+end
+
+# This class is system dependent ... must reify the vfs
+extern class FileStat `{ struct stat * `}
+	# Returns the permission bits of file
+	fun mode: Int is extern "file_FileStat_FileStat_mode_0"
+	# Returns the last access time
+	fun atime: Int is extern "file_FileStat_FileStat_atime_0"
+	# Returns the last status change time 
+	fun ctime: Int is extern "file_FileStat_FileStat_ctime_0"
+	# Returns the last modification time
+	fun mtime: Int is extern "file_FileStat_FileStat_mtime_0"
+	# Returns the size
+	fun size: Int is extern "file_FileStat_FileStat_size_0"
+
+	# Returns true if it is a regular file (not a device file, pipe, sockect, ...)
+	fun is_reg: Bool `{ return S_ISREG(recv->st_mode); `}
+	# Returns true if it is a directory
+	fun is_dir: Bool `{ return S_ISDIR(recv->st_mode); `}
+	# Returns true if it is a character device
+	fun is_chr: Bool `{ return S_ISCHR(recv->st_mode); `}
+	# Returns true if it is a block device
+	fun is_blk: Bool `{ return S_ISBLK(recv->st_mode); `}
+	# Returns true if the type is fifo
+	fun is_fifo: Bool `{ return S_ISFIFO(recv->st_mode); `}
+	# Returns true if the type is a link
+	fun is_lnk: Bool `{ return S_ISLNK(recv->st_mode); `}
+	# Returns true if the type is a socket
+	fun is_sock: Bool `{ return S_ISSOCK(recv->st_mode); `}
+end
+
+# Instance of this class are standard FILE * pointers
+private extern class NativeFile `{ FILE* `}
+	fun io_read(buf: NativeString, len: Int): Int is extern "file_NativeFile_NativeFile_io_read_2"
+	fun io_write(buf: NativeString, len: Int): Int is extern "file_NativeFile_NativeFile_io_write_2"
+	fun io_close: Int is extern "file_NativeFile_NativeFile_io_close_0"
+	fun file_stat: FileStat is extern "file_NativeFile_NativeFile_file_stat_0"
+	fun fileno: Int `{ return fileno(recv); `}
+
+	new io_open_read(path: NativeString) is extern "file_NativeFileCapable_NativeFileCapable_io_open_read_1"
+	new io_open_write(path: NativeString) is extern "file_NativeFileCapable_NativeFileCapable_io_open_write_1"
+	new native_stdin is extern "file_NativeFileCapable_NativeFileCapable_native_stdin_0"
+	new native_stdout is extern "file_NativeFileCapable_NativeFileCapable_native_stdout_0"
+	new native_stderr is extern "file_NativeFileCapable_NativeFileCapable_native_stderr_0"
+end
+
+redef class Sys
+
+	# Standard input
+	var stdin: PollableIStream = new Stdin is protected writable
+
+	# Standard output
+	var stdout: OStream = new Stdout is protected writable
+
+	# Standard output for errors
+	var stderr: OStream = new Stderr is protected writable
+
+end
+
+# Print `objects` on the standard output (`stdout`).
+protected fun printn(objects: Object...)
+do
+	sys.stdout.write(objects.to_s)
+end
+
+# Print an `object` on the standard output (`stdout`) and add a newline.
+protected fun print(object: Object)
+do
+	sys.stdout.write(object.to_s)
+	sys.stdout.write("\n")
+end
+
+# Read a character from the standard input (`stdin`).
+protected fun getc: Char
+do
+	return sys.stdin.read_char.ascii
+end
+
+# Read a line from the standard input (`stdin`).
+protected fun gets: String
+do
+	return sys.stdin.read_line
+end
+
+# Return the working (current) directory
+protected fun getcwd: String do return file_getcwd.to_s
+private fun file_getcwd: NativeString is extern "string_NativeString_NativeString_file_getcwd_0"
diff --git a/samples/Nit/meetup.nit b/samples/Nit/meetup.nit
new file mode 100644
index 00000000..e5d1f561
--- /dev/null
+++ b/samples/Nit/meetup.nit
@@ -0,0 +1,376 @@
+# This file is part of NIT ( http://www.nitlanguage.org ).
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License
+
+# Shows a meetup and allows to modify its participants
+module meetup
+
+import opportunity_model
+import boilerplate
+import welcome
+import template
+
+# Shows a meetup and allows to modify its participants
+class OpportunityMeetupPage
+	super OpportunityPage
+
+	# Meetup the page is supposed to show
+	var meetup: nullable Meetup = null
+	# Answer mode for the meetup
+	var mode = 0
+
+	init from_id(id: String) do
+		var db = new OpportunityDB.open("opportunity")
+		meetup = db.find_meetup_by_id(id)
+		db.close
+		if meetup != null then mode = meetup.answer_mode
+		init
+	end
+
+	init do
+		header.page_js = "mode = {mode};\n"
+		header.page_js += """
+		function update_scores(){
+			var anss = $('.answer');
+			var count = {};
+			var scores = {};
+			var answers = [];
+			var maxscore = 0;
+			for(i=0; i < anss.length; i++){
+				var incscore = 0;
+				var inccount = 0;
+				var idparts = anss[i].id.split("_");
+				var ansid = idparts[1];
+				var html = anss[i].innerHTML;
+				if(html === "<center>✔</center>"){
+					inccount = 1;
+					incscore = 2;
+				}else if(html === "<center>❓</center>"){
+					incscore = 1;
+				}
+				var intansid = parseInt(ansid)
+				if(answers.indexOf(intansid) == -1){
+					answers.push(intansid);
+				}
+				if(ansid in count){
+					count[ansid] += inccount;
+				}else{
+					count[ansid] = inccount;
+				}
+				if(ansid in scores){
+					scores[ansid] += incscore;
+				}else{
+					scores[ansid] = incscore;
+				}
+				if(scores[ansid] > maxscore){
+					maxscore = scores[ansid];
+				}
+			}
+			for(i=0; i < answers.length; i++){
+				var ansid = answers[i].toString();
+				var el = $('#total'+ansid)[0];
+				var ins = "<center>"+count[ansid];
+				if(scores[ansid] >= maxscore){
+					ins += "<br/><span style=\\"color:blue\\">★</span>";
+				}
+				ins += "</center>";
+				el.innerHTML = ins;
+			}
+		}
+		function change_answer(ele, id){
+			// modify only the currently selected entry
+			if (in_modification_id != id) return;
+
+			var e = document.getElementById(ele.id);
+			var i = e.innerHTML;
+			var ans = true;"""
+		if mode == 0 then
+			header.page_js += """
+			if(i === "<center>✔</center>"){
+				ans = 0;
+				e.innerHTML = "<center>✘</center>"
+				e.style.color = "red";
+			}else{
+				ans = 1;
+				e.innerHTML = "<center>✔</center>";
+				e.style.color = "green";
+			}"""
+
+		else
+			header.page_js += """
+			if(i === "<center>✔</center>"){
+				ans = 1;
+				e.innerHTML = "<center>❓</center>"
+				e.style.color = "#B8860B";
+			}else if(i === "<center>❓</center>"){
+				ans = 0;
+				e.innerHTML = "<center>✘</center>"
+				e.style.color = "red";
+			}else{
+				ans = 2;
+				e.innerHTML = "<center>✔</center>";
+				e.style.color = "green";
+			}"""
+		end
+		header.page_js += """
+			var a = ele.id.split('_')
+			var pid = a[1]
+			var aid = a[2]
+			update_scores();
+			$.ajax({
+				type: "POST",
+				url: "./rest/answer",
+				data: {
+					answer_id: aid,
+					pers_id: pid,
+					answer: ans
+				}
+			});
+		}
+		function change_temp_answer(ele){
+			var e = document.getElementById(ele.id);
+			var i = e.innerHTML;"""
+		if mode == 0 then
+			header.page_js += """
+			if(i === "<center>✔</center>"){
+				e.innerHTML = "<center>✘</center>"
+				e.style.color = "red";
+			}else{
+				e.innerHTML = "<center>✔</center>";
+				e.style.color = "green";
+			}
+			"""
+		else
+			header.page_js += """
+			if(i === "<center>✔</center>"){
+				e.innerHTML = "<center>❓</center>";
+				e.style.color = "#B8860B";
+			}else if(i === "<center>❓</center>"){
+				e.innerHTML = "<center>✘</center>"
+				e.style.color = "red";
+			}else{
+				e.innerHTML = "<center>✔</center>";
+				e.style.color = "green";
+			}
+			"""
+		end
+		header.page_js += """
+			update_scores();
+		}
+		function add_part(ele){
+			var e = document.getElementById(ele.id);
+			var pname = document.getElementById("new_name").value;
+			var arr = e.id.split("_");
+			var mid = arr[1];
+			var ans = $('#' + ele.id).parent().parent().parent().children(".answer");
+			ansmap = {};
+			for(i=0;i<ans.length;i++){
+				var curr = ans.eq(i)
+			"""
+		if mode == 0 then
+			header.page_js += """
+				if(curr[0].innerHTML === "<center>✔</center>"){
+					ansmap[curr.attr('id')] = 1
+				}else{
+					ansmap[curr.attr('id')] = 0
+				}"""
+		else
+			header.page_js += """
+				if(curr[0].innerHTML === "<center>✔</center>"){
+					ansmap[curr.attr('id')] = 2
+				}else if(curr[0].innerHTML === "<center>❓</center>"){
+					ansmap[curr.attr('id')] = 1
+				}else{
+					ansmap[curr.attr('id')] = 0
+				}"""
+		end
+		header.page_js += """
+			}
+			$.ajax({
+				type: "POST",
+				url: "./rest/meetup/new_pers",
+				data: {
+					meetup_id: mid,
+					persname: pname,
+					answers: $.param(ansmap)
+				}
+				})
+				.done(function(data){
+					location.reload();
+				})
+				.fail(function(data){
+					//TODO: Notify of failure
+				});
+		}
+		function remove_people(ele){
+			var arr = ele.id.split("_")
+			var pid = arr[1]
+			$('#' + ele.id).parent().parent().parent().remove();
+			update_scores();
+			$.ajax({
+				type: "POST",
+				url: "./rest/people",
+				data: {
+					method: "DELETE",
+					p_id: pid
+				}
+			});
+		}
+		// ID of line currently open for modification
+		var in_modification_id = null;
+		function modify_people(ele, id){
+			if (in_modification_id != null) {
+				// reset to normal values
+				$('#modify_'+in_modification_id).text("Modify or delete");
+				$('#modify_'+in_modification_id).attr("class", "btn btn-xs btn-warning");
+				$('#line_'+in_modification_id).css("background-color", "");
+				$('#delete_'+in_modification_id).css("display", "none");
+			}
+			if (in_modification_id != id) {
+				// activate modifiable mode
+				$('#modify_'+id).text("Done");
+				$('#modify_'+id).attr("class", "btn btn-xs btn-success");
+				$('#line_'+id).css("background-color", "LightYellow");
+				$('#delete_'+id).show();
+
+				in_modification_id = id;
+			} else {
+				in_modification_id = null;
+			}
+		}
+		"""
+	end
+
+	redef fun rendering do
+		if meetup == null then
+			add((new OpportunityHomePage).write_to_string)
+			return
+		end
+		add header
+		var db = new OpportunityDB.open("opportunity")
+		add meetup.to_html(db)
+		db.close
+		add footer
+	end
+end
+
+redef class Meetup
+	# Build the HTML for `self`
+	fun to_html(db: OpportunityDB): Streamable do
+		var t = new Template
+		t.add """
+<div class="container">
+<div class="page-header">
+	<center><h1>{{{name}}}</h1></center>
+"""
+		if not date.is_empty then t.add """
+	<center><h4>When: {{{date}}}</h4></center>"""
+
+		if not place.is_empty then t.add """
+	<center><h4>Where: {{{place}}}</h4></center>"""
+
+		t.add """
+</div>
+<table class="table">
+"""
+		t.add "<th>Participant name</th>"
+		for i in answers(db) do
+			t.add "<th class=\"text-center\">"
+			t.add i.to_s
+			t.add "</th>"
+		end
+		t.add "<th></th>"
+		t.add "</tr>"
+		for i in participants(db) do
+			i.load_answers(db, self)
+			t.add "<tr id=\"line_{i.id}\">"
+			t.add "<td>"
+			t.add i.to_s
+			t.add "</td>"
+			for j, k in i.answers do
+				var color
+				if answer_mode == 0 then
+					if k == 1 then
+						color = "green"
+					else
+						color = "red"
+					end
+				else
+					if k == 2 then
+						color = "green"
+					else if k == 1 then
+						color = "#B8860B"
+					else
+						color = "red"
+					end
+				end
+				t.add """<td class="answer" onclick="change_answer(this, {{{i.id}}})" id="answer_{{{j.id}}}_{{{i.id}}}" style="color:{{{color}}}">"""
+				t.add "<center>"
+				if answer_mode == 0 then
+					if k == 1 then
+						t.add "✔"
+					else
+						t.add "✘"
+					end
+				else
+					if k == 2 then
+						t.add "✔"
+					else if k == 1 then
+						t.add "❓"
+					else
+						t.add "✘"
+					end
+				end
+				t.add "</center></td>"
+			end
+			t.add """<td class="opportunity-action"><center><button class="btn btn-xs btn-warning" type="button" onclick="modify_people(this, {{{i.id}}})" id="modify_{{{i.id}}}">Modify or delete</button>&nbsp;"""
+			t.add """<button class="btn btn-xs btn-danger" type="button" onclick="remove_people(this)" id="delete_{{{i.id}}}" style="display: none;">Delete</button></center></td>"""
+			t.add "</tr>"
+		end
+		t.add """
+<tr id="newrow" style="background-color: LightYellow">
+	<td><input id="new_name" type="text" placeholder="Your name" class="input-large"></td>
+		"""
+		for i in answers(db) do
+			t.add "<td class=\"answer\" id=\"newans_{i.id}\" onclick=\"change_temp_answer(this)\" style=\"color:red;\"><center>✘</center></td>"
+		end
+		t.add """
+	<td><center><span id="add_{{{id}}}" onclick="add_part(this)" style="color:green;" class="action"><button class="btn btn-xs btn-success" type="button">Done</button></span></center></td>"""
+		t.add "</tr>"
+		# Compute score for each answer
+		var scores = new HashMap[Int, Int]
+		var maxsc = 0
+		for i in answers(db) do
+			scores[i.id] = i.score(db)
+			if scores[i.id] > maxsc then maxsc = scores[i.id]
+		end
+		t.add """
+<tr id="total">
+	<th>Total</th>
+		"""
+		for i in answers(db) do
+			t.add """<th id="total{{{i.id}}}"><center>{{{i.count(db)}}}"""
+			if scores.has_key(i.id) and scores[i.id] >= maxsc then
+				t.add """<br/><span style="color:blue">★</span>"""
+			end
+			t.add "</center></th>"
+		end
+		t.add "</th>"
+		t.add """
+		<th></th>
+</tr>"""
+		t.add "</table>"
+		t.add "</div>"
+		return t
+	end
+end

From 5f70776cf3ef7bc9c63354705dda2378c4452c56 Mon Sep 17 00:00:00 2001
From: Bob Tolbert <bob@eyesopen.com>
Date: Sat, 27 Dec 2014 15:22:53 -0700
Subject: [PATCH 40/42] Update Hy support by adding a reference to an Atom
 grammar.

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

diff --git a/.gitmodules b/.gitmodules
index f5f88347..f329e786 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -537,3 +537,6 @@
 [submodule "vendor/grammars/Sublime-Nit"]
 	path = vendor/grammars/Sublime-Nit
 	url = https://github.com/R4PaSs/Sublime-Nit
+[submodule "vendor/grammars/language-hy"]
+	path = vendor/grammars/language-hy
+	url = https://github.com/rwtolbert/language-hy
diff --git a/grammars.yml b/grammars.yml
index aa547ead..1b35a4a3 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -257,6 +257,8 @@ vendor/grammars/language-csharp:
 - source.nant-build
 vendor/grammars/language-gfm:
 - source.gfm
+vendor/grammars/language-hy:
+- source.hy
 vendor/grammars/language-javascript:
 - source.js
 - source.js.regexp
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index fff416c7..462b13c5 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1268,13 +1268,13 @@ Haxe:
 
 Hy:
   type: programming
-  ace_mode: clojure
+  ace_mode: text
   color: "#7891b1"
   extensions:
   - .hy
   aliases:
   - hylang
-  tm_scope: none
+  tm_scope: source.hy
 
 IDL:
   type: programming
diff --git a/vendor/grammars/language-hy b/vendor/grammars/language-hy
new file mode 160000
index 00000000..f9750744
--- /dev/null
+++ b/vendor/grammars/language-hy
@@ -0,0 +1 @@
+Subproject commit f9750744ae4b8519314dff7d57abc527b91a0ef2

From 3957a11f25d2ea0ea84554a2d3651e1941e6ad18 Mon Sep 17 00:00:00 2001
From: Lars Brinkhoff <lars@nocrew.org>
Date: Thu, 8 Jan 2015 19:35:02 +0100
Subject: [PATCH 41/42] Add to sample to show that a false positive goes away.

---
 samples/Text/messages.fr | 1 +
 1 file changed, 1 insertion(+)

diff --git a/samples/Text/messages.fr b/samples/Text/messages.fr
index da0269bb..c8108873 100644
--- a/samples/Text/messages.fr
+++ b/samples/Text/messages.fr
@@ -1 +1,2 @@
 the green potato=la pomme de terre verte
+le nouveau type de musique=the new type of music

From c0fbc9ef8c3ae649d80f4c9215d5e80f14ab2d0e Mon Sep 17 00:00:00 2001
From: Arfon Smith <arfon@github.com>
Date: Thu, 8 Jan 2015 14:11:04 -0600
Subject: [PATCH 42/42] Updating Sublime-HTTP reference

---
 vendor/grammars/Sublime-HTTP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/grammars/Sublime-HTTP b/vendor/grammars/Sublime-HTTP
index f5a4c381..00999986 160000
--- a/vendor/grammars/Sublime-HTTP
+++ b/vendor/grammars/Sublime-HTTP
@@ -1 +1 @@
-Subproject commit f5a4c3819d2b1d7bb9376c255ac78f94b6564b54
+Subproject commit 0099998617eb784fa27d8a47e289058d9a6307ab