diff --git a/index.html b/index.html
index de7ad817008421c6b1d5ef814fcdcac927c2a43b..9a473b93a99c91f2384c7df17f2b272ce975f3fb 100644
--- a/index.html
+++ b/index.html
@@ -51,6 +51,7 @@
<li><a href="mode/plsql/index.html">PL/SQL</a></li>
<li><a href="mode/lua/index.html">Lua</a></li>
<li><a href="mode/scheme/index.html">Scheme</a></li>
+ <li><a href="mode/clojure/index.html">Clojure</a></li>
<li><a href="mode/rst/index.html">reStructuredText</a></li>
<li><a href="mode/yaml/index.html">YAML</a></li>
<li><a href="mode/sparql/index.html">SPARQL</a></li>
diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
new file mode 100644
index 0000000000000000000000000000000000000000..b1dbf0d6179b6a99956a369cd84c4e69774e48d6
--- /dev/null
+++ b/mode/clojure/clojure.js
@@ -0,0 +1,207 @@
+/**
+ * Author: Hans Engel
+ * Branched from CodeMirror's Scheme mode (by Koh Zi Han, based on implementation by Koh Zi Chun)
+ */
+CodeMirror.defineMode("clojure", function (config, mode) {
+ var BUILTIN = "builtin", COMMENT = "comment", STRING = "string", TAG = "tag",
+ ATOM = "atom", NUMBER = "number", BRACKET = "bracket", KEYWORD="keyword";
+ var INDENT_WORD_SKIP = 2, KEYWORDS_SKIP = 1;
+
+ function makeKeywords(str) {
+ var obj = {}, words = str.split(" ");
+ for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+ return obj;
+ }
+
+ var atoms = makeKeywords("true false nil");
+
+ var keywords = makeKeywords(
+ // Control structures
+ "defn defn- def def- defonce defmulti defmethod defmacro defstruct deftype defprotocol defrecord deftest slice defalias defhinted defmacro- defn-memo defnk defnk defonce- defunbound defunbound- defvar defvar- let letfn do case cond condp for loop recur when when-not when-let when-first if if-let if-not . .. -> ->> doto and or dosync doseq dotimes dorun doall load import unimport ns in-ns refer try catch finally throw with-open with-local-vars binding gen-class gen-and-load-class gen-and-save-class handler-case handle" +
+
+ // Built-ins
+ "* *1 *2 *3 *agent* *allow-unresolved-vars* *assert *clojure-version* *command-line-args* *compile-files* *compile-path* *e *err* *file* *flush-on-newline* *in* *macro-meta* *math-context* *ns* *out* *print-dup* *print-length* *print-level* *print-meta* *print-readably* *read-eval* *source-path* *use-context-classloader* *warn-on-reflection* + - / < <= = == > >= accessor aclone agent agent-errors aget alength alias all-ns alter alter-meta! alter-var-root amap ancestors and apply areduce array-map aset aset-boolean aset-byte aset-char aset-double aset-float aset-int aset-long aset-short assert assoc assoc! assoc-in associative? atom await await-for await1 bases bean bigdec bigint binding bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set bit-shift-left bit-shift-right bit-test bit-xor boolean boolean-array booleans bound-fn bound-fn* butlast byte byte-array bytes case cast char char-array char-escape-string char-name-string char? chars chunk chunk-append chunk-buffer chunk-cons chunk-first chunk-next chunk-rest chunked-seq? class class? clear-agent-errors clojure-version coll? comment commute comp comparator compare compare-and-set! compile complement concat cond condp conj conj! cons constantly construct-proxy contains? count counted? create-ns create-struct cycle dec decimal? declare definline defmacro defmethod defmulti defn defn- defonce defstruct delay delay? deliver deref derive descendants destructure disj disj! dissoc dissoc! distinct distinct? doall doc dorun doseq dosync dotimes doto double double-array doubles drop drop-last drop-while empty empty? ensure enumeration-seq eval even? every? extend extend-protocol extend-type extends? extenders false? ffirst file-seq filter find find-doc find-ns find-var first float float-array float? floats flush fn fn? fnext for force format future future-call future-cancel future-cancelled? future-done? future? gen-class gen-interface gensym get get-in get-method get-proxy-class get-thread-bindings get-validator hash hash-map hash-set identical? identity if-let if-not ifn? import in-ns inc init-proxy instance? int int-array integer? interleave intern interpose into into-array ints io! isa? iterate iterator-seq juxt key keys keyword keyword? last lazy-cat lazy-seq let letfn line-seq list list* list? load load-file load-reader load-string loaded-libs locking long long-array longs loop macroexpand macroexpand-1 make-array make-hierarchy map map? mapcat max max-key memfn memoize merge merge-with meta method-sig methods min min-key mod name namespace neg? newline next nfirst nil? nnext not not-any? not-empty not-every? not= ns ns-aliases ns-imports ns-interns ns-map ns-name ns-publics ns-refers ns-resolve ns-unalias ns-unmap nth nthnext num number? odd? or parents partial partition pcalls peek persistent! pmap pop pop! pop-thread-bindings pos? pr pr-str prefer-method prefers primitives-classnames print print-ctor print-doc print-dup print-method print-namespace-doc print-simple print-special-doc print-str printf println println-str prn prn-str promise proxy proxy-call-with-super proxy-mappings proxy-name proxy-super push-thread-bindings pvalues quot rand rand-int range ratio? rational? rationalize re-find re-groups re-matcher re-matches re-pattern re-seq read read-line read-string reify reduce ref ref-history-count ref-max-history ref-min-history ref-set refer refer-clojure release-pending-sends rem remove remove-method remove-ns repeat repeatedly replace replicate require reset! reset-meta! resolve rest resultset-seq reverse reversible? rseq rsubseq satisfies? second select-keys send send-off seq seq? seque sequence sequential? set set-validator! set? short short-array shorts shutdown-agents slurp some sort sort-by sorted-map sorted-map-by sorted-set sorted-set-by sorted? special-form-anchor special-symbol? split-at split-with str stream? string? struct struct-map subs subseq subvec supers swap! symbol symbol? sync syntax-symbol-anchor take take-last take-nth take-while test the-ns time to-array to-array-2d trampoline transient tree-seq true? type unchecked-add unchecked-dec unchecked-divide unchecked-inc unchecked-multiply unchecked-negate unchecked-remainder unchecked-subtract underive unquote unquote-splicing update-in update-proxy use val vals var-get var-set var? vary-meta vec vector vector? when when-first when-let when-not while with-bindings with-bindings* with-in-str with-loading-context with-local-vars with-meta with-open with-out-str with-precision xml-seq");
+
+ var indentKeys = makeKeywords(
+ // Built-ins
+ "ns fn def defn defmethod bound-fn if if-not case condp when while when-not when-first do future comment doto locking proxy with-open with-precision reify deftype defrecord defprotocol extend extend-protocol extend-type try catch" +
+
+ // Binding forms
+ "let letfn binding loop for doseq dotimes when-let if-let" +
+
+ // Data structures
+ "defstruct struct-map assoc" +
+
+ // clojure.test
+ "testing deftest" +
+
+ // contrib
+ "handler-case handle dotrace deftrace");
+
+ var tests = {
+ digit: /\d/,
+ digit_or_colon: /[\d:]/,
+ hex: /[0-9a-fA-F]/,
+ sign: /[+-]/,
+ exponent: /[eE]/,
+ keyword_char: /[^\s\(\[\;\)\]]/,
+ basic: /[\w\$_\-]/,
+ lang_keyword: /[\w*+!-_?:\/]/
+ };
+
+ function stateStack(indent, type, prev) { // represents a state stack object
+ this.indent = indent;
+ this.type = type;
+ this.prev = prev;
+ }
+
+ function pushStack(state, indent, type) {
+ state.indentStack = new stateStack(indent, type, state.indentStack);
+ }
+
+ function popStack(state) {
+ state.indentStack = state.indentStack.prev;
+ }
+
+ function isNumber(ch, stream){
+ // hex
+ if ( ch === '0' && 'x' == stream.peek().toLowerCase() ) {
+ stream.eat('x');
+ stream.eatWhile(tests.hex);
+ return true;
+ }
+
+ // leading sign
+ if ( ch == '+' || ch == '-' ) {
+ stream.eat(tests.sign);
+ ch = stream.next();
+ }
+
+ if ( tests.digit.test(ch) ) {
+ stream.eat(ch);
+ stream.eatWhile(tests.digit);
+
+ if ( '.' == stream.peek() ) {
+ stream.eat('.');
+ stream.eatWhile(tests.digit);
+ }
+
+ if ( 'e' == stream.peek().toLowerCase() ) {
+ stream.eat(tests.exponent);
+ stream.eat(tests.sign);
+ stream.eatWhile(tests.digit);
+ }
+
+ return true;
+ }
+
+ return false;
+ }
+
+ return {
+ startState: function () {
+ return {
+ indentStack: null,
+ indentation: 0,
+ mode: false,
+ };
+ },
+
+ token: function (stream, state) {
+ if (state.indentStack == null && stream.sol()) {
+ // update indentation, but only if indentStack is empty
+ state.indentation = stream.indentation();
+ }
+
+ // skip spaces
+ if (stream.eatSpace()) {
+ return null;
+ }
+ var returnType = null;
+
+ switch(state.mode){
+ case "string": // multi-line string parsing mode
+ var next, escaped = false;
+ while ((next = stream.next()) != null) {
+ if (next == "\"" && !escaped) {
+
+ state.mode = false;
+ break;
+ }
+ escaped = !escaped && next == "\\";
+ }
+ returnType = STRING; // continue on in string mode
+ break;
+ default: // default parsing mode
+ var ch = stream.next();
+
+ if (ch == "\"") {
+ state.mode = "string";
+ returnType = STRING;
+ } else if (ch == "'" && !( tests.digit_or_colon.test(stream.peek()) )) {
+ returnType = ATOM;
+ } else if (ch == ";") { // comment
+ stream.skipToEnd(); // rest of the line is a comment
+ returnType = COMMENT;
+ } else if (isNumber(ch,stream)){
+ returnType = NUMBER;
+ } else if (ch == "(" || ch == "[") {
+ var keyWord = ''; var indentTemp = stream.column();
+ /**
+ Either
+ (indent-word ..
+ (non-indent-word ..
+ (;something else, bracket, etc.
+ */
+
+ while ((letter = stream.eat(tests.keyword_char)) != null) {
+ keyWord += letter;
+ }
+
+ if (keyWord.length > 0 && indentKeys.propertyIsEnumerable(keyWord)) { // indent-word
+
+ pushStack(state, indentTemp + INDENT_WORD_SKIP, ch);
+ } else { // non-indent word
+ // we continue eating the spaces
+ stream.eatSpace();
+ if (stream.eol() || stream.peek() == ";") {
+ // nothing significant after
+ // we restart indentation 1 space after
+ pushStack(state, indentTemp + 1, ch);
+ } else {
+ pushStack(state, indentTemp + stream.current().length, ch); // else we match
+ }
+ }
+ stream.backUp(stream.current().length - 1); // undo all the eating
+
+ returnType = BRACKET;
+ } else if (ch == ")" || ch == "]") {
+ returnType = BRACKET;
+ if (state.indentStack != null && state.indentStack.type == (ch == ")" ? "(" : "[")) {
+ popStack(state);
+ }
+ } else if ( ch == ":" ) {
+ stream.eatWhile(tests.lang_keyword);
+ return TAG;
+ } else {
+ stream.eatWhile(tests.basic);
+
+ if (keywords && keywords.propertyIsEnumerable(stream.current())) {
+ returnType = BUILTIN;
+ } else if ( atoms && atoms.propertyIsEnumerable(stream.current()) ) {
+ returnType = ATOM;
+ } else returnType = null;
+ }
+ }
+
+ return returnType;
+ },
+
+ indent: function (state, textAfter) {
+ if (state.indentStack == null) return state.indentation;
+ return state.indentStack.indent;
+ }
+ };
+});
+
+CodeMirror.defineMIME("text/x-clojure", "clojure");
diff --git a/mode/clojure/index.html b/mode/clojure/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..e9cc3e7c19fe25d2664a418160f8633dbcc903ee
--- /dev/null
+++ b/mode/clojure/index.html
@@ -0,0 +1,85 @@
+<!doctype html>
+<html>
+ <head>
+ <title>CodeMirror 2: Clojure mode</title>
+ <link rel="stylesheet" href="../../lib/codemirror.css">
+ <script src="../../lib/codemirror.js"></script>
+ <script src="clojure.js"></script>
+ <link rel="stylesheet" href="../../theme/default.css">
+ <style>.CodeMirror {background: #f8f8f8;}</style>
+ <link rel="stylesheet" href="../../css/docs.css">
+ </head>
+ <body>
+ <h1>CodeMirror 2: Clojure mode</h1>
+ <form><textarea id="code" name="code">
+; Conway's Game of Life, from http://rosettacode.org/wiki/Conway%27s_Game_of_Life#Clojure
+(defstruct grid :w :h :cells)
+
+(defn get-cell
+ "Returns the value at x,y. The grid is treated as a torus, such that both x and
+ y coordinates will wrap around if greater than width and height respectively."
+ [grid x y]
+ (let [x (mod x (:w grid))
+ y (mod y (:h grid))]
+ (-> grid :cells (nth y) (nth x))))
+
+(defn neighbors
+ "Returns a lazy sequence of all neighbors of the specified cell."
+ [grid x y]
+ (for [j [(dec y) y (inc y)]
+ i [(dec x) x (inc x)]
+ :when (not (and (= i x) (= j y)))]
+ (get-cell grid i j)))
+
+(defn evolve-cell
+ "Returns the new state of the specifed cell."
+ [grid x y]
+ (let [c (get-cell grid x y)
+ n (reduce + (neighbors grid x y))]
+ (if (or (and (zero? c) (= 3 n))
+ (and (= 1 c) (or (= 2 n) (= 3 n))))
+ 1 0)))
+
+(defn evolve-grid
+ "Returns a new grid whose cells have all been evolved."
+ [grid]
+ (assoc grid :cells
+ (vec (for [y (range (:h grid))]
+ (vec (for [x (range (:w grid))]
+ (evolve-cell grid x y)))))))
+
+(defn generations [grid]
+ "Returns a lazy sequence of the grid, and all subsequent generations."
+ (iterate evolve-grid grid))
+
+(defn make-grid [w h & row-patterns]
+ (let [cells (vec (for [rp row-patterns]
+ (vec (mapcat #(take %1 (repeat %2)) rp (cycle [0 1])))))]
+ (if (and (= h (count cells))
+ (every? #(= w (count %)) cells))
+ (struct grid w h cells)
+ (throw (IllegalArgumentException. "Resulting cells do not match expected width/height.")))))
+
+(defn display-row [row]
+ (do (dorun (map print (map #(if (zero? %) " . " "[X]") row))) (println)))
+
+(defn display-grid [grid]
+ (dorun (map display-row (:cells grid))))
+
+(defn display-grids [grids]
+ (dorun
+ (interleave
+ (repeatedly println)
+ (map display-grid grids))))
+
+(def blinker (make-grid 5 5 [5] [5] [1 3 1] [5] [5]))
+(display-grids (take 3 (generations blinker)))
+</textarea></form>
+ <script>
+ var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
+ </script>
+
+ <p><strong>MIME types defined:</strong> <code>text/x-clojure</code>.</p>
+
+ </body>
+</html>