added Jeremy Wall's Clojure mode

Author: [email protected]

README.html

@@ -77,6 +77,8 @@ <h3 id="langs">Which languages does it work for?</h3>
     <p>And similarly for
     <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-css.js"
      ><code>CSS</code></a>,
+    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-clj.js"
+     ><code>Clojure</code></a>,
     <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-go.js"
      ><code>Go</code></a>,
     <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-hs.js"
@@ -85,16 +87,20 @@ <h3 id="langs">Which languages does it work for?</h3>
      ><code>Lua</code></a>,
     <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-ml.js"
      ><code>OCAML, SML, F#</code></a>,
-    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-vb.js"
-     ><code>Visual Basic</code></a>,
+    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-proto.js"
+     ><code>Protocol Buffers</code></a>,
     <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-scala.js"
      ><code>Scala</code></a>,
     <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-sql.js"
      ><code>SQL</code></a>,
-    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-proto.js"
-     ><code>Protocol Buffers</code></a>, and
+    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-vhdl.js"
+     ><code>VHDL</code></a>,
+    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-vb.js"
+     ><code>Visual Basic</code></a>,
     <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-wiki.js"
-     ><code>WikiText</code></a>..
+     ><code>WikiText</code></a>, and
+    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-yaml.js"
+     ><code>YAML</code></a>.
 
     <p>If you'd like to add an extension for your favorite language, please
     look at <tt>src/lang-lisp.js</tt> and file an
@@ -209,9 +215,7 @@ <h3>How can I customize the colors and styles of my code?</h3>
 
     <div class="footer">
 <!-- Created: Tue Oct  3 17:51:56 PDT 2006 -->
-<!-- hhmts start -->
-Last modified: Wed Jul 19 13:56:00 PST 2010
-<!-- hhmts end -->
+<!-- hhmts start -->Last modified: Fri May 20 12:43:46 PDT 2011 <!-- hhmts end -->
     </div>
   </body>
 </html>

src/lang-clj.js

@@ -0,0 +1,64 @@
+/**
+ * @license Copyright (C) 2011 Google Inc.
+ *
+ * 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.
+ */
+
+/**
+ * @fileoverview
+ * Registers a language handler for Clojure.
+ *
+ *
+ * To use, include prettify.js and this file in your HTML page.
+ * Then put your code in an HTML tag like
+ *      <pre class="prettyprint lang-lisp">(my lisp code)</pre>
+ * The lang-cl class identifies the language as common lisp.
+ * This file supports the following language extensions:
+ *     lang-clj - Clojure
+ *
+ *
+ * I used lang-lisp.js as the basis for this adding the clojure specific
+ * keywords and syntax.
+ *
+ * "Name"    = 'Clojure'
+ * "Author"  = 'Rich Hickey'
+ * "Version" = '1.2'
+ * "About"   = 'Clojure is a lisp for the jvm with concurrency primitives and a richer set of types.'
+ *
+ *
+ * I used <a href="http://clojure.org/Reference">Clojure.org Reference</a> as
+ * the basis for the reserved word list.
+ *
+ *
+ * @author [email protected]
+ */
+
+PR['registerLangHandler'](
+    PR['createSimpleLexer'](
+        [
+         // clojure has more paren types than minimal lisp.
+         ['opn',             /^[\(\{\[]+/, null, '([{'],
+         ['clo',             /^[\)\}\]]+/, null, ')]}'],
+         // A line comment that starts with ;
+         [PR['PR_COMMENT'],     /^;[^\r\n]*/, null, ';'],
+         // Whitespace
+         [PR['PR_PLAIN'],       /^[\t\n\r \xA0]+/, null, '\t\n\r \xA0'],
+         // A double quoted, possibly multi-line, string.
+         [PR['PR_STRING'],      /^\"(?:[^\"\\]|\\[\s\S])*(?:\"|$)/, null, '"']
+        ],
+        [
+         // clojure has a much larger set of keywords
+         [PR['PR_KEYWORD'],     /^(?:def|if|do|let|quote|var|fn|loop|recur|throw|try|monitor-enter|monitor-exit|defmacro|defn|defn-|macroexpand|macroexpand-1|for|doseq|dosync|dotimes|and|or|when|not|assert|doto|proxy|defstruct|first|rest|cons|defprotocol|deftype|defrecord|reify|defmulti|defmethod|meta|with-meta|ns|in-ns|create-ns|import|intern|refer|alias|namespace|resolve|ref|deref|refset|new|set!|memfn|to-array|into-array|aset|gen-class|reduce|map|filter|find|nil?|empty?|hash-map|hash-set|vec|vector|seq|flatten|reverse|assoc|dissoc|list|list?|disj|get|union|difference|intersection|extend|extend-type|extend-protocol|prn)\b/, null],
+         [PR['PR_TYPE'], /^:[0-9a-zA-Z\-]+/]
+        ]),
+    ['clj']);

tests/prettify_test_2.html

@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W5C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <title>Code Prettifier</title>
@@ -8,6 +8,8 @@
  onerror="alert('Error: failed to load ' + this.src)"></script>
 
 <!-- Language extensions tested -->
+<script src="../src/lang-clj.js" type="text/javascript"
+ onerror="alert('Error: failed to load ' + this.src)"></script>
 <script src="../src/lang-xq.js" type="text/javascript"
  onerror="alert('Error: failed to load ' + this.src)"></script>
 <script src="../src/lang-n.js" type="text/javascript"
@@ -422,6 +424,20 @@ <h1>Issue 145</h1>
 &lt;/script&gt;
 </pre>
 
+<h1>Clojure Syntax Highlighting</h1>
+<pre class="prettyprint lang-clj" id="clojure">
+; Clojure test comment
+(ns test
+ (:gen-class))
+
+(def foo "bar")
+(defn bar [arg1 arg2 & args]
+  "sample function"
+  (for [arg args]
+    (prn arg)))
+
+(bar "foo" "bar" "blah" :baz)
+</pre>
 </body>
 
 <script type="text/javascript">
@@ -806,7 +822,18 @@ <h1>Issue 145</h1>
         '  printf `END`STR"%x "`END`PLN \\\'$i`END`PUN;`END`PLN\n' +
         '`END`KWDdone`END`PUN;`END`PLN\n' +
         'echo`END'
-        )
+        ),
+  clojure: '`COM; Clojure test comment`END`PLN\n' +
+        '`END`OPN(`END`KWDns`END`PLN test\n' +
+        ' `END`OPN(`END`TYP:gen-class`END`CLO))`END`PLN\n' +
+        '\n' +
+        '`END`OPN(`END`KWDdef`END`PLN foo `END`STR"bar"`END`CLO)`END`PLN\n' +
+        '`END`OPN(`END`KWDdefn`END`PLN bar `END`OPN[`END`PLNarg1 arg2 &amp; args`END`CLO]`END`PLN\n' +
+        '  `END`STR"sample function"`END`PLN\n' +
+        '  `END`OPN(`END`KWDfor`END`PLN `END`OPN[`END`PLNarg args`END`CLO]`END`PLN\n' +
+        '    `END`OPN(`END`KWDprn`END`PLN arg`END`CLO)))`END`PLN\n' +
+        '\n' +
+        '`END`OPN(`END`PLNbar `END`STR"foo"`END`PLN `END`STR"bar"`END`PLN `END`STR"blah"`END`PLN `END`TYP:baz`END`CLO)`END'
 };
 </script>